Bump version to 0.0.230

This PR upgrades RustPython to fix the type of `Dict.keys` to `Vec<Option<Expr>>` (see https://github.com/RustPython/RustPython/pull/4449 for why this change was needed) and unblock #1884.

.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

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.227
+    rev: v0.0.230
     hooks:
       - id: ruff
 

CONTRIBUTING.md

@@ -37,13 +37,16 @@ After cloning the repository, run Ruff locally with:
 cargo run resources/test/fixtures --no-cache
 ```
 
-Prior to opening a pull request, ensure that your code has been auto-formatted, and that it passes
-both the lint and test validation checks:
+Prior to opening a pull request, ensure that your code has been auto-formatted,
+and that it passes both the lint and test validation checks.
+
+For rustfmt and Clippy, we use [nightly Rust][nightly], as it is stricter than stable Rust.
+(However, tests and builds use stable Rust.)
 
 ```shell
 cargo +nightly fmt --all     # Auto-formatting...
-cargo +nightly clippy --all  # Linting...
-cargo +nightly test --all    # Testing...
+cargo +nightly clippy --fix --workspace --all-targets --all-features -- -W clippy::pedantic  # Linting...
+cargo test --all    # Testing...
 ```
 
 These checks will run on GitHub Actions when you open your Pull Request, but running them locally
@@ -66,7 +69,7 @@ At a high level, the steps involved in adding a new lint rule are as follows:
 6. Update the generated files (documentation and generated code).
 
 To define the violation, start by creating a dedicated file for your rule under the appropriate
-rule origin (e.g., `src/rules/flake8_bugbear/rules/abstract_base_class.rs`). That file should
+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.)
@@ -78,7 +81,7 @@ collecting diagnostics as it goes.
 If you need to inspect the AST, you can run `cargo +nightly dev print-ast` with a Python file. Grep
 for the `Check::new` invocations to understand how other, similar rules are implemented.
 
-To add a test fixture, create a file under `resources/test/fixtures/[origin]`, named to match
+To add a test fixture, create a file under `resources/test/fixtures/[linter]`, named to match
 the code you defined earlier (e.g., `resources/test/fixtures/pycodestyle/E402.py`). This file should
 contain a variety of violations and non-violations designed to evaluate and demonstrate the behavior
 of your lint rule.
@@ -87,7 +90,7 @@ Run `cargo +nightly dev generate-all` to generate the code for your new fixture.
 locally with (e.g.) `cargo run resources/test/fixtures/pycodestyle/E402.py --no-cache --select E402`.
 
 Once you're satisfied with the output, codify the behavior as a snapshot test by adding a new
-`test_case` macro in the relevant `src/[origin]/mod.rs` file. Then, run `cargo test --all`.
+`test_case` macro in the relevant `src/[linter]/mod.rs` file. Then, run `cargo test --all`.
 Your test will fail, but you'll be prompted to follow-up with `cargo insta review`. Accept the
 generated snapshot, then commit the snapshot file alongside the rest of your changes.
 
@@ -127,3 +130,5 @@ them to [PyPI](https://pypi.org/project/ruff/).
 
 Ruff follows the [semver](https://semver.org/) versioning standard. However, as pre-1.0 software,
 even patch releases may contain [non-backwards-compatible changes](https://semver.org/#spec-item-4).
+
+[nightly]: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust

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.227"
+version = "0.0.230"
 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.227"
+version = "0.0.230"
 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",
@@ -1960,7 +1882,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_cli"
-version = "0.0.227"
+version = "0.0.230"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
@@ -1997,7 +1919,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_dev"
-version = "0.0.227"
+version = "0.0.230"
 dependencies = [
  "anyhow",
  "clap 4.0.32",
@@ -2018,7 +1940,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_macros"
-version = "0.0.227"
+version = "0.0.230"
 dependencies = [
  "once_cell",
  "proc-macro2",
@@ -2027,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"
@@ -2062,7 +1994,7 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa#ff90fe52eea578c8ebdd9d95e078cc041a5959fa"
+source = "git+https://github.com/RustPython/RustPython.git?rev=4f38cb68e4a97aeea9eb19673803a0bd5f655383#4f38cb68e4a97aeea9eb19673803a0bd5f655383"
 dependencies = [
  "num-bigint",
  "rustpython-common",
@@ -2072,11 +2004,11 @@ dependencies = [
 [[package]]
 name = "rustpython-common"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa#ff90fe52eea578c8ebdd9d95e078cc041a5959fa"
+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",
@@ -2087,7 +2019,7 @@ dependencies = [
  "num-traits",
  "once_cell",
  "radium",
- "rand 0.8.5",
+ "rand",
  "siphasher",
  "unic-ucd-category",
  "volatile",
@@ -2097,7 +2029,7 @@ dependencies = [
 [[package]]
 name = "rustpython-compiler-core"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa#ff90fe52eea578c8ebdd9d95e078cc041a5959fa"
+source = "git+https://github.com/RustPython/RustPython.git?rev=4f38cb68e4a97aeea9eb19673803a0bd5f655383#4f38cb68e4a97aeea9eb19673803a0bd5f655383"
 dependencies = [
  "bincode",
  "bitflags",
@@ -2114,7 +2046,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa#ff90fe52eea578c8ebdd9d95e078cc041a5959fa"
+source = "git+https://github.com/RustPython/RustPython.git?rev=4f38cb68e4a97aeea9eb19673803a0bd5f655383#4f38cb68e4a97aeea9eb19673803a0bd5f655383"
 dependencies = [
  "ahash",
  "anyhow",
@@ -2274,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]]
@@ -2313,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"
@@ -2377,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",
@@ -2417,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]]
@@ -2449,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",
@@ -2589,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",
 ]
 
@@ -2793,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"
@@ -2817,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",
 ]
 
@@ -2842,7 +2762,7 @@ version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "wasm-bindgen",
  "web-sys",

Cargo.toml

@@ -8,7 +8,7 @@ default-members = [".", "ruff_cli"]
 
 [package]
 name = "ruff"
-version = "0.0.227"
+version = "0.0.230"
 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,12 +46,11 @@ 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.227", path = "ruff_macros" }
+ruff_macros = { version = "0.0.230", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "ff90fe52eea578c8ebdd9d95e078cc041a5959fa" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "ff90fe52eea578c8ebdd9d95e078cc041a5959fa" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "ff90fe52eea578c8ebdd9d95e078cc041a5959fa" }
+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"] }
@@ -59,9 +59,9 @@ 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"] }
-thiserror = { version = "1.0" }
 
 # https://docs.rs/getrandom/0.2.7/getrandom/#webassembly-support
 # For (future) wasm-pack support
@@ -97,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

README.md

@@ -134,19 +134,21 @@ developer of [Zulip](https://github.com/zulip/zulip):
    1. [eradicate (ERA)](#eradicate-era)
    1. [pandas-vet (PD)](#pandas-vet-pd)
    1. [pygrep-hooks (PGH)](#pygrep-hooks-pgh)
-   1. [Pylint (PLC, PLE, PLR, PLW)](#pylint-plc-ple-plr-plw)
+   1. [Pylint (PL)](#pylint-pl)
    1. [flake8-pie (PIE)](#flake8-pie-pie)
    1. [flake8-commas (COM)](#flake8-commas-com)
    1. [flake8-no-pep420 (INP)](#flake8-no-pep420-inp)
+   1. [flake8-executable (EXE)](#flake8-executable-exe)
+   1. [flake8-type-checking (TYP)](#flake8-type-checking-typ)
+   1. [tryceratops (TRY)](#tryceratops-try)
    1. [Ruff-specific rules (RUF)](#ruff-specific-rules-ruf)<!-- End auto-generated table of contents. -->
 1. [Editor Integrations](#editor-integrations)
 1. [FAQ](#faq)
-1. [Development](#development)
+1. [Contributing](#contributing)
 1. [Releases](#releases)
 1. [Benchmarks](#benchmarks)
 1. [Reference](#reference)
 1. [License](#license)
-1. [Contributing](#contributing)
 
 ## Installation and Usage
 
@@ -199,11 +201,9 @@ Ruff also works with [pre-commit](https://pre-commit.com):
 ```yaml
 - repo: https://github.com/charliermarsh/ruff-pre-commit
   # Ruff version.
-  rev: 'v0.0.227'
+  rev: 'v0.0.230'
   hooks:
     - id: ruff
-      # Respect `exclude` and `extend-exclude` settings.
-      args: ["--force-exclude"]
 ```
 
 ## Configuration
@@ -544,7 +544,7 @@ The 🛠 emoji indicates that a rule is automatically fixable by the `--fix` com
 <!-- Begin auto-generated sections. -->
 ### Pyflakes (F)
 
-For more, see [Pyflakes](https://pypi.org/project/pyflakes/2.5.0/) on PyPI.
+For more, see [Pyflakes](https://pypi.org/project/pyflakes/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -594,11 +594,12 @@ For more, see [Pyflakes](https://pypi.org/project/pyflakes/2.5.0/) on PyPI.
 
 ### pycodestyle (E, W)
 
-For more, see [pycodestyle](https://pypi.org/project/pycodestyle/2.9.1/) on PyPI.
+For more, see [pycodestyle](https://pypi.org/project/pycodestyle/) on PyPI.
 
 #### Error (E)
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
+| E101 | mixed-spaces-and-tabs | Indentation contains mixed spaces and tabs |  |
 | E401 | multiple-imports-on-one-line | Multiple imports on one line |  |
 | E402 | module-import-not-at-top-of-file | Module level import not at top of file |  |
 | E501 | line-too-long | Line too long ({length} > {limit} characters) |  |
@@ -624,7 +625,7 @@ For more, see [pycodestyle](https://pypi.org/project/pycodestyle/2.9.1/) on PyPI
 
 ### mccabe (C90)
 
-For more, see [mccabe](https://pypi.org/project/mccabe/0.7.0/) on PyPI.
+For more, see [mccabe](https://pypi.org/project/mccabe/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -632,7 +633,7 @@ For more, see [mccabe](https://pypi.org/project/mccabe/0.7.0/) on PyPI.
 
 ### isort (I)
 
-For more, see [isort](https://pypi.org/project/isort/5.10.1/) on PyPI.
+For more, see [isort](https://pypi.org/project/isort/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -641,7 +642,7 @@ For more, see [isort](https://pypi.org/project/isort/5.10.1/) on PyPI.
 
 ### pydocstyle (D)
 
-For more, see [pydocstyle](https://pypi.org/project/pydocstyle/6.1.1/) on PyPI.
+For more, see [pydocstyle](https://pypi.org/project/pydocstyle/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -672,6 +673,7 @@ For more, see [pydocstyle](https://pypi.org/project/pydocstyle/6.1.1/) on PyPI.
 | D300 | uses-triple-quotes | Use """triple double quotes""" |  |
 | D301 | uses-r-prefix-for-backslashed-content | Use r""" if any backslashes in a docstring |  |
 | D400 | ends-in-period | First line should end with a period | 🛠 |
+| D401 | non-imperative-mood | First line of docstring should be in imperative mood: "{first_line}" |  |
 | D402 | no-signature | First line should not be the function's signature |  |
 | D403 | first-line-capitalized | First word of the first line should be properly capitalized |  |
 | D404 | no-this-prefix | First word of the docstring should not be "This" |  |
@@ -693,7 +695,7 @@ For more, see [pydocstyle](https://pypi.org/project/pydocstyle/6.1.1/) on PyPI.
 
 ### pyupgrade (UP)
 
-For more, see [pyupgrade](https://pypi.org/project/pyupgrade/3.2.0/) on PyPI.
+For more, see [pyupgrade](https://pypi.org/project/pyupgrade/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -726,12 +728,14 @@ For more, see [pyupgrade](https://pypi.org/project/pyupgrade/3.2.0/) on PyPI.
 | UP028 | rewrite-yield-from | Replace `yield` over `for` loop with `yield from` | 🛠 |
 | UP029 | unnecessary-builtin-import | Unnecessary builtin import: `{import}` | 🛠 |
 | UP030 | format-literals | Use implicit references for positional format fields | 🛠 |
+| UP031 | printf-string-formatting | Use format specifiers instead of percent format | 🛠 |
 | UP032 | f-string | Use f-string instead of `format` call | 🛠 |
 | UP033 | functools-cache | Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)` | 🛠 |
+| UP034 | extraneous-parentheses | Avoid extraneous parentheses | 🛠 |
 
 ### pep8-naming (N)
 
-For more, see [pep8-naming](https://pypi.org/project/pep8-naming/0.13.2/) on PyPI.
+For more, see [pep8-naming](https://pypi.org/project/pep8-naming/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -753,7 +757,7 @@ For more, see [pep8-naming](https://pypi.org/project/pep8-naming/0.13.2/) on PyP
 
 ### flake8-2020 (YTT)
 
-For more, see [flake8-2020](https://pypi.org/project/flake8-2020/1.7.0/) on PyPI.
+For more, see [flake8-2020](https://pypi.org/project/flake8-2020/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -770,7 +774,7 @@ For more, see [flake8-2020](https://pypi.org/project/flake8-2020/1.7.0/) on PyPI
 
 ### flake8-annotations (ANN)
 
-For more, see [flake8-annotations](https://pypi.org/project/flake8-annotations/2.9.1/) on PyPI.
+For more, see [flake8-annotations](https://pypi.org/project/flake8-annotations/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -788,7 +792,7 @@ For more, see [flake8-annotations](https://pypi.org/project/flake8-annotations/2
 
 ### flake8-bandit (S)
 
-For more, see [flake8-bandit](https://pypi.org/project/flake8-bandit/4.1.1/) on PyPI.
+For more, see [flake8-bandit](https://pypi.org/project/flake8-bandit/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -810,7 +814,7 @@ For more, see [flake8-bandit](https://pypi.org/project/flake8-bandit/4.1.1/) on
 
 ### flake8-blind-except (BLE)
 
-For more, see [flake8-blind-except](https://pypi.org/project/flake8-blind-except/0.2.1/) on PyPI.
+For more, see [flake8-blind-except](https://pypi.org/project/flake8-blind-except/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -818,7 +822,7 @@ For more, see [flake8-blind-except](https://pypi.org/project/flake8-blind-except
 
 ### flake8-boolean-trap (FBT)
 
-For more, see [flake8-boolean-trap](https://pypi.org/project/flake8-boolean-trap/0.1.0/) on PyPI.
+For more, see [flake8-boolean-trap](https://pypi.org/project/flake8-boolean-trap/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -828,7 +832,7 @@ For more, see [flake8-boolean-trap](https://pypi.org/project/flake8-boolean-trap
 
 ### flake8-bugbear (B)
 
-For more, see [flake8-bugbear](https://pypi.org/project/flake8-bugbear/22.10.27/) on PyPI.
+For more, see [flake8-bugbear](https://pypi.org/project/flake8-bugbear/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -863,7 +867,7 @@ For more, see [flake8-bugbear](https://pypi.org/project/flake8-bugbear/22.10.27/
 
 ### flake8-builtins (A)
 
-For more, see [flake8-builtins](https://pypi.org/project/flake8-builtins/2.0.1/) on PyPI.
+For more, see [flake8-builtins](https://pypi.org/project/flake8-builtins/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -873,7 +877,7 @@ For more, see [flake8-builtins](https://pypi.org/project/flake8-builtins/2.0.1/)
 
 ### flake8-comprehensions (C4)
 
-For more, see [flake8-comprehensions](https://pypi.org/project/flake8-comprehensions/3.10.1/) on PyPI.
+For more, see [flake8-comprehensions](https://pypi.org/project/flake8-comprehensions/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -896,7 +900,7 @@ For more, see [flake8-comprehensions](https://pypi.org/project/flake8-comprehens
 
 ### flake8-debugger (T10)
 
-For more, see [flake8-debugger](https://pypi.org/project/flake8-debugger/4.1.2/) on PyPI.
+For more, see [flake8-debugger](https://pypi.org/project/flake8-debugger/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -904,7 +908,7 @@ For more, see [flake8-debugger](https://pypi.org/project/flake8-debugger/4.1.2/)
 
 ### flake8-errmsg (EM)
 
-For more, see [flake8-errmsg](https://pypi.org/project/flake8-errmsg/0.4.0/) on PyPI.
+For more, see [flake8-errmsg](https://pypi.org/project/flake8-errmsg/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -914,7 +918,7 @@ For more, see [flake8-errmsg](https://pypi.org/project/flake8-errmsg/0.4.0/) on
 
 ### flake8-implicit-str-concat (ISC)
 
-For more, see [flake8-implicit-str-concat](https://pypi.org/project/flake8-implicit-str-concat/0.3.0/) on PyPI.
+For more, see [flake8-implicit-str-concat](https://pypi.org/project/flake8-implicit-str-concat/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -932,7 +936,7 @@ For more, see [flake8-import-conventions](https://github.com/joaopalmeiro/flake8
 
 ### flake8-print (T20)
 
-For more, see [flake8-print](https://pypi.org/project/flake8-print/5.0.0/) on PyPI.
+For more, see [flake8-print](https://pypi.org/project/flake8-print/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -941,7 +945,7 @@ For more, see [flake8-print](https://pypi.org/project/flake8-print/5.0.0/) on Py
 
 ### flake8-pytest-style (PT)
 
-For more, see [flake8-pytest-style](https://pypi.org/project/flake8-pytest-style/1.6.0/) on PyPI.
+For more, see [flake8-pytest-style](https://pypi.org/project/flake8-pytest-style/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -973,7 +977,7 @@ For more, see [flake8-pytest-style](https://pypi.org/project/flake8-pytest-style
 
 ### flake8-quotes (Q)
 
-For more, see [flake8-quotes](https://pypi.org/project/flake8-quotes/3.3.1/) on PyPI.
+For more, see [flake8-quotes](https://pypi.org/project/flake8-quotes/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -984,7 +988,7 @@ For more, see [flake8-quotes](https://pypi.org/project/flake8-quotes/3.3.1/) on
 
 ### flake8-return (RET)
 
-For more, see [flake8-return](https://pypi.org/project/flake8-return/1.2.0/) on PyPI.
+For more, see [flake8-return](https://pypi.org/project/flake8-return/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -999,7 +1003,7 @@ For more, see [flake8-return](https://pypi.org/project/flake8-return/1.2.0/) on
 
 ### flake8-simplify (SIM)
 
-For more, see [flake8-simplify](https://pypi.org/project/flake8-simplify/0.19.3/) on PyPI.
+For more, see [flake8-simplify](https://pypi.org/project/flake8-simplify/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -1031,7 +1035,7 @@ For more, see [flake8-simplify](https://pypi.org/project/flake8-simplify/0.19.3/
 
 ### flake8-tidy-imports (TID)
 
-For more, see [flake8-tidy-imports](https://pypi.org/project/flake8-tidy-imports/4.8.0/) on PyPI.
+For more, see [flake8-tidy-imports](https://pypi.org/project/flake8-tidy-imports/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -1040,7 +1044,7 @@ For more, see [flake8-tidy-imports](https://pypi.org/project/flake8-tidy-imports
 
 ### flake8-unused-arguments (ARG)
 
-For more, see [flake8-unused-arguments](https://pypi.org/project/flake8-unused-arguments/0.0.12/) on PyPI.
+For more, see [flake8-unused-arguments](https://pypi.org/project/flake8-unused-arguments/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -1052,7 +1056,7 @@ For more, see [flake8-unused-arguments](https://pypi.org/project/flake8-unused-a
 
 ### flake8-datetimez (DTZ)
 
-For more, see [flake8-datetimez](https://pypi.org/project/flake8-datetimez/20.10.0/) on PyPI.
+For more, see [flake8-datetimez](https://pypi.org/project/flake8-datetimez/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -1062,13 +1066,13 @@ For more, see [flake8-datetimez](https://pypi.org/project/flake8-datetimez/20.10
 | DTZ004 | call-datetime-utcfromtimestamp | The use of `datetime.datetime.utcfromtimestamp()` is not allowed |  |
 | DTZ005 | call-datetime-now-without-tzinfo | The use of `datetime.datetime.now()` without `tz` argument is not allowed |  |
 | DTZ006 | call-datetime-fromtimestamp | The use of `datetime.datetime.fromtimestamp()` without `tz` argument is not allowed |  |
-| DTZ007 | call-datetime-strptime-without-zone | The use of `datetime.datetime.strptime()` without %z must be followed by `.replace(tzinfo=)` |  |
+| DTZ007 | call-datetime-strptime-without-zone | The use of `datetime.datetime.strptime()` without %z must be followed by `.replace(tzinfo=)` or `.astimezone()` |  |
 | DTZ011 | call-date-today | The use of `datetime.date.today()` is not allowed. |  |
 | DTZ012 | call-date-fromtimestamp | The use of `datetime.date.fromtimestamp()` is not allowed |  |
 
 ### eradicate (ERA)
 
-For more, see [eradicate](https://pypi.org/project/eradicate/2.1.0/) on PyPI.
+For more, see [eradicate](https://pypi.org/project/eradicate/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -1076,7 +1080,7 @@ For more, see [eradicate](https://pypi.org/project/eradicate/2.1.0/) on PyPI.
 
 ### pandas-vet (PD)
 
-For more, see [pandas-vet](https://pypi.org/project/pandas-vet/0.2.3/) on PyPI.
+For more, see [pandas-vet](https://pypi.org/project/pandas-vet/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -1104,9 +1108,9 @@ For more, see [pygrep-hooks](https://github.com/pre-commit/pygrep-hooks) on GitH
 | PGH003 | blanket-type-ignore | Use specific rule codes when ignoring type issues |  |
 | PGH004 | blanket-noqa | Use specific rule codes when using `noqa` |  |
 
-### Pylint (PLC, PLE, PLR, PLW)
+### Pylint (PL)
 
-For more, see [Pylint](https://pypi.org/project/pylint/2.15.7/) on PyPI.
+For more, see [Pylint](https://pypi.org/project/pylint/) on PyPI.
 
 #### Convention (PLC)
 | Code | Name | Message | Fix |
@@ -1139,7 +1143,7 @@ For more, see [Pylint](https://pypi.org/project/pylint/2.15.7/) on PyPI.
 
 ### flake8-pie (PIE)
 
-For more, see [flake8-pie](https://pypi.org/project/flake8-pie/0.16.0/) on PyPI.
+For more, see [flake8-pie](https://pypi.org/project/flake8-pie/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -1150,7 +1154,7 @@ For more, see [flake8-pie](https://pypi.org/project/flake8-pie/0.16.0/) on PyPI.
 
 ### flake8-commas (COM)
 
-For more, see [flake8-commas](https://pypi.org/project/flake8-commas/2.1.0/) on PyPI.
+For more, see [flake8-commas](https://pypi.org/project/flake8-commas/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -1160,12 +1164,39 @@ For more, see [flake8-commas](https://pypi.org/project/flake8-commas/2.1.0/) on
 
 ### flake8-no-pep420 (INP)
 
-For more, see [flake8-no-pep420](https://pypi.org/project/flake8-no-pep420/2.3.0/) on PyPI.
+For more, see [flake8-no-pep420](https://pypi.org/project/flake8-no-pep420/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
 | INP001 | implicit-namespace-package | File `{filename}` is part of an implicit namespace package. Add an `__init__.py`. |  |
 
+### flake8-executable (EXE)
+
+For more, see [flake8-executable](https://pypi.org/project/flake8-executable/) on PyPI.
+
+| Code | Name | Message | Fix |
+| ---- | ---- | ------- | --- |
+| EXE003 | shebang-python | Shebang should contain "python" |  |
+| EXE004 | shebang-whitespace | Avoid whitespace before shebang | 🛠 |
+| EXE005 | shebang-newline | Shebang should be at the beginning of the file |  |
+
+### flake8-type-checking (TYP)
+
+For more, see [flake8-type-checking](https://pypi.org/project/flake8-type-checking/) on PyPI.
+
+| Code | Name | Message | Fix |
+| ---- | ---- | ------- | --- |
+| TYP005 | empty-type-checking-block | Found empty type-checking block |  |
+
+### tryceratops (TRY)
+
+For more, see [tryceratops](https://pypi.org/project/tryceratops/1.1.0/) on PyPI.
+
+| Code | Name | Message | Fix |
+| ---- | ---- | ------- | --- |
+| TRY004 | prefer-type-error | Prefer `TypeError` exception for invalid type | 🛠 |
+| TRY300 | try-consider-else | Consider `else` block |  |
+
 ### Ruff-specific rules (RUF)
 
 | Code | Name | Message | Fix |
@@ -1458,11 +1489,13 @@ natively, including:
 - [`flake8-docstrings`](https://pypi.org/project/flake8-docstrings/)
 - [`flake8-eradicate`](https://pypi.org/project/flake8-eradicate/)
 - [`flake8-errmsg`](https://pypi.org/project/flake8-errmsg/)
+- [`flake8-executable`](https://pypi.org/project/flake8-executable/)
 - [`flake8-implicit-str-concat`](https://pypi.org/project/flake8-implicit-str-concat/)
 - [`flake8-import-conventions`](https://github.com/joaopalmeiro/flake8-import-conventions)
 - [`flake8-no-pep420`](https://pypi.org/project/flake8-no-pep420)
 - [`flake8-pie`](https://pypi.org/project/flake8-pie/) ([#1543](https://github.com/charliermarsh/ruff/issues/1543))
 - [`flake8-print`](https://pypi.org/project/flake8-print/)
+- [`flake8-pytest-style`](https://pypi.org/project/flake8-pytest-style/)
 - [`flake8-quotes`](https://pypi.org/project/flake8-quotes/)
 - [`flake8-return`](https://pypi.org/project/flake8-return/)
 - [`flake8-simplify`](https://pypi.org/project/flake8-simplify/) ([#998](https://github.com/charliermarsh/ruff/issues/998))
@@ -1506,7 +1539,7 @@ Like Flake8, Pylint supports plugins (called "checkers"), while Ruff implements
 
 Unlike Pylint, Ruff is capable of automatically fixing its own lint violations.
 
-Pylint parity is being tracked in [#689](https://github.com/charliermarsh/ruff/issues/689).
+Pylint parity is being tracked in [#970](https://github.com/charliermarsh/ruff/issues/970).
 
 ### Which tools does Ruff replace?
 
@@ -1526,11 +1559,13 @@ Today, Ruff can be used to replace Flake8 when used with any of the following pl
 - [`flake8-docstrings`](https://pypi.org/project/flake8-docstrings/)
 - [`flake8-eradicate`](https://pypi.org/project/flake8-eradicate/)
 - [`flake8-errmsg`](https://pypi.org/project/flake8-errmsg/)
+- [`flake8-executable`](https://pypi.org/project/flake8-executable/)
 - [`flake8-implicit-str-concat`](https://pypi.org/project/flake8-implicit-str-concat/)
 - [`flake8-import-conventions`](https://github.com/joaopalmeiro/flake8-import-conventions)
 - [`flake8-no-pep420`](https://pypi.org/project/flake8-no-pep420)
 - [`flake8-pie`](https://pypi.org/project/flake8-pie/) ([#1543](https://github.com/charliermarsh/ruff/issues/1543))
 - [`flake8-print`](https://pypi.org/project/flake8-print/)
+- [`flake8-pytest-style`](https://pypi.org/project/flake8-pytest-style/)
 - [`flake8-quotes`](https://pypi.org/project/flake8-quotes/)
 - [`flake8-return`](https://pypi.org/project/flake8-return/)
 - [`flake8-simplify`](https://pypi.org/project/flake8-simplify/) ([#998](https://github.com/charliermarsh/ruff/issues/998))
@@ -1639,24 +1674,10 @@ matter how they're provided, which avoids accidental incompatibilities and simpl
 
 Run `ruff /path/to/code.py --show-settings` to view the resolved settings for a given file.
 
-## Development
+## Contributing
 
-Ruff is written in Rust (1.65.0). You'll need to install the [Rust toolchain](https://www.rust-lang.org/tools/install)
-for development.
-
-Assuming you have `cargo` installed, you can run:
-
-```shell
-cargo run resources/test/fixtures
-```
-
-For development, we use [nightly Rust](https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust):
-
-```shell
-cargo +nightly fmt
-cargo +nightly clippy --fix --workspace --all-targets --all-features -- -W clippy::pedantic
-cargo +nightly test --all
-```
+Contributions are welcome and hugely appreciated. To get started, check out the
+[contributing guidelines](https://github.com/charliermarsh/ruff/blob/main/CONTRIBUTING.md).
 
 ## Releases
 
@@ -1979,7 +2000,7 @@ recommended to only use `extend-ignore` when extending a
 
 **Default value**: `[]`
 
-**Type**: `Vec<RuleCodePrefix>`
+**Type**: `Vec<RuleSelector>`
 
 **Example usage**:
 
@@ -2004,7 +2025,7 @@ recommended to only use `extend-select` when extending a
 
 **Default value**: `[]`
 
-**Type**: `Vec<RuleCodePrefix>`
+**Type**: `Vec<RuleSelector>`
 
 **Example usage**:
 
@@ -2079,7 +2100,7 @@ A list of rule codes or prefixes to consider autofixable.
 
 **Default value**: `["A", "ANN", "ARG", "B", "BLE", "C", "D", "E", "ERA", "F", "FBT", "I", "ICN", "N", "PGH", "PLC", "PLE", "PLR", "PLW", "Q", "RET", "RUF", "S", "T", "TID", "UP", "W", "YTT"]`
 
-**Type**: `Vec<RuleCodePrefix>`
+**Type**: `Vec<RuleSelector>`
 
 **Example usage**:
 
@@ -2151,7 +2172,7 @@ specific prefixes.
 
 **Default value**: `[]`
 
-**Type**: `Vec<RuleCodePrefix>`
+**Type**: `Vec<RuleSelector>`
 
 **Example usage**:
 
@@ -2229,7 +2250,7 @@ exclude, when considering any matching files.
 
 **Default value**: `{}`
 
-**Type**: `HashMap<String, Vec<RuleCodePrefix>>`
+**Type**: `HashMap<String, Vec<RuleSelector>>`
 
 **Example usage**:
 
@@ -2293,7 +2314,7 @@ specific prefixes.
 
 **Default value**: `["E", "F"]`
 
-**Type**: `Vec<RuleCodePrefix>`
+**Type**: `Vec<RuleSelector>`
 
 **Example usage**:
 
@@ -2437,7 +2458,7 @@ A list of rule codes or prefixes to consider non-autofix-able.
 
 **Default value**: `[]`
 
-**Type**: `Vec<RuleCodePrefix>`
+**Type**: `Vec<RuleSelector>`
 
 **Example usage**:
 
@@ -3456,8 +3477,3 @@ keep-runtime-typing = true
 ## License
 
 MIT
-
-## Contributing
-
-Contributions are welcome and hugely appreciated. To get started, check out the
-[contributing guidelines](https://github.com/charliermarsh/ruff/blob/main/CONTRIBUTING.md).

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);

build.rs

@@ -4,7 +4,7 @@ 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);
+    generate_linter_name_and_url(&out_dir);
 }
 
 const RULES_SUBMODULE_DOC_PREFIX: &str = "//! Rules from ";
@@ -12,16 +12,16 @@ 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/).
+///     //! Rules from [Pyflakes](https://pypi.org/project/pyflakes/).
 ///
 /// This function extracts the link label and url from these comments and
-/// generates the `name` and `url` functions for the `RuleOrigin` enum
+/// generates the `name` and `url` functions for the `Linter` enum
 /// accordingly, so that they can be used by `ruff_dev::generate_rules_table`.
-fn generate_origin_name_and_url(out_dir: &Path) {
+fn generate_linter_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();
+    let mut name_match_arms: String = r#"Linter::Ruff => "Ruff-specific rules","#.into();
+    let mut url_match_arms: String = r#"Linter::Ruff => None,"#.into();
 
     for file in fs::read_dir("src/rules/")
         .unwrap()
@@ -62,14 +62,14 @@ fn generate_origin_name_and_url(out_dir: &Path) {
             })
             .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}"),"#));
+        name_match_arms.push_str(&format!(r#"Linter::{variant_name} => "{name}","#));
+        url_match_arms.push_str(&format!(r#"Linter::{variant_name} => Some("{url}"),"#));
     }
 
     write!(
-        BufWriter::new(fs::File::create(out_dir.join("origin.rs")).unwrap()),
+        BufWriter::new(fs::File::create(out_dir.join("linter.rs")).unwrap()),
         "
-        impl RuleOrigin {{
+        impl Linter {{
             pub fn name(&self) -> &'static str {{
                 match self {{ {name_match_arms} }}
             }}

flake8_to_ruff/Cargo.lock

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

flake8_to_ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.227"
+version = "0.0.230"
 edition = "2021"
 
 [dependencies]

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(())

pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "maturin"
 
 [project]
 name = "ruff"
-version = "0.0.227"
+version = "0.0.230"
 description = "An extremely fast Python linter, written in Rust."
 authors = [
   { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" },

resources/test/fixtures/flake8_builtins/A001.py

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

resources/test/fixtures/flake8_builtins/A002.py

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

resources/test/fixtures/flake8_builtins/A003.py

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

resources/test/fixtures/flake8_commas/COM81.py

@@ -383,7 +383,7 @@ s = (
 
 s2 = (
     'this'
-    'is a also a string'
+    'is also a string'
 )
 
 t = (

resources/test/fixtures/flake8_executable/EXE003.py

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

resources/test/fixtures/flake8_executable/EXE004_1.py

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

resources/test/fixtures/flake8_executable/EXE004_2.py

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

resources/test/fixtures/flake8_executable/EXE004_3.py

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

resources/test/fixtures/flake8_executable/EXE005_1.py

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

resources/test/fixtures/flake8_executable/EXE005_2.py

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

resources/test/fixtures/flake8_executable/EXE005_3.py

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

resources/test/fixtures/flake8_import_conventions/from_imports.py

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

resources/test/fixtures/flake8_simplify/SIM102.py

@@ -3,6 +3,12 @@ if a:
     if b:
         c
 
+# SIM102
+if a:
+    if b:
+        if c:
+            d
+
 # SIM102
 if a:
     pass

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

resources/test/fixtures/flake8_type_checking/TYP005.py

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

resources/test/fixtures/isort/line_ending_cr.py

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

resources/test/fixtures/pep8_naming/N806.py

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

resources/test/fixtures/pycodestyle/E101.py

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

resources/test/fixtures/pydocstyle/D.py

@@ -606,3 +606,31 @@ def one_liner():
     r"""Wrong.
 
     """
+
+
+@expect('D200: One-line docstring should fit on one line with quotes '
+        '(found 3)')
+@expect('D212: Multi-line docstring summary should start at the first line')
+def one_liner():
+    """Wrong."
+
+    """
+
+
+@expect('D200: One-line docstring should fit on one line with quotes '
+        '(found 3)')
+@expect('D212: Multi-line docstring summary should start at the first line')
+def one_liner():
+    """
+
+    "Wrong."""
+
+
+@expect('D404: First word of the docstring should not be "This"')
+def starts_with_this():
+    """This is a docstring."""
+
+
+@expect('D404: First word of the docstring should not be "This"')
+def starts_with_space_then_this():
+    """ This is a docstring that starts with a space."""  # noqa: D210

resources/test/fixtures/pydocstyle/D401.py

@@ -0,0 +1,43 @@
+# Bad examples
+
+def bad_liouiwnlkjl():
+    """Returns foo."""
+
+
+def bad_sdgfsdg23245():
+    """Constructor for a foo."""
+
+
+def bad_sdgfsdg23245777():
+    """
+
+    Constructor for a boa.
+
+    """
+
+
+def bad_run_something():
+    """Runs something"""
+    pass
+
+
+def multi_line():
+    """Writes a logical line that
+    extends to two physical lines.
+    """
+
+
+# Good examples
+
+def good_run_something():
+    """Run away."""
+
+
+def good_construct():
+    """Construct a beautiful house."""
+
+
+def good_multi_line():
+    """Write a logical line that
+    extends to two physical lines.
+    """

resources/test/fixtures/pyflakes/multi_statement_lines.py

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

resources/test/fixtures/pyproject.toml

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

resources/test/fixtures/pyupgrade/UP013.py

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

resources/test/fixtures/pyupgrade/UP031_0.py

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

resources/test/fixtures/pyupgrade/UP031_1.py

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

resources/test/fixtures/pyupgrade/UP034.py

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

resources/test/fixtures/ruff/RUF005.py

@@ -20,3 +20,20 @@ astonishment = ("we all feel", ) + Fun.words
 chain = ['a', 'b', 'c'] + eggs + list(('yes', 'no', 'pants') + zoob)
 
 baz = () + zoob
+
+first = [
+    # The order
+    1,  # here
+    2,  # is
+    # extremely
+    3,  # critical
+    # to preserve
+]
+second = first + [
+    # please
+    4,
+    # don't
+    5,
+    # touch
+    6,
+]

resources/test/fixtures/ruff/RUF100_1.py

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

resources/test/fixtures/tryceratops/TRY004.py

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

resources/test/fixtures/tryceratops/TRY300.py

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

ruff.schema.json

@@ -73,7 +73,7 @@
         "null"
       ],
       "items": {
-        "$ref": "#/definitions/RuleCodePrefix"
+        "$ref": "#/definitions/RuleSelector"
       }
     },
     "extend-select": {
@@ -83,7 +83,7 @@
         "null"
       ],
       "items": {
-        "$ref": "#/definitions/RuleCodePrefix"
+        "$ref": "#/definitions/RuleSelector"
       }
     },
     "external": {
@@ -117,7 +117,7 @@
         "null"
       ],
       "items": {
-        "$ref": "#/definitions/RuleCodePrefix"
+        "$ref": "#/definitions/RuleSelector"
       }
     },
     "flake8-annotations": {
@@ -153,6 +153,17 @@
         }
       ]
     },
+    "flake8-builtins": {
+      "description": "Options for the `flake8-builtins` plugin.",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Flake8BuiltinsOptions"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
     "flake8-errmsg": {
       "description": "Options for the `flake8-errmsg` plugin.",
       "anyOf": [
@@ -244,7 +255,7 @@
         "null"
       ],
       "items": {
-        "$ref": "#/definitions/RuleCodePrefix"
+        "$ref": "#/definitions/RuleSelector"
       }
     },
     "ignore-init-module-imports": {
@@ -315,7 +326,7 @@
       "additionalProperties": {
         "type": "array",
         "items": {
-          "$ref": "#/definitions/RuleCodePrefix"
+          "$ref": "#/definitions/RuleSelector"
         }
       }
     },
@@ -388,7 +399,7 @@
         "null"
       ],
       "items": {
-        "$ref": "#/definitions/RuleCodePrefix"
+        "$ref": "#/definitions/RuleSelector"
       }
     },
     "show-source": {
@@ -446,7 +457,7 @@
         "null"
       ],
       "items": {
-        "$ref": "#/definitions/RuleCodePrefix"
+        "$ref": "#/definitions/RuleSelector"
       }
     },
     "update-check": {
@@ -584,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": {
@@ -1134,7 +1161,7 @@
         }
       ]
     },
-    "RuleCodePrefix": {
+    "RuleSelector": {
       "type": "string",
       "enum": [
         "A",
@@ -1277,6 +1304,7 @@
         "D4",
         "D40",
         "D400",
+        "D401",
         "D402",
         "D403",
         "D404",
@@ -1310,6 +1338,9 @@
         "DTZ011",
         "DTZ012",
         "E",
+        "E1",
+        "E10",
+        "E101",
         "E4",
         "E40",
         "E401",
@@ -1347,6 +1378,12 @@
         "ERA0",
         "ERA00",
         "ERA001",
+        "EXE",
+        "EXE0",
+        "EXE00",
+        "EXE003",
+        "EXE004",
+        "EXE005",
         "F",
         "F4",
         "F40",
@@ -1517,6 +1554,7 @@
         "PIE8",
         "PIE80",
         "PIE807",
+        "PL",
         "PLC",
         "PLC0",
         "PLC04",
@@ -1710,6 +1748,17 @@
         "TID25",
         "TID251",
         "TID252",
+        "TRY",
+        "TRY0",
+        "TRY00",
+        "TRY004",
+        "TRY3",
+        "TRY30",
+        "TRY300",
+        "TYP",
+        "TYP0",
+        "TYP00",
+        "TYP005",
         "U",
         "U0",
         "U00",
@@ -1766,8 +1815,10 @@
         "UP029",
         "UP03",
         "UP030",
+        "UP031",
         "UP032",
         "UP033",
+        "UP034",
         "W",
         "W2",
         "W29",

ruff_cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_cli"
-version = "0.0.227"
+version = "0.0.230"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 edition = "2021"
 rust-version = "1.65.0"

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:?}");

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::{Rule, 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>>,
@@ -324,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>,
@@ -435,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)
@@ -444,9 +443,6 @@ pub fn collect_per_file_ignores(pairs: Vec<PatternPrefixPair>) -> Vec<PerFileIgn
     }
     per_file_ignores
         .into_iter()
-        .map(|(pattern, prefixes)| {
-            let absolute = fs::normalize_path(Path::new(&pattern));
-            PerFileIgnore::new(pattern, absolute, &prefixes)
-        })
+        .map(|(pattern, prefixes)| PerFileIgnore::new(pattern, &prefixes, None))
         .collect()
 }

ruff_cli/src/commands.rs

@@ -15,7 +15,7 @@ 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::Rule;
+use ruff::registry::{Linter, Rule, RuleNamespace};
 use ruff::resolver::{FileDiscovery, PyprojectDiscovery};
 use ruff::settings::flags;
 use ruff::settings::types::SerializationFormat;
@@ -285,16 +285,17 @@ pub fn show_files(
 #[derive(Serialize)]
 struct Explanation<'a> {
     code: &'a str,
-    origin: &'a str,
+    linter: &'a str,
     summary: &'a str,
 }
 
 /// 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!("{}\n", rule.as_ref());
-            println!("Code: {} ({})\n", rule.code(), rule.origin().name());
+            println!("Code: {} ({})\n", rule.code(), linter.name());
 
             if let Some(autofix) = rule.autofixable() {
                 println!(
@@ -315,7 +316,7 @@ pub fn explain(rule: &Rule, format: SerializationFormat) -> Result<()> {
                 "{}",
                 serde_json::to_string_pretty(&Explanation {
                     code: rule.code(),
-                    origin: rule.origin().name(),
+                    linter: linter.name(),
                     summary: rule.message_formats()[0],
                 })?
             );

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 })

ruff_cli/tests/black_compatibility_test.rs

@@ -13,7 +13,7 @@ use assert_cmd::Command;
 use itertools::Itertools;
 use log::info;
 use ruff::logging::{set_up_logging, LogLevel};
-use ruff::registry::RuleOrigin;
+use ruff::registry::{Linter, RuleNamespace};
 use strum::IntoEnumIterator;
 use walkdir::WalkDir;
 
@@ -175,12 +175,12 @@ fn test_ruff_black_compatibility() -> Result<()> {
         .filter_map(Result::ok)
         .collect();
 
-    let codes = RuleOrigin::iter()
+    let codes = Linter::iter()
         // Exclude ruff codes, specifically RUF100, because it causes differences that are not a
         // problem. Ruff would add a `# noqa: W292`  after the first run, black introduces a
         // newline, and ruff removes the `# noqa: W292` again.
-        .filter(|origin| *origin != RuleOrigin::Ruff)
-        .map(|origin| origin.prefixes().as_list(","))
+        .filter(|linter| *linter != Linter::Ruff)
+        .map(|linter| linter.prefixes().join(","))
         .join(",");
     let ruff_args = [
         "-",

ruff_dev/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_dev"
-version = "0.0.227"
+version = "0.0.230"
 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 = "ff90fe52eea578c8ebdd9d95e078cc041a5959fa" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "ff90fe52eea578c8ebdd9d95e078cc041a5959fa" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "ff90fe52eea578c8ebdd9d95e078cc041a5959fa" }
+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"] }

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,12 +20,12 @@ 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 in prefix.codes() {
+    for rule in rules {
         let fix_token = match rule.autofixable() {
             None => "",
             Some(_) => "🛠",
@@ -47,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('/')
@@ -70,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",
@@ -78,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()
                     ),
                 }
             ));
@@ -86,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);
         }
     }
 

ruff_macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_macros"
-version = "0.0.227"
+version = "0.0.230"
 edition = "2021"
 
 [lib]

ruff_macros/src/define_rule_mapping.rs

@@ -10,7 +10,6 @@ pub fn define_rule_mapping(mapping: &Mapping) -> proc_macro2::TokenStream {
     let mut diagkind_variants = quote!();
     let mut rule_message_formats_match_arms = quote!();
     let mut rule_autofixable_match_arms = quote!();
-    let mut rule_origin_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!();
@@ -29,8 +28,6 @@ pub fn define_rule_mapping(mapping: &Mapping) -> proc_macro2::TokenStream {
         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,});
-        let origin = get_origin(code);
-        rule_origin_match_arms.extend(quote! {Self::#name => RuleOrigin::#origin,});
         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, });
@@ -56,7 +53,7 @@ pub fn define_rule_mapping(mapping: &Mapping) -> proc_macro2::TokenStream {
 
     let rulecodeprefix = super::rule_code_prefix::expand(
         &Ident::new("Rule", Span::call_site()),
-        &Ident::new("RuleCodePrefix", Span::call_site()),
+        &Ident::new("RuleSelector", Span::call_site()),
         mapping.entries.iter().map(|(code, ..)| code),
         |code| code_to_name[code],
     );
@@ -95,10 +92,6 @@ pub fn define_rule_mapping(mapping: &Mapping) -> proc_macro2::TokenStream {
                 match self { #rule_autofixable_match_arms }
             }
 
-            pub fn origin(&self) -> RuleOrigin {
-                match self { #rule_origin_match_arms }
-            }
-
             pub fn code(&self) -> &'static str {
                 match self { #rule_code_match_arms }
             }
@@ -140,19 +133,6 @@ pub fn define_rule_mapping(mapping: &Mapping) -> proc_macro2::TokenStream {
     }
 }
 
-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)>,
 }

ruff_macros/src/lib.rs

@@ -19,8 +19,8 @@ use syn::{parse_macro_input, DeriveInput, ItemFn};
 mod config;
 mod define_rule_mapping;
 mod derive_message_formats;
-mod prefixes;
 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 {
@@ -37,6 +37,15 @@ pub fn define_rule_mapping(item: proc_macro::TokenStream) -> proc_macro::TokenSt
     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_namespace::derive_impl(input)
+        .unwrap_or_else(syn::Error::into_compile_error)
+        .into()
+}
+
 #[proc_macro_attribute]
 pub fn derive_message_formats(_attr: TokenStream, item: TokenStream) -> TokenStream {
     let func = parse_macro_input!(item as ItemFn);

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));
-            }
-        }
-    }
-}

ruff_macros/src/rule_code_prefix.rs

@@ -7,8 +7,8 @@ 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.
@@ -91,9 +91,12 @@ pub fn expand<'a>(
     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.span();
         let code_str = variant.to_string();
         let code_prefix_len = code_str
             .chars()
@@ -103,28 +106,32 @@ pub fn expand<'a>(
         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
         }
@@ -148,6 +155,7 @@ pub fn expand<'a>(
             Two,
             Three,
             Four,
+            Five,
         }
 
         #[derive(
@@ -169,7 +177,7 @@ pub fn expand<'a>(
 
         #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),*
@@ -181,50 +189,51 @@ pub fn expand<'a>(
 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 rule_variant = variant_name(code);
             quote! {
                 #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! {
@@ -233,11 +242,11 @@ fn generate_impls<'a>(
         }
     });
 
-    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,
             }
@@ -248,15 +257,6 @@ fn generate_impls<'a>(
 
     quote! {
         impl #prefix_ident {
-            pub fn codes(&self) -> Vec<#rule_type> {
-                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 {
@@ -265,6 +265,20 @@ fn generate_impls<'a>(
             }
         }
 
+        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)*];
     }
 }

ruff_macros/src/rule_namespace.rs

@@ -0,0 +1,100 @@
+use proc_macro2::{Ident, Span};
+use quote::quote;
+use syn::spanned::Spanned;
+use syn::{Data, DataEnum, DeriveInput, Error, Lit, Meta, MetaNameValue};
+
+pub fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream> {
+    let DeriveInput { ident, data: Data::Enum(DataEnum {
+        variants, ..
+    }), .. } = input else {
+        return Err(Error::new(input.ident.span(), "only named fields are supported"));
+    };
+
+    let mut parsed = Vec::new();
+
+    let mut prefix_match_arms = quote!();
+
+    for variant in variants {
+        let prefix_attrs: Vec<_> = variant
+            .attrs
+            .iter()
+            .filter(|a| a.path.is_ident("prefix"))
+            .collect();
+
+        if prefix_attrs.is_empty() {
+            return Err(Error::new(
+                variant.span(),
+                r#"Missing [#prefix = "..."] attribute"#,
+            ));
+        }
+
+        let mut prefix_literals = Vec::new();
+
+        for attr in prefix_attrs {
+            let Ok(Meta::NameValue(MetaNameValue{lit: Lit::Str(lit), ..})) = attr.parse_meta() else {
+                return Err(Error::new(attr.span(), r#"expected attribute to be in the form of [#prefix = "..."]"#))
+            };
+            parsed.push((lit.clone(), variant.ident.clone()));
+            prefix_literals.push(lit);
+        }
+
+        let variant_ident = variant.ident;
+
+        prefix_match_arms.extend(quote! {
+            Self::#variant_ident => &[#(#prefix_literals),*],
+        });
+    }
+
+    parsed.sort_by_key(|(prefix, _)| prefix.value().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.value(), 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 }
+            }
+        }
+
+        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
+                }
+            }
+        }
+    })
+}

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]

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(
@@ -67,57 +59,36 @@ 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() == '#[prefix = "RUF"]':
+                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 +98,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 +112,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)

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: Rule, path: &Path) -> Result<()> {":
-                indent = line.split("fn rules(rule_code: Rule, path: &Path) -> Result<()> {")[0]
-                fp.write(f'{indent}#[test_case(Rule::{code}, Path::new("{code}.py"); "{code}")]')
+                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::{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)

scripts/pyproject.toml

@@ -0,0 +1,9 @@
+[tool.ruff]
+select = ["ALL"]
+ignore = [
+    "S101", # assert-used
+    "PLR2004", # magic-value-comparison
+]
+
+[tool.ruff.pydocstyle]
+convention = "pep257"

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.

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 {

src/ast/helpers.rs

@@ -161,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))
@@ -366,7 +366,7 @@ 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_in(range: Range, locator: &Locator) -> bool {
-    lexer::make_tokenizer(&locator.slice_source_code_range(&range))
+    lexer::make_tokenizer(locator.slice_source_code_range(&range))
         .any(|result| result.map_or(false, |(_, tok, _)| matches!(tok, Tok::Comment(..))))
 }
 
@@ -486,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);
             }
@@ -515,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 {
@@ -535,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)| {
@@ -562,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 {
@@ -576,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 {
@@ -630,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 {
@@ -646,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 {
@@ -676,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 {

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 {

src/ast/visitor.rs

@@ -288,7 +288,7 @@ pub fn walk_expr<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, expr: &'a Expr) {
             visitor.visit_expr(orelse);
         }
         ExprKind::Dict { keys, values } => {
-            for expr in keys {
+            for expr in keys.iter().flatten() {
                 visitor.visit_expr(expr);
             }
             for expr in values {

src/ast/whitespace.rs

@@ -1,4 +1,3 @@
-use std::borrow::Cow;
 use std::str::Lines;
 
 use rustpython_ast::{Located, Location};
@@ -7,7 +6,7 @@ use crate::ast::types::Range;
 use crate::source_code::Locator;
 
 /// Extract the leading indentation from a line.
-pub fn indentation<'a, T>(locator: &'a Locator, located: &'a Located<T>) -> Option<Cow<'a, str>> {
+pub fn indentation<'a, T>(locator: &'a Locator, located: &'a Located<T>) -> Option<&'a str> {
     let range = Range::from_located(located);
     let indentation = locator.slice_source_code_range(&Range::new(
         Location::new(range.location.row(), 0),

src/autofix/helpers.rs

@@ -80,7 +80,7 @@ fn is_lone_child(child: &Stmt, parent: &Stmt, deleted: &[&Stmt]) -> Result<bool>
 /// of a multi-statement line.
 fn trailing_semicolon(stmt: &Stmt, locator: &Locator) -> Option<Location> {
     let contents = locator.slice_source_code_at(stmt.end_location.unwrap());
-    for (row, line) in LinesWithTrailingNewline::from(&contents).enumerate() {
+    for (row, line) in LinesWithTrailingNewline::from(contents).enumerate() {
         let trimmed = line.trim();
         if trimmed.starts_with(';') {
             let column = line
@@ -103,7 +103,7 @@ fn trailing_semicolon(stmt: &Stmt, locator: &Locator) -> Option<Location> {
 fn next_stmt_break(semicolon: Location, locator: &Locator) -> Location {
     let start_location = Location::new(semicolon.row(), semicolon.column() + 1);
     let contents = locator.slice_source_code_at(start_location);
-    for (row, line) in LinesWithTrailingNewline::from(&contents).enumerate() {
+    for (row, line) in LinesWithTrailingNewline::from(contents).enumerate() {
         let trimmed = line.trim();
         // Skip past any continuations.
         if trimmed.starts_with('\\') {
@@ -202,7 +202,7 @@ pub fn remove_unused_imports<'a>(
     indexer: &Indexer,
 ) -> Result<Fix> {
     let module_text = locator.slice_source_code_range(&Range::from_located(stmt));
-    let mut tree = match_module(&module_text)?;
+    let mut tree = match_module(module_text)?;
 
     let Some(Statement::Simple(body)) = tree.body.first_mut() else {
         bail!("Expected Statement::Simple");

src/autofix/mod.rs

@@ -1,8 +1,6 @@
-use std::borrow::Cow;
 use std::collections::BTreeSet;
 
 use itertools::Itertools;
-use ropey::RopeBuilder;
 use rustpython_ast::Location;
 
 use crate::ast::types::Range;
@@ -14,10 +12,7 @@ pub mod fixer;
 pub mod helpers;
 
 /// Auto-fix errors in a file, and write the fixed source code to disk.
-pub fn fix_file<'a>(
-    diagnostics: &'a [Diagnostic],
-    locator: &'a Locator<'a>,
-) -> Option<(Cow<'a, str>, usize)> {
+pub fn fix_file(diagnostics: &[Diagnostic], locator: &Locator) -> Option<(String, usize)> {
     if diagnostics.iter().all(|check| check.fix.is_none()) {
         return None;
     }
@@ -32,8 +27,8 @@ pub fn fix_file<'a>(
 fn apply_fixes<'a>(
     fixes: impl Iterator<Item = &'a Fix>,
     locator: &'a Locator<'a>,
-) -> (Cow<'a, str>, usize) {
-    let mut output = RopeBuilder::new();
+) -> (String, usize) {
+    let mut output = String::new();
     let mut last_pos: Location = Location::new(1, 0);
     let mut applied: BTreeSet<&Fix> = BTreeSet::default();
     let mut num_fixed: usize = 0;
@@ -54,10 +49,10 @@ fn apply_fixes<'a>(
 
         // Add all contents from `last_pos` to `fix.location`.
         let slice = locator.slice_source_code_range(&Range::new(last_pos, fix.location));
-        output.append(&slice);
+        output.push_str(slice);
 
         // Add the patch itself.
-        output.append(&fix.content);
+        output.push_str(&fix.content);
 
         // Track that the fix was applied.
         last_pos = fix.end_location;
@@ -67,9 +62,9 @@ fn apply_fixes<'a>(
 
     // Add the remaining content.
     let slice = locator.slice_source_code_at(last_pos);
-    output.append(&slice);
+    output.push_str(slice);
 
-    (Cow::from(output.finish()), num_fixed)
+    (output, num_fixed)
 }
 
 #[cfg(test)]

src/checkers/ast.rs

@@ -35,9 +35,9 @@ use crate::rules::{
     flake8_2020, flake8_annotations, flake8_bandit, flake8_blind_except, flake8_boolean_trap,
     flake8_bugbear, flake8_builtins, flake8_comprehensions, flake8_datetimez, flake8_debugger,
     flake8_errmsg, flake8_implicit_str_concat, flake8_import_conventions, flake8_pie, flake8_print,
-    flake8_pytest_style, flake8_return, flake8_simplify, flake8_tidy_imports,
+    flake8_pytest_style, flake8_return, flake8_simplify, flake8_tidy_imports, flake8_type_checking,
     flake8_unused_arguments, mccabe, pandas_vet, pep8_naming, pycodestyle, pydocstyle, pyflakes,
-    pygrep_hooks, pylint, pyupgrade, ruff,
+    pygrep_hooks, pylint, pyupgrade, ruff, tryceratops,
 };
 use crate::settings::types::PythonVersion;
 use crate::settings::{flags, Settings};
@@ -273,7 +273,7 @@ impl<'a> Checker<'a> {
             Location::new(*noqa_lineno, 0),
             Location::new(noqa_lineno + 1, 0),
         ));
-        match noqa::extract_noqa_directive(&line) {
+        match noqa::extract_noqa_directive(line) {
             Directive::None => false,
             Directive::All(..) => true,
             Directive::Codes(.., codes) => noqa::includes(code, &codes),
@@ -1230,6 +1230,28 @@ where
                         }
                     }
 
+                    if self
+                        .settings
+                        .rules
+                        .enabled(&Rule::ImportAliasIsNotConventional)
+                    {
+                        let full_name = helpers::format_import_from_member(
+                            level.as_ref(),
+                            module.as_deref(),
+                            &alias.node.name,
+                        );
+                        if let Some(diagnostic) =
+                            flake8_import_conventions::rules::check_conventional_import(
+                                stmt,
+                                &full_name,
+                                alias.node.asname.as_deref(),
+                                &self.settings.flake8_import_conventions.aliases,
+                            )
+                        {
+                            self.diagnostics.push(diagnostic);
+                        }
+                    }
+
                     if let Some(asname) = &alias.node.asname {
                         if self
                             .settings
@@ -1355,8 +1377,17 @@ where
                 if self.settings.rules.enabled(&Rule::IfTuple) {
                     pyflakes::rules::if_tuple(self, stmt, test);
                 }
+                if self.settings.rules.enabled(&Rule::EmptyTypeCheckingBlock) {
+                    flake8_type_checking::rules::empty_type_checking_block(self, test, body);
+                }
                 if self.settings.rules.enabled(&Rule::NestedIfStatements) {
-                    flake8_simplify::rules::nested_if_statements(self, stmt);
+                    flake8_simplify::rules::nested_if_statements(
+                        self,
+                        stmt,
+                        test,
+                        body,
+                        self.current_stmt_parent().map(Into::into),
+                    );
                 }
                 if self
                     .settings
@@ -1382,6 +1413,15 @@ where
                         self.current_stmt_parent().map(std::convert::Into::into),
                     );
                 }
+                if self.settings.rules.enabled(&Rule::PreferTypeError) {
+                    tryceratops::rules::prefer_type_error(
+                        self,
+                        body,
+                        test,
+                        orelse,
+                        self.current_stmt_parent().map(Into::into),
+                    );
+                }
             }
             StmtKind::Assert { test, msg } => {
                 if self.settings.rules.enabled(&Rule::AssertTuple) {
@@ -1535,6 +1575,9 @@ where
                         self, body, handlers, finalbody,
                     );
                 }
+                if self.settings.rules.enabled(&Rule::TryConsiderElse) {
+                    tryceratops::rules::try_consider_else(self, body, orelse);
+                }
             }
             StmtKind::Assign { targets, value, .. } => {
                 if self.settings.rules.enabled(&Rule::DoNotAssignLambda) {
@@ -2618,7 +2661,7 @@ where
                             .enabled(&Rule::PercentFormatUnsupportedFormatCharacter)
                     {
                         let location = Range::from_located(expr);
-                        match pyflakes::cformat::CFormatSummary::try_from(value.as_ref()) {
+                        match pyflakes::cformat::CFormatSummary::try_from(value.as_str()) {
                             Err(CFormatError {
                                 typ: CFormatErrorType::UnsupportedFormatChar(c),
                                 ..
@@ -2713,6 +2756,10 @@ where
                             }
                         }
                     }
+
+                    if self.settings.rules.enabled(&Rule::PrintfStringFormatting) {
+                        pyupgrade::rules::printf_string_formatting(self, expr, left, right);
+                    }
                 }
             }
             ExprKind::BinOp {
@@ -3108,7 +3155,7 @@ where
                         // Ex) TypedDict("a", {"a": int})
                         if args.len() > 1 {
                             if let ExprKind::Dict { keys, values } = &args[1].node {
-                                for key in keys {
+                                for key in keys.iter().flatten() {
                                     self.in_type_definition = false;
                                     self.visit_expr(key);
                                     self.in_type_definition = prev_in_type_definition;
@@ -3571,7 +3618,6 @@ impl<'a> Checker<'a> {
     {
         let binding_index = self.bindings.len();
 
-        let mut overridden = None;
         if let Some((stack_index, scope_index)) = self
             .scope_stack
             .iter()
@@ -3603,7 +3649,6 @@ impl<'a> Checker<'a> {
                         | BindingKind::FutureImportation
                 );
                 if matches!(binding.kind, BindingKind::LoopVar) && existing_is_import {
-                    overridden = Some((*scope_index, *existing_binding_index));
                     if self.settings.rules.enabled(&Rule::ImportShadowedByLoopVar) {
                         self.diagnostics.push(Diagnostic::new(
                             violations::ImportShadowedByLoopVar(
@@ -3623,7 +3668,6 @@ impl<'a> Checker<'a> {
                                 cast::decorator_list(existing.source.as_ref().unwrap()),
                             ))
                     {
-                        overridden = Some((*scope_index, *existing_binding_index));
                         if self.settings.rules.enabled(&Rule::RedefinedWhileUnused) {
                             self.diagnostics.push(Diagnostic::new(
                                 violations::RedefinedWhileUnused(
@@ -3643,13 +3687,6 @@ impl<'a> Checker<'a> {
             }
         }
 
-        // If we're about to lose the binding, store it as overridden.
-        if let Some((scope_index, binding_index)) = overridden {
-            self.scopes[scope_index]
-                .overridden
-                .push((name, binding_index));
-        }
-
         // Assume the rebound name is used as a global or within a loop.
         let scope = self.current_scope();
         let binding = match scope.values.get(&name) {
@@ -4497,6 +4534,7 @@ impl<'a> Checker<'a> {
                 .rules
                 .enabled(&Rule::UsesRPrefixForBackslashedContent)
             || self.settings.rules.enabled(&Rule::EndsInPeriod)
+            || self.settings.rules.enabled(&Rule::NonImperativeMood)
             || self.settings.rules.enabled(&Rule::NoSignature)
             || self.settings.rules.enabled(&Rule::FirstLineCapitalized)
             || self.settings.rules.enabled(&Rule::NoThisPrefix)
@@ -4572,12 +4610,13 @@ impl<'a> Checker<'a> {
                     Location::new(expr.location.row(), 0),
                     Location::new(expr.location.row(), expr.location.column()),
                 ));
-                let body = pydocstyle::helpers::raw_contents(&contents);
+
+                let body = pydocstyle::helpers::raw_contents(contents);
                 let docstring = Docstring {
                     kind: definition.kind,
                     expr,
-                    contents: &contents,
-                    indentation: &indentation,
+                    contents,
+                    indentation,
                     body,
                 };
 
@@ -4645,6 +4684,9 @@ impl<'a> Checker<'a> {
                 if self.settings.rules.enabled(&Rule::EndsInPeriod) {
                     pydocstyle::rules::ends_with_period(self, &docstring);
                 }
+                if self.settings.rules.enabled(&Rule::NonImperativeMood) {
+                    pydocstyle::rules::non_imperative_mood::non_imperative_mood(self, &docstring);
+                }
                 if self.settings.rules.enabled(&Rule::NoSignature) {
                     pydocstyle::rules::no_signature(self, &docstring);
                 }
@@ -4718,6 +4760,7 @@ impl<'a> Checker<'a> {
                     name,
                     located,
                     flake8_builtins::types::ShadowingType::Attribute,
+                    &self.settings.flake8_builtins.builtins_ignorelist,
                 ) {
                     self.diagnostics.push(diagnostic);
                 }
@@ -4728,6 +4771,7 @@ impl<'a> Checker<'a> {
                     name,
                     located,
                     flake8_builtins::types::ShadowingType::Variable,
+                    &self.settings.flake8_builtins.builtins_ignorelist,
                 ) {
                     self.diagnostics.push(diagnostic);
                 }
@@ -4741,6 +4785,7 @@ impl<'a> Checker<'a> {
                 name,
                 arg,
                 flake8_builtins::types::ShadowingType::Argument,
+                &self.settings.flake8_builtins.builtins_ignorelist,
             ) {
                 self.diagnostics.push(diagnostic);
             }

src/checkers/filesystem.rs

@@ -4,12 +4,16 @@ use crate::registry::{Diagnostic, Rule};
 use crate::rules::flake8_no_pep420::rules::implicit_namespace_package;
 use crate::settings::Settings;
 
-pub fn check_file_path(path: &Path, settings: &Settings) -> Vec<Diagnostic> {
+pub fn check_file_path(
+    path: &Path,
+    package: Option<&Path>,
+    settings: &Settings,
+) -> Vec<Diagnostic> {
     let mut diagnostics: Vec<Diagnostic> = vec![];
 
     // flake8-no-pep420
     if settings.rules.enabled(&Rule::ImplicitNamespacePackage) {
-        if let Some(diagnostic) = implicit_namespace_package(path) {
+        if let Some(diagnostic) = implicit_namespace_package(path, package) {
             diagnostics.push(diagnostic);
         }
     }

src/checkers/lines.rs

@@ -1,8 +1,10 @@
 //! Lint rules based on checking raw physical lines.
 
 use crate::registry::{Diagnostic, Rule};
+use crate::rules::flake8_executable::helpers::extract_shebang;
+use crate::rules::flake8_executable::rules::{shebang_newline, shebang_python, shebang_whitespace};
 use crate::rules::pycodestyle::rules::{
-    doc_line_too_long, line_too_long, no_newline_at_end_of_file,
+    doc_line_too_long, line_too_long, mixed_spaces_and_tabs, no_newline_at_end_of_file,
 };
 use crate::rules::pygrep_hooks::rules::{blanket_noqa, blanket_type_ignore};
 use crate::rules::pyupgrade::rules::unnecessary_coding_comment;
@@ -18,6 +20,9 @@ pub fn check_lines(
     let mut diagnostics: Vec<Diagnostic> = vec![];
 
     let enforce_blanket_noqa = settings.rules.enabled(&Rule::BlanketNOQA);
+    let enforce_shebang_whitespace = settings.rules.enabled(&Rule::ShebangWhitespace);
+    let enforce_shebang_newline = settings.rules.enabled(&Rule::ShebangNewline);
+    let enforce_shebang_python = settings.rules.enabled(&Rule::ShebangPython);
     let enforce_blanket_type_ignore = settings.rules.enabled(&Rule::BlanketTypeIgnore);
     let enforce_doc_line_too_long = settings.rules.enabled(&Rule::DocLineTooLong);
     let enforce_line_too_long = settings.rules.enabled(&Rule::LineTooLong);
@@ -25,6 +30,14 @@ pub fn check_lines(
     let enforce_unnecessary_coding_comment = settings
         .rules
         .enabled(&Rule::PEP3120UnnecessaryCodingComment);
+    let enforce_mixed_spaces_and_tabs = settings.rules.enabled(&Rule::MixedSpacesAndTabs);
+
+    let fix_unnecessary_coding_comment = matches!(autofix, flags::Autofix::Enabled)
+        && settings
+            .rules
+            .should_fix(&Rule::PEP3120UnnecessaryCodingComment);
+    let fix_shebang_whitespace = matches!(autofix, flags::Autofix::Enabled)
+        && settings.rules.should_fix(&Rule::ShebangWhitespace);
 
     let mut commented_lines_iter = commented_lines.iter().peekable();
     let mut doc_lines_iter = doc_lines.iter().peekable();
@@ -35,14 +48,9 @@ pub fn check_lines(
         {
             if enforce_unnecessary_coding_comment {
                 if index < 2 {
-                    if let Some(diagnostic) = unnecessary_coding_comment(
-                        index,
-                        line,
-                        matches!(autofix, flags::Autofix::Enabled)
-                            && settings
-                                .rules
-                                .should_fix(&Rule::PEP3120UnnecessaryCodingComment),
-                    ) {
+                    if let Some(diagnostic) =
+                        unnecessary_coding_comment(index, line, fix_unnecessary_coding_comment)
+                    {
                         diagnostics.push(diagnostic);
                     }
                 }
@@ -59,6 +67,27 @@ pub fn check_lines(
                     diagnostics.push(diagnostic);
                 }
             }
+
+            if enforce_shebang_whitespace || enforce_shebang_newline || enforce_shebang_python {
+                let shebang = extract_shebang(line);
+                if enforce_shebang_whitespace {
+                    if let Some(diagnostic) =
+                        shebang_whitespace(index, &shebang, fix_shebang_whitespace)
+                    {
+                        diagnostics.push(diagnostic);
+                    }
+                }
+                if enforce_shebang_newline {
+                    if let Some(diagnostic) = shebang_newline(index, &shebang) {
+                        diagnostics.push(diagnostic);
+                    }
+                }
+                if enforce_shebang_python {
+                    if let Some(diagnostic) = shebang_python(index, &shebang) {
+                        diagnostics.push(diagnostic);
+                    }
+                }
+            }
         }
 
         while doc_lines_iter
@@ -72,6 +101,12 @@ pub fn check_lines(
             }
         }
 
+        if enforce_mixed_spaces_and_tabs {
+            if let Some(diagnostic) = mixed_spaces_and_tabs(index, line) {
+                diagnostics.push(diagnostic);
+            }
+        }
+
         if enforce_line_too_long {
             if let Some(diagnostic) = line_too_long(index, line, settings) {
                 diagnostics.push(diagnostic);

src/checkers/tokens.rs

@@ -6,7 +6,8 @@ use crate::lex::docstring_detection::StateMachine;
 use crate::registry::{Diagnostic, Rule};
 use crate::rules::ruff::rules::Context;
 use crate::rules::{
-    eradicate, flake8_commas, flake8_implicit_str_concat, flake8_quotes, pycodestyle, ruff,
+    eradicate, flake8_commas, flake8_implicit_str_concat, flake8_quotes, pycodestyle, pyupgrade,
+    ruff,
 };
 use crate::settings::{flags, Settings};
 use crate::source_code::Locator;
@@ -45,6 +46,7 @@ pub fn check_tokens(
             .rules
             .enabled(&Rule::TrailingCommaOnBareTupleProhibited)
         || settings.rules.enabled(&Rule::TrailingCommaProhibited);
+    let enforce_extraneous_parenthesis = settings.rules.enabled(&Rule::ExtraneousParentheses);
 
     let mut state_machine = StateMachine::default();
     for &(start, ref tok, end) in tokens.iter().flatten() {
@@ -137,5 +139,13 @@ pub fn check_tokens(
         );
     }
 
+    // UP034
+    if enforce_extraneous_parenthesis {
+        diagnostics.extend(
+            pyupgrade::rules::extraneous_parentheses(tokens, locator, settings, autofix)
+                .into_iter(),
+        );
+    }
+
     diagnostics
 }

src/docstrings/definition.rs

@@ -1,5 +1,3 @@
-use std::borrow::Cow;
-
 use rustpython_ast::{Expr, Stmt};
 
 #[derive(Debug, Clone)]
@@ -23,9 +21,9 @@ pub struct Definition<'a> {
 pub struct Docstring<'a> {
     pub kind: DefinitionKind<'a>,
     pub expr: &'a Expr,
-    pub contents: &'a Cow<'a, str>,
+    pub contents: &'a str,
     pub body: &'a str,
-    pub indentation: &'a Cow<'a, str>,
+    pub indentation: &'a str,
 }
 
 pub enum Documentable {

src/flake8_to_ruff/black.rs

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

src/flake8_to_ruff/converter.rs

@@ -3,10 +3,10 @@ use std::collections::{BTreeSet, HashMap};
 use anyhow::Result;
 use colored::Colorize;
 
-use super::black::Black;
+use super::external_config::ExternalConfig;
 use super::plugin::Plugin;
 use super::{parser, plugin};
-use crate::registry::RuleCodePrefix;
+use crate::registry::RuleSelector;
 use crate::rules::flake8_pytest_style::types::{
     ParametrizeNameType, ParametrizeValuesRowType, ParametrizeValuesType,
 };
@@ -14,8 +14,8 @@ use crate::rules::flake8_quotes::settings::Quote;
 use crate::rules::flake8_tidy_imports::relative_imports::Strictness;
 use crate::rules::pydocstyle::settings::Convention;
 use crate::rules::{
-    flake8_annotations, flake8_bugbear, flake8_errmsg, flake8_pytest_style, flake8_quotes,
-    flake8_tidy_imports, mccabe, pep8_naming, pydocstyle,
+    flake8_annotations, flake8_bugbear, flake8_builtins, flake8_errmsg, flake8_pytest_style,
+    flake8_quotes, flake8_tidy_imports, mccabe, pep8_naming, pydocstyle,
 };
 use crate::settings::options::Options;
 use crate::settings::pyproject::Pyproject;
@@ -23,7 +23,7 @@ use crate::warn_user;
 
 pub fn convert(
     config: &HashMap<String, HashMap<String, Option<String>>>,
-    black: Option<&Black>,
+    external_config: &ExternalConfig,
     plugins: Option<Vec<Plugin>>,
 ) -> Result<Pyproject> {
     // Extract the Flake8 section.
@@ -32,7 +32,7 @@ pub fn convert(
         .expect("Unable to find flake8 section in INI file");
 
     // Extract all referenced rule code prefixes, to power plugin inference.
-    let mut referenced_codes: BTreeSet<RuleCodePrefix> = BTreeSet::default();
+    let mut referenced_codes: BTreeSet<RuleSelector> = BTreeSet::default();
     for (key, value) in flake8 {
         if let Some(value) = value {
             match key.as_str() {
@@ -90,6 +90,7 @@ pub fn convert(
     let mut options = Options::default();
     let mut flake8_annotations = flake8_annotations::settings::Options::default();
     let mut flake8_bugbear = flake8_bugbear::settings::Options::default();
+    let mut flake8_builtins = flake8_builtins::settings::Options::default();
     let mut flake8_errmsg = flake8_errmsg::settings::Options::default();
     let mut flake8_pytest_style = flake8_pytest_style::settings::Options::default();
     let mut flake8_quotes = flake8_quotes::settings::Options::default();
@@ -104,7 +105,7 @@ pub fn convert(
                 "builtins" => {
                     options.builtins = Some(parser::parse_strings(value.as_ref()));
                 }
-                "max-line-length" | "max_line_length" => match value.clone().parse::<usize>() {
+                "max-line-length" | "max_line_length" => match value.parse::<usize>() {
                     Ok(line_length) => options.line_length = Some(line_length),
                     Err(e) => {
                         warn_user!("Unable to parse '{key}' property: {e}");
@@ -147,6 +148,11 @@ pub fn convert(
                     flake8_bugbear.extend_immutable_calls =
                         Some(parser::parse_strings(value.as_ref()));
                 }
+                // flake8-builtins
+                "builtins-ignorelist" | "builtins_ignorelist" => {
+                    flake8_builtins.builtins_ignorelist =
+                        Some(parser::parse_strings(value.as_ref()));
+                }
                 // flake8-annotations
                 "suppress-none-returning" | "suppress_none_returning" => {
                     match parser::parse_bool(value.as_ref()) {
@@ -241,7 +247,7 @@ pub fn convert(
                     }
                 },
                 // mccabe
-                "max-complexity" | "max_complexity" => match value.clone().parse::<usize>() {
+                "max-complexity" | "max_complexity" => match value.parse::<usize>() {
                     Ok(max_complexity) => mccabe.max_complexity = Some(max_complexity),
                     Err(e) => {
                         warn_user!("Unable to parse '{key}' property: {e}");
@@ -249,7 +255,7 @@ pub fn convert(
                 },
                 // flake8-errmsg
                 "errmsg-max-string-length" | "errmsg_max_string_length" => {
-                    match value.clone().parse::<usize>() {
+                    match value.parse::<usize>() {
                         Ok(max_string_length) => {
                             flake8_errmsg.max_string_length = Some(max_string_length);
                         }
@@ -345,6 +351,9 @@ pub fn convert(
     if flake8_bugbear != flake8_bugbear::settings::Options::default() {
         options.flake8_bugbear = Some(flake8_bugbear);
     }
+    if flake8_builtins != flake8_builtins::settings::Options::default() {
+        options.flake8_builtins = Some(flake8_builtins);
+    }
     if flake8_errmsg != flake8_errmsg::settings::Options::default() {
         options.flake8_errmsg = Some(flake8_errmsg);
     }
@@ -368,7 +377,7 @@ pub fn convert(
     }
 
     // Extract any settings from the existing `pyproject.toml`.
-    if let Some(black) = black {
+    if let Some(black) = &external_config.black {
         if let Some(line_length) = &black.line_length {
             options.line_length = Some(*line_length);
         }
@@ -380,6 +389,19 @@ pub fn convert(
         }
     }
 
+    if let Some(isort) = &external_config.isort {
+        if let Some(src_paths) = &isort.src_paths {
+            match options.src.as_mut() {
+                Some(src) => {
+                    src.extend(src_paths.clone());
+                }
+                None => {
+                    options.src = Some(src_paths.clone());
+                }
+            }
+        }
+    }
+
     // Create the pyproject.toml.
     Ok(Pyproject::new(options))
 }
@@ -392,7 +414,8 @@ mod tests {
 
     use super::super::plugin::Plugin;
     use super::convert;
-    use crate::registry::RuleCodePrefix;
+    use crate::flake8_to_ruff::ExternalConfig;
+    use crate::registry::RuleSelector;
     use crate::rules::pydocstyle::settings::Convention;
     use crate::rules::{flake8_quotes, pydocstyle};
     use crate::settings::options::Options;
@@ -402,7 +425,7 @@ mod tests {
     fn it_converts_empty() -> Result<()> {
         let actual = convert(
             &HashMap::from([("flake8".to_string(), HashMap::default())]),
-            None,
+            &ExternalConfig::default(),
             None,
         )?;
         let expected = Pyproject::new(Options {
@@ -428,11 +451,7 @@ mod tests {
             per_file_ignores: None,
             required_version: None,
             respect_gitignore: None,
-            select: Some(vec![
-                RuleCodePrefix::E,
-                RuleCodePrefix::F,
-                RuleCodePrefix::W,
-            ]),
+            select: Some(vec![RuleSelector::E, RuleSelector::F, RuleSelector::W]),
             show_source: None,
             src: None,
             target_version: None,
@@ -443,6 +462,7 @@ mod tests {
             flake8_annotations: None,
             flake8_bandit: None,
             flake8_bugbear: None,
+            flake8_builtins: None,
             flake8_errmsg: None,
             flake8_pytest_style: None,
             flake8_quotes: None,
@@ -469,7 +489,7 @@ mod tests {
                 "flake8".to_string(),
                 HashMap::from([("max-line-length".to_string(), Some("100".to_string()))]),
             )]),
-            None,
+            &ExternalConfig::default(),
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
@@ -495,11 +515,7 @@ mod tests {
             per_file_ignores: None,
             required_version: None,
             respect_gitignore: None,
-            select: Some(vec![
-                RuleCodePrefix::E,
-                RuleCodePrefix::F,
-                RuleCodePrefix::W,
-            ]),
+            select: Some(vec![RuleSelector::E, RuleSelector::F, RuleSelector::W]),
             show_source: None,
             src: None,
             target_version: None,
@@ -510,6 +526,7 @@ mod tests {
             flake8_annotations: None,
             flake8_bandit: None,
             flake8_bugbear: None,
+            flake8_builtins: None,
             flake8_errmsg: None,
             flake8_pytest_style: None,
             flake8_quotes: None,
@@ -536,7 +553,7 @@ mod tests {
                 "flake8".to_string(),
                 HashMap::from([("max_line_length".to_string(), Some("100".to_string()))]),
             )]),
-            None,
+            &ExternalConfig::default(),
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
@@ -562,11 +579,7 @@ mod tests {
             per_file_ignores: None,
             required_version: None,
             respect_gitignore: None,
-            select: Some(vec![
-                RuleCodePrefix::E,
-                RuleCodePrefix::F,
-                RuleCodePrefix::W,
-            ]),
+            select: Some(vec![RuleSelector::E, RuleSelector::F, RuleSelector::W]),
             show_source: None,
             src: None,
             target_version: None,
@@ -577,6 +590,7 @@ mod tests {
             flake8_annotations: None,
             flake8_bandit: None,
             flake8_bugbear: None,
+            flake8_builtins: None,
             flake8_errmsg: None,
             flake8_pytest_style: None,
             flake8_quotes: None,
@@ -603,7 +617,7 @@ mod tests {
                 "flake8".to_string(),
                 HashMap::from([("max_line_length".to_string(), Some("abc".to_string()))]),
             )]),
-            None,
+            &ExternalConfig::default(),
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
@@ -629,11 +643,7 @@ mod tests {
             per_file_ignores: None,
             required_version: None,
             respect_gitignore: None,
-            select: Some(vec![
-                RuleCodePrefix::E,
-                RuleCodePrefix::F,
-                RuleCodePrefix::W,
-            ]),
+            select: Some(vec![RuleSelector::E, RuleSelector::F, RuleSelector::W]),
             show_source: None,
             src: None,
             target_version: None,
@@ -644,6 +654,7 @@ mod tests {
             flake8_annotations: None,
             flake8_bandit: None,
             flake8_bugbear: None,
+            flake8_builtins: None,
             flake8_errmsg: None,
             flake8_pytest_style: None,
             flake8_quotes: None,
@@ -670,7 +681,7 @@ mod tests {
                 "flake8".to_string(),
                 HashMap::from([("inline-quotes".to_string(), Some("single".to_string()))]),
             )]),
-            None,
+            &ExternalConfig::default(),
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
@@ -696,11 +707,7 @@ mod tests {
             per_file_ignores: None,
             required_version: None,
             respect_gitignore: None,
-            select: Some(vec![
-                RuleCodePrefix::E,
-                RuleCodePrefix::F,
-                RuleCodePrefix::W,
-            ]),
+            select: Some(vec![RuleSelector::E, RuleSelector::F, RuleSelector::W]),
             show_source: None,
             src: None,
             target_version: None,
@@ -711,6 +718,7 @@ mod tests {
             flake8_annotations: None,
             flake8_bandit: None,
             flake8_bugbear: None,
+            flake8_builtins: None,
             flake8_errmsg: None,
             flake8_pytest_style: None,
             flake8_quotes: Some(flake8_quotes::settings::Options {
@@ -745,7 +753,7 @@ mod tests {
                     Some("numpy".to_string()),
                 )]),
             )]),
-            None,
+            &ExternalConfig::default(),
             Some(vec![Plugin::Flake8Docstrings]),
         )?;
         let expected = Pyproject::new(Options {
@@ -772,10 +780,10 @@ mod tests {
             required_version: None,
             respect_gitignore: None,
             select: Some(vec![
-                RuleCodePrefix::D,
-                RuleCodePrefix::E,
-                RuleCodePrefix::F,
-                RuleCodePrefix::W,
+                RuleSelector::D,
+                RuleSelector::E,
+                RuleSelector::F,
+                RuleSelector::W,
             ]),
             show_source: None,
             src: None,
@@ -787,6 +795,7 @@ mod tests {
             flake8_annotations: None,
             flake8_bandit: None,
             flake8_bugbear: None,
+            flake8_builtins: None,
             flake8_errmsg: None,
             flake8_pytest_style: None,
             flake8_quotes: None,
@@ -815,7 +824,7 @@ mod tests {
                 "flake8".to_string(),
                 HashMap::from([("inline-quotes".to_string(), Some("single".to_string()))]),
             )]),
-            None,
+            &ExternalConfig::default(),
             None,
         )?;
         let expected = Pyproject::new(Options {
@@ -842,10 +851,10 @@ mod tests {
             required_version: None,
             respect_gitignore: None,
             select: Some(vec![
-                RuleCodePrefix::E,
-                RuleCodePrefix::F,
-                RuleCodePrefix::Q,
-                RuleCodePrefix::W,
+                RuleSelector::E,
+                RuleSelector::F,
+                RuleSelector::Q,
+                RuleSelector::W,
             ]),
             show_source: None,
             src: None,
@@ -857,6 +866,7 @@ mod tests {
             flake8_annotations: None,
             flake8_bandit: None,
             flake8_bugbear: None,
+            flake8_builtins: None,
             flake8_errmsg: None,
             flake8_pytest_style: None,
             flake8_quotes: Some(flake8_quotes::settings::Options {

src/flake8_to_ruff/external_config.rs

@@ -0,0 +1,8 @@
+use super::black::Black;
+use super::isort::Isort;
+
+#[derive(Default)]
+pub struct ExternalConfig<'a> {
+    pub black: Option<&'a Black>,
+    pub isort: Option<&'a Isort>,
+}

src/flake8_to_ruff/isort.rs

@@ -0,0 +1,10 @@
+//! Extract isort configuration settings from a pyproject.toml.
+
+use serde::{Deserialize, Serialize};
+
+/// The [isort configuration](https://pycqa.github.io/isort/docs/configuration/config_files.html).
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Default)]
+pub struct Isort {
+    #[serde(alias = "src-paths", alias = "src_paths")]
+    pub src_paths: Option<Vec<String>>,
+}

src/flake8_to_ruff/mod.rs

@@ -1,8 +1,12 @@
 mod black;
 mod converter;
+mod external_config;
+mod isort;
 mod parser;
 mod plugin;
+mod pyproject;
 
-pub use black::parse_black_options;
 pub use converter::convert;
+pub use external_config::ExternalConfig;
 pub use plugin::Plugin;
+pub use pyproject::parse;

src/flake8_to_ruff/parser.rs

@@ -6,16 +6,16 @@ use once_cell::sync::Lazy;
 use regex::Regex;
 use rustc_hash::FxHashMap;
 
-use crate::registry::{RuleCodePrefix, PREFIX_REDIRECTS};
+use crate::registry::{RuleSelector, PREFIX_REDIRECTS};
 use crate::settings::types::PatternPrefixPair;
 use crate::warn_user;
 
 static COMMA_SEPARATED_LIST_RE: Lazy<Regex> = Lazy::new(|| Regex::new(r"[,\s]").unwrap());
 
-/// Parse a comma-separated list of `RuleCodePrefix` values (e.g.,
+/// Parse a comma-separated list of `RuleSelector` values (e.g.,
 /// "F401,E501").
-pub fn parse_prefix_codes(value: &str) -> Vec<RuleCodePrefix> {
-    let mut codes: Vec<RuleCodePrefix> = vec![];
+pub fn parse_prefix_codes(value: &str) -> Vec<RuleSelector> {
+    let mut codes: Vec<RuleSelector> = vec![];
     for code in COMMA_SEPARATED_LIST_RE.split(value) {
         let code = code.trim();
         if code.is_empty() {
@@ -23,7 +23,7 @@ pub fn parse_prefix_codes(value: &str) -> Vec<RuleCodePrefix> {
         }
         if let Some(code) = PREFIX_REDIRECTS.get(code) {
             codes.push(code.clone());
-        } else if let Ok(code) = RuleCodePrefix::from_str(code) {
+        } else if let Ok(code) = RuleSelector::from_str(code) {
             codes.push(code);
         } else {
             warn_user!("Unsupported prefix code: {code}");
@@ -96,7 +96,7 @@ impl State {
                         prefix: code.clone(),
                     });
                 }
-            } else if let Ok(code) = RuleCodePrefix::from_str(code) {
+            } else if let Ok(code) = RuleSelector::from_str(code) {
                 for filename in &self.filenames {
                     codes.push(PatternPrefixPair {
                         pattern: filename.clone(),
@@ -190,8 +190,8 @@ pub fn parse_files_to_codes_mapping(value: &str) -> Result<Vec<PatternPrefixPair
 /// Collect a list of `PatternPrefixPair` structs as a `BTreeMap`.
 pub fn collect_per_file_ignores(
     pairs: Vec<PatternPrefixPair>,
-) -> FxHashMap<String, Vec<RuleCodePrefix>> {
-    let mut per_file_ignores: FxHashMap<String, Vec<RuleCodePrefix>> = FxHashMap::default();
+) -> FxHashMap<String, Vec<RuleSelector>> {
+    let mut per_file_ignores: FxHashMap<String, Vec<RuleSelector>> = FxHashMap::default();
     for pair in pairs {
         per_file_ignores
             .entry(pair.pattern)
@@ -206,33 +206,33 @@ mod tests {
     use anyhow::Result;
 
     use super::{parse_files_to_codes_mapping, parse_prefix_codes, parse_strings};
-    use crate::registry::RuleCodePrefix;
+    use crate::registry::RuleSelector;
     use crate::settings::types::PatternPrefixPair;
 
     #[test]
     fn it_parses_prefix_codes() {
         let actual = parse_prefix_codes("");
-        let expected: Vec<RuleCodePrefix> = vec![];
+        let expected: Vec<RuleSelector> = vec![];
         assert_eq!(actual, expected);
 
         let actual = parse_prefix_codes(" ");
-        let expected: Vec<RuleCodePrefix> = vec![];
+        let expected: Vec<RuleSelector> = vec![];
         assert_eq!(actual, expected);
 
         let actual = parse_prefix_codes("F401");
-        let expected = vec![RuleCodePrefix::F401];
+        let expected = vec![RuleSelector::F401];
         assert_eq!(actual, expected);
 
         let actual = parse_prefix_codes("F401,");
-        let expected = vec![RuleCodePrefix::F401];
+        let expected = vec![RuleSelector::F401];
         assert_eq!(actual, expected);
 
         let actual = parse_prefix_codes("F401,E501");
-        let expected = vec![RuleCodePrefix::F401, RuleCodePrefix::E501];
+        let expected = vec![RuleSelector::F401, RuleSelector::E501];
         assert_eq!(actual, expected);
 
         let actual = parse_prefix_codes("F401, E501");
-        let expected = vec![RuleCodePrefix::F401, RuleCodePrefix::E501];
+        let expected = vec![RuleSelector::F401, RuleSelector::E501];
         assert_eq!(actual, expected);
     }
 
@@ -285,11 +285,11 @@ mod tests {
         let expected: Vec<PatternPrefixPair> = vec![
             PatternPrefixPair {
                 pattern: "locust/test/*".to_string(),
-                prefix: RuleCodePrefix::F841,
+                prefix: RuleSelector::F841,
             },
             PatternPrefixPair {
                 pattern: "examples/*".to_string(),
-                prefix: RuleCodePrefix::F841,
+                prefix: RuleSelector::F841,
             },
         ];
         assert_eq!(actual, expected);
@@ -305,23 +305,23 @@ mod tests {
         let expected: Vec<PatternPrefixPair> = vec![
             PatternPrefixPair {
                 pattern: "t/*".to_string(),
-                prefix: RuleCodePrefix::D,
+                prefix: RuleSelector::D,
             },
             PatternPrefixPair {
                 pattern: "setup.py".to_string(),
-                prefix: RuleCodePrefix::D,
+                prefix: RuleSelector::D,
             },
             PatternPrefixPair {
                 pattern: "examples/*".to_string(),
-                prefix: RuleCodePrefix::D,
+                prefix: RuleSelector::D,
             },
             PatternPrefixPair {
                 pattern: "docs/*".to_string(),
-                prefix: RuleCodePrefix::D,
+                prefix: RuleSelector::D,
             },
             PatternPrefixPair {
                 pattern: "extra/*".to_string(),
-                prefix: RuleCodePrefix::D,
+                prefix: RuleSelector::D,
             },
         ];
         assert_eq!(actual, expected);
@@ -343,47 +343,47 @@ mod tests {
         let expected: Vec<PatternPrefixPair> = vec![
             PatternPrefixPair {
                 pattern: "scrapy/__init__.py".to_string(),
-                prefix: RuleCodePrefix::E402,
+                prefix: RuleSelector::E402,
             },
             PatternPrefixPair {
                 pattern: "scrapy/core/downloader/handlers/http.py".to_string(),
-                prefix: RuleCodePrefix::F401,
+                prefix: RuleSelector::F401,
             },
             PatternPrefixPair {
                 pattern: "scrapy/http/__init__.py".to_string(),
-                prefix: RuleCodePrefix::F401,
+                prefix: RuleSelector::F401,
             },
             PatternPrefixPair {
                 pattern: "scrapy/linkextractors/__init__.py".to_string(),
-                prefix: RuleCodePrefix::E402,
+                prefix: RuleSelector::E402,
             },
             PatternPrefixPair {
                 pattern: "scrapy/linkextractors/__init__.py".to_string(),
-                prefix: RuleCodePrefix::F401,
+                prefix: RuleSelector::F401,
             },
             PatternPrefixPair {
                 pattern: "scrapy/selector/__init__.py".to_string(),
-                prefix: RuleCodePrefix::F401,
+                prefix: RuleSelector::F401,
             },
             PatternPrefixPair {
                 pattern: "scrapy/spiders/__init__.py".to_string(),
-                prefix: RuleCodePrefix::E402,
+                prefix: RuleSelector::E402,
             },
             PatternPrefixPair {
                 pattern: "scrapy/spiders/__init__.py".to_string(),
-                prefix: RuleCodePrefix::F401,
+                prefix: RuleSelector::F401,
             },
             PatternPrefixPair {
                 pattern: "scrapy/utils/url.py".to_string(),
-                prefix: RuleCodePrefix::F403,
+                prefix: RuleSelector::F403,
             },
             PatternPrefixPair {
                 pattern: "scrapy/utils/url.py".to_string(),
-                prefix: RuleCodePrefix::F405,
+                prefix: RuleSelector::F405,
             },
             PatternPrefixPair {
                 pattern: "tests/test_loader.py".to_string(),
-                prefix: RuleCodePrefix::E741,
+                prefix: RuleSelector::E741,
             },
         ];
         assert_eq!(actual, expected);

src/flake8_to_ruff/plugin.rs

@@ -4,7 +4,7 @@ use std::str::FromStr;
 
 use anyhow::anyhow;
 
-use crate::registry::RuleCodePrefix;
+use crate::registry::RuleSelector;
 
 #[derive(Clone, Ord, PartialOrd, Eq, PartialEq)]
 pub enum Plugin {
@@ -98,32 +98,32 @@ impl fmt::Debug for Plugin {
 }
 
 impl Plugin {
-    pub fn prefix(&self) -> RuleCodePrefix {
+    pub fn selector(&self) -> RuleSelector {
         match self {
-            Plugin::Flake8Annotations => RuleCodePrefix::ANN,
-            Plugin::Flake8Bandit => RuleCodePrefix::S,
+            Plugin::Flake8Annotations => RuleSelector::ANN,
+            Plugin::Flake8Bandit => RuleSelector::S,
             // TODO(charlie): Handle rename of `B` to `BLE`.
-            Plugin::Flake8BlindExcept => RuleCodePrefix::BLE,
-            Plugin::Flake8Bugbear => RuleCodePrefix::B,
-            Plugin::Flake8Builtins => RuleCodePrefix::A,
-            Plugin::Flake8Comprehensions => RuleCodePrefix::C4,
-            Plugin::Flake8Datetimez => RuleCodePrefix::DTZ,
-            Plugin::Flake8Debugger => RuleCodePrefix::T1,
-            Plugin::Flake8Docstrings => RuleCodePrefix::D,
+            Plugin::Flake8BlindExcept => RuleSelector::BLE,
+            Plugin::Flake8Bugbear => RuleSelector::B,
+            Plugin::Flake8Builtins => RuleSelector::A,
+            Plugin::Flake8Comprehensions => RuleSelector::C4,
+            Plugin::Flake8Datetimez => RuleSelector::DTZ,
+            Plugin::Flake8Debugger => RuleSelector::T1,
+            Plugin::Flake8Docstrings => RuleSelector::D,
             // TODO(charlie): Handle rename of `E` to `ERA`.
-            Plugin::Flake8Eradicate => RuleCodePrefix::ERA,
-            Plugin::Flake8ErrMsg => RuleCodePrefix::EM,
-            Plugin::Flake8ImplicitStrConcat => RuleCodePrefix::ISC,
-            Plugin::Flake8Print => RuleCodePrefix::T2,
-            Plugin::Flake8PytestStyle => RuleCodePrefix::PT,
-            Plugin::Flake8Quotes => RuleCodePrefix::Q,
-            Plugin::Flake8Return => RuleCodePrefix::RET,
-            Plugin::Flake8Simplify => RuleCodePrefix::SIM,
-            Plugin::Flake8TidyImports => RuleCodePrefix::TID25,
-            Plugin::McCabe => RuleCodePrefix::C9,
-            Plugin::PandasVet => RuleCodePrefix::PD,
-            Plugin::PEP8Naming => RuleCodePrefix::N,
-            Plugin::Pyupgrade => RuleCodePrefix::UP,
+            Plugin::Flake8Eradicate => RuleSelector::ERA,
+            Plugin::Flake8ErrMsg => RuleSelector::EM,
+            Plugin::Flake8ImplicitStrConcat => RuleSelector::ISC,
+            Plugin::Flake8Print => RuleSelector::T2,
+            Plugin::Flake8PytestStyle => RuleSelector::PT,
+            Plugin::Flake8Quotes => RuleSelector::Q,
+            Plugin::Flake8Return => RuleSelector::RET,
+            Plugin::Flake8Simplify => RuleSelector::SIM,
+            Plugin::Flake8TidyImports => RuleSelector::TID25,
+            Plugin::McCabe => RuleSelector::C9,
+            Plugin::PandasVet => RuleSelector::PD,
+            Plugin::PEP8Naming => RuleSelector::N,
+            Plugin::Pyupgrade => RuleSelector::UP,
         }
     }
 }
@@ -249,7 +249,7 @@ pub fn infer_plugins_from_options(flake8: &HashMap<String, Option<String>>) -> V
 ///
 /// For example, if the user ignores `ANN101`, we should infer that
 /// `flake8-annotations` is active.
-pub fn infer_plugins_from_codes(codes: &BTreeSet<RuleCodePrefix>) -> Vec<Plugin> {
+pub fn infer_plugins_from_codes(selectors: &BTreeSet<RuleSelector>) -> Vec<Plugin> {
     [
         Plugin::Flake8Annotations,
         Plugin::Flake8Bandit,
@@ -273,11 +273,10 @@ pub fn infer_plugins_from_codes(codes: &BTreeSet<RuleCodePrefix>) -> Vec<Plugin>
     ]
     .into_iter()
     .filter(|plugin| {
-        for prefix in codes {
-            if prefix
-                .codes()
-                .iter()
-                .any(|code| plugin.prefix().codes().contains(code))
+        for selector in selectors {
+            if selector
+                .into_iter()
+                .any(|rule| plugin.selector().into_iter().any(|r| r == rule))
             {
                 return true;
             }
@@ -287,11 +286,11 @@ pub fn infer_plugins_from_codes(codes: &BTreeSet<RuleCodePrefix>) -> Vec<Plugin>
     .collect()
 }
 
-/// Resolve the set of enabled `RuleCodePrefix` values for the given
+/// Resolve the set of enabled `RuleSelector` values for the given
 /// plugins.
-pub fn resolve_select(plugins: &[Plugin]) -> BTreeSet<RuleCodePrefix> {
-    let mut select = BTreeSet::from([RuleCodePrefix::F, RuleCodePrefix::E, RuleCodePrefix::W]);
-    select.extend(plugins.iter().map(Plugin::prefix));
+pub fn resolve_select(plugins: &[Plugin]) -> BTreeSet<RuleSelector> {
+    let mut select = BTreeSet::from([RuleSelector::F, RuleSelector::E, RuleSelector::W]);
+    select.extend(plugins.iter().map(Plugin::selector));
     select
 }
 

src/flake8_to_ruff/pyproject.rs

@@ -0,0 +1,24 @@
+use std::path::Path;
+
+use anyhow::Result;
+use serde::{Deserialize, Serialize};
+
+use super::black::Black;
+use super::isort::Isort;
+
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct Tools {
+    pub black: Option<Black>,
+    pub isort: Option<Isort>,
+}
+
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct Pyproject {
+    pub tool: Option<Tools>,
+}
+
+pub fn parse<P: AsRef<Path>>(path: P) -> Result<Pyproject> {
+    let contents = std::fs::read_to_string(path)?;
+    let pyproject = toml_edit::easy::from_str::<Pyproject>(&contents)?;
+    Ok(pyproject)
+}

src/lib_wasm.rs

@@ -9,9 +9,10 @@ use crate::directives;
 use crate::linter::check_path;
 use crate::registry::Rule;
 use crate::rules::{
-    flake8_annotations, flake8_bandit, flake8_bugbear, flake8_errmsg, flake8_import_conventions,
-    flake8_pytest_style, flake8_quotes, flake8_tidy_imports, flake8_unused_arguments, isort,
-    mccabe, pep8_naming, pycodestyle, pydocstyle, pylint, pyupgrade,
+    flake8_annotations, flake8_bandit, flake8_bugbear, flake8_builtins, flake8_errmsg,
+    flake8_import_conventions, flake8_pytest_style, flake8_quotes, flake8_tidy_imports,
+    flake8_unused_arguments, isort, mccabe, pep8_naming, pycodestyle, pydocstyle, pylint,
+    pyupgrade,
 };
 use crate::rustpython_helpers::tokenize;
 use crate::settings::configuration::Configuration;
@@ -136,6 +137,7 @@ pub fn defaultSettings() -> Result<JsValue, JsValue> {
         flake8_annotations: Some(flake8_annotations::settings::Settings::default().into()),
         flake8_bandit: Some(flake8_bandit::settings::Settings::default().into()),
         flake8_bugbear: Some(flake8_bugbear::settings::Settings::default().into()),
+        flake8_builtins: Some(flake8_builtins::settings::Settings::default().into()),
         flake8_errmsg: Some(flake8_errmsg::settings::Settings::default().into()),
         flake8_pytest_style: Some(flake8_pytest_style::settings::Settings::default().into()),
         flake8_quotes: Some(flake8_quotes::settings::Settings::default().into()),

src/linter.rs

@@ -16,6 +16,8 @@ use crate::directives::Directives;
 use crate::doc_lines::{doc_lines_from_ast, doc_lines_from_tokens};
 use crate::message::{Message, Source};
 use crate::noqa::add_noqa;
+#[cfg(test)]
+use crate::packaging::detect_package_root;
 use crate::registry::{Diagnostic, LintSource, Rule};
 use crate::settings::{flags, Settings};
 use crate::source_code::{Indexer, Locator, Stylist};
@@ -69,7 +71,7 @@ pub fn check_path(
         .iter_enabled()
         .any(|rule_code| matches!(rule_code.lint_source(), LintSource::Filesystem))
     {
-        diagnostics.extend(check_file_path(path, settings));
+        diagnostics.extend(check_file_path(path, package, settings));
     }
 
     // Run the AST-based rules.
@@ -395,7 +397,8 @@ pub fn test_path(path: &Path, settings: &Settings) -> Result<Vec<Diagnostic>> {
         directives::extract_directives(&tokens, directives::Flags::from_settings(settings));
     let mut diagnostics = check_path(
         path,
-        None,
+        path.parent()
+            .and_then(|parent| detect_package_root(parent, &settings.namespace_packages)),
         &contents,
         tokens,
         &locator,

src/message.rs

@@ -63,9 +63,9 @@ pub struct Source {
 impl Source {
     pub fn from_diagnostic(diagnostic: &Diagnostic, locator: &Locator) -> Self {
         let location = Location::new(diagnostic.location.row(), 0);
-        // Diagnostics can already extend one-past-the-end per Ropey's semantics. If
-        // they do, though, then they'll end at the start of a line. We need to
-        // avoid extending by yet another line past-the-end.
+        // Diagnostics can already extend one-past-the-end. If they do, though, then
+        // they'll end at the start of a line. We need to avoid extending by yet another
+        // line past-the-end.
         let end_location = if diagnostic.end_location.column() == 0 {
             diagnostic.end_location
         } else {

src/python/identifiers.rs

@@ -1,5 +1,15 @@
-use once_cell::sync::Lazy;
-use regex::Regex;
+/// Returns `true` if a string is a valid Python identifier (e.g., variable
+/// name).
+pub fn is_identifier(s: &str) -> bool {
+    // Is the first character a letter or underscore?
+    if !s
+        .chars()
+        .next()
+        .map_or(false, |c| c.is_alphabetic() || c == '_')
+    {
+        return false;
+    }
 
-pub static IDENTIFIER_REGEX: Lazy<Regex> =
-    Lazy::new(|| Regex::new(r"^[A-Za-z_][A-Za-z0-9_]*$").unwrap());
+    // Are the rest of the characters letters, digits, or underscores?
+    s.chars().skip(1).all(|c| c.is_alphanumeric() || c == '_')
+}

src/registry.rs

@@ -1,7 +1,7 @@
 //! Registry of [`Rule`] to [`DiagnosticKind`] mappings.
 
-use itertools::Itertools;
 use once_cell::sync::Lazy;
+use ruff_macros::RuleNamespace;
 use rustc_hash::FxHashMap;
 use rustpython_parser::ast::Location;
 use serde::{Deserialize, Serialize};
@@ -14,6 +14,7 @@ use crate::{rules, violations};
 
 ruff_macros::define_rule_mapping!(
     // pycodestyle errors
+    E101 => violations::MixedSpacesAndTabs,
     E401 => violations::MultipleImportsOnOneLine,
     E402 => violations::ModuleImportNotAtTopOfFile,
     E501 => violations::LineTooLong,
@@ -250,8 +251,10 @@ ruff_macros::define_rule_mapping!(
     UP028 => violations::RewriteYieldFrom,
     UP029 => violations::UnnecessaryBuiltinImport,
     UP030 => violations::FormatLiterals,
+    UP031 => violations::PrintfStringFormatting,
     UP032 => violations::FString,
-        UP033 => violations::FunctoolsCache,
+    UP033 => violations::FunctoolsCache,
+    UP034 => violations::ExtraneousParentheses,
     // pydocstyle
     D100 => violations::PublicModule,
     D101 => violations::PublicClass,
@@ -280,6 +283,7 @@ ruff_macros::define_rule_mapping!(
     D300 => violations::UsesTripleQuotes,
     D301 => violations::UsesRPrefixForBackslashedContent,
     D400 => violations::EndsInPeriod,
+    D401 => crate::rules::pydocstyle::rules::non_imperative_mood::NonImperativeMood,
     D402 => violations::NoSignature,
     D403 => violations::FirstLineCapitalized,
     D404 => violations::NoThisPrefix,
@@ -416,7 +420,16 @@ ruff_macros::define_rule_mapping!(
     COM819 => violations::TrailingCommaProhibited,
     // flake8-no-pep420
     INP001 => violations::ImplicitNamespacePackage,
-    // Ruff
+    // flake8-executable
+    EXE003 => rules::flake8_executable::rules::ShebangPython,
+    EXE004 => rules::flake8_executable::rules::ShebangWhitespace,
+    EXE005 => rules::flake8_executable::rules::ShebangNewline,
+    // flake8-type-checking
+    TYP005 => rules::flake8_type_checking::rules::EmptyTypeCheckingBlock,
+    // tryceratops
+    TRY004 => rules::tryceratops::rules::PreferTypeError,
+    TRY300 => rules::tryceratops::rules::TryConsiderElse,
+    // ruff
     RUF001 => violations::AmbiguousUnicodeCharacterString,
     RUF002 => violations::AmbiguousUnicodeCharacterDocstring,
     RUF003 => violations::AmbiguousUnicodeCharacterComment,
@@ -425,110 +438,112 @@ ruff_macros::define_rule_mapping!(
     RUF100 => violations::UnusedNOQA,
 );
 
-#[derive(EnumIter, Debug, PartialEq, Eq)]
-pub enum RuleOrigin {
+#[derive(EnumIter, Debug, PartialEq, Eq, RuleNamespace)]
+pub enum Linter {
+    #[prefix = "F"]
     Pyflakes,
+    #[prefix = "E"]
+    #[prefix = "W"]
     Pycodestyle,
+    #[prefix = "C90"]
     McCabe,
+    #[prefix = "I"]
     Isort,
+    #[prefix = "D"]
     Pydocstyle,
+    #[prefix = "UP"]
     Pyupgrade,
+    #[prefix = "N"]
     PEP8Naming,
+    #[prefix = "YTT"]
     Flake82020,
+    #[prefix = "ANN"]
     Flake8Annotations,
+    #[prefix = "S"]
     Flake8Bandit,
+    #[prefix = "BLE"]
     Flake8BlindExcept,
+    #[prefix = "FBT"]
     Flake8BooleanTrap,
+    #[prefix = "B"]
     Flake8Bugbear,
+    #[prefix = "A"]
     Flake8Builtins,
+    #[prefix = "C4"]
     Flake8Comprehensions,
+    #[prefix = "T10"]
     Flake8Debugger,
+    #[prefix = "EM"]
     Flake8ErrMsg,
+    #[prefix = "ISC"]
     Flake8ImplicitStrConcat,
+    #[prefix = "ICN"]
     Flake8ImportConventions,
+    #[prefix = "T20"]
     Flake8Print,
+    #[prefix = "PT"]
     Flake8PytestStyle,
+    #[prefix = "Q"]
     Flake8Quotes,
+    #[prefix = "RET"]
     Flake8Return,
+    #[prefix = "SIM"]
     Flake8Simplify,
+    #[prefix = "TID"]
     Flake8TidyImports,
+    #[prefix = "ARG"]
     Flake8UnusedArguments,
+    #[prefix = "DTZ"]
     Flake8Datetimez,
+    #[prefix = "ERA"]
     Eradicate,
+    #[prefix = "PD"]
     PandasVet,
+    #[prefix = "PGH"]
     PygrepHooks,
+    #[prefix = "PL"]
     Pylint,
+    #[prefix = "PIE"]
     Flake8Pie,
+    #[prefix = "COM"]
     Flake8Commas,
+    #[prefix = "INP"]
     Flake8NoPep420,
+    #[prefix = "EXE"]
+    Flake8Executable,
+    #[prefix = "TYP"]
+    Flake8TypeChecking,
+    #[prefix = "TRY"]
+    Tryceratops,
+    #[prefix = "RUF"]
     Ruff,
 }
 
-pub enum Prefixes {
-    Single(RuleCodePrefix),
-    Multiple(Vec<(RuleCodePrefix, &'static str)>),
+pub trait RuleNamespace: Sized {
+    fn parse_code(code: &str) -> Option<(Self, &str)>;
+
+    fn prefixes(&self) -> &'static [&'static str];
 }
 
-impl Prefixes {
-    pub fn as_list(&self, separator: &str) -> String {
-        match self {
-            Prefixes::Single(prefix) => prefix.as_ref().to_string(),
-            Prefixes::Multiple(entries) => entries
-                .iter()
-                .map(|(prefix, _)| prefix.as_ref())
-                .join(separator),
-        }
-    }
-}
+include!(concat!(env!("OUT_DIR"), "/linter.rs"));
 
-include!(concat!(env!("OUT_DIR"), "/origin.rs"));
+/// The prefix, name and selector for an upstream linter category.
+pub struct LinterCategory(pub &'static str, pub &'static str, pub RuleSelector);
 
-impl RuleOrigin {
-    pub fn prefixes(&self) -> Prefixes {
+impl Linter {
+    pub fn categories(&self) -> Option<&'static [LinterCategory]> {
         match self {
-            RuleOrigin::Eradicate => Prefixes::Single(RuleCodePrefix::ERA),
-            RuleOrigin::Flake82020 => Prefixes::Single(RuleCodePrefix::YTT),
-            RuleOrigin::Flake8Annotations => Prefixes::Single(RuleCodePrefix::ANN),
-            RuleOrigin::Flake8Bandit => Prefixes::Single(RuleCodePrefix::S),
-            RuleOrigin::Flake8BlindExcept => Prefixes::Single(RuleCodePrefix::BLE),
-            RuleOrigin::Flake8BooleanTrap => Prefixes::Single(RuleCodePrefix::FBT),
-            RuleOrigin::Flake8Bugbear => Prefixes::Single(RuleCodePrefix::B),
-            RuleOrigin::Flake8Builtins => Prefixes::Single(RuleCodePrefix::A),
-            RuleOrigin::Flake8Comprehensions => Prefixes::Single(RuleCodePrefix::C4),
-            RuleOrigin::Flake8Datetimez => Prefixes::Single(RuleCodePrefix::DTZ),
-            RuleOrigin::Flake8Debugger => Prefixes::Single(RuleCodePrefix::T10),
-            RuleOrigin::Flake8ErrMsg => Prefixes::Single(RuleCodePrefix::EM),
-            RuleOrigin::Flake8ImplicitStrConcat => Prefixes::Single(RuleCodePrefix::ISC),
-            RuleOrigin::Flake8ImportConventions => Prefixes::Single(RuleCodePrefix::ICN),
-            RuleOrigin::Flake8Print => Prefixes::Single(RuleCodePrefix::T20),
-            RuleOrigin::Flake8PytestStyle => Prefixes::Single(RuleCodePrefix::PT),
-            RuleOrigin::Flake8Quotes => Prefixes::Single(RuleCodePrefix::Q),
-            RuleOrigin::Flake8Return => Prefixes::Single(RuleCodePrefix::RET),
-            RuleOrigin::Flake8Simplify => Prefixes::Single(RuleCodePrefix::SIM),
-            RuleOrigin::Flake8TidyImports => Prefixes::Single(RuleCodePrefix::TID),
-            RuleOrigin::Flake8UnusedArguments => Prefixes::Single(RuleCodePrefix::ARG),
-            RuleOrigin::Isort => Prefixes::Single(RuleCodePrefix::I),
-            RuleOrigin::McCabe => Prefixes::Single(RuleCodePrefix::C90),
-            RuleOrigin::PEP8Naming => Prefixes::Single(RuleCodePrefix::N),
-            RuleOrigin::PandasVet => Prefixes::Single(RuleCodePrefix::PD),
-            RuleOrigin::Pycodestyle => Prefixes::Multiple(vec![
-                (RuleCodePrefix::E, "Error"),
-                (RuleCodePrefix::W, "Warning"),
+            Linter::Pycodestyle => Some(&[
+                LinterCategory("E", "Error", RuleSelector::E),
+                LinterCategory("W", "Warning", RuleSelector::W),
             ]),
-            RuleOrigin::Pydocstyle => Prefixes::Single(RuleCodePrefix::D),
-            RuleOrigin::Pyflakes => Prefixes::Single(RuleCodePrefix::F),
-            RuleOrigin::PygrepHooks => Prefixes::Single(RuleCodePrefix::PGH),
-            RuleOrigin::Pylint => Prefixes::Multiple(vec![
-                (RuleCodePrefix::PLC, "Convention"),
-                (RuleCodePrefix::PLE, "Error"),
-                (RuleCodePrefix::PLR, "Refactor"),
-                (RuleCodePrefix::PLW, "Warning"),
+            Linter::Pylint => Some(&[
+                LinterCategory("PLC", "Convention", RuleSelector::PLC),
+                LinterCategory("PLE", "Error", RuleSelector::PLE),
+                LinterCategory("PLR", "Refactor", RuleSelector::PLR),
+                LinterCategory("PLW", "Warning", RuleSelector::PLW),
             ]),
-            RuleOrigin::Pyupgrade => Prefixes::Single(RuleCodePrefix::UP),
-            RuleOrigin::Flake8Pie => Prefixes::Single(RuleCodePrefix::PIE),
-            RuleOrigin::Flake8Commas => Prefixes::Single(RuleCodePrefix::COM),
-            RuleOrigin::Flake8NoPep420 => Prefixes::Single(RuleCodePrefix::INP),
-            RuleOrigin::Ruff => Prefixes::Single(RuleCodePrefix::RUF),
+            _ => None,
         }
     }
 }
@@ -549,26 +564,31 @@ impl Rule {
     pub fn lint_source(&self) -> &'static LintSource {
         match self {
             Rule::UnusedNOQA => &LintSource::NoQa,
-            Rule::LineTooLong
-            | Rule::NoNewLineAtEndOfFile
-            | Rule::DocLineTooLong
-            | Rule::PEP3120UnnecessaryCodingComment
+            Rule::BlanketNOQA
             | Rule::BlanketTypeIgnore
-            | Rule::BlanketNOQA => &LintSource::Lines,
-            Rule::CommentedOutCode
-            | Rule::SingleLineImplicitStringConcatenation
-            | Rule::MultiLineImplicitStringConcatenation
+            | Rule::DocLineTooLong
+            | Rule::LineTooLong
+            | Rule::MixedSpacesAndTabs
+            | Rule::NoNewLineAtEndOfFile
+            | Rule::PEP3120UnnecessaryCodingComment
+            | Rule::ShebangNewline
+            | Rule::ShebangPython
+            | Rule::ShebangWhitespace => &LintSource::Lines,
+            Rule::AmbiguousUnicodeCharacterComment
+            | Rule::AmbiguousUnicodeCharacterDocstring
+            | Rule::AmbiguousUnicodeCharacterString
+            | Rule::AvoidQuoteEscape
+            | Rule::BadQuotesDocstring
             | Rule::BadQuotesInlineString
             | Rule::BadQuotesMultilineString
-            | Rule::BadQuotesDocstring
-            | Rule::AvoidQuoteEscape
+            | Rule::CommentedOutCode
+            | Rule::ExtraneousParentheses
             | Rule::InvalidEscapeSequence
+            | Rule::MultiLineImplicitStringConcatenation
+            | Rule::SingleLineImplicitStringConcatenation
             | Rule::TrailingCommaMissing
             | Rule::TrailingCommaOnBareTupleProhibited
-            | Rule::TrailingCommaProhibited
-            | Rule::AmbiguousUnicodeCharacterString
-            | Rule::AmbiguousUnicodeCharacterDocstring
-            | Rule::AmbiguousUnicodeCharacterComment => &LintSource::Tokens,
+            | Rule::TrailingCommaProhibited => &LintSource::Tokens,
             Rule::IOError => &LintSource::Io,
             Rule::UnsortedImports | Rule::MissingRequiredImport => &LintSource::Imports,
             Rule::ImplicitNamespacePackage => &LintSource::Filesystem,
@@ -674,7 +694,7 @@ pub static CODE_REDIRECTS: Lazy<FxHashMap<&'static str, Rule>> = Lazy::new(|| {
 mod tests {
     use strum::IntoEnumIterator;
 
-    use crate::registry::Rule;
+    use super::{Linter, Rule, RuleNamespace};
 
     #[test]
     fn check_code_serialization() {
@@ -685,4 +705,12 @@ mod tests {
             );
         }
     }
+
+    #[test]
+    fn test_linter_prefixes() {
+        for rule in Rule::iter() {
+            Linter::parse_code(rule.code())
+                .unwrap_or_else(|| panic!("couldn't parse {:?}", rule.code()));
+        }
+    }
 }

src/rules/eradicate/mod.rs

@@ -1,4 +1,4 @@
-//! Rules from [eradicate](https://pypi.org/project/eradicate/2.1.0/).
+//! Rules from [eradicate](https://pypi.org/project/eradicate/).
 pub(crate) mod detection;
 pub(crate) mod rules;
 

src/rules/eradicate/rules.rs

@@ -32,7 +32,7 @@ pub fn commented_out_code(
     let line = locator.slice_source_code_range(&Range::new(location, end_location));
 
     // Verify that the comment is on its own line, and that it contains code.
-    if is_standalone_comment(&line) && comment_contains_code(&line, &settings.task_tags[..]) {
+    if is_standalone_comment(line) && comment_contains_code(line, &settings.task_tags[..]) {
         let mut diagnostic = Diagnostic::new(violations::CommentedOutCode, Range::new(start, end));
         if matches!(autofix, flags::Autofix::Enabled)
             && settings.rules.should_fix(&Rule::CommentedOutCode)

src/rules/flake8_2020/mod.rs

@@ -1,4 +1,4 @@
-//! Rules from [flake8-2020](https://pypi.org/project/flake8-2020/1.7.0/).
+//! Rules from [flake8-2020](https://pypi.org/project/flake8-2020/).
 pub(crate) mod rules;
 
 #[cfg(test)]

src/rules/flake8_annotations/fixes.rs

@@ -16,7 +16,7 @@ pub fn add_return_none_annotation(locator: &Locator, stmt: &Stmt) -> Result<Fix>
     let mut seen_lpar = false;
     let mut seen_rpar = false;
     let mut count: usize = 0;
-    for (start, tok, ..) in lexer::make_tokenizer_located(&contents, range.location).flatten() {
+    for (start, tok, ..) in lexer::make_tokenizer_located(contents, range.location).flatten() {
         if seen_lpar && seen_rpar {
             if matches!(tok, Tok::Colon) {
                 return Ok(Fix::insertion(" -> None".to_string(), start));

src/rules/flake8_annotations/mod.rs

@@ -1,4 +1,4 @@
-//! Rules from [flake8-annotations](https://pypi.org/project/flake8-annotations/2.9.1/).
+//! Rules from [flake8-annotations](https://pypi.org/project/flake8-annotations/).
 mod fixes;
 pub(crate) mod helpers;
 pub(crate) mod rules;

src/rules/flake8_annotations/rules.rs

@@ -119,7 +119,7 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                             .rules
                             .enabled(&Rule::DynamicallyTypedExpression)
                         {
-                            let name = arg.node.arg.to_string();
+                            let name = &arg.node.arg;
                             check_dynamically_typed(checker, expr, || format!("*{name}"));
                         }
                     }
@@ -146,7 +146,7 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                             .rules
                             .enabled(&Rule::DynamicallyTypedExpression)
                         {
-                            let name = arg.node.arg.to_string();
+                            let name = &arg.node.arg;
                             check_dynamically_typed(checker, expr, || format!("**{name}"));
                         }
                     }
@@ -266,7 +266,7 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                             .rules
                             .enabled(&Rule::DynamicallyTypedExpression)
                         {
-                            let name = arg.node.arg.to_string();
+                            let name = &arg.node.arg;
                             check_dynamically_typed(checker, expr, || format!("*{name}"));
                         }
                     }
@@ -294,7 +294,7 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                             .rules
                             .enabled(&Rule::DynamicallyTypedExpression)
                         {
-                            let name = arg.node.arg.to_string();
+                            let name = &arg.node.arg;
                             check_dynamically_typed(checker, expr, || format!("**{name}"));
                         }
                     }

src/rules/flake8_bandit/mod.rs

@@ -1,4 +1,4 @@
-//! Rules from [flake8-bandit](https://pypi.org/project/flake8-bandit/4.1.1/).
+//! Rules from [flake8-bandit](https://pypi.org/project/flake8-bandit/).
 mod helpers;
 pub(crate) mod rules;
 pub mod settings;

src/rules/flake8_bandit/rules/assert_used.rs

@@ -6,5 +6,8 @@ use crate::violations;
 
 /// S101
 pub fn assert_used(stmt: &Located<StmtKind>) -> Diagnostic {
-    Diagnostic::new(violations::AssertUsed, Range::from_located(stmt))
+    Diagnostic::new(
+        violations::AssertUsed,
+        Range::new(stmt.location, stmt.location.with_col_offset("assert".len())),
+    )
 }

src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S101_S101.py.snap

@@ -9,7 +9,7 @@ expression: diagnostics
     column: 0
   end_location:
     row: 2
-    column: 11
+    column: 6
   fix: ~
   parent: ~
 - kind:
@@ -19,7 +19,7 @@ expression: diagnostics
     column: 4
   end_location:
     row: 8
-    column: 17
+    column: 10
   fix: ~
   parent: ~
 - kind:
@@ -29,7 +29,7 @@ expression: diagnostics
     column: 4
   end_location:
     row: 11
-    column: 17
+    column: 10
   fix: ~
   parent: ~
 

src/rules/flake8_blind_except/mod.rs

@@ -1,4 +1,4 @@
-//! Rules from [flake8-blind-except](https://pypi.org/project/flake8-blind-except/0.2.1/).
+//! Rules from [flake8-blind-except](https://pypi.org/project/flake8-blind-except/).
 pub(crate) mod rules;
 
 #[cfg(test)]