Bump version to 0.0.234

After this change:

```shell
> time cargo run -- -n $(find ../django -type f -name '*.py')`
8.85s user 0.20s system 498% cpu 1.814 total
> time cargo run -- -n ../django
8.95s user 0.23s system 507% cpu 1.811 total
```

I also verified that we only hit the creation path once via some manual logging.

Closes #2154.

.github/workflows/ci.yaml

@@ -1,10 +1,6 @@
 name: CI
 
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
+on: [push, pull_request, workflow_dispatch]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
@@ -13,6 +9,7 @@ concurrency:
 env:
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
+  CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
 
 jobs:
@@ -96,7 +93,9 @@ jobs:
       - 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/
+      - run: |
+         ./scripts/add_plugin.py test --url https://pypi.org/project/-test/0.1.0/ --prefix TST
+         ./scripts/add_rule.py --name FirstRule --code TST001 --linter test
       - run: cargo check
 
 # TODO(charlie): Re-enable the `wasm-pack` tests.
@@ -151,7 +150,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Actions Repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Check spelling of file.txt
       uses: crate-ci/typos@master

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

@@ -12,6 +12,7 @@ env:
   PYTHON_VERSION: "3.7" # to build abi3 wheels
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
+  CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
 
 jobs:
@@ -38,7 +39,7 @@ jobs:
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -64,7 +65,7 @@ jobs:
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*universal2.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -96,7 +97,7 @@ jobs:
         run: |
           python -m pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -123,7 +124,7 @@ jobs:
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -144,7 +145,7 @@ jobs:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --no-default-features --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
-      - uses: uraimo/run-on-arch-action@v2.0.5
+      - uses: uraimo/run-on-arch-action@v2.5.0
         if: matrix.target != 'ppc64'
         name: Install built wheel
         with:
@@ -158,7 +159,7 @@ jobs:
           run: |
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -192,7 +193,7 @@ jobs:
             apk add py3-pip
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links /io/dist/ --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -228,7 +229,7 @@ jobs:
           run: |
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -262,7 +263,7 @@ jobs:
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -280,7 +281,7 @@ jobs:
       - musllinux-cross
       - pypy
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: wheels
       - uses: actions/setup-python@v4

.github/workflows/playground.yaml

@@ -8,6 +8,7 @@ on:
 env:
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
+  CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
 
 jobs:

.github/workflows/ruff.yaml

@@ -1,6 +1,7 @@
 name: "[ruff] Release"
 
 on:
+  workflow_dispatch:
   release:
     types: [published]
 
@@ -13,6 +14,7 @@ env:
   PYTHON_VERSION: "3.7" # to build abi3 wheels
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
+  CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
 
 jobs:
@@ -39,7 +41,7 @@ jobs:
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -65,7 +67,7 @@ jobs:
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*universal2.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -97,7 +99,7 @@ jobs:
         run: |
           python -m pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -124,7 +126,7 @@ jobs:
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -145,7 +147,7 @@ jobs:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --no-default-features --release --out dist
-      - uses: uraimo/run-on-arch-action@v2.0.5
+      - uses: uraimo/run-on-arch-action@v2.5.0
         if: matrix.target != 'ppc64'
         name: Install built wheel
         with:
@@ -159,7 +161,7 @@ jobs:
           run: |
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -193,7 +195,7 @@ jobs:
             apk add py3-pip
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links /io/dist/ --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -229,7 +231,7 @@ jobs:
           run: |
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -263,7 +265,7 @@ jobs:
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -282,7 +284,7 @@ jobs:
       - pypy
     if: "startsWith(github.ref, 'refs/tags/')"
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: wheels
       - uses: actions/setup-python@v4

.pre-commit-config.yaml

@@ -1,8 +1,10 @@
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.229
+    rev: v0.0.234
     hooks:
       - id: ruff
+        args: [--fix]
+        exclude: ^resources
 
   - repo: https://github.com/abravalheri/validate-pyproject
     rev: v0.10.1
@@ -13,6 +15,6 @@ repos:
     hooks:
       - id: cargo-fmt
         name: cargo fmt
-        entry: cargo fmt --
+        entry: cargo +nightly fmt --
         language: rust
         types: [rust]

CONTRIBUTING.md

@@ -14,9 +14,10 @@ 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 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.
+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.
 
 ### Prerequisites
 
@@ -45,7 +46,7 @@ For rustfmt and Clippy, we use [nightly Rust][nightly], as it is stricter than s
 
 ```shell
 cargo +nightly fmt --all     # Auto-formatting...
-cargo +nightly clippy --fix --workspace --all-targets --all-features -- -W clippy::pedantic  # Linting...
+cargo +nightly clippy --fix --workspace --all-targets --all-features  # Linting...
 cargo test --all    # Testing...
 ```
 

Cargo.lock

@@ -719,7 +719,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.229"
+version = "0.0.234"
 dependencies = [
  "anyhow",
  "clap 4.0.32",
@@ -733,7 +733,7 @@ dependencies = [
  "serde_json",
  "strum",
  "strum_macros",
- "toml_edit",
+ "toml 0.6.0",
 ]
 
 [[package]]
@@ -984,6 +984,15 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "is_executable"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -1633,7 +1642,7 @@ checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
 dependencies = [
  "once_cell",
  "thiserror",
- "toml",
+ "toml 0.5.11",
 ]
 
 [[package]]
@@ -1826,19 +1835,9 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "ropey"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd22239fafefc42138ca5da064f3c17726a80d2379d817a3521240e78dd0064"
-dependencies = [
- "smallvec",
- "str_indices",
-]
-
 [[package]]
 name = "ruff"
-version = "0.0.229"
+version = "0.0.234"
 dependencies = [
  "anyhow",
  "bitflags",
@@ -1857,6 +1856,7 @@ dependencies = [
  "ignore",
  "imperative",
  "insta",
+ "is_executable",
  "itertools",
  "js-sys",
  "libcst",
@@ -1868,12 +1868,11 @@ dependencies = [
  "once_cell",
  "path-absolutize",
  "regex",
- "ropey",
  "ruff_macros",
  "rustc-hash",
- "rustpython-ast 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=62aa942bf506ea3d41ed0503b947b84141fdaa3c)",
- "rustpython-common 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=62aa942bf506ea3d41ed0503b947b84141fdaa3c)",
- "rustpython-parser 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=62aa942bf506ea3d41ed0503b947b84141fdaa3c)",
+ "rustpython-ast",
+ "rustpython-common",
+ "rustpython-parser",
  "schemars",
  "semver",
  "serde",
@@ -1886,14 +1885,14 @@ dependencies = [
  "textwrap",
  "thiserror",
  "titlecase",
- "toml_edit",
+ "toml 0.6.0",
  "wasm-bindgen",
  "wasm-bindgen-test",
 ]
 
 [[package]]
 name = "ruff_cli"
-version = "0.0.229"
+version = "0.0.234"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
@@ -1930,7 +1929,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_dev"
-version = "0.0.229"
+version = "0.0.234"
 dependencies = [
  "anyhow",
  "clap 4.0.32",
@@ -1939,9 +1938,9 @@ dependencies = [
  "once_cell",
  "ruff",
  "ruff_cli",
- "rustpython-ast 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa)",
- "rustpython-common 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa)",
- "rustpython-parser 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa)",
+ "rustpython-ast",
+ "rustpython-common",
+ "rustpython-parser",
  "schemars",
  "serde_json",
  "strum",
@@ -1951,7 +1950,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_macros"
-version = "0.0.229"
+version = "0.0.234"
 dependencies = [
  "once_cell",
  "proc-macro2",
@@ -2005,52 +2004,17 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=62aa942bf506ea3d41ed0503b947b84141fdaa3c#62aa942bf506ea3d41ed0503b947b84141fdaa3c"
+source = "git+https://github.com/RustPython/RustPython.git?rev=4f38cb68e4a97aeea9eb19673803a0bd5f655383#4f38cb68e4a97aeea9eb19673803a0bd5f655383"
 dependencies = [
  "num-bigint",
- "rustpython-common 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=62aa942bf506ea3d41ed0503b947b84141fdaa3c)",
- "rustpython-compiler-core 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=62aa942bf506ea3d41ed0503b947b84141fdaa3c)",
-]
-
-[[package]]
-name = "rustpython-ast"
-version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa#ff90fe52eea578c8ebdd9d95e078cc041a5959fa"
-dependencies = [
- "num-bigint",
- "rustpython-common 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa)",
- "rustpython-compiler-core 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa)",
+ "rustpython-common",
+ "rustpython-compiler-core",
 ]
 
 [[package]]
 name = "rustpython-common"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=62aa942bf506ea3d41ed0503b947b84141fdaa3c#62aa942bf506ea3d41ed0503b947b84141fdaa3c"
-dependencies = [
- "ascii",
- "bitflags",
- "cfg-if",
- "hexf-parse",
- "itertools",
- "lexical-parse-float",
- "libc",
- "lock_api",
- "num-bigint",
- "num-complex",
- "num-traits",
- "once_cell",
- "radium",
- "rand",
- "siphasher",
- "unic-ucd-category",
- "volatile",
- "widestring",
-]
-
-[[package]]
-name = "rustpython-common"
-version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa#ff90fe52eea578c8ebdd9d95e078cc041a5959fa"
+source = "git+https://github.com/RustPython/RustPython.git?rev=4f38cb68e4a97aeea9eb19673803a0bd5f655383#4f38cb68e4a97aeea9eb19673803a0bd5f655383"
 dependencies = [
  "ascii",
  "bitflags",
@@ -2075,24 +2039,7 @@ dependencies = [
 [[package]]
 name = "rustpython-compiler-core"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=62aa942bf506ea3d41ed0503b947b84141fdaa3c#62aa942bf506ea3d41ed0503b947b84141fdaa3c"
-dependencies = [
- "bincode",
- "bitflags",
- "bstr 0.2.17",
- "itertools",
- "lz4_flex",
- "num-bigint",
- "num-complex",
- "num_enum",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "rustpython-compiler-core"
-version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa#ff90fe52eea578c8ebdd9d95e078cc041a5959fa"
+source = "git+https://github.com/RustPython/RustPython.git?rev=4f38cb68e4a97aeea9eb19673803a0bd5f655383#4f38cb68e4a97aeea9eb19673803a0bd5f655383"
 dependencies = [
  "bincode",
  "bitflags",
@@ -2109,7 +2056,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=62aa942bf506ea3d41ed0503b947b84141fdaa3c#62aa942bf506ea3d41ed0503b947b84141fdaa3c"
+source = "git+https://github.com/RustPython/RustPython.git?rev=4f38cb68e4a97aeea9eb19673803a0bd5f655383#4f38cb68e4a97aeea9eb19673803a0bd5f655383"
 dependencies = [
  "ahash",
  "anyhow",
@@ -2122,33 +2069,8 @@ dependencies = [
  "phf 0.10.1",
  "phf_codegen 0.10.0",
  "rustc-hash",
- "rustpython-ast 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=62aa942bf506ea3d41ed0503b947b84141fdaa3c)",
- "rustpython-compiler-core 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=62aa942bf506ea3d41ed0503b947b84141fdaa3c)",
- "thiserror",
- "tiny-keccak",
- "unic-emoji-char",
- "unic-ucd-ident",
- "unicode_names2",
-]
-
-[[package]]
-name = "rustpython-parser"
-version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa#ff90fe52eea578c8ebdd9d95e078cc041a5959fa"
-dependencies = [
- "ahash",
- "anyhow",
- "itertools",
- "lalrpop",
- "lalrpop-util",
- "log",
- "num-bigint",
- "num-traits",
- "phf 0.10.1",
- "phf_codegen 0.10.0",
- "rustc-hash",
- "rustpython-ast 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa)",
- "rustpython-compiler-core 0.2.0 (git+https://github.com/RustPython/RustPython.git?rev=ff90fe52eea578c8ebdd9d95e078cc041a5959fa)",
+ "rustpython-ast",
+ "rustpython-compiler-core",
  "thiserror",
  "tiny-keccak",
  "unic-emoji-char",
@@ -2288,6 +2210,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c68e921cef53841b8925c2abadd27c9b891d9613bdc43d6b823062866df38e8"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "shellexpand"
 version = "3.0.0"
@@ -2333,12 +2264,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "str_indices"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f026164926842ec52deb1938fae44f83dfdb82d0a5b0270c5bd5935ab74d6dd"
-
 [[package]]
 name = "string_cache"
 version = "0.8.4"
@@ -2574,32 +2499,44 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.10"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
  "serde",
 ]
 
 [[package]]
-name = "toml_datetime"
-version = "0.5.0"
+name = "toml"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808b51e57d0ef8f71115d8f3a01e7d3750d01c79cac4b3eda910f4389fdf92fd"
+checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.17.1"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34cc558345efd7e88b9eda9626df2138b80bb46a7606f695e751c892bc7dac6"
+checksum = "729bfd096e40da9c001f778f5cdecbd2957929a24e10e5883d9392220a751581"
 dependencies = [
  "indexmap",
- "itertools",
  "nom8",
  "serde",
+ "serde_spanned",
  "toml_datetime",
 ]
 

Cargo.toml

@@ -8,7 +8,7 @@ default-members = [".", "ruff_cli"]
 
 [package]
 name = "ruff"
-version = "0.0.229"
+version = "0.0.234"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 edition = "2021"
 rust-version = "1.65.0"
@@ -46,12 +46,11 @@ num-traits = "0.2.15"
 once_cell = { version = "1.16.0" }
 path-absolutize = { version = "3.0.14", features = ["once_cell_cache", "use_unix_paths_on_wasm"] }
 regex = { version = "1.6.0" }
-ropey = { version = "1.5.0", features = ["cr_lines", "simd"], default-features = false }
-ruff_macros = { version = "0.0.229", path = "ruff_macros" }
+ruff_macros = { version = "0.0.234", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "62aa942bf506ea3d41ed0503b947b84141fdaa3c" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "62aa942bf506ea3d41ed0503b947b84141fdaa3c" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "62aa942bf506ea3d41ed0503b947b84141fdaa3c" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
 schemars = { version = "0.8.11" }
 semver = { version = "1.0.16" }
 serde = { version = "1.0.147", features = ["derive"] }
@@ -62,7 +61,7 @@ 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"] }
+toml = { version = "0.6.0" }
 
 # https://docs.rs/getrandom/0.2.7/getrandom/#webassembly-support
 # For (future) wasm-pack support
@@ -74,6 +73,9 @@ serde-wasm-bindgen = { version = "0.4" }
 js-sys = { version = "0.3.60" }
 wasm-bindgen = { version = "0.2.83" }
 
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
+is_executable = "1.0.1"
+
 [dev-dependencies]
 insta = { version = "1.19.1", features = ["yaml"] }
 test-case = { version = "2.2.2" }
@@ -98,7 +100,3 @@ opt-level = 3
 # https://github.com/bytecodealliance/wasm-tools/blob/b5c3d98e40590512a3b12470ef358d5c7b983b15/crates/wasmparser/src/limits.rs#L29
 [profile.dev.package.rustpython-parser]
 opt-level = 1
-
-[[bench]]
-name = "source_code_locator"
-harness = false

README.md

@@ -51,18 +51,23 @@ Ruff is extremely actively developed and used in major open-source projects like
 - [Apache Airflow](https://github.com/apache/airflow)
 - [Bokeh](https://github.com/bokeh/bokeh)
 - [Zulip](https://github.com/zulip/zulip)
-- [Dagster](https://github.com/dagster-io/dagster)
 - [Pydantic](https://github.com/pydantic/pydantic)
+- [Dagster](https://github.com/dagster-io/dagster)
+- [Dagger](https://github.com/dagger/dagger)
 - [Sphinx](https://github.com/sphinx-doc/sphinx)
 - [Hatch](https://github.com/pypa/hatch)
 - [Jupyter](https://github.com/jupyter-server/jupyter_server)
-- [Synapse (Matrix)](https://github.com/matrix-org/synapse)
-- [Saleor](https://github.com/saleor/saleor)
+- [Great Expectations](https://github.com/great-expectations/great_expectations)
 - [Polars](https://github.com/pola-rs/polars)
 - [Ibis](https://github.com/ibis-project/ibis)
-- [OpenBB](https://github.com/OpenBB-finance/OpenBBTerminal)
-- [Cryptography (PyCA)](https://github.com/pyca/cryptography)
+- [Synapse (Matrix)](https://github.com/matrix-org/synapse)
 - [SnowCLI (Snowflake)](https://github.com/Snowflake-Labs/snowcli)
+- [Saleor](https://github.com/saleor/saleor)
+- [OpenBB](https://github.com/OpenBB-finance/OpenBBTerminal)
+- [Home Assistant](https://github.com/home-assistant/core)
+- [Cryptography (PyCA)](https://github.com/pyca/cryptography)
+- [cibuildwheel (PyPA)](https://github.com/pypa/cibuildwheel)
+- [Babel](https://github.com/python-babel/babel)
 
 Read the [launch blog post](https://notes.crmarsh.com/python-tooling-could-be-much-much-faster).
 
@@ -134,13 +139,14 @@ developer of [Zulip](https://github.com/zulip/zulip):
    1. [eradicate (ERA)](#eradicate-era)
    1. [pandas-vet (PD)](#pandas-vet-pd)
    1. [pygrep-hooks (PGH)](#pygrep-hooks-pgh)
-   1. [Pylint (PLC, PLE, PLR, PLW)](#pylint-plc-ple-plr-plw)
+   1. [Pylint (PL)](#pylint-pl)
    1. [flake8-pie (PIE)](#flake8-pie-pie)
    1. [flake8-commas (COM)](#flake8-commas-com)
    1. [flake8-no-pep420 (INP)](#flake8-no-pep420-inp)
    1. [flake8-executable (EXE)](#flake8-executable-exe)
-   1. [flake8-type-checking (TYP)](#flake8-type-checking-typ)
+   1. [flake8-type-checking (TCH)](#flake8-type-checking-tch)
    1. [tryceratops (TRY)](#tryceratops-try)
+   1. [flake8-use-pathlib (PTH)](#flake8-use-pathlib-pth)
    1. [Ruff-specific rules (RUF)](#ruff-specific-rules-ruf)<!-- End auto-generated table of contents. -->
 1. [Editor Integrations](#editor-integrations)
 1. [FAQ](#faq)
@@ -178,6 +184,12 @@ For **Arch Linux** users, Ruff is also available as [`ruff`](https://archlinux.o
 pacman -S ruff
 ```
 
+For **Alpine** users, Ruff is also available as [`ruff`](https://pkgs.alpinelinux.org/package/edge/testing/x86_64/ruff) on the testing repositories:
+
+```shell
+apk add ruff
+```
+
 [![Packaging status](https://repology.org/badge/vertical-allrepos/ruff-python-linter.svg?exclude_unsupported=1)](https://repology.org/project/ruff-python-linter/versions)
 
 ### Usage
@@ -201,7 +213,7 @@ Ruff also works with [pre-commit](https://pre-commit.com):
 ```yaml
 - repo: https://github.com/charliermarsh/ruff-pre-commit
   # Ruff version.
-  rev: 'v0.0.229'
+  rev: 'v0.0.234'
   hooks:
     - id: ruff
 ```
@@ -544,7 +556,7 @@ The 🛠 emoji indicates that a rule is automatically fixable by the `--fix` com
 <!-- Begin auto-generated sections. -->
 ### Pyflakes (F)
 
-For more, see [Pyflakes](https://pypi.org/project/pyflakes/2.5.0/) on PyPI.
+For more, see [Pyflakes](https://pypi.org/project/pyflakes/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -594,7 +606,7 @@ For more, see [Pyflakes](https://pypi.org/project/pyflakes/2.5.0/) on PyPI.
 
 ### pycodestyle (E, W)
 
-For more, see [pycodestyle](https://pypi.org/project/pycodestyle/2.9.1/) on PyPI.
+For more, see [pycodestyle](https://pypi.org/project/pycodestyle/) on PyPI.
 
 #### Error (E)
 | Code | Name | Message | Fix |
@@ -625,7 +637,7 @@ For more, see [pycodestyle](https://pypi.org/project/pycodestyle/2.9.1/) on PyPI
 
 ### mccabe (C90)
 
-For more, see [mccabe](https://pypi.org/project/mccabe/0.7.0/) on PyPI.
+For more, see [mccabe](https://pypi.org/project/mccabe/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -633,7 +645,7 @@ For more, see [mccabe](https://pypi.org/project/mccabe/0.7.0/) on PyPI.
 
 ### isort (I)
 
-For more, see [isort](https://pypi.org/project/isort/5.10.1/) on PyPI.
+For more, see [isort](https://pypi.org/project/isort/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -642,7 +654,7 @@ For more, see [isort](https://pypi.org/project/isort/5.10.1/) on PyPI.
 
 ### pydocstyle (D)
 
-For more, see [pydocstyle](https://pypi.org/project/pydocstyle/6.1.1/) on PyPI.
+For more, see [pydocstyle](https://pypi.org/project/pydocstyle/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -666,8 +678,8 @@ For more, see [pydocstyle](https://pypi.org/project/pydocstyle/6.1.1/) on PyPI.
 | D209 | new-line-after-last-paragraph | Multi-line docstring closing quotes should be on a separate line | 🛠 |
 | D210 | no-surrounding-whitespace | No whitespaces allowed surrounding docstring text | 🛠 |
 | D211 | no-blank-line-before-class | No blank lines allowed before class docstring | 🛠 |
-| D212 | multi-line-summary-first-line | Multi-line docstring summary should start at the first line |  |
-| D213 | multi-line-summary-second-line | Multi-line docstring summary should start at the second line |  |
+| D212 | multi-line-summary-first-line | Multi-line docstring summary should start at the first line | 🛠 |
+| D213 | multi-line-summary-second-line | Multi-line docstring summary should start at the second line | 🛠 |
 | D214 | section-not-over-indented | Section is over-indented ("{name}") | 🛠 |
 | D215 | section-underline-not-over-indented | Section underline is over-indented ("{name}") | 🛠 |
 | D300 | uses-triple-quotes | Use """triple double quotes""" |  |
@@ -695,7 +707,7 @@ For more, see [pydocstyle](https://pypi.org/project/pydocstyle/6.1.1/) on PyPI.
 
 ### pyupgrade (UP)
 
-For more, see [pyupgrade](https://pypi.org/project/pyupgrade/3.2.0/) on PyPI.
+For more, see [pyupgrade](https://pypi.org/project/pyupgrade/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -735,7 +747,7 @@ For more, see [pyupgrade](https://pypi.org/project/pyupgrade/3.2.0/) on PyPI.
 
 ### pep8-naming (N)
 
-For more, see [pep8-naming](https://pypi.org/project/pep8-naming/0.13.2/) on PyPI.
+For more, see [pep8-naming](https://pypi.org/project/pep8-naming/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -757,7 +769,7 @@ For more, see [pep8-naming](https://pypi.org/project/pep8-naming/0.13.2/) on PyP
 
 ### flake8-2020 (YTT)
 
-For more, see [flake8-2020](https://pypi.org/project/flake8-2020/1.7.0/) on PyPI.
+For more, see [flake8-2020](https://pypi.org/project/flake8-2020/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -774,7 +786,7 @@ For more, see [flake8-2020](https://pypi.org/project/flake8-2020/1.7.0/) on PyPI
 
 ### flake8-annotations (ANN)
 
-For more, see [flake8-annotations](https://pypi.org/project/flake8-annotations/2.9.1/) on PyPI.
+For more, see [flake8-annotations](https://pypi.org/project/flake8-annotations/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -792,7 +804,7 @@ For more, see [flake8-annotations](https://pypi.org/project/flake8-annotations/2
 
 ### flake8-bandit (S)
 
-For more, see [flake8-bandit](https://pypi.org/project/flake8-bandit/4.1.1/) on PyPI.
+For more, see [flake8-bandit](https://pypi.org/project/flake8-bandit/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -810,11 +822,12 @@ For more, see [flake8-bandit](https://pypi.org/project/flake8-bandit/4.1.1/) on
 | S506 | unsafe-yaml-load | Probable use of unsafe loader `{name}` with `yaml.load`. Allows instantiation of arbitrary objects. Consider `yaml.safe_load`. |  |
 | S508 | snmp-insecure-version | The use of SNMPv1 and SNMPv2 is insecure. Use SNMPv3 if able. |  |
 | S509 | snmp-weak-cryptography | You should not use SNMPv3 without encryption. `noAuthNoPriv` & `authNoPriv` is insecure. |  |
+| S612 | logging-config-insecure-listen | Use of insecure `logging.config.listen` detected |  |
 | S701 | jinja2-autoescape-false | Using jinja2 templates with `autoescape=False` is dangerous and can lead to XSS. Ensure `autoescape=True` or use the `select_autoescape` function. |  |
 
 ### flake8-blind-except (BLE)
 
-For more, see [flake8-blind-except](https://pypi.org/project/flake8-blind-except/0.2.1/) on PyPI.
+For more, see [flake8-blind-except](https://pypi.org/project/flake8-blind-except/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -822,7 +835,7 @@ For more, see [flake8-blind-except](https://pypi.org/project/flake8-blind-except
 
 ### flake8-boolean-trap (FBT)
 
-For more, see [flake8-boolean-trap](https://pypi.org/project/flake8-boolean-trap/0.1.0/) on PyPI.
+For more, see [flake8-boolean-trap](https://pypi.org/project/flake8-boolean-trap/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -832,7 +845,7 @@ For more, see [flake8-boolean-trap](https://pypi.org/project/flake8-boolean-trap
 
 ### flake8-bugbear (B)
 
-For more, see [flake8-bugbear](https://pypi.org/project/flake8-bugbear/22.10.27/) on PyPI.
+For more, see [flake8-bugbear](https://pypi.org/project/flake8-bugbear/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -841,7 +854,7 @@ For more, see [flake8-bugbear](https://pypi.org/project/flake8-bugbear/22.10.27/
 | B004 | unreliable-callable-check |  Using `hasattr(x, '__call__')` to test if x is callable is unreliable. Use `callable(x)` for consistent results. |  |
 | B005 | strip-with-multi-characters | Using `.strip()` with multi-character strings is misleading the reader |  |
 | B006 | mutable-argument-default | Do not use mutable data structures for argument defaults |  |
-| B007 | unused-loop-control-variable | Loop control variable `{name}` not used within the loop body | 🛠 |
+| B007 | unused-loop-control-variable | Loop control variable `{name}` not used within loop body |  |
 | B008 | function-call-argument-default | Do not perform function call `{name}` in argument defaults |  |
 | B009 | get-attr-with-constant | Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. | 🛠 |
 | B010 | set-attr-with-constant | Do not call `setattr` with a constant attribute value. It is not any safer than normal property access. | 🛠 |
@@ -867,7 +880,7 @@ For more, see [flake8-bugbear](https://pypi.org/project/flake8-bugbear/22.10.27/
 
 ### flake8-builtins (A)
 
-For more, see [flake8-builtins](https://pypi.org/project/flake8-builtins/2.0.1/) on PyPI.
+For more, see [flake8-builtins](https://pypi.org/project/flake8-builtins/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -877,7 +890,7 @@ For more, see [flake8-builtins](https://pypi.org/project/flake8-builtins/2.0.1/)
 
 ### flake8-comprehensions (C4)
 
-For more, see [flake8-comprehensions](https://pypi.org/project/flake8-comprehensions/3.10.1/) on PyPI.
+For more, see [flake8-comprehensions](https://pypi.org/project/flake8-comprehensions/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -900,7 +913,7 @@ For more, see [flake8-comprehensions](https://pypi.org/project/flake8-comprehens
 
 ### flake8-debugger (T10)
 
-For more, see [flake8-debugger](https://pypi.org/project/flake8-debugger/4.1.2/) on PyPI.
+For more, see [flake8-debugger](https://pypi.org/project/flake8-debugger/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -908,7 +921,7 @@ For more, see [flake8-debugger](https://pypi.org/project/flake8-debugger/4.1.2/)
 
 ### flake8-errmsg (EM)
 
-For more, see [flake8-errmsg](https://pypi.org/project/flake8-errmsg/0.4.0/) on PyPI.
+For more, see [flake8-errmsg](https://pypi.org/project/flake8-errmsg/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -918,7 +931,7 @@ For more, see [flake8-errmsg](https://pypi.org/project/flake8-errmsg/0.4.0/) on
 
 ### flake8-implicit-str-concat (ISC)
 
-For more, see [flake8-implicit-str-concat](https://pypi.org/project/flake8-implicit-str-concat/0.3.0/) on PyPI.
+For more, see [flake8-implicit-str-concat](https://pypi.org/project/flake8-implicit-str-concat/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -936,7 +949,7 @@ For more, see [flake8-import-conventions](https://github.com/joaopalmeiro/flake8
 
 ### flake8-print (T20)
 
-For more, see [flake8-print](https://pypi.org/project/flake8-print/5.0.0/) on PyPI.
+For more, see [flake8-print](https://pypi.org/project/flake8-print/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -945,7 +958,7 @@ For more, see [flake8-print](https://pypi.org/project/flake8-print/5.0.0/) on Py
 
 ### flake8-pytest-style (PT)
 
-For more, see [flake8-pytest-style](https://pypi.org/project/flake8-pytest-style/1.6.0/) on PyPI.
+For more, see [flake8-pytest-style](https://pypi.org/project/flake8-pytest-style/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -977,7 +990,7 @@ For more, see [flake8-pytest-style](https://pypi.org/project/flake8-pytest-style
 
 ### flake8-quotes (Q)
 
-For more, see [flake8-quotes](https://pypi.org/project/flake8-quotes/3.3.1/) on PyPI.
+For more, see [flake8-quotes](https://pypi.org/project/flake8-quotes/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -988,7 +1001,7 @@ For more, see [flake8-quotes](https://pypi.org/project/flake8-quotes/3.3.1/) on
 
 ### flake8-return (RET)
 
-For more, see [flake8-return](https://pypi.org/project/flake8-return/1.2.0/) on PyPI.
+For more, see [flake8-return](https://pypi.org/project/flake8-return/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -1003,7 +1016,7 @@ For more, see [flake8-return](https://pypi.org/project/flake8-return/1.2.0/) on
 
 ### flake8-simplify (SIM)
 
-For more, see [flake8-simplify](https://pypi.org/project/flake8-simplify/0.19.3/) on PyPI.
+For more, see [flake8-simplify](https://pypi.org/project/flake8-simplify/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -1035,7 +1048,7 @@ For more, see [flake8-simplify](https://pypi.org/project/flake8-simplify/0.19.3/
 
 ### flake8-tidy-imports (TID)
 
-For more, see [flake8-tidy-imports](https://pypi.org/project/flake8-tidy-imports/4.8.0/) on PyPI.
+For more, see [flake8-tidy-imports](https://pypi.org/project/flake8-tidy-imports/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -1044,7 +1057,7 @@ For more, see [flake8-tidy-imports](https://pypi.org/project/flake8-tidy-imports
 
 ### flake8-unused-arguments (ARG)
 
-For more, see [flake8-unused-arguments](https://pypi.org/project/flake8-unused-arguments/0.0.12/) on PyPI.
+For more, see [flake8-unused-arguments](https://pypi.org/project/flake8-unused-arguments/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -1056,7 +1069,7 @@ For more, see [flake8-unused-arguments](https://pypi.org/project/flake8-unused-a
 
 ### flake8-datetimez (DTZ)
 
-For more, see [flake8-datetimez](https://pypi.org/project/flake8-datetimez/20.10.0/) on PyPI.
+For more, see [flake8-datetimez](https://pypi.org/project/flake8-datetimez/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -1072,7 +1085,7 @@ For more, see [flake8-datetimez](https://pypi.org/project/flake8-datetimez/20.10
 
 ### eradicate (ERA)
 
-For more, see [eradicate](https://pypi.org/project/eradicate/2.1.0/) on PyPI.
+For more, see [eradicate](https://pypi.org/project/eradicate/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -1080,7 +1093,7 @@ For more, see [eradicate](https://pypi.org/project/eradicate/2.1.0/) on PyPI.
 
 ### pandas-vet (PD)
 
-For more, see [pandas-vet](https://pypi.org/project/pandas-vet/0.2.3/) on PyPI.
+For more, see [pandas-vet](https://pypi.org/project/pandas-vet/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -1108,9 +1121,9 @@ For more, see [pygrep-hooks](https://github.com/pre-commit/pygrep-hooks) on GitH
 | PGH003 | blanket-type-ignore | Use specific rule codes when ignoring type issues |  |
 | PGH004 | blanket-noqa | Use specific rule codes when using `noqa` |  |
 
-### Pylint (PLC, PLE, PLR, PLW)
+### Pylint (PL)
 
-For more, see [Pylint](https://pypi.org/project/pylint/2.15.7/) on PyPI.
+For more, see [Pylint](https://pypi.org/project/pylint/) on PyPI.
 
 #### Convention (PLC)
 | Code | Name | Message | Fix |
@@ -1143,18 +1156,20 @@ For more, see [Pylint](https://pypi.org/project/pylint/2.15.7/) on PyPI.
 
 ### flake8-pie (PIE)
 
-For more, see [flake8-pie](https://pypi.org/project/flake8-pie/0.16.0/) on PyPI.
+For more, see [flake8-pie](https://pypi.org/project/flake8-pie/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
 | PIE790 | no-unnecessary-pass | Unnecessary `pass` statement | 🛠 |
 | PIE794 | dupe-class-field-definitions | Class field `{name}` is defined multiple times | 🛠 |
 | PIE796 | prefer-unique-enums | Enum contains duplicate value: `{value}` |  |
-| PIE807 | prefer-list-builtin | Prefer `list()` over useless lambda | 🛠 |
+| PIE800 | no-unnecessary-spread | Unnecessary spread `**` |  |
+| PIE804 | no-unnecessary-dict-kwargs | Unnecessary `dict` kwargs |  |
+| PIE807 | prefer-list-builtin | Prefer `list` over useless lambda | 🛠 |
 
 ### flake8-commas (COM)
 
-For more, see [flake8-commas](https://pypi.org/project/flake8-commas/2.1.0/) on PyPI.
+For more, see [flake8-commas](https://pypi.org/project/flake8-commas/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -1164,7 +1179,7 @@ For more, see [flake8-commas](https://pypi.org/project/flake8-commas/2.1.0/) on
 
 ### flake8-no-pep420 (INP)
 
-For more, see [flake8-no-pep420](https://pypi.org/project/flake8-no-pep420/2.3.0/) on PyPI.
+For more, see [flake8-no-pep420](https://pypi.org/project/flake8-no-pep420/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
@@ -1172,21 +1187,27 @@ For more, see [flake8-no-pep420](https://pypi.org/project/flake8-no-pep420/2.3.0
 
 ### flake8-executable (EXE)
 
-For more, see [flake8-executable](https://pypi.org/project/flake8-executable/2.1.1/) on PyPI.
+For more, see [flake8-executable](https://pypi.org/project/flake8-executable/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
+| EXE001 | shebang-not-executable | Shebang is present but file is not executable |  |
+| EXE002 | shebang-missing-executable-file | The file is executable but no shebang is present |  |
 | EXE003 | shebang-python | Shebang should contain "python" |  |
 | EXE004 | shebang-whitespace | Avoid whitespace before shebang | 🛠 |
 | EXE005 | shebang-newline | Shebang should be at the beginning of the file |  |
 
-### flake8-type-checking (TYP)
+### flake8-type-checking (TCH)
 
-For more, see [flake8-type-checking](https://pypi.org/project/flake8-type-checking/2.3.0/) on PyPI.
+For more, see [flake8-type-checking](https://pypi.org/project/flake8-type-checking/) on PyPI.
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
-| TYP005 | empty-type-checking-block | Found empty type-checking block |  |
+| TCH001 | typing-only-first-party-import | Move application import `{}` into a type-checking block |  |
+| TCH002 | typing-only-third-party-import | Move third-party import `{}` into a type-checking block |  |
+| TCH003 | typing-only-standard-library-import | Move standard library import `{}` into a type-checking block |  |
+| TCH004 | runtime-import-in-type-checking-block | Move import `{}` out of type-checking block. Import is used for more than type hinting. |  |
+| TCH005 | empty-type-checking-block | Found empty type-checking block |  |
 
 ### tryceratops (TRY)
 
@@ -1194,7 +1215,43 @@ For more, see [tryceratops](https://pypi.org/project/tryceratops/1.1.0/) on PyPI
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
+| TRY004 | prefer-type-error | Prefer `TypeError` exception for invalid type | 🛠 |
+| TRY200 | reraise-no-cause | Use `raise from` to specify exception cause |  |
+| TRY201 | verbose-raise | Use `raise` without specifying exception name |  |
 | TRY300 | try-consider-else | Consider `else` block |  |
+| TRY301 | raise-within-try | Abstract `raise` to an inner function |  |
+
+### flake8-use-pathlib (PTH)
+
+For more, see [flake8-use-pathlib](https://pypi.org/project/flake8-use-pathlib/) on PyPI.
+
+| Code | Name | Message | Fix |
+| ---- | ---- | ------- | --- |
+| PTH100 | pathlib-abspath | `os.path.abspath` should be replaced by `.resolve()` |  |
+| PTH101 | pathlib-chmod | `os.chmod` should be replaced by `.chmod()` |  |
+| PTH102 | pathlib-mkdir | `os.mkdir` should be replaced by `.mkdir()` |  |
+| PTH103 | pathlib-makedirs | `os.makedirs` should be replaced by `.mkdir(parents=True)` |  |
+| PTH104 | pathlib-rename | `os.rename` should be replaced by `.rename()` |  |
+| PTH105 | pathlib-replace | `os.replace`should be replaced by `.replace()` |  |
+| PTH106 | pathlib-rmdir | `os.rmdir` should be replaced by `.rmdir()` |  |
+| PTH107 | pathlib-remove | `os.remove` should be replaced by `.unlink()` |  |
+| PTH108 | pathlib-unlink | `os.unlink` should be replaced by `.unlink()` |  |
+| PTH109 | pathlib-getcwd | `os.getcwd()` should be replaced by `Path.cwd()` |  |
+| PTH110 | pathlib-exists | `os.path.exists` should be replaced by `.exists()` |  |
+| PTH111 | pathlib-expanduser | `os.path.expanduser` should be replaced by `.expanduser()` |  |
+| PTH112 | pathlib-is-dir | `os.path.isdir` should be replaced by `.is_dir()` |  |
+| PTH113 | pathlib-is-file | `os.path.isfile` should be replaced by `.is_file()` |  |
+| PTH114 | pathlib-is-link | `os.path.islink` should be replaced by `.is_symlink()` |  |
+| PTH115 | pathlib-readlink | `os.readlink(` should be replaced by `.readlink()` |  |
+| PTH116 | pathlib-stat | `os.stat` should be replaced by `.stat()` or `.owner()` or `.group()` |  |
+| PTH117 | pathlib-is-abs | `os.path.isabs` should be replaced by `.is_absolute()` |  |
+| PTH118 | pathlib-join | `os.path.join` should be replaced by foo_path / "bar" |  |
+| PTH119 | pathlib-basename | `os.path.basename` should be replaced by `.name` |  |
+| PTH120 | pathlib-dirname | `os.path.dirname` should be replaced by `.parent` |  |
+| PTH121 | pathlib-samefile | `os.path.samefile` should be replaced by `.samefile()` |  |
+| PTH122 | pathlib-splitext | `os.path.splitext` should be replaced by `.suffix` |  |
+| PTH123 | pathlib-open | `open("foo")` should be replaced by`Path("foo").open()` |  |
+| PTH124 | pathlib-py-path | `py.path` is in maintenance mode, use `pathlib` instead |  |
 
 ### Ruff-specific rules (RUF)
 
@@ -1538,7 +1595,7 @@ Like Flake8, Pylint supports plugins (called "checkers"), while Ruff implements
 
 Unlike Pylint, Ruff is capable of automatically fixing its own lint violations.
 
-Pylint parity is being tracked in [#689](https://github.com/charliermarsh/ruff/issues/689).
+Pylint parity is being tracked in [#970](https://github.com/charliermarsh/ruff/issues/970).
 
 ### Which tools does Ruff replace?
 
@@ -1601,12 +1658,15 @@ project. See [#283](https://github.com/charliermarsh/ruff/issues/283) for more.
 ### How does Ruff's import sorting compare to [`isort`](https://pypi.org/project/isort/)?
 
 Ruff's import sorting is intended to be nearly equivalent to `isort` when used `profile = "black"`.
-(There are some minor differences in how Ruff and isort break ties between similar imports.)
+There are a few known, minor differences in how Ruff and isort break ties between similar imports,
+and in how Ruff and isort treat inline comments in some cases (see: [#1381](https://github.com/charliermarsh/ruff/issues/1381),
+[#2104](https://github.com/charliermarsh/ruff/issues/2104)).
 
 Like `isort`, Ruff's import sorting is compatible with Black.
 
-Ruff is less configurable than `isort`, but supports the `known-first-party`, `known-third-party`,
-`extra-standard-library`, and `src` settings, like so:
+Ruff does not yet support all of `isort`'s configuration options, though it does support many of
+them. You can find the supported settings in the [API reference](#isort). For example, you can set
+`known-first-party` like so:
 
 ```toml
 [tool.ruff]
@@ -1637,7 +1697,7 @@ After installing `ruff` and `nbqa`, you can run Ruff over a notebook like so:
 Untitled.ipynb:cell_1:2:5: F841 Local variable `x` is assigned to but never used
 Untitled.ipynb:cell_2:1:1: E402 Module level import not at top of file
 Untitled.ipynb:cell_2:1:8: F401 `os` imported but unused
-Found 3 error(s).
+Found 3 errors.
 1 potentially fixable with the --fix option.
 ```
 
@@ -1673,6 +1733,25 @@ matter how they're provided, which avoids accidental incompatibilities and simpl
 
 Run `ruff /path/to/code.py --show-settings` to view the resolved settings for a given file.
 
+### Ruff tried to fix something, but it broke my code. What should I do?
+
+Ruff's autofix is a best-effort mechanism. Given the dynamic nature of Python, it's difficult to
+have _complete_ certainty when making changes to code, even for the seemingly trivial fixes.
+
+In the future, Ruff will support enabling autofix behavior based on the safety of the patch.
+
+In the meantime, if you find that the autofix is too aggressive, you can disable it on a per-rule or
+per-category basis using the [`unfixable`](#unfixable) mechanic. For example, to disable autofix
+for some possibly-unsafe rules, you could add the following to your `pyproject.toml`:
+
+```toml
+[tool.ruff]
+unfixable = ["B", "SIM", "TRY", "RUF"]
+```
+
+If you find a case where Ruff's autofix breaks your code, please file an Issue!
+
+
 ## Contributing
 
 Contributions are welcome and hugely appreciated. To get started, check out the
@@ -2186,10 +2265,9 @@ ignore = ["F841"]
 #### [`ignore-init-module-imports`](#ignore-init-module-imports)
 
 Avoid automatically removing unused imports in `__init__.py` files. Such
-imports will still be +flagged, but with a dedicated message
-suggesting that the import is either added to the module' +`__all__`
-symbol, or re-exported with a redundant alias (e.g., `import os as
-os`).
+imports will still be flagged, but with a dedicated message suggesting
+that the import is either added to the module's `__all__` symbol, or
+re-exported with a redundant alias (e.g., `import os as os`).
 
 **Default value**: `false`
 
@@ -2623,6 +2701,25 @@ extend-immutable-calls = ["fastapi.Depends", "fastapi.Query"]
 
 ---
 
+### `flake8-builtins`
+
+#### [`builtins-ignorelist`](#builtins-ignorelist)
+
+Ignore list of builtins.
+
+**Default value**: `[]`
+
+**Type**: `Vec<String>`
+
+**Example usage**:
+
+```toml
+[tool.ruff.flake8-builtins]
+builtins-ignorelist = ["id"]
+```
+
+---
+
 ### `flake8-errmsg`
 
 #### [`max-string-length`](#max-string-length)
@@ -2642,6 +2739,28 @@ max-string-length = 20
 
 ---
 
+### `flake8-implicit-str-concat`
+
+#### [`allow-multiline`](#allow-multiline)
+
+Whether to allow implicit string concatenations for multiline strings.
+By default, implicit concatenations of multiline strings are
+allowed (but continuation lines, delimited with a backslash, are
+prohibited).
+
+**Default value**: `true`
+
+**Type**: `bool`
+
+**Example usage**:
+
+```toml
+[tool.ruff.flake8-implicit-str-concat]
+allow-multiline = false
+```
+
+---
+
 ### `flake8-import-conventions`
 
 #### [`aliases`](#aliases)

benches/source_code_locator.rs

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

build.rs

@@ -1,84 +0,0 @@
-use std::fs;
-use std::io::{BufRead, BufReader, BufWriter, Write};
-use std::path::{Path, PathBuf};
-
-fn main() {
-    let out_dir = PathBuf::from(std::env::var_os("OUT_DIR").unwrap());
-    generate_linter_name_and_url(&out_dir);
-}
-
-const RULES_SUBMODULE_DOC_PREFIX: &str = "//! Rules from ";
-
-/// The `src/rules/*/mod.rs` files are expected to have a first line such as the
-/// following:
-///
-///     //! Rules from [Pyflakes](https://pypi.org/project/pyflakes/2.5.0/).
-///
-/// This function extracts the link label and url from these comments and
-/// generates the `name` and `url` functions for the `Linter` enum
-/// accordingly, so that they can be used by `ruff_dev::generate_rules_table`.
-fn generate_linter_name_and_url(out_dir: &Path) {
-    println!("cargo:rerun-if-changed=src/rules/");
-
-    let mut name_match_arms: String = r#"Linter::Ruff => "Ruff-specific rules","#.into();
-    let mut url_match_arms: String = r#"Linter::Ruff => None,"#.into();
-
-    for file in fs::read_dir("src/rules/")
-        .unwrap()
-        .flatten()
-        .filter(|f| f.file_type().unwrap().is_dir() && f.file_name() != "ruff")
-    {
-        let mod_rs_path = file.path().join("mod.rs");
-        let mod_rs_path = mod_rs_path.to_str().unwrap();
-        let first_line = BufReader::new(fs::File::open(mod_rs_path).unwrap())
-            .lines()
-            .next()
-            .unwrap()
-            .unwrap();
-
-        let Some(comment) = first_line.strip_prefix(RULES_SUBMODULE_DOC_PREFIX) else {
-                panic!("expected first line in {mod_rs_path} to start with `{RULES_SUBMODULE_DOC_PREFIX}`")
-            };
-        let md_link = comment.trim_end_matches('.');
-
-        let (name, url) = md_link
-            .strip_prefix('[')
-            .unwrap()
-            .strip_suffix(')')
-            .unwrap()
-            .split_once("](")
-            .unwrap();
-
-        let dirname = file.file_name();
-        let dirname = dirname.to_str().unwrap();
-
-        let variant_name = dirname
-            .split('_')
-            .map(|part| match part {
-                "errmsg" => "ErrMsg".to_string(),
-                "mccabe" => "McCabe".to_string(),
-                "pep8" => "PEP8".to_string(),
-                _ => format!("{}{}", part[..1].to_uppercase(), &part[1..]),
-            })
-            .collect::<String>();
-
-        name_match_arms.push_str(&format!(r#"Linter::{variant_name} => "{name}","#));
-        url_match_arms.push_str(&format!(r#"Linter::{variant_name} => Some("{url}"),"#));
-    }
-
-    write!(
-        BufWriter::new(fs::File::create(out_dir.join("linter.rs")).unwrap()),
-        "
-        impl Linter {{
-            pub fn name(&self) -> &'static str {{
-                match self {{ {name_match_arms} }}
-            }}
-
-            pub fn url(&self) -> Option<&'static str> {{
-                match self {{ {url_match_arms} }}
-            }}
-        }}
-        "
-    )
-    .unwrap();
-}

flake8_to_ruff/Cargo.lock

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

flake8_to_ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.229"
+version = "0.0.234"
 edition = "2021"
 
 [dependencies]
@@ -16,7 +16,7 @@ serde = { version = "1.0.147", features = ["derive"] }
 serde_json = { version = "1.0.87" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
-toml_edit = { version = "0.17.1", features = ["easy"] }
+toml = { version = "0.6.0" }
 
 [dev-dependencies]
 

flake8_to_ruff/src/main.rs

@@ -1,4 +1,6 @@
 //! Utility to generate Ruff's `pyproject.toml` section from a Flake8 INI file.
+#![forbid(unsafe_code)]
+#![warn(clippy::pedantic)]
 #![allow(
     clippy::collapsible_else_if,
     clippy::collapsible_if,
@@ -11,14 +13,13 @@
     clippy::similar_names,
     clippy::too_many_lines
 )]
-#![forbid(unsafe_code)]
 
 use std::path::PathBuf;
 
 use anyhow::Result;
 use clap::Parser;
 use configparser::ini::Ini;
-use ruff::flake8_to_ruff;
+use ruff::flake8_to_ruff::{self, ExternalConfig};
 
 #[derive(Parser)]
 #[command(
@@ -48,15 +49,19 @@ fn main() -> Result<()> {
     let config = ini.load(cli.file).map_err(|msg| anyhow::anyhow!(msg))?;
 
     // Read the pyproject.toml file.
-    let black = cli
-        .pyproject
-        .map(flake8_to_ruff::parse_black_options)
-        .transpose()?
-        .flatten();
+    let pyproject = cli.pyproject.map(flake8_to_ruff::parse).transpose()?;
+    let external_config = pyproject
+        .as_ref()
+        .and_then(|pyproject| pyproject.tool.as_ref())
+        .map(|tool| ExternalConfig {
+            black: tool.black.as_ref(),
+            isort: tool.isort.as_ref(),
+        })
+        .unwrap_or_default();
 
     // Create Ruff's pyproject.toml section.
-    let pyproject = flake8_to_ruff::convert(&config, black.as_ref(), cli.plugin)?;
-    println!("{}", toml_edit::easy::to_string_pretty(&pyproject)?);
+    let pyproject = flake8_to_ruff::convert(&config, &external_config, cli.plugin)?;
+    println!("{}", toml::to_string_pretty(&pyproject)?);
 
     Ok(())
 }

licenses/LICENSE_RoPP_flake8-use-pathlib

@@ -0,0 +1,22 @@
+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_snok_flake8-type-checking

@@ -0,0 +1,27 @@
+Copyright (c) 2021, Sondre Lillebø Gundersen
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of pytest-{{ cookiecutter.plugin_name }} nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

pyproject.toml

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

resources/test/fixtures/flake8_bandit/S612.py

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

resources/test/fixtures/flake8_bugbear/B007.py

@@ -29,3 +29,19 @@ def strange_generator():
 
 for i, (j, (k, l)) in strange_generator():  # i, k not used
     print(j, l)
+
+FMT = "{foo} {bar}"
+for foo, bar in [(1, 2)]:
+    if foo:
+        print(FMT.format(**locals()))
+
+for foo, bar in [(1, 2)]:
+    if foo:
+        print(FMT.format(**globals()))
+
+for foo, bar in [(1, 2)]:
+    if foo:
+        print(FMT.format(**vars()))
+
+for foo, bar in [(1, 2)]:
+    print(FMT.format(foo=foo, bar=eval('bar')))

resources/test/fixtures/flake8_executable/EXE001_1.py

@@ -0,0 +1,4 @@
+#!/usr/bin/python
+
+if __name__ == '__main__':
+    print('I should be executable.')

resources/test/fixtures/flake8_executable/EXE001_2.py

@@ -0,0 +1,2 @@
+if __name__ == '__main__':
+    print('I should be executable.')

resources/test/fixtures/flake8_executable/EXE001_3.py

@@ -0,0 +1,4 @@
+#!/usr/bin/python
+
+if __name__ == '__main__':
+    print('I should be executable.')

resources/test/fixtures/flake8_executable/EXE002_1.py

@@ -0,0 +1,2 @@
+if __name__ == '__main__':
+    print('I should be executable.')

resources/test/fixtures/flake8_executable/EXE002_2.py

@@ -0,0 +1,2 @@
+if __name__ == '__main__':
+    print('I should be executable.')

resources/test/fixtures/flake8_executable/EXE002_3.py

@@ -0,0 +1,4 @@
+#!/usr/bin/python
+
+if __name__ == '__main__':
+    print('I should be executable.')

resources/test/fixtures/flake8_import_conventions/from_imports.py

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

resources/test/fixtures/flake8_pie/PIE800.py

@@ -0,0 +1,17 @@
+{"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

@@ -0,0 +1,19 @@
+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_return/RET503.py

@@ -114,3 +114,12 @@ def bar3(x, y, z):
         else:
             return z
         return None
+
+
+def prompts(self, foo):
+    if not foo:
+        return []
+
+    for x in foo:
+        yield x
+        yield x + 1

resources/test/fixtures/flake8_simplify/SIM102.py

@@ -92,3 +92,40 @@ if node.module:
         "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_type_checking/TCH001.py

@@ -0,0 +1,28 @@
+"""Tests to determine first-party import classification.
+
+For typing-only import detection tests, see `TCH002.py`.
+"""
+
+
+def f():
+    import TYP001
+
+    x: TYP001
+
+
+def f():
+    import TYP001
+
+    print(TYP001)
+
+
+def f():
+    from . import TYP001
+
+    x: TYP001
+
+
+def f():
+    from . import TYP001
+
+    print(TYP001)

resources/test/fixtures/flake8_type_checking/TCH002.py

@@ -0,0 +1,148 @@
+"""Tests to determine accurate detection of typing-only imports."""
+
+
+def f():
+    import pandas as pd  # TCH002
+
+    x: pd.DataFrame
+
+
+def f():
+    from pandas import DataFrame  # TCH002
+
+    x: DataFrame
+
+
+def f():
+    from pandas import DataFrame as df  # TCH002
+
+    x: df
+
+
+def f():
+    import pandas as pd  # TCH002
+
+    x: pd.DataFrame = 1
+
+
+def f():
+    from pandas import DataFrame  # TCH002
+
+    x: DataFrame = 2
+
+
+def f():
+    from pandas import DataFrame as df  # TCH002
+
+    x: df = 3
+
+
+def f():
+    import pandas as pd  # TCH002
+
+    x: "pd.DataFrame" = 1
+
+
+def f():
+    import pandas as pd
+
+    x = dict["pd.DataFrame", "pd.DataFrame"]  # TCH002
+
+
+def f():
+    import pandas as pd
+
+    print(pd)
+
+
+def f():
+    from pandas import DataFrame
+
+    print(DataFrame)
+
+
+def f():
+    from pandas import DataFrame
+
+    def f():
+        print(DataFrame)
+
+
+def f():
+    from typing import Dict, Any
+
+    def example() -> Any:
+        return 1
+
+    x: Dict[int] = 20
+
+
+def f():
+    from typing import TYPE_CHECKING
+
+    if TYPE_CHECKING:
+        from typing import Dict
+    x: Dict[int] = 20
+
+
+def f():
+    from pathlib import Path
+
+    class ImportVisitor(ast.NodeTransformer):
+        def __init__(self, cwd: Path) -> None:
+            self.cwd = cwd
+            origin = Path(spec.origin)
+
+    class ExampleClass:
+        def __init__(self):
+            self.cwd = Path(pandas.getcwd())
+
+
+def f():
+    import pandas
+
+    class Migration:
+        enum = pandas
+
+
+def f():
+    import pandas
+
+    class Migration:
+        enum = pandas.EnumClass
+
+
+def f():
+    from typing import TYPE_CHECKING
+
+    from pandas import y
+
+    if TYPE_CHECKING:
+        _type = x
+    else:
+        _type = y
+
+
+def f():
+    from typing import TYPE_CHECKING
+
+    from pandas import y
+
+    if TYPE_CHECKING:
+        _type = x
+    elif True:
+        _type = y
+
+
+def f():
+    from typing import cast
+
+    import pandas as pd
+
+    x = cast(pd.DataFrame, 2)
+
+
+def f():
+    import pandas as pd
+
+    x = dict[pd.DataFrame, pd.DataFrame]

resources/test/fixtures/flake8_type_checking/TCH003.py

@@ -0,0 +1,16 @@
+"""Tests to determine standard library import classification.
+
+For typing-only import detection tests, see `TCH002.py`.
+"""
+
+
+def f():
+    import os
+
+    x: os
+
+
+def f():
+    import os
+
+    print(os)

resources/test/fixtures/flake8_type_checking/TCH004_1.py

@@ -0,0 +1,5 @@
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from datetime import datetime
+x = datetime

resources/test/fixtures/flake8_type_checking/TCH004_2.py

@@ -0,0 +1,8 @@
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from datetime import date
+
+
+def example():
+    return date()

resources/test/fixtures/flake8_type_checking/TCH004_3.py

@@ -0,0 +1,6 @@
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from typing import Any
+
+    CustomType = Any

resources/test/fixtures/flake8_type_checking/TCH004_4.py

@@ -0,0 +1,11 @@
+from typing import TYPE_CHECKING, Type
+
+if TYPE_CHECKING:
+    from typing import Any
+
+
+def example(*args: Any, **kwargs: Any):
+    return
+
+
+my_type: Type[Any] | Any

resources/test/fixtures/flake8_type_checking/TCH004_5.py

@@ -0,0 +1,8 @@
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from typing import List, Sequence, Set
+
+
+def example(a: List[int], /, b: Sequence[int], *, c: Set[int]):
+    return

resources/test/fixtures/flake8_type_checking/TCH004_6.py

@@ -0,0 +1,10 @@
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from pandas import DataFrame
+
+
+def example():
+    from pandas import DataFrame
+
+    x = DataFrame

resources/test/fixtures/flake8_type_checking/TCH004_7.py

@@ -0,0 +1,10 @@
+from __future__ import annotations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from typing import AsyncIterator, List
+
+
+class Example:
+    async def example(self) -> AsyncIterator[List[str]]:
+        yield 0

resources/test/fixtures/flake8_type_checking/TCH004_8.py

@@ -0,0 +1,7 @@
+from typing import TYPE_CHECKING
+from weakref import WeakKeyDictionary
+
+if TYPE_CHECKING:
+    from typing import Any
+
+d = WeakKeyDictionary["Any", "Any"]()

resources/test/fixtures/flake8_type_checking/TCH005.py

@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING, List
 
 if TYPE_CHECKING:
-    pass  # TYP005
+    pass  # TCH005
 
 
 def example():

resources/test/fixtures/flake8_use_pathlib/full_name.py

@@ -0,0 +1,31 @@
+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

@@ -0,0 +1,28 @@
+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

@@ -0,0 +1,33 @@
+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

@@ -0,0 +1,35 @@
+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

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

resources/test/fixtures/flake8_use_pathlib/py_path_2.py

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

resources/test/fixtures/flake8_use_pathlib/use_pathlib.py

@@ -0,0 +1,3 @@
+from pathlib import Path
+
+(Path("") / "").open()

resources/test/fixtures/isort/line_ending_cr.py

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

resources/test/fixtures/pep8_naming/N806.py

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

resources/test/fixtures/pydocstyle/D401.py

@@ -1,3 +1,7 @@
+"""This module docstring does not need to be written in imperative mood."""
+
+from functools import cached_property
+
 # Bad examples
 
 def bad_liouiwnlkjl():
@@ -18,7 +22,11 @@ def bad_sdgfsdg23245777():
 
 def bad_run_something():
     """Runs something"""
-    pass
+
+    def bad_nested():
+        """Runs other things, nested"""
+
+    bad_nested()
 
 
 def multi_line():
@@ -32,6 +40,11 @@ def multi_line():
 def good_run_something():
     """Run away."""
 
+    def good_nested():
+        """Run to the hills."""
+
+    good_nested()
+
 
 def good_construct():
     """Construct a beautiful house."""
@@ -41,3 +54,48 @@ def good_multi_line():
     """Write a logical line that
     extends to two physical lines.
     """
+
+
+good_top_level_var = False
+"""This top level assignment attribute docstring does not need to be written in imperative mood."""
+
+
+# Classes and their members
+
+class Thingy:
+    """This class docstring does not need to be written in imperative mood."""
+
+    _beep = "boop"
+    """This class attribute docstring does not need to be written in imperative mood."""
+
+    def bad_method(self):
+        """This method docstring should be written in imperative mood."""
+
+    @property
+    def good_property(self):
+        """This property method docstring does not need to be written in imperative mood."""
+        return self._beep
+
+    @cached_property
+    def good_cached_property(self):
+        """This property method docstring does not need to be written in imperative mood."""
+        return 42 * 42
+
+    class NestedThingy:
+        """This nested class docstring does not need to be written in imperative mood."""
+
+
+# Test functions
+
+def test_something():
+    """This test function does not need to be written in imperative mood.
+
+    pydocstyle's rationale:
+    We exclude tests from the imperative mood check, because to phrase
+    their docstring in the imperative mood, they would have to start with
+    a highly redundant "Test that ..."
+    """
+
+
+def runTest():
+    """This test function does not need to be written in imperative mood, either."""

resources/test/fixtures/pyupgrade/UP013.py

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

resources/test/fixtures/pyupgrade/UP031_0.py

@@ -62,6 +62,12 @@ print(
     "bar %(bar)s" % {"foo": x, "bar": y}
 )
 
+bar = {"bar": y}
+print(
+    "foo %(foo)s "
+    "bar %(bar)s" % {"foo": x, **bar}
+)
+
 print("%s \N{snowman}" % (a,))
 
 print("%(foo)s \N{snowman}" % {"foo": 1})

resources/test/fixtures/pyupgrade/UP032.py

@@ -44,6 +44,8 @@ print("foo {} ".format(x))
 
 "{}".format(a)
 
+'({}={{0!e}})'.format(a)
+
 ###
 # Non-errors
 ###

resources/test/fixtures/tryceratops/TRY004.py

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

resources/test/fixtures/tryceratops/TRY200.py

@@ -0,0 +1,32 @@
+"""
+Violation:
+Reraise without using 'from'
+"""
+
+
+class MyException(Exception):
+    pass
+
+
+def func():
+    try:
+        a = 1
+    except Exception:
+        raise MyException()
+
+
+def func():
+    try:
+        a = 1
+    except Exception:
+        if True:
+            raise MyException()
+
+
+def good():
+    try:
+        a = 1
+    except MyException as e:
+        raise e  # This is verbose violation, shouldn't trigger no cause
+    except Exception:
+        raise  # Just re-raising don't need 'from'

resources/test/fixtures/tryceratops/TRY201.py

@@ -0,0 +1,54 @@
+"""
+Violation:
+
+Raising an exception using its assigned name is verbose and unrequired
+"""
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class MyException(Exception):
+    pass
+
+
+def bad():
+    try:
+        process()
+    except MyException as e:
+        logger.exception("process failed")
+        raise e
+
+
+def good():
+    try:
+        process()
+    except MyException:
+        logger.exception("process failed")
+        raise
+
+def still_good():
+    try:
+        process()
+    except MyException as e:
+        print(e)
+        raise
+
+
+def bad_that_needs_recursion():
+    try:
+        process()
+    except MyException as e:
+        logger.exception("process failed")
+        if True:
+            raise e
+
+
+def bad_that_needs_recursion_2():
+    try:
+        process()
+    except MyException as e:
+        logger.exception("process failed")
+        if True:
+            def foo():
+                raise e

resources/test/fixtures/tryceratops/TRY301.py

@@ -0,0 +1,29 @@
+class MyException(Exception):
+    pass
+
+
+def bad():
+    try:
+        a = process()
+        if not a:
+            raise MyException(a)
+
+        raise MyException(a)
+
+        try:
+            b = process()
+            if not b:
+                raise MyException(b)
+        except Exception:
+            logger.exception("something failed")
+    except Exception:
+        logger.exception("something failed")
+
+
+def good():
+    try:
+        a = process()  # This throws the exception now
+    except MyException:
+        logger.exception("a failed")
+    except Exception:
+        logger.exception("something failed")

resources/test/project/README.md

@@ -16,7 +16,7 @@ resources/test/project/examples/docs/docs/file.py:1:1: I001 Import block is un-s
 resources/test/project/examples/docs/docs/file.py:8:5: F841 Local variable `x` is assigned to but never used
 resources/test/project/project/file.py:1:8: F401 `os` imported but unused
 resources/test/project/project/import_file.py:1:1: I001 Import block is un-sorted or un-formatted
-Found 7 error(s).
+Found 7 errors.
 7 potentially fixable with the --fix option.
 ```
 
@@ -31,7 +31,7 @@ examples/docs/docs/file.py:1:1: I001 Import block is un-sorted or un-formatted
 examples/docs/docs/file.py:8:5: F841 Local variable `x` is assigned to but never used
 project/file.py:1:8: F401 `os` imported but unused
 project/import_file.py:1:1: I001 Import block is un-sorted or un-formatted
-Found 7 error(s).
+Found 7 errors.
 7 potentially fixable with the --fix option.
 ```
 
@@ -42,7 +42,7 @@ files:
 ∴ (cd resources/test/project/examples/docs && cargo run .)
 docs/file.py:1:1: I001 Import block is un-sorted or un-formatted
 docs/file.py:8:5: F841 Local variable `x` is assigned to but never used
-Found 2 error(s).
+Found 2 errors.
 2 potentially fixable with the --fix option.
 ```
 
@@ -60,7 +60,7 @@ resources/test/project/examples/docs/docs/file.py:3:8: F401 `numpy` imported but
 resources/test/project/examples/docs/docs/file.py:4:27: F401 `docs.concepts.file` imported but unused
 resources/test/project/examples/excluded/script.py:1:8: F401 `os` imported but unused
 resources/test/project/project/file.py:1:8: F401 `os` imported but unused
-Found 9 error(s).
+Found 9 errors.
 9 potentially fixable with the --fix option.
 ```
 
@@ -73,7 +73,7 @@ docs/docs/concepts/file.py:5:5: F841 Local variable `x` is assigned to but never
 docs/docs/file.py:1:1: I001 Import block is un-sorted or un-formatted
 docs/docs/file.py:8:5: F841 Local variable `x` is assigned to but never used
 excluded/script.py:5:5: F841 Local variable `x` is assigned to but never used
-Found 4 error(s).
+Found 4 errors.
 4 potentially fixable with the --fix option.
 ```
 
@@ -82,7 +82,7 @@ Passing an excluded directory directly should report errors in the contained fil
 ```
 ∴ cargo run resources/test/project/examples/excluded/
 resources/test/project/examples/excluded/script.py:1:8: F401 `os` imported but unused
-Found 1 error(s).
+Found 1 error.
 1 potentially fixable with the --fix option.
 ```
 

ruff.schema.json

@@ -175,6 +175,17 @@
         }
       ]
     },
+    "flake8-implicit-str-concat": {
+      "description": "Options for the `flake8-implicit-str-concat` plugin.",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Flake8ImplicitStrConcatOptions"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
     "flake8-import-conventions": {
       "description": "Options for the `flake8-import-conventions` plugin.",
       "anyOf": [
@@ -259,7 +270,7 @@
       }
     },
     "ignore-init-module-imports": {
-      "description": "Avoid automatically removing unused imports in `__init__.py` files. Such imports will still be +flagged, but with a dedicated message suggesting that the import is either added to the module' +`__all__` symbol, or re-exported with a redundant alias (e.g., `import os as os`).",
+      "description": "Avoid automatically removing unused imports in `__init__.py` files. Such imports will still be flagged, but with a dedicated message suggesting that the import is either added to the module's `__all__` symbol, or re-exported with a redundant alias (e.g., `import os as os`).",
       "type": [
         "boolean",
         "null"
@@ -626,6 +637,19 @@
       },
       "additionalProperties": false
     },
+    "Flake8ImplicitStrConcatOptions": {
+      "type": "object",
+      "properties": {
+        "allow-multiline": {
+          "description": "Whether to allow implicit string concatenations for multiline strings. By default, implicit concatenations of multiline strings are allowed (but continuation lines, delimited with a backslash, are prohibited).",
+          "type": [
+            "boolean",
+            "null"
+          ]
+        }
+      },
+      "additionalProperties": false
+    },
     "Flake8ImportConventionsOptions": {
       "type": "object",
       "properties": {
@@ -1114,10 +1138,6 @@
     "PythonVersion": {
       "type": "string",
       "enum": [
-        "py33",
-        "py34",
-        "py35",
-        "py36",
         "py37",
         "py38",
         "py39",
@@ -1164,13 +1184,13 @@
     "RuleSelector": {
       "type": "string",
       "enum": [
+        "ALL",
         "A",
         "A0",
         "A00",
         "A001",
         "A002",
         "A003",
-        "ALL",
         "ANN",
         "ANN0",
         "ANN00",
@@ -1381,6 +1401,8 @@
         "EXE",
         "EXE0",
         "EXE00",
+        "EXE001",
+        "EXE002",
         "EXE003",
         "EXE004",
         "EXE005",
@@ -1458,15 +1480,6 @@
         "I00",
         "I001",
         "I002",
-        "I2",
-        "I25",
-        "I252",
-        "IC",
-        "IC0",
-        "IC001",
-        "IC002",
-        "IC003",
-        "IC004",
         "ICN",
         "ICN0",
         "ICN00",
@@ -1481,9 +1494,6 @@
         "ISC001",
         "ISC002",
         "ISC003",
-        "M",
-        "M0",
-        "M001",
         "N",
         "N8",
         "N80",
@@ -1521,23 +1531,6 @@
         "PD9",
         "PD90",
         "PD901",
-        "PDV",
-        "PDV0",
-        "PDV002",
-        "PDV003",
-        "PDV004",
-        "PDV007",
-        "PDV008",
-        "PDV009",
-        "PDV01",
-        "PDV010",
-        "PDV011",
-        "PDV012",
-        "PDV013",
-        "PDV015",
-        "PDV9",
-        "PDV90",
-        "PDV901",
         "PGH",
         "PGH0",
         "PGH00",
@@ -1553,7 +1546,10 @@
         "PIE796",
         "PIE8",
         "PIE80",
+        "PIE800",
+        "PIE804",
         "PIE807",
+        "PL",
         "PLC",
         "PLC0",
         "PLC04",
@@ -1632,6 +1628,36 @@
         "PT024",
         "PT025",
         "PT026",
+        "PTH",
+        "PTH1",
+        "PTH10",
+        "PTH100",
+        "PTH101",
+        "PTH102",
+        "PTH103",
+        "PTH104",
+        "PTH105",
+        "PTH106",
+        "PTH107",
+        "PTH108",
+        "PTH109",
+        "PTH11",
+        "PTH110",
+        "PTH111",
+        "PTH112",
+        "PTH113",
+        "PTH114",
+        "PTH115",
+        "PTH116",
+        "PTH117",
+        "PTH118",
+        "PTH119",
+        "PTH12",
+        "PTH120",
+        "PTH121",
+        "PTH122",
+        "PTH123",
+        "PTH124",
         "Q",
         "Q0",
         "Q00",
@@ -1639,17 +1665,6 @@
         "Q001",
         "Q002",
         "Q003",
-        "R",
-        "R5",
-        "R50",
-        "R501",
-        "R502",
-        "R503",
-        "R504",
-        "R505",
-        "R506",
-        "R507",
-        "R508",
         "RET",
         "RET5",
         "RET50",
@@ -1694,6 +1709,9 @@
         "S506",
         "S508",
         "S509",
+        "S6",
+        "S61",
+        "S612",
         "S7",
         "S70",
         "S701",
@@ -1742,40 +1760,31 @@
         "T20",
         "T201",
         "T203",
+        "TCH",
+        "TCH0",
+        "TCH00",
+        "TCH001",
+        "TCH002",
+        "TCH003",
+        "TCH004",
+        "TCH005",
         "TID",
         "TID2",
         "TID25",
         "TID251",
         "TID252",
         "TRY",
+        "TRY0",
+        "TRY00",
+        "TRY004",
+        "TRY2",
+        "TRY20",
+        "TRY200",
+        "TRY201",
         "TRY3",
         "TRY30",
         "TRY300",
-        "TYP",
-        "TYP0",
-        "TYP00",
-        "TYP005",
-        "U",
-        "U0",
-        "U00",
-        "U001",
-        "U003",
-        "U004",
-        "U005",
-        "U006",
-        "U007",
-        "U008",
-        "U009",
-        "U01",
-        "U010",
-        "U011",
-        "U012",
-        "U013",
-        "U014",
-        "U015",
-        "U016",
-        "U017",
-        "U019",
+        "TRY301",
         "UP",
         "UP0",
         "UP00",

ruff_cli/Cargo.toml

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

ruff_cli/src/cache.rs

@@ -35,10 +35,19 @@ fn content_dir() -> &'static Path {
     Path::new("content")
 }
 
-fn cache_key<P: AsRef<Path>>(path: P, settings: &Settings, autofix: flags::Autofix) -> u64 {
+fn cache_key<P: AsRef<Path>>(
+    path: P,
+    package: Option<&P>,
+    settings: &Settings,
+    autofix: flags::Autofix,
+) -> u64 {
     let mut hasher = DefaultHasher::new();
     CARGO_PKG_VERSION.hash(&mut hasher);
     path.as_ref().absolutize().unwrap().hash(&mut hasher);
+    package
+        .as_ref()
+        .map(|path| path.as_ref().absolutize().unwrap())
+        .hash(&mut hasher);
     settings.hash(&mut hasher);
     autofix.hash(&mut hasher);
     hasher.finish()
@@ -79,13 +88,14 @@ fn read_sync(cache_dir: &Path, key: u64) -> Result<Vec<u8>, std::io::Error> {
 /// Get a value from the cache.
 pub fn get<P: AsRef<Path>>(
     path: P,
+    package: Option<&P>,
     metadata: &fs::Metadata,
     settings: &AllSettings,
     autofix: flags::Autofix,
 ) -> Option<Vec<Message>> {
     let encoded = read_sync(
         &settings.cli.cache_dir,
-        cache_key(path, &settings.lib, autofix),
+        cache_key(path, package, &settings.lib, autofix),
     )
     .ok()?;
     let (mtime, messages) = match bincode::deserialize::<CheckResult>(&encoded[..]) {
@@ -107,6 +117,7 @@ pub fn get<P: AsRef<Path>>(
 /// Set a value in the cache.
 pub fn set<P: AsRef<Path>>(
     path: P,
+    package: Option<&P>,
     metadata: &fs::Metadata,
     settings: &AllSettings,
     autofix: flags::Autofix,
@@ -120,7 +131,7 @@ pub fn set<P: AsRef<Path>>(
     };
     if let Err(e) = write_sync(
         &settings.cli.cache_dir,
-        cache_key(path, &settings.lib, autofix),
+        cache_key(path, package, &settings.lib, autofix),
         &bincode::serialize(&check_result).unwrap(),
     ) {
         error!("Failed to write to cache: {e:?}");

ruff_cli/src/cli.rs

@@ -1,14 +1,14 @@
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 
 use clap::{command, Parser};
 use regex::Regex;
-use ruff::fs;
 use ruff::logging::LogLevel;
-use ruff::registry::{Rule, RuleSelector};
+use ruff::registry::Rule;
 use ruff::resolver::ConfigProcessor;
 use ruff::settings::types::{
     FilePattern, PatternPrefixPair, PerFileIgnore, PythonVersion, SerializationFormat,
 };
+use ruff::RuleSelector;
 use rustc_hash::FxHashMap;
 
 #[derive(Debug, Parser)]
@@ -444,9 +444,6 @@ pub fn collect_per_file_ignores(pairs: Vec<PatternPrefixPair>) -> Vec<PerFileIgn
     }
     per_file_ignores
         .into_iter()
-        .map(|(pattern, prefixes)| {
-            let absolute = fs::normalize_path(Path::new(&pattern));
-            PerFileIgnore::new(pattern, absolute, &prefixes)
-        })
+        .map(|(pattern, prefixes)| PerFileIgnore::new(pattern, &prefixes, None))
         .collect()
 }

ruff_cli/src/commands.rs

@@ -15,7 +15,7 @@ use ruff::cache::CACHE_DIR_NAME;
 use ruff::linter::add_noqa_to_path;
 use ruff::logging::LogLevel;
 use ruff::message::{Location, Message};
-use ruff::registry::{Linter, ParseCode, Rule};
+use ruff::registry::{Linter, Rule, RuleNamespace};
 use ruff::resolver::{FileDiscovery, PyprojectDiscovery};
 use ruff::settings::flags;
 use ruff::settings::types::SerializationFormat;

ruff_cli/src/diagnostics.rs

@@ -55,7 +55,9 @@ pub fn lint_path(
         && matches!(autofix, fix::FixMode::None | fix::FixMode::Generate)
     {
         let metadata = path.metadata()?;
-        if let Some(messages) = cache::get(path, &metadata, settings, autofix.into()) {
+        if let Some(messages) =
+            cache::get(path, package.as_ref(), &metadata, settings, autofix.into())
+        {
             debug!("Cache hit for: {}", path.to_string_lossy());
             return Ok(Diagnostics::new(messages));
         }
@@ -92,7 +94,14 @@ pub fn lint_path(
 
     // Re-populate the cache.
     if let Some(metadata) = metadata {
-        cache::set(path, &metadata, settings, autofix.into(), &messages);
+        cache::set(
+            path,
+            package.as_ref(),
+            &metadata,
+            settings,
+            autofix.into(),
+            &messages,
+        );
     }
 
     Ok(Diagnostics { messages, fixed })

ruff_cli/src/lib.rs

@@ -2,6 +2,8 @@
 //! to automatically update the `ruff --help` output in the `README.md`.
 //!
 //! For the actual Ruff library, see [`ruff`].
+#![forbid(unsafe_code)]
+#![warn(clippy::pedantic)]
 #![allow(clippy::must_use_candidate, dead_code)]
 
 mod cli;

ruff_cli/src/main.rs

@@ -1,10 +1,11 @@
+#![forbid(unsafe_code)]
+#![warn(clippy::pedantic)]
 #![allow(
     clippy::match_same_arms,
     clippy::missing_errors_doc,
     clippy::module_name_repetitions,
     clippy::too_many_lines
 )]
-#![forbid(unsafe_code)]
 
 use std::io::{self};
 use std::path::{Path, PathBuf};
@@ -88,7 +89,7 @@ fn resolve(
     }
 }
 
-pub fn main() -> Result<ExitCode> {
+fn inner_main() -> Result<ExitCode> {
     // Extract command-line arguments.
     let (cli, overrides) = Cli::parse().partition();
 
@@ -200,7 +201,7 @@ quoting the executed command, along with the relevant file contents and `pyproje
     if cache {
         // `--no-cache` doesn't respect code changes, and so is often confusing during
         // development.
-        warn_user_once!("debug build without --no-cache.");
+        warn_user_once!("Detected debug build without --no-cache.");
     }
 
     let printer = Printer::new(&format, &log_level, &autofix, &violations);
@@ -319,3 +320,14 @@ quoting the executed command, along with the relevant file contents and `pyproje
 
     Ok(ExitCode::SUCCESS)
 }
+
+#[must_use]
+pub fn main() -> ExitCode {
+    match inner_main() {
+        Ok(code) => code,
+        Err(err) => {
+            eprintln!("{}{} {err:?}", "error".red().bold(), ":".bold());
+            ExitCode::FAILURE
+        }
+    }
+}

ruff_cli/src/printer.rs

@@ -96,12 +96,14 @@ impl<'a> Printer<'a> {
                     let remaining = diagnostics.messages.len();
                     let total = fixed + remaining;
                     if fixed > 0 {
+                        let s = if total == 1 { "" } else { "s" };
                         writeln!(
                             stdout,
-                            "Found {total} error(s) ({fixed} fixed, {remaining} remaining)."
+                            "Found {total} error{s}) ({fixed} fixed, {remaining} remaining)."
                         )?;
                     } else if remaining > 0 {
-                        writeln!(stdout, "Found {remaining} error(s).")?;
+                        let s = if remaining == 1 { "" } else { "s" };
+                        writeln!(stdout, "Found {remaining} error{s}.")?;
                     }
 
                     if !matches!(self.autofix, fix::FixMode::Apply) {
@@ -121,10 +123,11 @@ impl<'a> Printer<'a> {
                 Violations::Hide => {
                     let fixed = diagnostics.fixed;
                     if fixed > 0 {
+                        let s = if fixed == 1 { "" } else { "s" };
                         if matches!(self.autofix, fix::FixMode::Apply) {
-                            writeln!(stdout, "Fixed {fixed} error(s).")?;
+                            writeln!(stdout, "Fixed {fixed} error{s}.")?;
                         } else if matches!(self.autofix, fix::FixMode::Diff) {
-                            writeln!(stdout, "Would fix {fixed} error(s).")?;
+                            writeln!(stdout, "Would fix {fixed} error{s}.")?;
                         }
                     }
                 }
@@ -339,8 +342,13 @@ impl<'a> Printer<'a> {
         }
 
         if self.log_level >= &LogLevel::Default {
+            let s = if diagnostics.messages.len() == 1 {
+                ""
+            } else {
+                "s"
+            };
             notify_user!(
-                "Found {} error(s). Watching for file changes.",
+                "Found {} error{s}. Watching for file changes.",
                 diagnostics.messages.len()
             );
         }

ruff_cli/tests/black_compatibility_test.rs

@@ -10,11 +10,8 @@ use std::{fs, process, str};
 
 use anyhow::{anyhow, Context, Result};
 use assert_cmd::Command;
-use itertools::Itertools;
 use log::info;
 use ruff::logging::{set_up_logging, LogLevel};
-use ruff::registry::Linter;
-use strum::IntoEnumIterator;
 use walkdir::WalkDir;
 
 /// Handles `blackd` process and allows submitting code to it for formatting.
@@ -175,13 +172,6 @@ fn test_ruff_black_compatibility() -> Result<()> {
         .filter_map(Result::ok)
         .collect();
 
-    let codes = Linter::iter()
-        // Exclude ruff codes, specifically RUF100, because it causes differences that are not a
-        // problem. Ruff would add a `# noqa: W292`  after the first run, black introduces a
-        // newline, and ruff removes the `# noqa: W292` again.
-        .filter(|linter| *linter != Linter::Ruff)
-        .map(|linter| linter.prefixes().as_list(","))
-        .join(",");
     let ruff_args = [
         "-",
         "--silent",
@@ -189,8 +179,11 @@ fn test_ruff_black_compatibility() -> Result<()> {
         "--fix",
         "--line-length",
         "88",
-        "--select",
-        &codes,
+        "--select ALL",
+        // Exclude ruff codes, specifically RUF100, because it causes differences that are not a
+        // problem. Ruff would add a `# noqa: W292`  after the first run, black introduces a
+        // newline, and ruff removes the `# noqa: W292` again.
+        "--ignore RUF",
     ];
 
     for entry in paths {

ruff_cli/tests/integration_test.rs

@@ -28,7 +28,7 @@ fn test_stdin_error() -> Result<()> {
         .failure();
     assert_eq!(
         str::from_utf8(&output.get_output().stdout)?,
-        "-:1:8: F401 `os` imported but unused\nFound 1 error(s).\n1 potentially fixable with the \
+        "-:1:8: F401 `os` imported but unused\nFound 1 error.\n1 potentially fixable with the \
          --fix option.\n"
     );
     Ok(())
@@ -44,8 +44,8 @@ fn test_stdin_filename() -> Result<()> {
         .failure();
     assert_eq!(
         str::from_utf8(&output.get_output().stdout)?,
-        "F401.py:1:8: F401 `os` imported but unused\nFound 1 error(s).\n1 potentially fixable \
-         with the --fix option.\n"
+        "F401.py:1:8: F401 `os` imported but unused\nFound 1 error.\n1 potentially fixable with \
+         the --fix option.\n"
     );
     Ok(())
 }

ruff_dev/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_dev"
-version = "0.0.229"
+version = "0.0.234"
 edition = "2021"
 
 [dependencies]
@@ -11,9 +11,9 @@ libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a87
 once_cell = { version = "1.16.0" }
 ruff = { path = ".." }
 ruff_cli = { path = "../ruff_cli" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "ff90fe52eea578c8ebdd9d95e078cc041a5959fa" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "ff90fe52eea578c8ebdd9d95e078cc041a5959fa" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "ff90fe52eea578c8ebdd9d95e078cc041a5959fa" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
 schemars = { version = "0.8.11" }
 serde_json = {version="1.0.91"}
 strum = { version = "0.24.1", features = ["strum_macros"] }

ruff_dev/src/generate_rules_table.rs

@@ -2,7 +2,7 @@
 
 use anyhow::Result;
 use clap::Args;
-use ruff::registry::{Linter, Prefixes, RuleSelector};
+use ruff::registry::{Linter, LinterCategory, Rule, RuleNamespace};
 use strum::IntoEnumIterator;
 
 use crate::utils::replace_readme_section;
@@ -20,12 +20,12 @@ pub struct Cli {
     pub(crate) dry_run: bool,
 }
 
-fn generate_table(table_out: &mut String, prefix: &RuleSelector) {
+fn generate_table(table_out: &mut String, rules: impl IntoIterator<Item = Rule>) {
     table_out.push_str("| Code | Name | Message | Fix |");
     table_out.push('\n');
     table_out.push_str("| ---- | ---- | ------- | --- |");
     table_out.push('\n');
-    for rule in prefix.codes() {
+    for rule in rules {
         let fix_token = match rule.autofixable() {
             None => "",
             Some(_) => "🛠",
@@ -48,8 +48,7 @@ pub fn main(cli: &Cli) -> Result<()> {
     let mut table_out = String::new();
     let mut toc_out = String::new();
     for linter in Linter::iter() {
-        let prefixes = linter.prefixes();
-        let codes_csv: String = prefixes.as_list(", ");
+        let codes_csv: String = linter.prefixes().join(", ");
         table_out.push_str(&format!("### {} ({codes_csv})", linter.name()));
         table_out.push('\n');
         table_out.push('\n');
@@ -86,15 +85,14 @@ pub fn main(cli: &Cli) -> Result<()> {
             table_out.push('\n');
         }
 
-        match prefixes {
-            Prefixes::Single(prefix) => generate_table(&mut table_out, &prefix),
-            Prefixes::Multiple(entries) => {
-                for (prefix, category) in entries {
-                    table_out.push_str(&format!("#### {category} ({})", prefix.as_ref()));
-                    table_out.push('\n');
-                    generate_table(&mut table_out, &prefix);
-                }
+        if let Some(categories) = linter.categories() {
+            for LinterCategory(prefix, name, selector) in categories {
+                table_out.push_str(&format!("#### {name} ({prefix})"));
+                table_out.push('\n');
+                generate_table(&mut table_out, selector);
             }
+        } else {
+            generate_table(&mut table_out, &linter);
         }
     }
 

ruff_dev/src/main.rs

@@ -1,6 +1,8 @@
 //! This crate implements an internal CLI for developers of Ruff.
 //!
 //! Within the ruff repository you can run it with `cargo dev`.
+#![forbid(unsafe_code)]
+#![warn(clippy::pedantic)]
 #![allow(
     clippy::collapsible_else_if,
     clippy::collapsible_if,
@@ -13,7 +15,6 @@
     clippy::similar_names,
     clippy::too_many_lines
 )]
-#![forbid(unsafe_code)]
 
 mod generate_all;
 mod generate_cli_help;

ruff_macros/Cargo.toml

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

ruff_macros/src/define_rule_mapping.rs

@@ -53,7 +53,7 @@ pub fn define_rule_mapping(mapping: &Mapping) -> proc_macro2::TokenStream {
 
     let rulecodeprefix = super::rule_code_prefix::expand(
         &Ident::new("Rule", Span::call_site()),
-        &Ident::new("RuleSelector", Span::call_site()),
+        &Ident::new("RuleCodePrefix", Span::call_site()),
         mapping.entries.iter().map(|(code, ..)| code),
         |code| code_to_name[code],
     );

ruff_macros/src/lib.rs

@@ -1,4 +1,6 @@
 //! This crate implements internal macros for the `ruff` library.
+#![forbid(unsafe_code)]
+#![warn(clippy::pedantic)]
 #![allow(
     clippy::collapsible_else_if,
     clippy::collapsible_if,
@@ -11,7 +13,6 @@
     clippy::similar_names,
     clippy::too_many_lines
 )]
-#![forbid(unsafe_code)]
 
 use proc_macro::TokenStream;
 use syn::{parse_macro_input, DeriveInput, ItemFn};
@@ -19,8 +20,8 @@ use syn::{parse_macro_input, DeriveInput, ItemFn};
 mod config;
 mod define_rule_mapping;
 mod derive_message_formats;
-mod parse_code;
 mod rule_code_prefix;
+mod rule_namespace;
 
 #[proc_macro_derive(ConfigurationOptions, attributes(option, doc, option_group))]
 pub fn derive_config(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
@@ -37,11 +38,11 @@ pub fn define_rule_mapping(item: proc_macro::TokenStream) -> proc_macro::TokenSt
     define_rule_mapping::define_rule_mapping(&mapping).into()
 }
 
-#[proc_macro_derive(ParseCode, attributes(prefix))]
-pub fn derive_rule_code_prefix(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+#[proc_macro_derive(RuleNamespace, attributes(prefix))]
+pub fn derive_rule_namespace(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let input = parse_macro_input!(input as DeriveInput);
 
-    parse_code::derive_impl(input)
+    rule_namespace::derive_impl(input)
         .unwrap_or_else(syn::Error::into_compile_error)
         .into()
 }

ruff_macros/src/parse_code.rs

@@ -1,54 +0,0 @@
-use quote::quote;
-use syn::spanned::Spanned;
-use syn::{Data, DataEnum, DeriveInput, Error, Lit, Meta, MetaNameValue};
-
-pub fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream> {
-    let DeriveInput { ident, data: Data::Enum(DataEnum {
-        variants, ..
-    }), .. } = input else {
-        return Err(Error::new(input.ident.span(), "only named fields are supported"));
-    };
-
-    let mut parsed = Vec::new();
-
-    for variant in variants {
-        let prefix_attrs: Vec<_> = variant
-            .attrs
-            .iter()
-            .filter(|a| a.path.is_ident("prefix"))
-            .collect();
-
-        if prefix_attrs.is_empty() {
-            return Err(Error::new(
-                variant.span(),
-                r#"Missing [#prefix = "..."] attribute"#,
-            ));
-        }
-
-        for attr in prefix_attrs {
-            let Ok(Meta::NameValue(MetaNameValue{lit: Lit::Str(lit), ..})) = attr.parse_meta() else {
-                return Err(Error::new(attr.span(), r#"expected attribute to be in the form of [#prefix = "..."]"#))
-            };
-            parsed.push((lit, variant.ident.clone()));
-        }
-    }
-
-    parsed.sort_by_key(|(prefix, _)| prefix.value().len());
-
-    let mut if_statements = quote!();
-
-    for (prefix, field) in parsed {
-        if_statements.extend(quote! {if let Some(rest) = code.strip_prefix(#prefix) {
-            return Some((#ident::#field, rest));
-        }});
-    }
-
-    Ok(quote! {
-        impl crate::registry::ParseCode for #ident {
-            fn parse_code(code: &str) -> Option<(Self, &str)> {
-                #if_statements
-                None
-            }
-        }
-    })
-}

ruff_macros/src/rule_code_prefix.rs

@@ -1,89 +1,9 @@
-use std::collections::{BTreeMap, BTreeSet, HashMap};
+use std::collections::{BTreeMap, BTreeSet};
 
-use once_cell::sync::Lazy;
 use proc_macro2::Span;
 use quote::quote;
 use syn::Ident;
 
-const ALL: &str = "ALL";
-
-/// A hash map from deprecated `RuleSelector` to latest
-/// `RuleSelector`.
-pub static PREFIX_REDIRECTS: Lazy<HashMap<&'static str, &'static str>> = Lazy::new(|| {
-    HashMap::from_iter([
-        // TODO(charlie): Remove by 2023-01-01.
-        ("U001", "UP001"),
-        ("U003", "UP003"),
-        ("U004", "UP004"),
-        ("U005", "UP005"),
-        ("U006", "UP006"),
-        ("U007", "UP007"),
-        ("U008", "UP008"),
-        ("U009", "UP009"),
-        ("U010", "UP010"),
-        ("U011", "UP011"),
-        ("U012", "UP012"),
-        ("U013", "UP013"),
-        ("U014", "UP014"),
-        ("U015", "UP015"),
-        ("U016", "UP016"),
-        ("U017", "UP017"),
-        ("U019", "UP019"),
-        // TODO(charlie): Remove by 2023-02-01.
-        ("I252", "TID252"),
-        ("M001", "RUF100"),
-        // TODO(charlie): Remove by 2023-02-01.
-        ("PDV002", "PD002"),
-        ("PDV003", "PD003"),
-        ("PDV004", "PD004"),
-        ("PDV007", "PD007"),
-        ("PDV008", "PD008"),
-        ("PDV009", "PD009"),
-        ("PDV010", "PD010"),
-        ("PDV011", "PD011"),
-        ("PDV012", "PD012"),
-        ("PDV013", "PD013"),
-        ("PDV015", "PD015"),
-        ("PDV901", "PD901"),
-        // TODO(charlie): Remove by 2023-02-01.
-        ("R501", "RET501"),
-        ("R502", "RET502"),
-        ("R503", "RET503"),
-        ("R504", "RET504"),
-        ("R505", "RET505"),
-        ("R506", "RET506"),
-        ("R507", "RET507"),
-        ("R508", "RET508"),
-        ("IC001", "ICN001"),
-        ("IC002", "ICN001"),
-        ("IC003", "ICN001"),
-        ("IC004", "ICN001"),
-        // TODO(charlie): Remove by 2023-01-01.
-        ("U", "UP"),
-        ("U0", "UP0"),
-        ("U00", "UP00"),
-        ("U01", "UP01"),
-        // TODO(charlie): Remove by 2023-02-01.
-        ("I2", "TID2"),
-        ("I25", "TID25"),
-        ("M", "RUF100"),
-        ("M0", "RUF100"),
-        // TODO(charlie): Remove by 2023-02-01.
-        ("PDV", "PD"),
-        ("PDV0", "PD0"),
-        ("PDV01", "PD01"),
-        ("PDV9", "PD9"),
-        ("PDV90", "PD90"),
-        // TODO(charlie): Remove by 2023-02-01.
-        ("R", "RET"),
-        ("R5", "RET5"),
-        ("R50", "RET50"),
-        // TODO(charlie): Remove by 2023-02-01.
-        ("IC", "ICN"),
-        ("IC0", "ICN0"),
-    ])
-});
-
 pub fn expand<'a>(
     rule_type: &Ident,
     prefix_ident: &Ident,
@@ -91,9 +11,12 @@ pub fn expand<'a>(
     variant_name: impl Fn(&str) -> &'a Ident,
 ) -> proc_macro2::TokenStream {
     // Build up a map from prefix to matching RuleCodes.
-    let mut prefix_to_codes: BTreeMap<Ident, BTreeSet<String>> = BTreeMap::default();
+    let mut prefix_to_codes: BTreeMap<String, BTreeSet<String>> = BTreeMap::default();
+
+    let mut all_codes = BTreeSet::new();
+    let mut pl_codes = BTreeSet::new();
+
     for variant in variants {
-        let span = variant.span();
         let code_str = variant.to_string();
         let code_prefix_len = code_str
             .chars()
@@ -103,28 +26,20 @@ pub fn expand<'a>(
         for i in 0..=code_suffix_len {
             let prefix = code_str[..code_prefix_len + i].to_string();
             prefix_to_codes
-                .entry(Ident::new(&prefix, span))
+                .entry(prefix)
                 .or_default()
                 .insert(code_str.clone());
         }
-        prefix_to_codes
-            .entry(Ident::new(ALL, span))
-            .or_default()
-            .insert(code_str.clone());
+        if code_str.starts_with("PL") {
+            pl_codes.insert(code_str.to_string());
+        }
+        all_codes.insert(code_str);
     }
 
-    // Add any prefix aliases (e.g., "U" to "UP").
-    for (alias, rule_code) in PREFIX_REDIRECTS.iter() {
-        prefix_to_codes.insert(
-            Ident::new(alias, Span::call_site()),
-            prefix_to_codes
-                .get(&Ident::new(rule_code, Span::call_site()))
-                .unwrap_or_else(|| panic!("Unknown RuleCode: {alias:?}"))
-                .clone(),
-        );
-    }
+    prefix_to_codes.insert("PL".to_string(), pl_codes);
 
     let prefix_variants = prefix_to_codes.keys().map(|prefix| {
+        let prefix = Ident::new(prefix, Span::call_site());
         quote! {
             #prefix
         }
@@ -132,25 +47,9 @@ pub fn expand<'a>(
 
     let prefix_impl = generate_impls(rule_type, prefix_ident, &prefix_to_codes, variant_name);
 
-    let prefix_redirects = PREFIX_REDIRECTS.iter().map(|(alias, rule_code)| {
-        let code = Ident::new(rule_code, Span::call_site());
-        quote! {
-            (#alias, #prefix_ident::#code)
-        }
-    });
-
     quote! {
-        #[derive(PartialEq, Eq, PartialOrd, Ord)]
-        pub enum SuffixLength {
-            None,
-            Zero,
-            One,
-            Two,
-            Three,
-            Four,
-        }
-
         #[derive(
+            ::strum_macros::EnumIter,
             ::strum_macros::EnumString,
             ::strum_macros::AsRefStr,
             Debug,
@@ -159,105 +58,63 @@ pub fn expand<'a>(
             PartialOrd,
             Ord,
             Clone,
+            Hash,
             ::serde::Serialize,
             ::serde::Deserialize,
-            ::schemars::JsonSchema,
         )]
         pub enum #prefix_ident {
             #(#prefix_variants,)*
         }
 
         #prefix_impl
-
-        /// A hash map from deprecated `RuleSelector` to latest `RuleSelector`.
-        pub static PREFIX_REDIRECTS: ::once_cell::sync::Lazy<::rustc_hash::FxHashMap<&'static str, #prefix_ident>> = ::once_cell::sync::Lazy::new(|| {
-            ::rustc_hash::FxHashMap::from_iter([
-                #(#prefix_redirects),*
-            ])
-        });
     }
 }
 
 fn generate_impls<'a>(
     rule_type: &Ident,
     prefix_ident: &Ident,
-    prefix_to_codes: &BTreeMap<Ident, BTreeSet<String>>,
+    prefix_to_codes: &BTreeMap<String, BTreeSet<String>>,
     variant_name: impl Fn(&str) -> &'a Ident,
 ) -> proc_macro2::TokenStream {
-    let codes_match_arms = prefix_to_codes.iter().map(|(prefix, codes)| {
+    let into_iter_match_arms = prefix_to_codes.iter().map(|(prefix_str, codes)| {
         let codes = codes.iter().map(|code| {
             let rule_variant = variant_name(code);
             quote! {
                 #rule_type::#rule_variant
             }
         });
-        let prefix_str = prefix.to_string();
-        if let Some(target) = PREFIX_REDIRECTS.get(prefix_str.as_str()) {
-            quote! {
-                #prefix_ident::#prefix => {
-                    crate::warn_user_once!(
-                        "`{}` has been remapped to `{}`", #prefix_str, #target
-                    );
-                    vec![#(#codes),*]
-                }
-            }
-        } else {
-            quote! {
-                #prefix_ident::#prefix => vec![#(#codes),*],
-            }
+        let prefix = Ident::new(prefix_str, Span::call_site());
+
+        quote! {
+            #prefix_ident::#prefix => vec![#(#codes),*].into_iter(),
         }
     });
 
-    let specificity_match_arms = prefix_to_codes.keys().map(|prefix| {
-        if *prefix == ALL {
-            quote! {
-                #prefix_ident::#prefix => SuffixLength::None,
-            }
-        } else {
-            let num_numeric = prefix
-                .to_string()
-                .chars()
-                .filter(|char| char.is_numeric())
-                .count();
-            let suffix_len = match num_numeric {
-                0 => quote! { SuffixLength::Zero },
-                1 => quote! { SuffixLength::One },
-                2 => quote! { SuffixLength::Two },
-                3 => quote! { SuffixLength::Three },
-                4 => quote! { SuffixLength::Four },
-                _ => panic!("Invalid prefix: {prefix}"),
-            };
-            quote! {
-                #prefix_ident::#prefix => #suffix_len,
-            }
+    let specificity_match_arms = prefix_to_codes.keys().map(|prefix_str| {
+        let prefix = Ident::new(prefix_str, Span::call_site());
+        let mut num_numeric = prefix_str.chars().filter(|char| char.is_numeric()).count();
+        if prefix_str != "PL" && prefix_str.starts_with("PL") {
+            num_numeric += 1;
         }
-    });
-
-    let categories = prefix_to_codes.keys().map(|prefix| {
-        let prefix_str = prefix.to_string();
-        if prefix_str.chars().all(char::is_alphabetic)
-            && !PREFIX_REDIRECTS.contains_key(&prefix_str.as_str())
-        {
-            quote! {
-                #prefix_ident::#prefix,
-            }
-        } else {
-            quote! {}
+        let suffix_len = match num_numeric {
+            0 => quote! { Specificity::Linter },
+            1 => quote! { Specificity::Code1Char },
+            2 => quote! { Specificity::Code2Chars },
+            3 => quote! { Specificity::Code3Chars },
+            4 => quote! { Specificity::Code4Chars },
+            5 => quote! { Specificity::Code5Chars },
+            _ => panic!("Invalid prefix: {prefix}"),
+        };
+        quote! {
+            #prefix_ident::#prefix => #suffix_len,
         }
     });
 
     quote! {
         impl #prefix_ident {
-            pub fn codes(&self) -> Vec<#rule_type> {
-                use colored::Colorize;
+            pub(crate) fn specificity(&self) -> crate::rule_selector::Specificity {
+                use crate::rule_selector::Specificity;
 
-                #[allow(clippy::match_same_arms)]
-                match self {
-                    #(#codes_match_arms)*
-                }
-            }
-
-            pub fn specificity(&self) -> SuffixLength {
                 #[allow(clippy::match_same_arms)]
                 match self {
                     #(#specificity_match_arms)*
@@ -265,6 +122,16 @@ fn generate_impls<'a>(
             }
         }
 
-        pub const CATEGORIES: &[#prefix_ident] = &[#(#categories)*];
+        impl IntoIterator for &#prefix_ident {
+            type Item = #rule_type;
+            type IntoIter = ::std::vec::IntoIter<Self::Item>;
+
+            fn into_iter(self) -> Self::IntoIter {
+                #[allow(clippy::match_same_arms)]
+                match self {
+                    #(#into_iter_match_arms)*
+                }
+            }
+        }
     }
 }

ruff_macros/src/rule_namespace.rs

@@ -0,0 +1,153 @@
+use std::collections::HashSet;
+
+use proc_macro2::{Ident, Span};
+use quote::quote;
+use syn::spanned::Spanned;
+use syn::{Attribute, Data, DataEnum, DeriveInput, Error, Lit, Meta, MetaNameValue};
+
+pub fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream> {
+    let DeriveInput { ident, data: Data::Enum(DataEnum {
+        variants, ..
+    }), .. } = input else {
+        return Err(Error::new(input.ident.span(), "only named fields are supported"));
+    };
+
+    let mut parsed = Vec::new();
+
+    let mut prefix_match_arms = quote!();
+    let mut name_match_arms = quote!(Self::Ruff => "Ruff-specific rules",);
+    let mut url_match_arms = quote!(Self::Ruff => None,);
+
+    let mut all_prefixes = HashSet::new();
+
+    for variant in variants {
+        let prefixes: Result<Vec<_>, _> = variant
+            .attrs
+            .iter()
+            .filter(|a| a.path.is_ident("prefix"))
+            .map(|attr| {
+                let Ok(Meta::NameValue(MetaNameValue{lit: Lit::Str(lit), ..})) = attr.parse_meta() else {
+                    return Err(Error::new(attr.span(), r#"expected attribute to be in the form of [#prefix = "..."]"#));
+                };
+                let str = lit.value();
+                match str.chars().next() {
+                    None => return Err(Error::new(lit.span(), "expected prefix string to be non-empty")),
+                    Some(_) => {},
+                }
+                if !all_prefixes.insert(str.clone()) {
+                    return Err(Error::new(lit.span(), "prefix has already been defined before"));
+                }
+                Ok(str)
+            })
+            .collect();
+        let prefixes = prefixes?;
+
+        if prefixes.is_empty() {
+            return Err(Error::new(
+                variant.span(),
+                r#"Missing #[prefix = "..."] attribute"#,
+            ));
+        }
+
+        let Some(doc_attr) = variant.attrs.iter().find(|a| a.path.is_ident("doc")) else {
+            return Err(Error::new(variant.span(), r#"expected a doc comment"#))
+        };
+
+        let variant_ident = variant.ident;
+
+        if variant_ident != "Ruff" {
+            let (name, url) = parse_doc_attr(doc_attr)?;
+            name_match_arms.extend(quote! {Self::#variant_ident => #name,});
+            url_match_arms.extend(quote! {Self::#variant_ident => Some(#url),});
+        }
+
+        for lit in &prefixes {
+            parsed.push((lit.clone(), variant_ident.clone()));
+        }
+
+        prefix_match_arms.extend(quote! {
+            Self::#variant_ident => &[#(#prefixes),*],
+        });
+    }
+
+    parsed.sort_by_key(|(prefix, _)| prefix.len());
+
+    let mut if_statements = quote!();
+    let mut into_iter_match_arms = quote!();
+
+    for (prefix, field) in parsed {
+        if_statements.extend(quote! {if let Some(rest) = code.strip_prefix(#prefix) {
+            return Some((#ident::#field, rest));
+        }});
+
+        let prefix_ident = Ident::new(&prefix, Span::call_site());
+
+        if field != "Pycodestyle" {
+            into_iter_match_arms.extend(quote! {
+                #ident::#field => RuleCodePrefix::#prefix_ident.into_iter(),
+            });
+        }
+    }
+
+    into_iter_match_arms.extend(quote! {
+        #ident::Pycodestyle => {
+            let rules: Vec<_> = (&RuleCodePrefix::E).into_iter().chain(&RuleCodePrefix::W).collect();
+            rules.into_iter()
+        }
+    });
+
+    Ok(quote! {
+        impl crate::registry::RuleNamespace for #ident {
+            fn parse_code(code: &str) -> Option<(Self, &str)> {
+                #if_statements
+                None
+            }
+
+
+            fn prefixes(&self) -> &'static [&'static str] {
+                match self { #prefix_match_arms }
+            }
+
+            fn name(&self) -> &'static str {
+                match self { #name_match_arms }
+            }
+
+            fn url(&self) -> Option<&'static str> {
+                match self { #url_match_arms }
+            }
+        }
+
+        impl IntoIterator for &#ident {
+            type Item = Rule;
+            type IntoIter = ::std::vec::IntoIter<Self::Item>;
+
+            fn into_iter(self) -> Self::IntoIter {
+                use colored::Colorize;
+
+                match self {
+                    #into_iter_match_arms
+                }
+            }
+        }
+    })
+}
+
+/// Parses an attribute in the form of `#[doc = " [name](https://example.com/)"]`
+/// into a tuple of link label and URL.
+fn parse_doc_attr(doc_attr: &Attribute) -> syn::Result<(String, String)> {
+    let Ok(Meta::NameValue(MetaNameValue{lit: Lit::Str(doc_lit), ..})) = doc_attr.parse_meta() else {
+        return Err(Error::new(doc_attr.span(), r#"expected doc attribute to be in the form of #[doc = "..."]"#))
+    };
+    parse_markdown_link(doc_lit.value().trim())
+        .map(|(name, url)| (name.to_string(), url.to_string()))
+        .ok_or_else(|| {
+            Error::new(
+                doc_lit.span(),
+                r#"expected doc comment to be in the form of `/// [name](https://example.com/)`"#,
+            )
+        })
+}
+
+fn parse_markdown_link(link: &str) -> Option<(&str, &str)> {
+    link.strip_prefix('[')?.strip_suffix(')')?.split_once("](")
+}

scripts/_utils.py

@@ -1,8 +1,7 @@
-import os
 import re
 from pathlib import Path
 
-ROOT_DIR = Path(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+ROOT_DIR = Path(__file__).resolve().parent.parent
 
 
 def dir_name(linter_name: str) -> str:
@@ -15,4 +14,4 @@ def pascal_case(linter_name: str) -> str:
 
 
 def get_indent(line: str) -> str:
-    return re.match(r"^\s*", line).group()  # pyright: ignore[reportOptionalMemberAccess]
+    return re.match(r"^\s*", line).group()  # type: ignore[union-attr]

scripts/add_plugin.py

@@ -5,28 +5,27 @@ Example usage:
 
     python scripts/add_plugin.py \
         flake8-pie \
-        --url https://pypi.org/project/flake8-pie/0.16.0/
+        --url https://pypi.org/project/flake8-pie/
+        --prefix PIE
 """
 
 import argparse
-import os
 
 from _utils import ROOT_DIR, dir_name, get_indent, pascal_case
 
 
-def main(*, plugin: str, url: str) -> None:
+def main(*, plugin: str, url: str, prefix_code: str) -> None:
+    """Generate boilerplate for a new plugin."""
     # Create the test fixture folder.
-    os.makedirs(
-        ROOT_DIR / "resources/test/fixtures" / dir_name(plugin),
+    (ROOT_DIR / "resources/test/fixtures" / dir_name(plugin)).mkdir(
         exist_ok=True,
     )
 
-    # Create the Rust module.
-    rust_module = ROOT_DIR / "src/rules" / dir_name(plugin)
-    os.makedirs(rust_module, exist_ok=True)
-    with open(rust_module / "rules.rs", "w+") as fp:
-        fp.write("use crate::checkers::ast::Checker;\n")
-    with open(rust_module / "mod.rs", "w+") as fp:
+    # Create the Plugin rules module.
+    plugin_dir = ROOT_DIR / "src/rules" / dir_name(plugin)
+    plugin_dir.mkdir(exist_ok=True)
+
+    with (plugin_dir / "mod.rs").open("w+") as fp:
         fp.write(f"//! Rules from [{plugin}]({url}).\n")
         fp.write("pub(crate) mod rules;\n")
         fp.write("\n")
@@ -56,49 +55,40 @@ mod tests {
     }
 }
 """
-            % dir_name(plugin)
+            % dir_name(plugin),
         )
 
+    # Create a subdirectory for rules and create a `mod.rs` placeholder
+    rules_dir = plugin_dir / "rules"
+    rules_dir.mkdir(exist_ok=True)
+
+    with (rules_dir / "mod.rs").open("w+") as fp:
+        fp.write("\n\n")
+
+    # Create the snapshots subdirectory
+    (plugin_dir / "snapshots").mkdir(exist_ok=True)
+
     # Add the plugin to `rules/mod.rs`.
-    with open(ROOT_DIR / "src/rules/mod.rs", "a") as fp:
+    with (ROOT_DIR / "src/rules/mod.rs").open("a") as fp:
         fp.write(f"pub mod {dir_name(plugin)};")
 
     # Add the relevant sections to `src/registry.rs`.
     content = (ROOT_DIR / "src/registry.rs").read_text()
 
-    with open(ROOT_DIR / "src/registry.rs", "w") as fp:
+    with (ROOT_DIR / "src/registry.rs").open("w") as fp:
         for line in content.splitlines():
             indent = get_indent(line)
 
-            if line.strip() == "// Ruff":
+            if line.strip() == "// ruff":
                 fp.write(f"{indent}// {plugin}")
                 fp.write("\n")
 
-            elif line.strip() == '#[prefix = "RUF"]':
-                fp.write(f'{indent}#[prefix = "TODO"]\n')
+            elif line.strip() == "/// Ruff-specific rules":
+                fp.write(f"/// [{plugin}]({url})\n")
+                fp.write(f'{indent}#[prefix = "{prefix_code}"]\n')
                 fp.write(f"{indent}{pascal_case(plugin)},")
                 fp.write("\n")
 
-            elif line.strip() == "Linter::Ruff => Prefixes::Single(RuleSelector::RUF),":
-                prefix = 'todo!("Fill-in prefix after generating codes")'
-                fp.write(
-                    f"{indent}Linter::{pascal_case(plugin)} => Prefixes::Single({prefix}),"
-                )
-                fp.write("\n")
-
-            fp.write(line)
-            fp.write("\n")
-
-    # Add the relevant section to `src/violations.rs`.
-    content = (ROOT_DIR / "src/violations.rs").read_text()
-
-    with open(ROOT_DIR / "src/violations.rs", "w") as fp:
-        for line in content.splitlines():
-            if line.strip() == "// Ruff":
-                indent = get_indent(line)
-                fp.write(f"{indent}// {plugin}")
-                fp.write("\n")
-
             fp.write(line)
             fp.write("\n")
 
@@ -108,7 +98,7 @@ if __name__ == "__main__":
         description="Generate boilerplate for a new Flake8 plugin.",
         epilog=(
             "Example usage: python scripts/add_plugin.py flake8-pie "
-            "--url https://pypi.org/project/flake8-pie/0.16.0/"
+            "--url https://pypi.org/project/flake8-pie/"
         ),
     )
     parser.add_argument(
@@ -122,6 +112,13 @@ if __name__ == "__main__":
         type=str,
         help="The URL of the latest release in PyPI.",
     )
+    parser.add_argument(
+        "--prefix",
+        required=False,
+        default="TODO",
+        type=str,
+        help="Prefix code for the plugin. Leave empty to manually fill.",
+    )
     args = parser.parse_args()
 
-    main(plugin=args.plugin, url=args.url)
+    main(plugin=args.plugin, url=args.url, prefix_code=args.prefix)

scripts/add_rule.py

@@ -16,52 +16,70 @@ from _utils import ROOT_DIR, dir_name, get_indent
 
 def snake_case(name: str) -> str:
     """Convert from PascalCase to snake_case."""
-    return "".join(f"_{word.lower()}" if word.isupper() else word for word in name).lstrip("_")
+    return "".join(
+        f"_{word.lower()}" if word.isupper() else word for word in name
+    ).lstrip("_")
 
 
 def main(*, name: str, code: str, linter: str) -> None:
+    """Generate boilerplate for a new rule."""
     # Create a test fixture.
-    with open(
-        ROOT_DIR / "resources/test/fixtures" / dir_name(linter) / f"{code}.py",
+    with (ROOT_DIR / "resources/test/fixtures" / dir_name(linter) / f"{code}.py").open(
         "a",
     ):
         pass
 
+    plugin_module = ROOT_DIR / "src/rules" / dir_name(linter)
+    rule_name_snake = snake_case(name)
+
     # Add the relevant `#testcase` macro.
-    mod_rs = ROOT_DIR / "src/rules" / dir_name(linter) / "mod.rs"
+    mod_rs = plugin_module / "mod.rs"
     content = mod_rs.read_text()
 
-    with open(mod_rs, "w") as fp:
+    with mod_rs.open("w") as fp:
         for line in content.splitlines():
             if line.strip() == "fn rules(rule_code: Rule, path: &Path) -> Result<()> {":
                 indent = get_indent(line)
-                fp.write(f'{indent}#[test_case(Rule::{code}, Path::new("{code}.py"); "{code}")]')
+                fp.write(
+                    f'{indent}#[test_case(Rule::{name}, Path::new("{code}.py"); "{code}")]',
+                )
                 fp.write("\n")
 
             fp.write(line)
             fp.write("\n")
 
-    # Add the relevant rule function.
-    with open(ROOT_DIR / "src/rules" / dir_name(linter) / (snake_case(name) + ".rs"), "w") as fp:
-        fp.write(
-            f"""
-/// {code}
-pub fn {snake_case(name)}(checker: &mut Checker) {{}}
-"""
-        )
-        fp.write("\n")
+    # Add the exports
+    rules_dir = plugin_module / "rules"
+    rules_mod = rules_dir / "mod.rs"
 
-    # Add the relevant struct to `src/violations.rs`.
-    content = (ROOT_DIR / "src/violations.rs").read_text()
-
-    with open(ROOT_DIR / "src/violations.rs", "w") as fp:
-        for line in content.splitlines():
-            fp.write(line)
+    contents = rules_mod.read_text()
+    parts = contents.split("\n\n")
+    if len(parts) == 2:
+        new_contents = parts[0] + "\n"
+        new_contents += f"pub use {rule_name_snake}::{{{rule_name_snake}, {name}}};"
+        new_contents += "\n"
+        new_contents += "\n"
+        new_contents += parts[1]
+        new_contents += f"mod {rule_name_snake};"
+        new_contents += "\n"
+        rules_mod.write_text(new_contents)
+    else:
+        with rules_mod.open("a") as fp:
+            fp.write(f"pub use {rule_name_snake}::{{{rule_name_snake}, {name}}};")
+            fp.write("\n")
+            fp.write(f"mod {rule_name_snake};")
             fp.write("\n")
 
-            if line.startswith(f"// {linter}"):
-                fp.write(
-                    """define_violation!(
+    # Add the relevant rule function.
+    with (rules_dir / f"{rule_name_snake}.rs").open("w") as fp:
+        fp.write(
+            """use ruff_macros::derive_message_formats;
+
+use crate::define_violation;
+use crate::violation::Violation;
+use crate::checkers::ast::Checker;
+
+define_violation!(
     pub struct %s;
 );
 impl Violation for %s {
@@ -72,16 +90,23 @@ impl Violation for %s {
     }
 }
 """
-                    % (name, name)
-                )
-                fp.write("\n")
+            % (name, name),
+        )
+        fp.write("\n")
+        fp.write(
+            f"""
+/// {code}
+pub fn {rule_name_snake}(checker: &mut Checker) {{}}
+""",
+        )
+        fp.write("\n")
 
     # Add the relevant code-to-violation pair to `src/registry.rs`.
     content = (ROOT_DIR / "src/registry.rs").read_text()
 
     seen_macro = False
     has_written = False
-    with open(ROOT_DIR / "src/registry.rs", "w") as fp:
+    with (ROOT_DIR / "src/registry.rs").open("w") as fp:
         for line in content.splitlines():
             fp.write(line)
             fp.write("\n")
@@ -98,7 +123,7 @@ impl Violation for %s {
 
             if line.strip() == f"// {linter}":
                 indent = get_indent(line)
-                fp.write(f"{indent}{code} => violations::{name},")
+                fp.write(f"{indent}{code} => rules::{dir_name(linter)}::rules::{name},")
                 fp.write("\n")
                 has_written = True
 

scripts/pyproject.toml

@@ -1,8 +1,10 @@
 [tool.ruff]
 select = ["ALL"]
 ignore = [
-    "S101", # assert-used
-    "PLR2004", # magic-value-comparison
+  "E501",    # line-too-long
+  "INP001",  # implicit-namespace-package
+  "PLR2004", # magic-value-comparison
+  "S101",    # assert-used
 ]
 
 [tool.ruff.pydocstyle]

src/ast/comparable.rs

@@ -295,7 +295,7 @@ pub enum ComparableExpr<'a> {
         orelse: Box<ComparableExpr<'a>>,
     },
     Dict {
-        keys: Vec<ComparableExpr<'a>>,
+        keys: Vec<Option<ComparableExpr<'a>>>,
         values: Vec<ComparableExpr<'a>>,
     },
     Set {
@@ -424,7 +424,10 @@ impl<'a> From<&'a Expr> for ComparableExpr<'a> {
                 orelse: orelse.into(),
             },
             ExprKind::Dict { keys, values } => Self::Dict {
-                keys: keys.iter().map(std::convert::Into::into).collect(),
+                keys: keys
+                    .iter()
+                    .map(|expr| expr.as_ref().map(std::convert::Into::into))
+                    .collect(),
                 values: values.iter().map(std::convert::Into::into).collect(),
             },
             ExprKind::Set { elts } => Self::Set {

src/ast/hashable.rs

@@ -0,0 +1,40 @@
+use std::hash::Hash;
+
+use rustpython_ast::Expr;
+
+use crate::ast::comparable::ComparableExpr;
+
+/// Wrapper around `Expr` that implements `Hash` and `PartialEq`.
+pub struct HashableExpr<'a>(&'a Expr);
+
+impl Hash for HashableExpr<'_> {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        let comparable = ComparableExpr::from(self.0);
+        comparable.hash(state);
+    }
+}
+
+impl PartialEq<Self> for HashableExpr<'_> {
+    fn eq(&self, other: &Self) -> bool {
+        let comparable = ComparableExpr::from(self.0);
+        comparable == ComparableExpr::from(other.0)
+    }
+}
+
+impl Eq for HashableExpr<'_> {}
+
+impl<'a> From<&'a Expr> for HashableExpr<'a> {
+    fn from(expr: &'a Expr) -> Self {
+        Self(expr)
+    }
+}
+
+impl<'a> HashableExpr<'a> {
+    pub(crate) fn from_expr(expr: &'a Expr) -> Self {
+        Self(expr)
+    }
+
+    pub(crate) fn as_expr(&self) -> &'a Expr {
+        self.0
+    }
+}

src/ast/helpers.rs

@@ -40,19 +40,22 @@ pub fn unparse_stmt(stmt: &Stmt, stylist: &Stylist) -> String {
     generator.generate()
 }
 
-fn collect_call_path_inner<'a>(expr: &'a Expr, parts: &mut CallPath<'a>) {
+fn collect_call_path_inner<'a>(expr: &'a Expr, parts: &mut CallPath<'a>) -> bool {
     match &expr.node {
-        ExprKind::Call { func, .. } => {
-            collect_call_path_inner(func, parts);
-        }
+        ExprKind::Call { func, .. } => collect_call_path_inner(func, parts),
         ExprKind::Attribute { value, attr, .. } => {
-            collect_call_path_inner(value, parts);
-            parts.push(attr);
+            if collect_call_path_inner(value, parts) {
+                parts.push(attr);
+                true
+            } else {
+                false
+            }
         }
         ExprKind::Name { id, .. } => {
             parts.push(id);
+            true
         }
-        _ => {}
+        _ => false,
     }
 }
 
@@ -161,7 +164,7 @@ where
         }
         ExprKind::Dict { keys, values } => values
             .iter()
-            .chain(keys.iter())
+            .chain(keys.iter().flatten())
             .any(|expr| any_over_expr(expr, func)),
         ExprKind::Set { elts } | ExprKind::List { elts, .. } | ExprKind::Tuple { elts, .. } => {
             elts.iter().any(|expr| any_over_expr(expr, func))
@@ -236,6 +239,186 @@ where
     }
 }
 
+pub fn any_over_stmt<F>(stmt: &Stmt, func: &F) -> bool
+where
+    F: Fn(&Expr) -> bool,
+{
+    match &stmt.node {
+        StmtKind::FunctionDef {
+            args,
+            body,
+            decorator_list,
+            returns,
+            ..
+        }
+        | StmtKind::AsyncFunctionDef {
+            args,
+            body,
+            decorator_list,
+            returns,
+            ..
+        } => {
+            args.defaults.iter().any(|expr| any_over_expr(expr, func))
+                || args
+                    .kw_defaults
+                    .iter()
+                    .any(|expr| any_over_expr(expr, func))
+                || args.args.iter().any(|arg| {
+                    arg.node
+                        .annotation
+                        .as_ref()
+                        .map_or(false, |expr| any_over_expr(expr, func))
+                })
+                || args.kwonlyargs.iter().any(|arg| {
+                    arg.node
+                        .annotation
+                        .as_ref()
+                        .map_or(false, |expr| any_over_expr(expr, func))
+                })
+                || args.posonlyargs.iter().any(|arg| {
+                    arg.node
+                        .annotation
+                        .as_ref()
+                        .map_or(false, |expr| any_over_expr(expr, func))
+                })
+                || args.vararg.as_ref().map_or(false, |arg| {
+                    arg.node
+                        .annotation
+                        .as_ref()
+                        .map_or(false, |expr| any_over_expr(expr, func))
+                })
+                || args.kwarg.as_ref().map_or(false, |arg| {
+                    arg.node
+                        .annotation
+                        .as_ref()
+                        .map_or(false, |expr| any_over_expr(expr, func))
+                })
+                || body.iter().any(|stmt| any_over_stmt(stmt, func))
+                || decorator_list.iter().any(|expr| any_over_expr(expr, func))
+                || returns
+                    .as_ref()
+                    .map_or(false, |value| any_over_expr(value, func))
+        }
+        StmtKind::ClassDef {
+            bases,
+            keywords,
+            body,
+            decorator_list,
+            ..
+        } => {
+            bases.iter().any(|expr| any_over_expr(expr, func))
+                || keywords
+                    .iter()
+                    .any(|keyword| any_over_expr(&keyword.node.value, func))
+                || body.iter().any(|stmt| any_over_stmt(stmt, func))
+                || decorator_list.iter().any(|expr| any_over_expr(expr, func))
+        }
+        StmtKind::Return { value } => value
+            .as_ref()
+            .map_or(false, |value| any_over_expr(value, func)),
+        StmtKind::Delete { targets } => targets.iter().any(|expr| any_over_expr(expr, func)),
+        StmtKind::Assign { targets, value, .. } => {
+            targets.iter().any(|expr| any_over_expr(expr, func)) || any_over_expr(value, func)
+        }
+        StmtKind::AugAssign { target, value, .. } => {
+            any_over_expr(target, func) || any_over_expr(value, func)
+        }
+        StmtKind::AnnAssign {
+            target,
+            annotation,
+            value,
+            ..
+        } => {
+            any_over_expr(target, func)
+                || any_over_expr(annotation, func)
+                || value
+                    .as_ref()
+                    .map_or(false, |value| any_over_expr(value, func))
+        }
+        StmtKind::For {
+            target,
+            iter,
+            body,
+            orelse,
+            ..
+        }
+        | StmtKind::AsyncFor {
+            target,
+            iter,
+            body,
+            orelse,
+            ..
+        } => {
+            any_over_expr(target, func)
+                || any_over_expr(iter, func)
+                || any_over_body(body, func)
+                || any_over_body(orelse, func)
+        }
+        StmtKind::While { test, body, orelse } => {
+            any_over_expr(test, func) || any_over_body(body, func) || any_over_body(orelse, func)
+        }
+        StmtKind::If { test, body, orelse } => {
+            any_over_expr(test, func) || any_over_body(body, func) || any_over_body(orelse, func)
+        }
+        StmtKind::With { items, body, .. } | StmtKind::AsyncWith { items, body, .. } => {
+            items.iter().any(|withitem| {
+                any_over_expr(&withitem.context_expr, func)
+                    || withitem
+                        .optional_vars
+                        .as_ref()
+                        .map_or(false, |expr| any_over_expr(expr, func))
+            }) || any_over_body(body, func)
+        }
+        StmtKind::Raise { exc, cause } => {
+            exc.as_ref()
+                .map_or(false, |value| any_over_expr(value, func))
+                || cause
+                    .as_ref()
+                    .map_or(false, |value| any_over_expr(value, func))
+        }
+        StmtKind::Try {
+            body,
+            handlers,
+            orelse,
+            finalbody,
+        } => {
+            any_over_body(body, func)
+                || handlers.iter().any(|handler| {
+                    let ExcepthandlerKind::ExceptHandler { type_, body, .. } = &handler.node;
+                    type_
+                        .as_ref()
+                        .map_or(false, |expr| any_over_expr(expr, func))
+                        || any_over_body(body, func)
+                })
+                || any_over_body(orelse, func)
+                || any_over_body(finalbody, func)
+        }
+        StmtKind::Assert { test, msg } => {
+            any_over_expr(test, func)
+                || msg
+                    .as_ref()
+                    .map_or(false, |value| any_over_expr(value, func))
+        }
+        // TODO(charlie): Handle match statements.
+        StmtKind::Match { .. } => false,
+        StmtKind::Import { .. } => false,
+        StmtKind::ImportFrom { .. } => false,
+        StmtKind::Global { .. } => false,
+        StmtKind::Nonlocal { .. } => false,
+        StmtKind::Expr { value } => any_over_expr(value, func),
+        StmtKind::Pass => false,
+        StmtKind::Break => false,
+        StmtKind::Continue => false,
+    }
+}
+
+pub fn any_over_body<F>(body: &[Stmt], func: &F) -> bool
+where
+    F: Fn(&Expr) -> bool,
+{
+    body.iter().any(|stmt| any_over_stmt(stmt, func))
+}
+
 static DUNDER_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"__[^\s]+__").unwrap());
 
 /// Return `true` if the [`Stmt`] is an assignment to a dunder (like `__all__`).
@@ -366,7 +549,7 @@ pub fn collect_arg_names<'a>(arguments: &'a Arguments) -> FxHashSet<&'a str> {
 
 /// Returns `true` if a statement or expression includes at least one comment.
 pub fn has_comments_in(range: Range, locator: &Locator) -> bool {
-    lexer::make_tokenizer(&locator.slice_source_code_range(&range))
+    lexer::make_tokenizer(locator.slice_source_code_range(&range))
         .any(|result| result.map_or(false, |(_, tok, _)| matches!(tok, Tok::Comment(..))))
 }
 
@@ -379,6 +562,23 @@ pub fn is_super_call_with_arguments(func: &Expr, args: &[Expr]) -> bool {
     }
 }
 
+/// Return `true` if the body uses `locals()`, `globals()`, `vars()`, `eval()`.
+pub fn uses_magic_variable_access(checker: &Checker, body: &[Stmt]) -> bool {
+    any_over_body(body, &|expr| {
+        if let ExprKind::Call { func, .. } = &expr.node {
+            checker.resolve_call_path(func).map_or(false, |call_path| {
+                call_path.as_slice() == ["", "locals"]
+                    || call_path.as_slice() == ["", "globals"]
+                    || call_path.as_slice() == ["", "vars"]
+                    || call_path.as_slice() == ["", "eval"]
+                    || call_path.as_slice() == ["", "exec"]
+            })
+        } else {
+            false
+        }
+    })
+}
+
 /// Format the module name for a relative import.
 pub fn format_import_from(level: Option<&usize>, module: Option<&str>) -> String {
     let mut module_name = String::with_capacity(16);
@@ -486,7 +686,7 @@ pub fn identifier_range(stmt: &Stmt, locator: &Locator) -> Range {
             | StmtKind::AsyncFunctionDef { .. }
     ) {
         let contents = locator.slice_source_code_range(&Range::from_located(stmt));
-        for (start, tok, end) in lexer::make_tokenizer_located(&contents, stmt.location).flatten() {
+        for (start, tok, end) in lexer::make_tokenizer_located(contents, stmt.location).flatten() {
             if matches!(tok, Tok::Name { .. }) {
                 return Range::new(start, end);
             }
@@ -515,7 +715,7 @@ pub fn binding_range(binding: &Binding, locator: &Locator) -> Range {
 // Return the ranges of `Name` tokens within a specified node.
 pub fn find_names<T>(located: &Located<T>, locator: &Locator) -> Vec<Range> {
     let contents = locator.slice_source_code_range(&Range::from_located(located));
-    lexer::make_tokenizer_located(&contents, located.location)
+    lexer::make_tokenizer_located(contents, located.location)
         .flatten()
         .filter(|(_, tok, _)| matches!(tok, Tok::Name { .. }))
         .map(|(start, _, end)| Range {
@@ -535,7 +735,7 @@ pub fn excepthandler_name_range(handler: &Excepthandler, locator: &Locator) -> O
             let type_end_location = type_.end_location.unwrap();
             let contents =
                 locator.slice_source_code_range(&Range::new(type_end_location, body[0].location));
-            let range = lexer::make_tokenizer_located(&contents, type_end_location)
+            let range = lexer::make_tokenizer_located(contents, type_end_location)
                 .flatten()
                 .tuple_windows()
                 .find(|(tok, next_tok)| {
@@ -562,7 +762,7 @@ pub fn except_range(handler: &Excepthandler, locator: &Locator) -> Range {
         location: handler.location,
         end_location: end,
     });
-    let range = lexer::make_tokenizer_located(&contents, handler.location)
+    let range = lexer::make_tokenizer_located(contents, handler.location)
         .flatten()
         .find(|(_, kind, _)| matches!(kind, Tok::Except { .. }))
         .map(|(location, _, end_location)| Range {
@@ -576,7 +776,7 @@ pub fn except_range(handler: &Excepthandler, locator: &Locator) -> Range {
 /// Find f-strings that don't contain any formatted values in a `JoinedStr`.
 pub fn find_useless_f_strings(expr: &Expr, locator: &Locator) -> Vec<(Range, Range)> {
     let contents = locator.slice_source_code_range(&Range::from_located(expr));
-    lexer::make_tokenizer_located(&contents, expr.location)
+    lexer::make_tokenizer_located(contents, expr.location)
         .flatten()
         .filter_map(|(location, tok, end_location)| match tok {
             Tok::String {
@@ -630,7 +830,7 @@ pub fn else_range(stmt: &Stmt, locator: &Locator) -> Option<Range> {
                     .expect("Expected orelse to be non-empty")
                     .location,
             });
-            let range = lexer::make_tokenizer_located(&contents, body_end)
+            let range = lexer::make_tokenizer_located(contents, body_end)
                 .flatten()
                 .find(|(_, kind, _)| matches!(kind, Tok::Else))
                 .map(|(location, _, end_location)| Range {
@@ -646,7 +846,7 @@ pub fn else_range(stmt: &Stmt, locator: &Locator) -> Option<Range> {
 /// Return the `Range` of the first `Tok::Colon` token in a `Range`.
 pub fn first_colon_range(range: Range, locator: &Locator) -> Option<Range> {
     let contents = locator.slice_source_code_range(&range);
-    let range = lexer::make_tokenizer_located(&contents, range.location)
+    let range = lexer::make_tokenizer_located(contents, range.location)
         .flatten()
         .find(|(_, kind, _)| matches!(kind, Tok::Colon))
         .map(|(location, _, end_location)| Range {
@@ -676,7 +876,7 @@ pub fn elif_else_range(stmt: &Stmt, locator: &Locator) -> Option<Range> {
         _ => return None,
     };
     let contents = locator.slice_source_code_range(&Range::new(start, end));
-    let range = lexer::make_tokenizer_located(&contents, start)
+    let range = lexer::make_tokenizer_located(contents, start)
         .flatten()
         .find(|(_, kind, _)| matches!(kind, Tok::Elif | Tok::Else))
         .map(|(location, _, end_location)| Range {

src/ast/mod.rs

@@ -2,6 +2,7 @@ pub mod branch_detection;
 pub mod cast;
 pub mod comparable;
 pub mod function_type;
+pub mod hashable;
 pub mod helpers;
 pub mod operations;
 pub mod relocate;

src/ast/relocate.rs

@@ -39,7 +39,7 @@ pub fn relocate_expr(expr: &mut Expr, location: Range) {
             relocate_expr(orelse, location);
         }
         ExprKind::Dict { keys, values } => {
-            for expr in keys {
+            for expr in keys.iter_mut().flatten() {
                 relocate_expr(expr, location);
             }
             for expr in values {

src/ast/types.rs

@@ -33,6 +33,10 @@ impl Range {
     pub fn from_located<T>(located: &Located<T>) -> Self {
         Range::new(located.location, located.end_location.unwrap())
     }
+
+    pub fn contains(&self, other: &Range) -> bool {
+        self.location <= other.location && self.end_location >= other.end_location
+    }
 }
 
 #[derive(Debug)]
@@ -130,8 +134,22 @@ pub struct Binding<'a> {
     /// The statement in which the [`Binding`] was defined.
     pub source: Option<RefEquality<'a, Stmt>>,
     /// Tuple of (scope index, range) indicating the scope and range at which
-    /// the binding was last used.
-    pub used: Option<(usize, Range)>,
+    /// the binding was last used in a runtime context.
+    pub runtime_usage: Option<(usize, Range)>,
+    /// Tuple of (scope index, range) indicating the scope and range at which
+    /// the binding was last used in a typing-time context.
+    pub typing_usage: Option<(usize, Range)>,
+    /// Tuple of (scope index, range) indicating the scope and range at which
+    /// the binding was last used in a synthetic context. This is used for
+    /// (e.g.) `__future__` imports, explicit re-exports, and other bindings
+    /// that should be considered used even if they're never referenced.
+    pub synthetic_usage: Option<(usize, Range)>,
+}
+
+#[derive(Copy, Clone)]
+pub enum UsageContext {
+    Runtime,
+    Typing,
 }
 
 // Pyflakes defines the following binding hierarchy (via inheritance):
@@ -152,6 +170,19 @@ pub struct Binding<'a> {
 //        FutureImportation
 
 impl<'a> Binding<'a> {
+    pub fn mark_used(&mut self, scope: usize, range: Range, context: UsageContext) {
+        match context {
+            UsageContext::Runtime => self.runtime_usage = Some((scope, range)),
+            UsageContext::Typing => self.typing_usage = Some((scope, range)),
+        }
+    }
+
+    pub fn used(&self) -> bool {
+        self.runtime_usage.is_some()
+            || self.synthetic_usage.is_some()
+            || self.typing_usage.is_some()
+    }
+
     pub fn is_definition(&self) -> bool {
         matches!(
             self.kind,

src/ast/visitor.rs

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