[ty] Simplify Self for final types

Co-authored-by: David Peter <sharkdp@users.noreply.github.com>

.cargo/config.toml

@@ -8,7 +8,3 @@ 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,3 +1,12 @@
+# 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}]
+[*.{rs,py,pyi,toml}]
 indent_size = 4
 
 [*.snap]
@@ -18,6 +18,3 @@ trim_trailing_whitespace = false
 
 [*.md]
 max_line_length = 100
-
-[*.toml]
-indent_size = 4

.github/workflows/ci.yaml

@@ -12,13 +12,18 @@ 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.13"
+  PYTHON_VERSION: "3.14"
+  NEXTEST_PROFILE: ci
 
 jobs:
   determine_changes:
@@ -237,7 +242,7 @@ jobs:
 
   cargo-test-linux:
     name: "cargo test (linux)"
-    runs-on: depot-ubuntu-22.04-16
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }}
     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
@@ -271,11 +276,9 @@ 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:
@@ -299,9 +302,13 @@ 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: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
+    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')
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -325,14 +332,16 @@ 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-windows:
-    name: "cargo test (windows)"
-    runs-on: depot-windows-2022-16
+  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 }}
     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
@@ -352,42 +361,6 @@ 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
-
-  cargo-test-macos:
-    name: "cargo test (macos)"
-    runs-on: macos-latest
-    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
-    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: "Install cargo nextest"
-        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
-        with:
-          tool: cargo-nextest
-      - name: "Install uv"
-        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
-        with:
-          enable-cache: "true"
-      - name: "Run tests"
-        shell: bash
-        env:
-          NEXTEST_PROFILE: "ci"
         run: |
           cargo nextest run --all-features --profile ci
           cargo test --all-features --doc
@@ -424,7 +397,7 @@ jobs:
 
   cargo-build-msrv:
     name: "cargo build (msrv)"
-    runs-on: depot-ubuntu-latest-8
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-latest-8' || 'ubuntu-latest' }}
     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
@@ -445,7 +418,6 @@ 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
@@ -501,9 +473,10 @@ jobs:
           chmod +x "${DOWNLOAD_PATH}/ruff"
 
           (
-            uvx \
+            uv run \
             --python="${PYTHON_VERSION}" \
-            --from=./python/py-fuzzer \
+            --project=./python/py-fuzzer \
+            --locked \
             fuzz \
             --test-executable="${DOWNLOAD_PATH}/ruff" \
             --bin=ruff \
@@ -521,6 +494,7 @@ 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
@@ -535,10 +509,15 @@ 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: depot-ubuntu-latest-8
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-latest-8' || 'ubuntu-latest' }}
     needs:
       - cargo-test-linux
       - determine_changes
@@ -550,9 +529,11 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
         with:
-          python-version: ${{ env.PYTHON_VERSION }}
+          # TODO: figure out why `ruff-ecosystem` crashes on Python 3.14
+          python-version: "3.13"
+          activate-environment: true
 
       - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         name: Download comparison Ruff binary
@@ -571,7 +552,7 @@ jobs:
 
       - name: Install ruff-ecosystem
         run: |
-          pip install ./python/ruff-ecosystem
+          uv pip install ./python/ruff-ecosystem
 
       - name: Run `ruff check` stable ecosystem check
         if: ${{ needs.determine_changes.outputs.linter == 'true' }}
@@ -663,13 +644,13 @@ jobs:
 
   fuzz-ty:
     name: "Fuzz for new ty panics"
-    runs-on: depot-ubuntu-22.04-16
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }}
     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: 20
+    timeout-minutes: ${{ github.repository == 'astral-sh/ruff' && 5 || 20 }}
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
@@ -697,15 +678,16 @@ jobs:
           chmod +x "${PWD}/ty" "${NEW_TY}/ty"
 
           (
-            uvx \
+            uv run \
             --python="${PYTHON_VERSION}" \
-            --from=./python/py-fuzzer \
+            --project=./python/py-fuzzer \
+            --locked \
             fuzz \
             --test-executable="${NEW_TY}/ty" \
             --baseline-executable="${PWD}/ty" \
             --only-new-bugs \
             --bin=ty \
-            0-500
+            0-1000
           )
 
   cargo-shear:
@@ -723,7 +705,7 @@ jobs:
 
   ty-completion-evaluation:
     name: "ty completion evaluation"
-    runs-on: depot-ubuntu-22.04-16
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }}
     needs: determine_changes
     if: ${{ needs.determine_changes.outputs.ty == 'true' || github.ref == 'refs/heads/main' }}
     steps:
@@ -769,7 +751,7 @@ jobs:
 
   pre-commit:
     name: "pre-commit"
-    runs-on: depot-ubuntu-22.04-16
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }}
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -806,9 +788,6 @@ 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' }}
@@ -819,12 +798,15 @@ 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 --system
+        run: uv pip install -r docs/requirements-insiders.txt
       - name: "Install dependencies"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS != 'true' }}
-        run: uv pip install -r docs/requirements.txt --system
+        run: uv pip install -r docs/requirements.txt
       - name: "Update README File"
         run: python scripts/transform_readme.py --target mkdocs
       - name: "Generate docs"
@@ -943,8 +925,12 @@ jobs:
     runs-on: ubuntu-24.04
     needs: determine_changes
     if: |
-      github.ref == 'refs/heads/main' ||
-      (needs.determine_changes.outputs.formatter == 'true' || needs.determine_changes.outputs.linter == 'true')
+      github.repository == 'astral-sh/ruff' &&
+      (
+        github.ref == 'refs/heads/main' ||
+        needs.determine_changes.outputs.formatter == 'true' ||
+        needs.determine_changes.outputs.linter == 'true'
+      )
     timeout-minutes: 20
     steps:
       - name: "Checkout Branch"
@@ -978,8 +964,11 @@ jobs:
     runs-on: ubuntu-24.04
     needs: determine_changes
     if: |
-      github.ref == 'refs/heads/main' ||
-      needs.determine_changes.outputs.ty == 'true'
+      github.repository == 'astral-sh/ruff' &&
+      (
+        github.ref == 'refs/heads/main' ||
+        needs.determine_changes.outputs.ty == 'true'
+      )
     timeout-minutes: 20
     steps:
       - name: "Checkout Branch"

.github/workflows/daily_fuzz.yaml

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

.github/workflows/mypy_primer.yaml

@@ -19,6 +19,10 @@ 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
@@ -29,7 +33,7 @@ env:
 jobs:
   mypy_primer:
     name: Run mypy_primer
-    runs-on: depot-ubuntu-22.04-32
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -49,7 +53,6 @@ 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
@@ -72,7 +75,7 @@ jobs:
 
   memory_usage:
     name: Run memory statistics
-    runs-on: depot-ubuntu-22.04-32
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -92,7 +95,6 @@ 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/publish-playground.yml

@@ -18,6 +18,8 @@ env:
   CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
 
+permissions: {}
+
 jobs:
   publish:
     runs-on: ubuntu-latest
@@ -32,7 +34,7 @@ jobs:
       - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 22
-          cache: "npm"
+          cache: "npm" # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
           cache-dependency-path: playground/package-lock.json
       - uses: jetli/wasm-bindgen-action@20b33e20595891ab1a0ed73145d8a21fc96e7c29 # v0.2.0
       - name: "Install Node dependencies"

.github/workflows/publish-ty-playground.yml

@@ -38,6 +38,7 @@ jobs:
       - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 22
+          cache: "npm" # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
       - uses: jetli/wasm-bindgen-action@20b33e20595891ab1a0ed73145d8a21fc96e7c29 # v0.2.0
       - name: "Install Node dependencies"
         run: npm ci

.github/workflows/release.yml

@@ -1,7 +1,6 @@
-# This file was autogenerated by dist: https://github.com/astral-sh/cargo-dist
+# This file was autogenerated by dist: https://axodotdev.github.io/cargo-dist
 #
 # Copyright 2022-2024, axodotdev
-# Copyright 2025 Astral Software Inc.
 # SPDX-License-Identifier: MIT or Apache-2.0
 #
 # CI that:
@@ -69,7 +68,7 @@ jobs:
         # we specify bash to get pipefail; it guards against the `curl` command
         # failing. otherwise `sh` won't catch that `curl` returned non-0
         shell: bash
-        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/cargo-dist/releases/download/v0.28.5-prerelease.1/cargo-dist-installer.sh | sh"
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.0/cargo-dist-installer.sh | sh"
       - name: Cache dist
         uses: actions/upload-artifact@6027e3dd177782cd8ab9af838c04fd81a07f1d47
         with:

.github/workflows/sync_typeshed.yaml

@@ -16,8 +16,10 @@ 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. 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
+#    c. Attempts to update any snapshots that might have changed
+#       (this sub-step is allowed to fail)
+#    d. Commits the changes and pushes them to the same upstream branch
+#    e. Creates a PR against the `main` branch using the branch all three workers have pushed to
 # 4. If any of steps 1-3 failed, an issue is created in the `astral-sh/ruff` repository
 
 on:
@@ -26,8 +28,18 @@ on:
     # Run on the 1st and the 15th of every month:
     - cron: "0 0 1,15 * *"
 
+defaults:
+  run:
+    shell: bash
+
 env:
-  FORCE_COLOR: 1
+  # 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"
   GH_TOKEN: ${{ github.token }}
 
   # The name of the upstream branch that the first worker creates,
@@ -86,6 +98,8 @@ 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
@@ -124,7 +138,8 @@ jobs:
           git config --global user.email '<>'
       - name: Sync Windows docstrings
         id: docstrings
-        shell: bash
+        env:
+          FORCE_COLOR: 1
         run: ./scripts/codemod_docstrings.sh
       - name: Commit the changes
         if: ${{ steps.docstrings.outcome == 'success' }}
@@ -161,26 +176,63 @@ 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
-
-          rm "${VENDORED_TYPESHED}/pyproject.toml"
-          git commit -am "Remove pyproject.toml file"
-
-          git push
-      - name: Create a PR
+      - 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
           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: depot-ubuntu-22.04-32
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
     timeout-minutes: 20
     if: contains(github.event.label.name, 'ecosystem-analyzer')
     steps:
@@ -34,10 +34,13 @@ jobs:
 
       - name: Install the latest version of uv
         uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+        with:
+          enable-cache: true # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
 
       - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:
           workspaces: "ruff"
+          lookup-only: false # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
 
       - name: Install Rust toolchain
         run: rustup show

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

@@ -19,7 +19,7 @@ env:
 jobs:
   ty-ecosystem-report:
     name: Create ecosystem report
-    runs-on: depot-ubuntu-22.04-32
+    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -30,10 +30,13 @@ jobs:
 
       - name: Install the latest version of uv
         uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+        with:
+          enable-cache: true # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
 
       - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:
           workspaces: "ruff"
+          lookup-only: false # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
 
       - name: Install Rust toolchain
         run: rustup show

.github/workflows/typing_conformance.yaml

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

.github/zizmor.yml

@@ -9,13 +9,18 @@ rules:
   cache-poisoning:
     ignore:
       - build-docker.yml
-      - publish-playground.yml
-      - ty-ecosystem-analyzer.yaml
-      - ty-ecosystem-report.yaml
   excessive-permissions:
     # it's hard to test what the impact of removing these ignores would be
     # without actually running the release workflow...
     ignore:
       - build-docker.yml
-      - publish-playground.yml
       - publish-docs.yml
+  secrets-inherit:
+    # `cargo dist` makes extensive use of `secrets: inherit`,
+    # and we can't easily fix that until an upstream release changes that.
+    disable: true
+  template-injection:
+    ignore:
+      # like with `secrets-inherit`, `cargo dist` introduces some
+      # template injections. We've manually audited these usages for safety.
+      - release.yml

.pre-commit-config.yaml

@@ -35,6 +35,7 @@ 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
@@ -58,6 +59,7 @@ 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: |
@@ -99,8 +101,8 @@ repos:
 
   # zizmor detects security vulnerabilities in GitHub Actions workflows.
   # Additional configuration for the tool is found in `.github/zizmor.yml`
-  - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v1.11.0
+  - repo: https://github.com/zizmorcore/zizmor-pre-commit
+    rev: v1.15.2
     hooks:
       - id: zizmor
 

CHANGELOG.md

@@ -1,5 +1,63 @@
 # 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

@@ -433,9 +433,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.48"
+version = "4.5.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae"
+checksum = "f4512b90fa68d3a9932cea5184017c5d200f5921df706d45e853537dea51508f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -443,9 +443,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.48"
+version = "4.5.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9"
+checksum = "0025e98baa12e766c67ba13ff4695a887a1eba19569aad00a472546795bd6730"
 dependencies = [
  "anstream",
  "anstyle",
@@ -486,9 +486,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.47"
+version = "4.5.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
+checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -633,7 +633,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -642,7 +642,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1007,7 +1007,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.61.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1093,7 +1093,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1262,20 +1262,20 @@ checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
  "r-efi",
- "wasi 0.14.7+wasi-0.2.4",
+ "wasip2",
  "wasm-bindgen",
 ]
 
@@ -1287,9 +1287,9 @@ checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
 [[package]]
 name = "globset"
-version = "0.4.16"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5"
+checksum = "eab69130804d941f8075cfd713bf8848a2c3b3f201a9457a11e6f87e1ab62305"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -1690,7 +1690,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1754,7 +1754,7 @@ dependencies = [
  "portable-atomic",
  "portable-atomic-util",
  "serde",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1789,7 +1789,7 @@ version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "libc",
 ]
 
@@ -2072,7 +2072,7 @@ checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
  "log",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
  "windows-sys 0.59.0",
 ]
 
@@ -2627,9 +2627,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
 dependencies = [
  "proc-macro2",
 ]
@@ -2724,7 +2724,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
 ]
 
 [[package]]
@@ -2767,6 +2767,26 @@ 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"
@@ -2781,9 +2801,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.11"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2815,7 +2835,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "anyhow",
  "argfile",
@@ -3072,7 +3092,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "aho-corasick",
  "anyhow",
@@ -3197,6 +3217,7 @@ dependencies = [
  "salsa",
  "schemars",
  "serde",
+ "serde_json",
  "thiserror 2.0.16",
 ]
 
@@ -3426,11 +3447,11 @@ dependencies = [
 
 [[package]]
 name = "ruff_wasm"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "js-sys",
  "log",
  "ruff_formatter",
@@ -3484,6 +3505,7 @@ dependencies = [
  "rustc-hash",
  "schemars",
  "serde",
+ "serde_json",
  "shellexpand",
  "strum",
  "tempfile",
@@ -3523,7 +3545,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.61.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3540,8 +3562,8 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "salsa"
-version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=29ab321b45d00daa4315fa2a06f7207759a8c87e#29ab321b45d00daa4315fa2a06f7207759a8c87e"
+version = "0.24.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=d38145c29574758de7ffbe8a13cd4584c3b09161#d38145c29574758de7ffbe8a13cd4584c3b09161"
 dependencies = [
  "boxcar",
  "compact_str",
@@ -3564,13 +3586,13 @@ dependencies = [
 
 [[package]]
 name = "salsa-macro-rules"
-version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=29ab321b45d00daa4315fa2a06f7207759a8c87e#29ab321b45d00daa4315fa2a06f7207759a8c87e"
+version = "0.24.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=d38145c29574758de7ffbe8a13cd4584c3b09161#d38145c29574758de7ffbe8a13cd4584c3b09161"
 
 [[package]]
 name = "salsa-macros"
-version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=29ab321b45d00daa4315fa2a06f7207759a8c87e#29ab321b45d00daa4315fa2a06f7207759a8c87e"
+version = "0.24.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=d38145c29574758de7ffbe8a13cd4584c3b09161#d38145c29574758de7ffbe8a13cd4584c3b09161"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3589,11 +3611,12 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "0.8.22"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615"
+checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
 dependencies = [
  "dyn-clone",
+ "ref-cast",
  "schemars_derive",
  "serde",
  "serde_json",
@@ -3601,9 +3624,9 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.22"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d"
+checksum = "33d020396d1d138dc19f1165df7545479dcd58d93810dc5d646a16e55abefa80"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3625,9 +3648,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
 
 [[package]]
 name = "serde"
-version = "1.0.226"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dca6411025b24b60bfa7ec1fe1f8e710ac09782dca409ee8237ba74b51295fd"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
  "serde_core",
  "serde_derive",
@@ -3646,18 +3669,18 @@ dependencies = [
 
 [[package]]
 name = "serde_core"
-version = "1.0.226"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba2ba63999edb9dac981fb34b3e5c0d111a69b0924e253ed29d83f7c99e966a4"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.226"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8db53ae22f34573731bafa1db20f04027b2d25e02d8205921b569171699cdb33"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3795,9 +3818,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "snapbox"
-version = "0.6.21"
+version = "0.6.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96dcfc4581e3355d70ac2ee14cfdf81dce3d85c85f1ed9e2c1d3013f53b3436b"
+checksum = "805d09a74586d9b17061e5be6ee5f8cc37e5982c349948114ffc5f68093fe5ec"
 dependencies = [
  "anstream",
  "anstyle",
@@ -3810,7 +3833,7 @@ dependencies = [
  "similar",
  "snapbox-macros",
  "wait-timeout",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -3915,10 +3938,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84fa4d11fadde498443cca10fd3ac23c951f0dc59e080e9f4b93d4df4e4eea53"
 dependencies = [
  "fastrand",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "once_cell",
  "rustix",
- "windows-sys 0.61.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4353,6 +4376,7 @@ dependencies = [
  "tracing",
  "ty_project",
  "ty_python_semantic",
+ "ty_vendored",
 ]
 
 [[package]]
@@ -4384,6 +4408,7 @@ dependencies = [
  "salsa",
  "schemars",
  "serde",
+ "serde_json",
  "thiserror 2.0.16",
  "toml",
  "tracing",
@@ -4409,10 +4434,12 @@ dependencies = [
  "glob",
  "hashbrown 0.16.0",
  "indexmap",
+ "indoc",
  "insta",
  "itertools 0.14.0",
  "memchr",
  "ordermap",
+ "pretty_assertions",
  "quickcheck",
  "quickcheck_macros",
  "ruff_annotate_snippets",
@@ -4431,6 +4458,7 @@ dependencies = [
  "salsa",
  "schemars",
  "serde",
+ "serde_json",
  "smallvec",
  "static_assertions",
  "strsim",
@@ -4479,7 +4507,6 @@ dependencies = [
  "ty_ide",
  "ty_project",
  "ty_python_semantic",
- "ty_vendored",
 ]
 
 [[package]]
@@ -4539,7 +4566,7 @@ version = "0.0.0"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "js-sys",
  "log",
  "ruff_db",
@@ -4732,7 +4759,7 @@ version = "1.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "js-sys",
  "rand 0.9.2",
  "uuid-macro-internal",
@@ -4844,15 +4871,6 @@ 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"
@@ -5004,7 +5022,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]

Cargo.toml

@@ -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 = "29ab321b45d00daa4315fa2a06f7207759a8c87e", default-features = false, features = [
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "d38145c29574758de7ffbe8a13cd4584c3b09161", default-features = false, features = [
     "compact_str",
     "macros",
     "salsa_unstable",
     "inventory",
 ] }
-schemars = { version = "0.8.16" }
+schemars = { version = "1.0.4" }
 seahash = { version = "4.1.0" }
 serde = { version = "1.0.197", features = ["derive"] }
 serde-wasm-bindgen = { version = "0.6.4" }

README.md

@@ -89,8 +89,7 @@ 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/astral-sh/ruff/issues/465#issuecomment-1317400028), lead
-developer of [Zulip](https://github.com/zulip/zulip):
+[**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)):
 
 > This is just ridiculously fast... `ruff` is amazing.
 
@@ -148,8 +147,8 @@ curl -LsSf https://astral.sh/ruff/install.sh | sh
 powershell -c "irm https://astral.sh/ruff/install.ps1 | iex"
 
 # For a specific version.
-curl -LsSf https://astral.sh/ruff/0.14.0/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.14.0/install.ps1 | iex"
+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"
 ```
 
 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -182,7 +181,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.14.0
+  rev: v0.14.1
   hooks:
     # Run the linter.
     - id: ruff-check

crates/ruff/Cargo.toml

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

crates/ruff/src/commands/format.rs

@@ -879,19 +879,7 @@ impl From<&FormatCommandError> for Diagnostic {
             | FormatCommandError::Write(_, source_error) => {
                 Diagnostic::new(DiagnosticId::Io, Severity::Error, source_error)
             }
-            FormatCommandError::Format(_, format_module_error) => match format_module_error {
-                FormatModuleError::ParseError(parse_error) => Diagnostic::new(
-                    DiagnosticId::InternalError,
-                    Severity::Error,
-                    &parse_error.error,
-                ),
-                FormatModuleError::FormatError(format_error) => {
-                    Diagnostic::new(DiagnosticId::InternalError, Severity::Error, format_error)
-                }
-                FormatModuleError::PrintError(print_error) => {
-                    Diagnostic::new(DiagnosticId::InternalError, Severity::Error, print_error)
-                }
-            },
+            FormatCommandError::Format(_, format_module_error) => format_module_error.into(),
             FormatCommandError::RangeFormatNotebook(_) => Diagnostic::new(
                 DiagnosticId::InvalidCliOption,
                 Severity::Error,

crates/ruff/src/commands/rule.rs

@@ -7,6 +7,7 @@ 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;
@@ -19,9 +20,11 @@ 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> {
@@ -36,8 +39,10 @@ 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,7 +13,6 @@ 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;
@@ -103,11 +102,7 @@ impl Diagnostics {
                 let name = path.map_or_else(|| "-".into(), Path::to_string_lossy);
                 let dummy = SourceFileBuilder::new(name, "").finish();
                 Self::new(
-                    vec![create_syntax_error_diagnostic(
-                        dummy,
-                        err,
-                        TextRange::default(),
-                    )],
+                    vec![Diagnostic::invalid_syntax(dummy, err, TextRange::default())],
                     FxHashMap::default(),
                 )
             }

crates/ruff/tests/cli/main.rs

@@ -15,6 +15,7 @@ use std::{
 };
 use tempfile::TempDir;
 
+mod format;
 mod lint;
 
 const BIN_NAME: &str = "ruff";
@@ -57,6 +58,16 @@ 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> {
@@ -174,4 +185,10 @@ impl CliTest {
 
         command
     }
+
+    pub(crate) fn format_command(&self) -> Command {
+        let mut command = self.command();
+        command.args(["format", "--no-cache"]);
+        command
+    }
 }

crates/ruff/tests/cli/snapshots/cli__format__output_format_azure.snap

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

crates/ruff/tests/cli/snapshots/cli__format__output_format_concise.snap

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

crates/ruff/tests/cli/snapshots/cli__format__output_format_full.snap

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

crates/ruff/tests/cli/snapshots/cli__format__output_format_github.snap

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

crates/ruff/tests/cli/snapshots/cli__format__output_format_gitlab.snap

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

crates/ruff/tests/cli/snapshots/cli__format__output_format_grouped.snap

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

crates/ruff/tests/cli/snapshots/cli__format__output_format_json-lines.snap

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

crates/ruff/tests/cli/snapshots/cli__format__output_format_json.snap

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

crates/ruff/tests/cli/snapshots/cli__format__output_format_junit.snap

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

crates/ruff/tests/cli/snapshots/cli__format__output_format_pylint.snap

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

crates/ruff/tests/cli/snapshots/cli__format__output_format_rdjson.snap

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

crates/ruff/tests/cli/snapshots/cli__format__output_format_sarif.snap

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

crates/ruff/tests/integration_test.rs

@@ -951,6 +951,16 @@ 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"
@@ -965,6 +975,34 @@ 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/integration_test__rule_f401_output_json.snap

@@ -0,0 +1,30 @@
+---
+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

@@ -0,0 +1,140 @@
+---
+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

@@ -667,7 +667,7 @@ fn attrs(criterion: &mut Criterion) {
             max_dep_date: "2025-06-17",
             python_version: PythonVersion::PY313,
         },
-        100,
+        110,
     );
 
     bench_project(&benchmark, criterion);
@@ -684,7 +684,7 @@ fn anyio(criterion: &mut Criterion) {
             max_dep_date: "2025-06-17",
             python_version: PythonVersion::PY313,
         },
-        100,
+        150,
     );
 
     bench_project(&benchmark, criterion);

crates/ruff_benchmark/benches/ty_walltime.rs

@@ -210,7 +210,7 @@ static TANJUN: Benchmark = Benchmark::new(
         max_dep_date: "2025-06-17",
         python_version: PythonVersion::PY312,
     },
-    100,
+    320,
 );
 
 static STATIC_FRAME: Benchmark = Benchmark::new(
@@ -226,7 +226,7 @@ static STATIC_FRAME: Benchmark = Benchmark::new(
         max_dep_date: "2025-08-09",
         python_version: PythonVersion::PY311,
     },
-    630,
+    750,
 );
 
 #[track_caller]

crates/ruff_db/src/diagnostic/mod.rs

@@ -84,17 +84,14 @@ 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, "");
+        let mut diag = Diagnostic::new(DiagnosticId::InvalidSyntax, Severity::Error, message);
         let span = span.into().with_range(range.range());
-        diag.annotate(Annotation::primary(span).message(message));
+        diag.annotate(Annotation::primary(span));
         diag
     }
 

crates/ruff_db/src/files.rs

@@ -193,6 +193,17 @@ 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,6 +81,8 @@ 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::schema_for;
+use schemars::generate::SchemaSettings;
 
 use crate::ROOT_DIR;
 use crate::generate_all::{Mode, REGENERATE_ALL_COMMAND};
@@ -17,7 +17,9 @@ pub(crate) struct Args {
 }
 
 pub(crate) fn main(args: &Args) -> Result<()> {
-    let schema = schema_for!(Options);
+    let settings = SchemaSettings::draft07();
+    let generator = settings.into_generator();
+    let schema = generator.into_root_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_schema.rs

@@ -3,7 +3,7 @@ use std::path::PathBuf;
 
 use anyhow::{Result, bail};
 use pretty_assertions::StrComparison;
-use schemars::schema_for;
+use schemars::generate::SchemaSettings;
 
 use crate::ROOT_DIR;
 use crate::generate_all::{Mode, REGENERATE_ALL_COMMAND};
@@ -17,7 +17,9 @@ pub(crate) struct Args {
 }
 
 pub(crate) fn main(args: &Args) -> Result<()> {
-    let schema = schema_for!(Options);
+    let settings = SchemaSettings::draft07();
+    let generator = settings.into_generator();
+    let schema = generator.into_root_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,6 +98,10 @@ 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.0"
+version = "0.14.1"
 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
+from airflow.datasets import DatasetAliasEvent, DatasetEvent
 from airflow.operators.postgres_operator import Mapping
 from airflow.operators.subdag import SubDagOperator
 from airflow.secrets.cache import SecretCache
@@ -48,6 +48,7 @@ AWSAthenaHook()
 
 # airflow.datasets
 DatasetAliasEvent()
+DatasetEvent()
 
 
 # airflow.operators.subdag.*

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

@@ -0,0 +1,87 @@
+"""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

@@ -256,3 +256,12 @@ async def f4():
 @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_bugbear/B905.py

@@ -1,12 +1,10 @@
 from itertools import count, cycle, repeat
 
 # Errors
-zip()
-zip(range(3))
 zip("a", "b")
 zip("a", "b", *zip("c"))
-zip(zip("a"), strict=False)
-zip(zip("a", strict=True))
+zip(zip("a", "b"), strict=False)
+zip(zip("a", strict=True),"b")
 
 # OK
 zip(range(3), strict=True)
@@ -27,3 +25,10 @@ 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,3 +31,6 @@ 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,3 +2,52 @@ _(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 +1,49 @@
 _("{}".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 +1,49 @@
 _("%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_pyi/PYI061.py

@@ -78,3 +78,11 @@ 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/SIM911.py

@@ -34,3 +34,7 @@ def foo():
 # https://github.com/astral-sh/ruff/issues/18776
 flag_stars = {}
 for country, stars in(zip)(flag_stars.keys(), flag_stars.values()):...
+
+# Regression test for https://github.com/astral-sh/ruff/issues/18778
+d = {}
+for country, stars in zip(d.keys(*x), d.values("hello")):...

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

@@ -0,0 +1,264 @@
+# 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

@@ -0,0 +1,372 @@
+# 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/UP032_0.py

@@ -269,3 +269,10 @@ 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/UP032_2.py

@@ -26,3 +26,8 @@
 "{.real}".format({1, 2})
 "{.real}".format({1: 2, 3: 4})
 "{}".format((i for i in range(2)))
+
+# https://github.com/astral-sh/ruff/issues/21017
+"{.real}".format(1_2)
+"{0.real}".format(1_2)
+"{a.real}".format(a=1_2)

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` should be skipped for now, added in Python 3.13
+# `default` was 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` should be skipped for now, added in Python 3.13
+# `default` was added in Python 3.13
 T = typing.TypeVar("T", default=Any)
-AnyList = TypeAliasType("AnyList", list[T], typep_params=(T,))
+AnyList = TypeAliasType("AnyList", list[T], type_params=(T,))
 
 # unsafe fix if comments within the fix
 T = TypeVar("T")
@@ -128,3 +128,7 @@ 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)
 
 
-# TODO(brent) default requires 3.13
+# default requires 3.13
 V = TypeVar("V", default=Any, bound=str)
 
 
@@ -130,6 +130,14 @@ 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,9 +44,7 @@ def any_str_param(s: AnyStr) -> AnyStr:
     return s
 
 
-# these cases are not handled
-
-# TODO(brent) default requires 3.13
+# default requires 3.13
 V = TypeVar("V", default=Any, bound=str)
 
 
@@ -54,6 +52,8 @@ 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,6 +81,7 @@ 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,6 +1034,7 @@ 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,15 +50,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pylint::rules::nonlocal_and_global(checker, nonlocal);
             }
         }
-        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

@@ -711,13 +711,21 @@ impl SemanticSyntaxContext for Checker<'_> {
                     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::GlobalParameter(_)
             | SemanticSyntaxErrorKind::DuplicateMatchKey(_)
             | SemanticSyntaxErrorKind::DuplicateMatchClassAttribute(_)
             | SemanticSyntaxErrorKind::InvalidStarExpression
@@ -839,6 +847,26 @@ impl SemanticSyntaxContext for Checker<'_> {
         }
         false
     }
+
+    fn is_bound_parameter(&self, name: &str) -> bool {
+        for scope in self.semantic.current_scopes() {
+            match scope.kind {
+                ScopeKind::Class(_) => return false,
+                ScopeKind::Function(ast::StmtFunctionDef { parameters, .. })
+                | ScopeKind::Lambda(ast::ExprLambda {
+                    parameters: Some(parameters),
+                    ..
+                }) => return parameters.includes(name),
+                ScopeKind::Lambda(_)
+                | ScopeKind::Generator { .. }
+                | ScopeKind::Module
+                | ScopeKind::Type
+                | ScopeKind::DunderClassCell => {}
+            }
+        }
+
+        false
+    }
 }
 
 impl<'a> Visitor<'a> for Checker<'a> {

crates/ruff_linter/src/checkers/noqa.rs

@@ -130,6 +130,7 @@ 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));
                     }
                 }
@@ -226,6 +227,7 @@ 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,6 +5,7 @@
 use std::fmt::Formatter;
 
 use ruff_db::diagnostic::SecondaryCode;
+use serde::Serialize;
 use strum_macros::EnumIter;
 
 use crate::registry::Linter;
@@ -74,7 +75,7 @@ impl serde::Serialize for NoqaCode {
     }
 }
 
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Copy, Clone, Serialize)]
 pub enum RuleGroup {
     /// The rule is stable.
     Stable,
@@ -988,6 +989,7 @@ 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/linter.rs

@@ -24,7 +24,6 @@ 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;
@@ -496,15 +495,15 @@ fn diagnostics_to_messages(
     parse_errors
         .iter()
         .map(|parse_error| {
-            create_syntax_error_diagnostic(source_file.clone(), &parse_error.error, parse_error)
+            Diagnostic::invalid_syntax(source_file.clone(), &parse_error.error, parse_error)
         })
         .chain(unsupported_syntax_errors.iter().map(|syntax_error| {
-            create_syntax_error_diagnostic(source_file.clone(), syntax_error, syntax_error)
+            Diagnostic::invalid_syntax(source_file.clone(), syntax_error, syntax_error)
         }))
         .chain(
             semantic_syntax_errors
                 .iter()
-                .map(|error| create_syntax_error_diagnostic(source_file.clone(), error, error)),
+                .map(|error| Diagnostic::invalid_syntax(source_file.clone(), error, error)),
         )
         .chain(diagnostics.into_iter().map(|mut diagnostic| {
             if let Some(range) = diagnostic.range() {
@@ -1041,6 +1040,42 @@ mod tests {
         PythonVersion::PY310,
         "DuplicateMatchKey"
     )]
+    #[test_case(
+        "global_parameter",
+        "
+        def f(a):
+            global a
+
+        def g(a):
+            if True:
+                global a 
+
+        def h(a):
+            def inner():
+                global a 
+
+        def i(a):
+            try:
+                global a 
+            except Exception:
+                pass
+
+        def f(a):
+            a = 1
+            global a
+        
+        def f(a):
+            a = 1
+            a = 2
+            global a
+        
+        def f(a):
+            class Inner:
+                global a   # ok
+        ",
+        PythonVersion::PY310,
+        "GlobalParameter"
+    )]
     #[test_case(
         "duplicate_match_class_attribute",
         "

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::{Ranged, TextRange, TextSize};
+use ruff_text_size::{TextRange, TextSize};
 pub use sarif::SarifEmitter;
 
 use crate::Fix;
@@ -26,24 +26,6 @@ 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(
@@ -260,8 +242,6 @@ 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
 
@@ -274,7 +254,7 @@ if call(foo
             .errors()
             .iter()
             .map(|parse_error| {
-                create_syntax_error_diagnostic(source_file.clone(), &parse_error.error, parse_error)
+                Diagnostic::invalid_syntax(source_file.clone(), &parse_error.error, parse_error)
             })
             .collect()
     }

crates/ruff_linter/src/preview.rs

@@ -242,6 +242,11 @@ 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,
@@ -269,3 +274,8 @@ pub(crate) const fn is_fix_write_whole_file_enabled(settings: &LinterSettings) -
 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,9 +257,8 @@ pub struct PreviewOptions {
 #[cfg(feature = "schemars")]
 mod schema {
     use itertools::Itertools;
-    use schemars::_serde_json::Value;
-    use schemars::JsonSchema;
-    use schemars::schema::{InstanceType, Schema, SchemaObject};
+    use schemars::{JsonSchema, Schema, SchemaGenerator};
+    use serde_json::Value;
     use strum::IntoEnumIterator;
 
     use crate::RuleSelector;
@@ -267,64 +266,65 @@ mod schema {
     use crate::rule_selector::{Linter, RuleCodePrefix};
 
     impl JsonSchema for RuleSelector {
-        fn schema_name() -> String {
-            "RuleSelector".to_string()
+        fn schema_name() -> std::borrow::Cow<'static, str> {
+            std::borrow::Cow::Borrowed("RuleSelector")
         }
 
-        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
-                        }
+        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}")
                     })
-                    .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()
+                    .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()
+            .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,6 +655,11 @@ 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,38 +104,49 @@ AIR301 `airflow.datasets.DatasetAliasEvent` is removed in Airflow 3.0
 49 | # airflow.datasets
 50 | DatasetAliasEvent()
    | ^^^^^^^^^^^^^^^^^
+51 | DatasetEvent()
    |
 
-AIR301 `airflow.operators.subdag.SubDagOperator` is removed in Airflow 3.0
-  --> AIR301_names.py:54:1
+AIR301 `airflow.datasets.DatasetEvent` is removed in Airflow 3.0
+  --> AIR301_names.py:51:1
    |
-53 | # airflow.operators.subdag.*
-54 | SubDagOperator()
+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
+   |
+54 | # airflow.operators.subdag.*
+55 | SubDagOperator()
    | ^^^^^^^^^^^^^^
-55 |
-56 | # airflow.operators.postgres_operator
+56 |
+57 | # 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:57:1
+  --> AIR301_names.py:58:1
    |
-56 | # airflow.operators.postgres_operator
-57 | Mapping()
+57 | # airflow.operators.postgres_operator
+58 | Mapping()
    | ^^^^^^^
-58 |
-59 | # airflow.secrets
+59 |
+60 | # airflow.secrets
    |
 
 AIR301 [*] `airflow.secrets.cache.SecretCache` is removed in Airflow 3.0
-  --> AIR301_names.py:64:1
+  --> AIR301_names.py:65:1
    |
-63 | # airflow.secrets.cache
-64 | SecretCache()
+64 | # airflow.secrets.cache
+65 | SecretCache()
    | ^^^^^^^^^^^
    |
 help: Use `SecretCache` from `airflow.sdk` instead.
-14 | from airflow.datasets import DatasetAliasEvent
+14 | from airflow.datasets import DatasetAliasEvent, DatasetEvent
 15 | from airflow.operators.postgres_operator import Mapping
 16 | from airflow.operators.subdag import SubDagOperator
    - from airflow.secrets.cache import SecretCache
@@ -153,211 +164,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:68:1
+  --> AIR301_names.py:69:1
    |
-67 | # airflow.triggers.external_task
-68 | TaskStateTrigger()
+68 | # airflow.triggers.external_task
+69 | TaskStateTrigger()
    | ^^^^^^^^^^^^^^^^
-69 |
-70 | # airflow.utils.date
+70 |
+71 | # airflow.utils.date
    |
 
 AIR301 `airflow.utils.dates.date_range` is removed in Airflow 3.0
-  --> AIR301_names.py:71:1
+  --> AIR301_names.py:72:1
    |
-70 | # airflow.utils.date
-71 | dates.date_range
+71 | # airflow.utils.date
+72 | dates.date_range
    | ^^^^^^^^^^^^^^^^
-72 | dates.days_ago
+73 | dates.days_ago
    |
 
 AIR301 `airflow.utils.dates.days_ago` is removed in Airflow 3.0
-  --> AIR301_names.py:72:1
+  --> AIR301_names.py:73:1
    |
-70 | # airflow.utils.date
-71 | dates.date_range
-72 | dates.days_ago
+71 | # airflow.utils.date
+72 | dates.date_range
+73 | dates.days_ago
    | ^^^^^^^^^^^^^^
-73 |
-74 | date_range
+74 |
+75 | 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:74:1
+  --> AIR301_names.py:75:1
    |
-72 | dates.days_ago
-73 |
-74 | date_range
+73 | dates.days_ago
+74 |
+75 | date_range
    | ^^^^^^^^^^
-75 | days_ago
-76 | infer_time_unit
+76 | days_ago
+77 | infer_time_unit
    |
 
 AIR301 `airflow.utils.dates.days_ago` is removed in Airflow 3.0
-  --> AIR301_names.py:75:1
+  --> AIR301_names.py:76:1
    |
-74 | date_range
-75 | days_ago
+75 | date_range
+76 | days_ago
    | ^^^^^^^^
-76 | infer_time_unit
-77 | parse_execution_date
+77 | infer_time_unit
+78 | 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:76:1
+  --> AIR301_names.py:77:1
    |
-74 | date_range
-75 | days_ago
-76 | infer_time_unit
+75 | date_range
+76 | days_ago
+77 | infer_time_unit
    | ^^^^^^^^^^^^^^^
-77 | parse_execution_date
-78 | round_time
+78 | parse_execution_date
+79 | round_time
    |
 
 AIR301 `airflow.utils.dates.parse_execution_date` is removed in Airflow 3.0
-  --> AIR301_names.py:77:1
+  --> AIR301_names.py:78:1
    |
-75 | days_ago
-76 | infer_time_unit
-77 | parse_execution_date
+76 | days_ago
+77 | infer_time_unit
+78 | parse_execution_date
    | ^^^^^^^^^^^^^^^^^^^^
-78 | round_time
-79 | scale_time_units
+79 | round_time
+80 | scale_time_units
    |
 
 AIR301 `airflow.utils.dates.round_time` is removed in Airflow 3.0
-  --> AIR301_names.py:78:1
+  --> AIR301_names.py:79:1
    |
-76 | infer_time_unit
-77 | parse_execution_date
-78 | round_time
+77 | infer_time_unit
+78 | parse_execution_date
+79 | round_time
    | ^^^^^^^^^^
-79 | scale_time_units
+80 | scale_time_units
    |
 
 AIR301 `airflow.utils.dates.scale_time_units` is removed in Airflow 3.0
-  --> AIR301_names.py:79:1
+  --> AIR301_names.py:80:1
    |
-77 | parse_execution_date
-78 | round_time
-79 | scale_time_units
+78 | parse_execution_date
+79 | round_time
+80 | scale_time_units
    | ^^^^^^^^^^^^^^^^
-80 |
-81 | # This one was not deprecated.
+81 |
+82 | # This one was not deprecated.
    |
 
 AIR301 `airflow.utils.dag_cycle_tester.test_cycle` is removed in Airflow 3.0
-  --> AIR301_names.py:86:1
+  --> AIR301_names.py:87:1
    |
-85 | # airflow.utils.dag_cycle_tester
-86 | test_cycle
+86 | # airflow.utils.dag_cycle_tester
+87 | test_cycle
    | ^^^^^^^^^^
    |
 
 AIR301 `airflow.utils.db.create_session` is removed in Airflow 3.0
-  --> AIR301_names.py:90:1
+  --> AIR301_names.py:91:1
    |
-89 | # airflow.utils.db
-90 | create_session
+90 | # airflow.utils.db
+91 | create_session
    | ^^^^^^^^^^^^^^
-91 |
-92 | # airflow.utils.decorators
+92 |
+93 | # airflow.utils.decorators
    |
 
 AIR301 `airflow.utils.decorators.apply_defaults` is removed in Airflow 3.0
-  --> AIR301_names.py:93:1
+  --> AIR301_names.py:94:1
    |
-92 | # airflow.utils.decorators
-93 | apply_defaults
+93 | # airflow.utils.decorators
+94 | apply_defaults
    | ^^^^^^^^^^^^^^
-94 |
-95 | # airflow.utils.file
+95 |
+96 | # 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:96:1
+  --> AIR301_names.py:97:1
    |
-95 | # airflow.utils.file
-96 | mkdirs
+96 | # airflow.utils.file
+97 | mkdirs
    | ^^^^^^
    |
 help: Use `pathlib.Path({path}).mkdir` instead
 
 AIR301 `airflow.utils.state.SHUTDOWN` is removed in Airflow 3.0
-   --> AIR301_names.py:100:1
+   --> AIR301_names.py:101:1
     |
- 99 | # airflow.utils.state
-100 | SHUTDOWN
+100 | # airflow.utils.state
+101 | SHUTDOWN
     | ^^^^^^^^
-101 | terminating_states
+102 | terminating_states
     |
 
 AIR301 `airflow.utils.state.terminating_states` is removed in Airflow 3.0
-   --> AIR301_names.py:101:1
+   --> AIR301_names.py:102:1
     |
- 99 | # airflow.utils.state
-100 | SHUTDOWN
-101 | terminating_states
+100 | # airflow.utils.state
+101 | SHUTDOWN
+102 | terminating_states
     | ^^^^^^^^^^^^^^^^^^
-102 |
-103 | #  airflow.utils.trigger_rule
+103 |
+104 | #  airflow.utils.trigger_rule
     |
 
 AIR301 `airflow.utils.trigger_rule.TriggerRule.DUMMY` is removed in Airflow 3.0
-   --> AIR301_names.py:104:1
+   --> AIR301_names.py:105:1
     |
-103 | #  airflow.utils.trigger_rule
-104 | TriggerRule.DUMMY
+104 | #  airflow.utils.trigger_rule
+105 | TriggerRule.DUMMY
     | ^^^^^^^^^^^^^^^^^
-105 | TriggerRule.NONE_FAILED_OR_SKIPPED
+106 | TriggerRule.NONE_FAILED_OR_SKIPPED
     |
 
 AIR301 `airflow.utils.trigger_rule.TriggerRule.NONE_FAILED_OR_SKIPPED` is removed in Airflow 3.0
-   --> AIR301_names.py:105:1
+   --> AIR301_names.py:106:1
     |
-103 | #  airflow.utils.trigger_rule
-104 | TriggerRule.DUMMY
-105 | TriggerRule.NONE_FAILED_OR_SKIPPED
+104 | #  airflow.utils.trigger_rule
+105 | TriggerRule.DUMMY
+106 | TriggerRule.NONE_FAILED_OR_SKIPPED
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 
 AIR301 `airflow.www.auth.has_access` is removed in Airflow 3.0
-   --> AIR301_names.py:109:1
+   --> AIR301_names.py:110:1
     |
-108 | # airflow.www.auth
-109 | has_access
+109 | # airflow.www.auth
+110 | has_access
     | ^^^^^^^^^^
-110 | has_access_dataset
+111 | has_access_dataset
     |
 
 AIR301 `airflow.www.auth.has_access_dataset` is removed in Airflow 3.0
-   --> AIR301_names.py:110:1
+   --> AIR301_names.py:111:1
     |
-108 | # airflow.www.auth
-109 | has_access
-110 | has_access_dataset
+109 | # airflow.www.auth
+110 | has_access
+111 | has_access_dataset
     | ^^^^^^^^^^^^^^^^^^
-111 |
-112 | # airflow.www.utils
+112 |
+113 | # airflow.www.utils
     |
 
 AIR301 `airflow.www.utils.get_sensitive_variables_fields` is removed in Airflow 3.0
-   --> AIR301_names.py:113:1
+   --> AIR301_names.py:114:1
     |
-112 | # airflow.www.utils
-113 | get_sensitive_variables_fields
+113 | # airflow.www.utils
+114 | get_sensitive_variables_fields
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-114 | should_hide_value_for_key
+115 | should_hide_value_for_key
     |
 
 AIR301 `airflow.www.utils.should_hide_value_for_key` is removed in Airflow 3.0
-   --> AIR301_names.py:114:1
+   --> AIR301_names.py:115:1
     |
-112 | # airflow.www.utils
-113 | get_sensitive_variables_fields
-114 | should_hide_value_for_key
+113 | # airflow.www.utils
+114 | get_sensitive_variables_fields
+115 | should_hide_value_for_key
     | ^^^^^^^^^^^^^^^^^^^^^^^^^
     |

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

@@ -18,6 +18,7 @@ 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());
@@ -56,6 +57,7 @@ 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,19 +275,42 @@ fn create_diagnostic(
                     .collect::<Vec<_>>()
                     .join(", ");
 
-                seen_default = true;
-                format!(
-                    "{parameter_name}: {binding}[{annotation}, {default_}({kwarg_list})] \
-                            = {default_value}",
+                // 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})]",
                     parameter_name = parameter.name,
                     annotation = checker.locator().slice(parameter.annotation.range()),
                     default_ = checker
                         .locator()
                         .slice(map_callable(parameter.default).range()),
-                    default_value = checker
+                );
+
+                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
                         .locator()
-                        .slice(dependency_call.default_argument.value().range()),
-                )
+                        .slice(dependency_call.default_argument.value().range());
+                    format!("{base_format} = {default_value}")
+                }
             }
             _ => {
                 if seen_default {

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

@@ -7,6 +7,7 @@ use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast as ast;
 use ruff_python_ast::{Arguments, Expr, ExprCall, ExprSubscript, Parameter, ParameterWithDefault};
 use ruff_python_semantic::{BindingKind, Modules, ScopeKind, SemanticModel};
+use ruff_python_stdlib::identifiers::is_identifier;
 use ruff_text_size::{Ranged, TextSize};
 
 use crate::Fix;
@@ -191,7 +192,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 {
+        if !is_positional && is_identifier(path_param) && path_param != "__debug__" {
             diagnostic.set_fix(Fix::unsafe_edit(add_parameter(
                 path_param,
                 &function_def.parameters,

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

@@ -0,0 +1,303 @@
+---
+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

@@ -0,0 +1,303 @@
+---
+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,3 +363,26 @@ 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_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.
+/// Checks for `map` calls without an explicit `strict` parameter when called with two or more iterables, or any starred argument.
 ///
 /// 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,7 +62,12 @@ 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()
-        && call.arguments.args.len() >= 3 // function + at least 2 iterables
+        && (
+            // 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)
+        )
         && !any_infinite_iterables(call.arguments.args.iter().skip(1), semantic)
     {
         checker

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.
+/// Checks for `zip` calls without an explicit `strict` parameter when called with two or more iterables, or any starred argument.
 ///
 /// ## Why is this bad?
 /// By default, if the iterables passed to `zip` are of different lengths, the
@@ -58,6 +58,12 @@ 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,204 +1,140 @@
 ---
 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()
-  | ^^^^^
-5 | zip(range(3))
-6 | zip("a", "b")
+4 | zip("a", "b")
+  | ^^^^^^^^^^^^^
+5 | zip("a", "b", *zip("c"))
+6 | zip(zip("a", "b"), strict=False)
   |
 help: Add explicit value for parameter `strict=`
 1 | from itertools import count, cycle, repeat
 2 | 
 3 | # Errors
-  - zip()
-4 + zip(strict=False)
-5 | zip(range(3))
-6 | zip("a", "b")
-7 | zip("a", "b", *zip("c"))
+  - 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")
 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()
-5 | zip(range(3))
-  | ^^^^^^^^^^^^^
-6 | zip("a", "b")
-7 | zip("a", "b", *zip("c"))
+4 | zip("a", "b")
+5 | zip("a", "b", *zip("c"))
+  | ^^^^^^^^^^^^^^^^^^^^^^^^
+6 | zip(zip("a", "b"), strict=False)
+7 | zip(zip("a", strict=True),"b")
   |
 help: Add explicit value for parameter `strict=`
 2 | 
 3 | # Errors
-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)
+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 | 
 note: This is an unsafe fix and may change runtime behavior
 
 B905 [*] `zip()` without an explicit `strict=` parameter
- --> B905.py:6:1
+ --> B905.py:6:5
   |
-4 | zip()
-5 | zip(range(3))
-6 | zip("a", "b")
-  | ^^^^^^^^^^^^^
-7 | zip("a", "b", *zip("c"))
-8 | zip(zip("a"), strict=False)
+4 | zip("a", "b")
+5 | zip("a", "b", *zip("c"))
+6 | zip(zip("a", "b"), strict=False)
+  |     ^^^^^^^^^^^^^
+7 | zip(zip("a", strict=True),"b")
   |
 help: Add explicit value for parameter `strict=`
 3 | # Errors
-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))
+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
 note: This is an unsafe fix and may change runtime behavior
 
 B905 [*] `zip()` without an explicit `strict=` parameter
  --> B905.py:7:1
   |
-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))
+5 | zip("a", "b", *zip("c"))
+6 | zip(zip("a", "b"), strict=False)
+7 | zip(zip("a", strict=True),"b")
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 |
+9 | # OK
   |
 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 | 
+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)
 note: This is an unsafe fix and may change runtime behavior
 
 B905 [*] `zip()` without an explicit `strict=` parameter
- --> 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
+  --> B905.py:22: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))
+21 | # Errors (limited iterators).
+22 | zip([1, 2, 3], repeat(1, 1))
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-25 | zip([1, 2, 3], repeat(1, times=4))
+23 | zip([1, 2, 3], repeat(1, times=4))
    |
 help: Add explicit value for parameter `strict=`
-21 | zip([1, 2, 3], repeat(1, times=None))
-22 | 
-23 | # Errors (limited iterators).
+19 | zip([1, 2, 3], repeat(1, times=None))
+20 | 
+21 | # Errors (limited iterators).
    - zip([1, 2, 3], repeat(1, 1))
-24 + zip([1, 2, 3], repeat(1, 1), strict=False)
-25 | zip([1, 2, 3], repeat(1, times=4))
-26 | 
-27 | import builtins
+22 + zip([1, 2, 3], repeat(1, 1), strict=False)
+23 | zip([1, 2, 3], repeat(1, times=4))
+24 | 
+25 | import builtins
 note: This is an unsafe fix and may change runtime behavior
 
 B905 [*] `zip()` without an explicit `strict=` parameter
-  --> B905.py:25:1
+  --> B905.py:23:1
    |
-23 | # Errors (limited iterators).
-24 | zip([1, 2, 3], repeat(1, 1))
-25 | zip([1, 2, 3], repeat(1, times=4))
+21 | # Errors (limited iterators).
+22 | zip([1, 2, 3], repeat(1, 1))
+23 | zip([1, 2, 3], repeat(1, times=4))
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-26 |
-27 | import builtins
+24 |
+25 | import builtins
    |
 help: Add explicit value for parameter `strict=`
-22 | 
-23 | # Errors (limited iterators).
-24 | zip([1, 2, 3], repeat(1, 1))
+20 | 
+21 | # Errors (limited iterators).
+22 | zip([1, 2, 3], repeat(1, 1))
    - zip([1, 2, 3], repeat(1, times=4))
-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
+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
 note: This is an unsafe fix and may change runtime behavior
 
 B905 [*] `zip()` without an explicit `strict=` parameter
-  --> B905.py:29:1
+  --> B905.py:34:1
    |
-27 | import builtins
-28 | # Still an error even though it uses the qualified name
-29 | builtins.zip([1, 2, 3])
-   | ^^^^^^^^^^^^^^^^^^^^^^^
+32 | zip(range(3))
+33 | # Error
+34 | zip(*lot_of_iterators)
+   | ^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Add explicit value for parameter `strict=`
-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)
+31 | zip()
+32 | zip(range(3))
+33 | # Error
+   - zip(*lot_of_iterators)
+34 + zip(*lot_of_iterators, 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__B912_B912.py.snap

@@ -1,6 +1,5 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
-assertion_line: 112
 ---
 B912 [*] `map()` without an explicit `strict=` parameter
  --> B912.py:5:1
@@ -147,3 +146,18 @@ 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_gettext/mod.rs

@@ -1,17 +1,50 @@
 //! Rules from [flake8-gettext](https://pypi.org/project/flake8-gettext/).
+use crate::checkers::ast::Checker;
+use crate::preview::is_extended_i18n_function_matching_enabled;
 use ruff_python_ast::name::Name;
 use ruff_python_ast::{self as ast, Expr};
+use ruff_python_semantic::Modules;
 
 pub(crate) mod rules;
 pub mod settings;
 
 /// Returns true if the [`Expr`] is an internationalization function call.
-pub(crate) fn is_gettext_func_call(func: &Expr, functions_names: &[Name]) -> bool {
-    if let Expr::Name(ast::ExprName { id, .. }) = func {
-        functions_names.contains(id)
-    } else {
-        false
+pub(crate) fn is_gettext_func_call(
+    checker: &Checker,
+    func: &Expr,
+    functions_names: &[Name],
+) -> bool {
+    if func
+        .as_name_expr()
+        .map(ast::ExprName::id)
+        .is_some_and(|id| functions_names.contains(id))
+    {
+        return true;
     }
+
+    if !is_extended_i18n_function_matching_enabled(checker.settings()) {
+        return false;
+    }
+
+    let semantic = checker.semantic();
+
+    let Some(qualified_name) = semantic.resolve_qualified_name(func) else {
+        return false;
+    };
+
+    if semantic.seen_module(Modules::BUILTINS)
+        && matches!(
+            qualified_name.segments(),
+            ["builtins", id] if functions_names.contains(&Name::new(id)),
+        )
+    {
+        return true;
+    }
+
+    matches!(
+        qualified_name.segments(),
+        ["gettext", "gettext" | "ngettext"]
+    )
 }
 
 #[cfg(test)]
@@ -22,6 +55,7 @@ mod tests {
     use test_case::test_case;
 
     use crate::registry::Rule;
+    use crate::settings::types::PreviewMode;
     use crate::test::test_path;
     use crate::{assert_diagnostics, settings};
 
@@ -37,4 +71,20 @@ mod tests {
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
+
+    #[test_case(Rule::FStringInGetTextFuncCall, Path::new("INT001.py"))]
+    #[test_case(Rule::FormatInGetTextFuncCall, Path::new("INT002.py"))]
+    #[test_case(Rule::PrintfInGetTextFuncCall, Path::new("INT003.py"))]
+    fn rules_preview(rule_code: Rule, path: &Path) -> Result<()> {
+        let snapshot = format!("preview__{}_{}", rule_code.name(), path.to_string_lossy());
+        let diagnostics = test_path(
+            Path::new("flake8_gettext").join(path).as_path(),
+            &settings::LinterSettings {
+                preview: PreviewMode::Enabled,
+                ..settings::LinterSettings::for_rule(rule_code)
+            },
+        )?;
+        assert_diagnostics!(snapshot, diagnostics);
+        Ok(())
+    }
 }

crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__f-string-in-get-text-func-call_INT001.py.snap

@@ -9,3 +9,85 @@ INT001 f-string is resolved before function call; consider `_("string %s") % arg
 2 |
 3 | # Don't trigger for t-strings
   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+ --> INT001.py:6:9
+  |
+4 | _(t"{'value'}")
+5 |
+6 | gettext(f"{'value'}")
+  |         ^^^^^^^^^^^^
+7 | ngettext(f"{'value'}", f"{'values'}", 2)
+  |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+ --> INT001.py:7:10
+  |
+6 | gettext(f"{'value'}")
+7 | ngettext(f"{'value'}", f"{'values'}", 2)
+  |          ^^^^^^^^^^^^
+8 |
+9 | _gettext(f"{'value'}")  # no lint
+  |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:31:14
+   |
+29 | def _(message): return message
+30 |
+31 | animals = [_(f"{'mollusk'}"),
+   |              ^^^^^^^^^^^^^^
+32 |            _(f"{'albatross'}"),
+33 |            _(f"{'rat'}"),
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:32:14
+   |
+31 | animals = [_(f"{'mollusk'}"),
+32 |            _(f"{'albatross'}"),
+   |              ^^^^^^^^^^^^^^^^
+33 |            _(f"{'rat'}"),
+34 |            _(f"{'penguin'}"),
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:33:14
+   |
+31 | animals = [_(f"{'mollusk'}"),
+32 |            _(f"{'albatross'}"),
+33 |            _(f"{'rat'}"),
+   |              ^^^^^^^^^^
+34 |            _(f"{'penguin'}"),
+35 |            _(f"{'python'}"),]
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:34:14
+   |
+32 |            _(f"{'albatross'}"),
+33 |            _(f"{'rat'}"),
+34 |            _(f"{'penguin'}"),
+   |              ^^^^^^^^^^^^^^
+35 |            _(f"{'python'}"),]
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:35:14
+   |
+33 |            _(f"{'rat'}"),
+34 |            _(f"{'penguin'}"),
+35 |            _(f"{'python'}"),]
+   |              ^^^^^^^^^^^^^
+36 |
+37 | del _
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:41:13
+   |
+39 | for a in animals:
+40 |     print(_(a))
+41 |     print(_(f"{a}"))
+   |             ^^^^^^
+   |

crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__format-in-get-text-func-call_INT002.py.snap

@@ -6,4 +6,88 @@ INT002 `format` method argument is resolved before function call; consider `_("s
   |
 1 | _("{}".format("line"))
   |   ^^^^^^^^^^^^^^^^^^^
+2 | gettext("{}".format("line"))
+3 | ngettext("{}".format("line"), "{}".format("lines"), 2)
   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+ --> INT002.py:2:9
+  |
+1 | _("{}".format("line"))
+2 | gettext("{}".format("line"))
+  |         ^^^^^^^^^^^^^^^^^^^
+3 | ngettext("{}".format("line"), "{}".format("lines"), 2)
+  |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+ --> INT002.py:3:10
+  |
+1 | _("{}".format("line"))
+2 | gettext("{}".format("line"))
+3 | ngettext("{}".format("line"), "{}".format("lines"), 2)
+  |          ^^^^^^^^^^^^^^^^^^^
+4 |
+5 | _gettext("{}".format("line"))  # no lint
+  |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:27:14
+   |
+25 | def _(message): return message
+26 |
+27 | animals = [_("{}".format("mollusk")),
+   |              ^^^^^^^^^^^^^^^^^^^^^^
+28 |            _("{}".format("albatross")),
+29 |            _("{}".format("rat")),
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:28:14
+   |
+27 | animals = [_("{}".format("mollusk")),
+28 |            _("{}".format("albatross")),
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^
+29 |            _("{}".format("rat")),
+30 |            _("{}".format("penguin")),
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:29:14
+   |
+27 | animals = [_("{}".format("mollusk")),
+28 |            _("{}".format("albatross")),
+29 |            _("{}".format("rat")),
+   |              ^^^^^^^^^^^^^^^^^^
+30 |            _("{}".format("penguin")),
+31 |            _("{}".format("python")),]
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:30:14
+   |
+28 |            _("{}".format("albatross")),
+29 |            _("{}".format("rat")),
+30 |            _("{}".format("penguin")),
+   |              ^^^^^^^^^^^^^^^^^^^^^^
+31 |            _("{}".format("python")),]
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:31:14
+   |
+29 |            _("{}".format("rat")),
+30 |            _("{}".format("penguin")),
+31 |            _("{}".format("python")),]
+   |              ^^^^^^^^^^^^^^^^^^^^^
+32 |
+33 | del _
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:37:13
+   |
+35 | for a in animals:
+36 |     print(_(a))
+37 |     print(_("{}".format(a)))
+   |             ^^^^^^^^^^^^^^
+   |

crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__preview__f-string-in-get-text-func-call_INT001.py.snap

@@ -0,0 +1,162 @@
+---
+source: crates/ruff_linter/src/rules/flake8_gettext/mod.rs
+---
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+ --> INT001.py:1:3
+  |
+1 | _(f"{'value'}")
+  |   ^^^^^^^^^^^^
+2 |
+3 | # Don't trigger for t-strings
+  |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+ --> INT001.py:6:9
+  |
+4 | _(t"{'value'}")
+5 |
+6 | gettext(f"{'value'}")
+  |         ^^^^^^^^^^^^
+7 | ngettext(f"{'value'}", f"{'values'}", 2)
+  |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+ --> INT001.py:7:10
+  |
+6 | gettext(f"{'value'}")
+7 | ngettext(f"{'value'}", f"{'values'}", 2)
+  |          ^^^^^^^^^^^^
+8 |
+9 | _gettext(f"{'value'}")  # no lint
+  |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:22:21
+   |
+20 | name = "Guido"
+21 |
+22 | gettext_mod.gettext(f"Hello, {name}!")
+   |                     ^^^^^^^^^^^^^^^^^
+23 | gettext_mod.ngettext(f"Hello, {name}!", f"Hello, {name}s!", 2)
+24 | gettext_fn(f"Hello, {name}!")
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:23:22
+   |
+22 | gettext_mod.gettext(f"Hello, {name}!")
+23 | gettext_mod.ngettext(f"Hello, {name}!", f"Hello, {name}s!", 2)
+   |                      ^^^^^^^^^^^^^^^^^
+24 | gettext_fn(f"Hello, {name}!")
+25 | ngettext_fn(f"Hello, {name}!", f"Hello, {name}s!", 2)
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:24:12
+   |
+22 | gettext_mod.gettext(f"Hello, {name}!")
+23 | gettext_mod.ngettext(f"Hello, {name}!", f"Hello, {name}s!", 2)
+24 | gettext_fn(f"Hello, {name}!")
+   |            ^^^^^^^^^^^^^^^^^
+25 | ngettext_fn(f"Hello, {name}!", f"Hello, {name}s!", 2)
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:25:13
+   |
+23 | gettext_mod.ngettext(f"Hello, {name}!", f"Hello, {name}s!", 2)
+24 | gettext_fn(f"Hello, {name}!")
+25 | ngettext_fn(f"Hello, {name}!", f"Hello, {name}s!", 2)
+   |             ^^^^^^^^^^^^^^^^^
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:31:14
+   |
+29 | def _(message): return message
+30 |
+31 | animals = [_(f"{'mollusk'}"),
+   |              ^^^^^^^^^^^^^^
+32 |            _(f"{'albatross'}"),
+33 |            _(f"{'rat'}"),
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:32:14
+   |
+31 | animals = [_(f"{'mollusk'}"),
+32 |            _(f"{'albatross'}"),
+   |              ^^^^^^^^^^^^^^^^
+33 |            _(f"{'rat'}"),
+34 |            _(f"{'penguin'}"),
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:33:14
+   |
+31 | animals = [_(f"{'mollusk'}"),
+32 |            _(f"{'albatross'}"),
+33 |            _(f"{'rat'}"),
+   |              ^^^^^^^^^^
+34 |            _(f"{'penguin'}"),
+35 |            _(f"{'python'}"),]
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:34:14
+   |
+32 |            _(f"{'albatross'}"),
+33 |            _(f"{'rat'}"),
+34 |            _(f"{'penguin'}"),
+   |              ^^^^^^^^^^^^^^
+35 |            _(f"{'python'}"),]
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:35:14
+   |
+33 |            _(f"{'rat'}"),
+34 |            _(f"{'penguin'}"),
+35 |            _(f"{'python'}"),]
+   |              ^^^^^^^^^^^^^
+36 |
+37 | del _
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:41:13
+   |
+39 | for a in animals:
+40 |     print(_(a))
+41 |     print(_(f"{a}"))
+   |             ^^^^^^
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:51:12
+   |
+49 | builtins.__dict__["gettext"] = gettext_fn
+50 |
+51 | builtins._(f"{'value'}")
+   |            ^^^^^^^^^^^^
+52 | builtins.gettext(f"{'value'}")
+53 | builtins.ngettext(f"{'value'}", f"{'values'}", 2)
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:52:18
+   |
+51 | builtins._(f"{'value'}")
+52 | builtins.gettext(f"{'value'}")
+   |                  ^^^^^^^^^^^^
+53 | builtins.ngettext(f"{'value'}", f"{'values'}", 2)
+   |
+
+INT001 f-string is resolved before function call; consider `_("string %s") % arg`
+  --> INT001.py:53:19
+   |
+51 | builtins._(f"{'value'}")
+52 | builtins.gettext(f"{'value'}")
+53 | builtins.ngettext(f"{'value'}", f"{'values'}", 2)
+   |                   ^^^^^^^^^^^^
+   |

crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__preview__format-in-get-text-func-call_INT002.py.snap

@@ -0,0 +1,162 @@
+---
+source: crates/ruff_linter/src/rules/flake8_gettext/mod.rs
+---
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+ --> INT002.py:1:3
+  |
+1 | _("{}".format("line"))
+  |   ^^^^^^^^^^^^^^^^^^^
+2 | gettext("{}".format("line"))
+3 | ngettext("{}".format("line"), "{}".format("lines"), 2)
+  |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+ --> INT002.py:2:9
+  |
+1 | _("{}".format("line"))
+2 | gettext("{}".format("line"))
+  |         ^^^^^^^^^^^^^^^^^^^
+3 | ngettext("{}".format("line"), "{}".format("lines"), 2)
+  |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+ --> INT002.py:3:10
+  |
+1 | _("{}".format("line"))
+2 | gettext("{}".format("line"))
+3 | ngettext("{}".format("line"), "{}".format("lines"), 2)
+  |          ^^^^^^^^^^^^^^^^^^^
+4 |
+5 | _gettext("{}".format("line"))  # no lint
+  |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:18:21
+   |
+16 | name = "Guido"
+17 |
+18 | gettext_mod.gettext("Hello, {}!".format(name))
+   |                     ^^^^^^^^^^^^^^^^^^^^^^^^^
+19 | gettext_mod.ngettext("Hello, {}!".format(name), "Hello, {}s!".format(name), 2)
+20 | gettext_fn("Hello, {}!".format(name))
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:19:22
+   |
+18 | gettext_mod.gettext("Hello, {}!".format(name))
+19 | gettext_mod.ngettext("Hello, {}!".format(name), "Hello, {}s!".format(name), 2)
+   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^
+20 | gettext_fn("Hello, {}!".format(name))
+21 | ngettext_fn("Hello, {}!".format(name), "Hello, {}s!".format(name), 2)
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:20:12
+   |
+18 | gettext_mod.gettext("Hello, {}!".format(name))
+19 | gettext_mod.ngettext("Hello, {}!".format(name), "Hello, {}s!".format(name), 2)
+20 | gettext_fn("Hello, {}!".format(name))
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^
+21 | ngettext_fn("Hello, {}!".format(name), "Hello, {}s!".format(name), 2)
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:21:13
+   |
+19 | gettext_mod.ngettext("Hello, {}!".format(name), "Hello, {}s!".format(name), 2)
+20 | gettext_fn("Hello, {}!".format(name))
+21 | ngettext_fn("Hello, {}!".format(name), "Hello, {}s!".format(name), 2)
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:27:14
+   |
+25 | def _(message): return message
+26 |
+27 | animals = [_("{}".format("mollusk")),
+   |              ^^^^^^^^^^^^^^^^^^^^^^
+28 |            _("{}".format("albatross")),
+29 |            _("{}".format("rat")),
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:28:14
+   |
+27 | animals = [_("{}".format("mollusk")),
+28 |            _("{}".format("albatross")),
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^
+29 |            _("{}".format("rat")),
+30 |            _("{}".format("penguin")),
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:29:14
+   |
+27 | animals = [_("{}".format("mollusk")),
+28 |            _("{}".format("albatross")),
+29 |            _("{}".format("rat")),
+   |              ^^^^^^^^^^^^^^^^^^
+30 |            _("{}".format("penguin")),
+31 |            _("{}".format("python")),]
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:30:14
+   |
+28 |            _("{}".format("albatross")),
+29 |            _("{}".format("rat")),
+30 |            _("{}".format("penguin")),
+   |              ^^^^^^^^^^^^^^^^^^^^^^
+31 |            _("{}".format("python")),]
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:31:14
+   |
+29 |            _("{}".format("rat")),
+30 |            _("{}".format("penguin")),
+31 |            _("{}".format("python")),]
+   |              ^^^^^^^^^^^^^^^^^^^^^
+32 |
+33 | del _
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:37:13
+   |
+35 | for a in animals:
+36 |     print(_(a))
+37 |     print(_("{}".format(a)))
+   |             ^^^^^^^^^^^^^^
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:47:12
+   |
+45 | builtins.__dict__["gettext"] = gettext_fn
+46 |
+47 | builtins._("{}".format("line"))
+   |            ^^^^^^^^^^^^^^^^^^^
+48 | builtins.gettext("{}".format("line"))
+49 | builtins.ngettext("{}".format("line"), "{}".format("lines"), 2)
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:48:18
+   |
+47 | builtins._("{}".format("line"))
+48 | builtins.gettext("{}".format("line"))
+   |                  ^^^^^^^^^^^^^^^^^^^
+49 | builtins.ngettext("{}".format("line"), "{}".format("lines"), 2)
+   |
+
+INT002 `format` method argument is resolved before function call; consider `_("string %s") % arg`
+  --> INT002.py:49:19
+   |
+47 | builtins._("{}".format("line"))
+48 | builtins.gettext("{}".format("line"))
+49 | builtins.ngettext("{}".format("line"), "{}".format("lines"), 2)
+   |                   ^^^^^^^^^^^^^^^^^^^
+   |

crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__preview__printf-in-get-text-func-call_INT003.py.snap

@@ -0,0 +1,162 @@
+---
+source: crates/ruff_linter/src/rules/flake8_gettext/mod.rs
+---
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+ --> INT003.py:1:3
+  |
+1 | _("%s" % "line")
+  |   ^^^^^^^^^^^^^
+2 | gettext("%s" % "line")
+3 | ngettext("%s" % "line", "%s" % "lines", 2)
+  |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+ --> INT003.py:2:9
+  |
+1 | _("%s" % "line")
+2 | gettext("%s" % "line")
+  |         ^^^^^^^^^^^^^
+3 | ngettext("%s" % "line", "%s" % "lines", 2)
+  |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+ --> INT003.py:3:10
+  |
+1 | _("%s" % "line")
+2 | gettext("%s" % "line")
+3 | ngettext("%s" % "line", "%s" % "lines", 2)
+  |          ^^^^^^^^^^^^^
+4 |
+5 | _gettext("%s" % "line")  # no lint
+  |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:18:21
+   |
+16 | name = "Guido"
+17 |
+18 | gettext_mod.gettext("Hello, %s!" % name)
+   |                     ^^^^^^^^^^^^^^^^^^^
+19 | gettext_mod.ngettext("Hello, %s!" % name, "Hello, %ss!" % name, 2)
+20 | gettext_fn("Hello, %s!" % name)
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:19:22
+   |
+18 | gettext_mod.gettext("Hello, %s!" % name)
+19 | gettext_mod.ngettext("Hello, %s!" % name, "Hello, %ss!" % name, 2)
+   |                      ^^^^^^^^^^^^^^^^^^^
+20 | gettext_fn("Hello, %s!" % name)
+21 | ngettext_fn("Hello, %s!" % name, "Hello, %ss!" % name, 2)
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:20:12
+   |
+18 | gettext_mod.gettext("Hello, %s!" % name)
+19 | gettext_mod.ngettext("Hello, %s!" % name, "Hello, %ss!" % name, 2)
+20 | gettext_fn("Hello, %s!" % name)
+   |            ^^^^^^^^^^^^^^^^^^^
+21 | ngettext_fn("Hello, %s!" % name, "Hello, %ss!" % name, 2)
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:21:13
+   |
+19 | gettext_mod.ngettext("Hello, %s!" % name, "Hello, %ss!" % name, 2)
+20 | gettext_fn("Hello, %s!" % name)
+21 | ngettext_fn("Hello, %s!" % name, "Hello, %ss!" % name, 2)
+   |             ^^^^^^^^^^^^^^^^^^^
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:27:14
+   |
+25 | def _(message): return message
+26 |
+27 | animals = [_("%s" %"mollusk"),
+   |              ^^^^^^^^^^^^^^^
+28 |            _("%s" %"albatross"),
+29 |            _("%s" %"rat"),
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:28:14
+   |
+27 | animals = [_("%s" %"mollusk"),
+28 |            _("%s" %"albatross"),
+   |              ^^^^^^^^^^^^^^^^^
+29 |            _("%s" %"rat"),
+30 |            _("%s" %"penguin"),
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:29:14
+   |
+27 | animals = [_("%s" %"mollusk"),
+28 |            _("%s" %"albatross"),
+29 |            _("%s" %"rat"),
+   |              ^^^^^^^^^^^
+30 |            _("%s" %"penguin"),
+31 |            _("%s" %"python"),]
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:30:14
+   |
+28 |            _("%s" %"albatross"),
+29 |            _("%s" %"rat"),
+30 |            _("%s" %"penguin"),
+   |              ^^^^^^^^^^^^^^^
+31 |            _("%s" %"python"),]
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:31:14
+   |
+29 |            _("%s" %"rat"),
+30 |            _("%s" %"penguin"),
+31 |            _("%s" %"python"),]
+   |              ^^^^^^^^^^^^^^
+32 |
+33 | del _
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:37:13
+   |
+35 | for a in animals:
+36 |     print(_(a))
+37 |     print(_("%s" % a))
+   |             ^^^^^^^^
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:47:12
+   |
+45 | builtins.__dict__["gettext"] = gettext_fn
+46 |
+47 | builtins._("%s" % "line")
+   |            ^^^^^^^^^^^^^
+48 | builtins.gettext("%s" % "line")
+49 | builtins.ngettext("%s" % "line", "%s" % "lines", 2)
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:48:18
+   |
+47 | builtins._("%s" % "line")
+48 | builtins.gettext("%s" % "line")
+   |                  ^^^^^^^^^^^^^
+49 | builtins.ngettext("%s" % "line", "%s" % "lines", 2)
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:49:19
+   |
+47 | builtins._("%s" % "line")
+48 | builtins.gettext("%s" % "line")
+49 | builtins.ngettext("%s" % "line", "%s" % "lines", 2)
+   |                   ^^^^^^^^^^^^^
+   |

crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linter__rules__flake8_gettext__tests__printf-in-get-text-func-call_INT003.py.snap

@@ -6,4 +6,88 @@ INT003 printf-style format is resolved before function call; consider `_("string
   |
 1 | _("%s" % "line")
   |   ^^^^^^^^^^^^^
+2 | gettext("%s" % "line")
+3 | ngettext("%s" % "line", "%s" % "lines", 2)
   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+ --> INT003.py:2:9
+  |
+1 | _("%s" % "line")
+2 | gettext("%s" % "line")
+  |         ^^^^^^^^^^^^^
+3 | ngettext("%s" % "line", "%s" % "lines", 2)
+  |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+ --> INT003.py:3:10
+  |
+1 | _("%s" % "line")
+2 | gettext("%s" % "line")
+3 | ngettext("%s" % "line", "%s" % "lines", 2)
+  |          ^^^^^^^^^^^^^
+4 |
+5 | _gettext("%s" % "line")  # no lint
+  |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:27:14
+   |
+25 | def _(message): return message
+26 |
+27 | animals = [_("%s" %"mollusk"),
+   |              ^^^^^^^^^^^^^^^
+28 |            _("%s" %"albatross"),
+29 |            _("%s" %"rat"),
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:28:14
+   |
+27 | animals = [_("%s" %"mollusk"),
+28 |            _("%s" %"albatross"),
+   |              ^^^^^^^^^^^^^^^^^
+29 |            _("%s" %"rat"),
+30 |            _("%s" %"penguin"),
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:29:14
+   |
+27 | animals = [_("%s" %"mollusk"),
+28 |            _("%s" %"albatross"),
+29 |            _("%s" %"rat"),
+   |              ^^^^^^^^^^^
+30 |            _("%s" %"penguin"),
+31 |            _("%s" %"python"),]
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:30:14
+   |
+28 |            _("%s" %"albatross"),
+29 |            _("%s" %"rat"),
+30 |            _("%s" %"penguin"),
+   |              ^^^^^^^^^^^^^^^
+31 |            _("%s" %"python"),]
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:31:14
+   |
+29 |            _("%s" %"rat"),
+30 |            _("%s" %"penguin"),
+31 |            _("%s" %"python"),]
+   |              ^^^^^^^^^^^^^^
+32 |
+33 | del _
+   |
+
+INT003 printf-style format is resolved before function call; consider `_("string %s") % arg`
+  --> INT003.py:37:13
+   |
+35 | for a in animals:
+36 |     print(_(a))
+37 |     print(_("%s" % a))
+   |             ^^^^^^^^
+   |

crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_none_literal.rs

@@ -4,6 +4,8 @@ use ruff_python_ast::{
     self as ast, Expr, ExprBinOp, ExprContext, ExprNoneLiteral, Operator, PythonVersion,
     helpers::{pep_604_union, typing_optional},
     name::Name,
+    operator_precedence::OperatorPrecedence,
+    parenthesize::parenthesized_range,
 };
 use ruff_python_semantic::analyze::typing::{traverse_literal, traverse_union};
 use ruff_text_size::{Ranged, TextRange};
@@ -238,7 +240,19 @@ fn create_fix(
                 node_index: ruff_python_ast::AtomicNodeIndex::NONE,
             });
             let union_expr = pep_604_union(&[new_literal_expr, none_expr]);
-            let content = checker.generator().expr(&union_expr);
+
+            // Check if we need parentheses to preserve operator precedence
+            let content = if needs_parentheses_for_precedence(
+                semantic,
+                literal_expr,
+                checker.comment_ranges(),
+                checker.source(),
+            ) {
+                format!("({})", checker.generator().expr(&union_expr))
+            } else {
+                checker.generator().expr(&union_expr)
+            };
+
             let union_edit = Edit::range_replacement(content, literal_expr.range());
             Fix::applicable_edit(union_edit, applicability)
         }
@@ -256,3 +270,37 @@ enum UnionKind {
     TypingOptional,
     BitOr,
 }
+
+/// Check if the union expression needs parentheses to preserve operator precedence.
+/// This is needed when the union is part of a larger expression where the `|` operator
+/// has lower precedence than the surrounding operations (like attribute access).
+fn needs_parentheses_for_precedence(
+    semantic: &ruff_python_semantic::SemanticModel,
+    literal_expr: &Expr,
+    comment_ranges: &ruff_python_trivia::CommentRanges,
+    source: &str,
+) -> bool {
+    // Get the parent expression to check if we're in a context that needs parentheses
+    let Some(parent_expr) = semantic.current_expression_parent() else {
+        return false;
+    };
+
+    // Check if the literal expression is already parenthesized
+    if parenthesized_range(
+        literal_expr.into(),
+        parent_expr.into(),
+        comment_ranges,
+        source,
+    )
+    .is_some()
+    {
+        return false; // Already parenthesized, don't add more
+    }
+
+    // Check if the parent expression has higher precedence than the `|` operator
+    let union_precedence = OperatorPrecedence::BitOr;
+    let parent_precedence = OperatorPrecedence::from(parent_expr);
+
+    // If the parent operation has higher precedence than `|`, we need parentheses
+    parent_precedence > union_precedence
+}

crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI061_PYI061.py.snap

@@ -423,5 +423,117 @@ PYI061 Use `None` rather than `Literal[None]`
 79 | d: None | (Literal[None] | None)
 80 | e: None | ((None | Literal[None]) | None) | None
    |                            ^^^^
+81 |
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
    |
 help: Replace with `None`
+
+PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
+  --> PYI061.py:83:18
+   |
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+   |                  ^^^^
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+   |
+help: Replace with `Literal[...] | None`
+80 | e: None | ((None | Literal[None]) | None) | None
+81 | 
+82 | # 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__
+83 + print((Literal[1] | None).__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+
+PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
+  --> PYI061.py:84:18
+   |
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+   |                  ^^^^
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+   |
+help: Replace with `Literal[...] | None`
+81 | 
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+   - print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+84 + print((Literal[1] | None).method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+
+PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
+  --> PYI061.py:85:18
+   |
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+   |                  ^^^^
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+   |
+help: Replace with `Literal[...] | None`
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+   - print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+85 + print((Literal[1] | None)[0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+
+PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
+  --> PYI061.py:86:18
+   |
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+   |                  ^^^^
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+   |
+help: Replace with `Literal[...] | None`
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+   - print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+86 + print((Literal[1] | None) + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+
+PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
+  --> PYI061.py:87:18
+   |
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+   |                  ^^^^
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+   |
+help: Replace with `Literal[...] | None`
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+   - print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+87 + print((Literal[1] | None) * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+
+PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 
+  --> PYI061.py:88:19
+   |
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+   |                   ^^^^
+   |
+help: Replace with `Literal[...] | None`
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+   - print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+88 + print((Literal[1] | None).__dict__)  # Should become ((Literal[1] | None)).__dict__

crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI061_PYI061.py.snap

@@ -465,5 +465,153 @@ PYI061 Use `None` rather than `Literal[None]`
 79 | d: None | (Literal[None] | None)
 80 | e: None | ((None | Literal[None]) | None) | None
    |                            ^^^^
+81 |
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
    |
 help: Replace with `None`
+
+PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 
+  --> PYI061.py:83:18
+   |
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+   |                  ^^^^
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+   |
+help: Replace with `Optional[Literal[...]]`
+   - from typing import Literal, Union
+1  + from typing import Literal, Union, Optional
+2  | 
+3  | 
+4  | def func1(arg1: Literal[None]):
+--------------------------------------------------------------------------------
+80 | e: None | ((None | Literal[None]) | None) | None
+81 | 
+82 | # 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__
+83 + print(Optional[Literal[1]].__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+
+PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 
+  --> PYI061.py:84:18
+   |
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+   |                  ^^^^
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+   |
+help: Replace with `Optional[Literal[...]]`
+   - from typing import Literal, Union
+1  + from typing import Literal, Union, Optional
+2  | 
+3  | 
+4  | def func1(arg1: Literal[None]):
+--------------------------------------------------------------------------------
+81 | 
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+   - print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+84 + print(Optional[Literal[1]].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+
+PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 
+  --> PYI061.py:85:18
+   |
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+   |                  ^^^^
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+   |
+help: Replace with `Optional[Literal[...]]`
+   - from typing import Literal, Union
+1  + from typing import Literal, Union, Optional
+2  | 
+3  | 
+4  | def func1(arg1: Literal[None]):
+--------------------------------------------------------------------------------
+82 | # Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+   - print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+85 + print(Optional[Literal[1]][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+
+PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 
+  --> PYI061.py:86:18
+   |
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+   |                  ^^^^
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+   |
+help: Replace with `Optional[Literal[...]]`
+   - from typing import Literal, Union
+1  + from typing import Literal, Union, Optional
+2  | 
+3  | 
+4  | def func1(arg1: Literal[None]):
+--------------------------------------------------------------------------------
+83 | print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+   - print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+86 + print(Optional[Literal[1]] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+
+PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 
+  --> PYI061.py:87:18
+   |
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+   |                  ^^^^
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+   |
+help: Replace with `Optional[Literal[...]]`
+   - from typing import Literal, Union
+1  + from typing import Literal, Union, Optional
+2  | 
+3  | 
+4  | def func1(arg1: Literal[None]):
+--------------------------------------------------------------------------------
+84 | print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+   - print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+87 + print(Optional[Literal[1]] * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+
+PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 
+  --> PYI061.py:88:19
+   |
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+88 | print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+   |                   ^^^^
+   |
+help: Replace with `Optional[Literal[...]]`
+   - from typing import Literal, Union
+1  + from typing import Literal, Union, Optional
+2  | 
+3  | 
+4  | def func1(arg1: Literal[None]):
+--------------------------------------------------------------------------------
+85 | print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
+86 | print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
+87 | print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
+   - print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__
+88 + print((Optional[Literal[1]]).__dict__)  # Should become ((Literal[1] | None)).__dict__

crates/ruff_linter/src/rules/flake8_simplify/rules/zip_dict_keys_and_values.rs

@@ -78,13 +78,18 @@ pub(crate) fn zip_dict_keys_and_values(checker: &Checker, expr: &ast::ExprCall)
     let [arg1, arg2] = &args[..] else {
         return;
     };
-    let Some((var1, attr1)) = get_var_attr(arg1) else {
+    let Some((var1, attr1, args1)) = get_var_attr_args(arg1) else {
         return;
     };
-    let Some((var2, attr2)) = get_var_attr(arg2) else {
+    let Some((var2, attr2, args2)) = get_var_attr_args(arg2) else {
         return;
     };
-    if var1.id != var2.id || attr1 != "keys" || attr2 != "values" {
+    if var1.id != var2.id
+        || attr1 != "keys"
+        || attr2 != "values"
+        || !args1.is_empty()
+        || !args2.is_empty()
+    {
         return;
     }
     if !checker.semantic().match_builtin_expr(func, "zip") {
@@ -122,8 +127,11 @@ pub(crate) fn zip_dict_keys_and_values(checker: &Checker, expr: &ast::ExprCall)
     )));
 }
 
-fn get_var_attr(expr: &Expr) -> Option<(&ExprName, &Identifier)> {
-    let Expr::Call(ast::ExprCall { func, .. }) = expr else {
+fn get_var_attr_args(expr: &Expr) -> Option<(&ExprName, &Identifier, &Arguments)> {
+    let Expr::Call(ast::ExprCall {
+        func, arguments, ..
+    }) = expr
+    else {
         return None;
     };
     let Expr::Attribute(ExprAttribute { value, attr, .. }) = func.as_ref() else {
@@ -132,5 +140,5 @@ fn get_var_attr(expr: &Expr) -> Option<(&ExprName, &Identifier)> {
     let Expr::Name(var_name) = value.as_ref() else {
         return None;
     };
-    Some((var_name, attr))
+    Some((var_name, attr, arguments))
 }

crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM911_SIM911.py.snap

@@ -81,6 +81,8 @@ SIM911 [*] Use ` flag_stars.items()` instead of `(zip)(flag_stars.keys(), flag_s
 35 | flag_stars = {}
 36 | for country, stars in(zip)(flag_stars.keys(), flag_stars.values()):...
    |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+37 |
+38 | # Regression test for https://github.com/astral-sh/ruff/issues/18778
    |
 help: Replace `(zip)(flag_stars.keys(), flag_stars.values())` with ` flag_stars.items()`
 33 | 
@@ -88,3 +90,6 @@ help: Replace `(zip)(flag_stars.keys(), flag_stars.values())` with ` flag_stars.
 35 | flag_stars = {}
    - for country, stars in(zip)(flag_stars.keys(), flag_stars.values()):...
 36 + for country, stars in flag_stars.items():...
+37 | 
+38 | # Regression test for https://github.com/astral-sh/ruff/issues/18778
+39 | d = {}