Use rustup-show instead of actions-rs

.github/CONTRIBUTING.md

@@ -14,10 +14,9 @@ If you're looking for a place to start, we recommend implementing a new lint rul
 pattern-match against the examples in the existing codebase. Many lint rules are inspired by
 existing Python plugins, which can be used as a reference implementation.
 
-As a concrete example: consider taking on one of the rules from the [`tryceratops`](https://github.com/charliermarsh/ruff/issues/2056)
-plugin, and looking to the originating [Python source](https://github.com/guilatrova/tryceratops)
-for guidance. [`flake8-simplify`](https://github.com/charliermarsh/ruff/issues/998) has a few rules
-left too.
+As a concrete example: consider taking on one of the rules in [`flake8-simplify`](https://github.com/charliermarsh/ruff/issues/998),
+and looking to the originating [Python source](https://github.com/MartinThoma/flake8-simplify) for
+guidance.
 
 ### Prerequisites
 
@@ -38,16 +37,13 @@ After cloning the repository, run Ruff locally with:
 cargo run resources/test/fixtures --no-cache
 ```
 
-Prior to opening a pull request, ensure that your code has been auto-formatted,
-and that it passes both the lint and test validation checks.
-
-For rustfmt and Clippy, we use [nightly Rust][nightly], as it is stricter than stable Rust.
-(However, tests and builds use stable Rust.)
+Prior to opening a pull request, ensure that your code has been auto-formatted, and that it passes
+both the lint and test validation checks:
 
 ```shell
 cargo +nightly fmt --all     # Auto-formatting...
-cargo +nightly clippy --fix --workspace --all-targets --all-features -- -W clippy::pedantic  # Linting...
-cargo test --all    # Testing...
+cargo +nightly clippy --all  # Linting...
+cargo +nightly test --all    # Testing...
 ```
 
 These checks will run on GitHub Actions when you open your Pull Request, but running them locally
@@ -58,22 +54,18 @@ prior to merging.
 
 ### Example: Adding a new lint rule
 
-At a high level, the steps involved in adding a new lint rule are as follows:
+There are four phases to adding a new lint rule:
 
-1. Create a file for your rule (e.g., `src/rules/flake8_bugbear/rules/abstract_base_class.rs`).
-2. In that file, define a violation struct. You can grep for `define_violation!` to see examples.
-3. Map the violation struct to a rule code in `src/registry.rs` (e.g., `E402`).
-4. Define the logic for triggering the violation in `src/checkers/ast.rs` (for AST-based checks),
-   `src/checkers/tokens.rs` (for token-based checks), `src/checkers/lines.rs` (for text-based
-   checks), or `src/checkers/filesystem.rs` (for filesystem-based checks).
-5. Add a test fixture.
-6. Update the generated files (documentation and generated code).
+1. Define the violation struct in `src/violations.rs` (e.g., `ModuleImportNotAtTopOfFile`).
+2. Map the violation struct to a rule code in `src/registry.rs` (e.g., `E402`).
+3. Define the logic for triggering the violation in `src/checkers/ast.rs` (for AST-based checks),
+   `src/checkers/tokens.rs` (for token-based checks), or `src/checkers/lines.rs` (for text-based checks).
+4. Add a test fixture.
+5. Update the generated files (documentation and generated code).
 
-To define the violation, start by creating a dedicated file for your rule under the appropriate
-rule linter (e.g., `src/rules/flake8_bugbear/rules/abstract_base_class.rs`). That file should
-contain a struct defined via `define_violation!`, along with a function that creates the violation
-based on any required inputs. (Many of the existing examples live in `src/violations.rs`, but we're
-looking to place new rules in their own files.)
+To define the violation, open up `src/violations.rs`, and define a new struct using the
+`define_violation!` macro. There are plenty of examples in that file, so feel free to pattern-match
+against the existing structs.
 
 To trigger the violation, you'll likely want to augment the logic in `src/checkers/ast.rs`, which
 defines the Python AST visitor, responsible for iterating over the abstract syntax tree and
@@ -82,7 +74,7 @@ collecting diagnostics as it goes.
 If you need to inspect the AST, you can run `cargo +nightly dev print-ast` with a Python file. Grep
 for the `Check::new` invocations to understand how other, similar rules are implemented.
 
-To add a test fixture, create a file under `resources/test/fixtures/[linter]`, named to match
+To add a test fixture, create a file under `resources/test/fixtures/[origin]`, named to match
 the code you defined earlier (e.g., `resources/test/fixtures/pycodestyle/E402.py`). This file should
 contain a variety of violations and non-violations designed to evaluate and demonstrate the behavior
 of your lint rule.
@@ -91,7 +83,7 @@ Run `cargo +nightly dev generate-all` to generate the code for your new fixture.
 locally with (e.g.) `cargo run resources/test/fixtures/pycodestyle/E402.py --no-cache --select E402`.
 
 Once you're satisfied with the output, codify the behavior as a snapshot test by adding a new
-`test_case` macro in the relevant `src/[linter]/mod.rs` file. Then, run `cargo test --all`.
+`test_case` macro in the relevant `src/[origin]/mod.rs` file. Then, run `cargo test --all`.
 Your test will fail, but you'll be prompted to follow-up with `cargo insta review`. Accept the
 generated snapshot, then commit the snapshot file alongside the rest of your changes.
 
@@ -131,5 +123,3 @@ them to [PyPI](https://pypi.org/project/ruff/).
 
 Ruff follows the [semver](https://semver.org/) versioning standard. However, as pre-1.0 software,
 even patch releases may contain [non-backwards-compatible changes](https://semver.org/#spec-item-4).
-
-[nightly]: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust

.github/workflows/ci.yaml

@@ -21,11 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2022-11-01
-          override: true
+      - run: rustup show
       - uses: Swatinem/rust-cache@v1
       - run: cargo build --all
       - run: ./target/debug/ruff_dev generate-all
@@ -38,12 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2022-11-01
-          override: true
-          components: rustfmt
+      - run: rustup show
       - run: cargo fmt --all --check
 
   cargo_clippy:
@@ -51,27 +42,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2022-11-01
-          override: true
-          components: clippy
-          target: wasm32-unknown-unknown
+      - run: rustup show
       - uses: Swatinem/rust-cache@v1
       - run: cargo clippy --workspace --all-targets --all-features -- -D warnings -W clippy::pedantic
-      - run: cargo clippy -p ruff --target wasm32-unknown-unknown --all-features -- -D warnings -W clippy::pedantic
+      - run: cargo clippy --workspace --target wasm32-unknown-unknown --all-features -- -D warnings -W clippy::pedantic
 
   cargo-test:
     name: "cargo test"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: 1.65.0
-          override: true
+      - run: rustup show
       - uses: Swatinem/rust-cache@v1
       - run: cargo install cargo-insta
       - run: pip install black[d]==22.12.0
@@ -79,27 +60,7 @@ jobs:
         run: |
           cargo insta test --all --delete-unreferenced-snapshots
           git diff --exit-code
-      - run: cargo test --package ruff_cli --test black_compatibility_test -- --ignored
-      # Check for broken links in the documentation.
-      # Setting RUSTDOCFLAGS because `cargo doc --check` isn't yet implemented (https://github.com/rust-lang/cargo/issues/10025).
-      - run: RUSTDOCFLAGS="-D warnings" cargo doc --all --no-deps
-
-  scripts:
-    name: "test scripts"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          override: true
-      - uses: Swatinem/rust-cache@v1
-      - run: ./scripts/add_rule.py --name DoTheThing --code PLC999 --linter pylint
-      - run: cargo check
-      - run: |
-         ./scripts/add_plugin.py test --url https://pypi.org/project/-test/0.1.0/ --prefix TST
-         ./scripts/add_rule.py --name FirstRule --code TST001 --linter test
-      - run: cargo check
+      - run: cargo test --package ruff --test black_compatibility_test -- --ignored
 
 # TODO(charlie): Re-enable the `wasm-pack` tests.
 # See: https://github.com/charliermarsh/ruff/issues/1425
@@ -110,11 +71,7 @@ jobs:
 #      WASM_BINDGEN_TEST_TIMEOUT: 60
 #    steps:
 #      - uses: actions/checkout@v3
-#      - uses: actions-rs/toolchain@v1
-#        with:
-#          profile: minimal
-#          toolchain: nightly-2022-11-01
-#          override: true
+#      - run: rustup show
 #      - uses: actions/cache@v3
 #        env:
 #          cache-name: cache-cargo
@@ -136,11 +93,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: 1.65.0
-          override: true
+      - run: rustup show
       - uses: Swatinem/rust-cache@v1
       - uses: actions/setup-python@v4
         with:

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

@@ -24,11 +24,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
+        run: rustup show
       - name: Build wheels - x86_64
         uses: messense/maturin-action@v1
         with:
@@ -51,11 +47,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
+        run: rustup show
       - name: Build wheels - universal2
         uses: messense/maturin-action@v1
         with:
@@ -81,11 +73,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: ${{ matrix.target }}
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
+        run: rustup show
       - name: Build wheels
         uses: messense/maturin-action@v1
         with:

.github/workflows/playground.yaml

@@ -17,12 +17,7 @@ jobs:
        CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2022-11-01
-          override: true
-          target: wasm32-unknown-unknown
+      - run: rustup show
       - uses: actions/setup-node@v3
         with:
           node-version: 18
@@ -31,7 +26,7 @@ jobs:
       - uses: jetli/wasm-pack-action@v0.4.0
       - uses: jetli/wasm-bindgen-action@v0.2.0
       - name: "Run wasm-pack"
-        run: wasm-pack build --target web --out-dir playground/src/pkg . -- -p ruff
+        run: wasm-pack build --target web --out-dir playground/src/pkg
       - name: "Install Node dependencies"
         run: npm ci
         working-directory: playground

.github/workflows/ruff.yaml

@@ -25,11 +25,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
+        run: rustup show
       - name: Build wheels - x86_64
         uses: messense/maturin-action@v1
         with:
@@ -52,11 +48,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
+        run: rustup show
       - name: Build wheels - universal2
         uses: messense/maturin-action@v1
         with:
@@ -82,11 +74,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: ${{ matrix.target }}
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
+        run: rustup show
       - name: Build wheels
         uses: messense/maturin-action@v1
         with:
@@ -293,6 +281,3 @@ jobs:
         run: |
           pip install --upgrade twine
           twine upload --skip-existing *
-      - name: Update pre-commit mirror
-        run: |
-          curl -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ secrets.RUFF_PRE_COMMIT_PAT }}" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/charliermarsh/ruff-pre-commit/dispatches --data '{"event_type": "pypi_release"}'

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.231
+    rev: v0.0.217
     hooks:
       - id: ruff
 
@@ -8,11 +8,3 @@ repos:
     rev: v0.10.1
     hooks:
       - id: validate-pyproject
-
-  - repo: local
-    hooks:
-      - id: cargo-fmt
-        name: cargo fmt
-        entry: cargo fmt --
-        language: rust
-        types: [rust]

BREAKING_CHANGES.md

@@ -1,36 +1,5 @@
 # Breaking Changes
 
-## 0.0.226
-
-### `misplaced-comparison-constant` (`PLC2201`) was deprecated in favor of `SIM300` ([#1980](https://github.com/charliermarsh/ruff/pull/1980))
-
-These two rules contain (nearly) identical logic. To deduplicate the rule set, we've upgraded
-`SIM300` to handle a few more cases, and deprecated `PLC2201` in favor of `SIM300`.
-
-## 0.0.225
-
-### `@functools.cache` rewrites have been moved to a standalone rule (`UP033`) ([#1938](https://github.com/charliermarsh/ruff/pull/1938))
-
-Previously, `UP011` handled both `@functools.lru_cache()`-to-`@functools.lru_cache` conversions,
-_and_ `@functools.lru_cache(maxsize=None)`-to-`@functools.cache` conversions. The latter has been
-moved out to its own rule (`UP033`). As such, some `# noqa: UP011` comments may need to be updated
-to reflect the change in rule code.
-
-## 0.0.222
-
-### `--max-complexity` has been removed from the CLI ([#1877](https://github.com/charliermarsh/ruff/pull/1877))
-
-The McCabe plugin's `--max-complexity` setting has been removed from the CLI, for consistency with
-the treatment of other, similar settings.
-
-To set the maximum complexity, use the `max-complexity` property in your `pyproject.toml` file,
-like so:
-
-```toml
-[tool.ruff.mccabe]
-max-complexity = 10
-```
-
 ## 0.0.181
 
 ### Files excluded by `.gitignore` are now ignored ([#1234](https://github.com/charliermarsh/ruff/pull/1234))

Cargo.lock

@@ -14,7 +14,7 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.8",
  "once_cell",
  "version_check",
 ]
@@ -197,6 +197,12 @@ version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
 
+[[package]]
+name = "cfg-if"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -407,7 +413,7 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "wasm-bindgen",
 ]
 
@@ -433,7 +439,7 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -478,7 +484,7 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "crossbeam-utils",
 ]
 
@@ -488,7 +494,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
@@ -500,7 +506,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
 dependencies = [
  "autocfg",
- "cfg-if",
+ "cfg-if 1.0.0",
  "crossbeam-utils",
  "memoffset",
  "scopeguard",
@@ -512,7 +518,7 @@ version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -586,6 +592,16 @@ dependencies = [
  "dirs-sys",
 ]
 
+[[package]]
+name = "dirs"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
+dependencies = [
+ "cfg-if 0.1.10",
+ "dirs-sys",
+]
+
 [[package]]
 name = "dirs"
 version = "4.0.0"
@@ -601,7 +617,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "dirs-sys-next",
 ]
 
@@ -705,7 +721,7 @@ version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "libc",
  "redox_syscall",
  "windows-sys",
@@ -719,7 +735,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.231"
+version = "0.0.217-dev.0"
 dependencies = [
  "anyhow",
  "clap 4.0.32",
@@ -770,13 +786,24 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "js-sys",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
@@ -899,16 +926,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "imperative"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f92123bf2fe0d9f1b5df1964727b970ca3b2d0203d47cf97fb1f36d856b6398"
-dependencies = [
- "phf 0.11.1",
- "rust-stemmers",
-]
-
 [[package]]
 name = "indexmap"
 version = "1.9.2"
@@ -959,7 +976,7 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -1169,7 +1186,7 @@ version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -1248,7 +1265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694"
 dependencies = [
  "bitflags",
- "cfg-if",
+ "cfg-if 1.0.0",
  "libc",
  "static_assertions",
 ]
@@ -1347,27 +1364,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "num_enum"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9"
-dependencies = [
- "num_enum_derive",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.17.0"
@@ -1402,7 +1398,7 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "libc",
  "redox_syscall",
  "smallvec",
@@ -1476,6 +1472,15 @@ dependencies = [
  "indexmap",
 ]
 
+[[package]]
+name = "phf"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
+dependencies = [
+ "phf_shared 0.8.0",
+]
+
 [[package]]
 name = "phf"
 version = "0.10.1"
@@ -1486,12 +1491,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "phf"
-version = "0.11.1"
+name = "phf_codegen"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
+checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
 dependencies = [
- "phf_shared 0.11.1",
+ "phf_generator 0.8.0",
+ "phf_shared 0.8.0",
 ]
 
 [[package]]
@@ -1505,13 +1511,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "phf_codegen"
-version = "0.11.1"
+name = "phf_generator"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770"
+checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
 dependencies = [
- "phf_generator 0.11.1",
- "phf_shared 0.11.1",
+ "phf_shared 0.8.0",
+ "rand 0.7.3",
 ]
 
 [[package]]
@@ -1521,17 +1527,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
 dependencies = [
  "phf_shared 0.10.0",
- "rand",
+ "rand 0.8.5",
 ]
 
 [[package]]
-name = "phf_generator"
-version = "0.11.1"
+name = "phf_shared"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
+checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
 dependencies = [
- "phf_shared 0.11.1",
- "rand",
+ "siphasher",
 ]
 
 [[package]]
@@ -1543,15 +1548,6 @@ dependencies = [
  "siphasher",
 ]
 
-[[package]]
-name = "phf_shared"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
-dependencies = [
- "siphasher",
-]
-
 [[package]]
 name = "pico-args"
 version = "0.4.2"
@@ -1625,17 +1621,6 @@ dependencies = [
  "termtree",
 ]
 
-[[package]]
-name = "proc-macro-crate"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
-dependencies = [
- "once_cell",
- "thiserror",
- "toml",
-]
-
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -1707,6 +1692,20 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
+ "rand_hc",
+ "rand_pcg",
+]
+
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -1714,8 +1713,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha",
- "rand_core",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.5.1",
 ]
 
 [[package]]
@@ -1725,7 +1734,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
 ]
 
 [[package]]
@@ -1734,7 +1752,25 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.8",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
+dependencies = [
+ "rand_core 0.5.1",
 ]
 
 [[package]]
@@ -1774,7 +1810,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.8",
  "redox_syscall",
  "thiserror",
 ]
@@ -1827,25 +1863,42 @@ dependencies = [
 ]
 
 [[package]]
-name = "ruff"
-version = "0.0.231"
+name = "ropey"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd22239fafefc42138ca5da064f3c17726a80d2379d817a3521240e78dd0064"
 dependencies = [
+ "smallvec",
+ "str_indices",
+]
+
+[[package]]
+name = "ruff"
+version = "0.0.217"
+dependencies = [
+ "annotate-snippets 0.9.1",
  "anyhow",
+ "assert_cmd",
+ "atty",
+ "bincode",
  "bitflags",
- "cfg-if",
+ "cachedir",
+ "cfg-if 1.0.0",
  "chrono",
  "clap 4.0.32",
+ "clap_complete_command",
+ "clearscreen",
  "colored",
  "console_error_panic_hook",
  "console_log",
  "criterion",
- "dirs",
+ "dirs 4.0.0",
  "fern",
- "getrandom",
+ "filetime",
+ "getrandom 0.2.8",
  "glob",
  "globset",
  "ignore",
- "imperative",
  "insta",
  "itertools",
  "js-sys",
@@ -1853,11 +1906,15 @@ dependencies = [
  "log",
  "natord",
  "nohash-hasher",
+ "notify",
  "num-bigint",
  "num-traits",
  "once_cell",
  "path-absolutize",
+ "quick-junit",
+ "rayon",
  "regex",
+ "ropey",
  "ruff_macros",
  "rustc-hash",
  "rustpython-ast",
@@ -1867,59 +1924,25 @@ dependencies = [
  "semver",
  "serde",
  "serde-wasm-bindgen",
+ "serde_json",
  "shellexpand",
- "smallvec",
+ "similar",
  "strum",
  "strum_macros",
  "test-case",
  "textwrap",
- "thiserror",
  "titlecase",
  "toml_edit",
+ "update-informer",
+ "ureq",
+ "walkdir",
  "wasm-bindgen",
  "wasm-bindgen-test",
 ]
 
-[[package]]
-name = "ruff_cli"
-version = "0.0.231"
-dependencies = [
- "annotate-snippets 0.9.1",
- "anyhow",
- "assert_cmd",
- "atty",
- "bincode",
- "cachedir",
- "chrono",
- "clap 4.0.32",
- "clap_complete_command",
- "clearscreen",
- "colored",
- "filetime",
- "glob",
- "ignore",
- "itertools",
- "log",
- "notify",
- "path-absolutize",
- "quick-junit",
- "rayon",
- "regex",
- "ruff",
- "rustc-hash",
- "serde",
- "serde_json",
- "similar",
- "strum",
- "textwrap",
- "update-informer",
- "ureq",
- "walkdir",
-]
-
 [[package]]
 name = "ruff_dev"
-version = "0.0.231"
+version = "0.0.217"
 dependencies = [
  "anyhow",
  "clap 4.0.32",
@@ -1927,7 +1950,6 @@ dependencies = [
  "libcst",
  "once_cell",
  "ruff",
- "ruff_cli",
  "rustpython-ast",
  "rustpython-common",
  "rustpython-parser",
@@ -1940,7 +1962,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_macros"
-version = "0.0.231"
+version = "0.0.217"
 dependencies = [
  "once_cell",
  "proc-macro2",
@@ -1949,16 +1971,6 @@ dependencies = [
  "textwrap",
 ]
 
-[[package]]
-name = "rust-stemmers"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54"
-dependencies = [
- "serde",
- "serde_derive",
-]
-
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
@@ -1993,8 +2005,8 @@ dependencies = [
 
 [[package]]
 name = "rustpython-ast"
-version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=4f38cb68e4a97aeea9eb19673803a0bd5f655383#4f38cb68e4a97aeea9eb19673803a0bd5f655383"
+version = "0.1.0"
+source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
 dependencies = [
  "num-bigint",
  "rustpython-common",
@@ -2003,12 +2015,12 @@ dependencies = [
 
 [[package]]
 name = "rustpython-common"
-version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=4f38cb68e4a97aeea9eb19673803a0bd5f655383#4f38cb68e4a97aeea9eb19673803a0bd5f655383"
+version = "0.0.0"
+source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
 dependencies = [
  "ascii",
  "bitflags",
- "cfg-if",
+ "cfg-if 1.0.0",
  "hexf-parse",
  "itertools",
  "lexical-parse-float",
@@ -2019,7 +2031,7 @@ dependencies = [
  "num-traits",
  "once_cell",
  "radium",
- "rand",
+ "rand 0.8.5",
  "siphasher",
  "unic-ucd-category",
  "volatile",
@@ -2028,8 +2040,8 @@ dependencies = [
 
 [[package]]
 name = "rustpython-compiler-core"
-version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=4f38cb68e4a97aeea9eb19673803a0bd5f655383#4f38cb68e4a97aeea9eb19673803a0bd5f655383"
+version = "0.1.2"
+source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
 dependencies = [
  "bincode",
  "bitflags",
@@ -2038,15 +2050,15 @@ dependencies = [
  "lz4_flex",
  "num-bigint",
  "num-complex",
- "num_enum",
  "serde",
+ "static_assertions",
  "thiserror",
 ]
 
 [[package]]
 name = "rustpython-parser"
-version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=4f38cb68e4a97aeea9eb19673803a0bd5f655383#4f38cb68e4a97aeea9eb19673803a0bd5f655383"
+version = "0.1.2"
+source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
 dependencies = [
  "ahash",
  "anyhow",
@@ -2206,7 +2218,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd1c7ddea665294d484c39fd0c0d2b7e35bbfe10035c5fe1854741a57f6880e1"
 dependencies = [
- "dirs",
+ "dirs 4.0.0",
 ]
 
 [[package]]
@@ -2245,6 +2257,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
+[[package]]
+name = "str_indices"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f026164926842ec52deb1938fae44f83dfdb82d0a5b0270c5bd5935ab74d6dd"
+
 [[package]]
 name = "string_cache"
 version = "0.8.4"
@@ -2303,7 +2321,7 @@ version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "fastrand",
  "libc",
  "redox_syscall",
@@ -2343,15 +2361,15 @@ dependencies = [
 
 [[package]]
 name = "terminfo"
-version = "0.7.5"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da31aef70da0f6352dbcb462683eb4dd2bfad01cf3fc96cf204547b9a839a585"
+checksum = "76971977e6121664ec1b960d1313aacfa75642adc93b9d4d53b247bd4cb1747e"
 dependencies = [
- "dirs",
+ "dirs 2.0.2",
  "fnv",
  "nom",
- "phf 0.11.1",
- "phf_codegen 0.11.1",
+ "phf 0.8.0",
+ "phf_codegen 0.8.0",
 ]
 
 [[package]]
@@ -2375,7 +2393,7 @@ version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e45b7bf6e19353ddd832745c8fcf77a17a93171df7151187f26623f2b75b5b26"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -2478,15 +2496,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "toml"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "toml_datetime"
 version = "0.5.0"
@@ -2515,7 +2524,7 @@ version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "static_assertions",
 ]
 
@@ -2719,6 +2728,12 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
 [[package]]
 name = "wasi"
 version = "0.10.0+wasi-snapshot-preview1"
@@ -2737,7 +2752,7 @@ version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "wasm-bindgen-macro",
 ]
 
@@ -2762,7 +2777,7 @@ version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "js-sys",
  "wasm-bindgen",
  "web-sys",

Cargo.toml

@@ -2,13 +2,11 @@
 members = [
   "flake8_to_ruff",
   "ruff_dev",
-  "ruff_cli",
 ]
-default-members = [".", "ruff_cli"]
 
 [package]
 name = "ruff"
-version = "0.0.231"
+version = "0.0.217"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 edition = "2021"
 rust-version = "1.65.0"
@@ -21,47 +19,60 @@ license = "MIT"
 [lib]
 name = "ruff"
 crate-type = ["cdylib", "rlib"]
-doctest = false
 
 [dependencies]
+annotate-snippets = { version = "0.9.1", features = ["color"] }
 anyhow = { version = "1.0.66" }
+atty = { version = "0.2.14" }
+bincode = { version = "1.3.3" }
 bitflags = { version = "1.3.2" }
+cachedir = { version = "0.3.0" }
 cfg-if = { version = "1.0.0" }
 chrono = { version = "0.4.21", default-features = false, features = ["clock"] }
 clap = { version = "4.0.1", features = ["derive", "env"] }
+clap_complete_command = { version = "0.4.0" }
 colored = { version = "2.0.0" }
 dirs = { version = "4.0.0" }
 fern = { version = "0.6.1" }
+filetime = { version = "0.2.17" }
 glob = { version = "0.3.0" }
 globset = { version = "0.4.9" }
 ignore = { version = "0.4.18" }
-imperative = { version = "1.0.3" }
 itertools = { version = "0.10.5" }
 libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a8725d161fe8b3ed73a6758b21e177" }
 log = { version = "0.4.17" }
 natord = { version = "1.0.9" }
 nohash-hasher = { version = "0.2.0" }
+notify = { version = "5.0.0" }
 num-bigint = { version = "0.4.3" }
 num-traits = "0.2.15"
 once_cell = { version = "1.16.0" }
 path-absolutize = { version = "3.0.14", features = ["once_cell_cache", "use_unix_paths_on_wasm"] }
+quick-junit = { version = "0.3.2" }
 regex = { version = "1.6.0" }
-ruff_macros = { version = "0.0.231", path = "ruff_macros" }
+ropey = { version = "1.5.0", features = ["cr_lines", "simd"], default-features = false }
+ruff_macros = { version = "0.0.217", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
 schemars = { version = "0.8.11" }
 semver = { version = "1.0.16" }
 serde = { version = "1.0.147", features = ["derive"] }
+serde_json = { version = "1.0.87" }
 shellexpand = { version = "3.0.0" }
-smallvec = { version = "1.10.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" }
-thiserror = { version = "1.0" }
 titlecase = { version = "2.2.1" }
 toml_edit = { version = "0.17.1", features = ["easy"] }
+walkdir = { version = "2.3.2" }
+
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
+clearscreen = { version = "2.0.0" }
+rayon = { version = "1.5.3" }
+update-informer = { version = "0.6.0", default-features = false, features = ["pypi"], optional = true }
 
 # https://docs.rs/getrandom/0.2.7/getrandom/#webassembly-support
 # For (future) wasm-pack support
@@ -76,11 +87,17 @@ wasm-bindgen = { version = "0.2.83" }
 [dev-dependencies]
 insta = { version = "1.19.1", features = ["yaml"] }
 test-case = { version = "2.2.2" }
+ureq = { version = "2.5.0", features = [] }
 wasm-bindgen-test = { version = "0.3.33" }
 
 [target.'cfg(not(target_family = "wasm"))'.dev-dependencies]
+assert_cmd = { version = "2.0.4" }
 criterion = { version = "0.4.0" }
 
+[features]
+default = ["update-informer"]
+update-informer = ["dep:update-informer"]
+
 [profile.release]
 panic = "abort"
 lto = "thin"
@@ -97,3 +114,7 @@ opt-level = 3
 # https://github.com/bytecodealliance/wasm-tools/blob/b5c3d98e40590512a3b12470ef358d5c7b983b15/crates/wasmparser/src/limits.rs#L29
 [profile.dev.package.rustpython-parser]
 opt-level = 1
+
+[[bench]]
+name = "source_code_locator"
+harness = false

benches/source_code_locator.rs

@@ -0,0 +1,18 @@
+use std::fs;
+use std::path::Path;
+
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use ropey::Rope;
+
+fn criterion_benchmark(c: &mut Criterion) {
+    let contents = fs::read_to_string(Path::new("resources/test/fixtures/D.py")).unwrap();
+    c.bench_function("rope", |b| {
+        b.iter(|| {
+            let rope = Rope::from_str(black_box(&contents));
+            rope.line_to_char(black_box(4));
+        });
+    });
+}
+
+criterion_group!(benches, criterion_benchmark);
+criterion_main!(benches);

flake8_to_ruff/Cargo.lock

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

flake8_to_ruff/Cargo.toml

@@ -1,8 +1,11 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.231"
+version = "0.0.217-dev.0"
 edition = "2021"
 
+[lib]
+name = "flake8_to_ruff"
+
 [dependencies]
 anyhow = { version = "1.0.66" }
 clap = { version = "4.0.1", features = ["derive"] }

flake8_to_ruff/src/black.rs

@@ -0,0 +1,32 @@
+//! 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_edit::easy::from_str::<Pyproject>(&contents)?
+        .tool
+        .and_then(|tool| tool.black))
+}

flake8_to_ruff/src/converter.rs

@@ -2,28 +2,27 @@ use std::collections::{BTreeSet, HashMap};
 
 use anyhow::Result;
 use colored::Colorize;
-
-use super::external_config::ExternalConfig;
-use super::plugin::Plugin;
-use super::{parser, plugin};
-use crate::registry::RuleSelector;
-use crate::rules::flake8_pytest_style::types::{
+use ruff::flake8_pytest_style::types::{
     ParametrizeNameType, ParametrizeValuesRowType, ParametrizeValuesType,
 };
-use crate::rules::flake8_quotes::settings::Quote;
-use crate::rules::flake8_tidy_imports::relative_imports::Strictness;
-use crate::rules::pydocstyle::settings::Convention;
-use crate::rules::{
-    flake8_annotations, flake8_bugbear, flake8_builtins, flake8_errmsg, flake8_pytest_style,
-    flake8_quotes, flake8_tidy_imports, mccabe, pep8_naming, pydocstyle,
+use ruff::flake8_quotes::settings::Quote;
+use ruff::flake8_tidy_imports::settings::Strictness;
+use ruff::pydocstyle::settings::Convention;
+use ruff::registry::RuleCodePrefix;
+use ruff::settings::options::Options;
+use ruff::settings::pyproject::Pyproject;
+use ruff::{
+    flake8_annotations, flake8_bugbear, flake8_errmsg, flake8_pytest_style, flake8_quotes,
+    flake8_tidy_imports, mccabe, pep8_naming, pydocstyle, warn_user,
 };
-use crate::settings::options::Options;
-use crate::settings::pyproject::Pyproject;
-use crate::warn_user;
+
+use crate::black::Black;
+use crate::plugin::Plugin;
+use crate::{parser, plugin};
 
 pub fn convert(
     config: &HashMap<String, HashMap<String, Option<String>>>,
-    external_config: &ExternalConfig,
+    black: Option<&Black>,
     plugins: Option<Vec<Plugin>>,
 ) -> Result<Pyproject> {
     // Extract the Flake8 section.
@@ -32,7 +31,7 @@ pub fn convert(
         .expect("Unable to find flake8 section in INI file");
 
     // Extract all referenced rule code prefixes, to power plugin inference.
-    let mut referenced_codes: BTreeSet<RuleSelector> = BTreeSet::default();
+    let mut referenced_codes: BTreeSet<RuleCodePrefix> = BTreeSet::default();
     for (key, value) in flake8 {
         if let Some(value) = value {
             match key.as_str() {
@@ -90,11 +89,10 @@ pub fn convert(
     let mut options = Options::default();
     let mut flake8_annotations = flake8_annotations::settings::Options::default();
     let mut flake8_bugbear = flake8_bugbear::settings::Options::default();
-    let mut flake8_builtins = flake8_builtins::settings::Options::default();
     let mut flake8_errmsg = flake8_errmsg::settings::Options::default();
     let mut flake8_pytest_style = flake8_pytest_style::settings::Options::default();
     let mut flake8_quotes = flake8_quotes::settings::Options::default();
-    let mut flake8_tidy_imports = flake8_tidy_imports::options::Options::default();
+    let mut flake8_tidy_imports = flake8_tidy_imports::settings::Options::default();
     let mut mccabe = mccabe::settings::Options::default();
     let mut pep8_naming = pep8_naming::settings::Options::default();
     let mut pydocstyle = pydocstyle::settings::Options::default();
@@ -105,7 +103,7 @@ pub fn convert(
                 "builtins" => {
                     options.builtins = Some(parser::parse_strings(value.as_ref()));
                 }
-                "max-line-length" | "max_line_length" => match value.parse::<usize>() {
+                "max-line-length" | "max_line_length" => match value.clone().parse::<usize>() {
                     Ok(line_length) => options.line_length = Some(line_length),
                     Err(e) => {
                         warn_user!("Unable to parse '{key}' property: {e}");
@@ -148,11 +146,6 @@ pub fn convert(
                     flake8_bugbear.extend_immutable_calls =
                         Some(parser::parse_strings(value.as_ref()));
                 }
-                // flake8-builtins
-                "builtins-ignorelist" | "builtins_ignorelist" => {
-                    flake8_builtins.builtins_ignorelist =
-                        Some(parser::parse_strings(value.as_ref()));
-                }
                 // flake8-annotations
                 "suppress-none-returning" | "suppress_none_returning" => {
                     match parser::parse_bool(value.as_ref()) {
@@ -247,7 +240,7 @@ pub fn convert(
                     }
                 },
                 // mccabe
-                "max-complexity" | "max_complexity" => match value.parse::<usize>() {
+                "max-complexity" | "max_complexity" => match value.clone().parse::<usize>() {
                     Ok(max_complexity) => mccabe.max_complexity = Some(max_complexity),
                     Err(e) => {
                         warn_user!("Unable to parse '{key}' property: {e}");
@@ -255,7 +248,7 @@ pub fn convert(
                 },
                 // flake8-errmsg
                 "errmsg-max-string-length" | "errmsg_max_string_length" => {
-                    match value.parse::<usize>() {
+                    match value.clone().parse::<usize>() {
                         Ok(max_string_length) => {
                             flake8_errmsg.max_string_length = Some(max_string_length);
                         }
@@ -277,7 +270,7 @@ pub fn convert(
                     match value.trim() {
                         "csv" => {
                             flake8_pytest_style.parametrize_names_type =
-                                Some(ParametrizeNameType::Csv);
+                                Some(ParametrizeNameType::CSV);
                         }
                         "tuple" => {
                             flake8_pytest_style.parametrize_names_type =
@@ -351,9 +344,6 @@ pub fn convert(
     if flake8_bugbear != flake8_bugbear::settings::Options::default() {
         options.flake8_bugbear = Some(flake8_bugbear);
     }
-    if flake8_builtins != flake8_builtins::settings::Options::default() {
-        options.flake8_builtins = Some(flake8_builtins);
-    }
     if flake8_errmsg != flake8_errmsg::settings::Options::default() {
         options.flake8_errmsg = Some(flake8_errmsg);
     }
@@ -363,7 +353,7 @@ pub fn convert(
     if flake8_quotes != flake8_quotes::settings::Options::default() {
         options.flake8_quotes = Some(flake8_quotes);
     }
-    if flake8_tidy_imports != flake8_tidy_imports::options::Options::default() {
+    if flake8_tidy_imports != flake8_tidy_imports::settings::Options::default() {
         options.flake8_tidy_imports = Some(flake8_tidy_imports);
     }
     if mccabe != mccabe::settings::Options::default() {
@@ -377,7 +367,7 @@ pub fn convert(
     }
 
     // Extract any settings from the existing `pyproject.toml`.
-    if let Some(black) = &external_config.black {
+    if let Some(black) = black {
         if let Some(line_length) = &black.line_length {
             options.line_length = Some(*line_length);
         }
@@ -389,19 +379,6 @@ pub fn convert(
         }
     }
 
-    if let Some(isort) = &external_config.isort {
-        if let Some(src_paths) = &isort.src_paths {
-            match options.src.as_mut() {
-                Some(src) => {
-                    src.extend(src_paths.clone());
-                }
-                None => {
-                    options.src = Some(src_paths.clone());
-                }
-            }
-        }
-    }
-
     // Create the pyproject.toml.
     Ok(Pyproject::new(options))
 }
@@ -411,21 +388,20 @@ mod tests {
     use std::collections::HashMap;
 
     use anyhow::Result;
+    use ruff::pydocstyle::settings::Convention;
+    use ruff::registry::RuleCodePrefix;
+    use ruff::settings::options::Options;
+    use ruff::settings::pyproject::Pyproject;
+    use ruff::{flake8_quotes, pydocstyle};
 
-    use super::super::plugin::Plugin;
-    use super::convert;
-    use crate::flake8_to_ruff::ExternalConfig;
-    use crate::registry::RuleSelector;
-    use crate::rules::pydocstyle::settings::Convention;
-    use crate::rules::{flake8_quotes, pydocstyle};
-    use crate::settings::options::Options;
-    use crate::settings::pyproject::Pyproject;
+    use crate::converter::convert;
+    use crate::plugin::Plugin;
 
     #[test]
     fn it_converts_empty() -> Result<()> {
         let actual = convert(
             &HashMap::from([("flake8".to_string(), HashMap::default())]),
-            &ExternalConfig::default(),
+            None,
             None,
         )?;
         let expected = Pyproject::new(Options {
@@ -447,11 +423,14 @@ mod tests {
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: None,
-            namespace_packages: None,
             per_file_ignores: None,
             required_version: None,
             respect_gitignore: None,
-            select: Some(vec![RuleSelector::E, RuleSelector::F, RuleSelector::W]),
+            select: Some(vec![
+                RuleCodePrefix::E,
+                RuleCodePrefix::F,
+                RuleCodePrefix::W,
+            ]),
             show_source: None,
             src: None,
             target_version: None,
@@ -462,7 +441,6 @@ mod tests {
             flake8_annotations: None,
             flake8_bandit: None,
             flake8_bugbear: None,
-            flake8_builtins: None,
             flake8_errmsg: None,
             flake8_pytest_style: None,
             flake8_quotes: None,
@@ -474,7 +452,6 @@ mod tests {
             pep8_naming: None,
             pycodestyle: None,
             pydocstyle: None,
-            pylint: None,
             pyupgrade: None,
         });
         assert_eq!(actual, expected);
@@ -489,7 +466,7 @@ mod tests {
                 "flake8".to_string(),
                 HashMap::from([("max-line-length".to_string(), Some("100".to_string()))]),
             )]),
-            &ExternalConfig::default(),
+            None,
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
@@ -511,11 +488,14 @@ mod tests {
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: Some(100),
-            namespace_packages: None,
             per_file_ignores: None,
             required_version: None,
             respect_gitignore: None,
-            select: Some(vec![RuleSelector::E, RuleSelector::F, RuleSelector::W]),
+            select: Some(vec![
+                RuleCodePrefix::E,
+                RuleCodePrefix::F,
+                RuleCodePrefix::W,
+            ]),
             show_source: None,
             src: None,
             target_version: None,
@@ -526,7 +506,6 @@ mod tests {
             flake8_annotations: None,
             flake8_bandit: None,
             flake8_bugbear: None,
-            flake8_builtins: None,
             flake8_errmsg: None,
             flake8_pytest_style: None,
             flake8_quotes: None,
@@ -538,7 +517,6 @@ mod tests {
             pep8_naming: None,
             pycodestyle: None,
             pydocstyle: None,
-            pylint: None,
             pyupgrade: None,
         });
         assert_eq!(actual, expected);
@@ -553,7 +531,7 @@ mod tests {
                 "flake8".to_string(),
                 HashMap::from([("max_line_length".to_string(), Some("100".to_string()))]),
             )]),
-            &ExternalConfig::default(),
+            None,
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
@@ -575,11 +553,14 @@ mod tests {
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: Some(100),
-            namespace_packages: None,
             per_file_ignores: None,
             required_version: None,
             respect_gitignore: None,
-            select: Some(vec![RuleSelector::E, RuleSelector::F, RuleSelector::W]),
+            select: Some(vec![
+                RuleCodePrefix::E,
+                RuleCodePrefix::F,
+                RuleCodePrefix::W,
+            ]),
             show_source: None,
             src: None,
             target_version: None,
@@ -590,7 +571,6 @@ mod tests {
             flake8_annotations: None,
             flake8_bandit: None,
             flake8_bugbear: None,
-            flake8_builtins: None,
             flake8_errmsg: None,
             flake8_pytest_style: None,
             flake8_quotes: None,
@@ -602,7 +582,6 @@ mod tests {
             pep8_naming: None,
             pycodestyle: None,
             pydocstyle: None,
-            pylint: None,
             pyupgrade: None,
         });
         assert_eq!(actual, expected);
@@ -617,7 +596,7 @@ mod tests {
                 "flake8".to_string(),
                 HashMap::from([("max_line_length".to_string(), Some("abc".to_string()))]),
             )]),
-            &ExternalConfig::default(),
+            None,
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
@@ -639,11 +618,14 @@ mod tests {
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: None,
-            namespace_packages: None,
             per_file_ignores: None,
             required_version: None,
             respect_gitignore: None,
-            select: Some(vec![RuleSelector::E, RuleSelector::F, RuleSelector::W]),
+            select: Some(vec![
+                RuleCodePrefix::E,
+                RuleCodePrefix::F,
+                RuleCodePrefix::W,
+            ]),
             show_source: None,
             src: None,
             target_version: None,
@@ -654,7 +636,6 @@ mod tests {
             flake8_annotations: None,
             flake8_bandit: None,
             flake8_bugbear: None,
-            flake8_builtins: None,
             flake8_errmsg: None,
             flake8_pytest_style: None,
             flake8_quotes: None,
@@ -666,7 +647,6 @@ mod tests {
             pep8_naming: None,
             pycodestyle: None,
             pydocstyle: None,
-            pylint: None,
             pyupgrade: None,
         });
         assert_eq!(actual, expected);
@@ -681,7 +661,7 @@ mod tests {
                 "flake8".to_string(),
                 HashMap::from([("inline-quotes".to_string(), Some("single".to_string()))]),
             )]),
-            &ExternalConfig::default(),
+            None,
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
@@ -703,11 +683,14 @@ mod tests {
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: None,
-            namespace_packages: None,
             per_file_ignores: None,
             required_version: None,
             respect_gitignore: None,
-            select: Some(vec![RuleSelector::E, RuleSelector::F, RuleSelector::W]),
+            select: Some(vec![
+                RuleCodePrefix::E,
+                RuleCodePrefix::F,
+                RuleCodePrefix::W,
+            ]),
             show_source: None,
             src: None,
             target_version: None,
@@ -718,7 +701,6 @@ mod tests {
             flake8_annotations: None,
             flake8_bandit: None,
             flake8_bugbear: None,
-            flake8_builtins: None,
             flake8_errmsg: None,
             flake8_pytest_style: None,
             flake8_quotes: Some(flake8_quotes::settings::Options {
@@ -735,7 +717,6 @@ mod tests {
             pep8_naming: None,
             pycodestyle: None,
             pydocstyle: None,
-            pylint: None,
             pyupgrade: None,
         });
         assert_eq!(actual, expected);
@@ -753,7 +734,7 @@ mod tests {
                     Some("numpy".to_string()),
                 )]),
             )]),
-            &ExternalConfig::default(),
+            None,
             Some(vec![Plugin::Flake8Docstrings]),
         )?;
         let expected = Pyproject::new(Options {
@@ -775,15 +756,14 @@ mod tests {
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: None,
-            namespace_packages: None,
             per_file_ignores: None,
             required_version: None,
             respect_gitignore: None,
             select: Some(vec![
-                RuleSelector::D,
-                RuleSelector::E,
-                RuleSelector::F,
-                RuleSelector::W,
+                RuleCodePrefix::D,
+                RuleCodePrefix::E,
+                RuleCodePrefix::F,
+                RuleCodePrefix::W,
             ]),
             show_source: None,
             src: None,
@@ -795,7 +775,6 @@ mod tests {
             flake8_annotations: None,
             flake8_bandit: None,
             flake8_bugbear: None,
-            flake8_builtins: None,
             flake8_errmsg: None,
             flake8_pytest_style: None,
             flake8_quotes: None,
@@ -809,7 +788,6 @@ mod tests {
             pydocstyle: Some(pydocstyle::settings::Options {
                 convention: Some(Convention::Numpy),
             }),
-            pylint: None,
             pyupgrade: None,
         });
         assert_eq!(actual, expected);
@@ -824,7 +802,7 @@ mod tests {
                 "flake8".to_string(),
                 HashMap::from([("inline-quotes".to_string(), Some("single".to_string()))]),
             )]),
-            &ExternalConfig::default(),
+            None,
             None,
         )?;
         let expected = Pyproject::new(Options {
@@ -846,15 +824,14 @@ mod tests {
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: None,
-            namespace_packages: None,
             per_file_ignores: None,
             required_version: None,
             respect_gitignore: None,
             select: Some(vec![
-                RuleSelector::E,
-                RuleSelector::F,
-                RuleSelector::Q,
-                RuleSelector::W,
+                RuleCodePrefix::E,
+                RuleCodePrefix::F,
+                RuleCodePrefix::Q,
+                RuleCodePrefix::W,
             ]),
             show_source: None,
             src: None,
@@ -866,7 +843,6 @@ mod tests {
             flake8_annotations: None,
             flake8_bandit: None,
             flake8_bugbear: None,
-            flake8_builtins: None,
             flake8_errmsg: None,
             flake8_pytest_style: None,
             flake8_quotes: Some(flake8_quotes::settings::Options {
@@ -883,7 +859,6 @@ mod tests {
             pep8_naming: None,
             pycodestyle: None,
             pydocstyle: None,
-            pylint: None,
             pyupgrade: None,
         });
         assert_eq!(actual, expected);

flake8_to_ruff/src/lib.rs

@@ -0,0 +1,18 @@
+#![allow(
+    clippy::collapsible_else_if,
+    clippy::collapsible_if,
+    clippy::implicit_hasher,
+    clippy::match_same_arms,
+    clippy::missing_errors_doc,
+    clippy::missing_panics_doc,
+    clippy::module_name_repetitions,
+    clippy::must_use_candidate,
+    clippy::similar_names,
+    clippy::too_many_lines
+)]
+#![forbid(unsafe_code)]
+
+pub mod black;
+pub mod converter;
+mod parser;
+pub mod plugin;

flake8_to_ruff/src/main.rs

@@ -1,4 +1,4 @@
-//! Utility to generate Ruff's `pyproject.toml` section from a Flake8 INI file.
+//! Utility to generate Ruff's pyproject.toml section from a Flake8 INI file.
 #![allow(
     clippy::collapsible_else_if,
     clippy::collapsible_if,
@@ -18,7 +18,9 @@ use std::path::PathBuf;
 use anyhow::Result;
 use clap::Parser;
 use configparser::ini::Ini;
-use ruff::flake8_to_ruff::{self, ExternalConfig};
+use flake8_to_ruff::black::parse_black_options;
+use flake8_to_ruff::converter;
+use flake8_to_ruff::plugin::Plugin;
 
 #[derive(Parser)]
 #[command(
@@ -36,7 +38,7 @@ struct Cli {
     pyproject: Option<PathBuf>,
     /// List of plugins to enable.
     #[arg(long, value_delimiter = ',')]
-    plugin: Option<Vec<flake8_to_ruff::Plugin>>,
+    plugin: Option<Vec<Plugin>>,
 }
 
 fn main() -> Result<()> {
@@ -48,18 +50,14 @@ fn main() -> Result<()> {
     let config = ini.load(cli.file).map_err(|msg| anyhow::anyhow!(msg))?;
 
     // Read the pyproject.toml file.
-    let pyproject = cli.pyproject.map(flake8_to_ruff::parse).transpose()?;
-    let external_config = pyproject
-        .as_ref()
-        .and_then(|pyproject| pyproject.tool.as_ref())
-        .map(|tool| ExternalConfig {
-            black: tool.black.as_ref(),
-            isort: tool.isort.as_ref(),
-        })
-        .unwrap_or_default();
+    let black = cli
+        .pyproject
+        .map(parse_black_options)
+        .transpose()?
+        .flatten();
 
     // Create Ruff's pyproject.toml section.
-    let pyproject = flake8_to_ruff::convert(&config, &external_config, cli.plugin)?;
+    let pyproject = converter::convert(&config, black.as_ref(), cli.plugin)?;
     println!("{}", toml_edit::easy::to_string_pretty(&pyproject)?);
 
     Ok(())

flake8_to_ruff/src/parser.rs

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

flake8_to_ruff/src/plugin.rs

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

licenses/LICENSE_PyCQA_flake8-commas

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

licenses/LICENSE_RoPP_flake8-use-pathlib

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

licenses/LICENSE_adamchainz_flake8-no-pep420

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 Adam Johnson
-
-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.

pyproject.toml

@@ -1,13 +1,10 @@
 [build-system]
-requires = ["maturin>=0.14.10,<0.15"]
-# We depend on >=0.14.10 because we specify name in
-# [package.metadata.maturin] in ruff_cli/Cargo.toml.
-
+requires = ["maturin>=0.14,<0.15"]
 build-backend = "maturin"
 
 [project]
 name = "ruff"
-version = "0.0.231"
+version = "0.0.217"
 description = "An extremely fast Python linter, written in Rust."
 authors = [
   { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" },
@@ -38,6 +35,10 @@ urls = { repository = "https://github.com/charliermarsh/ruff" }
 
 [tool.maturin]
 bindings = "bin"
-manifest-path = "ruff_cli/Cargo.toml"
-python-source = "python"
 strip = true
+
+[tool.setuptools]
+license-files = [
+  "LICENSE",
+  "licenses/*",
+]

resources/test/fixtures/flake8_annotations/allow_nested_overload.py

@@ -1,9 +0,0 @@
-class C:
-    from typing import overload
-
-    @overload
-    def f(self, x: int, y: int) -> None:
-        ...
-
-    def f(self, x, y):
-        pass

resources/test/fixtures/flake8_bandit/S508.py

@@ -1,6 +0,0 @@
-from pysnmp.hlapi import CommunityData
-
-CommunityData("public", mpModel=0)  # S508
-CommunityData("public", mpModel=1)  # S508
-
-CommunityData("public", mpModel=2)  # OK

resources/test/fixtures/flake8_bandit/S509.py

@@ -1,7 +0,0 @@
-from pysnmp.hlapi import UsmUserData
-
-
-insecure = UsmUserData("securityName")  # S509
-auth_no_priv = UsmUserData("securityName", "authName")  # S509
-
-less_insecure = UsmUserData("securityName", "authName", "privName")  # OK

resources/test/fixtures/flake8_bandit/S612.py

@@ -1,8 +0,0 @@
-import logging.config
-
-t = logging.config.listen(9999)
-
-def verify_func():
-    pass
-
-l = logging.config.listen(9999, verify=verify_func)

resources/test/fixtures/flake8_bandit/S701.py

@@ -1,29 +0,0 @@
-import jinja2
-from jinja2 import Environment, select_autoescape
-templateLoader = jinja2.FileSystemLoader( searchpath="/" )
-something = ''
-
-Environment(loader=templateLoader, load=templateLoader, autoescape=True)
-templateEnv = jinja2.Environment(autoescape=True,
-        loader=templateLoader )
-Environment(loader=templateLoader, load=templateLoader, autoescape=something)  # S701
-templateEnv = jinja2.Environment(autoescape=False, loader=templateLoader )  # S701
-Environment(loader=templateLoader,
-            load=templateLoader,
-            autoescape=False)  # S701
-
-Environment(loader=templateLoader,  # S701
-            load=templateLoader)
-
-Environment(loader=templateLoader, autoescape=select_autoescape())
-
-Environment(loader=templateLoader,
-            autoescape=select_autoescape(['html', 'htm', 'xml']))
-
-Environment(loader=templateLoader,
-            autoescape=jinja2.select_autoescape(['html', 'htm', 'xml']))
-
-
-def fake_func():
-    return 'foobar'
-Environment(loader=templateLoader, autoescape=fake_func())  # S701

resources/test/fixtures/flake8_bugbear/B023.py

@@ -25,10 +25,10 @@ for x in range(3):
 
 
 def check_inside_functions_too():
-    ls = [lambda: x for x in range(2)]  # error
-    st = {lambda: x for x in range(2)}  # error
-    gn = (lambda: x for x in range(2))  # error
-    dt = {x: lambda: x for x in range(2)}  # error
+    ls = [lambda: x for x in range(2)]
+    st = {lambda: x for x in range(2)}
+    gn = (lambda: x for x in range(2))
+    dt = {x: lambda: x for x in range(2)}
 
 
 async def pointless_async_iterable():
@@ -37,9 +37,9 @@ async def pointless_async_iterable():
 
 async def container_for_problems():
     async for x in pointless_async_iterable():
-        functions.append(lambda: x)  # error
+        functions.append(lambda: x)
 
-    [lambda: x async for x in pointless_async_iterable()]  # error
+    [lambda: x async for x in pointless_async_iterable()]
 
 
 a = 10
@@ -47,10 +47,10 @@ b = 0
 while True:
     a = a_ = a - 1
     b += 1
-    functions.append(lambda: a)  # error
-    functions.append(lambda: a_)  # error
-    functions.append(lambda: b)  # error
-    functions.append(lambda: c)  # error, but not a name error due to late binding
+    functions.append(lambda: a)
+    functions.append(lambda: a_)
+    functions.append(lambda: b)
+    functions.append(lambda: c)  # not a name error because of late binding!
     c: bool = a > 3
     if not c:
         break
@@ -58,7 +58,7 @@ while True:
 # Nested loops should not duplicate reports
 for j in range(2):
     for k in range(3):
-        lambda: j * k  # error
+        lambda: j * k
 
 
 for j, k, l in [(1, 2, 3)]:
@@ -80,95 +80,3 @@ for var in range(2):
 
 for i in range(3):
     lambda: f"{i}"
-
-
-# `query` is defined in the function, so also defining it in the loop should be OK.
-for name in ["a", "b"]:
-    query = name
-
-    def myfunc(x):
-        query = x
-        query_post = x
-        _ = query
-        _ = query_post
-
-    query_post = name  # in case iteration order matters
-
-
-# Bug here because two dict comprehensions reference `name`, one of which is inside
-# the lambda.  This should be totally fine, of course.
-_ = {
-    k: v
-    for k, v in reduce(
-        lambda data, event: merge_mappings(
-            [data, {name: f(caches, data, event) for name, f in xx}]
-        ),
-        events,
-        {name: getattr(group, name) for name in yy},
-    ).items()
-    if k in backfill_fields
-}
-
-
-# OK to define lambdas if they're immediately consumed, typically as the `key=`
-# argument or in a consumed `filter()` (even if a comprehension is better style)
-for x in range(2):
-    # It's not a complete get-out-of-linting-free construct - these should fail:
-    min([None, lambda: x], key=repr)
-    sorted([None, lambda: x], key=repr)
-    any(filter(bool, [None, lambda: x]))
-    list(filter(bool, [None, lambda: x]))
-    all(reduce(bool, [None, lambda: x]))
-
-    # But all these should be OK:
-    min(range(3), key=lambda y: x * y)
-    max(range(3), key=lambda y: x * y)
-    sorted(range(3), key=lambda y: x * y)
-
-    any(map(lambda y: x < y, range(3)))
-    all(map(lambda y: x < y, range(3)))
-    set(map(lambda y: x < y, range(3)))
-    list(map(lambda y: x < y, range(3)))
-    tuple(map(lambda y: x < y, range(3)))
-    sorted(map(lambda y: x < y, range(3)))
-    frozenset(map(lambda y: x < y, range(3)))
-
-    any(filter(lambda y: x < y, range(3)))
-    all(filter(lambda y: x < y, range(3)))
-    set(filter(lambda y: x < y, range(3)))
-    list(filter(lambda y: x < y, range(3)))
-    tuple(filter(lambda y: x < y, range(3)))
-    sorted(filter(lambda y: x < y, range(3)))
-    frozenset(filter(lambda y: x < y, range(3)))
-
-    any(reduce(lambda y: x | y, range(3)))
-    all(reduce(lambda y: x | y, range(3)))
-    set(reduce(lambda y: x | y, range(3)))
-    list(reduce(lambda y: x | y, range(3)))
-    tuple(reduce(lambda y: x | y, range(3)))
-    sorted(reduce(lambda y: x | y, range(3)))
-    frozenset(reduce(lambda y: x | y, range(3)))
-
-    import functools
-
-    any(functools.reduce(lambda y: x | y, range(3)))
-    all(functools.reduce(lambda y: x | y, range(3)))
-    set(functools.reduce(lambda y: x | y, range(3)))
-    list(functools.reduce(lambda y: x | y, range(3)))
-    tuple(functools.reduce(lambda y: x | y, range(3)))
-    sorted(functools.reduce(lambda y: x | y, range(3)))
-    frozenset(functools.reduce(lambda y: x | y, range(3)))
-
-# OK because the lambda which references a loop variable is defined in a `return`
-# statement, and after we return the loop variable can't be redefined.
-# In principle we could do something fancy with `break`, but it's not worth it.
-def iter_f(names):
-    for name in names:
-        if exists(name):
-            return lambda: name if exists(name) else None
-
-        if foo(name):
-            return [lambda: name]  # known false alarm
-
-        if False:
-            return [lambda: i for i in range(3)]  # error

resources/test/fixtures/flake8_bugbear/B024.py

@@ -1,16 +1,15 @@
 """
 Should emit:
-B024 - on lines 18, 71, 82, 87, 92, 141
+B024 - on lines 17, 34, 52, 58, 69, 74, 79, 84, 89
 """
 
 import abc
 import abc as notabc
 from abc import ABC, ABCMeta
-from abc import abstractmethod, abstractproperty
+from abc import abstractmethod
 from abc import abstractmethod as abstract
 from abc import abstractmethod as abstractaoeuaoeuaoeu
 from abc import abstractmethod as notabstract
-from abc import abstractproperty as notabstract_property
 
 import foo
 
@@ -50,24 +49,12 @@ class Base_6(ABC):
         foo()
 
 
-class Base_7(ABC):
+class Base_7(ABC):  # error
     @notabstract
     def method(self):
         foo()
 
 
-class Base_8(ABC):
-    @notabstract_property
-    def method(self):
-        foo()
-
-
-class Base_9(ABC):
-    @abstractproperty
-    def method(self):
-        foo()
-
-
 class MetaBase_1(metaclass=ABCMeta):  # error
     def method(self):
         foo()

resources/test/fixtures/flake8_bugbear/B027.py

@@ -1,12 +1,11 @@
 """
 Should emit:
-B027 - on lines 13, 16, 19, 23
+B027 - on lines 12, 15, 18, 22, 30
 """
 import abc
 from abc import ABC
-from abc import abstractmethod, abstractproperty
+from abc import abstractmethod
 from abc import abstractmethod as notabstract
-from abc import abstractproperty as notabstract_property
 
 
 class AbstractClass(ABC):
@@ -43,18 +42,6 @@ class AbstractClass(ABC):
     def abstract_3(self):
         ...
 
-    @abc.abstractproperty
-    def abstract_4(self):
-        ...
-
-    @abstractproperty
-    def abstract_5(self):
-        ...
-
-    @notabstract_property
-    def abstract_6(self):
-        ...
-
     def body_1(self):
         print("foo")
         ...

resources/test/fixtures/flake8_builtins/A001.py

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

resources/test/fixtures/flake8_builtins/A002.py

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

resources/test/fixtures/flake8_builtins/A003.py

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

resources/test/fixtures/flake8_commas/COM81.py

@@ -1,628 +0,0 @@
-# ==> bad_function_call.py <==
-bad_function_call(
-    param1='test',
-    param2='test'
-)
-# ==> bad_list.py <==
-bad_list = [
-    1,
-    2,
-    3
-]
-
-bad_list_with_comment = [
-    1,
-    2,
-    3
-    # still needs a comma!
-]
-
-bad_list_with_extra_empty = [
-    1,
-    2,
-    3
-
-
-
-]
-
-# ==> bare.py <==
-bar = 1, 2
-
-foo = 1
-
-foo = (1,)
-
-foo = 1,
-
-bar = 1; foo = bar,
-
-foo = (
-3,
-4,
-)
-
-foo = 3, 
-
-class A(object):
- foo = 3
- bar = 10,
- foo_bar = 2
-
-a = ('a',)
-
-from foo import bar, baz
-
-group_by = function_call('arg'),
-
-group_by = ('foobar' * 3),
-
-def foo():
-    return False,
-
-==> callable_before_parenth_form.py <==
-def foo(
-    bar,
-):
-    pass
-
-{'foo': foo}['foo'](
-    bar
-)
-
-{'foo': foo}['foo'](
-    bar,
-)
-
-(foo)(
-    bar
-)
-
-(foo)[0](
-    bar,
-)
-
-[foo][0](
-    bar
-)
-
-[foo][0](
-    bar,
-)
-
-# ==> comment_good_dict.py <==
-multiline_good_dict = {
-    "good": 123,  # this is a good number
-}
-
-# ==> dict_comprehension.py <==
-not_a_dict = {
-    x: y
-    for x, y in ((1, 2), (3, 4))
-}
-
-# ==> good_empty_comma_context.py <==
-def func2(
-):
-    pass
-
-
-func2(
-
-)
-
-func2(
-)
-
-[
-]
-
-[
-
-]
-
-(
-)
-
-(
-
-)
-
-{
-
-}
-
-# ==> good_list.py <==
-stuff = [
-   'a',
-   'b',
-   # more stuff will go here
-]
-
-more_stuff = [
-    'a',
-    'b',
-
-
-
-]
-
-# ==> keyword_before_parenth_form/base_bad.py <==
-from x import (
-    y
-)
-
-assert(
-    SyntaxWarning,
-    ThrownHere,
-    Anyway
-)
-
-# async await is fine outside an async def
-# ruff: RustPython tokenizer treats async/await as keywords, not applicable.
-
-# def await(
-#     foo
-# ):
-#     async(
-#         foo
-#     )
-
-# def async(
-#     foo
-# ):
-#     await(
-#         foo
-#     )
-
-# ==> keyword_before_parenth_form/base.py <==
-from x import (
-    y,
-)
-
-assert(
-    SyntaxWarning,
-    ThrownHere,
-    Anyway,
-)
-
-assert (
-    foo
-)
-
-assert (
-    foo and
-    bar
-)
-
-if(
-    foo and
-    bar
-):
-    pass
-elif(
-    foo and
-    bar
-):
-    pass
-
-for x in(
-    [1,2,3]
-):
-    print(x)
-
-
-(x for x in (
-    [1, 2, 3]
-))
-
-(
-    'foo'
-) is (
-    'foo'
-)
-
-if (
-    foo and
-    bar
-) or not (
-    foo
-) or (
-    spam
-):
-    pass
-
-def xyz():
-    raise(
-        Exception()
-    )
-
-def abc():
-    return(
-        3
-    )
-
-while(
-    False
-):
-    pass
-
-with(
-    loop
-):
-    pass
-
-def foo():
-    yield (
-        "foo"
-    )
-
-# async await is fine outside an async def
-# ruff: RustPython tokenizer treats async/await as keywords, not applicable.
-
-# def await(
-#     foo,
-# ):
-#     async(
-#         foo,
-#     )
-
-# def async(
-#     foo,
-# ):
-#     await(
-#         foo,
-#     )
-
-# ==> keyword_before_parenth_form/py3.py <==
-# Syntax error in Py2
-
-def foo():
-    yield from (
-        foo
-    )
-
-# ==> list_comprehension.py <==
-not_a_list = [
-    s.strip()
-    for s in 'foo, bar, baz'.split(',')
-]
-
-# ==> multiline_bad_dict.py <==
-multiline_bad_dict = {
-    "bad": 123
-}
-# ==> multiline_bad_function_def.py <==
-def func_good(
-        a = 3,
-        b = 2):
-    pass
-
-
-def func_bad(
-        a = 3,
-        b = 2
-    ):
-    pass
-
-# ==> multiline_bad_function_one_param.py <==
-def func(
-        a = 3
-    ):
-    pass
-
-
-func(
-    a = 3
-)
-
-# ==> multiline_bad_or_dict.py <==
-multiline_bad_or_dict = {
-    "good": True or False,
-    "bad": 123
-}
-
-# ==> multiline_good_dict.py <==
-multiline_good_dict = {
-    "good": 123,
-}
-# ==> multiline_good_single_keyed_for_dict.py <==
-good_dict = {
-    "good": x for x in y
-}
-
-# ==> multiline_if.py <==
-if (
-    foo
-    and bar
-):
-    print("Baz")
-
-# ==> multiline_index_access.py <==
-multiline_index_access[
-    "good"
-]
-
-multiline_index_access_after_function()[
-    "good"
-]
-
-multiline_index_access_after_inline_index_access['first'][
-    "good"
-]
-
-multiline_index_access[
-    "probably fine",
-]
-
-[0, 1, 2][
-    "good"
-]
-
-[0, 1, 2][
-    "probably fine",
-]
-
-multiline_index_access[
-    "probably fine",
-    "not good"
-]
-
-multiline_index_access[
-    "fine",
-    "fine",
-    :
-    "not good"
-]
-
-# ==> multiline_string.py <==
-s = (
-    'this' +
-    'is a string'
-)
-
-s2 = (
-    'this'
-    'is also a string'
-)
-
-t = (
-    'this' +
-    'is a tuple',
-)
-
-t2 = (
-    'this'
-    'is also a tuple',
-)
-
-# ==> multiline_subscript_slice.py <==
-multiline_index_access[
-    "fine",
-    "fine"
-    :
-    "not fine"
-]
-
-multiline_index_access[
-    "fine"
-    "fine"
-    :
-    "fine"
-    :
-    "fine"
-]
-
-multiline_index_access[
-    "fine"
-    "fine",
-    :
-    "fine",
-    :
-    "fine",
-]
-
-multiline_index_access[
-    "fine"
-    "fine",
-    :
-    "fine"
-    :
-    "fine",
-    "not fine"
-]
-
-multiline_index_access[
-    "fine"
-    "fine",
-    :
-    "fine",
-    "fine"
-    :
-    "fine",
-]
-
-multiline_index_access[
-    lambda fine,
-    fine,
-    fine: (0,)
-    :
-    lambda fine,
-    fine,
-    fine: (0,),
-    "fine"
-    :
-    "fine",
-]
-
-# ==> one_line_dict.py <==
-one_line_dict = {"good": 123}
-# ==> parenth_form.py <==
-parenth_form = (
-    a +
-    b +
-    c
-)
-
-parenth_form_with_lambda = (
-    lambda x, y: 0
-)
-
-parenth_form_with_default_lambda = (
-    lambda x=(
-        lambda
-        x,
-        y,
-        :
-        0
-    ),
-    y = {a: b},
-    :
-    0
-)
-
-# ==> prohibited.py <==
-foo = ['a', 'b', 'c',]
-
-bar = { a: b,}
-
-def bah(ham, spam,):
-    pass
-
-(0,)
-
-(0, 1,)
-
-foo = ['a', 'b', 'c', ]
-
-bar = { a: b, }
-
-def bah(ham, spam, ):
-    pass
-
-(0, )
-
-(0, 1, )
-
-image[:, :, 0]
-
-image[:,]
-
-image[:,:,]
-
-lambda x, :
-
-# ==> unpack.py <==
-def function(
-    foo,
-    bar,
-    **kwargs
-):
-    pass
-
-def function(
-    foo,
-    bar,
-    *args
-):
-    pass
-
-def function(
-    foo,
-    bar,
-    *args,
-    extra_kwarg
-    ):
-    pass
-
-result = function(
-    foo,
-    bar,
-    **kwargs
-)
-
-result = function(
-    foo,
-    bar,
-    **not_called_kwargs
-)
-
-def foo(
-    ham,
-    spam,
-    *args,
-    kwarg_only
-    ):
-    pass
-
-# In python 3.5 if it's not a function def, commas are mandatory.
-
-foo(
-    **kwargs
-)
-
-{
-    **kwargs
-}
-
-(
-    *args
-)
-
-{
-    *args
-}
-
-[
-    *args
-]
-
-def foo(
-    ham,
-    spam,
-    *args
-    ):
-    pass
-
-def foo(
-    ham,
-    spam,
-    **kwargs
-    ):
-    pass
-
-def foo(
-    ham,
-    spam,
-    *args,
-    kwarg_only
-    ):
-    pass
-
-# In python 3.5 if it's not a function def, commas are mandatory.
-
-foo(
-    **kwargs,
-)
-
-{
-    **kwargs,
-}
-
-(
-    *args,
-)
-
-{
-    *args,
-}
-
-[
-    *args,
-]
-
-result = function(
-    foo,
-    bar,
-    **{'ham': spam}
-)

resources/test/fixtures/flake8_comprehensions/C400.py

@@ -2,10 +2,3 @@ x = list(x for x in range(3))
 x = list(
     x for x in range(3)
 )
-
-
-def list(*args, **kwargs):
-    return None
-
-
-list(x for x in range(3))

resources/test/fixtures/flake8_comprehensions/C401.py

@@ -2,10 +2,3 @@ x = set(x for x in range(3))
 x = set(
     x for x in range(3)
 )
-
-
-def set(*args, **kwargs):
-    return None
-
-
-set(x for x in range(3))

resources/test/fixtures/flake8_comprehensions/C405.py

@@ -1,18 +1,5 @@
-set([1, 2])
-set((1, 2))
-set([])
-set(())
-set()
-set((1,))
-set((
-    1,
-))
-set([
-    1,
-])
-set(
-    (1,)
-)
-set(
-    [1,]
-)
+s1 = set([1, 2])
+s2 = set((1, 2))
+s3 = set([])
+s4 = set(())
+s5 = set()

resources/test/fixtures/flake8_comprehensions/C408.py

@@ -3,10 +3,3 @@ l = list()
 d1 = dict()
 d2 = dict(a=1)
 d3 = dict(**d2)
-
-
-def list():
-    return [1, 2, 3]
-
-
-a = list()

resources/test/fixtures/flake8_comprehensions/C413.py

@@ -4,10 +4,3 @@ list(sorted(x))
 reversed(sorted(x))
 reversed(sorted(x, key=lambda e: e))
 reversed(sorted(x, reverse=True))
-
-
-def reversed(*args, **kwargs):
-    return None
-
-
-reversed(sorted(x, reverse=True))

resources/test/fixtures/flake8_executable/EXE003.py

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

resources/test/fixtures/flake8_executable/EXE004_1.py

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

resources/test/fixtures/flake8_executable/EXE004_2.py

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

resources/test/fixtures/flake8_executable/EXE004_3.py

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

resources/test/fixtures/flake8_executable/EXE005_1.py

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

resources/test/fixtures/flake8_executable/EXE005_2.py

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

resources/test/fixtures/flake8_executable/EXE005_3.py

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

resources/test/fixtures/flake8_import_conventions/from_imports.py

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

resources/test/fixtures/flake8_no_pep420/test_fail_nonempty/example.py

@@ -1 +0,0 @@
-print('hi')

resources/test/fixtures/flake8_no_pep420/test_fail_shebang/example.py

@@ -1,2 +0,0 @@
-#!/bin/env/python
-print('hi')

resources/test/fixtures/flake8_no_pep420/test_ignored/example.py

@@ -1 +0,0 @@
-import os  # noqa: INP001

resources/test/fixtures/flake8_pie/PIE794.py

@@ -31,10 +31,3 @@ class User(BaseModel):
     @buzz.setter
     def buzz(self, value: str | int) -> None:
         ...
-
-
-class User:
-    bar: str = StringField()
-    foo: bool = BooleanField()
-    # ...
-    bar = StringField()  # PIE794

resources/test/fixtures/flake8_pie/PIE796.py

@@ -1,66 +0,0 @@
-import enum
-from enum import Enum, unique
-
-
-class FakeEnum1(enum.Enum):
-    A = "A"
-    B = "B"
-    C = "B"  # PIE796
-
-
-class FakeEnum2(Enum):
-    A = 1
-    B = 2
-    C = 2  # PIE796
-
-
-class FakeEnum3(str, Enum):
-    A = "1"
-    B = "2"
-    C = "2"  # PIE796
-
-
-class FakeEnum4(Enum):
-    A = 1.0
-    B = 2.5
-    C = 2.5  # PIE796
-
-
-class FakeEnum5(Enum):
-    A = 1.0
-    B = True
-    C = False
-    D = False  # PIE796
-
-
-class FakeEnum6(Enum):
-    A = 1
-    B = 2
-    C = None
-    D = None  # PIE796
-
-
-@enum.unique
-class FakeEnum7(enum.Enum):
-    A = "A"
-    B = "B"
-    C = "C"
-
-
-@unique
-class FakeEnum8(Enum):
-    A = 1
-    B = 2
-    C = 2  # PIE796
-
-
-class FakeEnum9(enum.Enum):
-    A = "A"
-    B = "B"
-    C = "C"
-
-
-class FakeEnum10(enum.Enum):
-    A = enum.auto()
-    B = enum.auto()
-    C = enum.auto()

resources/test/fixtures/flake8_pie/PIE800.py

@@ -1,17 +0,0 @@
-{"foo": 1, **{"bar": 1}}  # PIE800
-
-foo({**foo, **{"bar": True}})  # PIE800
-
-{**foo, **{"bar": 10}}  # PIE800
-
-{**foo, **buzz, **{bar: 10}}  # PIE800
-
-{**foo,    "bar": True  }  # OK
-
-{"foo": 1, "buzz": {"bar": 1}}  # OK
-
-{**foo,    "bar": True  }  # OK
-
-Table.objects.filter(inst=inst, **{f"foo__{bar}__exists": True})  # OK
-
-buzz = {**foo, "bar": { 1: 2 }}  # OK

resources/test/fixtures/flake8_pie/PIE804.py

@@ -1,19 +0,0 @@
-foo(**{"bar": True})  # PIE804
-
-foo(**{"r2d2": True})  # PIE804
-
-Foo.objects.create(**{"bar": True})  # PIE804
-
-Foo.objects.create(**{"_id": some_id})  # PIE804
-
-Foo.objects.create(**{**bar})  # PIE804
-
-
-foo(**{**data, "foo": "buzz"})
-foo(**buzz)
-foo(**{"bar-foo": True})
-foo(**{"bar foo": True})
-foo(**{"1foo": True})
-foo(**{buzz: True})
-foo(**{"": True})
-foo(**{f"buzz__{bar}": True})

resources/test/fixtures/flake8_pytest_style/PT007.py

@@ -53,25 +53,3 @@ def test_list_of_tuples(param1, param2):
 )
 def test_list_of_lists(param1, param2):
     ...
-
-
-@pytest.mark.parametrize(
-    "param1,param2",
-    [
-        [1, 2],
-        [3, 4],
-    ],
-)
-def test_csv_name_list_of_lists(param1, param2):
-    ...
-
-
-@pytest.mark.parametrize(
-    "param",
-    [
-        [1, 2],
-        [3, 4],
-    ],
-)
-def test_single_list_of_lists(param):
-    ...

resources/test/fixtures/flake8_quotes/docstring_doubles_function.py

@@ -17,15 +17,6 @@ def fun_with_params_no_docstring(a, b="""
 """ """docstring"""):
     pass
 
-
 def fun_with_params_no_docstring2(a, b=c[foo():], c=\
     """ not a docstring """):
     pass
-
-
-def function_with_single_docstring(a):
-    "Single line docstring"
-
-
-def double_inside_single(a):
-    'Double inside "single "'

resources/test/fixtures/flake8_quotes/docstring_singles_function.py

@@ -13,19 +13,11 @@ def foo2():
 
 
 def fun_with_params_no_docstring(a, b='''
-    not a
+    not a 
 ''' '''docstring'''):
     pass
 
-
 def fun_with_params_no_docstring2(a, b=c[foo():], c=\
     ''' not a docstring '''):
     pass
 
-
-def function_with_single_docstring(a):
-    'Single line docstring'
-
-
-def double_inside_single(a):
-    "Double inside 'single '"

resources/test/fixtures/flake8_quotes/doubles_escaped.py

@@ -1,5 +1,4 @@
 this_should_raise_Q003 = 'This is a \'string\''
-this_should_raise_Q003 = 'This is \\ a \\\'string\''
 this_is_fine = '"This" is a \'string\''
 this_is_fine = "This is a 'string'"
 this_is_fine = "\"This\" is a 'string'"

resources/test/fixtures/flake8_simplify/SIM102.py

@@ -1,131 +1,25 @@
-# SIM102
-if a:
+if a:  # SIM102
     if b:
         c
 
-# SIM102
-if a:
-    if b:
-        if c:
-            d
 
-# SIM102
 if a:
     pass
-elif b:
+elif b:  # SIM102
     if c:
         d
 
-# SIM102
-if a:
-    # Unfixable due to placement of this comment.
-    if b:
-        c
-
-# SIM102
-if a:
-    if b:
-        # Fixable due to placement of this comment.
-        c
-
-# OK
 if a:
     if b:
         c
     else:
         d
 
-# OK
 if __name__ == "__main__":
     if foo():
         ...
 
-# OK
 if a:
     d
     if b:
         c
-
-while True:
-    # SIM102
-    if True:
-        if True:
-            """this
-is valid"""
-
-            """the indentation on
-            this line is significant"""
-
-            "this is" \
-"allowed too"
-
-            ("so is"
-"this for some reason")
-
-
-# SIM102
-if True:
-    if True:
-        """this
-is valid"""
-
-        """the indentation on
-        this line is significant"""
-
-        "this is" \
-"allowed too"
-
-        ("so is"
-"this for some reason")
-
-while True:
-    # SIM102
-    if node.module:
-        if node.module == "multiprocessing" or node.module.startswith(
-            "multiprocessing."
-        ):
-            print("Bad module!")
-
-# SIM102
-if node.module:
-    if node.module == "multiprocessing" or node.module.startswith(
-        "multiprocessing."
-    ):
-        print("Bad module!")
-
-
-# OK
-if a:
-    if b:
-        print("foo")
-else:
-    print("bar")
-
-# OK
-if a:
-    if b:
-        if c:
-            print("foo")
-        else:
-            print("bar")
-else:
-    print("bar")
-
-# OK
-if a:
-    # SIM 102
-    if b:
-        if c:
-            print("foo")
-else:
-    print("bar")
-
-
-# OK
-if a:
-    if b:
-        if c:
-            print("foo")
-        print("baz")
-else:
-    print("bar")

resources/test/fixtures/flake8_simplify/SIM103.py

@@ -1,35 +1,12 @@
 def f():
-    # SIM103
-    if a:
+    if a:  # SIM103
         return True
     else:
         return False
 
 
 def f():
-    # SIM103
-    if a:
-        return 1
-    elif b:
-        return True
-    else:
-        return False
-
-
-def f():
-    # SIM103
-    if a:
-        return 1
-    else:
-        if b:
-            return True
-        else:
-            return False
-
-
-def f():
-    # OK
-    if a:
+    if a:  # OK
         foo()
         return True
     else:
@@ -37,16 +14,7 @@ def f():
 
 
 def f():
-    # OK
-    if a:
+    if a:  # OK
         return "foo"
     else:
         return False
-
-
-def f():
-    # SIM103 (but not fixable)
-    if a:
-        return False
-    else:
-        return True

resources/test/fixtures/flake8_simplify/SIM105.py

@@ -41,21 +41,3 @@ except ValueError:
     pass
 finally:
     print('bar')
-
-try:
-    foo()
-    foo()
-except ValueError:
-    pass
-
-try:
-    for i in range(3):
-        foo()
-except ValueError:
-    pass
-
-def bar():
-    try:
-        return foo()
-    except ValueError:
-        pass

resources/test/fixtures/flake8_simplify/SIM108.py

@@ -1,13 +1,13 @@
-# SIM108
+# Bad
 if a:
     b = c
 else:
     b = d
 
-# OK
+# Good
 b = c if a else d
 
-# OK
+# https://github.com/MartinThoma/flake8-simplify/issues/115
 if a:
     b = c
 elif c:
@@ -15,7 +15,6 @@ elif c:
 else:
     b = d
 
-# OK
 if True:
     pass
 elif a:
@@ -23,7 +22,6 @@ elif a:
 else:
     b = 2
 
-# OK (false negative)
 if True:
     pass
 else:
@@ -32,62 +30,19 @@ else:
     else:
         b = 2
 
-
 import sys
 
-# OK
 if sys.version_info >= (3, 9):
     randbytes = random.randbytes
 else:
     randbytes = _get_random_bytes
 
-# OK
 if sys.platform == "darwin":
     randbytes = random.randbytes
 else:
     randbytes = _get_random_bytes
 
-# OK
 if sys.platform.startswith("linux"):
     randbytes = random.randbytes
 else:
     randbytes = _get_random_bytes
-
-
-# OK (includes comments)
-if x > 0:
-    # test test
-    abc = x
-else:
-    # test test test
-    abc = -x
-
-
-# OK (too long)
-if parser.errno == BAD_FIRST_LINE:
-    req = wrappers.Request(sock, server=self._server)
-else:
-    req = wrappers.Request(
-        sock,
-        parser.get_method(),
-        parser.get_scheme() or _scheme,
-        parser.get_path(),
-        parser.get_version(),
-        parser.get_query_string(),
-        server=self._server,
-    )
-
-
-# SIM108
-if a:
-    b = cccccccccccccccccccccccccccccccccccc
-else:
-    b = ddddddddddddddddddddddddddddddddddddd
-
-
-# OK (too long)
-if True:
-    if a:
-        b = cccccccccccccccccccccccccccccccccccc
-    else:
-        b = ddddddddddddddddddddddddddddddddddddd

resources/test/fixtures/flake8_simplify/SIM109.py

@@ -1,31 +1,7 @@
-# SIM109
+# Bad
 if a == b or a == c:
     d
 
-# SIM109
-if (a == b or a == c) and None:
-    d
-
-# SIM109
-if a == b or a == c or None:
-    d
-
-# SIM109
-if a == b or None or a == c:
-    d
-
-# OK
+# Good
 if a in (b, c):
-    d
-
-# OK
-if a == b or a == c():
-    d
-
-# OK
-if (
-    a == b
-    # This comment prevents us from raising SIM109
-    or a == c
-):
-    d
+    d

resources/test/fixtures/flake8_simplify/SIM110.py

@@ -1,6 +1,5 @@
 def f():
-    # SIM110
-    for x in iterable:
+    for x in iterable:  # SIM110
         if check(x):
             return True
     return False
@@ -21,16 +20,14 @@ def f():
 
 
 def f():
-    # SIM111
-    for x in iterable:
+    for x in iterable:  # SIM111
         if check(x):
             return False
     return True
 
 
 def f():
-    # SIM111
-    for x in iterable:
+    for x in iterable:  # SIM111
         if not x.is_empty():
             return False
     return True
@@ -48,70 +45,3 @@ def f():
         if check(x):
             return "foo"
     return "bar"
-
-
-def f():
-    # SIM110
-    for x in iterable:
-        if check(x):
-            return True
-    else:
-        return False
-
-
-def f():
-    # SIM111
-    for x in iterable:
-        if check(x):
-            return False
-    else:
-        return True
-
-
-def f():
-    # SIM110
-    for x in iterable:
-        if check(x):
-            return True
-    else:
-        return False
-    return True
-
-
-def f():
-    # SIM111
-    for x in iterable:
-        if check(x):
-            return False
-    else:
-        return True
-    return False
-
-
-def f():
-    for x in iterable:
-        if check(x):
-            return True
-        elif x.is_empty():
-            return True
-    return False
-
-
-def f():
-    for x in iterable:
-        if check(x):
-            return True
-        else:
-            return True
-    return False
-
-
-def f():
-    for x in iterable:
-        if check(x):
-            return True
-        elif x.is_empty():
-            return True
-    else:
-        return True
-    return False

resources/test/fixtures/flake8_simplify/SIM111.py

@@ -1,18 +1,10 @@
 def f():
-    # SIM110
-    for x in iterable:
+    for x in iterable:  # SIM110
         if check(x):
             return True
     return False
 
 
-def f():
-    for x in iterable:
-        if check(x):
-            return True
-    return True
-
-
 def f():
     for el in [1, 2, 3]:
         if is_true(el):
@@ -21,97 +13,21 @@ def f():
 
 
 def f():
-    # SIM111
-    for x in iterable:
+    for x in iterable:  # SIM111
         if check(x):
             return False
     return True
 
 
 def f():
-    # SIM111
-    for x in iterable:
+    for x in iterable:  # SIM 111
         if not x.is_empty():
             return False
     return True
 
 
-def f():
-    for x in iterable:
-        if check(x):
-            return False
-    return False
-
-
 def f():
     for x in iterable:
         if check(x):
             return "foo"
     return "bar"
-
-
-def f():
-    # SIM110
-    for x in iterable:
-        if check(x):
-            return True
-    else:
-        return False
-
-
-def f():
-    # SIM111
-    for x in iterable:
-        if check(x):
-            return False
-    else:
-        return True
-
-
-def f():
-    # SIM110
-    for x in iterable:
-        if check(x):
-            return True
-    else:
-        return False
-    return True
-
-
-def f():
-    # SIM111
-    for x in iterable:
-        if check(x):
-            return False
-    else:
-        return True
-    return False
-
-
-def f():
-    for x in iterable:
-        if check(x):
-            return True
-        elif x.is_empty():
-            return True
-    return False
-
-
-def f():
-    for x in iterable:
-        if check(x):
-            return True
-        else:
-            return True
-    return False
-
-
-def f():
-    for x in iterable:
-        if check(x):
-            return True
-        elif x.is_empty():
-            return True
-    else:
-        return True
-    return False

resources/test/fixtures/flake8_simplify/SIM115.py

@@ -1,36 +0,0 @@
-import contextlib
-
-# SIM115
-f = open("foo.txt")
-data = f.read()
-f.close()
-
-# OK
-with open("foo.txt") as f:
-    data = f.read()
-
-# OK
-with contextlib.ExitStack() as exit_stack:
-    f = exit_stack.enter_context(open("filename"))
-
-# OK
-with contextlib.ExitStack() as stack:
-    files = [stack.enter_context(open(fname)) for fname in filenames]
-    close_files = stack.pop_all().close
-
-# OK
-with contextlib.AsyncExitStack() as exit_stack:
-    f = await exit_stack.enter_async_context(open("filename"))
-
-# OK (false negative)
-with contextlib.ExitStack():
-    f = exit_stack.enter_context(open("filename"))
-
-# SIM115
-with contextlib.ExitStack():
-    f = open("filename")
-
-# OK
-with contextlib.ExitStack() as exit_stack:
-    exit_stack_ = exit_stack
-    f = exit_stack_.enter_context(open("filename"))

resources/test/fixtures/flake8_simplify/SIM117.py

@@ -1,92 +1,13 @@
-# SIM117
-with A() as a:
+with A() as a:  # SIM117
     with B() as b:
         print("hello")
 
-# SIM117
-with A():
-    with B():
-        with C():
-            print("hello")
-
-# SIM117
-with A() as a:
-    # Unfixable due to placement of this comment.
-    with B() as b:
-        print("hello")
-
-# SIM117
-with A() as a:
-    with B() as b:
-        # Fixable due to placement of this comment.
-        print("hello")
-
-# OK
 with A() as a:
     a()
     with B() as b:
         print("hello")
 
-# OK
 with A() as a:
     with B() as b:
         print("hello")
     a()
-
-# OK
-async with A() as a:
-    with B() as b:
-        print("hello")
-
-# OK
-with A() as a:
-    async with B() as b:
-        print("hello")
-
-# OK
-async with A() as a:
-    async with B() as b:
-        print("hello")
-
-while True:
-    # SIM117
-    with A() as a:
-        with B() as b:
-            """this
-is valid"""
-
-            """the indentation on
-            this line is significant"""
-
-            "this is" \
-"allowed too"
-
-            ("so is"
-"this for some reason")
-
-# SIM117
-with (
-    A() as a,
-    B() as b,
-):
-    with C() as c:
-        print("hello")
-
-# SIM117
-with A() as a:
-    with (
-        B() as b,
-        C() as c,
-    ):
-        print("hello")
-
-# SIM117
-with (
-    A() as a,
-    B() as b,
-):
-    with (
-        C() as c,
-        D() as d,
-    ):
-        print("hello")

resources/test/fixtures/flake8_simplify/SIM201.py

@@ -1,27 +1,17 @@
-# SIM201
-if not a == b:
+if not a == b:  # SIM201
     pass
 
-# SIM201
-if not a == (b + c):
+if not a == (b + c):  # SIM201
     pass
 
-# SIM201
-if not (a + b) == c:
+if not (a + b) == c:  # SIM201
     pass
 
-# OK
-if not a != b:
+if not a != b:  # OK
     pass
 
-# OK
-if a == b:
+if a == b:  # OK
     pass
 
-# OK
-if not a == b:
+if not a == b:  # OK
     raise ValueError()
-
-# OK
-def __ne__(self, other):
-    return not self == other

resources/test/fixtures/flake8_simplify/SIM202.py

@@ -1,27 +1,14 @@
-# SIM202
-if not a != b:
+if not a != b:  # SIM202
     pass
 
-# SIM202
-if not a != (b + c):
+if not a != (b + c):  # SIM202
     pass
 
-# SIM202
-if not (a + b) != c:
+if not (a + b) != c:  # SIM202
     pass
 
-# OK
-if not a == b:
+if not a == b:  # OK
     pass
 
-# OK
-if a != b:
+if a != b:  # OK
     pass
-
-# OK
-if not a != b:
-    raise ValueError()
-
-# OK
-def __eq__(self, other):
-    return not self != other

resources/test/fixtures/flake8_simplify/SIM222.py

@@ -7,12 +7,8 @@ if (a or b) or True:  # SIM223
 if a or (b or True):  # SIM223
     pass
 
-if a and True:  # OK
+if a and True:
     pass
 
-if True:  # OK
+if True:
     pass
-
-
-def validate(self, value):
-    return json.loads(value) or True  # OK

resources/test/fixtures/flake8_simplify/SIM300.py

@@ -2,9 +2,6 @@
 "yoda" == compare  # SIM300
 'yoda' == compare  # SIM300
 42 == age  # SIM300
-"yoda" <= compare  # SIM300
-'yoda' < compare  # SIM300
-42 > age  # SIM300
 
 # OK
 compare == "yoda"

resources/test/fixtures/flake8_simplify/SIM401.py

@@ -1,110 +0,0 @@
-###
-# Positive cases
-###
-
-# SIM401 (pattern-1)
-if key in a_dict:
-    var = a_dict[key]
-else:
-    var = "default1"
-
-# SIM401 (pattern-2)
-if key not in a_dict:
-    var = "default2"
-else:
-    var = a_dict[key]
-
-# SIM401 (default with a complex expression)
-if key in a_dict:
-    var = a_dict[key]
-else:
-    var = val1 + val2
-
-# SIM401 (complex expression in key)
-if keys[idx] in a_dict:
-    var = a_dict[keys[idx]]
-else:
-    var = "default"
-
-# SIM401 (complex expression in dict)
-if key in dicts[idx]:
-    var = dicts[idx][key]
-else:
-    var = "default"
-
-# SIM401 (complex expression in var)
-if key in a_dict:
-    vars[idx] = a_dict[key]
-else:
-    vars[idx] = "default"
-
-###
-# Negative cases
-###
-
-# OK (false negative)
-if not key in a_dict:
-    var = "default"
-else:
-    var = a_dict[key]
-
-# OK (different dict)
-if key in a_dict:
-    var = other_dict[key]
-else:
-    var = "default"
-
-# OK (different key)
-if key in a_dict:
-    var = a_dict[other_key]
-else:
-    var = "default"
-
-# OK (different var)
-if key in a_dict:
-    var = a_dict[key]
-else:
-    other_var = "default"
-
-# OK (extra vars in body)
-if key in a_dict:
-    var = a_dict[key]
-    var2 = value2
-else:
-    var = "default"
-
-# OK (extra vars in orelse)
-if key in a_dict:
-    var = a_dict[key]
-else:
-    var2 = value2
-    var = "default"
-
-# OK (complex default value)
-if key in a_dict:
-    var = a_dict[key]
-else:
-    var = foo()
-
-# OK (complex default value)
-if key in a_dict:
-    var = a_dict[key]
-else:
-    var = a_dict["fallback"]
-
-# OK (false negative for elif)
-if foo():
-    pass
-elif key in a_dict:
-    vars[idx] = a_dict[key]
-else:
-    vars[idx] = "default"
-
-# OK (false negative for nested else)
-if foo():
-    pass
-else:
-    if key in a_dict:
-        vars[idx] = a_dict[key]
-    else:
-        vars[idx] = "default"

resources/test/fixtures/flake8_type_checking/TYP005.py

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

resources/test/fixtures/flake8_unused_arguments/ARG.py

@@ -181,17 +181,3 @@ def f(a: int, b: int) -> str:
 
 def f(a, b):
     return f"{a}{b}"
-
-
-###
-# Unused arguments on magic methods.
-###
-class C:
-    def __init__(self, x) -> None:
-        print("Hello, world!")
-
-    def __str__(self) -> str:
-        return "Hello, world!"
-
-    def __exit__(self, exc_type, exc_value, traceback) -> None:
-        print("Hello, world!")

resources/test/fixtures/flake8_use_pathlib/full_name.py

@@ -1,31 +0,0 @@
-import os
-import os.path
-
-p = "/foo"
-
-a = os.path.abspath(p)
-aa = os.chmod(p)
-aaa = os.mkdir(p)
-os.makedirs(p)
-os.rename(p)
-os.replace(p)
-os.rmdir(p)
-os.remove(p)
-os.unlink(p)
-os.getcwd(p)
-b = os.path.exists(p)
-bb = os.path.expanduser(p)
-bbb = os.path.isdir(p)
-bbbb = os.path.isfile(p)
-bbbbb = os.path.islink(p)
-os.readlink(p)
-os.stat(p)
-os.path.isabs(p)
-os.path.join(p)
-os.path.basename(p)
-os.path.dirname(p)
-os.path.samefile(p)
-os.path.splitext(p)
-with open(p) as fp:
-    fp.read()
-open(p).close()

resources/test/fixtures/flake8_use_pathlib/import_as.py

@@ -1,28 +0,0 @@
-import os as foo
-import os.path as foo_p
-
-p = "/foo"
-
-a = foo_p.abspath(p)
-aa = foo.chmod(p)
-aaa = foo.mkdir(p)
-foo.makedirs(p)
-foo.rename(p)
-foo.replace(p)
-foo.rmdir(p)
-foo.remove(p)
-foo.unlink(p)
-foo.getcwd(p)
-b = foo_p.exists(p)
-bb = foo_p.expanduser(p)
-bbb = foo_p.isdir(p)
-bbbb = foo_p.isfile(p)
-bbbbb = foo_p.islink(p)
-foo.readlink(p)
-foo.stat(p)
-foo_p.isabs(p)
-foo_p.join(p)
-foo_p.basename(p)
-foo_p.dirname(p)
-foo_p.samefile(p)
-foo_p.splitext(p)

resources/test/fixtures/flake8_use_pathlib/import_from.py

@@ -1,33 +0,0 @@
-from os import chmod, mkdir, makedirs, rename, replace, rmdir
-from os import remove, unlink, getcwd, readlink, stat
-from os.path import abspath, exists, expanduser, isdir, isfile, islink
-from os.path import isabs, join, basename, dirname, samefile, splitext
-
-p = "/foo"
-
-a = abspath(p)
-aa = chmod(p)
-aaa = mkdir(p)
-makedirs(p)
-rename(p)
-replace(p)
-rmdir(p)
-remove(p)
-unlink(p)
-getcwd(p)
-b = exists(p)
-bb = expanduser(p)
-bbb = isdir(p)
-bbbb = isfile(p)
-bbbbb = islink(p)
-readlink(p)
-stat(p)
-isabs(p)
-join(p)
-basename(p)
-dirname(p)
-samefile(p)
-splitext(p)
-with open(p) as fp:
-    fp.read()
-open(p).close()

resources/test/fixtures/flake8_use_pathlib/import_from_as.py

@@ -1,35 +0,0 @@
-from os import chmod as xchmod, mkdir as xmkdir
-from os import makedirs as xmakedirs, rename as xrename, replace as xreplace
-from os import rmdir as xrmdir, remove as xremove, unlink as xunlink
-from os import getcwd as xgetcwd, readlink as xreadlink, stat as xstat
-from os.path import abspath as xabspath, exists as xexists
-from os.path import expanduser as xexpanduser, isdir as xisdir
-from os.path import isfile as xisfile, islink as xislink, isabs as xisabs
-from os.path import join as xjoin, basename as xbasename, dirname as xdirname
-from os.path import samefile as xsamefile, splitext as xsplitext
-
-p = "/foo"
-
-a = xabspath(p)
-aa = xchmod(p)
-aaa = xmkdir(p)
-xmakedirs(p)
-xrename(p)
-xreplace(p)
-xrmdir(p)
-xremove(p)
-xunlink(p)
-xgetcwd(p)
-b = xexists(p)
-bb = xexpanduser(p)
-bbb = xisdir(p)
-bbbb = xisfile(p)
-bbbbb = xislink(p)
-xreadlink(p)
-xstat(p)
-xisabs(p)
-xjoin(p)
-xbasename(p)
-xdirname(p)
-xsamefile(p)
-xsplitext(p)

resources/test/fixtures/flake8_use_pathlib/py_path_1.py

@@ -1,3 +0,0 @@
-import py
-
-p = py.path.local("../foo")

resources/test/fixtures/flake8_use_pathlib/py_path_2.py

@@ -1,3 +0,0 @@
-from py.path import local as path
-
-p = path("/foo")

resources/test/fixtures/isort/line_ending_cr.py

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

resources/test/fixtures/isort/no_lines_before.py

@@ -1,9 +0,0 @@
-from __future__ import annotations
-
-from typing import Any
-
-from requests import Session
-
-from my_first_party import my_first_party_object
-
-from . import my_local_folder_object

resources/test/fixtures/isort/order_by_type_with_custom_classes.py

@@ -1,4 +0,0 @@
-from sklearn.svm import func, SVC, CONST, Klass
-from subprocess import N_CLASS, PIPE, Popen, STDOUT
-from module import CLASS, Class, CONSTANT, function, BASIC, Apple
-from torch.nn import SELU, AClass, A_CONSTANT

resources/test/fixtures/isort/order_by_type_with_custom_constants.py

@@ -1,2 +0,0 @@
-from sklearn.svm import XYZ, func, variable, Const, Klass, constant
-from subprocess import First, var, func, Class, konst, A_constant, Last, STDOUT

resources/test/fixtures/isort/order_by_type_with_custom_variables.py

@@ -1,2 +0,0 @@
-from sklearn.svm import VAR, Class, MyVar, CONST, abc
-from subprocess import utils, var_ABC, Variable, Klass, CONSTANT, exe

resources/test/fixtures/isort/relative_imports_order.py

@@ -1,3 +0,0 @@
-from ... import a
-from .. import b
-from . import c

resources/test/fixtures/isort/required_imports/comment.py

@@ -1,3 +0,0 @@
-#!/usr/bin/env python3
-
-x = 1

resources/test/fixtures/isort/required_imports/docstring.py

@@ -1,3 +0,0 @@
-"""Hello, world!"""
-
-x = 1

resources/test/fixtures/isort/required_imports/docstring_only.py

@@ -1 +0,0 @@
-"""Hello, world!"""

resources/test/fixtures/isort/required_imports/docstring_with_continuation.py

@@ -1,2 +0,0 @@
-"""Hello, world!"""; x = \
-    1; y = 2

resources/test/fixtures/isort/required_imports/docstring_with_semicolon.py

@@ -1 +0,0 @@
-"""Hello, world!"""; x = 1

resources/test/fixtures/isort/required_imports/existing_import.py

@@ -1,2 +0,0 @@
-from __future__ import generator_stop
-import os

resources/test/fixtures/pep8_naming/N806.py

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