Fix stack overflow with recursive generic protocols

This fixes https://github.com/astral-sh/ty/issues/1736 where recursive
generic protocols with growing specializations caused a stack overflow.

The issue occurred with protocols like:
```python
class C[T](Protocol):
    a: 'C[set[T]]'
```

When checking `C[set[int]]` against `C[Unknown]`, member `a` requires
checking `C[set[set[int]]]`, which requires `C[set[set[set[int]]]]`,
etc. Each level has different type specializations, so the existing
cycle detection (using full types as cache keys) didn't catch the
infinite recursion.

The fix introduces `TypeRelationKey`, an enum that can be either a full
`Type` or a `ClassLiteral` (protocol class without specialization). For
protocol-to-protocol comparisons, we use `ClassLiteral` keys, which
detects when we're comparing the same protocol class regardless of
specialization. When a cycle is detected, we return the fallback value
(assume compatible) to safely terminate the recursion.

.github/mypy-primer-ty.toml

@@ -4,6 +4,5 @@
 # Enable off-by-default rules.
 [rules]
 possibly-unresolved-reference = "warn"
-possibly-missing-import = "warn"
 unused-ignore-comment = "warn"
 division-by-zero = "warn"

.github/workflows/ci.yaml

@@ -298,7 +298,7 @@ jobs:
       # sync, not just public items. Eventually we should do this for all
       # crates; for now add crates here as they are warning-clean to prevent
       # regression.
-      - run: cargo doc --no-deps -p ty_python_semantic -p ty -p ty_test -p ruff_db -p ruff_python_formatter --document-private-items
+      - run: cargo doc --no-deps -p ty_python_semantic -p ty -p ty_test -p ruff_db --document-private-items
         env:
           # Setting RUSTDOCFLAGS because `cargo doc --check` isn't yet implemented (https://github.com/rust-lang/cargo/issues/10025).
           RUSTDOCFLAGS: "-D warnings"

.github/workflows/mypy_primer.yaml

@@ -47,7 +47,6 @@ jobs:
 
       - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
         with:
-          shared-key: "mypy-primer"
           workspaces: "ruff"
 
       - name: Install Rust toolchain
@@ -87,7 +86,6 @@ jobs:
       - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
         with:
           workspaces: "ruff"
-          shared-key: "mypy-primer"
 
       - name: Install Rust toolchain
         run: rustup show
@@ -107,54 +105,3 @@ jobs:
         with:
           name: mypy_primer_memory_diff
           path: mypy_primer_memory.diff
-
-  # Runs mypy twice against the same ty version to catch any non-deterministic behavior (ideally).
-  # The job is disabled for now because there are some non-deterministic diagnostics.
-  mypy_primer_same_revision:
-    name: Run mypy_primer on same revision
-    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
-    timeout-minutes: 20
-    # TODO: Enable once we fixed the non-deterministic diagnostics
-    if: false
-    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          path: ruff
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
-
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
-        with:
-          workspaces: "ruff"
-          shared-key: "mypy-primer"
-
-      - name: Install Rust toolchain
-        run: rustup show
-
-      - name: Run determinism check
-        env:
-          BASE_REVISION: ${{ github.event.pull_request.head.sha }}
-          PRIMER_SELECTOR: crates/ty_python_semantic/resources/primer/good.txt
-          CLICOLOR_FORCE: "1"
-          DIFF_FILE: mypy_primer_determinism.diff
-        run: |
-          cd ruff
-          scripts/mypy_primer.sh
-
-      - name: Check for non-determinism
-        run: |
-          # Remove ANSI color codes for checking
-          sed -e 's/\x1b\[[0-9;]*m//g' mypy_primer_determinism.diff > mypy_primer_determinism_clean.diff
-
-          # Check if there are any differences (non-determinism)
-          if [ -s mypy_primer_determinism_clean.diff ]; then
-            echo "ERROR: Non-deterministic output detected!"
-            echo "The following differences were found when running ty twice on the same commit:"
-            cat mypy_primer_determinism_clean.diff
-            exit 1
-          else
-            echo "✓ Output is deterministic"
-          fi

.github/workflows/release.yml

@@ -60,7 +60,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
         with:
           persist-credentials: false
           submodules: recursive
@@ -123,7 +123,7 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
         with:
           persist-credentials: false
           submodules: recursive
@@ -174,7 +174,7 @@ jobs:
     outputs:
       val: ${{ steps.host.outputs.manifest }}
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
         with:
           persist-credentials: false
           submodules: recursive
@@ -250,7 +250,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
         with:
           persist-credentials: false
           submodules: recursive

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

@@ -67,7 +67,7 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@2e1816eac09c90140b1ba51d19afc5f59da460f5"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@55df3c868f3fa9ab34cff0498dd6106722aac205"
 
           ecosystem-analyzer \
             --repository ruff \

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

@@ -52,7 +52,7 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@2e1816eac09c90140b1ba51d19afc5f59da460f5"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@55df3c868f3fa9ab34cff0498dd6106722aac205"
 
           ecosystem-analyzer \
             --verbose \

CHANGELOG.md

@@ -1,96 +1,5 @@
 # Changelog
 
-## 0.14.10
-
-Released on 2025-12-18.
-
-### Preview features
-
-- [formatter] Fluent formatting of method chains ([#21369](https://github.com/astral-sh/ruff/pull/21369))
-- [formatter] Keep lambda parameters on one line and parenthesize the body if it expands ([#21385](https://github.com/astral-sh/ruff/pull/21385))
-- \[`flake8-implicit-str-concat`\] New rule to prevent implicit string concatenation in collections (`ISC004`) ([#21972](https://github.com/astral-sh/ruff/pull/21972))
-- \[`flake8-use-pathlib`\] Make fixes unsafe when types change in compound statements (`PTH104`, `PTH105`, `PTH109`, `PTH115`) ([#22009](https://github.com/astral-sh/ruff/pull/22009))
-- \[`refurb`\] Extend support for `Path.open` (`FURB101`, `FURB103`) ([#21080](https://github.com/astral-sh/ruff/pull/21080))
-
-### Bug fixes
-
-- \[`pyupgrade`\] Fix parsing named Unicode escape sequences (`UP032`) ([#21901](https://github.com/astral-sh/ruff/pull/21901))
-
-### Rule changes
-
-- \[`eradicate`\] Ignore `ruff:disable` and `ruff:enable` comments in `ERA001` ([#22038](https://github.com/astral-sh/ruff/pull/22038))
-- \[`flake8-pytest-style`\] Allow `match` and `check` keyword arguments without an expected exception type (`PT010`) ([#21964](https://github.com/astral-sh/ruff/pull/21964))
-- [syntax-errors] Annotated name cannot be global ([#20868](https://github.com/astral-sh/ruff/pull/20868))
-
-### Documentation
-
-- Add `uv` and `ty` to the Ruff README ([#21996](https://github.com/astral-sh/ruff/pull/21996))
-- Document known lambda formatting deviations from Black ([#21954](https://github.com/astral-sh/ruff/pull/21954))
-- Update `setup.md` ([#22024](https://github.com/astral-sh/ruff/pull/22024))
-- \[`flake8-bandit`\] Fix broken link (`S704`) ([#22039](https://github.com/astral-sh/ruff/pull/22039))
-
-### Other changes
-
-- Fix playground Share button showing "Copied!" before clipboard copy completes ([#21942](https://github.com/astral-sh/ruff/pull/21942))
-
-### Contributors
-
-- [@dylwil3](https://github.com/dylwil3)
-- [@charliecloudberry](https://github.com/charliecloudberry)
-- [@charliermarsh](https://github.com/charliermarsh)
-- [@chirizxc](https://github.com/chirizxc)
-- [@ntBre](https://github.com/ntBre)
-- [@zanieb](https://github.com/zanieb)
-- [@amyreese](https://github.com/amyreese)
-- [@hauntsaninja](https://github.com/hauntsaninja)
-- [@11happy](https://github.com/11happy)
-- [@mahiro72](https://github.com/mahiro72)
-- [@MichaReiser](https://github.com/MichaReiser)
-- [@phongddo](https://github.com/phongddo)
-- [@PeterJCLaw](https://github.com/PeterJCLaw)
-
-## 0.14.9
-
-Released on 2025-12-11.
-
-### Preview features
-
-- \[`ruff`\] New `RUF100` diagnostics for unused range suppressions ([#21783](https://github.com/astral-sh/ruff/pull/21783))
-- \[`pylint`\] Detect subclasses of builtin exceptions (`PLW0133`) ([#21382](https://github.com/astral-sh/ruff/pull/21382))
-
-### Bug fixes
-
-- Fix comment placement in lambda parameters ([#21868](https://github.com/astral-sh/ruff/pull/21868))
-- Skip over trivia tokens after re-lexing ([#21895](https://github.com/astral-sh/ruff/pull/21895))
-- \[`flake8-bandit`\] Fix false positive when using non-standard `CSafeLoader` path (S506). ([#21830](https://github.com/astral-sh/ruff/pull/21830))
-- \[`flake8-bugbear`\] Accept immutable slice default arguments (`B008`) ([#21823](https://github.com/astral-sh/ruff/pull/21823))
-
-### Rule changes
-
-- \[`pydocstyle`\] Suppress `D417` for parameters with `Unpack` annotations ([#21816](https://github.com/astral-sh/ruff/pull/21816))
-
-### Performance
-
-- Use `memchr` for computing line indexes ([#21838](https://github.com/astral-sh/ruff/pull/21838))
-
-### Documentation
-
-- Document `*.pyw` is included by default in preview ([#21885](https://github.com/astral-sh/ruff/pull/21885))
-- Document range suppressions, reorganize suppression docs ([#21884](https://github.com/astral-sh/ruff/pull/21884))
-- Update mkdocs-material to 9.7.0 (Insiders now free) ([#21797](https://github.com/astral-sh/ruff/pull/21797))
-
-### Contributors
-
-- [@Avasam](https://github.com/Avasam)
-- [@MichaReiser](https://github.com/MichaReiser)
-- [@charliermarsh](https://github.com/charliermarsh)
-- [@amyreese](https://github.com/amyreese)
-- [@phongddo](https://github.com/phongddo)
-- [@prakhar1144](https://github.com/prakhar1144)
-- [@mahiro72](https://github.com/mahiro72)
-- [@ntBre](https://github.com/ntBre)
-- [@LoicRiegel](https://github.com/LoicRiegel)
-
 ## 0.14.8
 
 Released on 2025-12-04.

Cargo.lock

@@ -254,21 +254,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "bit-set"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
-dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -959,18 +944,6 @@ dependencies = [
  "parking_lot_core",
 ]
 
-[[package]]
-name = "datatest-stable"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a867d7322eb69cf3a68a5426387a25b45cb3b9c5ee41023ee6cea92e2afadd82"
-dependencies = [
- "camino",
- "fancy-regex",
- "libtest-mimic 0.8.1",
- "walkdir",
-]
-
 [[package]]
 name = "derive-where"
 version = "1.6.0"
@@ -1004,6 +977,27 @@ dependencies = [
  "crypto-common",
 ]
 
+[[package]]
+name = "dir-test"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62c013fe825864f3e4593f36426c1fa7a74f5603f13ca8d1af7a990c1cd94a79"
+dependencies = [
+ "dir-test-macros",
+]
+
+[[package]]
+name = "dir-test-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d42f54d7b4a6bc2400fe5b338e35d1a335787585375322f49c5d5fe7b243da7e"
+dependencies = [
+ "glob",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "dirs"
 version = "6.0.0"
@@ -1022,7 +1016,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.61.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1114,7 +1108,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1144,17 +1138,6 @@ dependencies = [
  "windows-sys 0.61.0",
 ]
 
-[[package]]
-name = "fancy-regex"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e24cb5a94bcae1e5408b0effca5cd7172ea3c5755049c5f3af4cd283a165298"
-dependencies = [
- "bit-set",
- "regex-automata",
- "regex-syntax",
-]
-
 [[package]]
 name = "fastrand"
 version = "2.3.0"
@@ -1255,9 +1238,9 @@ dependencies = [
 
 [[package]]
 name = "get-size-derive2"
-version = "0.7.3"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab21d7bd2c625f2064f04ce54bcb88bc57c45724cde45cba326d784e22d3f71a"
+checksum = "ff47daa61505c85af126e9dd64af6a342a33dc0cccfe1be74ceadc7d352e6efd"
 dependencies = [
  "attribute-derive",
  "quote",
@@ -1266,15 +1249,14 @@ dependencies = [
 
 [[package]]
 name = "get-size2"
-version = "0.7.3"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879272b0de109e2b67b39fcfe3d25fdbba96ac07e44a254f5a0b4d7ff55340cb"
+checksum = "ac7bb8710e1f09672102be7ddf39f764d8440ae74a9f4e30aaa4820dcdffa4af"
 dependencies = [
  "compact_str",
  "get-size-derive2",
  "hashbrown 0.16.1",
  "indexmap",
- "ordermap",
  "smallvec",
 ]
 
@@ -1642,6 +1624,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46fdb647ebde000f43b5b53f773c30cf9b0cb4300453208713fa38b2c70935a0"
 dependencies = [
  "console 0.15.11",
+ "globset",
  "once_cell",
  "pest",
  "pest_derive",
@@ -1649,6 +1632,7 @@ dependencies = [
  "ron",
  "serde",
  "similar",
+ "walkdir",
 ]
 
 [[package]]
@@ -1779,7 +1763,7 @@ dependencies = [
  "portable-atomic",
  "portable-atomic-util",
  "serde_core",
- "windows-sys 0.61.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1934,18 +1918,6 @@ dependencies = [
  "threadpool",
 ]
 
-[[package]]
-name = "libtest-mimic"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5297962ef19edda4ce33aaa484386e0a5b3d7f2f4e037cbeee00503ef6b29d33"
-dependencies = [
- "anstream",
- "anstyle",
- "clap",
- "escape8259",
-]
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.11.0"
@@ -2261,9 +2233,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "ordermap"
-version = "1.0.0"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed637741ced8fb240855d22a2b4f208dab7a06bcce73380162e5253000c16758"
+checksum = "b100f7dd605611822d30e182214d3c02fdefce2d801d23993f6b6ba6ca1392af"
 dependencies = [
  "indexmap",
  "serde",
@@ -2887,7 +2859,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.14.10"
+version = "0.14.8"
 dependencies = [
  "anyhow",
  "argfile",
@@ -3145,7 +3117,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.14.10"
+version = "0.14.8"
 dependencies = [
  "aho-corasick",
  "anyhow",
@@ -3305,7 +3277,6 @@ dependencies = [
  "anyhow",
  "clap",
  "countme",
- "datatest-stable",
  "insta",
  "itertools 0.14.0",
  "memchr",
@@ -3375,10 +3346,8 @@ dependencies = [
  "bitflags 2.10.0",
  "bstr",
  "compact_str",
- "datatest-stable",
  "get-size2",
  "insta",
- "itertools 0.14.0",
  "memchr",
  "ruff_annotate_snippets",
  "ruff_python_ast",
@@ -3504,7 +3473,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_wasm"
-version = "0.14.10"
+version = "0.14.8"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
@@ -3602,7 +3571,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.61.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3620,7 +3589,7 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 [[package]]
 name = "salsa"
 version = "0.24.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=55e5e7d32fa3fc189276f35bb04c9438f9aedbd1#55e5e7d32fa3fc189276f35bb04c9438f9aedbd1"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=59aa1075e837f5deb0d6ffb24b68fedc0f4bc5e0#59aa1075e837f5deb0d6ffb24b68fedc0f4bc5e0"
 dependencies = [
  "boxcar",
  "compact_str",
@@ -3631,7 +3600,6 @@ dependencies = [
  "indexmap",
  "intrusive-collections",
  "inventory",
- "ordermap",
  "parking_lot",
  "portable-atomic",
  "rustc-hash",
@@ -3645,12 +3613,12 @@ dependencies = [
 [[package]]
 name = "salsa-macro-rules"
 version = "0.24.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=55e5e7d32fa3fc189276f35bb04c9438f9aedbd1#55e5e7d32fa3fc189276f35bb04c9438f9aedbd1"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=59aa1075e837f5deb0d6ffb24b68fedc0f4bc5e0#59aa1075e837f5deb0d6ffb24b68fedc0f4bc5e0"
 
 [[package]]
 name = "salsa-macros"
 version = "0.24.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=55e5e7d32fa3fc189276f35bb04c9438f9aedbd1#55e5e7d32fa3fc189276f35bb04c9438f9aedbd1"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=59aa1075e837f5deb0d6ffb24b68fedc0f4bc5e0#59aa1075e837f5deb0d6ffb24b68fedc0f4bc5e0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4004,7 +3972,7 @@ dependencies = [
  "getrandom 0.3.4",
  "once_cell",
  "rustix",
- "windows-sys 0.61.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4340,7 +4308,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5fe242ee9e646acec9ab73a5c540e8543ed1b107f0ce42be831e0775d423c396"
 dependencies = [
  "ignore",
- "libtest-mimic 0.7.3",
+ "libtest-mimic",
  "snapbox",
 ]
 
@@ -4369,7 +4337,6 @@ dependencies = [
  "ruff_python_trivia",
  "salsa",
  "tempfile",
- "tikv-jemallocator",
  "toml",
  "tracing",
  "tracing-flame",
@@ -4492,7 +4459,7 @@ dependencies = [
  "camino",
  "colored 3.0.0",
  "compact_str",
- "datatest-stable",
+ "dir-test",
  "drop_bomb",
  "get-size2",
  "glob",
@@ -5059,7 +5026,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.59.0",
 ]
 
 [[package]]

Cargo.toml

@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.package]
 # Please update rustfmt.toml when bumping the Rust edition
 edition = "2024"
-rust-version = "1.90"
+rust-version = "1.89"
 homepage = "https://docs.astral.sh/ruff"
 documentation = "https://docs.astral.sh/ruff"
 repository = "https://github.com/astral-sh/ruff"
@@ -81,14 +81,14 @@ compact_str = "0.9.0"
 criterion = { version = "0.7.0", default-features = false }
 crossbeam = { version = "0.8.4" }
 dashmap = { version = "6.0.1" }
-datatest-stable = { version = "0.3.3" }
+dir-test = { version = "0.4.0" }
 dunce = { version = "1.0.5" }
 drop_bomb = { version = "0.1.5" }
 etcetera = { version = "0.11.0" }
 fern = { version = "0.7.0" }
 filetime = { version = "0.2.23" }
 getrandom = { version = "0.3.1" }
-get-size2 = { version = "0.7.3", features = [
+get-size2 = { version = "0.7.0", features = [
     "derive",
     "smallvec",
     "hashbrown",
@@ -129,7 +129,7 @@ memchr = { version = "2.7.1" }
 mimalloc = { version = "0.1.39" }
 natord = { version = "1.0.9" }
 notify = { version = "8.0.0" }
-ordermap = { version = "1.0.0" }
+ordermap = { version = "0.5.0" }
 path-absolutize = { version = "3.1.1" }
 path-slash = { version = "0.2.1" }
 pathdiff = { version = "0.2.1" }
@@ -146,7 +146,7 @@ regex-automata = { version = "0.4.9" }
 rustc-hash = { version = "2.0.0" }
 rustc-stable-hash = { version = "0.1.2" }
 # When updating salsa, make sure to also update the revision in `fuzz/Cargo.toml`
-salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "55e5e7d32fa3fc189276f35bb04c9438f9aedbd1", default-features = false, features = [
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "59aa1075e837f5deb0d6ffb24b68fedc0f4bc5e0", default-features = false, features = [
     "compact_str",
     "macros",
     "salsa_unstable",

README.md

@@ -57,11 +57,8 @@ Ruff is extremely actively developed and used in major open-source projects like
 
 ...and [many more](#whos-using-ruff).
 
-Ruff is backed by [Astral](https://astral.sh), the creators of
-[uv](https://github.com/astral-sh/uv) and [ty](https://github.com/astral-sh/ty).
-
-Read the [launch post](https://astral.sh/blog/announcing-astral-the-company-behind-ruff), or the
-original [project announcement](https://notes.crmarsh.com/python-tooling-could-be-much-much-faster).
+Ruff is backed by [Astral](https://astral.sh). Read the [launch post](https://astral.sh/blog/announcing-astral-the-company-behind-ruff),
+or the original [project announcement](https://notes.crmarsh.com/python-tooling-could-be-much-much-faster).
 
 ## Testimonials
 
@@ -150,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.10/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.14.10/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.14.8/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.14.8/install.ps1 | iex"
 ```
 
 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -184,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.10
+  rev: v0.14.8
   hooks:
     # Run the linter.
     - id: ruff-check

_typos.toml

@@ -4,7 +4,6 @@ extend-exclude = [
     "crates/ty_vendored/vendor/**/*",
     "**/resources/**/*",
     "**/snapshots/**/*",
-    "crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/collection_literal.rs",
     # Completion tests tend to have a lot of incomplete
     # words naturally. It's annoying to have to make all
     # of them actually words. So just ignore typos here.

crates/ruff/Cargo.toml

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

crates/ruff/src/args.rs

@@ -10,7 +10,7 @@ use anyhow::bail;
 use clap::builder::Styles;
 use clap::builder::styling::{AnsiColor, Effects};
 use clap::builder::{TypedValueParser, ValueParserFactory};
-use clap::{Parser, Subcommand};
+use clap::{Parser, Subcommand, command};
 use colored::Colorize;
 use itertools::Itertools;
 use path_absolutize::path_dedot;

crates/ruff/src/lib.rs

@@ -9,7 +9,7 @@ use std::sync::mpsc::channel;
 use anyhow::Result;
 use clap::CommandFactory;
 use colored::Colorize;
-use log::error;
+use log::{error, warn};
 use notify::{RecursiveMode, Watcher, recommended_watcher};
 
 use args::{GlobalConfigArgs, ServerCommand};

crates/ruff_benchmark/benches/ty_walltime.rs

@@ -194,7 +194,7 @@ static SYMPY: Benchmark = Benchmark::new(
         max_dep_date: "2025-06-17",
         python_version: PythonVersion::PY312,
     },
-    13100,
+    13000,
 );
 
 static TANJUN: Benchmark = Benchmark::new(
@@ -223,7 +223,7 @@ static STATIC_FRAME: Benchmark = Benchmark::new(
         max_dep_date: "2025-08-09",
         python_version: PythonVersion::PY311,
     },
-    1100,
+    950,
 );
 
 #[track_caller]

crates/ruff_db/src/system/test.rs

@@ -1,6 +1,5 @@
 use glob::PatternError;
 use ruff_notebook::{Notebook, NotebookError};
-use rustc_hash::FxHashMap;
 use std::panic::RefUnwindSafe;
 use std::sync::{Arc, Mutex};
 
@@ -21,44 +20,18 @@ use super::walk_directory::WalkDirectoryBuilder;
 ///
 /// ## Warning
 /// Don't use this system for production code. It's intended for testing only.
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct TestSystem {
     inner: Arc<dyn WritableSystem + RefUnwindSafe + Send + Sync>,
-    /// Environment variable overrides. If a key is present here, it takes precedence
-    /// over the inner system's environment variables.
-    env_overrides: Arc<Mutex<FxHashMap<String, Option<String>>>>,
-}
-
-impl Clone for TestSystem {
-    fn clone(&self) -> Self {
-        Self {
-            inner: self.inner.clone(),
-            env_overrides: self.env_overrides.clone(),
-        }
-    }
 }
 
 impl TestSystem {
     pub fn new(inner: impl WritableSystem + RefUnwindSafe + Send + Sync + 'static) -> Self {
         Self {
             inner: Arc::new(inner),
-            env_overrides: Arc::new(Mutex::new(FxHashMap::default())),
         }
     }
 
-    /// Sets an environment variable override. This takes precedence over the inner system.
-    pub fn set_env_var(&self, name: impl Into<String>, value: impl Into<String>) {
-        self.env_overrides
-            .lock()
-            .unwrap()
-            .insert(name.into(), Some(value.into()));
-    }
-
-    /// Removes an environment variable override, making it appear as not set.
-    pub fn remove_env_var(&self, name: impl Into<String>) {
-        self.env_overrides.lock().unwrap().insert(name.into(), None);
-    }
-
     /// Returns the [`InMemorySystem`].
     ///
     /// ## Panics
@@ -174,18 +147,6 @@ impl System for TestSystem {
         self.system().case_sensitivity()
     }
 
-    fn env_var(&self, name: &str) -> std::result::Result<String, std::env::VarError> {
-        // Check overrides first
-        if let Some(override_value) = self.env_overrides.lock().unwrap().get(name) {
-            return match override_value {
-                Some(value) => Ok(value.clone()),
-                None => Err(std::env::VarError::NotPresent),
-            };
-        }
-        // Fall back to inner system
-        self.system().env_var(name)
-    }
-
     fn dyn_clone(&self) -> Box<dyn System> {
         Box::new(self.clone())
     }
@@ -195,7 +156,6 @@ impl Default for TestSystem {
     fn default() -> Self {
         Self {
             inner: Arc::new(InMemorySystem::default()),
-            env_overrides: Arc::new(Mutex::new(FxHashMap::default())),
         }
     }
 }

crates/ruff_dev/src/generate_ty_options.rs

@@ -144,8 +144,8 @@ fn emit_field(output: &mut String, name: &str, field: &OptionField, parents: &[S
     output.push('\n');
 
     if let Some(deprecated) = &field.deprecated {
-        output.push_str("!!! warning \"Deprecated\"\n");
-        output.push_str("    This option has been deprecated");
+        output.push_str("> [!WARN] \"Deprecated\"\n");
+        output.push_str("> This option has been deprecated");
 
         if let Some(since) = deprecated.since {
             write!(output, " in {since}").unwrap();
@@ -166,9 +166,8 @@ fn emit_field(output: &mut String, name: &str, field: &OptionField, parents: &[S
     output.push('\n');
     let _ = writeln!(output, "**Type**: `{}`", field.value_type);
     output.push('\n');
-    output.push_str("**Example usage**:\n\n");
+    output.push_str("**Example usage** (`pyproject.toml`):\n\n");
     output.push_str(&format_example(
-        "pyproject.toml",
         &format_header(
             field.scope,
             field.example,
@@ -180,11 +179,11 @@ fn emit_field(output: &mut String, name: &str, field: &OptionField, parents: &[S
     output.push('\n');
 }
 
-fn format_example(title: &str, header: &str, content: &str) -> String {
+fn format_example(header: &str, content: &str) -> String {
     if header.is_empty() {
-        format!("```toml title=\"{title}\"\n{content}\n```\n",)
+        format!("```toml\n{content}\n```\n",)
     } else {
-        format!("```toml title=\"{title}\"\n{header}\n{content}\n```\n",)
+        format!("```toml\n{header}\n{content}\n```\n",)
     }
 }
 

crates/ruff_dev/src/generate_ty_rules.rs

@@ -119,7 +119,7 @@ fn generate_markdown() -> String {
         let _ = writeln!(
             &mut output,
             r#"<small>
-Default level: <a href="../../rules#rule-levels" title="This lint has a default level of '{level}'."><code>{level}</code></a> ·
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of '{level}'."><code>{level}</code></a> ·
 {status_text} ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20{encoded_name}" target="_blank">Related issues</a> ·
 <a href="https://github.com/astral-sh/ruff/blob/main/{file}#L{line}" target="_blank">View source</a>

crates/ruff_diagnostics/src/edit.rs

@@ -39,7 +39,7 @@ impl Edit {
 
     /// Creates an edit that replaces the content in `range` with `content`.
     pub fn range_replacement(content: String, range: TextRange) -> Self {
-        debug_assert!(!content.is_empty(), "Prefer `Edit::deletion`");
+        debug_assert!(!content.is_empty(), "Prefer `Fix::deletion`");
 
         Self {
             content: Some(Box::from(content)),

crates/ruff_formatter/src/macros.rs

@@ -337,7 +337,7 @@ macro_rules! best_fitting {
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
-    use crate::{FormatState, SimpleFormatOptions, VecBuffer};
+    use crate::{FormatState, SimpleFormatOptions, VecBuffer, write};
 
     struct TestFormat;
 
@@ -385,8 +385,8 @@ mod tests {
 
     #[test]
     fn best_fitting_variants_print_as_lists() {
-        use crate::Formatted;
         use crate::prelude::*;
+        use crate::{Formatted, format, format_args};
 
         // The second variant below should be selected when printing at a width of 30
         let formatted_best_fitting = format!(

crates/ruff_linter/Cargo.toml

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

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

@@ -1,66 +0,0 @@
-facts = (
-    "Lobsters have blue blood.",
-    "The liver is the only human organ that can fully regenerate itself.",
-    "Clarinets are made almost entirely out of wood from the mpingo tree."
-    "In 1971, astronaut Alan Shepard played golf on the moon.",
-)
-
-facts = [
-    "Lobsters have blue blood.",
-    "The liver is the only human organ that can fully regenerate itself.",
-    "Clarinets are made almost entirely out of wood from the mpingo tree."
-    "In 1971, astronaut Alan Shepard played golf on the moon.",
-]
-
-facts = {
-    "Lobsters have blue blood.",
-    "The liver is the only human organ that can fully regenerate itself.",
-    "Clarinets are made almost entirely out of wood from the mpingo tree."
-    "In 1971, astronaut Alan Shepard played golf on the moon.",
-}
-
-facts = {
-    (
-        "Clarinets are made almost entirely out of wood from the mpingo tree."
-        "In 1971, astronaut Alan Shepard played golf on the moon."
-    ),
-}
-
-facts = (
-    "Octopuses have three hearts."
-    # Missing comma here.
-    "Honey never spoils.",
-)
-
-facts = [
-    "Octopuses have three hearts."
-    # Missing comma here.
-    "Honey never spoils.",
-]
-
-facts = {
-    "Octopuses have three hearts."
-    # Missing comma here.
-    "Honey never spoils.",
-}
-
-facts = (
-    (
-        "Clarinets are made almost entirely out of wood from the mpingo tree."
-        "In 1971, astronaut Alan Shepard played golf on the moon."
-    ),
-)
-
-facts = [
-    (
-        "Clarinets are made almost entirely out of wood from the mpingo tree."
-        "In 1971, astronaut Alan Shepard played golf on the moon."
-    ),
-]
-
-facts = (
-    "Lobsters have blue blood.\n"
-    "The liver is the only human organ that can fully regenerate itself.\n"
-    "Clarinets are made almost entirely out of wood from the mpingo tree.\n"
-    "In 1971, astronaut Alan Shepard played golf on the moon.\n"
-)

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

@@ -9,15 +9,3 @@ def test_ok():
 def test_error():
     with pytest.raises(UnicodeError):
         pass
-
-def test_match_only():
-    with pytest.raises(match="some error message"):
-        pass
-
-def test_check_only():
-    with pytest.raises(check=lambda e: True):
-        pass
-
-def test_match_and_check():
-    with pytest.raises(match="some error message", check=lambda e: True):
-        pass

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

@@ -136,38 +136,4 @@ os.chmod("pth1_file", 0o700, None, True, 1, *[1], **{"x": 1}, foo=1)
 os.rename("pth1_file", "pth1_file1", None, None, 1, *[1], **{"x": 1}, foo=1)
 os.replace("pth1_file1", "pth1_file", None, None, 1, *[1], **{"x": 1}, foo=1)
 
-os.path.samefile("pth1_file", "pth1_link", 1, *[1], **{"x": 1}, foo=1)
-
-# See: https://github.com/astral-sh/ruff/issues/21794
-import sys
-
-if os.rename("pth1.py", "pth1.py.bak"):
-    print("rename: truthy")
-else:
-    print("rename: falsey")
-
-if os.replace("pth1.py.bak", "pth1.py"):
-    print("replace: truthy")
-else:
-    print("replace: falsey")
-
-try:
-    for _ in os.getcwd():
-        print("getcwd: iterable")
-        break
-except TypeError as e:
-    print("getcwd: not iterable")
-
-try:
-    for _ in os.getcwdb():
-        print("getcwdb: iterable")
-        break
-except TypeError as e:
-    print("getcwdb: not iterable")
-
-try:
-    for _ in os.readlink(sys.executable):
-        print("readlink: iterable")
-        break
-except TypeError as e:
-    print("readlink: not iterable")
+os.path.samefile("pth1_file", "pth1_link", 1, *[1], **{"x": 1}, foo=1)

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

@@ -2,40 +2,15 @@ from abc import ABC, abstractmethod
 from contextlib import suppress
 
 
-class MyError(Exception):
-    ...
-
-
-class MySubError(MyError):
-    ...
-
-
-class MyValueError(ValueError):
-    ...
-
-
-class MyUserWarning(UserWarning):
-    ...
-
-
-# Violation test cases with builtin errors: PLW0133
-
-
 # Test case 1: Useless exception statement
 def func():
     AssertionError("This is an assertion error")  # PLW0133
-    MyError("This is a custom error")  # PLW0133
-    MySubError("This is a custom error")  # PLW0133
-    MyValueError("This is a custom value error")  # PLW0133
 
 
 # Test case 2: Useless exception statement in try-except block
 def func():
     try:
         Exception("This is an exception")  # PLW0133
-        MyError("This is an exception")  # PLW0133
-        MySubError("This is an exception")  # PLW0133
-        MyValueError("This is an exception")  # PLW0133
     except Exception as err:
         pass
 
@@ -44,9 +19,6 @@ def func():
 def func():
     if True:
         RuntimeError("This is an exception")  # PLW0133
-        MyError("This is an exception")  # PLW0133
-        MySubError("This is an exception")  # PLW0133
-        MyValueError("This is an exception")  # PLW0133
 
 
 # Test case 4: Useless exception statement in class
@@ -54,18 +26,12 @@ def func():
     class Class:
         def __init__(self):
             TypeError("This is an exception")  # PLW0133
-            MyError("This is an exception")  # PLW0133
-            MySubError("This is an exception")  # PLW0133
-            MyValueError("This is an exception")  # PLW0133
 
 
 # Test case 5: Useless exception statement in function
 def func():
     def inner():
         IndexError("This is an exception")  # PLW0133
-        MyError("This is an exception")  # PLW0133
-        MySubError("This is an exception")  # PLW0133
-        MyValueError("This is an exception")  # PLW0133
 
     inner()
 
@@ -74,9 +40,6 @@ def func():
 def func():
     while True:
         KeyError("This is an exception")  # PLW0133
-        MyError("This is an exception")  # PLW0133
-        MySubError("This is an exception")  # PLW0133
-        MyValueError("This is an exception")  # PLW0133
 
 
 # Test case 7: Useless exception statement in abstract class
@@ -85,58 +48,27 @@ def func():
         @abstractmethod
         def method(self):
             NotImplementedError("This is an exception")  # PLW0133
-            MyError("This is an exception")  # PLW0133
-            MySubError("This is an exception")  # PLW0133
-            MyValueError("This is an exception")  # PLW0133
 
 
 # Test case 8: Useless exception statement inside context manager
 def func():
-    with suppress(Exception):
+    with suppress(AttributeError):
         AttributeError("This is an exception")  # PLW0133
-        MyError("This is an exception")  # PLW0133
-        MySubError("This is an exception")  # PLW0133
-        MyValueError("This is an exception")  # PLW0133
 
 
 # Test case 9: Useless exception statement in parentheses
 def func():
     (RuntimeError("This is an exception"))  # PLW0133
-    (MyError("This is an exception"))  # PLW0133
-    (MySubError("This is an exception"))  # PLW0133
-    (MyValueError("This is an exception"))  # PLW0133
 
 
 # Test case 10: Useless exception statement in continuation
 def func():
     x = 1; (RuntimeError("This is an exception")); y = 2  # PLW0133
-    x = 1; (MyError("This is an exception")); y = 2  # PLW0133
-    x = 1; (MySubError("This is an exception")); y = 2  # PLW0133
-    x = 1; (MyValueError("This is an exception")); y = 2  # PLW0133
 
 
 # Test case 11: Useless warning statement
 def func():
-    UserWarning("This is a user warning")  # PLW0133
-    MyUserWarning("This is a custom user warning")  # PLW0133
-
-
-# Test case 12: Useless exception statement at module level
-import builtins
-
-builtins.TypeError("still an exception even though it's an Attribute")  # PLW0133
-
-PythonFinalizationError("Added in Python 3.13")  # PLW0133
-
-MyError("This is an exception")  # PLW0133
-
-MySubError("This is an exception")  # PLW0133
-
-MyValueError("This is an exception")  # PLW0133
-
-UserWarning("This is a user warning")  # PLW0133
-
-MyUserWarning("This is a custom user warning")  # PLW0133
+    UserWarning("This is an assertion error")  # PLW0133
 
 
 # Non-violation test cases: PLW0133
@@ -187,3 +119,10 @@ def func():
 def func():
     with suppress(AttributeError):
         raise AttributeError("This is an exception")  # OK
+
+
+import builtins
+
+builtins.TypeError("still an exception even though it's an Attribute")
+
+PythonFinalizationError("Added in Python 3.13")

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

@@ -132,6 +132,7 @@ async def c():
 # Non-errors
 ###
 
+# False-negative: RustPython doesn't parse the `\N{snowman}`.
 "\N{snowman} {}".format(a)
 
 "{".format(a)
@@ -275,6 +276,3 @@ if __name__ == "__main__":
     number = 0
     string = "{}".format(number := number + 1)
     print(string)
-
-# Unicode escape
-"\N{angle}AOB = {angle}°".format(angle=180)

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

@@ -138,6 +138,5 @@ with open("file.txt", encoding="utf-8") as f:
 with open("file.txt", encoding="utf-8") as f:
     contents = process_contents(f.read())
 
-with open("file1.txt", encoding="utf-8") as f:
+with open("file.txt", encoding="utf-8") as f:
     contents: str = process_contents(f.read())
-

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

@@ -1,8 +0,0 @@
-
-from pathlib import Path
-
-with Path("file.txt").open() as f:
-    contents = f.read()
-
-with Path("file.txt").open("r") as f:
-    contents = f.read()

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

@@ -1,26 +0,0 @@
-from pathlib import Path
-
-with Path("file.txt").open("w") as f:
-    f.write("test")
-
-with Path("file.txt").open("wb") as f:
-    f.write(b"test")
-
-with Path("file.txt").open(mode="w") as f:
-    f.write("test")
-
-with Path("file.txt").open("w", encoding="utf8") as f:
-    f.write("test")
-
-with Path("file.txt").open("w", errors="ignore") as f:
-    f.write("test")
-
-with Path(foo()).open("w") as f:
-    f.write("test")
-
-p = Path("file.txt")
-with p.open("w") as f:
-    f.write("test")
-
-with Path("foo", "bar", "baz").open("w") as f:
-    f.write("test")

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

@@ -54,58 +54,3 @@ def f():
     # ruff:disable[E741,F841]
     I = 1  # noqa: E741,F841
     # ruff:enable[E741,F841]
-
-
-def f():
-    # TODO: Duplicate codes should be counted as duplicate, not unused
-    # ruff: disable[F841, F841]
-    foo = 0
-
-
-def f():
-    # Overlapping range suppressions, one should be marked as used,
-    # and the other should trigger an unused suppression diagnostic
-    # ruff: disable[F841]
-    # ruff: disable[F841]
-    foo = 0
-
-
-def f():
-    # Multiple codes but only one is used
-    # ruff: disable[E741, F401, F841]
-    foo = 0
-
-
-def f():
-    # Multiple codes but only two are used
-    # ruff: disable[E741, F401, F841]
-    I = 0
-
-
-def f():
-    # Multiple codes but none are used
-    # ruff: disable[E741, F401, F841]
-    print("hello")
-
-
-def f():
-    # Unknown rule codes
-    # ruff: disable[YF829]
-    # ruff: disable[F841, RQW320]
-    value = 0
-    # ruff: enable[F841, RQW320]
-    # ruff: enable[YF829]
-
-
-def f():
-    # External rule codes should be ignored
-    # ruff: disable[TK421]
-    print("hello")
-    # ruff: enable[TK421]
-
-
-def f():
-    # Empty or missing rule codes
-    # ruff: disable
-    # ruff: disable[]
-    print("hello")

crates/ruff_linter/resources/test/fixtures/semantic_errors/annotated_global.py

@@ -1,38 +0,0 @@
-a: int = 1
-def f1():
-    global a
-    a: str = "foo"  # error
-
-b: int = 1
-def outer():
-    def inner():
-        global b
-        b: str = "nested"  # error
-
-c: int = 1
-def f2():
-    global c
-    c: list[str] = []  # error
-
-d: int = 1
-def f3():
-    global d
-    d: str  # error
-
-e: int = 1
-def f4():
-    e: str = "happy"  # okay
-
-global f
-f: int = 1  # okay
-
-g: int = 1
-global g  # error
-
-class C:
-    x: str
-    global x  # error
-
-class D:
-    global x  # error
-    x: str

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

@@ -214,13 +214,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             range: _,
             node_index: _,
         }) => {
-            if checker.is_rule_enabled(Rule::ImplicitStringConcatenationInCollectionLiteral) {
-                flake8_implicit_str_concat::rules::implicit_string_concatenation_in_collection_literal(
-                    checker,
-                    expr,
-                    elts,
-                );
-            }
             if ctx.is_store() {
                 let check_too_many_expressions =
                     checker.is_rule_enabled(Rule::ExpressionsInStarAssignment);
@@ -1336,13 +1329,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             }
         }
         Expr::Set(set) => {
-            if checker.is_rule_enabled(Rule::ImplicitStringConcatenationInCollectionLiteral) {
-                flake8_implicit_str_concat::rules::implicit_string_concatenation_in_collection_literal(
-                    checker,
-                    expr,
-                    &set.elts,
-                );
-            }
             if checker.is_rule_enabled(Rule::DuplicateValue) {
                 flake8_bugbear::rules::duplicate_value(checker, set);
             }

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

@@ -437,15 +437,6 @@ impl<'a> Checker<'a> {
         }
     }
 
-    /// Returns the [`Tokens`] for the parsed source file.
-    ///
-    ///
-    /// Unlike [`Self::tokens`], this method always returns
-    /// the tokens for the current file, even when within a parsed type annotation.
-    pub(crate) fn source_tokens(&self) -> &'a Tokens {
-        self.parsed.tokens()
-    }
-
     /// The [`Locator`] for the current file, which enables extraction of source code from byte
     /// offsets.
     pub(crate) const fn locator(&self) -> &'a Locator<'a> {

crates/ruff_linter/src/checkers/noqa.rs

@@ -119,9 +119,6 @@ pub(crate) fn check_noqa(
         }
     }
 
-    // Diagnostics for unused/invalid range suppressions
-    suppressions.check_suppressions(context, locator);
-
     // Enforce that the noqa directive was actually used (RUF100), unless RUF100 was itself
     // suppressed.
     if context.is_rule_enabled(Rule::UnusedNOQA)
@@ -143,13 +140,8 @@ pub(crate) fn check_noqa(
                 Directive::All(directive) => {
                     if matches.is_empty() {
                         let edit = delete_comment(directive.range(), locator);
-                        let mut diagnostic = context.report_diagnostic(
-                            UnusedNOQA {
-                                codes: None,
-                                kind: ruff::rules::UnusedNOQAKind::Noqa,
-                            },
-                            directive.range(),
-                        );
+                        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));
                     }
@@ -244,7 +236,6 @@ pub(crate) fn check_noqa(
                                         .map(|code| (*code).to_string())
                                         .collect(),
                                 }),
-                                kind: ruff::rules::UnusedNOQAKind::Noqa,
                             },
                             directive.range(),
                         );

crates/ruff_linter/src/codes.rs

@@ -454,7 +454,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8ImplicitStrConcat, "001") => rules::flake8_implicit_str_concat::rules::SingleLineImplicitStringConcatenation,
         (Flake8ImplicitStrConcat, "002") => rules::flake8_implicit_str_concat::rules::MultiLineImplicitStringConcatenation,
         (Flake8ImplicitStrConcat, "003") => rules::flake8_implicit_str_concat::rules::ExplicitStringConcatenation,
-        (Flake8ImplicitStrConcat, "004") => rules::flake8_implicit_str_concat::rules::ImplicitStringConcatenationInCollectionLiteral,
 
         // flake8-print
         (Flake8Print, "1") => rules::flake8_print::rules::Print,
@@ -1064,8 +1063,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Ruff, "100") => rules::ruff::rules::UnusedNOQA,
         (Ruff, "101") => rules::ruff::rules::RedirectedNOQA,
         (Ruff, "102") => rules::ruff::rules::InvalidRuleCode,
-        (Ruff, "103") => rules::ruff::rules::InvalidSuppressionComment,
-        (Ruff, "104") => rules::ruff::rules::UnmatchedSuppressionComment,
 
         (Ruff, "200") => rules::ruff::rules::InvalidPyprojectToml,
         #[cfg(any(feature = "test-rules", test))]

crates/ruff_linter/src/fix/edits.rs

@@ -3,13 +3,14 @@
 use anyhow::{Context, Result};
 
 use ruff_python_ast::AnyNodeRef;
-use ruff_python_ast::token::{self, Tokens, parenthesized_range};
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::{self as ast, Arguments, ExceptHandler, Expr, ExprList, Parameters, Stmt};
 use ruff_python_codegen::Stylist;
 use ruff_python_index::Indexer;
 use ruff_python_trivia::textwrap::dedent_to;
 use ruff_python_trivia::{
-    PythonWhitespace, SimpleTokenKind, SimpleTokenizer, has_leading_content, is_python_whitespace,
+    CommentRanges, PythonWhitespace, SimpleTokenKind, SimpleTokenizer, has_leading_content,
+    is_python_whitespace,
 };
 use ruff_source_file::{LineRanges, NewlineWithTrailingNewline, UniversalNewlines};
 use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
@@ -208,7 +209,7 @@ pub(crate) fn remove_argument<T: Ranged>(
     arguments: &Arguments,
     parentheses: Parentheses,
     source: &str,
-    tokens: &Tokens,
+    comment_ranges: &CommentRanges,
 ) -> Result<Edit> {
     // Partition into arguments before and after the argument to remove.
     let (before, after): (Vec<_>, Vec<_>) = arguments
@@ -223,7 +224,7 @@ pub(crate) fn remove_argument<T: Ranged>(
         .context("Unable to find argument")?;
 
     let parenthesized_range =
-        token::parenthesized_range(arg.value().into(), arguments.into(), tokens)
+        parenthesized_range(arg.value().into(), arguments.into(), comment_ranges, source)
             .unwrap_or(arg.range());
 
     if !after.is_empty() {
@@ -269,14 +270,25 @@ pub(crate) fn remove_argument<T: Ranged>(
 ///
 /// The new argument will be inserted before the first existing keyword argument in `arguments`, if
 /// there are any present. Otherwise, the new argument is added to the end of the argument list.
-pub(crate) fn add_argument(argument: &str, arguments: &Arguments, tokens: &Tokens) -> Edit {
+pub(crate) fn add_argument(
+    argument: &str,
+    arguments: &Arguments,
+    comment_ranges: &CommentRanges,
+    source: &str,
+) -> Edit {
     if let Some(ast::Keyword { range, value, .. }) = arguments.keywords.first() {
-        let keyword = parenthesized_range(value.into(), arguments.into(), tokens).unwrap_or(*range);
+        let keyword = parenthesized_range(value.into(), arguments.into(), comment_ranges, source)
+            .unwrap_or(*range);
         Edit::insertion(format!("{argument}, "), keyword.start())
     } else if let Some(last) = arguments.arguments_source_order().last() {
         // Case 1: existing arguments, so append after the last argument.
-        let last = parenthesized_range(last.value().into(), arguments.into(), tokens)
-            .unwrap_or(last.range());
+        let last = parenthesized_range(
+            last.value().into(),
+            arguments.into(),
+            comment_ranges,
+            source,
+        )
+        .unwrap_or(last.range());
         Edit::insertion(format!(", {argument}"), last.end())
     } else {
         // Case 2: no arguments. Add argument, without any trailing comma.
@@ -286,7 +298,12 @@ pub(crate) fn add_argument(argument: &str, arguments: &Arguments, tokens: &Token
 
 /// Generic function to add a (regular) parameter to a function definition.
 pub(crate) fn add_parameter(parameter: &str, parameters: &Parameters, source: &str) -> Edit {
-    if let Some(last) = parameters.args.iter().rfind(|arg| arg.default.is_none()) {
+    if let Some(last) = parameters
+        .args
+        .iter()
+        .filter(|arg| arg.default.is_none())
+        .next_back()
+    {
         // Case 1: at least one regular parameter, so append after the last one.
         Edit::insertion(format!(", {parameter}"), last.end())
     } else if !parameters.args.is_empty() {

crates/ruff_linter/src/linter.rs

@@ -1001,7 +1001,6 @@ mod tests {
     #[test_case(Path::new("write_to_debug.py"), PythonVersion::PY310)]
     #[test_case(Path::new("invalid_expression.py"), PythonVersion::PY312)]
     #[test_case(Path::new("global_parameter.py"), PythonVersion::PY310)]
-    #[test_case(Path::new("annotated_global.py"), PythonVersion::PY314)]
     fn test_semantic_errors(path: &Path, python_version: PythonVersion) -> Result<()> {
         let snapshot = format!(
             "semantic_syntax_error_{}_{}",

crates/ruff_linter/src/noqa.rs

@@ -879,7 +879,7 @@ fn find_noqa_comments<'a>(
     exemption: &'a FileExemption,
     directives: &'a NoqaDirectives,
     noqa_line_for: &NoqaMapping,
-    suppressions: &'a Suppressions,
+    suppressions: &Suppressions,
 ) -> Vec<Option<NoqaComment<'a>>> {
     // List of noqa comments, ordered to match up with `messages`
     let mut comments_by_line: Vec<Option<NoqaComment<'a>>> = vec![];

crates/ruff_linter/src/preview.rs

@@ -9,11 +9,6 @@ use crate::settings::LinterSettings;
 
 // Rule-specific behavior
 
-// https://github.com/astral-sh/ruff/pull/21382
-pub(crate) const fn is_custom_exception_checking_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
 // https://github.com/astral-sh/ruff/pull/15541
 pub(crate) const fn is_suspicious_function_reference_enabled(settings: &LinterSettings) -> bool {
     settings.preview.is_enabled()

crates/ruff_linter/src/rules/eradicate/detection.rs

@@ -22,7 +22,6 @@ static ALLOWLIST_REGEX: LazyLock<Regex> = LazyLock::new(|| {
             # Case-sensitive
             pyright
         |   pyrefly
-        |   ruff\s*:\s*(disable|enable)
         |   mypy:
         |   type:\s*ignore
         |   SPDX-License-Identifier:
@@ -149,8 +148,6 @@ mod tests {
         assert!(!comment_contains_code("# 123", &[]));
         assert!(!comment_contains_code("# 123.1", &[]));
         assert!(!comment_contains_code("# 1, 2, 3", &[]));
-        assert!(!comment_contains_code("# ruff: disable[E501]", &[]));
-        assert!(!comment_contains_code("#ruff:enable[E501, F84]", &[]));
         assert!(!comment_contains_code(
             "# pylint: disable=redefined-outer-name",
             &[]

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

@@ -91,8 +91,8 @@ pub(crate) fn fastapi_redundant_response_model(checker: &Checker, function_def:
                 response_model_arg,
                 &call.arguments,
                 Parentheses::Preserve,
-                checker.source(),
-                checker.tokens(),
+                checker.locator().contents(),
+                checker.comment_ranges(),
             )
             .map(Fix::unsafe_edit)
         });

crates/ruff_linter/src/rules/flake8_async/rules/blocking_open_call.rs

@@ -70,7 +70,7 @@ fn is_open_call(func: &Expr, semantic: &SemanticModel) -> bool {
 }
 
 /// Returns `true` if an expression resolves to a call to `pathlib.Path.open`.
-pub(crate) fn is_open_call_from_pathlib(func: &Expr, semantic: &SemanticModel) -> bool {
+fn is_open_call_from_pathlib(func: &Expr, semantic: &SemanticModel) -> bool {
     let Expr::Attribute(ast::ExprAttribute { attr, value, .. }) = func else {
         return false;
     };

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

@@ -18,7 +18,7 @@ mod async_zero_sleep;
 mod blocking_http_call;
 mod blocking_http_call_httpx;
 mod blocking_input;
-pub(crate) mod blocking_open_call;
+mod blocking_open_call;
 mod blocking_path_methods;
 mod blocking_process_invocation;
 mod blocking_sleep;

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

@@ -12,7 +12,7 @@ use crate::{checkers::ast::Checker, settings::LinterSettings};
 /// Checks for non-literal strings being passed to [`markupsafe.Markup`][markupsafe-markup].
 ///
 /// ## Why is this bad?
-/// [`markupsafe.Markup`][markupsafe-markup] does not perform any escaping, so passing dynamic
+/// [`markupsafe.Markup`] does not perform any escaping, so passing dynamic
 /// content, like f-strings, variables or interpolated strings will potentially
 /// lead to XSS vulnerabilities.
 ///

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

@@ -74,7 +74,12 @@ pub(crate) fn map_without_explicit_strict(checker: &Checker, call: &ast::ExprCal
         checker
             .report_diagnostic(MapWithoutExplicitStrict, call.range())
             .set_fix(Fix::applicable_edit(
-                add_argument("strict=False", &call.arguments, checker.tokens()),
+                add_argument(
+                    "strict=False",
+                    &call.arguments,
+                    checker.comment_ranges(),
+                    checker.locator().contents(),
+                ),
                 Applicability::Unsafe,
             ));
     }

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

@@ -3,7 +3,7 @@ use std::fmt::Write;
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::helpers::is_docstring_stmt;
 use ruff_python_ast::name::QualifiedName;
-use ruff_python_ast::token::parenthesized_range;
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::{self as ast, Expr, ParameterWithDefault};
 use ruff_python_semantic::SemanticModel;
 use ruff_python_semantic::analyze::function_type::is_stub;
@@ -166,7 +166,12 @@ fn move_initialization(
         return None;
     }
 
-    let range = match parenthesized_range(default.into(), parameter.into(), checker.tokens()) {
+    let range = match parenthesized_range(
+        default.into(),
+        parameter.into(),
+        checker.comment_ranges(),
+        checker.source(),
+    ) {
         Some(range) => range,
         None => default.range(),
     };
@@ -189,8 +194,13 @@ fn move_initialization(
             "{} = {}",
             parameter.parameter.name(),
             locator.slice(
-                parenthesized_range(default.into(), parameter.into(), checker.tokens())
-                    .unwrap_or(default.range())
+                parenthesized_range(
+                    default.into(),
+                    parameter.into(),
+                    checker.comment_ranges(),
+                    checker.source()
+                )
+                .unwrap_or(default.range())
             )
         );
     } else {

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

@@ -92,7 +92,12 @@ pub(crate) fn no_explicit_stacklevel(checker: &Checker, call: &ast::ExprCall) {
     }
     let mut diagnostic = checker.report_diagnostic(NoExplicitStacklevel, call.func.range());
 
-    let edit = add_argument("stacklevel=2", &call.arguments, checker.tokens());
+    let edit = add_argument(
+        "stacklevel=2",
+        &call.arguments,
+        checker.comment_ranges(),
+        checker.locator().contents(),
+    );
 
     diagnostic.set_fix(Fix::unsafe_edit(edit));
 }

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

@@ -70,7 +70,12 @@ pub(crate) fn zip_without_explicit_strict(checker: &Checker, call: &ast::ExprCal
         checker
             .report_diagnostic(ZipWithoutExplicitStrict, call.range())
             .set_fix(Fix::applicable_edit(
-                add_argument("strict=False", &call.arguments, checker.tokens()),
+                add_argument(
+                    "strict=False",
+                    &call.arguments,
+                    checker.comment_ranges(),
+                    checker.locator().contents(),
+                ),
                 Applicability::Unsafe,
             ));
     }

crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_list.rs

@@ -2,8 +2,8 @@ use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast as ast;
 use ruff_python_ast::ExprGenerator;
 use ruff_python_ast::comparable::ComparableExpr;
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::token::TokenKind;
-use ruff_python_ast::token::parenthesized_range;
 use ruff_text_size::{Ranged, TextRange, TextSize};
 
 use crate::checkers::ast::Checker;
@@ -142,9 +142,13 @@ pub(crate) fn unnecessary_generator_list(checker: &Checker, call: &ast::ExprCall
         if *parenthesized {
             // The generator's range will include the innermost parentheses, but it could be
             // surrounded by additional parentheses.
-            let range =
-                parenthesized_range(argument.into(), (&call.arguments).into(), checker.tokens())
-                    .unwrap_or(argument.range());
+            let range = parenthesized_range(
+                argument.into(),
+                (&call.arguments).into(),
+                checker.comment_ranges(),
+                checker.locator().contents(),
+            )
+            .unwrap_or(argument.range());
 
             // The generator always parenthesizes the expression; trim the parentheses.
             let generator = checker.generator().expr(argument);

crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_generator_set.rs

@@ -2,8 +2,8 @@ use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast as ast;
 use ruff_python_ast::ExprGenerator;
 use ruff_python_ast::comparable::ComparableExpr;
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::token::TokenKind;
-use ruff_python_ast::token::parenthesized_range;
 use ruff_text_size::{Ranged, TextRange, TextSize};
 
 use crate::checkers::ast::Checker;
@@ -147,9 +147,13 @@ pub(crate) fn unnecessary_generator_set(checker: &Checker, call: &ast::ExprCall)
         if *parenthesized {
             // The generator's range will include the innermost parentheses, but it could be
             // surrounded by additional parentheses.
-            let range =
-                parenthesized_range(argument.into(), (&call.arguments).into(), checker.tokens())
-                    .unwrap_or(argument.range());
+            let range = parenthesized_range(
+                argument.into(),
+                (&call.arguments).into(),
+                checker.comment_ranges(),
+                checker.locator().contents(),
+            )
+            .unwrap_or(argument.range());
 
             // The generator always parenthesizes the expression; trim the parentheses.
             let generator = checker.generator().expr(argument);

crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_set.rs

@@ -1,7 +1,7 @@
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast as ast;
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::token::TokenKind;
-use ruff_python_ast::token::parenthesized_range;
 use ruff_text_size::{Ranged, TextRange, TextSize};
 
 use crate::checkers::ast::Checker;
@@ -89,9 +89,13 @@ pub(crate) fn unnecessary_list_comprehension_set(checker: &Checker, call: &ast::
 
     // If the list comprehension is parenthesized, remove the parentheses in addition to
     // removing the brackets.
-    let replacement_range =
-        parenthesized_range(argument.into(), (&call.arguments).into(), checker.tokens())
-            .unwrap_or_else(|| argument.range());
+    let replacement_range = parenthesized_range(
+        argument.into(),
+        (&call.arguments).into(),
+        checker.comment_ranges(),
+        checker.locator().contents(),
+    )
+    .unwrap_or_else(|| argument.range());
 
     let span = argument.range().add_start(one).sub_end(one);
     let replacement =

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

@@ -32,10 +32,6 @@ mod tests {
         Path::new("ISC_syntax_error_2.py")
     )]
     #[test_case(Rule::ExplicitStringConcatenation, Path::new("ISC.py"))]
-    #[test_case(
-        Rule::ImplicitStringConcatenationInCollectionLiteral,
-        Path::new("ISC004.py")
-    )]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(

crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/collection_literal.rs

@@ -1,103 +0,0 @@
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::token::parenthesized_range;
-use ruff_python_ast::{Expr, StringLike};
-use ruff_text_size::Ranged;
-
-use crate::checkers::ast::Checker;
-use crate::{Edit, Fix, FixAvailability, Violation};
-
-/// ## What it does
-/// Checks for implicitly concatenated strings inside list, tuple, and set literals.
-///
-/// ## Why is this bad?
-/// In collection literals, implicit string concatenation is often the result of
-/// a missing comma between elements, which can silently merge items together.
-///
-/// ## Example
-/// ```python
-/// facts = (
-///     "Lobsters have blue blood.",
-///     "The liver is the only human organ that can fully regenerate itself.",
-///     "Clarinets are made almost entirely out of wood from the mpingo tree."
-///     "In 1971, astronaut Alan Shepard played golf on the moon.",
-/// )
-/// ```
-///
-/// Instead, you likely intended:
-/// ```python
-/// facts = (
-///     "Lobsters have blue blood.",
-///     "The liver is the only human organ that can fully regenerate itself.",
-///     "Clarinets are made almost entirely out of wood from the mpingo tree.",
-///     "In 1971, astronaut Alan Shepard played golf on the moon.",
-/// )
-/// ```
-///
-/// If the concatenation is intentional, wrap it in parentheses to make it
-/// explicit:
-/// ```python
-/// facts = (
-///     "Lobsters have blue blood.",
-///     "The liver is the only human organ that can fully regenerate itself.",
-///     (
-///         "Clarinets are made almost entirely out of wood from the mpingo tree."
-///         "In 1971, astronaut Alan Shepard played golf on the moon."
-///     ),
-/// )
-/// ```
-///
-/// ## Fix safety
-/// The fix is safe in that it does not change the semantics of your code.
-/// However, the issue is that you may often want to change semantics
-/// by adding a missing comma.
-#[derive(ViolationMetadata)]
-#[violation_metadata(preview_since = "0.14.10")]
-pub(crate) struct ImplicitStringConcatenationInCollectionLiteral;
-
-impl Violation for ImplicitStringConcatenationInCollectionLiteral {
-    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Always;
-
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        "Unparenthesized implicit string concatenation in collection".to_string()
-    }
-
-    fn fix_title(&self) -> Option<String> {
-        Some("Wrap implicitly concatenated strings in parentheses".to_string())
-    }
-}
-
-/// ISC004
-pub(crate) fn implicit_string_concatenation_in_collection_literal(
-    checker: &Checker,
-    expr: &Expr,
-    elements: &[Expr],
-) {
-    for element in elements {
-        let Ok(string_like) = StringLike::try_from(element) else {
-            continue;
-        };
-        if !string_like.is_implicit_concatenated() {
-            continue;
-        }
-        if parenthesized_range(
-            string_like.as_expression_ref(),
-            expr.into(),
-            checker.tokens(),
-        )
-        .is_some()
-        {
-            continue;
-        }
-
-        let mut diagnostic = checker.report_diagnostic(
-            ImplicitStringConcatenationInCollectionLiteral,
-            string_like.range(),
-        );
-        diagnostic.help("Did you forget a comma?");
-        diagnostic.set_fix(Fix::unsafe_edits(
-            Edit::insertion("(".to_string(), string_like.range().start()),
-            [Edit::insertion(")".to_string(), string_like.range().end())],
-        ));
-    }
-}

crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/explicit.rs

@@ -1,5 +1,5 @@
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::token::parenthesized_range;
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::{self as ast, Expr, Operator};
 use ruff_python_trivia::is_python_whitespace;
 use ruff_source_file::LineRanges;
@@ -88,7 +88,13 @@ pub(crate) fn explicit(checker: &Checker, expr: &Expr) {
                     checker.report_diagnostic(ExplicitStringConcatenation, expr.range());
 
                 let is_parenthesized = |expr: &Expr| {
-                    parenthesized_range(expr.into(), bin_op.into(), checker.tokens()).is_some()
+                    parenthesized_range(
+                        expr.into(),
+                        bin_op.into(),
+                        checker.comment_ranges(),
+                        checker.source(),
+                    )
+                    .is_some()
                 };
                 // If either `left` or `right` is parenthesized, generating
                 // a fix would be too involved. Just report the diagnostic.

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

@@ -1,7 +1,5 @@
-pub(crate) use collection_literal::*;
 pub(crate) use explicit::*;
 pub(crate) use implicit::*;
 
-mod collection_literal;
 mod explicit;
 mod implicit;

crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC004_ISC004.py.snap

@@ -1,149 +0,0 @@
----
-source: crates/ruff_linter/src/rules/flake8_implicit_str_concat/mod.rs
----
-ISC004 [*] Unparenthesized implicit string concatenation in collection
- --> ISC004.py:4:5
-  |
-2 |       "Lobsters have blue blood.",
-3 |       "The liver is the only human organ that can fully regenerate itself.",
-4 | /     "Clarinets are made almost entirely out of wood from the mpingo tree."
-5 | |     "In 1971, astronaut Alan Shepard played golf on the moon.",
-  | |______________________________________________________________^
-6 |   )
-  |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-1 | facts = (
-2 |     "Lobsters have blue blood.",
-3 |     "The liver is the only human organ that can fully regenerate itself.",
-  -     "Clarinets are made almost entirely out of wood from the mpingo tree."
-  -     "In 1971, astronaut Alan Shepard played golf on the moon.",
-4 +     ("Clarinets are made almost entirely out of wood from the mpingo tree."
-5 +     "In 1971, astronaut Alan Shepard played golf on the moon."),
-6 | )
-7 | 
-8 | facts = [
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:11:5
-   |
- 9 |       "Lobsters have blue blood.",
-10 |       "The liver is the only human organ that can fully regenerate itself.",
-11 | /     "Clarinets are made almost entirely out of wood from the mpingo tree."
-12 | |     "In 1971, astronaut Alan Shepard played golf on the moon.",
-   | |______________________________________________________________^
-13 |   ]
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-8  | facts = [
-9  |     "Lobsters have blue blood.",
-10 |     "The liver is the only human organ that can fully regenerate itself.",
-   -     "Clarinets are made almost entirely out of wood from the mpingo tree."
-   -     "In 1971, astronaut Alan Shepard played golf on the moon.",
-11 +     ("Clarinets are made almost entirely out of wood from the mpingo tree."
-12 +     "In 1971, astronaut Alan Shepard played golf on the moon."),
-13 | ]
-14 | 
-15 | facts = {
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:18:5
-   |
-16 |       "Lobsters have blue blood.",
-17 |       "The liver is the only human organ that can fully regenerate itself.",
-18 | /     "Clarinets are made almost entirely out of wood from the mpingo tree."
-19 | |     "In 1971, astronaut Alan Shepard played golf on the moon.",
-   | |______________________________________________________________^
-20 |   }
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-15 | facts = {
-16 |     "Lobsters have blue blood.",
-17 |     "The liver is the only human organ that can fully regenerate itself.",
-   -     "Clarinets are made almost entirely out of wood from the mpingo tree."
-   -     "In 1971, astronaut Alan Shepard played golf on the moon.",
-18 +     ("Clarinets are made almost entirely out of wood from the mpingo tree."
-19 +     "In 1971, astronaut Alan Shepard played golf on the moon."),
-20 | }
-21 | 
-22 | facts = {
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:30:5
-   |
-29 |   facts = (
-30 | /     "Octopuses have three hearts."
-31 | |     # Missing comma here.
-32 | |     "Honey never spoils.",
-   | |_________________________^
-33 |   )
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-27 | }
-28 | 
-29 | facts = (
-   -     "Octopuses have three hearts."
-30 +     ("Octopuses have three hearts."
-31 |     # Missing comma here.
-   -     "Honey never spoils.",
-32 +     "Honey never spoils."),
-33 | )
-34 | 
-35 | facts = [
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:36:5
-   |
-35 |   facts = [
-36 | /     "Octopuses have three hearts."
-37 | |     # Missing comma here.
-38 | |     "Honey never spoils.",
-   | |_________________________^
-39 |   ]
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-33 | )
-34 | 
-35 | facts = [
-   -     "Octopuses have three hearts."
-36 +     ("Octopuses have three hearts."
-37 |     # Missing comma here.
-   -     "Honey never spoils.",
-38 +     "Honey never spoils."),
-39 | ]
-40 | 
-41 | facts = {
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:42:5
-   |
-41 |   facts = {
-42 | /     "Octopuses have three hearts."
-43 | |     # Missing comma here.
-44 | |     "Honey never spoils.",
-   | |_________________________^
-45 |   }
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-39 | ]
-40 | 
-41 | facts = {
-   -     "Octopuses have three hearts."
-42 +     ("Octopuses have three hearts."
-43 |     # Missing comma here.
-   -     "Honey never spoils.",
-44 +     "Honey never spoils."),
-45 | }
-46 | 
-47 | facts = (
-note: This is an unsafe fix and may change runtime behavior

crates/ruff_linter/src/rules/flake8_logging/rules/exc_info_outside_except_handler.rs

@@ -111,6 +111,7 @@ pub(crate) fn exc_info_outside_except_handler(checker: &Checker, call: &ExprCall
     }
 
     let arguments = &call.arguments;
+    let source = checker.source();
 
     let mut diagnostic = checker.report_diagnostic(ExcInfoOutsideExceptHandler, exc_info.range);
 
@@ -119,8 +120,8 @@ pub(crate) fn exc_info_outside_except_handler(checker: &Checker, call: &ExprCall
             exc_info,
             arguments,
             Parentheses::Preserve,
-            checker.source(),
-            checker.tokens(),
+            source,
+            checker.comment_ranges(),
         )?;
         Ok(Fix::unsafe_edit(edit))
     });

crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_dict_kwargs.rs

@@ -2,7 +2,7 @@ use itertools::Itertools;
 use rustc_hash::{FxBuildHasher, FxHashSet};
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::token::parenthesized_range;
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::{self as ast, Expr};
 use ruff_python_stdlib::identifiers::is_identifier;
 use ruff_text_size::Ranged;
@@ -129,8 +129,8 @@ pub(crate) fn unnecessary_dict_kwargs(checker: &Checker, call: &ast::ExprCall) {
                     keyword,
                     &call.arguments,
                     Parentheses::Preserve,
-                    checker.source(),
-                    checker.tokens(),
+                    checker.locator().contents(),
+                    checker.comment_ranges(),
                 )
                 .map(Fix::safe_edit)
             });
@@ -158,7 +158,8 @@ pub(crate) fn unnecessary_dict_kwargs(checker: &Checker, call: &ast::ExprCall) {
                                         parenthesized_range(
                                             value.into(),
                                             dict.into(),
-                                            checker.tokens()
+                                            checker.comment_ranges(),
+                                            checker.locator().contents(),
                                         )
                                         .unwrap_or(value.range())
                                     )

crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_range_start.rs

@@ -73,11 +73,11 @@ pub(crate) fn unnecessary_range_start(checker: &Checker, call: &ast::ExprCall) {
     let mut diagnostic = checker.report_diagnostic(UnnecessaryRangeStart, start.range());
     diagnostic.try_set_fix(|| {
         remove_argument(
-            start,
+            &start,
             &call.arguments,
             Parentheses::Preserve,
-            checker.source(),
-            checker.tokens(),
+            checker.locator().contents(),
+            checker.comment_ranges(),
         )
         .map(Fix::safe_edit)
     });

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

@@ -160,16 +160,20 @@ fn generate_fix(
 ) -> anyhow::Result<Fix> {
     let locator = checker.locator();
     let source = locator.contents();
-    let tokens = checker.tokens();
 
     let deletion = remove_argument(
         generic_base,
         arguments,
         Parentheses::Preserve,
         source,
-        tokens,
+        checker.comment_ranges(),
     )?;
-    let insertion = add_argument(locator.slice(generic_base), arguments, tokens);
+    let insertion = add_argument(
+        locator.slice(generic_base),
+        arguments,
+        checker.comment_ranges(),
+        source,
+    );
 
     Ok(Fix::unsafe_edits(deletion, [insertion]))
 }

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

@@ -5,7 +5,7 @@ use ruff_python_ast::{
     helpers::{pep_604_union, typing_optional},
     name::Name,
     operator_precedence::OperatorPrecedence,
-    token::{Tokens, parenthesized_range},
+    parenthesize::parenthesized_range,
 };
 use ruff_python_semantic::analyze::typing::{traverse_literal, traverse_union};
 use ruff_text_size::{Ranged, TextRange};
@@ -243,12 +243,16 @@ fn create_fix(
             let union_expr = pep_604_union(&[new_literal_expr, none_expr]);
 
             // Check if we need parentheses to preserve operator precedence
-            let content =
-                if needs_parentheses_for_precedence(semantic, literal_expr, checker.tokens()) {
-                    format!("({})", checker.generator().expr(&union_expr))
-                } else {
-                    checker.generator().expr(&union_expr)
-                };
+            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)
@@ -274,7 +278,8 @@ enum UnionKind {
 fn needs_parentheses_for_precedence(
     semantic: &ruff_python_semantic::SemanticModel,
     literal_expr: &Expr,
-    tokens: &Tokens,
+    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 {
@@ -282,7 +287,14 @@ fn needs_parentheses_for_precedence(
     };
 
     // Check if the literal expression is already parenthesized
-    if parenthesized_range(literal_expr.into(), parent_expr.into(), tokens).is_some() {
+    if parenthesized_range(
+        literal_expr.into(),
+        parent_expr.into(),
+        comment_ranges,
+        source,
+    )
+    .is_some()
+    {
         return false; // Already parenthesized, don't add more
     }
 

crates/ruff_linter/src/rules/flake8_pytest_style/rules/assertion.rs

@@ -10,7 +10,7 @@ use libcst_native::{
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::helpers::Truthiness;
-use ruff_python_ast::token::parenthesized_range;
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::visitor::Visitor;
 use ruff_python_ast::{
     self as ast, AnyNodeRef, Arguments, BoolOp, ExceptHandler, Expr, Keyword, Stmt, UnaryOp,
@@ -303,7 +303,8 @@ pub(crate) fn unittest_assertion(
                 parenthesized_range(
                     expr.into(),
                     checker.semantic().current_statement().into(),
-                    checker.tokens(),
+                    checker.comment_ranges(),
+                    checker.locator().contents(),
                 )
                 .unwrap_or(expr.range()),
             )));

crates/ruff_linter/src/rules/flake8_pytest_style/rules/fixture.rs

@@ -768,8 +768,8 @@ fn check_fixture_decorator(checker: &Checker, func_name: &str, decorator: &Decor
                                 keyword,
                                 arguments,
                                 edits::Parentheses::Preserve,
-                                checker.source(),
-                                checker.tokens(),
+                                checker.locator().contents(),
+                                checker.comment_ranges(),
                             )
                             .map(Fix::unsafe_edit)
                         });

crates/ruff_linter/src/rules/flake8_pytest_style/rules/parametrize.rs

@@ -2,9 +2,10 @@ use rustc_hash::{FxBuildHasher, FxHashMap};
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::comparable::ComparableExpr;
-use ruff_python_ast::token::{Tokens, parenthesized_range};
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::{self as ast, Expr, ExprCall, ExprContext, StringLiteralFlags};
 use ruff_python_codegen::Generator;
+use ruff_python_trivia::CommentRanges;
 use ruff_python_trivia::{SimpleTokenKind, SimpleTokenizer};
 use ruff_text_size::{Ranged, TextRange, TextSize};
 
@@ -321,8 +322,18 @@ fn elts_to_csv(elts: &[Expr], generator: Generator, flags: StringLiteralFlags) -
 /// ```
 ///
 /// This method assumes that the first argument is a string.
-fn get_parametrize_name_range(call: &ExprCall, expr: &Expr, tokens: &Tokens) -> Option<TextRange> {
-    parenthesized_range(expr.into(), (&call.arguments).into(), tokens)
+fn get_parametrize_name_range(
+    call: &ExprCall,
+    expr: &Expr,
+    comment_ranges: &CommentRanges,
+    source: &str,
+) -> Option<TextRange> {
+    parenthesized_range(
+        expr.into(),
+        (&call.arguments).into(),
+        comment_ranges,
+        source,
+    )
 }
 
 /// PT006
@@ -338,8 +349,13 @@ fn check_names(checker: &Checker, call: &ExprCall, expr: &Expr, argvalues: &Expr
             if names.len() > 1 {
                 match names_type {
                     types::ParametrizeNameType::Tuple => {
-                        let name_range = get_parametrize_name_range(call, expr, checker.tokens())
-                            .unwrap_or(expr.range());
+                        let name_range = get_parametrize_name_range(
+                            call,
+                            expr,
+                            checker.comment_ranges(),
+                            checker.locator().contents(),
+                        )
+                        .unwrap_or(expr.range());
                         let mut diagnostic = checker.report_diagnostic(
                             PytestParametrizeNamesWrongType {
                                 single_argument: false,
@@ -370,8 +386,13 @@ fn check_names(checker: &Checker, call: &ExprCall, expr: &Expr, argvalues: &Expr
                         )));
                     }
                     types::ParametrizeNameType::List => {
-                        let name_range = get_parametrize_name_range(call, expr, checker.tokens())
-                            .unwrap_or(expr.range());
+                        let name_range = get_parametrize_name_range(
+                            call,
+                            expr,
+                            checker.comment_ranges(),
+                            checker.locator().contents(),
+                        )
+                        .unwrap_or(expr.range());
                         let mut diagnostic = checker.report_diagnostic(
                             PytestParametrizeNamesWrongType {
                                 single_argument: false,

crates/ruff_linter/src/rules/flake8_pytest_style/rules/raises.rs

@@ -125,9 +125,6 @@ impl Violation for PytestRaisesTooBroad {
 /// ## Why is this bad?
 /// `pytest.raises` expects to receive an expected exception as its first
 /// argument. If omitted, the `pytest.raises` call will fail at runtime.
-/// The rule will also accept calls without an expected exception but with
-/// `match` and/or `check` keyword arguments, which are also valid after
-/// pytest version 8.4.0.
 ///
 /// ## Example
 /// ```python
@@ -184,8 +181,6 @@ pub(crate) fn raises_call(checker: &Checker, call: &ast::ExprCall) {
                 .arguments
                 .find_argument("expected_exception", 0)
                 .is_none()
-                && call.arguments.find_keyword("match").is_none()
-                && call.arguments.find_keyword("check").is_none()
             {
                 checker.report_diagnostic(PytestRaisesWithoutException, call.func.range());
             }

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

@@ -10,7 +10,7 @@ use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::comparable::ComparableExpr;
 use ruff_python_ast::helpers::{Truthiness, contains_effect};
 use ruff_python_ast::name::Name;
-use ruff_python_ast::token::parenthesized_range;
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_codegen::Generator;
 use ruff_python_semantic::SemanticModel;
 
@@ -800,9 +800,14 @@ fn is_short_circuit(
             edit = Some(get_short_circuit_edit(
                 value,
                 TextRange::new(
-                    parenthesized_range(furthest.into(), expr.into(), checker.tokens())
-                        .unwrap_or(furthest.range())
-                        .start(),
+                    parenthesized_range(
+                        furthest.into(),
+                        expr.into(),
+                        checker.comment_ranges(),
+                        checker.locator().contents(),
+                    )
+                    .unwrap_or(furthest.range())
+                    .start(),
                     expr.end(),
                 ),
                 short_circuit_truthiness,
@@ -823,9 +828,14 @@ fn is_short_circuit(
             edit = Some(get_short_circuit_edit(
                 next_value,
                 TextRange::new(
-                    parenthesized_range(furthest.into(), expr.into(), checker.tokens())
-                        .unwrap_or(furthest.range())
-                        .start(),
+                    parenthesized_range(
+                        furthest.into(),
+                        expr.into(),
+                        checker.comment_ranges(),
+                        checker.locator().contents(),
+                    )
+                    .unwrap_or(furthest.range())
+                    .start(),
                     expr.end(),
                 ),
                 short_circuit_truthiness,

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

@@ -4,7 +4,7 @@ use ruff_text_size::{Ranged, TextRange};
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::helpers::{is_const_false, is_const_true};
 use ruff_python_ast::name::Name;
-use ruff_python_ast::token::parenthesized_range;
+use ruff_python_ast::parenthesize::parenthesized_range;
 
 use crate::checkers::ast::Checker;
 use crate::{AlwaysFixableViolation, Edit, Fix, FixAvailability, Violation};
@@ -171,8 +171,13 @@ pub(crate) fn if_expr_with_true_false(
             checker
                 .locator()
                 .slice(
-                    parenthesized_range(test.into(), expr.into(), checker.tokens())
-                        .unwrap_or(test.range()),
+                    parenthesized_range(
+                        test.into(),
+                        expr.into(),
+                        checker.comment_ranges(),
+                        checker.locator().contents(),
+                    )
+                    .unwrap_or(test.range()),
                 )
                 .to_string(),
             expr.range(),

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

@@ -4,10 +4,10 @@ use anyhow::Result;
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::comparable::ComparableStmt;
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::stmt_if::{IfElifBranch, if_elif_branches};
-use ruff_python_ast::token::parenthesized_range;
 use ruff_python_ast::{self as ast, Expr};
-use ruff_python_trivia::{SimpleTokenKind, SimpleTokenizer};
+use ruff_python_trivia::{CommentRanges, SimpleTokenKind, SimpleTokenizer};
 use ruff_source_file::LineRanges;
 use ruff_text_size::{Ranged, TextRange};
 
@@ -99,7 +99,7 @@ pub(crate) fn if_with_same_arms(checker: &Checker, stmt_if: &ast::StmtIf) {
                 &current_branch,
                 following_branch,
                 checker.locator(),
-                checker.tokens(),
+                checker.comment_ranges(),
             )
         });
     }
@@ -111,7 +111,7 @@ fn merge_branches(
     current_branch: &IfElifBranch,
     following_branch: &IfElifBranch,
     locator: &Locator,
-    tokens: &ruff_python_ast::token::Tokens,
+    comment_ranges: &CommentRanges,
 ) -> Result<Fix> {
     // Identify the colon (`:`) at the end of the current branch's test.
     let Some(current_branch_colon) =
@@ -127,9 +127,12 @@ fn merge_branches(
     );
 
     // If the following test isn't parenthesized, consider parenthesizing it.
-    let following_branch_test = if let Some(range) =
-        parenthesized_range(following_branch.test.into(), stmt_if.into(), tokens)
-    {
+    let following_branch_test = if let Some(range) = parenthesized_range(
+        following_branch.test.into(),
+        stmt_if.into(),
+        comment_ranges,
+        locator.contents(),
+    ) {
         Cow::Borrowed(locator.slice(range))
     } else if matches!(
         following_branch.test,
@@ -150,19 +153,24 @@ fn merge_branches(
     //
     // For example, if the current test is `x if x else y`, we should parenthesize it to
     // `(x if x else y) or ...`.
-    let parenthesize_edit =
-        if matches!(
-            current_branch.test,
-            Expr::Lambda(_) | Expr::Named(_) | Expr::If(_)
-        ) && parenthesized_range(current_branch.test.into(), stmt_if.into(), tokens).is_none()
-        {
-            Some(Edit::range_replacement(
-                format!("({})", locator.slice(current_branch.test)),
-                current_branch.test.range(),
-            ))
-        } else {
-            None
-        };
+    let parenthesize_edit = if matches!(
+        current_branch.test,
+        Expr::Lambda(_) | Expr::Named(_) | Expr::If(_)
+    ) && parenthesized_range(
+        current_branch.test.into(),
+        stmt_if.into(),
+        comment_ranges,
+        locator.contents(),
+    )
+    .is_none()
+    {
+        Some(Edit::range_replacement(
+            format!("({})", locator.slice(current_branch.test)),
+            current_branch.test.range(),
+        ))
+    } else {
+        None
+    };
 
     Ok(Fix::safe_edits(
         deletion_edit,

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

@@ -1,6 +1,6 @@
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::AnyNodeRef;
-use ruff_python_ast::token::parenthesized_range;
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::{self as ast, Arguments, CmpOp, Comprehension, Expr};
 use ruff_python_semantic::analyze::typing;
 use ruff_python_trivia::{SimpleTokenKind, SimpleTokenizer};
@@ -90,10 +90,20 @@ fn key_in_dict(checker: &Checker, left: &Expr, right: &Expr, operator: CmpOp, pa
     }
 
     // Extract the exact range of the left and right expressions.
-    let left_range =
-        parenthesized_range(left.into(), parent, checker.tokens()).unwrap_or(left.range());
-    let right_range =
-        parenthesized_range(right.into(), parent, checker.tokens()).unwrap_or(right.range());
+    let left_range = parenthesized_range(
+        left.into(),
+        parent,
+        checker.comment_ranges(),
+        checker.locator().contents(),
+    )
+    .unwrap_or(left.range());
+    let right_range = parenthesized_range(
+        right.into(),
+        parent,
+        checker.comment_ranges(),
+        checker.locator().contents(),
+    )
+    .unwrap_or(right.range());
 
     let mut diagnostic = checker.report_diagnostic(
         InDictKeys {

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

@@ -146,7 +146,7 @@ fn reverse_comparison(expr: &Expr, locator: &Locator, stylist: &Stylist) -> Resu
         let left = (*comparison.left).clone();
 
         // Copy the right side to the left side.
-        *comparison.left = comparison.comparisons[0].comparator.clone();
+        comparison.left = Box::new(comparison.comparisons[0].comparator.clone());
 
         // Copy the left side to the right side.
         comparison.comparisons[0].comparator = left;

crates/ruff_linter/src/rules/flake8_type_checking/rules/type_alias_quotes.rs

@@ -11,7 +11,7 @@ use crate::registry::Rule;
 use crate::rules::flake8_type_checking::helpers::quote_type_expression;
 use crate::{AlwaysFixableViolation, Edit, Fix, FixAvailability, Violation};
 use ruff_python_ast::PythonVersion;
-use ruff_python_ast::token::parenthesized_range;
+use ruff_python_ast::parenthesize::parenthesized_range;
 
 /// ## What it does
 /// Checks if [PEP 613] explicit type aliases contain references to
@@ -295,20 +295,21 @@ pub(crate) fn quoted_type_alias(
     let range = annotation_expr.range();
     let mut diagnostic = checker.report_diagnostic(QuotedTypeAlias, range);
     let fix_string = annotation_expr.value.to_string();
-
     let fix_string = if (fix_string.contains('\n') || fix_string.contains('\r'))
         && parenthesized_range(
-            // Check for parentheses outside the string ("""...""")
+            // Check for parenthesis outside string ("""...""")
             annotation_expr.into(),
             checker.semantic().current_statement().into(),
-            checker.source_tokens(),
+            checker.comment_ranges(),
+            checker.locator().contents(),
         )
         .is_none()
         && parenthesized_range(
-            // Check for parentheses inside the string """(...)"""
+            // Check for parenthesis inside string """(...)"""
             expr.into(),
             annotation_expr.into(),
-            checker.tokens(),
+            checker.comment_ranges(),
+            checker.locator().contents(),
         )
         .is_none()
     {

crates/ruff_linter/src/rules/flake8_use_pathlib/helpers.rs

@@ -210,7 +210,6 @@ pub(crate) fn is_argument_non_default(arguments: &Arguments, name: &str, positio
 
 /// Returns `true` if the given call is a top-level expression in its statement.
 /// This means the call's return value is not used, so return type changes don't matter.
-pub(crate) fn is_top_level_expression_in_statement(checker: &Checker) -> bool {
+pub(crate) fn is_top_level_expression_call(checker: &Checker) -> bool {
     checker.semantic().current_expression_parent().is_none()
-        && checker.semantic().current_statement().is_expr_stmt()
 }

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_getcwd.rs

@@ -6,7 +6,7 @@ use ruff_text_size::Ranged;
 use crate::checkers::ast::Checker;
 use crate::importer::ImportRequest;
 use crate::preview::is_fix_os_getcwd_enabled;
-use crate::rules::flake8_use_pathlib::helpers::is_top_level_expression_in_statement;
+use crate::rules::flake8_use_pathlib::helpers::is_top_level_expression_call;
 use crate::{FixAvailability, Violation};
 
 /// ## What it does
@@ -89,7 +89,7 @@ pub(crate) fn os_getcwd(checker: &Checker, call: &ExprCall, segments: &[&str]) {
 
             // Unsafe when the fix would delete comments or change a used return value
             let applicability = if checker.comment_ranges().intersects(range)
-                || !is_top_level_expression_in_statement(checker)
+                || !is_top_level_expression_call(checker)
             {
                 Applicability::Unsafe
             } else {

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_readlink.rs

@@ -6,7 +6,7 @@ use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_readlink_enabled;
 use crate::rules::flake8_use_pathlib::helpers::{
     check_os_pathlib_single_arg_calls, is_keyword_only_argument_non_default,
-    is_top_level_expression_in_statement,
+    is_top_level_expression_call,
 };
 use crate::{FixAvailability, Violation};
 
@@ -86,7 +86,7 @@ pub(crate) fn os_readlink(checker: &Checker, call: &ExprCall, segments: &[&str])
         return;
     }
 
-    let applicability = if !is_top_level_expression_in_statement(checker) {
+    let applicability = if !is_top_level_expression_call(checker) {
         // Unsafe because the return type changes (str/bytes -> Path)
         Applicability::Unsafe
     } else {

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_rename.rs

@@ -6,7 +6,7 @@ use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_rename_enabled;
 use crate::rules::flake8_use_pathlib::helpers::{
     check_os_pathlib_two_arg_calls, has_unknown_keywords_or_starred_expr,
-    is_keyword_only_argument_non_default, is_top_level_expression_in_statement,
+    is_keyword_only_argument_non_default, is_top_level_expression_call,
 };
 use crate::{FixAvailability, Violation};
 
@@ -92,7 +92,7 @@ pub(crate) fn os_rename(checker: &Checker, call: &ExprCall, segments: &[&str]) {
         );
 
     // Unsafe when the fix would delete comments or change a used return value
-    let applicability = if !is_top_level_expression_in_statement(checker) {
+    let applicability = if !is_top_level_expression_call(checker) {
         // Unsafe because the return type changes (None -> Path)
         Applicability::Unsafe
     } else {

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_replace.rs

@@ -6,7 +6,7 @@ use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_replace_enabled;
 use crate::rules::flake8_use_pathlib::helpers::{
     check_os_pathlib_two_arg_calls, has_unknown_keywords_or_starred_expr,
-    is_keyword_only_argument_non_default, is_top_level_expression_in_statement,
+    is_keyword_only_argument_non_default, is_top_level_expression_call,
 };
 use crate::{FixAvailability, Violation};
 
@@ -95,7 +95,7 @@ pub(crate) fn os_replace(checker: &Checker, call: &ExprCall, segments: &[&str])
         );
 
     // Unsafe when the fix would delete comments or change a used return value
-    let applicability = if !is_top_level_expression_in_statement(checker) {
+    let applicability = if !is_top_level_expression_call(checker) {
         // Unsafe because the return type changes (None -> Path)
         Applicability::Unsafe
     } else {

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/path_constructor_current_directory.rs

@@ -1,9 +1,10 @@
 use std::ops::Range;
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::token::parenthesized_range;
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::{Expr, ExprBinOp, ExprCall, Operator};
 use ruff_python_semantic::SemanticModel;
+use ruff_python_trivia::CommentRanges;
 use ruff_text_size::{Ranged, TextRange};
 
 use crate::checkers::ast::Checker;
@@ -88,7 +89,11 @@ pub(crate) fn path_constructor_current_directory(
 
     let mut diagnostic = checker.report_diagnostic(PathConstructorCurrentDirectory, arg.range());
 
-    match parent_and_next_path_fragment_range(checker.semantic(), checker.tokens()) {
+    match parent_and_next_path_fragment_range(
+        checker.semantic(),
+        checker.comment_ranges(),
+        checker.source(),
+    ) {
         Some((parent_range, next_fragment_range)) => {
             let next_fragment_expr = checker.locator().slice(next_fragment_range);
             let call_expr = checker.locator().slice(call.range());
@@ -111,7 +116,7 @@ pub(crate) fn path_constructor_current_directory(
                 arguments,
                 Parentheses::Preserve,
                 checker.source(),
-                checker.tokens(),
+                checker.comment_ranges(),
             )?;
             Ok(Fix::applicable_edit(edit, applicability(call.range())))
         }),
@@ -120,7 +125,8 @@ pub(crate) fn path_constructor_current_directory(
 
 fn parent_and_next_path_fragment_range(
     semantic: &SemanticModel,
-    tokens: &ruff_python_ast::token::Tokens,
+    comment_ranges: &CommentRanges,
+    source: &str,
 ) -> Option<(TextRange, TextRange)> {
     let parent = semantic.current_expression_parent()?;
 
@@ -136,6 +142,6 @@ fn parent_and_next_path_fragment_range(
 
     Some((
         parent.range(),
-        parenthesized_range(right.into(), parent.into(), tokens).unwrap_or(range),
+        parenthesized_range(right.into(), parent.into(), comment_ranges, source).unwrap_or(range),
     ))
 }

crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__full_name.py.snap

@@ -567,64 +567,5 @@ PTH121 `os.path.samefile()` should be replaced by `Path.samefile()`
 138 |
 139 | os.path.samefile("pth1_file", "pth1_link", 1, *[1], **{"x": 1}, foo=1)
     | ^^^^^^^^^^^^^^^^
-140 |
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
     |
 help: Replace with `Path(...).samefile()`
-
-PTH104 `os.rename()` should be replaced by `Path.rename()`
-   --> full_name.py:144:4
-    |
-142 | import sys
-143 |
-144 | if os.rename("pth1.py", "pth1.py.bak"):
-    |    ^^^^^^^^^
-145 |     print("rename: truthy")
-146 | else:
-    |
-help: Replace with `Path(...).rename(...)`
-
-PTH105 `os.replace()` should be replaced by `Path.replace()`
-   --> full_name.py:149:4
-    |
-147 |     print("rename: falsey")
-148 |
-149 | if os.replace("pth1.py.bak", "pth1.py"):
-    |    ^^^^^^^^^^
-150 |     print("replace: truthy")
-151 | else:
-    |
-help: Replace with `Path(...).replace(...)`
-
-PTH109 `os.getcwd()` should be replaced by `Path.cwd()`
-   --> full_name.py:155:14
-    |
-154 | try:
-155 |     for _ in os.getcwd():
-    |              ^^^^^^^^^
-156 |         print("getcwd: iterable")
-157 |         break
-    |
-help: Replace with `Path.cwd()`
-
-PTH109 `os.getcwd()` should be replaced by `Path.cwd()`
-   --> full_name.py:162:14
-    |
-161 | try:
-162 |     for _ in os.getcwdb():
-    |              ^^^^^^^^^^
-163 |         print("getcwdb: iterable")
-164 |         break
-    |
-help: Replace with `Path.cwd()`
-
-PTH115 `os.readlink()` should be replaced by `Path.readlink()`
-   --> full_name.py:169:14
-    |
-168 | try:
-169 |     for _ in os.readlink(sys.executable):
-    |              ^^^^^^^^^^^
-170 |         print("readlink: iterable")
-171 |         break
-    |
-help: Replace with `Path(...).readlink()`

crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_full_name.py.snap

@@ -1037,142 +1037,5 @@ PTH121 `os.path.samefile()` should be replaced by `Path.samefile()`
 138 |
 139 | os.path.samefile("pth1_file", "pth1_link", 1, *[1], **{"x": 1}, foo=1)
     | ^^^^^^^^^^^^^^^^
-140 |
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
     |
 help: Replace with `Path(...).samefile()`
-
-PTH104 [*] `os.rename()` should be replaced by `Path.rename()`
-   --> full_name.py:144:4
-    |
-142 | import sys
-143 |
-144 | if os.rename("pth1.py", "pth1.py.bak"):
-    |    ^^^^^^^^^
-145 |     print("rename: truthy")
-146 | else:
-    |
-help: Replace with `Path(...).rename(...)`
-140 | 
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
-142 | import sys
-143 + import pathlib
-144 | 
-    - if os.rename("pth1.py", "pth1.py.bak"):
-145 + if pathlib.Path("pth1.py").rename("pth1.py.bak"):
-146 |     print("rename: truthy")
-147 | else:
-148 |     print("rename: falsey")
-note: This is an unsafe fix and may change runtime behavior
-
-PTH105 [*] `os.replace()` should be replaced by `Path.replace()`
-   --> full_name.py:149:4
-    |
-147 |     print("rename: falsey")
-148 |
-149 | if os.replace("pth1.py.bak", "pth1.py"):
-    |    ^^^^^^^^^^
-150 |     print("replace: truthy")
-151 | else:
-    |
-help: Replace with `Path(...).replace(...)`
-140 | 
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
-142 | import sys
-143 + import pathlib
-144 | 
-145 | if os.rename("pth1.py", "pth1.py.bak"):
-146 |     print("rename: truthy")
-147 | else:
-148 |     print("rename: falsey")
-149 | 
-    - if os.replace("pth1.py.bak", "pth1.py"):
-150 + if pathlib.Path("pth1.py.bak").replace("pth1.py"):
-151 |     print("replace: truthy")
-152 | else:
-153 |     print("replace: falsey")
-note: This is an unsafe fix and may change runtime behavior
-
-PTH109 [*] `os.getcwd()` should be replaced by `Path.cwd()`
-   --> full_name.py:155:14
-    |
-154 | try:
-155 |     for _ in os.getcwd():
-    |              ^^^^^^^^^
-156 |         print("getcwd: iterable")
-157 |         break
-    |
-help: Replace with `Path.cwd()`
-140 | 
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
-142 | import sys
-143 + import pathlib
-144 | 
-145 | if os.rename("pth1.py", "pth1.py.bak"):
-146 |     print("rename: truthy")
---------------------------------------------------------------------------------
-153 |     print("replace: falsey")
-154 | 
-155 | try:
-    -     for _ in os.getcwd():
-156 +     for _ in pathlib.Path.cwd():
-157 |         print("getcwd: iterable")
-158 |         break
-159 | except TypeError as e:
-note: This is an unsafe fix and may change runtime behavior
-
-PTH109 [*] `os.getcwd()` should be replaced by `Path.cwd()`
-   --> full_name.py:162:14
-    |
-161 | try:
-162 |     for _ in os.getcwdb():
-    |              ^^^^^^^^^^
-163 |         print("getcwdb: iterable")
-164 |         break
-    |
-help: Replace with `Path.cwd()`
-140 | 
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
-142 | import sys
-143 + import pathlib
-144 | 
-145 | if os.rename("pth1.py", "pth1.py.bak"):
-146 |     print("rename: truthy")
---------------------------------------------------------------------------------
-160 |     print("getcwd: not iterable")
-161 | 
-162 | try:
-    -     for _ in os.getcwdb():
-163 +     for _ in pathlib.Path.cwd():
-164 |         print("getcwdb: iterable")
-165 |         break
-166 | except TypeError as e:
-note: This is an unsafe fix and may change runtime behavior
-
-PTH115 [*] `os.readlink()` should be replaced by `Path.readlink()`
-   --> full_name.py:169:14
-    |
-168 | try:
-169 |     for _ in os.readlink(sys.executable):
-    |              ^^^^^^^^^^^
-170 |         print("readlink: iterable")
-171 |         break
-    |
-help: Replace with `Path(...).readlink()`
-140 | 
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
-142 | import sys
-143 + import pathlib
-144 | 
-145 | if os.rename("pth1.py", "pth1.py.bak"):
-146 |     print("rename: truthy")
---------------------------------------------------------------------------------
-167 |     print("getcwdb: not iterable")
-168 | 
-169 | try:
-    -     for _ in os.readlink(sys.executable):
-170 +     for _ in pathlib.Path(sys.executable).readlink():
-171 |         print("readlink: iterable")
-172 |         break
-173 | except TypeError as e:
-note: This is an unsafe fix and may change runtime behavior

crates/ruff_linter/src/rules/pandas_vet/rules/inplace_argument.rs

@@ -1,7 +1,8 @@
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::helpers::is_const_true;
-use ruff_python_ast::token::{Tokens, parenthesized_range};
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::{self as ast, Keyword, Stmt};
+use ruff_python_trivia::CommentRanges;
 use ruff_text_size::Ranged;
 
 use crate::Locator;
@@ -90,7 +91,7 @@ pub(crate) fn inplace_argument(checker: &Checker, call: &ast::ExprCall) {
                         call,
                         keyword,
                         statement,
-                        checker.tokens(),
+                        checker.comment_ranges(),
                         checker.locator(),
                     ) {
                         diagnostic.set_fix(fix);
@@ -110,16 +111,21 @@ fn convert_inplace_argument_to_assignment(
     call: &ast::ExprCall,
     keyword: &Keyword,
     statement: &Stmt,
-    tokens: &Tokens,
+    comment_ranges: &CommentRanges,
     locator: &Locator,
 ) -> Option<Fix> {
     // Add the assignment.
     let attr = call.func.as_attribute_expr()?;
     let insert_assignment = Edit::insertion(
         format!("{name} = ", name = locator.slice(attr.value.range())),
-        parenthesized_range(call.into(), statement.into(), tokens)
-            .unwrap_or(call.range())
-            .start(),
+        parenthesized_range(
+            call.into(),
+            statement.into(),
+            comment_ranges,
+            locator.contents(),
+        )
+        .unwrap_or(call.range())
+        .start(),
     );
 
     // Remove the `inplace` argument.
@@ -128,7 +134,7 @@ fn convert_inplace_argument_to_assignment(
         &call.arguments,
         Parentheses::Preserve,
         locator.contents(),
-        tokens,
+        comment_ranges,
     )
     .ok()?;
 

crates/ruff_linter/src/rules/pycodestyle/rules/lambda_assignment.rs

@@ -1,5 +1,5 @@
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::token::parenthesized_range;
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::{
     self as ast, Expr, ExprEllipsisLiteral, ExprLambda, Identifier, Parameter,
     ParameterWithDefault, Parameters, Stmt,
@@ -265,19 +265,29 @@ fn replace_trailing_ellipsis_with_original_expr(
     stmt: &Stmt,
     checker: &Checker,
 ) -> String {
-    let original_expr_range =
-        parenthesized_range((&lambda.body).into(), lambda.into(), checker.tokens())
-            .unwrap_or(lambda.body.range());
+    let original_expr_range = parenthesized_range(
+        (&lambda.body).into(),
+        lambda.into(),
+        checker.comment_ranges(),
+        checker.source(),
+    )
+    .unwrap_or(lambda.body.range());
 
     // This prevents the autofix of introducing a syntax error if the lambda's body is an
     // expression spanned across multiple lines. To avoid the syntax error we preserve
     // the parenthesis around the body.
-    let original_expr_in_source =
-        if parenthesized_range(lambda.into(), stmt.into(), checker.tokens()).is_some() {
-            format!("({})", checker.locator().slice(original_expr_range))
-        } else {
-            checker.locator().slice(original_expr_range).to_string()
-        };
+    let original_expr_in_source = if parenthesized_range(
+        lambda.into(),
+        stmt.into(),
+        checker.comment_ranges(),
+        checker.source(),
+    )
+    .is_some()
+    {
+        format!("({})", checker.locator().slice(original_expr_range))
+    } else {
+        checker.locator().slice(original_expr_range).to_string()
+    };
 
     let placeholder_ellipsis_start = generated.rfind("...").unwrap();
     let placeholder_ellipsis_end = placeholder_ellipsis_start + "...".len();

crates/ruff_linter/src/rules/pycodestyle/rules/literal_comparisons.rs

@@ -1,4 +1,4 @@
-use ruff_python_ast::token::{Tokens, parenthesized_range};
+use ruff_python_ast::parenthesize::parenthesized_range;
 use rustc_hash::FxHashMap;
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
@@ -179,14 +179,15 @@ fn is_redundant_boolean_comparison(op: CmpOp, comparator: &Expr) -> Option<bool>
 
 fn generate_redundant_comparison(
     compare: &ast::ExprCompare,
-    tokens: &Tokens,
+    comment_ranges: &ruff_python_trivia::CommentRanges,
     source: &str,
     comparator: &Expr,
     kind: bool,
     needs_wrap: bool,
 ) -> String {
-    let comparator_range = parenthesized_range(comparator.into(), compare.into(), tokens)
-        .unwrap_or(comparator.range());
+    let comparator_range =
+        parenthesized_range(comparator.into(), compare.into(), comment_ranges, source)
+            .unwrap_or(comparator.range());
 
     let comparator_str = &source[comparator_range];
 
@@ -378,7 +379,7 @@ pub(crate) fn literal_comparisons(checker: &Checker, compare: &ast::ExprCompare)
             .copied()
             .collect::<Vec<_>>();
 
-        let tokens = checker.tokens();
+        let comment_ranges = checker.comment_ranges();
         let source = checker.source();
 
         let content = match (&*compare.ops, &*compare.comparators) {
@@ -386,13 +387,18 @@ pub(crate) fn literal_comparisons(checker: &Checker, compare: &ast::ExprCompare)
                 if let Some(kind) = is_redundant_boolean_comparison(*op, &compare.left) {
                     let needs_wrap = compare.left.range().start() != compare.range().start();
                     generate_redundant_comparison(
-                        compare, tokens, source, comparator, kind, needs_wrap,
+                        compare,
+                        comment_ranges,
+                        source,
+                        comparator,
+                        kind,
+                        needs_wrap,
                     )
                 } else if let Some(kind) = is_redundant_boolean_comparison(*op, comparator) {
                     let needs_wrap = comparator.range().end() != compare.range().end();
                     generate_redundant_comparison(
                         compare,
-                        tokens,
+                        comment_ranges,
                         source,
                         &compare.left,
                         kind,
@@ -404,7 +410,7 @@ pub(crate) fn literal_comparisons(checker: &Checker, compare: &ast::ExprCompare)
                         &ops,
                         &compare.comparators,
                         compare.into(),
-                        tokens,
+                        comment_ranges,
                         source,
                     )
                 }
@@ -414,7 +420,7 @@ pub(crate) fn literal_comparisons(checker: &Checker, compare: &ast::ExprCompare)
                 &ops,
                 &compare.comparators,
                 compare.into(),
-                tokens,
+                comment_ranges,
                 source,
             ),
         };

crates/ruff_linter/src/rules/pycodestyle/rules/not_tests.rs

@@ -107,7 +107,7 @@ pub(crate) fn not_tests(checker: &Checker, unary_op: &ast::ExprUnaryOp) {
                             &[CmpOp::NotIn],
                             comparators,
                             unary_op.into(),
-                            checker.tokens(),
+                            checker.comment_ranges(),
                             checker.source(),
                         ),
                         unary_op.range(),
@@ -127,7 +127,7 @@ pub(crate) fn not_tests(checker: &Checker, unary_op: &ast::ExprUnaryOp) {
                             &[CmpOp::IsNot],
                             comparators,
                             unary_op.into(),
-                            checker.tokens(),
+                            checker.comment_ranges(),
                             checker.source(),
                         ),
                         unary_op.range(),

crates/ruff_linter/src/rules/pyflakes/rules/repeated_keys.rs

@@ -3,7 +3,7 @@ use std::collections::hash_map::Entry;
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::comparable::{ComparableExpr, HashableExpr};
-use ruff_python_ast::token::parenthesized_range;
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::{self as ast, Expr};
 use ruff_text_size::Ranged;
 
@@ -193,14 +193,16 @@ pub(crate) fn repeated_keys(checker: &Checker, dict: &ast::ExprDict) {
                                     parenthesized_range(
                                         dict.value(i - 1).into(),
                                         dict.into(),
-                                        checker.tokens(),
+                                        checker.comment_ranges(),
+                                        checker.locator().contents(),
                                     )
                                     .unwrap_or_else(|| dict.value(i - 1).range())
                                     .end(),
                                     parenthesized_range(
                                         dict.value(i).into(),
                                         dict.into(),
-                                        checker.tokens(),
+                                        checker.comment_ranges(),
+                                        checker.locator().contents(),
                                     )
                                     .unwrap_or_else(|| dict.value(i).range())
                                     .end(),
@@ -222,14 +224,16 @@ pub(crate) fn repeated_keys(checker: &Checker, dict: &ast::ExprDict) {
                                     parenthesized_range(
                                         dict.value(i - 1).into(),
                                         dict.into(),
-                                        checker.tokens(),
+                                        checker.comment_ranges(),
+                                        checker.locator().contents(),
                                     )
                                     .unwrap_or_else(|| dict.value(i - 1).range())
                                     .end(),
                                     parenthesized_range(
                                         dict.value(i).into(),
                                         dict.into(),
-                                        checker.tokens(),
+                                        checker.comment_ranges(),
+                                        checker.locator().contents(),
                                     )
                                     .unwrap_or_else(|| dict.value(i).range())
                                     .end(),

crates/ruff_linter/src/rules/pyflakes/rules/unused_variable.rs

@@ -2,7 +2,7 @@ use itertools::Itertools;
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::helpers::contains_effect;
-use ruff_python_ast::token::parenthesized_range;
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::token::{TokenKind, Tokens};
 use ruff_python_ast::{self as ast, Stmt};
 use ruff_python_semantic::Binding;
@@ -172,10 +172,14 @@ fn remove_unused_variable(binding: &Binding, checker: &Checker) -> Option<Fix> {
                 {
                     // If the expression is complex (`x = foo()`), remove the assignment,
                     // but preserve the right-hand side.
-                    let start =
-                        parenthesized_range(target.into(), statement.into(), checker.tokens())
-                            .unwrap_or(target.range())
-                            .start();
+                    let start = parenthesized_range(
+                        target.into(),
+                        statement.into(),
+                        checker.comment_ranges(),
+                        checker.locator().contents(),
+                    )
+                    .unwrap_or(target.range())
+                    .start();
                     let end = match_token_after(checker.tokens(), target.end(), |token| {
                         token == TokenKind::Equal
                     })?

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

@@ -16,10 +16,10 @@ mod tests {
     use crate::registry::Rule;
     use crate::rules::{flake8_tidy_imports, pylint};
 
+    use crate::assert_diagnostics;
     use crate::settings::LinterSettings;
     use crate::settings::types::PreviewMode;
     use crate::test::test_path;
-    use crate::{assert_diagnostics, assert_diagnostics_diff};
 
     #[test_case(Rule::SingledispatchMethod, Path::new("singledispatch_method.py"))]
     #[test_case(
@@ -253,32 +253,6 @@ mod tests {
         Ok(())
     }
 
-    #[test_case(
-        Rule::UselessExceptionStatement,
-        Path::new("useless_exception_statement.py")
-    )]
-    fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
-        let snapshot = format!(
-            "preview__{}_{}",
-            rule_code.noqa_code(),
-            path.to_string_lossy()
-        );
-
-        assert_diagnostics_diff!(
-            snapshot,
-            Path::new("pylint").join(path).as_path(),
-            &LinterSettings {
-                preview: PreviewMode::Disabled,
-                ..LinterSettings::for_rule(rule_code)
-            },
-            &LinterSettings {
-                preview: PreviewMode::Enabled,
-                ..LinterSettings::for_rule(rule_code)
-            }
-        );
-        Ok(())
-    }
-
     #[test]
     fn continue_in_finally() -> Result<()> {
         let diagnostics = test_path(

crates/ruff_linter/src/rules/pylint/rules/boolean_chained_comparison.rs

@@ -2,7 +2,7 @@ use itertools::Itertools;
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::{
     BoolOp, CmpOp, Expr, ExprBoolOp, ExprCompare,
-    token::{parentheses_iterator, parenthesized_range},
+    parenthesize::{parentheses_iterator, parenthesized_range},
 };
 use ruff_text_size::{Ranged, TextRange};
 
@@ -62,7 +62,7 @@ pub(crate) fn boolean_chained_comparison(checker: &Checker, expr_bool_op: &ExprB
     }
 
     let locator = checker.locator();
-    let tokens = checker.tokens();
+    let comment_ranges = checker.comment_ranges();
 
     // retrieve all compare expressions from boolean expression
     let compare_expressions = expr_bool_op
@@ -89,22 +89,40 @@ pub(crate) fn boolean_chained_comparison(checker: &Checker, expr_bool_op: &ExprB
             continue;
         }
 
-        let left_paren_count =
-            parentheses_iterator(left_compare.into(), Some(expr_bool_op.into()), tokens).count();
+        let left_paren_count = parentheses_iterator(
+            left_compare.into(),
+            Some(expr_bool_op.into()),
+            comment_ranges,
+            locator.contents(),
+        )
+        .count();
 
-        let right_paren_count =
-            parentheses_iterator(right_compare.into(), Some(expr_bool_op.into()), tokens).count();
+        let right_paren_count = parentheses_iterator(
+            right_compare.into(),
+            Some(expr_bool_op.into()),
+            comment_ranges,
+            locator.contents(),
+        )
+        .count();
 
         // Create the edit that removes the comparison operator
 
         // In `a<(b) and ((b))<c`, we need to handle the
         // parentheses when specifying the fix range.
-        let left_compare_right_range =
-            parenthesized_range(left_compare_right.into(), left_compare.into(), tokens)
-                .unwrap_or(left_compare_right.range());
-        let right_compare_left_range =
-            parenthesized_range(right_compare_left.into(), right_compare.into(), tokens)
-                .unwrap_or(right_compare_left.range());
+        let left_compare_right_range = parenthesized_range(
+            left_compare_right.into(),
+            left_compare.into(),
+            comment_ranges,
+            locator.contents(),
+        )
+        .unwrap_or(left_compare_right.range());
+        let right_compare_left_range = parenthesized_range(
+            right_compare_left.into(),
+            right_compare.into(),
+            comment_ranges,
+            locator.contents(),
+        )
+        .unwrap_or(right_compare_left.range());
         let edit = Edit::range_replacement(
             locator.slice(left_compare_right_range).to_string(),
             TextRange::new(

crates/ruff_linter/src/rules/pylint/rules/duplicate_bases.rs

@@ -99,7 +99,7 @@ pub(crate) fn duplicate_bases(checker: &Checker, name: &str, arguments: Option<&
                         arguments,
                         Parentheses::Remove,
                         checker.locator().contents(),
-                        checker.tokens(),
+                        checker.comment_ranges(),
                     )
                     .map(|edit| {
                         Fix::applicable_edit(

crates/ruff_linter/src/rules/pylint/rules/if_stmt_min_max.rs

@@ -1,6 +1,6 @@
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::comparable::ComparableExpr;
-use ruff_python_ast::token::parenthesized_range;
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::{self as ast, CmpOp, Stmt};
 use ruff_text_size::Ranged;
 
@@ -166,8 +166,13 @@ pub(crate) fn if_stmt_min_max(checker: &Checker, stmt_if: &ast::StmtIf) {
     let replacement = format!(
         "{} = {min_max}({}, {})",
         checker.locator().slice(
-            parenthesized_range(body_target.into(), body.into(), checker.tokens())
-                .unwrap_or(body_target.range())
+            parenthesized_range(
+                body_target.into(),
+                body.into(),
+                checker.comment_ranges(),
+                checker.locator().contents()
+            )
+            .unwrap_or(body_target.range())
         ),
         checker.locator().slice(arg1),
         checker.locator().slice(arg2),

crates/ruff_linter/src/rules/pylint/rules/missing_maxsplit_arg.rs

@@ -174,8 +174,12 @@ pub(crate) fn missing_maxsplit_arg(checker: &Checker, value: &Expr, slice: &Expr
         SliceBoundary::Last => "rsplit",
     };
 
-    let maxsplit_argument_edit =
-        fix::edits::add_argument("maxsplit=1", arguments, checker.tokens());
+    let maxsplit_argument_edit = fix::edits::add_argument(
+        "maxsplit=1",
+        arguments,
+        checker.comment_ranges(),
+        checker.locator().contents(),
+    );
 
     // Only change `actual_split_type` if it doesn't match `suggested_split_type`
     let split_type_edit: Option<Edit> = if actual_split_type == suggested_split_type {

crates/ruff_linter/src/rules/pylint/rules/non_augmented_assignment.rs

@@ -2,7 +2,7 @@ use ast::Expr;
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast as ast;
 use ruff_python_ast::comparable::ComparableExpr;
-use ruff_python_ast::token::parenthesized_range;
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::{ExprBinOp, ExprRef, Operator};
 use ruff_text_size::{Ranged, TextRange};
 
@@ -150,10 +150,12 @@ fn augmented_assignment(
 
     let right_operand_ref = ExprRef::from(right_operand);
     let parent = original_expr.into();
-    let tokens = checker.tokens();
+    let comment_ranges = checker.comment_ranges();
+    let source = checker.source();
 
     let right_operand_range =
-        parenthesized_range(right_operand_ref, parent, tokens).unwrap_or(right_operand.range());
+        parenthesized_range(right_operand_ref, parent, comment_ranges, source)
+            .unwrap_or(right_operand.range());
     let right_operand_expr = locator.slice(right_operand_range);
 
     let target_expr = locator.slice(target);

crates/ruff_linter/src/rules/pylint/rules/subprocess_run_without_check.rs

@@ -75,7 +75,12 @@ pub(crate) fn subprocess_run_without_check(checker: &Checker, call: &ast::ExprCa
             let mut diagnostic =
                 checker.report_diagnostic(SubprocessRunWithoutCheck, call.func.range());
             diagnostic.set_fix(Fix::applicable_edit(
-                add_argument("check=False", &call.arguments, checker.tokens()),
+                add_argument(
+                    "check=False",
+                    &call.arguments,
+                    checker.comment_ranges(),
+                    checker.locator().contents(),
+                ),
                 // If the function call contains `**kwargs`, mark the fix as unsafe.
                 if call
                     .arguments

crates/ruff_linter/src/rules/pylint/rules/unspecified_encoding.rs

@@ -1,7 +1,8 @@
 use std::fmt::{Display, Formatter};
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::{self as ast, Expr, name::QualifiedName};
+use ruff_python_ast::name::QualifiedName;
+use ruff_python_ast::{self as ast, Expr};
 use ruff_python_semantic::SemanticModel;
 use ruff_python_semantic::analyze::typing;
 use ruff_text_size::{Ranged, TextRange};
@@ -192,7 +193,8 @@ fn generate_keyword_fix(checker: &Checker, call: &ast::ExprCall) -> Fix {
             }))
         ),
         &call.arguments,
-        checker.tokens(),
+        checker.comment_ranges(),
+        checker.locator().contents(),
     ))
 }
 

crates/ruff_linter/src/rules/pylint/rules/useless_exception_statement.rs

@@ -1,11 +1,10 @@
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::{self as ast, Expr};
-use ruff_python_semantic::{SemanticModel, analyze};
+use ruff_python_semantic::SemanticModel;
 use ruff_python_stdlib::builtins;
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
-use crate::preview::is_custom_exception_checking_enabled;
 use crate::{Edit, Fix, FixAvailability, Violation};
 use ruff_python_ast::PythonVersion;
 
@@ -21,9 +20,6 @@ use ruff_python_ast::PythonVersion;
 /// This rule only detects built-in exceptions, like `ValueError`, and does
 /// not catch user-defined exceptions.
 ///
-/// In [preview], this rule will also detect user-defined exceptions, but only
-/// the ones defined in the file being checked.
-///
 /// ## Example
 /// ```python
 /// ValueError("...")
@@ -36,8 +32,7 @@ use ruff_python_ast::PythonVersion;
 ///
 /// ## Fix safety
 /// This rule's fix is marked as unsafe, as converting a useless exception
-///
-/// [preview]: https://docs.astral.sh/ruff/preview/
+/// statement to a `raise` statement will change the program's behavior.
 #[derive(ViolationMetadata)]
 #[violation_metadata(stable_since = "0.5.0")]
 pub(crate) struct UselessExceptionStatement;
@@ -61,10 +56,7 @@ pub(crate) fn useless_exception_statement(checker: &Checker, expr: &ast::StmtExp
         return;
     };
 
-    if is_builtin_exception(func, checker.semantic(), checker.target_version())
-        || (is_custom_exception_checking_enabled(checker.settings())
-            && is_custom_exception(func, checker.semantic(), checker.target_version()))
-    {
+    if is_builtin_exception(func, checker.semantic(), checker.target_version()) {
         let mut diagnostic = checker.report_diagnostic(UselessExceptionStatement, expr.range());
         diagnostic.set_fix(Fix::unsafe_edit(Edit::insertion(
             "raise ".to_string(),
@@ -86,34 +78,3 @@ fn is_builtin_exception(
             if builtins::is_exception(name, target_version.minor))
         })
 }
-
-/// Returns `true` if the given expression is a custom exception.
-fn is_custom_exception(
-    expr: &Expr,
-    semantic: &SemanticModel,
-    target_version: PythonVersion,
-) -> bool {
-    let Some(qualified_name) = semantic.resolve_qualified_name(expr) else {
-        return false;
-    };
-    let Some(symbol) = qualified_name.segments().last() else {
-        return false;
-    };
-    let Some(binding_id) = semantic.lookup_symbol(symbol) else {
-        return false;
-    };
-    let binding = semantic.binding(binding_id);
-    let Some(source) = binding.source else {
-        return false;
-    };
-    let statement = semantic.statement(source);
-    if let ast::Stmt::ClassDef(class_def) = statement {
-        return analyze::class::any_qualified_base_class(class_def, semantic, &|qualified_name| {
-            if let ["" | "builtins", name] = qualified_name.segments() {
-                return builtins::is_exception(name, target_version.minor);
-            }
-            false
-        });
-    }
-    false
-}

crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0133_useless_exception_statement.py.snap

@@ -2,294 +2,250 @@
 source: crates/ruff_linter/src/rules/pylint/mod.rs
 ---
 PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:26:5
-   |
-24 | # Test case 1: Useless exception statement
-25 | def func():
-26 |     AssertionError("This is an assertion error")  # PLW0133
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-27 |     MyError("This is a custom error")  # PLW0133
-28 |     MySubError("This is a custom error")  # PLW0133
-   |
+ --> useless_exception_statement.py:7:5
+  |
+5 | # Test case 1: Useless exception statement
+6 | def func():
+7 |     AssertionError("This is an assertion error")  # PLW0133
+  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |
 help: Add `raise` keyword
-23 | 
-24 | # Test case 1: Useless exception statement
-25 | def func():
+4  | 
+5  | # Test case 1: Useless exception statement
+6  | def func():
    -     AssertionError("This is an assertion error")  # PLW0133
-26 +     raise AssertionError("This is an assertion error")  # PLW0133
-27 |     MyError("This is a custom error")  # PLW0133
-28 |     MySubError("This is a custom error")  # PLW0133
-29 |     MyValueError("This is a custom value error")  # PLW0133
+7  +     raise AssertionError("This is an assertion error")  # PLW0133
+8  | 
+9  | 
+10 | # Test case 2: Useless exception statement in try-except block
 note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:35:9
+  --> useless_exception_statement.py:13:9
    |
-33 | def func():
-34 |     try:
-35 |         Exception("This is an exception")  # PLW0133
+11 | def func():
+12 |     try:
+13 |         Exception("This is an exception")  # PLW0133
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-36 |         MyError("This is an exception")  # PLW0133
-37 |         MySubError("This is an exception")  # PLW0133
+14 |     except Exception as err:
+15 |         pass
    |
 help: Add `raise` keyword
-32 | # Test case 2: Useless exception statement in try-except block
-33 | def func():
-34 |     try:
+10 | # Test case 2: Useless exception statement in try-except block
+11 | def func():
+12 |     try:
    -         Exception("This is an exception")  # PLW0133
-35 +         raise Exception("This is an exception")  # PLW0133
-36 |         MyError("This is an exception")  # PLW0133
-37 |         MySubError("This is an exception")  # PLW0133
-38 |         MyValueError("This is an exception")  # PLW0133
+13 +         raise Exception("This is an exception")  # PLW0133
+14 |     except Exception as err:
+15 |         pass
+16 | 
 note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:46:9
+  --> useless_exception_statement.py:21:9
    |
-44 | def func():
-45 |     if True:
-46 |         RuntimeError("This is an exception")  # PLW0133
+19 | def func():
+20 |     if True:
+21 |         RuntimeError("This is an exception")  # PLW0133
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-47 |         MyError("This is an exception")  # PLW0133
-48 |         MySubError("This is an exception")  # PLW0133
    |
 help: Add `raise` keyword
-43 | # Test case 3: Useless exception statement in if statement
-44 | def func():
-45 |     if True:
+18 | # Test case 3: Useless exception statement in if statement
+19 | def func():
+20 |     if True:
    -         RuntimeError("This is an exception")  # PLW0133
-46 +         raise RuntimeError("This is an exception")  # PLW0133
-47 |         MyError("This is an exception")  # PLW0133
-48 |         MySubError("This is an exception")  # PLW0133
-49 |         MyValueError("This is an exception")  # PLW0133
+21 +         raise RuntimeError("This is an exception")  # PLW0133
+22 | 
+23 | 
+24 | # Test case 4: Useless exception statement in class
 note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:56:13
+  --> useless_exception_statement.py:28:13
    |
-54 |     class Class:
-55 |         def __init__(self):
-56 |             TypeError("This is an exception")  # PLW0133
+26 |     class Class:
+27 |         def __init__(self):
+28 |             TypeError("This is an exception")  # PLW0133
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-57 |             MyError("This is an exception")  # PLW0133
-58 |             MySubError("This is an exception")  # PLW0133
    |
 help: Add `raise` keyword
-53 | def func():
-54 |     class Class:
-55 |         def __init__(self):
+25 | def func():
+26 |     class Class:
+27 |         def __init__(self):
    -             TypeError("This is an exception")  # PLW0133
-56 +             raise TypeError("This is an exception")  # PLW0133
-57 |             MyError("This is an exception")  # PLW0133
-58 |             MySubError("This is an exception")  # PLW0133
-59 |             MyValueError("This is an exception")  # PLW0133
+28 +             raise TypeError("This is an exception")  # PLW0133
+29 | 
+30 | 
+31 | # Test case 5: Useless exception statement in function
 note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:65:9
+  --> useless_exception_statement.py:34:9
    |
-63 | def func():
-64 |     def inner():
-65 |         IndexError("This is an exception")  # PLW0133
+32 | def func():
+33 |     def inner():
+34 |         IndexError("This is an exception")  # PLW0133
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-66 |         MyError("This is an exception")  # PLW0133
-67 |         MySubError("This is an exception")  # PLW0133
+35 |
+36 |     inner()
    |
 help: Add `raise` keyword
-62 | # Test case 5: Useless exception statement in function
-63 | def func():
-64 |     def inner():
+31 | # Test case 5: Useless exception statement in function
+32 | def func():
+33 |     def inner():
    -         IndexError("This is an exception")  # PLW0133
-65 +         raise IndexError("This is an exception")  # PLW0133
-66 |         MyError("This is an exception")  # PLW0133
-67 |         MySubError("This is an exception")  # PLW0133
-68 |         MyValueError("This is an exception")  # PLW0133
+34 +         raise IndexError("This is an exception")  # PLW0133
+35 | 
+36 |     inner()
+37 | 
 note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:76:9
+  --> useless_exception_statement.py:42:9
    |
-74 | def func():
-75 |     while True:
-76 |         KeyError("This is an exception")  # PLW0133
+40 | def func():
+41 |     while True:
+42 |         KeyError("This is an exception")  # PLW0133
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-77 |         MyError("This is an exception")  # PLW0133
-78 |         MySubError("This is an exception")  # PLW0133
    |
 help: Add `raise` keyword
-73 | # Test case 6: Useless exception statement in while loop
-74 | def func():
-75 |     while True:
+39 | # Test case 6: Useless exception statement in while loop
+40 | def func():
+41 |     while True:
    -         KeyError("This is an exception")  # PLW0133
-76 +         raise KeyError("This is an exception")  # PLW0133
-77 |         MyError("This is an exception")  # PLW0133
-78 |         MySubError("This is an exception")  # PLW0133
-79 |         MyValueError("This is an exception")  # PLW0133
+42 +         raise KeyError("This is an exception")  # PLW0133
+43 | 
+44 | 
+45 | # Test case 7: Useless exception statement in abstract class
 note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:87:13
+  --> useless_exception_statement.py:50:13
    |
-85 |         @abstractmethod
-86 |         def method(self):
-87 |             NotImplementedError("This is an exception")  # PLW0133
+48 |         @abstractmethod
+49 |         def method(self):
+50 |             NotImplementedError("This is an exception")  # PLW0133
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-88 |             MyError("This is an exception")  # PLW0133
-89 |             MySubError("This is an exception")  # PLW0133
    |
 help: Add `raise` keyword
-84 |     class Class(ABC):
-85 |         @abstractmethod
-86 |         def method(self):
+47 |     class Class(ABC):
+48 |         @abstractmethod
+49 |         def method(self):
    -             NotImplementedError("This is an exception")  # PLW0133
-87 +             raise NotImplementedError("This is an exception")  # PLW0133
-88 |             MyError("This is an exception")  # PLW0133
-89 |             MySubError("This is an exception")  # PLW0133
-90 |             MyValueError("This is an exception")  # PLW0133
+50 +             raise NotImplementedError("This is an exception")  # PLW0133
+51 | 
+52 | 
+53 | # Test case 8: Useless exception statement inside context manager
 note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:96:9
+  --> useless_exception_statement.py:56:9
    |
-94 | def func():
-95 |     with suppress(Exception):
-96 |         AttributeError("This is an exception")  # PLW0133
+54 | def func():
+55 |     with suppress(AttributeError):
+56 |         AttributeError("This is an exception")  # PLW0133
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-97 |         MyError("This is an exception")  # PLW0133
-98 |         MySubError("This is an exception")  # PLW0133
    |
 help: Add `raise` keyword
-93 | # Test case 8: Useless exception statement inside context manager
-94 | def func():
-95 |     with suppress(Exception):
+53 | # Test case 8: Useless exception statement inside context manager
+54 | def func():
+55 |     with suppress(AttributeError):
    -         AttributeError("This is an exception")  # PLW0133
-96 +         raise AttributeError("This is an exception")  # PLW0133
-97 |         MyError("This is an exception")  # PLW0133
-98 |         MySubError("This is an exception")  # PLW0133
-99 |         MyValueError("This is an exception")  # PLW0133
+56 +         raise AttributeError("This is an exception")  # PLW0133
+57 | 
+58 | 
+59 | # Test case 9: Useless exception statement in parentheses
 note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
-   --> useless_exception_statement.py:104:5
-    |
-102 | # Test case 9: Useless exception statement in parentheses
-103 | def func():
-104 |     (RuntimeError("This is an exception"))  # PLW0133
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-105 |     (MyError("This is an exception"))  # PLW0133
-106 |     (MySubError("This is an exception"))  # PLW0133
-    |
+  --> useless_exception_statement.py:61:5
+   |
+59 | # Test case 9: Useless exception statement in parentheses
+60 | def func():
+61 |     (RuntimeError("This is an exception"))  # PLW0133
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
 help: Add `raise` keyword
-101 | 
-102 | # Test case 9: Useless exception statement in parentheses
-103 | def func():
-    -     (RuntimeError("This is an exception"))  # PLW0133
-104 +     raise (RuntimeError("This is an exception"))  # PLW0133
-105 |     (MyError("This is an exception"))  # PLW0133
-106 |     (MySubError("This is an exception"))  # PLW0133
-107 |     (MyValueError("This is an exception"))  # PLW0133
+58 | 
+59 | # Test case 9: Useless exception statement in parentheses
+60 | def func():
+   -     (RuntimeError("This is an exception"))  # PLW0133
+61 +     raise (RuntimeError("This is an exception"))  # PLW0133
+62 | 
+63 | 
+64 | # Test case 10: Useless exception statement in continuation
 note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
-   --> useless_exception_statement.py:112:12
-    |
-110 | # Test case 10: Useless exception statement in continuation
-111 | def func():
-112 |     x = 1; (RuntimeError("This is an exception")); y = 2  # PLW0133
-    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-113 |     x = 1; (MyError("This is an exception")); y = 2  # PLW0133
-114 |     x = 1; (MySubError("This is an exception")); y = 2  # PLW0133
-    |
+  --> useless_exception_statement.py:66:12
+   |
+64 | # Test case 10: Useless exception statement in continuation
+65 | def func():
+66 |     x = 1; (RuntimeError("This is an exception")); y = 2  # PLW0133
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
 help: Add `raise` keyword
-109 | 
-110 | # Test case 10: Useless exception statement in continuation
-111 | def func():
-    -     x = 1; (RuntimeError("This is an exception")); y = 2  # PLW0133
-112 +     x = 1; raise (RuntimeError("This is an exception")); y = 2  # PLW0133
-113 |     x = 1; (MyError("This is an exception")); y = 2  # PLW0133
-114 |     x = 1; (MySubError("This is an exception")); y = 2  # PLW0133
-115 |     x = 1; (MyValueError("This is an exception")); y = 2  # PLW0133
+63 | 
+64 | # Test case 10: Useless exception statement in continuation
+65 | def func():
+   -     x = 1; (RuntimeError("This is an exception")); y = 2  # PLW0133
+66 +     x = 1; raise (RuntimeError("This is an exception")); y = 2  # PLW0133
+67 | 
+68 | 
+69 | # Test case 11: Useless warning statement
 note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
-   --> useless_exception_statement.py:120:5
-    |
-118 | # Test case 11: Useless warning statement
-119 | def func():
-120 |     UserWarning("This is a user warning")  # PLW0133
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-121 |     MyUserWarning("This is a custom user warning")  # PLW0133
-    |
+  --> useless_exception_statement.py:71:5
+   |
+69 | # Test case 11: Useless warning statement
+70 | def func():
+71 |     UserWarning("This is an assertion error")  # PLW0133
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
 help: Add `raise` keyword
-117 | 
-118 | # Test case 11: Useless warning statement
-119 | def func():
-    -     UserWarning("This is a user warning")  # PLW0133
-120 +     raise UserWarning("This is a user warning")  # PLW0133
-121 |     MyUserWarning("This is a custom user warning")  # PLW0133
-122 | 
-123 | 
+68 | 
+69 | # Test case 11: Useless warning statement
+70 | def func():
+   -     UserWarning("This is an assertion error")  # PLW0133
+71 +     raise UserWarning("This is an assertion error")  # PLW0133
+72 | 
+73 | 
+74 | # Non-violation test cases: PLW0133
 note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
-   --> useless_exception_statement.py:127:1
+   --> useless_exception_statement.py:126:1
     |
-125 | import builtins
-126 |
-127 | builtins.TypeError("still an exception even though it's an Attribute")  # PLW0133
+124 | import builtins
+125 |
+126 | builtins.TypeError("still an exception even though it's an Attribute")
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-128 |
-129 | PythonFinalizationError("Added in Python 3.13")  # PLW0133
+127 |
+128 | PythonFinalizationError("Added in Python 3.13")
     |
 help: Add `raise` keyword
-124 | # Test case 12: Useless exception statement at module level
-125 | import builtins
-126 | 
-    - builtins.TypeError("still an exception even though it's an Attribute")  # PLW0133
-127 + raise builtins.TypeError("still an exception even though it's an Attribute")  # PLW0133
-128 | 
-129 | PythonFinalizationError("Added in Python 3.13")  # PLW0133
-130 | 
+123 | 
+124 | import builtins
+125 | 
+    - builtins.TypeError("still an exception even though it's an Attribute")
+126 + raise builtins.TypeError("still an exception even though it's an Attribute")
+127 | 
+128 | PythonFinalizationError("Added in Python 3.13")
 note: This is an unsafe fix and may change runtime behavior
 
 PLW0133 [*] Missing `raise` statement on exception
-   --> useless_exception_statement.py:129:1
+   --> useless_exception_statement.py:128:1
     |
-127 | builtins.TypeError("still an exception even though it's an Attribute")  # PLW0133
-128 |
-129 | PythonFinalizationError("Added in Python 3.13")  # PLW0133
+126 | builtins.TypeError("still an exception even though it's an Attribute")
+127 |
+128 | PythonFinalizationError("Added in Python 3.13")
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-130 |
-131 | MyError("This is an exception")  # PLW0133
     |
 help: Add `raise` keyword
-126 | 
-127 | builtins.TypeError("still an exception even though it's an Attribute")  # PLW0133
-128 | 
-    - PythonFinalizationError("Added in Python 3.13")  # PLW0133
-129 + raise PythonFinalizationError("Added in Python 3.13")  # PLW0133
-130 | 
-131 | MyError("This is an exception")  # PLW0133
-132 | 
-note: This is an unsafe fix and may change runtime behavior
-
-PLW0133 [*] Missing `raise` statement on exception
-   --> useless_exception_statement.py:137:1
-    |
-135 | MyValueError("This is an exception")  # PLW0133
-136 |
-137 | UserWarning("This is a user warning")  # PLW0133
-    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-138 |
-139 | MyUserWarning("This is a custom user warning")  # PLW0133
-    |
-help: Add `raise` keyword
-134 | 
-135 | MyValueError("This is an exception")  # PLW0133
-136 | 
-    - UserWarning("This is a user warning")  # PLW0133
-137 + raise UserWarning("This is a user warning")  # PLW0133
-138 | 
-139 | MyUserWarning("This is a custom user warning")  # PLW0133
-140 | 
+125 | 
+126 | builtins.TypeError("still an exception even though it's an Attribute")
+127 | 
+    - PythonFinalizationError("Added in Python 3.13")
+128 + raise PythonFinalizationError("Added in Python 3.13")
 note: This is an unsafe fix and may change runtime behavior

crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__preview__PLW0133_useless_exception_statement.py.snap

@@ -1,751 +0,0 @@
----
-source: crates/ruff_linter/src/rules/pylint/mod.rs
----
---- Linter settings ---
--linter.preview = disabled
-+linter.preview = enabled
-
---- Summary ---
-Removed: 0
-Added: 35
-
---- Added ---
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:27:5
-   |
-25 | def func():
-26 |     AssertionError("This is an assertion error")  # PLW0133
-27 |     MyError("This is a custom error")  # PLW0133
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-28 |     MySubError("This is a custom error")  # PLW0133
-29 |     MyValueError("This is a custom value error")  # PLW0133
-   |
-help: Add `raise` keyword
-24 | # Test case 1: Useless exception statement
-25 | def func():
-26 |     AssertionError("This is an assertion error")  # PLW0133
-   -     MyError("This is a custom error")  # PLW0133
-27 +     raise MyError("This is a custom error")  # PLW0133
-28 |     MySubError("This is a custom error")  # PLW0133
-29 |     MyValueError("This is a custom value error")  # PLW0133
-30 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:28:5
-   |
-26 |     AssertionError("This is an assertion error")  # PLW0133
-27 |     MyError("This is a custom error")  # PLW0133
-28 |     MySubError("This is a custom error")  # PLW0133
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-29 |     MyValueError("This is a custom value error")  # PLW0133
-   |
-help: Add `raise` keyword
-25 | def func():
-26 |     AssertionError("This is an assertion error")  # PLW0133
-27 |     MyError("This is a custom error")  # PLW0133
-   -     MySubError("This is a custom error")  # PLW0133
-28 +     raise MySubError("This is a custom error")  # PLW0133
-29 |     MyValueError("This is a custom value error")  # PLW0133
-30 | 
-31 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:29:5
-   |
-27 |     MyError("This is a custom error")  # PLW0133
-28 |     MySubError("This is a custom error")  # PLW0133
-29 |     MyValueError("This is a custom value error")  # PLW0133
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-help: Add `raise` keyword
-26 |     AssertionError("This is an assertion error")  # PLW0133
-27 |     MyError("This is a custom error")  # PLW0133
-28 |     MySubError("This is a custom error")  # PLW0133
-   -     MyValueError("This is a custom value error")  # PLW0133
-29 +     raise MyValueError("This is a custom value error")  # PLW0133
-30 | 
-31 | 
-32 | # Test case 2: Useless exception statement in try-except block
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:36:9
-   |
-34 |     try:
-35 |         Exception("This is an exception")  # PLW0133
-36 |         MyError("This is an exception")  # PLW0133
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-37 |         MySubError("This is an exception")  # PLW0133
-38 |         MyValueError("This is an exception")  # PLW0133
-   |
-help: Add `raise` keyword
-33 | def func():
-34 |     try:
-35 |         Exception("This is an exception")  # PLW0133
-   -         MyError("This is an exception")  # PLW0133
-36 +         raise MyError("This is an exception")  # PLW0133
-37 |         MySubError("This is an exception")  # PLW0133
-38 |         MyValueError("This is an exception")  # PLW0133
-39 |     except Exception as err:
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:37:9
-   |
-35 |         Exception("This is an exception")  # PLW0133
-36 |         MyError("This is an exception")  # PLW0133
-37 |         MySubError("This is an exception")  # PLW0133
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-38 |         MyValueError("This is an exception")  # PLW0133
-39 |     except Exception as err:
-   |
-help: Add `raise` keyword
-34 |     try:
-35 |         Exception("This is an exception")  # PLW0133
-36 |         MyError("This is an exception")  # PLW0133
-   -         MySubError("This is an exception")  # PLW0133
-37 +         raise MySubError("This is an exception")  # PLW0133
-38 |         MyValueError("This is an exception")  # PLW0133
-39 |     except Exception as err:
-40 |         pass
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:38:9
-   |
-36 |         MyError("This is an exception")  # PLW0133
-37 |         MySubError("This is an exception")  # PLW0133
-38 |         MyValueError("This is an exception")  # PLW0133
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-39 |     except Exception as err:
-40 |         pass
-   |
-help: Add `raise` keyword
-35 |         Exception("This is an exception")  # PLW0133
-36 |         MyError("This is an exception")  # PLW0133
-37 |         MySubError("This is an exception")  # PLW0133
-   -         MyValueError("This is an exception")  # PLW0133
-38 +         raise MyValueError("This is an exception")  # PLW0133
-39 |     except Exception as err:
-40 |         pass
-41 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:47:9
-   |
-45 |     if True:
-46 |         RuntimeError("This is an exception")  # PLW0133
-47 |         MyError("This is an exception")  # PLW0133
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-48 |         MySubError("This is an exception")  # PLW0133
-49 |         MyValueError("This is an exception")  # PLW0133
-   |
-help: Add `raise` keyword
-44 | def func():
-45 |     if True:
-46 |         RuntimeError("This is an exception")  # PLW0133
-   -         MyError("This is an exception")  # PLW0133
-47 +         raise MyError("This is an exception")  # PLW0133
-48 |         MySubError("This is an exception")  # PLW0133
-49 |         MyValueError("This is an exception")  # PLW0133
-50 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:48:9
-   |
-46 |         RuntimeError("This is an exception")  # PLW0133
-47 |         MyError("This is an exception")  # PLW0133
-48 |         MySubError("This is an exception")  # PLW0133
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-49 |         MyValueError("This is an exception")  # PLW0133
-   |
-help: Add `raise` keyword
-45 |     if True:
-46 |         RuntimeError("This is an exception")  # PLW0133
-47 |         MyError("This is an exception")  # PLW0133
-   -         MySubError("This is an exception")  # PLW0133
-48 +         raise MySubError("This is an exception")  # PLW0133
-49 |         MyValueError("This is an exception")  # PLW0133
-50 | 
-51 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:49:9
-   |
-47 |         MyError("This is an exception")  # PLW0133
-48 |         MySubError("This is an exception")  # PLW0133
-49 |         MyValueError("This is an exception")  # PLW0133
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-help: Add `raise` keyword
-46 |         RuntimeError("This is an exception")  # PLW0133
-47 |         MyError("This is an exception")  # PLW0133
-48 |         MySubError("This is an exception")  # PLW0133
-   -         MyValueError("This is an exception")  # PLW0133
-49 +         raise MyValueError("This is an exception")  # PLW0133
-50 | 
-51 | 
-52 | # Test case 4: Useless exception statement in class
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:57:13
-   |
-55 |         def __init__(self):
-56 |             TypeError("This is an exception")  # PLW0133
-57 |             MyError("This is an exception")  # PLW0133
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-58 |             MySubError("This is an exception")  # PLW0133
-59 |             MyValueError("This is an exception")  # PLW0133
-   |
-help: Add `raise` keyword
-54 |     class Class:
-55 |         def __init__(self):
-56 |             TypeError("This is an exception")  # PLW0133
-   -             MyError("This is an exception")  # PLW0133
-57 +             raise MyError("This is an exception")  # PLW0133
-58 |             MySubError("This is an exception")  # PLW0133
-59 |             MyValueError("This is an exception")  # PLW0133
-60 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:58:13
-   |
-56 |             TypeError("This is an exception")  # PLW0133
-57 |             MyError("This is an exception")  # PLW0133
-58 |             MySubError("This is an exception")  # PLW0133
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-59 |             MyValueError("This is an exception")  # PLW0133
-   |
-help: Add `raise` keyword
-55 |         def __init__(self):
-56 |             TypeError("This is an exception")  # PLW0133
-57 |             MyError("This is an exception")  # PLW0133
-   -             MySubError("This is an exception")  # PLW0133
-58 +             raise MySubError("This is an exception")  # PLW0133
-59 |             MyValueError("This is an exception")  # PLW0133
-60 | 
-61 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:59:13
-   |
-57 |             MyError("This is an exception")  # PLW0133
-58 |             MySubError("This is an exception")  # PLW0133
-59 |             MyValueError("This is an exception")  # PLW0133
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-help: Add `raise` keyword
-56 |             TypeError("This is an exception")  # PLW0133
-57 |             MyError("This is an exception")  # PLW0133
-58 |             MySubError("This is an exception")  # PLW0133
-   -             MyValueError("This is an exception")  # PLW0133
-59 +             raise MyValueError("This is an exception")  # PLW0133
-60 | 
-61 | 
-62 | # Test case 5: Useless exception statement in function
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:66:9
-   |
-64 |     def inner():
-65 |         IndexError("This is an exception")  # PLW0133
-66 |         MyError("This is an exception")  # PLW0133
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-67 |         MySubError("This is an exception")  # PLW0133
-68 |         MyValueError("This is an exception")  # PLW0133
-   |
-help: Add `raise` keyword
-63 | def func():
-64 |     def inner():
-65 |         IndexError("This is an exception")  # PLW0133
-   -         MyError("This is an exception")  # PLW0133
-66 +         raise MyError("This is an exception")  # PLW0133
-67 |         MySubError("This is an exception")  # PLW0133
-68 |         MyValueError("This is an exception")  # PLW0133
-69 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:67:9
-   |
-65 |         IndexError("This is an exception")  # PLW0133
-66 |         MyError("This is an exception")  # PLW0133
-67 |         MySubError("This is an exception")  # PLW0133
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-68 |         MyValueError("This is an exception")  # PLW0133
-   |
-help: Add `raise` keyword
-64 |     def inner():
-65 |         IndexError("This is an exception")  # PLW0133
-66 |         MyError("This is an exception")  # PLW0133
-   -         MySubError("This is an exception")  # PLW0133
-67 +         raise MySubError("This is an exception")  # PLW0133
-68 |         MyValueError("This is an exception")  # PLW0133
-69 | 
-70 |     inner()
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:68:9
-   |
-66 |         MyError("This is an exception")  # PLW0133
-67 |         MySubError("This is an exception")  # PLW0133
-68 |         MyValueError("This is an exception")  # PLW0133
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-69 |
-70 |     inner()
-   |
-help: Add `raise` keyword
-65 |         IndexError("This is an exception")  # PLW0133
-66 |         MyError("This is an exception")  # PLW0133
-67 |         MySubError("This is an exception")  # PLW0133
-   -         MyValueError("This is an exception")  # PLW0133
-68 +         raise MyValueError("This is an exception")  # PLW0133
-69 | 
-70 |     inner()
-71 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:77:9
-   |
-75 |     while True:
-76 |         KeyError("This is an exception")  # PLW0133
-77 |         MyError("This is an exception")  # PLW0133
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-78 |         MySubError("This is an exception")  # PLW0133
-79 |         MyValueError("This is an exception")  # PLW0133
-   |
-help: Add `raise` keyword
-74 | def func():
-75 |     while True:
-76 |         KeyError("This is an exception")  # PLW0133
-   -         MyError("This is an exception")  # PLW0133
-77 +         raise MyError("This is an exception")  # PLW0133
-78 |         MySubError("This is an exception")  # PLW0133
-79 |         MyValueError("This is an exception")  # PLW0133
-80 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:78:9
-   |
-76 |         KeyError("This is an exception")  # PLW0133
-77 |         MyError("This is an exception")  # PLW0133
-78 |         MySubError("This is an exception")  # PLW0133
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-79 |         MyValueError("This is an exception")  # PLW0133
-   |
-help: Add `raise` keyword
-75 |     while True:
-76 |         KeyError("This is an exception")  # PLW0133
-77 |         MyError("This is an exception")  # PLW0133
-   -         MySubError("This is an exception")  # PLW0133
-78 +         raise MySubError("This is an exception")  # PLW0133
-79 |         MyValueError("This is an exception")  # PLW0133
-80 | 
-81 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:79:9
-   |
-77 |         MyError("This is an exception")  # PLW0133
-78 |         MySubError("This is an exception")  # PLW0133
-79 |         MyValueError("This is an exception")  # PLW0133
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-help: Add `raise` keyword
-76 |         KeyError("This is an exception")  # PLW0133
-77 |         MyError("This is an exception")  # PLW0133
-78 |         MySubError("This is an exception")  # PLW0133
-   -         MyValueError("This is an exception")  # PLW0133
-79 +         raise MyValueError("This is an exception")  # PLW0133
-80 | 
-81 | 
-82 | # Test case 7: Useless exception statement in abstract class
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:88:13
-   |
-86 |         def method(self):
-87 |             NotImplementedError("This is an exception")  # PLW0133
-88 |             MyError("This is an exception")  # PLW0133
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-89 |             MySubError("This is an exception")  # PLW0133
-90 |             MyValueError("This is an exception")  # PLW0133
-   |
-help: Add `raise` keyword
-85 |         @abstractmethod
-86 |         def method(self):
-87 |             NotImplementedError("This is an exception")  # PLW0133
-   -             MyError("This is an exception")  # PLW0133
-88 +             raise MyError("This is an exception")  # PLW0133
-89 |             MySubError("This is an exception")  # PLW0133
-90 |             MyValueError("This is an exception")  # PLW0133
-91 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:89:13
-   |
-87 |             NotImplementedError("This is an exception")  # PLW0133
-88 |             MyError("This is an exception")  # PLW0133
-89 |             MySubError("This is an exception")  # PLW0133
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-90 |             MyValueError("This is an exception")  # PLW0133
-   |
-help: Add `raise` keyword
-86 |         def method(self):
-87 |             NotImplementedError("This is an exception")  # PLW0133
-88 |             MyError("This is an exception")  # PLW0133
-   -             MySubError("This is an exception")  # PLW0133
-89 +             raise MySubError("This is an exception")  # PLW0133
-90 |             MyValueError("This is an exception")  # PLW0133
-91 | 
-92 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:90:13
-   |
-88 |             MyError("This is an exception")  # PLW0133
-89 |             MySubError("This is an exception")  # PLW0133
-90 |             MyValueError("This is an exception")  # PLW0133
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-help: Add `raise` keyword
-87 |             NotImplementedError("This is an exception")  # PLW0133
-88 |             MyError("This is an exception")  # PLW0133
-89 |             MySubError("This is an exception")  # PLW0133
-   -             MyValueError("This is an exception")  # PLW0133
-90 +             raise MyValueError("This is an exception")  # PLW0133
-91 | 
-92 | 
-93 | # Test case 8: Useless exception statement inside context manager
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:97:9
-   |
-95 |     with suppress(Exception):
-96 |         AttributeError("This is an exception")  # PLW0133
-97 |         MyError("This is an exception")  # PLW0133
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-98 |         MySubError("This is an exception")  # PLW0133
-99 |         MyValueError("This is an exception")  # PLW0133
-   |
-help: Add `raise` keyword
-94  | def func():
-95  |     with suppress(Exception):
-96  |         AttributeError("This is an exception")  # PLW0133
-    -         MyError("This is an exception")  # PLW0133
-97  +         raise MyError("This is an exception")  # PLW0133
-98  |         MySubError("This is an exception")  # PLW0133
-99  |         MyValueError("This is an exception")  # PLW0133
-100 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:98:9
-   |
-96 |         AttributeError("This is an exception")  # PLW0133
-97 |         MyError("This is an exception")  # PLW0133
-98 |         MySubError("This is an exception")  # PLW0133
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-99 |         MyValueError("This is an exception")  # PLW0133
-   |
-help: Add `raise` keyword
-95  |     with suppress(Exception):
-96  |         AttributeError("This is an exception")  # PLW0133
-97  |         MyError("This is an exception")  # PLW0133
-    -         MySubError("This is an exception")  # PLW0133
-98  +         raise MySubError("This is an exception")  # PLW0133
-99  |         MyValueError("This is an exception")  # PLW0133
-100 | 
-101 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-  --> useless_exception_statement.py:99:9
-   |
-97 |         MyError("This is an exception")  # PLW0133
-98 |         MySubError("This is an exception")  # PLW0133
-99 |         MyValueError("This is an exception")  # PLW0133
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-help: Add `raise` keyword
-96  |         AttributeError("This is an exception")  # PLW0133
-97  |         MyError("This is an exception")  # PLW0133
-98  |         MySubError("This is an exception")  # PLW0133
-    -         MyValueError("This is an exception")  # PLW0133
-99  +         raise MyValueError("This is an exception")  # PLW0133
-100 | 
-101 | 
-102 | # Test case 9: Useless exception statement in parentheses
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-   --> useless_exception_statement.py:105:5
-    |
-103 | def func():
-104 |     (RuntimeError("This is an exception"))  # PLW0133
-105 |     (MyError("This is an exception"))  # PLW0133
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-106 |     (MySubError("This is an exception"))  # PLW0133
-107 |     (MyValueError("This is an exception"))  # PLW0133
-    |
-help: Add `raise` keyword
-102 | # Test case 9: Useless exception statement in parentheses
-103 | def func():
-104 |     (RuntimeError("This is an exception"))  # PLW0133
-    -     (MyError("This is an exception"))  # PLW0133
-105 +     raise (MyError("This is an exception"))  # PLW0133
-106 |     (MySubError("This is an exception"))  # PLW0133
-107 |     (MyValueError("This is an exception"))  # PLW0133
-108 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-   --> useless_exception_statement.py:106:5
-    |
-104 |     (RuntimeError("This is an exception"))  # PLW0133
-105 |     (MyError("This is an exception"))  # PLW0133
-106 |     (MySubError("This is an exception"))  # PLW0133
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-107 |     (MyValueError("This is an exception"))  # PLW0133
-    |
-help: Add `raise` keyword
-103 | def func():
-104 |     (RuntimeError("This is an exception"))  # PLW0133
-105 |     (MyError("This is an exception"))  # PLW0133
-    -     (MySubError("This is an exception"))  # PLW0133
-106 +     raise (MySubError("This is an exception"))  # PLW0133
-107 |     (MyValueError("This is an exception"))  # PLW0133
-108 | 
-109 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-   --> useless_exception_statement.py:107:5
-    |
-105 |     (MyError("This is an exception"))  # PLW0133
-106 |     (MySubError("This is an exception"))  # PLW0133
-107 |     (MyValueError("This is an exception"))  # PLW0133
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    |
-help: Add `raise` keyword
-104 |     (RuntimeError("This is an exception"))  # PLW0133
-105 |     (MyError("This is an exception"))  # PLW0133
-106 |     (MySubError("This is an exception"))  # PLW0133
-    -     (MyValueError("This is an exception"))  # PLW0133
-107 +     raise (MyValueError("This is an exception"))  # PLW0133
-108 | 
-109 | 
-110 | # Test case 10: Useless exception statement in continuation
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-   --> useless_exception_statement.py:113:12
-    |
-111 | def func():
-112 |     x = 1; (RuntimeError("This is an exception")); y = 2  # PLW0133
-113 |     x = 1; (MyError("This is an exception")); y = 2  # PLW0133
-    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-114 |     x = 1; (MySubError("This is an exception")); y = 2  # PLW0133
-115 |     x = 1; (MyValueError("This is an exception")); y = 2  # PLW0133
-    |
-help: Add `raise` keyword
-110 | # Test case 10: Useless exception statement in continuation
-111 | def func():
-112 |     x = 1; (RuntimeError("This is an exception")); y = 2  # PLW0133
-    -     x = 1; (MyError("This is an exception")); y = 2  # PLW0133
-113 +     x = 1; raise (MyError("This is an exception")); y = 2  # PLW0133
-114 |     x = 1; (MySubError("This is an exception")); y = 2  # PLW0133
-115 |     x = 1; (MyValueError("This is an exception")); y = 2  # PLW0133
-116 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-   --> useless_exception_statement.py:114:12
-    |
-112 |     x = 1; (RuntimeError("This is an exception")); y = 2  # PLW0133
-113 |     x = 1; (MyError("This is an exception")); y = 2  # PLW0133
-114 |     x = 1; (MySubError("This is an exception")); y = 2  # PLW0133
-    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-115 |     x = 1; (MyValueError("This is an exception")); y = 2  # PLW0133
-    |
-help: Add `raise` keyword
-111 | def func():
-112 |     x = 1; (RuntimeError("This is an exception")); y = 2  # PLW0133
-113 |     x = 1; (MyError("This is an exception")); y = 2  # PLW0133
-    -     x = 1; (MySubError("This is an exception")); y = 2  # PLW0133
-114 +     x = 1; raise (MySubError("This is an exception")); y = 2  # PLW0133
-115 |     x = 1; (MyValueError("This is an exception")); y = 2  # PLW0133
-116 | 
-117 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-   --> useless_exception_statement.py:115:12
-    |
-113 |     x = 1; (MyError("This is an exception")); y = 2  # PLW0133
-114 |     x = 1; (MySubError("This is an exception")); y = 2  # PLW0133
-115 |     x = 1; (MyValueError("This is an exception")); y = 2  # PLW0133
-    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    |
-help: Add `raise` keyword
-112 |     x = 1; (RuntimeError("This is an exception")); y = 2  # PLW0133
-113 |     x = 1; (MyError("This is an exception")); y = 2  # PLW0133
-114 |     x = 1; (MySubError("This is an exception")); y = 2  # PLW0133
-    -     x = 1; (MyValueError("This is an exception")); y = 2  # PLW0133
-115 +     x = 1; raise (MyValueError("This is an exception")); y = 2  # PLW0133
-116 | 
-117 | 
-118 | # Test case 11: Useless warning statement
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-   --> useless_exception_statement.py:121:5
-    |
-119 | def func():
-120 |     UserWarning("This is a user warning")  # PLW0133
-121 |     MyUserWarning("This is a custom user warning")  # PLW0133
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    |
-help: Add `raise` keyword
-118 | # Test case 11: Useless warning statement
-119 | def func():
-120 |     UserWarning("This is a user warning")  # PLW0133
-    -     MyUserWarning("This is a custom user warning")  # PLW0133
-121 +     raise MyUserWarning("This is a custom user warning")  # PLW0133
-122 | 
-123 | 
-124 | # Test case 12: Useless exception statement at module level
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-   --> useless_exception_statement.py:131:1
-    |
-129 | PythonFinalizationError("Added in Python 3.13")  # PLW0133
-130 |
-131 | MyError("This is an exception")  # PLW0133
-    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-132 |
-133 | MySubError("This is an exception")  # PLW0133
-    |
-help: Add `raise` keyword
-128 | 
-129 | PythonFinalizationError("Added in Python 3.13")  # PLW0133
-130 | 
-    - MyError("This is an exception")  # PLW0133
-131 + raise MyError("This is an exception")  # PLW0133
-132 | 
-133 | MySubError("This is an exception")  # PLW0133
-134 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-   --> useless_exception_statement.py:133:1
-    |
-131 | MyError("This is an exception")  # PLW0133
-132 |
-133 | MySubError("This is an exception")  # PLW0133
-    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-134 |
-135 | MyValueError("This is an exception")  # PLW0133
-    |
-help: Add `raise` keyword
-130 | 
-131 | MyError("This is an exception")  # PLW0133
-132 | 
-    - MySubError("This is an exception")  # PLW0133
-133 + raise MySubError("This is an exception")  # PLW0133
-134 | 
-135 | MyValueError("This is an exception")  # PLW0133
-136 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-   --> useless_exception_statement.py:135:1
-    |
-133 | MySubError("This is an exception")  # PLW0133
-134 |
-135 | MyValueError("This is an exception")  # PLW0133
-    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-136 |
-137 | UserWarning("This is a user warning")  # PLW0133
-    |
-help: Add `raise` keyword
-132 | 
-133 | MySubError("This is an exception")  # PLW0133
-134 | 
-    - MyValueError("This is an exception")  # PLW0133
-135 + raise MyValueError("This is an exception")  # PLW0133
-136 | 
-137 | UserWarning("This is a user warning")  # PLW0133
-138 | 
-note: This is an unsafe fix and may change runtime behavior
-
-
-PLW0133 [*] Missing `raise` statement on exception
-   --> useless_exception_statement.py:139:1
-    |
-137 | UserWarning("This is a user warning")  # PLW0133
-138 |
-139 | MyUserWarning("This is a custom user warning")  # PLW0133
-    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    |
-help: Add `raise` keyword
-136 | 
-137 | UserWarning("This is a user warning")  # PLW0133
-138 | 
-    - MyUserWarning("This is a custom user warning")  # PLW0133
-139 + raise MyUserWarning("This is a custom user warning")  # PLW0133
-140 | 
-141 | 
-142 | # Non-violation test cases: PLW0133
-note: This is an unsafe fix and may change runtime behavior

crates/ruff_linter/src/rules/pyupgrade/rules/pep695/non_pep695_generic_class.rs

@@ -204,7 +204,7 @@ pub(crate) fn non_pep695_generic_class(checker: &Checker, class_def: &StmtClassD
                 arguments,
                 Parentheses::Remove,
                 checker.source(),
-                checker.tokens(),
+                checker.comment_ranges(),
             )?;
             Ok(Fix::unsafe_edits(
                 Edit::insertion(type_params.to_string(), name.end()),

crates/ruff_linter/src/rules/pyupgrade/rules/pep695/non_pep695_type_alias.rs

@@ -2,7 +2,7 @@ use itertools::Itertools;
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::name::Name;
-use ruff_python_ast::token::parenthesized_range;
+use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::visitor::Visitor;
 use ruff_python_ast::{Expr, ExprCall, ExprName, Keyword, StmtAnnAssign, StmtAssign, StmtRef};
 use ruff_text_size::{Ranged, TextRange};
@@ -261,11 +261,11 @@ fn create_diagnostic(
     type_alias_kind: TypeAliasKind,
 ) {
     let source = checker.source();
-    let tokens = checker.tokens();
     let comment_ranges = checker.comment_ranges();
 
     let range_with_parentheses =
-        parenthesized_range(value.into(), stmt.into(), tokens).unwrap_or(value.range());
+        parenthesized_range(value.into(), stmt.into(), comment_ranges, source)
+            .unwrap_or(value.range());
 
     let content = format!(
         "type {name}{type_params} = {value}",

crates/ruff_linter/src/rules/pyupgrade/rules/replace_stdout_stderr.rs

@@ -1,8 +1,9 @@
 use anyhow::Result;
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::{self as ast, Keyword, token::Tokens};
+use ruff_python_ast::{self as ast, Keyword};
 use ruff_python_semantic::Modules;
+use ruff_python_trivia::CommentRanges;
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
@@ -103,7 +104,7 @@ pub(crate) fn replace_stdout_stderr(checker: &Checker, call: &ast::ExprCall) {
                     stderr,
                     call,
                     checker.locator().contents(),
-                    checker.tokens(),
+                    checker.comment_ranges(),
                 )
             });
         }
@@ -116,7 +117,7 @@ fn generate_fix(
     stderr: &Keyword,
     call: &ast::ExprCall,
     source: &str,
-    tokens: &Tokens,
+    comment_ranges: &CommentRanges,
 ) -> Result<Fix> {
     let (first, second) = if stdout.start() < stderr.start() {
         (stdout, stderr)
@@ -131,7 +132,7 @@ fn generate_fix(
             &call.arguments,
             Parentheses::Preserve,
             source,
-            tokens,
+            comment_ranges,
         )?],
     ))
 }