Try a bit set

.github/workflows/ci.yaml

@@ -12,7 +12,7 @@ env:
   RUSTUP_MAX_RETRIES: 10
 
 jobs:
-  cargo-build:
+  cargo_build:
     name: "cargo build"
     runs-on: ubuntu-latest
     steps:
@@ -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,13 +33,8 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
       - run: cargo build --all --release
-      - run: ./target/release/ruff_dev generate-all
-      - run: git diff --quiet README.md || echo "::error file=README.md::This file is outdated. Run 'cargo +nightly dev generate-all'."
-      - run: git diff --quiet src/checks_gen.rs || echo "::error file=src/checks_gen.rs::This file is outdated. Run 'cargo +nightly dev generate-all'."
-      - run: git diff --quiet ruff.schema.json || echo "::error file=ruff.schema.json::This file is outdated. Run 'cargo +nightly dev generate-all'."
-      - run: git diff --exit-code -- README.md src/checks_gen.rs ruff.schema.json
 
-  cargo-fmt:
+  cargo_fmt:
     name: "cargo fmt"
     runs-on: ubuntu-latest
     steps:
@@ -78,7 +70,6 @@ jobs:
           toolchain: nightly-2022-11-01
           override: true
           components: clippy
-          target: wasm32-unknown-unknown
       - uses: actions/cache@v3
         env:
           cache-name: cache-cargo
@@ -91,10 +82,9 @@ 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 --target wasm32-unknown-unknown --all-features -- -D warnings -W clippy::pedantic
+      - run: cargo clippy --workspace --all-targets --all-features -- -D warnings
 
-  cargo-test:
+  cargo_test:
     name: "cargo test"
     runs-on: ubuntu-latest
     steps:
@@ -116,51 +106,9 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
             ${{ runner.os }}-
-      - run: pip install black[d]==22.12.0
-      - name: Run tests
-        run: |
-          export INSTA_SNAPSHOT_REFERENCES_FILE="$(mktemp)"
-          cargo test --all
-          USED_SNAPSHOTS=$(cat $INSTA_SNAPSHOT_REFERENCES_FILE | xargs realpath --relative-to $PWD)
-          UNUSED_SNAPSHOTS=$(cat <(git ls-files '*.snap') <(echo "$USED_SNAPSHOTS") | sort | uniq -u)
-          if [ ! -z "$UNUSED_SNAPSHOTS" ]; then
-            echo "Found unused snapshots:"
-            echo "$UNUSED_SNAPSHOTS"
-            exit 1
-          fi
-      - run: cargo test --package ruff --test black_compatibility_test -- --ignored
+      - run: cargo test --all
 
-# TODO(charlie): Re-enable the `wasm-pack` tests.
-# See: https://github.com/charliermarsh/ruff/issues/1425
-#  wasm-pack-test:
-#    name: "wasm-pack test"
-#    runs-on: ubuntu-latest
-#    env:
-#      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
-#      - uses: actions/cache@v3
-#        env:
-#          cache-name: cache-cargo
-#        with:
-#          path: |
-#            ~/.cargo/registry
-#            ~/.cargo/git
-#          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
-#          restore-keys: |
-#            ${{ runner.os }}-build-${{ env.cache-name }}-
-#            ${{ runner.os }}-build-
-#            ${{ runner.os }}-
-#      - uses: jetli/wasm-pack-action@v0.4.0
-#      - uses: jetli/wasm-bindgen-action@v0.2.0
-#      - run: wasm-pack test --node
-
-  maturin-build:
+  maturin_build:
     name: "maturin build"
     runs-on: ubuntu-latest
     steps:
@@ -172,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/playground.yaml

@@ -1,50 +0,0 @@
-name: "[Playground] Release"
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [main]
-
-env:
-  CARGO_INCREMENTAL: 0
-  CARGO_NET_RETRY: 10
-  RUSTUP_MAX_RETRIES: 10
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    env:
-       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
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: "npm"
-          cache-dependency-path: playground/package-lock.json
-      - 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
-      - name: "Install Node dependencies"
-        run: npm ci
-        working-directory: playground
-      - name: "Run TypeScript checks"
-        run: npm run check
-        working-directory: playground
-      - name: "Build JavaScript bundle"
-        run: npm run build
-        working-directory: playground
-      - name: "Deploy to Cloudflare Pages"
-        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        uses: cloudflare/wrangler-action@2.0.0
-        with:
-          apiToken: ${{ secrets.CF_API_TOKEN }}
-          accountId: ${{ secrets.CF_ACCOUNT_ID }}
-          command: pages publish playground/dist --project-name=ruff --branch ${GITHUB_HEAD_REF} --commit-hash ${GITHUB_SHA}

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

.gitignore

@@ -181,4 +181,3 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
-.vimspector.json

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.205
+    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).
 
@@ -59,20 +59,18 @@ pattern implemented therein.
 
 To trigger the rule, you'll likely want to augment the logic in `src/check_ast.rs`, which defines
 the Python AST visitor, responsible for iterating over the abstract syntax tree and collecting
-lint-rule violations as it goes. If you need to inspect the AST, you can run
-`cargo +nightly dev print-ast` with a Python file. Grep for the `Check::new` invocations to
-understand how other, similar rules are implemented.
+lint-rule violations as it goes. If you need to inspect the AST, you can run `cargo dev print-ast`
+with a Python file. Grep for the `Check::new` invocations to understand how other, similar rules
+are implemented.
 
 To add a test fixture, create a file under `resources/test/fixtures`, named to match the `CheckCode`
 you defined earlier (e.g., `E402.py`). This file should contain a variety of violations and
 non-violations designed to evaluate and demonstrate the behavior of your lint rule. Run Ruff locally
-with (e.g.) `cargo run resources/test/fixtures/E402.py --no-cache --select E402`. Once you're satisfied with the
+with (e.g.) `cargo run resources/test/fixtures/E402.py --no-cache`. Once you're satisfied with the
 output, codify the behavior as a snapshot test by adding a new `testcase` macro to the `mod tests`
 section of `src/linter.rs`, like so:
 
 ```rust
-use test_case::test_case;
-
 #[test_case(CheckCode::A001, Path::new("A001.py"); "A001")]
 ...
 ```
@@ -81,7 +79,9 @@ Then, run `cargo test`. Your test will fail, but you'll be prompted to follow-up
 `cargo insta review`. Accept the generated snapshot, then commit the snapshot file alongside the
 rest of your changes.
 
-Finally, regenerate the documentation and generated code with `cargo +nightly dev generate-all`.
+Finally, to update the documentation, run `cargo dev generate-rules-table` from the repo root. To
+update the generated prefix map, run `cargo dev generate-check-code-prefix`. Both of these commands
+should be run whenever a new check is added to the codebase.
 
 ### Example: Adding a new configuration option
 
@@ -105,8 +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`.
 
-Finally, regenerate the documentation and generated code with `cargo +nightly dev generate-all`.
-
 ## Release process
 
 As of now, Ruff has an ad hoc release process: releases are cut with high frequency via GitHub

Cargo.toml

@@ -6,19 +6,11 @@ members = [
 
 [package]
 name = "ruff"
-version = "0.0.205"
-authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
+version = "0.0.128"
 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"
 
 [lib]
 name = "ruff"
-crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 annotate-snippets = { version = "0.9.1", features = ["color"] }
@@ -26,73 +18,53 @@ 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"] }
-clap_complete_command = { version = "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.205", path = "ruff_macros" }
-rustc-hash = { version = "1.1.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "8cb2b8292062adf13bde1b863a9b02c9f0bda3dd" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "8cb2b8292062adf13bde1b863a9b02c9f0bda3dd" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "8cb2b8292062adf13bde1b863a9b02c9f0bda3dd" }
-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" }
-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 = { version = "0.5.9" }
+update-informer = { version = "0.5.0", default-features = false, features = ["pypi"], optional = true }
 walkdir = { version = "2.3.2" }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
-clearscreen = { version = "1.0.10" }
-rayon = { version = "1.5.3" }
-update-informer = { version = "0.5.0", default-features = false, features = ["pypi"], optional = true }
+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
 # For (future) wasm-pack support
 [target.'cfg(all(target_family = "wasm", target_os = "unknown"))'.dependencies]
 getrandom = { version = "0.2.7", features = ["js"] }
-console_error_panic_hook = { version = "0.1.7" }
-console_log = { version = "0.2.0" }
-serde-wasm-bindgen = { version = "0.4" }
-js-sys = { version = "0.3.60" }
-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" }
+insta = { version = "1.19.1", features = ["yaml"] }
+test-case = { version = "2.2.2" }
 
 [features]
 default = ["update-informer"]
@@ -110,11 +82,6 @@ opt-level = 3
 [profile.dev.package.similar]
 opt-level = 3
 
-# Reduce complexity of a parser function that would trigger a locals limit in a wasm tool.
-# https://github.com/bytecodealliance/wasm-tools/blob/b5c3d98e40590512a3b12470ef358d5c7b983b15/crates/wasmparser/src/limits.rs#L29
-[profile.dev.package.rustpython-parser]
-opt-level = 1
-
 [[bench]]
 name = "source_code_locator"
 harness = false

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,131 +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-implicit-str-concat, licensed as follows:
-  """
-    The MIT License (MIT)
-
-    Copyright (c) 2019 Dylan Turner
-
-    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)
@@ -596,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
@@ -641,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.
-  """

Vega/ruff-original.json

@@ -1,130 +0,0 @@
-{
-  "$schema": "https://vega.github.io/schema/vega-lite/v5.json",
-  "data": {
-    "values": [
-      { "tool": "ruff", "time": 0.4693, "timeFormat": "0.46s" },
-      { "tool": "autoflake", "time": 8.027, "timeFormat": "8.03s" },
-      { "tool": "flake8 + spawn", "time": 12.794, "timeFormat": "12.80s" },
-      { "tool": "pylint", "time": 27.211, "timeFormat": "27.21" },
-      { "tool": "pyflakes", "time": 27.309, "timeFormat": "27.31" },
-      { "tool": "pycodestyle", "time": 41.166, "timeFormat": "41.17s" },
-      { "tool": "flake8", "time": 75.7, "timeFormat": "75.70s" }
-    ]
-  },
-  "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" }
-      }
-    }
-  ]
-}

Vega/ruff-rerun.json

@@ -1,131 +0,0 @@
-{
-  "$schema": "https://vega.github.io/schema/vega-lite/v5.json",
-  "data": {
-    "values": [
-      { "tool": "ruff", "time": 0.2979, "timeFormat": "0.30s" },
-      { "tool": "autoflake", "time": 11.562, "timeFormat": "11.57s" },
-      { "tool": "flake8 + spawn", "time": 20.477, "timeFormat": "20.48s" },
-      { "tool": "pylint", "time": 27.211, "timeFormat": "27.21s" },
-      { "tool": "pyflakes", "time": 27.309, "timeFormat": "27.31s" },
-      { "tool": "pycodestyle", "time": 41.166, "timeFormat": "41.17s" },
-      { "tool": "flake8", "time": 75.7, "timeFormat": "75.70s" }
-    ]
-  },
-  "config": {
-    "padding": 16,
-    "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": 180,
-  "width": 360,
-  "layer": [
-    {
-      "mark": "bar",
-      "encoding": {
-        "size": { "value": 16 },
-        "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" }
-      }
-    }
-  ]
-}

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.205"
+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.205"
+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.205-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

@@ -4,30 +4,21 @@ use anyhow::Result;
 use ruff::checks_gen::CheckCodePrefix;
 use ruff::flake8_quotes::settings::Quote;
 use ruff::flake8_tidy_imports::settings::Strictness;
-use ruff::pydocstyle::settings::Convention;
 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, pydocstyle,
+    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() {
@@ -62,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()
                 }),
             )
         });
@@ -84,15 +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 pydocstyle = pydocstyle::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() {
@@ -126,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}"),
                     }
@@ -164,17 +148,17 @@ pub fn convert(
                 // flake8-quotes
                 "quotes" | "inline-quotes" | "inline_quotes" => match value.trim() {
                     "'" | "single" => flake8_quotes.inline_quotes = Some(Quote::Single),
-                    "\"" | "double" => flake8_quotes.inline_quotes = Some(Quote::Double),
+                    "\"" | "double" => flake8_quotes.inline_quotes = Some(Quote::Single),
                     _ => eprintln!("Unexpected '{key}' value: {value}"),
                 },
                 "multiline-quotes" | "multiline_quotes" => match value.trim() {
                     "'" | "single" => flake8_quotes.multiline_quotes = Some(Quote::Single),
-                    "\"" | "double" => flake8_quotes.multiline_quotes = Some(Quote::Double),
+                    "\"" | "double" => flake8_quotes.multiline_quotes = Some(Quote::Single),
                     _ => eprintln!("Unexpected '{key}' value: {value}"),
                 },
                 "docstring-quotes" | "docstring_quotes" => match value.trim() {
                     "'" | "single" => flake8_quotes.docstring_quotes = Some(Quote::Single),
-                    "\"" | "double" => flake8_quotes.docstring_quotes = Some(Quote::Double),
+                    "\"" | "double" => flake8_quotes.docstring_quotes = Some(Quote::Single),
                     _ => eprintln!("Unexpected '{key}' value: {value}"),
                 },
                 "avoid-escape" | "avoid_escape" => match parser::parse_bool(value.as_ref()) {
@@ -197,31 +181,19 @@ 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}"),
                 },
                 // flake8-docstrings
-                "docstring-convention" => match value.trim() {
-                    "google" => pydocstyle.convention = Some(Convention::Google),
-                    "numpy" => pydocstyle.convention = Some(Convention::Numpy),
-                    "pep257" | "all" => pydocstyle.convention = None,
-                    _ => eprintln!("Unexpected '{key}' value: {value}"),
-                },
+                "docstring-convention" => {
+                    // No-op (handled above).
+                }
                 // mccabe
                 "max-complexity" | "max_complexity" => match value.clone().parse::<usize>() {
                     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}"),
             }
@@ -231,43 +203,24 @@ 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);
     }
-    if pydocstyle != pydocstyle::settings::Options::default() {
-        options.pydocstyle = Some(pydocstyle);
-    }
-
-    // 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))
@@ -279,42 +232,27 @@ mod tests {
 
     use anyhow::Result;
     use ruff::checks_gen::CheckCodePrefix;
-    use ruff::pydocstyle::settings::Convention;
+    use ruff::flake8_quotes;
     use ruff::settings::options::Options;
     use ruff::settings::pyproject::Pyproject;
-    use ruff::{flake8_quotes, pydocstyle};
 
     use crate::converter::convert;
     use crate::plugin::Plugin;
 
     #[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,
-            cache_dir: 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,
@@ -324,19 +262,13 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            update_check: 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,
-            pydocstyle: None,
-            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -346,34 +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,
-            cache_dir: 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,
@@ -383,19 +301,13 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            update_check: 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,
-            pydocstyle: None,
-            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -405,34 +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,
-            cache_dir: 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,
@@ -442,19 +340,13 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            update_check: 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,
-            pydocstyle: None,
-            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -464,34 +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,
-            cache_dir: 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,
@@ -501,19 +379,13 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            update_check: 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,
-            pydocstyle: None,
-            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -523,34 +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,
-            cache_dir: 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,
@@ -560,10 +418,8 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            update_check: 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,
@@ -571,13 +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,
-            pydocstyle: None,
-            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -588,36 +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,
-            cache_dir: 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,
@@ -640,7 +478,6 @@ mod tests {
                 CheckCodePrefix::D214,
                 CheckCodePrefix::D215,
                 CheckCodePrefix::D300,
-                CheckCodePrefix::D301,
                 CheckCodePrefix::D400,
                 CheckCodePrefix::D403,
                 CheckCodePrefix::D404,
@@ -663,21 +500,13 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            update_check: 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,
-            pydocstyle: Some(pydocstyle::settings::Options {
-                convention: Some(Convention::Numpy),
-            }),
-            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -687,34 +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,
-            cache_dir: 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,
@@ -725,10 +540,8 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            update_check: 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,
@@ -736,13 +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,
-            pydocstyle: 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,32 +1,23 @@
 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,
-    Flake8Eradicate,
-    Flake8ErrMsg,
-    Flake8ImplicitStrConcat,
+    Flake8TidyImports,
     Flake8Print,
     Flake8Quotes,
-    Flake8Return,
-    Flake8Simplify,
-    Flake8TidyImports,
+    Flake8Annotations,
     McCabe,
+    Flake8BlindExcept,
     PEP8Naming,
-    PandasVet,
     Pyupgrade,
 }
 
@@ -35,103 +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-implicit-str-concat" => Ok(Plugin::Flake8ImplicitStrConcat),
+            "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::Flake8ImplicitStrConcat => "flake8-implicit-str-concat",
-                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::PEP8Naming => "pep8-naming",
-                Plugin::PandasVet => "pandas-vet",
-                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::Flake8ImplicitStrConcat => CheckCodePrefix::ISC,
-            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"] {
@@ -148,18 +85,14 @@ impl Plugin {
                 // Default to PEP8.
                 DocstringConvention::PEP8.select()
             }
-            Plugin::Flake8Eradicate => vec![CheckCodePrefix::ERA],
-            Plugin::Flake8ErrMsg => vec![CheckCodePrefix::EM],
-            Plugin::Flake8ImplicitStrConcat => vec![CheckCodePrefix::ISC],
-            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],
         }
     }
 }
@@ -180,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)),
         }
     }
 }
@@ -217,7 +150,6 @@ impl DocstringConvention {
                 // CheckCodePrefix::D214,
                 // CheckCodePrefix::D215,
                 CheckCodePrefix::D300,
-                CheckCodePrefix::D301,
                 CheckCodePrefix::D400,
                 CheckCodePrefix::D402,
                 CheckCodePrefix::D403,
@@ -265,7 +197,6 @@ impl DocstringConvention {
                 CheckCodePrefix::D214,
                 CheckCodePrefix::D215,
                 CheckCodePrefix::D300,
-                CheckCodePrefix::D301,
                 CheckCodePrefix::D400,
                 // CheckCodePrefix::D402,
                 CheckCodePrefix::D403,
@@ -314,7 +245,6 @@ impl DocstringConvention {
                 CheckCodePrefix::D214,
                 // CheckCodePrefix::D215,
                 CheckCodePrefix::D300,
-                CheckCodePrefix::D301,
                 // CheckCodePrefix::D400,
                 CheckCodePrefix::D402,
                 CheckCodePrefix::D403,
@@ -347,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);
@@ -372,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);
@@ -428,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);
-            }
             _ => {}
         }
     }
@@ -443,25 +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::Flake8ImplicitStrConcat,
+        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| {

playground/.eslintrc

@@ -1,25 +0,0 @@
-{
-  "parser": "@typescript-eslint/parser",
-  "plugins": ["@typescript-eslint", "prettier"],
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:react/recommended",
-    "plugin:react/jsx-runtime",
-    "plugin:react-hooks/recommended",
-    "plugin:import/recommended",
-    "plugin:import/typescript",
-    "plugin:prettier/recommended"
-  ],
-  "rules": {
-    // Disable some recommended rules that we don't want to enforce.
-    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-empty-function": "off"
-  },
-  "settings": {
-    "react": {
-      "version": "detect"
-    }
-  }
-}

playground/.gitignore

@@ -1,130 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-.pnpm-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-*.lcov
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# Snowpack dependency directory (https://snowpack.dev/)
-web_modules/
-
-# TypeScript cache
-*.tsbuildinfo
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional stylelint cache
-.stylelintcache
-
-# Microbundle cache
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variable files
-.env
-.env.development.local
-.env.test.local
-.env.production.local
-.env.local
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-.parcel-cache
-
-# Next.js build output
-.next
-out
-
-# Nuxt.js build / generate output
-.nuxt
-dist
-
-# Gatsby files
-.cache/
-# Comment in the public line in if your project uses Gatsby and not Next.js
-# https://nextjs.org/blog/next-9-1#public-directory-support
-# public
-
-# vuepress build output
-.vuepress/dist
-
-# vuepress v2.x temp and cache directory
-.temp
-.cache
-
-# Docusaurus cache and generated files
-.docusaurus
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/
-
-# TernJS port file
-.tern-port
-
-# Stores VSCode versions used for testing VSCode extensions
-.vscode-test
-
-# yarn v2
-.yarn/cache
-.yarn/unplugged
-.yarn/build-state.yml
-.yarn/install-state.gz
-.pnp.*

playground/.prettierrc.json

@@ -1,3 +0,0 @@
-{
-  "trailingComma": "all"
-}

playground/README.md

@@ -1,14 +0,0 @@
-# playground
-
-In-browser playground for Ruff. Available [https://ruff.pages.dev/](https://ruff.pages.dev/).
-
-## Getting started
-
-- To build the WASM module, run `wasm-pack build --target web --out-dir playground/src/pkg` from the
-  root directory.
-- Install TypeScript dependencies with: `npm install`.
-- Start the development server with: `npm run dev`.
-
-## Implementation
-
-Design based on [Tailwind Play](https://play.tailwindcss.com/). Themed with [`ayu`](https://github.com/dempfi/ayu).

playground/index.html

@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta
-      name="description"
-      content="An in-browser playground for Ruff, an extremely fast Python linter written in Rust."
-    />
-    <meta name="keywords" content="ruff, python, rust, webassembly, wasm" />
-    <title>Ruff Playground</title>
-    <link
-      rel="icon"
-      href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>🛠️</text></svg>"
-    />
-    <link rel="stylesheet" href="https://rsms.me/inter/inter.css" />
-  </head>
-  <body>
-    <div id="root"></div>
-    <div style="display: flex; position: fixed; right: 16px; bottom: 16px">
-      <a href="https://GitHub.com/charliermarsh/ruff"
-        ><img
-          src="https://img.shields.io/github/stars/charliermarsh/ruff.svg?style=social&label=GitHub&maxAge=2592000&?logoWidth=100"
-          alt="GitHub stars"
-          style="width: 120px"
-      /></a>
-    </div>
-    <script type="module" src="/src/main.tsx"></script>
-  </body>
-</html>

playground/package.json

@@ -1,42 +0,0 @@
-{
-  "name": "playground",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "build": "tsc && vite build",
-    "check": "npm run lint && npm run tsc",
-    "dev": "vite",
-    "fmt": "prettier --cache -w .",
-    "lint": "eslint --cache --ext .ts,.tsx src",
-    "preview": "vite preview",
-    "tsc": "tsc"
-  },
-  "dependencies": {
-    "@monaco-editor/react": "^4.4.6",
-    "classnames": "^2.3.2",
-    "lz-string": "^1.4.4",
-    "monaco-editor": "^0.34.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
-  },
-  "devDependencies": {
-    "@types/react": "^18.0.26",
-    "@types/react-dom": "^18.0.9",
-    "@typescript-eslint/eslint-plugin": "^5.47.1",
-    "@typescript-eslint/parser": "^5.47.1",
-    "@vitejs/plugin-react-swc": "^3.0.0",
-    "autoprefixer": "^10.4.13",
-    "eslint": "^8.30.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-react": "^7.31.11",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "postcss": "^8.4.20",
-    "prettier": "^2.8.1",
-    "tailwindcss": "^3.2.4",
-    "typescript": "^4.9.3",
-    "vite": "^4.0.0"
-  }
-}

playground/postcss.config.cjs

@@ -1,6 +0,0 @@
-module.exports = {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-};

playground/src/Editor/Editor.tsx

@@ -1,151 +0,0 @@
-import { useCallback, useEffect, useState } from "react";
-import { DEFAULT_PYTHON_SOURCE } from "../constants";
-import init, { check, Check, currentVersion, defaultSettings } from "../pkg";
-import { ErrorMessage } from "./ErrorMessage";
-import Header from "./Header";
-import { useTheme } from "./theme";
-import { persist, restore, stringify } from "./settings";
-import SettingsEditor from "./SettingsEditor";
-import SourceEditor from "./SourceEditor";
-import MonacoThemes from "./MonacoThemes";
-
-type Tab = "Source" | "Settings";
-
-export default function Editor() {
-  const [initialized, setInitialized] = useState<boolean>(false);
-  const [version, setVersion] = useState<string | null>(null);
-  const [tab, setTab] = useState<Tab>("Source");
-  const [edit, setEdit] = useState<number>(0);
-  const [settingsSource, setSettingsSource] = useState<string | null>(null);
-  const [pythonSource, setPythonSource] = useState<string | null>(null);
-  const [checks, setChecks] = useState<Check[]>([]);
-  const [error, setError] = useState<string | null>(null);
-  const [theme, setTheme] = useTheme();
-
-  useEffect(() => {
-    init().then(() => setInitialized(true));
-  }, []);
-
-  useEffect(() => {
-    if (!initialized || settingsSource == null || pythonSource == null) {
-      return;
-    }
-
-    let config: any;
-    let checks: Check[];
-
-    try {
-      config = JSON.parse(settingsSource);
-    } catch (e) {
-      setChecks([]);
-      setError((e as Error).message);
-      return;
-    }
-
-    try {
-      checks = check(pythonSource, config);
-    } catch (e) {
-      setError(e as string);
-      return;
-    }
-
-    setError(null);
-    setChecks(checks);
-  }, [initialized, settingsSource, pythonSource]);
-
-  useEffect(() => {
-    if (!initialized) {
-      return;
-    }
-
-    if (settingsSource == null || pythonSource == null) {
-      const payload = restore();
-      if (payload) {
-        const [settingsSource, pythonSource] = payload;
-        setSettingsSource(settingsSource);
-        setPythonSource(pythonSource);
-      } else {
-        setSettingsSource(stringify(defaultSettings()));
-        setPythonSource(DEFAULT_PYTHON_SOURCE);
-      }
-    }
-  }, [initialized, settingsSource, pythonSource]);
-
-  useEffect(() => {
-    if (!initialized) {
-      return;
-    }
-
-    setVersion(currentVersion());
-  }, [initialized]);
-
-  const handleShare = useCallback(() => {
-    if (!initialized || settingsSource == null || pythonSource == null) {
-      return;
-    }
-
-    persist(settingsSource, pythonSource);
-  }, [initialized, settingsSource, pythonSource]);
-
-  const handlePythonSourceChange = useCallback((pythonSource: string) => {
-    setEdit((edit) => edit + 1);
-    setPythonSource(pythonSource);
-  }, []);
-
-  const handleSettingsSourceChange = useCallback((settingsSource: string) => {
-    setEdit((edit) => edit + 1);
-    setSettingsSource(settingsSource);
-  }, []);
-
-  return (
-    <main
-      className={
-        "h-full w-full flex flex-auto bg-ayu-background dark:bg-ayu-background-dark"
-      }
-    >
-      <Header
-        edit={edit}
-        tab={tab}
-        theme={theme}
-        version={version}
-        onChangeTab={setTab}
-        onChangeTheme={setTheme}
-        onShare={initialized ? handleShare : undefined}
-      />
-
-      <MonacoThemes />
-
-      <div className={"mt-12 relative flex-auto"}>
-        {initialized && settingsSource != null && pythonSource != null ? (
-          <>
-            <SourceEditor
-              visible={tab === "Source"}
-              source={pythonSource}
-              theme={theme}
-              checks={checks}
-              onChange={handlePythonSourceChange}
-            />
-            <SettingsEditor
-              visible={tab === "Settings"}
-              source={settingsSource}
-              theme={theme}
-              onChange={handleSettingsSourceChange}
-            />
-          </>
-        ) : null}
-      </div>
-      {error && tab === "Source" ? (
-        <div
-          style={{
-            position: "fixed",
-            left: "10%",
-            right: "10%",
-            bottom: "10%",
-          }}
-        >
-          <ErrorMessage>{error}</ErrorMessage>
-        </div>
-      ) : null}
-    </main>
-  );
-}

playground/src/Editor/ErrorMessage.tsx

@@ -1,26 +0,0 @@
-function truncate(str: string, length: number) {
-  if (str.length > length) {
-    return str.slice(0, length) + "...";
-  } else {
-    return str;
-  }
-}
-
-export function ErrorMessage({ children }: { children: string }) {
-  return (
-    <div
-      className="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4"
-      role="alert"
-    >
-      <p className="font-bold">Error</p>
-      <p className="block sm:inline">
-        {truncate(
-          children.startsWith("Error: ")
-            ? children.slice("Error: ".length)
-            : children,
-          120,
-        )}
-      </p>
-    </div>
-  );
-}

playground/src/Editor/Header.tsx

@@ -1,99 +0,0 @@
-import classNames from "classnames";
-import ThemeButton from "./ThemeButton";
-import ShareButton from "./ShareButton";
-import { Theme } from "./theme";
-import VersionTag from "./VersionTag";
-
-export type Tab = "Source" | "Settings";
-
-export default function Header({
-  edit,
-  tab,
-  theme,
-  version,
-  onChangeTab,
-  onChangeTheme,
-  onShare,
-}: {
-  edit: number;
-  tab: Tab;
-  theme: Theme;
-  version: string | null;
-  onChangeTab: (tab: Tab) => void;
-  onChangeTheme: (theme: Theme) => void;
-  onShare?: () => void;
-}) {
-  return (
-    <div
-      className={classNames(
-        "w-full",
-        "flex",
-        "items-center",
-        "justify-between",
-        "flex-none",
-        "pl-5",
-        "sm:pl-6",
-        "pr-4",
-        "lg:pr-6",
-        "absolute",
-        "z-10",
-        "top-0",
-        "left-0",
-        "-mb-px",
-        "antialiased",
-        "border-b",
-        "border-gray-200",
-        "dark:border-gray-800",
-      )}
-    >
-      <div className="flex space-x-5">
-        <button
-          type="button"
-          className={classNames(
-            "relative flex py-3 text-sm leading-6 font-semibold focus:outline-none",
-            tab === "Source"
-              ? "text-ayu-accent"
-              : "text-gray-700 hover:text-gray-900 focus:text-gray-900 dark:text-gray-300 dark:hover:text-white",
-          )}
-          onClick={() => onChangeTab("Source")}
-        >
-          <span
-            className={classNames(
-              "absolute bottom-0 inset-x-0 bg-ayu-accent h-0.5 rounded-full transition-opacity duration-150",
-              tab === "Source" ? "opacity-100" : "opacity-0",
-            )}
-          />
-          Source
-        </button>
-        <button
-          type="button"
-          className={classNames(
-            "relative flex py-3 text-sm leading-6 font-semibold focus:outline-none",
-            tab === "Settings"
-              ? "text-ayu-accent"
-              : "text-gray-700 hover:text-gray-900 focus:text-gray-900 dark:text-gray-300 dark:hover:text-white",
-          )}
-          onClick={() => onChangeTab("Settings")}
-        >
-          <span
-            className={classNames(
-              "absolute bottom-0 inset-x-0 bg-ayu-accent h-0.5 rounded-full transition-opacity duration-150",
-              tab === "Settings" ? "opacity-100" : "opacity-0",
-            )}
-          />
-          Settings
-        </button>
-        {version ? (
-          <div className={"flex items-center"}>
-            <VersionTag>v{version}</VersionTag>
-          </div>
-        ) : null}
-      </div>
-      <div className={"hidden sm:flex items-center min-w-0"}>
-        <ShareButton key={edit} onShare={onShare} />
-        <div className="hidden sm:block mx-6 lg:mx-4 w-px h-6 bg-gray-200 dark:bg-gray-700" />
-        <ThemeButton theme={theme} onChange={onChangeTheme} />
-      </div>
-    </div>
-  );
-}

playground/src/Editor/SettingsEditor.tsx

@@ -1,57 +0,0 @@
-/**
- * Editor for the settings JSON.
- */
-
-import Editor, { useMonaco } from "@monaco-editor/react";
-import { useCallback, useEffect } from "react";
-import schema from "../../../ruff.schema.json";
-import { Theme } from "./theme";
-
-export default function SettingsEditor({
-  visible,
-  source,
-  theme,
-  onChange,
-}: {
-  visible: boolean;
-  source: string;
-  theme: Theme;
-  onChange: (source: string) => void;
-}) {
-  const monaco = useMonaco();
-
-  useEffect(() => {
-    monaco?.languages.json.jsonDefaults.setDiagnosticsOptions({
-      schemas: [
-        {
-          uri: "https://raw.githubusercontent.com/charliermarsh/ruff/main/ruff.schema.json",
-          fileMatch: ["*"],
-          schema,
-        },
-      ],
-    });
-  }, [monaco]);
-
-  const handleChange = useCallback(
-    (value: string | undefined) => {
-      onChange(value ?? "");
-    },
-    [onChange],
-  );
-  return (
-    <Editor
-      options={{
-        readOnly: false,
-        minimap: { enabled: false },
-        fontSize: 14,
-        roundedSelection: false,
-        scrollBeyondLastLine: false,
-      }}
-      wrapperProps={visible ? {} : { style: { display: "none" } }}
-      language={"json"}
-      value={source}
-      theme={theme === "light" ? "Ayu-Light" : "Ayu-Dark"}
-      onChange={handleChange}
-    />
-  );
-}

playground/src/Editor/ShareButton.tsx

@@ -1,53 +0,0 @@
-import { useEffect, useState } from "react";
-
-export default function ShareButton({ onShare }: { onShare?: () => void }) {
-  const [copied, setCopied] = useState(false);
-
-  useEffect(() => {
-    if (copied) {
-      const timeout = setTimeout(() => setCopied(false), 2000);
-      return () => clearTimeout(timeout);
-    }
-  }, [copied]);
-
-  return copied ? (
-    <button
-      type="button"
-      className="relative flex-none rounded-md text-sm font-semibold leading-6 py-1.5 px-3 cursor-auto text-ayu-accent shadow-copied dark:bg-ayu-accent/10"
-    >
-      <span
-        className="absolute inset-0 flex items-center justify-center invisible"
-        aria-hidden="true"
-      >
-        Share
-      </span>
-      <span className="" aria-hidden="false">
-        Copied!
-      </span>
-    </button>
-  ) : (
-    <button
-      type="button"
-      className="relative flex-none rounded-md text-sm font-semibold leading-6 py-1.5 px-3 enabled:hover:bg-ayu-accent/80 bg-ayu-accent text-white shadow-sm dark:shadow-highlight/20 disabled:opacity-50"
-      disabled={!onShare || copied}
-      onClick={
-        onShare
-          ? () => {
-              setCopied(true);
-              onShare();
-            }
-          : undefined
-      }
-    >
-      <span
-        className="absolute inset-0 flex items-center justify-center"
-        aria-hidden="false"
-      >
-        Share
-      </span>
-      <span className="invisible" aria-hidden="true">
-        Copied!
-      </span>
-    </button>
-  );
-}

playground/src/Editor/SourceEditor.tsx

@@ -1,117 +0,0 @@
-/**
- * Editor for the Python source code.
- */
-
-import Editor, { useMonaco } from "@monaco-editor/react";
-import { MarkerSeverity, MarkerTag } from "monaco-editor";
-import { useCallback, useEffect } from "react";
-import { Check } from "../pkg";
-import { Theme } from "./theme";
-
-export default function SourceEditor({
-  visible,
-  source,
-  theme,
-  checks,
-  onChange,
-}: {
-  visible: boolean;
-  source: string;
-  checks: Check[];
-  theme: Theme;
-  onChange: (pythonSource: string) => void;
-}) {
-  const monaco = useMonaco();
-
-  useEffect(() => {
-    const editor = monaco?.editor;
-    const model = editor?.getModels()[0];
-    if (!editor || !model) {
-      return;
-    }
-
-    editor.setModelMarkers(
-      model,
-      "owner",
-      checks.map((check) => ({
-        startLineNumber: check.location.row,
-        startColumn: check.location.column + 1,
-        endLineNumber: check.end_location.row,
-        endColumn: check.end_location.column + 1,
-        message: `${check.code}: ${check.message}`,
-        severity: MarkerSeverity.Error,
-        tags:
-          check.code === "F401" || check.code === "F841"
-            ? [MarkerTag.Unnecessary]
-            : [],
-      })),
-    );
-
-    const codeActionProvider = monaco?.languages.registerCodeActionProvider(
-      "python",
-      {
-        // @ts-expect-error: The type definition is wrong.
-        provideCodeActions: function (model, position) {
-          const actions = checks
-            .filter((check) => position.startLineNumber === check.location.row)
-            .filter((check) => check.fix)
-            .map((check) => ({
-              title: check.fix
-                ? `${check.code}: ${check.fix.message}` ?? `Fix ${check.code}`
-                : "Autofix",
-              id: `fix-${check.code}`,
-              kind: "quickfix",
-              edit: check.fix
-                ? {
-                    edits: [
-                      {
-                        resource: model.uri,
-                        versionId: model.getVersionId(),
-                        edit: {
-                          range: {
-                            startLineNumber: check.fix.location.row,
-                            startColumn: check.fix.location.column + 1,
-                            endLineNumber: check.fix.end_location.row,
-                            endColumn: check.fix.end_location.column + 1,
-                          },
-                          text: check.fix.content,
-                        },
-                      },
-                    ],
-                  }
-                : undefined,
-            }));
-          return { actions, dispose: () => {} };
-        },
-      },
-    );
-
-    return () => {
-      codeActionProvider?.dispose();
-    };
-  }, [checks, monaco]);
-
-  const handleChange = useCallback(
-    (value: string | undefined) => {
-      onChange(value ?? "");
-    },
-    [onChange],
-  );
-
-  return (
-    <Editor
-      options={{
-        readOnly: false,
-        minimap: { enabled: false },
-        fontSize: 14,
-        roundedSelection: false,
-        scrollBeyondLastLine: false,
-      }}
-      language={"python"}
-      wrapperProps={visible ? {} : { style: { display: "none" } }}
-      theme={theme === "light" ? "Ayu-Light" : "Ayu-Dark"}
-      value={source}
-      onChange={handleChange}
-    />
-  );
-}

playground/src/Editor/ThemeButton.tsx

@@ -1,49 +0,0 @@
-/**
- * Button to toggle between light and dark mode themes.
- */
-import { Theme } from "./theme";
-
-export default function ThemeButton({
-  theme,
-  onChange,
-}: {
-  theme: Theme;
-  onChange: (theme: Theme) => void;
-}) {
-  return (
-    <button
-      type="button"
-      className="ml-4 sm:ml-0 ring-1 ring-gray-900/5 shadow-sm hover:bg-gray-50 dark:ring-0 dark:bg-gray-800 dark:hover:bg-gray-700 dark:shadow-highlight/4 group focus:outline-none focus-visible:ring-2 rounded-md focus-visible:ring-ayu-accent dark:focus-visible:ring-2 dark:focus-visible:ring-gray-400"
-      onClick={() => onChange(theme === "light" ? "dark" : "light")}
-    >
-      <span className="sr-only">
-        <span className="dark:hidden">Switch to dark theme</span>
-        <span className="hidden dark:inline">Switch to light theme</span>
-      </span>
-      <svg
-        width="36"
-        height="36"
-        viewBox="-6 -6 36 36"
-        strokeWidth="2"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-        className="stroke-ayu-accent fill-ayu-accent/10 group-hover:stroke-ayu-accent/80 dark:stroke-gray-400 dark:fill-gray-400/20 dark:group-hover:stroke-gray-300"
-      >
-        <g className="dark:opacity-0">
-          <path d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z"></path>
-          <path
-            d="M12 4v.01M17.66 6.345l-.007.007M20.005 12.005h-.01M17.66 17.665l-.007-.007M12 20.01V20M6.34 17.665l.007-.007M3.995 12.005h.01M6.34 6.344l.007.007"
-            fill="none"
-          />
-        </g>
-        <g className="opacity-0 dark:opacity-100">
-          <path d="M16 12a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z" />
-          <path
-            d="M12 3v1M18.66 5.345l-.828.828M21.005 12.005h-1M18.66 18.665l-.828-.828M12 21.01V20M5.34 18.666l.835-.836M2.995 12.005h1.01M5.34 5.344l.835.836"
-            fill="none"
-          />
-        </g>
-      </svg>
-    </button>
-  );
-}

playground/src/Editor/VersionTag.tsx

@@ -1,26 +0,0 @@
-import classNames from "classnames";
-import { ReactNode } from "react";
-
-export default function VersionTag({ children }: { children: ReactNode }) {
-  return (
-    <div
-      className={classNames(
-        "text-gray-500",
-        "text-xs",
-        "leading-5",
-        "font-semibold",
-        "bg-gray-400/10",
-        "rounded-full",
-        "py-1",
-        "px-3",
-        "flex",
-        "items-center",
-        "dark:bg-gray-800",
-        "dark:text-gray-400",
-        "dark:shadow-highlight/4",
-      )}
-    >
-      {children}
-    </div>
-  );
-}

playground/src/Editor/index.tsx

@@ -1,3 +0,0 @@
-import Editor from "./Editor";
-
-export default Editor;

playground/src/Editor/settings.ts

@@ -1,50 +0,0 @@
-import lzstring from "lz-string";
-
-export type Settings = { [K: string]: any };
-
-/**
- * Stringify a settings object to JSON.
- */
-export function stringify(settings: Settings): string {
-  return JSON.stringify(
-    settings,
-    (k, v) => {
-      if (v instanceof Map) {
-        return Object.fromEntries(v.entries());
-      } else {
-        return v;
-      }
-    },
-    2,
-  );
-}
-
-/**
- * Persist the configuration to a URL.
- */
-export async function persist(settingsSource: string, pythonSource: string) {
-  const hash = lzstring.compressToEncodedURIComponent(
-    settingsSource + "$$$" + pythonSource,
-  );
-  await navigator.clipboard.writeText(
-    window.location.href.split("#")[0] + "#" + hash,
-  );
-}
-
-/**
- * Restore the configuration from a URL.
- */
-export function restore(): [string, string] | null {
-  const value = lzstring.decompressFromEncodedURIComponent(
-    window.location.hash.slice(1),
-  );
-
-  if (value) {
-    const parts = value.split("$$$");
-    const settingsSource = parts[0];
-    const pythonSource = parts[1];
-    return [settingsSource, pythonSource];
-  } else {
-    return null;
-  }
-}

playground/src/Editor/theme.ts

@@ -1,35 +0,0 @@
-/**
- * Light and dark mode theming.
- */
-import { useEffect, useState } from "react";
-
-export type Theme = "dark" | "light";
-
-export function useTheme(): [Theme, (theme: Theme) => void] {
-  const [localTheme, setLocalTheme] = useState<Theme>("light");
-
-  const setTheme = (mode: Theme) => {
-    if (mode === "dark") {
-      document.body.classList.add("dark");
-    } else {
-      document.body.classList.remove("dark");
-    }
-    localStorage.setItem("theme", mode);
-    setLocalTheme(mode);
-  };
-
-  useEffect(() => {
-    const initialTheme = localStorage.getItem("theme");
-    if (initialTheme === "dark") {
-      setTheme("dark");
-    } else if (initialTheme === "light") {
-      setTheme("light");
-    } else if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
-      setTheme("dark");
-    } else {
-      setTheme("light");
-    }
-  }, []);
-
-  return [localTheme, setTheme];
-}

playground/src/Editor/utils.ts

@@ -1,7 +0,0 @@
-export async function copyTextToClipboard(text: string) {
-  if ("clipboard" in navigator) {
-    return await navigator.clipboard.writeText(text);
-  } else {
-    return document.execCommand("copy", true, text);
-  }
-}

playground/src/constants.ts

@@ -1,31 +0,0 @@
-export const DEFAULT_PYTHON_SOURCE =
-  "import os\n" +
-  "\n" +
-  "# Define a function that takes an integer n and returns the nth number in the Fibonacci\n" +
-  "# sequence.\n" +
-  "def fibonacci(n):\n" +
-  '    """Compute the nth number in the Fibonacci sequence."""\n' +
-  "    x = 1\n" +
-  "    if n == 0:\n" +
-  "        return 0\n" +
-  "    elif n == 1:\n" +
-  "        return 1\n" +
-  "    else:\n" +
-  "        return fibonacci(n - 1) + fibonacci(n - 2)\n" +
-  "\n" +
-  "\n" +
-  "# Use a for loop to generate and print the first 10 numbers in the Fibonacci sequence.\n" +
-  "for i in range(10):\n" +
-  "    print(fibonacci(i))\n" +
-  "\n" +
-  "# Output:\n" +
-  "# 0\n" +
-  "# 1\n" +
-  "# 1\n" +
-  "# 2\n" +
-  "# 3\n" +
-  "# 5\n" +
-  "# 8\n" +
-  "# 13\n" +
-  "# 21\n" +
-  "# 34\n";

playground/src/index.css

@@ -1,24 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-* {
-  box-sizing: border-box;
-}
-
-body,
-html,
-#root {
-  margin: 0;
-  height: 100%;
-  width: 100%;
-}
-
-.shadow-copied {
-  --tw-shadow: 0 0 0 1px #f07171, inset 0 0 0 1px #f07171;
-  --tw-shadow-colored: 0 0 0 1px var(--tw-shadow-color),
-    inset 0 0 0 1px var(--tw-shadow-color);
-
-  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000),
-    var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
-}

playground/src/main.tsx

@@ -1,10 +0,0 @@
-import React from "react";
-import ReactDOM from "react-dom/client";
-import Editor from "./Editor";
-import "./index.css";
-
-ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
-  <React.StrictMode>
-    <Editor />
-  </React.StrictMode>,
-);

playground/src/third-party.d.ts

@@ -1,6 +0,0 @@
-declare module "lz-string" {
-  function decompressFromEncodedURIComponent(
-    input: string | null,
-  ): string | null;
-  function compressToEncodedURIComponent(input: string | null): string;
-}

playground/src/vite-env.d.ts

@@ -1 +0,0 @@
-/// <reference types="vite/client" />

playground/tailwind.config.cjs

@@ -1,22 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-const defaultTheme = require("tailwindcss/defaultTheme");
-
-module.exports = {
-  darkMode: "class",
-  content: ["./index.html", "./src/**/*.{js,ts,jsx,tsx}"],
-  theme: {
-    extend: {
-      colors: {
-        "ayu-accent": "#f07171",
-        "ayu-background": {
-          DEFAULT: "#f8f9fa",
-          dark: "#0b0e14",
-        },
-      },
-      fontFamily: {
-        sans: ["Inter var", ...defaultTheme.fontFamily.sans],
-      },
-    },
-  },
-  plugins: [],
-};

playground/tsconfig.json

@@ -1,21 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ESNext",
-    "useDefineForClassFields": true,
-    "lib": ["DOM", "DOM.Iterable", "ESNext"],
-    "allowJs": false,
-    "skipLibCheck": true,
-    "esModuleInterop": false,
-    "allowSyntheticDefaultImports": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "module": "ESNext",
-    "moduleResolution": "Node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "jsx": "react-jsx"
-  },
-  "include": ["src"],
-  "references": [{ "path": "./tsconfig.node.json" }]
-}

playground/tsconfig.node.json

@@ -1,9 +0,0 @@
-{
-  "compilerOptions": {
-    "composite": true,
-    "module": "ESNext",
-    "moduleResolution": "Node",
-    "allowSyntheticDefaultImports": true
-  },
-  "include": ["vite.config.ts"]
-}

playground/vite.config.ts

@@ -1,7 +0,0 @@
-import { defineConfig } from "vite";
-import react from "@vitejs/plugin-react-swc";
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [react()],
-});

pyproject.toml

@@ -1,19 +1,5 @@
-[build-system]
-requires = ["maturin>=0.14,<0.15"]
-build-backend = "maturin"
-
 [project]
 name = "ruff"
-version = "0.0.205"
-description = "An extremely fast Python linter, written in Rust."
-authors = [
-  { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" },
-]
-maintainers = [
-  { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" },
-]
-requires-python = ">=3.7"
-license = { file = "LICENSE" }
 keywords = ["automation", "flake8", "pycodestyle", "pyflakes", "pylint", "clippy"]
 classifiers = [
     "Development Status :: 3 - Alpha",
@@ -26,25 +12,27 @@ 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",
 ]
-urls = { repository = "https://github.com/charliermarsh/ruff-lsp" }
+author = "Charlie Marsh"
+author_email = "charlie.r.marsh@gmail.com"
+description = "An extremely fast Python linter, written in Rust."
+requires-python = ">=3.7"
+
+[project.urls]
+repository = "https://github.com/charliermarsh/ruff"
+
+[build-system]
+requires = ["maturin>=0.13,<0.14"]
+build-backend = "maturin"
 
 [tool.maturin]
 bindings = "bin"
+sdist-include = ["Cargo.lock"]
 strip = true
 
-[tool.ruff]
-line-length = 88
-
-[tool.ruff.isort]
-force-wrap-aliases = true
-combine-as-imports = true
-force-single-line = true
-single-line-exclusions = ["os", "logging.handlers"]
-
-[tool.ruff.pydocstyle]
-convention = "google"
+[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