Bump version to 0.0.231

[flake8-bandit] Added Rule S612 (Use of insecure logging.config.listen) (#2108 )
ref: https://github.com/charliermarsh/ruff/issues/1646
2023-01-23 12:51:09 -05:00 · 2023-01-23 12:37:33 -05:00 · 2023-01-23 12:32:35 -05:00 · 2023-01-23 12:29:44 -05:00 · 2023-01-23 12:20:10 -05:00 · 2023-01-23 12:20:10 -05:00
422 changed files with 17799 additions and 8352 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
@@ -84,6 +84,23 @@ jobs:
      # Setting RUSTDOCFLAGS because `cargo doc --check` isn't yet implemented (https://github.com/rust-lang/cargo/issues/10025).
      - run: RUSTDOCFLAGS="-D warnings" cargo doc --all --no-deps

+  scripts:
+    name: "test scripts"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          override: true
+      - uses: Swatinem/rust-cache@v1
+      - run: ./scripts/add_rule.py --name DoTheThing --code PLC999 --linter pylint
+      - run: cargo check
+      - run: |
+         ./scripts/add_plugin.py test --url https://pypi.org/project/-test/0.1.0/ --prefix TST
+         ./scripts/add_rule.py --name FirstRule --code TST001 --linter test
+      - run: cargo check
+
 # TODO(charlie): Re-enable the `wasm-pack` tests.
 # See: https://github.com/charliermarsh/ruff/issues/1425
 #  wasm-pack-test:
@@ -122,7 +139,7 @@ jobs:
      - uses: actions-rs/toolchain@v1
        with:
          profile: minimal
-          toolchain: nightly-2022-11-01
+          toolchain: 1.65.0
          override: true
      - uses: Swatinem/rust-cache@v1
      - uses: actions/setup-python@v4
--- 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.225
+    rev: v0.0.231
    hooks:
      - id: ruff

@@ -8,3 +8,11 @@ repos:
    rev: v0.10.1
    hooks:
      - id: validate-pyproject
+
+  - repo: local
+    hooks:
+      - id: cargo-fmt
+        name: cargo fmt
+        entry: cargo fmt --
+        language: rust
+        types: [rust]
--- a/BREAKING_CHANGES.md
+++ b/BREAKING_CHANGES.md
@@ -1,5 +1,12 @@
 # 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))
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,9 +14,10 @@ If you're looking for a place to start, we recommend implementing a new lint rul
 pattern-match against the examples in the existing codebase. Many lint rules are inspired by
 existing Python plugins, which can be used as a reference implementation.

-As a concrete example: consider taking on one of the rules in [`flake8-simplify`](https://github.com/charliermarsh/ruff/issues/998),
-and looking to the originating [Python source](https://github.com/MartinThoma/flake8-simplify) for
-guidance.
+As a concrete example: consider taking on one of the rules from the [`tryceratops`](https://github.com/charliermarsh/ruff/issues/2056)
+plugin, and looking to the originating [Python source](https://github.com/guilatrova/tryceratops)
+for guidance. [`flake8-simplify`](https://github.com/charliermarsh/ruff/issues/998) has a few rules
+left too.

 ### Prerequisites

@@ -37,13 +38,16 @@ After cloning the repository, run Ruff locally with:
 cargo run resources/test/fixtures --no-cache
 ```

-Prior to opening a pull request, ensure that your code has been auto-formatted, and that it passes
-both the lint and test validation checks:
+Prior to opening a pull request, ensure that your code has been auto-formatted,
+and that it passes both the lint and test validation checks.
+
+For rustfmt and Clippy, we use [nightly Rust][nightly], as it is stricter than stable Rust.
+(However, tests and builds use stable Rust.)

 ```shell
 cargo +nightly fmt --all     # Auto-formatting...
-cargo +nightly clippy --all  # Linting...
-cargo +nightly test --all    # Testing...
+cargo +nightly clippy --fix --workspace --all-targets --all-features -- -W clippy::pedantic  # Linting...
+cargo test --all    # Testing...
 ```

 These checks will run on GitHub Actions when you open your Pull Request, but running them locally
@@ -54,18 +58,22 @@ prior to merging.

 ### Example: Adding a new lint rule

-There are four phases to adding a new lint rule:
+At a high level, the steps involved in adding a new lint rule are as follows:

-1. Define the violation struct in `src/violations.rs` (e.g., `ModuleImportNotAtTopOfFile`).
-2. Map the violation struct to a rule code in `src/registry.rs` (e.g., `E402`).
-3. Define the logic for triggering the violation in `src/checkers/ast.rs` (for AST-based checks),
-   `src/checkers/tokens.rs` (for token-based checks), `src/checkers/lines.rs` (for text-based checks) or `src/checkers/filesystem.rs` (for filesystem-based checks).
-4. Add a test fixture.
-5. Update the generated files (documentation and generated code).
+1. Create a file for your rule (e.g., `src/rules/flake8_bugbear/rules/abstract_base_class.rs`).
+2. In that file, define a violation struct. You can grep for `define_violation!` to see examples.
+3. Map the violation struct to a rule code in `src/registry.rs` (e.g., `E402`).
+4. Define the logic for triggering the violation in `src/checkers/ast.rs` (for AST-based checks),
+   `src/checkers/tokens.rs` (for token-based checks), `src/checkers/lines.rs` (for text-based
+   checks), or `src/checkers/filesystem.rs` (for filesystem-based checks).
+5. Add a test fixture.
+6. Update the generated files (documentation and generated code).

-To define the violation, open up `src/violations.rs`, and define a new struct using the
-`define_violation!` macro. There are plenty of examples in that file, so feel free to pattern-match
-against the existing structs.
+To define the violation, start by creating a dedicated file for your rule under the appropriate
+rule linter (e.g., `src/rules/flake8_bugbear/rules/abstract_base_class.rs`). That file should
+contain a struct defined via `define_violation!`, along with a function that creates the violation
+based on any required inputs. (Many of the existing examples live in `src/violations.rs`, but we're
+looking to place new rules in their own files.)

 To trigger the violation, you'll likely want to augment the logic in `src/checkers/ast.rs`, which
 defines the Python AST visitor, responsible for iterating over the abstract syntax tree and
@@ -74,7 +82,7 @@ collecting diagnostics as it goes.
 If you need to inspect the AST, you can run `cargo +nightly dev print-ast` with a Python file. Grep
 for the `Check::new` invocations to understand how other, similar rules are implemented.

-To add a test fixture, create a file under `resources/test/fixtures/[origin]`, named to match
+To add a test fixture, create a file under `resources/test/fixtures/[linter]`, named to match
 the code you defined earlier (e.g., `resources/test/fixtures/pycodestyle/E402.py`). This file should
 contain a variety of violations and non-violations designed to evaluate and demonstrate the behavior
 of your lint rule.
@@ -83,7 +91,7 @@ Run `cargo +nightly dev generate-all` to generate the code for your new fixture.
 locally with (e.g.) `cargo run resources/test/fixtures/pycodestyle/E402.py --no-cache --select E402`.

 Once you're satisfied with the output, codify the behavior as a snapshot test by adding a new
-`test_case` macro in the relevant `src/[origin]/mod.rs` file. Then, run `cargo test --all`.
+`test_case` macro in the relevant `src/[linter]/mod.rs` file. Then, run `cargo test --all`.
 Your test will fail, but you'll be prompted to follow-up with `cargo insta review`. Accept the
 generated snapshot, then commit the snapshot file alongside the rest of your changes.

@@ -123,3 +131,5 @@ them to [PyPI](https://pypi.org/project/ruff/).

 Ruff follows the [semver](https://semver.org/) versioning standard. However, as pre-1.0 software,
 even patch releases may contain [non-backwards-compatible changes](https://semver.org/#spec-item-4).
+
+[nightly]: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust
--- 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.225"
+version = "0.0.231"
 dependencies = [
 "anyhow",
 "clap 4.0.32",
@@ -786,24 +770,13 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "js-sys",
 "libc",
 "wasi 0.11.0+wasi-snapshot-preview1",
@@ -926,6 +899,16 @@ dependencies = [
 "winapi-util",
 ]

+[[package]]
+name = "imperative"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f92123bf2fe0d9f1b5df1964727b970ca3b2d0203d47cf97fb1f36d856b6398"
+dependencies = [
+ "phf 0.11.1",
+ "rust-stemmers",
+]
+
 [[package]]
 name = "indexmap"
 version = "1.9.2"
@@ -976,7 +959,7 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]

 [[package]]
@@ -1186,7 +1169,7 @@ version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]

 [[package]]
@@ -1265,7 +1248,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694"
 dependencies = [
 "bitflags",
- "cfg-if 1.0.0",
+ "cfg-if",
 "libc",
 "static_assertions",
 ]
@@ -1419,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",
@@ -1493,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"
@@ -1512,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]]
@@ -1532,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]]
@@ -1548,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]]
@@ -1569,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"
@@ -1724,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"
@@ -1745,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]]
@@ -1766,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]]
@@ -1784,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]]
@@ -1842,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",
 ]
@@ -1894,35 +1826,26 @@ dependencies = [
 "winapi",
 ]

-[[package]]
-name = "ropey"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd22239fafefc42138ca5da064f3c17726a80d2379d817a3521240e78dd0064"
-dependencies = [
- "smallvec",
- "str_indices",
-]
-
 [[package]]
 name = "ruff"
-version = "0.0.225"
+version = "0.0.231"
 dependencies = [
 "anyhow",
 "bitflags",
- "cfg-if 1.0.0",
+ "cfg-if",
 "chrono",
 "clap 4.0.32",
 "colored",
 "console_error_panic_hook",
 "console_log",
 "criterion",
- "dirs 4.0.0",
+ "dirs",
 "fern",
- "getrandom 0.2.8",
+ "getrandom",
 "glob",
 "globset",
 "ignore",
+ "imperative",
 "insta",
 "itertools",
 "js-sys",
@@ -1935,7 +1858,6 @@ dependencies = [
 "once_cell",
 "path-absolutize",
 "regex",
- "ropey",
 "ruff_macros",
 "rustc-hash",
 "rustpython-ast",
@@ -1946,10 +1868,12 @@ dependencies = [
 "serde",
 "serde-wasm-bindgen",
 "shellexpand",
+ "smallvec",
 "strum",
 "strum_macros",
 "test-case",
 "textwrap",
+ "thiserror",
 "titlecase",
 "toml_edit",
 "wasm-bindgen",
@@ -1958,7 +1882,7 @@ dependencies = [

 [[package]]
 name = "ruff_cli"
-version = "0.0.225"
+version = "0.0.231"
 dependencies = [
 "annotate-snippets 0.9.1",
 "anyhow",
@@ -1995,7 +1919,7 @@ dependencies = [

 [[package]]
 name = "ruff_dev"
-version = "0.0.225"
+version = "0.0.231"
 dependencies = [
 "anyhow",
 "clap 4.0.32",
@@ -2016,7 +1940,7 @@ dependencies = [

 [[package]]
 name = "ruff_macros"
-version = "0.0.225"
+version = "0.0.231"
 dependencies = [
 "once_cell",
 "proc-macro2",
@@ -2025,6 +1949,16 @@ dependencies = [
 "textwrap",
 ]

+[[package]]
+name = "rust-stemmers"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54"
+dependencies = [
+ "serde",
+ "serde_derive",
+]
+
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
@@ -2060,7 +1994,7 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=acbc517b55406c76da83d7b2711941d8d3f65b87#acbc517b55406c76da83d7b2711941d8d3f65b87"
+source = "git+https://github.com/RustPython/RustPython.git?rev=4f38cb68e4a97aeea9eb19673803a0bd5f655383#4f38cb68e4a97aeea9eb19673803a0bd5f655383"
 dependencies = [
 "num-bigint",
 "rustpython-common",
@@ -2070,11 +2004,11 @@ dependencies = [
 [[package]]
 name = "rustpython-common"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=acbc517b55406c76da83d7b2711941d8d3f65b87#acbc517b55406c76da83d7b2711941d8d3f65b87"
+source = "git+https://github.com/RustPython/RustPython.git?rev=4f38cb68e4a97aeea9eb19673803a0bd5f655383#4f38cb68e4a97aeea9eb19673803a0bd5f655383"
 dependencies = [
 "ascii",
 "bitflags",
- "cfg-if 1.0.0",
+ "cfg-if",
 "hexf-parse",
 "itertools",
 "lexical-parse-float",
@@ -2085,7 +2019,7 @@ dependencies = [
 "num-traits",
 "once_cell",
 "radium",
- "rand 0.8.5",
+ "rand",
 "siphasher",
 "unic-ucd-category",
 "volatile",
@@ -2095,7 +2029,7 @@ dependencies = [
 [[package]]
 name = "rustpython-compiler-core"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=acbc517b55406c76da83d7b2711941d8d3f65b87#acbc517b55406c76da83d7b2711941d8d3f65b87"
+source = "git+https://github.com/RustPython/RustPython.git?rev=4f38cb68e4a97aeea9eb19673803a0bd5f655383#4f38cb68e4a97aeea9eb19673803a0bd5f655383"
 dependencies = [
 "bincode",
 "bitflags",
@@ -2112,7 +2046,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=acbc517b55406c76da83d7b2711941d8d3f65b87#acbc517b55406c76da83d7b2711941d8d3f65b87"
+source = "git+https://github.com/RustPython/RustPython.git?rev=4f38cb68e4a97aeea9eb19673803a0bd5f655383#4f38cb68e4a97aeea9eb19673803a0bd5f655383"
 dependencies = [
 "ahash",
 "anyhow",
@@ -2272,7 +2206,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd1c7ddea665294d484c39fd0c0d2b7e35bbfe10035c5fe1854741a57f6880e1"
 dependencies = [
- "dirs 4.0.0",
+ "dirs",
 ]

 [[package]]
@@ -2311,12 +2245,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"

-[[package]]
-name = "str_indices"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f026164926842ec52deb1938fae44f83dfdb82d0a5b0270c5bd5935ab74d6dd"
-
 [[package]]
 name = "string_cache"
 version = "0.8.4"
@@ -2375,7 +2303,7 @@ version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "fastrand",
 "libc",
 "redox_syscall",
@@ -2415,15 +2343,15 @@ dependencies = [

 [[package]]
 name = "terminfo"
-version = "0.7.3"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76971977e6121664ec1b960d1313aacfa75642adc93b9d4d53b247bd4cb1747e"
+checksum = "da31aef70da0f6352dbcb462683eb4dd2bfad01cf3fc96cf204547b9a839a585"
 dependencies = [
- "dirs 2.0.2",
+ "dirs",
 "fnv",
 "nom",
- "phf 0.8.0",
- "phf_codegen 0.8.0",
+ "phf 0.11.1",
+ "phf_codegen 0.11.1",
 ]

 [[package]]
@@ -2447,7 +2375,7 @@ version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e45b7bf6e19353ddd832745c8fcf77a17a93171df7151187f26623f2b75b5b26"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "proc-macro-error",
 "proc-macro2",
 "quote",
@@ -2587,7 +2515,7 @@ version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "static_assertions",
 ]

@@ -2791,12 +2719,6 @@ dependencies = [
 "winapi-util",
 ]

-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
 [[package]]
 name = "wasi"
 version = "0.10.0+wasi-snapshot-preview1"
@@ -2815,7 +2737,7 @@ version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "wasm-bindgen-macro",
 ]

@@ -2840,7 +2762,7 @@ version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "js-sys",
 "wasm-bindgen",
 "web-sys",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ default-members = [".", "ruff_cli"]

 [package]
 name = "ruff"
-version = "0.0.225"
+version = "0.0.231"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 edition = "2021"
 rust-version = "1.65.0"
@@ -35,6 +35,7 @@ fern = { version = "0.6.1" }
 glob = { version = "0.3.0" }
 globset = { version = "0.4.9" }
 ignore = { version = "0.4.18" }
+imperative = { version = "1.0.3" }
 itertools = { version = "0.10.5" }
 libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a8725d161fe8b3ed73a6758b21e177" }
 log = { version = "0.4.17" }
@@ -45,19 +46,20 @@ num-traits = "0.2.15"
 once_cell = { version = "1.16.0" }
 path-absolutize = { version = "3.0.14", features = ["once_cell_cache", "use_unix_paths_on_wasm"] }
 regex = { version = "1.6.0" }
-ropey = { version = "1.5.0", features = ["cr_lines", "simd"], default-features = false }
-ruff_macros = { version = "0.0.225", path = "ruff_macros" }
+ruff_macros = { version = "0.0.231", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "acbc517b55406c76da83d7b2711941d8d3f65b87" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "acbc517b55406c76da83d7b2711941d8d3f65b87" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "acbc517b55406c76da83d7b2711941d8d3f65b87" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
 schemars = { version = "0.8.11" }
 semver = { version = "1.0.16" }
 serde = { version = "1.0.147", features = ["derive"] }
 shellexpand = { version = "3.0.0" }
+smallvec = { version = "1.10.0" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
 textwrap = { version = "0.16.0" }
+thiserror = { version = "1.0" }
 titlecase = { version = "2.2.1" }
 toml_edit = { version = "0.17.1", features = ["easy"] }

@@ -95,7 +97,3 @@ opt-level = 3
 # https://github.com/bytecodealliance/wasm-tools/blob/b5c3d98e40590512a3b12470ef358d5c7b983b15/crates/wasmparser/src/limits.rs#L29
 [profile.dev.package.rustpython-parser]
 opt-level = 1
-
-[[bench]]
-name = "source_code_locator"
-harness = false
--- a/README.md
+++ b/README.md
--- a/benches/source_code_locator.rs
+++ b/benches/source_code_locator.rs
@@ -1,18 +0,0 @@
-use std::fs;
-use std::path::Path;
-
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use ropey::Rope;
-
-fn criterion_benchmark(c: &mut Criterion) {
-    let contents = fs::read_to_string(Path::new("resources/test/fixtures/D.py")).unwrap();
-    c.bench_function("rope", |b| {
-        b.iter(|| {
-            let rope = Rope::from_str(black_box(&contents));
-            rope.line_to_char(black_box(4));
-        });
-    });
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);
--- a/build.rs
+++ b/build.rs
@@ -1,84 +0,0 @@
-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_origin_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 `RuleOrigin` enum
-/// accordingly, so that they can be used by `ruff_dev::generate_rules_table`.
-fn generate_origin_name_and_url(out_dir: &Path) {
-    println!("cargo:rerun-if-changed=src/rules/");
-
-    let mut name_match_arms: String = r#"RuleOrigin::Ruff => "Ruff-specific rules","#.into();
-    let mut url_match_arms: String = r#"RuleOrigin::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#"RuleOrigin::{variant_name} => "{name}","#));
-        url_match_arms.push_str(&format!(r#"RuleOrigin::{variant_name} => Some("{url}"),"#));
-    }
-
-    write!(
-        BufWriter::new(fs::File::create(out_dir.join("origin.rs")).unwrap()),
-        "
-        impl RuleOrigin {{
-            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.225"
+version = "0.0.231"
 dependencies = [
 "anyhow",
 "clap",
@@ -1975,7 +1975,7 @@ dependencies = [

 [[package]]
 name = "ruff"
-version = "0.0.225"
+version = "0.0.231"
 dependencies = [
 "anyhow",
 "bincode",
--- a/flake8_to_ruff/Cargo.toml
+++ b/flake8_to_ruff/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.225"
+version = "0.0.231"
 edition = "2021"

 [dependencies]
--- a/flake8_to_ruff/src/main.rs
+++ b/flake8_to_ruff/src/main.rs
@@ -18,7 +18,7 @@ use std::path::PathBuf;
 use anyhow::Result;
 use clap::Parser;
 use configparser::ini::Ini;
-use ruff::flake8_to_ruff;
+use ruff::flake8_to_ruff::{self, ExternalConfig};

 #[derive(Parser)]
 #[command(
@@ -48,14 +48,18 @@ fn main() -> Result<()> {
    let config = ini.load(cli.file).map_err(|msg| anyhow::anyhow!(msg))?;

    // Read the pyproject.toml file.
-    let black = cli
-        .pyproject
-        .map(flake8_to_ruff::parse_black_options)
-        .transpose()?
-        .flatten();
+    let pyproject = cli.pyproject.map(flake8_to_ruff::parse).transpose()?;
+    let external_config = pyproject
+        .as_ref()
+        .and_then(|pyproject| pyproject.tool.as_ref())
+        .map(|tool| ExternalConfig {
+            black: tool.black.as_ref(),
+            isort: tool.isort.as_ref(),
+        })
+        .unwrap_or_default();

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

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

 [project]
 name = "ruff"
-version = "0.0.225"
+version = "0.0.231"
 description = "An extremely fast Python linter, written in Rust."
 authors = [
  { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" },
--- a/resources/test/fixtures/flake8_bandit/S612.py
+++ b/resources/test/fixtures/flake8_bandit/S612.py
@@ -0,0 +1,8 @@
+import logging.config
+
+t = logging.config.listen(9999)
+
+def verify_func():
+    pass
+
+l = logging.config.listen(9999, verify=verify_func)
--- 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
@@ -383,7 +383,7 @@ s = (

 s2 = (
    'this'
-    'is a also a string'
+    'is also a string'
 )

 t = (
--- 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_import_conventions/from_imports.py
+++ b/resources/test/fixtures/flake8_import_conventions/from_imports.py
@@ -0,0 +1,21 @@
+# Test absolute imports
+# Violation cases
+import xml.dom.minidom
+import xml.dom.minidom as wrong
+from xml.dom import minidom as wrong
+from xml.dom import minidom
+from xml.dom.minidom import parseString as wrong  # Ensure ICN001 throws on function import.
+from xml.dom.minidom import parseString
+from xml.dom.minidom import parse, parseString
+from xml.dom.minidom import parse as ps, parseString as wrong
+
+# No ICN001 violations
+import xml.dom.minidom as md
+from xml.dom import minidom as md
+from xml.dom.minidom import parseString as pstr
+from xml.dom.minidom import parse, parseString as pstr
+from xml.dom.minidom import parse as ps, parseString as pstr
+
+
+# Test relative imports
+from ..xml.dom import minidom as okay  # Ensure config "xml.dom.minidom" doesn't catch relative imports
--- a/resources/test/fixtures/flake8_no_pep420/test_pass_init/init.py
+++ b/resources/test/fixtures/flake8_no_pep420/test_pass_init/init.py
--- a/resources/test/fixtures/flake8_no_pep420/test_pass_init/example.py
+++ b/resources/test/fixtures/flake8_no_pep420/test_pass_init/example.py
--- a/resources/test/fixtures/flake8_no_pep420/test_pass_namespace_package/example.py
+++ b/resources/test/fixtures/flake8_no_pep420/test_pass_namespace_package/example.py
--- a/resources/test/fixtures/flake8_pie/PIE800.py
+++ b/resources/test/fixtures/flake8_pie/PIE800.py
@@ -0,0 +1,17 @@
+{"foo": 1, **{"bar": 1}}  # PIE800
+
+foo({**foo, **{"bar": True}})  # PIE800
+
+{**foo, **{"bar": 10}}  # PIE800
+
+{**foo, **buzz, **{bar: 10}}  # PIE800
+
+{**foo,    "bar": True  }  # OK
+
+{"foo": 1, "buzz": {"bar": 1}}  # OK
+
+{**foo,    "bar": True  }  # OK
+
+Table.objects.filter(inst=inst, **{f"foo__{bar}__exists": True})  # OK
+
+buzz = {**foo, "bar": { 1: 2 }}  # OK
--- a/resources/test/fixtures/flake8_pie/PIE804.py
+++ b/resources/test/fixtures/flake8_pie/PIE804.py
@@ -0,0 +1,19 @@
+foo(**{"bar": True})  # PIE804
+
+foo(**{"r2d2": True})  # PIE804
+
+Foo.objects.create(**{"bar": True})  # PIE804
+
+Foo.objects.create(**{"_id": some_id})  # PIE804
+
+Foo.objects.create(**{**bar})  # PIE804
+
+
+foo(**{**data, "foo": "buzz"})
+foo(**buzz)
+foo(**{"bar-foo": True})
+foo(**{"bar foo": True})
+foo(**{"1foo": True})
+foo(**{buzz: True})
+foo(**{"": True})
+foo(**{f"buzz__{bar}": True})
--- 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,131 @@
-if a:  # SIM102
+# SIM102
+if a:
    if b:
        c

+# SIM102
+if a:
+    if b:
+        if c:
+            d

+# SIM102
 if a:
    pass
-elif b:  # SIM102
+elif b:
    if c:
        d

+# SIM102
+if a:
+    # Unfixable due to placement of this comment.
+    if b:
+        c
+
+# SIM102
+if a:
+    if b:
+        # Fixable due to placement of this comment.
+        c
+
+# OK
 if a:
    if b:
        c
    else:
        d

+# OK
 if __name__ == "__main__":
    if foo():
        ...

+# OK
 if a:
    d
    if b:
        c
+
+while True:
+    # SIM102
+    if True:
+        if True:
+            """this
+is valid"""
+
+            """the indentation on
+            this line is significant"""
+
+            "this is" \
+"allowed too"
+
+            ("so is"
+"this for some reason")
+
+
+# SIM102
+if True:
+    if True:
+        """this
+is valid"""
+
+        """the indentation on
+        this line is significant"""
+
+        "this is" \
+"allowed too"
+
+        ("so is"
+"this for some reason")
+
+while True:
+    # SIM102
+    if node.module:
+        if node.module == "multiprocessing" or node.module.startswith(
+            "multiprocessing."
+        ):
+            print("Bad module!")
+
+# SIM102
+if node.module:
+    if node.module == "multiprocessing" or node.module.startswith(
+        "multiprocessing."
+    ):
+        print("Bad module!")
+
+
+# OK
+if a:
+    if b:
+        print("foo")
+else:
+    print("bar")
+
+# OK
+if a:
+    if b:
+        if c:
+            print("foo")
+        else:
+            print("bar")
+else:
+    print("bar")
+
+# OK
+if a:
+    # SIM 102
+    if b:
+        if c:
+            print("foo")
+else:
+    print("bar")
+
+
+# OK
+if a:
+    if b:
+        if c:
+            print("foo")
+        print("baz")
+else:
+    print("bar")
--- a/resources/test/fixtures/flake8_simplify/SIM103.py
+++ b/resources/test/fixtures/flake8_simplify/SIM103.py
@@ -42,3 +42,11 @@ def f():
        return "foo"
    else:
        return False
+
+
+def f():
+    # SIM103 (but not fixable)
+    if a:
+        return False
+    else:
+        return True
--- 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/SIM117.py
+++ b/resources/test/fixtures/flake8_simplify/SIM117.py
@@ -1,30 +1,92 @@
-with A() as a:  # SIM117
+# SIM117
+with A() as a:
    with B() as b:
        print("hello")

-with A():  # SIM117
+# 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/flake8_use_pathlib/full_name.py
+++ b/resources/test/fixtures/flake8_use_pathlib/full_name.py
@@ -0,0 +1,31 @@
+import os
+import os.path
+
+p = "/foo"
+
+a = os.path.abspath(p)
+aa = os.chmod(p)
+aaa = os.mkdir(p)
+os.makedirs(p)
+os.rename(p)
+os.replace(p)
+os.rmdir(p)
+os.remove(p)
+os.unlink(p)
+os.getcwd(p)
+b = os.path.exists(p)
+bb = os.path.expanduser(p)
+bbb = os.path.isdir(p)
+bbbb = os.path.isfile(p)
+bbbbb = os.path.islink(p)
+os.readlink(p)
+os.stat(p)
+os.path.isabs(p)
+os.path.join(p)
+os.path.basename(p)
+os.path.dirname(p)
+os.path.samefile(p)
+os.path.splitext(p)
+with open(p) as fp:
+    fp.read()
+open(p).close()
--- a/resources/test/fixtures/flake8_use_pathlib/import_as.py
+++ b/resources/test/fixtures/flake8_use_pathlib/import_as.py
@@ -0,0 +1,28 @@
+import os as foo
+import os.path as foo_p
+
+p = "/foo"
+
+a = foo_p.abspath(p)
+aa = foo.chmod(p)
+aaa = foo.mkdir(p)
+foo.makedirs(p)
+foo.rename(p)
+foo.replace(p)
+foo.rmdir(p)
+foo.remove(p)
+foo.unlink(p)
+foo.getcwd(p)
+b = foo_p.exists(p)
+bb = foo_p.expanduser(p)
+bbb = foo_p.isdir(p)
+bbbb = foo_p.isfile(p)
+bbbbb = foo_p.islink(p)
+foo.readlink(p)
+foo.stat(p)
+foo_p.isabs(p)
+foo_p.join(p)
+foo_p.basename(p)
+foo_p.dirname(p)
+foo_p.samefile(p)
+foo_p.splitext(p)
--- a/resources/test/fixtures/flake8_use_pathlib/import_from.py
+++ b/resources/test/fixtures/flake8_use_pathlib/import_from.py
@@ -0,0 +1,33 @@
+from os import chmod, mkdir, makedirs, rename, replace, rmdir
+from os import remove, unlink, getcwd, readlink, stat
+from os.path import abspath, exists, expanduser, isdir, isfile, islink
+from os.path import isabs, join, basename, dirname, samefile, splitext
+
+p = "/foo"
+
+a = abspath(p)
+aa = chmod(p)
+aaa = mkdir(p)
+makedirs(p)
+rename(p)
+replace(p)
+rmdir(p)
+remove(p)
+unlink(p)
+getcwd(p)
+b = exists(p)
+bb = expanduser(p)
+bbb = isdir(p)
+bbbb = isfile(p)
+bbbbb = islink(p)
+readlink(p)
+stat(p)
+isabs(p)
+join(p)
+basename(p)
+dirname(p)
+samefile(p)
+splitext(p)
+with open(p) as fp:
+    fp.read()
+open(p).close()
--- a/resources/test/fixtures/flake8_use_pathlib/import_from_as.py
+++ b/resources/test/fixtures/flake8_use_pathlib/import_from_as.py
@@ -0,0 +1,35 @@
+from os import chmod as xchmod, mkdir as xmkdir
+from os import makedirs as xmakedirs, rename as xrename, replace as xreplace
+from os import rmdir as xrmdir, remove as xremove, unlink as xunlink
+from os import getcwd as xgetcwd, readlink as xreadlink, stat as xstat
+from os.path import abspath as xabspath, exists as xexists
+from os.path import expanduser as xexpanduser, isdir as xisdir
+from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
+from os.path import join as xjoin, basename as xbasename, dirname as xdirname
+from os.path import samefile as xsamefile, splitext as xsplitext
+
+p = "/foo"
+
+a = xabspath(p)
+aa = xchmod(p)
+aaa = xmkdir(p)
+xmakedirs(p)
+xrename(p)
+xreplace(p)
+xrmdir(p)
+xremove(p)
+xunlink(p)
+xgetcwd(p)
+b = xexists(p)
+bb = xexpanduser(p)
+bbb = xisdir(p)
+bbbb = xisfile(p)
+bbbbb = xislink(p)
+xreadlink(p)
+xstat(p)
+xisabs(p)
+xjoin(p)
+xbasename(p)
+xdirname(p)
+xsamefile(p)
+xsplitext(p)
--- a/resources/test/fixtures/flake8_use_pathlib/py_path_1.py
+++ b/resources/test/fixtures/flake8_use_pathlib/py_path_1.py
@@ -0,0 +1,3 @@
+import py
+
+p = py.path.local("../foo")
--- a/resources/test/fixtures/flake8_use_pathlib/py_path_2.py
+++ b/resources/test/fixtures/flake8_use_pathlib/py_path_2.py
@@ -0,0 +1,3 @@
+from py.path import local as path
+
+p = path("/foo")
--- a/resources/test/fixtures/isort/line_ending_cr.py
+++ b/resources/test/fixtures/isort/line_ending_cr.py
@@ -1 +0,0 @@
-from long_module_name import member_one, member_two, member_three, member_four, member_five
--- 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/pep8_naming/N806.py
+++ b/resources/test/fixtures/pep8_naming/N806.py
@@ -1,5 +1,7 @@
 import collections
 from collections import namedtuple
+from typing import TypeVar
+from typing import NewType

 GLOBAL: str = "foo"

@@ -11,5 +13,9 @@ def f():
    Camel = 0
    CONSTANT = 0
    _ = 0
+
    MyObj1 = collections.namedtuple("MyObj1", ["a", "b"])
    MyObj2 = namedtuple("MyObj12", ["a", "b"])
+
+    T = TypeVar("T")
+    UserId = NewType('UserId', int)
--- 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,101 @@
+"""This module docstring does not need to be written in imperative mood."""
+
+from functools import cached_property
+
+# Bad examples
+
+def bad_liouiwnlkjl():
+    """Returns foo."""
+
+
+def bad_sdgfsdg23245():
+    """Constructor for a foo."""
+
+
+def bad_sdgfsdg23245777():
+    """
+
+    Constructor for a boa.
+
+    """
+
+
+def bad_run_something():
+    """Runs something"""
+
+    def bad_nested():
+        """Runs other things, nested"""
+
+    bad_nested()
+
+
+def multi_line():
+    """Writes a logical line that
+    extends to two physical lines.
+    """
+
+
+# Good examples
+
+def good_run_something():
+    """Run away."""
+
+    def good_nested():
+        """Run to the hills."""
+
+    good_nested()
+
+
+def good_construct():
+    """Construct a beautiful house."""
+
+
+def good_multi_line():
+    """Write a logical line that
+    extends to two physical lines.
+    """
+
+
+good_top_level_var = False
+"""This top level assignment attribute docstring does not need to be written in imperative mood."""
+
+
+# Classes and their members
+
+class Thingy:
+    """This class docstring does not need to be written in imperative mood."""
+
+    _beep = "boop"
+    """This class attribute docstring does not need to be written in imperative mood."""
+
+    def bad_method(self):
+        """This method docstring should be written in imperative mood."""
+
+    @property
+    def good_property(self):
+        """This property method docstring does not need to be written in imperative mood."""
+        return self._beep
+
+    @cached_property
+    def good_cached_property(self):
+        """This property method docstring does not need to be written in imperative mood."""
+        return 42 * 42
+
+    class NestedThingy:
+        """This nested class docstring does not need to be written in imperative mood."""
+
+
+# Test functions
+
+def test_something():
+    """This test function does not need to be written in imperative mood.
+
+    pydocstyle's rationale:
+    We exclude tests from the imperative mood check, because to phrase
+    their docstring in the imperative mood, they would have to start with
+    a highly redundant "Test that ..."
+    """
+
+
+def runTest():
+    """This test function does not need to be written in imperative mood, either."""
--- 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/UP013.py
+++ b/resources/test/fixtures/pyupgrade/UP013.py
@@ -31,3 +31,7 @@ MyType10 = TypedDict("MyType10", {"key": Literal["value"]})

 # using namespace TypedDict
 MyType11 = typing.TypedDict("MyType11", {"key": int})
+
+# unpacking
+c = {"c": float}
+MyType12 = TypedDict("MyType1", {"a": int, "b": str, **c})
--- a/resources/test/fixtures/pyupgrade/UP031_0.py
+++ b/resources/test/fixtures/pyupgrade/UP031_0.py
@@ -0,0 +1,75 @@
+a, b, x, y = 1, 2, 3, 4
+
+# UP031
+print('%s %s' % (a, b))
+
+print('%s%s' % (a, b))
+
+print("trivial" % ())
+
+print("%s" % ("simple",))
+
+print("%s" % ("%s" % ("nested",),))
+
+print("%s%% percent" % (15,))
+
+print("%f" % (15,))
+
+print("%.f" % (15,))
+
+print("%.3f" % (15,))
+
+print("%3f" % (15,))
+
+print("%-5f" % (5,))
+
+print("%9f" % (5,))
+
+print("%#o" % (123,))
+
+print("brace {} %s" % (1,))
+
+print(
+  "%s" % (
+    "trailing comma",
+        )
+)
+
+print("foo %s " % (x,))
+
+print("%(k)s" % {"k": "v"})
+
+print("%(k)s" % {
+    "k": "v",
+    "i": "j"
+})
+
+print("%(to_list)s" % {"to_list": []})
+
+print("%(k)s" % {"k": "v", "i": 1, "j": []})
+
+print("%(ab)s" % {"a" "b": 1})
+
+print("%(a)s" % {"a"  :  1})
+
+print((
+    "foo %s "
+    "bar %s" % (x, y)
+))
+
+print(
+    "foo %(foo)s "
+    "bar %(bar)s" % {"foo": x, "bar": y}
+)
+
+bar = {"bar": y}
+print(
+    "foo %(foo)s "
+    "bar %(bar)s" % {"foo": x, **bar}
+)
+
+print("%s \N{snowman}" % (a,))
+
+print("%(foo)s \N{snowman}" % {"foo": 1})
+
+print(("foo %s " "bar %s") % (x, y))
--- 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/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/TRY004.py
+++ b/resources/test/fixtures/tryceratops/TRY004.py
@@ -0,0 +1,296 @@
+"""
+Violation:
+
+Prefer TypeError when relevant.
+"""
+
+
+def incorrect_basic(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_multiple_type_check(some_arg):
+    if isinstance(some_arg, (int, str)):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+class MyClass:
+    pass
+
+
+def incorrect_with_issubclass(some_arg):
+    if issubclass(some_arg, MyClass):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_with_callable(some_arg):
+    if callable(some_arg):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_ArithmeticError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise ArithmeticError("...")  # should be typeerror
+
+
+def incorrect_AssertionError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise AssertionError("...")  # should be typeerror
+
+
+def incorrect_AttributeError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise AttributeError("...")  # should be typeerror
+
+
+def incorrect_BufferError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise BufferError  # should be typeerror
+
+
+def incorrect_EOFError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise EOFError("...")  # should be typeerror
+
+
+def incorrect_ImportError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise ImportError("...")  # should be typeerror
+
+
+def incorrect_LookupError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise LookupError("...")  # should be typeerror
+
+
+def incorrect_MemoryError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        # should be typeerror
+        # not multiline is on purpose for fix
+        raise MemoryError(
+            "..."
+        )  
+
+
+def incorrect_NameError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise NameError("...")  # should be typeerror
+
+
+def incorrect_ReferenceError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise ReferenceError("...")  # should be typeerror
+
+
+def incorrect_RuntimeError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise RuntimeError("...")  # should be typeerror
+
+
+def incorrect_SyntaxError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise SyntaxError("...")  # should be typeerror
+
+
+def incorrect_SystemError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise SystemError("...")  # should be typeerror
+
+
+def incorrect_ValueError(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise ValueError("...")  # should be typeerror
+
+
+def incorrect_not_operator_isinstance(some_arg):
+    if not isinstance(some_arg):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_and_operator_isinstance(arg1, arg2):
+    if isinstance(some_arg) and isinstance(arg2):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_or_operator_isinstance(arg1, arg2):
+    if isinstance(some_arg) or isinstance(arg2):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_multiple_operators_isinstance(arg1, arg2, arg3):
+    if not isinstance(arg1) and isinstance(arg2) or isinstance(arg3):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_not_operator_callable(some_arg):
+    if not callable(some_arg):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_and_operator_callable(arg1, arg2):
+    if callable(some_arg) and callable(arg2):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_or_operator_callable(arg1, arg2):
+    if callable(some_arg) or callable(arg2):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_multiple_operators_callable(arg1, arg2, arg3):
+    if not callable(arg1) and callable(arg2) or callable(arg3):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_not_operator_issubclass(some_arg):
+    if not issubclass(some_arg):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_and_operator_issubclass(arg1, arg2):
+    if issubclass(some_arg) and issubclass(arg2):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_or_operator_issubclass(arg1, arg2):
+    if issubclass(some_arg) or issubclass(arg2):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_multiple_operators_issubclass(arg1, arg2, arg3):
+    if not issubclass(arg1) and issubclass(arg2) or issubclass(arg3):
+        pass
+    else:
+        raise Exception("...")  # should be typeerror
+
+
+def incorrect_multi_conditional(arg1, arg2):
+    if isinstance(arg1, int):
+        pass
+    elif isinstance(arg2, int):
+        raise Exception("...")  # should be typeerror
+
+
+class MyCustomTypeValidation(Exception):
+    pass
+
+
+def correct_custom_exception(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise MyCustomTypeValidation("...")  # that's correct, because it's not vanilla
+
+
+def correct_complex_conditional(val):
+    if val is not None and (not isinstance(val, int) or val < 0):
+        raise ValueError(...)  # fine if this is not a TypeError
+
+
+def correct_multi_conditional(some_arg):
+    if some_arg == 3:
+        pass
+    elif isinstance(some_arg, int):
+        pass
+    else:
+        raise Exception("...")  # fine if this is not a TypeError
+
+
+def correct_should_ignore(some_arg):
+    if isinstance(some_arg, int):
+        pass
+    else:
+        raise TypeError("...")
+
+
+def check_body(some_args):
+    if isinstance(some_args, int):
+        raise ValueError("...") # should be typeerror
+
+
+def check_body_correct(some_args):
+    if isinstance(some_args, int):
+        raise TypeError("...") # correct
+
+
+def multiple_elifs(some_args):
+    if not isinstance(some_args, int):
+        raise ValueError("...") # should be typerror
+    elif some_args < 3:
+        raise ValueError("...")  # this is ok
+    elif some_args > 10:
+        raise ValueError("...")  # this is ok if we don't simplify
+    else:
+        pass
+
+
+def multiple_ifs(some_args):
+    if not isinstance(some_args, int):
+        raise ValueError("...") # should be typerror
+    else:
+        if some_args < 3:
+            raise ValueError("...")  # this is ok
+        else:
+            if some_args > 10:
+                raise ValueError("...")  # this is ok if we don't simplify
+            else:
+                pass
--- a/resources/test/fixtures/tryceratops/TRY201.py
+++ b/resources/test/fixtures/tryceratops/TRY201.py
@@ -0,0 +1,54 @@
+"""
+Violation:
+
+Raising an exception using its assigned name is verbose and unrequired
+"""
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class MyException(Exception):
+    pass
+
+
+def bad():
+    try:
+        process()
+    except MyException as e:
+        logger.exception("process failed")
+        raise e
+
+
+def good():
+    try:
+        process()
+    except MyException:
+        logger.exception("process failed")
+        raise
+
+def still_good():
+    try:
+        process()
+    except MyException as e:
+        print(e)
+        raise
+
+
+def bad_that_needs_recursion():
+    try:
+        process()
+    except MyException as e:
+        logger.exception("process failed")
+        if True:
+            raise e
+
+
+def bad_that_needs_recursion_2():
+    try:
+        process()
+    except MyException as e:
+        logger.exception("process failed")
+        if True:
+            def foo():
+                raise e
--- 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,11 +255,11 @@
        "null"
      ],
      "items": {
-        "$ref": "#/definitions/RuleCodePrefix"
+        "$ref": "#/definitions/RuleSelector"
      }
    },
    "ignore-init-module-imports": {
-      "description": "Avoid automatically removing unused imports in `__init__.py` files. Such imports will still be +flagged, but with a dedicated message suggesting that the import is either added to the module' +`__all__` symbol, or re-exported with a redundant alias (e.g., `import os as os`).",
+      "description": "Avoid automatically removing unused imports in `__init__.py` files. Such imports will still be flagged, but with a dedicated message suggesting that the import is either added to the module's `__all__` symbol, or re-exported with a redundant alias (e.g., `import os as os`).",
      "type": [
        "boolean",
        "null"
@@ -315,7 +326,7 @@
      "additionalProperties": {
        "type": "array",
        "items": {
-          "$ref": "#/definitions/RuleCodePrefix"
+          "$ref": "#/definitions/RuleSelector"
        }
      }
    },
@@ -341,6 +352,17 @@
        }
      ]
    },
+    "pylint": {
+      "description": "Options for the `pylint` plugin.",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/PylintOptions"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
    "pyupgrade": {
      "description": "Options for the `pyupgrade` plugin.",
      "anyOf": [
@@ -377,7 +399,7 @@
        "null"
      ],
      "items": {
-        "$ref": "#/definitions/RuleCodePrefix"
+        "$ref": "#/definitions/RuleSelector"
      }
    },
    "show-source": {
@@ -435,7 +457,7 @@
        "null"
      ],
      "items": {
-        "$ref": "#/definitions/RuleCodePrefix"
+        "$ref": "#/definitions/RuleSelector"
      }
    },
    "update-check": {
@@ -461,6 +483,17 @@
      },
      "additionalProperties": false
    },
+    "ConstantType": {
+      "type": "string",
+      "enum": [
+        "bytes",
+        "complex",
+        "float",
+        "int",
+        "str",
+        "tuple"
+      ]
+    },
    "Convention": {
      "oneOf": [
        {
@@ -562,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": {
@@ -762,6 +811,16 @@
      },
      "additionalProperties": false
    },
+    "ImportType": {
+      "type": "string",
+      "enum": [
+        "future",
+        "standard-library",
+        "third-party",
+        "first-party",
+        "local-folder"
+      ]
+    },
    "IsortOptions": {
      "type": "object",
      "properties": {
@@ -782,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": [
@@ -833,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": [
@@ -877,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
@@ -1006,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": [
@@ -1056,7 +1161,7 @@
        }
      ]
    },
-    "RuleCodePrefix": {
+    "RuleSelector": {
      "type": "string",
      "enum": [
        "A",
@@ -1199,6 +1304,7 @@
        "D4",
        "D40",
        "D400",
+        "D401",
        "D402",
        "D403",
        "D404",
@@ -1232,6 +1338,9 @@
        "DTZ011",
        "DTZ012",
        "E",
+        "E1",
+        "E10",
+        "E101",
        "E4",
        "E40",
        "E401",
@@ -1269,6 +1378,12 @@
        "ERA0",
        "ERA00",
        "ERA001",
+        "EXE",
+        "EXE0",
+        "EXE00",
+        "EXE003",
+        "EXE004",
+        "EXE005",
        "F",
        "F4",
        "F40",
@@ -1438,16 +1553,15 @@
        "PIE796",
        "PIE8",
        "PIE80",
+        "PIE800",
+        "PIE804",
        "PIE807",
+        "PL",
        "PLC",
        "PLC0",
        "PLC04",
        "PLC041",
        "PLC0414",
-        "PLC2",
-        "PLC22",
-        "PLC220",
-        "PLC2201",
        "PLC3",
        "PLC30",
        "PLC300",
@@ -1521,6 +1635,36 @@
        "PT024",
        "PT025",
        "PT026",
+        "PTH",
+        "PTH1",
+        "PTH10",
+        "PTH100",
+        "PTH101",
+        "PTH102",
+        "PTH103",
+        "PTH104",
+        "PTH105",
+        "PTH106",
+        "PTH107",
+        "PTH108",
+        "PTH109",
+        "PTH11",
+        "PTH110",
+        "PTH111",
+        "PTH112",
+        "PTH113",
+        "PTH114",
+        "PTH115",
+        "PTH116",
+        "PTH117",
+        "PTH118",
+        "PTH119",
+        "PTH12",
+        "PTH120",
+        "PTH121",
+        "PTH122",
+        "PTH123",
+        "PTH124",
        "Q",
        "Q0",
        "Q00",
@@ -1557,6 +1701,7 @@
        "RUF002",
        "RUF003",
        "RUF004",
+        "RUF005",
        "RUF1",
        "RUF10",
        "RUF100",
@@ -1582,6 +1727,9 @@
        "S506",
        "S508",
        "S509",
+        "S6",
+        "S61",
+        "S612",
        "S7",
        "S70",
        "S701",
@@ -1635,6 +1783,20 @@
        "TID25",
        "TID251",
        "TID252",
+        "TRY",
+        "TRY0",
+        "TRY00",
+        "TRY004",
+        "TRY2",
+        "TRY20",
+        "TRY201",
+        "TRY3",
+        "TRY30",
+        "TRY300",
+        "TYP",
+        "TYP0",
+        "TYP00",
+        "TYP005",
        "U",
        "U0",
        "U00",
@@ -1691,8 +1853,10 @@
        "UP029",
        "UP03",
        "UP030",
+        "UP031",
        "UP032",
        "UP033",
+        "UP034",
        "W",
        "W2",
        "W29",
@@ -1730,7 +1894,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.225"
+version = "0.0.231"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 edition = "2021"
 rust-version = "1.65.0"
--- a/ruff_cli/src/cache.rs
+++ b/ruff_cli/src/cache.rs
@@ -35,10 +35,19 @@ fn content_dir() -> &'static Path {
    Path::new("content")
 }

-fn cache_key<P: AsRef<Path>>(path: P, settings: &Settings, autofix: flags::Autofix) -> u64 {
+fn cache_key<P: AsRef<Path>>(
+    path: P,
+    package: Option<&P>,
+    settings: &Settings,
+    autofix: flags::Autofix,
+) -> u64 {
    let mut hasher = DefaultHasher::new();
    CARGO_PKG_VERSION.hash(&mut hasher);
    path.as_ref().absolutize().unwrap().hash(&mut hasher);
+    package
+        .as_ref()
+        .map(|path| path.as_ref().absolutize().unwrap())
+        .hash(&mut hasher);
    settings.hash(&mut hasher);
    autofix.hash(&mut hasher);
    hasher.finish()
@@ -79,13 +88,14 @@ fn read_sync(cache_dir: &Path, key: u64) -> Result<Vec<u8>, std::io::Error> {
 /// Get a value from the cache.
 pub fn get<P: AsRef<Path>>(
    path: P,
+    package: Option<&P>,
    metadata: &fs::Metadata,
    settings: &AllSettings,
    autofix: flags::Autofix,
 ) -> Option<Vec<Message>> {
    let encoded = read_sync(
        &settings.cli.cache_dir,
-        cache_key(path, &settings.lib, autofix),
+        cache_key(path, package, &settings.lib, autofix),
    )
    .ok()?;
    let (mtime, messages) = match bincode::deserialize::<CheckResult>(&encoded[..]) {
@@ -107,6 +117,7 @@ pub fn get<P: AsRef<Path>>(
 /// Set a value in the cache.
 pub fn set<P: AsRef<Path>>(
    path: P,
+    package: Option<&P>,
    metadata: &fs::Metadata,
    settings: &AllSettings,
    autofix: flags::Autofix,
@@ -120,7 +131,7 @@ pub fn set<P: AsRef<Path>>(
    };
    if let Err(e) = write_sync(
        &settings.cli.cache_dir,
-        cache_key(path, &settings.lib, autofix),
+        cache_key(path, package, &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
@@ -1,10 +1,9 @@
-use std::path::{Path, PathBuf};
+use std::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,
@@ -66,18 +65,18 @@ pub struct Cli {
    /// Comma-separated list of rule codes to enable (or ALL, to enable all
    /// rules).
    #[arg(long, value_delimiter = ',', value_name = "RULE_CODE")]
-    pub select: Option<Vec<RuleCodePrefix>>,
+    pub select: Option<Vec<RuleSelector>>,
    /// Like --select, but adds additional rule codes on top of the selected
    /// ones.
    #[arg(long, value_delimiter = ',', value_name = "RULE_CODE")]
-    pub extend_select: Option<Vec<RuleCodePrefix>>,
+    pub extend_select: Option<Vec<RuleSelector>>,
    /// Comma-separated list of rule codes to disable.
    #[arg(long, value_delimiter = ',', value_name = "RULE_CODE")]
-    pub ignore: Option<Vec<RuleCodePrefix>>,
+    pub ignore: Option<Vec<RuleSelector>>,
    /// Like --ignore, but adds additional rule codes on top of the ignored
    /// ones.
    #[arg(long, value_delimiter = ',', value_name = "RULE_CODE")]
-    pub extend_ignore: Option<Vec<RuleCodePrefix>>,
+    pub extend_ignore: Option<Vec<RuleSelector>>,
    /// List of paths, used to omit files and/or directories from analysis.
    #[arg(long, value_delimiter = ',', value_name = "FILE_PATTERN")]
    pub exclude: Option<Vec<FilePattern>>,
@@ -88,11 +87,11 @@ pub struct Cli {
    /// List of rule codes to treat as eligible for autofix. Only applicable
    /// when autofix itself is enabled (e.g., via `--fix`).
    #[arg(long, value_delimiter = ',', value_name = "RULE_CODE")]
-    pub fixable: Option<Vec<RuleCodePrefix>>,
+    pub fixable: Option<Vec<RuleSelector>>,
    /// List of rule codes to treat as ineligible for autofix. Only applicable
    /// when autofix itself is enabled (e.g., via `--fix`).
    #[arg(long, value_delimiter = ',', value_name = "RULE_CODE")]
-    pub unfixable: Option<Vec<RuleCodePrefix>>,
+    pub unfixable: Option<Vec<RuleSelector>>,
    /// List of mappings from file pattern to code to exclude
    #[arg(long, value_delimiter = ',')]
    pub per_file_ignores: Option<Vec<PatternPrefixPair>>,
@@ -169,6 +168,7 @@ pub struct Cli {
    /// Explain a rule.
    #[arg(
        long,
+        value_parser=Rule::from_code,
        // Fake subcommands.
        conflicts_with = "add_noqa",
        conflicts_with = "clean",
@@ -180,7 +180,7 @@ pub struct Cli {
        conflicts_with = "stdin_filename",
        conflicts_with = "watch",
    )]
-    pub explain: Option<RuleCode>,
+    pub explain: Option<&'static Rule>,
    /// Generate shell completion
    #[arg(
        long,
@@ -302,7 +302,7 @@ pub struct Arguments {
    pub config: Option<PathBuf>,
    pub diff: bool,
    pub exit_zero: bool,
-    pub explain: Option<RuleCode>,
+    pub explain: Option<&'static Rule>,
    pub files: Vec<PathBuf>,
    pub generate_shell_completion: Option<clap_complete_command::Shell>,
    pub isolated: bool,
@@ -323,17 +323,17 @@ pub struct Overrides {
    pub dummy_variable_rgx: Option<Regex>,
    pub exclude: Option<Vec<FilePattern>>,
    pub extend_exclude: Option<Vec<FilePattern>>,
-    pub extend_ignore: Option<Vec<RuleCodePrefix>>,
-    pub extend_select: Option<Vec<RuleCodePrefix>>,
-    pub fixable: Option<Vec<RuleCodePrefix>>,
-    pub ignore: Option<Vec<RuleCodePrefix>>,
+    pub extend_ignore: Option<Vec<RuleSelector>>,
+    pub extend_select: Option<Vec<RuleSelector>>,
+    pub fixable: Option<Vec<RuleSelector>>,
+    pub ignore: Option<Vec<RuleSelector>>,
    pub line_length: Option<usize>,
    pub 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>,
@@ -434,7 +434,7 @@ pub fn extract_log_level(cli: &Arguments) -> LogLevel {

 /// Convert a list of `PatternPrefixPair` structs to `PerFileIgnore`.
 pub fn collect_per_file_ignores(pairs: Vec<PatternPrefixPair>) -> Vec<PerFileIgnore> {
-    let mut per_file_ignores: FxHashMap<String, Vec<RuleCodePrefix>> = FxHashMap::default();
+    let mut per_file_ignores: FxHashMap<String, Vec<RuleSelector>> = FxHashMap::default();
    for pair in pairs {
        per_file_ignores
            .entry(pair.pattern)
@@ -443,9 +443,6 @@ pub fn collect_per_file_ignores(pairs: Vec<PatternPrefixPair>) -> Vec<PerFileIgn
    }
    per_file_ignores
        .into_iter()
-        .map(|(pattern, prefixes)| {
-            let absolute = fs::normalize_path(Path::new(&pattern));
-            PerFileIgnore::new(pattern, absolute, &prefixes)
-        })
+        .map(|(pattern, prefixes)| PerFileIgnore::new(pattern, &prefixes, None))
        .collect()
 }
--- 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, Rule, RuleNamespace};
 use ruff::resolver::{FileDiscovery, PyprojectDiscovery};
 use ruff::settings::flags;
 use ruff::settings::types::SerializationFormat;
-use ruff::{fix, fs, packaging, resolver, warn_user_once, IOError};
+use ruff::{fix, fs, packaging, resolver, warn_user_once, AutofixAvailability, IOError};
 use serde::Serialize;
 use walkdir::WalkDir;

@@ -114,7 +114,7 @@ pub fn run(
            .unwrap_or_else(|(path, message)| {
                if let Some(path) = &path {
                    let settings = resolver.resolve(path, pyproject_strategy);
-                    if settings.rules.enabled(&RuleCode::E902) {
+                    if settings.rules.enabled(&Rule::IOError) {
                        Diagnostics::new(vec![Message {
                            kind: IOError(message).into(),
                            location: Location::default(),
@@ -285,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().name(),
-                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().name(),
-                    summary: &code.kind().summary(),
+                    code: rule.code(),
+                    linter: linter.name(),
+                    summary: rule.message_formats()[0],
                })?
            );
        }
@@ -319,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
@@ -55,7 +55,9 @@ pub fn lint_path(
        && matches!(autofix, fix::FixMode::None | fix::FixMode::Generate)
    {
        let metadata = path.metadata()?;
-        if let Some(messages) = cache::get(path, &metadata, settings, autofix.into()) {
+        if let Some(messages) =
+            cache::get(path, package.as_ref(), &metadata, settings, autofix.into())
+        {
            debug!("Cache hit for: {}", path.to_string_lossy());
            return Ok(Diagnostics::new(messages));
        }
@@ -92,7 +94,14 @@ pub fn lint_path(

    // Re-populate the cache.
    if let Some(metadata) = metadata {
-        cache::set(path, &metadata, settings, autofix.into(), &messages);
+        cache::set(
+            path,
+            package.as_ref(),
+            &metadata,
+            settings,
+            autofix.into(),
+            &messages,
+        );
    }

    Ok(Diagnostics { messages, fixed })
--- a/ruff_cli/src/main.rs
+++ b/ruff_cli/src/main.rs
@@ -100,8 +100,7 @@ pub fn main() -> Result<ExitCode> {

 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!
+quoting the executed command, along with the relevant file contents and `pyproject.toml` settings, we'd be very appreciative!
 "#,
            "error".red().bold(),
        );
@@ -158,8 +157,8 @@ we'd be very appreciative!
        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 {
--- a/ruff_cli/src/printer.rs
+++ b/ruff_cli/src/printer.rs
@@ -11,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;
@@ -35,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,
@@ -43,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,
@@ -143,7 +160,7 @@ impl<'a> Printer<'a> {
                            .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,
@@ -177,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);
@@ -248,14 +267,14 @@ impl<'a> Printer<'a> {
                        ":",
                        message.location.column(),
                        ":",
-                        message.kind.code().as_ref(),
+                        message.kind.rule().code(),
                        message.kind.body(),
                    );
                    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(),
@@ -266,7 +285,7 @@ impl<'a> Printer<'a> {
                }
            }
            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
                writeln!(stdout,
                    "{}",
@@ -276,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": {
@@ -293,6 +312,20 @@ impl<'a> Printer<'a> {
                    )?
                )?;
            }
+            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()?;
@@ -361,7 +394,7 @@ fn print_message<T: Write>(stdout: &mut T, message: &Message) -> Result<()> {
        ":".cyan(),
        message.location.column(),
        ":".cyan(),
-        message.kind.code().as_ref().red().bold(),
+        message.kind.rule().code().red().bold(),
        message.kind.body(),
    );
    writeln!(stdout, "{label}")?;
@@ -388,7 +421,7 @@ fn print_message<T: Write>(stdout: &mut T, message: &Message) -> Result<()> {
                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,
                }],
@@ -425,7 +458,7 @@ fn print_grouped_message<T: Write>(
        ":".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(),
    );
    writeln!(stdout, "{label}")?;
@@ -452,7 +485,7 @@ fn print_grouped_message<T: Write>(
                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,
                }],
--- a/ruff_cli/tests/black_compatibility_test.rs
+++ b/ruff_cli/tests/black_compatibility_test.rs
@@ -10,11 +10,8 @@ use std::{fs, process, str};

 use anyhow::{anyhow, Context, Result};
 use assert_cmd::Command;
-use itertools::Itertools;
 use log::info;
 use ruff::logging::{set_up_logging, LogLevel};
-use ruff::registry::RuleOrigin;
-use strum::IntoEnumIterator;
 use walkdir::WalkDir;

 /// Handles `blackd` process and allows submitting code to it for formatting.
@@ -175,13 +172,6 @@ fn test_ruff_black_compatibility() -> Result<()> {
        .filter_map(Result::ok)
        .collect();

-    let codes = RuleOrigin::iter()
-        // Exclude ruff codes, specifically RUF100, because it causes differences that are not a
-        // problem. Ruff would add a `# noqa: W292`  after the first run, black introduces a
-        // newline, and ruff removes the `# noqa: W292` again.
-        .filter(|origin| *origin != RuleOrigin::Ruff)
-        .map(|origin| origin.prefixes().as_list(","))
-        .join(",");
    let ruff_args = [
        "-",
        "--silent",
@@ -189,8 +179,11 @@ fn test_ruff_black_compatibility() -> Result<()> {
        "--fix",
        "--line-length",
        "88",
-        "--select",
-        &codes,
+        "--select ALL",
+        // Exclude ruff codes, specifically RUF100, because it causes differences that are not a
+        // problem. Ruff would add a `# noqa: W292`  after the first run, black introduces a
+        // newline, and ruff removes the `# noqa: W292` again.
+        "--ignore RUF",
    ];

    for entry in paths {
--- 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,6 +1,6 @@
 [package]
 name = "ruff_dev"
-version = "0.0.225"
+version = "0.0.231"
 edition = "2021"

 [dependencies]
@@ -11,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 = "acbc517b55406c76da83d7b2711941d8d3f65b87" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "acbc517b55406c76da83d7b2711941d8d3f65b87" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "acbc517b55406c76da83d7b2711941d8d3f65b87" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
 schemars = { version = "0.8.11" }
 serde_json = {version="1.0.91"}
 strum = { version = "0.24.1", features = ["strum_macros"] }
--- a/ruff_dev/src/generate_rules_table.rs
+++ b/ruff_dev/src/generate_rules_table.rs
@@ -2,7 +2,7 @@

 use anyhow::Result;
 use clap::Args;
-use ruff::registry::{Prefixes, RuleCodePrefix, RuleOrigin};
+use ruff::registry::{Linter, LinterCategory, Rule, RuleNamespace};
 use strum::IntoEnumIterator;

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

-fn generate_table(table_out: &mut String, prefix: &RuleCodePrefix) {
+fn generate_table(table_out: &mut String, rules: impl IntoIterator<Item = Rule>) {
    table_out.push_str("| Code | Name | Message | Fix |");
    table_out.push('\n');
    table_out.push_str("| ---- | ---- | ------- | --- |");
    table_out.push('\n');
-    for rule_code in prefix.codes() {
-        let kind = rule_code.kind();
-        let fix_token = if kind.fixable() { "🛠" } else { "" };
+    for rule in rules {
+        let fix_token = match rule.autofixable() {
+            None => "",
+            Some(_) => "🛠",
+        };
+
        table_out.push_str(&format!(
            "| {} | {} | {} | {} |",
-            kind.code().as_ref(),
-            kind.as_ref(),
-            kind.summary().replace('|', r"\|"),
+            rule.code(),
+            rule.as_ref(),
+            rule.message_formats()[0].replace('|', r"\|"),
            fix_token
        ));
        table_out.push('\n');
@@ -44,22 +47,21 @@ 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 prefixes = origin.prefixes();
-        let codes_csv: String = prefixes.as_list(", ");
-        table_out.push_str(&format!("### {} ({codes_csv})", origin.name()));
+    for linter in Linter::iter() {
+        let codes_csv: String = linter.prefixes().join(", ");
+        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.name(),
+            linter.name(),
            codes_csv,
-            origin.name().to_lowercase().replace(' ', "-"),
+            linter.name().to_lowercase().replace(' ', "-"),
            codes_csv.to_lowercase().replace(',', "-").replace(' ', "")
        ));

-        if let Some(url) = origin.url() {
+        if let Some(url) = linter.url() {
            let host = url
                .trim_start_matches("https://")
                .split('/')
@@ -67,7 +69,7 @@ pub fn main(cli: &Cli) -> Result<()> {
                .unwrap();
            table_out.push_str(&format!(
                "For more, see [{}]({}) on {}.",
-                origin.name(),
+                linter.name(),
                url,
                match host {
                    "pypi.org" => "PyPI",
@@ -75,7 +77,7 @@ pub fn main(cli: &Cli) -> Result<()> {
                    host => panic!(
                        "unexpected host in URL of {}, expected pypi.org or github.com but found \
                         {host}",
-                        origin.name()
+                        linter.name()
                    ),
                }
            ));
@@ -83,15 +85,14 @@ pub fn main(cli: &Cli) -> Result<()> {
            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);
-                }
+        if let Some(categories) = linter.categories() {
+            for LinterCategory(prefix, name, selector) in categories {
+                table_out.push_str(&format!("#### {name} ({prefix})"));
+                table_out.push('\n');
+                generate_table(&mut table_out, selector);
            }
+        } else {
+            generate_table(&mut table_out, &linter);
        }
    }

--- a/ruff_macros/Cargo.toml
+++ b/ruff_macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_macros"
-version = "0.0.225"
+version = "0.0.231"
 edition = "2021"

 [lib]
--- a/ruff_macros/src/define_rule_mapping.rs
+++ b/ruff_macros/src/define_rule_mapping.rs
@@ -1,35 +1,41 @@
+use std::collections::HashMap;
+
 use proc_macro2::Span;
 use quote::quote;
 use syn::parse::Parse;
-use syn::{Ident, Path, Token};
+use syn::{Ident, LitStr, Path, Token};

-pub fn define_rule_mapping(mapping: Mapping) -> proc_macro2::TokenStream {
-    let mut rulecode_variants = quote!();
+pub fn define_rule_mapping(mapping: &Mapping) -> proc_macro2::TokenStream {
+    let mut rule_variants = quote!();
    let mut diagkind_variants = quote!();
-    let mut rulecode_kind_match_arms = quote!();
-    let mut rulecode_origin_match_arms = 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 {
-        rulecode_variants.extend(quote! {#code,});
+    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),});
-        rulecode_kind_match_arms.extend(
-            quote! {RuleCode::#code => DiagnosticKind::#name(<#path as Violation>::placeholder()),},
-        );
-        let origin = get_origin(&code);
-        rulecode_origin_match_arms.extend(quote! {RuleCode::#code => RuleOrigin::#origin,});
-        diagkind_code_match_arms.extend(quote! {DiagnosticKind::#name(..) => &RuleCode::#code, });
-        diagkind_body_match_arms
-            .extend(quote! {DiagnosticKind::#name(x) => Violation::message(x), });
+        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! {DiagnosticKind::#name(x) => x.autofix_title_formatter().is_some(),});
-        diagkind_commit_match_arms.extend(
-            quote! {DiagnosticKind::#name(x) => x.autofix_title_formatter().map(|f| f(x)), },
-        );
+            .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 {
@@ -39,44 +45,69 @@ pub fn define_rule_mapping(mapping: Mapping) -> proc_macro2::TokenStream {
        });
    }

+    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(
-            AsRefStr,
-            RuleCodePrefix,
            EnumIter,
-            EnumString,
            Debug,
-            Display,
            PartialEq,
            Eq,
            Clone,
-            Serialize,
-            Deserialize,
            Hash,
            PartialOrd,
            Ord,
+            AsRefStr,
        )]
-        pub enum RuleCode { #rulecode_variants }
+        #[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 RuleCode {
-            /// A placeholder representation of the `DiagnosticKind` for the diagnostic.
-            pub fn kind(&self) -> DiagnosticKind {
-                match self { #rulecode_kind_match_arms }
+        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 origin(&self) -> RuleOrigin {
-                match self { #rulecode_origin_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 {
-            /// A four-letter shorthand code for the diagnostic.
-            pub fn code(&self) -> &'static RuleCode {
+            /// The rule of the diagnostic.
+            pub fn rule(&self) -> &'static Rule {
                match self { #diagkind_code_match_arms }
            }

@@ -97,22 +128,11 @@ pub fn define_rule_mapping(mapping: Mapping) -> proc_macro2::TokenStream {
        }

        #from_impls_for_diagkind
+
+        #rulecodeprefix
    }
 }

-fn get_origin(ident: &Ident) -> Ident {
-    let ident = ident.to_string();
-    let mut iter = crate::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;
-        }
-    };
-    Ident::new(origin, Span::call_site())
-}
 pub struct Mapping {
    entries: Vec<(Ident, Path, Ident)>,
 }
--- 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
@@ -13,12 +13,14 @@
 )]
 #![forbid(unsafe_code)]

-use syn::{parse_macro_input, DeriveInput};
+use proc_macro::TokenStream;
+use syn::{parse_macro_input, DeriveInput, ItemFn};

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

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

-#[proc_macro_derive(RuleCodePrefix)]
-pub fn derive_rule_code_prefix(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+#[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(RuleNamespace, attributes(prefix))]
+pub fn derive_rule_namespace(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
    let input = parse_macro_input!(input as DeriveInput);

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

-#[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_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/prefixes.rs
+++ b/ruff_macros/src/prefixes.rs
@@ -1,54 +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"),
-    ("COM", "Flake8Commas"),
-    ("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,20 @@ 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();
+    let mut prefix_to_codes: BTreeMap<String, BTreeSet<String>> = BTreeMap::default();
+
+    let mut all_codes = BTreeSet::new();
+    let mut pl_codes = BTreeSet::new();
+
    for variant in variants {
-        let span = variant.ident.span();
-        let code_str = variant.ident.to_string();
+        let code_str = variant.to_string();
        let code_prefix_len = code_str
            .chars()
            .take_while(|char| char.is_alphabetic())
@@ -131,34 +106,38 @@ fn expand(
        for i in 0..=code_suffix_len {
            let prefix = code_str[..code_prefix_len + i].to_string();
            prefix_to_codes
-                .entry(Ident::new(&prefix, span))
+                .entry(prefix)
                .or_default()
                .insert(code_str.clone());
        }
-        prefix_to_codes
-            .entry(Ident::new(ALL, span))
-            .or_default()
-            .insert(code_str.clone());
+        if code_str.starts_with("PL") {
+            pl_codes.insert(code_str.to_string());
+        }
+        all_codes.insert(code_str);
    }

+    prefix_to_codes.insert(ALL.to_string(), all_codes);
+    prefix_to_codes.insert("PL".to_string(), pl_codes);
+
    // Add any prefix aliases (e.g., "U" to "UP").
    for (alias, rule_code) in PREFIX_REDIRECTS.iter() {
        prefix_to_codes.insert(
-            Ident::new(alias, Span::call_site()),
+            (*alias).to_string(),
            prefix_to_codes
-                .get(&Ident::new(rule_code, Span::call_site()))
+                .get(*rule_code)
                .unwrap_or_else(|| panic!("Unknown RuleCode: {alias:?}"))
                .clone(),
        );
    }

    let prefix_variants = prefix_to_codes.keys().map(|prefix| {
+        let prefix = Ident::new(prefix, Span::call_site());
        quote! {
            #prefix
        }
    });

-    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 +147,17 @@ fn expand(
    });

    quote! {
+        #[derive(PartialEq, Eq, PartialOrd, Ord)]
+        pub enum SuffixLength {
+            None,
+            Zero,
+            One,
+            Two,
+            Three,
+            Four,
+            Five,
+        }
+
        #[derive(
            ::strum_macros::EnumString,
            ::strum_macros::AsRefStr,
@@ -187,7 +177,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,52 +186,54 @@ fn expand(
    }
 }

-fn generate_impls(
-    ident: &Ident,
+fn generate_impls<'a>(
+    rule_type: &Ident,
    prefix_ident: &Ident,
-    prefix_to_codes: &BTreeMap<Ident, BTreeSet<String>>,
+    prefix_to_codes: &BTreeMap<String, BTreeSet<String>>,
+    variant_name: impl Fn(&str) -> &'a Ident,
 ) -> proc_macro2::TokenStream {
-    let codes_match_arms = prefix_to_codes.iter().map(|(prefix, codes)| {
+    let into_iter_match_arms = prefix_to_codes.iter().map(|(prefix_str, 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();
+        let prefix = Ident::new(prefix_str, Span::call_site());
        if let Some(target) = PREFIX_REDIRECTS.get(prefix_str.as_str()) {
            quote! {
                #prefix_ident::#prefix => {
                    crate::warn_user_once!(
                        "`{}` has been remapped to `{}`", #prefix_str, #target
                    );
-                    vec![#(#codes),*]
+                    vec![#(#codes),*].into_iter()
                }
            }
        } else {
            quote! {
-                #prefix_ident::#prefix => vec![#(#codes),*],
+                #prefix_ident::#prefix => vec![#(#codes),*].into_iter(),
            }
        }
    });

-    let specificity_match_arms = prefix_to_codes.keys().map(|prefix| {
-        if *prefix == ALL {
+    let specificity_match_arms = prefix_to_codes.keys().map(|prefix_str| {
+        let prefix = Ident::new(prefix_str, Span::call_site());
+        if prefix_str == ALL {
            quote! {
                #prefix_ident::#prefix => SuffixLength::None,
            }
        } else {
-            let num_numeric = prefix
-                .to_string()
-                .chars()
-                .filter(|char| char.is_numeric())
-                .count();
+            let mut num_numeric = prefix_str.chars().filter(|char| char.is_numeric()).count();
+            if prefix_str != "PL" && prefix_str.starts_with("PL") {
+                num_numeric += 1;
+            }
            let suffix_len = match num_numeric {
                0 => quote! { SuffixLength::Zero },
                1 => quote! { SuffixLength::One },
                2 => quote! { SuffixLength::Two },
                3 => quote! { SuffixLength::Three },
                4 => quote! { SuffixLength::Four },
+                5 => quote! { SuffixLength::Five },
                _ => panic!("Invalid prefix: {prefix}"),
            };
            quote! {
@@ -250,11 +242,11 @@ fn generate_impls(
        }
    });

-    let categories = prefix_to_codes.keys().map(|prefix| {
-        let prefix_str = prefix.to_string();
+    let categories = prefix_to_codes.keys().map(|prefix_str| {
        if prefix_str.chars().all(char::is_alphabetic)
            && !PREFIX_REDIRECTS.contains_key(&prefix_str.as_str())
        {
+            let prefix = Ident::new(prefix_str, Span::call_site());
            quote! {
                #prefix_ident::#prefix,
            }
@@ -265,15 +257,6 @@ fn generate_impls(

    quote! {
        impl #prefix_ident {
-            pub fn codes(&self) -> Vec<#ident> {
-                use colored::Colorize;
-
-                #[allow(clippy::match_same_arms)]
-                match self {
-                    #(#codes_match_arms)*
-                }
-            }
-
            pub fn specificity(&self) -> SuffixLength {
                #[allow(clippy::match_same_arms)]
                match self {
@@ -282,6 +265,20 @@ fn generate_impls(
            }
        }

+        impl IntoIterator for &#prefix_ident {
+            type Item = #rule_type;
+            type IntoIter = ::std::vec::IntoIter<Self::Item>;
+
+            fn into_iter(self) -> Self::IntoIter {
+                use colored::Colorize;
+
+                #[allow(clippy::match_same_arms)]
+                match self {
+                    #(#into_iter_match_arms)*
+                }
+            }
+        }
+
        pub const CATEGORIES: &[#prefix_ident] = &[#(#categories)*];
    }
 }
--- a/ruff_macros/src/rule_namespace.rs
+++ b/ruff_macros/src/rule_namespace.rs
@@ -0,0 +1,153 @@
+use std::collections::HashSet;
+
+use proc_macro2::{Ident, Span};
+use quote::quote;
+use syn::spanned::Spanned;
+use syn::{Attribute, 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();
+
+    let mut prefix_match_arms = quote!();
+    let mut name_match_arms = quote!(Self::Ruff => "Ruff-specific rules",);
+    let mut url_match_arms = quote!(Self::Ruff => None,);
+
+    let mut all_prefixes = HashSet::new();
+
+    for variant in variants {
+        let prefixes: Result<Vec<_>, _> = variant
+            .attrs
+            .iter()
+            .filter(|a| a.path.is_ident("prefix"))
+            .map(|attr| {
+                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 = "..."]"#));
+                };
+                let str = lit.value();
+                match str.chars().next() {
+                    None => return Err(Error::new(lit.span(), "expected prefix string to be non-empty")),
+                    Some(_) => {},
+                }
+                if !all_prefixes.insert(str.clone()) {
+                    return Err(Error::new(lit.span(), "prefix has already been defined before"));
+                }
+                Ok(str)
+            })
+            .collect();
+        let prefixes = prefixes?;
+
+        if prefixes.is_empty() {
+            return Err(Error::new(
+                variant.span(),
+                r#"Missing #[prefix = "..."] attribute"#,
+            ));
+        }
+
+        let Some(doc_attr) = variant.attrs.iter().find(|a| a.path.is_ident("doc")) else {
+            return Err(Error::new(variant.span(), r#"expected a doc comment"#))
+        };
+
+        let variant_ident = variant.ident;
+
+        if variant_ident != "Ruff" {
+            let (name, url) = parse_doc_attr(doc_attr)?;
+            name_match_arms.extend(quote! {Self::#variant_ident => #name,});
+            url_match_arms.extend(quote! {Self::#variant_ident => Some(#url),});
+        }
+
+        for lit in &prefixes {
+            parsed.push((lit.clone(), variant_ident.clone()));
+        }
+
+        prefix_match_arms.extend(quote! {
+            Self::#variant_ident => &[#(#prefixes),*],
+        });
+    }
+
+    parsed.sort_by_key(|(prefix, _)| prefix.len());
+
+    let mut if_statements = quote!();
+    let mut into_iter_match_arms = quote!();
+
+    for (prefix, field) in parsed {
+        if_statements.extend(quote! {if let Some(rest) = code.strip_prefix(#prefix) {
+            return Some((#ident::#field, rest));
+        }});
+
+        let prefix_ident = Ident::new(&prefix, Span::call_site());
+
+        if field != "Pycodestyle" {
+            into_iter_match_arms.extend(quote! {
+                #ident::#field => RuleSelector::#prefix_ident.into_iter(),
+            });
+        }
+    }
+
+    into_iter_match_arms.extend(quote! {
+        #ident::Pycodestyle => {
+            let rules: Vec<_> = (&RuleSelector::E).into_iter().chain(&RuleSelector::W).collect();
+            rules.into_iter()
+        }
+    });
+
+    Ok(quote! {
+        impl crate::registry::RuleNamespace for #ident {
+            fn parse_code(code: &str) -> Option<(Self, &str)> {
+                #if_statements
+                None
+            }
+
+
+            fn prefixes(&self) -> &'static [&'static str] {
+                match self { #prefix_match_arms }
+            }
+
+            fn name(&self) -> &'static str {
+                match self { #name_match_arms }
+            }
+
+            fn url(&self) -> Option<&'static str> {
+                match self { #url_match_arms }
+            }
+        }
+
+        impl IntoIterator for &#ident {
+            type Item = Rule;
+            type IntoIter = ::std::vec::IntoIter<Self::Item>;
+
+            fn into_iter(self) -> Self::IntoIter {
+                use colored::Colorize;
+
+                match self {
+                    #into_iter_match_arms
+                }
+            }
+        }
+    })
+}
+
+/// Parses an attribute in the form of `#[doc = " [name](https://example.com/)"]`
+/// into a tuple of link label and URL.
+fn parse_doc_attr(doc_attr: &Attribute) -> syn::Result<(String, String)> {
+    let Ok(Meta::NameValue(MetaNameValue{lit: Lit::Str(doc_lit), ..})) = doc_attr.parse_meta() else {
+        return Err(Error::new(doc_attr.span(), r#"expected doc attribute to be in the form of #[doc = "..."]"#))
+    };
+    parse_markdown_link(doc_lit.value().trim())
+        .map(|(name, url)| (name.to_string(), url.to_string()))
+        .ok_or_else(|| {
+            Error::new(
+                doc_lit.span(),
+                r#"expected doc comment to be in the form of `/// [name](https://example.com/)`"#,
+            )
+        })
+}
+
+fn parse_markdown_link(link: &str) -> Option<(&str, &str)> {
+    link.strip_prefix('[')?.strip_suffix(')')?.split_once("](")
+}
--- 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
@@ -5,37 +5,29 @@ Example usage:

    python scripts/add_plugin.py \
        flake8-pie \
-        --url https://pypi.org/project/flake8-pie/0.16.0/
+        --url https://pypi.org/project/flake8-pie/
+        --prefix PIE
 """

 import argparse
 import os
-from pathlib import Path

-ROOT_DIR = Path(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from _utils import ROOT_DIR, dir_name, get_indent, pascal_case


-def dir_name(plugin: str) -> str:
-    return plugin.replace("-", "_")
-
-
-def pascal_case(plugin: str) -> str:
-    return "".join(word.title() for word in plugin.split("-"))
-
-
-def main(*, plugin: str, url: str) -> None:
+def main(*, plugin: str, url: str, prefix_code: str) -> None:
    # Create the test fixture folder.
    os.makedirs(
        ROOT_DIR / "resources/test/fixtures" / dir_name(plugin),
        exist_ok=True,
    )

-    # Create the Rust module.
-    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(rust_module / "mod.rs", "w+") as fp:
+    # Create the Plugin rules module.
+    plugin_dir = ROOT_DIR / "src/rules" / dir_name(plugin)
+    plugin_dir.mkdir(exist_ok=True)
+
+    with (plugin_dir / "mod.rs").open("w+") as fp:
+        fp.write(f"//! Rules from [{plugin}]({url}).\n")
        fp.write("pub(crate) mod rules;\n")
        fp.write("\n")
        fp.write(
@@ -47,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")
@@ -67,57 +59,37 @@ mod tests {
            % dir_name(plugin)
        )

+    # Create a subdirectory for rules and create a `mod.rs` placeholder
+    rules_dir = plugin_dir / "rules"
+    rules_dir.mkdir(exist_ok=True)
+
+    with (rules_dir / "mod.rs").open("w+") as fp:
+        fp.write("\n\n")
+
+    # Create the snapshots subdirectory
+    (plugin_dir / "snapshots").mkdir(exist_ok=True)
+
    # Add the plugin to `rules/mod.rs`.
-    with open(ROOT_DIR / "src/rules/mod.rs", "a") as fp:
+    with (ROOT_DIR / "src/rules/mod.rs").open("a") as fp:
        fp.write(f"pub mod {dir_name(plugin)};")

    # Add the relevant sections to `src/registry.rs`.
    content = (ROOT_DIR / "src/registry.rs").read_text()

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

-            elif line.strip() == "Ruff,":
-                indent = line.split("Ruff,")[0]
+            elif line.strip() == '/// Ruff-specific rules':
+                fp.write(f"/// [{plugin}]({url})\n")
+                fp.write(f'{indent}#[prefix = "{prefix_code}"]\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]
-                fp.write(
-                    f"{indent}RuleOrigin::{pascal_case(plugin)} => vec![\n"
-                    f'{indent}    todo!("Fill-in prefix after generating codes")\n'
-                    f"{indent}],"
-                )
-                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`.
-    content = (ROOT_DIR / "src/violations.rs").read_text()
-
-    with open(ROOT_DIR / "src/violations.rs", "w") as fp:
-        for line in content.splitlines():
-            if line.strip() == "// Ruff":
-                indent = line.split("// Ruff")[0]
-                fp.write(f"{indent}// {plugin}")
-                fp.write("\n")
-
            fp.write(line)
            fp.write("\n")

@@ -127,7 +99,7 @@ if __name__ == "__main__":
        description="Generate boilerplate for a new Flake8 plugin.",
        epilog=(
            "Example usage: python scripts/add_plugin.py flake8-pie "
-            "--url https://pypi.org/project/flake8-pie/0.16.0/"
+            "--url https://pypi.org/project/flake8-pie/"
        ),
    )
    parser.add_argument(
@@ -141,6 +113,13 @@ if __name__ == "__main__":
        type=str,
        help="The URL of the latest release in PyPI.",
    )
+    parser.add_argument(
+        "--prefix",
+        required=False,
+        default="TODO",
+        type=str,
+        help="Prefix code for the plugin. Leave empty to manually fill.",
+    )
    args = parser.parse_args()

-    main(plugin=args.plugin, url=args.url)
+    main(plugin=args.plugin, url=args.url, prefix_code=args.prefix)
--- a/scripts/add_rule.py
+++ b/scripts/add_rule.py
@@ -6,23 +6,12 @@ Example usage:
    python scripts/add_rule.py \
        --name PreferListBuiltin \
        --code PIE807 \
-        --origin flake8-pie
+        --linter flake8-pie
 """

 import argparse
-import os
-from pathlib import Path

-ROOT_DIR = Path(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:
@@ -30,71 +19,87 @@ 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(
-        ROOT_DIR / "resources/test/fixtures" / dir_name(origin) / f"{code}.py",
-        "a",
-    ):
+    with (ROOT_DIR / "resources/test/fixtures" / dir_name(linter) / f"{code}.py").open("a"):
        pass

+    plugin_module = ROOT_DIR / "src/rules" / dir_name(linter)
+    rule_name_snake = snake_case(name)
+
    # Add the relevant `#testcase` macro.
-    mod_rs = ROOT_DIR / "src/rules" / dir_name(origin) / "mod.rs"
+    mod_rs = plugin_module / "mod.rs"
    content = mod_rs.read_text()

-    with open(mod_rs, "w") as fp:
+    with mod_rs.open("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::{name}, Path::new("{code}.py"); "{code}")]')
                fp.write("\n")

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

+    # Add the exports 
+    rules_dir = plugin_module / "rules"
+    rules_mod = rules_dir / "mod.rs"
+
+    contents = rules_mod.read_text()
+    parts = contents.split("\n\n")
+    if len(parts) == 2:
+        new_contents = parts[0] + "\n"
+        new_contents += f"pub use {rule_name_snake}::{{{rule_name_snake}, {name}}};"
+        new_contents += "\n"
+        new_contents += "\n"
+        new_contents += parts[1]
+        new_contents += f"mod {rule_name_snake};"
+        new_contents += "\n"
+        rules_mod.write_text(new_contents)
+    else:
+        with rules_mod.open("a") as fp:
+            fp.write(f"pub use {rule_name_snake}::{{{rule_name_snake}, {name}}};")
+            fp.write("\n")
+            fp.write(f"mod {rule_name_snake};")
+            fp.write("\n")
+
    # Add the relevant rule function.
-    with open(ROOT_DIR / "src/rules" / dir_name(origin) / "rules.rs", "a") as fp:
+    with (rules_dir / f"{rule_name_snake}.rs").open("w") as fp:
        fp.write(
-            f"""
-/// {code}
-pub fn {snake_case(name)}(checker: &mut Checker) {{}}
-"""
-        )
-        fp.write("\n")
+            """use ruff_macros::derive_message_formats;

-    # Add the relevant struct to `src/violations.rs`.
-    content = (ROOT_DIR / "src/violations.rs").read_text()
+use crate::define_violation;
+use crate::violation::Violation;
+use crate::checkers::ast::Checker;

-    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}"):
-                fp.write(
-                    """define_violation!(
+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)
-                )
-                fp.write("\n")
+            % (name, name)
+        )
+        fp.write("\n")
+        fp.write(
+            f"""
+/// {code}
+pub fn {rule_name_snake}(checker: &mut Checker) {{}}
+"""
+        )
+        fp.write("\n")

    # Add the relevant code-to-violation pair to `src/registry.rs`.
    content = (ROOT_DIR / "src/registry.rs").read_text()

    seen_macro = False
    has_written = False
-    with open(ROOT_DIR / "src/registry.rs", "w") as fp:
+    with (ROOT_DIR / "src/registry.rs").open("w") as fp:
        for line in content.splitlines():
            fp.write(line)
            fp.write("\n")
@@ -102,24 +107,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]
-                fp.write(f"{indent}{code} => violations::{name},")
+            if line.strip() == f"// {linter}":
+                indent = get_indent(line)
+                fp.write(f"{indent}{code} => rules::{dir_name(linter)}::rules::{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",
@@ -134,11 +141,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/pyproject.toml
+++ b/scripts/pyproject.toml
@@ -0,0 +1,9 @@
+[tool.ruff]
+select = ["ALL"]
+ignore = [
+    "S101", # assert-used
+    "PLR2004", # magic-value-comparison
+]
+
+[tool.ruff.pydocstyle]
+convention = "pep257"
--- a/setup.py
+++ b/setup.py
@@ -13,6 +13,7 @@ Please use `python -m pip install .` instead.
 )
 sys.exit(1)

+"abc".isidentifier()

 # The below code will never execute, however GitHub is particularly
 # picky about where it finds Python packaging metadata.
--- a/src/ast/comparable.rs
+++ b/src/ast/comparable.rs
@@ -295,7 +295,7 @@ pub enum ComparableExpr<'a> {
        orelse: Box<ComparableExpr<'a>>,
    },
    Dict {
-        keys: Vec<ComparableExpr<'a>>,
+        keys: Vec<Option<ComparableExpr<'a>>>,
        values: Vec<ComparableExpr<'a>>,
    },
    Set {
@@ -424,7 +424,10 @@ impl<'a> From<&'a Expr> for ComparableExpr<'a> {
                orelse: orelse.into(),
            },
            ExprKind::Dict { keys, values } => Self::Dict {
-                keys: keys.iter().map(std::convert::Into::into).collect(),
+                keys: keys
+                    .iter()
+                    .map(|expr| expr.as_ref().map(std::convert::Into::into))
+                    .collect(),
                values: values.iter().map(std::convert::Into::into).collect(),
            },
            ExprKind::Set { elts } => Self::Set {
--- a/src/ast/function_type.rs
+++ b/src/ast/function_type.rs
@@ -33,7 +33,7 @@ pub fn classify(
            checker.resolve_call_path(expr).map_or(false, |call_path| {
                METACLASS_BASES
                    .iter()
-                    .any(|(module, member)| call_path == [*module, *member])
+                    .any(|(module, member)| call_path.as_slice() == [*module, *member])
            })
        })
        || decorator_list.iter().any(|expr| {
--- a/src/ast/hashable.rs
+++ b/src/ast/hashable.rs
@@ -0,0 +1,40 @@
+use std::hash::Hash;
+
+use rustpython_ast::Expr;
+
+use crate::ast::comparable::ComparableExpr;
+
+/// Wrapper around `Expr` that implements `Hash` and `PartialEq`.
+pub struct HashableExpr<'a>(&'a Expr);
+
+impl Hash for HashableExpr<'_> {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        let comparable = ComparableExpr::from(self.0);
+        comparable.hash(state);
+    }
+}
+
+impl PartialEq<Self> for HashableExpr<'_> {
+    fn eq(&self, other: &Self) -> bool {
+        let comparable = ComparableExpr::from(self.0);
+        comparable == ComparableExpr::from(other.0)
+    }
+}
+
+impl Eq for HashableExpr<'_> {}
+
+impl<'a> From<&'a Expr> for HashableExpr<'a> {
+    fn from(expr: &'a Expr) -> Self {
+        Self(expr)
+    }
+}
+
+impl<'a> HashableExpr<'a> {
+    pub(crate) fn from_expr(expr: &'a Expr) -> Self {
+        Self(expr)
+    }
+
+    pub(crate) fn as_expr(&self) -> &'a Expr {
+        self.0
+    }
+}
--- a/src/ast/helpers.rs
+++ b/src/ast/helpers.rs
@@ -10,8 +10,9 @@ use rustpython_ast::{
 use rustpython_parser::lexer;
 use rustpython_parser::lexer::Tok;
 use rustpython_parser::token::StringKind;
+use smallvec::smallvec;

-use crate::ast::types::{Binding, BindingKind, Range};
+use crate::ast::types::{Binding, BindingKind, CallPath, Range};
 use crate::checkers::ast::Checker;
 use crate::source_code::{Generator, Indexer, Locator, Stylist};

@@ -39,7 +40,7 @@ pub fn unparse_stmt(stmt: &Stmt, stylist: &Stylist) -> String {
    generator.generate()
 }

-fn collect_call_path_inner<'a>(expr: &'a Expr, parts: &mut Vec<&'a str>) {
+fn collect_call_path_inner<'a>(expr: &'a Expr, parts: &mut CallPath<'a>) {
    match &expr.node {
        ExprKind::Call { func, .. } => {
            collect_call_path_inner(func, parts);
@@ -55,9 +56,9 @@ fn collect_call_path_inner<'a>(expr: &'a Expr, parts: &mut Vec<&'a str>) {
    }
 }

-/// Convert an `Expr` to its call path segments (like ["typing", "List"]).
-pub fn collect_call_path(expr: &Expr) -> Vec<&str> {
-    let mut segments = vec![];
+/// Convert an `Expr` to its [`CallPath`] segments (like `["typing", "List"]`).
+pub fn collect_call_path(expr: &Expr) -> CallPath {
+    let mut segments = smallvec![];
    collect_call_path_inner(expr, &mut segments);
    segments
 }
@@ -90,7 +91,7 @@ pub fn contains_call_path(checker: &Checker, expr: &Expr, target: &[&str]) -> bo
    any_over_expr(expr, &|expr| {
        checker
            .resolve_call_path(expr)
-            .map_or(false, |call_path| call_path == target)
+            .map_or(false, |call_path| call_path.as_slice() == target)
    })
 }

@@ -121,12 +122,13 @@ pub fn contains_effect(checker: &Checker, expr: &Expr) -> bool {
        // Otherwise, avoid all complex expressions.
        matches!(
            expr.node,
-            ExprKind::Call { .. }
-                | ExprKind::Await { .. }
+            ExprKind::Await { .. }
+                | ExprKind::Call { .. }
+                | ExprKind::DictComp { .. }
                | ExprKind::GeneratorExp { .. }
                | ExprKind::ListComp { .. }
                | ExprKind::SetComp { .. }
-                | ExprKind::DictComp { .. }
+                | ExprKind::Subscript { .. }
                | ExprKind::Yield { .. }
                | ExprKind::YieldFrom { .. }
        )
@@ -159,7 +161,7 @@ where
        }
        ExprKind::Dict { keys, values } => values
            .iter()
-            .chain(keys.iter())
+            .chain(keys.iter().flatten())
            .any(|expr| any_over_expr(expr, func)),
        ExprKind::Set { elts } | ExprKind::List { elts, .. } | ExprKind::Tuple { elts, .. } => {
            elts.iter().any(|expr| any_over_expr(expr, func))
@@ -313,7 +315,9 @@ pub fn has_non_none_keyword(keywords: &[Keyword], keyword: &str) -> bool {
 }

 /// Extract the names of all handled exceptions.
-pub fn extract_handler_names(handlers: &[Excepthandler]) -> Vec<Vec<&str>> {
+pub fn extract_handler_names(handlers: &[Excepthandler]) -> Vec<CallPath> {
+    // TODO(charlie): Use `resolve_call_path` to avoid false positives for
+    // overridden builtins.
    let mut handler_names = vec![];
    for handler in handlers {
        match &handler.node {
@@ -361,10 +365,9 @@ pub fn collect_arg_names<'a>(arguments: &'a Arguments) -> FxHashSet<&'a str> {
 }

 /// Returns `true` if a statement or expression includes at least one comment.
-pub fn has_comments<T>(located: &Located<T>, locator: &Locator) -> bool {
-    lexer::make_tokenizer(&locator.slice_source_code_range(&Range::from_located(located)))
-        .flatten()
-        .any(|(_, tok, _)| matches!(tok, Tok::Comment(..)))
+pub fn has_comments_in(range: Range, locator: &Locator) -> bool {
+    lexer::make_tokenizer(locator.slice_source_code_range(&range))
+        .any(|result| result.map_or(false, |(_, tok, _)| matches!(tok, Tok::Comment(..))))
 }

 /// Returns `true` if a call is an argumented `super` invocation.
@@ -416,11 +419,11 @@ pub fn format_import_from_member(
 }

 /// Split a target string (like `typing.List`) into (`typing`, `List`).
-pub fn to_call_path(target: &str) -> Vec<&str> {
+pub fn to_call_path(target: &str) -> CallPath {
    if target.contains('.') {
        target.split('.').collect()
    } else {
-        vec!["", target]
+        smallvec!["", target]
    }
 }

@@ -483,7 +486,7 @@ pub fn identifier_range(stmt: &Stmt, locator: &Locator) -> Range {
            | StmtKind::AsyncFunctionDef { .. }
    ) {
        let contents = locator.slice_source_code_range(&Range::from_located(stmt));
-        for (start, tok, end) in lexer::make_tokenizer_located(&contents, stmt.location).flatten() {
+        for (start, tok, end) in lexer::make_tokenizer_located(contents, stmt.location).flatten() {
            if matches!(tok, Tok::Name { .. }) {
                return Range::new(start, end);
            }
@@ -512,7 +515,7 @@ pub fn binding_range(binding: &Binding, locator: &Locator) -> Range {
 // Return the ranges of `Name` tokens within a specified node.
 pub fn find_names<T>(located: &Located<T>, locator: &Locator) -> Vec<Range> {
    let contents = locator.slice_source_code_range(&Range::from_located(located));
-    lexer::make_tokenizer_located(&contents, located.location)
+    lexer::make_tokenizer_located(contents, located.location)
        .flatten()
        .filter(|(_, tok, _)| matches!(tok, Tok::Name { .. }))
        .map(|(start, _, end)| Range {
@@ -532,7 +535,7 @@ pub fn excepthandler_name_range(handler: &Excepthandler, locator: &Locator) -> O
            let type_end_location = type_.end_location.unwrap();
            let contents =
                locator.slice_source_code_range(&Range::new(type_end_location, body[0].location));
-            let range = lexer::make_tokenizer_located(&contents, type_end_location)
+            let range = lexer::make_tokenizer_located(contents, type_end_location)
                .flatten()
                .tuple_windows()
                .find(|(tok, next_tok)| {
@@ -559,7 +562,7 @@ pub fn except_range(handler: &Excepthandler, locator: &Locator) -> Range {
        location: handler.location,
        end_location: end,
    });
-    let range = lexer::make_tokenizer_located(&contents, handler.location)
+    let range = lexer::make_tokenizer_located(contents, handler.location)
        .flatten()
        .find(|(_, kind, _)| matches!(kind, Tok::Except { .. }))
        .map(|(location, _, end_location)| Range {
@@ -573,7 +576,7 @@ pub fn except_range(handler: &Excepthandler, locator: &Locator) -> Range {
 /// Find f-strings that don't contain any formatted values in a `JoinedStr`.
 pub fn find_useless_f_strings(expr: &Expr, locator: &Locator) -> Vec<(Range, Range)> {
    let contents = locator.slice_source_code_range(&Range::from_located(expr));
-    lexer::make_tokenizer_located(&contents, expr.location)
+    lexer::make_tokenizer_located(contents, expr.location)
        .flatten()
        .filter_map(|(location, tok, end_location)| match tok {
            Tok::String {
@@ -627,7 +630,7 @@ pub fn else_range(stmt: &Stmt, locator: &Locator) -> Option<Range> {
                    .expect("Expected orelse to be non-empty")
                    .location,
            });
-            let range = lexer::make_tokenizer_located(&contents, body_end)
+            let range = lexer::make_tokenizer_located(contents, body_end)
                .flatten()
                .find(|(_, kind, _)| matches!(kind, Tok::Else))
                .map(|(location, _, end_location)| Range {
@@ -643,7 +646,7 @@ pub fn else_range(stmt: &Stmt, locator: &Locator) -> Option<Range> {
 /// Return the `Range` of the first `Tok::Colon` token in a `Range`.
 pub fn first_colon_range(range: Range, locator: &Locator) -> Option<Range> {
    let contents = locator.slice_source_code_range(&range);
-    let range = lexer::make_tokenizer_located(&contents, range.location)
+    let range = lexer::make_tokenizer_located(contents, range.location)
        .flatten()
        .find(|(_, kind, _)| matches!(kind, Tok::Colon))
        .map(|(location, _, end_location)| Range {
@@ -673,7 +676,7 @@ pub fn elif_else_range(stmt: &Stmt, locator: &Locator) -> Option<Range> {
        _ => return None,
    };
    let contents = locator.slice_source_code_range(&Range::new(start, end));
-    let range = lexer::make_tokenizer_located(&contents, start)
+    let range = lexer::make_tokenizer_located(contents, start)
        .flatten()
        .find(|(_, kind, _)| matches!(kind, Tok::Elif | Tok::Else))
        .map(|(location, _, end_location)| Range {
--- a/src/ast/mod.rs
+++ b/src/ast/mod.rs
@@ -2,6 +2,7 @@ pub mod branch_detection;
 pub mod cast;
 pub mod comparable;
 pub mod function_type;
+pub mod hashable;
 pub mod helpers;
 pub mod operations;
 pub mod relocate;
--- a/src/ast/relocate.rs
+++ b/src/ast/relocate.rs
@@ -39,7 +39,7 @@ pub fn relocate_expr(expr: &mut Expr, location: Range) {
            relocate_expr(orelse, location);
        }
        ExprKind::Dict { keys, values } => {
-            for expr in keys {
+            for expr in keys.iter_mut().flatten() {
                relocate_expr(expr, location);
            }
            for expr in values {
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`from long_module_name import member_one, member_two, member_three, member_four, member_five`