Try a bit set

.github/workflows/ci.yaml

@@ -20,9 +20,6 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2022-11-01
-          override: true
-          components: rustfmt
       - uses: actions/cache@v3
         env:
           cache-name: cache-cargo
@@ -36,15 +33,6 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
       - run: cargo build --all --release
-      - run: ./target/release/ruff_dev generate-rules-table
-      - run: ./target/release/ruff_dev generate-options
-      - run: git diff --quiet README.md || echo "::error file=README.md::This file is outdated. You may have to rerun 'cargo dev generate-options' and/or 'cargo dev generate-rules-table'."
-      - run: ./target/release/ruff_dev generate-check-code-prefix
-      - run: git diff --quiet src/checks_gen.rs || echo "::error file=src/checks_gen.rs::This file is outdated. You may have to rerun 'cargo dev generate-check-code-prefix'."
-      - run: git diff --exit-code -- README.md src/checks_gen.rs
-      - run: ./target/release/ruff_dev generate-json-schema
-      - run: git diff --quiet ruff.schema.json || echo "::error file=ruff.schema.json::This file is outdated. You may have to rerun 'cargo dev generate-json-schema'."
-      - run: git diff --exit-code -- ruff.schema.json
 
   cargo_fmt:
     name: "cargo fmt"
@@ -94,7 +82,7 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
             ${{ runner.os }}-
-      - run: cargo clippy --workspace --all-targets --all-features -- -D warnings -W clippy::pedantic
+      - run: cargo clippy --workspace --all-targets --all-features -- -D warnings
 
   cargo_test:
     name: "cargo test"
@@ -118,9 +106,7 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
             ${{ runner.os }}-
-      - run: pip install black[d]==22.12.0
       - run: cargo test --all
-      - run: cargo test --package ruff --test black_compatibility_test -- --ignored
 
   maturin_build:
     name: "maturin build"
@@ -134,7 +120,7 @@ jobs:
           override: true
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: "3.10"
       - run: pip install maturin
       - uses: actions/cache@v3
         env:

.github/workflows/flake8-to-ruff.yaml

@@ -34,6 +34,7 @@ jobs:
         with:
           target: x86_64
           args: --release --out dist --sdist -m ./${{ env.CRATE_NAME }}/Cargo.toml
+          maturin-version: "v0.13.0"
       - name: Install built wheel - x86_64
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
@@ -60,6 +61,7 @@ jobs:
         uses: messense/maturin-action@v1
         with:
           args: --release --universal2 --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
+          maturin-version: "v0.13.0"
       - name: Install built wheel - universal2
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*universal2.whl --force-reinstall
@@ -91,6 +93,7 @@ jobs:
         with:
           target: ${{ matrix.target }}
           args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
+          maturin-version: "v0.13.0"
       - name: Install built wheel
         shell: bash
         run: |
@@ -118,6 +121,7 @@ jobs:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
+          maturin-version: "v0.13.0"
       - name: Install built wheel
         if: matrix.target == 'x86_64'
         run: |
@@ -144,6 +148,7 @@ jobs:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --no-default-features --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
+          maturin-version: "v0.13.0"
       - uses: uraimo/run-on-arch-action@v2.0.5
         if: matrix.target != 'ppc64'
         name: Install built wheel
@@ -182,6 +187,7 @@ jobs:
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
           args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
+          maturin-version: "v0.13.0"
       - name: Install built wheel
         if: matrix.target == 'x86_64-unknown-linux-musl'
         uses: addnab/docker-run-action@v3
@@ -217,6 +223,7 @@ jobs:
           target: ${{ matrix.platform.target }}
           manylinux: musllinux_1_2
           args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
+          maturin-version: "v0.13.0"
       - uses: uraimo/run-on-arch-action@master
         name: Install built wheel
         with:
@@ -254,6 +261,7 @@ jobs:
       - name: Build wheels
         uses: messense/maturin-action@v1
         with:
+          maturin-version: "v0.13.0"
           target: ${{ matrix.target }}
           manylinux: auto
           args: --release --out dist -i pypy${{ matrix.python-version }} -m ./${{ env.CRATE_NAME }}/Cargo.toml

.github/workflows/ruff.yaml

@@ -1,8 +1,9 @@
 name: "[ruff] Release"
 
 on:
-  release:
-    types: [published]
+  create:
+    tags:
+      - v*
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -35,6 +36,7 @@ jobs:
         with:
           target: x86_64
           args: --release --out dist --sdist
+          maturin-version: "v0.13.0"
       - name: Install built wheel - x86_64
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
@@ -61,6 +63,7 @@ jobs:
         uses: messense/maturin-action@v1
         with:
           args: --release --universal2 --out dist
+          maturin-version: "v0.13.0"
       - name: Install built wheel - universal2
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*universal2.whl --force-reinstall
@@ -92,6 +95,7 @@ jobs:
         with:
           target: ${{ matrix.target }}
           args: --release --out dist
+          maturin-version: "v0.13.0"
       - name: Install built wheel
         shell: bash
         run: |
@@ -119,6 +123,7 @@ jobs:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --release --out dist
+          maturin-version: "v0.13.0"
       - name: Install built wheel
         if: matrix.target == 'x86_64'
         run: |
@@ -145,6 +150,7 @@ jobs:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --no-default-features --release --out dist
+          maturin-version: "v0.13.0"
       - uses: uraimo/run-on-arch-action@v2.0.5
         if: matrix.target != 'ppc64'
         name: Install built wheel
@@ -183,6 +189,7 @@ jobs:
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
           args: --release --out dist
+          maturin-version: "v0.13.0"
       - name: Install built wheel
         if: matrix.target == 'x86_64-unknown-linux-musl'
         uses: addnab/docker-run-action@v3
@@ -218,6 +225,7 @@ jobs:
           target: ${{ matrix.platform.target }}
           manylinux: musllinux_1_2
           args: --release --out dist
+          maturin-version: "v0.13.0"
       - uses: uraimo/run-on-arch-action@master
         name: Install built wheel
         with:
@@ -255,6 +263,7 @@ jobs:
       - name: Build wheels
         uses: messense/maturin-action@v1
         with:
+          maturin-version: "v0.13.0"
           target: ${{ matrix.target }}
           manylinux: auto
           args: --release --out dist -i pypy${{ matrix.python-version }}

.pre-commit-config.yaml

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

BREAKING_CHANGES.md

@@ -1,23 +0,0 @@
-# Breaking Changes
-
-## 0.0.181
-
-### Files excluded by `.gitignore` are now ignored ([#1234](https://github.com/charliermarsh/ruff/pull/1234))
-
-Ruff will now avoid checking files that are excluded by `.ignore`, `.gitignore`,
-`.git/info/exclude`, and global `gitignore` files. This behavior is powered by the [`ignore`](https://docs.rs/ignore/latest/ignore/struct.WalkBuilder.html#ignore-rules)
-crate, and is applied in addition to Ruff's built-in `exclude` system.
-
-To disable this behavior, set `respect-gitignore = false` in your `pyproject.toml` file.
-
-Note that hidden files (i.e., files and directories prefixed with a `.`) are _not_ ignored by
-default.
-
-## 0.0.178
-
-### Configuration files are now resolved hierarchically ([#1190](https://github.com/charliermarsh/ruff/pull/1190))
-
-`pyproject.toml` files are now resolved hierarchically, such that for each Python file, we find
-the first `pyproject.toml` file in its path, and use that to determine its lint settings.
-
-See the [README](https://github.com/charliermarsh/ruff#pyprojecttoml-discovery) for more.

CONTRIBUTING.md

@@ -48,8 +48,8 @@ prior to merging.
 There are four phases to adding a new lint rule:
 
 1. Define the rule in `src/checks.rs`.
-2. Define the _logic_ for triggering the rule in `src/checkers/ast.rs` (for AST-based checks),
-   `src/checkers/tokens.rs` (for token-based checks), or `src/checkers/lines.rs` (for text-based checks).
+2. Define the _logic_ for triggering the rule in `src/check_ast.rs` (for AST-based checks),
+   `src/check_tokens.rs` (for token-based checks), or `src/check_lines.rs` (for text-based checks).
 3. Add a test fixture.
 4. Update the generated files (documentation and generated code).
 
@@ -105,9 +105,6 @@ You may also want to add the new configuration option to the `flake8-to-ruff` to
 responsible for converting `flake8` configuration files to Ruff's TOML format. This logic
 lives in `flake8_to_ruff/src/converter.rs`.
 
-Run `cargo dev generate-options` to update the documentation for supported configuration options,
-and `cargo dev generate-json-schema` to update the JSON schema for `tool.ruff` in `pyproject.toml`.
-
 ## Release process
 
 As of now, Ruff has an ad hoc release process: releases are cut with high frequency via GitHub

Cargo.toml

@@ -6,9 +6,8 @@ members = [
 
 [package]
 name = "ruff"
-version = "0.0.194"
+version = "0.0.128"
 edition = "2021"
-rust-version = "1.65.0"
 
 [lib]
 name = "ruff"
@@ -19,41 +18,31 @@ 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" }
 chrono = { version = "0.4.21", default-features = false, features = ["clock"] }
 clap = { version = "4.0.1", features = ["derive"] }
-clap_complete_command = "0.4.0"
 colored = { version = "2.0.0" }
 common-path = { version = "1.0.0" }
 dirs = { version = "4.0.0" }
 fern = { version = "0.6.1" }
 filetime = { version = "0.2.17" }
+fnv = { version = "1.0.7" }
 glob = { version = "0.3.0" }
-globset = { version = "0.4.9" }
-ignore = { version = "0.4.18" }
 itertools = { version = "0.10.5" }
-libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a8725d161fe8b3ed73a6758b21e177" }
+libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "a13ec97dd4eb925bde4d426c6e422582793b260c" }
 log = { version = "0.4.17" }
-natord = { version = "1.0.9" }
 nohash-hasher = { version = "0.2.0" }
-notify = { version = "5.0.0" }
+notify = { version = "4.0.17" }
 num-bigint = { version = "0.4.3" }
 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" }
 rayon = { version = "1.5.3" }
 regex = { version = "1.6.0" }
 ropey = { version = "1.5.0", features = ["cr_lines", "simd"], default-features = false }
-ruff_macros = { version = "0.0.194", path = "ruff_macros" }
-rustc-hash = { version = "1.1.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "1b6cb170e925a43d605b3fed9f6b878e63e47744" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "1b6cb170e925a43d605b3fed9f6b878e63e47744" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "1b6cb170e925a43d605b3fed9f6b878e63e47744" }
-schemars = { version = "0.8.11" }
-semver = { version = "1.0.16" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "27bf82a2251d7e6ac6cd75e6ad51be12a53d84bb" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "27bf82a2251d7e6ac6cd75e6ad51be12a53d84bb" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "27bf82a2251d7e6ac6cd75e6ad51be12a53d84bb" }
 serde = { version = "1.0.147", features = ["derive"] }
 serde_json = { version = "1.0.87" }
-shellexpand = { version = "3.0.0" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
 textwrap = { version = "0.16.0" }
@@ -63,6 +52,7 @@ update-informer = { version = "0.5.0", default-features = false, features = ["py
 walkdir = { version = "2.3.2" }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
+cacache = { version = "10.0.1" } # uses async-std
 clearscreen = { version = "1.0.10" } # uses which
 
 # https://docs.rs/getrandom/0.2.7/getrandom/#webassembly-support
@@ -75,7 +65,6 @@ assert_cmd = { version = "2.0.4" }
 criterion = { version = "0.4.0" }
 insta = { version = "1.19.1", features = ["yaml"] }
 test-case = { version = "2.2.2" }
-ureq = { version = "2.5.0", features = [] }
 
 [features]
 default = ["update-informer"]

LICENSE

@@ -242,56 +242,6 @@ are:
     SOFTWARE.
   """
 
-- flake8-debugger, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2016 Joseph Kahn
-
-    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.
-  """
-
-- flake8-eradicate, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2018 Nikita Sobolev
-
-    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.
-  """
-
 - flake8-tidy-imports, licensed as follows:
   """
     MIT License
@@ -363,106 +313,6 @@ are:
     THE SOFTWARE.
   """
 
-- flake8-return, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2019 Afonasev Evgeniy
-
-    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.
-  """
-
-- flake8-import-conventions, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2021 João Palmeiro
-
-    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.
-  """
-
-- flake8-unused-arguments, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2019 Nathan Hoad
-
-    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.
-  """
-
-- flake8-simplify, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2020 Martin Thoma
-
-    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.
-  """
-
 - isort, licensed as follows:
   """
     The MIT License (MIT)
@@ -571,29 +421,6 @@ are:
     SOFTWARE.
   """
 
-- pygrep-hooks, licensed as follows:
-  """
-    Copyright (c) 2018 Anthony Sottile
-
-    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.
-  """
-
 - pyupgrade, licensed as follows:
   """
     Copyright (c) 2017 Anthony Sottile
@@ -616,28 +443,3 @@ are:
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
     THE SOFTWARE.
   """
-
-- RustPython, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2020 RustPython Team
-
-    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.
-  """

benches/source_code_locator.rs

@@ -10,7 +10,7 @@ fn criterion_benchmark(c: &mut Criterion) {
         b.iter(|| {
             let rope = Rope::from_str(black_box(&contents));
             rope.line_to_char(black_box(4));
-        });
+        })
     });
 }
 

flake8_to_ruff/Cargo.lock

@@ -771,7 +771,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8_to_ruff"
-version = "0.0.194"
+version = "0.0.128"
 dependencies = [
  "anyhow",
  "clap",
@@ -1265,7 +1265,7 @@ checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
 [[package]]
 name = "libcst"
 version = "0.1.0"
-source = "git+https://github.com/charliermarsh/LibCST?rev=f2f0b7a487a8725d161fe8b3ed73a6758b21e177#f2f0b7a487a8725d161fe8b3ed73a6758b21e177"
+source = "git+https://github.com/charliermarsh/LibCST?rev=a13ec97dd4eb925bde4d426c6e422582793b260c#a13ec97dd4eb925bde4d426c6e422582793b260c"
 dependencies = [
  "chic",
  "itertools",
@@ -1280,7 +1280,7 @@ dependencies = [
 [[package]]
 name = "libcst_derive"
 version = "0.1.0"
-source = "git+https://github.com/charliermarsh/LibCST?rev=f2f0b7a487a8725d161fe8b3ed73a6758b21e177#f2f0b7a487a8725d161fe8b3ed73a6758b21e177"
+source = "git+https://github.com/charliermarsh/LibCST?rev=a13ec97dd4eb925bde4d426c6e422582793b260c#a13ec97dd4eb925bde4d426c6e422582793b260c"
 dependencies = [
  "quote",
  "syn",
@@ -1975,7 +1975,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.194"
+version = "0.0.128"
 dependencies = [
  "anyhow",
  "bincode",
@@ -2028,7 +2028,7 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.1.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
+source = "git+https://github.com/RustPython/RustPython.git?rev=27bf82a2251d7e6ac6cd75e6ad51be12a53d84bb#27bf82a2251d7e6ac6cd75e6ad51be12a53d84bb"
 dependencies = [
  "num-bigint",
  "rustpython-common",
@@ -2038,7 +2038,7 @@ dependencies = [
 [[package]]
 name = "rustpython-common"
 version = "0.0.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
+source = "git+https://github.com/RustPython/RustPython.git?rev=27bf82a2251d7e6ac6cd75e6ad51be12a53d84bb#27bf82a2251d7e6ac6cd75e6ad51be12a53d84bb"
 dependencies = [
  "ascii",
  "cfg-if 1.0.0",
@@ -2061,7 +2061,7 @@ dependencies = [
 [[package]]
 name = "rustpython-compiler-core"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
+source = "git+https://github.com/RustPython/RustPython.git?rev=27bf82a2251d7e6ac6cd75e6ad51be12a53d84bb#27bf82a2251d7e6ac6cd75e6ad51be12a53d84bb"
 dependencies = [
  "bincode",
  "bitflags",
@@ -2078,7 +2078,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
+source = "git+https://github.com/RustPython/RustPython.git?rev=27bf82a2251d7e6ac6cd75e6ad51be12a53d84bb#27bf82a2251d7e6ac6cd75e6ad51be12a53d84bb"
 dependencies = [
  "ahash",
  "anyhow",

flake8_to_ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.194-dev.0"
+version = "0.0.128-dev.0"
 edition = "2021"
 
 [lib]
@@ -10,14 +10,12 @@ name = "flake8_to_ruff"
 anyhow = { version = "1.0.66" }
 clap = { version = "4.0.1", features = ["derive"] }
 configparser = { version = "3.0.2" }
+fnv = { version = "1.0.7" }
 once_cell = { version = "1.16.0" }
 regex = { version = "1.6.0" }
 ruff = { path = "..", default-features = false }
-rustc-hash = { version = "1.1.0" }
 serde = { version = "1.0.147", features = ["derive"] }
 serde_json = { version = "1.0.87" }
-strum = { version = "0.24.1", features = ["strum_macros"] }
-strum_macros = { version = "0.24.3" }
 toml = { version = "0.5.9" }
 
 [dev-dependencies]

flake8_to_ruff/examples/cryptography/pyproject.toml

@@ -1,65 +0,0 @@
-[build-system]
-requires = [
-    # The minimum setuptools version is specific to the PEP 517 backend,
-    # and may be stricter than the version required in `setup.cfg`
-    "setuptools>=40.6.0,!=60.9.0",
-    "wheel",
-    # Must be kept in sync with the `install_requirements` in `setup.cfg`
-    "cffi>=1.12; platform_python_implementation != 'PyPy'",
-    "setuptools-rust>=0.11.4",
-]
-build-backend = "setuptools.build_meta"
-
-[tool.black]
-line-length = 79
-target-version = ["py36"]
-
-[tool.pytest.ini_options]
-addopts = "-r s --capture=no --strict-markers --benchmark-disable"
-markers = [
-    "skip_fips: this test is not executed in FIPS mode",
-    "supported: parametrized test requiring only_if and skip_message",
-]
-
-[tool.mypy]
-show_error_codes = true
-check_untyped_defs = true
-no_implicit_reexport = true
-warn_redundant_casts = true
-warn_unused_ignores = true
-warn_unused_configs = true
-strict_equality = true
-
-[[tool.mypy.overrides]]
-module = [
-    "pretend"
-]
-ignore_missing_imports = true
-
-[tool.coverage.run]
-branch = true
-relative_files = true
-source = [
-    "cryptography",
-    "tests/",
-]
-
-[tool.coverage.paths]
-source = [
-   "src/cryptography",
-   "*.tox/*/lib*/python*/site-packages/cryptography",
-   "*.tox\\*\\Lib\\site-packages\\cryptography",
-   "*.tox/pypy/site-packages/cryptography",
-]
-tests =[
-   "tests/",
-   "*tests\\",
-]
-
-[tool.coverage.report]
-exclude_lines = [
-    "@abc.abstractmethod",
-    "@abc.abstractproperty",
-    "@typing.overload",
-    "if typing.TYPE_CHECKING",
-]

flake8_to_ruff/examples/cryptography/setup.cfg

@@ -1,91 +0,0 @@
-[metadata]
-name = cryptography
-version = attr: cryptography.__version__
-description = cryptography is a package which provides cryptographic recipes and primitives to Python developers.
-long_description = file: README.rst
-long_description_content_type = text/x-rst
-license = BSD-3-Clause OR Apache-2.0
-url = https://github.com/pyca/cryptography
-author = The Python Cryptographic Authority and individual contributors
-author_email = cryptography-dev@python.org
-project_urls =
-    Documentation=https://cryptography.io/
-    Source=https://github.com/pyca/cryptography/
-    Issues=https://github.com/pyca/cryptography/issues
-    Changelog=https://cryptography.io/en/latest/changelog/
-classifiers =
-    Development Status :: 5 - Production/Stable
-    Intended Audience :: Developers
-    License :: OSI Approved :: Apache Software License
-    License :: OSI Approved :: BSD License
-    Natural Language :: English
-    Operating System :: MacOS :: MacOS X
-    Operating System :: POSIX
-    Operating System :: POSIX :: BSD
-    Operating System :: POSIX :: Linux
-    Operating System :: Microsoft :: Windows
-    Programming Language :: Python
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
-    Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11
-    Programming Language :: Python :: Implementation :: CPython
-    Programming Language :: Python :: Implementation :: PyPy
-    Topic :: Security :: Cryptography
-
-[options]
-python_requires = >=3.6
-include_package_data = True
-zip_safe = False
-package_dir =
-    =src
-packages = find:
-# `install_requires` must be kept in sync with `pyproject.toml`
-install_requires =
-    cffi >=1.12
-
-[options.packages.find]
-where = src
-exclude =
-    _cffi_src
-    _cffi_src.*
-
-[options.extras_require]
-test =
-    pytest>=6.2.0
-    pytest-benchmark
-    pytest-cov
-    pytest-subtests
-    pytest-xdist
-    pretend
-    iso8601
-    pytz
-    hypothesis>=1.11.4,!=3.79.2
-docs =
-    sphinx >= 1.6.5,!=1.8.0,!=3.1.0,!=3.1.1,!=5.2.0,!=5.2.0.post0
-    sphinx_rtd_theme
-docstest =
-    pyenchant >= 1.6.11
-    twine >= 1.12.0
-    sphinxcontrib-spelling >= 4.0.1
-sdist =
-    setuptools_rust >= 0.11.4
-pep8test =
-    black
-    flake8
-    flake8-import-order
-    pep8-naming
-# This extra is for OpenSSH private keys that use bcrypt KDF
-# Versions: v3.1.3 - ignore_few_rounds, v3.1.5 - abi3
-ssh =
-    bcrypt >= 3.1.5
-
-[flake8]
-ignore = E203,E211,W503,W504,N818
-exclude = .tox,*.egg,.git,_build,.hypothesis
-select = E,W,F,N,I
-application-import-names = cryptography,cryptography_vectors,tests

flake8_to_ruff/pyproject.toml

@@ -12,7 +12,6 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3 :: Only",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Software Development :: Quality Assurance",
@@ -26,7 +25,7 @@ requires-python = ">=3.7"
 repository = "https://github.com/charliermarsh/ruff#subdirectory=crates/flake8_to_ruff"
 
 [build-system]
-requires = ["maturin>=0.14,<0.15"]
+requires = ["maturin>=0.13,<0.14"]
 build-backend = "maturin"
 
 [tool.maturin]

flake8_to_ruff/src/black.rs

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

flake8_to_ruff/src/converter.rs

@@ -7,26 +7,18 @@ use ruff::flake8_tidy_imports::settings::Strictness;
 use ruff::settings::options::Options;
 use ruff::settings::pyproject::Pyproject;
 use ruff::{
-    flake8_annotations, flake8_bugbear, flake8_errmsg, flake8_quotes, flake8_tidy_imports, mccabe,
-    pep8_naming,
+    flake8_annotations, flake8_bugbear, flake8_quotes, flake8_tidy_imports, mccabe, pep8_naming,
 };
 
-use crate::black::Black;
 use crate::plugin::Plugin;
 use crate::{parser, plugin};
 
 pub fn convert(
-    config: &HashMap<String, HashMap<String, Option<String>>>,
-    black: Option<&Black>,
+    flake8: &HashMap<String, Option<String>>,
     plugins: Option<Vec<Plugin>>,
 ) -> Result<Pyproject> {
-    // Extract the Flake8 section.
-    let flake8 = config
-        .get("flake8")
-        .expect("Unable to find flake8 section in INI file");
-
     // Extract all referenced check code prefixes, to power plugin inference.
-    let mut referenced_codes: BTreeSet<CheckCodePrefix> = BTreeSet::default();
+    let mut referenced_codes: BTreeSet<CheckCodePrefix> = Default::default();
     for (key, value) in flake8 {
         if let Some(value) = value {
             match key.as_str() {
@@ -61,15 +53,10 @@ pub fn convert(
             plugin::resolve_select(
                 flake8,
                 &plugins.unwrap_or_else(|| {
-                    let from_options = plugin::infer_plugins_from_options(flake8);
-                    if !from_options.is_empty() {
-                        eprintln!("Inferred plugins from settings: {from_options:#?}");
-                    }
-                    let from_codes = plugin::infer_plugins_from_codes(&referenced_codes);
-                    if !from_codes.is_empty() {
-                        eprintln!("Inferred plugins from referenced check codes: {from_codes:#?}");
-                    }
-                    from_options.into_iter().chain(from_codes).collect()
+                    plugin::infer_plugins_from_options(flake8)
+                        .into_iter()
+                        .chain(plugin::infer_plugins_from_codes(&referenced_codes))
+                        .collect()
                 }),
             )
         });
@@ -83,14 +70,13 @@ pub fn convert(
         .unwrap_or_default();
 
     // Parse each supported option.
-    let mut options = Options::default();
-    let mut flake8_annotations = flake8_annotations::settings::Options::default();
-    let mut flake8_bugbear = flake8_bugbear::settings::Options::default();
-    let mut flake8_errmsg = flake8_errmsg::settings::Options::default();
-    let mut flake8_quotes = flake8_quotes::settings::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 options: Options = Default::default();
+    let mut flake8_annotations: flake8_annotations::settings::Options = Default::default();
+    let mut flake8_bugbear: flake8_bugbear::settings::Options = Default::default();
+    let mut flake8_quotes: flake8_quotes::settings::Options = Default::default();
+    let mut flake8_tidy_imports: flake8_tidy_imports::settings::Options = Default::default();
+    let mut mccabe: mccabe::settings::Options = Default::default();
+    let mut pep8_naming: pep8_naming::settings::Options = Default::default();
     for (key, value) in flake8 {
         if let Some(value) = value {
             match key.as_str() {
@@ -124,7 +110,7 @@ pub fn convert(
                     match parser::parse_files_to_codes_mapping(value.as_ref()) {
                         Ok(per_file_ignores) => {
                             options.per_file_ignores =
-                                Some(parser::collect_per_file_ignores(per_file_ignores));
+                                Some(parser::collect_per_file_ignores(per_file_ignores))
                         }
                         Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
                     }
@@ -195,7 +181,7 @@ pub fn convert(
                 "ban-relative-imports" | "ban_relative_imports" => match value.trim() {
                     "true" => flake8_tidy_imports.ban_relative_imports = Some(Strictness::All),
                     "parents" => {
-                        flake8_tidy_imports.ban_relative_imports = Some(Strictness::Parents);
+                        flake8_tidy_imports.ban_relative_imports = Some(Strictness::Parents)
                     }
                     _ => eprintln!("Unexpected '{key}' value: {value}"),
                 },
@@ -208,15 +194,6 @@ pub fn convert(
                     Ok(max_complexity) => mccabe.max_complexity = Some(max_complexity),
                     Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
                 },
-                // flake8-errmsg
-                "errmsg-max-string-length" | "errmsg_max_string_length" => {
-                    match value.clone().parse::<usize>() {
-                        Ok(max_string_length) => {
-                            flake8_errmsg.max_string_length = Some(max_string_length);
-                        }
-                        Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
-                    }
-                }
                 // Unknown
                 _ => eprintln!("Skipping unsupported property: {key}"),
             }
@@ -226,41 +203,25 @@ pub fn convert(
     // Deduplicate and sort.
     options.select = Some(Vec::from_iter(select));
     options.ignore = Some(Vec::from_iter(ignore));
-    if flake8_annotations != flake8_annotations::settings::Options::default() {
+    if flake8_annotations != Default::default() {
         options.flake8_annotations = Some(flake8_annotations);
     }
-    if flake8_bugbear != flake8_bugbear::settings::Options::default() {
+    if flake8_bugbear != Default::default() {
         options.flake8_bugbear = Some(flake8_bugbear);
     }
-    if flake8_errmsg != flake8_errmsg::settings::Options::default() {
-        options.flake8_errmsg = Some(flake8_errmsg);
-    }
-    if flake8_quotes != flake8_quotes::settings::Options::default() {
+    if flake8_quotes != Default::default() {
         options.flake8_quotes = Some(flake8_quotes);
     }
-    if flake8_tidy_imports != flake8_tidy_imports::settings::Options::default() {
+    if flake8_tidy_imports != Default::default() {
         options.flake8_tidy_imports = Some(flake8_tidy_imports);
     }
-    if mccabe != mccabe::settings::Options::default() {
+    if mccabe != Default::default() {
         options.mccabe = Some(mccabe);
     }
-    if pep8_naming != pep8_naming::settings::Options::default() {
+    if pep8_naming != Default::default() {
         options.pep8_naming = Some(pep8_naming);
     }
 
-    // Extract any settings from the existing `pyproject.toml`.
-    if let Some(black) = black {
-        if let Some(line_length) = &black.line_length {
-            options.line_length = Some(*line_length);
-        }
-
-        if let Some(target_version) = &black.target_version {
-            if let Some(target_version) = target_version.iter().min() {
-                options.target_version = Some(*target_version);
-            }
-        }
-    }
-
     // Create the pyproject.toml.
     Ok(Pyproject::new(options))
 }
@@ -280,31 +241,18 @@ mod tests {
 
     #[test]
     fn it_converts_empty() -> Result<()> {
-        let actual = convert(
-            &HashMap::from([("flake8".to_string(), HashMap::default())]),
-            None,
-            None,
-        )?;
+        let actual = convert(&HashMap::from([]), None)?;
         let expected = Pyproject::new(Options {
-            allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
-            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
-            external: None,
             fix: None,
-            fix_only: None,
             fixable: None,
-            format: None,
-            force_exclude: None,
             ignore: Some(vec![]),
-            ignore_init_module_imports: None,
             line_length: None,
             per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::E,
                 CheckCodePrefix::F,
@@ -314,18 +262,13 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            cache_dir: None,
             flake8_annotations: None,
             flake8_bugbear: None,
-            flake8_errmsg: None,
             flake8_quotes: None,
             flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
-            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -335,33 +278,20 @@ mod tests {
     #[test]
     fn it_converts_dashes() -> Result<()> {
         let actual = convert(
-            &HashMap::from([(
-                "flake8".to_string(),
-                HashMap::from([("max-line-length".to_string(), Some("100".to_string()))]),
-            )]),
-            None,
+            &HashMap::from([("max-line-length".to_string(), Some("100".to_string()))]),
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
-            allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
-            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
-            external: None,
             fix: None,
-            fix_only: None,
             fixable: None,
-            format: None,
-            force_exclude: None,
             ignore: Some(vec![]),
-            ignore_init_module_imports: None,
             line_length: Some(100),
             per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::E,
                 CheckCodePrefix::F,
@@ -371,18 +301,13 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            cache_dir: None,
             flake8_annotations: None,
             flake8_bugbear: None,
-            flake8_errmsg: None,
             flake8_quotes: None,
             flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
-            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -392,33 +317,20 @@ mod tests {
     #[test]
     fn it_converts_underscores() -> Result<()> {
         let actual = convert(
-            &HashMap::from([(
-                "flake8".to_string(),
-                HashMap::from([("max_line_length".to_string(), Some("100".to_string()))]),
-            )]),
-            None,
+            &HashMap::from([("max_line_length".to_string(), Some("100".to_string()))]),
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
-            allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
-            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
-            external: None,
             fix: None,
-            fix_only: None,
             fixable: None,
-            format: None,
-            force_exclude: None,
             ignore: Some(vec![]),
-            ignore_init_module_imports: None,
             line_length: Some(100),
             per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::E,
                 CheckCodePrefix::F,
@@ -428,18 +340,13 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            cache_dir: None,
             flake8_annotations: None,
             flake8_bugbear: None,
-            flake8_errmsg: None,
             flake8_quotes: None,
             flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
-            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -449,33 +356,20 @@ mod tests {
     #[test]
     fn it_ignores_parse_errors() -> Result<()> {
         let actual = convert(
-            &HashMap::from([(
-                "flake8".to_string(),
-                HashMap::from([("max_line_length".to_string(), Some("abc".to_string()))]),
-            )]),
-            None,
+            &HashMap::from([("max_line_length".to_string(), Some("abc".to_string()))]),
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
-            allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
-            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
-            external: None,
             fix: None,
-            fix_only: None,
             fixable: None,
-            format: None,
-            force_exclude: None,
             ignore: Some(vec![]),
-            ignore_init_module_imports: None,
             line_length: None,
             per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::E,
                 CheckCodePrefix::F,
@@ -485,18 +379,13 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            cache_dir: None,
             flake8_annotations: None,
             flake8_bugbear: None,
-            flake8_errmsg: None,
             flake8_quotes: None,
             flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
-            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -506,33 +395,20 @@ mod tests {
     #[test]
     fn it_converts_plugin_options() -> Result<()> {
         let actual = convert(
-            &HashMap::from([(
-                "flake8".to_string(),
-                HashMap::from([("inline-quotes".to_string(), Some("single".to_string()))]),
-            )]),
-            None,
+            &HashMap::from([("inline-quotes".to_string(), Some("single".to_string()))]),
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
-            allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
-            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
-            external: None,
             fix: None,
-            fix_only: None,
             fixable: None,
-            format: None,
-            force_exclude: None,
             ignore: Some(vec![]),
-            ignore_init_module_imports: None,
             line_length: None,
             per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::E,
                 CheckCodePrefix::F,
@@ -542,10 +418,8 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            cache_dir: None,
             flake8_annotations: None,
             flake8_bugbear: None,
-            flake8_errmsg: None,
             flake8_quotes: Some(flake8_quotes::settings::Options {
                 inline_quotes: Some(flake8_quotes::settings::Quote::Single),
                 multiline_quotes: None,
@@ -553,12 +427,9 @@ mod tests {
                 avoid_escape: None,
             }),
             flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
-            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -569,35 +440,22 @@ mod tests {
     fn it_converts_docstring_conventions() -> Result<()> {
         let actual = convert(
             &HashMap::from([(
-                "flake8".to_string(),
-                HashMap::from([(
-                    "docstring-convention".to_string(),
-                    Some("numpy".to_string()),
-                )]),
+                "docstring-convention".to_string(),
+                Some("numpy".to_string()),
             )]),
-            None,
             Some(vec![Plugin::Flake8Docstrings]),
         )?;
         let expected = Pyproject::new(Options {
-            allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
-            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
-            external: None,
             fix: None,
-            fix_only: None,
             fixable: None,
-            format: None,
-            force_exclude: None,
             ignore: Some(vec![]),
-            ignore_init_module_imports: None,
             line_length: None,
             per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::D100,
                 CheckCodePrefix::D101,
@@ -620,7 +478,6 @@ mod tests {
                 CheckCodePrefix::D214,
                 CheckCodePrefix::D215,
                 CheckCodePrefix::D300,
-                CheckCodePrefix::D301,
                 CheckCodePrefix::D400,
                 CheckCodePrefix::D403,
                 CheckCodePrefix::D404,
@@ -643,18 +500,13 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            cache_dir: None,
             flake8_annotations: None,
             flake8_bugbear: None,
-            flake8_errmsg: None,
             flake8_quotes: None,
             flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
-            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -664,33 +516,20 @@ mod tests {
     #[test]
     fn it_infers_plugins_if_omitted() -> Result<()> {
         let actual = convert(
-            &HashMap::from([(
-                "flake8".to_string(),
-                HashMap::from([("inline-quotes".to_string(), Some("single".to_string()))]),
-            )]),
-            None,
+            &HashMap::from([("inline-quotes".to_string(), Some("single".to_string()))]),
             None,
         )?;
         let expected = Pyproject::new(Options {
-            allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
-            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
-            external: None,
             fix: None,
-            fix_only: None,
             fixable: None,
-            format: None,
-            force_exclude: None,
             ignore: Some(vec![]),
-            ignore_init_module_imports: None,
             line_length: None,
             per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::E,
                 CheckCodePrefix::F,
@@ -701,10 +540,8 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            cache_dir: None,
             flake8_annotations: None,
             flake8_bugbear: None,
-            flake8_errmsg: None,
             flake8_quotes: Some(flake8_quotes::settings::Options {
                 inline_quotes: Some(flake8_quotes::settings::Quote::Single),
                 multiline_quotes: None,
@@ -712,12 +549,9 @@ mod tests {
                 avoid_escape: None,
             }),
             flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
-            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 

flake8_to_ruff/src/lib.rs

@@ -1,17 +1,5 @@
-#![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
-)]
+#![allow(clippy::collapsible_if, clippy::collapsible_else_if)]
 
-pub mod black;
 pub mod converter;
 mod parser;
 pub mod plugin;

flake8_to_ruff/src/main.rs

@@ -1,23 +1,10 @@
 //! Utility to generate Ruff's pyproject.toml section from a Flake8 INI file.
-#![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
-)]
 
 use std::path::PathBuf;
 
 use anyhow::Result;
 use clap::Parser;
 use configparser::ini::Ini;
-use flake8_to_ruff::black::parse_black_options;
 use flake8_to_ruff::converter;
 use flake8_to_ruff::plugin::Plugin;
 
@@ -27,14 +14,10 @@ use flake8_to_ruff::plugin::Plugin;
     long_about = None
 )]
 struct Cli {
-    /// Path to the Flake8 configuration file (e.g., `setup.cfg`, `tox.ini`, or
-    /// `.flake8`).
+    /// Path to the Flake8 configuration file (e.g., 'setup.cfg', 'tox.ini', or
+    /// '.flake8').
     #[arg(required = true)]
     file: PathBuf,
-    /// Optional path to a `pyproject.toml` file, used to ensure compatibility
-    /// with Black.
-    #[arg(long)]
-    pyproject: Option<PathBuf>,
     /// List of plugins to enable.
     #[arg(long, value_delimiter = ',')]
     plugin: Option<Vec<Plugin>>,
@@ -48,15 +31,13 @@ fn main() -> Result<()> {
     ini.set_multiline(true);
     let config = ini.load(cli.file).map_err(|msg| anyhow::anyhow!(msg))?;
 
-    // Read the pyproject.toml file.
-    let black = cli
-        .pyproject
-        .map(parse_black_options)
-        .transpose()?
-        .flatten();
+    // Extract the Flake8 section.
+    let flake8 = config
+        .get("flake8")
+        .expect("Unable to find flake8 section in INI file.");
 
-    // Create Ruff's pyproject.toml section.
-    let pyproject = converter::convert(&config, black.as_ref(), cli.plugin)?;
+    // Create the pyproject.toml.
+    let pyproject = converter::convert(flake8, cli.plugin)?;
     println!("{}", toml::to_string_pretty(&pyproject)?);
 
     Ok(())

flake8_to_ruff/src/parser.rs

@@ -1,12 +1,11 @@
 use std::str::FromStr;
 
-use anyhow::{bail, Result};
+use anyhow::Result;
+use fnv::FnvHashMap;
 use once_cell::sync::Lazy;
 use regex::Regex;
-use ruff::checks::PREFIX_REDIRECTS;
 use ruff::checks_gen::CheckCodePrefix;
 use ruff::settings::types::PatternPrefixPair;
-use rustc_hash::FxHashMap;
 
 static COMMA_SEPARATED_LIST_RE: Lazy<Regex> = Lazy::new(|| Regex::new(r"[,\s]").unwrap());
 
@@ -19,9 +18,7 @@ pub fn parse_prefix_codes(value: &str) -> Vec<CheckCodePrefix> {
         if code.is_empty() {
             continue;
         }
-        if let Some(code) = PREFIX_REDIRECTS.get(code) {
-            codes.push(code.clone());
-        } else if let Ok(code) = CheckCodePrefix::from_str(code) {
+        if let Ok(code) = CheckCodePrefix::from_str(code) {
             codes.push(code);
         } else {
             eprintln!("Unsupported prefix code: {code}");
@@ -34,7 +31,7 @@ pub fn parse_prefix_codes(value: &str) -> Vec<CheckCodePrefix> {
 pub fn parse_strings(value: &str) -> Vec<String> {
     COMMA_SEPARATED_LIST_RE
         .split(value)
-        .map(str::trim)
+        .map(|part| part.trim())
         .filter(|part| !part.is_empty())
         .map(String::from)
         .collect()
@@ -45,7 +42,7 @@ pub fn parse_bool(value: &str) -> Result<bool> {
     match value.trim() {
         "true" => Ok(true),
         "false" => Ok(false),
-        _ => bail!("Unexpected boolean value: {value}"),
+        _ => Err(anyhow::anyhow!("Unexpected boolean value: {value}")),
     }
 }
 
@@ -86,22 +83,16 @@ impl State {
     fn parse(&self) -> Vec<PatternPrefixPair> {
         let mut codes: Vec<PatternPrefixPair> = vec![];
         for code in &self.codes {
-            if let Some(code) = PREFIX_REDIRECTS.get(code.as_str()) {
-                for filename in &self.filenames {
-                    codes.push(PatternPrefixPair {
-                        pattern: filename.clone(),
-                        prefix: code.clone(),
-                    });
+            match CheckCodePrefix::from_str(code) {
+                Ok(code) => {
+                    for filename in &self.filenames {
+                        codes.push(PatternPrefixPair {
+                            pattern: filename.clone(),
+                            prefix: code.clone(),
+                        });
+                    }
                 }
-            } else if let Ok(code) = CheckCodePrefix::from_str(code) {
-                for filename in &self.filenames {
-                    codes.push(PatternPrefixPair {
-                        pattern: filename.clone(),
-                        prefix: code.clone(),
-                    });
-                }
-            } else {
-                eprintln!("Unsupported prefix code: {code}");
+                Err(_) => eprintln!("Skipping unrecognized prefix: {}", code),
             }
         }
         codes
@@ -138,13 +129,14 @@ fn tokenize_files_to_codes_mapping(value: &str) -> Vec<Token> {
     }
     tokens.push(Token {
         token_name: TokenType::Eof,
-        src: String::new(),
+        src: "".to_string(),
     });
     tokens
 }
 
 /// Parse a 'files-to-codes' mapping, mimicking Flake8's internal logic.
-/// See: <https://github.com/PyCQA/flake8/blob/7dfe99616fc2f07c0017df2ba5fa884158f3ea8a/src/flake8/utils.py#L45>
+///
+/// See: https://github.com/PyCQA/flake8/blob/7dfe99616fc2f07c0017df2ba5fa884158f3ea8a/src/flake8/utils.py#L45
 pub fn parse_files_to_codes_mapping(value: &str) -> Result<Vec<PatternPrefixPair>> {
     if value.trim().is_empty() {
         return Ok(vec![]);
@@ -162,7 +154,7 @@ pub fn parse_files_to_codes_mapping(value: &str) -> Result<Vec<PatternPrefixPair
                 state.filenames.push(token.src);
                 state.seen_sep = false;
             } else {
-                bail!("Unexpected token: {:?}", token.token_name);
+                return Err(anyhow::anyhow!("Unexpected token: {:?}", token.token_name));
             }
         } else {
             if matches!(token.token_name, TokenType::Eof) {
@@ -177,7 +169,7 @@ pub fn parse_files_to_codes_mapping(value: &str) -> Result<Vec<PatternPrefixPair
                 state.filenames.push(token.src);
                 state.seen_sep = false;
             } else {
-                bail!("Unexpected token: {:?}", token.token_name);
+                return Err(anyhow::anyhow!("Unexpected token: {:?}", token.token_name));
             }
         }
     }
@@ -187,8 +179,8 @@ pub fn parse_files_to_codes_mapping(value: &str) -> Result<Vec<PatternPrefixPair
 /// Collect a list of `PatternPrefixPair` structs as a `BTreeMap`.
 pub fn collect_per_file_ignores(
     pairs: Vec<PatternPrefixPair>,
-) -> FxHashMap<String, Vec<CheckCodePrefix>> {
-    let mut per_file_ignores: FxHashMap<String, Vec<CheckCodePrefix>> = FxHashMap::default();
+) -> FnvHashMap<String, Vec<CheckCodePrefix>> {
+    let mut per_file_ignores: FnvHashMap<String, Vec<CheckCodePrefix>> = FnvHashMap::default();
     for pair in pairs {
         per_file_ignores
             .entry(pair.pattern)

flake8_to_ruff/src/plugin.rs

@@ -1,30 +1,22 @@
 use std::collections::{BTreeSet, HashMap};
-use std::fmt;
 use std::str::FromStr;
 
 use anyhow::anyhow;
 use ruff::checks_gen::CheckCodePrefix;
 
-#[derive(Clone, Ord, PartialOrd, Eq, PartialEq)]
+#[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq)]
 pub enum Plugin {
-    Flake8Annotations,
     Flake8Bandit,
-    Flake8BlindExcept,
     Flake8Bugbear,
     Flake8Builtins,
     Flake8Comprehensions,
-    Flake8Datetimez,
-    Flake8Debugger,
     Flake8Docstrings,
-    Flake8ErrMsg,
-    Flake8Eradicate,
+    Flake8TidyImports,
     Flake8Print,
     Flake8Quotes,
-    Flake8Return,
-    Flake8Simplify,
-    Flake8TidyImports,
+    Flake8Annotations,
     McCabe,
-    PandasVet,
+    Flake8BlindExcept,
     PEP8Naming,
     Pyupgrade,
 }
@@ -34,100 +26,49 @@ impl FromStr for Plugin {
 
     fn from_str(string: &str) -> Result<Self, Self::Err> {
         match string {
-            "flake8-annotations" => Ok(Plugin::Flake8Annotations),
             "flake8-bandit" => Ok(Plugin::Flake8Bandit),
-            "flake8-blind-except" => Ok(Plugin::Flake8BlindExcept),
             "flake8-bugbear" => Ok(Plugin::Flake8Bugbear),
             "flake8-builtins" => Ok(Plugin::Flake8Builtins),
             "flake8-comprehensions" => Ok(Plugin::Flake8Comprehensions),
-            "flake8-datetimez" => Ok(Plugin::Flake8Datetimez),
-            "flake8-debugger" => Ok(Plugin::Flake8Debugger),
             "flake8-docstrings" => Ok(Plugin::Flake8Docstrings),
-            "flake8-eradicate" => Ok(Plugin::Flake8Eradicate),
-            "flake8-errmsg" => Ok(Plugin::Flake8ErrMsg),
+            "flake8-tidy-imports" => Ok(Plugin::Flake8TidyImports),
             "flake8-print" => Ok(Plugin::Flake8Print),
             "flake8-quotes" => Ok(Plugin::Flake8Quotes),
-            "flake8-return" => Ok(Plugin::Flake8Return),
-            "flake8-simplify" => Ok(Plugin::Flake8Simplify),
-            "flake8-tidy-imports" => Ok(Plugin::Flake8TidyImports),
+            "flake8-annotations" => Ok(Plugin::Flake8Annotations),
+            "flake8-blind-except" => Ok(Plugin::Flake8BlindExcept),
             "mccabe" => Ok(Plugin::McCabe),
-            "pandas-vet" => Ok(Plugin::PandasVet),
             "pep8-naming" => Ok(Plugin::PEP8Naming),
             "pyupgrade" => Ok(Plugin::Pyupgrade),
-            _ => Err(anyhow!("Unknown plugin: {string}")),
+            _ => Err(anyhow!("Unknown plugin: {}", string)),
         }
     }
 }
 
-impl fmt::Debug for Plugin {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "{}",
-            match self {
-                Plugin::Flake8Annotations => "flake8-annotations",
-                Plugin::Flake8Bandit => "flake8-bandit",
-                Plugin::Flake8BlindExcept => "flake8-blind-except",
-                Plugin::Flake8Bugbear => "flake8-bugbear",
-                Plugin::Flake8Builtins => "flake8-builtins",
-                Plugin::Flake8Comprehensions => "flake8-comprehensions",
-                Plugin::Flake8Datetimez => "flake8-datetimez",
-                Plugin::Flake8Debugger => "flake8-debugger",
-                Plugin::Flake8Docstrings => "flake8-docstrings",
-                Plugin::Flake8Eradicate => "flake8-eradicate",
-                Plugin::Flake8ErrMsg => "flake8-errmsg",
-                Plugin::Flake8Print => "flake8-print",
-                Plugin::Flake8Quotes => "flake8-quotes",
-                Plugin::Flake8Return => "flake8-return",
-                Plugin::Flake8Simplify => "flake8-simplify",
-                Plugin::Flake8TidyImports => "flake8-tidy-imports",
-                Plugin::McCabe => "mccabe",
-                Plugin::PandasVet => "pandas-vet",
-                Plugin::PEP8Naming => "pep8-naming",
-                Plugin::Pyupgrade => "pyupgrade",
-            }
-        )
-    }
-}
-
 impl Plugin {
     pub fn default(&self) -> CheckCodePrefix {
         match self {
-            Plugin::Flake8Annotations => CheckCodePrefix::ANN,
             Plugin::Flake8Bandit => CheckCodePrefix::S,
-            // TODO(charlie): Handle rename of `B` to `BLE`.
-            Plugin::Flake8BlindExcept => CheckCodePrefix::BLE,
             Plugin::Flake8Bugbear => CheckCodePrefix::B,
             Plugin::Flake8Builtins => CheckCodePrefix::A,
             Plugin::Flake8Comprehensions => CheckCodePrefix::C4,
-            Plugin::Flake8Datetimez => CheckCodePrefix::DTZ,
-            Plugin::Flake8Debugger => CheckCodePrefix::T1,
             Plugin::Flake8Docstrings => CheckCodePrefix::D,
-            // TODO(charlie): Handle rename of `E` to `ERA`.
-            Plugin::Flake8Eradicate => CheckCodePrefix::ERA,
-            Plugin::Flake8ErrMsg => CheckCodePrefix::EM,
-            Plugin::Flake8Print => CheckCodePrefix::T2,
+            Plugin::Flake8TidyImports => CheckCodePrefix::I25,
+            Plugin::Flake8Print => CheckCodePrefix::T,
             Plugin::Flake8Quotes => CheckCodePrefix::Q,
-            Plugin::Flake8Return => CheckCodePrefix::RET,
-            Plugin::Flake8Simplify => CheckCodePrefix::SIM,
-            Plugin::Flake8TidyImports => CheckCodePrefix::TID25,
+            Plugin::Flake8Annotations => CheckCodePrefix::ANN,
+            Plugin::Flake8BlindExcept => CheckCodePrefix::BLE,
             Plugin::McCabe => CheckCodePrefix::C9,
-            Plugin::PandasVet => CheckCodePrefix::PD,
             Plugin::PEP8Naming => CheckCodePrefix::N,
-            Plugin::Pyupgrade => CheckCodePrefix::UP,
+            Plugin::Pyupgrade => CheckCodePrefix::U,
         }
     }
 
     pub fn select(&self, flake8: &HashMap<String, Option<String>>) -> Vec<CheckCodePrefix> {
         match self {
-            Plugin::Flake8Annotations => vec![CheckCodePrefix::ANN],
             Plugin::Flake8Bandit => vec![CheckCodePrefix::S],
-            Plugin::Flake8BlindExcept => vec![CheckCodePrefix::BLE],
             Plugin::Flake8Bugbear => vec![CheckCodePrefix::B],
             Plugin::Flake8Builtins => vec![CheckCodePrefix::A],
             Plugin::Flake8Comprehensions => vec![CheckCodePrefix::C4],
-            Plugin::Flake8Datetimez => vec![CheckCodePrefix::DTZ],
-            Plugin::Flake8Debugger => vec![CheckCodePrefix::T1],
             Plugin::Flake8Docstrings => {
                 // Use the user-provided docstring.
                 for key in ["docstring-convention", "docstring_convention"] {
@@ -144,17 +85,14 @@ impl Plugin {
                 // Default to PEP8.
                 DocstringConvention::PEP8.select()
             }
-            Plugin::Flake8Eradicate => vec![CheckCodePrefix::ERA],
-            Plugin::Flake8ErrMsg => vec![CheckCodePrefix::EM],
-            Plugin::Flake8Print => vec![CheckCodePrefix::T2],
+            Plugin::Flake8TidyImports => vec![CheckCodePrefix::I25],
+            Plugin::Flake8Print => vec![CheckCodePrefix::T],
             Plugin::Flake8Quotes => vec![CheckCodePrefix::Q],
-            Plugin::Flake8Return => vec![CheckCodePrefix::RET],
-            Plugin::Flake8Simplify => vec![CheckCodePrefix::SIM],
-            Plugin::Flake8TidyImports => vec![CheckCodePrefix::TID],
+            Plugin::Flake8Annotations => vec![CheckCodePrefix::ANN],
+            Plugin::Flake8BlindExcept => vec![CheckCodePrefix::BLE],
             Plugin::McCabe => vec![CheckCodePrefix::C9],
-            Plugin::PandasVet => vec![CheckCodePrefix::PD],
             Plugin::PEP8Naming => vec![CheckCodePrefix::N],
-            Plugin::Pyupgrade => vec![CheckCodePrefix::UP],
+            Plugin::Pyupgrade => vec![CheckCodePrefix::U],
         }
     }
 }
@@ -175,7 +113,7 @@ impl FromStr for DocstringConvention {
             "pep8" => Ok(DocstringConvention::PEP8),
             "numpy" => Ok(DocstringConvention::NumPy),
             "google" => Ok(DocstringConvention::Google),
-            _ => Err(anyhow!("Unknown docstring convention: {string}")),
+            _ => Err(anyhow!("Unknown docstring convention: {}", string)),
         }
     }
 }
@@ -212,7 +150,6 @@ impl DocstringConvention {
                 // CheckCodePrefix::D214,
                 // CheckCodePrefix::D215,
                 CheckCodePrefix::D300,
-                CheckCodePrefix::D301,
                 CheckCodePrefix::D400,
                 CheckCodePrefix::D402,
                 CheckCodePrefix::D403,
@@ -260,7 +197,6 @@ impl DocstringConvention {
                 CheckCodePrefix::D214,
                 CheckCodePrefix::D215,
                 CheckCodePrefix::D300,
-                CheckCodePrefix::D301,
                 CheckCodePrefix::D400,
                 // CheckCodePrefix::D402,
                 CheckCodePrefix::D403,
@@ -309,7 +245,6 @@ impl DocstringConvention {
                 CheckCodePrefix::D214,
                 // CheckCodePrefix::D215,
                 CheckCodePrefix::D300,
-                CheckCodePrefix::D301,
                 // CheckCodePrefix::D400,
                 CheckCodePrefix::D402,
                 CheckCodePrefix::D403,
@@ -342,6 +277,31 @@ pub fn infer_plugins_from_options(flake8: &HashMap<String, Option<String>>) -> V
     let mut plugins = BTreeSet::new();
     for key in flake8.keys() {
         match key.as_str() {
+            // flake8-docstrings
+            "docstring-convention" | "docstring_convention" => {
+                plugins.insert(Plugin::Flake8Docstrings);
+            }
+            // flake8-bugbear
+            "extend-immutable-calls" | "extend_immutable_calls" => {
+                plugins.insert(Plugin::Flake8Bugbear);
+            }
+            // flake8-builtins
+            "builtins-ignorelist" | "builtins_ignorelist" => {
+                plugins.insert(Plugin::Flake8Builtins);
+            }
+            // flake8-quotes
+            "quotes" | "inline-quotes" | "inline_quotes" => {
+                plugins.insert(Plugin::Flake8Quotes);
+            }
+            "multiline-quotes" | "multiline_quotes" => {
+                plugins.insert(Plugin::Flake8Quotes);
+            }
+            "docstring-quotes" | "docstring_quotes" => {
+                plugins.insert(Plugin::Flake8Quotes);
+            }
+            "avoid-escape" | "avoid_escape" => {
+                plugins.insert(Plugin::Flake8Quotes);
+            }
             // flake8-annotations
             "suppress-none-returning" | "suppress_none_returning" => {
                 plugins.insert(Plugin::Flake8Annotations);
@@ -367,41 +327,6 @@ pub fn infer_plugins_from_options(flake8: &HashMap<String, Option<String>>) -> V
             "allow-star-arg-any" | "allow_star_arg_any" => {
                 plugins.insert(Plugin::Flake8Annotations);
             }
-            // flake8-bugbear
-            "extend-immutable-calls" | "extend_immutable_calls" => {
-                plugins.insert(Plugin::Flake8Bugbear);
-            }
-            // flake8-builtins
-            "builtins-ignorelist" | "builtins_ignorelist" => {
-                plugins.insert(Plugin::Flake8Builtins);
-            }
-            // flake8-docstrings
-            "docstring-convention" | "docstring_convention" => {
-                plugins.insert(Plugin::Flake8Docstrings);
-            }
-            // flake8-eradicate
-            "eradicate-aggressive" | "eradicate_aggressive" => {
-                plugins.insert(Plugin::Flake8Eradicate);
-            }
-            "eradicate-whitelist" | "eradicate_whitelist" => {
-                plugins.insert(Plugin::Flake8Eradicate);
-            }
-            "eradicate-whitelist-extend" | "eradicate_whitelist_extend" => {
-                plugins.insert(Plugin::Flake8Eradicate);
-            }
-            // flake8-quotes
-            "quotes" | "inline-quotes" | "inline_quotes" => {
-                plugins.insert(Plugin::Flake8Quotes);
-            }
-            "multiline-quotes" | "multiline_quotes" => {
-                plugins.insert(Plugin::Flake8Quotes);
-            }
-            "docstring-quotes" | "docstring_quotes" => {
-                plugins.insert(Plugin::Flake8Quotes);
-            }
-            "avoid-escape" | "avoid_escape" => {
-                plugins.insert(Plugin::Flake8Quotes);
-            }
             // flake8-tidy-imports
             "ban-relative-imports" | "ban_relative_imports" => {
                 plugins.insert(Plugin::Flake8TidyImports);
@@ -423,9 +348,6 @@ pub fn infer_plugins_from_options(flake8: &HashMap<String, Option<String>>) -> V
             "staticmethod-decorators" | "staticmethod_decorators" => {
                 plugins.insert(Plugin::PEP8Naming);
             }
-            "max-string-length" | "max_string_length" => {
-                plugins.insert(Plugin::Flake8ErrMsg);
-            }
             _ => {}
         }
     }
@@ -438,24 +360,18 @@ pub fn infer_plugins_from_options(flake8: &HashMap<String, Option<String>>) -> V
 /// `flake8-annotations` is active.
 pub fn infer_plugins_from_codes(codes: &BTreeSet<CheckCodePrefix>) -> Vec<Plugin> {
     [
-        Plugin::Flake8Annotations,
         Plugin::Flake8Bandit,
-        Plugin::Flake8BlindExcept,
         Plugin::Flake8Bugbear,
         Plugin::Flake8Builtins,
         Plugin::Flake8Comprehensions,
-        Plugin::Flake8Datetimez,
-        Plugin::Flake8Debugger,
         Plugin::Flake8Docstrings,
-        Plugin::Flake8Eradicate,
-        Plugin::Flake8ErrMsg,
+        Plugin::Flake8TidyImports,
         Plugin::Flake8Print,
         Plugin::Flake8Quotes,
-        Plugin::Flake8Return,
-        Plugin::Flake8Simplify,
-        Plugin::Flake8TidyImports,
-        Plugin::PandasVet,
+        Plugin::Flake8Annotations,
+        Plugin::Flake8BlindExcept,
         Plugin::PEP8Naming,
+        Plugin::Pyupgrade,
     ]
     .into_iter()
     .filter(|plugin| {

pyproject.toml

@@ -12,7 +12,6 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3 :: Only",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Software Development :: Quality Assurance",
@@ -26,15 +25,14 @@ requires-python = ">=3.7"
 repository = "https://github.com/charliermarsh/ruff"
 
 [build-system]
-requires = ["maturin>=0.14,<0.15"]
+requires = ["maturin>=0.13,<0.14"]
 build-backend = "maturin"
 
 [tool.maturin]
 bindings = "bin"
+sdist-include = ["Cargo.lock"]
 strip = true
 
-[tool.ruff]
-
-[tool.ruff.isort]
-force-wrap-aliases = true
-combine-as-imports = true
+[tool.isort]
+profile = "black"
+known_third_party = ["fastapi", "pydantic", "starlette"]

resources/test/fixtures/B006_B008.py

@@ -185,23 +185,3 @@ def nested_b008(a=random.randint(0, dt.datetime.now().year)):
 # Ignore lambda contents since they are evaluated at call time.
 def foo(f=lambda x: print(x)):
     f(1)
-
-
-from collections import abc
-from typing import Annotated, Dict, Optional, Sequence, Union, Set
-
-
-def immutable_annotations(
-    a: Sequence[int] | None = [],
-    b: Optional[abc.Mapping[int, int]] = {},
-    c: Annotated[Union[abc.Set[str], abc.Sized], "annotation"] = set(),
-):
-    pass
-
-
-def mutable_annotations(
-    a: list[int] | None = [],
-    b: Optional[Dict[int, int]] = {},
-    c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
-):
-    pass

resources/test/fixtures/B009_B010.py

@@ -20,8 +20,6 @@ getattr(foo, "_123abc")
 getattr(foo, "abc123")
 getattr(foo, r"abc123")
 _ = lambda x: getattr(x, "bar")
-if getattr(x, "bar"):
-    pass
 
 # Valid setattr usage
 setattr(foo, bar, None)
@@ -30,12 +28,9 @@ setattr(foo, "123abc", None)
 setattr(foo, r"123\abc", None)
 setattr(foo, "except", None)
 _ = lambda x: setattr(x, "bar", 1)
-if setattr(x, "bar", 1):
-    pass
 
 # Invalid usage
 setattr(foo, "bar", None)
 setattr(foo, "_123abc", None)
 setattr(foo, "abc123", None)
 setattr(foo, r"abc123", None)
-setattr(foo.bar, r"baz", None)

resources/test/fixtures/BLE.py

@@ -53,11 +53,3 @@ try:
         raise e
 except Exception:
     pass
-
-
-try:
-    pass
-except Exception as e:
-    raise bad
-except BaseException:
-    pass

resources/test/fixtures/C901.py

@@ -106,33 +106,3 @@ async def foobar(a, b, c):
 # Complexity = 1
 def annotated_assign():
     x: Any = None
-
-
-# Complexity = 9
-class Class:
-    def handle(self, *args, **options):
-        if args:
-            return
-
-        class ServiceProvider:
-            def a(self):
-                pass
-
-            def b(self, data):
-                if not args:
-                    pass
-
-        class Logger:
-            def c(*args, **kwargs):
-                pass
-
-            def error(self, message):
-                pass
-
-            def info(self, message):
-                pass
-
-            def exception(self):
-                pass
-
-        return ServiceProvider(Logger())

resources/test/fixtures/D.py

@@ -3,7 +3,6 @@ from functools import wraps
 import os
 from .expected import Expectation
 from typing import overload
-from typing_extensions import override
 
 
 expectation = Expectation()
@@ -43,13 +42,9 @@ class class_:
            "D418: Function/ Method decorated with @overload"
            " shouldn't contain a docstring")
 
-    @override
-    def overridden_method(a):
-        return str(a)
-
     @property
     def foo(self):
-        """The foo of the thing, which isn't in imperative mood."""
+        """The foo of the thing, which isn't in imperitive mood."""
         return "hello"
 
     @expect('D102: Missing docstring in public method')
@@ -571,11 +566,3 @@ def multiline_trailing_and_leading_space():
     """
 
     pass
-
-
-@expect('D210: No whitespaces allowed surrounding docstring text')
-@expect("D400: First line should end with a period (not '\"')")
-@expect("D415: First line should end with a period, question mark, "
-        "or exclamation point (not '\"')")
-def endswith_quote():
-    """Whitespace at the end, but also a quote" """

resources/test/fixtures/E501.py

@@ -49,14 +49,3 @@ sit amet  consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labor
 sit amet  consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 """,  # noqa: E501
 }
-
-# OK
-# A very long URL: https://loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong.url.com
-
-# OK
-# https://loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong.url.com
-
-# Not OK
-_ = """
-Source: https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533
-"""

resources/test/fixtures/E721.py

@@ -15,7 +15,7 @@ import types
 if type(res) is not types.ListType:
     pass
 #: E721
-assert type(res) == type(False)
+assert type(res) == type(False) or type(res) == type(None)
 #: E721
 assert type(res) == type([])
 #: E721
@@ -52,5 +52,3 @@ if isinstance(res, types.MethodType):
     pass
 if type(a) != type(b) or type(a) == type(ccc):
     pass
-
-assert type(res) == type(None)

resources/test/fixtures/F541.py

@@ -9,4 +9,3 @@ e = (
 )
 
 g = f"ghi{123:{45}}"
-h = "x" "y" f"z"