Do not emit Unknown token

## Summary

This PR removes the `Pattern::Invalid` variant. There are no references
of it in the parser.

.gitattributes

@@ -2,8 +2,6 @@
 
 crates/ruff_linter/resources/test/fixtures/isort/line_ending_crlf.py text eol=crlf
 crates/ruff_linter/resources/test/fixtures/pycodestyle/W605_1.py text eol=crlf
-crates/ruff_linter/resources/test/fixtures/pycodestyle/W391_2.py text eol=crlf
-crates/ruff_linter/resources/test/fixtures/pycodestyle/W391_3.py text eol=crlf
 
 crates/ruff_python_formatter/resources/test/fixtures/ruff/docstring_code_examples_crlf.py text eol=crlf
 crates/ruff_python_formatter/tests/snapshots/format@docstring_code_examples_crlf.py.snap text eol=crlf

.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: |

.github/workflows/release.yaml

@@ -28,6 +28,7 @@ env:
   CARGO_NET_RETRY: 10
   CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
+  MATURIN_VERSION: "1.4.0"
 
 jobs:
   sdist:
@@ -44,6 +45,7 @@ jobs:
       - name: "Build sdist"
         uses: PyO3/maturin-action@v1
         with:
+          maturin-version: ${{ env.MATURIN_VERSION }}
           command: sdist
           args: --out dist
       - name: "Test sdist"
@@ -72,6 +74,7 @@ jobs:
       - name: "Build wheels - x86_64"
         uses: PyO3/maturin-action@v1
         with:
+          maturin-version: ${{ env.MATURIN_VERSION }}
           target: x86_64
           args: --release --locked --out dist
       - name: "Test wheel - x86_64"
@@ -112,6 +115,7 @@ jobs:
       - name: "Build wheels - universal2"
         uses: PyO3/maturin-action@v1
         with:
+          maturin-version: ${{ env.MATURIN_VERSION }}
           args: --release --locked --target universal2-apple-darwin --out dist
       - name: "Test wheel - universal2"
         run: |
@@ -160,6 +164,7 @@ jobs:
       - name: "Build wheels"
         uses: PyO3/maturin-action@v1
         with:
+          maturin-version: ${{ env.MATURIN_VERSION }}
           target: ${{ matrix.platform.target }}
           args: --release --locked --out dist
       - name: "Test wheel"
@@ -208,6 +213,7 @@ jobs:
       - name: "Build wheels"
         uses: PyO3/maturin-action@v1
         with:
+          maturin-version: ${{ env.MATURIN_VERSION }}
           target: ${{ matrix.target }}
           manylinux: auto
           args: --release --locked --out dist
@@ -270,6 +276,7 @@ jobs:
       - name: "Build wheels"
         uses: PyO3/maturin-action@v1
         with:
+          maturin-version: ${{ env.MATURIN_VERSION }}
           target: ${{ matrix.platform.target }}
           manylinux: auto
           docker-options: ${{ matrix.platform.maturin_docker_options }}
@@ -326,6 +333,7 @@ jobs:
       - name: "Build wheels"
         uses: PyO3/maturin-action@v1
         with:
+          maturin-version: ${{ env.MATURIN_VERSION }}
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
           args: --release --locked --out dist
@@ -381,6 +389,7 @@ jobs:
       - name: "Build wheels"
         uses: PyO3/maturin-action@v1
         with:
+          maturin-version: ${{ env.MATURIN_VERSION }}
           target: ${{ matrix.platform.target }}
           manylinux: musllinux_1_2
           args: --release --locked --out dist
@@ -517,7 +526,7 @@ jobs:
           path: binaries
           merge-multiple: true
       - name: "Publish to GitHub"
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
         with:
           draft: true
           files: binaries/*

.gitignore

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

CHANGELOG.md

@@ -1,105 +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
-
-- Improve single-`with` item formatting for Python 3.8 or older ([#10276](https://github.com/astral-sh/ruff/pull/10276))
-
-### Rule changes
-
-- \[`pyupgrade`\] Allow fixes for f-string rule regardless of line length (`UP032`) ([#10263](https://github.com/astral-sh/ruff/pull/10263))
-- \[`pycodestyle`\] Include actual conditions in E712 diagnostics ([#10254](https://github.com/astral-sh/ruff/pull/10254))
-
-### Bug fixes
-
-- Fix trailing kwargs end of line comment after slash ([#10297](https://github.com/astral-sh/ruff/pull/10297))
-- Fix unstable `with` items formatting ([#10274](https://github.com/astral-sh/ruff/pull/10274))
-- Avoid repeating function calls in f-string conversions ([#10265](https://github.com/astral-sh/ruff/pull/10265))
-- Fix E203 false positive for slices in format strings ([#10280](https://github.com/astral-sh/ruff/pull/10280))
-- Fix incorrect `Parameter` range  for `*args` and `**kwargs`  ([#10283](https://github.com/astral-sh/ruff/pull/10283))
-- Treat `typing.Annotated` subscripts as type definitions ([#10285](https://github.com/astral-sh/ruff/pull/10285))
-
 ## 0.3.1
 
 ### Preview features
@@ -1279,7 +1179,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
 

CONTRIBUTING.md

@@ -329,13 +329,13 @@ even patch releases may contain [non-backwards-compatible changes](https://semve
 
 ### Creating a new release
 
-1. Install `uv`: `curl -LsSf https://astral.sh/uv/install.sh | sh`
-1. Run `./scripts/release/bump.sh`; this command will:
-    - Generate a temporary virtual environment with `rooster`
+We use an experimental in-house tool for managing releases.
+
+1. Install `rooster`: `pip install git+https://github.com/zanieb/rooster@main`
+1. Run `rooster release`; this command will:
     - Generate a changelog entry in `CHANGELOG.md`
     - Update versions in `pyproject.toml` and `Cargo.toml`
     - Update references to versions in the `README.md` and documentation
-    - Display contributors for the release
 1. The changelog should then be editorialized for consistency
     - Often labels will be missing from pull requests they will need to be manually organized into the proper section
     - Changes should be edited to be user-facing descriptions, avoiding internal details
@@ -359,7 +359,7 @@ even patch releases may contain [non-backwards-compatible changes](https://semve
     1. Open the draft release in the GitHub release section
     1. Copy the changelog for the release into the GitHub release
         - See previous releases for formatting of section headers
-    1. Append the contributors from the `bump.sh` script
+    1. Generate the contributor list with `rooster contributors` and add to the release notes
 1. If needed, [update the schemastore](https://github.com/astral-sh/ruff/blob/main/scripts/update_schemastore.py).
     1. One can determine if an update is needed when
         `git diff old-version-tag new-version-tag -- ruff.schema.json` returns a non-empty diff.

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"
@@ -255,9 +270,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.35"
+version = "0.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a"
+checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -294,9 +309,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.3"
+version = "4.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813"
+checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -304,9 +319,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb"
 dependencies = [
  "anstream",
  "anstyle",
@@ -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",
@@ -513,19 +528,6 @@ dependencies = [
  "itertools 0.10.5",
 ]
 
-[[package]]
-name = "crossbeam"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.12"
@@ -554,15 +556,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.19"
@@ -616,6 +609,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 +677,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 +890,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"
@@ -1156,17 +1155,11 @@ version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
-[[package]]
-name = "jod-thread"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b23360e99b8717f20aaa4598f5a6541efbe30630039fbc7706cf954a87947ae"
-
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1334,31 +1327,6 @@ version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
-[[package]]
-name = "lsp-server"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248f65b78f6db5d8e1b1604b4098a28b43d21a8eb1deeca22b1c421b276c7095"
-dependencies = [
- "crossbeam-channel",
- "log",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "lsp-types"
-version = "0.95.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "158c1911354ef73e8fe42da6b10c0484cb65c7f1007f28022e847706c1ab6984"
-dependencies = [
- "bitflags 1.3.2",
- "serde",
- "serde_json",
- "serde_repr",
- "url",
-]
-
 [[package]]
 name = "matchers"
 version = "0.1.0"
@@ -1493,16 +1461,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 +1706,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 +1745,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 +1950,11 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.3.4"
+version = "0.3.1"
 dependencies = [
  "anyhow",
  "argfile",
+ "assert_cmd",
  "bincode",
  "bitflags 2.4.2",
  "cachedir",
@@ -1986,7 +1972,6 @@ dependencies = [
  "log",
  "mimalloc",
  "notify",
- "num_cpus",
  "path-absolutize",
  "rayon",
  "regex",
@@ -1997,7 +1982,6 @@ dependencies = [
  "ruff_notebook",
  "ruff_python_ast",
  "ruff_python_formatter",
- "ruff_server",
  "ruff_source_file",
  "ruff_text_size",
  "ruff_workspace",
@@ -2012,8 +1996,6 @@ dependencies = [
  "tikv-jemallocator",
  "toml",
  "tracing",
- "tracing-subscriber",
- "tracing-tree",
  "walkdir",
  "wild",
 ]
@@ -2063,6 +2045,7 @@ dependencies = [
  "indoc",
  "itertools 0.12.1",
  "libcst",
+ "once_cell",
  "pretty_assertions",
  "rayon",
  "regex",
@@ -2106,6 +2089,7 @@ name = "ruff_formatter"
 version = "0.0.0"
 dependencies = [
  "drop_bomb",
+ "insta",
  "ruff_cache",
  "ruff_macros",
  "ruff_text_size",
@@ -2127,7 +2111,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.3.4"
+version = "0.3.1"
 dependencies = [
  "aho-corasick",
  "annotate-snippets 0.9.2",
@@ -2152,12 +2136,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 +2164,7 @@ dependencies = [
  "smallvec",
  "strum",
  "strum_macros",
+ "tempfile",
  "test-case",
  "thiserror",
  "toml",
@@ -2203,6 +2190,7 @@ name = "ruff_notebook"
 version = "0.0.0"
 dependencies = [
  "anyhow",
+ "insta",
  "itertools 0.12.1",
  "once_cell",
  "rand",
@@ -2251,6 +2239,7 @@ name = "ruff_python_formatter"
 version = "0.0.0"
 dependencies = [
  "anyhow",
+ "bitflags 2.4.2",
  "clap",
  "countme",
  "insta",
@@ -2296,9 +2285,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",
 ]
 
@@ -2306,9 +2296,11 @@ dependencies = [
 name = "ruff_python_parser"
 version = "0.0.0"
 dependencies = [
+ "annotate-snippets 0.9.2",
  "anyhow",
  "bitflags 2.4.2",
  "bstr",
+ "drop_bomb",
  "insta",
  "is-macro",
  "itertools 0.12.1",
@@ -2316,12 +2308,12 @@ dependencies = [
  "lalrpop-util",
  "memchr",
  "ruff_python_ast",
+ "ruff_source_file",
  "ruff_text_size",
  "rustc-hash",
  "static_assertions",
  "tiny-keccak",
  "unicode-ident",
- "unicode-normalization",
  "unicode_names2",
 ]
 
@@ -2363,6 +2355,7 @@ version = "0.0.0"
 dependencies = [
  "insta",
  "itertools 0.12.1",
+ "ruff_python_ast",
  "ruff_python_index",
  "ruff_python_parser",
  "ruff_source_file",
@@ -2370,37 +2363,9 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "ruff_server"
-version = "0.2.2"
-dependencies = [
- "anyhow",
- "crossbeam",
- "insta",
- "jod-thread",
- "libc",
- "lsp-server",
- "lsp-types",
- "ruff_diagnostics",
- "ruff_formatter",
- "ruff_linter",
- "ruff_python_ast",
- "ruff_python_codegen",
- "ruff_python_formatter",
- "ruff_python_index",
- "ruff_python_parser",
- "ruff_source_file",
- "ruff_text_size",
- "ruff_workspace",
- "rustc-hash",
- "serde",
- "serde_json",
- "tracing",
-]
-
 [[package]]
 name = "ruff_shrinking"
-version = "0.3.4"
+version = "0.3.1"
 dependencies = [
  "anyhow",
  "clap",
@@ -2418,6 +2383,7 @@ dependencies = [
 name = "ruff_source_file"
 version = "0.0.0"
 dependencies = [
+ "insta",
  "memchr",
  "once_cell",
  "ruff_text_size",
@@ -2472,6 +2438,7 @@ dependencies = [
  "is-macro",
  "itertools 0.12.1",
  "log",
+ "once_cell",
  "path-absolutize",
  "pep440_rs",
  "regex",
@@ -2667,17 +2634,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_repr"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.52",
-]
-
 [[package]]
 name = "serde_spanned"
 version = "0.6.5"
@@ -2822,7 +2778,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 +2868,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 +2909,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",
@@ -2995,6 +2957,22 @@ dependencies = [
  "tikv-jemalloc-sys",
 ]
 
+[[package]]
+name = "time"
+version = "0.3.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
+dependencies = [
+ "serde",
+ "time-core",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+
 [[package]]
 name = "tiny-keccak"
 version = "2.0.2"
@@ -3031,9 +3009,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 +3030,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",
@@ -3108,17 +3086,6 @@ dependencies = [
  "tracing-subscriber",
 ]
 
-[[package]]
-name = "tracing-log"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
-dependencies = [
- "log",
- "once_cell",
- "tracing-core",
-]
-
 [[package]]
 name = "tracing-log"
 version = "0.2.0"
@@ -3145,19 +3112,7 @@ dependencies = [
  "thread_local",
  "tracing",
  "tracing-core",
- "tracing-log 0.2.0",
-]
-
-[[package]]
-name = "tracing-tree"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ec6adcab41b1391b08a308cc6302b79f8095d1673f6947c2dc65ffb028b0b2d"
-dependencies = [
- "nu-ansi-term",
- "tracing-core",
- "tracing-log 0.1.4",
- "tracing-subscriber",
+ "tracing-log",
 ]
 
 [[package]]
@@ -3243,9 +3198,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
 [[package]]
 name = "unicode_names2"
-version = "1.2.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "addeebf294df7922a1164f729fb27ebbbcea99cc32b3bf08afab62757f707677"
+checksum = "ac64ef2f016dc69dfa8283394a70b057066eb054d5fcb6b9eb17bd2ec5097211"
 dependencies = [
  "phf",
  "unicode_names2_generator",
@@ -3253,14 +3208,15 @@ dependencies = [
 
 [[package]]
 name = "unicode_names2_generator"
-version = "1.2.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f444b8bba042fe3c1251ffaca35c603f2dc2ccc08d595c65a8c4f76f3e8426c0"
+checksum = "013f6a731e80f3930de580e55ba41dfa846de4e0fdee4a701f97989cb1597d6a"
 dependencies = [
  "getopts",
  "log",
  "phf_codegen",
  "rand",
+ "time",
 ]
 
 [[package]]
@@ -3372,6 +3328,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"
@@ -3390,9 +3355,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -3400,9 +3365,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
 dependencies = [
  "bumpalo",
  "log",
@@ -3415,9 +3380,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",
@@ -3427,9 +3392,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3437,9 +3402,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3450,15 +3415,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
 
 [[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 +3435,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,21 +16,22 @@ 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"] }
+chrono = { version = "0.4.34", default-features = false, features = ["clock"] }
+clap = { version = "4.5.1", 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" }
 criterion = { version = "0.5.1", default-features = false }
-crossbeam = { version = "0.8.4" }
 dirs = { version = "5.0.0" }
 drop_bomb = { version = "0.1.5" }
 env_logger = { version = "0.10.1" }
@@ -50,26 +51,21 @@ insta-cmd = { version = "0.4.0" }
 is-macro = { version = "0.3.5" }
 is-wsl = { version = "0.4.0" }
 itertools = { version = "0.12.1" }
-js-sys = { version = "0.3.69" }
-jod-thread = { version = "0.1.2" }
+js-sys = { version = "0.3.67" }
 lalrpop-util = { version = "0.20.0", default-features = false }
 lexical-parse-float = { version = "0.8.0", features = ["format"] }
-libc = { version = "0.2.153" }
 libcst = { version = "1.1.0", default-features = false }
 log = { version = "0.4.17" }
-lsp-server = { version = "0.7.6" }
-lsp-types = { version = "0.95.0", features = ["proposed"] }
 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,25 +91,23 @@ 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"] }
-tracing-tree = { version = "0.2.4" }
 typed-arena = { version = "2.0.2" }
 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" }
+unicode_names2 = { version = "1.2.1" }
 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 = { version = "0.2.84" }
+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.1
   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.1"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -20,7 +20,6 @@ ruff_macros = { path = "../ruff_macros" }
 ruff_notebook = { path = "../ruff_notebook" }
 ruff_python_ast = { path = "../ruff_python_ast" }
 ruff_python_formatter = { path = "../ruff_python_formatter" }
-ruff_server = { path = "../ruff_server" }
 ruff_source_file = { path = "../ruff_source_file" }
 ruff_text_size = { path = "../ruff_text_size" }
 ruff_workspace = { path = "../ruff_workspace" }
@@ -41,7 +40,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,16 +52,15 @@ tempfile = { workspace = true }
 thiserror = { workspace = true }
 toml = { workspace = true }
 tracing = { workspace = true, features = ["log"] }
-tracing-subscriber = { workspace = true, features = ["registry"] }
-tracing-tree = { workspace = true }
 walkdir = { workspace = true }
 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

@@ -126,8 +126,6 @@ pub enum Command {
     GenerateShellCompletion { shell: clap_complete_command::Shell },
     /// Run the Ruff formatter on the given files or directories.
     Format(FormatCommand),
-    /// Run the language server.
-    Server(ServerCommand),
     /// Display Ruff's version
     Version {
         #[arg(long, value_enum, default_value = "text")]
@@ -496,13 +494,6 @@ 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(Debug, Clone, Copy, clap::ValueEnum)]
 pub enum HelpFormat {
     Text,

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/mod.rs

@@ -7,7 +7,6 @@ pub(crate) mod format;
 pub(crate) mod format_stdin;
 pub(crate) mod linter;
 pub(crate) mod rule;
-pub(crate) mod server;
 pub(crate) mod show_files;
 pub(crate) mod show_settings;
 pub(crate) mod version;

crates/ruff/src/commands/server.rs

@@ -1,79 +0,0 @@
-use std::num::NonZeroUsize;
-
-use crate::ExitStatus;
-use anyhow::Result;
-use ruff_linter::logging::LogLevel;
-use ruff_server::Server;
-use tracing::{level_filters::LevelFilter, metadata::Level, subscriber::Interest, Metadata};
-use tracing_subscriber::{
-    layer::{Context, Filter, SubscriberExt},
-    Layer, Registry,
-};
-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);
-    }
-    let trace_level = if log_level == LogLevel::Verbose {
-        Level::TRACE
-    } else {
-        Level::DEBUG
-    };
-
-    let subscriber = Registry::default().with(
-        tracing_tree::HierarchicalLayer::default()
-            .with_indent_lines(true)
-            .with_indent_amount(2)
-            .with_bracketed_fields(true)
-            .with_targets(true)
-            .with_writer(|| Box::new(std::io::stderr()))
-            .with_timer(Uptime::default())
-            .with_filter(LoggingFilter { trace_level }),
-    );
-
-    tracing::subscriber::set_global_default(subscriber)?;
-
-    let server = Server::new(worker_threads)?;
-
-    server.run().map(|()| ExitStatus::Success)
-}
-
-struct LoggingFilter {
-    trace_level: Level,
-}
-
-impl LoggingFilter {
-    fn is_enabled(&self, meta: &Metadata<'_>) -> bool {
-        let filter = if meta.target().starts_with("ruff") {
-            self.trace_level
-        } else {
-            Level::INFO
-        };
-
-        meta.level() <= &filter
-    }
-}
-
-impl<S> Filter<S> for LoggingFilter {
-    fn enabled(&self, meta: &Metadata<'_>, _cx: &Context<'_, S>) -> bool {
-        self.is_enabled(meta)
-    }
-
-    fn callsite_enabled(&self, meta: &'static Metadata<'static>) -> Interest {
-        if self.is_enabled(meta) {
-            Interest::always()
-        } else {
-            Interest::never()
-        }
-    }
-
-    fn max_level_hint(&self) -> Option<LevelFilter> {
-        Some(LevelFilter::from_level(self.trace_level))
-    }
-}

crates/ruff/src/lib.rs

@@ -2,13 +2,12 @@
 
 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;
 
 use anyhow::Result;
-use args::{GlobalConfigArgs, ServerCommand};
+use args::GlobalConfigArgs;
 use clap::CommandFactory;
 use colored::Colorize;
 use log::warn;
@@ -191,7 +190,6 @@ pub fn run(
         }
         Command::Check(args) => check(args, global_options),
         Command::Format(args) => format(args, global_options),
-        Command::Server(args) => server(args, global_options.log_level()),
     }
 }
 
@@ -205,17 +203,6 @@ fn format(args: FormatCommand, global_options: GlobalConfigArgs) -> Result<ExitS
     }
 }
 
-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,
-    )
-}
-
 pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<ExitStatus> {
     let (cli, config_arguments) = args.partition(global_options)?;
 

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:
@@ -523,7 +523,7 @@ from module import =
     ----- stdout -----
 
     ----- stderr -----
-    error: Failed to parse main.py:2:20: Unexpected token '='
+    error: Failed to parse main.py:2:20: Unexpected token =
     "###);
 
     Ok(())

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!
     "###);
 }
 
@@ -731,11 +728,11 @@ fn stdin_parse_error() {
     success: false
     exit_code: 1
     ----- stdout -----
-    -:1:17: E999 SyntaxError: Unexpected token '='
+    -:1:17: E999 SyntaxError: Unexpected token =
     Found 1 error.
 
     ----- stderr -----
-    error: Failed to parse at 1:17: Unexpected token '='
+    error: Failed to parse at 1:17: Unexpected token =
     "###);
 }
 
@@ -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

@@ -52,6 +52,7 @@ file_resolver.exclude = [
 file_resolver.extend_exclude = [
 	"crates/ruff_linter/resources/",
 	"crates/ruff_python_formatter/resources/",
+	"crates/ruff_python_parser/resources/",
 ]
 file_resolver.force_exclude = false
 file_resolver.include = [
@@ -201,7 +202,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 = [
@@ -241,22 +242,7 @@ linter.flake8_gettext.functions_names = [
 	ngettext,
 ]
 linter.flake8_implicit_str_concat.allow_multiline = true
-linter.flake8_import_conventions.aliases = {
-	altair = alt,
-	holoviews = hv,
-	matplotlib = mpl,
-	matplotlib.pyplot = plt,
-	networkx = nx,
-	numpy = np,
-	pandas = pd,
-	panel = pn,
-	plotly.express = px,
-	polars = pl,
-	pyarrow = pa,
-	seaborn = sns,
-	tensorflow = tf,
-	tkinter = tk,
-}
+linter.flake8_import_conventions.aliases = {"matplotlib": "mpl", "matplotlib.pyplot": "plt", "pandas": "pd", "seaborn": "sns", "tensorflow": "tf", "networkx": "nx", "plotly.express": "px", "polars": "pl", "numpy": "np", "panel": "pn", "pyarrow": "pa", "altair": "alt", "tkinter": "tk", "holoviews": "hv"}
 linter.flake8_import_conventions.banned_aliases = {}
 linter.flake8_import_conventions.banned_from = []
 linter.flake8_pytest_style.fixture_parentheses = true

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_formatter/src/lib.rs

@@ -545,10 +545,6 @@ impl PrintedRange {
         &self.code
     }
 
-    pub fn into_code(self) -> String {
-        self.code
-    }
-
     /// The range the formatted code corresponds to in the source document.
     pub fn source_range(&self) -> TextRange {
         self.source_range

crates/ruff_linter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.3.4"
+version = "0.3.1"
 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_bandit/S311.py

@@ -1,22 +0,0 @@
-import os
-import random
-
-import a_lib
-
-# OK
-random.SystemRandom()
-
-# Errors
-random.Random()
-random.random()
-random.randrange()
-random.randint()
-random.choice()
-random.choices()
-random.uniform()
-random.triangular()
-random.randbytes()
-
-# Unrelated
-os.urandom()
-a_lib.random()

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

@@ -1,47 +1,52 @@
-import crypt
 import hashlib
 from hashlib import new as hashlib_new
 from hashlib import sha1 as hashlib_sha1
 
-# Errors
+# Invalid
+
 hashlib.new('md5')
+
 hashlib.new('md4', b'test')
+
 hashlib.new(name='md5', data=b'test')
+
 hashlib.new('MD4', data=b'test')
+
 hashlib.new('sha1')
+
 hashlib.new('sha1', data=b'test')
+
 hashlib.new('sha', data=b'test')
+
 hashlib.new(name='SHA', data=b'test')
+
 hashlib.sha(data=b'test')
+
 hashlib.md5()
+
 hashlib_new('sha1')
+
 hashlib_sha1('sha1')
+
 # usedforsecurity arg only available in Python 3.9+
 hashlib.new('sha1', usedforsecurity=True)
 
-crypt.crypt("test", salt=crypt.METHOD_CRYPT)
-crypt.crypt("test", salt=crypt.METHOD_MD5)
-crypt.crypt("test", salt=crypt.METHOD_BLOWFISH)
-crypt.crypt("test", crypt.METHOD_BLOWFISH)
+# Valid
 
-crypt.mksalt(crypt.METHOD_CRYPT)
-crypt.mksalt(crypt.METHOD_MD5)
-crypt.mksalt(crypt.METHOD_BLOWFISH)
-
-# OK
 hashlib.new('sha256')
+
 hashlib.new('SHA512')
+
 hashlib.sha256(data=b'test')
+
 # usedforsecurity arg only available in Python 3.9+
 hashlib_new(name='sha1', usedforsecurity=False)
+
+# usedforsecurity arg only available in Python 3.9+
 hashlib_sha1(name='sha1', usedforsecurity=False)
+
+# usedforsecurity arg only available in Python 3.9+
 hashlib.md4(usedforsecurity=False)
+
+# usedforsecurity arg only available in Python 3.9+
 hashlib.new(name='sha256', usedforsecurity=False)
-
-crypt.crypt("test")
-crypt.crypt("test", salt=crypt.METHOD_SHA256)
-crypt.crypt("test", salt=crypt.METHOD_SHA512)
-
-crypt.mksalt()
-crypt.mksalt(crypt.METHOD_SHA256)
-crypt.mksalt(crypt.METHOD_SHA512)

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

@@ -1,5 +1,4 @@
 import os
-import subprocess
 
 import commands
 import popen2
@@ -17,8 +16,6 @@ popen2.Popen3("true")
 popen2.Popen4("true")
 commands.getoutput("true")
 commands.getstatusoutput("true")
-subprocess.getoutput("true")
-subprocess.getstatusoutput("true")
 
 
 # Check command argument looks unsafe.

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

@@ -1,34 +0,0 @@
-from django.contrib.auth.models import User
-
-# Errors
-User.objects.filter(username='admin').extra(dict(could_be='insecure'))
-User.objects.filter(username='admin').extra(select=dict(could_be='insecure'))
-User.objects.filter(username='admin').extra(select={'test': '%secure' % 'nos'})
-User.objects.filter(username='admin').extra(select={'test': '{}secure'.format('nos')})
-User.objects.filter(username='admin').extra(where=['%secure' % 'nos'])
-User.objects.filter(username='admin').extra(where=['{}secure'.format('no')])
-
-query = '"username") AS "username", * FROM "auth_user" WHERE 1=1 OR "username"=? --'
-User.objects.filter(username='admin').extra(select={'test': query})
-
-where_var = ['1=1) OR 1=1 AND (1=1']
-User.objects.filter(username='admin').extra(where=where_var)
-
-where_str = '1=1) OR 1=1 AND (1=1'
-User.objects.filter(username='admin').extra(where=[where_str])
-
-tables_var = ['django_content_type" WHERE "auth_user"."username"="admin']
-User.objects.all().extra(tables=tables_var).distinct()
-
-tables_str = 'django_content_type" WHERE "auth_user"."username"="admin'
-User.objects.all().extra(tables=[tables_str]).distinct()
-
-# OK
-User.objects.filter(username='admin').extra(
-    select={'test': 'secure'},
-    where=['secure'],
-    tables=['secure']
-)
-User.objects.filter(username='admin').extra({'test': 'secure'})
-User.objects.filter(username='admin').extra(select={'test': 'secure'})
-User.objects.filter(username='admin').extra(where=['secure'])

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_comprehensions/C413.py

@@ -14,6 +14,9 @@ reversed(sorted(x, reverse=not x))
 reversed(sorted(i for i in range(42)))
 reversed(sorted((i for i in range(42)), reverse=True))
 
-# Regression test for: https://github.com/astral-sh/ruff/issues/10335
-reversed(sorted([1, 2, 3], reverse=False or True))
-reversed(sorted([1, 2, 3], reverse=(False or True)))
+
+def reversed(*args, **kwargs):
+    return None
+
+
+reversed(sorted(x, reverse=True))

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_escaped_unnecessary.py

@@ -40,7 +40,4 @@ f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal"  # Q004
 
 # Make sure we do not unescape quotes
 this_is_fine = "This is an \\'escaped\\' quote"
-this_should_raise_Q004 = "This is an \\\'escaped\\\' quote with an extra backslash"  # Q004
-
-# Invalid escapes in bytestrings are also triggered:
-x = b"\xe7\xeb\x0c\xa1\x1b\x83tN\xce=x\xe9\xbe\x01\xb9\x13B_\xba\xe7\x0c2\xce\'rm\x0e\xcd\xe9.\xf8\xd2"  # Q004
+this_should_raise_Q004 = "This is an \\\'escaped\\\' quote with an extra backslash"

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/E20.py

@@ -153,9 +153,3 @@ ham[lower +1 :, "columnname"]
 
 #: E203:1:13
 ham[lower + 1  :, "columnname"]
-
-#: Okay
-f"{ham[lower +1 :, "columnname"]}"
-
-#: E203:1:13
-f"{ham[lower + 1  :, "columnname"]}"

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/E2_syntax_error.py

@@ -1 +0,0 @@
-a = (1 or)

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/E502.py

@@ -1,88 +0,0 @@
-a = 2 + 2
-
-a = (2 + 2)
-
-a = 2 + \
-    3 \
-    + 4
-
-a = (3 -\
-    2 +   \
-    7)
-
-z = 5 + \
-    (3 -\
-    2 +   \
-    7) + \
-    4
-
-b = [2 +
-    2]
-
-b = [
-    2 + 4 + 5 + \
-    44 \
-    - 5
-]
-
-c = (True and
-    False \
-    or False \
-    and True \
-)
-
-c = (True and
-    False)
-
-d = True and \
-    False or \
-    False \
-    and not True
-
-
-s = {
-    'x': 2 + \
-    2
-}
-
-
-s = {
-    'x': 2 +
-    2
-}
-
-
-x = {2 + 4 \
-  + 3}
-
-y = (
-    2 + 2  # \
-    + 3  # \
-    + 4 \
-    + 3
-)
-
-
-x = """
-    (\\
-    )
-"""
-
-
-("""hello \
-""")
-
-("hello \
-")
-
-
-x = "abc" \
-    "xyz"
-
-x = ("abc" \
-    "xyz")
-
-
-def foo():
-    x = (a + \
-        2)

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

@@ -1,14 +0,0 @@
-# Unix style
-def foo() -> None:
-    pass
-
-
-def bar() -> None:
-    pass
-
-
-
-if __name__ == '__main__':
-    foo()
-    bar()
-

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

@@ -1,13 +0,0 @@
-# Unix style
-def foo() -> None:
-    pass
-
-
-def bar() -> None:
-    pass
-
-
-
-if __name__ == '__main__':
-    foo()
-    bar()

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

@@ -1,17 +0,0 @@
-# Windows style
-def foo() -> None:
-    pass
-
-
-def bar() -> None:
-    pass
-
-
-
-if __name__ == '__main__':
-    foo()
-    bar()
-
-
-
-

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

@@ -1,13 +0,0 @@
-# Windows style
-def foo() -> None:
-    pass
-
-
-def bar() -> None:
-    pass
-
-
-
-if __name__ == '__main__':
-    foo()
-    bar()

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

@@ -1,5 +0,0 @@
-# This is fine
-def foo():
-    pass
-
-    # Some comment

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/F401_23.py

@@ -1,7 +0,0 @@
-"""Test: ensure that we treat strings in `typing.Annotation` as type definitions."""
-
-from pathlib import Path
-from re import RegexFlag
-from typing import Annotated
-
-p: Annotated["Path", int] = 1

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_11.pyi

@@ -1,16 +0,0 @@
-"""Test case: strings used within calls within type annotations."""
-
-from typing import Callable
-
-import bpy
-from mypy_extensions import VarArg
-
-class LightShow(bpy.types.Operator):
-    label = "Create Character"
-    name = "lightshow.letter_creation"
-
-    filepath: bpy.props.StringProperty(subtype="FILE_PATH")  # OK
-
-
-def f(x: Callable[[VarArg("os")], None]):  # F821
-    pass

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

@@ -1,44 +0,0 @@
-"""Tests for constructs allowed in `.pyi` stub files but not at runtime"""
-
-from typing import Optional, TypeAlias, Union
-
-__version__: str
-__author__: str
-
-# Forward references:
-MaybeCStr: TypeAlias = Optional[CStr]  # valid in a `.pyi` stub file, not in a `.py` runtime file
-MaybeCStr2: TypeAlias = Optional["CStr"]  # always okay
-CStr: TypeAlias = Union[C, str]  # valid in a `.pyi` stub file, not in a `.py` runtime file
-CStr2: TypeAlias = Union["C", str]  # always okay
-
-# References to a class from inside the class:
-class C:
-    other: C = ...  # valid in a `.pyi` stub file, not in a `.py` runtime file
-    other2: "C" = ...  # always okay
-    def from_str(self, s: str) -> C: ...  # valid in a `.pyi` stub file, not in a `.py` runtime file
-    def from_str2(self, s: str) -> "C": ...  # always okay
-
-# Circular references:
-class A:
-    foo: B  # valid in a `.pyi` stub file, not in a `.py` runtime file
-    foo2: "B"  # always okay
-    bar: dict[str, B]  # valid in a `.pyi` stub file, not in a `.py` runtime file
-    bar2: dict[str, "A"]  # always okay
-
-class B:
-    foo: A  # always okay
-    bar: dict[str, A]  # always okay
-
-class Leaf: ...
-class Tree(list[Tree | Leaf]): ...  # valid in a `.pyi` stub file, not in a `.py` runtime file
-class Tree2(list["Tree | Leaf"]): ...  # always okay
-
-# Annotations are treated as assignments in .pyi files, but not in .py files
-class MyClass:
-    foo: int
-    bar = foo  # valid in a `.pyi` stub file, not in a `.py` runtime file
-    bar = "foo"  # always okay
-
-baz: MyClass
-eggs = baz  # valid in a `.pyi` stub file, not in a `.py` runtime file
-eggs = "baz"  # always okay

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

@@ -1,44 +0,0 @@
-"""Tests for constructs allowed in `.pyi` stub files but not at runtime"""
-
-from typing import Optional, TypeAlias, Union
-
-__version__: str
-__author__: str
-
-# Forward references:
-MaybeCStr: TypeAlias = Optional[CStr]  # valid in a `.pyi` stub file, not in a `.py` runtime file
-MaybeCStr2: TypeAlias = Optional["CStr"]  # always okay
-CStr: TypeAlias = Union[C, str]  # valid in a `.pyi` stub file, not in a `.py` runtime file
-CStr2: TypeAlias = Union["C", str]  # always okay
-
-# References to a class from inside the class:
-class C:
-    other: C = ...  # valid in a `.pyi` stub file, not in a `.py` runtime file
-    other2: "C" = ...  # always okay
-    def from_str(self, s: str) -> C: ...  # valid in a `.pyi` stub file, not in a `.py` runtime file
-    def from_str2(self, s: str) -> "C": ...  # always okay
-
-# Circular references:
-class A:
-    foo: B  # valid in a `.pyi` stub file, not in a `.py` runtime file
-    foo2: "B"  # always okay
-    bar: dict[str, B]  # valid in a `.pyi` stub file, not in a `.py` runtime file
-    bar2: dict[str, "A"]  # always okay
-
-class B:
-    foo: A  # always okay
-    bar: dict[str, A]  # always okay
-
-class Leaf: ...
-class Tree(list[Tree | Leaf]): ...  # valid in a `.pyi` stub file, not in a `.py` runtime file
-class Tree2(list["Tree | Leaf"]): ...  # always okay
-
-# Annotations are treated as assignments in .pyi files, but not in .py files
-class MyClass:
-    foo: int
-    bar = foo  # valid in a `.pyi` stub file, not in a `.py` runtime file
-    bar = "foo"  # always okay
-
-baz: MyClass
-eggs = baz  # valid in a `.pyi` stub file, not in a `.py` runtime file
-eggs = "baz"  # always okay

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

@@ -1,35 +0,0 @@
-"""Tests for constructs allowed when `__future__` annotations are enabled but not otherwise"""
-from __future__ import annotations
-
-from typing import Optional, TypeAlias, Union
-
-__version__: str
-__author__: str
-
-# References to a class from inside the class:
-class C:
-    other: C = ...  # valid when `__future__.annotations are enabled
-    other2: "C" = ...  # always okay
-    def from_str(self, s: str) -> C: ...  # valid when `__future__.annotations are enabled
-    def from_str2(self, s: str) -> "C": ...  # always okay
-
-# Circular references:
-class A:
-    foo: B  # valid when `__future__.annotations are enabled
-    foo2: "B"  # always okay
-    bar: dict[str, B]  # valid when `__future__.annotations are enabled
-    bar2: dict[str, "A"]  # always okay
-
-class B:
-    foo: A  # always okay
-    bar: dict[str, A]  # always okay
-
-# Annotations are treated as assignments in .pyi files, but not in .py files
-class MyClass:
-    foo: int
-    bar = foo  # Still invalid even when `__future__.annotations` are enabled
-    bar = "foo"  # always okay
-
-baz: MyClass
-eggs = baz  # Still invalid even when `__future__.annotations` are enabled
-eggs = "baz"  # 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/pyflakes/F821_5.pyi

@@ -1,10 +0,0 @@
-"""Test: inner class annotation."""
-
-class RandomClass:
-    def bad_func(self) -> InnerClass: ...  # F821
-    def good_func(self) -> OuterClass.InnerClass: ...  # Okay
-
-class OuterClass:
-    class InnerClass: ...
-
-    def good_func(self) -> InnerClass: ...  # Okay

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

@@ -1,4 +0,0 @@
-a = 1
-b: int  # Considered a binding in a `.pyi` stub file, not in a `.py` runtime file
-
-__all__ = ["a", "b", "c"]  # c is flagged as missing; b is not

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/non_slot_assignment.py

@@ -54,15 +54,3 @@ class StudentE(StudentD):
 
     def setup(self):
         pass
-
-
-class StudentF(object):
-    __slots__ = ("name", "__dict__")
-
-    def __init__(self, name, middle_name):
-        self.name = name
-        self.middle_name = middle_name  # [assigning-non-slot]
-        self.setup()
-
-    def setup(self):
-        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