Increase recursion limit in ruff_linter

.github/ISSUE_TEMPLATE.md

@@ -3,8 +3,6 @@ Thank you for taking the time to report an issue! We're glad to have you involve
 
 If you're filing a bug report, please consider including the following information:
 
-* List of keywords you searched for before creating this issue. Write them down here so that others can find this issue more easily and help provide feedback.
-  e.g. "RUF001", "unused variable", "Jupyter notebook"
 * A minimal code snippet that reproduces the bug.
 * The command you invoked (e.g., `ruff /path/to/file.py --fix`), ideally including the `--isolated` flag.
 * The current Ruff settings (any relevant sections from your `pyproject.toml`).

.github/workflows/ci.yaml

@@ -35,7 +35,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: tj-actions/changed-files@v43
+      - uses: tj-actions/changed-files@v42
         id: changed
         with:
           files_yaml: |

.gitignore

@@ -92,7 +92,6 @@ coverage.xml
 .hypothesis/
 .pytest_cache/
 cover/
-repos/
 
 # Translations
 *.mo

CHANGELOG.md

@@ -1,85 +1,5 @@
 # Changelog
 
-## 0.3.4
-
-### Preview features
-
-- \[`flake8-simplify`\] Detect implicit `else` cases in `needless-bool` (`SIM103`) ([#10414](https://github.com/astral-sh/ruff/pull/10414))
-- \[`pylint`\] Implement `nan-comparison` (`PLW0117`) ([#10401](https://github.com/astral-sh/ruff/pull/10401))
-- \[`pylint`\] Implement `nonlocal-and-global` (`E115`) ([#10407](https://github.com/astral-sh/ruff/pull/10407))
-- \[`pylint`\] Implement `singledispatchmethod-function` (`PLE5120`) ([#10428](https://github.com/astral-sh/ruff/pull/10428))
-- \[`refurb`\] Implement `list-reverse-copy` (`FURB187`) ([#10212](https://github.com/astral-sh/ruff/pull/10212))
-
-### Rule changes
-
-- \[`flake8-pytest-style`\] Add automatic fix for `pytest-parametrize-values-wrong-type` (`PT007`) ([#10461](https://github.com/astral-sh/ruff/pull/10461))
-- \[`pycodestyle`\] Allow SPDX license headers to exceed the line length (`E501`) ([#10481](https://github.com/astral-sh/ruff/pull/10481))
-
-### Formatter
-
-- Fix unstable formatting for trailing subscript end-of-line comment ([#10492](https://github.com/astral-sh/ruff/pull/10492))
-
-### Bug fixes
-
-- Avoid code comment detection in PEP 723 script tags ([#10464](https://github.com/astral-sh/ruff/pull/10464))
-- Avoid incorrect tuple transformation in single-element case (`C409`) ([#10491](https://github.com/astral-sh/ruff/pull/10491))
-- Bug fix: Prevent fully defined links [`name`](link) from being reformatted ([#10442](https://github.com/astral-sh/ruff/pull/10442))
-- Consider raw source code for `W605` ([#10480](https://github.com/astral-sh/ruff/pull/10480))
-- Docs: Link inline settings when not part of options section ([#10499](https://github.com/astral-sh/ruff/pull/10499))
-- Don't treat annotations as redefinitions in `.pyi` files ([#10512](https://github.com/astral-sh/ruff/pull/10512))
-- Fix `E231` bug: Inconsistent catch compared to pycodestyle, such as when dict nested in list ([#10469](https://github.com/astral-sh/ruff/pull/10469))
-- Fix pylint upstream categories not showing in docs ([#10441](https://github.com/astral-sh/ruff/pull/10441))
-- Add missing `Options` references to blank line docs ([#10498](https://github.com/astral-sh/ruff/pull/10498))
-- 'Revert "F821: Fix false negatives in .py files when `from __future__ import annotations` is active (#10362)"' ([#10513](https://github.com/astral-sh/ruff/pull/10513))
-- Apply NFKC normalization to unicode identifiers in the lexer ([#10412](https://github.com/astral-sh/ruff/pull/10412))
-- Avoid failures due to non-deterministic binding ordering ([#10478](https://github.com/astral-sh/ruff/pull/10478))
-- \[`flake8-bugbear`\] Allow tuples of exceptions (`B030`) ([#10437](https://github.com/astral-sh/ruff/pull/10437))
-- \[`flake8-quotes`\] Avoid syntax errors due to invalid quotes (`Q000, Q002`) ([#10199](https://github.com/astral-sh/ruff/pull/10199))
-
-## 0.3.3
-
-### Preview features
-
-- \[`flake8-bandit`\]: Implement `S610` rule ([#10316](https://github.com/astral-sh/ruff/pull/10316))
-- \[`pycodestyle`\] Implement `blank-line-at-end-of-file` (`W391`) ([#10243](https://github.com/astral-sh/ruff/pull/10243))
-- \[`pycodestyle`\] Implement `redundant-backslash` (`E502`) ([#10292](https://github.com/astral-sh/ruff/pull/10292))
-- \[`pylint`\] - implement `redeclared-assigned-name` (`W0128`) ([#9268](https://github.com/astral-sh/ruff/pull/9268))
-
-### Rule changes
-
-- \[`flake8_comprehensions`\] Handled special case for `C400` which also matches `C416` ([#10419](https://github.com/astral-sh/ruff/pull/10419))
-- \[`flake8-bandit`\] Implement upstream updates for `S311`, `S324` and `S605` ([#10313](https://github.com/astral-sh/ruff/pull/10313))
-- \[`pyflakes`\] Remove `F401` fix for `__init__` imports by default and allow opt-in to unsafe fix ([#10365](https://github.com/astral-sh/ruff/pull/10365))
-- \[`pylint`\] Implement `invalid-bool-return-type` (`E304`) ([#10377](https://github.com/astral-sh/ruff/pull/10377))
-- \[`pylint`\] Include builtin warnings in useless-exception-statement (`PLW0133`) ([#10394](https://github.com/astral-sh/ruff/pull/10394))
-
-### CLI
-
-- Add message on success to `ruff check` ([#8631](https://github.com/astral-sh/ruff/pull/8631))
-
-### Bug fixes
-
-- \[`PIE970`\] Allow trailing ellipsis in `typing.TYPE_CHECKING` ([#10413](https://github.com/astral-sh/ruff/pull/10413))
-- Avoid `TRIO115` if the argument is a variable ([#10376](https://github.com/astral-sh/ruff/pull/10376))
-- \[`F811`\] Avoid removing shadowed imports that point to different symbols ([#10387](https://github.com/astral-sh/ruff/pull/10387))
-- Fix `F821` and `F822` false positives in `.pyi` files ([#10341](https://github.com/astral-sh/ruff/pull/10341))
-- Fix `F821` false negatives in `.py` files when `from __future__ import annotations` is active ([#10362](https://github.com/astral-sh/ruff/pull/10362))
-- Fix case where `Indexer` fails to identify continuation preceded by newline #10351 ([#10354](https://github.com/astral-sh/ruff/pull/10354))
-- Sort hash maps in `Settings` display ([#10370](https://github.com/astral-sh/ruff/pull/10370))
-- Track conditional deletions in the semantic model ([#10415](https://github.com/astral-sh/ruff/pull/10415))
-- \[`C413`\] Wrap expressions in parentheses when negating ([#10346](https://github.com/astral-sh/ruff/pull/10346))
-- \[`pycodestyle`\] Do not ignore lines before the first logical line in blank lines rules. ([#10382](https://github.com/astral-sh/ruff/pull/10382))
-- \[`pycodestyle`\] Do not trigger `E225` and `E275` when the next token is a ')' ([#10315](https://github.com/astral-sh/ruff/pull/10315))
-- \[`pylint`\] Avoid false-positive slot non-assignment for `__dict__` (`PLE0237`) ([#10348](https://github.com/astral-sh/ruff/pull/10348))
-- Gate f-string struct size test for Rustc \< 1.76 ([#10371](https://github.com/astral-sh/ruff/pull/10371))
-
-### Documentation
-
-- Use `ruff.toml` format in README ([#10393](https://github.com/astral-sh/ruff/pull/10393))
-- \[`RUF008`\] Make it clearer that a mutable default in a dataclass is only valid if it is typed as a ClassVar ([#10395](https://github.com/astral-sh/ruff/pull/10395))
-- \[`pylint`\] Extend docs and test in `invalid-str-return-type` (`E307`) ([#10400](https://github.com/astral-sh/ruff/pull/10400))
-- Remove `.` from `check` and `format` commands ([#10217](https://github.com/astral-sh/ruff/pull/10217))
-
 ## 0.3.2
 
 ### Preview features
@@ -1279,7 +1199,7 @@ Read Ruff's new [versioning policy](https://docs.astral.sh/ruff/versioning/).
 - \[`refurb`\] Add `single-item-membership-test` (`FURB171`) ([#7815](https://github.com/astral-sh/ruff/pull/7815))
 - \[`pylint`\] Add `and-or-ternary` (`R1706`) ([#7811](https://github.com/astral-sh/ruff/pull/7811))
 
-*New rules are added in [preview](https://docs.astral.sh/ruff/preview/).*
+_New rules are added in [preview](https://docs.astral.sh/ruff/preview/)._
 
 ### Configuration
 

Cargo.lock

@@ -152,6 +152,21 @@ dependencies = [
  "term",
 ]
 
+[[package]]
+name = "assert_cmd"
+version = "2.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8"
+dependencies = [
+ "anstyle",
+ "bstr",
+ "doc-comment",
+ "predicates",
+ "predicates-core",
+ "predicates-tree",
+ "wait-timeout",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -294,9 +309,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.3"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813"
+checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -358,11 +373,11 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.3"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f"
+checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
  "syn 2.0.52",
@@ -616,6 +631,12 @@ version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
 
+[[package]]
+name = "difflib"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
+
 [[package]]
 name = "dirs"
 version = "4.0.0"
@@ -678,6 +699,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "doc-comment"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
+
 [[package]]
 name = "drop_bomb"
 version = "0.1.5"
@@ -885,12 +912,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
 [[package]]
 name = "hermit-abi"
 version = "0.3.9"
@@ -1493,16 +1514,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
 [[package]]
 name = "number_prefix"
 version = "0.4.0"
@@ -1748,6 +1759,33 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
+[[package]]
+name = "predicates"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8"
+dependencies = [
+ "anstyle",
+ "difflib",
+ "predicates-core",
+]
+
+[[package]]
+name = "predicates-core"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
+
+[[package]]
+name = "predicates-tree"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
+dependencies = [
+ "predicates-core",
+ "termtree",
+]
+
 [[package]]
 name = "pretty_assertions"
 version = "1.4.0"
@@ -1760,9 +1798,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
  "unicode-ident",
 ]
@@ -1965,10 +2003,11 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.3.4"
+version = "0.3.2"
 dependencies = [
  "anyhow",
  "argfile",
+ "assert_cmd",
  "bincode",
  "bitflags 2.4.2",
  "cachedir",
@@ -1986,7 +2025,6 @@ dependencies = [
  "log",
  "mimalloc",
  "notify",
- "num_cpus",
  "path-absolutize",
  "rayon",
  "regex",
@@ -2063,6 +2101,7 @@ dependencies = [
  "indoc",
  "itertools 0.12.1",
  "libcst",
+ "once_cell",
  "pretty_assertions",
  "rayon",
  "regex",
@@ -2106,6 +2145,7 @@ name = "ruff_formatter"
 version = "0.0.0"
 dependencies = [
  "drop_bomb",
+ "insta",
  "ruff_cache",
  "ruff_macros",
  "ruff_text_size",
@@ -2127,7 +2167,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.3.4"
+version = "0.3.2"
 dependencies = [
  "aho-corasick",
  "annotate-snippets 0.9.2",
@@ -2152,12 +2192,14 @@ dependencies = [
  "path-absolutize",
  "pathdiff",
  "pep440_rs",
+ "pretty_assertions",
  "pyproject-toml",
  "quick-junit",
  "regex",
  "result-like",
  "ruff_cache",
  "ruff_diagnostics",
+ "ruff_index",
  "ruff_macros",
  "ruff_notebook",
  "ruff_python_ast",
@@ -2178,6 +2220,7 @@ dependencies = [
  "smallvec",
  "strum",
  "strum_macros",
+ "tempfile",
  "test-case",
  "thiserror",
  "toml",
@@ -2203,6 +2246,7 @@ name = "ruff_notebook"
 version = "0.0.0"
 dependencies = [
  "anyhow",
+ "insta",
  "itertools 0.12.1",
  "once_cell",
  "rand",
@@ -2251,6 +2295,7 @@ name = "ruff_python_formatter"
 version = "0.0.0"
 dependencies = [
  "anyhow",
+ "bitflags 2.4.2",
  "clap",
  "countme",
  "insta",
@@ -2296,9 +2341,10 @@ version = "0.0.0"
 dependencies = [
  "bitflags 2.4.2",
  "hexf-parse",
+ "is-macro",
  "itertools 0.12.1",
  "lexical-parse-float",
- "ruff_python_ast",
+ "rand",
  "unic-ucd-category",
 ]
 
@@ -2321,7 +2367,6 @@ dependencies = [
  "static_assertions",
  "tiny-keccak",
  "unicode-ident",
- "unicode-normalization",
  "unicode_names2",
 ]
 
@@ -2363,6 +2408,7 @@ version = "0.0.0"
 dependencies = [
  "insta",
  "itertools 0.12.1",
+ "ruff_python_ast",
  "ruff_python_index",
  "ruff_python_parser",
  "ruff_source_file",
@@ -2395,12 +2441,13 @@ dependencies = [
  "rustc-hash",
  "serde",
  "serde_json",
+ "similar",
  "tracing",
 ]
 
 [[package]]
 name = "ruff_shrinking"
-version = "0.3.4"
+version = "0.3.2"
 dependencies = [
  "anyhow",
  "clap",
@@ -2418,6 +2465,7 @@ dependencies = [
 name = "ruff_source_file"
 version = "0.0.0"
 dependencies = [
+ "insta",
  "memchr",
  "once_cell",
  "ruff_text_size",
@@ -2472,6 +2520,7 @@ dependencies = [
  "is-macro",
  "itertools 0.12.1",
  "log",
+ "once_cell",
  "path-absolutize",
  "pep440_rs",
  "regex",
@@ -2822,7 +2871,7 @@ version = "0.25.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
 dependencies = [
- "heck 0.4.1",
+ "heck",
  "proc-macro2",
  "quote",
  "rustversion",
@@ -2912,6 +2961,12 @@ dependencies = [
  "phf_codegen",
 ]
 
+[[package]]
+name = "termtree"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
+
 [[package]]
 name = "test-case"
 version = "3.3.1"
@@ -2947,18 +3002,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.58"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.58"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3031,9 +3086,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "toml"
-version = "0.8.11"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af06656561d28735e9c1cd63dfd57132c8155426aa6af24f36a00a351f88c48e"
+checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -3052,9 +3107,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.7"
+version = "0.22.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992"
+checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6"
 dependencies = [
  "indexmap",
  "serde",
@@ -3372,6 +3427,15 @@ dependencies = [
  "quote",
 ]
 
+[[package]]
+name = "wait-timeout"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "walkdir"
 version = "2.5.0"
@@ -3415,9 +3479,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3456,9 +3520,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.42"
+version = "0.3.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b"
+checksum = "143ddeb4f833e2ed0d252e618986e18bfc7b0e52f2d28d77d05b2f045dd8eb61"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
@@ -3470,9 +3534,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.42"
+version = "0.3.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
+checksum = "a5211b7550606857312bba1d978a8ec75692eae187becc5e680444fffc5e6f89"
 dependencies = [
  "proc-macro2",
  "quote",

Cargo.toml

@@ -16,16 +16,18 @@ aho-corasick = { version = "1.1.2" }
 annotate-snippets = { version = "0.9.2", features = ["color"] }
 anyhow = { version = "1.0.80" }
 argfile = { version = "0.1.6" }
+assert_cmd = { version = "2.0.13" }
 bincode = { version = "1.3.3" }
 bitflags = { version = "2.4.1" }
 bstr = { version = "1.9.1" }
 cachedir = { version = "0.3.1" }
 chrono = { version = "0.4.35", default-features = false, features = ["clock"] }
-clap = { version = "4.5.3", features = ["derive"] }
+clap = { version = "4.5.2", features = ["derive"] }
 clap_complete_command = { version = "0.5.1" }
 clearscreen = { version = "2.0.0" }
 codspeed-criterion-compat = { version = "2.4.0", default-features = false }
 colored = { version = "2.1.0" }
+configparser = { version = "3.0.3" }
 console_error_panic_hook = { version = "0.1.7" }
 console_log = { version = "1.0.0" }
 countme = { version = "3.0.1" }
@@ -63,13 +65,12 @@ memchr = { version = "2.7.1" }
 mimalloc = { version = "0.1.39" }
 natord = { version = "1.0.9" }
 notify = { version = "6.1.1" }
-num_cpus = { version = "1.16.0" }
 once_cell = { version = "1.19.0" }
 path-absolutize = { version = "3.1.1" }
 pathdiff = { version = "0.2.1" }
 pep440_rs = { version = "0.4.0", features = ["serde"] }
 pretty_assertions = "1.3.0"
-proc-macro2 = { version = "1.0.79" }
+proc-macro2 = { version = "1.0.78" }
 pyproject-toml = { version = "0.9.0" }
 quick-junit = { version = "0.3.5" }
 quote = { version = "1.0.23" }
@@ -95,9 +96,9 @@ strum_macros = { version = "0.25.3" }
 syn = { version = "2.0.51" }
 tempfile = { version = "3.9.0" }
 test-case = { version = "3.3.1" }
-thiserror = { version = "1.0.58" }
+thiserror = { version = "1.0.57" }
 tikv-jemallocator = { version = "0.5.0" }
-toml = { version = "0.8.11" }
+toml = { version = "0.8.9" }
 tracing = { version = "0.1.40" }
 tracing-indicatif = { version = "0.3.6" }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
@@ -107,13 +108,12 @@ unic-ucd-category = { version = "0.9" }
 unicode-ident = { version = "1.0.12" }
 unicode-width = { version = "0.1.11" }
 unicode_names2 = { version = "1.2.2" }
-unicode-normalization = { version = "0.1.23" }
 ureq = { version = "2.9.6" }
 url = { version = "2.5.0" }
 uuid = { version = "1.6.1", features = ["v4", "fast-rng", "macro-diagnostics", "js"] }
 walkdir = { version = "2.3.2" }
 wasm-bindgen = { version = "0.2.92" }
-wasm-bindgen-test = { version = "0.3.42" }
+wasm-bindgen-test = { version = "0.3.40" }
 wild = { version = "2" }
 
 [workspace.lints.rust]

README.md

@@ -32,7 +32,7 @@ An extremely fast Python linter and code formatter, written in Rust.
 - ⚖️ Drop-in parity with [Flake8](https://docs.astral.sh/ruff/faq/#how-does-ruff-compare-to-flake8), isort, and Black
 - 📦 Built-in caching, to avoid re-analyzing unchanged files
 - 🔧 Fix support, for automatic error correction (e.g., automatically remove unused imports)
-- 📏 Over [800 built-in rules](https://docs.astral.sh/ruff/rules/), with native re-implementations
+- 📏 Over [700 built-in rules](https://docs.astral.sh/ruff/rules/), with native re-implementations
     of popular Flake8 plugins, like flake8-bugbear
 - ⌨️ First-party [editor integrations](https://docs.astral.sh/ruff/integrations/) for
     [VS Code](https://github.com/astral-sh/ruff-vscode) and [more](https://github.com/astral-sh/ruff-lsp)
@@ -129,7 +129,7 @@ and with [a variety of other package managers](https://docs.astral.sh/ruff/insta
 To run Ruff as a linter, try any of the following:
 
 ```shell
-ruff check                          # Lint all files in the current directory (and any subdirectories).
+ruff check .                        # Lint all files in the current directory (and any subdirectories).
 ruff check path/to/code/            # Lint all files in `/path/to/code` (and any subdirectories).
 ruff check path/to/code/*.py        # Lint all `.py` files in `/path/to/code`.
 ruff check path/to/code/to/file.py  # Lint `file.py`.
@@ -139,7 +139,7 @@ ruff check @arguments.txt           # Lint using an input file, treating its con
 Or, to run Ruff as a formatter:
 
 ```shell
-ruff format                          # Format all files in the current directory (and any subdirectories).
+ruff format .                        # Format all files in the current directory (and any subdirectories).
 ruff format path/to/code/            # Format all files in `/path/to/code` (and any subdirectories).
 ruff format path/to/code/*.py        # Format all `.py` files in `/path/to/code`.
 ruff format path/to/code/to/file.py  # Format `file.py`.
@@ -151,7 +151,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.3.4
+  rev: v0.3.2
   hooks:
     # Run the linter.
     - id: ruff
@@ -183,9 +183,10 @@ Ruff can be configured through a `pyproject.toml`, `ruff.toml`, or `.ruff.toml`
 [_Configuration_](https://docs.astral.sh/ruff/configuration/), or [_Settings_](https://docs.astral.sh/ruff/settings/)
 for a complete list of all configuration options).
 
-If left unspecified, Ruff's default configuration is equivalent to the following `ruff.toml` file:
+If left unspecified, Ruff's default configuration is equivalent to:
 
 ```toml
+[tool.ruff]
 # Exclude a variety of commonly ignored directories.
 exclude = [
     ".bzr",
@@ -223,7 +224,7 @@ indent-width = 4
 # Assume Python 3.8
 target-version = "py38"
 
-[lint]
+[tool.ruff.lint]
 # Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`)  codes by default.
 select = ["E4", "E7", "E9", "F"]
 ignore = []
@@ -235,7 +236,7 @@ unfixable = []
 # Allow unused variables when underscore-prefixed.
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 
-[format]
+[tool.ruff.format]
 # Like Black, use double quotes for strings.
 quote-style = "double"
 
@@ -249,20 +250,11 @@ skip-magic-trailing-comma = false
 line-ending = "auto"
 ```
 
-Note that, in a `pyproject.toml`, each section header should be prefixed with `tool.ruff`. For
-example, `[lint]` should be replaced with `[tool.ruff.lint]`.
-
-Some configuration options can be provided via dedicated command-line arguments, such as those
-related to rule enablement and disablement, file discovery, and logging level:
+Some configuration options can be provided via the command-line, such as those related to
+rule enablement and disablement, file discovery, and logging level:
 
 ```shell
-ruff check --select F401 --select F403 --quiet
-```
-
-The remaining configuration options can be provided through a catch-all `--config` argument:
-
-```shell
-ruff check --config "lint.per-file-ignores = {'some_file.py' = ['F841']}"
+ruff check path/to/code/ --select F401 --select F403 --quiet
 ```
 
 See `ruff help` for more on Ruff's top-level commands, or `ruff help check` and `ruff help format`
@@ -272,7 +264,7 @@ for more on the linting and formatting commands, respectively.
 
 <!-- Begin section: Rules -->
 
-**Ruff supports over 800 lint rules**, many of which are inspired by popular tools like Flake8,
+**Ruff supports over 700 lint rules**, many of which are inspired by popular tools like Flake8,
 isort, pyupgrade, and others. Regardless of the rule's origin, Ruff re-implements every rule in
 Rust as a first-party feature.
 
@@ -429,7 +421,6 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [Mypy](https://github.com/python/mypy)
 - Netflix ([Dispatch](https://github.com/Netflix/dispatch))
 - [Neon](https://github.com/neondatabase/neon)
-- [Nokia](https://nokia.com/)
 - [NoneBot](https://github.com/nonebot/nonebot2)
 - [NumPyro](https://github.com/pyro-ppl/numpyro)
 - [ONNX](https://github.com/onnx/onnx)

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.3.4"
+version = "0.3.2"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -41,7 +41,6 @@ is-macro = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true }
 notify = { workspace = true }
-num_cpus = { workspace = true }
 path-absolutize = { workspace = true, features = ["once_cell_cache"] }
 rayon = { workspace = true }
 regex = { workspace = true }
@@ -54,7 +53,7 @@ tempfile = { workspace = true }
 thiserror = { workspace = true }
 toml = { workspace = true }
 tracing = { workspace = true, features = ["log"] }
-tracing-subscriber = { workspace = true, features = ["registry"] }
+tracing-subscriber = { workspace = true, features = ["registry"]}
 tracing-tree = { workspace = true }
 walkdir = { workspace = true }
 wild = { workspace = true }
@@ -62,8 +61,9 @@ wild = { workspace = true }
 [dev-dependencies]
 # Enable test rules during development
 ruff_linter = { path = "../ruff_linter", features = ["clap", "test-rules"] }
+assert_cmd = { workspace = true }
 # Avoid writing colored snapshots when running tests from the terminal
-colored = { workspace = true, features = ["no-color"] }
+colored = { workspace = true, features = ["no-color"]}
 insta = { workspace = true, features = ["filters", "json"] }
 insta-cmd = { workspace = true }
 tempfile = { workspace = true }

crates/ruff/src/args.rs

@@ -496,12 +496,8 @@ pub struct FormatCommand {
     pub range: Option<FormatRange>,
 }
 
-#[derive(Copy, Clone, Debug, clap::Parser)]
-pub struct ServerCommand {
-    /// Enable preview mode; required for regular operation
-    #[arg(long)]
-    pub(crate) preview: bool,
-}
+#[derive(Clone, Debug, clap::Parser)]
+pub struct ServerCommand;
 
 #[derive(Debug, Clone, Copy, clap::ValueEnum)]
 pub enum HelpFormat {

crates/ruff/src/commands/check.rs

@@ -252,7 +252,6 @@ mod test {
         for file in [&pyproject_toml, &python_file, &notebook] {
             fs::OpenOptions::new()
                 .create(true)
-                .truncate(true)
                 .write(true)
                 .mode(0o000)
                 .open(file)?;

crates/ruff/src/commands/server.rs

@@ -1,5 +1,3 @@
-use std::num::NonZeroUsize;
-
 use crate::ExitStatus;
 use anyhow::Result;
 use ruff_linter::logging::LogLevel;
@@ -11,15 +9,7 @@ use tracing_subscriber::{
 };
 use tracing_tree::time::Uptime;
 
-pub(crate) fn run_server(
-    preview: bool,
-    worker_threads: NonZeroUsize,
-    log_level: LogLevel,
-) -> Result<ExitStatus> {
-    if !preview {
-        tracing::error!("--preview needs to be provided as a command line argument while the server is still unstable.\nFor example: `ruff server --preview`");
-        return Ok(ExitStatus::Error);
-    }
+pub(crate) fn run_server(log_level: LogLevel) -> Result<ExitStatus> {
     let trace_level = if log_level == LogLevel::Verbose {
         Level::TRACE
     } else {
@@ -39,7 +29,7 @@ pub(crate) fn run_server(
 
     tracing::subscriber::set_global_default(subscriber)?;
 
-    let server = Server::new(worker_threads)?;
+    let server = Server::new()?;
 
     server.run().map(|()| ExitStatus::Success)
 }

crates/ruff/src/lib.rs

@@ -2,7 +2,6 @@
 
 use std::fs::File;
 use std::io::{self, stdout, BufWriter, Write};
-use std::num::NonZeroUsize;
 use std::path::{Path, PathBuf};
 use std::process::ExitCode;
 use std::sync::mpsc::channel;
@@ -205,15 +204,10 @@ fn format(args: FormatCommand, global_options: GlobalConfigArgs) -> Result<ExitS
     }
 }
 
+#[allow(clippy::needless_pass_by_value)] // TODO: remove once we start taking arguments from here
 fn server(args: ServerCommand, log_level: LogLevel) -> Result<ExitStatus> {
-    let ServerCommand { preview } = args;
-    // by default, we set the number of worker threads to `num_cpus`, with a maximum of 4.
-    let worker_threads = num_cpus::get().max(4);
-    commands::server::run_server(
-        preview,
-        NonZeroUsize::try_from(worker_threads).expect("a non-zero worker thread count"),
-        log_level,
-    )
+    let ServerCommand {} = args;
+    commands::server::run_server(log_level)
 }
 
 pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<ExitStatus> {

crates/ruff/src/panic.rs

@@ -16,7 +16,7 @@ impl std::fmt::Display for PanicError {
 }
 
 thread_local! {
-    static LAST_PANIC: std::cell::Cell<Option<PanicError>> = const { std::cell::Cell::new(None) };
+    static LAST_PANIC: std::cell::Cell<Option<PanicError>> = std::cell::Cell::new(None);
 }
 
 /// [`catch_unwind`](std::panic::catch_unwind) wrapper that sets a custom [`set_hook`](std::panic::set_hook)

crates/ruff/src/printer.rs

@@ -118,8 +118,6 @@ impl Printer {
                 } else if remaining > 0 {
                     let s = if remaining == 1 { "" } else { "s" };
                     writeln!(writer, "Found {remaining} error{s}.")?;
-                } else if remaining == 0 {
-                    writeln!(writer, "All checks passed!")?;
                 }
 
                 if let Some(fixables) = fixables {

crates/ruff/tests/format.rs

@@ -23,7 +23,7 @@ fn default_options() {
         .arg("-")
         .pass_stdin(r#"
 def foo(arg1, arg2,):
-    print('Shouldn\'t change quotes')
+    print('Should\'t change quotes')
 
 
 if condition:
@@ -38,7 +38,7 @@ if condition:
         arg1,
         arg2,
     ):
-        print("Shouldn't change quotes")
+        print("Should't change quotes")
 
 
     if condition:

crates/ruff/tests/integration_test.rs

@@ -101,7 +101,6 @@ fn stdin_success() {
     success: true
     exit_code: 0
     ----- stdout -----
-    All checks passed!
 
     ----- stderr -----
     "###);
@@ -223,7 +222,6 @@ fn stdin_source_type_pyi() {
     success: true
     exit_code: 0
     ----- stdout -----
-    All checks passed!
 
     ----- stderr -----
     "###);
@@ -592,7 +590,6 @@ fn stdin_fix_when_no_issues_should_still_print_contents() {
     print(sys.version)
 
     ----- stderr -----
-    All checks passed!
     "###);
 }
 
@@ -1026,7 +1023,6 @@ fn preview_disabled_direct() {
     success: true
     exit_code: 0
     ----- stdout -----
-    All checks passed!
 
     ----- stderr -----
     warning: Selection `RUF911` has no effect because preview is not enabled.
@@ -1043,7 +1039,6 @@ fn preview_disabled_prefix_empty() {
     success: true
     exit_code: 0
     ----- stdout -----
-    All checks passed!
 
     ----- stderr -----
     warning: Selection `RUF91` has no effect because preview is not enabled.
@@ -1060,7 +1055,6 @@ fn preview_disabled_does_not_warn_for_empty_ignore_selections() {
     success: true
     exit_code: 0
     ----- stdout -----
-    All checks passed!
 
     ----- stderr -----
     "###);
@@ -1076,7 +1070,6 @@ fn preview_disabled_does_not_warn_for_empty_fixable_selections() {
     success: true
     exit_code: 0
     ----- stdout -----
-    All checks passed!
 
     ----- stderr -----
     "###);
@@ -1182,7 +1175,6 @@ fn removed_indirect() {
     success: true
     exit_code: 0
     ----- stdout -----
-    All checks passed!
 
     ----- stderr -----
     "###);
@@ -1213,7 +1205,6 @@ fn redirect_indirect() {
     success: true
     exit_code: 0
     ----- stdout -----
-    All checks passed!
 
     ----- stderr -----
     "###);
@@ -1316,7 +1307,6 @@ fn deprecated_indirect_preview_enabled() {
     success: true
     exit_code: 0
     ----- stdout -----
-    All checks passed!
 
     ----- stderr -----
     "###);
@@ -1353,7 +1343,6 @@ fn unreadable_pyproject_toml() -> Result<()> {
     // Create an empty file with 000 permissions
     fs::OpenOptions::new()
         .create(true)
-        .truncate(true)
         .write(true)
         .mode(0o000)
         .open(pyproject_toml)?;
@@ -1394,7 +1383,6 @@ fn unreadable_dir() -> Result<()> {
     success: true
     exit_code: 0
     ----- stdout -----
-    All checks passed!
 
     ----- stderr -----
     warning: Encountered error: Permission denied (os error 13)
@@ -1909,7 +1897,6 @@ def log(x, base) -> float:
     success: true
     exit_code: 0
     ----- stdout -----
-    All checks passed!
 
     ----- stderr -----
     "###

crates/ruff/tests/lint.rs

@@ -496,7 +496,6 @@ ignore = ["D203", "D212"]
     success: true
     exit_code: 0
     ----- stdout -----
-    All checks passed!
 
     ----- stderr -----
     warning: No Python files found under the given path(s)
@@ -834,7 +833,6 @@ fn complex_config_setting_overridden_via_cli() -> Result<()> {
     success: true
     exit_code: 0
     ----- stdout -----
-    All checks passed!
 
     ----- stderr -----
     "###);

crates/ruff/tests/snapshots/integration_test__rule_f401.snap

@@ -34,11 +34,6 @@ marking it as unused, as in:
 from module import member as member
 ```
 
-## Fix safety
-
-When `ignore_init_module_imports` is disabled, fixes can remove for unused imports in `__init__` files.
-These fixes are considered unsafe because they can change the public interface.
-
 ## Example
 ```python
 import numpy as np  # unused import

crates/ruff/tests/snapshots/show_settings__display_default_settings.snap

@@ -201,7 +201,7 @@ linter.allowed_confusables = []
 linter.builtins = []
 linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
 linter.external = []
-linter.ignore_init_module_imports = true
+linter.ignore_init_module_imports = false
 linter.logger_objects = []
 linter.namespace_packages = []
 linter.src = [

crates/ruff_dev/Cargo.toml

@@ -22,7 +22,7 @@ ruff_python_formatter = { path = "../ruff_python_formatter" }
 ruff_python_parser = { path = "../ruff_python_parser" }
 ruff_python_stdlib = { path = "../ruff_python_stdlib" }
 ruff_python_trivia = { path = "../ruff_python_trivia" }
-ruff_workspace = { path = "../ruff_workspace", features = ["schemars"] }
+ruff_workspace = { path = "../ruff_workspace", features = ["schemars"]}
 
 anyhow = { workspace = true }
 clap = { workspace = true, features = ["wrap_help"] }
@@ -31,6 +31,7 @@ imara-diff = { workspace = true }
 indicatif = { workspace = true }
 itertools = { workspace = true }
 libcst = { workspace = true }
+once_cell = { workspace = true }
 pretty_assertions = { workspace = true }
 rayon = { workspace = true }
 regex = { workspace = true }

crates/ruff_dev/src/format_dev.rs

@@ -134,7 +134,7 @@ impl Statistics {
         }
     }
 
-    /// We currently prefer the similarity index, but i'd like to keep this around
+    /// We currently prefer the the similarity index, but i'd like to keep this around
     #[allow(clippy::cast_precision_loss, unused)]
     pub(crate) fn jaccard_index(&self) -> f32 {
         self.intersection as f32 / (self.black_input + self.ruff_output + self.intersection) as f32

crates/ruff_dev/src/generate_docs.rs

@@ -1,7 +1,6 @@
 //! Generate Markdown documentation for applicable rules.
 #![allow(clippy::print_stdout, clippy::print_stderr)]
 
-use std::collections::HashSet;
 use std::fs;
 use std::path::PathBuf;
 
@@ -98,13 +97,12 @@ pub(crate) fn main(args: &Args) -> Result<()> {
 fn process_documentation(documentation: &str, out: &mut String, rule_name: &str) {
     let mut in_options = false;
     let mut after = String::new();
-    let mut referenced_options = HashSet::new();
 
     // HACK: This is an ugly regex hack that's necessary because mkdocs uses
     // a non-CommonMark-compliant Markdown parser, which doesn't support code
     // tags in link definitions
     // (see https://github.com/Python-Markdown/markdown/issues/280).
-    let documentation = Regex::new(r"\[`([^`]*?)`]($|[^\[(])").unwrap().replace_all(
+    let documentation = Regex::new(r"\[`([^`]*?)`]($|[^\[])").unwrap().replace_all(
         documentation,
         |caps: &Captures| {
             format!(
@@ -137,7 +135,6 @@ fn process_documentation(documentation: &str, out: &mut String, rule_name: &str)
                 let anchor = option.replace('.', "_");
                 out.push_str(&format!("- [`{option}`][{option}]\n"));
                 after.push_str(&format!("[{option}]: ../settings.md#{anchor}\n"));
-                referenced_options.insert(option);
 
                 continue;
             }
@@ -145,20 +142,6 @@ fn process_documentation(documentation: &str, out: &mut String, rule_name: &str)
 
         out.push_str(line);
     }
-
-    let re = Regex::new(r"\[`([^`]*?)`]\[(.*?)]").unwrap();
-    for (_, [option, _]) in re.captures_iter(&documentation).map(|c| c.extract()) {
-        if let Some(OptionEntry::Field(field)) = Options::metadata().find(option) {
-            if referenced_options.insert(option) {
-                let anchor = option.replace('.', "_");
-                after.push_str(&format!("[{option}]: ../settings.md#{anchor}\n"));
-            }
-            if field.deprecated.is_some() {
-                eprintln!("Rule {rule_name} references deprecated option {option}.");
-            }
-        }
-    }
-
     if !after.is_empty() {
         out.push('\n');
         out.push('\n');
@@ -176,7 +159,7 @@ mod tests {
         process_documentation(
             "
 See also [`lint.mccabe.max-complexity`] and [`lint.task-tags`].
-Something [`else`][other]. Some [link](https://example.com).
+Something [`else`][other].
 
 ## Options
 
@@ -191,7 +174,7 @@ Something [`else`][other]. Some [link](https://example.com).
             output,
             "
 See also [`lint.mccabe.max-complexity`][lint.mccabe.max-complexity] and [`lint.task-tags`][lint.task-tags].
-Something [`else`][other]. Some [link](https://example.com).
+Something [`else`][other].
 
 ## Options
 

crates/ruff_dev/src/generate_rules_table.rs

@@ -180,22 +180,8 @@ pub(crate) fn generate() -> String {
             .map(|rule| (rule.upstream_category(&linter), rule))
             .into_group_map();
 
-        let mut rules_by_upstream_category: Vec<_> = rules_by_upstream_category.iter().collect();
-
-        // Sort the upstream categories alphabetically by prefix.
-        rules_by_upstream_category.sort_by(|(a, _), (b, _)| {
-            a.as_ref()
-                .map(|category| category.prefix)
-                .unwrap_or_default()
-                .cmp(
-                    b.as_ref()
-                        .map(|category| category.prefix)
-                        .unwrap_or_default(),
-                )
-        });
-
         if rules_by_upstream_category.len() > 1 {
-            for (opt, rules) in rules_by_upstream_category {
+            for (opt, rules) in &rules_by_upstream_category {
                 if opt.is_some() {
                     let UpstreamCategoryAndPrefix { category, prefix } = opt.unwrap();
                     table_out.push_str(&format!("#### {category} ({prefix})"));

crates/ruff_formatter/Cargo.toml

@@ -24,6 +24,7 @@ tracing = { workspace = true }
 unicode-width = { workspace = true }
 
 [dev-dependencies]
+insta = { workspace = true }
 
 [features]
 serde = ["dep:serde", "ruff_text_size/serde"]

crates/ruff_formatter/src/buffer.rs

@@ -37,7 +37,7 @@ pub trait Buffer {
     #[doc(hidden)]
     fn elements(&self) -> &[FormatElement];
 
-    /// Glue for usage of the [`write!`] macro with implementers of this trait.
+    /// Glue for usage of the [`write!`] macro with implementors of this trait.
     ///
     /// This method should generally not be invoked manually, but rather through the [`write!`] macro itself.
     ///

crates/ruff_linter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.3.4"
+version = "0.3.2"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -15,6 +15,7 @@ license = { workspace = true }
 [dependencies]
 ruff_cache = { path = "../ruff_cache" }
 ruff_diagnostics = { path = "../ruff_diagnostics", features = ["serde"] }
+ruff_index = { path = "../ruff_index" }
 ruff_notebook = { path = "../ruff_notebook" }
 ruff_macros = { path = "../ruff_macros" }
 ruff_python_ast = { path = "../ruff_python_ast", features = ["serde"] }
@@ -74,9 +75,11 @@ url = { workspace = true }
 
 [dev-dependencies]
 insta = { workspace = true }
+pretty_assertions = { workspace = true }
 test-case = { workspace = true }
 # Disable colored output in tests
 colored = { workspace = true, features = ["no-color"] }
+tempfile = { workspace = true }
 
 [features]
 default = []

crates/ruff_linter/resources/test/fixtures/eradicate/ERA001.py

@@ -36,32 +36,3 @@ dictionary = {
 # except:
 # except Foo:
 # except Exception as e: print(e)
-
-
-# Script tag without an opening tag (Error)
-
-# requires-python = ">=3.11"
-# dependencies = [
-#   "requests<3",
-#   "rich",
-# ]
-# ///
-
-# Script tag (OK)
-
-# /// script
-# requires-python = ">=3.11"
-# dependencies = [
-#   "requests<3",
-#   "rich",
-# ]
-# ///
-
-# Script tag without a closing tag (OK)
-
-# /// script
-# requires-python = ">=3.11"
-# dependencies = [
-#   "requests<3",
-#   "rich",
-# ]

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

@@ -18,7 +18,3 @@ func("0.0.0.0")
 def my_func():
     x = "0.0.0.0"
     print(x)
-
-
-# Implicit string concatenation
-"0.0.0.0" f"0.0.0.0{expr}0.0.0.0"

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

@@ -18,13 +18,6 @@ with open("/dev/shm/unit/test", "w") as f:
 with open("/foo/bar", "w") as f:
     f.write("def")
 
-# Implicit string concatenation
-with open("/tmp/" "abc", "w") as f:
-    f.write("def")
-
-with open("/tmp/abc" f"/tmp/abc", "w") as f:
-    f.write("def")
-
 # Using `tempfile` module should be ok
 import tempfile
 from tempfile import TemporaryDirectory

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

@@ -9,69 +9,62 @@ B030:
 
 try:
     pass
-except 1:  # Error
+except 1:  # error
     pass
 
 try:
     pass
-except (1, ValueError):  # Error
+except (1, ValueError):  # error
     pass
 
 try:
     pass
-except (ValueError, (RuntimeError, (KeyError, TypeError))):  # Error
+except (ValueError, (RuntimeError, (KeyError, TypeError))):  # error
     pass
 
 try:
     pass
-except (ValueError, *(RuntimeError, (KeyError, TypeError))):  # Error
+except (ValueError, *(RuntimeError, (KeyError, TypeError))):  # error
     pass
 
 
 try:
     pass
-except (*a, *(RuntimeError, (KeyError, TypeError))):  # Error
+except (*a, *(RuntimeError, (KeyError, TypeError))):  # error
+    pass
+
+try:
+    pass
+except (ValueError, *(RuntimeError, TypeError)):  # ok
+    pass
+
+try:
+    pass
+except (ValueError, *[RuntimeError, *(TypeError,)]):  # ok
     pass
 
 
 try:
     pass
-except* a + (RuntimeError, (KeyError, TypeError)):  # Error
+except (*a, *b):  # ok
     pass
 
 
 try:
     pass
-except (ValueError, *(RuntimeError, TypeError)):  # OK
-    pass
-
-try:
-    pass
-except (ValueError, *[RuntimeError, *(TypeError,)]):  # OK
+except (*a, *(RuntimeError, TypeError)):  # ok
     pass
 
 
 try:
     pass
-except (*a, *b):  # OK
+except (*a, *(b, c)):  # ok
     pass
 
 
 try:
     pass
-except (*a, *(RuntimeError, TypeError)):  # OK
-    pass
-
-
-try:
-    pass
-except (*a, *(b, c)):  # OK
-    pass
-
-
-try:
-    pass
-except (*a, *(*b, *c)):  # OK
+except (*a, *(*b, *c)):  # ok
     pass
 
 
@@ -81,52 +74,5 @@ def what_to_catch():
 
 try:
     pass
-except what_to_catch():  # OK
-    pass
-
-
-try:
-    pass
-except (a, b) + (c, d):  # OK
-    pass
-
-
-try:
-    pass
-except* (a, b) + (c, d):  # OK
-    pass
-
-
-try:
-    pass
-except* (a, (b) + (c)):  # OK
-    pass
-
-
-try:
-    pass
-except (a, b) + (c, d) + (e, f):  # OK
-    pass
-
-
-try:
-    pass
-except a + (b, c):  # OK
-    pass
-
-
-try:
-    pass
-except (ValueError, *(RuntimeError, TypeError), *((ArithmeticError,) + (EOFError,))):
-    pass
-
-
-try:
-    pass
-except ((a, b) + (c, d)) + ((e, f) + (g)):  # OK
-    pass
-
-try:
-    pass
-except (a, b) * (c, d):  # B030
+except what_to_catch():  # ok
     pass

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

@@ -1,20 +1,11 @@
-# Cannot combine with C416. Should use list comprehension here.
-even_nums = list(2 * x for x in range(3))
-odd_nums = list(
-    2 * x + 1 for x in range(3)
-)
-
-
-# Short-circuit case, combine with C416 and should produce x = list(range(3))
 x = list(x for x in range(3))
 x = list(
     x for x in range(3)
 )
 
-# Not built-in list.
+
 def list(*args, **kwargs):
     return None
 
 
-list(2 * x for x in range(3))
 list(x for x in range(3))

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

@@ -16,11 +16,3 @@ tuple(  # comment
 tuple([  # comment
     1, 2
 ])
-
-tuple((
-    1,
-))
-
-t6 = tuple([1])
-t7 = tuple((1,))
-t8 = tuple([1,])

crates/ruff_linter/resources/test/fixtures/flake8_logging/LOG009.py

@@ -1,12 +1,9 @@
-def func():
-    import logging
+import logging
 
-    logging.WARN  # LOG009
-    logging.WARNING  # OK
+logging.WARN  # LOG009
+logging.WARNING  # OK
 
+from logging import WARN, WARNING
 
-def func():
-    from logging import WARN, WARNING
-
-    WARN  # LOG009
-    WARNING  # OK
+WARN  # LOG009
+WARNING  # OK

crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE790.py

@@ -227,11 +227,3 @@ class Repro[int](Protocol):
     def impl(self) -> str:
         """Docstring"""
         return self.func()
-
-
-import typing
-
-if typing.TYPE_CHECKING:
-    def contains_meaningful_ellipsis() -> list[int]:
-        """Allow this in a TYPE_CHECKING block."""
-        ...

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

@@ -64,5 +64,3 @@ def not_warnings_dot_deprecated(
     "Not warnings.deprecated, so this one *should* lead to PYI053 in a stub!"  # Error: PYI053
 )
 def not_a_deprecated_function() -> None: ...
-
-fbaz: str = f"51 character {foo} stringgggggggggggggggggggggggggg"  # Error: PYI053

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

@@ -79,6 +79,5 @@ def test_single_list_of_lists(param):
 
 @pytest.mark.parametrize("a", [1, 2])
 @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
-@pytest.mark.parametrize("d", [3,])
 def test_multiple_decorators(a, b, c):
     pass

crates/ruff_linter/resources/test/fixtures/flake8_quotes/docstring_doubles_mixed_quotes_class_var_1.py

@@ -1,9 +0,0 @@
-class SingleLineDocstrings():
-    ""'Start with empty string' ' and lint docstring safely'
-    """ Not a docstring """
-
-    def foo(self, bar="""not a docstring"""):
-        ""'Start with empty string' ' and lint docstring safely'
-        pass
-
-    class Nested(foo()[:]): ""'Start with empty string' ' and lint docstring safely'; pass

crates/ruff_linter/resources/test/fixtures/flake8_quotes/docstring_doubles_mixed_quotes_class_var_2.py

@@ -1,9 +0,0 @@
-class SingleLineDocstrings():
-    "Do not"' start with empty string' ' and lint docstring safely'
-    """ Not a docstring """
-
-    def foo(self, bar="""not a docstring"""):
-        "Do not"' start with empty string' ' and lint docstring safely'
-        pass
-
-    class Nested(foo()[:]): "Do not"' start with empty string' ' and lint docstring safely'; pass

crates/ruff_linter/resources/test/fixtures/flake8_quotes/docstring_doubles_mixed_quotes_module_singleline_var_1.py

@@ -1,5 +0,0 @@
-""'Start with empty string' ' and lint docstring safely'
-
-def foo():
-    pass
-""" this is not a docstring """

crates/ruff_linter/resources/test/fixtures/flake8_quotes/docstring_doubles_mixed_quotes_module_singleline_var_2.py

@@ -1,5 +0,0 @@
-"Do not"' start with empty string' ' and lint docstring safely'
-
-def foo():
-    pass
-""" this is not a docstring """

crates/ruff_linter/resources/test/fixtures/flake8_quotes/docstring_singles_mixed_quotes_class_var_1.py

@@ -1,9 +0,0 @@
-class SingleLineDocstrings():
-    ''"Start with empty string" ' and lint docstring safely'
-    ''' Not a docstring '''
-
-    def foo(self, bar='''not a docstring'''):
-        ''"Start with empty string" ' and lint docstring safely'
-        pass
-
-    class Nested(foo()[:]): ''"Start with empty string" ' and lint docstring safely'; pass

crates/ruff_linter/resources/test/fixtures/flake8_quotes/docstring_singles_mixed_quotes_class_var_2.py

@@ -1,9 +0,0 @@
-class SingleLineDocstrings():
-    'Do not'" start with empty string" ' and lint docstring safely'
-    ''' Not a docstring '''
-
-    def foo(self, bar='''not a docstring'''):
-        'Do not'" start with empty string" ' and lint docstring safely'
-        pass
-
-    class Nested(foo()[:]): 'Do not'" start with empty string" ' and lint docstring safely'; pass

crates/ruff_linter/resources/test/fixtures/flake8_quotes/docstring_singles_mixed_quotes_module_singleline_var_1.py

@@ -1,5 +0,0 @@
-''"Start with empty string" ' and lint docstring safely'
-
-def foo():
-    pass
-""" this is not a docstring """

crates/ruff_linter/resources/test/fixtures/flake8_quotes/docstring_singles_mixed_quotes_module_singleline_var_2.py

@@ -1,5 +0,0 @@
-'Do not'" start with empty string" ' and lint docstring safely'
-
-def foo():
-    pass
-""" this is not a docstring """

crates/ruff_linter/resources/test/fixtures/flake8_quotes/doubles_would_be_triple_quotes.py

@@ -1,2 +0,0 @@
-s = ""'Start with empty string' ' and lint docstring safely'
-s = "Do not"' start with empty string' ' and lint docstring safely'

crates/ruff_linter/resources/test/fixtures/flake8_quotes/singles_would_be_triple_quotes.py

@@ -1,2 +0,0 @@
-s = ''"Start with empty string" ' and lint docstring safely'
-s = 'Do not'" start with empty string" ' and lint docstring safely'

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

@@ -84,22 +84,3 @@ def f():
         return True
     else:
         return False
-
-
-###
-# Positive cases (preview)
-###
-
-
-def f():
-    # SIM103
-    if a:
-        return True
-    return False
-
-
-def f():
-    # SIM103
-    if a:
-        return False
-    return True

crates/ruff_linter/resources/test/fixtures/flake8_trio/TRIO115.py

@@ -10,7 +10,7 @@ async def func():
 
     trio.sleep(0)  # TRIO115
     foo = 0
-    trio.sleep(foo)  # OK
+    trio.sleep(foo)  # TRIO115
     trio.sleep(1)  # OK
     time.sleep(0)  # OK
 
@@ -20,26 +20,26 @@ async def func():
     trio.sleep(bar)
 
     x, y = 0, 2000
-    trio.sleep(x)  # OK
+    trio.sleep(x)  # TRIO115
     trio.sleep(y)  # OK
 
     (a, b, [c, (d, e)]) = (1, 2, (0, [4, 0]))
-    trio.sleep(c)  # OK
+    trio.sleep(c)  # TRIO115
     trio.sleep(d)  # OK
-    trio.sleep(e)  # OK
+    trio.sleep(e)  # TRIO115
 
     m_x, m_y = 0
     trio.sleep(m_y)  # OK
     trio.sleep(m_x)  # OK
 
     m_a = m_b = 0
-    trio.sleep(m_a)  # OK
-    trio.sleep(m_b)  # OK
+    trio.sleep(m_a)  # TRIO115
+    trio.sleep(m_b)  # TRIO115
 
     m_c = (m_d, m_e) = (0, 0)
     trio.sleep(m_c)  # OK
-    trio.sleep(m_d)  # OK
-    trio.sleep(m_e)  # OK
+    trio.sleep(m_d)  # TRIO115
+    trio.sleep(m_e)  # TRIO115
 
 
 def func():
@@ -63,16 +63,4 @@ def func():
     import trio
 
     if (walrus := 0) == 0:
-        trio.sleep(walrus)  # OK
-
-
-def func():
-    import trio
-
-    async def main() -> None:
-        sleep = 0
-        for _ in range(2):
-            await trio.sleep(sleep)  # OK
-            sleep = 10
-
-    trio.run(main)
+        trio.sleep(walrus)  # TRIO115

crates/ruff_linter/resources/test/fixtures/pycodestyle/E23.py

@@ -47,60 +47,4 @@ snapshot.file_uri[len(f's3://{self.s3_bucket_name}/'):]
 {len(f's3://{self.s3_bucket_name}/'):1}
 
 #: Okay
-a = (1,)
-
-
-# https://github.com/astral-sh/ruff/issues/10113
-"""Minimal repo."""
-
-def main() -> None:
-    """Primary function."""
-    results = {
-        "k1": [1],
-        "k2":[2],
-    }
-    results_in_tuple = (
-        {
-            "k1": [1],
-            "k2":[2],
-        },
-    )
-    results_in_list = [
-        {
-            "k1": [1],
-            "k2":[2],
-        }
-    ]
-    results_in_list_first = [
-        {
-            "k2":[2],
-        }
-    ]
-
-x = [
-    {
-        "k1":[2], # E231
-        "k2": [2:4],
-        "k3":[2],  # E231
-        "k4": [2],
-        "k5": [2],
-        "k6": [1, 2, 3, 4,5,6,7]  # E231
-    },
-    {
-        "k1": [
-            {
-                "ka":[2,3],  # E231
-            },
-            {
-                "kb": [2,3],  # E231
-            },
-            {
-                "ka":[2, 3],  # E231
-                "kb": [2, 3],  # Ok
-                "kc": [2, 3],  # Ok
-                "kd": [2,3],  # E231
-                "ke":[2,3],  # E231
-            },
-        ]
-    }
-]
+a = (1,

crates/ruff_linter/resources/test/fixtures/pycodestyle/E302_first_line_docstring.py

@@ -1,4 +0,0 @@
-"""Test where the error is after the module's docstring."""
-
-def fn():
-    pass

crates/ruff_linter/resources/test/fixtures/pycodestyle/E302_first_line_expression.py

@@ -1,4 +0,0 @@
-"Test where the first line is a comment, " + "and the rule violation follows it."
-
-def fn():
-    pass

crates/ruff_linter/resources/test/fixtures/pycodestyle/E302_first_line_function.py

@@ -1,5 +0,0 @@
-def fn1():
-    pass
-
-def fn2():
-    pass

crates/ruff_linter/resources/test/fixtures/pycodestyle/E302_first_line_statement.py

@@ -1,4 +0,0 @@
-print("Test where the first line is a statement, and the rule violation follows it.")
-
-def fn():
-    pass

crates/ruff_linter/resources/test/fixtures/pycodestyle/E303_first_line_comment.py

@@ -1,6 +0,0 @@
-# Test where the first line is a comment, and the rule violation follows it.
-
-
-
-def fn():
-    pass

crates/ruff_linter/resources/test/fixtures/pycodestyle/E303_first_line_docstring.py

@@ -1,6 +0,0 @@
-"""Test where the error is after the module's docstring."""
-
-
-
-def fn():
-    pass

crates/ruff_linter/resources/test/fixtures/pycodestyle/E303_first_line_expression.py

@@ -1,6 +0,0 @@
-"Test where the first line is a comment, " + "and the rule violation follows it."
-
-
-
-def fn():
-    pass

crates/ruff_linter/resources/test/fixtures/pycodestyle/E303_first_line_statement.py

@@ -1,6 +0,0 @@
-print("Test where the first line is a statement, and the rule violation follows it.")
-
-
-
-def fn():
-    pass

crates/ruff_linter/resources/test/fixtures/pycodestyle/E501.py

@@ -82,8 +82,3 @@ class Bar:
     """
     This is a long sentence that ends with a shortened URL and, therefore, could easily be broken across multiple lines ([source](https://ruff.rs))
     """
-
-
-# OK
-# SPDX-FileCopyrightText: Copyright 2012-2015 Charlie Marsh <very-long-email-address@fake.com>
-# SPDX-License-Identifier: a very long license identifier that exceeds the line length limit

crates/ruff_linter/resources/test/fixtures/pycodestyle/W505.py

@@ -10,7 +10,7 @@ def f1():
     # Here's a standalone comment that's over the limit.
 
     x = 2
-    # Another standalone that is preceded by a newline and indent token and is over the limit.
+    # Another standalone that is preceded by a newline and indent toke and is over the limit.
 
     print("Here's a string that's over the limit, but it's not a docstring.")
 

crates/ruff_linter/resources/test/fixtures/pycodestyle/W505_utf_8.py

@@ -10,7 +10,7 @@ def f1():
     # Here's a standalone comment that's over theß9💣2ℝ.
 
     x = 2
-    # Another standalone that is preceded by a newline and indent token and is over theß9💣2ℝ.
+    # Another standalone that is preceded by a newline and indent toke and is over theß9💣2ℝ.
 
     print("Here's a string that's over theß9💣2ℝ, but it's not a ß9💣2ℝing.")
 

crates/ruff_linter/resources/test/fixtures/pycodestyle/W605_1.py

@@ -52,8 +52,3 @@ value = rf'\{{1}}'
 value = rf'\{1}'
 value = rf'{1:\}'
 value = f"{rf"\{1}"}"
-
-# Regression tests for https://github.com/astral-sh/ruff/issues/10434
-f"{{}}+-\d"
-f"\n{{}}+-\d+"
-f"\n{{}}<EFBFBD>+-\d+"

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

@@ -1,6 +0,0 @@
-"""Regression test for: https://github.com/astral-sh/ruff/issues/10384"""
-
-import datetime
-from datetime import datetime
-
-datetime(1, 2, 3)

crates/ruff_linter/resources/test/fixtures/pyflakes/F811_29.pyi

@@ -1,8 +0,0 @@
-"""Regression test for: https://github.com/astral-sh/ruff/issues/10509"""
-
-from foo import Bar as Bar
-
-class Eggs:
-    Bar: int  # OK
-
-Bar = 1  # F811

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

@@ -33,3 +33,16 @@ class MyClass:
 baz: MyClass
 eggs = baz  # Still invalid even when `__future__.annotations` are enabled
 eggs = "baz"  # always okay
+
+# Forward references:
+MaybeDStr: TypeAlias = Optional[DStr]  # Still invalid even when `__future__.annotations` are enabled
+MaybeDStr2: TypeAlias = Optional["DStr"]  # always okay
+DStr: TypeAlias = Union[D, str]  # Still invalid even when `__future__.annotations` are enabled
+DStr2: TypeAlias = Union["D", str]  # always okay
+
+class D: ...
+
+# More circular references
+class Leaf: ...
+class Tree(list[Tree | Leaf]): ...  # Still invalid even when `__future__.annotations` are enabled
+class Tree2(list["Tree | Leaf"]): ...  # always okay

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

@@ -1,9 +0,0 @@
-"""Test that unicode identifiers are NFKC-normalised"""
-
-𝒞 = 500
-print(𝒞)
-print(C + 𝒞)  # 2 references to the same variable due to NFKC normalization
-print(C / 𝒞)
-print(C == 𝑪 == 𝒞 == 𝓒 == 𝕮)
-
-print(𝒟)  # F821

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

@@ -1,23 +0,0 @@
-"""Regression test for #10451.
-
-Annotations in a class are allowed to be forward references
-if `from __future__ import annotations` is active,
-even if they're in a class included in
-`lint.flake8-type-checking.runtime-evaluated-base-classes`.
-
-They're not allowed to refer to symbols that cannot be *resolved*
-at runtime, however.
-"""
-
-from __future__ import annotations
-
-from sqlalchemy.orm import DeclarativeBase, Mapped
-
-
-class Base(DeclarativeBase):
-    some_mapping: Mapped[list[Bar]] | None = None  # Should not trigger F821 (resolveable forward reference)
-    simplified: list[Bar] | None = None  # Should not trigger F821 (resolveable forward reference)
-
-
-class Bar:
-    pass

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

@@ -11,13 +11,6 @@ def f():
     print(X)
 
 
-def f():
-    global X
-
-    if X > 0:
-        del X
-
-
 ###
 # Non-errors.
 ###

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

@@ -1,37 +0,0 @@
-# These testcases should raise errors
-
-class Float:
-    def __bool__(self):
-        return 3.05  # [invalid-bool-return]
-
-class Int:
-    def __bool__(self):
-        return 0  # [invalid-bool-return]
-
-
-class Str:
-    def __bool__(self):
-        x = "ruff"
-        return x  # [invalid-bool-return]
-
-# TODO: Once Ruff has better type checking
-def return_int():
-    return 3
-
-class ComplexReturn:
-    def __bool__(self):
-        return return_int()  # [invalid-bool-return]
-
-
-
-# These testcases should NOT raise errors
-
-class Bool:
-    def __bool__(self):
-        return True
-
-
-class Bool2:
-    def __bool__(self):
-        x = True
-        return x

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

@@ -1,36 +1,28 @@
-# These testcases should raise errors
+class Str:
+    def __str__(self):
+        return 1
 
 class Float:
     def __str__(self):
         return 3.05
-
+    
 class Int:
-    def __str__(self):
-        return 1
-
-class Int2:
     def __str__(self):
         return 0
-
+    
 class Bool:
     def __str__(self):
         return False
-
-# TODO: Once Ruff has better type checking
+    
+class Str2:
+    def __str__(self):
+        x = "ruff"
+        return x
+    
+# TODO fixme once Ruff has better type checking
 def return_int():
     return 3
 
 class ComplexReturn:
     def __str__(self):
-        return return_int()
-
-# These testcases should NOT raise errors
-
-class Str:
-    def __str__(self):
-        return "ruff"
-
-class Str2:
-    def __str__(self):
-        x = "ruff"
-        return x
+        return return_int()

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

@@ -1,76 +0,0 @@
-import math
-from math import nan as bad_val
-import numpy as np
-from numpy import nan as npy_nan
-
-
-x = float("nan")
-y = np.NaN
-
-# PLW0117
-if x == float("nan"):
-    pass
-
-# PLW0117
-if x == float("NaN"):
-    pass
-
-# PLW0117
-if x == float("NAN"):
-    pass
-
-# PLW0117
-if x == float("Nan"):
-    pass
-
-# PLW0117
-if x == math.nan:
-    pass
-
-# PLW0117
-if x == bad_val:
-    pass
-
-# PLW0117
-if y == np.NaN:
-    pass
-
-# PLW0117
-if y == np.NAN:
-    pass
-
-# PLW0117
-if y == np.nan:
-    pass
-
-# PLW0117
-if y == npy_nan:
-    pass
-
-# OK
-if math.isnan(x):
-    pass
-
-# OK
-if np.isnan(y):
-    pass
-
-# OK
-if x == 0:
-    pass
-
-# OK
-if x == float("32"):
-    pass
-
-# OK
-if x == float(42):
-    pass
-
-# OK
-if y == np.inf:
-    pass
-
-# OK
-if x == "nan":
-    pass

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

@@ -1,67 +0,0 @@
-# Positive cases
-
-counter = 0
-
-
-def count():
-    global counter
-    nonlocal counter
-    counter += 1
-
-
-def count():
-    counter = 0
-
-    def count(counter_type):
-        if counter_type == "nonlocal":
-            nonlocal counter
-            counter += 1
-        else:
-            global counter
-            counter += 1
-
-
-def count():
-    counter = 0
-
-    def count_twice():
-        for i in range(2):
-            nonlocal counter
-            counter += 1
-        global counter
-
-
-def count():
-    nonlocal counter
-    global counter
-    counter += 1
-
-
-# Negative cases
-
-counter = 0
-
-
-def count():
-    global counter
-    counter += 1
-
-
-def count():
-    counter = 0
-
-    def count_local():
-        nonlocal counter
-        counter += 1
-
-
-def count():
-    counter = 0
-
-    def count_local():
-        nonlocal counter
-        counter += 1
-
-    def count_global():
-        global counter
-        counter += 1

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

@@ -1,6 +0,0 @@
-FIRST, FIRST = (1, 2)  # PLW0128
-FIRST, (FIRST, SECOND) = (1, (1, 2))  # PLW0128
-FIRST, (FIRST, SECOND, (THIRD, FIRST)) = (1, (1, 2))  # PLW0128
-FIRST, SECOND, THIRD, FIRST, SECOND = (1, 2, 3, 4)  # PLW0128
-
-FIRST, SECOND, _, _, _ignored = (1, 2, 3, 4, 5)  # OK

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

@@ -1,23 +0,0 @@
-from functools import singledispatchmethod
-
-
-@singledispatchmethod  # [singledispatchmethod-function]
-def convert_position(position):
-    pass
-
-
-class Board:
-
-    @singledispatchmethod  # Ok
-    @classmethod
-    def convert_position(cls, position):
-        pass
-
-    @singledispatchmethod  # Ok
-    def move(self, position):
-        pass
-
-    @singledispatchmethod  # [singledispatchmethod-function]
-    @staticmethod
-    def do(position):
-        pass

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

@@ -1,8 +1,8 @@
+# Test case 1: Useless exception statement
 from abc import ABC, abstractmethod
 from contextlib import suppress
 
 
-# Test case 1: Useless exception statement
 def func():
     AssertionError("This is an assertion error")  # PLW0133
 
@@ -66,11 +66,6 @@ def func():
     x = 1; (RuntimeError("This is an exception")); y = 2  # PLW0133
 
 
-# Test case 11: Useless warning statement
-def func():
-    UserWarning("This is an assertion error")  # PLW0133
-
-
 # Non-violation test cases: PLW0133
 
 

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

@@ -1,28 +1,11 @@
-def func():
-    import datetime
+import datetime
+import datetime as dt
+from datetime import timezone
+from datetime import timezone as tz
 
-    print(datetime.timezone(-1))
+print(datetime.timezone(-1))
+print(timezone.utc)
+print(tz.utc)
 
-
-def func():
-    from datetime import timezone
-
-    print(timezone.utc)
-
-
-def func():
-    from datetime import timezone as tz
-
-    print(tz.utc)
-
-
-def func():
-    import datetime
-
-    print(datetime.timezone.utc)
-
-
-def func():
-    import datetime as dt
-
-    print(dt.timezone.utc)
+print(datetime.timezone.utc)
+print(dt.timezone.utc)

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

@@ -1,6 +1,9 @@
 import math
 
-# Errors
+from math import e as special_e
+from math import log as special_log
+
+# Errors.
 math.log(1, 2)
 math.log(1, 10)
 math.log(1, math.e)
@@ -8,10 +11,15 @@ foo = ...
 math.log(foo, 2)
 math.log(foo, 10)
 math.log(foo, math.e)
+math.log(1, special_e)
+special_log(1, 2)
+special_log(1, 10)
+special_log(1, math.e)
+special_log(1, special_e)
 math.log(1, 2.0)
 math.log(1, 10.0)
 
-# OK
+# Ok.
 math.log2(1)
 math.log10(1)
 math.log(1)
@@ -32,7 +40,6 @@ math.log10(1, 2)  # math.log10 takes only one argument.
 
 math.log(1, base=2)  # math.log does not accept keyword arguments.
 
-
 def log(*args):
     print(f"Logging: {args}")
 

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

@@ -1,62 +0,0 @@
-# Errors
-
-
-def a():
-    l = []
-    l = reversed(l)
-
-
-def b():
-    l = []
-    l = list(reversed(l))
-
-
-def c():
-    l = []
-    l = l[::-1]
-
-
-# False negative
-def c2():
-    class Wrapper:
-        l: list[int]
-
-    w = Wrapper()
-    w.l = list(reversed(w.l))
-    w.l = w.l[::-1]
-    w.l = reversed(w.l)
-
-
-# OK
-
-
-def d():
-    l = []
-    _ = reversed(l)
-
-
-def e():
-    l = []
-    l = l[::-2]
-    l = l[1:]
-    l = l[1::-1]
-    l = l[:1:-1]
-
-
-def f():
-    d = {}
-
-    # Don't warn: `d` is a dictionary, which doesn't have a `reverse` method.
-    d = reversed(d)
-
-
-def g():
-    l = "abc"[::-1]
-
-
-def h():
-    l = reversed([1, 2, 3])
-
-
-def i():
-    l = list(reversed([1, 2, 3]))

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

@@ -1,3 +1,4 @@
+import typing
 from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
 
 
@@ -25,6 +26,10 @@ def f(arg: str = None):  # RUF013
     pass
 
 
+def f(arg: typing.List[str] = None):  # RUF013
+    pass
+
+
 def f(arg: Tuple[str] = None):  # RUF013
     pass
 
@@ -36,6 +41,10 @@ def f(arg: Optional[int] = None):
     pass
 
 
+def f(arg: typing.Optional[int] = None):
+    pass
+
+
 # Union
 
 
@@ -51,6 +60,10 @@ def f(arg: Union[str, None] = None):
     pass
 
 
+def f(arg: typing.Union[int, str, None] = None):
+    pass
+
+
 def f(arg: Union[int, str, Any] = None):
     pass
 
@@ -67,6 +80,10 @@ def f(arg: Union[int, str] = None):  # RUF013
     pass
 
 
+def f(arg: typing.Union[int, str] = None):  # RUF013
+    pass
+
+
 # PEP 604 Union
 
 
@@ -113,6 +130,10 @@ def f(arg: Literal[1, "foo"] = None):  # RUF013
     pass
 
 
+def f(arg: typing.Literal[1, "foo", True] = None):  # RUF013
+    pass
+
+
 # Annotated
 
 

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

@@ -1,5 +1,5 @@
 # No `typing.Optional` import
 
 
-def f(arg: int = None):  # RUF013
+def f(arg: int = None):  # RUF011
     pass

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

@@ -1,30 +0,0 @@
-import typing
-
-
-def f(arg: typing.List[str] = None):  # RUF013
-    pass
-
-
-# Optional
-
-
-def f(arg: typing.Optional[int] = None):
-    pass
-
-
-# Union
-
-
-def f(arg: typing.Union[int, str, None] = None):
-    pass
-
-
-def f(arg: typing.Union[int, str] = None):  # RUF013
-    pass
-
-
-# Literal
-
-
-def f(arg: typing.Literal[1, "foo", True] = None):  # RUF013
-    pass

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

@@ -47,7 +47,7 @@ if (
     and some_third_reasonably_long_condition
     or some_fourth_reasonably_long_condition
     and some_fifth_reasonably_long_condition
-    # a comment
+    # a commment
     and some_sixth_reasonably_long_condition
     and some_seventh_reasonably_long_condition
     # another comment

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

@@ -48,7 +48,7 @@ __all__ = [
 # we implement an "isort-style sort":
 # SCEAMING_CASE constants first,
 # then CamelCase classes,
-# then anything that's lowercase_snake_case.
+# then anything thats lowercase_snake_case.
 # This (which is currently alphabetically sorted)
 # should get reordered accordingly:
 __all__ = [

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

@@ -53,6 +53,3 @@ class Labware:
 
 
 assert getattr(Labware(), "µL") == 1.5
-
-# Implicit string concatenation
-x = "𝐁ad" f"𝐁ad string"

crates/ruff_linter/resources/test/fixtures/tryceratops/TRY400.py

@@ -3,10 +3,13 @@ Violation:
 Use '.exception' over '.error' inside except blocks
 """
 
+import logging
+import sys
+
+logger = logging.getLogger(__name__)
+
 
 def bad():
-    import logging
-
     try:
         a = 1
     except Exception:
@@ -17,10 +20,6 @@ def bad():
 
 
 def bad():
-    import logging
-
-    logger = logging.getLogger(__name__)
-
     try:
         a = 1
     except Exception:
@@ -51,10 +50,6 @@ def bad():
 
 
 def good():
-    import logging
-
-    logger = logging.getLogger(__name__)
-
     try:
         a = 1
     except Exception:
@@ -69,10 +64,6 @@ def good():
 
 
 def fine():
-    import logging
-
-    logger = logging.getLogger(__name__)
-
     try:
         a = 1
     except Exception:
@@ -80,20 +71,16 @@ def fine():
 
 
 def fine():
-    import logging
-    import sys
-
-    logger = logging.getLogger(__name__)
-
     try:
         a = 1
     except Exception:
         logger.error("Context message here", exc_info=sys.exc_info())
 
 
-def bad():
-    from logging import error, exception
+from logging import error, exception
 
+
+def bad():
     try:
         a = 1
     except Exception:
@@ -104,8 +91,6 @@ def bad():
 
 
 def good():
-    from logging import error, exception
-
     try:
         a = 1
     except Exception:
@@ -113,8 +98,6 @@ def good():
 
 
 def fine():
-    from logging import error, exception
-
     try:
         a = 1
     except Exception:
@@ -122,9 +105,6 @@ def fine():
 
 
 def fine():
-    from logging import error, exception
-    import sys
-
     try:
         a = 1
     except Exception:
@@ -132,8 +112,6 @@ def fine():
 
 
 def nested():
-    from logging import error, exception
-
     try:
         a = 1
     except Exception:

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

@@ -1,6 +1,6 @@
 use ruff_diagnostics::{Diagnostic, Fix};
 use ruff_python_semantic::analyze::visibility;
-use ruff_python_semantic::{Binding, BindingKind, Imported, ResolvedReference, ScopeKind};
+use ruff_python_semantic::{Binding, BindingKind, Imported, ScopeKind};
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
@@ -43,7 +43,6 @@ pub(crate) fn deferred_scopes(checker: &mut Checker) {
         Rule::UnusedStaticMethodArgument,
         Rule::UnusedVariable,
         Rule::SingledispatchMethod,
-        Rule::SingledispatchmethodFunction,
     ]) {
         return;
     }
@@ -92,29 +91,13 @@ pub(crate) fn deferred_scopes(checker: &mut Checker) {
         if checker.enabled(Rule::GlobalVariableNotAssigned) {
             for (name, binding_id) in scope.bindings() {
                 let binding = checker.semantic.binding(binding_id);
-                // If the binding is a `global`, then it's a top-level `global` that was never
-                // assigned in the current scope. If it were assigned, the `global` would be
-                // shadowed by the assignment.
                 if binding.kind.is_global() {
-                    // If the binding was conditionally deleted, it will include a reference within
-                    // a `Del` context, but won't be shadowed by a `BindingKind::Deletion`, as in:
-                    // ```python
-                    // if condition:
-                    //     del var
-                    // ```
-                    if binding
-                        .references
-                        .iter()
-                        .map(|id| checker.semantic.reference(*id))
-                        .all(ResolvedReference::is_load)
-                    {
-                        diagnostics.push(Diagnostic::new(
-                            pylint::rules::GlobalVariableNotAssigned {
-                                name: (*name).to_string(),
-                            },
-                            binding.range(),
-                        ));
-                    }
+                    diagnostics.push(Diagnostic::new(
+                        pylint::rules::GlobalVariableNotAssigned {
+                            name: (*name).to_string(),
+                        },
+                        binding.range(),
+                    ));
                 }
             }
         }
@@ -276,29 +259,23 @@ pub(crate) fn deferred_scopes(checker: &mut Checker) {
                         diagnostic.set_parent(range.start());
                     }
 
-                    // Remove the import if the binding and the shadowed binding are both imports,
-                    // and both point to the same qualified name.
-                    if let Some(shadowed_import) = shadowed.as_any_import() {
-                        if let Some(import) = binding.as_any_import() {
-                            if shadowed_import.qualified_name() == import.qualified_name() {
-                                if let Some(source) = binding.source {
-                                    diagnostic.try_set_fix(|| {
-                                        let statement = checker.semantic().statement(source);
-                                        let parent = checker.semantic().parent_statement(source);
-                                        let edit = fix::edits::remove_unused_imports(
-                                            std::iter::once(import.member_name().as_ref()),
-                                            statement,
-                                            parent,
-                                            checker.locator(),
-                                            checker.stylist(),
-                                            checker.indexer(),
-                                        )?;
-                                        Ok(Fix::safe_edit(edit).isolate(Checker::isolation(
-                                            checker.semantic().parent_statement_id(source),
-                                        )))
-                                    });
-                                }
-                            }
+                    if let Some(import) = binding.as_any_import() {
+                        if let Some(source) = binding.source {
+                            diagnostic.try_set_fix(|| {
+                                let statement = checker.semantic().statement(source);
+                                let parent = checker.semantic().parent_statement(source);
+                                let edit = fix::edits::remove_unused_imports(
+                                    std::iter::once(import.member_name().as_ref()),
+                                    statement,
+                                    parent,
+                                    checker.locator(),
+                                    checker.stylist(),
+                                    checker.indexer(),
+                                )?;
+                                Ok(Fix::safe_edit(edit).isolate(Checker::isolation(
+                                    checker.semantic().parent_statement_id(source),
+                                )))
+                            });
                         }
                     }
 
@@ -420,10 +397,6 @@ pub(crate) fn deferred_scopes(checker: &mut Checker) {
                 pylint::rules::singledispatch_method(checker, scope, &mut diagnostics);
             }
 
-            if checker.enabled(Rule::SingledispatchmethodFunction) {
-                pylint::rules::singledispatchmethod_function(checker, scope, &mut diagnostics);
-            }
-
             if checker.any_enabled(&[
                 Rule::InvalidFirstArgumentNameForClassMethod,
                 Rule::InvalidFirstArgumentNameForMethod,

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

@@ -1283,9 +1283,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::MagicValueComparison) {
                 pylint::rules::magic_value_comparison(checker, left, comparators);
             }
-            if checker.enabled(Rule::NanComparison) {
-                pylint::rules::nan_comparison(checker, left, comparators);
-            }
             if checker.enabled(Rule::InDictKeys) {
                 flake8_simplify::rules::key_in_dict_compare(checker, compare);
             }

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

@@ -30,7 +30,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 }));
             }
         }
-        Stmt::Nonlocal(nonlocal @ ast::StmtNonlocal { names, range: _ }) => {
+        Stmt::Nonlocal(ast::StmtNonlocal { names, range: _ }) => {
             if checker.enabled(Rule::AmbiguousVariableName) {
                 checker.diagnostics.extend(names.iter().filter_map(|name| {
                     pycodestyle::rules::ambiguous_variable_name(name, name.range())
@@ -50,9 +50,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     }
                 }
             }
-            if checker.enabled(Rule::NonlocalAndGlobal) {
-                pylint::rules::nonlocal_and_global(checker, nonlocal);
-            }
         }
         Stmt::Break(_) => {
             if checker.enabled(Rule::BreakOutsideLoop) {
@@ -94,9 +91,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     checker.diagnostics.push(diagnostic);
                 }
             }
-            if checker.enabled(Rule::InvalidBoolReturnType) {
-                pylint::rules::invalid_bool_return(checker, name, body);
-            }
             if checker.enabled(Rule::InvalidStrReturnType) {
                 pylint::rules::invalid_str_return(checker, name, body);
             }
@@ -1082,7 +1076,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 flake8_simplify::rules::if_with_same_arms(checker, if_);
             }
             if checker.enabled(Rule::NeedlessBool) {
-                flake8_simplify::rules::needless_bool(checker, stmt);
+                flake8_simplify::rules::needless_bool(checker, if_);
             }
             if checker.enabled(Rule::IfElseBlockInsteadOfDictLookup) {
                 flake8_simplify::rules::if_else_block_instead_of_dict_lookup(checker, if_);
@@ -1392,9 +1386,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             }
         }
         Stmt::Assign(assign @ ast::StmtAssign { targets, value, .. }) => {
-            if checker.enabled(Rule::RedeclaredAssignedName) {
-                pylint::rules::redeclared_assigned_name(checker, targets);
-            }
             if checker.enabled(Rule::LambdaAssignment) {
                 if let [target] = &targets[..] {
                     pycodestyle::rules::lambda_assignment(checker, target, value, None, stmt);
@@ -1503,9 +1494,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     }
                 }
             }
-            if checker.enabled(Rule::ListReverseCopy) {
-                refurb::rules::list_assign_reversed(checker, assign);
-            }
         }
         Stmt::AnnAssign(
             assign_stmt @ ast::StmtAnnAssign {

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

@@ -44,10 +44,10 @@ use ruff_python_ast::helpers::{
 };
 use ruff_python_ast::identifier::Identifier;
 use ruff_python_ast::name::QualifiedName;
-use ruff_python_ast::str::Quote;
-use ruff_python_ast::visitor::{walk_except_handler, walk_pattern, Visitor};
+use ruff_python_ast::str::trailing_quote;
+use ruff_python_ast::visitor::{walk_except_handler, walk_f_string_element, walk_pattern, Visitor};
 use ruff_python_ast::{helpers, str, visitor, PySourceType};
-use ruff_python_codegen::{Generator, Stylist};
+use ruff_python_codegen::{Generator, Quote, Stylist};
 use ruff_python_index::Indexer;
 use ruff_python_parser::typing::{parse_type_annotation, AnnotationKind};
 use ruff_python_semantic::analyze::{imports, typing, visibility};
@@ -228,11 +228,16 @@ impl<'a> Checker<'a> {
         }
 
         // Find the quote character used to start the containing f-string.
-        let ast::ExprFString { value, .. } = self
-            .semantic
-            .current_expressions()
-            .find_map(|expr| expr.as_f_string_expr())?;
-        Some(value.iter().next()?.quote_style().opposite())
+        let expr = self.semantic.current_expression()?;
+        let string_range = self.indexer.fstring_ranges().innermost(expr.start())?;
+        let trailing_quote = trailing_quote(self.locator.slice(string_range))?;
+
+        // Invert the quote character, if it's a single quote.
+        match trailing_quote {
+            "'" => Some(Quote::Double),
+            "\"" => Some(Quote::Single),
+            _ => None,
+        }
     }
 
     /// Returns the [`SourceRow`] for the given offset.
@@ -540,11 +545,7 @@ impl<'a> Visitor<'a> for Checker<'a> {
                     for name in names {
                         if let Some((scope_id, binding_id)) = self.semantic.nonlocal(name) {
                             // Mark the binding as "used".
-                            self.semantic.add_local_reference(
-                                binding_id,
-                                ExprContext::Load,
-                                name.range(),
-                            );
+                            self.semantic.add_local_reference(binding_id, name.range());
 
                             // Mark the binding in the enclosing scope as "rebound" in the current
                             // scope.
@@ -937,6 +938,7 @@ impl<'a> Visitor<'a> for Checker<'a> {
             && !self.semantic.in_deferred_type_definition()
             && self.semantic.in_type_definition()
             && self.semantic.future_annotations()
+            && (self.semantic.in_typing_only_annotation() || self.source_type.is_stub())
         {
             if let Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) = expr {
                 self.visit.string_type_definitions.push((
@@ -1410,7 +1412,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 analyze::string_like(string_literal.into(), self);
             }
             Expr::BytesLiteral(bytes_literal) => analyze::string_like(bytes_literal.into(), self),
-            Expr::FString(f_string) => analyze::string_like(f_string.into(), self),
             _ => {}
         }
 
@@ -1577,6 +1578,16 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 .push((bound, self.semantic.snapshot()));
         }
     }
+
+    fn visit_f_string_element(&mut self, f_string_element: &'a ast::FStringElement) {
+        // Step 2: Traversal
+        walk_f_string_element(self, f_string_element);
+
+        // Step 4: Analysis
+        if let Some(literal) = f_string_element.as_literal() {
+            analyze::string_like(literal.into(), self);
+        }
+    }
 }
 
 impl<'a> Checker<'a> {
@@ -1835,7 +1846,7 @@ impl<'a> Checker<'a> {
         if matches!(
             parent,
             Stmt::AnnAssign(ast::StmtAnnAssign { value: None, .. })
-        ) && !self.semantic.in_annotation()
+        ) && !(self.semantic.in_annotation() || self.source_type.is_stub())
         {
             self.add_binding(id, expr.range(), BindingKind::Annotation, flags);
             return;
@@ -2116,8 +2127,7 @@ impl<'a> Checker<'a> {
                 // Mark anything referenced in `__all__` as used.
                 // TODO(charlie): `range` here should be the range of the name in `__all__`, not
                 // the range of `__all__` itself.
-                self.semantic
-                    .add_global_reference(binding_id, ExprContext::Load, range);
+                self.semantic.add_global_reference(binding_id, range);
             } else {
                 if self.semantic.global_scope().uses_star_imports() {
                     if self.enabled(Rule::UndefinedLocalWithImportStarUsage) {

crates/ruff_linter/src/checkers/imports.rs

@@ -20,7 +20,12 @@ use crate::rules::isort::block::{Block, BlockBuilder};
 use crate::settings::LinterSettings;
 
 fn extract_import_map(path: &Path, package: Option<&Path>, blocks: &[&Block]) -> Option<ImportMap> {
-    let module_path = to_module_path(package?, path)?;
+    let Some(package) = package else {
+        return None;
+    };
+    let Some(module_path) = to_module_path(package, path) else {
+        return None;
+    };
 
     let num_imports = blocks.iter().map(|block| block.imports.len()).sum();
     let mut module_imports = Vec::with_capacity(num_imports);

crates/ruff_linter/src/codes.rs

@@ -234,14 +234,12 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Pylint, "C3002") => (RuleGroup::Stable, rules::pylint::rules::UnnecessaryDirectLambdaCall),
         (Pylint, "E0100") => (RuleGroup::Stable, rules::pylint::rules::YieldInInit),
         (Pylint, "E0101") => (RuleGroup::Stable, rules::pylint::rules::ReturnInInit),
-        (Pylint, "E0115") => (RuleGroup::Preview, rules::pylint::rules::NonlocalAndGlobal),
         (Pylint, "E0116") => (RuleGroup::Stable, rules::pylint::rules::ContinueInFinally),
         (Pylint, "E0117") => (RuleGroup::Stable, rules::pylint::rules::NonlocalWithoutBinding),
         (Pylint, "E0118") => (RuleGroup::Stable, rules::pylint::rules::LoadBeforeGlobalDeclaration),
         (Pylint, "E0237") => (RuleGroup::Stable, rules::pylint::rules::NonSlotAssignment),
         (Pylint, "E0241") => (RuleGroup::Stable, rules::pylint::rules::DuplicateBases),
         (Pylint, "E0302") => (RuleGroup::Stable, rules::pylint::rules::UnexpectedSpecialMethodSignature),
-        (Pylint, "E0304") => (RuleGroup::Preview, rules::pylint::rules::InvalidBoolReturnType),
         (Pylint, "E0307") => (RuleGroup::Stable, rules::pylint::rules::InvalidStrReturnType),
         (Pylint, "E0604") => (RuleGroup::Stable, rules::pylint::rules::InvalidAllObject),
         (Pylint, "E0605") => (RuleGroup::Stable, rules::pylint::rules::InvalidAllFormat),
@@ -257,7 +255,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Pylint, "E1310") => (RuleGroup::Stable, rules::pylint::rules::BadStrStripCall),
         (Pylint, "E1507") => (RuleGroup::Stable, rules::pylint::rules::InvalidEnvvarValue),
         (Pylint, "E1519") => (RuleGroup::Preview, rules::pylint::rules::SingledispatchMethod),
-        (Pylint, "E1520") => (RuleGroup::Preview, rules::pylint::rules::SingledispatchmethodFunction),
         (Pylint, "E1700") => (RuleGroup::Stable, rules::pylint::rules::YieldFromInAsyncFunction),
         (Pylint, "E2502") => (RuleGroup::Stable, rules::pylint::rules::BidirectionalUnicode),
         (Pylint, "E2510") => (RuleGroup::Stable, rules::pylint::rules::InvalidCharacterBackspace),
@@ -294,10 +291,8 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         #[allow(deprecated)]
         (Pylint, "R6301") => (RuleGroup::Nursery, rules::pylint::rules::NoSelfUse),
         (Pylint, "W0108") => (RuleGroup::Preview, rules::pylint::rules::UnnecessaryLambda),
-        (Pylint, "W0117") => (RuleGroup::Preview, rules::pylint::rules::NanComparison),
         (Pylint, "W0120") => (RuleGroup::Stable, rules::pylint::rules::UselessElseOnLoop),
         (Pylint, "W0127") => (RuleGroup::Stable, rules::pylint::rules::SelfAssigningVariable),
-        (Pylint, "W0128") => (RuleGroup::Preview, rules::pylint::rules::RedeclaredAssignedName),
         (Pylint, "W0129") => (RuleGroup::Stable, rules::pylint::rules::AssertOnStringLiteral),
         (Pylint, "W0131") => (RuleGroup::Stable, rules::pylint::rules::NamedExprWithoutContext),
         (Pylint, "W0133") => (RuleGroup::Preview, rules::pylint::rules::UselessExceptionStatement),
@@ -1056,7 +1051,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Refurb, "177") => (RuleGroup::Preview, rules::refurb::rules::ImplicitCwd),
         (Refurb, "180") => (RuleGroup::Preview, rules::refurb::rules::MetaClassABCMeta),
         (Refurb, "181") => (RuleGroup::Preview, rules::refurb::rules::HashlibDigestHex),
-        (Refurb, "187") => (RuleGroup::Preview, rules::refurb::rules::ListReverseCopy),
 
         // flake8-logging
         (Flake8Logging, "001") => (RuleGroup::Stable, rules::flake8_logging::rules::DirectLoggerInstantiation),

crates/ruff_linter/src/fix/edits.rs

@@ -40,7 +40,10 @@ pub(crate) fn delete_stmt(
     locator: &Locator,
     indexer: &Indexer,
 ) -> Edit {
-    if parent.is_some_and(|parent| is_lone_child(stmt, parent)) {
+    if parent
+        .map(|parent| is_lone_child(stmt, parent))
+        .unwrap_or_default()
+    {
         // If removing this node would lead to an invalid syntax tree, replace
         // it with a `pass`.
         Edit::range_replacement("pass".to_string(), stmt.range())

crates/ruff_linter/src/importer/insertion.rs

@@ -278,7 +278,9 @@ impl<'a> Insertion<'a> {
 /// Find the end of the last docstring.
 fn match_docstring_end(body: &[Stmt]) -> Option<TextSize> {
     let mut iter = body.iter();
-    let mut stmt = iter.next()?;
+    let Some(mut stmt) = iter.next() else {
+        return None;
+    };
     if !is_docstring_stmt(stmt) {
         return None;
     }

crates/ruff_linter/src/lib.rs

@@ -4,6 +4,7 @@
 //! and subject to change drastically.
 //!
 //! [Ruff]: https://github.com/astral-sh/ruff
+#![recursion_limit = "256"]
 
 #[cfg(feature = "clap")]
 pub use registry::clap_completion::RuleParser;

crates/ruff_linter/src/renamer.rs

@@ -255,7 +255,6 @@ impl Renamer {
             | BindingKind::ClassDefinition(_)
             | BindingKind::FunctionDefinition(_)
             | BindingKind::Deletion
-            | BindingKind::ConditionalDeletion(_)
             | BindingKind::UnboundException(_) => {
                 Some(Edit::range_replacement(target.to_string(), binding.range()))
             }

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

@@ -43,49 +43,7 @@ impl Violation for CommentedOutCode {
     }
 }
 
-/// ERA001
-pub(crate) fn commented_out_code(
-    diagnostics: &mut Vec<Diagnostic>,
-    locator: &Locator,
-    indexer: &Indexer,
-    settings: &LinterSettings,
-) {
-    // Skip comments within `/// script` tags.
-    let mut in_script_tag = false;
-
-    // Iterate over all comments in the document.
-    for range in indexer.comment_ranges() {
-        let line = locator.lines(*range);
-
-        // Detect `/// script` tags.
-        if in_script_tag {
-            if is_script_tag_end(line) {
-                in_script_tag = false;
-            }
-        } else {
-            if is_script_tag_start(line) {
-                in_script_tag = true;
-            }
-        }
-
-        // Skip comments within `/// script` tags.
-        if in_script_tag {
-            continue;
-        }
-
-        // Verify that the comment is on its own line, and that it contains code.
-        if is_own_line_comment(line) && comment_contains_code(line, &settings.task_tags[..]) {
-            let mut diagnostic = Diagnostic::new(CommentedOutCode, *range);
-            diagnostic.set_fix(Fix::display_only_edit(Edit::range_deletion(
-                locator.full_lines_range(*range),
-            )));
-            diagnostics.push(diagnostic);
-        }
-    }
-}
-
-/// Returns `true` if line contains an own-line comment.
-fn is_own_line_comment(line: &str) -> bool {
+fn is_standalone_comment(line: &str) -> bool {
     for char in line.chars() {
         if char == '#' {
             return true;
@@ -97,16 +55,23 @@ fn is_own_line_comment(line: &str) -> bool {
     unreachable!("Comment should contain '#' character")
 }
 
-/// Returns `true` if the line appears to start a script tag.
-///
-/// See: <https://peps.python.org/pep-0723/>
-fn is_script_tag_start(line: &str) -> bool {
-    line == "# /// script"
-}
+/// ERA001
+pub(crate) fn commented_out_code(
+    diagnostics: &mut Vec<Diagnostic>,
+    locator: &Locator,
+    indexer: &Indexer,
+    settings: &LinterSettings,
+) {
+    for range in indexer.comment_ranges() {
+        let line = locator.full_lines(*range);
 
-/// Returns `true` if the line appears to start a script tag.
-///
-/// See: <https://peps.python.org/pep-0723/>
-fn is_script_tag_end(line: &str) -> bool {
-    line == "# ///"
+        // Verify that the comment is on its own line, and that it contains code.
+        if is_standalone_comment(line) && comment_contains_code(line, &settings.task_tags[..]) {
+            let mut diagnostic = Diagnostic::new(CommentedOutCode, *range);
+            diagnostic.set_fix(Fix::display_only_edit(Edit::range_deletion(
+                locator.full_lines_range(*range),
+            )));
+            diagnostics.push(diagnostic);
+        }
+    }
 }

crates/ruff_linter/src/rules/eradicate/snapshots/ruff_linter__rules__eradicate__tests__ERA001_ERA001.py.snap

@@ -245,7 +245,6 @@ ERA001.py:36:1: ERA001 Found commented-out code
 36    |-# except:
 37 36 | # except Foo:
 38 37 | # except Exception as e: print(e)
-39 38 | 
 
 ERA001.py:37:1: ERA001 Found commented-out code
    |
@@ -263,8 +262,6 @@ ERA001.py:37:1: ERA001 Found commented-out code
 36 36 | # except:
 37    |-# except Foo:
 38 37 | # except Exception as e: print(e)
-39 38 | 
-40 39 | 
 
 ERA001.py:38:1: ERA001 Found commented-out code
    |
@@ -280,44 +277,3 @@ ERA001.py:38:1: ERA001 Found commented-out code
 36 36 | # except:
 37 37 | # except Foo:
 38    |-# except Exception as e: print(e)
-39 38 | 
-40 39 | 
-41 40 | # Script tag without an opening tag (Error)
-
-ERA001.py:44:1: ERA001 Found commented-out code
-   |
-43 | # requires-python = ">=3.11"
-44 | # dependencies = [
-   | ^^^^^^^^^^^^^^^^^^ ERA001
-45 | #   "requests<3",
-46 | #   "rich",
-   |
-   = help: Remove commented-out code
-
-ℹ Display-only fix
-41 41 | # Script tag without an opening tag (Error)
-42 42 | 
-43 43 | # requires-python = ">=3.11"
-44    |-# dependencies = [
-45 44 | #   "requests<3",
-46 45 | #   "rich",
-47 46 | # ]
-
-ERA001.py:47:1: ERA001 Found commented-out code
-   |
-45 | #   "requests<3",
-46 | #   "rich",
-47 | # ]
-   | ^^^ ERA001
-48 | # ///
-   |
-   = help: Remove commented-out code
-
-ℹ Display-only fix
-44 44 | # dependencies = [
-45 45 | #   "requests<3",
-46 46 | #   "rich",
-47    |-# ]
-48 47 | # ///
-49 48 | 
-50 49 | # Script tag (OK)

crates/ruff_linter/src/rules/flake8_annotations/rules/definition.rs

@@ -294,7 +294,7 @@ impl Violation for MissingReturnTypePrivateFunction {
 ///
 /// Note that type checkers often allow you to omit the return type annotation for
 /// `__init__` methods, as long as at least one argument has a type annotation. To
-/// opt in to this behavior, use the `mypy-init-return` setting in your `pyproject.toml`
+/// opt-in to this behavior, use the `mypy-init-return` setting in your `pyproject.toml`
 /// or `ruff.toml` file:
 ///
 /// ```toml

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

@@ -38,37 +38,17 @@ impl Violation for HardcodedBindAllInterfaces {
 
 /// S104
 pub(crate) fn hardcoded_bind_all_interfaces(checker: &mut Checker, string: StringLike) {
-    match string {
-        StringLike::String(ast::ExprStringLiteral { value, .. }) => {
-            if value == "0.0.0.0" {
-                checker
-                    .diagnostics
-                    .push(Diagnostic::new(HardcodedBindAllInterfaces, string.range()));
-            }
+    let is_bind_all_interface = match string {
+        StringLike::StringLiteral(ast::ExprStringLiteral { value, .. }) => value == "0.0.0.0",
+        StringLike::FStringLiteral(ast::FStringLiteralElement { value, .. }) => {
+            &**value == "0.0.0.0"
         }
-        StringLike::FString(ast::ExprFString { value, .. }) => {
-            for part in value {
-                match part {
-                    ast::FStringPart::Literal(literal) => {
-                        if &**literal == "0.0.0.0" {
-                            checker
-                                .diagnostics
-                                .push(Diagnostic::new(HardcodedBindAllInterfaces, literal.range()));
-                        }
-                    }
-                    ast::FStringPart::FString(f_string) => {
-                        for literal in f_string.literals() {
-                            if &**literal == "0.0.0.0" {
-                                checker.diagnostics.push(Diagnostic::new(
-                                    HardcodedBindAllInterfaces,
-                                    literal.range(),
-                                ));
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        StringLike::Bytes(_) => (),
+        StringLike::BytesLiteral(_) => return,
     };
+
+    if is_bind_all_interface {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(HardcodedBindAllInterfaces, string.range()));
+    }
 }

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

@@ -80,7 +80,9 @@ pub(crate) fn compare_to_hardcoded_password_string(
         .diagnostics
         .extend(comparators.iter().filter_map(|comp| {
             string_literal(comp).filter(|string| !string.is_empty())?;
-            let name = password_target(left)?;
+            let Some(name) = password_target(left) else {
+                return None;
+            };
             Some(Diagnostic::new(
                 HardcodedPasswordString {
                     name: name.to_string(),

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

@@ -1,5 +1,5 @@
 use ruff_python_ast::{self as ast, Expr, StringLike};
-use ruff_text_size::{Ranged, TextRange};
+use ruff_text_size::Ranged;
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -53,29 +53,12 @@ impl Violation for HardcodedTempFile {
 
 /// S108
 pub(crate) fn hardcoded_tmp_directory(checker: &mut Checker, string: StringLike) {
-    match string {
-        StringLike::String(ast::ExprStringLiteral { value, .. }) => {
-            check(checker, value.to_str(), string.range());
-        }
-        StringLike::FString(ast::ExprFString { value, .. }) => {
-            for part in value {
-                match part {
-                    ast::FStringPart::Literal(literal) => {
-                        check(checker, literal, literal.range());
-                    }
-                    ast::FStringPart::FString(f_string) => {
-                        for literal in f_string.literals() {
-                            check(checker, literal, literal.range());
-                        }
-                    }
-                }
-            }
-        }
-        StringLike::Bytes(_) => (),
-    }
-}
+    let value = match string {
+        StringLike::StringLiteral(ast::ExprStringLiteral { value, .. }) => value.to_str(),
+        StringLike::FStringLiteral(ast::FStringLiteralElement { value, .. }) => value,
+        StringLike::BytesLiteral(_) => return,
+    };
 
-fn check(checker: &mut Checker, value: &str, range: TextRange) {
     if !checker
         .settings
         .flake8_bandit
@@ -102,6 +85,6 @@ fn check(checker: &mut Checker, value: &str, range: TextRange) {
         HardcodedTempFile {
             string: value.to_string(),
         },
-        range,
+        string.range(),
     ));
 }