Bump version to 0.0.183

.github/workflows/ci.yaml

@@ -20,6 +20,9 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
+          toolchain: nightly-2022-11-01
+          override: true
+          components: rustfmt
       - uses: actions/cache@v3
         env:
           cache-name: cache-cargo
@@ -33,6 +36,12 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
       - run: cargo build --all --release
+      - run: ./target/release/ruff_dev generate-rules-table
+      - run: ./target/release/ruff_dev generate-options
+      - run: git diff --quiet README.md || echo "::error file=README.md::This file is outdated. You may have to rerun 'cargo dev generate-options' and/or 'cargo dev generate-rules-table'."
+      - run: ./target/release/ruff_dev generate-check-code-prefix && cargo fmt -- src/checks_gen.rs
+      - run: git diff --quiet src/checks_gen.rs || echo "::error file=src/checks_gen.rs::This file is outdated. You may have to rerun 'cargo dev generate-check-code-prefix'."
+      - run: git diff --exit-code -- README.md src/checks_gen.rs
 
   cargo_fmt:
     name: "cargo fmt"
@@ -106,7 +115,9 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
             ${{ runner.os }}-
+      - run: pip install black[d]==22.12.0
       - run: cargo test --all
+      - run: cargo test --package ruff --test black_compatibility_test -- --ignored
 
   maturin_build:
     name: "maturin build"

.pre-commit-config.yaml

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

BREAKING_CHANGES.md

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

Cargo.lock

@@ -724,7 +724,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.172-dev.0"
+version = "0.0.183-dev.0"
 dependencies = [
  "anyhow",
  "clap 4.0.29",
@@ -796,6 +796,12 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "glob"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+
 [[package]]
 name = "globset"
 version = "0.4.9"
@@ -888,6 +894,24 @@ dependencies = [
  "unicode-normalization",
 ]
 
+[[package]]
+name = "ignore"
+version = "0.4.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d"
+dependencies = [
+ "crossbeam-utils",
+ "globset",
+ "lazy_static",
+ "log",
+ "memchr",
+ "regex",
+ "same-file",
+ "thread_local",
+ "walkdir",
+ "winapi-util",
+]
+
 [[package]]
 name = "indexmap"
 version = "1.9.2"
@@ -1821,7 +1845,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.172"
+version = "0.0.183"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
@@ -1841,7 +1865,9 @@ dependencies = [
  "fern",
  "filetime",
  "getrandom 0.2.8",
+ "glob",
  "globset",
+ "ignore",
  "insta",
  "itertools",
  "libcst",
@@ -1869,12 +1895,13 @@ dependencies = [
  "titlecase",
  "toml",
  "update-informer",
+ "ureq",
  "walkdir",
 ]
 
 [[package]]
 name = "ruff_dev"
-version = "0.0.172"
+version = "0.0.183"
 dependencies = [
  "anyhow",
  "clap 4.0.29",
@@ -1892,7 +1919,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_macros"
-version = "0.0.172"
+version = "0.0.183"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1935,7 +1962,7 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.1.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=28f9f65ccc625f00835d84bbb5fba274dce5aa89#28f9f65ccc625f00835d84bbb5fba274dce5aa89"
+source = "git+https://github.com/RustPython/RustPython.git?rev=8d879a53197f9c73062f6160410bdba796a71cbf#8d879a53197f9c73062f6160410bdba796a71cbf"
 dependencies = [
  "num-bigint",
  "rustpython-common",
@@ -1945,7 +1972,7 @@ dependencies = [
 [[package]]
 name = "rustpython-common"
 version = "0.0.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=28f9f65ccc625f00835d84bbb5fba274dce5aa89#28f9f65ccc625f00835d84bbb5fba274dce5aa89"
+source = "git+https://github.com/RustPython/RustPython.git?rev=8d879a53197f9c73062f6160410bdba796a71cbf#8d879a53197f9c73062f6160410bdba796a71cbf"
 dependencies = [
  "ascii",
  "cfg-if 1.0.0",
@@ -1968,7 +1995,7 @@ dependencies = [
 [[package]]
 name = "rustpython-compiler-core"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=28f9f65ccc625f00835d84bbb5fba274dce5aa89#28f9f65ccc625f00835d84bbb5fba274dce5aa89"
+source = "git+https://github.com/RustPython/RustPython.git?rev=8d879a53197f9c73062f6160410bdba796a71cbf#8d879a53197f9c73062f6160410bdba796a71cbf"
 dependencies = [
  "bincode",
  "bitflags",
@@ -1985,7 +2012,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=28f9f65ccc625f00835d84bbb5fba274dce5aa89#28f9f65ccc625f00835d84bbb5fba274dce5aa89"
+source = "git+https://github.com/RustPython/RustPython.git?rev=8d879a53197f9c73062f6160410bdba796a71cbf#8d879a53197f9c73062f6160410bdba796a71cbf"
 dependencies = [
  "ahash",
  "anyhow",
@@ -2297,6 +2324,15 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "thread_local"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
+dependencies = [
+ "once_cell",
+]
+
 [[package]]
 name = "time"
 version = "0.1.45"

Cargo.toml

@@ -6,7 +6,7 @@ members = [
 
 [package]
 name = "ruff"
-version = "0.0.172"
+version = "0.0.183"
 edition = "2021"
 rust-version = "1.65.0"
 
@@ -28,7 +28,9 @@ common-path = { version = "1.0.0" }
 dirs = { version = "4.0.0" }
 fern = { version = "0.6.1" }
 filetime = { version = "0.2.17" }
+glob = { version = "0.3.0" }
 globset = { version = "0.4.9" }
+ignore = { version = "0.4.18" }
 itertools = { version = "0.10.5" }
 libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a8725d161fe8b3ed73a6758b21e177" }
 log = { version = "0.4.17" }
@@ -41,11 +43,11 @@ quick-junit = { version = "0.3.2" }
 rayon = { version = "1.5.3" }
 regex = { version = "1.6.0" }
 ropey = { version = "1.5.0", features = ["cr_lines", "simd"], default-features = false }
-ruff_macros = { version = "0.0.172", path = "ruff_macros" }
+ruff_macros = { version = "0.0.183", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "28f9f65ccc625f00835d84bbb5fba274dce5aa89" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "28f9f65ccc625f00835d84bbb5fba274dce5aa89" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "28f9f65ccc625f00835d84bbb5fba274dce5aa89" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "8d879a53197f9c73062f6160410bdba796a71cbf" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "8d879a53197f9c73062f6160410bdba796a71cbf" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "8d879a53197f9c73062f6160410bdba796a71cbf" }
 serde = { version = "1.0.147", features = ["derive"] }
 serde_json = { version = "1.0.87" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
@@ -69,6 +71,7 @@ assert_cmd = { version = "2.0.4" }
 criterion = { version = "0.4.0" }
 insta = { version = "1.19.1", features = ["yaml"] }
 test-case = { version = "2.2.2" }
+ureq = { version = "2.5.0", features = [] }
 
 [features]
 default = ["update-informer"]

LICENSE

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

README.md

@@ -41,6 +41,7 @@ Ruff is extremely actively developed and used in major open-source projects like
 - [Pydantic](https://github.com/pydantic/pydantic)
 - [Saleor](https://github.com/saleor/saleor)
 - [Hatch](https://github.com/pypa/hatch)
+- [Jupyter Server](https://github.com/jupyter-server/jupyter_server)
 
 Read the [launch blog post](https://notes.crmarsh.com/python-tooling-could-be-much-much-faster).
 
@@ -85,13 +86,16 @@ of [Conda](https://docs.conda.io/en/latest/):
    1. [flake8-builtins (A)](#flake8-builtins-a)
    1. [flake8-comprehensions (C4)](#flake8-comprehensions-c4)
    1. [flake8-debugger (T10)](#flake8-debugger-t10)
+   1. [flake8-errmsg (EM)](#flake8-errmsg-em)
    1. [flake8-import-conventions (ICN)](#flake8-import-conventions-icn)
    1. [flake8-print (T20)](#flake8-print-t20)
    1. [flake8-quotes (Q)](#flake8-quotes-q)
    1. [flake8-return (RET)](#flake8-return-ret)
+   1. [flake8-simplify (SIM)](#flake8-simplify-sim)
    1. [flake8-tidy-imports (TID)](#flake8-tidy-imports-tid)
    1. [flake8-unused-arguments (ARG)](#flake8-unused-arguments-arg)
    1. [eradicate (ERA)](#eradicate-era)
+   1. [pandas-vet (PDV)](#pandas-vet-pdv)
    1. [pygrep-hooks (PGH)](#pygrep-hooks-pgh)
    1. [Pylint (PLC, PLE, PLR, PLW)](#pylint-plc-ple-plr-plw)
    1. [Ruff-specific rules (RUF)](#ruff-specific-rules-ruf)<!-- End auto-generated table of contents. -->
@@ -120,12 +124,18 @@ For **macOS Homebrew** and **Linuxbrew** users, Ruff is also available as [`ruff
 brew install ruff
 ```
 
-For Conda users, Ruff is also available as [`ruff`](https://anaconda.org/conda-forge/ruff) on `conda-forge`:
+For **Conda** users, Ruff is also available as [`ruff`](https://anaconda.org/conda-forge/ruff) on `conda-forge`:
 
 ```shell
 conda install -c conda-forge ruff
 ```
 
+For **Arch Linux** users, Ruff is also available as [`ruff`](https://archlinux.org/packages/community/x86_64/ruff/) on the official repositories:
+
+```shell
+pacman -S ruff
+```
+
 ### Usage
 
 To run Ruff, try any of the following:
@@ -147,7 +157,7 @@ Ruff also works with [pre-commit](https://pre-commit.com):
 ```yaml
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.172
+    rev: v0.0.183
     hooks:
       - id: ruff
 ```
@@ -296,13 +306,15 @@ Options:
       --per-file-ignores <PER_FILE_IGNORES>
           List of mappings from file pattern to code to exclude
       --format <FORMAT>
-          Output serialization format for error messages [default: text] [possible values: text, json, junit, grouped]
+          Output serialization format for error messages [possible values: text, json, junit, grouped, github]
       --show-source
           Show violations with source code
+      --respect-gitignore
+          Respect file exclusions via `.gitignore` and other standard ignore files
       --show-files
           See the files Ruff will be run against with the current settings
       --show-settings
-          See Ruff's settings
+          See the settings Ruff will use to check a given Python file
       --add-noqa
           Enable automatic additions of noqa directives to failing lines
       --dummy-variable-rgx <DUMMY_VARIABLE_RGX>
@@ -323,6 +335,55 @@ Options:
           Print version information
 ```
 
+### `pyproject.toml` discovery
+
+Similar to [ESLint](https://eslint.org/docs/latest/user-guide/configuring/configuration-files#cascading-and-hierarchy),
+Ruff supports hierarchical configuration, such that the "closest" `pyproject.toml` file in the
+directory hierarchy is used for every individual file, with all paths in the `pyproject.toml` file
+(e.g., `exclude` globs, `src` paths) being resolved relative to the directory containing the
+`pyproject.toml` file.
+
+There are a few exceptions to these rules:
+
+1. In locating the "closest" `pyproject.toml` file for a given path, Ruff ignore any
+   `pyproject.toml` files that lack a `[tool.ruff]` section.
+2. If a configuration file is passed directly via `--config`, those settings are used for across
+   files. Any relative paths in that configuration file (like `exclude` globs or `src` paths) are
+   resolved relative to the _current working directory_.
+3. If no `pyproject.toml` file is found in the filesystem hierarchy, Ruff will fall back to using
+   a default configuration. If a user-specific configuration file exists
+   at `${config_dir}/ruff/pyproject.toml`,
+   that file will be used instead of the default configuration, with `${config_dir}` being
+   determined via the [`dirs](https://docs.rs/dirs/4.0.0/dirs/fn.config_dir.html) crate, and all
+   relative paths being again resolved relative to the _current working directory_.
+4. Any `pyproject.toml`-supported settings that are provided on the command-line (e.g., via
+   `--select`) will override the settings in _every_ resolved configuration file.
+
+Unlike [ESLint](https://eslint.org/docs/latest/user-guide/configuring/configuration-files#cascading-and-hierarchy),
+Ruff does not merge settings across configuration files; instead, the "closest" configuration file
+is used, and any parent configuration files are ignored. In lieu of this implicit cascade, Ruff
+supports an [`extend`](#extend) field, which allows you to inherit the settings from another
+`pyproject.toml` file, like so:
+
+```toml
+# Extend the `pyproject.toml` file in the parent directory.
+extend = "../pyproject.toml"
+# But use a different line length.
+line-length = 100
+```
+
+### Python file discovery
+
+When passed a path on the command-line, Ruff will automatically discover all Python files in that
+path, taking into account the [`exclude`](#exclude) and [`extend-exclude`](#extend-exclude) settings
+in each directory's `pyproject.toml` file.
+
+By default, Ruff will also skip any files that are omitted via `.ignore`, `.gitignore`,
+`.git/info/exclude`, and global `gitignore` files (see: [`respect-gitignore`](#respect-gitignore)).
+
+Files that are passed to `ruff` directly are always checked, regardless of the above criteria.
+For example, `ruff /path/to/excluded/file.py` will always check `file.py`.
+
 ### Ignoring errors
 
 To omit a lint check entirely, add it to the "ignore" list via [`ignore`](#ignore) or
@@ -362,7 +423,7 @@ For targeted exclusions across entire files (e.g., "Ignore all F841 violations i
 ### "Action Comments"
 
 Ruff respects `isort`'s ["Action Comments"](https://pycqa.github.io/isort/docs/configuration/action_comments.html)
-(`# isort: skip_file`, `# isort: on`, `# isort: off`, `# isort: skip`, and `isort: split`), which
+(`# isort: skip_file`, `# isort: on`, `# isort: off`, `# isort: skip`, and `# isort: split`), which
 enable selectively enabling and disabling import sorting for blocks of code and other inline
 configuration.
 
@@ -412,14 +473,14 @@ For more, see [Pyflakes](https://pypi.org/project/pyflakes/2.5.0/) on PyPI.
 | F501 | PercentFormatInvalidFormat | '...' % ... has invalid format string: ... |  |
 | F502 | PercentFormatExpectedMapping | '...' % ... expected mapping but got sequence |  |
 | F503 | PercentFormatExpectedSequence | '...' % ... expected sequence but got mapping |  |
-| F504 | PercentFormatExtraNamedArguments | '...' % ... has unused named argument(s): ... |  |
+| F504 | PercentFormatExtraNamedArguments | '...' % ... has unused named argument(s): ... | 🛠 |
 | F505 | PercentFormatMissingArgument | '...' % ... is missing argument(s) for placeholder(s): ... |  |
 | F506 | PercentFormatMixedPositionalAndNamed | '...' % ... has mixed positional and named placeholders |  |
 | F507 | PercentFormatPositionalCountMismatch | '...' % ... has 4 placeholder(s) but 2 substitution(s) |  |
 | F508 | PercentFormatStarRequiresSequence | '...' % ... `*` specifier requires sequence |  |
 | F509 | PercentFormatUnsupportedFormatCharacter | '...' % ... has unsupported format character 'c' |  |
 | F521 | StringDotFormatInvalidFormat | '...'.format(...) has invalid format string: ... |  |
-| F522 | StringDotFormatExtraNamedArguments | '...'.format(...) has unused named argument(s): ... |  |
+| F522 | StringDotFormatExtraNamedArguments | '...'.format(...) has unused named argument(s): ... | 🛠 |
 | F523 | StringDotFormatExtraPositionalArguments | '...'.format(...) has unused arguments at position(s): ... |  |
 | F524 | StringDotFormatMissingArguments | '...'.format(...) is missing argument(s) for placeholder(s): ... |  |
 | F525 | StringDotFormatMixingAutomatic | '...'.format(...) mixes automatic and manual numbering |  |
@@ -558,6 +619,7 @@ For more, see [pyupgrade](https://pypi.org/project/pyupgrade/3.2.0/) on PyPI.
 | UP013 | ConvertTypedDictFunctionalToClass | Convert `...` from `TypedDict` functional to class syntax | 🛠 |
 | UP014 | ConvertNamedTupleFunctionalToClass | Convert `...` from `NamedTuple` functional to class syntax | 🛠 |
 | UP015 | RedundantOpenModes | Unnecessary open mode parameters | 🛠 |
+| UP016 | RemoveSixCompat | Unnecessary `six` compatibility usage | 🛠 |
 
 ### pep8-naming (N)
 
@@ -709,7 +771,7 @@ For more, see [flake8-comprehensions](https://pypi.org/project/flake8-comprehens
 | C409 | UnnecessaryLiteralWithinTupleCall | Unnecessary `(list\|tuple)` literal passed to `tuple()` (remove the outer call to `tuple()`) | 🛠 |
 | C410 | UnnecessaryLiteralWithinListCall | Unnecessary `(list\|tuple)` literal passed to `list()` (rewrite as a `list` literal) | 🛠 |
 | C411 | UnnecessaryListCall | Unnecessary `list` call (remove the outer call to `list()`) | 🛠 |
-| C413 | UnnecessaryCallAroundSorted | Unnecessary `(list\|reversed)` call around `sorted()` |  |
+| C413 | UnnecessaryCallAroundSorted | Unnecessary `(list\|reversed)` call around `sorted()` | 🛠 |
 | C414 | UnnecessaryDoubleCastOrProcess | Unnecessary `(list\|reversed\|set\|sorted\|tuple)` call within `(list\|set\|sorted\|tuple)()` |  |
 | C415 | UnnecessarySubscriptReversal | Unnecessary subscript reversal of iterable within `(reversed\|set\|sorted)()` |  |
 | C416 | UnnecessaryComprehension | Unnecessary `(list\|set)` comprehension (rewrite using `(list\|set)()`) | 🛠 |
@@ -723,6 +785,16 @@ For more, see [flake8-debugger](https://pypi.org/project/flake8-debugger/4.1.2/)
 | ---- | ---- | ------- | --- |
 | T100 | Debugger | Import for `...` found |  |
 
+### flake8-errmsg (EM)
+
+For more, see [flake8-errmsg](https://pypi.org/project/flake8-errmsg/0.4.0/) on PyPI.
+
+| Code | Name | Message | Fix |
+| ---- | ---- | ------- | --- |
+| EM101 | RawStringInException | Exception must not use a string literal, assign to variable first |  |
+| EM102 | FStringInException | Exception must not use an f-string literal, assign to variable first |  |
+| EM103 | DotFormatInException | Exception must not use a `.format()` string directly, assign to variable first |  |
+
 ### flake8-import-conventions (ICN)
 
 | Code | Name | Message | Fix |
@@ -764,6 +836,14 @@ For more, see [flake8-return](https://pypi.org/project/flake8-return/1.2.0/) on
 | RET507 | SuperfluousElseContinue | Unnecessary `else` after `continue` statement |  |
 | RET508 | SuperfluousElseBreak | Unnecessary `else` after `break` statement |  |
 
+### flake8-simplify (SIM)
+
+For more, see [flake8-simplify](https://pypi.org/project/flake8-simplify/0.19.3/) on PyPI.
+
+| Code | Name | Message | Fix |
+| ---- | ---- | ------- | --- |
+| SIM118 | KeyInDict | Use `key in dict` instead of `key in dict.keys()` | 🛠 |
+
 ### flake8-tidy-imports (TID)
 
 For more, see [flake8-tidy-imports](https://pypi.org/project/flake8-tidy-imports/4.8.0/) on PyPI.
@@ -792,6 +872,25 @@ For more, see [eradicate](https://pypi.org/project/eradicate/2.1.0/) on PyPI.
 | ---- | ---- | ------- | --- |
 | ERA001 | CommentedOutCode | Found commented-out code | 🛠 |
 
+### pandas-vet (PDV)
+
+For more, see [pandas-vet](https://pypi.org/project/pandas-vet/0.2.3/) on PyPI.
+
+| Code | Name | Message | Fix |
+| ---- | ---- | ------- | --- |
+| PDV002 | UseOfInplaceArgument | `inplace=True` should be avoided; it has inconsistent behavior |  |
+| PDV003 | UseOfDotIsNull | `.isna` is preferred to `.isnull`; functionality is equivalent |  |
+| PDV004 | UseOfDotNotNull | `.notna` is preferred to `.notnull`; functionality is equivalent |  |
+| PDV007 | UseOfDotIx | ``ix` i` deprecated; use more explicit `.loc` o` `.iloc` |  |
+| PDV008 | UseOfDotAt | Use `.loc` instead of `.at`.  If speed is important, use numpy. |  |
+| PDV009 | UseOfDotIat | Use `.iloc` instea` of `.iat`.  If speed is important, use numpy. |  |
+| PDV010 | UseOfDotPivotOrUnstack | `.pivot_table` is preferred to `.pivot` or `.unstack`; provides same functionality |  |
+| PDV011 | UseOfDotValues | Use `.to_numpy()` instead of `.values` |  |
+| PDV012 | UseOfDotReadTable | `.read_csv` is preferred to `.read_table`; provides same functionality |  |
+| PDV013 | UseOfDotStack | `.melt` is preferred to `.stack`; provides same functionality |  |
+| PDV015 | UseOfPdMerge | Use `.merge` method instead of `pd.merge` function. They have equivalent functionality. |  |
+| PDV901 | DfIsABadVariableName | `df` is a bad variable name. Be kinder to your future self. |  |
+
 ### pygrep-hooks (PGH)
 
 For more, see [pygrep-hooks](https://github.com/pre-commit/pygrep-hooks) on GitHub.
@@ -809,12 +908,15 @@ For more, see [Pylint](https://pypi.org/project/pylint/2.15.7/) on PyPI.
 | PLC0414 | UselessImportAlias | Import alias does not rename original package | 🛠 |
 | PLC2201 | MisplacedComparisonConstant | Comparison should be ... | 🛠 |
 | PLC3002 | UnnecessaryDirectLambdaCall | Lambda expression called directly. Execute the expression inline instead. |  |
+| PLE0117 | NonlocalWithoutBinding | Nonlocal name `...` found without binding |  |
+| PLE0118 | UsedPriorGlobalDeclaration | Name `...` is used prior to global declaration on line 1 |  |
 | PLE1142 | AwaitOutsideAsync | `await` should be used within an async function |  |
 | PLR0206 | PropertyWithParameters | Cannot have defined parameters for properties |  |
 | PLR0402 | ConsiderUsingFromImport | Use `from ... import ...` in lieu of alias |  |
 | PLR1701 | ConsiderMergingIsinstance | Merge these isinstance calls: `isinstance(..., (...))` |  |
 | PLR1722 | UseSysExit | Use `sys.exit()` instead of `exit` | 🛠 |
 | PLW0120 | UselessElseOnLoop | Else clause on loop without a break statement, remove the else and de-indent all the code inside it |  |
+| PLW0602 | GlobalVariableNotAssigned | Using global for `...` but no assignment is done |  |
 
 ### Ruff-specific rules (RUF)
 
@@ -833,6 +935,37 @@ For more, see [Pylint](https://pypi.org/project/pylint/2.15.7/) on PyPI.
 
 Download the [Ruff VS Code extension](https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff).
 
+### Language Server Protocol
+
+Ruff is available as a [Language Server Protocol (LSP)](https://microsoft.github.io/language-server-protocol/)
+server, distributed as the [`python-lsp-ruff`](https://github.com/python-lsp/python-lsp-ruff) plugin
+for [`python-lsp-server`](https://github.com/python-lsp/python-lsp-server), both of which are
+installable via [PyPI](https://pypi.org/project/python-lsp-ruff/):
+
+```shell
+pip install python-lsp-server python-lsp-ruff
+```
+
+The LSP server can be used with any editor that supports the Language Server Protocol. For example,
+to use it with Neovim, you would add something like the following to your `init.lua`:
+
+```lua
+require'lspconfig'.pylsp.setup {
+  settings = {
+    pylsp = {
+      plugins = {
+        ruff = {
+          enabled = true
+        }
+      }
+    }
+  },
+}
+```
+
+[`ruffd`](https://github.com/Seamooo/ruffd) is another implementation of the Language Server
+Protocol (LSP) for Ruff, written in Rust.
+
 ### PyCharm
 
 Ruff can be installed as an [External Tool](https://www.jetbrains.com/help/pycharm/configuring-third-party-tools.html)
@@ -845,10 +978,13 @@ Ruff should then appear as a runnable action:
 
 ![Ruff as a runnable action](https://user-images.githubusercontent.com/1309177/193156026-732b0aaf-3dd9-4549-9b4d-2de6d2168a33.png)
 
-### Vim & Neovim (Unofficial)
+### Vim & Neovim
 
-Ruff is available as part of the [coc-pyright](https://github.com/fannheyward/coc-pyright) extension
-for coc.nvim.
+Ruff can be integrated into any editor that supports the Language Server Protocol (LSP) (see:
+[Language Server Protocol](#language-server-protocol)).
+
+Ruff is also available as part of the [coc-pyright](https://github.com/fannheyward/coc-pyright)
+extension for `coc.nvim`.
 
 <details>
 <summary>Ruff can also be integrated via <a href="https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#efm"><code>efm</code></a> in just a <a href="https://github.com/JafarAbdi/myconfigs/blob/6f0b6b2450e92ec8fc50422928cd22005b919110/efm-langserver/config.yaml#L14-L20">few lines</a>.</summary>
@@ -904,11 +1040,6 @@ null_ls.setup({
 
 </details>
 
-### Language Server Protocol (Unofficial)
-
-[`ruffd`](https://github.com/Seamooo/ruffd) is a Rust-based language server for Ruff that implements
-the Language Server Protocol (LSP).
-
 ### GitHub Actions
 
 GitHub Actions has everything you need to run Ruff out-of-the-box:
@@ -956,9 +1087,8 @@ Under those conditions, Ruff implements every rule in Flake8.
 Ruff also re-implements some of the most popular Flake8 plugins and related code quality tools
 natively, including:
 
-- [`isort`](https://pypi.org/project/isort/)
-- [`pydocstyle`](https://pypi.org/project/pydocstyle/)
-- [`pep8-naming`](https://pypi.org/project/pep8-naming/)
+- [`autoflake`](https://pypi.org/project/autoflake/) (1/7)
+- [`eradicate`](https://pypi.org/project/eradicate/)
 - [`flake8-2020`](https://pypi.org/project/flake8-2020/)
 - [`flake8-annotations`](https://pypi.org/project/flake8-annotations/)
 - [`flake8-bandit`](https://pypi.org/project/flake8-bandit/) (6/40)
@@ -976,12 +1106,13 @@ natively, including:
 - [`flake8-return`](https://pypi.org/project/flake8-return/)
 - [`flake8-super`](https://pypi.org/project/flake8-super/)
 - [`flake8-tidy-imports`](https://pypi.org/project/flake8-tidy-imports/) (1/3)
+- [`isort`](https://pypi.org/project/isort/)
 - [`mccabe`](https://pypi.org/project/mccabe/)
-- [`yesqa`](https://github.com/asottile/yesqa)
-- [`eradicate`](https://pypi.org/project/eradicate/)
-- [`pyupgrade`](https://pypi.org/project/pyupgrade/) (16/33)
+- [`pep8-naming`](https://pypi.org/project/pep8-naming/)
+- [`pydocstyle`](https://pypi.org/project/pydocstyle/)
 - [`pygrep-hooks`](https://github.com/pre-commit/pygrep-hooks) (1/10)
-- [`autoflake`](https://pypi.org/project/autoflake/) (1/7)
+- [`pyupgrade`](https://pypi.org/project/pyupgrade/) (16/33)
+- [`yesqa`](https://github.com/asottile/yesqa)
 
 Note that, in some cases, Ruff uses different error code prefixes than would be found in the
 originating Flake8 plugins. For example, Ruff uses `TID252` to represent the `I252` rule from
@@ -991,8 +1122,7 @@ conflicts with the `isort` rules, like `I001`).
 
 Beyond the rule set, Ruff suffers from the following limitations vis-à-vis Flake8:
 
-1. Ruff does not yet support a few Python 3.9 and 3.10 language features, including structural
-   pattern matching and parenthesized context managers.
+1. Ruff does not yet support structural pattern matching.
 2. Flake8 has a plugin architecture and supports writing custom lint rules. (Instead, popular Flake8
    plugins are re-implemented in Rust as part of Ruff itself.)
 
@@ -1012,8 +1142,6 @@ Pylint parity is being tracked in [#689](https://github.com/charliermarsh/ruff/i
 
 Today, Ruff can be used to replace Flake8 when used with any of the following plugins:
 
-- [`pydocstyle`](https://pypi.org/project/pydocstyle/)
-- [`pep8-naming`](https://pypi.org/project/pep8-naming/)
 - [`flake8-2020`](https://pypi.org/project/flake8-2020/)
 - [`flake8-annotations`](https://pypi.org/project/flake8-annotations/)
 - [`flake8-bandit`](https://pypi.org/project/flake8-bandit/) (6/40)
@@ -1032,6 +1160,8 @@ Today, Ruff can be used to replace Flake8 when used with any of the following pl
 - [`flake8-super`](https://pypi.org/project/flake8-super/)
 - [`flake8-tidy-imports`](https://pypi.org/project/flake8-tidy-imports/) (1/3)
 - [`mccabe`](https://pypi.org/project/mccabe/)
+- [`pep8-naming`](https://pypi.org/project/pep8-naming/)
+- [`pydocstyle`](https://pypi.org/project/pydocstyle/)
 
 Ruff can also replace [`isort`](https://pypi.org/project/isort/),
 [`yesqa`](https://github.com/asottile/yesqa), [`eradicate`](https://pypi.org/project/eradicate/),
@@ -1374,7 +1504,7 @@ Exclusions are based on globs, and can be either:
   (to exclude any Python files in `directory`). Note that these paths are relative to the
   project root (e.g., the directory containing your `pyproject.toml`).
 
-Note that you'll typically want to use [`extend_exclude`](#extend_exclude) to modify
+Note that you'll typically want to use [`extend-exclude`](#extend-exclude) to modify
 the excluded paths.
 
 **Default value**: `[".bzr", ".direnv", ".eggs", ".git", ".hg", ".mypy_cache", ".nox", ".pants.d", ".ruff_cache", ".svn", ".tox", ".venv", "__pypackages__", "_build", "buck-out", "build", "dist", "node_modules", "venv"]`
@@ -1390,6 +1520,30 @@ exclude = [".venv"]
 
 ---
 
+#### [`extend`](#extend)
+
+A path to a local `pyproject.toml` file to merge into this configuration.
+
+To resolve the current `pyproject.toml` file, Ruff will first resolve this base
+configuration file, then merge in any properties defined in the current configuration
+file.
+
+**Default value**: `None`
+
+**Type**: `Path`
+
+**Example usage**:
+
+```toml
+[tool.ruff]
+# Extend the `pyproject.toml` file in the parent directory.
+extend = "../pyproject.toml"
+# But use a different line length.
+line-length = 100
+```
+
+---
+
 #### [`extend-exclude`](#extend-exclude)
 
 A list of file patterns to omit from linting, in addition to those specified by `exclude`.
@@ -1602,6 +1756,24 @@ any matching files.
 
 ---
 
+#### [`respect-gitignore`](#respect-gitignore)
+
+Whether to automatically exclude files that are ignored by `.ignore`, `.gitignore`,
+`.git/info/exclude`, and global `gitignore` files. Enabled by default.
+
+**Default value**: `true`
+
+**Type**: `bool`
+
+**Example usage**:
+
+```toml
+[tool.ruff]
+respect_gitignore = false
+```
+
+---
+
 #### [`select`](#select)
 
 A list of check code prefixes to enable. Prefixes can specify exact checks (like
@@ -1647,6 +1819,25 @@ show-source = true
 
 The source code paths to consider, e.g., when resolving first- vs. third-party imports.
 
+As an example: given a Python package structure like:
+
+```text
+my_package/
+  pyproject.toml
+  src/
+    my_package/
+      __init__.py
+      foo.py
+      bar.py
+```
+
+The `src` directory should be included in `source` (e.g., `source = ["src"]`), such that
+when resolving imports, `my_package.foo` is considered a first-party import.
+
+This field supports globs. For example, if you have a series of Python packages in
+a `python_modules` directory, `src = ["python_modules/*"]` would expand to incorporate
+all of the packages in that directory.
+
 **Default value**: `["."]`
 
 **Type**: `Vec<PathBuf>`
@@ -1796,6 +1987,25 @@ extend-immutable-calls = ["fastapi.Depends", "fastapi.Query"]
 
 ---
 
+### `flake8-errmsg`
+
+#### [`max-string-length`](#max-string-length)
+
+Maximum string length for string literals in exception messages.
+
+**Default value**: `0`
+
+**Type**: `usize`
+
+**Example usage**:
+
+```toml
+[tool.ruff.flake8-errmsg]
+max-string-length = 20
+```
+
+---
+
 ### `flake8-import-conventions`
 
 #### [`aliases`](#aliases)

flake8_to_ruff/Cargo.lock

@@ -771,7 +771,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8_to_ruff"
-version = "0.0.172"
+version = "0.0.183"
 dependencies = [
  "anyhow",
  "clap",
@@ -1975,7 +1975,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.172"
+version = "0.0.183"
 dependencies = [
  "anyhow",
  "bincode",
@@ -2028,7 +2028,7 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.1.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=28f9f65ccc625f00835d84bbb5fba274dce5aa89#28f9f65ccc625f00835d84bbb5fba274dce5aa89"
+source = "git+https://github.com/RustPython/RustPython.git?rev=8d879a53197f9c73062f6160410bdba796a71cbf#8d879a53197f9c73062f6160410bdba796a71cbf"
 dependencies = [
  "num-bigint",
  "rustpython-common",
@@ -2038,7 +2038,7 @@ dependencies = [
 [[package]]
 name = "rustpython-common"
 version = "0.0.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=28f9f65ccc625f00835d84bbb5fba274dce5aa89#28f9f65ccc625f00835d84bbb5fba274dce5aa89"
+source = "git+https://github.com/RustPython/RustPython.git?rev=8d879a53197f9c73062f6160410bdba796a71cbf#8d879a53197f9c73062f6160410bdba796a71cbf"
 dependencies = [
  "ascii",
  "cfg-if 1.0.0",
@@ -2061,7 +2061,7 @@ dependencies = [
 [[package]]
 name = "rustpython-compiler-core"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=28f9f65ccc625f00835d84bbb5fba274dce5aa89#28f9f65ccc625f00835d84bbb5fba274dce5aa89"
+source = "git+https://github.com/RustPython/RustPython.git?rev=8d879a53197f9c73062f6160410bdba796a71cbf#8d879a53197f9c73062f6160410bdba796a71cbf"
 dependencies = [
  "bincode",
  "bitflags",
@@ -2078,7 +2078,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=28f9f65ccc625f00835d84bbb5fba274dce5aa89#28f9f65ccc625f00835d84bbb5fba274dce5aa89"
+source = "git+https://github.com/RustPython/RustPython.git?rev=8d879a53197f9c73062f6160410bdba796a71cbf#8d879a53197f9c73062f6160410bdba796a71cbf"
 dependencies = [
  "ahash",
  "anyhow",

flake8_to_ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.172-dev.0"
+version = "0.0.183-dev.0"
 edition = "2021"
 
 [lib]

flake8_to_ruff/src/converter.rs

@@ -7,7 +7,8 @@ use ruff::flake8_tidy_imports::settings::Strictness;
 use ruff::settings::options::Options;
 use ruff::settings::pyproject::Pyproject;
 use ruff::{
-    flake8_annotations, flake8_bugbear, flake8_quotes, flake8_tidy_imports, mccabe, pep8_naming,
+    flake8_annotations, flake8_bugbear, flake8_errmsg, flake8_quotes, flake8_tidy_imports, mccabe,
+    pep8_naming,
 };
 
 use crate::plugin::Plugin;
@@ -73,6 +74,7 @@ pub fn convert(
     let mut options = Options::default();
     let mut flake8_annotations = flake8_annotations::settings::Options::default();
     let mut flake8_bugbear = flake8_bugbear::settings::Options::default();
+    let mut flake8_errmsg = flake8_errmsg::settings::Options::default();
     let mut flake8_quotes = flake8_quotes::settings::Options::default();
     let mut flake8_tidy_imports = flake8_tidy_imports::settings::Options::default();
     let mut mccabe = mccabe::settings::Options::default();
@@ -194,6 +196,15 @@ pub fn convert(
                     Ok(max_complexity) => mccabe.max_complexity = Some(max_complexity),
                     Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
                 },
+                // flake8-errmsg
+                "errmsg-max-string-length" | "errmsg_max_string_length" => {
+                    match value.clone().parse::<usize>() {
+                        Ok(max_string_length) => {
+                            flake8_errmsg.max_string_length = Some(max_string_length);
+                        }
+                        Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
+                    }
+                }
                 // Unknown
                 _ => eprintln!("Skipping unsupported property: {key}"),
             }
@@ -209,6 +220,9 @@ pub fn convert(
     if flake8_bugbear != flake8_bugbear::settings::Options::default() {
         options.flake8_bugbear = Some(flake8_bugbear);
     }
+    if flake8_errmsg != flake8_errmsg::settings::Options::default() {
+        options.flake8_errmsg = Some(flake8_errmsg);
+    }
     if flake8_quotes != flake8_quotes::settings::Options::default() {
         options.flake8_quotes = Some(flake8_quotes);
     }
@@ -246,6 +260,7 @@ mod tests {
             allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
@@ -257,6 +272,7 @@ mod tests {
             ignore_init_module_imports: None,
             line_length: None,
             per_file_ignores: None,
+            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::E,
                 CheckCodePrefix::F,
@@ -268,6 +284,7 @@ mod tests {
             unfixable: None,
             flake8_annotations: None,
             flake8_bugbear: None,
+            flake8_errmsg: None,
             flake8_quotes: None,
             flake8_tidy_imports: None,
             flake8_import_conventions: None,
@@ -291,6 +308,7 @@ mod tests {
             allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
@@ -302,6 +320,7 @@ mod tests {
             ignore_init_module_imports: None,
             line_length: Some(100),
             per_file_ignores: None,
+            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::E,
                 CheckCodePrefix::F,
@@ -313,6 +332,7 @@ mod tests {
             unfixable: None,
             flake8_annotations: None,
             flake8_bugbear: None,
+            flake8_errmsg: None,
             flake8_quotes: None,
             flake8_tidy_imports: None,
             flake8_import_conventions: None,
@@ -336,6 +356,7 @@ mod tests {
             allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
@@ -347,6 +368,7 @@ mod tests {
             ignore_init_module_imports: None,
             line_length: Some(100),
             per_file_ignores: None,
+            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::E,
                 CheckCodePrefix::F,
@@ -358,6 +380,7 @@ mod tests {
             unfixable: None,
             flake8_annotations: None,
             flake8_bugbear: None,
+            flake8_errmsg: None,
             flake8_quotes: None,
             flake8_tidy_imports: None,
             flake8_import_conventions: None,
@@ -381,6 +404,7 @@ mod tests {
             allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
@@ -392,6 +416,7 @@ mod tests {
             ignore_init_module_imports: None,
             line_length: None,
             per_file_ignores: None,
+            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::E,
                 CheckCodePrefix::F,
@@ -403,6 +428,7 @@ mod tests {
             unfixable: None,
             flake8_annotations: None,
             flake8_bugbear: None,
+            flake8_errmsg: None,
             flake8_quotes: None,
             flake8_tidy_imports: None,
             flake8_import_conventions: None,
@@ -426,6 +452,7 @@ mod tests {
             allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
@@ -437,6 +464,7 @@ mod tests {
             ignore_init_module_imports: None,
             line_length: None,
             per_file_ignores: None,
+            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::E,
                 CheckCodePrefix::F,
@@ -448,6 +476,7 @@ mod tests {
             unfixable: None,
             flake8_annotations: None,
             flake8_bugbear: None,
+            flake8_errmsg: None,
             flake8_quotes: Some(flake8_quotes::settings::Options {
                 inline_quotes: Some(flake8_quotes::settings::Quote::Single),
                 multiline_quotes: None,
@@ -479,6 +508,7 @@ mod tests {
             allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
@@ -490,6 +520,7 @@ mod tests {
             ignore_init_module_imports: None,
             line_length: None,
             per_file_ignores: None,
+            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::D100,
                 CheckCodePrefix::D101,
@@ -537,6 +568,7 @@ mod tests {
             unfixable: None,
             flake8_annotations: None,
             flake8_bugbear: None,
+            flake8_errmsg: None,
             flake8_quotes: None,
             flake8_tidy_imports: None,
             flake8_import_conventions: None,
@@ -560,6 +592,7 @@ mod tests {
             allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
@@ -571,6 +604,7 @@ mod tests {
             ignore_init_module_imports: None,
             line_length: None,
             per_file_ignores: None,
+            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::E,
                 CheckCodePrefix::F,
@@ -583,6 +617,7 @@ mod tests {
             unfixable: None,
             flake8_annotations: None,
             flake8_bugbear: None,
+            flake8_errmsg: None,
             flake8_quotes: Some(flake8_quotes::settings::Options {
                 inline_quotes: Some(flake8_quotes::settings::Quote::Single),
                 multiline_quotes: None,

flake8_to_ruff/src/plugin.rs

@@ -14,12 +14,15 @@ pub enum Plugin {
     Flake8Comprehensions,
     Flake8Debugger,
     Flake8Docstrings,
+    Flake8ErrMsg,
     Flake8Eradicate,
     Flake8Print,
     Flake8Quotes,
     Flake8Return,
+    Flake8Simplify,
     Flake8TidyImports,
     McCabe,
+    PandasVet,
     PEP8Naming,
     Pyupgrade,
 }
@@ -38,11 +41,14 @@ impl FromStr for Plugin {
             "flake8-debugger" => Ok(Plugin::Flake8Debugger),
             "flake8-docstrings" => Ok(Plugin::Flake8Docstrings),
             "flake8-eradicate" => Ok(Plugin::Flake8BlindExcept),
+            "flake8-errmsg" => Ok(Plugin::Flake8ErrMsg),
             "flake8-print" => Ok(Plugin::Flake8Print),
             "flake8-quotes" => Ok(Plugin::Flake8Quotes),
             "flake8-return" => Ok(Plugin::Flake8Return),
+            "flake8-simplify" => Ok(Plugin::Flake8Simplify),
             "flake8-tidy-imports" => Ok(Plugin::Flake8TidyImports),
             "mccabe" => Ok(Plugin::McCabe),
+            "pandas-vet" => Ok(Plugin::PandasVet),
             "pep8-naming" => Ok(Plugin::PEP8Naming),
             "pyupgrade" => Ok(Plugin::Pyupgrade),
             _ => Err(anyhow!("Unknown plugin: {string}")),
@@ -55,18 +61,24 @@ impl Plugin {
         match self {
             Plugin::Flake8Annotations => CheckCodePrefix::ANN,
             Plugin::Flake8Bandit => CheckCodePrefix::S,
+            // TODO(charlie): Handle rename of `B` to `BLE`.
             Plugin::Flake8BlindExcept => CheckCodePrefix::BLE,
             Plugin::Flake8Bugbear => CheckCodePrefix::B,
             Plugin::Flake8Builtins => CheckCodePrefix::A,
             Plugin::Flake8Comprehensions => CheckCodePrefix::C4,
             Plugin::Flake8Debugger => CheckCodePrefix::T1,
             Plugin::Flake8Docstrings => CheckCodePrefix::D,
+            // TODO(charlie): Handle rename of `E` to `ERA`.
             Plugin::Flake8Eradicate => CheckCodePrefix::ERA,
+            Plugin::Flake8ErrMsg => CheckCodePrefix::EM,
             Plugin::Flake8Print => CheckCodePrefix::T2,
             Plugin::Flake8Quotes => CheckCodePrefix::Q,
             Plugin::Flake8Return => CheckCodePrefix::RET,
+            Plugin::Flake8Simplify => CheckCodePrefix::SIM,
             Plugin::Flake8TidyImports => CheckCodePrefix::I25,
             Plugin::McCabe => CheckCodePrefix::C9,
+            // TODO(charlie): Handle rename of `PD` to `PDV`.
+            Plugin::PandasVet => CheckCodePrefix::PDV,
             Plugin::PEP8Naming => CheckCodePrefix::N,
             Plugin::Pyupgrade => CheckCodePrefix::U,
         }
@@ -98,13 +110,16 @@ impl Plugin {
                 DocstringConvention::PEP8.select()
             }
             Plugin::Flake8Eradicate => vec![CheckCodePrefix::ERA],
+            Plugin::Flake8ErrMsg => vec![CheckCodePrefix::EM],
             Plugin::Flake8Print => vec![CheckCodePrefix::T2],
             Plugin::Flake8Quotes => vec![CheckCodePrefix::Q],
             Plugin::Flake8Return => vec![CheckCodePrefix::RET],
-            Plugin::Flake8TidyImports => vec![CheckCodePrefix::I25],
+            Plugin::Flake8Simplify => vec![CheckCodePrefix::SIM],
+            Plugin::Flake8TidyImports => vec![CheckCodePrefix::TID],
             Plugin::McCabe => vec![CheckCodePrefix::C9],
+            Plugin::PandasVet => vec![CheckCodePrefix::PDV],
             Plugin::PEP8Naming => vec![CheckCodePrefix::N],
-            Plugin::Pyupgrade => vec![CheckCodePrefix::U],
+            Plugin::Pyupgrade => vec![CheckCodePrefix::UP],
         }
     }
 }
@@ -373,6 +388,9 @@ pub fn infer_plugins_from_options(flake8: &HashMap<String, Option<String>>) -> V
             "staticmethod-decorators" | "staticmethod_decorators" => {
                 plugins.insert(Plugin::PEP8Naming);
             }
+            "max-string-length" | "max_string_length" => {
+                plugins.insert(Plugin::Flake8ErrMsg);
+            }
             _ => {}
         }
     }
@@ -394,10 +412,13 @@ pub fn infer_plugins_from_codes(codes: &BTreeSet<CheckCodePrefix>) -> Vec<Plugin
         Plugin::Flake8Debugger,
         Plugin::Flake8Docstrings,
         Plugin::Flake8Eradicate,
+        Plugin::Flake8ErrMsg,
         Plugin::Flake8Print,
         Plugin::Flake8Quotes,
         Plugin::Flake8Return,
+        Plugin::Flake8Simplify,
         Plugin::Flake8TidyImports,
+        Plugin::PandasVet,
         Plugin::PEP8Naming,
         Plugin::Pyupgrade,
     ]

resources/test/fixtures/README.md

@@ -0,0 +1,3 @@
+# fixtures
+
+Fixture files used for snapshot testing.

resources/test/fixtures/flake8_bugbear/B009_B010.py

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

resources/test/fixtures/flake8_errmsg/EM.py

@@ -0,0 +1,19 @@
+from __future__ import annotations
+
+
+def f_a():
+    raise RuntimeError("This is an example exception")
+
+
+def f_b():
+    example = "example"
+    raise RuntimeError(f"This is an {example} exception")
+
+
+def f_c():
+    raise RuntimeError("This is an {example} exception".format(example="example"))
+
+
+def f_ok():
+    msg = "hello"
+    raise RuntimeError(msg)

resources/test/fixtures/flake8_simplify/SIM118.py

@@ -0,0 +1,12 @@
+key in dict.keys() # SIM118
+
+foo["bar"] in dict.keys() # SIM118
+
+foo() in dict.keys() # SIM118
+
+for key in dict.keys(): # SIM118
+    pass
+
+for key in list(dict.keys()):
+    if some_property(key):
+        del dict[key]

resources/test/fixtures/isort/insert_empty_lines.py

@@ -39,3 +39,27 @@ if True:
     import collections
     import typing
     def f(): pass
+
+
+import os
+
+# Comment goes here.
+
+def f():
+    pass
+
+
+import os
+
+# Comment goes here.
+def f():
+    pass
+
+
+import os
+
+# Comment goes here.
+
+# And another.
+def f():
+    pass

resources/test/fixtures/isort/insert_empty_lines.pyi

@@ -39,3 +39,27 @@ if True:
     import collections
     import typing
     def f(): pass
+
+
+import os
+
+# Comment goes here.
+
+def f():
+    pass
+
+
+import os
+
+# Comment goes here.
+def f():
+    pass
+
+
+import os
+
+# Comment goes here.
+
+# And another.
+def f():
+    pass

resources/test/fixtures/isort/leading_prefix.py

@@ -4,3 +4,10 @@ import os
 if True:
     x = 1; import sys
     import os
+
+if True:
+    x = 1; \
+        import os
+
+x = 1; \
+import os

resources/test/fixtures/pycodestyle/constant_literals.py

@@ -0,0 +1,39 @@
+###
+# Errors
+###
+if "abc" is "def":  # F632 (fix)
+    pass
+if "abc" is None:  # F632 (fix, but leaves behind unfixable E711)
+    pass
+if None is "abc":  # F632 (fix, but leaves behind unfixable E711)
+    pass
+if "abc" is False:  # F632 (fix, but leaves behind unfixable E712)
+    pass
+if False is "abc":  # F632 (fix, but leaves behind unfixable E712)
+    pass
+if False == None:  # E711, E712 (fix)
+    pass
+if None == False:  # E711, E712 (fix)
+    pass
+
+###
+# Unfixable errors
+###
+if "abc" == None:  # E711
+    pass
+if None == "abc":  # E711
+    pass
+if "abc" == False:  # E712
+    pass
+if False == "abc":  # E712
+    pass
+
+###
+# Non-errors
+###
+if "def" == "abc":
+    pass
+if False is None:
+    pass
+if None is False:
+    pass

resources/test/fixtures/pyflakes/F401_7.py

@@ -0,0 +1,16 @@
+"""Test: noqa directives."""
+
+from module import (
+    A,  # noqa: F401
+    B,
+)
+
+from module import (
+    A,  # noqa: F401
+    B,  # noqa: F401
+)
+
+from module import (
+    A,
+    B,
+)

resources/test/fixtures/pyflakes/F504.py

@@ -4,3 +4,6 @@ a = "wrong"
 
 hidden = {"a": "!"}
 "%(a)s %(c)s" % {"x": 1, **hidden}  # Ok (cannot see through splat)
+
+"%(a)s" % {"a": 1, r"b": "!"}  # F504 ("b" not used)
+"%(a)s" % {'a': 1, u"b": "!"}  # F504 ("b" not used)

resources/test/fixtures/pyflakes/F541.py

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

resources/test/fixtures/pyflakes/F811_20.py

@@ -7,7 +7,6 @@ import fu
 
 
 class bar:
-    # STOPSHIP: This errors.
     fu = 1
 
 

resources/test/fixtures/pyflakes/F821_6.py

@@ -0,0 +1,17 @@
+"""Test: annotated global."""
+
+
+n: int
+
+
+def f():
+    print(n)
+
+
+def g():
+    global n
+    n = 1
+
+
+g()
+f()

resources/test/fixtures/pyflakes/F841_0.py

@@ -10,13 +10,13 @@ except ValueError as e:
     print(e)
 
 
-def f1():
+def f():
     x = 1
     y = 2
     z = x + y
 
 
-def f2():
+def f():
     foo = (1, 2)
     (a, b) = (1, 2)
 
@@ -26,12 +26,12 @@ def f2():
     (x, y) = baz = bar
 
 
-def f3():
+def f():
     locals()
     x = 1
 
 
-def f4():
+def f():
     _ = 1
     __ = 1
     _discarded = 1
@@ -40,26 +40,26 @@ def f4():
 a = 1
 
 
-def f5():
+def f():
     global a
 
-    # Used in `f7` via `nonlocal`.
+    # Used in `c` via `nonlocal`.
     b = 1
 
-    def f6():
+    def c():
         # F841
         b = 1
 
-    def f7():
+    def d():
         nonlocal b
 
 
-def f6():
+def f():
     annotations = []
     assert len([annotations for annotations in annotations])
 
 
-def f7():
+def f():
     def connect():
         return None, None
 
@@ -67,6 +67,22 @@ def f7():
         cursor.execute("SELECT * FROM users")
 
 
-def f8():
-    with open("file") as f, open("") as ((a, b)):
+def f():
+    def connect():
+        return None, None
+
+    with (connect() as (connection, cursor)):
+        cursor.execute("SELECT * FROM users")
+
+
+def f():
+    with open("file") as my_file, open("") as ((this, that)):
+        print("hello")
+
+
+def f():
+    with (
+        open("file") as my_file,
+        open("") as ((this, that)),
+    ):
         print("hello")

resources/test/fixtures/pyflakes/multi_statement_lines.py

@@ -0,0 +1,51 @@
+
+if True:
+    import foo; x = 1
+    import foo;     x = 1
+
+if True:
+    import foo; \
+x = 1
+
+if True:
+    import foo \
+        ; x = 1
+
+
+if True:
+    x = 1; import foo
+
+
+if True:
+    x = 1; \
+         import foo
+
+
+if True:
+    x = 1 \
+        ; import foo
+
+
+if True:
+    x = 1; import foo; x = 1
+    x = 1;     import foo;     x = 1
+
+if True:
+    x = 1; \
+        import foo; \
+    x = 1
+
+if True:
+    x = 1 \
+        ;import foo \
+        ;x = 1
+
+
+# Continuation, but not as the last content in the file.
+x = 1; \
+import foo
+
+# Continuation, followed by end-of-file. (Removing `import foo` would cause a syntax
+# error.)
+x = 1; \
+import foo

resources/test/fixtures/pylint/global_variable_not_assigned.py

@@ -0,0 +1,32 @@
+###
+# Errors.
+###
+def f():
+    global x
+
+
+def f():
+    global x
+
+    print(x)
+
+
+###
+# Non-errors.
+###
+def f():
+    global x
+
+    x = 1
+
+
+def f():
+    global x
+
+    (x, y) = (1, 2)
+
+
+def f():
+    global x
+
+    del x

resources/test/fixtures/pylint/nonlocal_without_binding.py

@@ -0,0 +1,19 @@
+nonlocal x
+
+
+def f():
+    nonlocal x
+
+
+def f():
+    nonlocal y
+
+
+def f():
+    x = 1
+
+    def f():
+        nonlocal x
+
+    def f():
+        nonlocal y

resources/test/fixtures/pylint/used_prior_global_declaration.py

@@ -0,0 +1,148 @@
+###
+# Errors.
+###
+def f():
+    print(x)
+
+    global x
+
+    print(x)
+
+
+def f():
+    global x
+
+    print(x)
+
+    global x
+
+    print(x)
+
+
+def f():
+    print(x)
+
+    global x, y
+
+    print(x)
+
+
+def f():
+    global x, y
+
+    print(x)
+
+    global x, y
+
+    print(x)
+
+
+def f():
+    x = 1
+
+    global x
+
+    x = 1
+
+
+def f():
+    global x
+
+    x = 1
+
+    global x
+
+    x = 1
+
+
+def f():
+    del x
+
+    global x, y
+
+    del x
+
+
+def f():
+    global x, y
+
+    del x
+
+    global x, y
+
+    del x
+
+
+def f():
+    del x
+
+    global x
+
+    del x
+
+
+def f():
+    global x
+
+    del x
+
+    global x
+
+    del x
+
+
+def f():
+    del x
+
+    global x, y
+
+    del x
+
+
+def f():
+    global x, y
+
+    del x
+
+    global x, y
+
+    del x
+
+
+###
+# Non-errors.
+###
+def f():
+    global x
+
+    print(x)
+
+
+def f():
+    global x, y
+
+    print(x)
+
+
+def f():
+    global x
+
+    x = 1
+
+
+def f():
+    global x, y
+
+    x = 1
+
+
+def f():
+    global x
+
+    del x
+
+
+def f():
+    global x, y
+
+    del x

resources/test/fixtures/pyproject.toml

@@ -42,6 +42,9 @@ staticmethod-decorators = ["staticmethod"]
 [tool.ruff.flake8-tidy-imports]
 ban-relative-imports = "parents"
 
+[tool.ruff.flake8-errmsg]
+max-string-length = 20
+
 [tool.ruff.flake8-import-conventions.aliases]
 pandas = "pd"
 

resources/test/fixtures/pyupgrade/UP016.py

@@ -0,0 +1,87 @@
+# Replace names by built-in names, whether namespaced or not
+# https://github.com/search?q=%22from+six+import%22&type=code
+import six
+from six.moves import map  # No need
+from six import text_type
+
+six.text_type  # str
+six.binary_type  # bytes
+six.class_types  # (type,)
+six.string_types  # (str,)
+six.integer_types  # (int,)
+six.unichr  # chr
+six.iterbytes  # iter
+six.print_(...)  # print(...)
+six.exec_(c, g, l)  # exec(c, g, l)
+six.advance_iterator(it)  # next(it)
+six.next(it)  # next(it)
+six.callable(x)  # callable(x)
+six.moves.range(x)  # range(x)
+six.moves.xrange(x)  # range(x)
+isinstance(..., six.class_types)  # isinstance(..., type)
+issubclass(..., six.integer_types)  # issubclass(..., int)
+isinstance(..., six.string_types)  # isinstance(..., str)
+
+# Replace call on arg by method call on arg
+six.iteritems(dct)  # dct.items()
+six.iterkeys(dct)  # dct.keys()
+six.itervalues(dct)  # dct.values()
+six.viewitems(dct)  # dct.items()
+six.viewkeys(dct)  # dct.keys()
+six.viewvalues(dct)  # dct.values()
+six.assertCountEqual(self, a1, a2)  # self.assertCountEqual(a1, a2)
+six.assertRaisesRegex(self, e, r, fn)  # self.assertRaisesRegex(e, r, fn)
+six.assertRegex(self, s, r)  # self.assertRegex(s, r)
+
+# Replace call on arg by arg attribute
+six.get_method_function(meth)  # meth.__func__
+six.get_method_self(meth)  # meth.__self__
+six.get_function_closure(fn)  # fn.__closure__
+six.get_function_code(fn)  # fn.__code__
+six.get_function_defaults(fn)  # fn.__defaults__
+six.get_function_globals(fn)  # fn.__globals__
+
+# Replace by string literal
+six.b("...")  # b'...'
+six.u("...")  # '...'
+six.ensure_binary("...")  # b'...'
+six.ensure_str("...")  # '...'
+six.ensure_text("...")  # '...'
+six.b(string)  # no change
+
+# Replace by simple expression
+six.get_unbound_function(meth)  # meth
+six.create_unbound_method(fn, cls)  # fn
+
+# Raise exception
+six.raise_from(exc, exc_from)  # raise exc from exc_from
+six.reraise(tp, exc, tb)  # raise exc.with_traceback(tb)
+six.reraise(*sys.exc_info())  # raise
+
+# Int / Bytes conversion
+six.byte2int(bs)  # bs[0]
+six.indexbytes(bs, i)  # bs[i]
+six.int2byte(i)  # bytes((i, ))
+
+# Special cases for next calls
+next(six.iteritems(dct))  # next(iter(dct.items()))
+next(six.iterkeys(dct))  # next(iter(dct.keys()))
+next(six.itervalues(dct))  # next(iter(dct.values()))
+
+# TODO: To implement
+
+
+# Rewrite classes
+@six.python_2_unicode_compatible  # Remove
+class C(six.Iterator):
+    pass  # class C: pass
+
+
+class C(six.with_metaclass(M, B)):
+    pass  # class C(B, metaclass=M): pass
+
+
+# class C(B, metaclass=M): pass
+@six.add_metaclass(M)
+class C(B):
+    pass

resources/test/project/.gitignore

@@ -0,0 +1 @@
+examples/generated

resources/test/project/README.md

@@ -0,0 +1,89 @@
+# project
+
+An example multi-package Python project used to test setting resolution and other complex
+behaviors.
+
+## Expected behavior
+
+Running from the repo root should pick up and enforce the appropriate settings for each package:
+
+```
+∴ cargo run resources/test/project/
+Found 7 error(s).
+resources/test/project/examples/.dotfiles/script.py:1:1: I001 Import block is un-sorted or un-formatted
+resources/test/project/examples/.dotfiles/script.py:1:8: F401 `numpy` imported but unused
+resources/test/project/examples/.dotfiles/script.py:2:17: F401 `app.app_file` imported but unused
+resources/test/project/examples/docs/docs/file.py:1:1: I001 Import block is un-sorted or un-formatted
+resources/test/project/examples/docs/docs/file.py:8:5: F841 Local variable `x` is assigned to but never used
+resources/test/project/src/file.py:1:8: F401 `os` imported but unused
+resources/test/project/src/import_file.py:1:1: I001 Import block is un-sorted or un-formatted
+6 potentially fixable with the --fix option.
+```
+
+Running from the project directory itself should exhibit the same behavior:
+
+```
+∴ (cd resources/test/project/ && cargo run .)
+Found 7 error(s).
+examples/.dotfiles/script.py:1:1: I001 Import block is un-sorted or un-formatted
+examples/.dotfiles/script.py:1:8: F401 `numpy` imported but unused
+examples/.dotfiles/script.py:2:17: F401 `app.app_file` imported but unused
+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
+src/file.py:1:8: F401 `os` imported but unused
+src/import_file.py:1:1: I001 Import block is un-sorted or un-formatted
+6 potentially fixable with the --fix option.
+```
+
+Running from the sub-package directory should exhibit the same behavior, but omit the top-level
+files:
+
+```
+∴ (cd resources/test/project/examples/docs && cargo run .)
+Found 2 error(s).
+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
+1 potentially fixable with the --fix option.
+```
+
+`--config` should force Ruff to use the specified `pyproject.toml` for all files, and resolve
+file paths from the current working directory:
+
+```
+∴ (cargo run -- --config=resources/test/project/pyproject.toml resources/test/project/)
+Found 11 error(s).
+resources/test/project/examples/.dotfiles/script.py:1:1: I001 Import block is un-sorted or un-formatted
+resources/test/project/examples/.dotfiles/script.py:1:8: F401 `numpy` imported but unused
+resources/test/project/examples/.dotfiles/script.py:2:17: F401 `app.app_file` imported but unused
+resources/test/project/examples/docs/docs/concepts/file.py:1:8: F401 `os` imported but unused
+resources/test/project/examples/docs/docs/file.py:1:1: I001 Import block is un-sorted or un-formatted
+resources/test/project/examples/docs/docs/file.py:1:8: F401 `os` imported but unused
+resources/test/project/examples/docs/docs/file.py:3:8: F401 `numpy` imported but unused
+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/src/file.py:1:8: F401 `os` imported but unused
+resources/test/project/src/import_file.py:1:1: I001 Import block is un-sorted or un-formatted
+11 potentially fixable with the --fix option.
+```
+
+Running from a parent directory should this "ignore" the `exclude` (hence, `concepts/file.py` gets
+included in the output):
+
+```
+∴ (cd resources/test/project/examples && cargo run -- --config=docs/pyproject.toml .)
+Found 4 error(s).
+docs/docs/concepts/file.py:5:5: F841 Local variable `x` is assigned to but never used
+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
+1 potentially fixable with the --fix option.
+```
+
+Passing an excluded directory directly should report errors in the contained files:
+
+```
+∴ cargo run resources/test/project/examples/excluded/
+Found 1 error(s).
+resources/test/project/examples/excluded/script.py:1:8: F401 `os` imported but unused
+1 potentially fixable with the --fix option.
+```

resources/test/project/examples/.dotfiles/script.py

@@ -0,0 +1,2 @@
+import numpy as np
+from app import app_file

resources/test/project/examples/docs/docs/concepts/file.py

@@ -0,0 +1,5 @@
+import os
+
+
+def f():
+    x = 1

resources/test/project/examples/docs/docs/file.py

@@ -0,0 +1,8 @@
+import os
+
+import numpy as np
+from docs.concepts import file
+
+
+def f():
+    x = 1

resources/test/project/examples/docs/pyproject.toml

@@ -0,0 +1,7 @@
+[tool.ruff]
+extend = "../../pyproject.toml"
+src = ["."]
+# Enable I001, and re-enable F841, to test extension priority.
+extend-select = ["I001", "F841"]
+extend-ignore = ["F401"]
+extend-exclude = ["./docs/concepts/file.py"]

resources/test/project/examples/excluded/script.py

@@ -0,0 +1,5 @@
+import os
+
+
+def f():
+    x = 1

resources/test/project/pyproject.toml

@@ -0,0 +1,5 @@
+[tool.ruff]
+src = [".", "python_modules/*"]
+exclude = ["examples/excluded"]
+extend-select = ["I001"]
+extend-ignore = ["F841"]

resources/test/project/src/file.py

@@ -0,0 +1,5 @@
+import os
+
+
+def f():
+    x = 1

resources/test/project/src/import_file.py

@@ -0,0 +1,7 @@
+import numpy as np
+from app import app_file
+from core import core_file
+
+np.array([1, 2, 3])
+app_file()
+core_file()

ruff_dev/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_dev"
-version = "0.0.172"
+version = "0.0.183"
 edition = "2021"
 
 [dependencies]
@@ -11,8 +11,8 @@ itertools = { version = "0.10.5" }
 libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a8725d161fe8b3ed73a6758b21e177" }
 once_cell = { version = "1.16.0" }
 ruff = { path = ".." }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "28f9f65ccc625f00835d84bbb5fba274dce5aa89" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "28f9f65ccc625f00835d84bbb5fba274dce5aa89" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "28f9f65ccc625f00835d84bbb5fba274dce5aa89" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "8d879a53197f9c73062f6160410bdba796a71cbf" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "8d879a53197f9c73062f6160410bdba796a71cbf" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "8d879a53197f9c73062f6160410bdba796a71cbf" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }

ruff_macros/Cargo.toml

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

src/ast/helpers.rs

@@ -1,13 +1,26 @@
+use log::error;
 use once_cell::sync::Lazy;
 use regex::Regex;
 use rustc_hash::{FxHashMap, FxHashSet};
 use rustpython_ast::{
-    Arguments, Excepthandler, ExcepthandlerKind, Expr, ExprKind, Location, Stmt, StmtKind,
+    Arguments, Constant, Excepthandler, ExcepthandlerKind, Expr, ExprKind, Location, Stmt, StmtKind,
 };
+use rustpython_parser::lexer;
+use rustpython_parser::lexer::Tok;
 
 use crate::ast::types::Range;
 use crate::SourceCodeLocator;
 
+/// Create an `Expr` with default location from an `ExprKind`.
+pub fn create_expr(node: ExprKind) -> Expr {
+    Expr::new(Location::default(), Location::default(), node)
+}
+
+/// Create a `Stmt` with a default location from a `StmtKind`.
+pub fn create_stmt(node: StmtKind) -> Stmt {
+    Stmt::new(Location::default(), Location::default(), node)
+}
+
 fn collect_call_path_inner<'a>(expr: &'a Expr, parts: &mut Vec<&'a str>) {
     match &expr.node {
         ExprKind::Call { func, .. } => {
@@ -149,15 +162,12 @@ pub fn match_call_path(
 
 static DUNDER_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"__[^\s]+__").unwrap());
 
-pub fn is_assignment_to_a_dunder(node: &StmtKind) -> bool {
+/// Return `true` if the `Stmt` is an assignment to a dunder (like `__all__`).
+pub fn is_assignment_to_a_dunder(stmt: &Stmt) -> bool {
     // Check whether it's an assignment to a dunder, with or without a type
     // annotation. This is what pycodestyle (as of 2.9.1) does.
-    match node {
-        StmtKind::Assign {
-            targets,
-            value: _,
-            type_comment: _,
-        } => {
+    match &stmt.node {
+        StmtKind::Assign { targets, .. } => {
             if targets.len() != 1 {
                 return false;
             }
@@ -166,12 +176,7 @@ pub fn is_assignment_to_a_dunder(node: &StmtKind) -> bool {
                 _ => false,
             }
         }
-        StmtKind::AnnAssign {
-            target,
-            annotation: _,
-            value: _,
-            simple: _,
-        } => match &target.node {
+        StmtKind::AnnAssign { target, .. } => match &target.node {
             ExprKind::Name { id, ctx: _ } => DUNDER_REGEX.is_match(id),
             _ => false,
         },
@@ -179,6 +184,32 @@ pub fn is_assignment_to_a_dunder(node: &StmtKind) -> bool {
     }
 }
 
+/// Return `true` if the `Expr` is a singleton (`None`, `True`, `False`, or
+/// `...`).
+pub fn is_singleton(expr: &Expr) -> bool {
+    matches!(
+        expr.node,
+        ExprKind::Constant {
+            value: Constant::None | Constant::Bool(_) | Constant::Ellipsis,
+            ..
+        }
+    )
+}
+
+/// Return `true` if the `Expr` is a constant or tuple of constants.
+pub fn is_constant(expr: &Expr) -> bool {
+    match &expr.node {
+        ExprKind::Constant { .. } => true,
+        ExprKind::Tuple { elts, .. } => elts.iter().all(is_constant),
+        _ => false,
+    }
+}
+
+/// Return `true` if the `Expr` is a non-singleton constant.
+pub fn is_constant_non_singleton(expr: &Expr) -> bool {
+    is_constant(expr) && !is_singleton(expr)
+}
+
 /// Extract the names of all handled exceptions.
 pub fn extract_handler_names(handlers: &[Excepthandler]) -> Vec<Vec<&str>> {
     let mut handler_names = vec![];
@@ -229,7 +260,6 @@ pub fn collect_arg_names<'a>(arguments: &'a Arguments) -> FxHashSet<&'a str> {
 
 /// Returns `true` if a call is an argumented `super` invocation.
 pub fn is_super_call_with_arguments(func: &Expr, args: &[Expr]) -> bool {
-    // Check: is this a `super` call?
     if let ExprKind::Name { id, .. } = &func.node {
         id == "super" && !args.is_empty()
     } else {
@@ -311,13 +341,75 @@ pub fn count_trailing_lines(stmt: &Stmt, locator: &SourceCodeLocator) -> usize {
         .count()
 }
 
+/// Return the appropriate visual `Range` for any message that spans a `Stmt`.
+/// Specifically, this method returns the range of a function or class name,
+/// rather than that of the entire function or class body.
+pub fn identifier_range(stmt: &Stmt, locator: &SourceCodeLocator) -> Range {
+    if matches!(
+        stmt.node,
+        StmtKind::ClassDef { .. }
+            | StmtKind::FunctionDef { .. }
+            | StmtKind::AsyncFunctionDef { .. }
+    ) {
+        let contents = locator.slice_source_code_range(&Range::from_located(stmt));
+        for (start, tok, end) in lexer::make_tokenizer(&contents).flatten() {
+            if matches!(tok, Tok::Name { .. }) {
+                let start = to_absolute(start, stmt.location);
+                let end = to_absolute(end, stmt.location);
+                return Range {
+                    location: start,
+                    end_location: end,
+                };
+            }
+        }
+        error!("Failed to find identifier for {:?}", stmt);
+    }
+    Range::from_located(stmt)
+}
+
+/// Return `true` if a `Stmt` appears to be part of a multi-statement line, with
+/// other statements preceding it.
+pub fn preceded_by_continuation(stmt: &Stmt, locator: &SourceCodeLocator) -> bool {
+    // Does the previous line end in a continuation? This will have a specific
+    // false-positive, which is that if the previous line ends in a comment, it
+    // will be treated as a continuation. So we should only use this information to
+    // make conservative choices.
+    // TODO(charlie): Come up with a more robust strategy.
+    if stmt.location.row() > 1 {
+        let range = Range {
+            location: Location::new(stmt.location.row() - 1, 0),
+            end_location: Location::new(stmt.location.row(), 0),
+        };
+        let line = locator.slice_source_code_range(&range);
+        if line.trim().ends_with('\\') {
+            return true;
+        }
+    }
+    false
+}
+
+/// Return `true` if a `Stmt` appears to be part of a multi-statement line, with
+/// other statements preceding it.
+pub fn preceded_by_multi_statement_line(stmt: &Stmt, locator: &SourceCodeLocator) -> bool {
+    match_leading_content(stmt, locator) || preceded_by_continuation(stmt, locator)
+}
+
+/// Return `true` if a `Stmt` appears to be part of a multi-statement line, with
+/// other statements following it.
+pub fn followed_by_multi_statement_line(stmt: &Stmt, locator: &SourceCodeLocator) -> bool {
+    match_trailing_content(stmt, locator)
+}
+
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
     use rustc_hash::{FxHashMap, FxHashSet};
+    use rustpython_ast::Location;
     use rustpython_parser::parser;
 
-    use crate::ast::helpers::match_module_member;
+    use crate::ast::helpers::{identifier_range, match_module_member, match_trailing_content};
+    use crate::ast::types::Range;
+    use crate::source_code_locator::SourceCodeLocator;
 
     #[test]
     fn builtin() -> Result<()> {
@@ -461,4 +553,130 @@ mod tests {
         ));
         Ok(())
     }
+
+    #[test]
+    fn trailing_content() -> Result<()> {
+        let contents = "x = 1";
+        let program = parser::parse_program(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = SourceCodeLocator::new(contents);
+        assert!(!match_trailing_content(stmt, &locator));
+
+        let contents = "x = 1; y = 2";
+        let program = parser::parse_program(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = SourceCodeLocator::new(contents);
+        assert!(match_trailing_content(stmt, &locator));
+
+        let contents = "x = 1  ";
+        let program = parser::parse_program(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = SourceCodeLocator::new(contents);
+        assert!(!match_trailing_content(stmt, &locator));
+
+        let contents = "x = 1  # Comment";
+        let program = parser::parse_program(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = SourceCodeLocator::new(contents);
+        assert!(!match_trailing_content(stmt, &locator));
+
+        let contents = r#"
+x = 1
+y = 2
+"#
+        .trim();
+        let program = parser::parse_program(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = SourceCodeLocator::new(contents);
+        assert!(!match_trailing_content(stmt, &locator));
+
+        Ok(())
+    }
+
+    #[test]
+    fn extract_identifier_range() -> Result<()> {
+        let contents = "def f(): pass".trim();
+        let program = parser::parse_program(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = SourceCodeLocator::new(contents);
+        assert_eq!(
+            identifier_range(stmt, &locator),
+            Range {
+                location: Location::new(1, 4),
+                end_location: Location::new(1, 5),
+            }
+        );
+
+        let contents = r#"
+def \
+  f():
+  pass
+"#
+        .trim();
+        let program = parser::parse_program(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = SourceCodeLocator::new(contents);
+        assert_eq!(
+            identifier_range(stmt, &locator),
+            Range {
+                location: Location::new(2, 2),
+                end_location: Location::new(2, 3),
+            }
+        );
+
+        let contents = "class Class(): pass".trim();
+        let program = parser::parse_program(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = SourceCodeLocator::new(contents);
+        assert_eq!(
+            identifier_range(stmt, &locator),
+            Range {
+                location: Location::new(1, 6),
+                end_location: Location::new(1, 11),
+            }
+        );
+
+        let contents = "class Class: pass".trim();
+        let program = parser::parse_program(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = SourceCodeLocator::new(contents);
+        assert_eq!(
+            identifier_range(stmt, &locator),
+            Range {
+                location: Location::new(1, 6),
+                end_location: Location::new(1, 11),
+            }
+        );
+
+        let contents = r#"
+@decorator()
+class Class():
+  pass
+"#
+        .trim();
+        let program = parser::parse_program(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = SourceCodeLocator::new(contents);
+        assert_eq!(
+            identifier_range(stmt, &locator),
+            Range {
+                location: Location::new(2, 6),
+                end_location: Location::new(2, 11),
+            }
+        );
+
+        let contents = r#"x = y + 1"#.trim();
+        let program = parser::parse_program(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = SourceCodeLocator::new(contents);
+        assert_eq!(
+            identifier_range(stmt, &locator),
+            Range {
+                location: Location::new(1, 0),
+                end_location: Location::new(1, 9),
+            }
+        );
+
+        Ok(())
+    }
 }

src/ast/operations.rs

@@ -1,9 +1,12 @@
+use rustc_hash::FxHashMap;
 use rustpython_ast::{Cmpop, Located};
 use rustpython_parser::ast::{Constant, Expr, ExprKind, Stmt, StmtKind};
 use rustpython_parser::lexer;
 use rustpython_parser::lexer::Tok;
 
 use crate::ast::types::{Binding, BindingKind, Scope};
+use crate::ast::visitor;
+use crate::ast::visitor::Visitor;
 
 /// Extract the names bound to a given __all__ assignment.
 pub fn extract_all_names(stmt: &Stmt, scope: &Scope, bindings: &[Binding]) -> Vec<String> {
@@ -69,6 +72,38 @@ pub fn extract_all_names(stmt: &Stmt, scope: &Scope, bindings: &[Binding]) -> Ve
     names
 }
 
+#[derive(Default)]
+struct GlobalVisitor<'a> {
+    globals: FxHashMap<&'a str, &'a Stmt>,
+}
+
+impl<'a> Visitor<'a> for GlobalVisitor<'a> {
+    fn visit_stmt(&mut self, stmt: &'a Stmt) {
+        match &stmt.node {
+            StmtKind::Global { names } => {
+                for name in names {
+                    self.globals.insert(name, stmt);
+                }
+            }
+            StmtKind::FunctionDef { .. }
+            | StmtKind::AsyncFunctionDef { .. }
+            | StmtKind::ClassDef { .. } => {
+                // Don't recurse.
+            }
+            _ => visitor::walk_stmt(self, stmt),
+        }
+    }
+}
+
+/// Extract a map from global name to its last-defining `Stmt`.
+pub fn extract_globals(body: &[Stmt]) -> FxHashMap<&str, &Stmt> {
+    let mut visitor = GlobalVisitor::default();
+    for stmt in body {
+        visitor.visit_stmt(stmt);
+    }
+    visitor.globals
+}
+
 /// Check if a node is parent of a conditional branch.
 pub fn on_conditional_branch<'a>(parents: &mut impl Iterator<Item = &'a Stmt>) -> bool {
     parents.any(|parent| {

src/ast/types.rs

@@ -32,23 +32,29 @@ impl Range {
 
 #[derive(Debug)]
 pub struct FunctionDef<'a> {
+    // Properties derived from StmtKind::FunctionDef.
     pub name: &'a str,
     pub args: &'a Arguments,
     pub body: &'a [Stmt],
     pub decorator_list: &'a [Expr],
     // pub returns: Option<&'a Expr>,
     // pub type_comment: Option<&'a str>,
+    // Scope-specific properties.
     // TODO(charlie): Create AsyncFunctionDef to mirror the AST.
     pub async_: bool,
+    pub globals: FxHashMap<&'a str, &'a Stmt>,
 }
 
 #[derive(Debug)]
 pub struct ClassDef<'a> {
+    // Properties derived from StmtKind::ClassDef.
     pub name: &'a str,
     pub bases: &'a [Expr],
     pub keywords: &'a [Keyword],
     // pub body: &'a [Stmt],
     pub decorator_list: &'a [Expr],
+    // Scope-specific properties.
+    pub globals: FxHashMap<&'a str, &'a Stmt>,
 }
 
 #[derive(Debug)]
@@ -73,7 +79,11 @@ pub struct Scope<'a> {
     pub kind: ScopeKind<'a>,
     pub import_starred: bool,
     pub uses_locals: bool,
+    /// A map from bound name to binding index.
     pub values: FxHashMap<&'a str, usize>,
+    /// A list of (name, index) pairs for bindings that were overridden in the
+    /// scope.
+    pub overridden: Vec<(&'a str, usize)>,
 }
 
 impl<'a> Scope<'a> {
@@ -84,6 +94,7 @@ impl<'a> Scope<'a> {
             import_starred: false,
             uses_locals: false,
             values: FxHashMap::default(),
+            overridden: Vec::new(),
         }
     }
 }
@@ -117,8 +128,6 @@ pub struct Binding<'a> {
     /// Tuple of (scope index, range) indicating the scope and range at which
     /// the binding was last used.
     pub used: Option<(usize, Range)>,
-    /// A list of pointers to `Binding` instances that redefined this binding.
-    pub redefined: Vec<usize>,
 }
 
 // Pyflakes defines the following binding hierarchy (via inheritance):

src/ast/whitespace.rs

@@ -1,3 +1,4 @@
+use std::borrow::Cow;
 use std::str::Lines;
 
 use rustpython_ast::{Located, Location};
@@ -5,31 +6,26 @@ use rustpython_ast::{Located, Location};
 use crate::ast::types::Range;
 use crate::check_ast::Checker;
 
+/// Extract the leading indentation from a line.
+pub fn indentation<'a, T>(checker: &'a Checker, located: &'a Located<T>) -> Cow<'a, str> {
+    let range = Range::from_located(located);
+    checker.locator.slice_source_code_range(&Range {
+        location: Location::new(range.location.row(), 0),
+        end_location: Location::new(range.location.row(), range.location.column()),
+    })
+}
+
 /// Extract the leading words from a line of text.
-pub fn leading_words(line: &str) -> String {
-    line.trim()
-        .chars()
-        .take_while(|char| char.is_alphanumeric() || char.is_whitespace())
-        .collect()
+pub fn leading_words(line: &str) -> &str {
+    let line = line.trim();
+    line.find(|char: char| !char.is_alphanumeric() && !char.is_whitespace())
+        .map_or(line, |index| &line[..index])
 }
 
 /// Extract the leading whitespace from a line of text.
-pub fn leading_space(line: &str) -> String {
-    line.chars()
-        .take_while(|char| char.is_whitespace())
-        .collect()
-}
-
-/// Extract the leading indentation from a line.
-pub fn indentation<T>(checker: &Checker, located: &Located<T>) -> String {
-    let range = Range::from_located(located);
-    checker
-        .locator
-        .slice_source_code_range(&Range {
-            location: Location::new(range.location.row(), 0),
-            end_location: Location::new(range.location.row(), range.location.column()),
-        })
-        .to_string()
+pub fn leading_space(line: &str) -> &str {
+    line.find(|char: char| !char.is_whitespace())
+        .map_or(line, |index| &line[..index])
 }
 
 /// Replace any non-whitespace characters from an indentation string.

src/autofix/fixer.rs

@@ -10,7 +10,7 @@ use crate::autofix::Fix;
 use crate::checks::Check;
 use crate::source_code_locator::SourceCodeLocator;
 
-#[derive(Hash)]
+#[derive(Debug, Hash)]
 pub enum Mode {
     Generate,
     Apply,

src/autofix/helpers.rs

@@ -2,7 +2,11 @@ use anyhow::{bail, Result};
 use itertools::Itertools;
 use rustpython_parser::ast::{ExcepthandlerKind, Location, Stmt, StmtKind};
 
+use crate::ast::helpers;
+use crate::ast::helpers::to_absolute;
+use crate::ast::whitespace::LinesWithTrailingNewline;
 use crate::autofix::Fix;
+use crate::source_code_locator::SourceCodeLocator;
 
 /// Determine if a body contains only a single statement, taking into account
 /// deleted.
@@ -66,7 +70,87 @@ fn is_lone_child(child: &Stmt, parent: &Stmt, deleted: &[&Stmt]) -> Result<bool>
     }
 }
 
-pub fn remove_stmt(stmt: &Stmt, parent: Option<&Stmt>, deleted: &[&Stmt]) -> Result<Fix> {
+/// Return the location of a trailing semicolon following a `Stmt`, if it's part
+/// of a multi-statement line.
+fn trailing_semicolon(stmt: &Stmt, locator: &SourceCodeLocator) -> Option<Location> {
+    let contents = locator.slice_source_code_at(&stmt.end_location.unwrap());
+    for (row, line) in LinesWithTrailingNewline::from(&contents).enumerate() {
+        let trimmed = line.trim();
+        if trimmed.starts_with(';') {
+            let column = line
+                .char_indices()
+                .find_map(|(column, char)| if char == ';' { Some(column) } else { None })
+                .unwrap();
+            return Some(to_absolute(
+                Location::new(row + 1, column),
+                stmt.end_location.unwrap(),
+            ));
+        }
+        if !trimmed.starts_with('\\') {
+            break;
+        }
+    }
+    None
+}
+
+/// Find the next valid break for a `Stmt` after a semicolon.
+fn next_stmt_break(semicolon: Location, locator: &SourceCodeLocator) -> Location {
+    let start_location = Location::new(semicolon.row(), semicolon.column() + 1);
+    let contents = locator.slice_source_code_at(&start_location);
+    for (row, line) in LinesWithTrailingNewline::from(&contents).enumerate() {
+        let trimmed = line.trim();
+        // Skip past any continuations.
+        if trimmed.starts_with('\\') {
+            continue;
+        }
+        return if trimmed.is_empty() {
+            // If the line is empty, then despite the previous statement ending in a
+            // semicolon, we know that it's not a multi-statement line.
+            to_absolute(Location::new(row + 1, 0), start_location)
+        } else {
+            // Otherwise, find the start of the next statement. (Or, anything that isn't
+            // whitespace.)
+            let column = line
+                .char_indices()
+                .find_map(|(column, char)| {
+                    if char.is_whitespace() {
+                        None
+                    } else {
+                        Some(column)
+                    }
+                })
+                .unwrap();
+            to_absolute(Location::new(row + 1, column), start_location)
+        };
+    }
+    Location::new(start_location.row() + 1, 0)
+}
+
+/// Return `true` if a `Stmt` occurs at the end of a file.
+fn is_end_of_file(stmt: &Stmt, locator: &SourceCodeLocator) -> bool {
+    let contents = locator.slice_source_code_at(&stmt.end_location.unwrap());
+    contents.is_empty()
+}
+
+/// Return the `Fix` to use when deleting a `Stmt`.
+///
+/// In some cases, this is as simple as deleting the `Range` of the `Stmt`
+/// itself. However, there are a few exceptions:
+/// - If the `Stmt` is _not_ the terminal statement in a multi-statement line,
+///   we need to delete up to the start of the next statement (and avoid
+///   deleting any content that precedes the statement).
+/// - If the `Stmt` is the terminal statement in a multi-statement line, we need
+///   to avoid deleting any content that precedes the statement.
+/// - If the `Stmt` has no trailing and leading content, then it's convenient to
+///   remove the entire start and end lines.
+/// - If the `Stmt` is the last statement in its parent body, replace it with a
+///   `pass` instead.
+pub fn delete_stmt(
+    stmt: &Stmt,
+    parent: Option<&Stmt>,
+    deleted: &[&Stmt],
+    locator: &SourceCodeLocator,
+) -> Result<Fix> {
     if parent
         .map(|parent| is_lone_child(stmt, parent, deleted))
         .map_or(Ok(None), |v| v.map(Some))?
@@ -80,12 +164,103 @@ pub fn remove_stmt(stmt: &Stmt, parent: Option<&Stmt>, deleted: &[&Stmt]) -> Res
             stmt.end_location.unwrap(),
         ))
     } else {
-        // Otherwise, nuke the entire line.
-        // TODO(charlie): This logic assumes that there are no multi-statement physical
-        // lines.
-        Ok(Fix::deletion(
-            Location::new(stmt.location.row(), 0),
-            Location::new(stmt.end_location.unwrap().row() + 1, 0),
-        ))
+        Ok(if let Some(semicolon) = trailing_semicolon(stmt, locator) {
+            let next = next_stmt_break(semicolon, locator);
+            Fix::deletion(stmt.location, next)
+        } else if helpers::match_leading_content(stmt, locator) {
+            Fix::deletion(stmt.location, stmt.end_location.unwrap())
+        } else if helpers::preceded_by_continuation(stmt, locator) {
+            if is_end_of_file(stmt, locator) && stmt.location.column() == 0 {
+                // Special-case: a file can't end in a continuation.
+                Fix::replacement("\n".to_string(), stmt.location, stmt.end_location.unwrap())
+            } else {
+                Fix::deletion(stmt.location, stmt.end_location.unwrap())
+            }
+        } else {
+            Fix::deletion(
+                Location::new(stmt.location.row(), 0),
+                Location::new(stmt.end_location.unwrap().row() + 1, 0),
+            )
+        })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use anyhow::Result;
+    use rustpython_ast::Location;
+    use rustpython_parser::parser;
+
+    use crate::autofix::helpers::{next_stmt_break, trailing_semicolon};
+    use crate::source_code_locator::SourceCodeLocator;
+
+    #[test]
+    fn find_semicolon() -> Result<()> {
+        let contents = "x = 1";
+        let program = parser::parse_program(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = SourceCodeLocator::new(contents);
+        assert_eq!(trailing_semicolon(stmt, &locator), None);
+
+        let contents = "x = 1; y = 1";
+        let program = parser::parse_program(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = SourceCodeLocator::new(contents);
+        assert_eq!(
+            trailing_semicolon(stmt, &locator),
+            Some(Location::new(1, 5))
+        );
+
+        let contents = "x = 1 ; y = 1";
+        let program = parser::parse_program(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = SourceCodeLocator::new(contents);
+        assert_eq!(
+            trailing_semicolon(stmt, &locator),
+            Some(Location::new(1, 6))
+        );
+
+        let contents = r#"
+x = 1 \
+  ; y = 1
+"#
+        .trim();
+        let program = parser::parse_program(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = SourceCodeLocator::new(contents);
+        assert_eq!(
+            trailing_semicolon(stmt, &locator),
+            Some(Location::new(2, 2))
+        );
+
+        Ok(())
+    }
+
+    #[test]
+    fn find_next_stmt_break() {
+        let contents = "x = 1; y = 1";
+        let locator = SourceCodeLocator::new(contents);
+        assert_eq!(
+            next_stmt_break(Location::new(1, 4), &locator),
+            Location::new(1, 5)
+        );
+
+        let contents = "x = 1 ; y = 1";
+        let locator = SourceCodeLocator::new(contents);
+        assert_eq!(
+            next_stmt_break(Location::new(1, 5), &locator),
+            Location::new(1, 6)
+        );
+
+        let contents = r#"
+x = 1 \
+  ; y = 1
+"#
+        .trim();
+        let locator = SourceCodeLocator::new(contents);
+        assert_eq!(
+            next_stmt_break(Location::new(2, 2), &locator),
+            Location::new(2, 4)
+        );
     }
 }

src/autofix/mod.rs

@@ -35,12 +35,4 @@ impl Fix {
             end_location: at,
         }
     }
-
-    pub fn dummy(location: Location) -> Self {
-        Self {
-            content: String::new(),
-            location,
-            end_location: location,
-        }
-    }
 }

src/check_imports.rs

@@ -37,7 +37,7 @@ pub fn check_imports(
     autofix: bool,
     path: &Path,
 ) -> Vec<Check> {
-    let mut tracker = ImportTracker::new(directives, path);
+    let mut tracker = ImportTracker::new(locator, directives, path);
     for stmt in python_ast {
         tracker.visit_stmt(stmt);
     }

src/checks.rs

@@ -99,12 +99,15 @@ pub enum CheckCode {
     PLC0414,
     PLC2201,
     PLC3002,
+    PLE0117,
+    PLE0118,
     PLE1142,
     PLR0206,
     PLR0402,
     PLR1701,
     PLR1722,
     PLW0120,
+    PLW0602,
     // flake8-builtins
     A001,
     A002,
@@ -203,6 +206,8 @@ pub enum CheckCode {
     YTT301,
     YTT302,
     YTT303,
+    // flake8-simplify
+    SIM118,
     // pyupgrade
     UP001,
     UP003,
@@ -218,6 +223,7 @@ pub enum CheckCode {
     UP013,
     UP014,
     UP015,
+    UP016,
     // pydocstyle
     D100,
     D101,
@@ -310,6 +316,23 @@ pub enum CheckCode {
     RUF100,
     // pygrep-hooks
     PGH001,
+    // pandas-vet
+    PDV002,
+    PDV003,
+    PDV004,
+    PDV007,
+    PDV008,
+    PDV009,
+    PDV010,
+    PDV011,
+    PDV012,
+    PDV013,
+    PDV015,
+    PDV901,
+    // flake8-errmsg
+    EM101,
+    EM102,
+    EM103,
 }
 
 #[derive(EnumIter, Debug, PartialEq, Eq)]
@@ -330,13 +353,16 @@ pub enum CheckCategory {
     Flake8Builtins,
     Flake8Comprehensions,
     Flake8Debugger,
+    Flake8ErrMsg,
     Flake8ImportConventions,
     Flake8Print,
     Flake8Quotes,
     Flake8Return,
+    Flake8Simplify,
     Flake8TidyImports,
     Flake8UnusedArguments,
     Eradicate,
+    PandasVet,
     PygrepHooks,
     Pylint,
     Ruff,
@@ -369,14 +395,17 @@ impl CheckCategory {
             CheckCategory::Flake8Builtins => "flake8-builtins",
             CheckCategory::Flake8Comprehensions => "flake8-comprehensions",
             CheckCategory::Flake8Debugger => "flake8-debugger",
+            CheckCategory::Flake8ErrMsg => "flake8-errmsg",
             CheckCategory::Flake8ImportConventions => "flake8-import-conventions",
             CheckCategory::Flake8Print => "flake8-print",
             CheckCategory::Flake8Quotes => "flake8-quotes",
             CheckCategory::Flake8Return => "flake8-return",
             CheckCategory::Flake8TidyImports => "flake8-tidy-imports",
+            CheckCategory::Flake8Simplify => "flake8-simplify",
             CheckCategory::Flake8UnusedArguments => "flake8-unused-arguments",
             CheckCategory::Isort => "isort",
             CheckCategory::McCabe => "mccabe",
+            CheckCategory::PandasVet => "pandas-vet",
             CheckCategory::PEP8Naming => "pep8-naming",
             CheckCategory::Pycodestyle => "pycodestyle",
             CheckCategory::Pydocstyle => "pydocstyle",
@@ -400,13 +429,16 @@ impl CheckCategory {
             CheckCategory::Flake8Builtins => vec![CheckCodePrefix::A],
             CheckCategory::Flake8Comprehensions => vec![CheckCodePrefix::C4],
             CheckCategory::Flake8Debugger => vec![CheckCodePrefix::T10],
+            CheckCategory::Flake8ErrMsg => vec![CheckCodePrefix::EM],
             CheckCategory::Flake8Print => vec![CheckCodePrefix::T20],
             CheckCategory::Flake8Quotes => vec![CheckCodePrefix::Q],
             CheckCategory::Flake8Return => vec![CheckCodePrefix::RET],
+            CheckCategory::Flake8Simplify => vec![CheckCodePrefix::SIM],
             CheckCategory::Flake8TidyImports => vec![CheckCodePrefix::TID],
             CheckCategory::Flake8UnusedArguments => vec![CheckCodePrefix::ARG],
             CheckCategory::Isort => vec![CheckCodePrefix::I],
             CheckCategory::McCabe => vec![CheckCodePrefix::C90],
+            CheckCategory::PandasVet => vec![CheckCodePrefix::PDV],
             CheckCategory::PEP8Naming => vec![CheckCodePrefix::N],
             CheckCategory::Pycodestyle => vec![CheckCodePrefix::E, CheckCodePrefix::W],
             CheckCategory::Pydocstyle => vec![CheckCodePrefix::D],
@@ -465,6 +497,10 @@ impl CheckCategory {
                 "https://pypi.org/project/flake8-debugger/4.1.2/",
                 &Platform::PyPI,
             )),
+            CheckCategory::Flake8ErrMsg => Some((
+                "https://pypi.org/project/flake8-errmsg/0.4.0/",
+                &Platform::PyPI,
+            )),
             CheckCategory::Flake8ImportConventions => None,
             CheckCategory::Flake8Print => Some((
                 "https://pypi.org/project/flake8-print/5.0.0/",
@@ -478,6 +514,10 @@ impl CheckCategory {
                 "https://pypi.org/project/flake8-return/1.2.0/",
                 &Platform::PyPI,
             )),
+            CheckCategory::Flake8Simplify => Some((
+                "https://pypi.org/project/flake8-simplify/0.19.3/",
+                &Platform::PyPI,
+            )),
             CheckCategory::Flake8TidyImports => Some((
                 "https://pypi.org/project/flake8-tidy-imports/4.8.0/",
                 &Platform::PyPI,
@@ -492,6 +532,10 @@ impl CheckCategory {
             CheckCategory::McCabe => {
                 Some(("https://pypi.org/project/mccabe/0.7.0/", &Platform::PyPI))
             }
+            CheckCategory::PandasVet => Some((
+                "https://pypi.org/project/pandas-vet/0.2.3/",
+                &Platform::PyPI,
+            )),
             CheckCategory::PEP8Naming => Some((
                 "https://pypi.org/project/pep8-naming/0.13.2/",
                 &Platform::PyPI,
@@ -635,15 +679,18 @@ pub enum CheckKind {
     UnusedVariable(String),
     YieldOutsideFunction(DeferralKeyword),
     // pylint
-    ConsiderMergingIsinstance(String, Vec<String>),
-    UselessImportAlias,
-    MisplacedComparisonConstant(String),
-    UnnecessaryDirectLambdaCall,
-    PropertyWithParameters,
-    ConsiderUsingFromImport(String, String),
     AwaitOutsideAsync,
-    UselessElseOnLoop,
+    ConsiderMergingIsinstance(String, Vec<String>),
+    ConsiderUsingFromImport(String, String),
+    GlobalVariableNotAssigned(String),
+    MisplacedComparisonConstant(String),
+    NonlocalWithoutBinding(String),
+    PropertyWithParameters,
+    UnnecessaryDirectLambdaCall,
     UseSysExit(String),
+    UsedPriorGlobalDeclaration(String, usize),
+    UselessElseOnLoop,
+    UselessImportAlias,
     // flake8-builtins
     BuiltinVariableShadowing(String),
     BuiltinArgumentShadowing(String),
@@ -740,6 +787,8 @@ pub enum CheckKind {
     SysVersion0Referenced,
     SysVersionCmpStr10,
     SysVersionSlice1Referenced,
+    // flake8-simplify
+    KeyInDict(String, String),
     // pyupgrade
     TypeOfPrimitive(Primitive),
     UselessMetaclassType,
@@ -755,6 +804,7 @@ pub enum CheckKind {
     ConvertTypedDictFunctionalToClass(String),
     ConvertNamedTupleFunctionalToClass(String),
     RedundantOpenModes,
+    RemoveSixCompat,
     // pydocstyle
     BlankLineAfterLastSection(String),
     BlankLineAfterSection(String),
@@ -844,6 +894,23 @@ pub enum CheckKind {
     UnusedLambdaArgument(String),
     // flake8-import-conventions
     ImportAliasIsNotConventional(String, String),
+    // pandas-vet
+    UseOfInplaceArgument,
+    UseOfDotIsNull,
+    UseOfDotNotNull,
+    UseOfDotIx,
+    UseOfDotAt,
+    UseOfDotIat,
+    UseOfDotPivotOrUnstack,
+    UseOfDotValues,
+    UseOfDotReadTable,
+    UseOfDotStack,
+    UseOfPdMerge,
+    DfIsABadVariableName,
+    // flake8-errmsg
+    RawStringInException,
+    FStringInException,
+    DotFormatInException,
     // Ruff
     AmbiguousUnicodeCharacterString(char, char),
     AmbiguousUnicodeCharacterDocstring(char, char),
@@ -950,6 +1017,8 @@ impl CheckCode {
             CheckCode::PLC0414 => CheckKind::UselessImportAlias,
             CheckCode::PLC2201 => CheckKind::MisplacedComparisonConstant("...".to_string()),
             CheckCode::PLC3002 => CheckKind::UnnecessaryDirectLambdaCall,
+            CheckCode::PLE0117 => CheckKind::NonlocalWithoutBinding("...".to_string()),
+            CheckCode::PLE0118 => CheckKind::UsedPriorGlobalDeclaration("...".to_string(), 1),
             CheckCode::PLE1142 => CheckKind::AwaitOutsideAsync,
             CheckCode::PLR0402 => {
                 CheckKind::ConsiderUsingFromImport("...".to_string(), "...".to_string())
@@ -960,6 +1029,7 @@ impl CheckCode {
             }
             CheckCode::PLR1722 => CheckKind::UseSysExit("exit".to_string()),
             CheckCode::PLW0120 => CheckKind::UselessElseOnLoop,
+            CheckCode::PLW0602 => CheckKind::GlobalVariableNotAssigned("...".to_string()),
             // flake8-builtins
             CheckCode::A001 => CheckKind::BuiltinVariableShadowing("...".to_string()),
             CheckCode::A002 => CheckKind::BuiltinArgumentShadowing("...".to_string()),
@@ -1073,6 +1143,8 @@ impl CheckCode {
             CheckCode::YTT303 => CheckKind::SysVersionSlice1Referenced,
             // flake8-blind-except
             CheckCode::BLE001 => CheckKind::BlindExcept("Exception".to_string()),
+            // flake8-simplify
+            CheckCode::SIM118 => CheckKind::KeyInDict("key".to_string(), "dict".to_string()),
             // pyupgrade
             CheckCode::UP001 => CheckKind::UselessMetaclassType,
             CheckCode::UP003 => CheckKind::TypeOfPrimitive(Primitive::Str),
@@ -1091,6 +1163,7 @@ impl CheckCode {
             CheckCode::UP013 => CheckKind::ConvertTypedDictFunctionalToClass("...".to_string()),
             CheckCode::UP014 => CheckKind::ConvertNamedTupleFunctionalToClass("...".to_string()),
             CheckCode::UP015 => CheckKind::RedundantOpenModes,
+            CheckCode::UP016 => CheckKind::RemoveSixCompat,
             // pydocstyle
             CheckCode::D100 => CheckKind::PublicModule,
             CheckCode::D101 => CheckKind::PublicClass,
@@ -1197,6 +1270,23 @@ impl CheckCode {
             CheckCode::ICN001 => {
                 CheckKind::ImportAliasIsNotConventional("...".to_string(), "...".to_string())
             }
+            // pandas-vet
+            CheckCode::PDV002 => CheckKind::UseOfInplaceArgument,
+            CheckCode::PDV003 => CheckKind::UseOfDotIsNull,
+            CheckCode::PDV004 => CheckKind::UseOfDotNotNull,
+            CheckCode::PDV007 => CheckKind::UseOfDotIx,
+            CheckCode::PDV008 => CheckKind::UseOfDotAt,
+            CheckCode::PDV009 => CheckKind::UseOfDotIat,
+            CheckCode::PDV010 => CheckKind::UseOfDotPivotOrUnstack,
+            CheckCode::PDV011 => CheckKind::UseOfDotValues,
+            CheckCode::PDV012 => CheckKind::UseOfDotReadTable,
+            CheckCode::PDV013 => CheckKind::UseOfDotStack,
+            CheckCode::PDV015 => CheckKind::UseOfPdMerge,
+            CheckCode::PDV901 => CheckKind::DfIsABadVariableName,
+            // flake8-errmsg
+            CheckCode::EM101 => CheckKind::RawStringInException,
+            CheckCode::EM102 => CheckKind::FStringInException,
+            CheckCode::EM103 => CheckKind::DotFormatInException,
             // Ruff
             CheckCode::RUF001 => CheckKind::AmbiguousUnicodeCharacterString('𝐁', 'B'),
             CheckCode::RUF002 => CheckKind::AmbiguousUnicodeCharacterDocstring('𝐁', 'B'),
@@ -1332,6 +1422,9 @@ impl CheckCode {
             CheckCode::E743 => CheckCategory::Pycodestyle,
             CheckCode::E902 => CheckCategory::Pycodestyle,
             CheckCode::E999 => CheckCategory::Pycodestyle,
+            CheckCode::EM101 => CheckCategory::Flake8ErrMsg,
+            CheckCode::EM102 => CheckCategory::Flake8ErrMsg,
+            CheckCode::EM103 => CheckCategory::Flake8ErrMsg,
             CheckCode::ERA001 => CheckCategory::Eradicate,
             CheckCode::F401 => CheckCategory::Pyflakes,
             CheckCode::F402 => CheckCategory::Pyflakes,
@@ -1398,16 +1491,31 @@ impl CheckCode {
             CheckCode::N816 => CheckCategory::PEP8Naming,
             CheckCode::N817 => CheckCategory::PEP8Naming,
             CheckCode::N818 => CheckCategory::PEP8Naming,
+            CheckCode::PDV002 => CheckCategory::PandasVet,
+            CheckCode::PDV003 => CheckCategory::PandasVet,
+            CheckCode::PDV004 => CheckCategory::PandasVet,
+            CheckCode::PDV007 => CheckCategory::PandasVet,
+            CheckCode::PDV008 => CheckCategory::PandasVet,
+            CheckCode::PDV009 => CheckCategory::PandasVet,
+            CheckCode::PDV010 => CheckCategory::PandasVet,
+            CheckCode::PDV011 => CheckCategory::PandasVet,
+            CheckCode::PDV012 => CheckCategory::PandasVet,
+            CheckCode::PDV013 => CheckCategory::PandasVet,
+            CheckCode::PDV015 => CheckCategory::PandasVet,
+            CheckCode::PDV901 => CheckCategory::PandasVet,
             CheckCode::PGH001 => CheckCategory::PygrepHooks,
             CheckCode::PLC0414 => CheckCategory::Pylint,
             CheckCode::PLC2201 => CheckCategory::Pylint,
             CheckCode::PLC3002 => CheckCategory::Pylint,
+            CheckCode::PLE0117 => CheckCategory::Pylint,
+            CheckCode::PLE0118 => CheckCategory::Pylint,
             CheckCode::PLE1142 => CheckCategory::Pylint,
             CheckCode::PLR0206 => CheckCategory::Pylint,
             CheckCode::PLR0402 => CheckCategory::Pylint,
             CheckCode::PLR1701 => CheckCategory::Pylint,
             CheckCode::PLR1722 => CheckCategory::Pylint,
             CheckCode::PLW0120 => CheckCategory::Pylint,
+            CheckCode::PLW0602 => CheckCategory::Pylint,
             CheckCode::Q000 => CheckCategory::Flake8Quotes,
             CheckCode::Q001 => CheckCategory::Flake8Quotes,
             CheckCode::Q002 => CheckCategory::Flake8Quotes,
@@ -1430,6 +1538,7 @@ impl CheckCode {
             CheckCode::S105 => CheckCategory::Flake8Bandit,
             CheckCode::S106 => CheckCategory::Flake8Bandit,
             CheckCode::S107 => CheckCategory::Flake8Bandit,
+            CheckCode::SIM118 => CheckCategory::Flake8Simplify,
             CheckCode::T100 => CheckCategory::Flake8Debugger,
             CheckCode::T201 => CheckCategory::Flake8Print,
             CheckCode::T203 => CheckCategory::Flake8Print,
@@ -1447,6 +1556,7 @@ impl CheckCode {
             CheckCode::UP013 => CheckCategory::Pyupgrade,
             CheckCode::UP014 => CheckCategory::Pyupgrade,
             CheckCode::UP015 => CheckCategory::Pyupgrade,
+            CheckCode::UP016 => CheckCategory::Pyupgrade,
             CheckCode::W292 => CheckCategory::Pycodestyle,
             CheckCode::W605 => CheckCategory::Pycodestyle,
             CheckCode::YTT101 => CheckCategory::Flake82020,
@@ -1530,15 +1640,18 @@ impl CheckKind {
             CheckKind::NoNewLineAtEndOfFile => &CheckCode::W292,
             CheckKind::InvalidEscapeSequence(_) => &CheckCode::W605,
             // pylint
-            CheckKind::UselessImportAlias => &CheckCode::PLC0414,
-            CheckKind::MisplacedComparisonConstant(..) => &CheckCode::PLC2201,
-            CheckKind::UnnecessaryDirectLambdaCall => &CheckCode::PLC3002,
             CheckKind::AwaitOutsideAsync => &CheckCode::PLE1142,
             CheckKind::ConsiderMergingIsinstance(..) => &CheckCode::PLR1701,
-            CheckKind::PropertyWithParameters => &CheckCode::PLR0206,
             CheckKind::ConsiderUsingFromImport(..) => &CheckCode::PLR0402,
+            CheckKind::GlobalVariableNotAssigned(..) => &CheckCode::PLW0602,
+            CheckKind::MisplacedComparisonConstant(..) => &CheckCode::PLC2201,
+            CheckKind::PropertyWithParameters => &CheckCode::PLR0206,
+            CheckKind::UnnecessaryDirectLambdaCall => &CheckCode::PLC3002,
             CheckKind::UseSysExit(_) => &CheckCode::PLR1722,
+            CheckKind::NonlocalWithoutBinding(..) => &CheckCode::PLE0117,
+            CheckKind::UsedPriorGlobalDeclaration(..) => &CheckCode::PLE0118,
             CheckKind::UselessElseOnLoop => &CheckCode::PLW0120,
+            CheckKind::UselessImportAlias => &CheckCode::PLC0414,
             // flake8-builtins
             CheckKind::BuiltinVariableShadowing(_) => &CheckCode::A001,
             CheckKind::BuiltinArgumentShadowing(_) => &CheckCode::A002,
@@ -1635,6 +1748,8 @@ impl CheckKind {
             CheckKind::SysVersion0Referenced => &CheckCode::YTT301,
             CheckKind::SysVersionCmpStr10 => &CheckCode::YTT302,
             CheckKind::SysVersionSlice1Referenced => &CheckCode::YTT303,
+            // flake8-simplify
+            CheckKind::KeyInDict(..) => &CheckCode::SIM118,
             // pyupgrade
             CheckKind::TypeOfPrimitive(_) => &CheckCode::UP003,
             CheckKind::UselessMetaclassType => &CheckCode::UP001,
@@ -1650,6 +1765,7 @@ impl CheckKind {
             CheckKind::ConvertTypedDictFunctionalToClass(_) => &CheckCode::UP013,
             CheckKind::ConvertNamedTupleFunctionalToClass(_) => &CheckCode::UP014,
             CheckKind::RedundantOpenModes => &CheckCode::UP015,
+            CheckKind::RemoveSixCompat => &CheckCode::UP016,
             // pydocstyle
             CheckKind::BlankLineAfterLastSection(_) => &CheckCode::D413,
             CheckKind::BlankLineAfterSection(_) => &CheckCode::D410,
@@ -1739,6 +1855,23 @@ impl CheckKind {
             CheckKind::UnusedLambdaArgument(..) => &CheckCode::ARG005,
             // flake8-import-conventions
             CheckKind::ImportAliasIsNotConventional(..) => &CheckCode::ICN001,
+            // pandas-vet
+            CheckKind::UseOfInplaceArgument => &CheckCode::PDV002,
+            CheckKind::UseOfDotIsNull => &CheckCode::PDV003,
+            CheckKind::UseOfDotNotNull => &CheckCode::PDV004,
+            CheckKind::UseOfDotIx => &CheckCode::PDV007,
+            CheckKind::UseOfDotAt => &CheckCode::PDV008,
+            CheckKind::UseOfDotIat => &CheckCode::PDV009,
+            CheckKind::UseOfDotPivotOrUnstack => &CheckCode::PDV010,
+            CheckKind::UseOfDotValues => &CheckCode::PDV011,
+            CheckKind::UseOfDotReadTable => &CheckCode::PDV012,
+            CheckKind::UseOfDotStack => &CheckCode::PDV013,
+            CheckKind::UseOfPdMerge => &CheckCode::PDV015,
+            CheckKind::DfIsABadVariableName => &CheckCode::PDV901,
+            // flake8-errmsg
+            CheckKind::RawStringInException => &CheckCode::EM101,
+            CheckKind::FStringInException => &CheckCode::EM102,
+            CheckKind::DotFormatInException => &CheckCode::EM103,
             // Ruff
             CheckKind::AmbiguousUnicodeCharacterString(..) => &CheckCode::RUF001,
             CheckKind::AmbiguousUnicodeCharacterDocstring(..) => &CheckCode::RUF002,
@@ -1947,6 +2080,9 @@ impl CheckKind {
             CheckKind::MisplacedComparisonConstant(comparison) => {
                 format!("Comparison should be {comparison}")
             }
+            CheckKind::NonlocalWithoutBinding(name) => {
+                format!("Nonlocal name `{name}` found without binding")
+            }
             CheckKind::UnnecessaryDirectLambdaCall => "Lambda expression called directly. Execute \
                                                        the expression inline instead."
                 .to_string(),
@@ -1956,6 +2092,12 @@ impl CheckKind {
             CheckKind::ConsiderUsingFromImport(module, name) => {
                 format!("Use `from {module} import {name}` in lieu of alias")
             }
+            CheckKind::UsedPriorGlobalDeclaration(name, line) => {
+                format!("Name `{name}` is used prior to global declaration on line {line}")
+            }
+            CheckKind::GlobalVariableNotAssigned(name) => {
+                format!("Using global for `{name}` but no assignment is done")
+            }
             CheckKind::AwaitOutsideAsync => {
                 "`await` should be used within an async function".to_string()
             }
@@ -2292,6 +2434,10 @@ impl CheckKind {
             CheckKind::SysVersionSlice1Referenced => {
                 "`sys.version[:1]` referenced (python10), use `sys.version_info`".to_string()
             }
+            // flake8-simplify
+            CheckKind::KeyInDict(key, dict) => {
+                format!("Use `{key} in {dict}` instead of `{key} in {dict}.keys()`")
+            }
             // pyupgrade
             CheckKind::TypeOfPrimitive(primitive) => {
                 format!("Use `{}` instead of `type(...)`", primitive.builtin())
@@ -2328,6 +2474,7 @@ impl CheckKind {
             }
             CheckKind::UnnecessaryEncodeUTF8 => "Unnecessary call to `encode` as UTF-8".to_string(),
             CheckKind::RedundantOpenModes => "Unnecessary open mode parameters".to_string(),
+            CheckKind::RemoveSixCompat => "Unnecessary `six` compatibility usage".to_string(),
             CheckKind::ConvertTypedDictFunctionalToClass(name) => {
                 format!("Convert `{name}` from `TypedDict` functional to class syntax")
             }
@@ -2553,6 +2700,51 @@ impl CheckKind {
             CheckKind::ImportAliasIsNotConventional(name, asname) => {
                 format!("`{name}` should be imported as `{asname}`")
             }
+            // pandas-vet
+            CheckKind::UseOfInplaceArgument => {
+                "`inplace=True` should be avoided; it has inconsistent behavior".to_string()
+            }
+            CheckKind::UseOfDotIsNull => {
+                "`.isna` is preferred to `.isnull`; functionality is equivalent".to_string()
+            }
+            CheckKind::UseOfDotNotNull => {
+                "`.notna` is preferred to `.notnull`; functionality is equivalent".to_string()
+            }
+            CheckKind::UseOfDotIx => {
+                "``ix` i` deprecated; use more explicit `.loc` o` `.iloc`".to_string()
+            }
+            CheckKind::UseOfDotAt => {
+                "Use `.loc` instead of `.at`.  If speed is important, use numpy.".to_string()
+            }
+            CheckKind::UseOfDotIat => {
+                "Use `.iloc` instea` of `.iat`.  If speed is important, use numpy.".to_string()
+            }
+            CheckKind::UseOfDotPivotOrUnstack => "`.pivot_table` is preferred to `.pivot` or \
+                                                  `.unstack`; provides same functionality"
+                .to_string(),
+            CheckKind::UseOfDotValues => "Use `.to_numpy()` instead of `.values`".to_string(),
+            CheckKind::UseOfDotReadTable => {
+                "`.read_csv` is preferred to `.read_table`; provides same functionality".to_string()
+            }
+            CheckKind::UseOfDotStack => {
+                "`.melt` is preferred to `.stack`; provides same functionality".to_string()
+            }
+            CheckKind::DfIsABadVariableName => {
+                "`df` is a bad variable name. Be kinder to your future self.".to_string()
+            }
+            CheckKind::UseOfPdMerge => "Use `.merge` method instead of `pd.merge` function. They \
+                                        have equivalent functionality."
+                .to_string(),
+            // flake8-errmsg
+            CheckKind::RawStringInException => {
+                "Exception must not use a string literal, assign to variable first".to_string()
+            }
+            CheckKind::FStringInException => {
+                "Exception must not use an f-string literal, assign to variable first".to_string()
+            }
+            CheckKind::DotFormatInException => "Exception must not use a `.format()` string \
+                                                directly, assign to variable first"
+                .to_string(),
             // Ruff
             CheckKind::AmbiguousUnicodeCharacterString(confusable, representant) => {
                 format!(
@@ -2625,6 +2817,7 @@ impl CheckKind {
                 | CheckKind::CommentedOutCode
                 | CheckKind::ConvertNamedTupleFunctionalToClass(..)
                 | CheckKind::ConvertTypedDictFunctionalToClass(..)
+                | CheckKind::RemoveSixCompat
                 | CheckKind::DashedUnderlineAfterSection(..)
                 | CheckKind::DeprecatedUnittestAlias(..)
                 | CheckKind::DoNotAssertFalse
@@ -2636,6 +2829,7 @@ impl CheckKind {
                 | CheckKind::ImplicitReturn
                 | CheckKind::ImplicitReturnValue
                 | CheckKind::IsLiteral
+                | CheckKind::KeyInDict(..)
                 | CheckKind::MisplacedComparisonConstant(..)
                 | CheckKind::NewLineAfterLastParagraph
                 | CheckKind::NewLineAfterSectionName(..)
@@ -2651,6 +2845,7 @@ impl CheckKind {
                 | CheckKind::NotIsTest
                 | CheckKind::OneBlankLineAfterClass(..)
                 | CheckKind::OneBlankLineBeforeClass(..)
+                | CheckKind::PercentFormatExtraNamedArguments(..)
                 | CheckKind::PEP3120UnnecessaryCodingComment
                 | CheckKind::PPrintFound
                 | CheckKind::PrintFound
@@ -2663,9 +2858,11 @@ impl CheckKind {
                 | CheckKind::SectionUnderlineMatchesSectionLength(..)
                 | CheckKind::SectionUnderlineNotOverIndented(..)
                 | CheckKind::SetAttrWithConstant
+                | CheckKind::StringDotFormatExtraNamedArguments(..)
                 | CheckKind::SuperCallWithParameters
                 | CheckKind::TrueFalseComparison(..)
                 | CheckKind::TypeOfPrimitive(..)
+                | CheckKind::UnnecessaryCallAroundSorted(..)
                 | CheckKind::UnnecessaryCollectionCall(..)
                 | CheckKind::UnnecessaryComprehension(..)
                 | CheckKind::UnnecessaryEncodeUTF8
@@ -2737,6 +2934,7 @@ pub static CODE_REDIRECTS: Lazy<FxHashMap<&'static str, CheckCode>> = Lazy::new(
         ("U013", CheckCode::UP013),
         ("U014", CheckCode::UP014),
         ("U015", CheckCode::UP015),
+        ("U016", CheckCode::UP016),
         // TODO(charlie): Remove by 2023-02-01.
         ("I252", CheckCode::TID252),
         ("M001", CheckCode::RUF100),

src/checks_gen.rs

@@ -189,6 +189,12 @@ pub enum CheckCodePrefix {
     E902,
     E99,
     E999,
+    EM,
+    EM1,
+    EM10,
+    EM101,
+    EM102,
+    EM103,
     ERA,
     ERA0,
     ERA00,
@@ -297,6 +303,24 @@ pub enum CheckCodePrefix {
     N816,
     N817,
     N818,
+    PDV,
+    PDV0,
+    PDV00,
+    PDV002,
+    PDV003,
+    PDV004,
+    PDV007,
+    PDV008,
+    PDV009,
+    PDV01,
+    PDV010,
+    PDV011,
+    PDV012,
+    PDV013,
+    PDV015,
+    PDV9,
+    PDV90,
+    PDV901,
     PGH,
     PGH0,
     PGH00,
@@ -315,6 +339,11 @@ pub enum CheckCodePrefix {
     PLC300,
     PLC3002,
     PLE,
+    PLE0,
+    PLE01,
+    PLE011,
+    PLE0117,
+    PLE0118,
     PLE1,
     PLE11,
     PLE114,
@@ -338,6 +367,9 @@ pub enum CheckCodePrefix {
     PLW01,
     PLW012,
     PLW0120,
+    PLW06,
+    PLW060,
+    PLW0602,
     Q,
     Q0,
     Q00,
@@ -374,6 +406,10 @@ pub enum CheckCodePrefix {
     S105,
     S106,
     S107,
+    SIM,
+    SIM1,
+    SIM11,
+    SIM118,
     T,
     T1,
     T10,
@@ -404,6 +440,7 @@ pub enum CheckCodePrefix {
     U013,
     U014,
     U015,
+    U016,
     UP,
     UP0,
     UP00,
@@ -422,6 +459,7 @@ pub enum CheckCodePrefix {
     UP013,
     UP014,
     UP015,
+    UP016,
     W,
     W2,
     W29,
@@ -991,6 +1029,12 @@ impl CheckCodePrefix {
             CheckCodePrefix::E902 => vec![CheckCode::E902],
             CheckCodePrefix::E99 => vec![CheckCode::E999],
             CheckCodePrefix::E999 => vec![CheckCode::E999],
+            CheckCodePrefix::EM => vec![CheckCode::EM101, CheckCode::EM102, CheckCode::EM103],
+            CheckCodePrefix::EM1 => vec![CheckCode::EM101, CheckCode::EM102, CheckCode::EM103],
+            CheckCodePrefix::EM10 => vec![CheckCode::EM101, CheckCode::EM102, CheckCode::EM103],
+            CheckCodePrefix::EM101 => vec![CheckCode::EM101],
+            CheckCodePrefix::EM102 => vec![CheckCode::EM102],
+            CheckCodePrefix::EM103 => vec![CheckCode::EM103],
             CheckCodePrefix::ERA => vec![CheckCode::ERA001],
             CheckCodePrefix::ERA0 => vec![CheckCode::ERA001],
             CheckCodePrefix::ERA00 => vec![CheckCode::ERA001],
@@ -1324,6 +1368,62 @@ impl CheckCodePrefix {
             CheckCodePrefix::N816 => vec![CheckCode::N816],
             CheckCodePrefix::N817 => vec![CheckCode::N817],
             CheckCodePrefix::N818 => vec![CheckCode::N818],
+            CheckCodePrefix::PDV => vec![
+                CheckCode::PDV002,
+                CheckCode::PDV003,
+                CheckCode::PDV004,
+                CheckCode::PDV007,
+                CheckCode::PDV008,
+                CheckCode::PDV009,
+                CheckCode::PDV010,
+                CheckCode::PDV011,
+                CheckCode::PDV012,
+                CheckCode::PDV013,
+                CheckCode::PDV015,
+                CheckCode::PDV901,
+            ],
+            CheckCodePrefix::PDV0 => vec![
+                CheckCode::PDV002,
+                CheckCode::PDV003,
+                CheckCode::PDV004,
+                CheckCode::PDV007,
+                CheckCode::PDV008,
+                CheckCode::PDV009,
+                CheckCode::PDV010,
+                CheckCode::PDV011,
+                CheckCode::PDV012,
+                CheckCode::PDV013,
+                CheckCode::PDV015,
+            ],
+            CheckCodePrefix::PDV00 => vec![
+                CheckCode::PDV002,
+                CheckCode::PDV003,
+                CheckCode::PDV004,
+                CheckCode::PDV007,
+                CheckCode::PDV008,
+                CheckCode::PDV009,
+            ],
+            CheckCodePrefix::PDV002 => vec![CheckCode::PDV002],
+            CheckCodePrefix::PDV003 => vec![CheckCode::PDV003],
+            CheckCodePrefix::PDV004 => vec![CheckCode::PDV004],
+            CheckCodePrefix::PDV007 => vec![CheckCode::PDV007],
+            CheckCodePrefix::PDV008 => vec![CheckCode::PDV008],
+            CheckCodePrefix::PDV009 => vec![CheckCode::PDV009],
+            CheckCodePrefix::PDV01 => vec![
+                CheckCode::PDV010,
+                CheckCode::PDV011,
+                CheckCode::PDV012,
+                CheckCode::PDV013,
+                CheckCode::PDV015,
+            ],
+            CheckCodePrefix::PDV010 => vec![CheckCode::PDV010],
+            CheckCodePrefix::PDV011 => vec![CheckCode::PDV011],
+            CheckCodePrefix::PDV012 => vec![CheckCode::PDV012],
+            CheckCodePrefix::PDV013 => vec![CheckCode::PDV013],
+            CheckCodePrefix::PDV015 => vec![CheckCode::PDV015],
+            CheckCodePrefix::PDV9 => vec![CheckCode::PDV901],
+            CheckCodePrefix::PDV90 => vec![CheckCode::PDV901],
+            CheckCodePrefix::PDV901 => vec![CheckCode::PDV901],
             CheckCodePrefix::PGH => vec![CheckCode::PGH001],
             CheckCodePrefix::PGH0 => vec![CheckCode::PGH001],
             CheckCodePrefix::PGH00 => vec![CheckCode::PGH001],
@@ -1343,7 +1443,14 @@ impl CheckCodePrefix {
             CheckCodePrefix::PLC30 => vec![CheckCode::PLC3002],
             CheckCodePrefix::PLC300 => vec![CheckCode::PLC3002],
             CheckCodePrefix::PLC3002 => vec![CheckCode::PLC3002],
-            CheckCodePrefix::PLE => vec![CheckCode::PLE1142],
+            CheckCodePrefix::PLE => {
+                vec![CheckCode::PLE0117, CheckCode::PLE0118, CheckCode::PLE1142]
+            }
+            CheckCodePrefix::PLE0 => vec![CheckCode::PLE0117, CheckCode::PLE0118],
+            CheckCodePrefix::PLE01 => vec![CheckCode::PLE0117, CheckCode::PLE0118],
+            CheckCodePrefix::PLE011 => vec![CheckCode::PLE0117, CheckCode::PLE0118],
+            CheckCodePrefix::PLE0117 => vec![CheckCode::PLE0117],
+            CheckCodePrefix::PLE0118 => vec![CheckCode::PLE0118],
             CheckCodePrefix::PLE1 => vec![CheckCode::PLE1142],
             CheckCodePrefix::PLE11 => vec![CheckCode::PLE1142],
             CheckCodePrefix::PLE114 => vec![CheckCode::PLE1142],
@@ -1367,11 +1474,14 @@ impl CheckCodePrefix {
             CheckCodePrefix::PLR1701 => vec![CheckCode::PLR1701],
             CheckCodePrefix::PLR172 => vec![CheckCode::PLR1722],
             CheckCodePrefix::PLR1722 => vec![CheckCode::PLR1722],
-            CheckCodePrefix::PLW => vec![CheckCode::PLW0120],
-            CheckCodePrefix::PLW0 => vec![CheckCode::PLW0120],
+            CheckCodePrefix::PLW => vec![CheckCode::PLW0120, CheckCode::PLW0602],
+            CheckCodePrefix::PLW0 => vec![CheckCode::PLW0120, CheckCode::PLW0602],
             CheckCodePrefix::PLW01 => vec![CheckCode::PLW0120],
             CheckCodePrefix::PLW012 => vec![CheckCode::PLW0120],
             CheckCodePrefix::PLW0120 => vec![CheckCode::PLW0120],
+            CheckCodePrefix::PLW06 => vec![CheckCode::PLW0602],
+            CheckCodePrefix::PLW060 => vec![CheckCode::PLW0602],
+            CheckCodePrefix::PLW0602 => vec![CheckCode::PLW0602],
             CheckCodePrefix::Q => vec![
                 CheckCode::Q000,
                 CheckCode::Q001,
@@ -1476,6 +1586,10 @@ impl CheckCodePrefix {
             CheckCodePrefix::S105 => vec![CheckCode::S105],
             CheckCodePrefix::S106 => vec![CheckCode::S106],
             CheckCodePrefix::S107 => vec![CheckCode::S107],
+            CheckCodePrefix::SIM => vec![CheckCode::SIM118],
+            CheckCodePrefix::SIM1 => vec![CheckCode::SIM118],
+            CheckCodePrefix::SIM11 => vec![CheckCode::SIM118],
+            CheckCodePrefix::SIM118 => vec![CheckCode::SIM118],
             CheckCodePrefix::T => vec![CheckCode::T100, CheckCode::T201, CheckCode::T203],
             CheckCodePrefix::T1 => vec![CheckCode::T100],
             CheckCodePrefix::T10 => vec![CheckCode::T100],
@@ -1510,6 +1624,7 @@ impl CheckCodePrefix {
                     CheckCode::UP013,
                     CheckCode::UP014,
                     CheckCode::UP015,
+                    CheckCode::UP016,
                 ]
             }
             CheckCodePrefix::U0 => {
@@ -1534,6 +1649,7 @@ impl CheckCodePrefix {
                     CheckCode::UP013,
                     CheckCode::UP014,
                     CheckCode::UP015,
+                    CheckCode::UP016,
                 ]
             }
             CheckCodePrefix::U00 => {
@@ -1640,6 +1756,7 @@ impl CheckCodePrefix {
                     CheckCode::UP013,
                     CheckCode::UP014,
                     CheckCode::UP015,
+                    CheckCode::UP016,
                 ]
             }
             CheckCodePrefix::U010 => {
@@ -1696,6 +1813,15 @@ impl CheckCodePrefix {
                 );
                 vec![CheckCode::UP015]
             }
+            CheckCodePrefix::U016 => {
+                eprintln!(
+                    "{}{} {}",
+                    "warning".yellow().bold(),
+                    ":".bold(),
+                    "`U016` has been remapped to `UP016`".bold()
+                );
+                vec![CheckCode::UP016]
+            }
             CheckCodePrefix::UP => vec![
                 CheckCode::UP001,
                 CheckCode::UP003,
@@ -1711,6 +1837,7 @@ impl CheckCodePrefix {
                 CheckCode::UP013,
                 CheckCode::UP014,
                 CheckCode::UP015,
+                CheckCode::UP016,
             ],
             CheckCodePrefix::UP0 => vec![
                 CheckCode::UP001,
@@ -1727,6 +1854,7 @@ impl CheckCodePrefix {
                 CheckCode::UP013,
                 CheckCode::UP014,
                 CheckCode::UP015,
+                CheckCode::UP016,
             ],
             CheckCodePrefix::UP00 => vec![
                 CheckCode::UP001,
@@ -1753,6 +1881,7 @@ impl CheckCodePrefix {
                 CheckCode::UP013,
                 CheckCode::UP014,
                 CheckCode::UP015,
+                CheckCode::UP016,
             ],
             CheckCodePrefix::UP010 => vec![CheckCode::UP010],
             CheckCodePrefix::UP011 => vec![CheckCode::UP011],
@@ -1760,6 +1889,7 @@ impl CheckCodePrefix {
             CheckCodePrefix::UP013 => vec![CheckCode::UP013],
             CheckCodePrefix::UP014 => vec![CheckCode::UP014],
             CheckCodePrefix::UP015 => vec![CheckCode::UP015],
+            CheckCodePrefix::UP016 => vec![CheckCode::UP016],
             CheckCodePrefix::W => vec![CheckCode::W292, CheckCode::W605],
             CheckCodePrefix::W2 => vec![CheckCode::W292],
             CheckCodePrefix::W29 => vec![CheckCode::W292],
@@ -1992,6 +2122,12 @@ impl CheckCodePrefix {
             CheckCodePrefix::E902 => SuffixLength::Three,
             CheckCodePrefix::E99 => SuffixLength::Two,
             CheckCodePrefix::E999 => SuffixLength::Three,
+            CheckCodePrefix::EM => SuffixLength::Zero,
+            CheckCodePrefix::EM1 => SuffixLength::One,
+            CheckCodePrefix::EM10 => SuffixLength::Two,
+            CheckCodePrefix::EM101 => SuffixLength::Three,
+            CheckCodePrefix::EM102 => SuffixLength::Three,
+            CheckCodePrefix::EM103 => SuffixLength::Three,
             CheckCodePrefix::ERA => SuffixLength::Zero,
             CheckCodePrefix::ERA0 => SuffixLength::One,
             CheckCodePrefix::ERA00 => SuffixLength::Two,
@@ -2100,6 +2236,24 @@ impl CheckCodePrefix {
             CheckCodePrefix::N816 => SuffixLength::Three,
             CheckCodePrefix::N817 => SuffixLength::Three,
             CheckCodePrefix::N818 => SuffixLength::Three,
+            CheckCodePrefix::PDV => SuffixLength::Zero,
+            CheckCodePrefix::PDV0 => SuffixLength::One,
+            CheckCodePrefix::PDV00 => SuffixLength::Two,
+            CheckCodePrefix::PDV002 => SuffixLength::Three,
+            CheckCodePrefix::PDV003 => SuffixLength::Three,
+            CheckCodePrefix::PDV004 => SuffixLength::Three,
+            CheckCodePrefix::PDV007 => SuffixLength::Three,
+            CheckCodePrefix::PDV008 => SuffixLength::Three,
+            CheckCodePrefix::PDV009 => SuffixLength::Three,
+            CheckCodePrefix::PDV01 => SuffixLength::Two,
+            CheckCodePrefix::PDV010 => SuffixLength::Three,
+            CheckCodePrefix::PDV011 => SuffixLength::Three,
+            CheckCodePrefix::PDV012 => SuffixLength::Three,
+            CheckCodePrefix::PDV013 => SuffixLength::Three,
+            CheckCodePrefix::PDV015 => SuffixLength::Three,
+            CheckCodePrefix::PDV9 => SuffixLength::One,
+            CheckCodePrefix::PDV90 => SuffixLength::Two,
+            CheckCodePrefix::PDV901 => SuffixLength::Three,
             CheckCodePrefix::PGH => SuffixLength::Zero,
             CheckCodePrefix::PGH0 => SuffixLength::One,
             CheckCodePrefix::PGH00 => SuffixLength::Two,
@@ -2118,6 +2272,11 @@ impl CheckCodePrefix {
             CheckCodePrefix::PLC300 => SuffixLength::Three,
             CheckCodePrefix::PLC3002 => SuffixLength::Four,
             CheckCodePrefix::PLE => SuffixLength::Zero,
+            CheckCodePrefix::PLE0 => SuffixLength::One,
+            CheckCodePrefix::PLE01 => SuffixLength::Two,
+            CheckCodePrefix::PLE011 => SuffixLength::Three,
+            CheckCodePrefix::PLE0117 => SuffixLength::Four,
+            CheckCodePrefix::PLE0118 => SuffixLength::Four,
             CheckCodePrefix::PLE1 => SuffixLength::One,
             CheckCodePrefix::PLE11 => SuffixLength::Two,
             CheckCodePrefix::PLE114 => SuffixLength::Three,
@@ -2141,6 +2300,9 @@ impl CheckCodePrefix {
             CheckCodePrefix::PLW01 => SuffixLength::Two,
             CheckCodePrefix::PLW012 => SuffixLength::Three,
             CheckCodePrefix::PLW0120 => SuffixLength::Four,
+            CheckCodePrefix::PLW06 => SuffixLength::Two,
+            CheckCodePrefix::PLW060 => SuffixLength::Three,
+            CheckCodePrefix::PLW0602 => SuffixLength::Four,
             CheckCodePrefix::Q => SuffixLength::Zero,
             CheckCodePrefix::Q0 => SuffixLength::One,
             CheckCodePrefix::Q00 => SuffixLength::Two,
@@ -2177,6 +2339,10 @@ impl CheckCodePrefix {
             CheckCodePrefix::S105 => SuffixLength::Three,
             CheckCodePrefix::S106 => SuffixLength::Three,
             CheckCodePrefix::S107 => SuffixLength::Three,
+            CheckCodePrefix::SIM => SuffixLength::Zero,
+            CheckCodePrefix::SIM1 => SuffixLength::One,
+            CheckCodePrefix::SIM11 => SuffixLength::Two,
+            CheckCodePrefix::SIM118 => SuffixLength::Three,
             CheckCodePrefix::T => SuffixLength::Zero,
             CheckCodePrefix::T1 => SuffixLength::One,
             CheckCodePrefix::T10 => SuffixLength::Two,
@@ -2207,6 +2373,7 @@ impl CheckCodePrefix {
             CheckCodePrefix::U013 => SuffixLength::Three,
             CheckCodePrefix::U014 => SuffixLength::Three,
             CheckCodePrefix::U015 => SuffixLength::Three,
+            CheckCodePrefix::U016 => SuffixLength::Three,
             CheckCodePrefix::UP => SuffixLength::Zero,
             CheckCodePrefix::UP0 => SuffixLength::One,
             CheckCodePrefix::UP00 => SuffixLength::Two,
@@ -2225,6 +2392,7 @@ impl CheckCodePrefix {
             CheckCodePrefix::UP013 => SuffixLength::Three,
             CheckCodePrefix::UP014 => SuffixLength::Three,
             CheckCodePrefix::UP015 => SuffixLength::Three,
+            CheckCodePrefix::UP016 => SuffixLength::Three,
             CheckCodePrefix::W => SuffixLength::Zero,
             CheckCodePrefix::W2 => SuffixLength::One,
             CheckCodePrefix::W29 => SuffixLength::Two,
@@ -2262,12 +2430,14 @@ pub const CATEGORIES: &[CheckCodePrefix] = &[
     CheckCodePrefix::C,
     CheckCodePrefix::D,
     CheckCodePrefix::E,
+    CheckCodePrefix::EM,
     CheckCodePrefix::ERA,
     CheckCodePrefix::F,
     CheckCodePrefix::FBT,
     CheckCodePrefix::I,
     CheckCodePrefix::ICN,
     CheckCodePrefix::N,
+    CheckCodePrefix::PDV,
     CheckCodePrefix::PGH,
     CheckCodePrefix::PLC,
     CheckCodePrefix::PLE,
@@ -2277,6 +2447,7 @@ pub const CATEGORIES: &[CheckCodePrefix] = &[
     CheckCodePrefix::RET,
     CheckCodePrefix::RUF,
     CheckCodePrefix::S,
+    CheckCodePrefix::SIM,
     CheckCodePrefix::T,
     CheckCodePrefix::TID,
     CheckCodePrefix::UP,

src/cli.rs

@@ -1,4 +1,4 @@
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 use clap::{command, Parser};
 use regex::Regex;
@@ -6,6 +6,7 @@ use rustc_hash::FxHashMap;
 
 use crate::checks::CheckCode;
 use crate::checks_gen::CheckCodePrefix;
+use crate::fs;
 use crate::logging::LogLevel;
 use crate::settings::types::{
     FilePattern, PatternPrefixPair, PerFileIgnore, PythonVersion, SerializationFormat,
@@ -47,46 +48,54 @@ pub struct Cli {
     pub no_cache: bool,
     /// List of error codes to enable.
     #[arg(long, value_delimiter = ',')]
-    pub select: Vec<CheckCodePrefix>,
+    pub select: Option<Vec<CheckCodePrefix>>,
     /// Like --select, but adds additional error codes on top of the selected
     /// ones.
     #[arg(long, value_delimiter = ',')]
-    pub extend_select: Vec<CheckCodePrefix>,
+    pub extend_select: Option<Vec<CheckCodePrefix>>,
     /// List of error codes to ignore.
     #[arg(long, value_delimiter = ',')]
-    pub ignore: Vec<CheckCodePrefix>,
+    pub ignore: Option<Vec<CheckCodePrefix>>,
     /// Like --ignore, but adds additional error codes on top of the ignored
     /// ones.
     #[arg(long, value_delimiter = ',')]
-    pub extend_ignore: Vec<CheckCodePrefix>,
+    pub extend_ignore: Option<Vec<CheckCodePrefix>>,
     /// List of paths, used to exclude files and/or directories from checks.
     #[arg(long, value_delimiter = ',')]
-    pub exclude: Vec<FilePattern>,
+    pub exclude: Option<Vec<FilePattern>>,
     /// Like --exclude, but adds additional files and directories on top of the
     /// excluded ones.
     #[arg(long, value_delimiter = ',')]
-    pub extend_exclude: Vec<FilePattern>,
+    pub extend_exclude: Option<Vec<FilePattern>>,
     /// List of error codes to treat as eligible for autofix. Only applicable
     /// when autofix itself is enabled (e.g., via `--fix`).
     #[arg(long, value_delimiter = ',')]
-    pub fixable: Vec<CheckCodePrefix>,
+    pub fixable: Option<Vec<CheckCodePrefix>>,
     /// List of error codes to treat as ineligible for autofix. Only applicable
     /// when autofix itself is enabled (e.g., via `--fix`).
     #[arg(long, value_delimiter = ',')]
-    pub unfixable: Vec<CheckCodePrefix>,
+    pub unfixable: Option<Vec<CheckCodePrefix>>,
     /// List of mappings from file pattern to code to exclude
     #[arg(long, value_delimiter = ',')]
-    pub per_file_ignores: Vec<PatternPrefixPair>,
+    pub per_file_ignores: Option<Vec<PatternPrefixPair>>,
     /// Output serialization format for error messages.
     #[arg(long, value_enum)]
     pub format: Option<SerializationFormat>,
     /// Show violations with source code.
-    #[arg(long)]
-    pub show_source: bool,
+    #[arg(long, overrides_with("no_show_source"))]
+    show_source: bool,
+    #[clap(long, overrides_with("show_source"), hide = true)]
+    no_show_source: bool,
+    /// Respect file exclusions via `.gitignore` and other standard ignore
+    /// files.
+    #[arg(long, overrides_with("no_respect_gitignore"))]
+    respect_gitignore: bool,
+    #[clap(long, overrides_with("respect_gitignore"), hide = true)]
+    no_respect_gitignore: bool,
     /// See the files Ruff will be run against with the current settings.
     #[arg(long)]
     pub show_files: bool,
-    /// See Ruff's settings.
+    /// See the settings Ruff will use to check a given Python file.
     #[arg(long)]
     pub show_settings: bool,
     /// Enable automatic additions of noqa directives to failing lines.
@@ -121,9 +130,51 @@ pub struct Cli {
 }
 
 impl Cli {
-    // See: https://github.com/clap-rs/clap/issues/3146
-    pub fn fix(&self) -> Option<bool> {
-        resolve_bool_arg(self.fix, self.no_fix)
+    /// Partition the CLI into command-line arguments and configuration
+    /// overrides.
+    pub fn partition(self) -> (Arguments, Overrides) {
+        (
+            Arguments {
+                add_noqa: self.add_noqa,
+                autoformat: self.autoformat,
+                config: self.config,
+                exit_zero: self.exit_zero,
+                explain: self.explain,
+                files: self.files,
+                generate_shell_completion: self.generate_shell_completion,
+                no_cache: self.no_cache,
+                quiet: self.quiet,
+                show_files: self.show_files,
+                show_settings: self.show_settings,
+                silent: self.silent,
+                stdin_filename: self.stdin_filename,
+                verbose: self.verbose,
+                watch: self.watch,
+            },
+            Overrides {
+                dummy_variable_rgx: self.dummy_variable_rgx,
+                exclude: self.exclude,
+                extend_exclude: self.extend_exclude,
+                extend_ignore: self.extend_ignore,
+                extend_select: self.extend_select,
+                fixable: self.fixable,
+                ignore: self.ignore,
+                line_length: self.line_length,
+                max_complexity: self.max_complexity,
+                per_file_ignores: self.per_file_ignores,
+                respect_gitignore: resolve_bool_arg(
+                    self.respect_gitignore,
+                    self.no_respect_gitignore,
+                ),
+                select: self.select,
+                show_source: resolve_bool_arg(self.show_source, self.no_show_source),
+                target_version: self.target_version,
+                unfixable: self.unfixable,
+                // TODO(charlie): Included in `pyproject.toml`, but not inherited.
+                fix: resolve_bool_arg(self.fix, self.no_fix),
+                format: self.format,
+            },
+        )
     }
 }
 
@@ -136,8 +187,53 @@ fn resolve_bool_arg(yes: bool, no: bool) -> Option<bool> {
     }
 }
 
+/// CLI settings that are distinct from configuration (commands, lists of files,
+/// etc.).
+#[allow(clippy::struct_excessive_bools)]
+pub struct Arguments {
+    pub add_noqa: bool,
+    pub autoformat: bool,
+    pub config: Option<PathBuf>,
+    pub exit_zero: bool,
+    pub explain: Option<CheckCode>,
+    pub files: Vec<PathBuf>,
+    pub generate_shell_completion: Option<clap_complete_command::Shell>,
+    pub no_cache: bool,
+    pub quiet: bool,
+    pub show_files: bool,
+    pub show_settings: bool,
+    pub silent: bool,
+    pub stdin_filename: Option<String>,
+    pub verbose: bool,
+    pub watch: bool,
+}
+
+/// CLI settings that function as configuration overrides.
+#[derive(Clone)]
+#[allow(clippy::struct_excessive_bools)]
+pub struct Overrides {
+    pub dummy_variable_rgx: Option<Regex>,
+    pub exclude: Option<Vec<FilePattern>>,
+    pub extend_exclude: Option<Vec<FilePattern>>,
+    pub extend_ignore: Option<Vec<CheckCodePrefix>>,
+    pub extend_select: Option<Vec<CheckCodePrefix>>,
+    pub fixable: Option<Vec<CheckCodePrefix>>,
+    pub ignore: Option<Vec<CheckCodePrefix>>,
+    pub line_length: Option<usize>,
+    pub max_complexity: Option<usize>,
+    pub per_file_ignores: Option<Vec<PatternPrefixPair>>,
+    pub respect_gitignore: Option<bool>,
+    pub select: Option<Vec<CheckCodePrefix>>,
+    pub show_source: Option<bool>,
+    pub target_version: Option<PythonVersion>,
+    pub unfixable: Option<Vec<CheckCodePrefix>>,
+    // TODO(charlie): Captured in pyproject.toml as a default, but not part of `Settings`.
+    pub fix: Option<bool>,
+    pub format: Option<SerializationFormat>,
+}
+
 /// Map the CLI settings to a `LogLevel`.
-pub fn extract_log_level(cli: &Cli) -> LogLevel {
+pub fn extract_log_level(cli: &Arguments) -> LogLevel {
     if cli.silent {
         LogLevel::Silent
     } else if cli.quiet {
@@ -160,6 +256,9 @@ pub fn collect_per_file_ignores(pairs: Vec<PatternPrefixPair>) -> Vec<PerFileIgn
     }
     per_file_ignores
         .into_iter()
-        .map(|(pattern, prefixes)| PerFileIgnore::new(pattern, &prefixes))
+        .map(|(pattern, prefixes)| {
+            let absolute = fs::normalize_path(Path::new(&pattern));
+            PerFileIgnore::new(pattern, absolute, &prefixes)
+        })
         .collect()
 }

src/commands.rs

@@ -1,36 +1,238 @@
-use std::path::PathBuf;
+use std::io::{self, Read};
+use std::path::{Path, PathBuf};
+use std::time::Instant;
 
 use anyhow::{bail, Result};
+use ignore::Error;
+use itertools::Itertools;
+use log::{debug, error};
+#[cfg(not(target_family = "wasm"))]
+use rayon::prelude::*;
+use rustpython_ast::Location;
 use serde::Serialize;
-use walkdir::DirEntry;
 
-use crate::checks::CheckCode;
-use crate::fs::iter_python_files;
+use crate::autofix::fixer;
+use crate::checks::{CheckCode, CheckKind};
+use crate::cli::Overrides;
+use crate::iterators::par_iter;
+use crate::linter::{add_noqa_to_path, autoformat_path, lint_path, lint_stdin, Diagnostics};
+use crate::message::Message;
+use crate::resolver;
+use crate::resolver::{FileDiscovery, PyprojectDiscovery};
 use crate::settings::types::SerializationFormat;
-use crate::{Configuration, Settings};
+
+/// Run the linter over a collection of files.
+pub fn run(
+    files: &[PathBuf],
+    pyproject_strategy: &PyprojectDiscovery,
+    file_strategy: &FileDiscovery,
+    overrides: &Overrides,
+    cache: bool,
+    autofix: &fixer::Mode,
+) -> Result<Diagnostics> {
+    // Collect all the files to check.
+    let start = Instant::now();
+    let (paths, resolver) =
+        resolver::python_files_in_path(files, pyproject_strategy, file_strategy, overrides)?;
+    let duration = start.elapsed();
+    debug!("Identified files to lint in: {:?}", duration);
+
+    let start = Instant::now();
+    let mut diagnostics: Diagnostics = par_iter(&paths)
+        .map(|entry| {
+            match entry {
+                Ok(entry) => {
+                    let path = entry.path();
+                    let settings = resolver.resolve(path, pyproject_strategy);
+                    lint_path(path, settings, &cache.into(), autofix)
+                        .map_err(|e| (Some(path.to_owned()), e.to_string()))
+                }
+                Err(e) => Err((
+                    if let Error::WithPath { path, .. } = e {
+                        Some(path.clone())
+                    } else {
+                        None
+                    },
+                    e.io_error()
+                        .map_or_else(|| e.to_string(), io::Error::to_string),
+                )),
+            }
+            .unwrap_or_else(|(path, message)| {
+                if let Some(path) = &path {
+                    let settings = resolver.resolve(path, pyproject_strategy);
+                    if settings.enabled.contains(&CheckCode::E902) {
+                        Diagnostics::new(vec![Message {
+                            kind: CheckKind::IOError(message),
+                            location: Location::default(),
+                            end_location: Location::default(),
+                            fix: None,
+                            filename: path.to_string_lossy().to_string(),
+                            source: None,
+                        }])
+                    } else {
+                        error!("Failed to check {}: {message}", path.to_string_lossy());
+                        Diagnostics::default()
+                    }
+                } else {
+                    error!("{message}");
+                    Diagnostics::default()
+                }
+            })
+        })
+        .reduce(Diagnostics::default, |mut acc, item| {
+            acc += item;
+            acc
+        });
+
+    diagnostics.messages.sort_unstable();
+    let duration = start.elapsed();
+    debug!("Checked files in: {:?}", duration);
+
+    Ok(diagnostics)
+}
+
+/// Read a `String` from `stdin`.
+fn read_from_stdin() -> Result<String> {
+    let mut buffer = String::new();
+    io::stdin().lock().read_to_string(&mut buffer)?;
+    Ok(buffer)
+}
+
+/// Run the linter over a single file, read from `stdin`.
+pub fn run_stdin(
+    strategy: &PyprojectDiscovery,
+    filename: &Path,
+    autofix: &fixer::Mode,
+) -> Result<Diagnostics> {
+    let stdin = read_from_stdin()?;
+    let settings = match strategy {
+        PyprojectDiscovery::Fixed(settings) => settings,
+        PyprojectDiscovery::Hierarchical(settings) => settings,
+    };
+    let mut diagnostics = lint_stdin(filename, &stdin, settings, autofix)?;
+    diagnostics.messages.sort_unstable();
+    Ok(diagnostics)
+}
+
+/// Add `noqa` directives to a collection of files.
+pub fn add_noqa(
+    files: &[PathBuf],
+    pyproject_strategy: &PyprojectDiscovery,
+    file_strategy: &FileDiscovery,
+    overrides: &Overrides,
+) -> Result<usize> {
+    // Collect all the files to check.
+    let start = Instant::now();
+    let (paths, resolver) =
+        resolver::python_files_in_path(files, pyproject_strategy, file_strategy, overrides)?;
+    let duration = start.elapsed();
+    debug!("Identified files to lint in: {:?}", duration);
+
+    let start = Instant::now();
+    let modifications: usize = par_iter(&paths)
+        .flatten()
+        .filter_map(|entry| {
+            let path = entry.path();
+            let settings = resolver.resolve(path, pyproject_strategy);
+            match add_noqa_to_path(path, settings) {
+                Ok(count) => Some(count),
+                Err(e) => {
+                    error!("Failed to add noqa to {}: {e}", path.to_string_lossy());
+                    None
+                }
+            }
+        })
+        .sum();
+
+    let duration = start.elapsed();
+    debug!("Added noqa to files in: {:?}", duration);
+
+    Ok(modifications)
+}
+
+/// Automatically format a collection of files.
+pub fn autoformat(
+    files: &[PathBuf],
+    pyproject_strategy: &PyprojectDiscovery,
+    file_strategy: &FileDiscovery,
+    overrides: &Overrides,
+) -> Result<usize> {
+    // Collect all the files to format.
+    let start = Instant::now();
+    let (paths, resolver) =
+        resolver::python_files_in_path(files, pyproject_strategy, file_strategy, overrides)?;
+    let duration = start.elapsed();
+    debug!("Identified files to lint in: {:?}", duration);
+
+    let start = Instant::now();
+    let modifications = par_iter(&paths)
+        .flatten()
+        .filter_map(|entry| {
+            let path = entry.path();
+            let settings = resolver.resolve(path, pyproject_strategy);
+            match autoformat_path(path, settings) {
+                Ok(()) => Some(()),
+                Err(e) => {
+                    error!("Failed to autoformat {}: {e}", path.to_string_lossy());
+                    None
+                }
+            }
+        })
+        .count();
+
+    let duration = start.elapsed();
+    debug!("Auto-formatted files in: {:?}", duration);
+
+    Ok(modifications)
+}
 
 /// Print the user-facing configuration settings.
 pub fn show_settings(
-    configuration: &Configuration,
-    project_root: Option<&PathBuf>,
-    pyproject: Option<&PathBuf>,
-) {
-    println!("Resolved configuration: {configuration:#?}");
-    println!("Found project root at: {project_root:?}");
-    println!("Found pyproject.toml at: {pyproject:?}");
+    files: &[PathBuf],
+    pyproject_strategy: &PyprojectDiscovery,
+    file_strategy: &FileDiscovery,
+    overrides: &Overrides,
+) -> Result<()> {
+    // Collect all files in the hierarchy.
+    let (paths, resolver) =
+        resolver::python_files_in_path(files, pyproject_strategy, file_strategy, overrides)?;
+
+    // Print the list of files.
+    let Some(entry) = paths
+        .iter()
+        .flatten()
+        .sorted_by(|a, b| a.path().cmp(b.path())).next() else {
+        bail!("No files found under the given path");
+    };
+    let path = entry.path();
+    let settings = resolver.resolve(path, pyproject_strategy);
+    println!("Resolved settings for: {path:?}");
+    println!("{settings:#?}");
+
+    Ok(())
 }
 
 /// Show the list of files to be checked based on current settings.
-pub fn show_files(files: &[PathBuf], settings: &Settings) {
-    let mut entries: Vec<DirEntry> = files
+pub fn show_files(
+    files: &[PathBuf],
+    pyproject_strategy: &PyprojectDiscovery,
+    file_strategy: &FileDiscovery,
+    overrides: &Overrides,
+) -> Result<()> {
+    // Collect all files in the hierarchy.
+    let (paths, _resolver) =
+        resolver::python_files_in_path(files, pyproject_strategy, file_strategy, overrides)?;
+
+    // Print the list of files.
+    for entry in paths
         .iter()
-        .flat_map(|path| iter_python_files(path, &settings.exclude, &settings.extend_exclude))
         .flatten()
-        .collect();
-    entries.sort_by(|a, b| a.path().cmp(b.path()));
-    for entry in entries {
+        .sorted_by(|a, b| a.path().cmp(b.path()))
+    {
         println!("{}", entry.path().to_string_lossy());
     }
+
+    Ok(())
 }
 
 #[derive(Serialize)]
@@ -41,7 +243,7 @@ struct Explanation<'a> {
 }
 
 /// Explain a `CheckCode` to the user.
-pub fn explain(code: &CheckCode, format: SerializationFormat) -> Result<()> {
+pub fn explain(code: &CheckCode, format: &SerializationFormat) -> Result<()> {
     match format {
         SerializationFormat::Text | SerializationFormat::Grouped => {
             println!(

src/docstrings/definition.rs

@@ -1,6 +1,8 @@
+use std::borrow::Cow;
+
 use rustpython_ast::{Expr, Stmt};
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum DefinitionKind<'a> {
     Module,
     Package,
@@ -17,6 +19,15 @@ pub struct Definition<'a> {
     pub docstring: Option<&'a Expr>,
 }
 
+#[derive(Debug)]
+pub struct Docstring<'a> {
+    pub kind: DefinitionKind<'a>,
+    pub expr: &'a Expr,
+    pub contents: &'a Cow<'a, str>,
+    pub body: &'a str,
+    pub indentation: &'a Cow<'a, str>,
+}
+
 pub enum Documentable {
     Class,
     Function,

src/docstrings/sections.rs

@@ -3,7 +3,7 @@ use crate::docstrings::styles::SectionStyle;
 
 #[derive(Debug)]
 pub(crate) struct SectionContext<'a> {
-    pub(crate) section_name: String,
+    pub(crate) section_name: &'a str,
     pub(crate) previous_line: &'a str,
     pub(crate) line: &'a str,
     pub(crate) following_lines: &'a [&'a str],
@@ -22,7 +22,7 @@ fn is_docstring_section(context: &SectionContext) -> bool {
     let section_name_suffix = context
         .line
         .trim()
-        .strip_prefix(&context.section_name)
+        .strip_prefix(context.section_name)
         .unwrap()
         .trim();
     let this_looks_like_a_section_name =

src/flake8_annotations/snapshots/ruff__flake8_annotations__tests__allow_overload.snap

@@ -8,7 +8,7 @@ expression: checks
     row: 29
     column: 4
   end_location:
-    row: 35
-    column: 0
+    row: 30
+    column: 16
   fix: ~
 

src/flake8_annotations/snapshots/ruff__flake8_annotations__tests__defaults.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 4
     column: 0
   end_location:
-    row: 9
-    column: 0
+    row: 5
+    column: 8
   fix: ~
 - kind:
     MissingTypeFunctionArgument: a
@@ -35,8 +35,8 @@ expression: checks
     row: 9
     column: 0
   end_location:
-    row: 14
-    column: 0
+    row: 10
+    column: 8
   fix: ~
 - kind:
     MissingTypeFunctionArgument: b
@@ -62,8 +62,8 @@ expression: checks
     row: 19
     column: 0
   end_location:
-    row: 24
-    column: 0
+    row: 20
+    column: 8
   fix: ~
 - kind:
     MissingReturnTypePublicFunction: foo
@@ -71,8 +71,8 @@ expression: checks
     row: 24
     column: 0
   end_location:
-    row: 29
-    column: 0
+    row: 25
+    column: 8
   fix: ~
 - kind:
     DynamicallyTypedExpression: a

src/flake8_annotations/snapshots/ruff__flake8_annotations__tests__mypy_init_return.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 5
     column: 4
   end_location:
-    row: 10
-    column: 0
+    row: 6
+    column: 11
   fix: ~
 - kind:
     MissingReturnTypeMagicMethod: __init__
@@ -17,8 +17,8 @@ expression: checks
     row: 11
     column: 4
   end_location:
-    row: 16
-    column: 0
+    row: 12
+    column: 11
   fix: ~
 - kind:
     MissingReturnTypePrivateFunction: __init__
@@ -26,7 +26,7 @@ expression: checks
     row: 40
     column: 0
   end_location:
-    row: 42
-    column: 0
+    row: 41
+    column: 7
   fix: ~
 

src/flake8_annotations/snapshots/ruff__flake8_annotations__tests__suppress_none_returning.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 45
     column: 0
   end_location:
-    row: 50
-    column: 0
+    row: 46
+    column: 15
   fix: ~
 - kind:
     MissingReturnTypePublicFunction: foo
@@ -17,7 +17,7 @@ expression: checks
     row: 50
     column: 0
   end_location:
-    row: 56
-    column: 0
+    row: 55
+    column: 14
   fix: ~
 

src/flake8_bugbear/plugins/setattr_with_constant.rs

@@ -56,16 +56,23 @@ pub fn setattr_with_constant(checker: &mut Checker, expr: &Expr, func: &Expr, ar
     if KWLIST.contains(&name.as_str()) {
         return;
     }
-    let mut check = Check::new(CheckKind::SetAttrWithConstant, Range::from_located(expr));
-    if checker.patch(check.kind.code()) {
-        match assignment(obj, name, value) {
-            Ok(content) => check.amend(Fix::replacement(
-                content,
-                expr.location,
-                expr.end_location.unwrap(),
-            )),
-            Err(e) => error!("Failed to fix invalid comparison: {e}"),
-        };
+    // We can only replace a `setattr` call (which is an `Expr`) with an assignment
+    // (which is a `Stmt`) if the `Expr` is already being used as a `Stmt`
+    // (i.e., it's directly within an `StmtKind::Expr`).
+    if let StmtKind::Expr { value: child } = &checker.current_parent().0.node {
+        if expr == child.as_ref() {
+            let mut check = Check::new(CheckKind::SetAttrWithConstant, Range::from_located(expr));
+            if checker.patch(check.kind.code()) {
+                match assignment(obj, name, value) {
+                    Ok(content) => check.amend(Fix::replacement(
+                        content,
+                        expr.location,
+                        expr.end_location.unwrap(),
+                    )),
+                    Err(e) => error!("Failed to fix invalid comparison: {e}"),
+                };
+            }
+            checker.add_check(check);
+        }
     }
-    checker.add_check(check);
 }

src/flake8_bugbear/snapshots/ruff__flake8_bugbear__tests__B009_B009_B010.py.snap

@@ -77,4 +77,19 @@ expression: checks
     end_location:
       row: 22
       column: 31
+- kind: GetAttrWithConstant
+  location:
+    row: 23
+    column: 3
+  end_location:
+    row: 23
+    column: 20
+  fix:
+    content: x.bar
+    location:
+      row: 23
+      column: 3
+    end_location:
+      row: 23
+      column: 20
 

src/flake8_bugbear/snapshots/ruff__flake8_bugbear__tests__B010_B009_B010.py.snap

@@ -4,77 +4,77 @@ expression: checks
 ---
 - kind: SetAttrWithConstant
   location:
-    row: 33
+    row: 37
     column: 0
   end_location:
-    row: 33
+    row: 37
     column: 25
   fix:
     content: foo.bar = None
     location:
-      row: 33
+      row: 37
       column: 0
     end_location:
-      row: 33
+      row: 37
       column: 25
 - kind: SetAttrWithConstant
   location:
-    row: 34
+    row: 38
     column: 0
   end_location:
-    row: 34
+    row: 38
     column: 29
   fix:
     content: foo._123abc = None
     location:
-      row: 34
+      row: 38
       column: 0
     end_location:
-      row: 34
+      row: 38
       column: 29
 - kind: SetAttrWithConstant
   location:
-    row: 35
+    row: 39
     column: 0
   end_location:
-    row: 35
+    row: 39
     column: 28
   fix:
     content: foo.abc123 = None
     location:
-      row: 35
+      row: 39
       column: 0
     end_location:
-      row: 35
+      row: 39
       column: 28
 - kind: SetAttrWithConstant
   location:
-    row: 36
+    row: 40
     column: 0
   end_location:
-    row: 36
+    row: 40
     column: 29
   fix:
     content: foo.abc123 = None
     location:
-      row: 36
+      row: 40
       column: 0
     end_location:
-      row: 36
+      row: 40
       column: 29
 - kind: SetAttrWithConstant
   location:
-    row: 37
+    row: 41
     column: 0
   end_location:
-    row: 37
+    row: 41
     column: 30
   fix:
     content: foo.bar.baz = None
     location:
-      row: 37
+      row: 41
       column: 0
     end_location:
-      row: 37
+      row: 41
       column: 30
 

src/flake8_bugbear/snapshots/ruff__flake8_bugbear__tests__B017_B017.py.snap

@@ -7,7 +7,7 @@ expression: checks
     row: 22
     column: 8
   end_location:
-    row: 25
-    column: 4
+    row: 23
+    column: 42
   fix: ~
 

src/flake8_bugbear/snapshots/ruff__flake8_bugbear__tests__B024_B024.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 17
     column: 0
   end_location:
-    row: 22
-    column: 0
+    row: 19
+    column: 13
   fix: ~
 - kind:
     AbstractBaseClassWithoutAbstractMethod: MetaBase_1
@@ -17,8 +17,8 @@ expression: checks
     row: 58
     column: 0
   end_location:
-    row: 63
-    column: 0
+    row: 60
+    column: 13
   fix: ~
 - kind:
     AbstractBaseClassWithoutAbstractMethod: abc_Base_1
@@ -26,8 +26,8 @@ expression: checks
     row: 69
     column: 0
   end_location:
-    row: 74
-    column: 0
+    row: 71
+    column: 13
   fix: ~
 - kind:
     AbstractBaseClassWithoutAbstractMethod: abc_Base_2
@@ -35,8 +35,8 @@ expression: checks
     row: 74
     column: 0
   end_location:
-    row: 79
-    column: 0
+    row: 76
+    column: 13
   fix: ~
 - kind:
     AbstractBaseClassWithoutAbstractMethod: notabc_Base_1
@@ -44,8 +44,8 @@ expression: checks
     row: 79
     column: 0
   end_location:
-    row: 84
-    column: 0
+    row: 81
+    column: 13
   fix: ~
 - kind:
     AbstractBaseClassWithoutAbstractMethod: abc_set_class_variable_4
@@ -53,7 +53,7 @@ expression: checks
     row: 128
     column: 0
   end_location:
-    row: 130
-    column: 0
+    row: 129
+    column: 7
   fix: ~
 

src/flake8_bugbear/snapshots/ruff__flake8_bugbear__tests__B025_B025.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 15
     column: 0
   end_location:
-    row: 22
-    column: 0
+    row: 20
+    column: 9
   fix: ~
 - kind:
     DuplicateTryBlockException: pickle.PickleError
@@ -17,8 +17,8 @@ expression: checks
     row: 22
     column: 0
   end_location:
-    row: 31
-    column: 0
+    row: 29
+    column: 9
   fix: ~
 - kind:
     DuplicateTryBlockException: TypeError
@@ -26,8 +26,8 @@ expression: checks
     row: 31
     column: 0
   end_location:
-    row: 39
-    column: 0
+    row: 38
+    column: 9
   fix: ~
 - kind:
     DuplicateTryBlockException: ValueError
@@ -35,7 +35,7 @@ expression: checks
     row: 31
     column: 0
   end_location:
-    row: 39
-    column: 0
+    row: 38
+    column: 9
   fix: ~
 

src/flake8_bugbear/snapshots/ruff__flake8_bugbear__tests__B027_B027.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 12
     column: 4
   end_location:
-    row: 15
-    column: 4
+    row: 13
+    column: 11
   fix: ~
 - kind:
     EmptyMethodWithoutAbstractDecorator: AbstractClass
@@ -17,8 +17,8 @@ expression: checks
     row: 15
     column: 4
   end_location:
-    row: 18
-    column: 4
+    row: 16
+    column: 12
   fix: ~
 - kind:
     EmptyMethodWithoutAbstractDecorator: AbstractClass
@@ -26,8 +26,8 @@ expression: checks
     row: 18
     column: 4
   end_location:
-    row: 22
-    column: 4
+    row: 20
+    column: 11
   fix: ~
 - kind:
     EmptyMethodWithoutAbstractDecorator: AbstractClass
@@ -35,7 +35,7 @@ expression: checks
     row: 22
     column: 4
   end_location:
-    row: 29
-    column: 4
+    row: 27
+    column: 12
   fix: ~
 

src/flake8_builtins/checks.rs

@@ -1,10 +1,16 @@
+use rustpython_ast::Located;
+
 use crate::ast::types::Range;
 use crate::checks::{Check, CheckKind};
 use crate::flake8_builtins::types::ShadowingType;
 use crate::python::builtins::BUILTINS;
 
 /// Check builtin name shadowing.
-pub fn builtin_shadowing(name: &str, location: Range, node_type: ShadowingType) -> Option<Check> {
+pub fn builtin_shadowing<T>(
+    name: &str,
+    located: &Located<T>,
+    node_type: ShadowingType,
+) -> Option<Check> {
     if BUILTINS.contains(&name) {
         Some(Check::new(
             match node_type {
@@ -12,7 +18,7 @@ pub fn builtin_shadowing(name: &str, location: Range, node_type: ShadowingType)
                 ShadowingType::Argument => CheckKind::BuiltinArgumentShadowing(name.to_string()),
                 ShadowingType::Attribute => CheckKind::BuiltinAttributeShadowing(name.to_string()),
             },
-            location,
+            Range::from_located(located),
         ))
     } else {
         None

src/flake8_builtins/snapshots/ruff__flake8_builtins__tests__A001_A001.py.snap

@@ -89,8 +89,8 @@ expression: checks
     row: 10
     column: 0
   end_location:
-    row: 13
-    column: 0
+    row: 11
+    column: 8
   fix: ~
 - kind:
     BuiltinVariableShadowing: slice
@@ -98,8 +98,8 @@ expression: checks
     row: 13
     column: 0
   end_location:
-    row: 16
-    column: 0
+    row: 14
+    column: 8
   fix: ~
 - kind:
     BuiltinVariableShadowing: ValueError
@@ -107,8 +107,8 @@ expression: checks
     row: 18
     column: 0
   end_location:
-    row: 21
-    column: 0
+    row: 19
+    column: 7
   fix: ~
 - kind:
     BuiltinVariableShadowing: memoryview

src/flake8_builtins/snapshots/ruff__flake8_builtins__tests__A003_A003.py.snap

@@ -17,7 +17,7 @@ expression: checks
     row: 7
     column: 4
   end_location:
-    row: 9
-    column: 0
+    row: 8
+    column: 12
   fix: ~
 

src/flake8_errmsg/checks.rs

@@ -0,0 +1,46 @@
+use rustpython_ast::{Constant, Expr, ExprKind};
+
+use crate::ast::types::Range;
+use crate::checks::{Check, CheckKind};
+
+pub fn check_string_in_exception(exc: &Expr, max_string_length: usize) -> Vec<Check> {
+    let mut checks = vec![];
+
+    if let ExprKind::Call { args, .. } = &exc.node {
+        if let Some(first) = args.first() {
+            match &first.node {
+                // Check for string literals
+                ExprKind::Constant {
+                    value: Constant::Str(string),
+                    ..
+                } => {
+                    if string.len() > max_string_length {
+                        checks.push(Check::new(
+                            CheckKind::RawStringInException,
+                            Range::from_located(first),
+                        ));
+                    }
+                }
+                // Check for f-strings
+                ExprKind::JoinedStr { .. } => checks.push(Check::new(
+                    CheckKind::FStringInException,
+                    Range::from_located(first),
+                )),
+                // Check for .format() calls
+                ExprKind::Call { func, .. } => {
+                    if let ExprKind::Attribute { value, attr, .. } = &func.node {
+                        if attr == "format" && matches!(value.node, ExprKind::Constant { .. }) {
+                            checks.push(Check::new(
+                                CheckKind::DotFormatInException,
+                                Range::from_located(first),
+                            ));
+                        }
+                    }
+                }
+                _ => {}
+            }
+        }
+    }
+
+    checks
+}

src/flake8_errmsg/mod.rs

@@ -0,0 +1,50 @@
+pub mod checks;
+pub mod settings;
+
+#[cfg(test)]
+mod tests {
+    use std::path::Path;
+
+    use anyhow::Result;
+
+    use crate::checks::CheckCode;
+    use crate::linter::test_path;
+    use crate::{flake8_errmsg, settings};
+
+    #[test]
+    fn defaults() -> Result<()> {
+        let mut checks = test_path(
+            Path::new("./resources/test/fixtures/flake8_errmsg/EM.py"),
+            &settings::Settings::for_rules(vec![
+                CheckCode::EM101,
+                CheckCode::EM102,
+                CheckCode::EM103,
+            ]),
+            false,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!("defaults", checks);
+        Ok(())
+    }
+
+    #[test]
+    fn custom() -> Result<()> {
+        let mut checks = test_path(
+            Path::new("./resources/test/fixtures/flake8_errmsg/EM.py"),
+            &settings::Settings {
+                flake8_errmsg: flake8_errmsg::settings::Settings {
+                    max_string_length: 20,
+                },
+                ..settings::Settings::for_rules(vec![
+                    CheckCode::EM101,
+                    CheckCode::EM102,
+                    CheckCode::EM103,
+                ])
+            },
+            false,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!("custom", checks);
+        Ok(())
+    }
+}

src/flake8_errmsg/settings.rs

@@ -0,0 +1,32 @@
+//! Settings for the `flake8-errmsg` plugin.
+
+use ruff_macros::ConfigurationOptions;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions)]
+#[serde(deny_unknown_fields, rename_all = "kebab-case")]
+pub struct Options {
+    #[option(
+        doc = r#"
+            Maximum string length for string literals in exception messages.
+        "#,
+        default = "0",
+        value_type = "usize",
+        example = "max-string-length = 20"
+    )]
+    pub max_string_length: Option<usize>,
+}
+
+#[derive(Debug, Default, Hash)]
+pub struct Settings {
+    pub max_string_length: usize,
+}
+
+impl Settings {
+    #[allow(clippy::needless_pass_by_value)]
+    pub fn from_options(options: Options) -> Self {
+        Self {
+            max_string_length: options.max_string_length.unwrap_or_default(),
+        }
+    }
+}

src/flake8_errmsg/snapshots/ruff__flake8_errmsg__tests__custom.snap

@@ -0,0 +1,29 @@
+---
+source: src/flake8_errmsg/mod.rs
+expression: checks
+---
+- kind: RawStringInException
+  location:
+    row: 5
+    column: 23
+  end_location:
+    row: 5
+    column: 53
+  fix: ~
+- kind: FStringInException
+  location:
+    row: 10
+    column: 23
+  end_location:
+    row: 10
+    column: 56
+  fix: ~
+- kind: DotFormatInException
+  location:
+    row: 14
+    column: 23
+  end_location:
+    row: 14
+    column: 81
+  fix: ~
+

src/flake8_errmsg/snapshots/ruff__flake8_errmsg__tests__defaults.snap

@@ -0,0 +1,29 @@
+---
+source: src/flake8_errmsg/mod.rs
+expression: checks
+---
+- kind: RawStringInException
+  location:
+    row: 5
+    column: 23
+  end_location:
+    row: 5
+    column: 53
+  fix: ~
+- kind: FStringInException
+  location:
+    row: 10
+    column: 23
+  end_location:
+    row: 10
+    column: 56
+  fix: ~
+- kind: DotFormatInException
+  location:
+    row: 14
+    column: 23
+  end_location:
+    row: 14
+    column: 81
+  fix: ~
+

src/flake8_print/plugins/print_call.rs

@@ -23,7 +23,12 @@ pub fn print_call(checker: &mut Checker, expr: &Expr, func: &Expr) {
         let defined_in = checker.current_grandparent();
         if matches!(defined_by.0.node, StmtKind::Expr { .. }) {
             let deleted: Vec<&Stmt> = checker.deletions.iter().map(|node| node.0).collect();
-            match helpers::remove_stmt(defined_by.0, defined_in.map(|node| node.0), &deleted) {
+            match helpers::delete_stmt(
+                defined_by.0,
+                defined_in.map(|node| node.0),
+                &deleted,
+                checker.locator,
+            ) {
                 Ok(fix) => {
                     if fix.content.is_empty() || fix.content == "pass" {
                         checker.deletions.insert(defined_by.clone());

src/flake8_return/snapshots/ruff__flake8_return__tests__RET503_RET503.py.snap

@@ -7,8 +7,8 @@ expression: checks
     row: 7
     column: 4
   end_location:
-    row: 12
-    column: 0
+    row: 8
+    column: 16
   fix: ~
 - kind: ImplicitReturn
   location:
@@ -45,8 +45,8 @@ expression: checks
     row: 29
     column: 8
   end_location:
-    row: 34
-    column: 0
+    row: 30
+    column: 20
   fix: ~
 - kind: ImplicitReturn
   location:

src/flake8_return/snapshots/ruff__flake8_return__tests__RET505_RET505.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 5
     column: 4
   end_location:
-    row: 16
-    column: 0
+    row: 13
+    column: 16
   fix: ~
 - kind:
     SuperfluousElseReturn: Elif
@@ -17,8 +17,8 @@ expression: checks
     row: 17
     column: 4
   end_location:
-    row: 27
-    column: 4
+    row: 26
+    column: 13
   fix: ~
 - kind:
     SuperfluousElseReturn: Elif
@@ -26,8 +26,8 @@ expression: checks
     row: 38
     column: 4
   end_location:
-    row: 49
-    column: 0
+    row: 46
+    column: 16
   fix: ~
 - kind:
     SuperfluousElseReturn: Else
@@ -35,8 +35,8 @@ expression: checks
     row: 50
     column: 4
   end_location:
-    row: 58
-    column: 0
+    row: 55
+    column: 16
   fix: ~
 - kind:
     SuperfluousElseReturn: Else
@@ -44,8 +44,8 @@ expression: checks
     row: 61
     column: 8
   end_location:
-    row: 67
-    column: 4
+    row: 66
+    column: 20
   fix: ~
 - kind:
     SuperfluousElseReturn: Else
@@ -53,8 +53,8 @@ expression: checks
     row: 73
     column: 4
   end_location:
-    row: 81
-    column: 4
+    row: 80
+    column: 13
   fix: ~
 - kind:
     SuperfluousElseReturn: Else
@@ -62,8 +62,8 @@ expression: checks
     row: 86
     column: 8
   end_location:
-    row: 91
-    column: 4
+    row: 90
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseReturn: Else
@@ -71,7 +71,7 @@ expression: checks
     row: 97
     column: 4
   end_location:
-    row: 109
-    column: 0
+    row: 103
+    column: 23
   fix: ~
 

src/flake8_return/snapshots/ruff__flake8_return__tests__RET506_RET506.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 5
     column: 4
   end_location:
-    row: 16
-    column: 0
+    row: 13
+    column: 26
   fix: ~
 - kind:
     SuperfluousElseRaise: Elif
@@ -17,8 +17,8 @@ expression: checks
     row: 17
     column: 4
   end_location:
-    row: 27
-    column: 4
+    row: 26
+    column: 13
   fix: ~
 - kind:
     SuperfluousElseRaise: Else
@@ -26,8 +26,8 @@ expression: checks
     row: 31
     column: 4
   end_location:
-    row: 39
-    column: 0
+    row: 36
+    column: 26
   fix: ~
 - kind:
     SuperfluousElseRaise: Else
@@ -35,8 +35,8 @@ expression: checks
     row: 42
     column: 8
   end_location:
-    row: 48
-    column: 4
+    row: 47
+    column: 30
   fix: ~
 - kind:
     SuperfluousElseRaise: Else
@@ -44,8 +44,8 @@ expression: checks
     row: 54
     column: 4
   end_location:
-    row: 62
-    column: 4
+    row: 61
+    column: 13
   fix: ~
 - kind:
     SuperfluousElseRaise: Else
@@ -53,8 +53,8 @@ expression: checks
     row: 67
     column: 8
   end_location:
-    row: 72
-    column: 4
+    row: 71
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseRaise: Else
@@ -62,7 +62,7 @@ expression: checks
     row: 78
     column: 4
   end_location:
-    row: 90
-    column: 0
+    row: 84
+    column: 33
   fix: ~
 

src/flake8_return/snapshots/ruff__flake8_return__tests__RET507_RET507.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 6
     column: 8
   end_location:
-    row: 14
-    column: 0
+    row: 11
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseContinue: Elif
@@ -17,8 +17,8 @@ expression: checks
     row: 16
     column: 8
   end_location:
-    row: 26
-    column: 8
+    row: 25
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseContinue: Else
@@ -26,8 +26,8 @@ expression: checks
     row: 34
     column: 8
   end_location:
-    row: 40
-    column: 0
+    row: 37
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseContinue: Else
@@ -35,8 +35,8 @@ expression: checks
     row: 44
     column: 12
   end_location:
-    row: 50
-    column: 8
+    row: 49
+    column: 24
   fix: ~
 - kind:
     SuperfluousElseContinue: Else
@@ -44,8 +44,8 @@ expression: checks
     row: 57
     column: 8
   end_location:
-    row: 65
-    column: 8
+    row: 64
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseContinue: Else
@@ -53,8 +53,8 @@ expression: checks
     row: 71
     column: 12
   end_location:
-    row: 76
-    column: 8
+    row: 75
+    column: 21
   fix: ~
 - kind:
     SuperfluousElseContinue: Else
@@ -62,7 +62,7 @@ expression: checks
     row: 83
     column: 8
   end_location:
-    row: 92
-    column: 0
+    row: 89
+    column: 24
   fix: ~
 

src/flake8_return/snapshots/ruff__flake8_return__tests__RET508_RET508.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 6
     column: 8
   end_location:
-    row: 14
-    column: 0
+    row: 11
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseBreak: Elif
@@ -17,8 +17,8 @@ expression: checks
     row: 16
     column: 8
   end_location:
-    row: 26
-    column: 8
+    row: 25
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseBreak: Else
@@ -26,8 +26,8 @@ expression: checks
     row: 31
     column: 8
   end_location:
-    row: 37
-    column: 0
+    row: 34
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseBreak: Else
@@ -35,8 +35,8 @@ expression: checks
     row: 41
     column: 12
   end_location:
-    row: 47
-    column: 8
+    row: 46
+    column: 21
   fix: ~
 - kind:
     SuperfluousElseBreak: Else
@@ -44,8 +44,8 @@ expression: checks
     row: 54
     column: 8
   end_location:
-    row: 62
-    column: 8
+    row: 61
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseBreak: Else
@@ -53,8 +53,8 @@ expression: checks
     row: 68
     column: 12
   end_location:
-    row: 73
-    column: 8
+    row: 72
+    column: 21
   fix: ~
 - kind:
     SuperfluousElseBreak: Else
@@ -62,7 +62,7 @@ expression: checks
     row: 80
     column: 8
   end_location:
-    row: 92
-    column: 0
+    row: 86
+    column: 21
   fix: ~
 

src/flake8_simplify/mod.rs

@@ -0,0 +1,29 @@
+pub mod plugins;
+
+#[cfg(test)]
+mod tests {
+    use std::convert::AsRef;
+    use std::path::Path;
+
+    use anyhow::Result;
+    use test_case::test_case;
+
+    use crate::checks::CheckCode;
+    use crate::linter::test_path;
+    use crate::settings;
+
+    #[test_case(CheckCode::SIM118, Path::new("SIM118.py"); "SIM118")]
+    fn checks(check_code: CheckCode, path: &Path) -> Result<()> {
+        let snapshot = format!("{}_{}", check_code.as_ref(), path.to_string_lossy());
+        let mut checks = test_path(
+            Path::new("./resources/test/fixtures/flake8_simplify")
+                .join(path)
+                .as_path(),
+            &settings::Settings::for_rule(check_code),
+            true,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(snapshot, checks);
+        Ok(())
+    }
+}

src/flake8_simplify/plugins/key_in_dict.rs

@@ -0,0 +1,74 @@
+use rustpython_ast::{Cmpop, Expr, ExprKind};
+
+use crate::ast::types::Range;
+use crate::autofix::Fix;
+use crate::check_ast::Checker;
+use crate::checks::{Check, CheckCode, CheckKind};
+
+/// SIM118
+fn key_in_dict(checker: &mut Checker, left: &Expr, right: &Expr, range: Range) {
+    let ExprKind::Call {
+        func,
+        args,
+        keywords,
+    } = &right.node else {
+        return;
+    };
+    if !(args.is_empty() && keywords.is_empty()) {
+        return;
+    }
+
+    let ExprKind::Attribute { attr, value, .. } = &func.node else {
+        return;
+    };
+    if attr != "keys" {
+        return;
+    }
+
+    let mut check = Check::new(
+        CheckKind::KeyInDict(left.to_string(), value.to_string()),
+        range,
+    );
+    if checker.patch(&CheckCode::SIM118) {
+        let content = right.to_string().replace(".keys()", "");
+        check.amend(Fix::replacement(
+            content,
+            right.location,
+            right.end_location.unwrap(),
+        ));
+    }
+    checker.add_check(check);
+}
+
+/// SIM118 in a for loop
+pub fn key_in_dict_for(checker: &mut Checker, target: &Expr, iter: &Expr) {
+    key_in_dict(
+        checker,
+        target,
+        iter,
+        Range {
+            location: target.location,
+            end_location: iter.end_location.unwrap(),
+        },
+    );
+}
+
+/// SIM118 in a comparison
+pub fn key_in_dict_compare(
+    checker: &mut Checker,
+    expr: &Expr,
+    left: &Expr,
+    ops: &[Cmpop],
+    comparators: &[Expr],
+) {
+    if !matches!(ops[..], [Cmpop::In]) {
+        return;
+    }
+
+    if comparators.len() != 1 {
+        return;
+    }
+    let right = comparators.first().unwrap();
+
+    key_in_dict(checker, left, right, Range::from_located(expr));
+}

src/flake8_simplify/plugins/mod.rs

@@ -0,0 +1,3 @@
+pub use key_in_dict::{key_in_dict_compare, key_in_dict_for};
+
+mod key_in_dict;

src/flake8_simplify/snapshots/ruff__flake8_simplify__tests__SIM118_SIM118.py.snap

@@ -0,0 +1,77 @@
+---
+source: src/flake8_simplify/mod.rs
+expression: checks
+---
+- kind:
+    KeyInDict:
+      - key
+      - dict
+  location:
+    row: 1
+    column: 0
+  end_location:
+    row: 1
+    column: 18
+  fix:
+    content: dict
+    location:
+      row: 1
+      column: 7
+    end_location:
+      row: 1
+      column: 18
+- kind:
+    KeyInDict:
+      - "foo['bar']"
+      - dict
+  location:
+    row: 3
+    column: 0
+  end_location:
+    row: 3
+    column: 25
+  fix:
+    content: dict
+    location:
+      row: 3
+      column: 14
+    end_location:
+      row: 3
+      column: 25
+- kind:
+    KeyInDict:
+      - foo()
+      - dict
+  location:
+    row: 5
+    column: 0
+  end_location:
+    row: 5
+    column: 20
+  fix:
+    content: dict
+    location:
+      row: 5
+      column: 9
+    end_location:
+      row: 5
+      column: 20
+- kind:
+    KeyInDict:
+      - key
+      - dict
+  location:
+    row: 7
+    column: 4
+  end_location:
+    row: 7
+    column: 22
+  fix:
+    content: dict
+    location:
+      row: 7
+      column: 11
+    end_location:
+      row: 7
+      column: 22
+

src/fs.rs

@@ -5,15 +5,13 @@ use std::path::{Path, PathBuf};
 
 use anyhow::{anyhow, Result};
 use globset::GlobMatcher;
-use log::debug;
 use path_absolutize::{path_dedot, Absolutize};
 use rustc_hash::FxHashSet;
-use walkdir::{DirEntry, WalkDir};
 
 use crate::checks::CheckCode;
 
 /// Extract the absolute path and basename (as strings) from a Path.
-fn extract_path_names(path: &Path) -> Result<(&str, &str)> {
+pub fn extract_path_names(path: &Path) -> Result<(&str, &str)> {
     let file_path = path
         .to_str()
         .ok_or_else(|| anyhow!("Unable to parse filename: {:?}", path))?;
@@ -25,62 +23,7 @@ fn extract_path_names(path: &Path) -> Result<(&str, &str)> {
     Ok((file_path, file_basename))
 }
 
-fn is_excluded(file_path: &str, file_basename: &str, exclude: &globset::GlobSet) -> bool {
-    exclude.is_match(file_path) || exclude.is_match(file_basename)
-}
-
-fn is_included(path: &Path) -> bool {
-    let file_name = path.to_string_lossy();
-    file_name.ends_with(".py") || file_name.ends_with(".pyi")
-}
-
-pub fn iter_python_files<'a>(
-    path: &'a Path,
-    exclude: &'a globset::GlobSet,
-    extend_exclude: &'a globset::GlobSet,
-) -> impl Iterator<Item = Result<DirEntry, walkdir::Error>> + 'a {
-    // Run some checks over the provided patterns, to enable optimizations below.
-    let has_exclude = !exclude.is_empty();
-    let has_extend_exclude = !extend_exclude.is_empty();
-
-    WalkDir::new(normalize_path(path))
-        .into_iter()
-        .filter_entry(move |entry| {
-            if !has_exclude && !has_extend_exclude {
-                return true;
-            }
-
-            let path = entry.path();
-            match extract_path_names(path) {
-                Ok((file_path, file_basename)) => {
-                    if has_exclude && is_excluded(file_path, file_basename, exclude) {
-                        debug!("Ignored path via `exclude`: {:?}", path);
-                        false
-                    } else if has_extend_exclude
-                        && is_excluded(file_path, file_basename, extend_exclude)
-                    {
-                        debug!("Ignored path via `extend-exclude`: {:?}", path);
-                        false
-                    } else {
-                        true
-                    }
-                }
-                Err(e) => {
-                    debug!("Ignored path due to error in parsing: {:?}: {}", path, e);
-                    true
-                }
-            }
-        })
-        .filter(|entry| {
-            entry.as_ref().map_or(true, |entry| {
-                (entry.depth() == 0 || is_included(entry.path()))
-                    && !entry.file_type().is_dir()
-                    && !(entry.file_type().is_symlink() && entry.path().is_dir())
-            })
-        })
-}
-
-/// Create tree set with codes matching the pattern/code pairs.
+/// Create a set with codes matching the pattern/code pairs.
 pub(crate) fn ignores_from_path<'a>(
     path: &Path,
     pattern_code_pairs: &'a [(GlobMatcher, GlobMatcher, FxHashSet<CheckCode>)],
@@ -128,114 +71,3 @@ pub(crate) fn read_file(path: &Path) -> Result<String> {
     buf_reader.read_to_string(&mut contents)?;
     Ok(contents)
 }
-
-#[cfg(test)]
-mod tests {
-    use std::path::{Path, PathBuf};
-
-    use anyhow::Result;
-    use globset::GlobSet;
-    use path_absolutize::Absolutize;
-
-    use crate::fs::{extract_path_names, is_excluded, is_included};
-    use crate::settings::types::FilePattern;
-
-    #[test]
-    fn inclusions() {
-        let path = Path::new("foo/bar/baz.py").absolutize().unwrap();
-        assert!(is_included(&path));
-
-        let path = Path::new("foo/bar/baz.pyi").absolutize().unwrap();
-        assert!(is_included(&path));
-
-        let path = Path::new("foo/bar/baz.js").absolutize().unwrap();
-        assert!(!is_included(&path));
-
-        let path = Path::new("foo/bar/baz").absolutize().unwrap();
-        assert!(!is_included(&path));
-    }
-
-    fn make_exclusion(file_pattern: FilePattern, project_root: Option<&PathBuf>) -> GlobSet {
-        let mut builder = globset::GlobSetBuilder::new();
-        file_pattern.add_to(&mut builder, project_root).unwrap();
-        builder.build().unwrap()
-    }
-
-    #[test]
-    fn exclusions() -> Result<()> {
-        let project_root = Path::new("/tmp/");
-
-        let path = Path::new("foo").absolutize_from(project_root).unwrap();
-        let exclude = FilePattern::User("foo".to_string());
-        let (file_path, file_basename) = extract_path_names(&path)?;
-        assert!(is_excluded(
-            file_path,
-            file_basename,
-            &make_exclusion(exclude, Some(&project_root.to_path_buf()))
-        ));
-
-        let path = Path::new("foo/bar").absolutize_from(project_root).unwrap();
-        let exclude = FilePattern::User("bar".to_string());
-        let (file_path, file_basename) = extract_path_names(&path)?;
-        assert!(is_excluded(
-            file_path,
-            file_basename,
-            &make_exclusion(exclude, Some(&project_root.to_path_buf()))
-        ));
-
-        let path = Path::new("foo/bar/baz.py")
-            .absolutize_from(project_root)
-            .unwrap();
-        let exclude = FilePattern::User("baz.py".to_string());
-        let (file_path, file_basename) = extract_path_names(&path)?;
-        assert!(is_excluded(
-            file_path,
-            file_basename,
-            &make_exclusion(exclude, Some(&project_root.to_path_buf()))
-        ));
-
-        let path = Path::new("foo/bar").absolutize_from(project_root).unwrap();
-        let exclude = FilePattern::User("foo/bar".to_string());
-        let (file_path, file_basename) = extract_path_names(&path)?;
-        assert!(is_excluded(
-            file_path,
-            file_basename,
-            &make_exclusion(exclude, Some(&project_root.to_path_buf()))
-        ));
-
-        let path = Path::new("foo/bar/baz.py")
-            .absolutize_from(project_root)
-            .unwrap();
-        let exclude = FilePattern::User("foo/bar/baz.py".to_string());
-        let (file_path, file_basename) = extract_path_names(&path)?;
-        assert!(is_excluded(
-            file_path,
-            file_basename,
-            &make_exclusion(exclude, Some(&project_root.to_path_buf()))
-        ));
-
-        let path = Path::new("foo/bar/baz.py")
-            .absolutize_from(project_root)
-            .unwrap();
-        let exclude = FilePattern::User("foo/bar/*.py".to_string());
-        let (file_path, file_basename) = extract_path_names(&path)?;
-        assert!(is_excluded(
-            file_path,
-            file_basename,
-            &make_exclusion(exclude, Some(&project_root.to_path_buf()))
-        ));
-
-        let path = Path::new("foo/bar/baz.py")
-            .absolutize_from(project_root)
-            .unwrap();
-        let exclude = FilePattern::User("baz".to_string());
-        let (file_path, file_basename) = extract_path_names(&path)?;
-        assert!(!is_excluded(
-            file_path,
-            file_basename,
-            &make_exclusion(exclude, Some(&project_root.to_path_buf()))
-        ));
-
-        Ok(())
-    }
-}

src/isort/helpers.rs

@@ -0,0 +1,55 @@
+use rustpython_ast::Stmt;
+
+use crate::source_code_locator::SourceCodeLocator;
+
+/// Return `true` if a `Stmt` is preceded by a "comment break"
+pub fn has_comment_break(stmt: &Stmt, locator: &SourceCodeLocator) -> bool {
+    // Starting from the `Stmt` (`def f(): pass`), we want to detect patterns like
+    // this:
+    //
+    //   import os
+    //
+    //   # Detached comment.
+    //
+    //   def f(): pass
+
+    // This should also be detected:
+    //
+    //   import os
+    //
+    //   # Detached comment.
+    //
+    //   # Direct comment.
+    //   def f(): pass
+
+    // But this should not:
+    //
+    //   import os
+    //
+    //   # Direct comment.
+    //   def f(): pass
+    let mut seen_blank = false;
+    for line in locator
+        .slice_source_code_until(&stmt.location)
+        .lines()
+        .rev()
+    {
+        let line = line.trim();
+        if seen_blank {
+            if line.starts_with('#') {
+                return true;
+            } else if !line.is_empty() {
+                break;
+            }
+        } else {
+            if line.is_empty() {
+                seen_blank = true;
+            } else if line.starts_with('#') || line.starts_with('@') {
+                continue;
+            } else {
+                break;
+            }
+        }
+    }
+    false
+}

src/isort/mod.rs

@@ -18,6 +18,7 @@ use crate::isort::types::{
 mod categorize;
 mod comments;
 pub mod format;
+mod helpers;
 pub mod plugins;
 pub mod settings;
 mod sorting;

src/isort/plugins.rs

@@ -1,7 +1,9 @@
 use rustpython_ast::{Location, Stmt};
 use textwrap::{dedent, indent};
 
-use crate::ast::helpers::{count_trailing_lines, match_leading_content, match_trailing_content};
+use crate::ast::helpers::{
+    count_trailing_lines, followed_by_multi_statement_line, preceded_by_multi_statement_line,
+};
 use crate::ast::types::Range;
 use crate::ast::whitespace::leading_space;
 use crate::autofix::Fix;
@@ -19,14 +21,12 @@ fn extract_range(body: &[&Stmt]) -> Range {
     }
 }
 
-fn extract_indentation(body: &[&Stmt], locator: &SourceCodeLocator) -> String {
+fn extract_indentation_range(body: &[&Stmt]) -> Range {
     let location = body.first().unwrap().location;
-    let range = Range {
+    Range {
         location: Location::new(location.row(), 0),
         end_location: location,
-    };
-    let existing = locator.slice_source_code_range(&range);
-    leading_space(&existing)
+    }
 }
 
 /// I001
@@ -36,8 +36,18 @@ pub fn check_imports(
     settings: &Settings,
     autofix: bool,
 ) -> Option<Check> {
+    let indentation = locator.slice_source_code_range(&extract_indentation_range(&block.imports));
+    let indentation = leading_space(&indentation);
+
     let range = extract_range(&block.imports);
-    let indentation = extract_indentation(&block.imports, locator);
+
+    // Special-cases: there's leading or trailing content in the import block. These
+    // are too hard to get right, and relatively rare, so flag but don't fix.
+    if preceded_by_multi_statement_line(block.imports.first().unwrap(), locator)
+        || followed_by_multi_statement_line(block.imports.last().unwrap(), locator)
+    {
+        return Some(Check::new(CheckKind::UnsortedImports, range));
+    }
 
     // Extract comments. Take care to grab any inline comments from the last line.
     let comments = comments::collect_comments(
@@ -48,9 +58,6 @@ pub fn check_imports(
         locator,
     );
 
-    // Special-cases: there's leading or trailing content in the import block.
-    let has_leading_content = match_leading_content(block.imports.first().unwrap(), locator);
-    let has_trailing_content = match_trailing_content(block.imports.last().unwrap(), locator);
     let num_trailing_lines = if block.trailer.is_none() {
         0
     } else {
@@ -70,46 +77,23 @@ pub fn check_imports(
         settings.isort.force_wrap_aliases,
     );
 
-    if has_leading_content || has_trailing_content {
+    // Expand the span the entire range, including leading and trailing space.
+    let range = Range {
+        location: Location::new(range.location.row(), 0),
+        end_location: Location::new(range.end_location.row() + 1 + num_trailing_lines, 0),
+    };
+    let actual = dedent(&locator.slice_source_code_range(&range));
+    if actual == expected {
+        None
+    } else {
         let mut check = Check::new(CheckKind::UnsortedImports, range);
         if autofix && settings.fixable.contains(check.kind.code()) {
-            let mut content = String::new();
-            if has_leading_content {
-                content.push('\n');
-            }
-            content.push_str(&indent(&expected, &indentation));
             check.amend(Fix::replacement(
-                content,
-                // Preserve leading prefix (but put the imports on a new line).
-                if has_leading_content {
-                    range.location
-                } else {
-                    Location::new(range.location.row(), 0)
-                },
-                // TODO(charlie): Preserve trailing suffixes. Right now, we strip them.
-                Location::new(range.end_location.row() + 1 + num_trailing_lines, 0),
+                indent(&expected, indentation),
+                range.location,
+                range.end_location,
             ));
         }
         Some(check)
-    } else {
-        // Expand the span the entire range, including leading and trailing space.
-        let range = Range {
-            location: Location::new(range.location.row(), 0),
-            end_location: Location::new(range.end_location.row() + 1 + num_trailing_lines, 0),
-        };
-        let actual = dedent(&locator.slice_source_code_range(&range));
-        if actual == expected {
-            None
-        } else {
-            let mut check = Check::new(CheckKind::UnsortedImports, range);
-            if autofix && settings.fixable.contains(check.kind.code()) {
-                check.amend(Fix::replacement(
-                    indent(&expected, &indentation),
-                    range.location,
-                    range.end_location,
-                ));
-            }
-            Some(check)
-        }
     }
 }

src/isort/snapshots/ruff__isort__tests__insert_empty_lines.py.snap

@@ -49,32 +49,17 @@ expression: checks
       column: 0
 - kind: UnsortedImports
   location:
-    row: 33
+    row: 52
     column: 0
   end_location:
-    row: 35
+    row: 54
     column: 0
   fix:
-    content: "    import collections\n    import typing\n\n"
+    content: "import os\n\n\n"
     location:
-      row: 33
+      row: 52
       column: 0
     end_location:
-      row: 35
-      column: 0
-- kind: UnsortedImports
-  location:
-    row: 39
-    column: 0
-  end_location:
-    row: 41
-    column: 0
-  fix:
-    content: "    import collections\n    import typing\n\n"
-    location:
-      row: 39
-      column: 0
-    end_location:
-      row: 41
+      row: 54
       column: 0