Bump version to 0.0.231

ref: https://github.com/charliermarsh/ruff/issues/1646

.github/workflows/ci.yaml

@@ -70,7 +70,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2022-11-01
+          toolchain: 1.65.0
           override: true
       - uses: Swatinem/rust-cache@v1
       - run: cargo install cargo-insta
@@ -80,6 +80,26 @@ jobs:
           cargo insta test --all --delete-unreferenced-snapshots
           git diff --exit-code
       - run: cargo test --package ruff_cli --test black_compatibility_test -- --ignored
+      # Check for broken links in the documentation.
+      # Setting RUSTDOCFLAGS because `cargo doc --check` isn't yet implemented (https://github.com/rust-lang/cargo/issues/10025).
+      - run: RUSTDOCFLAGS="-D warnings" cargo doc --all --no-deps
+
+  scripts:
+    name: "test scripts"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          override: true
+      - uses: Swatinem/rust-cache@v1
+      - run: ./scripts/add_rule.py --name DoTheThing --code PLC999 --linter pylint
+      - run: cargo check
+      - run: |
+         ./scripts/add_plugin.py test --url https://pypi.org/project/-test/0.1.0/ --prefix TST
+         ./scripts/add_rule.py --name FirstRule --code TST001 --linter test
+      - run: cargo check
 
 # TODO(charlie): Re-enable the `wasm-pack` tests.
 # See: https://github.com/charliermarsh/ruff/issues/1425
@@ -119,7 +139,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2022-11-01
+          toolchain: 1.65.0
           override: true
       - uses: Swatinem/rust-cache@v1
       - uses: actions/setup-python@v4

.github/workflows/ruff.yaml

@@ -293,3 +293,6 @@ jobs:
         run: |
           pip install --upgrade twine
           twine upload --skip-existing *
+      - name: Update pre-commit mirror
+        run: |
+          curl -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ secrets.RUFF_PRE_COMMIT_PAT }}" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/charliermarsh/ruff-pre-commit/dispatches --data '{"event_type": "pypi_release"}'

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.221
+    rev: v0.0.231
     hooks:
       - id: ruff
 
@@ -8,3 +8,11 @@ repos:
     rev: v0.10.1
     hooks:
       - id: validate-pyproject
+
+  - repo: local
+    hooks:
+      - id: cargo-fmt
+        name: cargo fmt
+        entry: cargo fmt --
+        language: rust
+        types: [rust]

BREAKING_CHANGES.md

@@ -1,5 +1,36 @@
 # Breaking Changes
 
+## 0.0.226
+
+### `misplaced-comparison-constant` (`PLC2201`) was deprecated in favor of `SIM300` ([#1980](https://github.com/charliermarsh/ruff/pull/1980))
+
+These two rules contain (nearly) identical logic. To deduplicate the rule set, we've upgraded
+`SIM300` to handle a few more cases, and deprecated `PLC2201` in favor of `SIM300`.
+
+## 0.0.225
+
+### `@functools.cache` rewrites have been moved to a standalone rule (`UP033`) ([#1938](https://github.com/charliermarsh/ruff/pull/1938))
+
+Previously, `UP011` handled both `@functools.lru_cache()`-to-`@functools.lru_cache` conversions,
+_and_ `@functools.lru_cache(maxsize=None)`-to-`@functools.cache` conversions. The latter has been
+moved out to its own rule (`UP033`). As such, some `# noqa: UP011` comments may need to be updated
+to reflect the change in rule code.
+
+## 0.0.222
+
+### `--max-complexity` has been removed from the CLI ([#1877](https://github.com/charliermarsh/ruff/pull/1877))
+
+The McCabe plugin's `--max-complexity` setting has been removed from the CLI, for consistency with
+the treatment of other, similar settings.
+
+To set the maximum complexity, use the `max-complexity` property in your `pyproject.toml` file,
+like so:
+
+```toml
+[tool.ruff.mccabe]
+max-complexity = 10
+```
+
 ## 0.0.181
 
 ### Files excluded by `.gitignore` are now ignored ([#1234](https://github.com/charliermarsh/ruff/pull/1234))

CONTRIBUTING.md

@@ -14,9 +14,10 @@ If you're looking for a place to start, we recommend implementing a new lint rul
 pattern-match against the examples in the existing codebase. Many lint rules are inspired by
 existing Python plugins, which can be used as a reference implementation.
 
-As a concrete example: consider taking on one of the rules in [`flake8-simplify`](https://github.com/charliermarsh/ruff/issues/998),
-and looking to the originating [Python source](https://github.com/MartinThoma/flake8-simplify) for
-guidance.
+As a concrete example: consider taking on one of the rules from the [`tryceratops`](https://github.com/charliermarsh/ruff/issues/2056)
+plugin, and looking to the originating [Python source](https://github.com/guilatrova/tryceratops)
+for guidance. [`flake8-simplify`](https://github.com/charliermarsh/ruff/issues/998) has a few rules
+left too.
 
 ### Prerequisites
 
@@ -37,13 +38,16 @@ After cloning the repository, run Ruff locally with:
 cargo run resources/test/fixtures --no-cache
 ```
 
-Prior to opening a pull request, ensure that your code has been auto-formatted, and that it passes
-both the lint and test validation checks:
+Prior to opening a pull request, ensure that your code has been auto-formatted,
+and that it passes both the lint and test validation checks.
+
+For rustfmt and Clippy, we use [nightly Rust][nightly], as it is stricter than stable Rust.
+(However, tests and builds use stable Rust.)
 
 ```shell
 cargo +nightly fmt --all     # Auto-formatting...
-cargo +nightly clippy --all  # Linting...
-cargo +nightly test --all    # Testing...
+cargo +nightly clippy --fix --workspace --all-targets --all-features -- -W clippy::pedantic  # Linting...
+cargo test --all    # Testing...
 ```
 
 These checks will run on GitHub Actions when you open your Pull Request, but running them locally
@@ -54,18 +58,22 @@ prior to merging.
 
 ### Example: Adding a new lint rule
 
-There are four phases to adding a new lint rule:
+At a high level, the steps involved in adding a new lint rule are as follows:
 
-1. Define the violation struct in `src/violations.rs` (e.g., `ModuleImportNotAtTopOfFile`).
-2. Map the violation struct to a rule code in `src/registry.rs` (e.g., `E402`).
-3. Define the logic for triggering the violation in `src/checkers/ast.rs` (for AST-based checks),
-   `src/checkers/tokens.rs` (for token-based checks), or `src/checkers/lines.rs` (for text-based checks).
-4. Add a test fixture.
-5. Update the generated files (documentation and generated code).
+1. Create a file for your rule (e.g., `src/rules/flake8_bugbear/rules/abstract_base_class.rs`).
+2. In that file, define a violation struct. You can grep for `define_violation!` to see examples.
+3. Map the violation struct to a rule code in `src/registry.rs` (e.g., `E402`).
+4. Define the logic for triggering the violation in `src/checkers/ast.rs` (for AST-based checks),
+   `src/checkers/tokens.rs` (for token-based checks), `src/checkers/lines.rs` (for text-based
+   checks), or `src/checkers/filesystem.rs` (for filesystem-based checks).
+5. Add a test fixture.
+6. Update the generated files (documentation and generated code).
 
-To define the violation, open up `src/violations.rs`, and define a new struct using the
-`define_violation!` macro. There are plenty of examples in that file, so feel free to pattern-match
-against the existing structs.
+To define the violation, start by creating a dedicated file for your rule under the appropriate
+rule linter (e.g., `src/rules/flake8_bugbear/rules/abstract_base_class.rs`). That file should
+contain a struct defined via `define_violation!`, along with a function that creates the violation
+based on any required inputs. (Many of the existing examples live in `src/violations.rs`, but we're
+looking to place new rules in their own files.)
 
 To trigger the violation, you'll likely want to augment the logic in `src/checkers/ast.rs`, which
 defines the Python AST visitor, responsible for iterating over the abstract syntax tree and
@@ -74,7 +82,7 @@ collecting diagnostics as it goes.
 If you need to inspect the AST, you can run `cargo +nightly dev print-ast` with a Python file. Grep
 for the `Check::new` invocations to understand how other, similar rules are implemented.
 
-To add a test fixture, create a file under `resources/test/fixtures/[origin]`, named to match
+To add a test fixture, create a file under `resources/test/fixtures/[linter]`, named to match
 the code you defined earlier (e.g., `resources/test/fixtures/pycodestyle/E402.py`). This file should
 contain a variety of violations and non-violations designed to evaluate and demonstrate the behavior
 of your lint rule.
@@ -83,7 +91,7 @@ Run `cargo +nightly dev generate-all` to generate the code for your new fixture.
 locally with (e.g.) `cargo run resources/test/fixtures/pycodestyle/E402.py --no-cache --select E402`.
 
 Once you're satisfied with the output, codify the behavior as a snapshot test by adding a new
-`test_case` macro in the relevant `src/[origin]/mod.rs` file. Then, run `cargo test --all`.
+`test_case` macro in the relevant `src/[linter]/mod.rs` file. Then, run `cargo test --all`.
 Your test will fail, but you'll be prompted to follow-up with `cargo insta review`. Accept the
 generated snapshot, then commit the snapshot file alongside the rest of your changes.
 
@@ -123,3 +131,5 @@ them to [PyPI](https://pypi.org/project/ruff/).
 
 Ruff follows the [semver](https://semver.org/) versioning standard. However, as pre-1.0 software,
 even patch releases may contain [non-backwards-compatible changes](https://semver.org/#spec-item-4).
+
+[nightly]: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust

Cargo.lock

@@ -14,7 +14,7 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom",
  "once_cell",
  "version_check",
 ]
@@ -197,12 +197,6 @@ version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
 
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -413,7 +407,7 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "wasm-bindgen",
 ]
 
@@ -439,7 +433,7 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -484,7 +478,7 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-utils",
 ]
 
@@ -494,7 +488,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
@@ -506,7 +500,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
 dependencies = [
  "autocfg",
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-utils",
  "memoffset",
  "scopeguard",
@@ -518,7 +512,7 @@ version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -592,16 +586,6 @@ dependencies = [
  "dirs-sys",
 ]
 
-[[package]]
-name = "dirs"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
-dependencies = [
- "cfg-if 0.1.10",
- "dirs-sys",
-]
-
 [[package]]
 name = "dirs"
 version = "4.0.0"
@@ -617,7 +601,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "dirs-sys-next",
 ]
 
@@ -721,7 +705,7 @@ version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "redox_syscall",
  "windows-sys",
@@ -735,7 +719,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.221-dev.0"
+version = "0.0.231"
 dependencies = [
  "anyhow",
  "clap 4.0.32",
@@ -786,24 +770,13 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
@@ -926,6 +899,16 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "imperative"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f92123bf2fe0d9f1b5df1964727b970ca3b2d0203d47cf97fb1f36d856b6398"
+dependencies = [
+ "phf 0.11.1",
+ "rust-stemmers",
+]
+
 [[package]]
 name = "indexmap"
 version = "1.9.2"
@@ -976,7 +959,7 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -1186,7 +1169,7 @@ version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -1265,7 +1248,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694"
 dependencies = [
  "bitflags",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "static_assertions",
 ]
@@ -1364,6 +1347,27 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "num_enum"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.17.0"
@@ -1398,7 +1402,7 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
@@ -1472,15 +1476,6 @@ dependencies = [
  "indexmap",
 ]
 
-[[package]]
-name = "phf"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
-dependencies = [
- "phf_shared 0.8.0",
-]
-
 [[package]]
 name = "phf"
 version = "0.10.1"
@@ -1491,13 +1486,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "phf_codegen"
-version = "0.8.0"
+name = "phf"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
+checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
 dependencies = [
- "phf_generator 0.8.0",
- "phf_shared 0.8.0",
+ "phf_shared 0.11.1",
 ]
 
 [[package]]
@@ -1511,13 +1505,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "phf_generator"
-version = "0.8.0"
+name = "phf_codegen"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
+checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770"
 dependencies = [
- "phf_shared 0.8.0",
- "rand 0.7.3",
+ "phf_generator 0.11.1",
+ "phf_shared 0.11.1",
 ]
 
 [[package]]
@@ -1527,16 +1521,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
 dependencies = [
  "phf_shared 0.10.0",
- "rand 0.8.5",
+ "rand",
 ]
 
 [[package]]
-name = "phf_shared"
-version = "0.8.0"
+name = "phf_generator"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
+checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
 dependencies = [
- "siphasher",
+ "phf_shared 0.11.1",
+ "rand",
 ]
 
 [[package]]
@@ -1548,6 +1543,15 @@ dependencies = [
  "siphasher",
 ]
 
+[[package]]
+name = "phf_shared"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
+dependencies = [
+ "siphasher",
+]
+
 [[package]]
 name = "pico-args"
 version = "0.4.2"
@@ -1621,6 +1625,17 @@ dependencies = [
  "termtree",
 ]
 
+[[package]]
+name = "proc-macro-crate"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
+dependencies = [
+ "once_cell",
+ "thiserror",
+ "toml",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -1692,20 +1707,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
- "rand_pcg",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -1713,18 +1714,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
+ "rand_chacha",
+ "rand_core",
 ]
 
 [[package]]
@@ -1734,16 +1725,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
+ "rand_core",
 ]
 
 [[package]]
@@ -1752,25 +1734,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.8",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
-dependencies = [
- "rand_core 0.5.1",
+ "getrandom",
 ]
 
 [[package]]
@@ -1810,7 +1774,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom",
  "redox_syscall",
  "thiserror",
 ]
@@ -1862,35 +1826,26 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "ropey"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd22239fafefc42138ca5da064f3c17726a80d2379d817a3521240e78dd0064"
-dependencies = [
- "smallvec",
- "str_indices",
-]
-
 [[package]]
 name = "ruff"
-version = "0.0.221"
+version = "0.0.231"
 dependencies = [
  "anyhow",
  "bitflags",
- "cfg-if 1.0.0",
+ "cfg-if",
  "chrono",
  "clap 4.0.32",
  "colored",
  "console_error_panic_hook",
  "console_log",
  "criterion",
- "dirs 4.0.0",
+ "dirs",
  "fern",
- "getrandom 0.2.8",
+ "getrandom",
  "glob",
  "globset",
  "ignore",
+ "imperative",
  "insta",
  "itertools",
  "js-sys",
@@ -1903,7 +1858,6 @@ dependencies = [
  "once_cell",
  "path-absolutize",
  "regex",
- "ropey",
  "ruff_macros",
  "rustc-hash",
  "rustpython-ast",
@@ -1914,10 +1868,12 @@ dependencies = [
  "serde",
  "serde-wasm-bindgen",
  "shellexpand",
+ "smallvec",
  "strum",
  "strum_macros",
  "test-case",
  "textwrap",
+ "thiserror",
  "titlecase",
  "toml_edit",
  "wasm-bindgen",
@@ -1926,7 +1882,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_cli"
-version = "0.0.221"
+version = "0.0.231"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
@@ -1963,7 +1919,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_dev"
-version = "0.0.221"
+version = "0.0.231"
 dependencies = [
  "anyhow",
  "clap 4.0.32",
@@ -1984,7 +1940,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_macros"
-version = "0.0.221"
+version = "0.0.231"
 dependencies = [
  "once_cell",
  "proc-macro2",
@@ -1993,6 +1949,16 @@ dependencies = [
  "textwrap",
 ]
 
+[[package]]
+name = "rust-stemmers"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54"
+dependencies = [
+ "serde",
+ "serde_derive",
+]
+
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
@@ -2027,8 +1993,8 @@ dependencies = [
 
 [[package]]
 name = "rustpython-ast"
-version = "0.1.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
+version = "0.2.0"
+source = "git+https://github.com/RustPython/RustPython.git?rev=4f38cb68e4a97aeea9eb19673803a0bd5f655383#4f38cb68e4a97aeea9eb19673803a0bd5f655383"
 dependencies = [
  "num-bigint",
  "rustpython-common",
@@ -2037,12 +2003,12 @@ dependencies = [
 
 [[package]]
 name = "rustpython-common"
-version = "0.0.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
+version = "0.2.0"
+source = "git+https://github.com/RustPython/RustPython.git?rev=4f38cb68e4a97aeea9eb19673803a0bd5f655383#4f38cb68e4a97aeea9eb19673803a0bd5f655383"
 dependencies = [
  "ascii",
  "bitflags",
- "cfg-if 1.0.0",
+ "cfg-if",
  "hexf-parse",
  "itertools",
  "lexical-parse-float",
@@ -2053,7 +2019,7 @@ dependencies = [
  "num-traits",
  "once_cell",
  "radium",
- "rand 0.8.5",
+ "rand",
  "siphasher",
  "unic-ucd-category",
  "volatile",
@@ -2062,8 +2028,8 @@ dependencies = [
 
 [[package]]
 name = "rustpython-compiler-core"
-version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
+version = "0.2.0"
+source = "git+https://github.com/RustPython/RustPython.git?rev=4f38cb68e4a97aeea9eb19673803a0bd5f655383#4f38cb68e4a97aeea9eb19673803a0bd5f655383"
 dependencies = [
  "bincode",
  "bitflags",
@@ -2072,15 +2038,15 @@ dependencies = [
  "lz4_flex",
  "num-bigint",
  "num-complex",
+ "num_enum",
  "serde",
- "static_assertions",
  "thiserror",
 ]
 
 [[package]]
 name = "rustpython-parser"
-version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
+version = "0.2.0"
+source = "git+https://github.com/RustPython/RustPython.git?rev=4f38cb68e4a97aeea9eb19673803a0bd5f655383#4f38cb68e4a97aeea9eb19673803a0bd5f655383"
 dependencies = [
  "ahash",
  "anyhow",
@@ -2240,7 +2206,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd1c7ddea665294d484c39fd0c0d2b7e35bbfe10035c5fe1854741a57f6880e1"
 dependencies = [
- "dirs 4.0.0",
+ "dirs",
 ]
 
 [[package]]
@@ -2279,12 +2245,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "str_indices"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f026164926842ec52deb1938fae44f83dfdb82d0a5b0270c5bd5935ab74d6dd"
-
 [[package]]
 name = "string_cache"
 version = "0.8.4"
@@ -2343,7 +2303,7 @@ version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "fastrand",
  "libc",
  "redox_syscall",
@@ -2383,15 +2343,15 @@ dependencies = [
 
 [[package]]
 name = "terminfo"
-version = "0.7.3"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76971977e6121664ec1b960d1313aacfa75642adc93b9d4d53b247bd4cb1747e"
+checksum = "da31aef70da0f6352dbcb462683eb4dd2bfad01cf3fc96cf204547b9a839a585"
 dependencies = [
- "dirs 2.0.2",
+ "dirs",
  "fnv",
  "nom",
- "phf 0.8.0",
- "phf_codegen 0.8.0",
+ "phf 0.11.1",
+ "phf_codegen 0.11.1",
 ]
 
 [[package]]
@@ -2415,7 +2375,7 @@ version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e45b7bf6e19353ddd832745c8fcf77a17a93171df7151187f26623f2b75b5b26"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -2518,6 +2478,15 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "toml"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "toml_datetime"
 version = "0.5.0"
@@ -2546,7 +2515,7 @@ version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "static_assertions",
 ]
 
@@ -2750,12 +2719,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
 [[package]]
 name = "wasi"
 version = "0.10.0+wasi-snapshot-preview1"
@@ -2774,7 +2737,7 @@ version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "wasm-bindgen-macro",
 ]
 
@@ -2799,7 +2762,7 @@ version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "wasm-bindgen",
  "web-sys",

Cargo.toml

@@ -8,7 +8,7 @@ default-members = [".", "ruff_cli"]
 
 [package]
 name = "ruff"
-version = "0.0.221"
+version = "0.0.231"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 edition = "2021"
 rust-version = "1.65.0"
@@ -35,6 +35,7 @@ fern = { version = "0.6.1" }
 glob = { version = "0.3.0" }
 globset = { version = "0.4.9" }
 ignore = { version = "0.4.18" }
+imperative = { version = "1.0.3" }
 itertools = { version = "0.10.5" }
 libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a8725d161fe8b3ed73a6758b21e177" }
 log = { version = "0.4.17" }
@@ -45,19 +46,20 @@ num-traits = "0.2.15"
 once_cell = { version = "1.16.0" }
 path-absolutize = { version = "3.0.14", features = ["once_cell_cache", "use_unix_paths_on_wasm"] }
 regex = { version = "1.6.0" }
-ropey = { version = "1.5.0", features = ["cr_lines", "simd"], default-features = false }
-ruff_macros = { version = "0.0.221", path = "ruff_macros" }
+ruff_macros = { version = "0.0.231", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
 schemars = { version = "0.8.11" }
 semver = { version = "1.0.16" }
 serde = { version = "1.0.147", features = ["derive"] }
 shellexpand = { version = "3.0.0" }
+smallvec = { version = "1.10.0" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
 textwrap = { version = "0.16.0" }
+thiserror = { version = "1.0" }
 titlecase = { version = "2.2.1" }
 toml_edit = { version = "0.17.1", features = ["easy"] }
 
@@ -95,7 +97,3 @@ opt-level = 3
 # https://github.com/bytecodealliance/wasm-tools/blob/b5c3d98e40590512a3b12470ef358d5c7b983b15/crates/wasmparser/src/limits.rs#L29
 [profile.dev.package.rustpython-parser]
 opt-level = 1
-
-[[bench]]
-name = "source_code_locator"
-harness = false

benches/source_code_locator.rs

@@ -1,18 +0,0 @@
-use std::fs;
-use std::path::Path;
-
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use ropey::Rope;
-
-fn criterion_benchmark(c: &mut Criterion) {
-    let contents = fs::read_to_string(Path::new("resources/test/fixtures/D.py")).unwrap();
-    c.bench_function("rope", |b| {
-        b.iter(|| {
-            let rope = Rope::from_str(black_box(&contents));
-            rope.line_to_char(black_box(4));
-        });
-    });
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);

flake8_to_ruff/Cargo.lock

@@ -771,7 +771,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8_to_ruff"
-version = "0.0.221"
+version = "0.0.231"
 dependencies = [
  "anyhow",
  "clap",
@@ -1975,7 +1975,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.221"
+version = "0.0.231"
 dependencies = [
  "anyhow",
  "bincode",

flake8_to_ruff/Cargo.toml

@@ -1,12 +1,8 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.221-dev.0"
+version = "0.0.231"
 edition = "2021"
 
-[lib]
-name = "flake8_to_ruff"
-doctest = false
-
 [dependencies]
 anyhow = { version = "1.0.66" }
 clap = { version = "4.0.1", features = ["derive"] }

flake8_to_ruff/src/black.rs

@@ -1,32 +0,0 @@
-//! Extract Black configuration settings from a pyproject.toml.
-
-use std::path::Path;
-
-use anyhow::Result;
-use ruff::settings::types::PythonVersion;
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Default)]
-pub struct Black {
-    #[serde(alias = "line-length", alias = "line_length")]
-    pub line_length: Option<usize>,
-    #[serde(alias = "target-version", alias = "target_version")]
-    pub target_version: Option<Vec<PythonVersion>>,
-}
-
-#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
-struct Tools {
-    black: Option<Black>,
-}
-
-#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
-struct Pyproject {
-    tool: Option<Tools>,
-}
-
-pub fn parse_black_options<P: AsRef<Path>>(path: P) -> Result<Option<Black>> {
-    let contents = std::fs::read_to_string(path)?;
-    Ok(toml_edit::easy::from_str::<Pyproject>(&contents)?
-        .tool
-        .and_then(|tool| tool.black))
-}

flake8_to_ruff/src/lib.rs

@@ -1,18 +0,0 @@
-#![allow(
-    clippy::collapsible_else_if,
-    clippy::collapsible_if,
-    clippy::implicit_hasher,
-    clippy::match_same_arms,
-    clippy::missing_errors_doc,
-    clippy::missing_panics_doc,
-    clippy::module_name_repetitions,
-    clippy::must_use_candidate,
-    clippy::similar_names,
-    clippy::too_many_lines
-)]
-#![forbid(unsafe_code)]
-
-pub mod black;
-pub mod converter;
-mod parser;
-pub mod plugin;

flake8_to_ruff/src/main.rs

@@ -1,4 +1,4 @@
-//! Utility to generate Ruff's pyproject.toml section from a Flake8 INI file.
+//! Utility to generate Ruff's `pyproject.toml` section from a Flake8 INI file.
 #![allow(
     clippy::collapsible_else_if,
     clippy::collapsible_if,
@@ -18,9 +18,7 @@ use std::path::PathBuf;
 use anyhow::Result;
 use clap::Parser;
 use configparser::ini::Ini;
-use flake8_to_ruff::black::parse_black_options;
-use flake8_to_ruff::converter;
-use flake8_to_ruff::plugin::Plugin;
+use ruff::flake8_to_ruff::{self, ExternalConfig};
 
 #[derive(Parser)]
 #[command(
@@ -38,7 +36,7 @@ struct Cli {
     pyproject: Option<PathBuf>,
     /// List of plugins to enable.
     #[arg(long, value_delimiter = ',')]
-    plugin: Option<Vec<Plugin>>,
+    plugin: Option<Vec<flake8_to_ruff::Plugin>>,
 }
 
 fn main() -> Result<()> {
@@ -50,14 +48,18 @@ fn main() -> Result<()> {
     let config = ini.load(cli.file).map_err(|msg| anyhow::anyhow!(msg))?;
 
     // Read the pyproject.toml file.
-    let black = cli
-        .pyproject
-        .map(parse_black_options)
-        .transpose()?
-        .flatten();
+    let pyproject = cli.pyproject.map(flake8_to_ruff::parse).transpose()?;
+    let external_config = pyproject
+        .as_ref()
+        .and_then(|pyproject| pyproject.tool.as_ref())
+        .map(|tool| ExternalConfig {
+            black: tool.black.as_ref(),
+            isort: tool.isort.as_ref(),
+        })
+        .unwrap_or_default();
 
     // Create Ruff's pyproject.toml section.
-    let pyproject = converter::convert(&config, black.as_ref(), cli.plugin)?;
+    let pyproject = flake8_to_ruff::convert(&config, &external_config, cli.plugin)?;
     println!("{}", toml_edit::easy::to_string_pretty(&pyproject)?);
 
     Ok(())

licenses/LICENSE_PyCQA_flake8-commas

@@ -0,0 +1,45 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Thomas Grainger.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+Portions of this flake8-commas Software may utilize the following
+copyrighted material, the use of which is hereby acknowledged.
+
+Original flake8-commas: https://github.com/trevorcreech/flake8-commas/commit/e8563b71b1d5442e102c8734c11cb5202284293d
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

licenses/LICENSE_RoPP_flake8-use-pathlib

@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2021 Rodolphe Pelloux-Prayer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

licenses/LICENSE_adamchainz_flake8-no-pep420

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Adam Johnson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "maturin"
 
 [project]
 name = "ruff"
-version = "0.0.221"
+version = "0.0.231"
 description = "An extremely fast Python linter, written in Rust."
 authors = [
   { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" },
@@ -41,9 +41,3 @@ bindings = "bin"
 manifest-path = "ruff_cli/Cargo.toml"
 python-source = "python"
 strip = true
-
-[tool.setuptools]
-license-files = [
-  "LICENSE",
-  "licenses/*",
-]

resources/test/fixtures/flake8_bandit/S612.py

@@ -0,0 +1,8 @@
+import logging.config
+
+t = logging.config.listen(9999)
+
+def verify_func():
+    pass
+
+l = logging.config.listen(9999, verify=verify_func)

resources/test/fixtures/flake8_builtins/A001.py

@@ -1,5 +1,6 @@
 import some as sum
 from some import other as int
+from directory import new as dir
 
 print = 1
 copyright: 'annotation' = 2
@@ -7,6 +8,8 @@ copyright: 'annotation' = 2
 float = object = 4
 min, max = 5, 6
 
+id = 4
+
 def bytes():
     pass
 

resources/test/fixtures/flake8_builtins/A002.py

@@ -5,5 +5,7 @@ def func1(str, /, type, *complex, Exception, **getattr):
 async def func2(bytes):
     pass
 
+async def func3(id, dir):
+    pass
 
 map([], lambda float: ...)

resources/test/fixtures/flake8_builtins/A003.py

@@ -1,8 +1,12 @@
 class MyClass:
     ImportError = 4
+    id = 5
+    dir = "/"
 
     def __init__(self):
         self.float = 5  # is fine
+        self.id = 10
+        self.dir = "."
 
     def str(self):
         pass

resources/test/fixtures/flake8_commas/COM81.py

@@ -0,0 +1,628 @@
+# ==> bad_function_call.py <==
+bad_function_call(
+    param1='test',
+    param2='test'
+)
+# ==> bad_list.py <==
+bad_list = [
+    1,
+    2,
+    3
+]
+
+bad_list_with_comment = [
+    1,
+    2,
+    3
+    # still needs a comma!
+]
+
+bad_list_with_extra_empty = [
+    1,
+    2,
+    3
+
+
+
+]
+
+# ==> bare.py <==
+bar = 1, 2
+
+foo = 1
+
+foo = (1,)
+
+foo = 1,
+
+bar = 1; foo = bar,
+
+foo = (
+3,
+4,
+)
+
+foo = 3, 
+
+class A(object):
+ foo = 3
+ bar = 10,
+ foo_bar = 2
+
+a = ('a',)
+
+from foo import bar, baz
+
+group_by = function_call('arg'),
+
+group_by = ('foobar' * 3),
+
+def foo():
+    return False,
+
+==> callable_before_parenth_form.py <==
+def foo(
+    bar,
+):
+    pass
+
+{'foo': foo}['foo'](
+    bar
+)
+
+{'foo': foo}['foo'](
+    bar,
+)
+
+(foo)(
+    bar
+)
+
+(foo)[0](
+    bar,
+)
+
+[foo][0](
+    bar
+)
+
+[foo][0](
+    bar,
+)
+
+# ==> comment_good_dict.py <==
+multiline_good_dict = {
+    "good": 123,  # this is a good number
+}
+
+# ==> dict_comprehension.py <==
+not_a_dict = {
+    x: y
+    for x, y in ((1, 2), (3, 4))
+}
+
+# ==> good_empty_comma_context.py <==
+def func2(
+):
+    pass
+
+
+func2(
+
+)
+
+func2(
+)
+
+[
+]
+
+[
+
+]
+
+(
+)
+
+(
+
+)
+
+{
+
+}
+
+# ==> good_list.py <==
+stuff = [
+   'a',
+   'b',
+   # more stuff will go here
+]
+
+more_stuff = [
+    'a',
+    'b',
+
+
+
+]
+
+# ==> keyword_before_parenth_form/base_bad.py <==
+from x import (
+    y
+)
+
+assert(
+    SyntaxWarning,
+    ThrownHere,
+    Anyway
+)
+
+# async await is fine outside an async def
+# ruff: RustPython tokenizer treats async/await as keywords, not applicable.
+
+# def await(
+#     foo
+# ):
+#     async(
+#         foo
+#     )
+
+# def async(
+#     foo
+# ):
+#     await(
+#         foo
+#     )
+
+# ==> keyword_before_parenth_form/base.py <==
+from x import (
+    y,
+)
+
+assert(
+    SyntaxWarning,
+    ThrownHere,
+    Anyway,
+)
+
+assert (
+    foo
+)
+
+assert (
+    foo and
+    bar
+)
+
+if(
+    foo and
+    bar
+):
+    pass
+elif(
+    foo and
+    bar
+):
+    pass
+
+for x in(
+    [1,2,3]
+):
+    print(x)
+
+
+(x for x in (
+    [1, 2, 3]
+))
+
+(
+    'foo'
+) is (
+    'foo'
+)
+
+if (
+    foo and
+    bar
+) or not (
+    foo
+) or (
+    spam
+):
+    pass
+
+def xyz():
+    raise(
+        Exception()
+    )
+
+def abc():
+    return(
+        3
+    )
+
+while(
+    False
+):
+    pass
+
+with(
+    loop
+):
+    pass
+
+def foo():
+    yield (
+        "foo"
+    )
+
+# async await is fine outside an async def
+# ruff: RustPython tokenizer treats async/await as keywords, not applicable.
+
+# def await(
+#     foo,
+# ):
+#     async(
+#         foo,
+#     )
+
+# def async(
+#     foo,
+# ):
+#     await(
+#         foo,
+#     )
+
+# ==> keyword_before_parenth_form/py3.py <==
+# Syntax error in Py2
+
+def foo():
+    yield from (
+        foo
+    )
+
+# ==> list_comprehension.py <==
+not_a_list = [
+    s.strip()
+    for s in 'foo, bar, baz'.split(',')
+]
+
+# ==> multiline_bad_dict.py <==
+multiline_bad_dict = {
+    "bad": 123
+}
+# ==> multiline_bad_function_def.py <==
+def func_good(
+        a = 3,
+        b = 2):
+    pass
+
+
+def func_bad(
+        a = 3,
+        b = 2
+    ):
+    pass
+
+# ==> multiline_bad_function_one_param.py <==
+def func(
+        a = 3
+    ):
+    pass
+
+
+func(
+    a = 3
+)
+
+# ==> multiline_bad_or_dict.py <==
+multiline_bad_or_dict = {
+    "good": True or False,
+    "bad": 123
+}
+
+# ==> multiline_good_dict.py <==
+multiline_good_dict = {
+    "good": 123,
+}
+# ==> multiline_good_single_keyed_for_dict.py <==
+good_dict = {
+    "good": x for x in y
+}
+
+# ==> multiline_if.py <==
+if (
+    foo
+    and bar
+):
+    print("Baz")
+
+# ==> multiline_index_access.py <==
+multiline_index_access[
+    "good"
+]
+
+multiline_index_access_after_function()[
+    "good"
+]
+
+multiline_index_access_after_inline_index_access['first'][
+    "good"
+]
+
+multiline_index_access[
+    "probably fine",
+]
+
+[0, 1, 2][
+    "good"
+]
+
+[0, 1, 2][
+    "probably fine",
+]
+
+multiline_index_access[
+    "probably fine",
+    "not good"
+]
+
+multiline_index_access[
+    "fine",
+    "fine",
+    :
+    "not good"
+]
+
+# ==> multiline_string.py <==
+s = (
+    'this' +
+    'is a string'
+)
+
+s2 = (
+    'this'
+    'is also a string'
+)
+
+t = (
+    'this' +
+    'is a tuple',
+)
+
+t2 = (
+    'this'
+    'is also a tuple',
+)
+
+# ==> multiline_subscript_slice.py <==
+multiline_index_access[
+    "fine",
+    "fine"
+    :
+    "not fine"
+]
+
+multiline_index_access[
+    "fine"
+    "fine"
+    :
+    "fine"
+    :
+    "fine"
+]
+
+multiline_index_access[
+    "fine"
+    "fine",
+    :
+    "fine",
+    :
+    "fine",
+]
+
+multiline_index_access[
+    "fine"
+    "fine",
+    :
+    "fine"
+    :
+    "fine",
+    "not fine"
+]
+
+multiline_index_access[
+    "fine"
+    "fine",
+    :
+    "fine",
+    "fine"
+    :
+    "fine",
+]
+
+multiline_index_access[
+    lambda fine,
+    fine,
+    fine: (0,)
+    :
+    lambda fine,
+    fine,
+    fine: (0,),
+    "fine"
+    :
+    "fine",
+]
+
+# ==> one_line_dict.py <==
+one_line_dict = {"good": 123}
+# ==> parenth_form.py <==
+parenth_form = (
+    a +
+    b +
+    c
+)
+
+parenth_form_with_lambda = (
+    lambda x, y: 0
+)
+
+parenth_form_with_default_lambda = (
+    lambda x=(
+        lambda
+        x,
+        y,
+        :
+        0
+    ),
+    y = {a: b},
+    :
+    0
+)
+
+# ==> prohibited.py <==
+foo = ['a', 'b', 'c',]
+
+bar = { a: b,}
+
+def bah(ham, spam,):
+    pass
+
+(0,)
+
+(0, 1,)
+
+foo = ['a', 'b', 'c', ]
+
+bar = { a: b, }
+
+def bah(ham, spam, ):
+    pass
+
+(0, )
+
+(0, 1, )
+
+image[:, :, 0]
+
+image[:,]
+
+image[:,:,]
+
+lambda x, :
+
+# ==> unpack.py <==
+def function(
+    foo,
+    bar,
+    **kwargs
+):
+    pass
+
+def function(
+    foo,
+    bar,
+    *args
+):
+    pass
+
+def function(
+    foo,
+    bar,
+    *args,
+    extra_kwarg
+    ):
+    pass
+
+result = function(
+    foo,
+    bar,
+    **kwargs
+)
+
+result = function(
+    foo,
+    bar,
+    **not_called_kwargs
+)
+
+def foo(
+    ham,
+    spam,
+    *args,
+    kwarg_only
+    ):
+    pass
+
+# In python 3.5 if it's not a function def, commas are mandatory.
+
+foo(
+    **kwargs
+)
+
+{
+    **kwargs
+}
+
+(
+    *args
+)
+
+{
+    *args
+}
+
+[
+    *args
+]
+
+def foo(
+    ham,
+    spam,
+    *args
+    ):
+    pass
+
+def foo(
+    ham,
+    spam,
+    **kwargs
+    ):
+    pass
+
+def foo(
+    ham,
+    spam,
+    *args,
+    kwarg_only
+    ):
+    pass
+
+# In python 3.5 if it's not a function def, commas are mandatory.
+
+foo(
+    **kwargs,
+)
+
+{
+    **kwargs,
+}
+
+(
+    *args,
+)
+
+{
+    *args,
+}
+
+[
+    *args,
+]
+
+result = function(
+    foo,
+    bar,
+    **{'ham': spam}
+)

resources/test/fixtures/flake8_executable/EXE003.py

@@ -0,0 +1,2 @@
+#!/usr/bin/bash
+print("hello world")

resources/test/fixtures/flake8_executable/EXE004_1.py

@@ -0,0 +1 @@
+    #!/usr/bin/python

resources/test/fixtures/flake8_executable/EXE004_2.py

@@ -0,0 +1,2 @@
+print("  #!/usr/bin/python")
+# shebang outside of comments should be ignored

resources/test/fixtures/flake8_executable/EXE004_3.py

@@ -0,0 +1,2 @@
+
+pass  #!/usr/bin/env python

resources/test/fixtures/flake8_executable/EXE005_1.py

@@ -0,0 +1,3 @@
+
+# A python comment
+#!/usr/bin/python

resources/test/fixtures/flake8_executable/EXE005_2.py

@@ -0,0 +1,4 @@
+print("code prior to shebang")
+
+# A python comment
+#!/usr/bin/python

resources/test/fixtures/flake8_executable/EXE005_3.py

@@ -0,0 +1,6 @@
+"""
+With a docstring
+print("commented out code")
+"""
+# A python comment
+#!/usr/bin/python

resources/test/fixtures/flake8_import_conventions/from_imports.py

@@ -0,0 +1,21 @@
+# Test absolute imports
+# Violation cases
+import xml.dom.minidom
+import xml.dom.minidom as wrong
+from xml.dom import minidom as wrong
+from xml.dom import minidom
+from xml.dom.minidom import parseString as wrong  # Ensure ICN001 throws on function import.
+from xml.dom.minidom import parseString
+from xml.dom.minidom import parse, parseString
+from xml.dom.minidom import parse as ps, parseString as wrong
+
+# No ICN001 violations
+import xml.dom.minidom as md
+from xml.dom import minidom as md
+from xml.dom.minidom import parseString as pstr
+from xml.dom.minidom import parse, parseString as pstr
+from xml.dom.minidom import parse as ps, parseString as pstr
+
+
+# Test relative imports
+from ..xml.dom import minidom as okay  # Ensure config "xml.dom.minidom" doesn't catch relative imports

resources/test/fixtures/flake8_no_pep420/test_fail_nonempty/example.py

@@ -0,0 +1 @@
+print('hi')

resources/test/fixtures/flake8_no_pep420/test_fail_shebang/example.py

@@ -0,0 +1,2 @@
+#!/bin/env/python
+print('hi')

resources/test/fixtures/flake8_no_pep420/test_ignored/example.py

@@ -0,0 +1 @@
+import os  # noqa: INP001

resources/test/fixtures/flake8_pie/PIE796.py

@@ -0,0 +1,66 @@
+import enum
+from enum import Enum, unique
+
+
+class FakeEnum1(enum.Enum):
+    A = "A"
+    B = "B"
+    C = "B"  # PIE796
+
+
+class FakeEnum2(Enum):
+    A = 1
+    B = 2
+    C = 2  # PIE796
+
+
+class FakeEnum3(str, Enum):
+    A = "1"
+    B = "2"
+    C = "2"  # PIE796
+
+
+class FakeEnum4(Enum):
+    A = 1.0
+    B = 2.5
+    C = 2.5  # PIE796
+
+
+class FakeEnum5(Enum):
+    A = 1.0
+    B = True
+    C = False
+    D = False  # PIE796
+
+
+class FakeEnum6(Enum):
+    A = 1
+    B = 2
+    C = None
+    D = None  # PIE796
+
+
+@enum.unique
+class FakeEnum7(enum.Enum):
+    A = "A"
+    B = "B"
+    C = "C"
+
+
+@unique
+class FakeEnum8(Enum):
+    A = 1
+    B = 2
+    C = 2  # PIE796
+
+
+class FakeEnum9(enum.Enum):
+    A = "A"
+    B = "B"
+    C = "C"
+
+
+class FakeEnum10(enum.Enum):
+    A = enum.auto()
+    B = enum.auto()
+    C = enum.auto()

resources/test/fixtures/flake8_pie/PIE800.py

@@ -0,0 +1,17 @@
+{"foo": 1, **{"bar": 1}}  # PIE800
+
+foo({**foo, **{"bar": True}})  # PIE800
+
+{**foo, **{"bar": 10}}  # PIE800
+
+{**foo, **buzz, **{bar: 10}}  # PIE800
+
+{**foo,    "bar": True  }  # OK
+
+{"foo": 1, "buzz": {"bar": 1}}  # OK
+
+{**foo,    "bar": True  }  # OK
+
+Table.objects.filter(inst=inst, **{f"foo__{bar}__exists": True})  # OK
+
+buzz = {**foo, "bar": { 1: 2 }}  # OK

resources/test/fixtures/flake8_pie/PIE804.py

@@ -0,0 +1,19 @@
+foo(**{"bar": True})  # PIE804
+
+foo(**{"r2d2": True})  # PIE804
+
+Foo.objects.create(**{"bar": True})  # PIE804
+
+Foo.objects.create(**{"_id": some_id})  # PIE804
+
+Foo.objects.create(**{**bar})  # PIE804
+
+
+foo(**{**data, "foo": "buzz"})
+foo(**buzz)
+foo(**{"bar-foo": True})
+foo(**{"bar foo": True})
+foo(**{"1foo": True})
+foo(**{buzz: True})
+foo(**{"": True})
+foo(**{f"buzz__{bar}": True})

resources/test/fixtures/flake8_pytest_style/PT007.py

@@ -53,3 +53,25 @@ def test_list_of_tuples(param1, param2):
 )
 def test_list_of_lists(param1, param2):
     ...
+
+
+@pytest.mark.parametrize(
+    "param1,param2",
+    [
+        [1, 2],
+        [3, 4],
+    ],
+)
+def test_csv_name_list_of_lists(param1, param2):
+    ...
+
+
+@pytest.mark.parametrize(
+    "param",
+    [
+        [1, 2],
+        [3, 4],
+    ],
+)
+def test_single_list_of_lists(param):
+    ...

resources/test/fixtures/flake8_simplify/SIM102.py

@@ -1,25 +1,131 @@
-if a:  # SIM102
+# SIM102
+if a:
     if b:
         c
 
+# SIM102
+if a:
+    if b:
+        if c:
+            d
 
+# SIM102
 if a:
     pass
-elif b:  # SIM102
+elif b:
     if c:
         d
 
+# SIM102
+if a:
+    # Unfixable due to placement of this comment.
+    if b:
+        c
+
+# SIM102
+if a:
+    if b:
+        # Fixable due to placement of this comment.
+        c
+
+# OK
 if a:
     if b:
         c
     else:
         d
 
+# OK
 if __name__ == "__main__":
     if foo():
         ...
 
+# OK
 if a:
     d
     if b:
         c
+
+while True:
+    # SIM102
+    if True:
+        if True:
+            """this
+is valid"""
+
+            """the indentation on
+            this line is significant"""
+
+            "this is" \
+"allowed too"
+
+            ("so is"
+"this for some reason")
+
+
+# SIM102
+if True:
+    if True:
+        """this
+is valid"""
+
+        """the indentation on
+        this line is significant"""
+
+        "this is" \
+"allowed too"
+
+        ("so is"
+"this for some reason")
+
+while True:
+    # SIM102
+    if node.module:
+        if node.module == "multiprocessing" or node.module.startswith(
+            "multiprocessing."
+        ):
+            print("Bad module!")
+
+# SIM102
+if node.module:
+    if node.module == "multiprocessing" or node.module.startswith(
+        "multiprocessing."
+    ):
+        print("Bad module!")
+
+
+# OK
+if a:
+    if b:
+        print("foo")
+else:
+    print("bar")
+
+# OK
+if a:
+    if b:
+        if c:
+            print("foo")
+        else:
+            print("bar")
+else:
+    print("bar")
+
+# OK
+if a:
+    # SIM 102
+    if b:
+        if c:
+            print("foo")
+else:
+    print("bar")
+
+
+# OK
+if a:
+    if b:
+        if c:
+            print("foo")
+        print("baz")
+else:
+    print("bar")

resources/test/fixtures/flake8_simplify/SIM103.py

@@ -1,12 +1,35 @@
 def f():
-    if a:  # SIM103
+    # SIM103
+    if a:
         return True
     else:
         return False
 
 
 def f():
-    if a:  # OK
+    # SIM103
+    if a:
+        return 1
+    elif b:
+        return True
+    else:
+        return False
+
+
+def f():
+    # SIM103
+    if a:
+        return 1
+    else:
+        if b:
+            return True
+        else:
+            return False
+
+
+def f():
+    # OK
+    if a:
         foo()
         return True
     else:
@@ -14,7 +37,16 @@ def f():
 
 
 def f():
-    if a:  # OK
+    # OK
+    if a:
         return "foo"
     else:
         return False
+
+
+def f():
+    # SIM103 (but not fixable)
+    if a:
+        return False
+    else:
+        return True

resources/test/fixtures/flake8_simplify/SIM105.py

@@ -41,3 +41,21 @@ except ValueError:
     pass
 finally:
     print('bar')
+
+try:
+    foo()
+    foo()
+except ValueError:
+    pass
+
+try:
+    for i in range(3):
+        foo()
+except ValueError:
+    pass
+
+def bar():
+    try:
+        return foo()
+    except ValueError:
+        pass

resources/test/fixtures/flake8_simplify/SIM109.py

@@ -1,7 +1,31 @@
-# Bad
+# SIM109
 if a == b or a == c:
     d
 
-# Good
+# SIM109
+if (a == b or a == c) and None:
+    d
+
+# SIM109
+if a == b or a == c or None:
+    d
+
+# SIM109
+if a == b or None or a == c:
+    d
+
+# OK
 if a in (b, c):
-    d
+    d
+
+# OK
+if a == b or a == c():
+    d
+
+# OK
+if (
+    a == b
+    # This comment prevents us from raising SIM109
+    or a == c
+):
+    d

resources/test/fixtures/flake8_simplify/SIM115.py

@@ -1,6 +1,36 @@
-f = open('foo.txt')  # SIM115
+import contextlib
+
+# SIM115
+f = open("foo.txt")
 data = f.read()
 f.close()
 
-with open('foo.txt') as f:  # OK
+# OK
+with open("foo.txt") as f:
     data = f.read()
+
+# OK
+with contextlib.ExitStack() as exit_stack:
+    f = exit_stack.enter_context(open("filename"))
+
+# OK
+with contextlib.ExitStack() as stack:
+    files = [stack.enter_context(open(fname)) for fname in filenames]
+    close_files = stack.pop_all().close
+
+# OK
+with contextlib.AsyncExitStack() as exit_stack:
+    f = await exit_stack.enter_async_context(open("filename"))
+
+# OK (false negative)
+with contextlib.ExitStack():
+    f = exit_stack.enter_context(open("filename"))
+
+# SIM115
+with contextlib.ExitStack():
+    f = open("filename")
+
+# OK
+with contextlib.ExitStack() as exit_stack:
+    exit_stack_ = exit_stack
+    f = exit_stack_.enter_context(open("filename"))

resources/test/fixtures/flake8_simplify/SIM117.py

@@ -1,13 +1,92 @@
-with A() as a:  # SIM117
+# SIM117
+with A() as a:
     with B() as b:
         print("hello")
 
+# SIM117
+with A():
+    with B():
+        with C():
+            print("hello")
+
+# SIM117
+with A() as a:
+    # Unfixable due to placement of this comment.
+    with B() as b:
+        print("hello")
+
+# SIM117
+with A() as a:
+    with B() as b:
+        # Fixable due to placement of this comment.
+        print("hello")
+
+# OK
 with A() as a:
     a()
     with B() as b:
         print("hello")
 
+# OK
 with A() as a:
     with B() as b:
         print("hello")
     a()
+
+# OK
+async with A() as a:
+    with B() as b:
+        print("hello")
+
+# OK
+with A() as a:
+    async with B() as b:
+        print("hello")
+
+# OK
+async with A() as a:
+    async with B() as b:
+        print("hello")
+
+while True:
+    # SIM117
+    with A() as a:
+        with B() as b:
+            """this
+is valid"""
+
+            """the indentation on
+            this line is significant"""
+
+            "this is" \
+"allowed too"
+
+            ("so is"
+"this for some reason")
+
+# SIM117
+with (
+    A() as a,
+    B() as b,
+):
+    with C() as c:
+        print("hello")
+
+# SIM117
+with A() as a:
+    with (
+        B() as b,
+        C() as c,
+    ):
+        print("hello")
+
+# SIM117
+with (
+    A() as a,
+    B() as b,
+):
+    with (
+        C() as c,
+        D() as d,
+    ):
+        print("hello")

resources/test/fixtures/flake8_simplify/SIM201.py

@@ -1,17 +1,27 @@
-if not a == b:  # SIM201
+# SIM201
+if not a == b:
     pass
 
-if not a == (b + c):  # SIM201
+# SIM201
+if not a == (b + c):
     pass
 
-if not (a + b) == c:  # SIM201
+# SIM201
+if not (a + b) == c:
     pass
 
-if not a != b:  # OK
+# OK
+if not a != b:
     pass
 
-if a == b:  # OK
+# OK
+if a == b:
     pass
 
-if not a == b:  # OK
+# OK
+if not a == b:
     raise ValueError()
+
+# OK
+def __ne__(self, other):
+    return not self == other

resources/test/fixtures/flake8_simplify/SIM202.py

@@ -1,14 +1,27 @@
-if not a != b:  # SIM202
+# SIM202
+if not a != b:
     pass
 
-if not a != (b + c):  # SIM202
+# SIM202
+if not a != (b + c):
     pass
 
-if not (a + b) != c:  # SIM202
+# SIM202
+if not (a + b) != c:
     pass
 
-if not a == b:  # OK
+# OK
+if not a == b:
     pass
 
-if a != b:  # OK
+# OK
+if a != b:
     pass
+
+# OK
+if not a != b:
+    raise ValueError()
+
+# OK
+def __eq__(self, other):
+    return not self != other

resources/test/fixtures/flake8_simplify/SIM222.py

@@ -7,8 +7,12 @@ if (a or b) or True:  # SIM223
 if a or (b or True):  # SIM223
     pass
 
-if a and True:
+if a and True:  # OK
     pass
 
-if True:
+if True:  # OK
     pass
+
+
+def validate(self, value):
+    return json.loads(value) or True  # OK

resources/test/fixtures/flake8_simplify/SIM300.py

@@ -2,6 +2,9 @@
 "yoda" == compare  # SIM300
 'yoda' == compare  # SIM300
 42 == age  # SIM300
+"yoda" <= compare  # SIM300
+'yoda' < compare  # SIM300
+42 > age  # SIM300
 
 # OK
 compare == "yoda"

resources/test/fixtures/flake8_simplify/SIM401.py

@@ -85,3 +85,26 @@ if key in a_dict:
     var = a_dict[key]
 else:
     var = foo()
+
+# OK (complex default value)
+if key in a_dict:
+    var = a_dict[key]
+else:
+    var = a_dict["fallback"]
+
+# OK (false negative for elif)
+if foo():
+    pass
+elif key in a_dict:
+    vars[idx] = a_dict[key]
+else:
+    vars[idx] = "default"
+
+# OK (false negative for nested else)
+if foo():
+    pass
+else:
+    if key in a_dict:
+        vars[idx] = a_dict[key]
+    else:
+        vars[idx] = "default"

resources/test/fixtures/flake8_type_checking/TYP005.py

@@ -0,0 +1,25 @@
+from typing import TYPE_CHECKING, List
+
+if TYPE_CHECKING:
+    pass  # TYP005
+
+
+def example():
+    if TYPE_CHECKING:
+        pass  # TYP005
+    return
+
+
+class Test:
+    if TYPE_CHECKING:
+        pass  # TYP005
+    x = 2
+
+
+if TYPE_CHECKING:
+    if 2:
+        pass
+
+
+if TYPE_CHECKING:
+    x: List

resources/test/fixtures/flake8_use_pathlib/full_name.py

@@ -0,0 +1,31 @@
+import os
+import os.path
+
+p = "/foo"
+
+a = os.path.abspath(p)
+aa = os.chmod(p)
+aaa = os.mkdir(p)
+os.makedirs(p)
+os.rename(p)
+os.replace(p)
+os.rmdir(p)
+os.remove(p)
+os.unlink(p)
+os.getcwd(p)
+b = os.path.exists(p)
+bb = os.path.expanduser(p)
+bbb = os.path.isdir(p)
+bbbb = os.path.isfile(p)
+bbbbb = os.path.islink(p)
+os.readlink(p)
+os.stat(p)
+os.path.isabs(p)
+os.path.join(p)
+os.path.basename(p)
+os.path.dirname(p)
+os.path.samefile(p)
+os.path.splitext(p)
+with open(p) as fp:
+    fp.read()
+open(p).close()

resources/test/fixtures/flake8_use_pathlib/import_as.py

@@ -0,0 +1,28 @@
+import os as foo
+import os.path as foo_p
+
+p = "/foo"
+
+a = foo_p.abspath(p)
+aa = foo.chmod(p)
+aaa = foo.mkdir(p)
+foo.makedirs(p)
+foo.rename(p)
+foo.replace(p)
+foo.rmdir(p)
+foo.remove(p)
+foo.unlink(p)
+foo.getcwd(p)
+b = foo_p.exists(p)
+bb = foo_p.expanduser(p)
+bbb = foo_p.isdir(p)
+bbbb = foo_p.isfile(p)
+bbbbb = foo_p.islink(p)
+foo.readlink(p)
+foo.stat(p)
+foo_p.isabs(p)
+foo_p.join(p)
+foo_p.basename(p)
+foo_p.dirname(p)
+foo_p.samefile(p)
+foo_p.splitext(p)

resources/test/fixtures/flake8_use_pathlib/import_from.py

@@ -0,0 +1,33 @@
+from os import chmod, mkdir, makedirs, rename, replace, rmdir
+from os import remove, unlink, getcwd, readlink, stat
+from os.path import abspath, exists, expanduser, isdir, isfile, islink
+from os.path import isabs, join, basename, dirname, samefile, splitext
+
+p = "/foo"
+
+a = abspath(p)
+aa = chmod(p)
+aaa = mkdir(p)
+makedirs(p)
+rename(p)
+replace(p)
+rmdir(p)
+remove(p)
+unlink(p)
+getcwd(p)
+b = exists(p)
+bb = expanduser(p)
+bbb = isdir(p)
+bbbb = isfile(p)
+bbbbb = islink(p)
+readlink(p)
+stat(p)
+isabs(p)
+join(p)
+basename(p)
+dirname(p)
+samefile(p)
+splitext(p)
+with open(p) as fp:
+    fp.read()
+open(p).close()

resources/test/fixtures/flake8_use_pathlib/import_from_as.py

@@ -0,0 +1,35 @@
+from os import chmod as xchmod, mkdir as xmkdir
+from os import makedirs as xmakedirs, rename as xrename, replace as xreplace
+from os import rmdir as xrmdir, remove as xremove, unlink as xunlink
+from os import getcwd as xgetcwd, readlink as xreadlink, stat as xstat
+from os.path import abspath as xabspath, exists as xexists
+from os.path import expanduser as xexpanduser, isdir as xisdir
+from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
+from os.path import join as xjoin, basename as xbasename, dirname as xdirname
+from os.path import samefile as xsamefile, splitext as xsplitext
+
+p = "/foo"
+
+a = xabspath(p)
+aa = xchmod(p)
+aaa = xmkdir(p)
+xmakedirs(p)
+xrename(p)
+xreplace(p)
+xrmdir(p)
+xremove(p)
+xunlink(p)
+xgetcwd(p)
+b = xexists(p)
+bb = xexpanduser(p)
+bbb = xisdir(p)
+bbbb = xisfile(p)
+bbbbb = xislink(p)
+xreadlink(p)
+xstat(p)
+xisabs(p)
+xjoin(p)
+xbasename(p)
+xdirname(p)
+xsamefile(p)
+xsplitext(p)

resources/test/fixtures/flake8_use_pathlib/py_path_1.py

@@ -0,0 +1,3 @@
+import py
+
+p = py.path.local("../foo")

resources/test/fixtures/flake8_use_pathlib/py_path_2.py

@@ -0,0 +1,3 @@
+from py.path import local as path
+
+p = path("/foo")

resources/test/fixtures/isort/line_ending_cr.py

@@ -1 +0,0 @@
-from long_module_name import member_one, member_two, member_three, member_four, member_five

resources/test/fixtures/isort/no_lines_before.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+from typing import Any
+
+from requests import Session
+
+from my_first_party import my_first_party_object
+
+from . import my_local_folder_object

resources/test/fixtures/isort/order_by_type_with_custom_constants.py

@@ -0,0 +1,2 @@
+from sklearn.svm import XYZ, func, variable, Const, Klass, constant
+from subprocess import First, var, func, Class, konst, A_constant, Last, STDOUT

resources/test/fixtures/isort/order_by_type_with_custom_variables.py

@@ -0,0 +1,2 @@
+from sklearn.svm import VAR, Class, MyVar, CONST, abc
+from subprocess import utils, var_ABC, Variable, Klass, CONSTANT, exe

resources/test/fixtures/pep8_naming/N806.py

@@ -1,5 +1,7 @@
 import collections
 from collections import namedtuple
+from typing import TypeVar
+from typing import NewType
 
 GLOBAL: str = "foo"
 
@@ -11,5 +13,9 @@ def f():
     Camel = 0
     CONSTANT = 0
     _ = 0
+
     MyObj1 = collections.namedtuple("MyObj1", ["a", "b"])
     MyObj2 = namedtuple("MyObj12", ["a", "b"])
+
+    T = TypeVar("T")
+    UserId = NewType('UserId', int)

resources/test/fixtures/pycodestyle/E101.py

@@ -0,0 +1,19 @@
+def func_all_spaces():
+    # No error
+    print("spaces")
+
+def func_tabs():
+    # No error
+	print("tabs")
+
+def func_mixed_start_with_tab():
+    # E101
+	  print("mixed starts with tab")
+
+def func_mixed_start_with_space():
+    # E101
+ 	  	  	   print("mixed starts with space")
+
+def xyz():
+    # E101
+   	print("xyz");

resources/test/fixtures/pydocstyle/D.py

@@ -579,3 +579,58 @@ def multiline_trailing_and_leading_space():
         "or exclamation point (not '\"')")
 def endswith_quote():
     """Whitespace at the end, but also a quote" """
+
+
+@expect('D209: Multi-line docstring closing quotes should be on a separate '
+        'line')
+@expect('D213: Multi-line docstring summary should start at the second line')
+def asdfljdjgf24():
+    """Summary.
+
+    Description.  """
+
+
+@expect('D200: One-line docstring should fit on one line with quotes '
+        '(found 3)')
+@expect('D212: Multi-line docstring summary should start at the first line')
+def one_liner():
+    """
+
+    Wrong."""
+
+
+@expect('D200: One-line docstring should fit on one line with quotes '
+        '(found 3)')
+@expect('D212: Multi-line docstring summary should start at the first line')
+def one_liner():
+    r"""Wrong.
+
+    """
+
+
+@expect('D200: One-line docstring should fit on one line with quotes '
+        '(found 3)')
+@expect('D212: Multi-line docstring summary should start at the first line')
+def one_liner():
+    """Wrong."
+
+    """
+
+
+@expect('D200: One-line docstring should fit on one line with quotes '
+        '(found 3)')
+@expect('D212: Multi-line docstring summary should start at the first line')
+def one_liner():
+    """
+
+    "Wrong."""
+
+
+@expect('D404: First word of the docstring should not be "This"')
+def starts_with_this():
+    """This is a docstring."""
+
+
+@expect('D404: First word of the docstring should not be "This"')
+def starts_with_space_then_this():
+    """ This is a docstring that starts with a space."""  # noqa: D210

resources/test/fixtures/pydocstyle/D401.py

@@ -0,0 +1,101 @@
+"""This module docstring does not need to be written in imperative mood."""
+
+from functools import cached_property
+
+# Bad examples
+
+def bad_liouiwnlkjl():
+    """Returns foo."""
+
+
+def bad_sdgfsdg23245():
+    """Constructor for a foo."""
+
+
+def bad_sdgfsdg23245777():
+    """
+
+    Constructor for a boa.
+
+    """
+
+
+def bad_run_something():
+    """Runs something"""
+
+    def bad_nested():
+        """Runs other things, nested"""
+
+    bad_nested()
+
+
+def multi_line():
+    """Writes a logical line that
+    extends to two physical lines.
+    """
+
+
+# Good examples
+
+def good_run_something():
+    """Run away."""
+
+    def good_nested():
+        """Run to the hills."""
+
+    good_nested()
+
+
+def good_construct():
+    """Construct a beautiful house."""
+
+
+def good_multi_line():
+    """Write a logical line that
+    extends to two physical lines.
+    """
+
+
+good_top_level_var = False
+"""This top level assignment attribute docstring does not need to be written in imperative mood."""
+
+
+# Classes and their members
+
+class Thingy:
+    """This class docstring does not need to be written in imperative mood."""
+
+    _beep = "boop"
+    """This class attribute docstring does not need to be written in imperative mood."""
+
+    def bad_method(self):
+        """This method docstring should be written in imperative mood."""
+
+    @property
+    def good_property(self):
+        """This property method docstring does not need to be written in imperative mood."""
+        return self._beep
+
+    @cached_property
+    def good_cached_property(self):
+        """This property method docstring does not need to be written in imperative mood."""
+        return 42 * 42
+
+    class NestedThingy:
+        """This nested class docstring does not need to be written in imperative mood."""
+
+
+# Test functions
+
+def test_something():
+    """This test function does not need to be written in imperative mood.
+
+    pydocstyle's rationale:
+    We exclude tests from the imperative mood check, because to phrase
+    their docstring in the imperative mood, they would have to start with
+    a highly redundant "Test that ..."
+    """
+
+
+def runTest():
+    """This test function does not need to be written in imperative mood, either."""

resources/test/fixtures/pydocstyle/setter.py

@@ -0,0 +1,17 @@
+class PropertyWithSetter:
+    @property
+    def foo(self) -> str:
+        """Docstring for foo."""
+        return "foo"
+
+    @foo.setter
+    def foo(self, value: str) -> None:
+        pass
+
+    @foo.deleter
+    def foo(self):
+        pass
+
+    @foo
+    def foo(self, value: str) -> None:
+        pass

resources/test/fixtures/pyflakes/F841_3.py

@@ -44,3 +44,25 @@ def f():
         1 / 0
     except (ValueError, ZeroDivisionError) as x2:
         pass
+
+
+def f(a, b):
+    x = (
+        a()
+        if a is not None
+        else b
+    )
+
+    y = \
+        a() if a is not None else b
+
+
+def f(a, b):
+    x = (
+        a
+        if a is not None
+        else b
+    )
+
+    y = \
+        a if a is not None else b

resources/test/fixtures/pyflakes/multi_statement_lines.py

@@ -1,51 +1,51 @@
 
 if True:
-    import foo; x = 1
-    import foo;     x = 1
+    import foo1; x = 1
+    import foo2;     x = 1
 
 if True:
-    import foo; \
+    import foo3; \
 x = 1
 
 if True:
-    import foo \
+    import foo4 \
         ; x = 1
 
 
 if True:
-    x = 1; import foo
+    x = 1; import foo5
 
 
 if True:
     x = 1; \
-         import foo
+         import foo6
 
 
 if True:
     x = 1 \
-        ; import foo
+        ; import foo7
 
 
 if True:
-    x = 1; import foo; x = 1
-    x = 1;     import foo;     x = 1
+    x = 1; import foo8; x = 1
+    x = 1;     import foo9;     x = 1
 
 if True:
     x = 1; \
-        import foo; \
+        import foo10; \
     x = 1
 
 if True:
     x = 1 \
-        ;import foo \
+        ;import foo11 \
         ;x = 1
 
 
 # Continuation, but not as the last content in the file.
 x = 1; \
-import foo
+import foo12
 
 # Continuation, followed by end-of-file. (Removing `import foo` would cause a syntax
 # error.)
 x = 1; \
-import foo
+import foo13

resources/test/fixtures/pylint/magic_value_comparison.py

@@ -1,71 +1,69 @@
-"""Check that magic values are not used in comparisons"""
-import cmath
+"""Check that magic values are not used in comparisons."""
 
 user_input = 10
 
-if 10 > user_input: # [magic-value-comparison]
+if 10 > user_input:  # [magic-value-comparison]
     pass
 
-if 10 == 100: # [comparison-of-constants] R0133
+if 10 == 100:  # [comparison-of-constants] R0133
     pass
 
-if 1 == 3: # [comparison-of-constants] R0133
+if 1 == 3:  # [comparison-of-constants] R0133
     pass
 
 x = 0
-if 4 == 3 == x: # [comparison-of-constants] R0133
+if 4 == 3 == x:  # [comparison-of-constants] R0133
     pass
 
 time_delta = 7224
 ONE_HOUR = 3600
 
-if time_delta > ONE_HOUR: # correct
+if time_delta > ONE_HOUR:  # correct
     pass
 
 argc = 1
 
-if argc != -1: # correct
+if argc != -1:  # correct
     pass
 
-if argc != 0: # correct
+if argc != 0:  # correct
     pass
 
-if argc != 1: # correct
+if argc != 1:  # correct
     pass
 
-if argc != 2: # [magic-value-comparison]
+if argc != 2:  # [magic-value-comparison]
     pass
 
-if __name__ == "__main__": # correct
+if __name__ == "__main__":  # correct
     pass
 
 ADMIN_PASSWORD = "SUPERSECRET"
 input_password = "password"
 
-if input_password == "": # correct
+if input_password == "":  # correct
     pass
 
-if input_password == ADMIN_PASSWORD: # correct
+if input_password == ADMIN_PASSWORD:  # correct
     pass
 
-if input_password == "Hunter2": # [magic-value-comparison]
+if input_password == "Hunter2":  # [magic-value-comparison]
     pass
 
 PI = 3.141592653589793238
 pi_estimation = 3.14
 
-if pi_estimation == 3.141592653589793238: # [magic-value-comparison]
+if pi_estimation == 3.141592653589793238:  # [magic-value-comparison]
     pass
 
-if pi_estimation == PI: # correct
+if pi_estimation == PI:  # correct
     pass
 
 HELLO_WORLD = b"Hello, World!"
 user_input = b"Hello, There!"
 
-if user_input == b"something": # [magic-value-comparison]
+if user_input == b"something":  # [magic-value-comparison]
     pass
 
-if user_input == HELLO_WORLD: # correct
+if user_input == HELLO_WORLD:  # correct
     pass
-

resources/test/fixtures/pyproject.toml

@@ -12,6 +12,9 @@ per-file-ignores = { "__init__.py" = ["F401"] }
 [tool.ruff.flake8-bugbear]
 extend-immutable-calls = ["fastapi.Depends", "fastapi.Query"]
 
+[tool.ruff.flake8-builtins]
+builtins-ignorelist = ["id", "dir"]
+
 [tool.ruff.flake8-quotes]
 inline-quotes = "single"
 multiline-quotes = "double"

resources/test/fixtures/pyupgrade/UP003.py

@@ -1,5 +1,12 @@
-type('')
-type(b'')
+type("")
+type(b"")
 type(0)
-type(0.)
+type(0.0)
 type(0j)
+
+# OK
+y = x.dtype.type(0.0)
+
+# OK
+type = lambda *args, **kwargs: None
+type("")

resources/test/fixtures/pyupgrade/UP011.py

@@ -0,0 +1,67 @@
+import functools
+from functools import lru_cache
+
+
+@functools.lru_cache()
+def fixme():
+    pass
+
+
+@lru_cache()
+def fixme():
+    pass
+
+
+@other_decorator
+@functools.lru_cache()
+def fixme():
+    pass
+
+
+@functools.lru_cache()
+@other_decorator
+def fixme():
+    pass
+
+
+@functools.lru_cache(maxsize=None)
+def ok():
+    pass
+
+
+@lru_cache(maxsize=None)
+def ok():
+    pass
+
+
+@functools.lru_cache(maxsize=64)
+def ok():
+    pass
+
+
+@lru_cache(maxsize=64)
+def ok():
+    pass
+
+
+def user_func():
+    pass
+
+
+@lru_cache(user_func)
+def ok():
+    pass
+
+
+@lru_cache(user_func, maxsize=None)
+def ok():
+    pass
+
+
+def lru_cache(maxsize=None):
+    pass
+
+
+@lru_cache(maxsize=None)
+def ok():
+    pass

resources/test/fixtures/pyupgrade/UP011_0.py

@@ -1,103 +0,0 @@
-import functools
-from functools import lru_cache
-
-
-@lru_cache()
-def fixme1():
-    pass
-
-
-@other_deco_after
-@functools.lru_cache()
-def fixme2():
-    pass
-
-
-@lru_cache(maxsize=None)
-def fixme3():
-    pass
-
-
-@functools.lru_cache(maxsize=None)
-@other_deco_before
-def fixme4():
-    pass
-
-
-@lru_cache( # A 
-) # B
-def fixme5():
-    pass
-
-
-@lru_cache(
-    # A
-)   # B
-def fixme6():
-    pass
-
-
-@functools.lru_cache(
-    # A
-    maxsize = None) # B
-def fixme7():
-    pass
-
-
-@functools.lru_cache(
-    # A1
-    maxsize = None
-    # A2
-) # B
-def fixme8():
-    pass
-
-
-@functools.lru_cache(
-    # A1
-    maxsize = 
-    None
-    # A2
-
-)
-def fixme9():
-    pass
-
-
-@functools.lru_cache(
-    # A1
-    maxsize = 
-    None
-    # A2
-)
-def fixme10():
-    pass
-
-
-@lru_cache
-def correct1():
-    pass
-
-
-@functools.lru_cache
-def correct2():
-    pass
-
-
-@functoools.lru_cache(maxsize=64)
-def correct3():
-    pass
-
-
-def user_func():
-    pass
-
-
-@lru_cache(user_func)
-def correct4():
-    pass
-
-
-@lru_cache(user_func, maxsize=None)
-def correct5():
-    pass

resources/test/fixtures/pyupgrade/UP011_1.py

@@ -1,15 +0,0 @@
-import functools
-
-
-def lru_cache(maxsize=None):
-    pass
-
-
-@lru_cache()
-def dont_fixme():
-    pass
-
-
-@lru_cache(maxsize=None)
-def dont_fixme():
-    pass

resources/test/fixtures/pyupgrade/UP013.py

@@ -31,3 +31,7 @@ MyType10 = TypedDict("MyType10", {"key": Literal["value"]})
 
 # using namespace TypedDict
 MyType11 = typing.TypedDict("MyType11", {"key": int})
+
+# unpacking
+c = {"c": float}
+MyType12 = TypedDict("MyType1", {"a": int, "b": str, **c})

resources/test/fixtures/pyupgrade/UP031_0.py

@@ -0,0 +1,75 @@
+a, b, x, y = 1, 2, 3, 4
+
+# UP031
+print('%s %s' % (a, b))
+
+print('%s%s' % (a, b))
+
+print("trivial" % ())
+
+print("%s" % ("simple",))
+
+print("%s" % ("%s" % ("nested",),))
+
+print("%s%% percent" % (15,))
+
+print("%f" % (15,))
+
+print("%.f" % (15,))
+
+print("%.3f" % (15,))
+
+print("%3f" % (15,))
+
+print("%-5f" % (5,))
+
+print("%9f" % (5,))
+
+print("%#o" % (123,))
+
+print("brace {} %s" % (1,))
+
+print(
+  "%s" % (
+    "trailing comma",
+        )
+)
+
+print("foo %s " % (x,))
+
+print("%(k)s" % {"k": "v"})
+
+print("%(k)s" % {
+    "k": "v",
+    "i": "j"
+})
+
+print("%(to_list)s" % {"to_list": []})
+
+print("%(k)s" % {"k": "v", "i": 1, "j": []})
+
+print("%(ab)s" % {"a" "b": 1})
+
+print("%(a)s" % {"a"  :  1})
+
+print((
+    "foo %s "
+    "bar %s" % (x, y)
+))
+
+print(
+    "foo %(foo)s "
+    "bar %(bar)s" % {"foo": x, "bar": y}
+)
+
+bar = {"bar": y}
+print(
+    "foo %(foo)s "
+    "bar %(bar)s" % {"foo": x, **bar}
+)
+
+print("%s \N{snowman}" % (a,))
+
+print("%(foo)s \N{snowman}" % {"foo": 1})
+
+print(("foo %s " "bar %s") % (x, y))

resources/test/fixtures/pyupgrade/UP031_1.py

@@ -0,0 +1,59 @@
+# OK
+"%s" % unknown_type
+
+b"%s" % (b"bytestring",)
+
+"%*s" % (5, "hi")
+
+"%d" % (flt,)
+
+"%c" % (some_string,)
+
+"%4%" % ()
+
+"%.2r" % (1.25)
+
+i % 3
+
+"%.*s" % (5, "hi")
+
+"%i" % (flt,)
+
+"%()s" % {"": "empty"}
+
+"%s" % {"k": "v"}
+
+"%(1)s" % {"1": "bar"}
+
+"%(a)s" % {"a": 1, "a": 2}
+
+pytest.param('"%8s" % (None,)', id="unsafe width-string conversion"),
+
+"%()s" % {"": "bar"}
+
+"%(1)s" % {1: 2, "1": 2}
+
+"%(and)s" % {"and": 2}
+
+# OK (arguably false negatives)
+(
+    "foo %s "
+    "bar %s"
+) % (x, y)
+
+(
+    "foo %(foo)s "
+    "bar %(bar)s"
+) % {"foo": x, "bar": y}
+
+(
+    """foo %s"""
+    % (x,)
+)
+
+(
+    """
+    foo %s
+    """
+    % (x,)
+)

resources/test/fixtures/pyupgrade/UP032.py

@@ -0,0 +1,86 @@
+###
+# Errors
+###
+
+"{} {}".format(a, b)
+
+"{1} {0}".format(a, b)
+
+"{x.y}".format(x=z)
+
+"{.x} {.y}".format(a, b)
+
+"{} {}".format(a.b, c.d)
+
+"{}".format(a())
+
+"{}".format(a.b())
+
+"{}".format(a.b().c())
+
+"hello {}!".format(name)
+
+"{}{b}{}".format(a, c, b=b)
+
+"{}".format(0x0)
+
+"{} {}".format(a, b)
+
+"""{} {}""".format(a, b)
+
+"foo{}".format(1)
+
+r"foo{}".format(1)
+
+x = "{a}".format(a=1)
+
+print("foo {} ".format(x))
+
+"{a[b]}".format(a=a)
+
+"{a.a[b]}".format(a=a)
+
+"{}{{}}{}".format(escaped, y)
+
+"{}".format(a)
+
+###
+# Non-errors
+###
+
+# False-negative: RustPython doesn't parse the `\N{snowman}`.
+"\N{snowman} {}".format(a)
+
+"{".format(a)
+
+"}".format(a)
+
+"{} {}".format(*a)
+
+"{0} {0}".format(arg)
+
+"{x} {x}".format(arg)
+
+"{x.y} {x.z}".format(arg)
+
+b"{} {}".format(a, b)
+
+"{:{}}".format(x, y)
+
+"{}{}".format(a)
+
+"" "{}".format(a["\\"])
+
+"{}".format(a["b"])
+
+r'"\N{snowman} {}".format(a)'
+
+"{a}" "{b}".format(a=1, b=1)
+
+
+async def c():
+    return "{}".format(await 3)
+
+
+async def c():
+    return "{}".format(1 + await 3)

resources/test/fixtures/pyupgrade/UP033.py

@@ -0,0 +1,67 @@
+import functools
+from functools import lru_cache
+
+
+@functools.lru_cache(maxsize=None)
+def fixme():
+    pass
+
+
+@lru_cache(maxsize=None)
+def fixme():
+    pass
+
+
+@other_decorator
+@functools.lru_cache(maxsize=None)
+def fixme():
+    pass
+
+
+@functools.lru_cache(maxsize=None)
+@other_decorator
+def fixme():
+    pass
+
+
+@functools.lru_cache()
+def ok():
+    pass
+
+
+@lru_cache()
+def ok():
+    pass
+
+
+@functools.lru_cache(maxsize=64)
+def ok():
+    pass
+
+
+@lru_cache(maxsize=64)
+def ok():
+    pass
+
+
+def user_func():
+    pass
+
+
+@lru_cache(user_func)
+def ok():
+    pass
+
+
+@lru_cache(user_func, maxsize=None)
+def ok():
+    pass
+
+
+def lru_cache(maxsize=None):
+    pass
+
+
+@lru_cache(maxsize=None)
+def ok():
+    pass

resources/test/fixtures/pyupgrade/UP034.py

@@ -0,0 +1,61 @@
+# UP034
+print(("foo"))
+
+# UP034
+print(("hell((goodybe))o"))
+
+# UP034
+print((("foo")))
+
+# UP034
+print((((1))))
+
+# UP034
+print(("foo{}".format(1)))
+
+# UP034
+print(
+    ("foo{}".format(1))
+)
+
+# UP034
+print(
+    (
+        "foo"
+    )
+)
+
+# UP034
+def f():
+    x = int(((yield 1)))
+
+# UP034
+if True:
+    print(
+        ("foo{}".format(1))
+    )
+
+# UP034
+print((x for x in range(3)))
+
+# OK
+print("foo")
+
+# OK
+print((1, 2, 3))
+
+# OK
+print(())
+
+# OK
+print((1,))
+
+# OK
+sum((block.code for block in blocks), [])
+
+# OK
+def f():
+    x = int((yield 1))
+
+# OK
+sum((i for i in range(3)), [])

resources/test/fixtures/ruff/RUF005.py

@@ -0,0 +1,39 @@
+class Fun:
+    words = ("how", "fun!")
+
+    def yay(self):
+        return self.words
+
+yay = Fun().yay
+
+foo = [4, 5, 6]
+bar = [1, 2, 3] + foo
+zoob = tuple(bar)
+quux = (7, 8, 9) + zoob
+spam = quux + (10, 11, 12)
+spom = list(spam)
+eggs = spom + [13, 14, 15]
+elatement = ("we all say", ) + yay()
+excitement = ("we all think", ) + Fun().yay()
+astonishment = ("we all feel", ) + Fun.words
+
+chain = ['a', 'b', 'c'] + eggs + list(('yes', 'no', 'pants') + zoob)
+
+baz = () + zoob
+
+first = [
+    # The order
+    1,  # here
+    2,  # is
+    # extremely
+    3,  # critical
+    # to preserve
+]
+second = first + [
+    # please
+    4,
+    # don't
+    5,
+    # touch
+    6,
+]

resources/test/fixtures/ruff/RUF100_1.py

@@ -1,64 +1,89 @@
-# This should ignore both errors.
-from typing import (  # noqa: F401
-    List,
-    Sequence,
-)
+def f():
+    # This should ignore both errors.
+    from typing import (  # noqa: F401
+        List,
+        Sequence,
+    )
 
-# This should ignore both errors.
-from typing import (  # noqa
-    List,
-    Sequence,
-)
 
-# This should ignore both errors.
-from typing import (
-    List,  # noqa: F401
-    Sequence,  # noqa: F401
-)
+def f():
+    # This should ignore both errors.
+    from typing import (  # noqa
+        List,
+        Sequence,
+    )
 
-# This should ignore both errors.
-from typing import (
-    List,  # noqa
-    Sequence,  # noqa
-)
 
-# This should ignore the first error.
-from typing import (
-    Mapping,  # noqa: F401
-    Union,
-)
+def f():
+    # This should ignore both errors.
+    from typing import (
+        List,  # noqa: F401
+        Sequence,  # noqa: F401
+    )
 
-# This should ignore both errors.
-from typing import (  # noqa
-    List,
-    Sequence,
-)
 
-# This should ignore the error, but the inner noqa should be marked as unused.
-from typing import (  # noqa: F401
-    Optional,  # noqa: F401
-)
+def f():
+    # This should ignore both errors.
+    from typing import (
+        List,  # noqa
+        Sequence,  # noqa
+    )
 
-# This should ignore the error, but the inner noqa should be marked as unused.
-from typing import (  # noqa
-    Optional,  # noqa: F401
-)
 
-# This should ignore the error, but mark F501 as unused.
-from typing import (  # noqa: F401
-    Dict,  # noqa: F501
-)
+def f():
+    # This should ignore the first error.
+    from typing import (
+        Mapping,  # noqa: F401
+        Union,
+    )
 
-# This should ignore the error, but mark F501 as unused.
-from typing import (  # noqa: F501
-    Tuple,  # noqa: F401
-)
 
-# This should ignore both errors.
-from typing import Any, AnyStr  # noqa: F401
+def f():
+    # This should ignore both errors.
+    from typing import (  # noqa
+        List,
+        Sequence,
+    )
 
-# This should ignore both errors.
-from typing import AsyncIterable, AsyncGenerator  # noqa
 
-# This should mark F501 as unused.
-from typing import Awaitable, AwaitableGenerator  # noqa: F501
+def f():
+    # This should ignore the error, but the inner noqa should be marked as unused.
+    from typing import (  # noqa: F401
+        Optional,  # noqa: F401
+    )
+
+
+def f():
+    # This should ignore the error, but the inner noqa should be marked as unused.
+    from typing import (  # noqa
+        Optional,  # noqa: F401
+    )
+
+
+def f():
+    # This should ignore the error, but mark F501 as unused.
+    from typing import (  # noqa: F401
+        Dict,  # noqa: F501
+    )
+
+
+def f():
+    # This should ignore the error, but mark F501 as unused.
+    from typing import (  # noqa: F501
+        Tuple,  # noqa: F401
+    )
+
+
+def f():
+    # This should ignore both errors.
+    from typing import Any, AnyStr  # noqa: F401
+
+
+def f():
+    # This should ignore both errors.
+    from typing import AsyncIterable, AsyncGenerator  # noqa
+
+
+def f():
+    # This should mark F501 as unused.
+    from typing import Awaitable, AwaitableGenerator  # noqa: F501

resources/test/fixtures/tryceratops/TRY004.py

@@ -0,0 +1,296 @@
+"""
+Violation:
+
+Prefer TypeError when relevant.
+"""
+
+
+def incorrect_basic(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_multiple_type_check(some_arg):
+    if isinstance(some_arg, (int, str)):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+class MyClass:
+    pass
+
+
+def incorrect_with_issubclass(some_arg):
+    if issubclass(some_arg, MyClass):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_with_callable(some_arg):
+    if callable(some_arg):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_ArithmeticError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise ArithmeticError("...")  # should be typeerror
+
+
+def incorrect_AssertionError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise AssertionError("...")  # should be typeerror
+
+
+def incorrect_AttributeError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise AttributeError("...")  # should be typeerror
+
+
+def incorrect_BufferError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise BufferError  # should be typeerror
+
+
+def incorrect_EOFError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise EOFError("...")  # should be typeerror
+
+
+def incorrect_ImportError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise ImportError("...")  # should be typeerror
+
+
+def incorrect_LookupError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise LookupError("...")  # should be typeerror
+
+
+def incorrect_MemoryError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        # should be typeerror
+        # not multiline is on purpose for fix
+        raise MemoryError(
+            "..."
+        )  
+
+
+def incorrect_NameError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise NameError("...")  # should be typeerror
+
+
+def incorrect_ReferenceError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise ReferenceError("...")  # should be typeerror
+
+
+def incorrect_RuntimeError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise RuntimeError("...")  # should be typeerror
+
+
+def incorrect_SyntaxError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise SyntaxError("...")  # should be typeerror
+
+
+def incorrect_SystemError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise SystemError("...")  # should be typeerror
+
+
+def incorrect_ValueError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise ValueError("...")  # should be typeerror
+
+
+def incorrect_not_operator_isinstance(some_arg):
+    if not isinstance(some_arg):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_and_operator_isinstance(arg1, arg2):
+    if isinstance(some_arg) and isinstance(arg2):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_or_operator_isinstance(arg1, arg2):
+    if isinstance(some_arg) or isinstance(arg2):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_multiple_operators_isinstance(arg1, arg2, arg3):
+    if not isinstance(arg1) and isinstance(arg2) or isinstance(arg3):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_not_operator_callable(some_arg):
+    if not callable(some_arg):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_and_operator_callable(arg1, arg2):
+    if callable(some_arg) and callable(arg2):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_or_operator_callable(arg1, arg2):
+    if callable(some_arg) or callable(arg2):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_multiple_operators_callable(arg1, arg2, arg3):
+    if not callable(arg1) and callable(arg2) or callable(arg3):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_not_operator_issubclass(some_arg):
+    if not issubclass(some_arg):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_and_operator_issubclass(arg1, arg2):
+    if issubclass(some_arg) and issubclass(arg2):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_or_operator_issubclass(arg1, arg2):
+    if issubclass(some_arg) or issubclass(arg2):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_multiple_operators_issubclass(arg1, arg2, arg3):
+    if not issubclass(arg1) and issubclass(arg2) or issubclass(arg3):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_multi_conditional(arg1, arg2):
+    if isinstance(arg1, int):
+        pass
+    elif isinstance(arg2, int):
+        raise Exception("...")  # should be typeerror
+
+
+class MyCustomTypeValidation(Exception):
+    pass
+
+
+def correct_custom_exception(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise MyCustomTypeValidation("...")  # that's correct, because it's not vanilla
+
+
+def correct_complex_conditional(val):
+    if val is not None and (not isinstance(val, int) or val < 0):
+        raise ValueError(...)  # fine if this is not a TypeError
+
+
+def correct_multi_conditional(some_arg):
+    if some_arg == 3:
+        pass
+    elif isinstance(some_arg, int):
+        pass
+    else:
+        raise Exception("...")  # fine if this is not a TypeError
+
+
+def correct_should_ignore(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise TypeError("...")
+
+
+def check_body(some_args):
+    if isinstance(some_args, int):
+        raise ValueError("...") # should be typeerror
+
+
+def check_body_correct(some_args):
+    if isinstance(some_args, int):
+        raise TypeError("...") # correct
+
+
+def multiple_elifs(some_args):
+    if not isinstance(some_args, int):
+        raise ValueError("...") # should be typerror
+    elif some_args < 3:
+        raise ValueError("...")  # this is ok
+    elif some_args > 10:
+        raise ValueError("...")  # this is ok if we don't simplify
+    else:
+        pass
+
+
+def multiple_ifs(some_args):
+    if not isinstance(some_args, int):
+        raise ValueError("...") # should be typerror
+    else:
+        if some_args < 3:
+            raise ValueError("...")  # this is ok
+        else:
+            if some_args > 10:
+                raise ValueError("...")  # this is ok if we don't simplify
+            else:
+                pass

resources/test/fixtures/tryceratops/TRY201.py

@@ -0,0 +1,54 @@
+"""
+Violation:
+
+Raising an exception using its assigned name is verbose and unrequired
+"""
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class MyException(Exception):
+    pass
+
+
+def bad():
+    try:
+        process()
+    except MyException as e:
+        logger.exception("process failed")
+        raise e
+
+
+def good():
+    try:
+        process()
+    except MyException:
+        logger.exception("process failed")
+        raise
+
+def still_good():
+    try:
+        process()
+    except MyException as e:
+        print(e)
+        raise
+
+
+def bad_that_needs_recursion():
+    try:
+        process()
+    except MyException as e:
+        logger.exception("process failed")
+        if True:
+            raise e
+
+
+def bad_that_needs_recursion_2():
+    try:
+        process()
+    except MyException as e:
+        logger.exception("process failed")
+        if True:
+            def foo():
+                raise e

resources/test/fixtures/tryceratops/TRY300.py

@@ -0,0 +1,47 @@
+"""
+Violation:
+
+Returning a final value inside a try block may indicate you could use an else block
+instead to outline the success scenario
+"""
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class MyException(Exception):
+    pass
+
+
+def bad():
+    try:
+        a = 1
+        b = process()
+        return b
+    except MyException:
+        logger.exception("process failed")
+
+
+def good():
+    try:
+        a = 1
+        b = process()
+    except MyException:
+        logger.exception("process failed")
+    else:
+        return b
+
+
+def noreturn():
+    try:
+        a = 1
+        b = process()
+    except MyException:
+        logger.exception("process failed")
+
+
+def still_good():
+    try:
+        return process()
+    except MyException:
+        logger.exception("process failed")

ruff.schema.json

@@ -73,7 +73,7 @@
         "null"
       ],
       "items": {
-        "$ref": "#/definitions/RuleCodePrefix"
+        "$ref": "#/definitions/RuleSelector"
       }
     },
     "extend-select": {
@@ -83,7 +83,7 @@
         "null"
       ],
       "items": {
-        "$ref": "#/definitions/RuleCodePrefix"
+        "$ref": "#/definitions/RuleSelector"
       }
     },
     "external": {
@@ -117,7 +117,7 @@
         "null"
       ],
       "items": {
-        "$ref": "#/definitions/RuleCodePrefix"
+        "$ref": "#/definitions/RuleSelector"
       }
     },
     "flake8-annotations": {
@@ -153,6 +153,17 @@
         }
       ]
     },
+    "flake8-builtins": {
+      "description": "Options for the `flake8-builtins` plugin.",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Flake8BuiltinsOptions"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
     "flake8-errmsg": {
       "description": "Options for the `flake8-errmsg` plugin.",
       "anyOf": [
@@ -227,7 +238,7 @@
       ]
     },
     "format": {
-      "description": "The style in which violation messages should be formatted: `\"text\"` (default), `\"grouped\"` (group messages by file), `\"json\"` (machine-readable), `\"junit\"` (machine-readable XML), `\"github\"` (GitHub Actions annotations) or `\"gitlab\"` (GitLab CI code quality report).",
+      "description": "The style in which violation messages should be formatted: `\"text\"` (default), `\"grouped\"` (group messages by file), `\"json\"` (machine-readable), `\"junit\"` (machine-readable XML), `\"github\"` (GitHub Actions annotations), `\"gitlab\"` (GitLab CI code quality report), or `\"pylint\"` (Pylint text format).",
       "anyOf": [
         {
           "$ref": "#/definitions/SerializationFormat"
@@ -244,11 +255,11 @@
         "null"
       ],
       "items": {
-        "$ref": "#/definitions/RuleCodePrefix"
+        "$ref": "#/definitions/RuleSelector"
       }
     },
     "ignore-init-module-imports": {
-      "description": "Avoid automatically removing unused imports in `__init__.py` files. Such imports will still be +flagged, but with a dedicated message suggesting that the import is either added to the module' +`__all__` symbol, or re-exported with a redundant alias (e.g., `import os as os`).",
+      "description": "Avoid automatically removing unused imports in `__init__.py` files. Such imports will still be flagged, but with a dedicated message suggesting that the import is either added to the module's `__all__` symbol, or re-exported with a redundant alias (e.g., `import os as os`).",
       "type": [
         "boolean",
         "null"
@@ -285,6 +296,16 @@
         }
       ]
     },
+    "namespace-packages": {
+      "description": "Mark the specified directories as namespace packages. For the purpose of module resolution, Ruff will treat those directories as if they contained an `__init__.py` file.",
+      "type": [
+        "array",
+        "null"
+      ],
+      "items": {
+        "type": "string"
+      }
+    },
     "pep8-naming": {
       "description": "Options for the `pep8-naming` plugin.",
       "anyOf": [
@@ -305,7 +326,7 @@
       "additionalProperties": {
         "type": "array",
         "items": {
-          "$ref": "#/definitions/RuleCodePrefix"
+          "$ref": "#/definitions/RuleSelector"
         }
       }
     },
@@ -331,6 +352,17 @@
         }
       ]
     },
+    "pylint": {
+      "description": "Options for the `pylint` plugin.",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/PylintOptions"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
     "pyupgrade": {
       "description": "Options for the `pyupgrade` plugin.",
       "anyOf": [
@@ -367,7 +399,7 @@
         "null"
       ],
       "items": {
-        "$ref": "#/definitions/RuleCodePrefix"
+        "$ref": "#/definitions/RuleSelector"
       }
     },
     "show-source": {
@@ -425,7 +457,7 @@
         "null"
       ],
       "items": {
-        "$ref": "#/definitions/RuleCodePrefix"
+        "$ref": "#/definitions/RuleSelector"
       }
     },
     "update-check": {
@@ -438,7 +470,7 @@
   },
   "additionalProperties": false,
   "definitions": {
-    "BannedApi": {
+    "ApiBan": {
       "type": "object",
       "required": [
         "msg"
@@ -451,6 +483,17 @@
       },
       "additionalProperties": false
     },
+    "ConstantType": {
+      "type": "string",
+      "enum": [
+        "bytes",
+        "complex",
+        "float",
+        "int",
+        "str",
+        "tuple"
+      ]
+    },
     "Convention": {
       "oneOf": [
         {
@@ -552,6 +595,22 @@
       },
       "additionalProperties": false
     },
+    "Flake8BuiltinsOptions": {
+      "type": "object",
+      "properties": {
+        "builtins-ignorelist": {
+          "description": "Ignore list of builtins.",
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "type": "string"
+          }
+        }
+      },
+      "additionalProperties": false
+    },
     "Flake8ErrMsgOptions": {
       "type": "object",
       "properties": {
@@ -733,7 +792,7 @@
             "null"
           ],
           "additionalProperties": {
-            "$ref": "#/definitions/BannedApi"
+            "$ref": "#/definitions/ApiBan"
           }
         }
       },
@@ -752,6 +811,16 @@
       },
       "additionalProperties": false
     },
+    "ImportType": {
+      "type": "string",
+      "enum": [
+        "future",
+        "standard-library",
+        "third-party",
+        "first-party",
+        "local-folder"
+      ]
+    },
     "IsortOptions": {
       "type": "object",
       "properties": {
@@ -772,6 +841,16 @@
             "null"
           ]
         },
+        "constants": {
+          "description": "An override list of tokens to always recognize as a CONSTANT for `order-by-type` regardless of casing.",
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "type": "string"
+          }
+        },
         "extra-standard-library": {
           "description": "A list of modules to consider standard-library, in addition to those known to Ruff in advance.",
           "type": [
@@ -823,6 +902,16 @@
             "type": "string"
           }
         },
+        "no-lines-before": {
+          "description": "A list of sections that should _not_ be delineated from the previous section via empty lines.",
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "$ref": "#/definitions/ImportType"
+          }
+        },
         "order-by-type": {
           "description": "Order imports by type, which is determined by case, in addition to alphabetically.",
           "type": [
@@ -867,6 +956,16 @@
             "boolean",
             "null"
           ]
+        },
+        "variables": {
+          "description": "An override list of tokens to always recognize as a var for `order-by-type` regardless of casing.",
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "type": "string"
+          }
         }
       },
       "additionalProperties": false
@@ -996,6 +1095,22 @@
       },
       "additionalProperties": false
     },
+    "PylintOptions": {
+      "type": "object",
+      "properties": {
+        "allow-magic-value-types": {
+          "description": "Constant types to ignore when used as \"magic values\".",
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "$ref": "#/definitions/ConstantType"
+          }
+        }
+      },
+      "additionalProperties": false
+    },
     "PythonVersion": {
       "type": "string",
       "enum": [
@@ -1046,7 +1161,7 @@
         }
       ]
     },
-    "RuleCodePrefix": {
+    "RuleSelector": {
       "type": "string",
       "enum": [
         "A",
@@ -1146,6 +1261,12 @@
         "C9",
         "C90",
         "C901",
+        "COM",
+        "COM8",
+        "COM81",
+        "COM812",
+        "COM818",
+        "COM819",
         "D",
         "D1",
         "D10",
@@ -1183,6 +1304,7 @@
         "D4",
         "D40",
         "D400",
+        "D401",
         "D402",
         "D403",
         "D404",
@@ -1216,6 +1338,9 @@
         "DTZ011",
         "DTZ012",
         "E",
+        "E1",
+        "E10",
+        "E101",
         "E4",
         "E40",
         "E401",
@@ -1253,6 +1378,12 @@
         "ERA0",
         "ERA00",
         "ERA001",
+        "EXE",
+        "EXE0",
+        "EXE00",
+        "EXE003",
+        "EXE004",
+        "EXE005",
         "F",
         "F4",
         "F40",
@@ -1340,6 +1471,10 @@
         "ICN0",
         "ICN00",
         "ICN001",
+        "INP",
+        "INP0",
+        "INP00",
+        "INP001",
         "ISC",
         "ISC0",
         "ISC00",
@@ -1415,18 +1550,18 @@
         "PIE79",
         "PIE790",
         "PIE794",
+        "PIE796",
         "PIE8",
         "PIE80",
+        "PIE800",
+        "PIE804",
         "PIE807",
+        "PL",
         "PLC",
         "PLC0",
         "PLC04",
         "PLC041",
         "PLC0414",
-        "PLC2",
-        "PLC22",
-        "PLC220",
-        "PLC2201",
         "PLC3",
         "PLC30",
         "PLC300",
@@ -1500,6 +1635,36 @@
         "PT024",
         "PT025",
         "PT026",
+        "PTH",
+        "PTH1",
+        "PTH10",
+        "PTH100",
+        "PTH101",
+        "PTH102",
+        "PTH103",
+        "PTH104",
+        "PTH105",
+        "PTH106",
+        "PTH107",
+        "PTH108",
+        "PTH109",
+        "PTH11",
+        "PTH110",
+        "PTH111",
+        "PTH112",
+        "PTH113",
+        "PTH114",
+        "PTH115",
+        "PTH116",
+        "PTH117",
+        "PTH118",
+        "PTH119",
+        "PTH12",
+        "PTH120",
+        "PTH121",
+        "PTH122",
+        "PTH123",
+        "PTH124",
         "Q",
         "Q0",
         "Q00",
@@ -1536,6 +1701,7 @@
         "RUF002",
         "RUF003",
         "RUF004",
+        "RUF005",
         "RUF1",
         "RUF10",
         "RUF100",
@@ -1561,6 +1727,9 @@
         "S506",
         "S508",
         "S509",
+        "S6",
+        "S61",
+        "S612",
         "S7",
         "S70",
         "S701",
@@ -1614,6 +1783,20 @@
         "TID25",
         "TID251",
         "TID252",
+        "TRY",
+        "TRY0",
+        "TRY00",
+        "TRY004",
+        "TRY2",
+        "TRY20",
+        "TRY201",
+        "TRY3",
+        "TRY30",
+        "TRY300",
+        "TYP",
+        "TYP0",
+        "TYP00",
+        "TYP005",
         "U",
         "U0",
         "U00",
@@ -1670,6 +1853,10 @@
         "UP029",
         "UP03",
         "UP030",
+        "UP031",
+        "UP032",
+        "UP033",
+        "UP034",
         "W",
         "W2",
         "W29",
@@ -1707,7 +1894,8 @@
         "junit",
         "grouped",
         "github",
-        "gitlab"
+        "gitlab",
+        "pylint"
       ]
     },
     "Strictness": {

ruff_cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_cli"
-version = "0.0.221"
+version = "0.0.231"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 edition = "2021"
 rust-version = "1.65.0"
@@ -17,6 +17,12 @@ name = "ruff"
 path = "src/main.rs"
 doctest = false
 
+# Since the name of the binary is the same as the name of the `ruff` crate
+# running `cargo doc --no-deps --all` results in an `output filename collision`
+# See also https://github.com/rust-lang/cargo/issues/6313.
+# We therefore disable the documentation generation for the binary.
+doc = false
+
 [dependencies]
 ruff = { path = ".." }
 

ruff_cli/src/cache.rs

@@ -9,7 +9,7 @@ use filetime::FileTime;
 use log::error;
 use path_absolutize::Absolutize;
 use ruff::message::Message;
-use ruff::settings::{flags, Settings};
+use ruff::settings::{flags, AllSettings, Settings};
 use serde::{Deserialize, Serialize};
 
 const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
@@ -35,10 +35,19 @@ fn content_dir() -> &'static Path {
     Path::new("content")
 }
 
-fn cache_key<P: AsRef<Path>>(path: P, settings: &Settings, autofix: flags::Autofix) -> u64 {
+fn cache_key<P: AsRef<Path>>(
+    path: P,
+    package: Option<&P>,
+    settings: &Settings,
+    autofix: flags::Autofix,
+) -> u64 {
     let mut hasher = DefaultHasher::new();
     CARGO_PKG_VERSION.hash(&mut hasher);
     path.as_ref().absolutize().unwrap().hash(&mut hasher);
+    package
+        .as_ref()
+        .map(|path| path.as_ref().absolutize().unwrap())
+        .hash(&mut hasher);
     settings.hash(&mut hasher);
     autofix.hash(&mut hasher);
     hasher.finish()
@@ -79,11 +88,16 @@ fn read_sync(cache_dir: &Path, key: u64) -> Result<Vec<u8>, std::io::Error> {
 /// Get a value from the cache.
 pub fn get<P: AsRef<Path>>(
     path: P,
+    package: Option<&P>,
     metadata: &fs::Metadata,
-    settings: &Settings,
+    settings: &AllSettings,
     autofix: flags::Autofix,
 ) -> Option<Vec<Message>> {
-    let encoded = read_sync(&settings.cache_dir, cache_key(path, settings, autofix)).ok()?;
+    let encoded = read_sync(
+        &settings.cli.cache_dir,
+        cache_key(path, package, &settings.lib, autofix),
+    )
+    .ok()?;
     let (mtime, messages) = match bincode::deserialize::<CheckResult>(&encoded[..]) {
         Ok(CheckResult {
             metadata: CacheMetadata { mtime },
@@ -103,8 +117,9 @@ pub fn get<P: AsRef<Path>>(
 /// Set a value in the cache.
 pub fn set<P: AsRef<Path>>(
     path: P,
+    package: Option<&P>,
     metadata: &fs::Metadata,
-    settings: &Settings,
+    settings: &AllSettings,
     autofix: flags::Autofix,
     messages: &[Message],
 ) {
@@ -115,8 +130,8 @@ pub fn set<P: AsRef<Path>>(
         messages,
     };
     if let Err(e) = write_sync(
-        &settings.cache_dir,
-        cache_key(path, settings, autofix),
+        &settings.cli.cache_dir,
+        cache_key(path, package, &settings.lib, autofix),
         &bincode::serialize(&check_result).unwrap(),
     ) {
         error!("Failed to write to cache: {e:?}");

ruff_cli/src/cli.rs

@@ -1,14 +1,13 @@
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 
 use clap::{command, Parser};
 use regex::Regex;
 use ruff::logging::LogLevel;
-use ruff::registry::{RuleCode, RuleCodePrefix};
+use ruff::registry::{Rule, RuleSelector};
 use ruff::resolver::ConfigProcessor;
 use ruff::settings::types::{
     FilePattern, PatternPrefixPair, PerFileIgnore, PythonVersion, SerializationFormat,
 };
-use ruff::{fs, mccabe};
 use rustc_hash::FxHashMap;
 
 #[derive(Debug, Parser)]
@@ -66,18 +65,18 @@ pub struct Cli {
     /// Comma-separated list of rule codes to enable (or ALL, to enable all
     /// rules).
     #[arg(long, value_delimiter = ',', value_name = "RULE_CODE")]
-    pub select: Option<Vec<RuleCodePrefix>>,
+    pub select: Option<Vec<RuleSelector>>,
     /// Like --select, but adds additional rule codes on top of the selected
     /// ones.
     #[arg(long, value_delimiter = ',', value_name = "RULE_CODE")]
-    pub extend_select: Option<Vec<RuleCodePrefix>>,
+    pub extend_select: Option<Vec<RuleSelector>>,
     /// Comma-separated list of rule codes to disable.
     #[arg(long, value_delimiter = ',', value_name = "RULE_CODE")]
-    pub ignore: Option<Vec<RuleCodePrefix>>,
+    pub ignore: Option<Vec<RuleSelector>>,
     /// Like --ignore, but adds additional rule codes on top of the ignored
     /// ones.
     #[arg(long, value_delimiter = ',', value_name = "RULE_CODE")]
-    pub extend_ignore: Option<Vec<RuleCodePrefix>>,
+    pub extend_ignore: Option<Vec<RuleSelector>>,
     /// List of paths, used to omit files and/or directories from analysis.
     #[arg(long, value_delimiter = ',', value_name = "FILE_PATTERN")]
     pub exclude: Option<Vec<FilePattern>>,
@@ -88,11 +87,11 @@ pub struct Cli {
     /// List of rule codes to treat as eligible for autofix. Only applicable
     /// when autofix itself is enabled (e.g., via `--fix`).
     #[arg(long, value_delimiter = ',', value_name = "RULE_CODE")]
-    pub fixable: Option<Vec<RuleCodePrefix>>,
+    pub fixable: Option<Vec<RuleSelector>>,
     /// List of rule codes to treat as ineligible for autofix. Only applicable
     /// when autofix itself is enabled (e.g., via `--fix`).
     #[arg(long, value_delimiter = ',', value_name = "RULE_CODE")]
-    pub unfixable: Option<Vec<RuleCodePrefix>>,
+    pub unfixable: Option<Vec<RuleSelector>>,
     /// List of mappings from file pattern to code to exclude
     #[arg(long, value_delimiter = ',')]
     pub per_file_ignores: Option<Vec<PatternPrefixPair>>,
@@ -137,9 +136,6 @@ pub struct Cli {
     /// formatting.
     #[arg(long)]
     pub line_length: Option<usize>,
-    /// Maximum McCabe complexity allowed for a given function.
-    #[arg(long)]
-    pub max_complexity: Option<usize>,
     /// Enable automatic additions of `noqa` directives to failing lines.
     #[arg(
         long,
@@ -172,6 +168,7 @@ pub struct Cli {
     /// Explain a rule.
     #[arg(
         long,
+        value_parser=Rule::from_code,
         // Fake subcommands.
         conflicts_with = "add_noqa",
         conflicts_with = "clean",
@@ -183,7 +180,7 @@ pub struct Cli {
         conflicts_with = "stdin_filename",
         conflicts_with = "watch",
     )]
-    pub explain: Option<RuleCode>,
+    pub explain: Option<&'static Rule>,
     /// Generate shell completion
     #[arg(
         long,
@@ -266,7 +263,6 @@ impl Cli {
                 fixable: self.fixable,
                 ignore: self.ignore,
                 line_length: self.line_length,
-                max_complexity: self.max_complexity,
                 per_file_ignores: self.per_file_ignores,
                 respect_gitignore: resolve_bool_arg(
                     self.respect_gitignore,
@@ -306,7 +302,7 @@ pub struct Arguments {
     pub config: Option<PathBuf>,
     pub diff: bool,
     pub exit_zero: bool,
-    pub explain: Option<RuleCode>,
+    pub explain: Option<&'static Rule>,
     pub files: Vec<PathBuf>,
     pub generate_shell_completion: Option<clap_complete_command::Shell>,
     pub isolated: bool,
@@ -327,18 +323,17 @@ pub struct Overrides {
     pub dummy_variable_rgx: Option<Regex>,
     pub exclude: Option<Vec<FilePattern>>,
     pub extend_exclude: Option<Vec<FilePattern>>,
-    pub extend_ignore: Option<Vec<RuleCodePrefix>>,
-    pub extend_select: Option<Vec<RuleCodePrefix>>,
-    pub fixable: Option<Vec<RuleCodePrefix>>,
-    pub ignore: Option<Vec<RuleCodePrefix>>,
+    pub extend_ignore: Option<Vec<RuleSelector>>,
+    pub extend_select: Option<Vec<RuleSelector>>,
+    pub fixable: Option<Vec<RuleSelector>>,
+    pub ignore: Option<Vec<RuleSelector>>,
     pub line_length: Option<usize>,
-    pub max_complexity: Option<usize>,
     pub per_file_ignores: Option<Vec<PatternPrefixPair>>,
     pub respect_gitignore: Option<bool>,
-    pub select: Option<Vec<RuleCodePrefix>>,
+    pub select: Option<Vec<RuleSelector>>,
     pub show_source: Option<bool>,
     pub target_version: Option<PythonVersion>,
-    pub unfixable: Option<Vec<RuleCodePrefix>>,
+    pub unfixable: Option<Vec<RuleSelector>>,
     // TODO(charlie): Captured in pyproject.toml as a default, but not part of `Settings`.
     pub cache_dir: Option<PathBuf>,
     pub fix: Option<bool>,
@@ -383,11 +378,6 @@ impl ConfigProcessor for &Overrides {
         if let Some(line_length) = &self.line_length {
             config.line_length = Some(*line_length);
         }
-        if let Some(max_complexity) = &self.max_complexity {
-            config.mccabe = Some(mccabe::settings::Options {
-                max_complexity: Some(*max_complexity),
-            });
-        }
         if let Some(per_file_ignores) = &self.per_file_ignores {
             config.per_file_ignores = Some(collect_per_file_ignores(per_file_ignores.clone()));
         }
@@ -444,7 +434,7 @@ pub fn extract_log_level(cli: &Arguments) -> LogLevel {
 
 /// Convert a list of `PatternPrefixPair` structs to `PerFileIgnore`.
 pub fn collect_per_file_ignores(pairs: Vec<PatternPrefixPair>) -> Vec<PerFileIgnore> {
-    let mut per_file_ignores: FxHashMap<String, Vec<RuleCodePrefix>> = FxHashMap::default();
+    let mut per_file_ignores: FxHashMap<String, Vec<RuleSelector>> = FxHashMap::default();
     for pair in pairs {
         per_file_ignores
             .entry(pair.pattern)
@@ -453,9 +443,6 @@ pub fn collect_per_file_ignores(pairs: Vec<PatternPrefixPair>) -> Vec<PerFileIgn
     }
     per_file_ignores
         .into_iter()
-        .map(|(pattern, prefixes)| {
-            let absolute = fs::normalize_path(Path::new(&pattern));
-            PerFileIgnore::new(pattern, absolute, &prefixes)
-        })
+        .map(|(pattern, prefixes)| PerFileIgnore::new(pattern, &prefixes, None))
         .collect()
 }

ruff_cli/src/commands.rs

@@ -15,11 +15,11 @@ use ruff::cache::CACHE_DIR_NAME;
 use ruff::linter::add_noqa_to_path;
 use ruff::logging::LogLevel;
 use ruff::message::{Location, Message};
-use ruff::registry::RuleCode;
+use ruff::registry::{Linter, Rule, RuleNamespace};
 use ruff::resolver::{FileDiscovery, PyprojectDiscovery};
 use ruff::settings::flags;
 use ruff::settings::types::SerializationFormat;
-use ruff::{fix, fs, packaging, resolver, violations, warn_user_once};
+use ruff::{fix, fs, packaging, resolver, warn_user_once, AutofixAvailability, IOError};
 use serde::Serialize;
 use walkdir::WalkDir;
 
@@ -56,19 +56,19 @@ pub fn run(
     if matches!(cache, flags::Cache::Enabled) {
         match &pyproject_strategy {
             PyprojectDiscovery::Fixed(settings) => {
-                if let Err(e) = cache::init(&settings.cache_dir) {
+                if let Err(e) = cache::init(&settings.cli.cache_dir) {
                     error!(
                         "Failed to initialize cache at {}: {e:?}",
-                        settings.cache_dir.to_string_lossy()
+                        settings.cli.cache_dir.to_string_lossy()
                     );
                 }
             }
             PyprojectDiscovery::Hierarchical(default) => {
                 for settings in std::iter::once(default).chain(resolver.iter()) {
-                    if let Err(e) = cache::init(&settings.cache_dir) {
+                    if let Err(e) = cache::init(&settings.cli.cache_dir) {
                         error!(
                             "Failed to initialize cache at {}: {e:?}",
-                            settings.cache_dir.to_string_lossy()
+                            settings.cli.cache_dir.to_string_lossy()
                         );
                     }
                 }
@@ -83,6 +83,8 @@ pub fn run(
             .flatten()
             .map(ignore::DirEntry::path)
             .collect::<Vec<_>>(),
+        &resolver,
+        pyproject_strategy,
     );
 
     let start = Instant::now();
@@ -95,7 +97,7 @@ pub fn run(
                         .parent()
                         .and_then(|parent| package_roots.get(parent))
                         .and_then(|package| *package);
-                    let settings = resolver.resolve(path, pyproject_strategy);
+                    let settings = resolver.resolve_all(path, pyproject_strategy);
                     lint_path(path, package, settings, cache, autofix)
                         .map_err(|e| (Some(path.to_owned()), e.to_string()))
                 }
@@ -112,9 +114,9 @@ pub fn run(
             .unwrap_or_else(|(path, message)| {
                 if let Some(path) = &path {
                     let settings = resolver.resolve(path, pyproject_strategy);
-                    if settings.enabled.contains(&RuleCode::E902) {
+                    if settings.rules.enabled(&Rule::IOError) {
                         Diagnostics::new(vec![Message {
-                            kind: violations::IOError(message).into(),
+                            kind: IOError(message).into(),
                             location: Location::default(),
                             end_location: Location::default(),
                             fix: None,
@@ -169,9 +171,9 @@ pub fn run_stdin(
     };
     let package_root = filename
         .and_then(Path::parent)
-        .and_then(packaging::detect_package_root);
+        .and_then(|path| packaging::detect_package_root(path, &settings.lib.namespace_packages));
     let stdin = read_from_stdin()?;
-    let mut diagnostics = lint_stdin(filename, package_root, &stdin, settings, autofix)?;
+    let mut diagnostics = lint_stdin(filename, package_root, &stdin, &settings.lib, autofix)?;
     diagnostics.messages.sort_unstable();
     Ok(diagnostics)
 }
@@ -283,28 +285,39 @@ pub fn show_files(
 #[derive(Serialize)]
 struct Explanation<'a> {
     code: &'a str,
-    origin: &'a str,
+    linter: &'a str,
     summary: &'a str,
 }
 
-/// Explain a `RuleCode` to the user.
-pub fn explain(code: &RuleCode, format: SerializationFormat) -> Result<()> {
+/// Explain a `Rule` to the user.
+pub fn explain(rule: &Rule, format: SerializationFormat) -> Result<()> {
+    let (linter, _) = Linter::parse_code(rule.code()).unwrap();
     match format {
         SerializationFormat::Text | SerializationFormat::Grouped => {
-            println!(
-                "{} ({}): {}",
-                code.as_ref(),
-                code.origin().title(),
-                code.kind().summary()
-            );
+            println!("{}\n", rule.as_ref());
+            println!("Code: {} ({})\n", rule.code(), linter.name());
+
+            if let Some(autofix) = rule.autofixable() {
+                println!(
+                    "{}",
+                    match autofix.available {
+                        AutofixAvailability::Sometimes => "Autofix is sometimes available.\n",
+                        AutofixAvailability::Always => "Autofix is always available.\n",
+                    }
+                );
+            }
+            println!("Message formats:\n");
+            for format in rule.message_formats() {
+                println!("* {format}");
+            }
         }
         SerializationFormat::Json => {
             println!(
                 "{}",
                 serde_json::to_string_pretty(&Explanation {
-                    code: code.as_ref(),
-                    origin: code.origin().title(),
-                    summary: &code.kind().summary(),
+                    code: rule.code(),
+                    linter: linter.name(),
+                    summary: rule.message_formats()[0],
                 })?
             );
         }
@@ -317,6 +330,9 @@ pub fn explain(code: &RuleCode, format: SerializationFormat) -> Result<()> {
         SerializationFormat::Gitlab => {
             bail!("`--explain` does not support GitLab format")
         }
+        SerializationFormat::Pylint => {
+            bail!("`--explain` does not support pylint format")
+        }
     };
     Ok(())
 }

ruff_cli/src/diagnostics.rs

@@ -9,7 +9,7 @@ use anyhow::Result;
 use log::debug;
 use ruff::linter::{lint_fix, lint_only};
 use ruff::message::Message;
-use ruff::settings::{flags, Settings};
+use ruff::settings::{flags, AllSettings, Settings};
 use ruff::{fix, fs};
 use similar::TextDiff;
 
@@ -38,12 +38,12 @@ impl AddAssign for Diagnostics {
 pub fn lint_path(
     path: &Path,
     package: Option<&Path>,
-    settings: &Settings,
+    settings: &AllSettings,
     cache: flags::Cache,
     autofix: fix::FixMode,
 ) -> Result<Diagnostics> {
     // Validate the `Settings` and return any errors.
-    settings.validate()?;
+    settings.lib.validate()?;
 
     // Check the cache.
     // TODO(charlie): `fixer::Mode::Apply` and `fixer::Mode::Diff` both have
@@ -55,7 +55,9 @@ pub fn lint_path(
         && matches!(autofix, fix::FixMode::None | fix::FixMode::Generate)
     {
         let metadata = path.metadata()?;
-        if let Some(messages) = cache::get(path, &metadata, settings, autofix.into()) {
+        if let Some(messages) =
+            cache::get(path, package.as_ref(), &metadata, settings, autofix.into())
+        {
             debug!("Cache hit for: {}", path.to_string_lossy());
             return Ok(Diagnostics::new(messages));
         }
@@ -69,7 +71,7 @@ pub fn lint_path(
 
     // Lint the file.
     let (messages, fixed) = if matches!(autofix, fix::FixMode::Apply | fix::FixMode::Diff) {
-        let (transformed, fixed, messages) = lint_fix(&contents, path, package, settings)?;
+        let (transformed, fixed, messages) = lint_fix(&contents, path, package, &settings.lib)?;
         if fixed > 0 {
             if matches!(autofix, fix::FixMode::Apply) {
                 write(path, transformed)?;
@@ -85,14 +87,21 @@ pub fn lint_path(
         }
         (messages, fixed)
     } else {
-        let messages = lint_only(&contents, path, package, settings, autofix.into())?;
+        let messages = lint_only(&contents, path, package, &settings.lib, autofix.into())?;
         let fixed = 0;
         (messages, fixed)
     };
 
     // Re-populate the cache.
     if let Some(metadata) = metadata {
-        cache::set(path, &metadata, settings, autofix.into(), &messages);
+        cache::set(
+            path,
+            package.as_ref(),
+            &metadata,
+            settings,
+            autofix.into(),
+            &messages,
+        );
     }
 
     Ok(Diagnostics { messages, fixed })

ruff_cli/src/lib.rs

@@ -1,6 +1,14 @@
+//! This library only exists to enable the Ruff internal tooling (`ruff_dev`)
+//! to automatically update the `ruff --help` output in the `README.md`.
+//!
+//! For the actual Ruff library, see [`ruff`].
 #![allow(clippy::must_use_candidate, dead_code)]
 
 mod cli;
 
-// used by ruff_dev::generate_cli_help
-pub use cli::Cli;
+use clap::CommandFactory;
+
+/// Returns the output of `ruff --help`.
+pub fn help() -> String {
+    cli::Cli::command().render_help().to_string()
+}

ruff_cli/src/main.rs

@@ -16,8 +16,8 @@ use ::ruff::resolver::{
     resolve_settings_with_processor, ConfigProcessor, FileDiscovery, PyprojectDiscovery, Relativity,
 };
 use ::ruff::settings::configuration::Configuration;
+use ::ruff::settings::pyproject;
 use ::ruff::settings::types::SerializationFormat;
-use ::ruff::settings::{pyproject, Settings};
 use ::ruff::{fix, fs, warn_user_once};
 use anyhow::Result;
 use clap::{CommandFactory, Parser};
@@ -26,6 +26,7 @@ use colored::Colorize;
 use notify::{recommended_watcher, RecursiveMode, Watcher};
 use path_absolutize::path_dedot;
 use printer::{Printer, Violations};
+use ruff::settings::{AllSettings, CliSettings};
 
 mod cache;
 mod cli;
@@ -48,7 +49,7 @@ fn resolve(
         // First priority: if we're running in isolated mode, use the default settings.
         let mut config = Configuration::default();
         overrides.process_config(&mut config);
-        let settings = Settings::from_configuration(config, &path_dedot::CWD)?;
+        let settings = AllSettings::from_configuration(config, &path_dedot::CWD)?;
         Ok(PyprojectDiscovery::Fixed(settings))
     } else if let Some(pyproject) = config {
         // Second priority: the user specified a `pyproject.toml` file. Use that
@@ -82,7 +83,7 @@ fn resolve(
         // as the "default" settings.)
         let mut config = Configuration::default();
         overrides.process_config(&mut config);
-        let settings = Settings::from_configuration(config, &path_dedot::CWD)?;
+        let settings = AllSettings::from_configuration(config, &path_dedot::CWD)?;
         Ok(PyprojectDiscovery::Hierarchical(settings))
     }
 }
@@ -90,6 +91,22 @@ fn resolve(
 pub fn main() -> Result<ExitCode> {
     // Extract command-line arguments.
     let (cli, overrides) = Cli::parse().partition();
+
+    let default_panic_hook = std::panic::take_hook();
+    std::panic::set_hook(Box::new(move |info| {
+        eprintln!(
+            r#"
+{}: `ruff` crashed. This indicates a bug in `ruff`. If you could open an issue at:
+
+https://github.com/charliermarsh/ruff/issues/new?title=%5BPanic%5D
+
+quoting the executed command, along with the relevant file contents and `pyproject.toml` settings, we'd be very appreciative!
+"#,
+            "error".red().bold(),
+        );
+        default_panic_hook(info);
+    }));
+
     let log_level = extract_log_level(&cli);
     set_up_logging(&log_level)?;
 
@@ -113,39 +130,35 @@ pub fn main() -> Result<ExitCode> {
 
     // Validate the `Settings` and return any errors.
     match &pyproject_strategy {
-        PyprojectDiscovery::Fixed(settings) => settings.validate()?,
-        PyprojectDiscovery::Hierarchical(settings) => settings.validate()?,
+        PyprojectDiscovery::Fixed(settings) => settings.lib.validate()?,
+        PyprojectDiscovery::Hierarchical(settings) => settings.lib.validate()?,
     };
 
     // Extract options that are included in `Settings`, but only apply at the top
     // level.
     let file_strategy = FileDiscovery {
         force_exclude: match &pyproject_strategy {
-            PyprojectDiscovery::Fixed(settings) => settings.force_exclude,
-            PyprojectDiscovery::Hierarchical(settings) => settings.force_exclude,
+            PyprojectDiscovery::Fixed(settings) => settings.lib.force_exclude,
+            PyprojectDiscovery::Hierarchical(settings) => settings.lib.force_exclude,
         },
         respect_gitignore: match &pyproject_strategy {
-            PyprojectDiscovery::Fixed(settings) => settings.respect_gitignore,
-            PyprojectDiscovery::Hierarchical(settings) => settings.respect_gitignore,
+            PyprojectDiscovery::Fixed(settings) => settings.lib.respect_gitignore,
+            PyprojectDiscovery::Hierarchical(settings) => settings.lib.respect_gitignore,
         },
     };
-    let (fix, fix_only, format, update_check) = match &pyproject_strategy {
-        PyprojectDiscovery::Fixed(settings) => (
-            settings.fix,
-            settings.fix_only,
-            settings.format,
-            settings.update_check,
-        ),
-        PyprojectDiscovery::Hierarchical(settings) => (
-            settings.fix,
-            settings.fix_only,
-            settings.format,
-            settings.update_check,
-        ),
+    let CliSettings {
+        fix,
+        fix_only,
+        format,
+        update_check,
+        ..
+    } = match &pyproject_strategy {
+        PyprojectDiscovery::Fixed(settings) => settings.cli.clone(),
+        PyprojectDiscovery::Hierarchical(settings) => settings.cli.clone(),
     };
 
-    if let Some(code) = cli.explain {
-        commands::explain(&code, format)?;
+    if let Some(rule) = cli.explain {
+        commands::explain(rule, format)?;
         return Ok(ExitCode::SUCCESS);
     }
     if cli.show_settings {
@@ -200,7 +213,7 @@ pub fn main() -> Result<ExitCode> {
         }
 
         // Perform an initial run instantly.
-        printer.clear_screen()?;
+        Printer::clear_screen()?;
         printer.write_to_user("Starting linter in watch mode...\n");
 
         let messages = commands::run(
@@ -211,7 +224,7 @@ pub fn main() -> Result<ExitCode> {
             cache.into(),
             fix::FixMode::None,
         )?;
-        printer.write_continuously(&messages);
+        printer.write_continuously(&messages)?;
 
         // Configure the file watcher.
         let (tx, rx) = channel();
@@ -230,7 +243,7 @@ pub fn main() -> Result<ExitCode> {
                             .unwrap_or_default()
                     });
                     if py_changed {
-                        printer.clear_screen()?;
+                        Printer::clear_screen()?;
                         printer.write_to_user("File change detected...\n");
 
                         let messages = commands::run(
@@ -241,7 +254,7 @@ pub fn main() -> Result<ExitCode> {
                             cache.into(),
                             fix::FixMode::None,
                         )?;
-                        printer.write_continuously(&messages);
+                        printer.write_continuously(&messages)?;
                     }
                 }
                 Err(err) => return Err(err.into()),

ruff_cli/src/printer.rs

@@ -1,4 +1,6 @@
 use std::collections::BTreeMap;
+use std::io;
+use std::io::{BufWriter, Write};
 use std::path::Path;
 
 use annotate_snippets::display_list::{DisplayList, FormatOptions};
@@ -9,7 +11,7 @@ use itertools::iterate;
 use ruff::fs::relativize_path;
 use ruff::logging::LogLevel;
 use ruff::message::{Location, Message};
-use ruff::registry::RuleCode;
+use ruff::registry::Rule;
 use ruff::settings::types::SerializationFormat;
 use ruff::{fix, notify_user};
 use serde::Serialize;
@@ -33,7 +35,7 @@ struct ExpandedFix<'a> {
 
 #[derive(Serialize)]
 struct ExpandedMessage<'a> {
-    code: &'a RuleCode,
+    code: SerializeRuleAsCode<'a>,
     message: String,
     fix: Option<ExpandedFix<'a>>,
     location: Location,
@@ -41,6 +43,23 @@ struct ExpandedMessage<'a> {
     filename: &'a str,
 }
 
+struct SerializeRuleAsCode<'a>(&'a Rule);
+
+impl Serialize for SerializeRuleAsCode<'_> {
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.serialize_str(self.0.code())
+    }
+}
+
+impl<'a> From<&'a Rule> for SerializeRuleAsCode<'a> {
+    fn from(rule: &'a Rule) -> Self {
+        Self(rule)
+    }
+}
+
 pub struct Printer<'a> {
     format: &'a SerializationFormat,
     log_level: &'a LogLevel,
@@ -69,7 +88,7 @@ impl<'a> Printer<'a> {
         }
     }
 
-    fn post_text(&self, diagnostics: &Diagnostics) {
+    fn post_text<T: Write>(&self, stdout: &mut T, diagnostics: &Diagnostics) -> Result<()> {
         if self.log_level >= &LogLevel::Default {
             match self.violations {
                 Violations::Show => {
@@ -77,9 +96,12 @@ impl<'a> Printer<'a> {
                     let remaining = diagnostics.messages.len();
                     let total = fixed + remaining;
                     if fixed > 0 {
-                        println!("Found {total} error(s) ({fixed} fixed, {remaining} remaining).");
+                        writeln!(
+                            stdout,
+                            "Found {total} error(s) ({fixed} fixed, {remaining} remaining)."
+                        )?;
                     } else if remaining > 0 {
-                        println!("Found {remaining} error(s).");
+                        writeln!(stdout, "Found {remaining} error(s).")?;
                     }
 
                     if !matches!(self.autofix, fix::FixMode::Apply) {
@@ -89,7 +111,10 @@ impl<'a> Printer<'a> {
                             .filter(|message| message.kind.fixable())
                             .count();
                         if num_fixable > 0 {
-                            println!("{num_fixable} potentially fixable with the --fix option.");
+                            writeln!(
+                                stdout,
+                                "{num_fixable} potentially fixable with the --fix option."
+                            )?;
                         }
                     }
                 }
@@ -97,14 +122,15 @@ impl<'a> Printer<'a> {
                     let fixed = diagnostics.fixed;
                     if fixed > 0 {
                         if matches!(self.autofix, fix::FixMode::Apply) {
-                            println!("Fixed {fixed} error(s).");
+                            writeln!(stdout, "Fixed {fixed} error(s).")?;
                         } else if matches!(self.autofix, fix::FixMode::Diff) {
-                            println!("Would fix {fixed} error(s).");
+                            writeln!(stdout, "Would fix {fixed} error(s).")?;
                         }
                     }
                 }
             }
         }
+        Ok(())
     }
 
     pub fn write_once(&self, diagnostics: &Diagnostics) -> Result<()> {
@@ -113,25 +139,28 @@ impl<'a> Printer<'a> {
         }
 
         if matches!(self.violations, Violations::Hide) {
+            let mut stdout = BufWriter::new(io::stdout().lock());
             if matches!(
                 self.format,
                 SerializationFormat::Text | SerializationFormat::Grouped
             ) {
-                self.post_text(diagnostics);
+                self.post_text(&mut stdout, diagnostics)?;
             }
             return Ok(());
         }
 
+        let mut stdout = BufWriter::new(io::stdout().lock());
         match self.format {
             SerializationFormat::Json => {
-                println!(
+                writeln!(
+                    stdout,
                     "{}",
                     serde_json::to_string_pretty(
                         &diagnostics
                             .messages
                             .iter()
                             .map(|message| ExpandedMessage {
-                                code: message.kind.code(),
+                                code: message.kind.rule().into(),
                                 message: message.kind.body(),
                                 fix: message.fix.as_ref().map(|fix| ExpandedFix {
                                     content: &fix.content,
@@ -145,7 +174,7 @@ impl<'a> Printer<'a> {
                             })
                             .collect::<Vec<_>>()
                     )?
-                );
+                )?;
             }
             SerializationFormat::Junit => {
                 use quick_junit::{NonSuccessKind, Report, TestCase, TestCaseStatus, TestSuite};
@@ -165,8 +194,10 @@ impl<'a> Printer<'a> {
                             message.location.column(),
                             message.kind.body()
                         ));
-                        let mut case =
-                            TestCase::new(format!("org.ruff.{}", message.kind.code()), status);
+                        let mut case = TestCase::new(
+                            format!("org.ruff.{}", message.kind.rule().code()),
+                            status,
+                        );
                         let file_path = Path::new(filename);
                         let file_stem = file_path.file_stem().unwrap().to_str().unwrap();
                         let classname = file_path.parent().unwrap().join(file_stem);
@@ -180,14 +211,14 @@ impl<'a> Printer<'a> {
                     }
                     report.add_test_suite(test_suite);
                 }
-                println!("{}", report.to_string().unwrap());
+                writeln!(stdout, "{}", report.to_string().unwrap())?;
             }
             SerializationFormat::Text => {
                 for message in &diagnostics.messages {
-                    print_message(message);
+                    print_message(&mut stdout, message)?;
                 }
 
-                self.post_text(diagnostics);
+                self.post_text(&mut stdout, diagnostics)?;
             }
             SerializationFormat::Grouped => {
                 for (filename, messages) in group_messages_by_filename(&diagnostics.messages) {
@@ -209,21 +240,25 @@ impl<'a> Printer<'a> {
                     );
 
                     // Print the filename.
-                    println!("{}:", relativize_path(Path::new(&filename)).underline());
+                    writeln!(
+                        stdout,
+                        "{}:",
+                        relativize_path(Path::new(&filename)).underline()
+                    )?;
 
                     // Print each message.
                     for message in messages {
-                        print_grouped_message(message, row_length, column_length);
+                        print_grouped_message(&mut stdout, message, row_length, column_length)?;
                     }
-                    println!();
+                    writeln!(stdout)?;
                 }
 
-                self.post_text(diagnostics);
+                self.post_text(&mut stdout, diagnostics)?;
             }
             SerializationFormat::Github => {
                 // Generate error workflow command in GitHub Actions format.
                 // See: https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-error-message
-                diagnostics.messages.iter().for_each(|message| {
+                for message in &diagnostics.messages {
                     let label = format!(
                         "{}{}{}{}{}{} {} {}",
                         relativize_path(Path::new(&message.filename)),
@@ -232,26 +267,27 @@ impl<'a> Printer<'a> {
                         ":",
                         message.location.column(),
                         ":",
-                        message.kind.code().as_ref(),
+                        message.kind.rule().code(),
                         message.kind.body(),
                     );
-                    println!(
+                    writeln!(
+                        stdout,
                         "::error title=Ruff \
                          ({}),file={},line={},col={},endLine={},endColumn={}::{}",
-                        message.kind.code(),
+                        message.kind.rule().code(),
                         message.filename,
                         message.location.row(),
                         message.location.column(),
                         message.end_location.row(),
                         message.end_location.column(),
                         label,
-                    );
-                });
+                    )?;
+                }
             }
             SerializationFormat::Gitlab => {
-                // Generate JSON with errors in GitLab CI format
+                // Generate JSON with violations in GitLab CI format
                 // https://docs.gitlab.com/ee/ci/testing/code_quality.html#implementing-a-custom-tool
-                println!(
+                writeln!(stdout,
                     "{}",
                     serde_json::to_string_pretty(
                         &diagnostics
@@ -259,9 +295,9 @@ impl<'a> Printer<'a> {
                             .iter()
                             .map(|message| {
                                 json!({
-                                    "description": format!("({}) {}", message.kind.code(), message.kind.body()),
+                                    "description": format!("({}) {}", message.kind.rule().code(), message.kind.body()),
                                     "severity": "major",
-                                    "fingerprint": message.kind.code(),
+                                    "fingerprint": message.kind.rule().code(),
                                     "location": {
                                         "path": message.filename,
                                         "lines": {
@@ -274,16 +310,32 @@ impl<'a> Printer<'a> {
                         )
                         .collect::<Vec<_>>()
                     )?
-                );
+                )?;
+            }
+            SerializationFormat::Pylint => {
+                // Generate violations in Pylint format.
+                // See: https://flake8.pycqa.org/en/latest/internal/formatters.html#pylint-formatter
+                for message in &diagnostics.messages {
+                    let label = format!(
+                        "{}:{}: [{}] {}",
+                        relativize_path(Path::new(&message.filename)),
+                        message.location.row(),
+                        message.kind.rule().code(),
+                        message.kind.body(),
+                    );
+                    writeln!(stdout, "{label}")?;
+                }
             }
         }
 
+        stdout.flush()?;
+
         Ok(())
     }
 
-    pub fn write_continuously(&self, diagnostics: &Diagnostics) {
+    pub fn write_continuously(&self, diagnostics: &Diagnostics) -> Result<()> {
         if matches!(self.log_level, LogLevel::Silent) {
-            return;
+            return Ok(());
         }
 
         if self.log_level >= &LogLevel::Default {
@@ -293,18 +345,21 @@ impl<'a> Printer<'a> {
             );
         }
 
+        let mut stdout = BufWriter::new(io::stdout().lock());
         if !diagnostics.messages.is_empty() {
             if self.log_level >= &LogLevel::Default {
-                println!();
+                writeln!(stdout)?;
             }
             for message in &diagnostics.messages {
-                print_message(message);
+                print_message(&mut stdout, message)?;
             }
         }
+        stdout.flush()?;
+
+        Ok(())
     }
 
-    #[allow(clippy::unused_self)]
-    pub fn clear_screen(&self) -> Result<()> {
+    pub fn clear_screen() -> Result<()> {
         #[cfg(not(target_family = "wasm"))]
         clearscreen::clear()?;
         Ok(())
@@ -330,7 +385,7 @@ fn num_digits(n: usize) -> usize {
 }
 
 /// Print a single `Message` with full details.
-fn print_message(message: &Message) {
+fn print_message<T: Write>(stdout: &mut T, message: &Message) -> Result<()> {
     let label = format!(
         "{}{}{}{}{}{} {} {}",
         relativize_path(Path::new(&message.filename)).bold(),
@@ -339,10 +394,10 @@ fn print_message(message: &Message) {
         ":".cyan(),
         message.location.column(),
         ":".cyan(),
-        message.kind.code().as_ref().red().bold(),
+        message.kind.rule().code().red().bold(),
         message.kind.body(),
     );
-    println!("{label}");
+    writeln!(stdout, "{label}")?;
     if let Some(source) = &message.source {
         let commit = message.kind.commit();
         let footer = if commit.is_some() {
@@ -354,7 +409,6 @@ fn print_message(message: &Message) {
         } else {
             vec![]
         };
-
         let snippet = Snippet {
             title: Some(Annotation {
                 label: None,
@@ -367,7 +421,7 @@ fn print_message(message: &Message) {
                 source: &source.contents,
                 line_start: message.location.row(),
                 annotations: vec![SourceAnnotation {
-                    label: message.kind.code().as_ref(),
+                    label: message.kind.rule().code(),
                     annotation_type: AnnotationType::Error,
                     range: source.range,
                 }],
@@ -384,13 +438,19 @@ fn print_message(message: &Message) {
         // Skip the first line, since we format the `label` ourselves.
         let message = DisplayList::from(snippet).to_string();
         let (_, message) = message.split_once('\n').unwrap();
-        println!("{message}\n");
+        writeln!(stdout, "{message}\n")?;
     }
+    Ok(())
 }
 
 /// Print a grouped `Message`, assumed to be printed in a group with others from
 /// the same file.
-fn print_grouped_message(message: &Message, row_length: usize, column_length: usize) {
+fn print_grouped_message<T: Write>(
+    stdout: &mut T,
+    message: &Message,
+    row_length: usize,
+    column_length: usize,
+) -> Result<()> {
     let label = format!(
         "  {}{}{}{}{}  {}  {}",
         " ".repeat(row_length - num_digits(message.location.row())),
@@ -398,10 +458,10 @@ fn print_grouped_message(message: &Message, row_length: usize, column_length: us
         ":".cyan(),
         message.location.column(),
         " ".repeat(column_length - num_digits(message.location.column())),
-        message.kind.code().as_ref().red().bold(),
+        message.kind.rule().code().red().bold(),
         message.kind.body(),
     );
-    println!("{label}");
+    writeln!(stdout, "{label}")?;
     if let Some(source) = &message.source {
         let commit = message.kind.commit();
         let footer = if commit.is_some() {
@@ -413,7 +473,6 @@ fn print_grouped_message(message: &Message, row_length: usize, column_length: us
         } else {
             vec![]
         };
-
         let snippet = Snippet {
             title: Some(Annotation {
                 label: None,
@@ -426,7 +485,7 @@ fn print_grouped_message(message: &Message, row_length: usize, column_length: us
                 source: &source.contents,
                 line_start: message.location.row(),
                 annotations: vec![SourceAnnotation {
-                    label: message.kind.code().as_ref(),
+                    label: message.kind.rule().code(),
                     annotation_type: AnnotationType::Error,
                     range: source.range,
                 }],
@@ -444,6 +503,7 @@ fn print_grouped_message(message: &Message, row_length: usize, column_length: us
         let message = DisplayList::from(snippet).to_string();
         let (_, message) = message.split_once('\n').unwrap();
         let message = textwrap::indent(message, "  ");
-        println!("{message}");
+        writeln!(stdout, "{message}")?;
     }
+    Ok(())
 }

ruff_cli/tests/black_compatibility_test.rs

@@ -10,11 +10,8 @@ use std::{fs, process, str};
 
 use anyhow::{anyhow, Context, Result};
 use assert_cmd::Command;
-use itertools::Itertools;
 use log::info;
 use ruff::logging::{set_up_logging, LogLevel};
-use ruff::registry::RuleOrigin;
-use strum::IntoEnumIterator;
 use walkdir::WalkDir;
 
 /// Handles `blackd` process and allows submitting code to it for formatting.
@@ -175,13 +172,6 @@ fn test_ruff_black_compatibility() -> Result<()> {
         .filter_map(Result::ok)
         .collect();
 
-    let codes = RuleOrigin::iter()
-        // Exclude ruff codes, specifically RUF100, because it causes differences that are not a
-        // problem. Ruff would add a `# noqa: W292`  after the first run, black introduces a
-        // newline, and ruff removes the `# noqa: W292` again.
-        .filter(|origin| *origin != RuleOrigin::Ruff)
-        .map(|origin| origin.codes().iter().map(AsRef::as_ref).join(","))
-        .join(",");
     let ruff_args = [
         "-",
         "--silent",
@@ -189,8 +179,11 @@ fn test_ruff_black_compatibility() -> Result<()> {
         "--fix",
         "--line-length",
         "88",
-        "--select",
-        &codes,
+        "--select ALL",
+        // Exclude ruff codes, specifically RUF100, because it causes differences that are not a
+        // problem. Ruff would add a `# noqa: W292`  after the first run, black introduces a
+        // newline, and ruff removes the `# noqa: W292` again.
+        "--ignore RUF",
     ];
 
     for entry in paths {

ruff_cli/tests/integration_test.rs

@@ -151,3 +151,12 @@ fn test_show_source() -> Result<()> {
     assert!(str::from_utf8(&output.get_output().stdout)?.contains("l = 1"));
     Ok(())
 }
+
+#[test]
+fn explain_status_codes() -> Result<()> {
+    let mut cmd = Command::cargo_bin(BIN_NAME)?;
+    cmd.args(["-", "--explain", "F401"]).assert().success();
+    let mut cmd = Command::cargo_bin(BIN_NAME)?;
+    cmd.args(["-", "--explain", "RUF404"]).assert().failure();
+    Ok(())
+}

ruff_dev/Cargo.toml

@@ -1,12 +1,8 @@
 [package]
 name = "ruff_dev"
-version = "0.0.221"
+version = "0.0.231"
 edition = "2021"
 
-[lib]
-name = "ruff_dev"
-doctest = false
-
 [dependencies]
 anyhow = { version = "1.0.66" }
 clap = { version = "4.0.1", features = ["derive"] }
@@ -15,9 +11,9 @@ libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a87
 once_cell = { version = "1.16.0" }
 ruff = { path = ".." }
 ruff_cli = { path = "../ruff_cli" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
 schemars = { version = "0.8.11" }
 serde_json = {version="1.0.91"}
 strum = { version = "0.24.1", features = ["strum_macros"] }