Use rustup-show instead of actions-rs

2023-01-10 07:44:27 -05:00
1037 changed files with 9062 additions and 17688 deletions
--- a/.github/CODE_OF_CONDUCT.md
+++ b/.github/CODE_OF_CONDUCT.md
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -21,11 +21,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2022-11-01
-          override: true
+      - run: rustup show
      - uses: Swatinem/rust-cache@v1
      - run: cargo build --all
      - run: ./target/debug/ruff_dev generate-all
@@ -38,12 +34,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2022-11-01
-          override: true
-          components: rustfmt
+      - run: rustup show
      - run: cargo fmt --all --check

  cargo_clippy:
@@ -51,27 +42,17 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2022-11-01
-          override: true
-          components: clippy
-          target: wasm32-unknown-unknown
+      - run: rustup show
      - uses: Swatinem/rust-cache@v1
      - run: cargo clippy --workspace --all-targets --all-features -- -D warnings -W clippy::pedantic
-      - run: cargo clippy -p ruff --target wasm32-unknown-unknown --all-features -- -D warnings -W clippy::pedantic
+      - run: cargo clippy --workspace --target wasm32-unknown-unknown --all-features -- -D warnings -W clippy::pedantic

  cargo-test:
    name: "cargo test"
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2022-11-01
-          override: true
+      - run: rustup show
      - uses: Swatinem/rust-cache@v1
      - run: cargo install cargo-insta
      - run: pip install black[d]==22.12.0
@@ -79,10 +60,7 @@ jobs:
        run: |
          cargo insta test --all --delete-unreferenced-snapshots
          git diff --exit-code
-      - run: cargo test --package ruff_cli --test black_compatibility_test -- --ignored
-      # Check for broken links in the documentation.
-      # Setting RUSTDOCFLAGS because `cargo doc --check` isn't yet implemented (https://github.com/rust-lang/cargo/issues/10025).
-      - run: RUSTDOCFLAGS="-D warnings" cargo doc --all --no-deps
+      - run: cargo test --package ruff --test black_compatibility_test -- --ignored

 # TODO(charlie): Re-enable the `wasm-pack` tests.
 # See: https://github.com/charliermarsh/ruff/issues/1425
@@ -93,11 +71,7 @@ jobs:
 #      WASM_BINDGEN_TEST_TIMEOUT: 60
 #    steps:
 #      - uses: actions/checkout@v3
-#      - uses: actions-rs/toolchain@v1
-#        with:
-#          profile: minimal
-#          toolchain: nightly-2022-11-01
-#          override: true
+#      - run: rustup show
 #      - uses: actions/cache@v3
 #        env:
 #          cache-name: cache-cargo
@@ -119,11 +93,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2022-11-01
-          override: true
+      - run: rustup show
      - uses: Swatinem/rust-cache@v1
      - uses: actions/setup-python@v4
        with:
--- a/.github/workflows/flake8-to-ruff.yaml
+++ b/.github/workflows/flake8-to-ruff.yaml
@@ -24,11 +24,7 @@ jobs:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
+        run: rustup show
      - name: Build wheels - x86_64
        uses: messense/maturin-action@v1
        with:
@@ -51,11 +47,7 @@ jobs:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
+        run: rustup show
      - name: Build wheels - universal2
        uses: messense/maturin-action@v1
        with:
@@ -81,11 +73,7 @@ jobs:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: ${{ matrix.target }}
      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
+        run: rustup show
      - name: Build wheels
        uses: messense/maturin-action@v1
        with:
--- a/.github/workflows/playground.yaml
+++ b/.github/workflows/playground.yaml
@@ -17,12 +17,7 @@ jobs:
       CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
    steps:
      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2022-11-01
-          override: true
-          target: wasm32-unknown-unknown
+      - run: rustup show
      - uses: actions/setup-node@v3
        with:
          node-version: 18
@@ -31,7 +26,7 @@ jobs:
      - uses: jetli/wasm-pack-action@v0.4.0
      - uses: jetli/wasm-bindgen-action@v0.2.0
      - name: "Run wasm-pack"
-        run: wasm-pack build --target web --out-dir playground/src/pkg . -- -p ruff
+        run: wasm-pack build --target web --out-dir playground/src/pkg
      - name: "Install Node dependencies"
        run: npm ci
        working-directory: playground
--- a/.github/workflows/ruff.yaml
+++ b/.github/workflows/ruff.yaml
@@ -25,11 +25,7 @@ jobs:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
+        run: rustup show
      - name: Build wheels - x86_64
        uses: messense/maturin-action@v1
        with:
@@ -52,11 +48,7 @@ jobs:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
+        run: rustup show
      - name: Build wheels - universal2
        uses: messense/maturin-action@v1
        with:
@@ -82,11 +74,7 @@ jobs:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: ${{ matrix.target }}
      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
+        run: rustup show
      - name: Build wheels
        uses: messense/maturin-action@v1
        with:
@@ -293,6 +281,3 @@ jobs:
        run: |
          pip install --upgrade twine
          twine upload --skip-existing *
-      - name: Update pre-commit mirror
-        run: |
-          curl -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ secrets.RUFF_PRE_COMMIT_PAT }}" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/charliermarsh/ruff-pre-commit/dispatches --data '{"event_type": "build_pypi_release"}'
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.224
+    rev: v0.0.217
    hooks:
      - id: ruff

--- a/BREAKING_CHANGES.md
+++ b/BREAKING_CHANGES.md
@@ -1,20 +1,5 @@
 # Breaking Changes

-## 0.0.222
-
-### `--max-complexity` has been removed from the CLI ([#1877](https://github.com/charliermarsh/ruff/pull/1877))
-
-The McCabe plugin's `--max-complexity` setting has been removed from the CLI, for consistency with
-the treatment of other, similar settings.
-
-To set the maximum complexity, use the `max-complexity` property in your `pyproject.toml` file,
-like so:
-
-```toml
-[tool.ruff.mccabe]
-max-complexity = 10
-```
-
 ## 0.0.181

 ### Files excluded by `.gitignore` are now ignored ([#1234](https://github.com/charliermarsh/ruff/pull/1234))
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -735,7 +735,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"

 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.224"
+version = "0.0.217-dev.0"
 dependencies = [
 "anyhow",
 "clap 4.0.32",
@@ -1364,27 +1364,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "num_enum"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9"
-dependencies = [
- "num_enum_derive",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.17.0"
@@ -1642,17 +1621,6 @@ dependencies = [
 "termtree",
 ]

-[[package]]
-name = "proc-macro-crate"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
-dependencies = [
- "once_cell",
- "thiserror",
- "toml",
-]
-
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -1906,19 +1874,27 @@ dependencies = [

 [[package]]
 name = "ruff"
-version = "0.0.224"
+version = "0.0.217"
 dependencies = [
+ "annotate-snippets 0.9.1",
 "anyhow",
+ "assert_cmd",
+ "atty",
+ "bincode",
 "bitflags",
+ "cachedir",
 "cfg-if 1.0.0",
 "chrono",
 "clap 4.0.32",
+ "clap_complete_command",
+ "clearscreen",
 "colored",
 "console_error_panic_hook",
 "console_log",
 "criterion",
 "dirs 4.0.0",
 "fern",
+ "filetime",
 "getrandom 0.2.8",
 "glob",
 "globset",
@@ -1930,10 +1906,13 @@ dependencies = [
 "log",
 "natord",
 "nohash-hasher",
+ "notify",
 "num-bigint",
 "num-traits",
 "once_cell",
 "path-absolutize",
+ "quick-junit",
+ "rayon",
 "regex",
 "ropey",
 "ruff_macros",
@@ -1945,57 +1924,25 @@ dependencies = [
 "semver",
 "serde",
 "serde-wasm-bindgen",
+ "serde_json",
 "shellexpand",
+ "similar",
 "strum",
 "strum_macros",
 "test-case",
 "textwrap",
 "titlecase",
 "toml_edit",
+ "update-informer",
+ "ureq",
+ "walkdir",
 "wasm-bindgen",
 "wasm-bindgen-test",
 ]

-[[package]]
-name = "ruff_cli"
-version = "0.0.224"
-dependencies = [
- "annotate-snippets 0.9.1",
- "anyhow",
- "assert_cmd",
- "atty",
- "bincode",
- "cachedir",
- "chrono",
- "clap 4.0.32",
- "clap_complete_command",
- "clearscreen",
- "colored",
- "filetime",
- "glob",
- "ignore",
- "itertools",
- "log",
- "notify",
- "path-absolutize",
- "quick-junit",
- "rayon",
- "regex",
- "ruff",
- "rustc-hash",
- "serde",
- "serde_json",
- "similar",
- "strum",
- "textwrap",
- "update-informer",
- "ureq",
- "walkdir",
-]
-
 [[package]]
 name = "ruff_dev"
-version = "0.0.224"
+version = "0.0.217"
 dependencies = [
 "anyhow",
 "clap 4.0.32",
@@ -2003,7 +1950,6 @@ dependencies = [
 "libcst",
 "once_cell",
 "ruff",
- "ruff_cli",
 "rustpython-ast",
 "rustpython-common",
 "rustpython-parser",
@@ -2016,7 +1962,7 @@ dependencies = [

 [[package]]
 name = "ruff_macros"
-version = "0.0.224"
+version = "0.0.217"
 dependencies = [
 "once_cell",
 "proc-macro2",
@@ -2059,8 +2005,8 @@ dependencies = [

 [[package]]
 name = "rustpython-ast"
-version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=acbc517b55406c76da83d7b2711941d8d3f65b87#acbc517b55406c76da83d7b2711941d8d3f65b87"
+version = "0.1.0"
+source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
 dependencies = [
 "num-bigint",
 "rustpython-common",
@@ -2069,8 +2015,8 @@ dependencies = [

 [[package]]
 name = "rustpython-common"
-version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=acbc517b55406c76da83d7b2711941d8d3f65b87#acbc517b55406c76da83d7b2711941d8d3f65b87"
+version = "0.0.0"
+source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
 dependencies = [
 "ascii",
 "bitflags",
@@ -2094,8 +2040,8 @@ dependencies = [

 [[package]]
 name = "rustpython-compiler-core"
-version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=acbc517b55406c76da83d7b2711941d8d3f65b87#acbc517b55406c76da83d7b2711941d8d3f65b87"
+version = "0.1.2"
+source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
 dependencies = [
 "bincode",
 "bitflags",
@@ -2104,15 +2050,15 @@ dependencies = [
 "lz4_flex",
 "num-bigint",
 "num-complex",
- "num_enum",
 "serde",
+ "static_assertions",
 "thiserror",
 ]

 [[package]]
 name = "rustpython-parser"
-version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=acbc517b55406c76da83d7b2711941d8d3f65b87#acbc517b55406c76da83d7b2711941d8d3f65b87"
+version = "0.1.2"
+source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
 dependencies = [
 "ahash",
 "anyhow",
@@ -2550,15 +2496,6 @@ dependencies = [
 "regex",
 ]

-[[package]]
-name = "toml"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "toml_datetime"
 version = "0.5.0"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,13 +2,11 @@
 members = [
  "flake8_to_ruff",
  "ruff_dev",
-  "ruff_cli",
 ]
-default-members = [".", "ruff_cli"]

 [package]
 name = "ruff"
-version = "0.0.224"
+version = "0.0.217"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 edition = "2021"
 rust-version = "1.65.0"
@@ -21,17 +19,22 @@ license = "MIT"
 [lib]
 name = "ruff"
 crate-type = ["cdylib", "rlib"]
-doctest = false

 [dependencies]
+annotate-snippets = { version = "0.9.1", features = ["color"] }
 anyhow = { version = "1.0.66" }
+atty = { version = "0.2.14" }
+bincode = { version = "1.3.3" }
 bitflags = { version = "1.3.2" }
+cachedir = { version = "0.3.0" }
 cfg-if = { version = "1.0.0" }
 chrono = { version = "0.4.21", default-features = false, features = ["clock"] }
 clap = { version = "4.0.1", features = ["derive", "env"] }
+clap_complete_command = { version = "0.4.0" }
 colored = { version = "2.0.0" }
 dirs = { version = "4.0.0" }
 fern = { version = "0.6.1" }
+filetime = { version = "0.2.17" }
 glob = { version = "0.3.0" }
 globset = { version = "0.4.9" }
 ignore = { version = "0.4.18" }
@@ -40,26 +43,36 @@ libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a87
 log = { version = "0.4.17" }
 natord = { version = "1.0.9" }
 nohash-hasher = { version = "0.2.0" }
+notify = { version = "5.0.0" }
 num-bigint = { version = "0.4.3" }
 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"] }
+quick-junit = { version = "0.3.2" }
 regex = { version = "1.6.0" }
 ropey = { version = "1.5.0", features = ["cr_lines", "simd"], default-features = false }
-ruff_macros = { version = "0.0.224", path = "ruff_macros" }
+ruff_macros = { version = "0.0.217", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "acbc517b55406c76da83d7b2711941d8d3f65b87" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "acbc517b55406c76da83d7b2711941d8d3f65b87" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "acbc517b55406c76da83d7b2711941d8d3f65b87" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
 schemars = { version = "0.8.11" }
 semver = { version = "1.0.16" }
 serde = { version = "1.0.147", features = ["derive"] }
+serde_json = { version = "1.0.87" }
 shellexpand = { version = "3.0.0" }
+similar = { version = "2.2.1" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
 textwrap = { version = "0.16.0" }
 titlecase = { version = "2.2.1" }
 toml_edit = { version = "0.17.1", features = ["easy"] }
+walkdir = { version = "2.3.2" }
+
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
+clearscreen = { version = "2.0.0" }
+rayon = { version = "1.5.3" }
+update-informer = { version = "0.6.0", default-features = false, features = ["pypi"], optional = true }

 # https://docs.rs/getrandom/0.2.7/getrandom/#webassembly-support
 # For (future) wasm-pack support
@@ -74,11 +87,17 @@ wasm-bindgen = { version = "0.2.83" }
 [dev-dependencies]
 insta = { version = "1.19.1", features = ["yaml"] }
 test-case = { version = "2.2.2" }
+ureq = { version = "2.5.0", features = [] }
 wasm-bindgen-test = { version = "0.3.33" }

 [target.'cfg(not(target_family = "wasm"))'.dev-dependencies]
+assert_cmd = { version = "2.0.4" }
 criterion = { version = "0.4.0" }

+[features]
+default = ["update-informer"]
+update-informer = ["dep:update-informer"]
+
 [profile.release]
 panic = "abort"
 lto = "thin"
--- a/README.md
+++ b/README.md
@@ -10,9 +10,9 @@ An extremely fast Python linter, written in Rust.

 <p align="center">
  <picture align="center">
-    <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/1309177/212613422-7faaf278-706b-4294-ad92-236ffcab3430.svg">
-    <source media="(prefers-color-scheme: light)" srcset="https://user-images.githubusercontent.com/1309177/212613257-5f4bca12-6d6b-4c79-9bac-51a4c6d08928.svg">
-    <img alt="Shows a bar chart with benchmark results." src="https://user-images.githubusercontent.com/1309177/212613257-5f4bca12-6d6b-4c79-9bac-51a4c6d08928.svg">
+    <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/1309177/210156880-a97c2a0d-2c03-4393-8695-36547935a94e.svg">
+    <source media="(prefers-color-scheme: light)" srcset="https://user-images.githubusercontent.com/1309177/210156881-a88fd142-5008-4695-9407-d028cec3eff7.svg">
+    <img alt="Shows a bar chart with benchmark results." src="https://user-images.githubusercontent.com/1309177/210156881-a88fd142-5008-4695-9407-d028cec3eff7.svg">
  </picture>
 </p>

@@ -46,23 +46,19 @@ imports, and more.

 Ruff is extremely actively developed and used in major open-source projects like:

- [pandas](https://github.com/pandas-dev/pandas)
 - [FastAPI](https://github.com/tiangolo/fastapi)
- [Apache Airflow](https://github.com/apache/airflow)
 - [Bokeh](https://github.com/bokeh/bokeh)
 - [Zulip](https://github.com/zulip/zulip)
- [Dagster](https://github.com/dagster-io/dagster)
 - [Pydantic](https://github.com/pydantic/pydantic)
 - [Sphinx](https://github.com/sphinx-doc/sphinx)
 - [Hatch](https://github.com/pypa/hatch)
 - [Jupyter](https://github.com/jupyter-server/jupyter_server)
- [Synapse (Matrix)](https://github.com/matrix-org/synapse)
+- [Synapse](https://github.com/matrix-org/synapse)
 - [Saleor](https://github.com/saleor/saleor)
 - [Polars](https://github.com/pola-rs/polars)
 - [Ibis](https://github.com/ibis-project/ibis)
 - [OpenBB](https://github.com/OpenBB-finance/OpenBBTerminal)
- [Cryptography (PyCA)](https://github.com/pyca/cryptography)
- [SnowCLI (Snowflake)](https://github.com/Snowflake-Labs/snowcli)
+- [`pyca/cryptography`](https://github.com/pyca/cryptography)

 Read the [launch blog post](https://notes.crmarsh.com/python-tooling-could-be-much-much-faster).

@@ -74,13 +70,6 @@ of [FastAPI](https://github.com/tiangolo/fastapi):
 > Ruff is so fast that sometimes I add an intentional bug in the code just to confirm it's actually
 > running and checking the code.

-[**Nick Schrock**](https://twitter.com/schrockn/status/1612615862904827904), founder of [Elementl](https://www.elementl.com/),
-co-creator of [GraphQL](https://graphql.org/):
-
-> Why is Ruff a gamechanger? Primarily because it is nearly 1000x faster. Literally. Not a typo. On
-> our largest module (dagster itself, 250k LOC) pylint takes about 2.5 minutes, parallelized across 4
-> cores on my M1. Running ruff against our *entire* codebase takes .4 seconds.
-
 [**Bryan Van de Ven**](https://github.com/bokeh/bokeh/pull/12605), co-creator
 of [Bokeh](https://github.com/bokeh/bokeh/), original author
 of [Conda](https://docs.conda.io/en/latest/):
@@ -89,13 +78,7 @@ of [Conda](https://docs.conda.io/en/latest/):
 > ~20s. This is an enormous quality of life improvement for local dev. It's fast enough that I added
 > it as an actual commit hook, which is terrific.

-[**Timothy Crosley**](https://twitter.com/timothycrosley/status/1606420868514877440),
-creator of [isort](https://github.com/PyCQA/isort):
-
-> Just switched my first project to Ruff. Only one downside so far: it's so fast I couldn't believe it was working till I intentionally introduced some errors.
-
-[**Tim Abbott**](https://github.com/charliermarsh/ruff/issues/465#issuecomment-1317400028), lead
-developer of [Zulip](https://github.com/zulip/zulip):
+[**Tim Abbott**](https://github.com/charliermarsh/ruff/issues/465#issuecomment-1317400028), lead developer of [Zulip](https://github.com/zulip/zulip):

 > This is just ridiculously fast... `ruff` is amazing.

@@ -136,7 +119,6 @@ developer of [Zulip](https://github.com/zulip/zulip):
   1. [pygrep-hooks (PGH)](#pygrep-hooks-pgh)
   1. [Pylint (PLC, PLE, PLR, PLW)](#pylint-plc-ple-plr-plw)
   1. [flake8-pie (PIE)](#flake8-pie-pie)
-   1. [flake8-commas (COM)](#flake8-commas-com)
   1. [Ruff-specific rules (RUF)](#ruff-specific-rules-ruf)<!-- End auto-generated table of contents. -->
 1. [Editor Integrations](#editor-integrations)
 1. [FAQ](#faq)
@@ -157,6 +139,8 @@ Ruff is available as [`ruff`](https://pypi.org/project/ruff/) on PyPI:
 pip install ruff
 ```

+[![Packaging status](https://repology.org/badge/vertical-allrepos/ruff-python-linter.svg?exclude_unsupported=1)](https://repology.org/project/ruff-python-linter/versions)
+
 For **macOS Homebrew** and **Linuxbrew** users, Ruff is also available as [`ruff`](https://formulae.brew.sh/formula/ruff) on Homebrew:

 ```shell
@@ -175,8 +159,6 @@ For **Arch Linux** users, Ruff is also available as [`ruff`](https://archlinux.o
 pacman -S ruff
 ```

-[![Packaging status](https://repology.org/badge/vertical-allrepos/ruff-python-linter.svg?exclude_unsupported=1)](https://repology.org/project/ruff-python-linter/versions)
-
 ### Usage

 To run Ruff, try any of the following:
@@ -198,7 +180,7 @@ Ruff also works with [pre-commit](https://pre-commit.com):
 ```yaml
 - repo: https://github.com/charliermarsh/ruff-pre-commit
  # Ruff version.
-  rev: 'v0.0.224'
+  rev: 'v0.0.217'
  hooks:
    - id: ruff
      # Respect `exclude` and `extend-exclude` settings.
@@ -361,21 +343,21 @@ Options:
          Disable cache reads
      --isolated
          Ignore all configuration files
-      --select <RULE_CODE>
+      --select <SELECT>
          Comma-separated list of rule codes to enable (or ALL, to enable all rules)
-      --extend-select <RULE_CODE>
+      --extend-select <EXTEND_SELECT>
          Like --select, but adds additional rule codes on top of the selected ones
-      --ignore <RULE_CODE>
+      --ignore <IGNORE>
          Comma-separated list of rule codes to disable
-      --extend-ignore <RULE_CODE>
+      --extend-ignore <EXTEND_IGNORE>
          Like --ignore, but adds additional rule codes on top of the ignored ones
-      --exclude <FILE_PATTERN>
+      --exclude <EXCLUDE>
          List of paths, used to omit files and/or directories from analysis
-      --extend-exclude <FILE_PATTERN>
+      --extend-exclude <EXTEND_EXCLUDE>
          Like --exclude, but adds additional files and directories on top of those already excluded
-      --fixable <RULE_CODE>
+      --fixable <FIXABLE>
          List of rule codes to treat as eligible for autofix. Only applicable when autofix itself is enabled (e.g., via `--fix`)
-      --unfixable <RULE_CODE>
+      --unfixable <UNFIXABLE>
          List of rule codes to treat as ineligible for autofix. Only applicable when autofix itself is enabled (e.g., via `--fix`)
      --per-file-ignores <PER_FILE_IGNORES>
          List of mappings from file pattern to code to exclude
@@ -399,6 +381,8 @@ Options:
          The minimum Python version that should be supported
      --line-length <LINE_LENGTH>
          Set the line-length for length-associated rules and automatic formatting
+      --max-complexity <MAX_COMPLEXITY>
+          Maximum McCabe complexity allowed for a given function
      --add-noqa
          Enable automatic additions of `noqa` directives to failing lines
      --clean
@@ -595,7 +579,6 @@ For more, see [Pyflakes](https://pypi.org/project/pyflakes/2.5.0/) on PyPI.

 For more, see [pycodestyle](https://pypi.org/project/pycodestyle/2.9.1/) on PyPI.

-#### Error (E)
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
 | E401 | MultipleImportsOnOneLine | Multiple imports on one line |  |
@@ -613,12 +596,7 @@ For more, see [pycodestyle](https://pypi.org/project/pycodestyle/2.9.1/) on PyPI
 | E743 | AmbiguousFunctionName | Ambiguous function name: `...` |  |
 | E902 | IOError | IOError: `...` |  |
 | E999 | SyntaxError | SyntaxError: `...` |  |
-
-#### Warning (W)
-| Code | Name | Message | Fix |
-| ---- | ---- | ------- | --- |
 | W292 | NoNewLineAtEndOfFile | No newline at end of file | 🛠 |
-| W505 | DocLineTooLong | Doc line too long (89 > 88 characters) |  |
 | W605 | InvalidEscapeSequence | Invalid escape sequence: '\c' | 🛠 |

 ### mccabe (C90)
@@ -636,7 +614,6 @@ For more, see [isort](https://pypi.org/project/isort/5.10.1/) on PyPI.
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
 | I001 | UnsortedImports | Import block is un-sorted or un-formatted | 🛠 |
-| I002 | MissingRequiredImport | Missing required import: `from __future__ import ...` | 🛠 |

 ### pydocstyle (D)

@@ -724,8 +701,6 @@ For more, see [pyupgrade](https://pypi.org/project/pyupgrade/3.2.0/) on PyPI.
 | UP027 | RewriteListComprehension | Replace unpacked list comprehension with a generator expression | 🛠 |
 | UP028 | RewriteYieldFrom | Replace `yield` over `for` loop with `yield from` | 🛠 |
 | UP029 | UnnecessaryBuiltinImport | Unnecessary builtin import: `...` | 🛠 |
-| UP030 | FormatLiterals | Use implicit references for positional format fields | 🛠 |
-| UP032 | FString | Use f-string instead of `format` call | 🛠 |

 ### pep8-naming (N)

@@ -802,9 +777,6 @@ For more, see [flake8-bandit](https://pypi.org/project/flake8-bandit/4.1.1/) on
 | S324 | HashlibInsecureHashFunction | Probable use of insecure hash functions in `hashlib`: "..." |  |
 | S501 | RequestWithNoCertValidation | Probable use of `...` call with `verify=False` disabling SSL certificate checks |  |
 | S506 | UnsafeYAMLLoad | Probable use of unsafe `yaml.load`. Allows instantiation of arbitrary objects. Consider `yaml.safe_load`. |  |
-| S508 | SnmpInsecureVersion | The use of SNMPv1 and SNMPv2 is insecure. Use SNMPv3 if able. |  |
-| S509 | SnmpWeakCryptography | You should not use SNMPv3 without encryption. `noAuthNoPriv` & `authNoPriv` is insecure. |  |
-| S701 | Jinja2AutoescapeFalse | By default, jinja2 sets `autoescape` to `False`. Consider using `autoescape=True` or the `select_autoescape` function to mitigate XSS vulnerabilities. |  |

 ### flake8-blind-except (BLE)

@@ -856,7 +828,7 @@ For more, see [flake8-bugbear](https://pypi.org/project/flake8-bugbear/22.10.27/
 | B025 | DuplicateTryBlockException | try-except block with duplicate exception `Exception` |  |
 | B026 | StarArgUnpackingAfterKeywordArg | Star-arg unpacking after a keyword argument is strongly discouraged |  |
 | B027 | EmptyMethodWithoutAbstractDecorator | `...` is an empty method in an abstract base class, but has no abstract decorator |  |
-| B904 | RaiseWithoutFromInsideExcept | Within an except clause, raise exceptions with `raise ... from err` or `raise ... from None` to distinguish them from errors in exception handling |  |
+| B904 | RaiseWithoutFromInsideExcept | Within an except clause, raise exceptions with raise ... from err or raise ... from None to distinguish them from errors in exception handling |  |
 | B905 | ZipWithoutExplicitStrict | `zip()` without an explicit `strict=` parameter |  |

 ### flake8-builtins (A)
@@ -944,8 +916,8 @@ For more, see [flake8-pytest-style](https://pypi.org/project/flake8-pytest-style
 | PT001 | IncorrectFixtureParenthesesStyle | Use `@pytest.fixture()` over `@pytest.fixture` | 🛠 |
 | PT002 | FixturePositionalArgs | Configuration for fixture `...` specified via positional args, use kwargs |  |
 | PT003 | ExtraneousScopeFunction | `scope='function'` is implied in `@pytest.fixture()` |  |
-| PT004 | MissingFixtureNameUnderscore | Fixture `...` does not return anything, add leading underscore |  |
-| PT005 | IncorrectFixtureNameUnderscore | Fixture `...` returns a value, remove leading underscore |  |
+| PT004 | MissingFixtureNameUnderscore | Fixture `...` does not return anything, add leading underscore | 🛠 |
+| PT005 | IncorrectFixtureNameUnderscore | Fixture `...` returns a value, remove leading underscore | 🛠 |
 | PT006 | ParametrizeNamesWrongType | Wrong name(s) type in `@pytest.mark.parametrize`, expected `tuple` | 🛠 |
 | PT007 | ParametrizeValuesWrongType | Wrong values type in `@pytest.mark.parametrize` expected `list` of `tuple` |  |
 | PT008 | PatchWithLambda | Use `return_value=` instead of patching with `lambda` |  |
@@ -973,10 +945,10 @@ For more, see [flake8-quotes](https://pypi.org/project/flake8-quotes/3.3.1/) on

 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
-| Q000 | BadQuotesInlineString | Single quotes found but double quotes preferred | 🛠 |
-| Q001 | BadQuotesMultilineString | Single quote multiline found but double quotes preferred | 🛠 |
-| Q002 | BadQuotesDocstring | Single quote docstring found but double quotes preferred | 🛠 |
-| Q003 | AvoidQuoteEscape | Change outer quotes to avoid escaping inner quotes | 🛠 |
+| Q000 | BadQuotesInlineString | Single quotes found but double quotes preferred |  |
+| Q001 | BadQuotesMultilineString | Single quote multiline found but double quotes preferred |  |
+| Q002 | BadQuotesDocstring | Single quote docstring found but double quotes preferred |  |
+| Q003 | AvoidQuoteEscape | Change outer quotes to avoid escaping inner quotes |  |

 ### flake8-return (RET)

@@ -1009,7 +981,6 @@ For more, see [flake8-simplify](https://pypi.org/project/flake8-simplify/0.19.3/
 | SIM110 | ConvertLoopToAny | Use `return any(x for x in y)` instead of `for` loop | 🛠 |
 | SIM111 | ConvertLoopToAll | Use `return all(x for x in y)` instead of `for` loop | 🛠 |
 | SIM112 | UseCapitalEnvironmentVariables | Use capitalized environment variable `...` instead of `...` | 🛠 |
-| SIM115 | OpenFileWithContextHandler | Use context handler for opening files |  |
 | SIM117 | MultipleWithStatements | Use a single `with` statement with multiple contexts instead of nested `with` statements |  |
 | SIM118 | KeyInDict | Use `key in dict` instead of `key in dict.keys()` | 🛠 |
 | SIM201 | NegateEqualOp | Use `left != right` instead of `not left == right` | 🛠 |
@@ -1023,7 +994,6 @@ For more, see [flake8-simplify](https://pypi.org/project/flake8-simplify/0.19.3/
 | SIM222 | OrTrue | Use `True` instead of `... or True` | 🛠 |
 | SIM223 | AndFalse | Use `False` instead of `... and False` | 🛠 |
 | SIM300 | YodaConditions | Yoda conditions are discouraged, use `left == right` instead | 🛠 |
-| SIM401 | DictGetWithDefault | Use `var = dict.get(key, "default")` instead of an `if` block | 🛠 |

 ### flake8-tidy-imports (TID)

@@ -1032,7 +1002,7 @@ For more, see [flake8-tidy-imports](https://pypi.org/project/flake8-tidy-imports
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
 | TID251 | BannedApi | `...` is banned: ... |  |
-| TID252 | RelativeImports | Relative imports are banned |  |
+| TID252 | BannedRelativeImport | Relative imports are banned |  |

 ### flake8-unused-arguments (ARG)

@@ -1104,33 +1074,18 @@ For more, see [pygrep-hooks](https://github.com/pre-commit/pygrep-hooks) on GitH

 For more, see [Pylint](https://pypi.org/project/pylint/2.15.7/) on PyPI.

-#### Convention (PLC)
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
 | PLC0414 | UselessImportAlias | Import alias does not rename original package | 🛠 |
 | PLC2201 | MisplacedComparisonConstant | Comparison should be ... | 🛠 |
 | PLC3002 | UnnecessaryDirectLambdaCall | Lambda expression called directly. Execute the expression inline instead. |  |
-
-#### Error (PLE)
-| Code | Name | Message | Fix |
-| ---- | ---- | ------- | --- |
 | PLE0117 | NonlocalWithoutBinding | Nonlocal name `...` found without binding |  |
 | PLE0118 | UsedPriorGlobalDeclaration | Name `...` is used prior to global declaration on line 1 |  |
 | PLE1142 | AwaitOutsideAsync | `await` should be used within an async function |  |
-
-#### Refactor (PLR)
-| Code | Name | Message | Fix |
-| ---- | ---- | ------- | --- |
-| PLR0133 | ConstantComparison | Two constants compared in a comparison, consider replacing `0 == 0` |  |
 | PLR0206 | PropertyWithParameters | Cannot have defined parameters for properties |  |
 | PLR0402 | ConsiderUsingFromImport | Use `from ... import ...` in lieu of alias |  |
 | PLR1701 | ConsiderMergingIsinstance | Merge these isinstance calls: `isinstance(..., (...))` |  |
 | PLR1722 | UseSysExit | Use `sys.exit()` instead of `exit` | 🛠 |
-| PLR2004 | MagicValueComparison | Magic value used in comparison, consider replacing magic with a constant variable |  |
-
-#### Warning (PLW)
-| Code | Name | Message | Fix |
-| ---- | ---- | ------- | --- |
 | PLW0120 | UselessElseOnLoop | Else clause on loop without a break statement, remove the else and de-indent all the code inside it |  |
 | PLW0602 | GlobalVariableNotAssigned | Using global for `...` but no assignment is done |  |

@@ -1142,19 +1097,8 @@ For more, see [flake8-pie](https://pypi.org/project/flake8-pie/0.16.0/) on PyPI.
 | ---- | ---- | ------- | --- |
 | PIE790 | NoUnnecessaryPass | Unnecessary `pass` statement | 🛠 |
 | PIE794 | DupeClassFieldDefinitions | Class field `...` is defined multiple times | 🛠 |
-| PIE796 | PreferUniqueEnums | Enum contains duplicate value: `...` |  |
 | PIE807 | PreferListBuiltin | Prefer `list()` over useless lambda | 🛠 |

-### flake8-commas (COM)
-
-For more, see [flake8-commas](https://pypi.org/project/flake8-commas/2.1.0/) on PyPI.
-
-| Code | Name | Message | Fix |
-| ---- | ---- | ------- | --- |
-| COM812 | TrailingCommaMissing | Trailing comma missing | 🛠 |
-| COM818 | TrailingCommaOnBareTupleProhibited | Trailing comma on bare tuple prohibited |  |
-| COM819 | TrailingCommaProhibited | Trailing comma prohibited | 🛠 |
-
 ### Ruff-specific rules (RUF)

 | Code | Name | Message | Fix |
@@ -1300,18 +1244,6 @@ officially supported LSP server for Ruff.
 However, Ruff is also available as part of the [coc-pyright](https://github.com/fannheyward/coc-pyright)
 extension for `coc.nvim`.

-<details>
-<summary>With the <a href="https://github.com/dense-analysis/ale">ALE</a> plugin for (Neo)Vim.</summary>
-
-```vim
-let g:ale_linters = { "python": ["ruff"] }
-let g:ale_fixers = {
-\       "python": ["black", "ruff"],
-\}
-```
-
-</details>
-
 <details>
 <summary>Ruff can also be integrated via <a href="https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#efm"><code>efm</code></a> in just a <a href="https://github.com/JafarAbdi/myconfigs/blob/6f0b6b2450e92ec8fc50422928cd22005b919110/efm-langserver/config.yaml#L14-L20">few lines</a>.</summary>
 <br>
@@ -1439,7 +1371,6 @@ natively, including:
 - [`flake8-boolean-trap`](https://pypi.org/project/flake8-boolean-trap/)
 - [`flake8-bugbear`](https://pypi.org/project/flake8-bugbear/)
 - [`flake8-builtins`](https://pypi.org/project/flake8-builtins/)
- [`flake8-commas`](https://pypi.org/project/flake8-commas/)
 - [`flake8-comprehensions`](https://pypi.org/project/flake8-comprehensions/)
 - [`flake8-datetimez`](https://pypi.org/project/flake8-datetimez/)
 - [`flake8-debugger`](https://pypi.org/project/flake8-debugger/)
@@ -1457,7 +1388,6 @@ natively, including:
 - [`flake8-tidy-imports`](https://pypi.org/project/flake8-tidy-imports/)
 - [`isort`](https://pypi.org/project/isort/)
 - [`mccabe`](https://pypi.org/project/mccabe/)
- [`pandas-vet`](https://pypi.org/project/pandas-vet/)
 - [`pep8-naming`](https://pypi.org/project/pep8-naming/)
 - [`pydocstyle`](https://pypi.org/project/pydocstyle/)
 - [`pygrep-hooks`](https://github.com/pre-commit/pygrep-hooks) ([#980](https://github.com/charliermarsh/ruff/issues/980))
@@ -1478,7 +1408,7 @@ Beyond the rule set, Ruff suffers from the following limitations vis-à-vis Flak

 There are a few other minor incompatibilities between Ruff and the originating Flake8 plugins:

- Ruff doesn't implement all the "opinionated" lint rules from `flake8-bugbear`.
+- Ruff doesn't implement the "opinionated" lint rules from `flake8-bugbear`.
 - Depending on your project structure, Ruff and `isort` can differ in their detection of first-party
  code. (This is often solved by modifying the `src` property, e.g., to `src = ["src"]`, if your
  code is nested in a `src` directory.)
@@ -1506,7 +1436,6 @@ Today, Ruff can be used to replace Flake8 when used with any of the following pl
 - [`flake8-boolean-trap`](https://pypi.org/project/flake8-boolean-trap/)
 - [`flake8-bugbear`](https://pypi.org/project/flake8-bugbear/)
 - [`flake8-builtins`](https://pypi.org/project/flake8-builtins/)
- [`flake8-commas`](https://pypi.org/project/flake8-commas/)
 - [`flake8-comprehensions`](https://pypi.org/project/flake8-comprehensions/)
 - [`flake8-datetimez`](https://pypi.org/project/flake8-datetimez/)
 - [`flake8-debugger`](https://pypi.org/project/flake8-debugger/)
@@ -1523,7 +1452,6 @@ Today, Ruff can be used to replace Flake8 when used with any of the following pl
 - [`flake8-super`](https://pypi.org/project/flake8-super/)
 - [`flake8-tidy-imports`](https://pypi.org/project/flake8-tidy-imports/)
 - [`mccabe`](https://pypi.org/project/mccabe/)
- [`pandas-vet`](https://pypi.org/project/pandas-vet/)
 - [`pep8-naming`](https://pypi.org/project/pep8-naming/)
 - [`pydocstyle`](https://pypi.org/project/pydocstyle/)

@@ -1659,28 +1587,57 @@ which makes it a good target for benchmarking.
 git clone --branch 3.10 https://github.com/python/cpython.git resources/test/cpython
 ```

-To benchmark the release build:
+Add this `pyproject.toml` to the CPython directory:
+
+```toml
+[tool.ruff]
+line-length = 88
+extend-exclude = [
+    "Lib/lib2to3/tests/data/bom.py",
+    "Lib/lib2to3/tests/data/crlf.py",
+    "Lib/lib2to3/tests/data/different_encoding.py",
+    "Lib/lib2to3/tests/data/false_encoding.py",
+    "Lib/lib2to3/tests/data/py2_test_grammar.py",
+    "Lib/test/bad_coding2.py",
+    "Lib/test/badsyntax_3131.py",
+    "Lib/test/badsyntax_pep3120.py",
+    "Lib/test/encoded_modules/module_iso_8859_1.py",
+    "Lib/test/encoded_modules/module_koi8_r.py",
+    "Lib/test/test_fstring.py",
+    "Lib/test/test_grammar.py",
+    "Lib/test/test_importlib/test_util.py",
+    "Lib/test/test_named_expressions.py",
+    "Lib/test/test_patma.py",
+    "Lib/test/test_source_encoding.py",
+    "Tools/c-analyzer/c_parser/parser/_delim.py",
+    "Tools/i18n/pygettext.py",
+    "Tools/test2to3/maintest.py",
+    "Tools/test2to3/setup.py",
+    "Tools/test2to3/test/test_foo.py",
+    "Tools/test2to3/test2to3/hello.py",
+]
+```
+
+Next, to benchmark the release build:

 ```shell
-cargo build --release && hyperfine --ignore-failure --warmup 10 \
+cargo build --release
+
+hyperfine --ignore-failure --warmup 10 --runs 100 \
  "./target/release/ruff ./resources/test/cpython/ --no-cache" \
  "./target/release/ruff ./resources/test/cpython/"

 Benchmark 1: ./target/release/ruff ./resources/test/cpython/ --no-cache
-  Time (mean ± σ):     293.8 ms ±   3.2 ms    [User: 2384.6 ms, System: 90.3 ms]
-  Range (min … max):   289.9 ms … 301.6 ms    10 runs
+  Time (mean ± σ):     297.4 ms ±   4.9 ms    [User: 2460.0 ms, System: 67.2 ms]
+  Range (min … max):   287.7 ms … 312.1 ms    100 runs

  Warning: Ignoring non-zero exit code.

 Benchmark 2: ./target/release/ruff ./resources/test/cpython/
-  Time (mean ± σ):      48.0 ms ±   3.1 ms    [User: 65.2 ms, System: 124.7 ms]
-  Range (min … max):    45.0 ms …  66.7 ms    62 runs
+  Time (mean ± σ):      79.6 ms ±   7.3 ms    [User: 59.7 ms, System: 356.1 ms]
+  Range (min … max):    62.4 ms … 111.2 ms    100 runs

  Warning: Ignoring non-zero exit code.
-
-Summary
-  './target/release/ruff ./resources/test/cpython/' ran
-    6.12 ± 0.41 times faster than './target/release/ruff ./resources/test/cpython/ --no-cache'
 ```

 To benchmark against the ecosystem's existing tools:
@@ -1688,89 +1645,73 @@ To benchmark against the ecosystem's existing tools:
 ```shell
 hyperfine --ignore-failure --warmup 5 \
  "./target/release/ruff ./resources/test/cpython/ --no-cache" \
+  "pylint --recursive=y resources/test/cpython/" \
  "pyflakes resources/test/cpython" \
  "autoflake --recursive --expand-star-imports --remove-all-unused-imports --remove-unused-variables --remove-duplicate-keys resources/test/cpython" \
  "pycodestyle resources/test/cpython" \
-  "flake8 resources/test/cpython"
+  "flake8 resources/test/cpython" \
+  "python -m scripts.run_flake8 resources/test/cpython"
+```

+In order, these evaluate:
+
+- Ruff
+- Pylint
+- Pyflakes
+- autoflake
+- pycodestyle
+- Flake8
+- Flake8, with a hack to enable multiprocessing on macOS
+
+(You can `poetry install` from `./scripts` to create a working environment for the above.)
+
+```shell
 Benchmark 1: ./target/release/ruff ./resources/test/cpython/ --no-cache
-  Time (mean ± σ):     294.3 ms ±   3.3 ms    [User: 2467.5 ms, System: 89.6 ms]
-  Range (min … max):   291.1 ms … 302.8 ms    10 runs
+  Time (mean ± σ):     297.9 ms ±   7.0 ms    [User: 2436.6 ms, System: 65.9 ms]
+  Range (min … max):   289.9 ms … 314.6 ms    10 runs

  Warning: Ignoring non-zero exit code.

-Benchmark 2: pyflakes resources/test/cpython
-  Time (mean ± σ):     15.786 s ±  0.143 s    [User: 15.560 s, System: 0.214 s]
-  Range (min … max):   15.640 s … 16.157 s    10 runs
+Benchmark 2: pylint --recursive=y resources/test/cpython/
+  Time (mean ± σ):     37.634 s ±  0.225 s    [User: 36.728 s, System: 0.853 s]
+  Range (min … max):   37.201 s … 38.106 s    10 runs

  Warning: Ignoring non-zero exit code.

-Benchmark 3: autoflake --recursive --expand-star-imports --remove-all-unused-imports --remove-unused-variables --remove-duplicate-keys resources/test/cpython
-  Time (mean ± σ):      6.175 s ±  0.169 s    [User: 54.102 s, System: 1.057 s]
-  Range (min … max):    5.950 s …  6.391 s    10 runs
-
-Benchmark 4: pycodestyle resources/test/cpython
-  Time (mean ± σ):     46.921 s ±  0.508 s    [User: 46.699 s, System: 0.202 s]
-  Range (min … max):   46.171 s … 47.863 s    10 runs
+Benchmark 3: pyflakes resources/test/cpython
+  Time (mean ± σ):     40.950 s ±  0.449 s    [User: 40.688 s, System: 0.229 s]
+  Range (min … max):   40.348 s … 41.671 s    10 runs

  Warning: Ignoring non-zero exit code.

-Benchmark 5: flake8 resources/test/cpython
-  Time (mean ± σ):     12.260 s ±  0.321 s    [User: 102.934 s, System: 1.230 s]
-  Range (min … max):   11.848 s … 12.933 s    10 runs
+Benchmark 4: autoflake --recursive --expand-star-imports --remove-all-unused-imports --remove-unused-variables --remove-duplicate-keys resources/test/cpython
+  Time (mean ± σ):     11.562 s ±  0.160 s    [User: 107.022 s, System: 1.143 s]
+  Range (min … max):   11.417 s … 11.917 s    10 runs
+
+Benchmark 5: pycodestyle resources/test/cpython
+  Time (mean ± σ):     67.428 s ±  0.985 s    [User: 67.199 s, System: 0.203 s]
+  Range (min … max):   65.313 s … 68.496 s    10 runs

  Warning: Ignoring non-zero exit code.

+Benchmark 6: flake8 resources/test/cpython
+  Time (mean ± σ):     116.099 s ±  1.178 s    [User: 115.217 s, System: 0.845 s]
+  Range (min … max):   114.180 s … 117.724 s    10 runs
+
+  Warning: Ignoring non-zero exit code.
+
+Benchmark 7: python -m scripts.run_flake8 resources/test/cpython
+  Time (mean ± σ):     20.477 s ±  0.349 s    [User: 142.372 s, System: 1.504 s]
+  Range (min … max):   20.107 s … 21.183 s    10 runs
+
 Summary
  './target/release/ruff ./resources/test/cpython/ --no-cache' ran
-   20.98 ± 0.62 times faster than 'autoflake --recursive --expand-star-imports --remove-all-unused-imports --remove-unused-variables --remove-duplicate-keys resources/test/cpython'
-   41.66 ± 1.18 times faster than 'flake8 resources/test/cpython'
-   53.64 ± 0.77 times faster than 'pyflakes resources/test/cpython'
-  159.43 ± 2.48 times faster than 'pycodestyle resources/test/cpython'
-```
-
-You can run `poetry install` from `./scripts` to create a working environment for the above. All
-reported benchmarks were computed using the versions specified by `./scripts/pyproject.toml`
-on Python 3.11.
-
-To benchmark Pylint, remove the following files from the CPython repository:
-
-```shell
-rm Lib/test/bad_coding.py \
-  Lib/test/bad_coding2.py \
-  Lib/test/bad_getattr.py \
-  Lib/test/bad_getattr2.py \
-  Lib/test/bad_getattr3.py \
-  Lib/test/badcert.pem \
-  Lib/test/badkey.pem \
-  Lib/test/badsyntax_3131.py \
-  Lib/test/badsyntax_future10.py \
-  Lib/test/badsyntax_future3.py \
-  Lib/test/badsyntax_future4.py \
-  Lib/test/badsyntax_future5.py \
-  Lib/test/badsyntax_future6.py \
-  Lib/test/badsyntax_future7.py \
-  Lib/test/badsyntax_future8.py \
-  Lib/test/badsyntax_future9.py \
-  Lib/test/badsyntax_pep3120.py \
-  Lib/test/test_asyncio/test_runners.py \
-  Lib/test/test_copy.py \
-  Lib/test/test_inspect.py \
-  Lib/test/test_typing.py
-```
-
-Then, from `resources/test/cpython`, run: `time pylint -j 0 -E $(git ls-files '*.py')`. This
-will execute Pylint with maximum parallelism and only report errors.
-
-To benchmark Pyupgrade, run the following from `resources/test/cpython`:
-
-```shell
-hyperfine --ignore-failure --warmup 5 --prepare "git reset --hard HEAD" \
-  "find . -type f -name \"*.py\" | xargs -P 0 pyupgrade --py311-plus"
-
-Benchmark 1: find . -type f -name "*.py" | xargs -P 0 pyupgrade --py311-plus
-  Time (mean ± σ):     30.119 s ±  0.195 s    [User: 28.638 s, System: 0.390 s]
-  Range (min … max):   29.813 s … 30.356 s    10 runs
+   38.81 ± 1.05 times faster than 'autoflake --recursive --expand-star-imports --remove-all-unused-imports --remove-unused-variables --remove-duplicate-keys resources/test/cpython'
+   68.74 ± 1.99 times faster than 'python -m scripts.run_flake8 resources/test/cpython'
+  126.33 ± 3.05 times faster than 'pylint --recursive=y resources/test/cpython/'
+  137.46 ± 3.55 times faster than 'pyflakes resources/test/cpython'
+  226.35 ± 6.23 times faster than 'pycodestyle resources/test/cpython'
+  389.73 ± 9.92 times faster than 'flake8 resources/test/cpython'
 ```

 ## Reference
@@ -1877,8 +1818,6 @@ Exclusions are based on globs, and can be either:
  `directory`). Note that these paths are relative to the project root
  (e.g., the directory containing your `pyproject.toml`).

-For more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).
-
 Note that you'll typically want to use
 [`extend-exclude`](#extend-exclude) to modify the excluded paths.

@@ -1926,18 +1865,6 @@ line-length = 100
 A list of file patterns to omit from linting, in addition to those
 specified by `exclude`.

-Exclusions are based on globs, and can be either:
-
- Single-path patterns, like `.mypy_cache` (to exclude any directory
-  named `.mypy_cache` in the tree), `foo.py` (to exclude any file named
-  `foo.py`), or `foo_*.py` (to exclude any file matching `foo_*.py` ).
- Relative patterns, like `directory/foo.py` (to exclude that specific
-  file) or `directory/*.py` (to exclude any Python files in
-  `directory`). Note that these paths are relative to the project root
-  (e.g., the directory containing your `pyproject.toml`).
-
-For more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).
-
 **Default value**: `[]`

 **Type**: `Vec<FilePattern>`
@@ -1957,12 +1884,6 @@ extend-exclude = ["tests", "src/bad.py"]
 A list of rule codes or prefixes to ignore, in addition to those
 specified by `ignore`.

-Note that `extend-ignore` is applied after resolving rules from
-`ignore`/`select` and a less specific rule in `extend-ignore`
-would overwrite a more specific rule in `select`. It is
-recommended to only use `extend-ignore` when extending a
-`pyproject.toml` file via `extend`.
-
 **Default value**: `[]`

 **Type**: `Vec<RuleCodePrefix>`
@@ -1982,12 +1903,6 @@ extend-ignore = ["F841"]
 A list of rule codes or prefixes to enable, in addition to those
 specified by `select`.

-Note that `extend-select` is applied after resolving rules from
-`ignore`/`select` and a less specific rule in `extend-select`
-would overwrite a more specific rule in `ignore`. It is
-recommended to only use `extend-select` when extending a
-`pyproject.toml` file via `extend`.
-
 **Default value**: `[]`

 **Type**: `Vec<RuleCodePrefix>`
@@ -2189,25 +2104,6 @@ line-length = 120

 ---

-#### [`namespace-packages`](#namespace-packages)
-
-Mark the specified directories as namespace packages. For the purpose of
-module resolution, Ruff will treat those directories as if they
-contained an `__init__.py` file.
-
-**Default value**: `[]`
-
-**Type**: `Vec<PathBuf>`
-
-**Example usage**:
-
-```toml
-[tool.ruff]
-namespace-packages = ["airflow/providers"]
-```
-
---
-
 #### [`per-file-ignores`](#per-file-ignores)

 A list of mappings from file pattern to rule codes or prefixes to
@@ -2440,7 +2336,7 @@ unfixable = ["F401"]
 Enable or disable automatic update checks (overridden by the
 `--update-check` and `--no-update-check` command-line flags).

-**Default value**: `false`
+**Default value**: `true`

 **Type**: `bool`

@@ -2448,7 +2344,7 @@ Enable or disable automatic update checks (overridden by the

 ```toml
 [tool.ruff]
-update-check = true
+update-check = false
 ```

 ---
@@ -2944,24 +2840,6 @@ ignore-variadic-names = true

 ### `isort`

-#### [`classes`](#classes)
-
-An override list of tokens to always recognize as a Class for
-`order-by-type` regardless of casing.
-
-**Default value**: `[]`
-
-**Type**: `Vec<String>`
-
-**Example usage**:
-
-```toml
-[tool.ruff.isort]
-classes = ["SVC"]
-```
-
---
-
 #### [`combine-as-imports`](#combine-as-imports)

 Combines as imports on the same line. See isort's [`combine-as-imports`](https://pycqa.github.io/isort/docs/configuration/options.html#combine-as-imports)
@@ -3121,47 +2999,6 @@ order-by-type = true

 ---

-#### [`relative-imports-order`](#relative-imports-order)
-
-Whether to place "closer" imports (fewer `.` characters, most local)
-before "further" imports (more `.` characters, least local), or vice
-versa.
-
-The default ("furthest-to-closest") is equivalent to isort's
-`reverse-relative` default (`reverse-relative = false`); setting
-this to "closest-to-furthest" is equivalent to isort's `reverse-relative
-= true`.
-
-**Default value**: `furthest-to-closest`
-
-**Type**: `RelatveImportsOrder`
-
-**Example usage**:
-
-```toml
-[tool.ruff.isort]
-relative-imports-order = "closest-to-furthest"
-```
-
---
-
-#### [`required-imports`](#required-imports)
-
-Add the specified import line to all files.
-
-**Default value**: `[]`
-
-**Type**: `Vec<String>`
-
-**Example usage**:
-
-```toml
-[tool.ruff.isort]
-required-imports = ["from __future__ import annotations"]
-```
-
---
-
 #### [`single-line-exclusions`](#single-line-exclusions)

 One or more modules to exclude from the single line rule.
@@ -3301,24 +3138,6 @@ ignore-overlong-task-comments = true

 ---

-#### [`max-doc-length`](#max-doc-length)
-
-The maximum line length to allow for line-length violations within
-documentation (`W505`), including standalone comments.
-
-**Default value**: `None`
-
-**Type**: `usize`
-
-**Example usage**:
-
-```toml
-[tool.ruff.pycodestyle]
-max-doc-length = 88
-```
-
---
-
 ### `pydocstyle`

 #### [`convention`](#convention)
@@ -3373,4 +3192,4 @@ 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).
+[contributing guidelines](https://github.com/charliermarsh/ruff/blob/main/.github/CONTRIBUTING.md).
--- a/flake8_to_ruff/Cargo.lock
+++ b/flake8_to_ruff/Cargo.lock
@@ -771,7 +771,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"

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

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

+[lib]
+name = "flake8_to_ruff"
+
 [dependencies]
 anyhow = { version = "1.0.66" }
 clap = { version = "4.0.1", features = ["derive"] }
--- a/flake8_to_ruff/src/black.rs
+++ b/flake8_to_ruff/src/black.rs
@@ -3,10 +3,9 @@
 use std::path::Path;

 use anyhow::Result;
+use ruff::settings::types::PythonVersion;
 use serde::{Deserialize, Serialize};

-use crate::settings::types::PythonVersion;
-
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Default)]
 pub struct Black {
    #[serde(alias = "line-length", alias = "line_length")]
--- a/flake8_to_ruff/src/converter.rs
+++ b/flake8_to_ruff/src/converter.rs
@@ -2,24 +2,23 @@ use std::collections::{BTreeSet, HashMap};

 use anyhow::Result;
 use colored::Colorize;
-
-use super::black::Black;
-use super::plugin::Plugin;
-use super::{parser, plugin};
-use crate::registry::RuleCodePrefix;
-use crate::rules::flake8_pytest_style::types::{
+use ruff::flake8_pytest_style::types::{
    ParametrizeNameType, ParametrizeValuesRowType, ParametrizeValuesType,
 };
-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::{
+use ruff::flake8_quotes::settings::Quote;
+use ruff::flake8_tidy_imports::settings::Strictness;
+use ruff::pydocstyle::settings::Convention;
+use ruff::registry::RuleCodePrefix;
+use ruff::settings::options::Options;
+use ruff::settings::pyproject::Pyproject;
+use ruff::{
    flake8_annotations, flake8_bugbear, flake8_errmsg, flake8_pytest_style, flake8_quotes,
-    flake8_tidy_imports, mccabe, pep8_naming, pydocstyle,
+    flake8_tidy_imports, mccabe, pep8_naming, pydocstyle, warn_user,
 };
-use crate::settings::options::Options;
-use crate::settings::pyproject::Pyproject;
-use crate::warn_user;
+
+use crate::black::Black;
+use crate::plugin::Plugin;
+use crate::{parser, plugin};

 pub fn convert(
    config: &HashMap<String, HashMap<String, Option<String>>>,
@@ -93,7 +92,7 @@ pub fn convert(
    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();
-    let mut flake8_tidy_imports = flake8_tidy_imports::options::Options::default();
+    let mut flake8_tidy_imports = flake8_tidy_imports::settings::Options::default();
    let mut mccabe = mccabe::settings::Options::default();
    let mut pep8_naming = pep8_naming::settings::Options::default();
    let mut pydocstyle = pydocstyle::settings::Options::default();
@@ -271,7 +270,7 @@ pub fn convert(
                    match value.trim() {
                        "csv" => {
                            flake8_pytest_style.parametrize_names_type =
-                                Some(ParametrizeNameType::Csv);
+                                Some(ParametrizeNameType::CSV);
                        }
                        "tuple" => {
                            flake8_pytest_style.parametrize_names_type =
@@ -354,7 +353,7 @@ pub fn convert(
    if flake8_quotes != flake8_quotes::settings::Options::default() {
        options.flake8_quotes = Some(flake8_quotes);
    }
-    if flake8_tidy_imports != flake8_tidy_imports::options::Options::default() {
+    if flake8_tidy_imports != flake8_tidy_imports::settings::Options::default() {
        options.flake8_tidy_imports = Some(flake8_tidy_imports);
    }
    if mccabe != mccabe::settings::Options::default() {
@@ -389,14 +388,14 @@ mod tests {
    use std::collections::HashMap;

    use anyhow::Result;
+    use ruff::pydocstyle::settings::Convention;
+    use ruff::registry::RuleCodePrefix;
+    use ruff::settings::options::Options;
+    use ruff::settings::pyproject::Pyproject;
+    use ruff::{flake8_quotes, pydocstyle};

-    use super::super::plugin::Plugin;
-    use super::convert;
-    use crate::registry::RuleCodePrefix;
-    use crate::rules::pydocstyle::settings::Convention;
-    use crate::rules::{flake8_quotes, pydocstyle};
-    use crate::settings::options::Options;
-    use crate::settings::pyproject::Pyproject;
+    use crate::converter::convert;
+    use crate::plugin::Plugin;

    #[test]
    fn it_converts_empty() -> Result<()> {
@@ -424,7 +423,6 @@ mod tests {
            ignore: Some(vec![]),
            ignore_init_module_imports: None,
            line_length: None,
-            namespace_packages: None,
            per_file_ignores: None,
            required_version: None,
            respect_gitignore: None,
@@ -490,7 +488,6 @@ mod tests {
            ignore: Some(vec![]),
            ignore_init_module_imports: None,
            line_length: Some(100),
-            namespace_packages: None,
            per_file_ignores: None,
            required_version: None,
            respect_gitignore: None,
@@ -556,7 +553,6 @@ mod tests {
            ignore: Some(vec![]),
            ignore_init_module_imports: None,
            line_length: Some(100),
-            namespace_packages: None,
            per_file_ignores: None,
            required_version: None,
            respect_gitignore: None,
@@ -622,7 +618,6 @@ mod tests {
            ignore: Some(vec![]),
            ignore_init_module_imports: None,
            line_length: None,
-            namespace_packages: None,
            per_file_ignores: None,
            required_version: None,
            respect_gitignore: None,
@@ -688,7 +683,6 @@ mod tests {
            ignore: Some(vec![]),
            ignore_init_module_imports: None,
            line_length: None,
-            namespace_packages: None,
            per_file_ignores: None,
            required_version: None,
            respect_gitignore: None,
@@ -762,7 +756,6 @@ mod tests {
            ignore: Some(vec![]),
            ignore_init_module_imports: None,
            line_length: None,
-            namespace_packages: None,
            per_file_ignores: None,
            required_version: None,
            respect_gitignore: None,
@@ -831,7 +824,6 @@ mod tests {
            ignore: Some(vec![]),
            ignore_init_module_imports: None,
            line_length: None,
-            namespace_packages: None,
            per_file_ignores: None,
            required_version: None,
            respect_gitignore: None,
--- a/flake8_to_ruff/src/lib.rs
+++ b/flake8_to_ruff/src/lib.rs
@@ -0,0 +1,18 @@
+#![allow(
+    clippy::collapsible_else_if,
+    clippy::collapsible_if,
+    clippy::implicit_hasher,
+    clippy::match_same_arms,
+    clippy::missing_errors_doc,
+    clippy::missing_panics_doc,
+    clippy::module_name_repetitions,
+    clippy::must_use_candidate,
+    clippy::similar_names,
+    clippy::too_many_lines
+)]
+#![forbid(unsafe_code)]
+
+pub mod black;
+pub mod converter;
+mod parser;
+pub mod plugin;
--- a/flake8_to_ruff/src/main.rs
+++ b/flake8_to_ruff/src/main.rs
@@ -1,4 +1,4 @@
-//! Utility to generate Ruff's `pyproject.toml` section from a Flake8 INI file.
+//! Utility to generate Ruff's pyproject.toml section from a Flake8 INI file.
 #![allow(
    clippy::collapsible_else_if,
    clippy::collapsible_if,
@@ -18,7 +18,9 @@ use std::path::PathBuf;
 use anyhow::Result;
 use clap::Parser;
 use configparser::ini::Ini;
-use ruff::flake8_to_ruff;
+use flake8_to_ruff::black::parse_black_options;
+use flake8_to_ruff::converter;
+use flake8_to_ruff::plugin::Plugin;

 #[derive(Parser)]
 #[command(
@@ -36,7 +38,7 @@ struct Cli {
    pyproject: Option<PathBuf>,
    /// List of plugins to enable.
    #[arg(long, value_delimiter = ',')]
-    plugin: Option<Vec<flake8_to_ruff::Plugin>>,
+    plugin: Option<Vec<Plugin>>,
 }

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

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

    Ok(())
--- a/flake8_to_ruff/src/parser.rs
+++ b/flake8_to_ruff/src/parser.rs
@@ -4,12 +4,11 @@ use anyhow::{bail, Result};
 use colored::Colorize;
 use once_cell::sync::Lazy;
 use regex::Regex;
+use ruff::registry::{RuleCodePrefix, PREFIX_REDIRECTS};
+use ruff::settings::types::PatternPrefixPair;
+use ruff::warn_user;
 use rustc_hash::FxHashMap;

-use crate::registry::{RuleCodePrefix, 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.,
@@ -204,10 +203,10 @@ pub fn collect_per_file_ignores(
 #[cfg(test)]
 mod tests {
    use anyhow::Result;
+    use ruff::registry::RuleCodePrefix;
+    use ruff::settings::types::PatternPrefixPair;

-    use super::{parse_files_to_codes_mapping, parse_prefix_codes, parse_strings};
-    use crate::registry::RuleCodePrefix;
-    use crate::settings::types::PatternPrefixPair;
+    use crate::parser::{parse_files_to_codes_mapping, parse_prefix_codes, parse_strings};

    #[test]
    fn it_parses_prefix_codes() {
--- a/flake8_to_ruff/src/plugin.rs
+++ b/flake8_to_ruff/src/plugin.rs
@@ -3,8 +3,7 @@ use std::fmt;
 use std::str::FromStr;

 use anyhow::anyhow;
-
-use crate::registry::RuleCodePrefix;
+use ruff::registry::RuleCodePrefix;

 #[derive(Clone, Ord, PartialOrd, Eq, PartialEq)]
 pub enum Plugin {
@@ -299,7 +298,7 @@ pub fn resolve_select(plugins: &[Plugin]) -> BTreeSet<RuleCodePrefix> {
 mod tests {
    use std::collections::HashMap;

-    use super::{infer_plugins_from_options, Plugin};
+    use crate::plugin::{infer_plugins_from_options, Plugin};

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

 [project]
 name = "ruff"
-version = "0.0.224"
+version = "0.0.217"
 description = "An extremely fast Python linter, written in Rust."
 authors = [
  { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" },
@@ -38,8 +35,6 @@ urls = { repository = "https://github.com/charliermarsh/ruff" }

 [tool.maturin]
 bindings = "bin"
-manifest-path = "ruff_cli/Cargo.toml"
-python-source = "python"
 strip = true

 [tool.setuptools]
--- a/resources/test/fixtures/flake8_annotations/allow_nested_overload.py
+++ b/resources/test/fixtures/flake8_annotations/allow_nested_overload.py
@@ -1,9 +0,0 @@
-class C:
-    from typing import overload
-
-    @overload
-    def f(self, x: int, y: int) -> None:
-        ...
-
-    def f(self, x, y):
-        pass
--- a/resources/test/fixtures/flake8_bandit/S508.py
+++ b/resources/test/fixtures/flake8_bandit/S508.py
@@ -1,6 +0,0 @@
-from pysnmp.hlapi import CommunityData
-
-CommunityData("public", mpModel=0)  # S508
-CommunityData("public", mpModel=1)  # S508
-
-CommunityData("public", mpModel=2)  # OK
--- a/resources/test/fixtures/flake8_bandit/S509.py
+++ b/resources/test/fixtures/flake8_bandit/S509.py
@@ -1,7 +0,0 @@
-from pysnmp.hlapi import UsmUserData
-
-
-insecure = UsmUserData("securityName")  # S509
-auth_no_priv = UsmUserData("securityName", "authName")  # S509
-
-less_insecure = UsmUserData("securityName", "authName", "privName")  # OK
--- a/resources/test/fixtures/flake8_bandit/S701.py
+++ b/resources/test/fixtures/flake8_bandit/S701.py
@@ -1,29 +0,0 @@
-import jinja2
-from jinja2 import Environment, select_autoescape
-templateLoader = jinja2.FileSystemLoader( searchpath="/" )
-something = ''
-
-Environment(loader=templateLoader, load=templateLoader, autoescape=True)
-templateEnv = jinja2.Environment(autoescape=True,
-        loader=templateLoader )
-Environment(loader=templateLoader, load=templateLoader, autoescape=something)  # S701
-templateEnv = jinja2.Environment(autoescape=False, loader=templateLoader )  # S701
-Environment(loader=templateLoader,
-            load=templateLoader,
-            autoescape=False)  # S701
-
-Environment(loader=templateLoader,  # S701
-            load=templateLoader)
-
-Environment(loader=templateLoader, autoescape=select_autoescape())
-
-Environment(loader=templateLoader,
-            autoescape=select_autoescape(['html', 'htm', 'xml']))
-
-Environment(loader=templateLoader,
-            autoescape=jinja2.select_autoescape(['html', 'htm', 'xml']))
-
-
-def fake_func():
-    return 'foobar'
-Environment(loader=templateLoader, autoescape=fake_func())  # S701
--- a/resources/test/fixtures/flake8_bugbear/B023.py
+++ b/resources/test/fixtures/flake8_bugbear/B023.py
@@ -25,10 +25,10 @@ for x in range(3):


 def check_inside_functions_too():
-    ls = [lambda: x for x in range(2)]  # error
-    st = {lambda: x for x in range(2)}  # error
-    gn = (lambda: x for x in range(2))  # error
-    dt = {x: lambda: x for x in range(2)}  # error
+    ls = [lambda: x for x in range(2)]
+    st = {lambda: x for x in range(2)}
+    gn = (lambda: x for x in range(2))
+    dt = {x: lambda: x for x in range(2)}


 async def pointless_async_iterable():
@@ -37,9 +37,9 @@ async def pointless_async_iterable():

 async def container_for_problems():
    async for x in pointless_async_iterable():
-        functions.append(lambda: x)  # error
+        functions.append(lambda: x)

-    [lambda: x async for x in pointless_async_iterable()]  # error
+    [lambda: x async for x in pointless_async_iterable()]


 a = 10
@@ -47,10 +47,10 @@ b = 0
 while True:
    a = a_ = a - 1
    b += 1
-    functions.append(lambda: a)  # error
-    functions.append(lambda: a_)  # error
-    functions.append(lambda: b)  # error
-    functions.append(lambda: c)  # error, but not a name error due to late binding
+    functions.append(lambda: a)
+    functions.append(lambda: a_)
+    functions.append(lambda: b)
+    functions.append(lambda: c)  # not a name error because of late binding!
    c: bool = a > 3
    if not c:
        break
@@ -58,7 +58,7 @@ while True:
 # Nested loops should not duplicate reports
 for j in range(2):
    for k in range(3):
-        lambda: j * k  # error
+        lambda: j * k


 for j, k, l in [(1, 2, 3)]:
@@ -80,95 +80,3 @@ for var in range(2):

 for i in range(3):
    lambda: f"{i}"
-
-
-# `query` is defined in the function, so also defining it in the loop should be OK.
-for name in ["a", "b"]:
-    query = name
-
-    def myfunc(x):
-        query = x
-        query_post = x
-        _ = query
-        _ = query_post
-
-    query_post = name  # in case iteration order matters
-
-
-# Bug here because two dict comprehensions reference `name`, one of which is inside
-# the lambda.  This should be totally fine, of course.
-_ = {
-    k: v
-    for k, v in reduce(
-        lambda data, event: merge_mappings(
-            [data, {name: f(caches, data, event) for name, f in xx}]
-        ),
-        events,
-        {name: getattr(group, name) for name in yy},
-    ).items()
-    if k in backfill_fields
-}
-
-
-# OK to define lambdas if they're immediately consumed, typically as the `key=`
-# argument or in a consumed `filter()` (even if a comprehension is better style)
-for x in range(2):
-    # It's not a complete get-out-of-linting-free construct - these should fail:
-    min([None, lambda: x], key=repr)
-    sorted([None, lambda: x], key=repr)
-    any(filter(bool, [None, lambda: x]))
-    list(filter(bool, [None, lambda: x]))
-    all(reduce(bool, [None, lambda: x]))
-
-    # But all these should be OK:
-    min(range(3), key=lambda y: x * y)
-    max(range(3), key=lambda y: x * y)
-    sorted(range(3), key=lambda y: x * y)
-
-    any(map(lambda y: x < y, range(3)))
-    all(map(lambda y: x < y, range(3)))
-    set(map(lambda y: x < y, range(3)))
-    list(map(lambda y: x < y, range(3)))
-    tuple(map(lambda y: x < y, range(3)))
-    sorted(map(lambda y: x < y, range(3)))
-    frozenset(map(lambda y: x < y, range(3)))
-
-    any(filter(lambda y: x < y, range(3)))
-    all(filter(lambda y: x < y, range(3)))
-    set(filter(lambda y: x < y, range(3)))
-    list(filter(lambda y: x < y, range(3)))
-    tuple(filter(lambda y: x < y, range(3)))
-    sorted(filter(lambda y: x < y, range(3)))
-    frozenset(filter(lambda y: x < y, range(3)))
-
-    any(reduce(lambda y: x | y, range(3)))
-    all(reduce(lambda y: x | y, range(3)))
-    set(reduce(lambda y: x | y, range(3)))
-    list(reduce(lambda y: x | y, range(3)))
-    tuple(reduce(lambda y: x | y, range(3)))
-    sorted(reduce(lambda y: x | y, range(3)))
-    frozenset(reduce(lambda y: x | y, range(3)))
-
-    import functools
-
-    any(functools.reduce(lambda y: x | y, range(3)))
-    all(functools.reduce(lambda y: x | y, range(3)))
-    set(functools.reduce(lambda y: x | y, range(3)))
-    list(functools.reduce(lambda y: x | y, range(3)))
-    tuple(functools.reduce(lambda y: x | y, range(3)))
-    sorted(functools.reduce(lambda y: x | y, range(3)))
-    frozenset(functools.reduce(lambda y: x | y, range(3)))
-
-# OK because the lambda which references a loop variable is defined in a `return`
-# statement, and after we return the loop variable can't be redefined.
-# In principle we could do something fancy with `break`, but it's not worth it.
-def iter_f(names):
-    for name in names:
-        if exists(name):
-            return lambda: name if exists(name) else None
-
-        if foo(name):
-            return [lambda: name]  # known false alarm
-
-        if False:
-            return [lambda: i for i in range(3)]  # error
--- a/resources/test/fixtures/flake8_bugbear/B024.py
+++ b/resources/test/fixtures/flake8_bugbear/B024.py
@@ -1,16 +1,15 @@
 """
 Should emit:
-B024 - on lines 18, 71, 82, 87, 92, 141
+B024 - on lines 17, 34, 52, 58, 69, 74, 79, 84, 89
 """

 import abc
 import abc as notabc
 from abc import ABC, ABCMeta
-from abc import abstractmethod, abstractproperty
+from abc import abstractmethod
 from abc import abstractmethod as abstract
 from abc import abstractmethod as abstractaoeuaoeuaoeu
 from abc import abstractmethod as notabstract
-from abc import abstractproperty as notabstract_property

 import foo

@@ -50,24 +49,12 @@ class Base_6(ABC):
        foo()


-class Base_7(ABC):
+class Base_7(ABC):  # error
    @notabstract
    def method(self):
        foo()


-class Base_8(ABC):
-    @notabstract_property
-    def method(self):
-        foo()
-
-
-class Base_9(ABC):
-    @abstractproperty
-    def method(self):
-        foo()
-
-
 class MetaBase_1(metaclass=ABCMeta):  # error
    def method(self):
        foo()
--- a/resources/test/fixtures/flake8_bugbear/B027.py
+++ b/resources/test/fixtures/flake8_bugbear/B027.py
@@ -1,12 +1,11 @@
 """
 Should emit:
-B027 - on lines 13, 16, 19, 23
+B027 - on lines 12, 15, 18, 22, 30
 """
 import abc
 from abc import ABC
-from abc import abstractmethod, abstractproperty
+from abc import abstractmethod
 from abc import abstractmethod as notabstract
-from abc import abstractproperty as notabstract_property


 class AbstractClass(ABC):
@@ -43,18 +42,6 @@ class AbstractClass(ABC):
    def abstract_3(self):
        ...

-    @abc.abstractproperty
-    def abstract_4(self):
-        ...
-
-    @abstractproperty
-    def abstract_5(self):
-        ...
-
-    @notabstract_property
-    def abstract_6(self):
-        ...
-
    def body_1(self):
        print("foo")
        ...
--- a/resources/test/fixtures/flake8_commas/COM81.py
+++ b/resources/test/fixtures/flake8_commas/COM81.py
@@ -1,628 +0,0 @@
-# ==> bad_function_call.py <==
-bad_function_call(
-    param1='test',
-    param2='test'
-)
-# ==> bad_list.py <==
-bad_list = [
-    1,
-    2,
-    3
-]
-
-bad_list_with_comment = [
-    1,
-    2,
-    3
-    # still needs a comma!
-]
-
-bad_list_with_extra_empty = [
-    1,
-    2,
-    3
-
-
-
-]
-
-# ==> bare.py <==
-bar = 1, 2
-
-foo = 1
-
-foo = (1,)
-
-foo = 1,
-
-bar = 1; foo = bar,
-
-foo = (
-3,
-4,
-)
-
-foo = 3, 
-
-class A(object):
- foo = 3
- bar = 10,
- foo_bar = 2
-
-a = ('a',)
-
-from foo import bar, baz
-
-group_by = function_call('arg'),
-
-group_by = ('foobar' * 3),
-
-def foo():
-    return False,
-
-==> callable_before_parenth_form.py <==
-def foo(
-    bar,
-):
-    pass
-
-{'foo': foo}['foo'](
-    bar
-)
-
-{'foo': foo}['foo'](
-    bar,
-)
-
-(foo)(
-    bar
-)
-
-(foo)[0](
-    bar,
-)
-
-[foo][0](
-    bar
-)
-
-[foo][0](
-    bar,
-)
-
-# ==> comment_good_dict.py <==
-multiline_good_dict = {
-    "good": 123,  # this is a good number
-}
-
-# ==> dict_comprehension.py <==
-not_a_dict = {
-    x: y
-    for x, y in ((1, 2), (3, 4))
-}
-
-# ==> good_empty_comma_context.py <==
-def func2(
-):
-    pass
-
-
-func2(
-
-)
-
-func2(
-)
-
-[
-]
-
-[
-
-]
-
-(
-)
-
-(
-
-)
-
-{
-
-}
-
-# ==> good_list.py <==
-stuff = [
-   'a',
-   'b',
-   # more stuff will go here
-]
-
-more_stuff = [
-    'a',
-    'b',
-
-
-
-]
-
-# ==> keyword_before_parenth_form/base_bad.py <==
-from x import (
-    y
-)
-
-assert(
-    SyntaxWarning,
-    ThrownHere,
-    Anyway
-)
-
-# async await is fine outside an async def
-# ruff: RustPython tokenizer treats async/await as keywords, not applicable.
-
-# def await(
-#     foo
-# ):
-#     async(
-#         foo
-#     )
-
-# def async(
-#     foo
-# ):
-#     await(
-#         foo
-#     )
-
-# ==> keyword_before_parenth_form/base.py <==
-from x import (
-    y,
-)
-
-assert(
-    SyntaxWarning,
-    ThrownHere,
-    Anyway,
-)
-
-assert (
-    foo
-)
-
-assert (
-    foo and
-    bar
-)
-
-if(
-    foo and
-    bar
-):
-    pass
-elif(
-    foo and
-    bar
-):
-    pass
-
-for x in(
-    [1,2,3]
-):
-    print(x)
-
-
-(x for x in (
-    [1, 2, 3]
-))
-
-(
-    'foo'
-) is (
-    'foo'
-)
-
-if (
-    foo and
-    bar
-) or not (
-    foo
-) or (
-    spam
-):
-    pass
-
-def xyz():
-    raise(
-        Exception()
-    )
-
-def abc():
-    return(
-        3
-    )
-
-while(
-    False
-):
-    pass
-
-with(
-    loop
-):
-    pass
-
-def foo():
-    yield (
-        "foo"
-    )
-
-# async await is fine outside an async def
-# ruff: RustPython tokenizer treats async/await as keywords, not applicable.
-
-# def await(
-#     foo,
-# ):
-#     async(
-#         foo,
-#     )
-
-# def async(
-#     foo,
-# ):
-#     await(
-#         foo,
-#     )
-
-# ==> keyword_before_parenth_form/py3.py <==
-# Syntax error in Py2
-
-def foo():
-    yield from (
-        foo
-    )
-
-# ==> list_comprehension.py <==
-not_a_list = [
-    s.strip()
-    for s in 'foo, bar, baz'.split(',')
-]
-
-# ==> multiline_bad_dict.py <==
-multiline_bad_dict = {
-    "bad": 123
-}
-# ==> multiline_bad_function_def.py <==
-def func_good(
-        a = 3,
-        b = 2):
-    pass
-
-
-def func_bad(
-        a = 3,
-        b = 2
-    ):
-    pass
-
-# ==> multiline_bad_function_one_param.py <==
-def func(
-        a = 3
-    ):
-    pass
-
-
-func(
-    a = 3
-)
-
-# ==> multiline_bad_or_dict.py <==
-multiline_bad_or_dict = {
-    "good": True or False,
-    "bad": 123
-}
-
-# ==> multiline_good_dict.py <==
-multiline_good_dict = {
-    "good": 123,
-}
-# ==> multiline_good_single_keyed_for_dict.py <==
-good_dict = {
-    "good": x for x in y
-}
-
-# ==> multiline_if.py <==
-if (
-    foo
-    and bar
-):
-    print("Baz")
-
-# ==> multiline_index_access.py <==
-multiline_index_access[
-    "good"
-]
-
-multiline_index_access_after_function()[
-    "good"
-]
-
-multiline_index_access_after_inline_index_access['first'][
-    "good"
-]
-
-multiline_index_access[
-    "probably fine",
-]
-
-[0, 1, 2][
-    "good"
-]
-
-[0, 1, 2][
-    "probably fine",
-]
-
-multiline_index_access[
-    "probably fine",
-    "not good"
-]
-
-multiline_index_access[
-    "fine",
-    "fine",
-    :
-    "not good"
-]
-
-# ==> multiline_string.py <==
-s = (
-    'this' +
-    'is a string'
-)
-
-s2 = (
-    'this'
-    'is a also a string'
-)
-
-t = (
-    'this' +
-    'is a tuple',
-)
-
-t2 = (
-    'this'
-    'is also a tuple',
-)
-
-# ==> multiline_subscript_slice.py <==
-multiline_index_access[
-    "fine",
-    "fine"
-    :
-    "not fine"
-]
-
-multiline_index_access[
-    "fine"
-    "fine"
-    :
-    "fine"
-    :
-    "fine"
-]
-
-multiline_index_access[
-    "fine"
-    "fine",
-    :
-    "fine",
-    :
-    "fine",
-]
-
-multiline_index_access[
-    "fine"
-    "fine",
-    :
-    "fine"
-    :
-    "fine",
-    "not fine"
-]
-
-multiline_index_access[
-    "fine"
-    "fine",
-    :
-    "fine",
-    "fine"
-    :
-    "fine",
-]
-
-multiline_index_access[
-    lambda fine,
-    fine,
-    fine: (0,)
-    :
-    lambda fine,
-    fine,
-    fine: (0,),
-    "fine"
-    :
-    "fine",
-]
-
-# ==> one_line_dict.py <==
-one_line_dict = {"good": 123}
-# ==> parenth_form.py <==
-parenth_form = (
-    a +
-    b +
-    c
-)
-
-parenth_form_with_lambda = (
-    lambda x, y: 0
-)
-
-parenth_form_with_default_lambda = (
-    lambda x=(
-        lambda
-        x,
-        y,
-        :
-        0
-    ),
-    y = {a: b},
-    :
-    0
-)
-
-# ==> prohibited.py <==
-foo = ['a', 'b', 'c',]
-
-bar = { a: b,}
-
-def bah(ham, spam,):
-    pass
-
-(0,)
-
-(0, 1,)
-
-foo = ['a', 'b', 'c', ]
-
-bar = { a: b, }
-
-def bah(ham, spam, ):
-    pass
-
-(0, )
-
-(0, 1, )
-
-image[:, :, 0]
-
-image[:,]
-
-image[:,:,]
-
-lambda x, :
-
-# ==> unpack.py <==
-def function(
-    foo,
-    bar,
-    **kwargs
-):
-    pass
-
-def function(
-    foo,
-    bar,
-    *args
-):
-    pass
-
-def function(
-    foo,
-    bar,
-    *args,
-    extra_kwarg
-    ):
-    pass
-
-result = function(
-    foo,
-    bar,
-    **kwargs
-)
-
-result = function(
-    foo,
-    bar,
-    **not_called_kwargs
-)
-
-def foo(
-    ham,
-    spam,
-    *args,
-    kwarg_only
-    ):
-    pass
-
-# In python 3.5 if it's not a function def, commas are mandatory.
-
-foo(
-    **kwargs
-)
-
-{
-    **kwargs
-}
-
-(
-    *args
-)
-
-{
-    *args
-}
-
-[
-    *args
-]
-
-def foo(
-    ham,
-    spam,
-    *args
-    ):
-    pass
-
-def foo(
-    ham,
-    spam,
-    **kwargs
-    ):
-    pass
-
-def foo(
-    ham,
-    spam,
-    *args,
-    kwarg_only
-    ):
-    pass
-
-# In python 3.5 if it's not a function def, commas are mandatory.
-
-foo(
-    **kwargs,
-)
-
-{
-    **kwargs,
-}
-
-(
-    *args,
-)
-
-{
-    *args,
-}
-
-[
-    *args,
-]
-
-result = function(
-    foo,
-    bar,
-    **{'ham': spam}
-)
--- a/resources/test/fixtures/flake8_comprehensions/C400.py
+++ b/resources/test/fixtures/flake8_comprehensions/C400.py
@@ -2,10 +2,3 @@ x = list(x for x in range(3))
 x = list(
    x for x in range(3)
 )
-
-
-def list(*args, **kwargs):
-    return None
-
-
-list(x for x in range(3))
--- a/resources/test/fixtures/flake8_comprehensions/C401.py
+++ b/resources/test/fixtures/flake8_comprehensions/C401.py
@@ -2,10 +2,3 @@ x = set(x for x in range(3))
 x = set(
    x for x in range(3)
 )
-
-
-def set(*args, **kwargs):
-    return None
-
-
-set(x for x in range(3))
--- a/resources/test/fixtures/flake8_comprehensions/C405.py
+++ b/resources/test/fixtures/flake8_comprehensions/C405.py
@@ -1,18 +1,5 @@
-set([1, 2])
-set((1, 2))
-set([])
-set(())
-set()
-set((1,))
-set((
-    1,
-))
-set([
-    1,
-])
-set(
-    (1,)
-)
-set(
-    [1,]
-)
+s1 = set([1, 2])
+s2 = set((1, 2))
+s3 = set([])
+s4 = set(())
+s5 = set()
--- a/resources/test/fixtures/flake8_comprehensions/C408.py
+++ b/resources/test/fixtures/flake8_comprehensions/C408.py
@@ -3,10 +3,3 @@ l = list()
 d1 = dict()
 d2 = dict(a=1)
 d3 = dict(**d2)
-
-
-def list():
-    return [1, 2, 3]
-
-
-a = list()
--- a/resources/test/fixtures/flake8_comprehensions/C413.py
+++ b/resources/test/fixtures/flake8_comprehensions/C413.py
@@ -4,10 +4,3 @@ list(sorted(x))
 reversed(sorted(x))
 reversed(sorted(x, key=lambda e: e))
 reversed(sorted(x, reverse=True))
-
-
-def reversed(*args, **kwargs):
-    return None
-
-
-reversed(sorted(x, reverse=True))
--- a/resources/test/fixtures/flake8_pie/PIE794.py
+++ b/resources/test/fixtures/flake8_pie/PIE794.py
@@ -31,10 +31,3 @@ class User(BaseModel):
    @buzz.setter
    def buzz(self, value: str | int) -> None:
        ...
-
-
-class User:
-    bar: str = StringField()
-    foo: bool = BooleanField()
-    # ...
-    bar = StringField()  # PIE794
--- a/resources/test/fixtures/flake8_pie/PIE796.py
+++ b/resources/test/fixtures/flake8_pie/PIE796.py
@@ -1,60 +0,0 @@
-import enum
-from enum import Enum, unique
-
-
-class FakeEnum(enum.Enum):
-    A = "A"
-    B = "B"
-    C = "B"  # PIE796
-
-
-class FakeEnum2(Enum):
-    A = 1
-    B = 2
-    C = 2  # PIE796
-
-
-class FakeEnum3(str, Enum):
-    A = "1"
-    B = "2"
-    C = "2"  # PIE796
-
-
-class FakeEnum4(Enum):
-    A = 1.0
-    B = 2.5
-    C = 2.5  # PIE796
-
-
-class FakeEnum5(Enum):
-    A = 1.0
-    B = True
-    C = False
-    D = False  # PIE796
-
-
-class FakeEnum6(Enum):
-    A = 1
-    B = 2
-    C = None
-    D = None  # PIE796
-
-
-@enum.unique
-class FakeEnum7(enum.Enum):
-    A = "A"
-    B = "B"
-    C = "C"
-
-
-@unique
-class FakeEnum8(Enum):
-    A = 1
-    B = 2
-    C = 2  # PIE796
-
-
-class FakeEnum9(enum.Enum):
-    A = "A"
-    B = "B"
-    C = "C"
--- a/resources/test/fixtures/flake8_quotes/docstring_doubles_function.py
+++ b/resources/test/fixtures/flake8_quotes/docstring_doubles_function.py
@@ -17,15 +17,6 @@ def fun_with_params_no_docstring(a, b="""
 """ """docstring"""):
    pass

-
 def fun_with_params_no_docstring2(a, b=c[foo():], c=\
    """ not a docstring """):
    pass
-
-
-def function_with_single_docstring(a):
-    "Single line docstring"
-
-
-def double_inside_single(a):
-    'Double inside "single "'
--- a/resources/test/fixtures/flake8_quotes/docstring_singles_function.py
+++ b/resources/test/fixtures/flake8_quotes/docstring_singles_function.py
@@ -13,19 +13,11 @@ def foo2():


 def fun_with_params_no_docstring(a, b='''
-    not a
+    not a 
 ''' '''docstring'''):
    pass

-
 def fun_with_params_no_docstring2(a, b=c[foo():], c=\
    ''' not a docstring '''):
    pass

-
-def function_with_single_docstring(a):
-    'Single line docstring'
-
-
-def double_inside_single(a):
-    "Double inside 'single '"
--- a/resources/test/fixtures/flake8_quotes/doubles_escaped.py
+++ b/resources/test/fixtures/flake8_quotes/doubles_escaped.py
@@ -1,5 +1,4 @@
 this_should_raise_Q003 = 'This is a \'string\''
-this_should_raise_Q003 = 'This is \\ a \\\'string\''
 this_is_fine = '"This" is a \'string\''
 this_is_fine = "This is a 'string'"
 this_is_fine = "\"This\" is a 'string'"
--- a/resources/test/fixtures/flake8_simplify/SIM108.py
+++ b/resources/test/fixtures/flake8_simplify/SIM108.py
@@ -1,13 +1,13 @@
-# SIM108
+# Bad
 if a:
    b = c
 else:
    b = d

-# OK
+# Good
 b = c if a else d

-# OK
+# https://github.com/MartinThoma/flake8-simplify/issues/115
 if a:
    b = c
 elif c:
@@ -15,7 +15,6 @@ elif c:
 else:
    b = d

-# OK
 if True:
    pass
 elif a:
@@ -23,7 +22,6 @@ elif a:
 else:
    b = 2

-# OK (false negative)
 if True:
    pass
 else:
@@ -32,62 +30,19 @@ else:
    else:
        b = 2

-
 import sys

-# OK
 if sys.version_info >= (3, 9):
    randbytes = random.randbytes
 else:
    randbytes = _get_random_bytes

-# OK
 if sys.platform == "darwin":
    randbytes = random.randbytes
 else:
    randbytes = _get_random_bytes

-# OK
 if sys.platform.startswith("linux"):
    randbytes = random.randbytes
 else:
    randbytes = _get_random_bytes
-
-
-# OK (includes comments)
-if x > 0:
-    # test test
-    abc = x
-else:
-    # test test test
-    abc = -x
-
-
-# OK (too long)
-if parser.errno == BAD_FIRST_LINE:
-    req = wrappers.Request(sock, server=self._server)
-else:
-    req = wrappers.Request(
-        sock,
-        parser.get_method(),
-        parser.get_scheme() or _scheme,
-        parser.get_path(),
-        parser.get_version(),
-        parser.get_query_string(),
-        server=self._server,
-    )
-
-
-# SIM108
-if a:
-    b = cccccccccccccccccccccccccccccccccccc
-else:
-    b = ddddddddddddddddddddddddddddddddddddd
-
-
-# OK (too long)
-if True:
-    if a:
-        b = cccccccccccccccccccccccccccccccccccc
-    else:
-        b = ddddddddddddddddddddddddddddddddddddd
--- a/resources/test/fixtures/flake8_simplify/SIM110.py
+++ b/resources/test/fixtures/flake8_simplify/SIM110.py
@@ -1,6 +1,5 @@
 def f():
-    # SIM110
-    for x in iterable:
+    for x in iterable:  # SIM110
        if check(x):
            return True
    return False
@@ -21,16 +20,14 @@ def f():


 def f():
-    # SIM111
-    for x in iterable:
+    for x in iterable:  # SIM111
        if check(x):
            return False
    return True


 def f():
-    # SIM111
-    for x in iterable:
+    for x in iterable:  # SIM111
        if not x.is_empty():
            return False
    return True
@@ -48,70 +45,3 @@ def f():
        if check(x):
            return "foo"
    return "bar"
-
-
-def f():
-    # SIM110
-    for x in iterable:
-        if check(x):
-            return True
-    else:
-        return False
-
-
-def f():
-    # SIM111
-    for x in iterable:
-        if check(x):
-            return False
-    else:
-        return True
-
-
-def f():
-    # SIM110
-    for x in iterable:
-        if check(x):
-            return True
-    else:
-        return False
-    return True
-
-
-def f():
-    # SIM111
-    for x in iterable:
-        if check(x):
-            return False
-    else:
-        return True
-    return False
-
-
-def f():
-    for x in iterable:
-        if check(x):
-            return True
-        elif x.is_empty():
-            return True
-    return False
-
-
-def f():
-    for x in iterable:
-        if check(x):
-            return True
-        else:
-            return True
-    return False
-
-
-def f():
-    for x in iterable:
-        if check(x):
-            return True
-        elif x.is_empty():
-            return True
-    else:
-        return True
-    return False
--- a/resources/test/fixtures/flake8_simplify/SIM111.py
+++ b/resources/test/fixtures/flake8_simplify/SIM111.py
@@ -1,18 +1,10 @@
 def f():
-    # SIM110
-    for x in iterable:
+    for x in iterable:  # SIM110
        if check(x):
            return True
    return False


-def f():
-    for x in iterable:
-        if check(x):
-            return True
-    return True
-
-
 def f():
    for el in [1, 2, 3]:
        if is_true(el):
@@ -21,97 +13,21 @@ def f():


 def f():
-    # SIM111
-    for x in iterable:
+    for x in iterable:  # SIM111
        if check(x):
            return False
    return True


 def f():
-    # SIM111
-    for x in iterable:
+    for x in iterable:  # SIM 111
        if not x.is_empty():
            return False
    return True


-def f():
-    for x in iterable:
-        if check(x):
-            return False
-    return False
-
-
 def f():
    for x in iterable:
        if check(x):
            return "foo"
    return "bar"
-
-
-def f():
-    # SIM110
-    for x in iterable:
-        if check(x):
-            return True
-    else:
-        return False
-
-
-def f():
-    # SIM111
-    for x in iterable:
-        if check(x):
-            return False
-    else:
-        return True
-
-
-def f():
-    # SIM110
-    for x in iterable:
-        if check(x):
-            return True
-    else:
-        return False
-    return True
-
-
-def f():
-    # SIM111
-    for x in iterable:
-        if check(x):
-            return False
-    else:
-        return True
-    return False
-
-
-def f():
-    for x in iterable:
-        if check(x):
-            return True
-        elif x.is_empty():
-            return True
-    return False
-
-
-def f():
-    for x in iterable:
-        if check(x):
-            return True
-        else:
-            return True
-    return False
-
-
-def f():
-    for x in iterable:
-        if check(x):
-            return True
-        elif x.is_empty():
-            return True
-    else:
-        return True
-    return False
--- a/resources/test/fixtures/flake8_simplify/SIM115.py
+++ b/resources/test/fixtures/flake8_simplify/SIM115.py
@@ -1,6 +0,0 @@
-f = open('foo.txt')  # SIM115
-data = f.read()
-f.close()
-
-with open('foo.txt') as f:  # OK
-    data = f.read()
--- a/resources/test/fixtures/flake8_simplify/SIM117.py
+++ b/resources/test/fixtures/flake8_simplify/SIM117.py
@@ -2,11 +2,6 @@ with A() as a:  # SIM117
    with B() as b:
        print("hello")

-with A():  # SIM117
-    with B():
-        with C():
-            print("hello")
-
 with A() as a:
    a()
    with B() as b:
@@ -16,15 +11,3 @@ with A() as a:
    with B() as b:
        print("hello")
    a()
-
-async with A() as a:
-    with B() as b:
-        print("hello")
-
-with A() as a:
-    async with B() as b:
-        print("hello")
-
-async with A() as a:
-    async with B() as b:
-        print("hello")
--- a/resources/test/fixtures/flake8_simplify/SIM401.py
+++ b/resources/test/fixtures/flake8_simplify/SIM401.py
@@ -1,87 +0,0 @@
-###
-# Positive cases
-###
-
-# SIM401 (pattern-1)
-if key in a_dict:
-    var = a_dict[key]
-else:
-    var = "default1"
-
-# SIM401 (pattern-2)
-if key not in a_dict:
-    var = "default2"
-else:
-    var = a_dict[key]
-
-# SIM401 (default with a complex expression)
-if key in a_dict:
-    var = a_dict[key]
-else:
-    var = val1 + val2
-
-# SIM401 (complex expression in key)
-if keys[idx] in a_dict:
-    var = a_dict[keys[idx]]
-else:
-    var = "default"
-
-# SIM401 (complex expression in dict)
-if key in dicts[idx]:
-    var = dicts[idx][key]
-else:
-    var = "default"
-
-# SIM401 (complex expression in var)
-if key in a_dict:
-    vars[idx] = a_dict[key]
-else:
-    vars[idx] = "default"
-
-###
-# Negative cases
-###
-
-# OK (false negative)
-if not key in a_dict:
-    var = "default"
-else:
-    var = a_dict[key]
-
-# OK (different dict)
-if key in a_dict:
-    var = other_dict[key]
-else:
-    var = "default"
-
-# OK (different key)
-if key in a_dict:
-    var = a_dict[other_key]
-else:
-    var = "default"
-
-# OK (different var)
-if key in a_dict:
-    var = a_dict[key]
-else:
-    other_var = "default"
-
-# OK (extra vars in body)
-if key in a_dict:
-    var = a_dict[key]
-    var2 = value2
-else:
-    var = "default"
-
-# OK (extra vars in orelse)
-if key in a_dict:
-    var = a_dict[key]
-else:
-    var2 = value2
-    var = "default"
-
-# OK (complex default value)
-if key in a_dict:
-    var = a_dict[key]
-else:
-    var = foo()
--- a/resources/test/fixtures/flake8_unused_arguments/ARG.py
+++ b/resources/test/fixtures/flake8_unused_arguments/ARG.py
@@ -181,17 +181,3 @@ def f(a: int, b: int) -> str:

 def f(a, b):
    return f"{a}{b}"
-
-
-###
-# Unused arguments on magic methods.
-###
-class C:
-    def __init__(self, x) -> None:
-        print("Hello, world!")
-
-    def __str__(self) -> str:
-        return "Hello, world!"
-
-    def __exit__(self, exc_type, exc_value, traceback) -> None:
-        print("Hello, world!")
--- a/resources/test/fixtures/isort/order_by_type_with_custom_classes.py
+++ b/resources/test/fixtures/isort/order_by_type_with_custom_classes.py
@@ -1,4 +0,0 @@
-from sklearn.svm import func, SVC, CONST, Klass
-from subprocess import N_CLASS, PIPE, Popen, STDOUT
-from module import CLASS, Class, CONSTANT, function, BASIC, Apple
-from torch.nn import SELU, AClass, A_CONSTANT
--- a/resources/test/fixtures/isort/relative_imports_order.py
+++ b/resources/test/fixtures/isort/relative_imports_order.py
@@ -1,3 +0,0 @@
-from ... import a
-from .. import b
-from . import c
--- a/resources/test/fixtures/isort/required_imports/comment.py
+++ b/resources/test/fixtures/isort/required_imports/comment.py
@@ -1,3 +0,0 @@
-#!/usr/bin/env python3
-
-x = 1
--- a/resources/test/fixtures/isort/required_imports/docstring.py
+++ b/resources/test/fixtures/isort/required_imports/docstring.py
@@ -1,3 +0,0 @@
-"""Hello, world!"""
-
-x = 1
--- a/resources/test/fixtures/isort/required_imports/docstring_only.py
+++ b/resources/test/fixtures/isort/required_imports/docstring_only.py
@@ -1 +0,0 @@
-"""Hello, world!"""
--- a/resources/test/fixtures/isort/required_imports/docstring_with_continuation.py
+++ b/resources/test/fixtures/isort/required_imports/docstring_with_continuation.py
@@ -1,2 +0,0 @@
-"""Hello, world!"""; x = \
-    1; y = 2
--- a/resources/test/fixtures/isort/required_imports/docstring_with_semicolon.py
+++ b/resources/test/fixtures/isort/required_imports/docstring_with_semicolon.py
@@ -1 +0,0 @@
-"""Hello, world!"""; x = 1
--- a/resources/test/fixtures/isort/required_imports/empty.py
+++ b/resources/test/fixtures/isort/required_imports/empty.py
--- a/resources/test/fixtures/isort/required_imports/existing_import.py
+++ b/resources/test/fixtures/isort/required_imports/existing_import.py
@@ -1,2 +0,0 @@
-from __future__ import generator_stop
-import os
--- a/resources/test/fixtures/pycodestyle/W505.py
+++ b/resources/test/fixtures/pycodestyle/W505.py
@@ -1,15 +0,0 @@
-#!/usr/bin/env python3
-"""Here's a top-level docstring that's over the limit."""
-
-
-def f():
-    """Here's a docstring that's also over the limit."""
-
-    x = 1  # Here's a comment that's over the limit, but it's not standalone.
-
-    # Here's a standalone comment that's over the limit.
-
-    print("Here's a string that's over the limit, but it's not a docstring.")
-
-
-"This is also considered a docstring, and is over the limit."
--- a/resources/test/fixtures/pydocstyle/setter.py
+++ b/resources/test/fixtures/pydocstyle/setter.py
@@ -1,17 +0,0 @@
-class PropertyWithSetter:
-    @property
-    def foo(self) -> str:
-        """Docstring for foo."""
-        return "foo"
-
-    @foo.setter
-    def foo(self, value: str) -> None:
-        pass
-
-    @foo.deleter
-    def foo(self):
-        pass
-
-    @foo
-    def foo(self, value: str) -> None:
-        pass
--- a/resources/test/fixtures/pyflakes/F401_6.py
+++ b/resources/test/fixtures/pyflakes/F401_6.py
@@ -9,6 +9,7 @@ from .background import BackgroundTasks
 # F401 `datastructures.UploadFile` imported but unused
 from .datastructures import UploadFile as FileUpload

+
 # OK
 import applications as applications

--- a/resources/test/fixtures/pyflakes/F841_3.py
+++ b/resources/test/fixtures/pyflakes/F841_3.py
@@ -44,25 +44,3 @@ def f():
        1 / 0
    except (ValueError, ZeroDivisionError) as x2:
        pass
-
-
-def f(a, b):
-    x = (
-        a()
-        if a is not None
-        else b
-    )
-
-    y = \
-        a() if a is not None else b
-
-
-def f(a, b):
-    x = (
-        a
-        if a is not None
-        else b
-    )
-
-    y = \
-        a if a is not None else b
--- a/resources/test/fixtures/pygrep-hooks/PGH002_0.py
+++ b/resources/test/fixtures/pygrep-hooks/PGH002_0.py
@@ -5,3 +5,4 @@ from warnings import warn
 warnings.warn("this is ok")
 warn("by itself is also ok")
 logging.warning("this is fine")
+log.warning("this is ok")
--- a/resources/test/fixtures/pygrep-hooks/PGH002_1.py
+++ b/resources/test/fixtures/pygrep-hooks/PGH002_1.py
@@ -2,4 +2,14 @@ import logging
 from logging import warn

 logging.warn("this is not ok")
+log.warn("this is also not ok")
 warn("not ok")
+
+
+def foo():
+    from logging import warn
+
+    def warn():
+        pass
+
+    warn("has been redefined, but we will still report it")
--- a/resources/test/fixtures/pylint/constant_comparison.py
+++ b/resources/test/fixtures/pylint/constant_comparison.py
@@ -1,59 +0,0 @@
-"""Check that magic values are not used in comparisons"""
-
-if 100 == 100: # [comparison-of-constants]
-    pass
-
-if 1 == 3: # [comparison-of-constants]
-    pass
-
-if 1 != 3: # [comparison-of-constants]
-    pass
-
-x = 0
-if 4 == 3 == x: # [comparison-of-constants]
-    pass
-
-if x == 0: # correct
-    pass
-
-y = 1
-if x == y: # correct
-    pass
-
-if 1 > 0: # [comparison-of-constants]
-    pass
-
-if x > 0: # correct
-    pass
-
-if 1 >= 0: # [comparison-of-constants]
-    pass
-
-if x >= 0: # correct
-    pass
-
-if 1 < 0: # [comparison-of-constants]
-    pass
-
-if x < 0: # correct
-    pass
-
-if 1 <= 0: # [comparison-of-constants]
-    pass
-
-if x <= 0: # correct
-    pass
-
-word = "hello"
-if word == "": # correct
-    pass
-
-if "hello" == "": # [comparison-of-constants]
-    pass
-
-truthy = True
-if truthy == True: # correct
-    pass
-
-if True == False: # [comparison-of-constants]
-    pass
--- a/resources/test/fixtures/pylint/magic_value_comparison.py
+++ b/resources/test/fixtures/pylint/magic_value_comparison.py
@@ -1,71 +0,0 @@
-"""Check that magic values are not used in comparisons"""
-import cmath
-
-user_input = 10
-
-if 10 > user_input: # [magic-value-comparison]
-    pass
-
-if 10 == 100: # [comparison-of-constants] R0133
-    pass
-
-if 1 == 3: # [comparison-of-constants] R0133
-    pass
-
-x = 0
-if 4 == 3 == x: # [comparison-of-constants] R0133
-    pass
-
-time_delta = 7224
-ONE_HOUR = 3600
-
-if time_delta > ONE_HOUR: # correct
-    pass
-
-argc = 1
-
-if argc != -1: # correct
-    pass
-
-if argc != 0: # correct
-    pass
-
-if argc != 1: # correct
-    pass
-
-if argc != 2: # [magic-value-comparison]
-    pass
-
-if __name__ == "__main__": # correct
-    pass
-
-ADMIN_PASSWORD = "SUPERSECRET"
-input_password = "password"
-
-if input_password == "": # correct
-    pass
-
-if input_password == ADMIN_PASSWORD: # correct
-    pass
-
-if input_password == "Hunter2": # [magic-value-comparison]
-    pass
-
-PI = 3.141592653589793238
-pi_estimation = 3.14
-
-if pi_estimation == 3.141592653589793238: # [magic-value-comparison]
-    pass
-
-if pi_estimation == PI: # correct
-    pass
-
-HELLO_WORLD = b"Hello, World!"
-user_input = b"Hello, There!"
-
-if user_input == b"something": # [magic-value-comparison]
-    pass
-
-if user_input == HELLO_WORLD: # correct
-    pass
-
--- a/resources/test/fixtures/pyupgrade/UP024_3.py
+++ b/resources/test/fixtures/pyupgrade/UP024_3.py
@@ -1,8 +0,0 @@
-class SocketError(Exception):
-    pass
-
-
-try:
-    raise SocketError()
-except SocketError:
-    pass
--- a/resources/test/fixtures/pyupgrade/UP030_0.py
+++ b/resources/test/fixtures/pyupgrade/UP030_0.py
@@ -1,36 +0,0 @@
-# Invalid calls; errors expected.
-
-"{0}" "{1}" "{2}".format(1, 2, 3)
-
-"a {3} complicated {1} string with {0} {2}".format(
-    "first", "second", "third", "fourth"
-)
-
-'{0}'.format(1)
-
-'{0:x}'.format(30)
-
-x = '{0}'.format(1)
-
-'''{0}\n{1}\n'''.format(1, 2)
-
-x = "foo {0}" \
-    "bar {1}".format(1, 2)
-
-("{0}").format(1)
-
-"\N{snowman} {0}".format(1)
-
-'{' '0}'.format(1)
-
-# These will not change because we are waiting for libcst to fix this issue:
-# https://github.com/Instagram/LibCST/issues/846
-print(
-    'foo{0}'
-    'bar{1}'.format(1, 2)
-)
-
-print(
-    'foo{0}'  # ohai\n"
-    'bar{1}'.format(1, 2)
-)
--- a/resources/test/fixtures/pyupgrade/UP030_1.py
+++ b/resources/test/fixtures/pyupgrade/UP030_1.py
@@ -1,23 +0,0 @@
-# Valid calls; no errors expected.
-
-'{}'.format(1)
-
-
-x = ('{0} {1}',)
-
-'{0} {0}'.format(1)
-
-'{0:<{1}}'.format(1, 4)
-
-f"{0}".format(a)
-
-f"{0}".format(1)
-
-print(f"{0}".format(1))
-
-# I did not include the following tests because ruff does not seem to work with
-# invalid python syntax (which is a good thing)
-
-# "{0}"format(1)
-# '{'.format(1)", "'}'.format(1)
-# ("{0}" # {1}\n"{2}").format(1, 2, 3)
--- a/resources/test/fixtures/pyupgrade/UP032.py
+++ b/resources/test/fixtures/pyupgrade/UP032.py
@@ -1,86 +0,0 @@
-###
-# Errors
-###
-
-"{} {}".format(a, b)
-
-"{1} {0}".format(a, b)
-
-"{x.y}".format(x=z)
-
-"{.x} {.y}".format(a, b)
-
-"{} {}".format(a.b, c.d)
-
-"{}".format(a())
-
-"{}".format(a.b())
-
-"{}".format(a.b().c())
-
-"hello {}!".format(name)
-
-"{}{b}{}".format(a, c, b=b)
-
-"{}".format(0x0)
-
-"{} {}".format(a, b)
-
-"""{} {}""".format(a, b)
-
-"foo{}".format(1)
-
-r"foo{}".format(1)
-
-x = "{a}".format(a=1)
-
-print("foo {} ".format(x))
-
-"{a[b]}".format(a=a)
-
-"{a.a[b]}".format(a=a)
-
-"{}{{}}{}".format(escaped, y)
-
-"{}".format(a)
-
-###
-# Non-errors
-###
-
-# False-negative: RustPython doesn't parse the `\N{snowman}`.
-"\N{snowman} {}".format(a)
-
-"{".format(a)
-
-"}".format(a)
-
-"{} {}".format(*a)
-
-"{0} {0}".format(arg)
-
-"{x} {x}".format(arg)
-
-"{x.y} {x.z}".format(arg)
-
-b"{} {}".format(a, b)
-
-"{:{}}".format(x, y)
-
-"{}{}".format(a)
-
-"" "{}".format(a["\\"])
-
-"{}".format(a["b"])
-
-r'"\N{snowman} {}".format(a)'
-
-"{a}" "{b}".format(a=1, b=1)
-
-
-async def c():
-    return "{}".format(await 3)
-
-
-async def c():
-    return "{}".format(1 + await 3)
--- a/resources/test/project/README.md
+++ b/resources/test/project/README.md
@@ -17,7 +17,7 @@ resources/test/project/examples/docs/docs/file.py:8:5: F841 Local variable `x` i
 resources/test/project/project/file.py:1:8: F401 `os` imported but unused
 resources/test/project/project/import_file.py:1:1: I001 Import block is un-sorted or un-formatted
 Found 7 error(s).
-7 potentially fixable with the --fix option.
+6 potentially fixable with the --fix option.
 ```

 Running from the project directory itself should exhibit the same behavior:
@@ -32,7 +32,7 @@ examples/docs/docs/file.py:8:5: F841 Local variable `x` is assigned to but never
 project/file.py:1:8: F401 `os` imported but unused
 project/import_file.py:1:1: I001 Import block is un-sorted or un-formatted
 Found 7 error(s).
-7 potentially fixable with the --fix option.
+6 potentially fixable with the --fix option.
 ```

 Running from the sub-package directory should exhibit the same behavior, but omit the top-level
@@ -43,7 +43,7 @@ files:
 docs/file.py:1:1: I001 Import block is un-sorted or un-formatted
 docs/file.py:8:5: F841 Local variable `x` is assigned to but never used
 Found 2 error(s).
-2 potentially fixable with the --fix option.
+1 potentially fixable with the --fix option.
 ```

 `--config` should force Ruff to use the specified `pyproject.toml` for all files, and resolve
@@ -74,7 +74,7 @@ docs/docs/file.py:1:1: I001 Import block is un-sorted or un-formatted
 docs/docs/file.py:8:5: F841 Local variable `x` is assigned to but never used
 excluded/script.py:5:5: F841 Local variable `x` is assigned to but never used
 Found 4 error(s).
-4 potentially fixable with the --fix option.
+1 potentially fixable with the --fix option.
 ```

 Passing an excluded directory directly should report errors in the contained files:
--- a/ruff.schema.json
+++ b/ruff.schema.json
@@ -40,7 +40,7 @@
      ]
    },
    "exclude": {
-      "description": "A list of file patterns to exclude from linting.\n\nExclusions are based on globs, and can be either:\n\n- Single-path patterns, like `.mypy_cache` (to exclude any directory named `.mypy_cache` in the tree), `foo.py` (to exclude any file named `foo.py`), or `foo_*.py` (to exclude any file matching `foo_*.py` ). - Relative patterns, like `directory/foo.py` (to exclude that specific file) or `directory/*.py` (to exclude any Python files in `directory`). Note that these paths are relative to the project root (e.g., the directory containing your `pyproject.toml`).\n\nFor more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).\n\nNote that you'll typically want to use [`extend-exclude`](#extend-exclude) to modify the excluded paths.",
+      "description": "A list of file patterns to exclude from linting.\n\nExclusions are based on globs, and can be either:\n\n- Single-path patterns, like `.mypy_cache` (to exclude any directory named `.mypy_cache` in the tree), `foo.py` (to exclude any file named `foo.py`), or `foo_*.py` (to exclude any file matching `foo_*.py` ). - Relative patterns, like `directory/foo.py` (to exclude that specific file) or `directory/*.py` (to exclude any Python files in `directory`). Note that these paths are relative to the project root (e.g., the directory containing your `pyproject.toml`).\n\nNote that you'll typically want to use [`extend-exclude`](#extend-exclude) to modify the excluded paths.",
      "type": [
        "array",
        "null"
@@ -57,7 +57,7 @@
      ]
    },
    "extend-exclude": {
-      "description": "A list of file patterns to omit from linting, in addition to those specified by `exclude`.\n\nExclusions are based on globs, and can be either:\n\n- Single-path patterns, like `.mypy_cache` (to exclude any directory named `.mypy_cache` in the tree), `foo.py` (to exclude any file named `foo.py`), or `foo_*.py` (to exclude any file matching `foo_*.py` ). - Relative patterns, like `directory/foo.py` (to exclude that specific file) or `directory/*.py` (to exclude any Python files in `directory`). Note that these paths are relative to the project root (e.g., the directory containing your `pyproject.toml`).\n\nFor more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
+      "description": "A list of file patterns to omit from linting, in addition to those specified by `exclude`.",
      "type": [
        "array",
        "null"
@@ -67,7 +67,7 @@
      }
    },
    "extend-ignore": {
-      "description": "A list of rule codes or prefixes to ignore, in addition to those specified by `ignore`.\n\nNote that `extend-ignore` is applied after resolving rules from `ignore`/`select` and a less specific rule in `extend-ignore` would overwrite a more specific rule in `select`. It is recommended to only use `extend-ignore` when extending a `pyproject.toml` file via `extend`.",
+      "description": "A list of rule codes or prefixes to ignore, in addition to those specified by `ignore`.",
      "type": [
        "array",
        "null"
@@ -77,7 +77,7 @@
      }
    },
    "extend-select": {
-      "description": "A list of rule codes or prefixes to enable, in addition to those specified by `select`.\n\nNote that `extend-select` is applied after resolving rules from `ignore`/`select` and a less specific rule in `extend-select` would overwrite a more specific rule in `ignore`. It is recommended to only use `extend-select` when extending a `pyproject.toml` file via `extend`.",
+      "description": "A list of rule codes or prefixes to enable, in addition to those specified by `select`.",
      "type": [
        "array",
        "null"
@@ -285,16 +285,6 @@
        }
      ]
    },
-    "namespace-packages": {
-      "description": "Mark the specified directories as namespace packages. For the purpose of module resolution, Ruff will treat those directories as if they contained an `__init__.py` file.",
-      "type": [
-        "array",
-        "null"
-      ],
-      "items": {
-        "type": "string"
-      }
-    },
    "pep8-naming": {
      "description": "Options for the `pep8-naming` plugin.",
      "anyOf": [
@@ -448,7 +438,7 @@
  },
  "additionalProperties": false,
  "definitions": {
-    "ApiBan": {
+    "BannedApi": {
      "type": "object",
      "required": [
        "msg"
@@ -743,7 +733,7 @@
            "null"
          ],
          "additionalProperties": {
-            "$ref": "#/definitions/ApiBan"
+            "$ref": "#/definitions/BannedApi"
          }
        }
      },
@@ -765,16 +755,6 @@
    "IsortOptions": {
      "type": "object",
      "properties": {
-        "classes": {
-          "description": "An override list of tokens to always recognize as a Class for `order-by-type` regardless of casing.",
-          "type": [
-            "array",
-            "null"
-          ],
-          "items": {
-            "type": "string"
-          }
-        },
        "combine-as-imports": {
          "description": "Combines as imports on the same line. See isort's [`combine-as-imports`](https://pycqa.github.io/isort/docs/configuration/options.html#combine-as-imports) option.",
          "type": [
@@ -840,27 +820,6 @@
            "null"
          ]
        },
-        "relative-imports-order": {
-          "description": "Whether to place \"closer\" imports (fewer `.` characters, most local) before \"further\" imports (more `.` characters, least local), or vice versa.\n\nThe default (\"furthest-to-closest\") is equivalent to isort's `reverse-relative` default (`reverse-relative = false`); setting this to \"closest-to-furthest\" is equivalent to isort's `reverse-relative = true`.",
-          "anyOf": [
-            {
-              "$ref": "#/definitions/RelatveImportsOrder"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "required-imports": {
-          "description": "Add the specified import line to all files.",
-          "type": [
-            "array",
-            "null"
-          ],
-          "items": {
-            "type": "string"
-          }
-        },
        "single-line-exclusions": {
          "description": "One or more modules to exclude from the single line rule.",
          "type": [
@@ -976,15 +935,6 @@
            "boolean",
            "null"
          ]
-        },
-        "max-doc-length": {
-          "description": "The maximum line length to allow for line-length violations within documentation (`W505`), including standalone comments.",
-          "type": [
-            "integer",
-            "null"
-          ],
-          "format": "uint",
-          "minimum": 0.0
        }
      },
      "additionalProperties": false
@@ -1038,24 +988,6 @@
        }
      ]
    },
-    "RelatveImportsOrder": {
-      "oneOf": [
-        {
-          "description": "Place \"closer\" imports (fewer `.` characters, most local) before \"further\" imports (more `.` characters, least local).",
-          "type": "string",
-          "enum": [
-            "closest-to-furthest"
-          ]
-        },
-        {
-          "description": "Place \"further\" imports (more `.` characters, least local) imports before \"closer\" imports (fewer `.` characters, most local).",
-          "type": "string",
-          "enum": [
-            "furthest-to-closest"
-          ]
-        }
-      ]
-    },
    "RuleCodePrefix": {
      "type": "string",
      "enum": [
@@ -1156,12 +1088,6 @@
        "C9",
        "C90",
        "C901",
-        "COM",
-        "COM8",
-        "COM81",
-        "COM812",
-        "COM818",
-        "COM819",
        "D",
        "D1",
        "D10",
@@ -1342,7 +1268,6 @@
        "I0",
        "I00",
        "I001",
-        "I002",
        "I2",
        "I25",
        "I252",
@@ -1431,7 +1356,6 @@
        "PIE79",
        "PIE790",
        "PIE794",
-        "PIE796",
        "PIE8",
        "PIE80",
        "PIE807",
@@ -1460,9 +1384,6 @@
        "PLE1142",
        "PLR",
        "PLR0",
-        "PLR01",
-        "PLR013",
-        "PLR0133",
        "PLR02",
        "PLR020",
        "PLR0206",
@@ -1475,10 +1396,6 @@
        "PLR1701",
        "PLR172",
        "PLR1722",
-        "PLR2",
-        "PLR20",
-        "PLR200",
-        "PLR2004",
        "PLW",
        "PLW0",
        "PLW01",
@@ -1576,11 +1493,6 @@
        "S50",
        "S501",
        "S506",
-        "S508",
-        "S509",
-        "S7",
-        "S70",
-        "S701",
        "SIM",
        "SIM1",
        "SIM10",
@@ -1595,7 +1507,6 @@
        "SIM110",
        "SIM111",
        "SIM112",
-        "SIM115",
        "SIM117",
        "SIM118",
        "SIM2",
@@ -1615,9 +1526,6 @@
        "SIM3",
        "SIM30",
        "SIM300",
-        "SIM4",
-        "SIM40",
-        "SIM401",
        "T",
        "T1",
        "T10",
@@ -1685,16 +1593,10 @@
        "UP027",
        "UP028",
        "UP029",
-        "UP03",
-        "UP030",
-        "UP032",
        "W",
        "W2",
        "W29",
        "W292",
-        "W5",
-        "W50",
-        "W505",
        "W6",
        "W60",
        "W605",
--- a/python/ruff/init.py
+++ b/python/ruff/init.py
--- a/python/ruff/main.py
+++ b/python/ruff/main.py
--- a/ruff_cli/Cargo.toml
+++ b/ruff_cli/Cargo.toml
@@ -1,68 +0,0 @@
-[package]
-name = "ruff_cli"
-version = "0.0.224"
-authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
-edition = "2021"
-rust-version = "1.65.0"
-documentation = "https://github.com/charliermarsh/ruff"
-homepage = "https://github.com/charliermarsh/ruff"
-repository = "https://github.com/charliermarsh/ruff"
-readme = "../README.md"
-license = "MIT"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[[bin]]
-name = "ruff"
-path = "src/main.rs"
-doctest = false
-
-# Since the name of the binary is the same as the name of the `ruff` crate
-# running `cargo doc --no-deps --all` results in an `output filename collision`
-# See also https://github.com/rust-lang/cargo/issues/6313.
-# We therefore disable the documentation generation for the binary.
-doc = false
-
-[dependencies]
-ruff = { path = ".." }
-
-annotate-snippets = { version = "0.9.1", features = ["color"] }
-anyhow = { version = "1.0.66" }
-atty = { version = "0.2.14" }
-bincode = { version = "1.3.3" }
-cachedir = { version = "0.3.0" }
-chrono = { version = "0.4.21", default-features = false, features = ["clock"] }
-clap = { version = "4.0.1", features = ["derive", "env"] }
-clap_complete_command = { version = "0.4.0" }
-clearscreen = { version = "2.0.0" }
-colored = { version = "2.0.0" }
-filetime = { version = "0.2.17" }
-glob = { version = "0.3.0" }
-ignore = { version = "0.4.18" }
-itertools = { version = "0.10.5" }
-log = { version = "0.4.17" }
-notify = { version = "5.0.0" }
-path-absolutize = { version = "3.0.14", features = ["once_cell_cache"] }
-quick-junit = { version = "0.3.2" }
-rayon = { version = "1.5.3" }
-regex = { version = "1.6.0" }
-rustc-hash = { version = "1.1.0" }
-serde = { version = "1.0.147", features = ["derive"] }
-serde_json = { version = "1.0.87" }
-similar = { version = "2.2.1" }
-textwrap = { version = "0.16.0" }
-update-informer = { version = "0.6.0", default-features = false, features = ["pypi"], optional = true }
-walkdir = { version = "2.3.2" }
-
-[dev-dependencies]
-assert_cmd = { version = "2.0.4" }
-strum = { version = "0.24.1" }
-ureq = { version = "2.5.0", features = [] }
-
-[features]
-default = ["update-informer"]
-update-informer = ["dep:update-informer"]
-
-[package.metadata.maturin]
-name = "ruff"
-# Setting the name here is necessary for maturin to include the package in its builds.
--- a/ruff_cli/src/cache.rs
+++ b/ruff_cli/src/cache.rs
@@ -1,128 +0,0 @@
-use std::collections::hash_map::DefaultHasher;
-use std::fs;
-use std::hash::{Hash, Hasher};
-use std::io::Write;
-use std::path::Path;
-
-use anyhow::Result;
-use filetime::FileTime;
-use log::error;
-use path_absolutize::Absolutize;
-use ruff::message::Message;
-use ruff::settings::{flags, AllSettings, Settings};
-use serde::{Deserialize, Serialize};
-
-const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
-
-#[derive(Serialize, Deserialize)]
-struct CacheMetadata {
-    mtime: i64,
-}
-
-#[derive(Serialize)]
-struct CheckResultRef<'a> {
-    metadata: &'a CacheMetadata,
-    messages: &'a [Message],
-}
-
-#[derive(Deserialize)]
-struct CheckResult {
-    metadata: CacheMetadata,
-    messages: Vec<Message>,
-}
-
-fn content_dir() -> &'static Path {
-    Path::new("content")
-}
-
-fn cache_key<P: AsRef<Path>>(path: 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);
-    settings.hash(&mut hasher);
-    autofix.hash(&mut hasher);
-    hasher.finish()
-}
-
-#[allow(dead_code)]
-/// Initialize the cache at the specified `Path`.
-pub fn init(path: &Path) -> Result<()> {
-    // Create the cache directories.
-    fs::create_dir_all(path.join(content_dir()))?;
-
-    // Add the CACHEDIR.TAG.
-    if !cachedir::is_tagged(path)? {
-        cachedir::add_tag(path)?;
-    }
-
-    // Add the .gitignore.
-    let gitignore_path = path.join(".gitignore");
-    if !gitignore_path.exists() {
-        let mut file = fs::File::create(gitignore_path)?;
-        file.write_all(b"*")?;
-    }
-
-    Ok(())
-}
-
-fn write_sync(cache_dir: &Path, key: u64, value: &[u8]) -> Result<(), std::io::Error> {
-    fs::write(
-        cache_dir.join(content_dir()).join(format!("{key:x}")),
-        value,
-    )
-}
-
-fn read_sync(cache_dir: &Path, key: u64) -> Result<Vec<u8>, std::io::Error> {
-    fs::read(cache_dir.join(content_dir()).join(format!("{key:x}")))
-}
-
-/// Get a value from the cache.
-pub fn get<P: AsRef<Path>>(
-    path: 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),
-    )
-    .ok()?;
-    let (mtime, messages) = match bincode::deserialize::<CheckResult>(&encoded[..]) {
-        Ok(CheckResult {
-            metadata: CacheMetadata { mtime },
-            messages,
-        }) => (mtime, messages),
-        Err(e) => {
-            error!("Failed to deserialize encoded cache entry: {e:?}");
-            return None;
-        }
-    };
-    if FileTime::from_last_modification_time(metadata).unix_seconds() != mtime {
-        return None;
-    }
-    Some(messages)
-}
-
-/// Set a value in the cache.
-pub fn set<P: AsRef<Path>>(
-    path: P,
-    metadata: &fs::Metadata,
-    settings: &AllSettings,
-    autofix: flags::Autofix,
-    messages: &[Message],
-) {
-    let check_result = CheckResultRef {
-        metadata: &CacheMetadata {
-            mtime: FileTime::from_last_modification_time(metadata).unix_seconds(),
-        },
-        messages,
-    };
-    if let Err(e) = write_sync(
-        &settings.cli.cache_dir,
-        cache_key(path, &settings.lib, autofix),
-        &bincode::serialize(&check_result).unwrap(),
-    ) {
-        error!("Failed to write to cache: {e:?}");
-    }
-}
--- a/ruff_cli/src/diagnostics.rs
+++ b/ruff_cli/src/diagnostics.rs
@@ -1,155 +0,0 @@
-#![cfg_attr(target_family = "wasm", allow(dead_code))]
-use std::fs::write;
-use std::io;
-use std::io::Write;
-use std::ops::AddAssign;
-use std::path::Path;
-
-use anyhow::Result;
-use log::debug;
-use ruff::linter::{lint_fix, lint_only};
-use ruff::message::Message;
-use ruff::settings::{flags, AllSettings, Settings};
-use ruff::{fix, fs};
-use similar::TextDiff;
-
-use crate::cache;
-
-#[derive(Debug, Default)]
-pub struct Diagnostics {
-    pub messages: Vec<Message>,
-    pub fixed: usize,
-}
-
-impl Diagnostics {
-    pub fn new(messages: Vec<Message>) -> Self {
-        Self { messages, fixed: 0 }
-    }
-}
-
-impl AddAssign for Diagnostics {
-    fn add_assign(&mut self, other: Self) {
-        self.messages.extend(other.messages);
-        self.fixed += other.fixed;
-    }
-}
-
-/// Lint the source code at the given `Path`.
-pub fn lint_path(
-    path: &Path,
-    package: Option<&Path>,
-    settings: &AllSettings,
-    cache: flags::Cache,
-    autofix: fix::FixMode,
-) -> Result<Diagnostics> {
-    // Validate the `Settings` and return any errors.
-    settings.lib.validate()?;
-
-    // Check the cache.
-    // TODO(charlie): `fixer::Mode::Apply` and `fixer::Mode::Diff` both have
-    // side-effects that aren't captured in the cache. (In practice, it's fine
-    // to cache `fixer::Mode::Apply`, since a file either has no fixes, or we'll
-    // write the fixes to disk, thus invalidating the cache. But it's a bit hard
-    // to reason about. We need to come up with a better solution here.)
-    let metadata = if matches!(cache, flags::Cache::Enabled)
-        && matches!(autofix, fix::FixMode::None | fix::FixMode::Generate)
-    {
-        let metadata = path.metadata()?;
-        if let Some(messages) = cache::get(path, &metadata, settings, autofix.into()) {
-            debug!("Cache hit for: {}", path.to_string_lossy());
-            return Ok(Diagnostics::new(messages));
-        }
-        Some(metadata)
-    } else {
-        None
-    };
-
-    // Read the file from disk.
-    let contents = fs::read_file(path)?;
-
-    // Lint the file.
-    let (messages, fixed) = if matches!(autofix, fix::FixMode::Apply | fix::FixMode::Diff) {
-        let (transformed, fixed, messages) = lint_fix(&contents, path, package, &settings.lib)?;
-        if fixed > 0 {
-            if matches!(autofix, fix::FixMode::Apply) {
-                write(path, transformed)?;
-            } else if matches!(autofix, fix::FixMode::Diff) {
-                let mut stdout = io::stdout().lock();
-                TextDiff::from_lines(&contents, &transformed)
-                    .unified_diff()
-                    .header(&fs::relativize_path(path), &fs::relativize_path(path))
-                    .to_writer(&mut stdout)?;
-                stdout.write_all(b"\n")?;
-                stdout.flush()?;
-            }
-        }
-        (messages, fixed)
-    } else {
-        let messages = lint_only(&contents, path, package, &settings.lib, autofix.into())?;
-        let fixed = 0;
-        (messages, fixed)
-    };
-
-    // Re-populate the cache.
-    if let Some(metadata) = metadata {
-        cache::set(path, &metadata, settings, autofix.into(), &messages);
-    }
-
-    Ok(Diagnostics { messages, fixed })
-}
-
-/// Generate `Diagnostic`s from source code content derived from
-/// stdin.
-pub fn lint_stdin(
-    path: Option<&Path>,
-    package: Option<&Path>,
-    contents: &str,
-    settings: &Settings,
-    autofix: fix::FixMode,
-) -> Result<Diagnostics> {
-    // Validate the `Settings` and return any errors.
-    settings.validate()?;
-
-    // Lint the inputs.
-    let (messages, fixed) = if matches!(autofix, fix::FixMode::Apply | fix::FixMode::Diff) {
-        let (transformed, fixed, messages) = lint_fix(
-            contents,
-            path.unwrap_or_else(|| Path::new("-")),
-            package,
-            settings,
-        )?;
-
-        if matches!(autofix, fix::FixMode::Apply) {
-            // Write the contents to stdout, regardless of whether any errors were fixed.
-            io::stdout().write_all(transformed.as_bytes())?;
-        } else if matches!(autofix, fix::FixMode::Diff) {
-            // But only write a diff if it's non-empty.
-            if fixed > 0 {
-                let text_diff = TextDiff::from_lines(contents, &transformed);
-                let mut unified_diff = text_diff.unified_diff();
-                if let Some(path) = path {
-                    unified_diff.header(&fs::relativize_path(path), &fs::relativize_path(path));
-                }
-
-                let mut stdout = io::stdout().lock();
-                unified_diff.to_writer(&mut stdout)?;
-                stdout.write_all(b"\n")?;
-                stdout.flush()?;
-            }
-        }
-
-        (messages, fixed)
-    } else {
-        let messages = lint_only(
-            contents,
-            path.unwrap_or_else(|| Path::new("-")),
-            package,
-            settings,
-            autofix.into(),
-        )?;
-        let fixed = 0;
-        (messages, fixed)
-    };
-
-    Ok(Diagnostics { messages, fixed })
-}
--- a/ruff_cli/src/lib.rs
+++ b/ruff_cli/src/lib.rs
@@ -1,14 +0,0 @@
-//! This library only exists to enable the Ruff internal tooling (`ruff_dev`)
-//! to automatically update the `ruff --help` output in the `README.md`.
-//!
-//! For the actual Ruff library, see [`ruff`].
-#![allow(clippy::must_use_candidate, dead_code)]
-
-mod cli;
-
-use clap::CommandFactory;
-
-/// Returns the output of `ruff --help`.
-pub fn help() -> String {
-    cli::Cli::command().render_help().to_string()
-}
--- a/ruff_dev/Cargo.toml
+++ b/ruff_dev/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_dev"
-version = "0.0.224"
+version = "0.0.217"
 edition = "2021"

 [dependencies]
@@ -10,10 +10,9 @@ itertools = { version = "0.10.5" }
 libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a8725d161fe8b3ed73a6758b21e177" }
 once_cell = { version = "1.16.0" }
 ruff = { path = ".." }
-ruff_cli = { path = "../ruff_cli" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "acbc517b55406c76da83d7b2711941d8d3f65b87" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "acbc517b55406c76da83d7b2711941d8d3f65b87" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "acbc517b55406c76da83d7b2711941d8d3f65b87" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
 schemars = { version = "0.8.11" }
 serde_json = {version="1.0.91"}
 strum = { version = "0.24.1", features = ["strum_macros"] }
--- a/ruff_dev/src/generate_cli_help.rs
+++ b/ruff_dev/src/generate_cli_help.rs
@@ -1,7 +1,8 @@
 //! Generate CLI help.

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

 use crate::utils::replace_readme_section;

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

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

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

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

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

-fn generate_table(table_out: &mut String, prefix: &RuleCodePrefix) {
-    table_out.push_str("| Code | Name | Message | Fix |");
-    table_out.push('\n');
-    table_out.push_str("| ---- | ---- | ------- | --- |");
-    table_out.push('\n');
-    for rule_code in prefix.codes() {
-        let kind = rule_code.kind();
-        let fix_token = if kind.fixable() { "🛠" } else { "" };
-        table_out.push_str(&format!(
-            "| {} | {} | {} | {} |",
-            kind.code().as_ref(),
-            kind.as_ref(),
-            kind.summary().replace('|', r"\|"),
-            fix_token
-        ));
-        table_out.push('\n');
-    }
-    table_out.push('\n');
-}
-
 pub fn main(cli: &Cli) -> Result<()> {
    // Generate the table string.
    let mut table_out = String::new();
    let mut toc_out = String::new();
    for origin in RuleOrigin::iter() {
-        let prefixes = origin.prefixes();
-        let codes_csv: String = prefixes.as_list(", ");
+        let codes_csv: String = origin.codes().iter().map(AsRef::as_ref).join(", ");
        table_out.push_str(&format!("### {} ({codes_csv})", origin.title()));
        table_out.push('\n');
        table_out.push('\n');
@@ -70,16 +50,26 @@ 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);
-                }
+        table_out.push_str("| Code | Name | Message | Fix |");
+        table_out.push('\n');
+        table_out.push_str("| ---- | ---- | ------- | --- |");
+        table_out.push('\n');
+
+        for rule_code in RuleCode::iter() {
+            if rule_code.origin() == origin {
+                let kind = rule_code.kind();
+                let fix_token = if kind.fixable() { "🛠" } else { "" };
+                table_out.push_str(&format!(
+                    "| {} | {} | {} | {} |",
+                    kind.code().as_ref(),
+                    kind.as_ref(),
+                    kind.summary().replace('|', r"\|"),
+                    fix_token
+                ));
+                table_out.push('\n');
            }
        }
+        table_out.push('\n');
    }

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

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

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

 use anyhow::Result;
 use clap::Args;
-use ruff::source_code::round_trip;
+use ruff::source_code_generator::SourceCodeGenerator;
+use ruff::source_code_locator::SourceCodeLocator;
+use ruff::source_code_style::SourceCodeStyleDetector;
+use rustpython_parser::parser;

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

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

 [lib]
 proc-macro = true
-doctest = false

 [dependencies]
 once_cell = { version = "1.17.0" }
--- a/ruff_macros/src/define_rule_mapping.rs
+++ b/ruff_macros/src/define_rule_mapping.rs
@@ -1,133 +0,0 @@
-use proc_macro2::Span;
-use quote::quote;
-use syn::parse::Parse;
-use syn::{Ident, Path, Token};
-
-pub fn define_rule_mapping(mapping: Mapping) -> proc_macro2::TokenStream {
-    let mut rulecode_variants = quote!();
-    let mut diagkind_variants = quote!();
-    let mut rulecode_kind_match_arms = quote!();
-    let mut rulecode_origin_match_arms = quote!();
-    let mut diagkind_code_match_arms = quote!();
-    let mut diagkind_body_match_arms = quote!();
-    let mut diagkind_fixable_match_arms = quote!();
-    let mut diagkind_commit_match_arms = quote!();
-    let mut from_impls_for_diagkind = quote!();
-
-    for (code, path, name) in mapping.entries {
-        rulecode_variants.extend(quote! {#code,});
-        diagkind_variants.extend(quote! {#name(#path),});
-        rulecode_kind_match_arms.extend(
-            quote! {RuleCode::#code => DiagnosticKind::#name(<#path as Violation>::placeholder()),},
-        );
-        let origin = get_origin(&code);
-        rulecode_origin_match_arms.extend(quote! {RuleCode::#code => RuleOrigin::#origin,});
-        diagkind_code_match_arms.extend(quote! {DiagnosticKind::#name(..) => &RuleCode::#code, });
-        diagkind_body_match_arms
-            .extend(quote! {DiagnosticKind::#name(x) => Violation::message(x), });
-        diagkind_fixable_match_arms
-            .extend(quote! {DiagnosticKind::#name(x) => x.autofix_title_formatter().is_some(),});
-        diagkind_commit_match_arms.extend(
-            quote! {DiagnosticKind::#name(x) => x.autofix_title_formatter().map(|f| f(x)), },
-        );
-        from_impls_for_diagkind.extend(quote! {
-            impl From<#path> for DiagnosticKind {
-                fn from(x: #path) -> Self {
-                    DiagnosticKind::#name(x)
-                }
-            }
-        });
-    }
-
-    quote! {
-        #[derive(
-            AsRefStr,
-            RuleCodePrefix,
-            EnumIter,
-            EnumString,
-            Debug,
-            Display,
-            PartialEq,
-            Eq,
-            Clone,
-            Serialize,
-            Deserialize,
-            Hash,
-            PartialOrd,
-            Ord,
-        )]
-        pub enum RuleCode { #rulecode_variants }
-
-        #[derive(AsRefStr, Debug, PartialEq, Eq, Serialize, Deserialize)]
-        pub enum DiagnosticKind { #diagkind_variants }
-
-
-        impl RuleCode {
-            /// A placeholder representation of the `DiagnosticKind` for the diagnostic.
-            pub fn kind(&self) -> DiagnosticKind {
-                match self { #rulecode_kind_match_arms }
-            }
-
-            pub fn origin(&self) -> RuleOrigin {
-                match self { #rulecode_origin_match_arms }
-            }
-        }
-
-
-        impl DiagnosticKind {
-            /// A four-letter shorthand code for the diagnostic.
-            pub fn code(&self) -> &'static RuleCode {
-                match self { #diagkind_code_match_arms }
-            }
-
-            /// The body text for the diagnostic.
-            pub fn body(&self) -> String {
-                match self { #diagkind_body_match_arms }
-            }
-
-            /// Whether the diagnostic is (potentially) fixable.
-            pub fn fixable(&self) -> bool {
-                match self { #diagkind_fixable_match_arms }
-            }
-
-            /// The message used to describe the fix action for a given `DiagnosticKind`.
-            pub fn commit(&self) -> Option<String> {
-                match self { #diagkind_commit_match_arms }
-            }
-        }
-
-        #from_impls_for_diagkind
-    }
-}
-
-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)>,
-}
-
-impl Parse for Mapping {
-    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
-        let mut entries = Vec::new();
-        while !input.is_empty() {
-            let code: Ident = input.parse()?;
-            let _: Token![=>] = input.parse()?;
-            let path: Path = input.parse()?;
-            let name = path.segments.last().unwrap().ident.clone();
-            let _: Token![,] = input.parse()?;
-            entries.push((code, path, name));
-        }
-        Ok(Mapping { entries })
-    }
-}
--- a/ruff_macros/src/lib.rs
+++ b/ruff_macros/src/lib.rs
@@ -1,4 +1,3 @@
-//! This crate implements internal macros for the `ruff` library.
 #![allow(
    clippy::collapsible_else_if,
    clippy::collapsible_if,
@@ -16,8 +15,6 @@
 use syn::{parse_macro_input, DeriveInput};

 mod config;
-mod define_rule_mapping;
-mod prefixes;
 mod rule_code_prefix;

 #[proc_macro_derive(ConfigurationOptions, attributes(option, doc, option_group))]
@@ -37,9 +34,3 @@ pub fn derive_rule_code_prefix(input: proc_macro::TokenStream) -> proc_macro::To
        .unwrap_or_else(syn::Error::into_compile_error)
        .into()
 }
-
-#[proc_macro]
-pub fn define_rule_mapping(item: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    let mapping = parse_macro_input!(item as define_rule_mapping::Mapping);
-    define_rule_mapping::define_rule_mapping(mapping).into()
-}
--- a/ruff_macros/src/prefixes.rs
+++ b/ruff_macros/src/prefixes.rs
@@ -1,54 +0,0 @@
-// Longer prefixes should come first so that you can find an origin for a code
-// by simply picking the first entry that starts with the given prefix.
-
-pub const PREFIX_TO_ORIGIN: &[(&str, &str)] = &[
-    ("ANN", "Flake8Annotations"),
-    ("ARG", "Flake8UnusedArguments"),
-    ("A", "Flake8Builtins"),
-    ("BLE", "Flake8BlindExcept"),
-    ("B", "Flake8Bugbear"),
-    ("C4", "Flake8Comprehensions"),
-    ("C9", "McCabe"),
-    ("COM", "Flake8Commas"),
-    ("DTZ", "Flake8Datetimez"),
-    ("D", "Pydocstyle"),
-    ("ERA", "Eradicate"),
-    ("EM", "Flake8ErrMsg"),
-    ("E", "Pycodestyle"),
-    ("FBT", "Flake8BooleanTrap"),
-    ("F", "Pyflakes"),
-    ("ICN", "Flake8ImportConventions"),
-    ("ISC", "Flake8ImplicitStrConcat"),
-    ("I", "Isort"),
-    ("N", "PEP8Naming"),
-    ("PD", "PandasVet"),
-    ("PGH", "PygrepHooks"),
-    ("PL", "Pylint"),
-    ("PT", "Flake8PytestStyle"),
-    ("Q", "Flake8Quotes"),
-    ("RET", "Flake8Return"),
-    ("SIM", "Flake8Simplify"),
-    ("S", "Flake8Bandit"),
-    ("T10", "Flake8Debugger"),
-    ("T20", "Flake8Print"),
-    ("TID", "Flake8TidyImports"),
-    ("UP", "Pyupgrade"),
-    ("W", "Pycodestyle"),
-    ("YTT", "Flake82020"),
-    ("PIE", "Flake8Pie"),
-    ("RUF", "Ruff"),
-];
-
-#[cfg(test)]
-mod tests {
-    use super::PREFIX_TO_ORIGIN;
-
-    #[test]
-    fn order() {
-        for (idx, (prefix, _)) in PREFIX_TO_ORIGIN.iter().enumerate() {
-            for (prior_prefix, _) in PREFIX_TO_ORIGIN[..idx].iter() {
-                assert!(!prefix.starts_with(prior_prefix));
-            }
-        }
-    }
-}
--- a/1
+++ b/1
@@ -1 +0,0 @@
-1.65.0
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -0,0 +1,5 @@
+[toolchain]
+# The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy.
+# https://rust-lang.github.io/rustup/concepts/profiles.html
+profile = "default"
+channel = "1.65.0"
--- a/scripts/add_plugin.py
+++ b/scripts/add_plugin.py
@@ -10,9 +10,8 @@ Example usage:

 import argparse
 import os
-from pathlib import Path

-ROOT_DIR = Path(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))


 def dir_name(plugin: str) -> str:
@@ -26,17 +25,16 @@ def pascal_case(plugin: str) -> str:
 def main(*, plugin: str, url: str) -> None:
    # Create the test fixture folder.
    os.makedirs(
-        ROOT_DIR / "resources/test/fixtures" / dir_name(plugin),
+        os.path.join(ROOT_DIR, f"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:
+    os.makedirs(os.path.join(ROOT_DIR, f"src/{dir_name(plugin)}"), exist_ok=True)
+    with open(os.path.join(ROOT_DIR, f"src/{dir_name(plugin)}/rules.rs"), "w+") as fp:
        fp.write("use crate::checkers::ast::Checker;\n")
-    with open(rust_module / "mod.rs", "w+") as fp:
-        fp.write("pub(crate) mod rules;\n")
+    with open(os.path.join(ROOT_DIR, f"src/{dir_name(plugin)}/mod.rs"), "w+") as fp:
+        fp.write("pub mod rules;\n")
        fp.write("\n")
        fp.write(
            """#[cfg(test)]
@@ -67,14 +65,15 @@ mod tests {
            % dir_name(plugin)
        )

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

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

-    with open(ROOT_DIR / "src/registry.rs", "w") as fp:
+    with open(os.path.join(ROOT_DIR, "src/registry.rs"), "w") as fp:
        for line in content.splitlines():
            if line.strip() == "// Ruff":
                indent = line.split("// Ruff")[0]
@@ -109,9 +108,10 @@ mod tests {
            fp.write("\n")

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

-    with open(ROOT_DIR / "src/violations.rs", "w") as fp:
+    with open(os.path.join(ROOT_DIR, "src/violations.rs"), "w") as fp:
        for line in content.splitlines():
            if line.strip() == "// Ruff":
                indent = line.split("// Ruff")[0]
--- a/scripts/add_rule.py
+++ b/scripts/add_rule.py
@@ -11,9 +11,8 @@ Example usage:

 import argparse
 import os
-from pathlib import Path

-ROOT_DIR = Path(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))


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

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

-    with open(mod_rs, "w") as fp:
+    with open(os.path.join(ROOT_DIR, f"src/{dir_name(origin)}/mod.rs"), "w") as fp:
        for line in content.splitlines():
            if line.strip() == "fn rules(rule_code: RuleCode, path: &Path) -> Result<()> {":
                indent = line.split("fn rules(rule_code: RuleCode, path: &Path) -> Result<()> {")[0]
@@ -53,7 +52,7 @@ def main(*, name: str, code: str, origin: str) -> None:
            fp.write("\n")

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

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

-    with open(ROOT_DIR / "src/violations.rs", "w") as fp:
+    with open(os.path.join(ROOT_DIR, "src/violations.rs"), "w") as fp:
        for line in content.splitlines():
            fp.write(line)
            fp.write("\n")
@@ -90,11 +90,12 @@ impl Violation for %s {
                fp.write("\n")

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

    seen_macro = False
    has_written = False
-    with open(ROOT_DIR / "src/registry.rs", "w") as fp:
+    with open(os.path.join(ROOT_DIR, "src/registry.rs"), "w") as fp:
        for line in content.splitlines():
            fp.write(line)
            fp.write("\n")
@@ -115,6 +116,33 @@ impl Violation for %s {
                fp.write("\n")
                has_written = True

+    # Add the relevant code-to-origin pair to `src/registry.rs`.
+    with open(os.path.join(ROOT_DIR, "src/registry.rs")) as fp:
+        content = fp.read()
+
+    seen_impl = False
+    has_written = False
+    with open(os.path.join(ROOT_DIR, "src/registry.rs"), "w") as fp:
+        for line in content.splitlines():
+            fp.write(line)
+            fp.write("\n")
+
+            if has_written:
+                continue
+
+            if line.startswith("impl RuleCode"):
+                seen_impl = True
+                continue
+
+            if not seen_impl:
+                continue
+
+            if line.strip() == f"// {origin}":
+                indent = line.split("//")[0]
+                fp.write(f"{indent}RuleCode::{code} => RuleOrigin::{pascal_case(origin)},")
+                fp.write("\n")
+                has_written = True
+

 if __name__ == "__main__":
    parser = argparse.ArgumentParser(
--- a/scripts/benchmarks/README.md
+++ b/scripts/benchmarks/README.md
@@ -1,25 +0,0 @@
-# benchmarks
-
-Utilities for benchmarking Ruff.
-
-## Getting Started
-
-Run `./scripts/benchmarks/run.sh` to clone the benchmarking target (CPython).
-
-If you're looking to benchmark Ruff against other tools, you'll also need to run `poetry
-install` to create a virtual environment with the required dependencies.
-
-## Running Benchmarks
-
-Run `./scripts/benchmarks/run.sh` to run Ruff over the target repo (CPython). The
-`./scripts/benchmarks` folder contains a few other benchmarks (e.g., `scripts/benchmarks/run_comparisons.sh`
-compares Ruff to a variety of other tools).
-
-## Generating Plots
-
-The Vega specification for the benchmark plot depicted in the root README can be found at
-`scripts/benchmarks/graph-spec.json`. You can render this JSON spec in the [Vega Editor](https://vega.github.io/editor/#/edited).
-
-The images seen in the README are generated by exporting the rendered Vega spec as SVG (at around
-688px wide) and manually bolding the Ruff title and benchmark time. The dark mode variant is
-generated by changing the fill from `fill="#333333"` to `fill="#C9D1D9"`.
--- a/scripts/benchmarks/dark.svg
+++ b/scripts/benchmarks/dark.svg
--- a/scripts/benchmarks/graph-spec.json
+++ b/scripts/benchmarks/graph-spec.json
@@ -1,209 +0,0 @@
-{
-  "$schema": "https://vega.github.io/schema/vega-lite/v5.json",
-  "data": {
-    "values": [
-      {
-        "tool": "Ruff",
-        "time": 0.2943,
-        "timeFormat": "0.29s"
-      },
-      {
-        "tool": "Autoflake",
-        "time": 6.175,
-        "timeFormat": "6.18s"
-      },
-      {
-        "tool": "Flake8",
-        "time": 12.26,
-        "timeFormat": "12.26s"
-      },
-      {
-        "tool": "Pyflakes",
-        "time": 15.786,
-        "timeFormat": "15.79s"
-      },
-      {
-        "tool": "Pycodestyle",
-        "time": 46.921,
-        "timeFormat": "46.92s"
-      },
-      {
-        "tool": "Pylint",
-        "time": 62.0,
-        "timeFormat": "> 60s"
-      }
-    ]
-  },
-  "config": {
-    "params": [
-      {
-        "name": "defaultFont",
-        "value": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Helvetica,Arial,sans-serif,\"Apple Color Emoji\",\"Segoe UI Emoji\""
-      },
-      {
-        "name": "titleColor",
-        "value": "#333333"
-      },
-      {
-        "name": "labelColor",
-        "value": "#333333"
-      }
-    ],
-    "header": {
-      "labelFont": {
-        "expr": "defaultFont"
-      },
-      "titleFont": {
-        "expr": "defaultFont"
-      },
-      "titleFontWeight": 500
-    },
-    "text": {
-      "font": {
-        "expr": "defaultFont"
-      },
-      "color": {
-        "expr": "labelColor"
-      }
-    },
-    "mark": {
-      "font": {
-        "expr": "defaultFont"
-      },
-      "color": {
-        "expr": "labelColor"
-      }
-    },
-    "title": {
-      "font": {
-        "expr": "defaultFont"
-      },
-      "subtitleFont": {
-        "expr": "defaultFont"
-      },
-      "fontWeight": 500
-    },
-    "axis": {
-      "labelColor": {
-        "expr": "labelColor"
-      },
-      "labelFont": {
-        "expr": "defaultFont"
-      },
-      "titleFont": {
-        "expr": "defaultFont"
-      },
-      "titleFontWeight": 500,
-      "titleColor": {
-        "expr": "titleColor"
-      },
-      "titleFontSize": 12
-    },
-    "legend": {
-      "titleFontWeight": 500,
-      "titleColor": {
-        "expr": "titleColor"
-      },
-      "titleFontSize": 12,
-      "labelColor": {
-        "expr": "labelColor"
-      },
-      "labelFont": {
-        "expr": "defaultFont"
-      },
-      "titleFont": {
-        "expr": "defaultFont"
-      }
-    },
-    "view": {
-      "stroke": null
-    },
-    "background": "transparent"
-  },
-  "background": "transparent",
-  "encoding": {
-    "y": {
-      "field": "tool",
-      "type": "nominal",
-      "axis": {
-        "grid": false,
-        "title": null,
-        "labelFontSize": 12,
-        "ticks": false,
-        "labelPadding": 10,
-        "domain": false
-      },
-      "sort": null
-    },
-    "x": {
-      "field": "time",
-      "type": "quantitative",
-      "axis": {
-        "title": null,
-        "labelExpr": "datum.value + 's'",
-        "tickCount": 3,
-        "tickSize": 0,
-        "labelPadding": 6,
-        "labelAlign": "center",
-        "labelFontSize": 12,
-        "tickColor": "rgba(127,127,127,0.25)",
-        "gridColor": "rgba(127,127,127,0.25)",
-        "domain": false
-      }
-    }
-  },
-  "height": 140,
-  "width": "container",
-  "layer": [
-    {
-      "mark": "bar",
-      "encoding": {
-        "size": {
-          "value": 13
-        },
-        "color": {
-          "value": "#E15759"
-        }
-      }
-    },
-    {
-      "transform": [
-        {
-          "filter": "datum.tool !== 'ruff'"
-        }
-      ],
-      "mark": {
-        "type": "text",
-        "align": "left",
-        "baseline": "middle",
-        "dx": 6,
-        "fontSize": 12
-      },
-      "encoding": {
-        "text": {
-          "field": "timeFormat"
-        }
-      }
-    },
-    {
-      "transform": [
-        {
-          "filter": "datum.tool === 'ruff'"
-        }
-      ],
-      "mark": {
-        "type": "text",
-        "align": "left",
-        "baseline": "middle",
-        "dx": 6,
-        "fontSize": 12,
-        "fontWeight": "bold"
-      },
-      "encoding": {
-        "text": {
-          "field": "timeFormat"
-        }
-      }
-    }
-  ]
-}
--- a/scripts/benchmarks/light.svg
+++ b/scripts/benchmarks/light.svg
--- a/scripts/benchmarks/poetry.lock
+++ b/scripts/benchmarks/poetry.lock
--- a/scripts/benchmarks/pyproject.toml
+++ b/scripts/benchmarks/pyproject.toml
@@ -1,77 +0,0 @@
-[tool.poetry]
-name = "scripts"
-version = "0.1.0"
-description = ""
-authors = ["Charles Marsh <charlie.r.marsh@gmail.com>"]
-
-[tool.poetry.dependencies]
-python = ">=3.10,<3.12"
-autoflake = "^2.0.0"
-flake8 = "^6.0.0"
-pycodestyle = "^2.10.0"
-pyflakes = "^3.0.1"
-pylint = "^2.15.10"
-black = "^22.12.0"
-isort = "^5.11.4"
-flake8-2020 = { version = "*", optional = true }
-flake8-annotations = { version = "*", optional = true }
-flake8-bandit = { version = "*", optional = true }
-flake8-blind-except = { version = "*", optional = true }
-# flake8-boolean-trap = { version = "*", optional = true }
-flake8-bugbear = { version = "*", optional = true }
-flake8-builtins = { version = "*", optional = true }
-flake8-commas = { version = "*", optional = true }
-flake8-comprehensions = { version = "*", optional = true }
-flake8-datetimez = { version = "*", optional = true }
-flake8-debugger = { version = "*", optional = true }
-flake8-docstrings = { version = "*", optional = true }
-# flake8-eradicate = { version = "*", optional = true }
-flake8-errmsg = { version = "*", optional = true }
-flake8-implicit-str-concat = { version = "*", optional = true }
-# flake8-import-conventions = { version = "*", optional = true }
-flake8-isort = { version = "*", optional = true }
-flake8-pie = { version = "*", optional = true }
-flake8-print = { version = "*", optional = true }
-flake8-quotes = { version = "*", optional = true }
-flake8-return = { version = "*", optional = true }
-flake8-simplify = { version = "*", optional = true }
-flake8-super = { version = "*", optional = true }
-flake8-tidy-imports = { version = "*", optional = true }
-pandas-vet = { version = "*", optional = true }
-pep8-naming = { version = "*", optional = true }
-
-[tool.poetry.dev-dependencies]
-
-[tool.poetry.extras]
-plugins = [
-  "flake8-2020",
-  "flake8-annotations",
-  "flake8-bandit",
-  "flake8-blind-except",
-  # "flake8-boolean-trap",
-  "flake8-bugbear",
-  "flake8-builtins",
-  "flake8-commas",
-  "flake8-comprehensions",
-  "flake8-datetimez",
-  "flake8-debugger",
-  "flake8-docstrings",
-  # "flake8-eradicate",
-  "flake8-errmsg",
-  "flake8-implicit-str-concat",
-  # "flake8-import-conventions",
-  "flake8-isort",
-  "flake8-pie",
-  "flake8-print",
-  "flake8-quotes",
-  "flake8-return",
-  "flake8-simplify",
-  "flake8-super",
-  "flake8-tidy-imports",
-  "pandas-vet",
-  "pep8-naming",
-]
-
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
--- a/scripts/benchmarks/run.sh
+++ b/scripts/benchmarks/run.sh
@@ -1,8 +0,0 @@
-#!/usr/bin/env sh
-
-###
-# Benchmark Ruff on the CPython codebase.
-###
-
-cargo build --release && hyperfine --ignore-failure --warmup 10 \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache"
--- a/scripts/benchmarks/run_all.sh
+++ b/scripts/benchmarks/run_all.sh
@@ -1,26 +0,0 @@
-#!/usr/bin/env sh
-
-###
-# Benchmark Ruff's performance against a variety of similar tools, suppressing output as much as
-# possible (so as to reduce I/O overhead).
-###
-
-# Note: Flake8's `checker.py` requires the following variant of `mp_run`:
-#   def _mp_run(filename: str) -> tuple[str, Results, dict[str, int]]:
-#       try:
-#           return FileChecker(
-#               filename=filename, plugins=_mp_plugins, options=_mp_options
-#           ).run_checks()
-#       except:
-#           return (filename, [], {
-#               "files": 0,
-#               "logical lines": 0,
-#               "physical lines": 0,
-#               "tokens": 0,
-#           })
-
-hyperfine --ignore-failure --warmup 5 \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --select ALL" \
-  "flake8 resources/test/cpython -qq --docstring-convention=all" \
-  "pycodestyle resources/test/cpython -qq" \
-  "pylint resources/test/cpython -j 0  --recursive=y --disable=E,W,C,R"
--- a/scripts/benchmarks/run_comparisons.sh
+++ b/scripts/benchmarks/run_comparisons.sh
@@ -1,12 +0,0 @@
-#!/usr/bin/env sh
-
-###
-# Benchmark Ruff's performance against a variety of similar tools.
-###
-
-hyperfine --ignore-failure --warmup 5 \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache" \
-  "pyflakes resources/test/cpython" \
-  "autoflake --recursive --expand-star-imports --remove-all-unused-imports --remove-unused-variables --remove-duplicate-keys resources/test/cpython" \
-  "pycodestyle resources/test/cpython" \
-  "flake8 resources/test/cpython"
--- a/scripts/benchmarks/run_plugins.sh
+++ b/scripts/benchmarks/run_plugins.sh
@@ -1,43 +0,0 @@
-#!/usr/bin/env sh
-
-###
-# Benchmark the incremental performance of each subsequent plugin.
-###
-
-cargo build --release && hyperfine --ignore-failure --warmup 10 \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select C90" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select I" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select D" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select UP" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select N" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select YTT" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select ANN" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select S" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select BLE" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select FBT" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select B" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select A" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select C4" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select T10" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select EM" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select ISC" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select ICN" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select T20" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select PT" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select Q" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select RET" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select SIM" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select TID" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select ARG" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select DTZ" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select ERA" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select PD" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select PGH" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select PLC" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select PLE" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select PLR" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select PLW" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select PIE" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select COM" \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent --extend-select RUF"
--- a/scripts/benchmarks/run_silent.sh
+++ b/scripts/benchmarks/run_silent.sh
@@ -1,12 +0,0 @@
-#!/usr/bin/env sh
-
-###
-# Benchmark Ruff's performance against a variety of similar tools, suppressing output as much as
-# possible (so as to reduce I/O overhead).
-###
-
-hyperfine --ignore-failure --warmup 5 \
-  "./target/release/ruff ./resources/test/cpython/ --no-cache --silent" \
-  "pycodestyle resources/test/cpython -qq" \
-  "flake8 resources/test/cpython -qq" \
-  "pylint resources/test/cpython -j 0  --recursive=y --disable=E,W,C,R"
--- a/Show More
+++ b/Show More