Bump version to 0.0.229

Avoid flagging redefined imports as unused in same-scope (#2065 )
This is effectively a revert of #1173, to favor false-negatives over false-positives in the same-scope case. Closes #2044.
2023-01-21 13:18:06 -05:00 · 2023-01-21 12:50:21 -05:00 · 2023-01-21 11:25:10 -05:00 · 2023-01-21 11:09:04 -05:00 · 2023-01-21 09:37:22 -05:00 · 2023-01-21 07:54:56 -05:00
1113 changed files with 23135 additions and 12307 deletions
--- a/.github/workflows/ci.yaml
+++ b/.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,24 @@ 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/
+      - run: cargo check

 # TODO(charlie): Re-enable the `wasm-pack` tests.
 # See: https://github.com/charliermarsh/ruff/issues/1425
@@ -119,7 +137,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
--- a/.github/workflows/ruff.yaml
+++ b/.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"}'
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.221
+    rev: v0.0.229
    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]
--- a/BREAKING_CHANGES.md
+++ b/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))
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -37,13 +37,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 +57,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 +81,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 +90,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 +130,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
--- a/Cargo.lock
+++ b/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.229"
 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",
 ]
@@ -1874,23 +1838,24 @@ dependencies = [

 [[package]]
 name = "ruff"
-version = "0.0.221"
+version = "0.0.229"
 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",
@@ -1906,18 +1871,20 @@ dependencies = [
 "ropey",
 "ruff_macros",
 "rustc-hash",
- "rustpython-ast",
- "rustpython-common",
- "rustpython-parser",
+ "rustpython-ast 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=62aa942bf506ea3d41ed0503b947b84141fdaa3c)",
+ "rustpython-common 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=62aa942bf506ea3d41ed0503b947b84141fdaa3c)",
+ "rustpython-parser 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=62aa942bf506ea3d41ed0503b947b84141fdaa3c)",
 "schemars",
 "semver",
 "serde",
 "serde-wasm-bindgen",
 "shellexpand",
+ "smallvec",
 "strum",
 "strum_macros",
 "test-case",
 "textwrap",
+ "thiserror",
 "titlecase",
 "toml_edit",
 "wasm-bindgen",
@@ -1926,7 +1893,7 @@ dependencies = [

 [[package]]
 name = "ruff_cli"
-version = "0.0.221"
+version = "0.0.229"
 dependencies = [
 "annotate-snippets 0.9.1",
 "anyhow",
@@ -1963,7 +1930,7 @@ dependencies = [

 [[package]]
 name = "ruff_dev"
-version = "0.0.221"
+version = "0.0.229"
 dependencies = [
 "anyhow",
 "clap 4.0.32",
@@ -1972,9 +1939,9 @@ dependencies = [
 "once_cell",
 "ruff",
 "ruff_cli",
- "rustpython-ast",
- "rustpython-common",
- "rustpython-parser",
+ "rustpython-ast 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa)",
+ "rustpython-common 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa)",
+ "rustpython-parser 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa)",
 "schemars",
 "serde_json",
 "strum",
@@ -1984,7 +1951,7 @@ dependencies = [

 [[package]]
 name = "ruff_macros"
-version = "0.0.221"
+version = "0.0.229"
 dependencies = [
 "once_cell",
 "proc-macro2",
@@ -1993,6 +1960,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,22 +2004,32 @@ 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=62aa942bf506ea3d41ed0503b947b84141fdaa3c#62aa942bf506ea3d41ed0503b947b84141fdaa3c"
 dependencies = [
 "num-bigint",
- "rustpython-common",
- "rustpython-compiler-core",
+ "rustpython-common 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=62aa942bf506ea3d41ed0503b947b84141fdaa3c)",
+ "rustpython-compiler-core 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=62aa942bf506ea3d41ed0503b947b84141fdaa3c)",
+]
+
+[[package]]
+name = "rustpython-ast"
+version = "0.2.0"
+source = "git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa#ff90fe52eea578c8ebdd9d95e078cc041a5959fa"
+dependencies = [
+ "num-bigint",
+ "rustpython-common 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa)",
+ "rustpython-compiler-core 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa)",
 ]

 [[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=62aa942bf506ea3d41ed0503b947b84141fdaa3c#62aa942bf506ea3d41ed0503b947b84141fdaa3c"
 dependencies = [
 "ascii",
 "bitflags",
- "cfg-if 1.0.0",
+ "cfg-if",
 "hexf-parse",
 "itertools",
 "lexical-parse-float",
@@ -2053,7 +2040,32 @@ dependencies = [
 "num-traits",
 "once_cell",
 "radium",
- "rand 0.8.5",
+ "rand",
+ "siphasher",
+ "unic-ucd-category",
+ "volatile",
+ "widestring",
+]
+
+[[package]]
+name = "rustpython-common"
+version = "0.2.0"
+source = "git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa#ff90fe52eea578c8ebdd9d95e078cc041a5959fa"
+dependencies = [
+ "ascii",
+ "bitflags",
+ "cfg-if",
+ "hexf-parse",
+ "itertools",
+ "lexical-parse-float",
+ "libc",
+ "lock_api",
+ "num-bigint",
+ "num-complex",
+ "num-traits",
+ "once_cell",
+ "radium",
+ "rand",
 "siphasher",
 "unic-ucd-category",
 "volatile",
@@ -2062,8 +2074,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=62aa942bf506ea3d41ed0503b947b84141fdaa3c#62aa942bf506ea3d41ed0503b947b84141fdaa3c"
 dependencies = [
 "bincode",
 "bitflags",
@@ -2072,15 +2084,32 @@ dependencies = [
 "lz4_flex",
 "num-bigint",
 "num-complex",
+ "num_enum",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "rustpython-compiler-core"
+version = "0.2.0"
+source = "git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa#ff90fe52eea578c8ebdd9d95e078cc041a5959fa"
+dependencies = [
+ "bincode",
+ "bitflags",
+ "bstr 0.2.17",
+ "itertools",
+ "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=62aa942bf506ea3d41ed0503b947b84141fdaa3c#62aa942bf506ea3d41ed0503b947b84141fdaa3c"
 dependencies = [
 "ahash",
 "anyhow",
@@ -2093,8 +2122,33 @@ dependencies = [
 "phf 0.10.1",
 "phf_codegen 0.10.0",
 "rustc-hash",
- "rustpython-ast",
- "rustpython-compiler-core",
+ "rustpython-ast 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=62aa942bf506ea3d41ed0503b947b84141fdaa3c)",
+ "rustpython-compiler-core 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=62aa942bf506ea3d41ed0503b947b84141fdaa3c)",
+ "thiserror",
+ "tiny-keccak",
+ "unic-emoji-char",
+ "unic-ucd-ident",
+ "unicode_names2",
+]
+
+[[package]]
+name = "rustpython-parser"
+version = "0.2.0"
+source = "git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa#ff90fe52eea578c8ebdd9d95e078cc041a5959fa"
+dependencies = [
+ "ahash",
+ "anyhow",
+ "itertools",
+ "lalrpop",
+ "lalrpop-util",
+ "log",
+ "num-bigint",
+ "num-traits",
+ "phf 0.10.1",
+ "phf_codegen 0.10.0",
+ "rustc-hash",
+ "rustpython-ast 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa)",
+ "rustpython-compiler-core 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa)",
 "thiserror",
 "tiny-keccak",
 "unic-emoji-char",
@@ -2240,7 +2294,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd1c7ddea665294d484c39fd0c0d2b7e35bbfe10035c5fe1854741a57f6880e1"
 dependencies = [
- "dirs 4.0.0",
+ "dirs",
 ]

 [[package]]
@@ -2343,7 +2397,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 +2437,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 +2469,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 +2572,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 +2609,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 +2813,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 +2831,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 +2856,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",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ default-members = [".", "ruff_cli"]

 [package]
 name = "ruff"
-version = "0.0.221"
+version = "0.0.229"
 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" }
@@ -46,18 +47,20 @@ 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.229", 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 = "62aa942bf506ea3d41ed0503b947b84141fdaa3c" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "62aa942bf506ea3d41ed0503b947b84141fdaa3c" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "62aa942bf506ea3d41ed0503b947b84141fdaa3c" }
 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"] }

--- a/README.md
+++ b/README.md
--- a/build.rs
+++ b/build.rs
@@ -0,0 +1,84 @@
+use std::fs;
+use std::io::{BufRead, BufReader, BufWriter, Write};
+use std::path::{Path, PathBuf};
+
+fn main() {
+    let out_dir = PathBuf::from(std::env::var_os("OUT_DIR").unwrap());
+    generate_linter_name_and_url(&out_dir);
+}
+
+const RULES_SUBMODULE_DOC_PREFIX: &str = "//! Rules from ";
+
+/// The `src/rules/*/mod.rs` files are expected to have a first line such as the
+/// following:
+///
+///     //! Rules from [Pyflakes](https://pypi.org/project/pyflakes/2.5.0/).
+///
+/// This function extracts the link label and url from these comments and
+/// generates the `name` and `url` functions for the `Linter` enum
+/// accordingly, so that they can be used by `ruff_dev::generate_rules_table`.
+fn generate_linter_name_and_url(out_dir: &Path) {
+    println!("cargo:rerun-if-changed=src/rules/");
+
+    let mut name_match_arms: String = r#"Linter::Ruff => "Ruff-specific rules","#.into();
+    let mut url_match_arms: String = r#"Linter::Ruff => None,"#.into();
+
+    for file in fs::read_dir("src/rules/")
+        .unwrap()
+        .flatten()
+        .filter(|f| f.file_type().unwrap().is_dir() && f.file_name() != "ruff")
+    {
+        let mod_rs_path = file.path().join("mod.rs");
+        let mod_rs_path = mod_rs_path.to_str().unwrap();
+        let first_line = BufReader::new(fs::File::open(mod_rs_path).unwrap())
+            .lines()
+            .next()
+            .unwrap()
+            .unwrap();
+
+        let Some(comment) = first_line.strip_prefix(RULES_SUBMODULE_DOC_PREFIX) else {
+                panic!("expected first line in {mod_rs_path} to start with `{RULES_SUBMODULE_DOC_PREFIX}`")
+            };
+        let md_link = comment.trim_end_matches('.');
+
+        let (name, url) = md_link
+            .strip_prefix('[')
+            .unwrap()
+            .strip_suffix(')')
+            .unwrap()
+            .split_once("](")
+            .unwrap();
+
+        let dirname = file.file_name();
+        let dirname = dirname.to_str().unwrap();
+
+        let variant_name = dirname
+            .split('_')
+            .map(|part| match part {
+                "errmsg" => "ErrMsg".to_string(),
+                "mccabe" => "McCabe".to_string(),
+                "pep8" => "PEP8".to_string(),
+                _ => format!("{}{}", part[..1].to_uppercase(), &part[1..]),
+            })
+            .collect::<String>();
+
+        name_match_arms.push_str(&format!(r#"Linter::{variant_name} => "{name}","#));
+        url_match_arms.push_str(&format!(r#"Linter::{variant_name} => Some("{url}"),"#));
+    }
+
+    write!(
+        BufWriter::new(fs::File::create(out_dir.join("linter.rs")).unwrap()),
+        "
+        impl Linter {{
+            pub fn name(&self) -> &'static str {{
+                match self {{ {name_match_arms} }}
+            }}
+
+            pub fn url(&self) -> Option<&'static str> {{
+                match self {{ {url_match_arms} }}
+            }}
+        }}
+        "
+    )
+    .unwrap();
+}
--- a/flake8_to_ruff/Cargo.lock
+++ b/flake8_to_ruff/Cargo.lock
@@ -771,7 +771,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"

 [[package]]
 name = "flake8_to_ruff"
-version = "0.0.221"
+version = "0.0.229"
 dependencies = [
 "anyhow",
 "clap",
@@ -1975,7 +1975,7 @@ dependencies = [

 [[package]]
 name = "ruff"
-version = "0.0.221"
+version = "0.0.229"
 dependencies = [
 "anyhow",
 "bincode",
--- a/flake8_to_ruff/Cargo.toml
+++ b/flake8_to_ruff/Cargo.toml
@@ -1,12 +1,8 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.221-dev.0"
+version = "0.0.229"
 edition = "2021"

-[lib]
-name = "flake8_to_ruff"
-doctest = false
-
 [dependencies]
 anyhow = { version = "1.0.66" }
 clap = { version = "4.0.1", features = ["derive"] }
--- a/flake8_to_ruff/src/lib.rs
+++ b/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;
--- a/flake8_to_ruff/src/main.rs
+++ b/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;

 #[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<()> {
@@ -52,12 +50,12 @@ fn main() -> Result<()> {
    // Read the pyproject.toml file.
    let black = cli
        .pyproject
-        .map(parse_black_options)
+        .map(flake8_to_ruff::parse_black_options)
        .transpose()?
        .flatten();

    // Create Ruff's pyproject.toml section.
-    let pyproject = converter::convert(&config, black.as_ref(), cli.plugin)?;
+    let pyproject = flake8_to_ruff::convert(&config, black.as_ref(), cli.plugin)?;
    println!("{}", toml_edit::easy::to_string_pretty(&pyproject)?);

    Ok(())
--- a/licenses/LICENSE_PyCQA_flake8-commas
+++ b/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.
--- a/licenses/LICENSE_adamchainz_flake8-no-pep420
+++ b/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.
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@ build-backend = "maturin"

 [project]
 name = "ruff"
-version = "0.0.221"
+version = "0.0.229"
 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/*",
-]
--- a/resources/test/fixtures/flake8_builtins/A001.py
+++ b/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

--- a/resources/test/fixtures/flake8_builtins/A002.py
+++ b/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: ...)
--- a/resources/test/fixtures/flake8_builtins/A003.py
+++ b/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
--- a/resources/test/fixtures/flake8_commas/COM81.py
+++ b/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}
+)
--- a/resources/test/fixtures/flake8_executable/EXE003.py
+++ b/resources/test/fixtures/flake8_executable/EXE003.py
@@ -0,0 +1,2 @@
+#!/usr/bin/bash
+print("hello world")
--- a/resources/test/fixtures/flake8_executable/EXE004_1.py
+++ b/resources/test/fixtures/flake8_executable/EXE004_1.py
@@ -0,0 +1 @@
+    #!/usr/bin/python
--- a/resources/test/fixtures/flake8_executable/EXE004_2.py
+++ b/resources/test/fixtures/flake8_executable/EXE004_2.py
@@ -0,0 +1,2 @@
+print("  #!/usr/bin/python")
+# shebang outside of comments should be ignored
--- a/resources/test/fixtures/flake8_executable/EXE004_3.py
+++ b/resources/test/fixtures/flake8_executable/EXE004_3.py
@@ -0,0 +1,2 @@
+
+pass  #!/usr/bin/env python
--- a/resources/test/fixtures/flake8_executable/EXE005_1.py
+++ b/resources/test/fixtures/flake8_executable/EXE005_1.py
@@ -0,0 +1,3 @@
+
+# A python comment
+#!/usr/bin/python
--- a/resources/test/fixtures/flake8_executable/EXE005_2.py
+++ b/resources/test/fixtures/flake8_executable/EXE005_2.py
@@ -0,0 +1,4 @@
+print("code prior to shebang")
+
+# A python comment
+#!/usr/bin/python
--- a/resources/test/fixtures/flake8_executable/EXE005_3.py
+++ b/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
--- a/resources/test/fixtures/flake8_no_pep420/test_fail_empty/example.py
+++ b/resources/test/fixtures/flake8_no_pep420/test_fail_empty/example.py
--- a/resources/test/fixtures/flake8_no_pep420/test_fail_nonempty/example.py
+++ b/resources/test/fixtures/flake8_no_pep420/test_fail_nonempty/example.py
@@ -0,0 +1 @@
+print('hi')
--- a/resources/test/fixtures/flake8_no_pep420/test_fail_shebang/example.py
+++ b/resources/test/fixtures/flake8_no_pep420/test_fail_shebang/example.py
@@ -0,0 +1,2 @@
+#!/bin/env/python
+print('hi')
--- a/resources/test/fixtures/flake8_no_pep420/test_ignored/example.py
+++ b/resources/test/fixtures/flake8_no_pep420/test_ignored/example.py
@@ -0,0 +1 @@
+import os  # noqa: INP001
--- a/resources/test/fixtures/flake8_no_pep420/test_pass/init.py
+++ b/resources/test/fixtures/flake8_no_pep420/test_pass/init.py
--- a/resources/test/fixtures/flake8_no_pep420/test_pass/example.py
+++ b/resources/test/fixtures/flake8_no_pep420/test_pass/example.py
--- a/resources/test/fixtures/flake8_pie/PIE796.py
+++ b/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()
--- a/resources/test/fixtures/flake8_pytest_style/PT007.py
+++ b/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):
+    ...
--- a/resources/test/fixtures/flake8_simplify/SIM102.py
+++ b/resources/test/fixtures/flake8_simplify/SIM102.py
@@ -1,25 +1,94 @@
-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!")
--- a/resources/test/fixtures/flake8_simplify/SIM103.py
+++ b/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
--- a/resources/test/fixtures/flake8_simplify/SIM105.py
+++ b/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
--- a/resources/test/fixtures/flake8_simplify/SIM109.py
+++ b/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
--- a/resources/test/fixtures/flake8_simplify/SIM115.py
+++ b/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"))
--- a/resources/test/fixtures/flake8_simplify/SIM117.py
+++ b/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")
--- a/resources/test/fixtures/flake8_simplify/SIM201.py
+++ b/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
--- a/resources/test/fixtures/flake8_simplify/SIM202.py
+++ b/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
--- a/resources/test/fixtures/flake8_simplify/SIM222.py
+++ b/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
--- a/resources/test/fixtures/flake8_simplify/SIM300.py
+++ b/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"
--- a/resources/test/fixtures/flake8_simplify/SIM401.py
+++ b/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"
--- a/resources/test/fixtures/flake8_type_checking/TYP005.py
+++ b/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
--- a/resources/test/fixtures/isort/no_lines_before.py
+++ b/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
--- a/resources/test/fixtures/isort/order_by_type_with_custom_constants.py
+++ b/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
--- a/resources/test/fixtures/isort/order_by_type_with_custom_variables.py
+++ b/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
--- a/resources/test/fixtures/pycodestyle/E101.py
+++ b/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");
--- a/resources/test/fixtures/pydocstyle/D.py
+++ b/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
--- a/resources/test/fixtures/pydocstyle/D401.py
+++ b/resources/test/fixtures/pydocstyle/D401.py
@@ -0,0 +1,43 @@
+# 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"""
+    pass
+
+
+def multi_line():
+    """Writes a logical line that
+    extends to two physical lines.
+    """
+
+
+# Good examples
+
+def good_run_something():
+    """Run away."""
+
+
+def good_construct():
+    """Construct a beautiful house."""
+
+
+def good_multi_line():
+    """Write a logical line that
+    extends to two physical lines.
+    """
--- a/resources/test/fixtures/pydocstyle/setter.py
+++ b/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
--- a/resources/test/fixtures/pyflakes/F841_3.py
+++ b/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
--- a/resources/test/fixtures/pyflakes/multi_statement_lines.py
+++ 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
--- a/resources/test/fixtures/pylint/magic_value_comparison.py
+++ b/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
-
--- a/resources/test/fixtures/pyproject.toml
+++ b/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"
--- a/resources/test/fixtures/pyupgrade/UP003.py
+++ b/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("")
--- a/resources/test/fixtures/pyupgrade/UP011.py
+++ b/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
--- a/resources/test/fixtures/pyupgrade/UP011_0.py
+++ b/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
--- a/resources/test/fixtures/pyupgrade/UP011_1.py
+++ b/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
--- a/resources/test/fixtures/pyupgrade/UP031_0.py
+++ b/resources/test/fixtures/pyupgrade/UP031_0.py
@@ -0,0 +1,69 @@
+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}
+)
+
+print("%s \N{snowman}" % (a,))
+
+print("%(foo)s \N{snowman}" % {"foo": 1})
+
+print(("foo %s " "bar %s") % (x, y))
--- a/resources/test/fixtures/pyupgrade/UP031_1.py
+++ b/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,)
+)
--- a/resources/test/fixtures/pyupgrade/UP032.py
+++ b/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)
--- a/resources/test/fixtures/pyupgrade/UP033.py
+++ b/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
--- a/resources/test/fixtures/pyupgrade/UP034.py
+++ b/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)), [])
--- a/resources/test/fixtures/ruff/RUF005.py
+++ b/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,
+]
--- a/resources/test/fixtures/ruff/RUF100_1.py
+++ b/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
--- a/resources/test/fixtures/tryceratops/TRY300.py
+++ b/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")
--- a/ruff.schema.json
+++ b/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,7 +255,7 @@
        "null"
      ],
      "items": {
-        "$ref": "#/definitions/RuleCodePrefix"
+        "$ref": "#/definitions/RuleSelector"
      }
    },
    "ignore-init-module-imports": {
@@ -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,6 +1550,7 @@
        "PIE79",
        "PIE790",
        "PIE794",
+        "PIE796",
        "PIE8",
        "PIE80",
        "PIE807",
@@ -1423,10 +1559,6 @@
        "PLC04",
        "PLC041",
        "PLC0414",
-        "PLC2",
-        "PLC22",
-        "PLC220",
-        "PLC2201",
        "PLC3",
        "PLC30",
        "PLC300",
@@ -1536,6 +1668,7 @@
        "RUF002",
        "RUF003",
        "RUF004",
+        "RUF005",
        "RUF1",
        "RUF10",
        "RUF100",
@@ -1614,6 +1747,14 @@
        "TID25",
        "TID251",
        "TID252",
+        "TRY",
+        "TRY3",
+        "TRY30",
+        "TRY300",
+        "TYP",
+        "TYP0",
+        "TYP00",
+        "TYP005",
        "U",
        "U0",
        "U00",
@@ -1670,6 +1811,10 @@
        "UP029",
        "UP03",
        "UP030",
+        "UP031",
+        "UP032",
+        "UP033",
+        "UP034",
        "W",
        "W2",
        "W29",
@@ -1707,7 +1852,8 @@
        "junit",
        "grouped",
        "github",
-        "gitlab"
+        "gitlab",
+        "pylint"
      ]
    },
    "Strictness": {
--- a/ruff_cli/Cargo.toml
+++ b/ruff_cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_cli"
-version = "0.0.221"
+version = "0.0.229"
 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 = ".." }

--- a/ruff_cli/src/cache.rs
+++ b/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");
@@ -80,10 +80,14 @@ fn read_sync(cache_dir: &Path, key: u64) -> Result<Vec<u8>, std::io::Error> {
 pub fn get<P: AsRef<Path>>(
    path: 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, &settings.lib, autofix),
+    )
+    .ok()?;
    let (mtime, messages) = match bincode::deserialize::<CheckResult>(&encoded[..]) {
        Ok(CheckResult {
            metadata: CacheMetadata { mtime },
@@ -104,7 +108,7 @@ pub fn get<P: AsRef<Path>>(
 pub fn set<P: AsRef<Path>>(
    path: P,
    metadata: &fs::Metadata,
-    settings: &Settings,
+    settings: &AllSettings,
    autofix: flags::Autofix,
    messages: &[Message],
 ) {
@@ -115,8 +119,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, &settings.lib, autofix),
        &bincode::serialize(&check_result).unwrap(),
    ) {
        error!("Failed to write to cache: {e:?}");
--- a/ruff_cli/src/cli.rs
+++ b/ruff_cli/src/cli.rs
@@ -2,13 +2,13 @@ use std::path::{Path, PathBuf};

 use clap::{command, Parser};
 use regex::Regex;
+use ruff::fs;
 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 +66,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 +88,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 +137,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 +169,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 +181,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 +264,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 +303,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 +324,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 +379,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 +435,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)
--- a/ruff_cli/src/commands.rs
+++ b/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, ParseCode, Rule};
 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(())
 }
--- a/ruff_cli/src/diagnostics.rs
+++ b/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
@@ -69,7 +69,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,7 +85,7 @@ 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)
    };
--- a/ruff_cli/src/lib.rs
+++ b/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()
+}
--- a/ruff_cli/src/main.rs
+++ b/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()),
--- a/ruff_cli/src/printer.rs
+++ b/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(())
 }
--- a/ruff_cli/tests/black_compatibility_test.rs
+++ b/ruff_cli/tests/black_compatibility_test.rs
@@ -13,7 +13,7 @@ use assert_cmd::Command;
 use itertools::Itertools;
 use log::info;
 use ruff::logging::{set_up_logging, LogLevel};
-use ruff::registry::RuleOrigin;
+use ruff::registry::Linter;
 use strum::IntoEnumIterator;
 use walkdir::WalkDir;

@@ -175,12 +175,12 @@ fn test_ruff_black_compatibility() -> Result<()> {
        .filter_map(Result::ok)
        .collect();

-    let codes = RuleOrigin::iter()
+    let codes = Linter::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(","))
+        .filter(|linter| *linter != Linter::Ruff)
+        .map(|linter| linter.prefixes().as_list(","))
        .join(",");
    let ruff_args = [
        "-",
--- a/ruff_cli/tests/integration_test.rs
+++ b/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(())
+}
--- a/ruff_dev/Cargo.toml
+++ b/ruff_dev/Cargo.toml
@@ -1,12 +1,8 @@
 [package]
 name = "ruff_dev"
-version = "0.0.221"
+version = "0.0.229"
 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 = "ff90fe52eea578c8ebdd9d95e078cc041a5959fa" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "ff90fe52eea578c8ebdd9d95e078cc041a5959fa" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "ff90fe52eea578c8ebdd9d95e078cc041a5959fa" }
 schemars = { version = "0.8.11" }
 serde_json = {version="1.0.91"}
 strum = { version = "0.24.1", features = ["strum_macros"] }
--- a/ruff_dev/src/generate_cli_help.rs
+++ b/ruff_dev/src/generate_cli_help.rs
@@ -1,8 +1,7 @@
 //! Generate CLI help.

 use anyhow::Result;
-use clap::{Args, CommandFactory};
-use ruff_cli::Cli as MainCli;
+use clap::Args;

 use crate::utils::replace_readme_section;

@@ -21,8 +20,7 @@ fn trim_lines(s: &str) -> String {
 }

 pub fn main(cli: &Cli) -> Result<()> {
-    let mut cmd = MainCli::command();
-    let output = trim_lines(cmd.render_help().to_string().trim());
+    let output = trim_lines(ruff_cli::help().trim());

    if cli.dry_run {
        print!("{output}");
--- a/ruff_dev/src/generate_rules_table.rs
+++ b/ruff_dev/src/generate_rules_table.rs
@@ -2,8 +2,7 @@

 use anyhow::Result;
 use clap::Args;
-use itertools::Itertools;
-use ruff::registry::{RuleCode, RuleOrigin};
+use ruff::registry::{Linter, Prefixes, RuleSelector};
 use strum::IntoEnumIterator;

 use crate::utils::replace_readme_section;
@@ -21,55 +20,82 @@ pub struct Cli {
    pub(crate) dry_run: bool,
 }

+fn generate_table(table_out: &mut String, prefix: &RuleSelector) {
+    table_out.push_str("| Code | Name | Message | Fix |");
+    table_out.push('\n');
+    table_out.push_str("| ---- | ---- | ------- | --- |");
+    table_out.push('\n');
+    for rule in prefix.codes() {
+        let fix_token = match rule.autofixable() {
+            None => "",
+            Some(_) => "🛠",
+        };
+
+        table_out.push_str(&format!(
+            "| {} | {} | {} | {} |",
+            rule.code(),
+            rule.as_ref(),
+            rule.message_formats()[0].replace('|', r"\|"),
+            fix_token
+        ));
+        table_out.push('\n');
+    }
+    table_out.push('\n');
+}
+
 pub fn main(cli: &Cli) -> Result<()> {
    // Generate the table string.
    let mut table_out = String::new();
    let mut toc_out = String::new();
-    for origin in RuleOrigin::iter() {
-        let codes_csv: String = origin.codes().iter().map(AsRef::as_ref).join(", ");
-        table_out.push_str(&format!("### {} ({codes_csv})", origin.title()));
+    for linter in Linter::iter() {
+        let prefixes = linter.prefixes();
+        let codes_csv: String = prefixes.as_list(", ");
+        table_out.push_str(&format!("### {} ({codes_csv})", linter.name()));
        table_out.push('\n');
        table_out.push('\n');

        toc_out.push_str(&format!(
            "   1. [{} ({})](#{}-{})\n",
-            origin.title(),
+            linter.name(),
            codes_csv,
-            origin.title().to_lowercase().replace(' ', "-"),
+            linter.name().to_lowercase().replace(' ', "-"),
            codes_csv.to_lowercase().replace(',', "-").replace(' ', "")
        ));

-        if let Some((url, platform)) = origin.url() {
+        if let Some(url) = linter.url() {
+            let host = url
+                .trim_start_matches("https://")
+                .split('/')
+                .next()
+                .unwrap();
            table_out.push_str(&format!(
                "For more, see [{}]({}) on {}.",
-                origin.title(),
+                linter.name(),
                url,
-                platform
+                match host {
+                    "pypi.org" => "PyPI",
+                    "github.com" => "GitHub",
+                    host => panic!(
+                        "unexpected host in URL of {}, expected pypi.org or github.com but found \
+                         {host}",
+                        linter.name()
+                    ),
+                }
            ));
            table_out.push('\n');
            table_out.push('\n');
        }

-        table_out.push_str("| Code | Name | Message | Fix |");
-        table_out.push('\n');
-        table_out.push_str("| ---- | ---- | ------- | --- |");
-        table_out.push('\n');
-
-        for rule_code in RuleCode::iter() {
-            if rule_code.origin() == origin {
-                let kind = rule_code.kind();
-                let fix_token = if kind.fixable() { "🛠" } else { "" };
-                table_out.push_str(&format!(
-                    "| {} | {} | {} | {} |",
-                    kind.code().as_ref(),
-                    kind.as_ref(),
-                    kind.summary().replace('|', r"\|"),
-                    fix_token
-                ));
-                table_out.push('\n');
+        match prefixes {
+            Prefixes::Single(prefix) => generate_table(&mut table_out, &prefix),
+            Prefixes::Multiple(entries) => {
+                for (prefix, category) in entries {
+                    table_out.push_str(&format!("#### {category} ({})", prefix.as_ref()));
+                    table_out.push('\n');
+                    generate_table(&mut table_out, &prefix);
+                }
            }
        }
-        table_out.push('\n');
    }

    if cli.dry_run {
--- a/ruff_dev/src/lib.rs
+++ b/ruff_dev/src/lib.rs
@@ -1,24 +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 generate_all;
-pub mod generate_cli_help;
-pub mod generate_json_schema;
-pub mod generate_options;
-pub mod generate_rules_table;
-pub mod print_ast;
-pub mod print_cst;
-pub mod print_tokens;
-pub mod round_trip;
-mod utils;
--- a/ruff_dev/src/main.rs
+++ b/ruff_dev/src/main.rs
@@ -1,3 +1,6 @@
+//! This crate implements an internal CLI for developers of Ruff.
+//!
+//! Within the ruff repository you can run it with `cargo dev`.
 #![allow(
    clippy::collapsible_else_if,
    clippy::collapsible_if,
@@ -12,12 +15,19 @@
 )]
 #![forbid(unsafe_code)]

+mod generate_all;
+mod generate_cli_help;
+mod generate_json_schema;
+mod generate_options;
+mod generate_rules_table;
+mod print_ast;
+mod print_cst;
+mod print_tokens;
+mod round_trip;
+mod utils;
+
 use anyhow::Result;
 use clap::{Parser, Subcommand};
-use ruff_dev::{
-    generate_all, generate_cli_help, generate_json_schema, generate_options, generate_rules_table,
-    print_ast, print_cst, print_tokens, round_trip,
-};

 #[derive(Parser)]
 #[command(author, version, about, long_about = None)]
--- a/ruff_dev/src/round_trip.rs
+++ b/ruff_dev/src/round_trip.rs
@@ -5,8 +5,7 @@ use std::path::PathBuf;

 use anyhow::Result;
 use clap::Args;
-use ruff::source_code::{Generator, Locator, Stylist};
-use rustpython_parser::parser;
+use ruff::source_code::round_trip;

 #[derive(Args)]
 pub struct Cli {
@@ -17,11 +16,6 @@ pub struct Cli {

 pub fn main(cli: &Cli) -> Result<()> {
    let contents = fs::read_to_string(&cli.file)?;
-    let python_ast = parser::parse_program(&contents, &cli.file.to_string_lossy())?;
-    let locator = Locator::new(&contents);
-    let stylist = Stylist::from_contents(&contents, &locator);
-    let mut generator: Generator = (&stylist).into();
-    generator.unparse_suite(&python_ast);
-    println!("{}", generator.generate());
+    println!("{}", round_trip(&contents, &cli.file.to_string_lossy())?);
    Ok(())
 }
--- a/ruff_macros/Cargo.toml
+++ b/ruff_macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_macros"
-version = "0.0.221"
+version = "0.0.229"
 edition = "2021"

 [lib]
--- a/ruff_macros/src/define_rule_mapping.rs
+++ b/ruff_macros/src/define_rule_mapping.rs
@@ -0,0 +1,153 @@
+use std::collections::HashMap;
+
+use proc_macro2::Span;
+use quote::quote;
+use syn::parse::Parse;
+use syn::{Ident, LitStr, Path, Token};
+
+pub fn define_rule_mapping(mapping: &Mapping) -> proc_macro2::TokenStream {
+    let mut rule_variants = quote!();
+    let mut diagkind_variants = quote!();
+    let mut rule_message_formats_match_arms = quote!();
+    let mut rule_autofixable_match_arms = quote!();
+    let mut rule_code_match_arms = quote!();
+    let mut rule_from_code_match_arms = quote!();
+    let mut diagkind_code_match_arms = quote!();
+    let mut diagkind_body_match_arms = quote!();
+    let mut diagkind_fixable_match_arms = quote!();
+    let mut diagkind_commit_match_arms = quote!();
+    let mut from_impls_for_diagkind = quote!();
+
+    for (code, path, name) in &mapping.entries {
+        let code_str = LitStr::new(&code.to_string(), Span::call_site());
+        rule_variants.extend(quote! {
+            #[doc = #code_str]
+            #name,
+        });
+        diagkind_variants.extend(quote! {#name(#path),});
+        rule_message_formats_match_arms
+            .extend(quote! {Self::#name => <#path as Violation>::message_formats(),});
+        rule_autofixable_match_arms.extend(quote! {Self::#name => <#path as Violation>::AUTOFIX,});
+        rule_code_match_arms.extend(quote! {Self::#name => #code_str,});
+        rule_from_code_match_arms.extend(quote! {#code_str => Ok(&Rule::#name), });
+        diagkind_code_match_arms.extend(quote! {Self::#name(..) => &Rule::#name, });
+        diagkind_body_match_arms.extend(quote! {Self::#name(x) => Violation::message(x), });
+        diagkind_fixable_match_arms
+            .extend(quote! {Self::#name(x) => x.autofix_title_formatter().is_some(),});
+        diagkind_commit_match_arms
+            .extend(quote! {Self::#name(x) => x.autofix_title_formatter().map(|f| f(x)), });
+        from_impls_for_diagkind.extend(quote! {
+            impl From<#path> for DiagnosticKind {
+                fn from(x: #path) -> Self {
+                    DiagnosticKind::#name(x)
+                }
+            }
+        });
+    }
+
+    let code_to_name: HashMap<_, _> = mapping
+        .entries
+        .iter()
+        .map(|(code, _, name)| (code.to_string(), name))
+        .collect();
+
+    let rulecodeprefix = super::rule_code_prefix::expand(
+        &Ident::new("Rule", Span::call_site()),
+        &Ident::new("RuleSelector", Span::call_site()),
+        mapping.entries.iter().map(|(code, ..)| code),
+        |code| code_to_name[code],
+    );
+
+    quote! {
+        #[derive(
+            EnumIter,
+            Debug,
+            PartialEq,
+            Eq,
+            Clone,
+            Hash,
+            PartialOrd,
+            Ord,
+            AsRefStr,
+        )]
+        #[strum(serialize_all = "kebab-case")]
+        pub enum Rule { #rule_variants }
+
+        #[derive(AsRefStr, Debug, PartialEq, Eq, Serialize, Deserialize)]
+        pub enum DiagnosticKind { #diagkind_variants }
+
+        #[derive(thiserror::Error, Debug)]
+        pub enum FromCodeError {
+            #[error("unknown rule code")]
+            Unknown,
+        }
+
+        impl Rule {
+            /// Returns the format strings used to report violations of this rule.
+            pub fn message_formats(&self) -> &'static [&'static str] {
+                match self { #rule_message_formats_match_arms }
+            }
+
+            pub fn autofixable(&self) -> Option<crate::violation::AutofixKind> {
+                match self { #rule_autofixable_match_arms }
+            }
+
+            pub fn code(&self) -> &'static str {
+                match self { #rule_code_match_arms }
+            }
+
+            pub fn from_code(code: &str) -> Result<&'static Self, FromCodeError> {
+                match code {
+                    #rule_from_code_match_arms
+                    _ => Err(FromCodeError::Unknown),
+                }
+            }
+        }
+
+
+        impl DiagnosticKind {
+            /// The rule of the diagnostic.
+            pub fn rule(&self) -> &'static Rule {
+                match self { #diagkind_code_match_arms }
+            }
+
+            /// The body text for the diagnostic.
+            pub fn body(&self) -> String {
+                match self { #diagkind_body_match_arms }
+            }
+
+            /// Whether the diagnostic is (potentially) fixable.
+            pub fn fixable(&self) -> bool {
+                match self { #diagkind_fixable_match_arms }
+            }
+
+            /// The message used to describe the fix action for a given `DiagnosticKind`.
+            pub fn commit(&self) -> Option<String> {
+                match self { #diagkind_commit_match_arms }
+            }
+        }
+
+        #from_impls_for_diagkind
+
+        #rulecodeprefix
+    }
+}
+
+pub struct Mapping {
+    entries: Vec<(Ident, Path, Ident)>,
+}
+
+impl Parse for Mapping {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        let mut entries = Vec::new();
+        while !input.is_empty() {
+            let code: Ident = input.parse()?;
+            let _: Token![=>] = input.parse()?;
+            let path: Path = input.parse()?;
+            let name = path.segments.last().unwrap().ident.clone();
+            let _: Token![,] = input.parse()?;
+            entries.push((code, path, name));
+        }
+        Ok(Mapping { entries })
+    }
+}
--- a/ruff_macros/src/derive_message_formats.rs
+++ b/ruff_macros/src/derive_message_formats.rs
@@ -0,0 +1,55 @@
+use proc_macro2::TokenStream;
+use quote::{quote, quote_spanned, ToTokens};
+use syn::spanned::Spanned;
+use syn::{Block, Expr, ItemFn, Stmt};
+
+pub fn derive_message_formats(func: &ItemFn) -> proc_macro2::TokenStream {
+    let mut strings = quote!();
+
+    if let Err(err) = parse_block(&func.block, &mut strings) {
+        return err;
+    }
+
+    quote! {
+        #func
+        fn message_formats() -> &'static [&'static str] {
+            &[#strings]
+        }
+    }
+}
+
+fn parse_block(block: &Block, strings: &mut TokenStream) -> Result<(), TokenStream> {
+    let Some(Stmt::Expr(last)) = block.stmts.last() else {panic!("expected last statement in block to be an expression")};
+    parse_expr(last, strings)?;
+    Ok(())
+}
+
+fn parse_expr(expr: &Expr, strings: &mut TokenStream) -> Result<(), TokenStream> {
+    match expr {
+        Expr::Macro(mac) if mac.mac.path.is_ident("format") => {
+            let Some(first_token) = mac.mac.tokens.to_token_stream().into_iter().next() else {
+                return Err(quote_spanned!(expr.span() => compile_error!("expected format! to have an argument")))
+            };
+            strings.extend(quote! {#first_token,});
+            Ok(())
+        }
+        Expr::Block(block) => parse_block(&block.block, strings),
+        Expr::If(expr) => {
+            parse_block(&expr.then_branch, strings)?;
+            if let Some((_, then)) = &expr.else_branch {
+                parse_expr(then, strings)?;
+            }
+            Ok(())
+        }
+        Expr::Match(block) => {
+            for arm in &block.arms {
+                parse_expr(&arm.body, strings)?;
+            }
+            Ok(())
+        }
+        _ => Err(quote_spanned!(
+            expr.span() =>
+            compile_error!("expected last expression to be a format! macro or a match block")
+        )),
+    }
+}
--- a/ruff_macros/src/lib.rs
+++ b/ruff_macros/src/lib.rs
@@ -1,3 +1,4 @@
+//! This crate implements internal macros for the `ruff` library.
 #![allow(
    clippy::collapsible_else_if,
    clippy::collapsible_if,
@@ -12,12 +13,13 @@
 )]
 #![forbid(unsafe_code)]

-use proc_macro2::Span;
-use quote::quote;
-use syn::{parse_macro_input, DeriveInput, Ident};
+use proc_macro::TokenStream;
+use syn::{parse_macro_input, DeriveInput, ItemFn};

 mod config;
-mod prefixes;
+mod define_rule_mapping;
+mod derive_message_formats;
+mod parse_code;
 mod rule_code_prefix;

 #[proc_macro_derive(ConfigurationOptions, attributes(option, doc, option_group))]
@@ -29,31 +31,23 @@ pub fn derive_config(input: proc_macro::TokenStream) -> proc_macro::TokenStream
        .into()
 }

-#[proc_macro_derive(RuleCodePrefix)]
+#[proc_macro]
+pub fn define_rule_mapping(item: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let mapping = parse_macro_input!(item as define_rule_mapping::Mapping);
+    define_rule_mapping::define_rule_mapping(&mapping).into()
+}
+
+#[proc_macro_derive(ParseCode, attributes(prefix))]
 pub fn derive_rule_code_prefix(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
    let input = parse_macro_input!(input as DeriveInput);

-    rule_code_prefix::derive_impl(input)
+    parse_code::derive_impl(input)
        .unwrap_or_else(syn::Error::into_compile_error)
        .into()
 }

-#[proc_macro]
-pub fn origin_by_code(item: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    let ident = parse_macro_input!(item as Ident).to_string();
-    let mut iter = prefixes::PREFIX_TO_ORIGIN.iter();
-    let origin = loop {
-        let (prefix, origin) = iter
-            .next()
-            .unwrap_or_else(|| panic!("code doesn't start with any recognized prefix: {ident}"));
-        if ident.starts_with(prefix) {
-            break origin;
-        }
-    };
-    let prefix = Ident::new(origin, Span::call_site());
-
-    quote! {
-        RuleOrigin::#prefix
-    }
-    .into()
+#[proc_macro_attribute]
+pub fn derive_message_formats(_attr: TokenStream, item: TokenStream) -> TokenStream {
+    let func = parse_macro_input!(item as ItemFn);
+    derive_message_formats::derive_message_formats(&func).into()
 }
--- a/ruff_macros/src/parse_code.rs
+++ b/ruff_macros/src/parse_code.rs
@@ -0,0 +1,54 @@
+use quote::quote;
+use syn::spanned::Spanned;
+use syn::{Data, DataEnum, DeriveInput, Error, Lit, Meta, MetaNameValue};
+
+pub fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream> {
+    let DeriveInput { ident, data: Data::Enum(DataEnum {
+        variants, ..
+    }), .. } = input else {
+        return Err(Error::new(input.ident.span(), "only named fields are supported"));
+    };
+
+    let mut parsed = Vec::new();
+
+    for variant in variants {
+        let prefix_attrs: Vec<_> = variant
+            .attrs
+            .iter()
+            .filter(|a| a.path.is_ident("prefix"))
+            .collect();
+
+        if prefix_attrs.is_empty() {
+            return Err(Error::new(
+                variant.span(),
+                r#"Missing [#prefix = "..."] attribute"#,
+            ));
+        }
+
+        for attr in prefix_attrs {
+            let Ok(Meta::NameValue(MetaNameValue{lit: Lit::Str(lit), ..})) = attr.parse_meta() else {
+                return Err(Error::new(attr.span(), r#"expected attribute to be in the form of [#prefix = "..."]"#))
+            };
+            parsed.push((lit, variant.ident.clone()));
+        }
+    }
+
+    parsed.sort_by_key(|(prefix, _)| prefix.value().len());
+
+    let mut if_statements = quote!();
+
+    for (prefix, field) in parsed {
+        if_statements.extend(quote! {if let Some(rest) = code.strip_prefix(#prefix) {
+            return Some((#ident::#field, rest));
+        }});
+    }
+
+    Ok(quote! {
+        impl crate::registry::ParseCode for #ident {
+            fn parse_code(code: &str) -> Option<(Self, &str)> {
+                #if_statements
+                None
+            }
+        }
+    })
+}
--- a/ruff_macros/src/prefixes.rs
+++ b/ruff_macros/src/prefixes.rs
@@ -1,53 +0,0 @@
-// Longer prefixes should come first so that you can find an origin for a code
-// by simply picking the first entry that starts with the given prefix.
-
-pub const PREFIX_TO_ORIGIN: &[(&str, &str)] = &[
-    ("ANN", "Flake8Annotations"),
-    ("ARG", "Flake8UnusedArguments"),
-    ("A", "Flake8Builtins"),
-    ("BLE", "Flake8BlindExcept"),
-    ("B", "Flake8Bugbear"),
-    ("C4", "Flake8Comprehensions"),
-    ("C9", "McCabe"),
-    ("DTZ", "Flake8Datetimez"),
-    ("D", "Pydocstyle"),
-    ("ERA", "Eradicate"),
-    ("EM", "Flake8ErrMsg"),
-    ("E", "Pycodestyle"),
-    ("FBT", "Flake8BooleanTrap"),
-    ("F", "Pyflakes"),
-    ("ICN", "Flake8ImportConventions"),
-    ("ISC", "Flake8ImplicitStrConcat"),
-    ("I", "Isort"),
-    ("N", "PEP8Naming"),
-    ("PD", "PandasVet"),
-    ("PGH", "PygrepHooks"),
-    ("PL", "Pylint"),
-    ("PT", "Flake8PytestStyle"),
-    ("Q", "Flake8Quotes"),
-    ("RET", "Flake8Return"),
-    ("SIM", "Flake8Simplify"),
-    ("S", "Flake8Bandit"),
-    ("T10", "Flake8Debugger"),
-    ("T20", "Flake8Print"),
-    ("TID", "Flake8TidyImports"),
-    ("UP", "Pyupgrade"),
-    ("W", "Pycodestyle"),
-    ("YTT", "Flake82020"),
-    ("PIE", "Flake8Pie"),
-    ("RUF", "Ruff"),
-];
-
-#[cfg(test)]
-mod tests {
-    use super::PREFIX_TO_ORIGIN;
-
-    #[test]
-    fn order() {
-        for (idx, (prefix, _)) in PREFIX_TO_ORIGIN.iter().enumerate() {
-            for (prior_prefix, _) in PREFIX_TO_ORIGIN[..idx].iter() {
-                assert!(!prefix.starts_with(prior_prefix));
-            }
-        }
-    }
-}
--- a/ruff_macros/src/rule_code_prefix.rs
+++ b/ruff_macros/src/rule_code_prefix.rs
@@ -3,14 +3,12 @@ use std::collections::{BTreeMap, BTreeSet, HashMap};
 use once_cell::sync::Lazy;
 use proc_macro2::Span;
 use quote::quote;
-use syn::punctuated::Punctuated;
-use syn::token::Comma;
-use syn::{DataEnum, DeriveInput, Ident, Variant};
+use syn::Ident;

 const ALL: &str = "ALL";

-/// A hash map from deprecated `RuleCodePrefix` to latest
-/// `RuleCodePrefix`.
+/// A hash map from deprecated `RuleSelector` to latest
+/// `RuleSelector`.
 pub static PREFIX_REDIRECTS: Lazy<HashMap<&'static str, &'static str>> = Lazy::new(|| {
    HashMap::from_iter([
        // TODO(charlie): Remove by 2023-01-01.
@@ -86,43 +84,17 @@ pub static PREFIX_REDIRECTS: Lazy<HashMap<&'static str, &'static str>> = Lazy::n
    ])
 });

-pub fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream> {
-    let DeriveInput { ident, data, .. } = input;
-    let syn::Data::Enum(DataEnum { variants, .. }) = data else {
-        return Err(syn::Error::new(
-            ident.span(),
-            "Can only derive `RuleCodePrefix` from enums.",
-        ));
-    };
-
-    let prefix_ident = Ident::new(&format!("{ident}Prefix"), ident.span());
-    let prefix = expand(&ident, &prefix_ident, &variants);
-    let expanded = quote! {
-        #[derive(PartialEq, Eq, PartialOrd, Ord)]
-        pub enum SuffixLength {
-            None,
-            Zero,
-            One,
-            Two,
-            Three,
-            Four,
-        }
-
-        #prefix
-    };
-    Ok(expanded)
-}
-
-fn expand(
-    ident: &Ident,
+pub fn expand<'a>(
+    rule_type: &Ident,
    prefix_ident: &Ident,
-    variants: &Punctuated<Variant, Comma>,
+    variants: impl Iterator<Item = &'a Ident>,
+    variant_name: impl Fn(&str) -> &'a Ident,
 ) -> proc_macro2::TokenStream {
    // Build up a map from prefix to matching RuleCodes.
    let mut prefix_to_codes: BTreeMap<Ident, BTreeSet<String>> = BTreeMap::default();
    for variant in variants {
-        let span = variant.ident.span();
-        let code_str = variant.ident.to_string();
+        let span = variant.span();
+        let code_str = variant.to_string();
        let code_prefix_len = code_str
            .chars()
            .take_while(|char| char.is_alphabetic())
@@ -158,7 +130,7 @@ fn expand(
        }
    });

-    let prefix_impl = generate_impls(ident, prefix_ident, &prefix_to_codes);
+    let prefix_impl = generate_impls(rule_type, prefix_ident, &prefix_to_codes, variant_name);

    let prefix_redirects = PREFIX_REDIRECTS.iter().map(|(alias, rule_code)| {
        let code = Ident::new(rule_code, Span::call_site());
@@ -168,6 +140,16 @@ fn expand(
    });

    quote! {
+        #[derive(PartialEq, Eq, PartialOrd, Ord)]
+        pub enum SuffixLength {
+            None,
+            Zero,
+            One,
+            Two,
+            Three,
+            Four,
+        }
+
        #[derive(
            ::strum_macros::EnumString,
            ::strum_macros::AsRefStr,
@@ -187,7 +169,7 @@ fn expand(

        #prefix_impl

-        /// A hash map from deprecated `RuleCodePrefix` to latest `RuleCodePrefix`.
+        /// A hash map from deprecated `RuleSelector` to latest `RuleSelector`.
        pub static PREFIX_REDIRECTS: ::once_cell::sync::Lazy<::rustc_hash::FxHashMap<&'static str, #prefix_ident>> = ::once_cell::sync::Lazy::new(|| {
            ::rustc_hash::FxHashMap::from_iter([
                #(#prefix_redirects),*
@@ -196,16 +178,17 @@ fn expand(
    }
 }

-fn generate_impls(
-    ident: &Ident,
+fn generate_impls<'a>(
+    rule_type: &Ident,
    prefix_ident: &Ident,
    prefix_to_codes: &BTreeMap<Ident, BTreeSet<String>>,
+    variant_name: impl Fn(&str) -> &'a Ident,
 ) -> proc_macro2::TokenStream {
    let codes_match_arms = prefix_to_codes.iter().map(|(prefix, codes)| {
        let codes = codes.iter().map(|code| {
-            let code = Ident::new(code, Span::call_site());
+            let rule_variant = variant_name(code);
            quote! {
-                #ident::#code
+                #rule_type::#rule_variant
            }
        });
        let prefix_str = prefix.to_string();
@@ -265,7 +248,7 @@ fn generate_impls(

    quote! {
        impl #prefix_ident {
-            pub fn codes(&self) -> Vec<#ident> {
+            pub fn codes(&self) -> Vec<#rule_type> {
                use colored::Colorize;

                #[allow(clippy::match_same_arms)]
--- a/scripts/_utils.py
+++ b/scripts/_utils.py
@@ -0,0 +1,18 @@
+import os
+import re
+from pathlib import Path
+
+ROOT_DIR = Path(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+
+def dir_name(linter_name: str) -> str:
+    return linter_name.replace("-", "_")
+
+
+def pascal_case(linter_name: str) -> str:
+    """Convert from snake-case to PascalCase."""
+    return "".join(word.title() for word in linter_name.split("-"))
+
+
+def get_indent(line: str) -> str:
+    return re.match(r"^\s*", line).group()  # pyright: ignore[reportOptionalMemberAccess]
--- a/scripts/add_plugin.py
+++ b/scripts/add_plugin.py
@@ -11,29 +11,23 @@ Example usage:
 import argparse
 import os

-ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
-
-def dir_name(plugin: str) -> str:
-    return plugin.replace("-", "_")
-
-
-def pascal_case(plugin: str) -> str:
-    return "".join(word.title() for word in plugin.split("-"))
+from _utils import ROOT_DIR, dir_name, get_indent, pascal_case


 def main(*, plugin: str, url: str) -> None:
    # Create the test fixture folder.
    os.makedirs(
-        os.path.join(ROOT_DIR, f"resources/test/fixtures/{dir_name(plugin)}"),
+        ROOT_DIR / "resources/test/fixtures" / dir_name(plugin),
        exist_ok=True,
    )

    # Create the Rust module.
-    os.makedirs(os.path.join(ROOT_DIR, f"src/{dir_name(plugin)}"), exist_ok=True)
-    with open(os.path.join(ROOT_DIR, f"src/{dir_name(plugin)}/rules.rs"), "w+") as fp:
+    rust_module = ROOT_DIR / "src/rules" / dir_name(plugin)
+    os.makedirs(rust_module, exist_ok=True)
+    with open(rust_module / "rules.rs", "w+") as fp:
        fp.write("use crate::checkers::ast::Checker;\n")
-    with open(os.path.join(ROOT_DIR, f"src/{dir_name(plugin)}/mod.rs"), "w+") as fp:
+    with open(rust_module / "mod.rs", "w+") as fp:
+        fp.write(f"//! Rules from [{plugin}]({url}).\n")
        fp.write("pub(crate) mod rules;\n")
        fp.write("\n")
        fp.write(
@@ -45,11 +39,11 @@ mod tests {
    use anyhow::Result;
    use test_case::test_case;

-    use crate::registry::RuleCode;
+    use crate::registry::Rule;
    use crate::linter::test_path;
    use crate::settings;

-    fn rules(rule_code: RuleCode, path: &Path) -> Result<()> {
+    fn rules(rule_code: Rule, path: &Path) -> Result<()> {
        let snapshot = format!("{}_{}", rule_code.as_ref(), path.to_string_lossy());
        let diagnostics =test_path(
            Path::new("./resources/test/fixtures/%s")
@@ -65,56 +59,43 @@ mod tests {
            % dir_name(plugin)
        )

-    # Add the plugin to `lib.rs`.
-    with open(os.path.join(ROOT_DIR, "src/lib.rs"), "a") as fp:
-        fp.write(f"mod {dir_name(plugin)};")
+    # Add the plugin to `rules/mod.rs`.
+    with open(ROOT_DIR / "src/rules/mod.rs", "a") as fp:
+        fp.write(f"pub mod {dir_name(plugin)};")

    # Add the relevant sections to `src/registry.rs`.
-    with open(os.path.join(ROOT_DIR, "src/registry.rs")) as fp:
-        content = fp.read()
+    content = (ROOT_DIR / "src/registry.rs").read_text()

-    with open(os.path.join(ROOT_DIR, "src/registry.rs"), "w") as fp:
+    with open(ROOT_DIR / "src/registry.rs", "w") as fp:
        for line in content.splitlines():
+            indent = get_indent(line)
+
            if line.strip() == "// Ruff":
-                indent = line.split("// Ruff")[0]
                fp.write(f"{indent}// {plugin}")
                fp.write("\n")

-            elif line.strip() == "Ruff,":
-                indent = line.split("Ruff,")[0]
+            elif line.strip() == '#[prefix = "RUF"]':
+                fp.write(f'{indent}#[prefix = "TODO"]\n')
                fp.write(f"{indent}{pascal_case(plugin)},")
                fp.write("\n")

-            elif line.strip() == 'RuleOrigin::Ruff => "Ruff-specific rules",':
-                indent = line.split('RuleOrigin::Ruff => "Ruff-specific rules",')[0]
-                fp.write(f'{indent}RuleOrigin::{pascal_case(plugin)} => "{plugin}",')
-                fp.write("\n")
-
-            elif line.strip() == "RuleOrigin::Ruff => vec![RuleCodePrefix::RUF],":
-                indent = line.split("RuleOrigin::Ruff => vec![RuleCodePrefix::RUF],")[0]
+            elif line.strip() == "Linter::Ruff => Prefixes::Single(RuleSelector::RUF),":
+                prefix = 'todo!("Fill-in prefix after generating codes")'
                fp.write(
-                    f"{indent}RuleOrigin::{pascal_case(plugin)} => vec![\n"
-                    f'{indent}    todo!("Fill-in prefix after generating codes")\n'
-                    f"{indent}],"
+                    f"{indent}Linter::{pascal_case(plugin)} => Prefixes::Single({prefix}),"
                )
                fp.write("\n")

-            elif line.strip() == "RuleOrigin::Ruff => None,":
-                indent = line.split("RuleOrigin::Ruff => None,")[0]
-                fp.write(f"{indent}RuleOrigin::{pascal_case(plugin)} => " f'Some(("{url}", &Platform::PyPI)),')
-                fp.write("\n")
-
            fp.write(line)
            fp.write("\n")

    # Add the relevant section to `src/violations.rs`.
-    with open(os.path.join(ROOT_DIR, "src/violations.rs")) as fp:
-        content = fp.read()
+    content = (ROOT_DIR / "src/violations.rs").read_text()

-    with open(os.path.join(ROOT_DIR, "src/violations.rs"), "w") as fp:
+    with open(ROOT_DIR / "src/violations.rs", "w") as fp:
        for line in content.splitlines():
            if line.strip() == "// Ruff":
-                indent = line.split("// Ruff")[0]
+                indent = get_indent(line)
                fp.write(f"{indent}// {plugin}")
                fp.write("\n")

--- a/scripts/add_rule.py
+++ b/scripts/add_rule.py
@@ -6,22 +6,12 @@ Example usage:
    python scripts/add_rule.py \
        --name PreferListBuiltin \
        --code PIE807 \
-        --origin flake8-pie
+        --linter flake8-pie
 """

 import argparse
-import os

-ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
-
-def dir_name(origin: str) -> str:
-    return origin.replace("-", "_")
-
-
-def pascal_case(origin: str) -> str:
-    """Convert from snake-case to PascalCase."""
-    return "".join(word.title() for word in origin.split("-"))
+from _utils import ROOT_DIR, dir_name, get_indent


 def snake_case(name: str) -> str:
@@ -29,30 +19,30 @@ def snake_case(name: str) -> str:
    return "".join(f"_{word.lower()}" if word.isupper() else word for word in name).lstrip("_")


-def main(*, name: str, code: str, origin: str) -> None:
+def main(*, name: str, code: str, linter: str) -> None:
    # Create a test fixture.
    with open(
-        os.path.join(ROOT_DIR, f"resources/test/fixtures/{dir_name(origin)}/{code}.py"),
+        ROOT_DIR / "resources/test/fixtures" / dir_name(linter) / f"{code}.py",
        "a",
    ):
        pass

    # Add the relevant `#testcase` macro.
-    with open(os.path.join(ROOT_DIR, f"src/{dir_name(origin)}/mod.rs")) as fp:
-        content = fp.read()
+    mod_rs = ROOT_DIR / "src/rules" / dir_name(linter) / "mod.rs"
+    content = mod_rs.read_text()

-    with open(os.path.join(ROOT_DIR, f"src/{dir_name(origin)}/mod.rs"), "w") as fp:
+    with open(mod_rs, "w") as fp:
        for line in content.splitlines():
-            if line.strip() == "fn rules(rule_code: RuleCode, path: &Path) -> Result<()> {":
-                indent = line.split("fn rules(rule_code: RuleCode, path: &Path) -> Result<()> {")[0]
-                fp.write(f'{indent}#[test_case(RuleCode::{code}, Path::new("{code}.py"); "{code}")]')
+            if line.strip() == "fn rules(rule_code: Rule, path: &Path) -> Result<()> {":
+                indent = get_indent(line)
+                fp.write(f'{indent}#[test_case(Rule::{code}, Path::new("{code}.py"); "{code}")]')
                fp.write("\n")

            fp.write(line)
            fp.write("\n")

    # Add the relevant rule function.
-    with open(os.path.join(ROOT_DIR, f"src/{dir_name(origin)}/rules.rs"), "a") as fp:
+    with open(ROOT_DIR / "src/rules" / dir_name(linter) / (snake_case(name) + ".rs"), "w") as fp:
        fp.write(
            f"""
 /// {code}
@@ -62,40 +52,36 @@ pub fn {snake_case(name)}(checker: &mut Checker) {{}}
        fp.write("\n")

    # Add the relevant struct to `src/violations.rs`.
-    with open(os.path.join(ROOT_DIR, "src/violations.rs")) as fp:
-        content = fp.read()
+    content = (ROOT_DIR / "src/violations.rs").read_text()

-    with open(os.path.join(ROOT_DIR, "src/violations.rs"), "w") as fp:
+    with open(ROOT_DIR / "src/violations.rs", "w") as fp:
        for line in content.splitlines():
            fp.write(line)
            fp.write("\n")

-            if line.startswith(f"// {origin}"):
+            if line.startswith(f"// {linter}"):
                fp.write(
                    """define_violation!(
    pub struct %s;
 );
 impl Violation for %s {
+    #[derive_message_formats]
    fn message(&self) -> String {
-        todo!("Implement message")
-    }
-
-    fn placeholder() -> Self {
-        %s
+        todo!("implement message");
+        format!("TODO: write message")
    }
 }
 """
-                    % (name, name, name)
+                    % (name, name)
                )
                fp.write("\n")

    # Add the relevant code-to-violation pair to `src/registry.rs`.
-    with open(os.path.join(ROOT_DIR, "src/registry.rs")) as fp:
-        content = fp.read()
+    content = (ROOT_DIR / "src/registry.rs").read_text()

    seen_macro = False
    has_written = False
-    with open(os.path.join(ROOT_DIR, "src/registry.rs"), "w") as fp:
+    with open(ROOT_DIR / "src/registry.rs", "w") as fp:
        for line in content.splitlines():
            fp.write(line)
            fp.write("\n")
@@ -103,24 +89,26 @@ impl Violation for %s {
            if has_written:
                continue

-            if line.startswith("define_rule_mapping!"):
+            if line.startswith("ruff_macros::define_rule_mapping!"):
                seen_macro = True
                continue

            if not seen_macro:
                continue

-            if line.strip() == f"// {origin}":
-                indent = line.split("//")[0]
+            if line.strip() == f"// {linter}":
+                indent = get_indent(line)
                fp.write(f"{indent}{code} => violations::{name},")
                fp.write("\n")
                has_written = True

+    assert has_written
+

 if __name__ == "__main__":
    parser = argparse.ArgumentParser(
        description="Generate boilerplate for a new rule.",
-        epilog="python scripts/add_rule.py --name PreferListBuiltin --code PIE807 --origin flake8-pie",
+        epilog="python scripts/add_rule.py --name PreferListBuiltin --code PIE807 --linter flake8-pie",
    )
    parser.add_argument(
        "--name",
@@ -135,11 +123,11 @@ if __name__ == "__main__":
        help="The code of the check to generate (e.g., 'A001').",
    )
    parser.add_argument(
-        "--origin",
+        "--linter",
        type=str,
        required=True,
        help="The source with which the check originated (e.g., 'flake8-builtins').",
    )
    args = parser.parse_args()

-    main(name=args.name, code=args.code, origin=args.origin)
+    main(name=args.name, code=args.code, linter=args.linter)
--- a/scripts/benchmarks/README.md
+++ b/scripts/benchmarks/README.md
@@ -0,0 +1,25 @@
+# benchmarks
+
+Utilities for benchmarking Ruff.
+
+## Getting Started
+
+Run `./scripts/benchmarks/run.sh` to clone the benchmarking target (CPython).
+
+If you're looking to benchmark Ruff against other tools, you'll also need to run `poetry
+install` to create a virtual environment with the required dependencies.
+
+## Running Benchmarks
+
+Run `./scripts/benchmarks/run.sh` to run Ruff over the target repo (CPython). The
+`./scripts/benchmarks` folder contains a few other benchmarks (e.g., `scripts/benchmarks/run_comparisons.sh`
+compares Ruff to a variety of other tools).
+
+## Generating Plots
+
+The Vega specification for the benchmark plot depicted in the root README can be found at
+`scripts/benchmarks/graph-spec.json`. You can render this JSON spec in the [Vega Editor](https://vega.github.io/editor/#/edited).
+
+The images seen in the README are generated by exporting the rendered Vega spec as SVG (at around
+688px wide) and manually bolding the Ruff title and benchmark time. The dark mode variant is
+generated by changing the fill from `fill="#333333"` to `fill="#C9D1D9"`.
--- a/scripts/benchmarks/dark.svg
+++ b/scripts/benchmarks/dark.svg
--- a/scripts/benchmarks/graph-spec.json
+++ b/scripts/benchmarks/graph-spec.json
@@ -0,0 +1,209 @@
+{
+  "$schema": "https://vega.github.io/schema/vega-lite/v5.json",
+  "data": {
+    "values": [
+      {
+        "tool": "Ruff",
+        "time": 0.2943,
+        "timeFormat": "0.29s"
+      },
+      {
+        "tool": "Autoflake",
+        "time": 6.175,
+        "timeFormat": "6.18s"
+      },
+      {
+        "tool": "Flake8",
+        "time": 12.26,
+        "timeFormat": "12.26s"
+      },
+      {
+        "tool": "Pyflakes",
+        "time": 15.786,
+        "timeFormat": "15.79s"
+      },
+      {
+        "tool": "Pycodestyle",
+        "time": 46.921,
+        "timeFormat": "46.92s"
+      },
+      {
+        "tool": "Pylint",
+        "time": 62.0,
+        "timeFormat": "> 60s"
+      }
+    ]
+  },
+  "config": {
+    "params": [
+      {
+        "name": "defaultFont",
+        "value": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Helvetica,Arial,sans-serif,\"Apple Color Emoji\",\"Segoe UI Emoji\""
+      },
+      {
+        "name": "titleColor",
+        "value": "#333333"
+      },
+      {
+        "name": "labelColor",
+        "value": "#333333"
+      }
+    ],
+    "header": {
+      "labelFont": {
+        "expr": "defaultFont"
+      },
+      "titleFont": {
+        "expr": "defaultFont"
+      },
+      "titleFontWeight": 500
+    },
+    "text": {
+      "font": {
+        "expr": "defaultFont"
+      },
+      "color": {
+        "expr": "labelColor"
+      }
+    },
+    "mark": {
+      "font": {
+        "expr": "defaultFont"
+      },
+      "color": {
+        "expr": "labelColor"
+      }
+    },
+    "title": {
+      "font": {
+        "expr": "defaultFont"
+      },
+      "subtitleFont": {
+        "expr": "defaultFont"
+      },
+      "fontWeight": 500
+    },
+    "axis": {
+      "labelColor": {
+        "expr": "labelColor"
+      },
+      "labelFont": {
+        "expr": "defaultFont"
+      },
+      "titleFont": {
+        "expr": "defaultFont"
+      },
+      "titleFontWeight": 500,
+      "titleColor": {
+        "expr": "titleColor"
+      },
+      "titleFontSize": 12
+    },
+    "legend": {
+      "titleFontWeight": 500,
+      "titleColor": {
+        "expr": "titleColor"
+      },
+      "titleFontSize": 12,
+      "labelColor": {
+        "expr": "labelColor"
+      },
+      "labelFont": {
+        "expr": "defaultFont"
+      },
+      "titleFont": {
+        "expr": "defaultFont"
+      }
+    },
+    "view": {
+      "stroke": null
+    },
+    "background": "transparent"
+  },
+  "background": "transparent",
+  "encoding": {
+    "y": {
+      "field": "tool",
+      "type": "nominal",
+      "axis": {
+        "grid": false,
+        "title": null,
+        "labelFontSize": 12,
+        "ticks": false,
+        "labelPadding": 10,
+        "domain": false
+      },
+      "sort": null
+    },
+    "x": {
+      "field": "time",
+      "type": "quantitative",
+      "axis": {
+        "title": null,
+        "labelExpr": "datum.value + 's'",
+        "tickCount": 3,
+        "tickSize": 0,
+        "labelPadding": 6,
+        "labelAlign": "center",
+        "labelFontSize": 12,
+        "tickColor": "rgba(127,127,127,0.25)",
+        "gridColor": "rgba(127,127,127,0.25)",
+        "domain": false
+      }
+    }
+  },
+  "height": 140,
+  "width": "container",
+  "layer": [
+    {
+      "mark": "bar",
+      "encoding": {
+        "size": {
+          "value": 13
+        },
+        "color": {
+          "value": "#E15759"
+        }
+      }
+    },
+    {
+      "transform": [
+        {
+          "filter": "datum.tool !== 'ruff'"
+        }
+      ],
+      "mark": {
+        "type": "text",
+        "align": "left",
+        "baseline": "middle",
+        "dx": 6,
+        "fontSize": 12
+      },
+      "encoding": {
+        "text": {
+          "field": "timeFormat"
+        }
+      }
+    },
+    {
+      "transform": [
+        {
+          "filter": "datum.tool === 'ruff'"
+        }
+      ],
+      "mark": {
+        "type": "text",
+        "align": "left",
+        "baseline": "middle",
+        "dx": 6,
+        "fontSize": 12,
+        "fontWeight": "bold"
+      },
+      "encoding": {
+        "text": {
+          "field": "timeFormat"
+        }
+      }
+    }
+  ]
+}
--- a/Show More
+++ b/Show More