Bump version to 0.0.207

Previously visibility::module_visibility() returned Private
for any module name starting with an underscore, resulting in
__init__.py being categorized as private, which in turn resulted
in D104 (Missing docstring in public package) never being reported
for __init__.py files.

.github/workflows/ci.yaml

@@ -40,8 +40,7 @@ jobs:
       - run: git diff --quiet README.md || echo "::error file=README.md::This file is outdated. Run 'cargo +nightly dev generate-all'."
       - run: git diff --quiet src/checks_gen.rs || echo "::error file=src/checks_gen.rs::This file is outdated. Run 'cargo +nightly dev generate-all'."
       - run: git diff --quiet ruff.schema.json || echo "::error file=ruff.schema.json::This file is outdated. Run 'cargo +nightly dev generate-all'."
-      - run: git diff --quiet playground/src/ruff_options.ts || echo "::error file=playground/src/ruff_options.ts::This file is outdated. Run 'cargo +nightly dev generate-all'."
-      - run: git diff --exit-code -- README.md src/checks_gen.rs ruff.schema.json playground/src/ruff_options.ts
+      - run: git diff --exit-code -- README.md src/checks_gen.rs ruff.schema.json
 
   cargo-fmt:
     name: "cargo fmt"
@@ -117,8 +116,12 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
             ${{ runner.os }}-
+      - run: cargo install cargo-insta
       - run: pip install black[d]==22.12.0
-      - run: cargo test --all
+      - name: Run tests
+        run: |
+          cargo insta test --all --delete-unreferenced-snapshots
+          git diff --exit-code
       - run: cargo test --package ruff --test black_compatibility_test -- --ignored
 
 # TODO(charlie): Re-enable the `wasm-pack` tests.

.gitignore

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

.pre-commit-config.yaml

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

CONTRIBUTING.md

@@ -9,6 +9,15 @@ free to submit a PR. For larger changes (e.g., new lint rules, new functionality
 options), consider submitting an [Issue](https://github.com/charliermarsh/ruff/issues) outlining
 your proposed change.
 
+If you're looking for a place to start, we recommend implementing a new lint rule (see:
+[_Adding a new lint rule_](#example-adding-a-new-lint-rule), which will allow you to learn from and
+pattern-match against the examples in the existing codebase. Many lint rules are inspired by
+existing Python plugins, which can be used as a reference implementation.
+
+As a concrete example: consider taking on one of the rules in [`flake8-simplify`](https://github.com/charliermarsh/ruff/issues/998),
+and looking to the originating [Python source](https://github.com/MartinThoma/flake8-simplify) for
+guidance.
+
 ### Prerequisites
 
 Ruff is written in Rust. You'll need to install the
@@ -65,21 +74,15 @@ understand how other, similar rules are implemented.
 
 To add a test fixture, create a file under `resources/test/fixtures`, named to match the `CheckCode`
 you defined earlier (e.g., `E402.py`). This file should contain a variety of violations and
-non-violations designed to evaluate and demonstrate the behavior of your lint rule. Run Ruff locally
-with (e.g.) `cargo run resources/test/fixtures/E402.py --no-cache --select E402`. Once you're satisfied with the
-output, codify the behavior as a snapshot test by adding a new `testcase` macro to the `mod tests`
-section of `src/linter.rs`, like so:
+non-violations designed to evaluate and demonstrate the behavior of your lint rule.
 
-```rust
-use test_case::test_case;
+Run `cargo +nightly dev generate-all` to generate the code for your new fixture. Then run Ruff
+locally with (e.g.) `cargo run resources/test/fixtures/E402.py --no-cache --select E402`.
 
-#[test_case(CheckCode::A001, Path::new("A001.py"); "A001")]
-...
-```
-
-Then, run `cargo test`. Your test will fail, but you'll be prompted to follow-up with
-`cargo insta review`. Accept the generated snapshot, then commit the snapshot file alongside the
-rest of your changes.
+Once you're satisfied with the output, codify the behavior as a snapshot test by adding a new
+`test_case` macro in the relevant `src/[test-suite-name]/mod.rs` file. Then, run `cargo test`. Your
+test will fail, but you'll be prompted to follow-up with `cargo insta review`. Accept the generated
+snapshot, then commit the snapshot file alongside the rest of your changes.
 
 Finally, regenerate the documentation and generated code with `cargo +nightly dev generate-all`.
 

Cargo.lock

@@ -750,7 +750,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.202-dev.0"
+version = "0.0.207-dev.0"
 dependencies = [
  "anyhow",
  "clap 4.0.32",
@@ -1878,7 +1878,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.202"
+version = "0.0.207"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
@@ -1946,7 +1946,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_dev"
-version = "0.0.202"
+version = "0.0.207"
 dependencies = [
  "anyhow",
  "clap 4.0.32",
@@ -1967,7 +1967,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_macros"
-version = "0.0.202"
+version = "0.0.207"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2010,7 +2010,7 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.1.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=68d26955b3e24198a150315e7959719b03709dee#68d26955b3e24198a150315e7959719b03709dee"
+source = "git+https://github.com/RustPython/RustPython.git?rev=71becd4059fdce4bce7010f1208ed3b1c883abba#71becd4059fdce4bce7010f1208ed3b1c883abba"
 dependencies = [
  "num-bigint",
  "rustpython-common",
@@ -2020,7 +2020,7 @@ dependencies = [
 [[package]]
 name = "rustpython-common"
 version = "0.0.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=68d26955b3e24198a150315e7959719b03709dee#68d26955b3e24198a150315e7959719b03709dee"
+source = "git+https://github.com/RustPython/RustPython.git?rev=71becd4059fdce4bce7010f1208ed3b1c883abba#71becd4059fdce4bce7010f1208ed3b1c883abba"
 dependencies = [
  "ascii",
  "cfg-if 1.0.0",
@@ -2043,7 +2043,7 @@ dependencies = [
 [[package]]
 name = "rustpython-compiler-core"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=68d26955b3e24198a150315e7959719b03709dee#68d26955b3e24198a150315e7959719b03709dee"
+source = "git+https://github.com/RustPython/RustPython.git?rev=71becd4059fdce4bce7010f1208ed3b1c883abba#71becd4059fdce4bce7010f1208ed3b1c883abba"
 dependencies = [
  "bincode",
  "bitflags",
@@ -2060,7 +2060,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=68d26955b3e24198a150315e7959719b03709dee#68d26955b3e24198a150315e7959719b03709dee"
+source = "git+https://github.com/RustPython/RustPython.git?rev=71becd4059fdce4bce7010f1208ed3b1c883abba#71becd4059fdce4bce7010f1208ed3b1c883abba"
 dependencies = [
  "ahash",
  "anyhow",

Cargo.toml

@@ -6,7 +6,7 @@ members = [
 
 [package]
 name = "ruff"
-version = "0.0.202"
+version = "0.0.207"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 edition = "2021"
 rust-version = "1.65.0"
@@ -51,11 +51,11 @@ path-absolutize = { version = "3.0.14", features = ["once_cell_cache", "use_unix
 quick-junit = { version = "0.3.2" }
 regex = { version = "1.6.0" }
 ropey = { version = "1.5.0", features = ["cr_lines", "simd"], default-features = false }
-ruff_macros = { version = "0.0.202", path = "ruff_macros" }
+ruff_macros = { version = "0.0.207", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "68d26955b3e24198a150315e7959719b03709dee" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "68d26955b3e24198a150315e7959719b03709dee" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "68d26955b3e24198a150315e7959719b03709dee" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "71becd4059fdce4bce7010f1208ed3b1c883abba" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "71becd4059fdce4bce7010f1208ed3b1c883abba" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "71becd4059fdce4bce7010f1208ed3b1c883abba" }
 schemars = { version = "0.8.11" }
 semver = { version = "1.0.16" }
 serde = { version = "1.0.147", features = ["derive"] }

README.md

@@ -8,7 +8,11 @@
 An extremely fast Python linter, written in Rust.
 
 <p align="center">
-  <img alt="Bar chart with benchmark results" src="https://user-images.githubusercontent.com/1309177/187504482-6d9df992-a81d-4e86-9f6a-d958741c8182.svg">
+  <picture align="center">
+    <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/1309177/210156880-a97c2a0d-2c03-4393-8695-36547935a94e.svg">
+    <source media="(prefers-color-scheme: light)" srcset="https://user-images.githubusercontent.com/1309177/210156881-a88fd142-5008-4695-9407-d028cec3eff7.svg">
+    <img alt="Shows a bar chart with benchmark results." src="https://user-images.githubusercontent.com/1309177/210156881-a88fd142-5008-4695-9407-d028cec3eff7.svg">
+  </picture>
 </p>
 
 <p align="center">
@@ -153,9 +157,9 @@ pacman -S ruff
 To run Ruff, try any of the following:
 
 ```shell
-ruff path/to/code/to/check.py
-ruff path/to/code/
-ruff path/to/code/*.py
+ruff path/to/code/to/check.py  # Run Ruff over `check.py`
+ruff path/to/code/             # Run Ruff over all files in `/path/to/code` (and any subdirectories)
+ruff path/to/code/*.py         # Run Ruff over all `.py` files in `/path/to/code`
 ```
 
 You can run Ruff in `--watch` mode to automatically re-run on-change:
@@ -169,7 +173,7 @@ Ruff also works with [pre-commit](https://pre-commit.com):
 ```yaml
 - repo: https://github.com/charliermarsh/ruff-pre-commit
   # Ruff version.
-  rev: 'v0.0.202'
+  rev: 'v0.0.207'
   hooks:
     - id: ruff
       # Respect `exclude` and `extend-exclude` settings.
@@ -300,6 +304,7 @@ ruff path/to/code/ --select F401 --select F403
 
 See `ruff --help` for more:
 
+<!-- Begin auto-generated cli help. -->
 ```shell
 Ruff: An extremely fast Python linter.
 
@@ -349,6 +354,10 @@ Options:
           List of mappings from file pattern to code to exclude
       --format <FORMAT>
           Output serialization format for error messages [possible values: text, json, junit, grouped, github, gitlab]
+      --stdin-filename <STDIN_FILENAME>
+          The name of the file when passing it through stdin
+      --cache-dir <CACHE_DIR>
+          Path to the cache directory
       --show-source
           Show violations with source code
       --respect-gitignore
@@ -357,12 +366,6 @@ Options:
           Enforce exclusions, even for paths passed to Ruff directly on the command-line
       --update-check
           Enable or disable automatic update checks
-      --show-files
-          See the files Ruff will be run against with the current settings
-      --show-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>
           Regular expression matching the name of dummy variables
       --target-version <TARGET_VERSION>
@@ -371,17 +374,22 @@ Options:
           Set the line-length for length-associated checks and automatic formatting
       --max-complexity <MAX_COMPLEXITY>
           Maximum McCabe complexity allowed for a given function
-      --stdin-filename <STDIN_FILENAME>
-          The name of the file when passing it through stdin
+      --add-noqa
+          Enable automatic additions of `noqa` directives to failing lines
+      --clean
+          Clear any caches in the current directory or any subdirectories
       --explain <EXPLAIN>
           Explain a rule
-      --cache-dir <CACHE_DIR>
-          Path to the cache directory
+      --show-files
+          See the files Ruff will be run against with the current settings
+      --show-settings
+          See the settings Ruff will use to check a given Python file
   -h, --help
           Print help information
   -V, --version
           Print version information
 ```
+<!-- End auto-generated cli help. -->
 
 ### `pyproject.toml` discovery
 
@@ -541,7 +549,7 @@ For more, see [Pyflakes](https://pypi.org/project/pyflakes/2.5.0/) on PyPI.
 | F621 | ExpressionsInStarAssignment | Too many expressions in star-unpacking assignment |  |
 | F622 | TwoStarredExpressions | Two starred expressions in assignment |  |
 | F631 | AssertTuple | Assert test is a non-empty tuple, which is always `True` |  |
-| F632 | IsLiteral | Use `==` and `!=` to compare constant literals | 🛠 |
+| F632 | IsLiteral | Use `==` to compare constant literals | 🛠 |
 | F633 | InvalidPrintSyntax | Use of `>>` is invalid with `print` function |  |
 | F634 | IfTuple | If test is a tuple, which is always `True` |  |
 | F701 | BreakOutsideLoop | `break` outside loop |  |
@@ -554,7 +562,6 @@ For more, see [Pyflakes](https://pypi.org/project/pyflakes/2.5.0/) on PyPI.
 | F821 | UndefinedName | Undefined name `...` |  |
 | F822 | UndefinedExport | Undefined name `...` in `__all__` |  |
 | F823 | UndefinedLocal | Local variable `...` referenced before assignment |  |
-| F831 | DuplicateArgumentName | Duplicate argument name in function definition |  |
 | F841 | UnusedVariable | Local variable `...` is assigned to but never used |  |
 | F842 | UnusedAnnotation | Local variable `...` is annotated but never used |  |
 | F901 | RaiseNotImplemented | `raise NotImplemented` should be `raise NotImplementedError` | 🛠 |
@@ -574,7 +581,7 @@ For more, see [pycodestyle](https://pypi.org/project/pycodestyle/2.9.1/) on PyPI
 | E714 | NotIsTest | Test for object identity should be `is not` | 🛠 |
 | E721 | TypeComparison | Do not compare types, use `isinstance()` |  |
 | E722 | DoNotUseBareExcept | Do not use bare `except` |  |
-| E731 | DoNotAssignLambda | Do not assign a lambda expression, use a def | 🛠 |
+| E731 | DoNotAssignLambda | Do not assign a `lambda` expression, use a `def` | 🛠 |
 | E741 | AmbiguousVariableName | Ambiguous variable name: `...` |  |
 | E742 | AmbiguousClassName | Ambiguous class name: `...` |  |
 | E743 | AmbiguousFunctionName | Ambiguous function name: `...` |  |
@@ -659,7 +666,7 @@ For more, see [pyupgrade](https://pypi.org/project/pyupgrade/3.2.0/) on PyPI.
 | ---- | ---- | ------- | --- |
 | UP001 | UselessMetaclassType | `__metaclass__ = type` is implied | 🛠 |
 | UP003 | TypeOfPrimitive | Use `str` instead of `type(...)` | 🛠 |
-| UP004 | UselessObjectInheritance | Class `...` inherits from object | 🛠 |
+| UP004 | UselessObjectInheritance | Class `...` inherits from `object` | 🛠 |
 | UP005 | DeprecatedUnittestAlias | `assertEquals` is deprecated, use `assertEqual` | 🛠 |
 | UP006 | UsePEP585Annotation | Use `list` instead of `List` for type annotations | 🛠 |
 | UP007 | UsePEP604Annotation | Use `X \| Y` for type annotations | 🛠 |
@@ -673,13 +680,16 @@ For more, see [pyupgrade](https://pypi.org/project/pyupgrade/3.2.0/) on PyPI.
 | UP015 | RedundantOpenModes | Unnecessary open mode parameters | 🛠 |
 | UP016 | RemoveSixCompat | Unnecessary `six` compatibility usage | 🛠 |
 | UP017 | DatetimeTimezoneUTC | Use `datetime.UTC` alias | 🛠 |
-| UP018 | NativeLiterals | Unnecessary call to `str` and `bytes` | 🛠 |
+| UP018 | NativeLiterals | Unnecessary call to `str` | 🛠 |
 | UP019 | TypingTextStrAlias | `typing.Text` is deprecated, use `str` | 🛠 |
 | UP020 | OpenAlias | Use builtin `open` | 🛠 |
 | UP021 | ReplaceUniversalNewlines | `universal_newlines` is deprecated, use `text` | 🛠 |
 | UP022 | ReplaceStdoutStderr | Sending stdout and stderr to pipe is deprecated, use `capture_output` | 🛠 |
 | UP023 | RewriteCElementTree | `cElementTree` is deprecated, use `ElementTree` | 🛠 |
+| UP024 | OSErrorAlias | Replace aliased errors with `OSError` | 🛠 |
 | UP025 | RewriteUnicodeLiteral | Remove unicode literals from strings | 🛠 |
+| UP026 | RewriteMockImport | `mock` is deprecated, use `unittest.mock` | 🛠 |
+| UP027 | RewriteListComprehension | Replace unpacked list comprehension with a generator expression | 🛠 |
 
 ### pep8-naming (N)
 
@@ -913,6 +923,7 @@ For more, see [flake8-simplify](https://pypi.org/project/flake8-simplify/0.19.3/
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
 | SIM118 | KeyInDict | Use `key in dict` instead of `key in dict.keys()` | 🛠 |
+| SIM300 | YodaConditions | Use `left == right` instead of `right == left (Yoda-conditions)` |  |
 
 ### flake8-tidy-imports (TID)
 
@@ -1014,7 +1025,7 @@ For more, see [Pylint](https://pypi.org/project/pylint/2.15.7/) on PyPI.
 | ---- | ---- | ------- | --- |
 | RUF001 | AmbiguousUnicodeCharacterString | String contains ambiguous unicode character '𝐁' (did you mean 'B'?) | 🛠 |
 | RUF002 | AmbiguousUnicodeCharacterDocstring | Docstring contains ambiguous unicode character '𝐁' (did you mean 'B'?) | 🛠 |
-| RUF003 | AmbiguousUnicodeCharacterComment | Comment contains ambiguous unicode character '𝐁' (did you mean 'B'?) |  |
+| RUF003 | AmbiguousUnicodeCharacterComment | Comment contains ambiguous unicode character '𝐁' (did you mean 'B'?) | 🛠 |
 | RUF004 | KeywordArgumentBeforeStarArgument | Keyword argument `...` must come after starred arguments |  |
 | RUF100 | UnusedNOQA | Unused blanket `noqa` directive | 🛠 |
 
@@ -1298,7 +1309,7 @@ natively, including:
 - [`pep8-naming`](https://pypi.org/project/pep8-naming/)
 - [`pydocstyle`](https://pypi.org/project/pydocstyle/)
 - [`pygrep-hooks`](https://github.com/pre-commit/pygrep-hooks) (3/10)
-- [`pyupgrade`](https://pypi.org/project/pyupgrade/) (20/33)
+- [`pyupgrade`](https://pypi.org/project/pyupgrade/) (21/33)
 - [`yesqa`](https://github.com/asottile/yesqa)
 
 Note that, in some cases, Ruff uses different error code prefixes than would be found in the
@@ -1357,7 +1368,7 @@ Today, Ruff can be used to replace Flake8 when used with any of the following pl
 Ruff can also replace [`isort`](https://pypi.org/project/isort/),
 [`yesqa`](https://github.com/asottile/yesqa), [`eradicate`](https://pypi.org/project/eradicate/),
 [`pygrep-hooks`](https://github.com/pre-commit/pygrep-hooks) (3/10), and a subset of the rules
-implemented in [`pyupgrade`](https://pypi.org/project/pyupgrade/) (20/33).
+implemented in [`pyupgrade`](https://pypi.org/project/pyupgrade/) (21/33).
 
 If you're looking to use Ruff, but rely on an unsupported Flake8 plugin, free to file an Issue.
 
@@ -1669,7 +1680,6 @@ Summary
 
 <!-- Sections automatically generated by `cargo dev generate-options`. -->
 <!-- Begin auto-generated options sections. -->
-
 #### [`allowed-confusables`](#allowed-confusables)
 
 A list of allowed "confusable" Unicode characters to ignore when

flake8_to_ruff/Cargo.lock

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

flake8_to_ruff/Cargo.toml

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

playground/src/Editor/SourceEditor.tsx

@@ -56,7 +56,9 @@ export default function SourceEditor({
             .filter((check) => position.startLineNumber === check.location.row)
             .filter((check) => check.fix)
             .map((check) => ({
-              title: `Fix ${check.code}`,
+              title: check.fix
+                ? `${check.code}: ${check.fix.message}` ?? `Fix ${check.code}`
+                : "Autofix",
               id: `fix-${check.code}`,
               kind: "quickfix",
               edit: check.fix

pyproject.toml

@@ -1,5 +1,19 @@
+[build-system]
+requires = ["maturin>=0.14,<0.15"]
+build-backend = "maturin"
+
 [project]
 name = "ruff"
+version = "0.0.207"
+description = "An extremely fast Python linter, written in Rust."
+authors = [
+  { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" },
+]
+maintainers = [
+  { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" },
+]
+requires-python = ">=3.7"
+license = { file = "LICENSE" }
 keywords = ["automation", "flake8", "pycodestyle", "pyflakes", "pylint", "clippy"]
 classifiers = [
     "Development Status :: 3 - Alpha",
@@ -17,24 +31,14 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Software Development :: Quality Assurance",
 ]
-author = "Charlie Marsh"
-author_email = "charlie.r.marsh@gmail.com"
-description = "An extremely fast Python linter, written in Rust."
-requires-python = ">=3.7"
-
-[project.urls]
-repository = "https://github.com/charliermarsh/ruff"
-
-[build-system]
-requires = ["maturin>=0.14,<0.15"]
-build-backend = "maturin"
+urls = { repository = "https://github.com/charliermarsh/ruff-lsp" }
 
 [tool.maturin]
 bindings = "bin"
 strip = true
 
 [tool.ruff]
-update-check = true
+line-length = 88
 
 [tool.ruff.isort]
 force-wrap-aliases = true

resources/test/fixtures/flake8_bandit/S105.py

@@ -51,3 +51,12 @@ secret == "s3cr3t"
 token == "s3cr3t"
 secrete == "s3cr3t"
 password == safe == "s3cr3t"
+
+if token == "1\n2":
+    pass
+
+if token == "3\t4":
+    pass
+
+if token == "5\r6":
+    pass

resources/test/fixtures/flake8_return/RET504.py

@@ -137,6 +137,14 @@ def x():
     return a
 
 
+# Considered OK, since attribute assignments can have side effects.
+class X:
+    def x(self):
+        a = self.property
+        self.property = None
+        return a
+
+
 # Test cases for using value for assignment then returning it
 # See:https://github.com/afonasev/flake8-return/issues/47
 def resolve_from_url(self, url: str) -> dict:
@@ -238,13 +246,16 @@ def close(self):
             report(traceback.format_exc())
     return any_failed
 
+
 def global_assignment():
     global X
     X = 1
     return X
 
+
 def nonlocal_assignment():
     X = 1
+
     def inner():
         nonlocal X
         X = 1

resources/test/fixtures/flake8_simplify/SIM300.py

@@ -0,0 +1,11 @@
+# Errors
+"yoda" == compare  # SIM300
+42 == age  # SIM300
+
+# OK
+compare == "yoda"
+age == 42
+x == y
+"yoda" == compare == 1
+"yoda" == compare == someothervar
+"yoda" == "yoda"

resources/test/fixtures/isort/line_ending_cr.py

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

resources/test/fixtures/isort/line_ending_crlf.py

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

resources/test/fixtures/isort/line_ending_lf.py

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

resources/test/fixtures/pydocstyle/D400.py

@@ -35,7 +35,6 @@ def f():
     ...
 
 
-
 def f():
     r"Here's a line without a period"
     ...
@@ -71,3 +70,24 @@ def f():
     Here's a line without a period,
     but here's the next line with trailing space """
     ...
+
+
+def f(rounds: list[int], number: int) -> bool:
+    """
+    :param rounds: list - rounds played.
+    :param number: int - round number.
+    :return:  bool - was the round played?
+    """
+    return number in rounds
+
+
+def f(rounds: list[int], number: int) -> bool:
+    """
+    Args:
+        rounds (list): rounds played.
+        number (int): round number.
+
+    Returns:
+        bool: was the round played?
+    """
+    return number in rounds

resources/test/fixtures/pyflakes/F401_7.py

@@ -1,16 +1,66 @@
 """Test: noqa directives."""
 
-from module import (
-    A,  # noqa: F401
-    B,
+# This should ignore both errors.
+from typing import (  # noqa: F401
+    List,
+    Sequence,
 )
 
-from module import (
-    A,  # noqa: F401
-    B,  # noqa: F401
+# This should ignore both errors.
+from typing import (  # noqa
+    List,
+    Sequence,
 )
 
-from module import (
-    A,
-    B,
+# This should ignore both errors.
+from typing import (
+    List,  # noqa: F401
+    Sequence,  # noqa: F401
 )
+
+# This should ignore both errors.
+from typing import (
+    List,  # noqa
+    Sequence,  # noqa
+)
+
+# This should ignore the first error.
+from typing import (
+    Mapping,  # noqa: F401
+    Union,
+)
+
+# This should ignore both errors.
+from typing import (  # noqa
+    List,
+    Sequence,
+)
+
+# This should ignore the error, but the inner noqa should be marked as unused.
+from typing import (  # noqa: F401
+    Optional,  # noqa: F401
+)
+
+# This should ignore the error, but the inner noqa should be marked as unused.
+from typing import (  # noqa
+    Optional,  # noqa: F401
+)
+
+# This should ignore the error, but mark F501 as unused.
+from typing import (  # noqa: F401
+    Dict,  # noqa: F501
+)
+
+# This should ignore the error, but mark F501 as unused.
+from typing import (  # noqa: F501
+    Tuple,  # noqa: F401
+)
+
+# This should ignore both errors.
+from typing import Any, AnyStr  # noqa: F401
+
+# This should ignore both errors.
+from typing import AsyncIterable, AsyncGenerator  # noqa
+
+# This should mark F501 as unused.
+from typing import Awaitable, AwaitableGenerator  # noqa: F501

resources/test/fixtures/pyflakes/F541.py

@@ -1,6 +1,8 @@
+# OK
 a = "abc"
 b = f"ghi{'jkl'}"
 
+# Errors
 c = f"def"
 d = f"def" + "ghi"
 e = (
@@ -8,5 +10,18 @@ e = (
     "ghi"
 )
 
+# OK
 g = f"ghi{123:{45}}"
+
+# Error
 h = "x" "y" f"z"
+
+v = 23.234234
+
+# OK
+f"{v:0.2f}"
+f"{f'{v:0.2f}'}"
+
+# Errors
+f"{v:{f'0.2f'}}"
+f"{f''}"

resources/test/fixtures/pyflakes/F821_0.py

@@ -89,7 +89,8 @@ A = (
     f'B'
     f'{B}'
 )
-
+C = f'{A:{B}}'
+C = f'{A:{f"{B}"}}'
 
 from typing import Annotated, Literal
 

resources/test/fixtures/pyflakes/F831.py

@@ -1,10 +0,0 @@
-def foo(x: int, y: int, x: int) -> None:
-    pass
-
-
-def bar(x: int, y: int, *, x: int) -> None:
-    pass
-
-
-def baz(x: int, y: int, **x: int) -> None:
-    pass

resources/test/fixtures/pyflakes/F841_2.py

@@ -0,0 +1,6 @@
+from __future__ import annotations
+
+# test case for https://github.com/charliermarsh/ruff/issues/1552
+def _():
+    x = 0
+    list()[x:]

resources/test/fixtures/pyupgrade/UP024_0.py

@@ -0,0 +1,98 @@
+import mmap, select, socket
+from mmap import error
+# These should be fixed
+try:
+    pass
+except EnvironmentError:
+    pass
+
+try:
+    pass
+except IOError:
+    pass
+
+try:
+    pass
+except WindowsError:
+    pass
+
+try:
+    pass
+except mmap.error:
+    pass
+
+try:
+    pass
+except select.error:
+    pass
+
+try:
+    pass
+except socket.error:
+    pass
+
+try:
+    pass
+except error:
+    pass
+
+# Should NOT be in parentheses when replaced
+
+try:
+    pass
+except (IOError,):
+    pass
+try:
+    pass
+except (mmap.error,):
+    pass
+try:
+    pass
+except (EnvironmentError, IOError, OSError, select.error):
+    pass
+
+# Should be kept in parentheses (because multiple)
+
+try:
+    pass
+except (IOError, KeyError, OSError):
+    pass
+
+# First should change, second should not
+from .mmap import error
+try:
+    pass
+except (IOError, error):
+    pass
+# These should not change
+
+from foo import error
+
+try:
+    pass
+except (OSError, error):
+    pass
+
+try:
+    pass
+except:
+    pass
+
+try:
+    pass
+except AssertionError:
+    pass
+try:
+    pass
+except (mmap).error:
+    pass
+
+try:
+    pass
+except OSError:
+    pass
+
+try:
+    pass
+except (OSError, KeyError):
+    pass

resources/test/fixtures/pyupgrade/UP024_1.py

@@ -0,0 +1,17 @@
+import mmap, socket, select
+
+try:
+    pass
+except (OSError, mmap.error, IOError):
+    pass
+except (OSError, socket.error, KeyError):
+    pass
+
+try:
+    pass
+except (
+    OSError,
+    select.error,
+    IOError,
+):
+    pass

resources/test/fixtures/pyupgrade/UP024_2.py

@@ -0,0 +1,50 @@
+# These should not change
+raise ValueError
+raise ValueError(1)
+
+from .mmap import error
+raise error
+
+# Testing the modules
+import socket, mmap, select
+raise socket.error
+raise mmap.error
+raise select.error
+
+raise socket.error()
+raise mmap.error(1)
+raise select.error(1, 2)
+
+raise socket.error(
+    1,
+    2,
+    3,
+)
+
+from mmap import error
+raise error
+
+from socket import error
+raise error(1)
+
+from select import error
+raise error(1, 2)
+
+# Testing the names
+raise EnvironmentError
+raise IOError
+raise WindowsError
+
+raise EnvironmentError()
+raise IOError(1)
+raise WindowsError(1, 2)
+
+raise EnvironmentError(
+    1,
+    2,
+    3,
+)
+
+raise WindowsError
+raise EnvironmentError(1)
+raise IOError(1, 2)

resources/test/fixtures/pyupgrade/UP026.py

@@ -0,0 +1,74 @@
+# These should be changed
+if True:
+    import mock
+
+if True:
+    import mock, sys
+
+# This goes to from unitest import mock
+import mock.mock
+
+# Mock should go on a new line as `from unittest import mock`
+import contextlib, mock, sys
+
+# Mock should go on a new line as `from unittest import mock`
+import mock, sys
+x = "This code should be preserved one line below the mock"
+
+# Mock should go on a new line as `from unittest import mock`
+from mock import mock
+
+# Should keep trailing comma
+from mock import (
+    mock,
+    a,
+    b,
+    c,
+)
+
+# Should not get a trailing comma
+from mock import (
+    mock,
+    a,
+    b,
+    c
+)
+
+if True:
+    if False:
+        from mock import (
+            mock,
+            a,
+            b,
+            c
+        )
+
+# These should not change:
+import os, io
+
+# Mock should go on a new line as `from unittest import mock`
+import mock, mock
+
+# Mock should go on a new line as `from unittest import mock as foo`
+import mock as foo
+
+# Mock should go on a new line as `from unittest import mock as foo`
+from mock import mock as foo
+
+if True:
+    # This should yield multiple, aliased imports.
+    import mock as foo, mock as bar, mock
+
+    # This should yield multiple, aliased imports, and preserve `os`.
+    import mock as foo, mock as bar, mock, os
+
+if True:
+    # This should yield multiple, aliased imports.
+    from mock import mock as foo, mock as bar, mock
+
+
+# This should be unchanged.
+x = mock.Mock()
+
+# This should change to `mock.Mock`().
+x = mock.mock.Mock()

resources/test/fixtures/pyupgrade/UP027.py

@@ -0,0 +1,18 @@
+# Should change
+foo, bar, baz = [fn(x) for x in items]
+
+foo, bar, baz =[fn(x) for x in items]
+
+foo, bar, baz =          [fn(x) for x in items]
+
+foo, bar, baz = [[i for i in fn(x)] for x in items]
+
+foo, bar, baz = [
+    fn(x)
+    for x in items
+]
+
+# Should not change
+foo = [fn(x) for x in items]
+
+x, = [await foo for foo in bar]

resources/test/fixtures/ruff/RUF100_1.py

@@ -0,0 +1,64 @@
+# This should ignore both errors.
+from typing import (  # noqa: F401
+    List,
+    Sequence,
+)
+
+# This should ignore both errors.
+from typing import (  # noqa
+    List,
+    Sequence,
+)
+
+# This should ignore both errors.
+from typing import (
+    List,  # noqa: F401
+    Sequence,  # noqa: F401
+)
+
+# This should ignore both errors.
+from typing import (
+    List,  # noqa
+    Sequence,  # noqa
+)
+
+# This should ignore the first error.
+from typing import (
+    Mapping,  # noqa: F401
+    Union,
+)
+
+# This should ignore both errors.
+from typing import (  # noqa
+    List,
+    Sequence,
+)
+
+# This should ignore the error, but the inner noqa should be marked as unused.
+from typing import (  # noqa: F401
+    Optional,  # noqa: F401
+)
+
+# This should ignore the error, but the inner noqa should be marked as unused.
+from typing import (  # noqa
+    Optional,  # noqa: F401
+)
+
+# This should ignore the error, but mark F501 as unused.
+from typing import (  # noqa: F401
+    Dict,  # noqa: F501
+)
+
+# This should ignore the error, but mark F501 as unused.
+from typing import (  # noqa: F501
+    Tuple,  # noqa: F401
+)
+
+# This should ignore both errors.
+from typing import Any, AnyStr  # noqa: F401
+
+# This should ignore both errors.
+from typing import AsyncIterable, AsyncGenerator  # noqa
+
+# This should mark F501 as unused.
+from typing import Awaitable, AwaitableGenerator  # noqa: F501

ruff.schema.json

@@ -652,8 +652,6 @@
         "F821",
         "F822",
         "F823",
-        "F83",
-        "F831",
         "F84",
         "F841",
         "F842",
@@ -850,6 +848,9 @@
         "SIM1",
         "SIM11",
         "SIM118",
+        "SIM3",
+        "SIM30",
+        "SIM300",
         "T",
         "T1",
         "T10",
@@ -911,7 +912,10 @@
         "UP021",
         "UP022",
         "UP023",
+        "UP024",
         "UP025",
+        "UP026",
+        "UP027",
         "W",
         "W2",
         "W29",

ruff_dev/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_dev"
-version = "0.0.202"
+version = "0.0.207"
 edition = "2021"
 
 [dependencies]
@@ -11,9 +11,9 @@ 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 = "68d26955b3e24198a150315e7959719b03709dee" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "68d26955b3e24198a150315e7959719b03709dee" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "68d26955b3e24198a150315e7959719b03709dee" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "71becd4059fdce4bce7010f1208ed3b1c883abba" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "71becd4059fdce4bce7010f1208ed3b1c883abba" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "71becd4059fdce4bce7010f1208ed3b1c883abba" }
 schemars = { version = "0.8.11" }
 serde_json = {version="1.0.91"}
 strum = { version = "0.24.1", features = ["strum_macros"] }

ruff_dev/src/generate_all.rs

@@ -4,7 +4,8 @@ use anyhow::Result;
 use clap::Args;
 
 use crate::{
-    generate_check_code_prefix, generate_json_schema, generate_options, generate_rules_table,
+    generate_check_code_prefix, generate_cli_help, generate_json_schema, generate_options,
+    generate_rules_table,
 };
 
 #[derive(Args)]
@@ -27,5 +28,8 @@ pub fn main(cli: &Cli) -> Result<()> {
     generate_options::main(&generate_options::Cli {
         dry_run: cli.dry_run,
     })?;
+    generate_cli_help::main(&generate_cli_help::Cli {
+        dry_run: cli.dry_run,
+    })?;
     Ok(())
 }

ruff_dev/src/generate_cli_help.rs

@@ -0,0 +1,38 @@
+//! Generate CLI help.
+
+use anyhow::Result;
+use clap::{Args, CommandFactory};
+use ruff::cli::Cli as MainCli;
+
+use crate::utils::replace_readme_section;
+
+const HELP_BEGIN_PRAGMA: &str = "<!-- Begin auto-generated cli help. -->";
+const HELP_END_PRAGMA: &str = "<!-- End auto-generated cli help. -->";
+
+#[derive(Args)]
+pub struct Cli {
+    /// Write the generated help to stdout (rather than to `README.md`).
+    #[arg(long)]
+    pub(crate) dry_run: bool,
+}
+
+fn trim_lines(s: &str) -> String {
+    s.lines().map(str::trim_end).collect::<Vec<_>>().join("\n")
+}
+
+pub fn main(cli: &Cli) -> Result<()> {
+    let mut cmd = MainCli::command();
+    let output = trim_lines(cmd.render_help().to_string().trim());
+
+    if cli.dry_run {
+        print!("{output}");
+    } else {
+        replace_readme_section(
+            &format!("```shell\n{output}\n```\n"),
+            HELP_BEGIN_PRAGMA,
+            HELP_END_PRAGMA,
+        )?;
+    }
+
+    Ok(())
+}

ruff_dev/src/generate_options.rs

@@ -1,16 +1,13 @@
 //! Generate a Markdown-compatible listing of configuration options.
 
-use std::fs;
-use std::fs::OpenOptions;
-use std::io::Write;
-use std::path::PathBuf;
-
 use anyhow::Result;
 use clap::Args;
 use itertools::Itertools;
 use ruff::settings::options::Options;
 use ruff::settings::options_base::{ConfigurationOptions, OptionEntry, OptionField};
 
+use crate::utils::replace_readme_section;
+
 const BEGIN_PRAGMA: &str = "<!-- Begin auto-generated options sections. -->";
 const END_PRAGMA: &str = "<!-- End auto-generated options sections. -->";
 
@@ -95,30 +92,7 @@ pub fn main(cli: &Cli) -> Result<()> {
     if cli.dry_run {
         print!("{output}");
     } else {
-        // Read the existing file.
-        let file = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-            .parent()
-            .expect("Failed to find root directory")
-            .join("README.md");
-        let existing = fs::read_to_string(&file)?;
-
-        // Extract the prefix.
-        let index = existing
-            .find(BEGIN_PRAGMA)
-            .expect("Unable to find begin pragma");
-        let prefix = &existing[..index + BEGIN_PRAGMA.len()];
-
-        // Extract the suffix.
-        let index = existing
-            .find(END_PRAGMA)
-            .expect("Unable to find end pragma");
-        let suffix = &existing[index..];
-
-        // Write the prefix, new contents, and suffix.
-        let mut f = OpenOptions::new().write(true).truncate(true).open(&file)?;
-        write!(f, "{prefix}\n\n")?;
-        write!(f, "{output}")?;
-        write!(f, "{suffix}")?;
+        replace_readme_section(&output, BEGIN_PRAGMA, END_PRAGMA)?;
     }
 
     Ok(())

ruff_dev/src/generate_rules_table.rs

@@ -1,16 +1,13 @@
 //! Generate a Markdown-compatible table of supported lint rules.
 
-use std::fs;
-use std::fs::OpenOptions;
-use std::io::Write;
-use std::path::PathBuf;
-
 use anyhow::Result;
 use clap::Args;
 use itertools::Itertools;
 use ruff::checks::{CheckCategory, CheckCode};
 use strum::IntoEnumIterator;
 
+use crate::utils::replace_readme_section;
+
 const TABLE_BEGIN_PRAGMA: &str = "<!-- Begin auto-generated sections. -->";
 const TABLE_END_PRAGMA: &str = "<!-- End auto-generated sections. -->";
 
@@ -85,32 +82,3 @@ pub fn main(cli: &Cli) -> Result<()> {
 
     Ok(())
 }
-
-fn replace_readme_section(content: &str, begin_pragma: &str, end_pragma: &str) -> Result<()> {
-    // Read the existing file.
-    let file = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-        .parent()
-        .expect("Failed to find root directory")
-        .join("README.md");
-    let existing = fs::read_to_string(&file)?;
-
-    // Extract the prefix.
-    let index = existing
-        .find(begin_pragma)
-        .expect("Unable to find begin pragma");
-    let prefix = &existing[..index + begin_pragma.len()];
-
-    // Extract the suffix.
-    let index = existing
-        .find(end_pragma)
-        .expect("Unable to find end pragma");
-    let suffix = &existing[index..];
-
-    // Write the prefix, new contents, and suffix.
-    let mut f = OpenOptions::new().write(true).truncate(true).open(&file)?;
-    writeln!(f, "{prefix}")?;
-    write!(f, "{content}")?;
-    write!(f, "{suffix}")?;
-
-    Ok(())
-}

ruff_dev/src/lib.rs

@@ -13,6 +13,7 @@
 
 pub mod generate_all;
 pub mod generate_check_code_prefix;
+pub mod generate_cli_help;
 pub mod generate_json_schema;
 pub mod generate_options;
 pub mod generate_rules_table;
@@ -20,3 +21,4 @@ pub mod print_ast;
 pub mod print_cst;
 pub mod print_tokens;
 pub mod round_trip;
+mod utils;

ruff_dev/src/main.rs

@@ -14,8 +14,8 @@
 use anyhow::Result;
 use clap::{Parser, Subcommand};
 use ruff_dev::{
-    generate_all, generate_check_code_prefix, generate_json_schema, generate_options,
-    generate_rules_table, print_ast, print_cst, print_tokens, round_trip,
+    generate_all, generate_check_code_prefix, generate_cli_help, generate_json_schema,
+    generate_options, generate_rules_table, print_ast, print_cst, print_tokens, round_trip,
 };
 
 #[derive(Parser)]
@@ -38,6 +38,8 @@ enum Commands {
     GenerateRulesTable(generate_rules_table::Cli),
     /// Generate a Markdown-compatible listing of configuration options.
     GenerateOptions(generate_options::Cli),
+    /// Generate CLI help.
+    GenerateCliHelp(generate_cli_help::Cli),
     /// Print the AST for a given Python file.
     PrintAST(print_ast::Cli),
     /// Print the LibCST CST for a given Python file.
@@ -56,6 +58,7 @@ fn main() -> Result<()> {
         Commands::GenerateJSONSchema(args) => generate_json_schema::main(args)?,
         Commands::GenerateRulesTable(args) => generate_rules_table::main(args)?,
         Commands::GenerateOptions(args) => generate_options::main(args)?,
+        Commands::GenerateCliHelp(args) => generate_cli_help::main(args)?,
         Commands::PrintAST(args) => print_ast::main(args)?,
         Commands::PrintCST(args) => print_cst::main(args)?,
         Commands::PrintTokens(args) => print_tokens::main(args)?,

ruff_dev/src/round_trip.rs

@@ -22,7 +22,11 @@ pub fn main(cli: &Cli) -> Result<()> {
     let python_ast = parser::parse_program(&contents, &cli.file.to_string_lossy())?;
     let locator = SourceCodeLocator::new(&contents);
     let stylist = SourceCodeStyleDetector::from_contents(&contents, &locator);
-    let mut generator = SourceCodeGenerator::new(stylist.indentation(), stylist.quote());
+    let mut generator = SourceCodeGenerator::new(
+        stylist.indentation(),
+        stylist.quote(),
+        stylist.line_ending(),
+    );
     generator.unparse_suite(&python_ast);
     println!("{}", generator.generate()?);
     Ok(())

ruff_dev/src/utils.rs

@@ -0,0 +1,35 @@
+use std::fs;
+use std::fs::OpenOptions;
+use std::io::Write;
+use std::path::PathBuf;
+
+use anyhow::Result;
+
+pub fn replace_readme_section(content: &str, begin_pragma: &str, end_pragma: &str) -> Result<()> {
+    // Read the existing file.
+    let file = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+        .parent()
+        .expect("Failed to find root directory")
+        .join("README.md");
+    let existing = fs::read_to_string(&file)?;
+
+    // Extract the prefix.
+    let index = existing
+        .find(begin_pragma)
+        .expect("Unable to find begin pragma");
+    let prefix = &existing[..index + begin_pragma.len()];
+
+    // Extract the suffix.
+    let index = existing
+        .find(end_pragma)
+        .expect("Unable to find end pragma");
+    let suffix = &existing[index..];
+
+    // Write the prefix, new contents, and suffix.
+    let mut f = OpenOptions::new().write(true).truncate(true).open(&file)?;
+    writeln!(f, "{prefix}")?;
+    write!(f, "{content}")?;
+    write!(f, "{suffix}")?;
+
+    Ok(())
+}

ruff_macros/Cargo.toml

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

src/ast/helpers.rs

@@ -5,7 +5,7 @@ use regex::Regex;
 use rustc_hash::{FxHashMap, FxHashSet};
 use rustpython_ast::{
     Arguments, Constant, Excepthandler, ExcepthandlerKind, Expr, ExprKind, Keyword, KeywordData,
-    Location, Stmt, StmtKind,
+    Located, Location, Stmt, StmtKind,
 };
 use rustpython_parser::lexer;
 use rustpython_parser::lexer::Tok;
@@ -212,6 +212,23 @@ pub fn is_constant_non_singleton(expr: &Expr) -> bool {
     is_constant(expr) && !is_singleton(expr)
 }
 
+/// Return `true` if an `Expr` is not a reference to a variable (or something
+/// that could resolve to a variable, like a function call).
+pub fn is_non_variable(expr: &Expr) -> bool {
+    matches!(
+        expr.node,
+        ExprKind::Constant { .. }
+            | ExprKind::Tuple { .. }
+            | ExprKind::List { .. }
+            | ExprKind::Set { .. }
+            | ExprKind::Dict { .. }
+            | ExprKind::SetComp { .. }
+            | ExprKind::ListComp { .. }
+            | ExprKind::DictComp { .. }
+            | ExprKind::GeneratorExp { .. }
+    )
+}
+
 /// Return the `Keyword` with the given name, if it's present in the list of
 /// `Keyword` arguments.
 pub fn find_keyword<'a>(keywords: &'a [Keyword], keyword_name: &str) -> Option<&'a Keyword> {
@@ -335,20 +352,17 @@ pub fn to_absolute(relative: Location, base: Location) -> Location {
 
 /// Return `true` if a `Stmt` has leading content.
 pub fn match_leading_content(stmt: &Stmt, locator: &SourceCodeLocator) -> bool {
-    let range = Range {
-        location: Location::new(stmt.location.row(), 0),
-        end_location: stmt.location,
-    };
+    let range = Range::new(Location::new(stmt.location.row(), 0), stmt.location);
     let prefix = locator.slice_source_code_range(&range);
     prefix.chars().any(|char| !char.is_whitespace())
 }
 
 /// Return `true` if a `Stmt` has trailing content.
 pub fn match_trailing_content(stmt: &Stmt, locator: &SourceCodeLocator) -> bool {
-    let range = Range {
-        location: stmt.end_location.unwrap(),
-        end_location: Location::new(stmt.end_location.unwrap().row() + 1, 0),
-    };
+    let range = Range::new(
+        stmt.end_location.unwrap(),
+        Location::new(stmt.end_location.unwrap().row() + 1, 0),
+    );
     let suffix = locator.slice_source_code_range(&range);
     for char in suffix.chars() {
         if char == '#' {
@@ -384,10 +398,7 @@ pub fn identifier_range(stmt: &Stmt, locator: &SourceCodeLocator) -> Range {
         let contents = locator.slice_source_code_range(&Range::from_located(stmt));
         for (start, tok, end) in lexer::make_tokenizer_located(&contents, stmt.location).flatten() {
             if matches!(tok, Tok::Name { .. }) {
-                return Range {
-                    location: start,
-                    end_location: end,
-                };
+                return Range::new(start, end);
             }
         }
         error!("Failed to find identifier for {:?}", stmt);
@@ -395,6 +406,19 @@ pub fn identifier_range(stmt: &Stmt, locator: &SourceCodeLocator) -> Range {
     Range::from_located(stmt)
 }
 
+// Return the ranges of `Name` tokens within a specified node.
+pub fn find_names<T>(located: &Located<T>, locator: &SourceCodeLocator) -> Vec<Range> {
+    let contents = locator.slice_source_code_range(&Range::from_located(located));
+    lexer::make_tokenizer_located(&contents, located.location)
+        .flatten()
+        .filter(|(_, tok, _)| matches!(tok, Tok::Name { .. }))
+        .map(|(start, _, end)| Range {
+            location: start,
+            end_location: end,
+        })
+        .collect()
+}
+
 /// Return the `Range` of `name` in `Excepthandler`.
 pub fn excepthandler_name_range(
     handler: &Excepthandler,
@@ -406,17 +430,70 @@ pub fn excepthandler_name_range(
     match (name, type_) {
         (Some(_), Some(type_)) => {
             let type_end_location = type_.end_location.unwrap();
-            let contents = locator.slice_source_code_range(&Range {
-                location: type_end_location,
-                end_location: body[0].location,
-            });
+            let contents =
+                locator.slice_source_code_range(&Range::new(type_end_location, body[0].location));
             let range = lexer::make_tokenizer_located(&contents, type_end_location)
                 .flatten()
                 .tuple_windows()
                 .find(|(tok, next_tok)| {
                     matches!(tok.1, Tok::As) && matches!(next_tok.1, Tok::Name { .. })
                 })
-                .map(|((..), (location, _, end_location))| Range {
+                .map(|((..), (location, _, end_location))| Range::new(location, end_location));
+            range
+        }
+        _ => None,
+    }
+}
+
+/// Return the `Range` of `except` in `Excepthandler`.
+pub fn except_range(handler: &Excepthandler, locator: &SourceCodeLocator) -> Range {
+    let ExcepthandlerKind::ExceptHandler { body, type_, .. } = &handler.node;
+    let end = if let Some(type_) = type_ {
+        type_.location
+    } else {
+        body.first()
+            .expect("Expected body to be non-empty")
+            .location
+    };
+    let contents = locator.slice_source_code_range(&Range {
+        location: handler.location,
+        end_location: end,
+    });
+    let range = lexer::make_tokenizer_located(&contents, handler.location)
+        .flatten()
+        .find(|(_, kind, _)| matches!(kind, Tok::Except { .. }))
+        .map(|(location, _, end_location)| Range {
+            location,
+            end_location,
+        })
+        .expect("Failed to find `except` range");
+    range
+}
+
+/// Return the `Range` of `else` in `For`, `AsyncFor`, and `While` statements.
+pub fn else_range(stmt: &Stmt, locator: &SourceCodeLocator) -> Option<Range> {
+    match &stmt.node {
+        StmtKind::For { body, orelse, .. }
+        | StmtKind::AsyncFor { body, orelse, .. }
+        | StmtKind::While { body, orelse, .. }
+            if !orelse.is_empty() =>
+        {
+            let body_end = body
+                .last()
+                .expect("Expected body to be non-empty")
+                .end_location
+                .unwrap();
+            let contents = locator.slice_source_code_range(&Range {
+                location: body_end,
+                end_location: orelse
+                    .first()
+                    .expect("Expected orelse to be non-empty")
+                    .location,
+            });
+            let range = lexer::make_tokenizer_located(&contents, body_end)
+                .flatten()
+                .find(|(_, kind, _)| matches!(kind, Tok::Else))
+                .map(|(location, _, end_location)| Range {
                     location,
                     end_location,
                 });
@@ -435,10 +512,10 @@ pub fn preceded_by_continuation(stmt: &Stmt, locator: &SourceCodeLocator) -> boo
     // 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 range = Range::new(
+            Location::new(stmt.location.row() - 1, 0),
+            Location::new(stmt.location.row(), 0),
+        );
         let line = locator.slice_source_code_range(&range);
         if line.trim().ends_with('\\') {
             return true;
@@ -466,7 +543,9 @@ mod tests {
     use rustpython_ast::Location;
     use rustpython_parser::parser;
 
-    use crate::ast::helpers::{identifier_range, match_module_member, match_trailing_content};
+    use crate::ast::helpers::{
+        else_range, identifier_range, match_module_member, match_trailing_content,
+    };
     use crate::ast::types::Range;
     use crate::source_code_locator::SourceCodeLocator;
 
@@ -660,10 +739,7 @@ y = 2
         let locator = SourceCodeLocator::new(contents);
         assert_eq!(
             identifier_range(stmt, &locator),
-            Range {
-                location: Location::new(1, 4),
-                end_location: Location::new(1, 5),
-            }
+            Range::new(Location::new(1, 4), Location::new(1, 5),)
         );
 
         let contents = r#"
@@ -677,10 +753,7 @@ def \
         let locator = SourceCodeLocator::new(contents);
         assert_eq!(
             identifier_range(stmt, &locator),
-            Range {
-                location: Location::new(2, 2),
-                end_location: Location::new(2, 3),
-            }
+            Range::new(Location::new(2, 2), Location::new(2, 3),)
         );
 
         let contents = "class Class(): pass".trim();
@@ -689,10 +762,7 @@ def \
         let locator = SourceCodeLocator::new(contents);
         assert_eq!(
             identifier_range(stmt, &locator),
-            Range {
-                location: Location::new(1, 6),
-                end_location: Location::new(1, 11),
-            }
+            Range::new(Location::new(1, 6), Location::new(1, 11),)
         );
 
         let contents = "class Class: pass".trim();
@@ -701,10 +771,7 @@ def \
         let locator = SourceCodeLocator::new(contents);
         assert_eq!(
             identifier_range(stmt, &locator),
-            Range {
-                location: Location::new(1, 6),
-                end_location: Location::new(1, 11),
-            }
+            Range::new(Location::new(1, 6), Location::new(1, 11),)
         );
 
         let contents = r#"
@@ -718,10 +785,7 @@ class Class():
         let locator = SourceCodeLocator::new(contents);
         assert_eq!(
             identifier_range(stmt, &locator),
-            Range {
-                location: Location::new(2, 6),
-                end_location: Location::new(2, 11),
-            }
+            Range::new(Location::new(2, 6), Location::new(2, 11),)
         );
 
         let contents = r#"x = y + 1"#.trim();
@@ -730,12 +794,29 @@ class Class():
         let locator = SourceCodeLocator::new(contents);
         assert_eq!(
             identifier_range(stmt, &locator),
-            Range {
-                location: Location::new(1, 0),
-                end_location: Location::new(1, 9),
-            }
+            Range::new(Location::new(1, 0), Location::new(1, 9),)
         );
 
         Ok(())
     }
+
+    #[test]
+    fn test_else_range() -> Result<()> {
+        let contents = r#"
+for x in y:
+    pass
+else:
+    pass
+"#
+        .trim();
+        let program = parser::parse_program(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = SourceCodeLocator::new(contents);
+        let range = else_range(stmt, &locator).unwrap();
+        assert_eq!(range.location.row(), 3);
+        assert_eq!(range.location.column(), 0);
+        assert_eq!(range.end_location.row(), 3);
+        assert_eq!(range.end_location.column(), 4);
+        Ok(())
+    }
 }

src/ast/types.rs

@@ -22,12 +22,16 @@ pub struct Range {
 }
 
 impl Range {
-    pub fn from_located<T>(located: &Located<T>) -> Self {
-        Range {
-            location: located.location,
-            end_location: located.end_location.unwrap(),
+    pub fn new(location: Location, end_location: Location) -> Self {
+        Self {
+            location,
+            end_location,
         }
     }
+
+    pub fn from_located<T>(located: &Located<T>) -> Self {
+        Range::new(located.location, located.end_location.unwrap())
+    }
 }
 
 #[derive(Debug)]

src/ast/visitor.rs

@@ -38,6 +38,9 @@ pub trait Visitor<'a> {
     fn visit_excepthandler(&mut self, excepthandler: &'a Excepthandler) {
         walk_excepthandler(self, excepthandler);
     }
+    fn visit_format_spec(&mut self, format_spec: &'a Expr) {
+        walk_expr(self, format_spec);
+    }
     fn visit_arguments(&mut self, arguments: &'a Arguments) {
         walk_arguments(self, arguments);
     }
@@ -387,7 +390,7 @@ pub fn walk_expr<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, expr: &'a Expr) {
         } => {
             visitor.visit_expr(value);
             if let Some(expr) = format_spec {
-                visitor.visit_expr(expr);
+                visitor.visit_format_spec(expr);
             }
         }
         ExprKind::JoinedStr { values } => {

src/ast/whitespace.rs

@@ -9,10 +9,10 @@ use crate::checkers::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()),
-    })
+    checker.locator.slice_source_code_range(&Range::new(
+        Location::new(range.location.row(), 0),
+        Location::new(range.location.row(), range.location.column()),
+    ))
 }
 
 /// Extract the leading words from a line of text.

src/autofix/fixer.rs

@@ -68,10 +68,7 @@ fn apply_fixes<'a>(
         }
 
         // Add all contents from `last_pos` to `fix.location`.
-        let slice = locator.slice_source_code_range(&Range {
-            location: last_pos,
-            end_location: fix.location,
-        });
+        let slice = locator.slice_source_code_range(&Range::new(last_pos, fix.location));
         output.append(&slice);
 
         // Add the patch itself.

src/cache.rs

@@ -15,8 +15,9 @@ use serde::{Deserialize, Serialize};
 use crate::message::Message;
 use crate::settings::{flags, Settings};
 
-static CACHE_DIR: Lazy<Option<String>> = Lazy::new(|| std::env::var("RUFF_CACHE_DIR").ok());
 const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
+static CACHE_DIR: Lazy<Option<String>> = Lazy::new(|| std::env::var("RUFF_CACHE_DIR").ok());
+pub const DEFAULT_CACHE_DIR_NAME: &str = ".ruff_cache";
 
 #[derive(Serialize, Deserialize)]
 struct CacheMetadata {
@@ -40,7 +41,7 @@ struct CheckResult {
 pub fn cache_dir(project_root: &Path) -> PathBuf {
     CACHE_DIR
         .as_ref()
-        .map_or_else(|| project_root.join(".ruff_cache"), PathBuf::from)
+        .map_or_else(|| project_root.join(DEFAULT_CACHE_DIR_NAME), PathBuf::from)
 }
 
 fn content_dir() -> &'static Path {

src/checkers/ast.rs

@@ -87,7 +87,6 @@ pub struct Checker<'a> {
     deferred_assignments: Vec<DeferralContext<'a>>,
     // Internal, derivative state.
     visible_scope: VisibleScope,
-    in_f_string: Option<Range>,
     in_annotation: bool,
     in_type_definition: bool,
     in_deferred_string_type_definition: bool,
@@ -144,7 +143,6 @@ impl<'a> Checker<'a> {
                 modifier: Modifier::Module,
                 visibility: module_visibility(path),
             },
-            in_f_string: None,
             in_annotation: false,
             in_type_definition: false,
             in_deferred_string_type_definition: false,
@@ -161,14 +159,7 @@ impl<'a> Checker<'a> {
     }
 
     /// Add a `Check` to the `Checker`.
-    pub(crate) fn add_check(&mut self, mut check: Check) {
-        // If we're in an f-string, override the location. RustPython doesn't produce
-        // reliable locations for expressions within f-strings, so we use the
-        // span of the f-string itself as a best-effort default.
-        if let Some(range) = self.in_f_string {
-            check.location = range.location;
-            check.end_location = range.end_location;
-        }
+    pub(crate) fn add_check(&mut self, check: Check) {
         self.checks.push(check);
     }
 
@@ -184,16 +175,7 @@ impl<'a> Checker<'a> {
     pub fn patch(&self, code: &CheckCode) -> bool {
         // TODO(charlie): We can't fix errors in f-strings until RustPython adds
         // location data.
-        matches!(self.autofix, flags::Autofix::Enabled)
-            && self.in_f_string.is_none()
-            && self.settings.fixable.contains(code)
-    }
-
-    /// Return the amended `Range` from a `Located`.
-    pub fn range_for<T>(&self, located: &Located<T>) -> Range {
-        // If we're in an f-string, override the location.
-        self.in_f_string
-            .unwrap_or_else(|| Range::from_located(located))
+        matches!(self.autofix, flags::Autofix::Enabled) && self.settings.fixable.contains(code)
     }
 
     /// Return `true` if the `Expr` is a reference to `typing.${target}`.
@@ -231,10 +213,10 @@ impl<'a> Checker<'a> {
             return false;
         }
         let noqa_lineno = self.noqa_line_for.get(&lineno).unwrap_or(&lineno);
-        let line = self.locator.slice_source_code_range(&Range {
-            location: Location::new(*noqa_lineno, 0),
-            end_location: Location::new(noqa_lineno + 1, 0),
-        });
+        let line = self.locator.slice_source_code_range(&Range::new(
+            Location::new(*noqa_lineno, 0),
+            Location::new(noqa_lineno + 1, 0),
+        ));
         match noqa::extract_noqa_directive(&line) {
             Directive::None => false,
             Directive::All(..) => true,
@@ -282,16 +264,17 @@ where
         match &stmt.node {
             StmtKind::Global { names } => {
                 let scope_index = *self.scope_stack.last().expect("No current scope found");
+                let ranges = helpers::find_names(stmt, self.locator);
                 if scope_index != GLOBAL_SCOPE_INDEX {
                     // Add the binding to the current scope.
                     let scope = &mut self.scopes[scope_index];
                     let usage = Some((scope.id, Range::from_located(stmt)));
-                    for name in names {
+                    for (name, range) in names.iter().zip(ranges.iter()) {
                         let index = self.bindings.len();
                         self.bindings.push(Binding {
                             kind: BindingKind::Global,
                             used: usage,
-                            range: Range::from_located(stmt),
+                            range: *range,
                             source: Some(RefEquality(stmt)),
                         });
                         scope.values.insert(name, index);
@@ -302,8 +285,9 @@ where
                     self.add_checks(
                         names
                             .iter()
-                            .filter_map(|name| {
-                                pycodestyle::checks::ambiguous_variable_name(name, stmt)
+                            .zip(ranges.iter())
+                            .filter_map(|(name, range)| {
+                                pycodestyle::checks::ambiguous_variable_name(name, *range)
                             })
                             .into_iter(),
                     );
@@ -311,16 +295,17 @@ where
             }
             StmtKind::Nonlocal { names } => {
                 let scope_index = *self.scope_stack.last().expect("No current scope found");
+                let ranges = helpers::find_names(stmt, self.locator);
                 if scope_index != GLOBAL_SCOPE_INDEX {
                     let scope = &mut self.scopes[scope_index];
                     let usage = Some((scope.id, Range::from_located(stmt)));
-                    for name in names {
+                    for (name, range) in names.iter().zip(ranges.iter()) {
                         // Add a binding to the current scope.
                         let index = self.bindings.len();
                         self.bindings.push(Binding {
                             kind: BindingKind::Nonlocal,
                             used: usage,
-                            range: Range::from_located(stmt),
+                            range: *range,
                             source: Some(RefEquality(stmt)),
                         });
                         scope.values.insert(name, index);
@@ -328,7 +313,7 @@ where
 
                     // Mark the binding in the defining scopes as used too. (Skip the global scope
                     // and the current scope.)
-                    for name in names {
+                    for (name, range) in names.iter().zip(ranges.iter()) {
                         let mut exists = false;
                         for index in self.scope_stack.iter().skip(1).rev().skip(1) {
                             if let Some(index) = self.scopes[*index].values.get(&name.as_str()) {
@@ -342,7 +327,7 @@ where
                             if self.settings.enabled.contains(&CheckCode::PLE0117) {
                                 self.add_check(Check::new(
                                     CheckKind::NonlocalWithoutBinding(name.to_string()),
-                                    Range::from_located(stmt),
+                                    *range,
                                 ));
                             }
                         }
@@ -353,8 +338,9 @@ where
                     self.add_checks(
                         names
                             .iter()
-                            .filter_map(|name| {
-                                pycodestyle::checks::ambiguous_variable_name(name, stmt)
+                            .zip(ranges.iter())
+                            .filter_map(|(name, range)| {
+                                pycodestyle::checks::ambiguous_variable_name(name, *range)
                             })
                             .into_iter(),
                     );
@@ -550,7 +536,7 @@ where
                     Binding {
                         kind: BindingKind::FunctionDefinition,
                         used: None,
-                        range: Range::from_located(stmt),
+                        range: helpers::identifier_range(stmt, self.locator),
                         source: Some(self.current_stmt().clone()),
                     },
                 );
@@ -600,9 +586,12 @@ where
                 }
 
                 if self.settings.enabled.contains(&CheckCode::N818) {
-                    if let Some(check) =
-                        pep8_naming::checks::error_suffix_on_exception_name(stmt, bases, name)
-                    {
+                    if let Some(check) = pep8_naming::checks::error_suffix_on_exception_name(
+                        stmt,
+                        bases,
+                        name,
+                        self.locator,
+                    ) {
                         self.add_check(check);
                     }
                 }
@@ -652,6 +641,9 @@ where
                 if self.settings.enabled.contains(&CheckCode::UP023) {
                     pyupgrade::plugins::replace_c_element_tree(self, stmt);
                 }
+                if self.settings.enabled.contains(&CheckCode::UP026) {
+                    pyupgrade::plugins::rewrite_mock_import(self, stmt);
+                }
 
                 for alias in names {
                     if alias.node.name.contains('.') && alias.node.asname.is_none() {
@@ -863,6 +855,9 @@ where
                         pyupgrade::plugins::unnecessary_future_import(self, stmt, names);
                     }
                 }
+                if self.settings.enabled.contains(&CheckCode::UP026) {
+                    pyupgrade::plugins::rewrite_mock_import(self, stmt);
+                }
 
                 if self.settings.enabled.contains(&CheckCode::TID251) {
                     if let Some(module) = module {
@@ -1116,6 +1111,11 @@ where
                         flake8_errmsg::plugins::string_in_exception(self, exc);
                     }
                 }
+                if self.settings.enabled.contains(&CheckCode::UP024) {
+                    if let Some(item) = exc {
+                        pyupgrade::plugins::os_error_alias(self, item);
+                    }
+                }
             }
             StmtKind::AugAssign { target, .. } => {
                 self.handle_node_load(target);
@@ -1186,7 +1186,9 @@ where
             }
             StmtKind::Try { handlers, .. } => {
                 if self.settings.enabled.contains(&CheckCode::F707) {
-                    if let Some(check) = pyflakes::checks::default_except_not_last(handlers) {
+                    if let Some(check) =
+                        pyflakes::checks::default_except_not_last(handlers, self.locator)
+                    {
                         self.add_check(check);
                     }
                 }
@@ -1198,6 +1200,9 @@ where
                 if self.settings.enabled.contains(&CheckCode::B013) {
                     flake8_bugbear::plugins::redundant_tuple_in_exception_handler(self, handlers);
                 }
+                if self.settings.enabled.contains(&CheckCode::UP024) {
+                    pyupgrade::plugins::os_error_alias(self, handlers);
+                }
             }
             StmtKind::Assign { targets, value, .. } => {
                 if self.settings.enabled.contains(&CheckCode::E731) {
@@ -1205,12 +1210,11 @@ where
                         pycodestyle::plugins::do_not_assign_lambda(self, target, value, stmt);
                     }
                 }
-                if self.settings.enabled.contains(&CheckCode::UP001) {
-                    pyupgrade::plugins::useless_metaclass_type(self, stmt, value, targets);
-                }
+
                 if self.settings.enabled.contains(&CheckCode::B003) {
                     flake8_bugbear::plugins::assignment_to_os_environ(self, targets);
                 }
+
                 if self.settings.enabled.contains(&CheckCode::S105) {
                     if let Some(check) =
                         flake8_bandit::plugins::assign_hardcoded_password_string(value, targets)
@@ -1218,6 +1222,10 @@ where
                         self.add_check(check);
                     }
                 }
+
+                if self.settings.enabled.contains(&CheckCode::UP001) {
+                    pyupgrade::plugins::useless_metaclass_type(self, stmt, value, targets);
+                }
                 if self.settings.enabled.contains(&CheckCode::UP013) {
                     pyupgrade::plugins::convert_typed_dict_functional_to_class(
                         self, stmt, targets, value,
@@ -1228,6 +1236,10 @@ where
                         self, stmt, targets, value,
                     );
                 }
+                if self.settings.enabled.contains(&CheckCode::UP027) {
+                    pyupgrade::plugins::unpack_list_comprehension(self, targets, value);
+                }
+
                 if self.settings.enabled.contains(&CheckCode::PD901) {
                     if let Some(check) = pandas_vet::checks::assignment_to_df(targets) {
                         self.add_check(check);
@@ -1430,7 +1442,7 @@ where
                     Binding {
                         kind: BindingKind::ClassDefinition,
                         used: None,
-                        range: Range::from_located(stmt),
+                        range: helpers::identifier_range(stmt, self.locator),
                         source: Some(self.current_stmt().clone()),
                     },
                 );
@@ -1479,7 +1491,6 @@ where
 
         self.push_expr(expr);
 
-        let prev_in_f_string = self.in_f_string;
         let prev_in_literal = self.in_literal;
         let prev_in_type_definition = self.in_type_definition;
 
@@ -1554,9 +1565,10 @@ where
                     }
                     ExprContext::Store => {
                         if self.settings.enabled.contains(&CheckCode::E741) {
-                            if let Some(check) =
-                                pycodestyle::checks::ambiguous_variable_name(id, expr)
-                            {
+                            if let Some(check) = pycodestyle::checks::ambiguous_variable_name(
+                                id,
+                                Range::from_located(expr),
+                            ) {
                                 self.add_check(check);
                             }
                         }
@@ -1576,7 +1588,7 @@ where
                     pylint::plugins::used_prior_global_declaration(self, id, expr);
                 }
             }
-            ExprKind::Attribute { attr, .. } => {
+            ExprKind::Attribute { attr, value, .. } => {
                 // Ex) typing.List[...]
                 if !self.in_deferred_string_type_definition
                     && self.settings.enabled.contains(&CheckCode::UP006)
@@ -1601,6 +1613,10 @@ where
                 if self.settings.enabled.contains(&CheckCode::UP019) {
                     pyupgrade::plugins::typing_text_str_alias(self, expr);
                 }
+                if self.settings.enabled.contains(&CheckCode::UP026) {
+                    pyupgrade::plugins::rewrite_mock_attribute(self, expr);
+                }
+
                 if self.settings.enabled.contains(&CheckCode::YTT202) {
                     flake8_2020::plugins::name_or_attribute(self, expr);
                 }
@@ -1613,6 +1629,16 @@ where
                 ] {
                     if self.settings.enabled.contains(&code) {
                         if attr == name {
+                            // Avoid flagging on function calls (e.g., `df.values()`).
+                            if let Some(parent) = self.current_expr_parent() {
+                                if matches!(parent.0.node, ExprKind::Call { .. }) {
+                                    continue;
+                                }
+                            }
+                            // Avoid flagging on non-DataFrames (e.g., `{"a": 1}.values`).
+                            if helpers::is_non_variable(value) {
+                                continue;
+                            }
                             self.add_check(Check::new(code.kind(), Range::from_located(expr)));
                         };
                     }
@@ -1722,12 +1748,15 @@ where
                 if self.settings.enabled.contains(&CheckCode::UP022) {
                     pyupgrade::plugins::replace_stdout_stderr(self, expr, keywords);
                 }
+                if self.settings.enabled.contains(&CheckCode::UP024) {
+                    pyupgrade::plugins::os_error_alias(self, expr);
+                }
 
                 // flake8-print
                 if self.settings.enabled.contains(&CheckCode::T201)
                     || self.settings.enabled.contains(&CheckCode::T203)
                 {
-                    flake8_print::plugins::print_call(self, expr, func, keywords);
+                    flake8_print::plugins::print_call(self, func, keywords);
                 }
 
                 // flake8-bugbear
@@ -2166,10 +2195,9 @@ where
             }
             ExprKind::JoinedStr { values } => {
                 if self.settings.enabled.contains(&CheckCode::F541) {
-                    if self.in_f_string.is_none()
-                        && !values
-                            .iter()
-                            .any(|value| matches!(value.node, ExprKind::FormattedValue { .. }))
+                    if !values
+                        .iter()
+                        .any(|value| matches!(value.node, ExprKind::FormattedValue { .. }))
                     {
                         self.add_check(Check::new(
                             CheckKind::FStringMissingPlaceholders,
@@ -2177,7 +2205,6 @@ where
                         ));
                     }
                 }
-                self.in_f_string = Some(Range::from_located(expr));
             }
             ExprKind::BinOp {
                 left,
@@ -2375,6 +2402,10 @@ where
                         comparators,
                     );
                 }
+
+                if self.settings.enabled.contains(&CheckCode::SIM300) {
+                    flake8_simplify::plugins::yoda_conditions(self, expr, left, ops, comparators);
+                }
             }
             ExprKind::Constant {
                 value: Constant::Str(value),
@@ -2397,7 +2428,7 @@ where
                     }
                 }
                 if self.settings.enabled.contains(&CheckCode::UP025) {
-                    pyupgrade::plugins::rewrite_unicode_literal(self, expr, value, kind);
+                    pyupgrade::plugins::rewrite_unicode_literal(self, expr, kind);
                 }
             }
             ExprKind::Lambda { args, body, .. } => {
@@ -2670,6 +2701,9 @@ where
                 }
                 self.in_subscript = prev_in_subscript;
             }
+            ExprKind::JoinedStr { .. } => {
+                visitor::walk_expr(self, expr);
+            }
             _ => visitor::walk_expr(self, expr),
         }
 
@@ -2687,7 +2721,6 @@ where
 
         self.in_type_definition = prev_in_type_definition;
         self.in_literal = prev_in_literal;
-        self.in_f_string = prev_in_f_string;
 
         self.pop_expr();
     }
@@ -2701,7 +2734,8 @@ where
                     if let Some(check) = pycodestyle::checks::do_not_use_bare_except(
                         type_.as_deref(),
                         body,
-                        Range::from_located(excepthandler),
+                        excepthandler,
+                        self.locator,
                     ) {
                         self.add_check(check);
                     }
@@ -2720,9 +2754,11 @@ where
                 match name {
                     Some(name) => {
                         if self.settings.enabled.contains(&CheckCode::E741) {
-                            if let Some(check) =
-                                pycodestyle::checks::ambiguous_variable_name(name, excepthandler)
-                            {
+                            if let Some(check) = pycodestyle::checks::ambiguous_variable_name(
+                                name,
+                                helpers::excepthandler_name_range(excepthandler, self.locator)
+                                    .expect("Failed to find `name` range"),
+                            ) {
                                 self.add_check(check);
                             }
                         }
@@ -2788,11 +2824,18 @@ where
         }
     }
 
-    fn visit_arguments(&mut self, arguments: &'b Arguments) {
-        if self.settings.enabled.contains(&CheckCode::F831) {
-            self.checks
-                .extend(pyflakes::checks::duplicate_arguments(arguments));
+    fn visit_format_spec(&mut self, format_spec: &'b Expr) {
+        match &format_spec.node {
+            ExprKind::JoinedStr { values } => {
+                for value in values {
+                    self.visit_expr(value);
+                }
+            }
+            _ => unreachable!("Unexpected expression for format_spec"),
         }
+    }
+
+    fn visit_arguments(&mut self, arguments: &'b Arguments) {
         if self.settings.enabled.contains(&CheckCode::B006) {
             flake8_bugbear::plugins::mutable_argument_default(self, arguments);
         }
@@ -2843,7 +2886,10 @@ where
         );
 
         if self.settings.enabled.contains(&CheckCode::E741) {
-            if let Some(check) = pycodestyle::checks::ambiguous_variable_name(&arg.node.arg, arg) {
+            if let Some(check) = pycodestyle::checks::ambiguous_variable_name(
+                &arg.node.arg,
+                Range::from_located(arg),
+            ) {
                 self.add_check(check);
             }
         }
@@ -3673,7 +3719,22 @@ impl<'a> Checker<'a> {
 
                     let defined_by = binding.source.as_ref().unwrap();
                     let defined_in = self.child_to_parent.get(defined_by);
-                    if self.is_ignored(&CheckCode::F401, binding.range.location.row()) {
+                    let child = defined_by.0;
+
+                    let check_lineno = binding.range.location.row();
+                    let parent_lineno = if matches!(child.node, StmtKind::ImportFrom { .. })
+                        && child.location.row() != check_lineno
+                    {
+                        Some(child.location.row())
+                    } else {
+                        None
+                    };
+
+                    if self.is_ignored(&CheckCode::F401, check_lineno)
+                        || parent_lineno.map_or(false, |parent_lineno| {
+                            self.is_ignored(&CheckCode::F401, parent_lineno)
+                        })
+                    {
                         ignored
                             .entry((defined_by, defined_in))
                             .or_default()
@@ -3720,26 +3781,40 @@ impl<'a> Checker<'a> {
                         None
                     };
 
+                    let multiple = unused_imports.len() > 1;
                     for (full_name, range) in unused_imports {
                         let mut check = Check::new(
-                            CheckKind::UnusedImport(full_name.clone(), ignore_init),
+                            CheckKind::UnusedImport(full_name.clone(), ignore_init, multiple),
                             *range,
                         );
+                        if matches!(child.node, StmtKind::ImportFrom { .. })
+                            && child.location.row() != range.location.row()
+                        {
+                            check.parent(child.location);
+                        }
                         if let Some(fix) = fix.as_ref() {
                             check.amend(fix.clone());
                         }
                         checks.push(check);
                     }
                 }
-                for (_, unused_imports) in ignored
+                for ((defined_by, ..), unused_imports) in ignored
                     .into_iter()
                     .sorted_by_key(|((defined_by, _), _)| defined_by.0.location)
                 {
+                    let child = defined_by.0;
+                    let multiple = unused_imports.len() > 1;
                     for (full_name, range) in unused_imports {
-                        checks.push(Check::new(
-                            CheckKind::UnusedImport(full_name.clone(), ignore_init),
+                        let mut check = Check::new(
+                            CheckKind::UnusedImport(full_name.clone(), ignore_init, multiple),
                             *range,
-                        ));
+                        );
+                        if matches!(child.node, StmtKind::ImportFrom { .. })
+                            && child.location.row() != range.location.row()
+                        {
+                            check.parent(child.location);
+                        }
+                        checks.push(check);
                     }
                 }
             }
@@ -3839,10 +3914,10 @@ impl<'a> Checker<'a> {
                 let content = self
                     .locator
                     .slice_source_code_range(&Range::from_located(expr));
-                let indentation = self.locator.slice_source_code_range(&Range {
-                    location: Location::new(expr.location.row(), 0),
-                    end_location: Location::new(expr.location.row(), expr.location.column()),
-                });
+                let indentation = self.locator.slice_source_code_range(&Range::new(
+                    Location::new(expr.location.row(), 0),
+                    Location::new(expr.location.row(), expr.location.column()),
+                ));
                 let body = pydocstyle::helpers::raw_contents(&content);
                 let docstring = Docstring {
                     kind: definition.kind,

src/checkers/imports.rs

@@ -11,11 +11,13 @@ use crate::isort;
 use crate::isort::track::ImportTracker;
 use crate::settings::{flags, Settings};
 use crate::source_code_locator::SourceCodeLocator;
+use crate::source_code_style::SourceCodeStyleDetector;
 
 fn check_import_blocks(
     tracker: ImportTracker,
     locator: &SourceCodeLocator,
     settings: &Settings,
+    stylist: &SourceCodeStyleDetector,
     autofix: flags::Autofix,
     package: Option<&Path>,
 ) -> Vec<Check> {
@@ -23,7 +25,7 @@ fn check_import_blocks(
     for block in tracker.into_iter() {
         if !block.imports.is_empty() {
             if let Some(check) =
-                isort::plugins::check_imports(&block, locator, settings, autofix, package)
+                isort::plugins::check_imports(&block, locator, settings, stylist, autofix, package)
             {
                 checks.push(check);
             }
@@ -32,11 +34,13 @@ fn check_import_blocks(
     checks
 }
 
+#[allow(clippy::too_many_arguments)]
 pub fn check_imports(
     python_ast: &Suite,
     locator: &SourceCodeLocator,
     directives: &IsortDirectives,
     settings: &Settings,
+    stylist: &SourceCodeStyleDetector,
     autofix: flags::Autofix,
     path: &Path,
     package: Option<&Path>,
@@ -45,5 +49,5 @@ pub fn check_imports(
     for stmt in python_ast {
         tracker.visit_stmt(stmt);
     }
-    check_import_blocks(tracker, locator, settings, autofix, package)
+    check_import_blocks(tracker, locator, settings, stylist, autofix, package)
 }

src/checkers/noqa.rs

@@ -25,12 +25,6 @@ pub fn check_noqa(
 
     let enforce_noqa = settings.enabled.contains(&CheckCode::RUF100);
 
-    checks.sort_by_key(|check| check.location);
-    let mut checks_iter = checks.iter().enumerate().peekable();
-    if let Some((_index, check)) = checks_iter.peek() {
-        assert!(check.location.row() >= 1);
-    }
-
     let lines: Vec<&str> = contents.lines().collect();
     for lineno in commented_lines {
         // If we hit an exemption for the entire file, bail.
@@ -44,20 +38,18 @@ pub fn check_noqa(
                 .entry(lineno - 1)
                 .or_insert_with(|| (noqa::extract_noqa_directive(lines[lineno - 1]), vec![]));
         }
+    }
 
-        // Remove any ignored checks.
-        while let Some((index, check)) =
-            checks_iter.next_if(|(_index, check)| check.location.row() <= *lineno)
-        {
-            if check.kind == CheckKind::BlanketNOQA {
-                continue;
-            }
-            // Grab the noqa (logical) line number for the current (physical) line.
-            // If there are newlines at the end of the file, they won't be represented in
-            // `noqa_line_for`, so fallback to the current line.
-            let check_lineno = check.location.row();
-            let noqa_lineno = noqa_line_for.get(&check_lineno).unwrap_or(&check_lineno);
-            if noqa_lineno == lineno {
+    // Remove any ignored checks.
+    for (index, check) in checks.iter().enumerate() {
+        if check.kind == CheckKind::BlanketNOQA {
+            continue;
+        }
+
+        // Is the check ignored by a `noqa` directive on the parent line?
+        if let Some(parent_lineno) = check.parent.map(|location| location.row()) {
+            let noqa_lineno = noqa_line_for.get(&parent_lineno).unwrap_or(&parent_lineno);
+            if commented_lines.contains(noqa_lineno) {
                 let noqa = noqa_directives.entry(noqa_lineno - 1).or_insert_with(|| {
                     (noqa::extract_noqa_directive(lines[noqa_lineno - 1]), vec![])
                 });
@@ -65,17 +57,41 @@ pub fn check_noqa(
                     (Directive::All(..), matches) => {
                         matches.push(check.kind.code().as_ref());
                         ignored.push(index);
+                        continue;
                     }
                     (Directive::Codes(.., codes), matches) => {
                         if noqa::includes(check.kind.code(), codes) {
                             matches.push(check.kind.code().as_ref());
                             ignored.push(index);
+                            continue;
                         }
                     }
                     (Directive::None, ..) => {}
                 }
             }
         }
+
+        // Is the check ignored by a `noqa` directive on the same line?
+        let check_lineno = check.location.row();
+        let noqa_lineno = noqa_line_for.get(&check_lineno).unwrap_or(&check_lineno);
+        if commented_lines.contains(noqa_lineno) {
+            let noqa = noqa_directives
+                .entry(noqa_lineno - 1)
+                .or_insert_with(|| (noqa::extract_noqa_directive(lines[noqa_lineno - 1]), vec![]));
+            match noqa {
+                (Directive::All(..), matches) => {
+                    matches.push(check.kind.code().as_ref());
+                    ignored.push(index);
+                }
+                (Directive::Codes(.., codes), matches) => {
+                    if noqa::includes(check.kind.code(), codes) {
+                        matches.push(check.kind.code().as_ref());
+                        ignored.push(index);
+                    }
+                }
+                (Directive::None, ..) => {}
+            }
+        }
     }
 
     // Enforce that the noqa directive was actually used (RUF100).
@@ -86,10 +102,7 @@ pub fn check_noqa(
                     if matches.is_empty() {
                         let mut check = Check::new(
                             CheckKind::UnusedNOQA(None),
-                            Range {
-                                location: Location::new(row + 1, start),
-                                end_location: Location::new(row + 1, end),
-                            },
+                            Range::new(Location::new(row + 1, start), Location::new(row + 1, end)),
                         );
                         if matches!(autofix, flags::Autofix::Enabled)
                             && settings.fixable.contains(check.kind.code())
@@ -153,10 +166,7 @@ pub fn check_noqa(
                                     .map(|code| (*code).to_string())
                                     .collect(),
                             })),
-                            Range {
-                                location: Location::new(row + 1, start),
-                                end_location: Location::new(row + 1, end),
-                            },
+                            Range::new(Location::new(row + 1, start), Location::new(row + 1, end)),
                         );
                         if matches!(autofix, flags::Autofix::Enabled)
                             && settings.fixable.contains(check.kind.code())

src/checks.rs

@@ -3,6 +3,7 @@ use std::fmt;
 use itertools::Itertools;
 use once_cell::sync::Lazy;
 use rustc_hash::FxHashMap;
+use rustpython_ast::Cmpop;
 use rustpython_parser::ast::Location;
 use serde::{Deserialize, Serialize};
 use strum_macros::{AsRefStr, Display, EnumIter, EnumString};
@@ -91,7 +92,6 @@ pub enum CheckCode {
     F821,
     F822,
     F823,
-    F831,
     F841,
     F842,
     F901,
@@ -213,6 +213,7 @@ pub enum CheckCode {
     YTT303,
     // flake8-simplify
     SIM118,
+    SIM300,
     // pyupgrade
     UP001,
     UP003,
@@ -236,7 +237,10 @@ pub enum CheckCode {
     UP021,
     UP022,
     UP023,
+    UP024,
     UP025,
+    UP026,
+    UP027,
     // pydocstyle
     D100,
     D101,
@@ -618,11 +622,37 @@ pub enum LintSource {
 }
 
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum RejectedCmpop {
+pub enum EqCmpop {
     Eq,
     NotEq,
 }
 
+impl From<&Cmpop> for EqCmpop {
+    fn from(cmpop: &Cmpop) -> Self {
+        match cmpop {
+            Cmpop::Eq => EqCmpop::Eq,
+            Cmpop::NotEq => EqCmpop::NotEq,
+            _ => unreachable!("Expected Cmpop::Eq | Cmpop::NotEq"),
+        }
+    }
+}
+
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub enum IsCmpop {
+    Is,
+    IsNot,
+}
+
+impl From<&Cmpop> for IsCmpop {
+    fn from(cmpop: &Cmpop) -> Self {
+        match cmpop {
+            Cmpop::Is => IsCmpop::Is,
+            Cmpop::IsNot => IsCmpop::IsNot,
+            _ => unreachable!("Expected Cmpop::Is | Cmpop::IsNot"),
+        }
+    }
+}
+
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum DeferralKeyword {
     Yield,
@@ -655,6 +685,21 @@ impl fmt::Display for Branch {
     }
 }
 
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub enum LiteralType {
+    Str,
+    Bytes,
+}
+
+impl fmt::Display for LiteralType {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            LiteralType::Str => fmt.write_str("str"),
+            LiteralType::Bytes => fmt.write_str("bytes"),
+        }
+    }
+}
+
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct UnusedCodes {
     pub unknown: Vec<String>,
@@ -662,23 +707,29 @@ pub struct UnusedCodes {
     pub unmatched: Vec<String>,
 }
 
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub enum MockReference {
+    Import,
+    Attribute,
+}
+
 #[derive(AsRefStr, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum CheckKind {
     // pycodestyle errors
     AmbiguousClassName(String),
     AmbiguousFunctionName(String),
     AmbiguousVariableName(String),
-    DoNotAssignLambda,
+    DoNotAssignLambda(String),
     DoNotUseBareExcept,
     IOError(String),
     LineTooLong(usize, usize),
     ModuleImportNotAtTopOfFile,
     MultipleImportsOnOneLine,
-    NoneComparison(RejectedCmpop),
+    NoneComparison(EqCmpop),
     NotInTest,
     NotIsTest,
     SyntaxError(String),
-    TrueFalseComparison(bool, RejectedCmpop),
+    TrueFalseComparison(bool, EqCmpop),
     TypeComparison,
     // pycodestyle warnings
     NoNewLineAtEndOfFile,
@@ -688,7 +739,6 @@ pub enum CheckKind {
     BreakOutsideLoop,
     ContinueOutsideLoop,
     DefaultExceptNotLast,
-    DuplicateArgumentName,
     ExpressionsInStarAssignment,
     FStringMissingPlaceholders,
     ForwardAnnotationSyntaxError(String),
@@ -699,7 +749,7 @@ pub enum CheckKind {
     ImportStarUsage(String, Vec<String>),
     ImportStarUsed(String),
     InvalidPrintSyntax,
-    IsLiteral,
+    IsLiteral(IsCmpop),
     LateFutureImport,
     MultiValueRepeatedKeyLiteral,
     MultiValueRepeatedKeyVariable(String),
@@ -725,7 +775,7 @@ pub enum CheckKind {
     UndefinedLocal(String),
     UnusedAnnotation(String),
     UndefinedName(String),
-    UnusedImport(String, bool),
+    UnusedImport(String, bool, bool),
     UnusedVariable(String),
     YieldOutsideFunction(DeferralKeyword),
     // pylint
@@ -844,6 +894,7 @@ pub enum CheckKind {
     SysVersionSlice1Referenced,
     // flake8-simplify
     KeyInDict(String, String),
+    YodaConditions(String, String),
     // pyupgrade
     TypeOfPrimitive(Primitive),
     UselessMetaclassType,
@@ -859,15 +910,18 @@ pub enum CheckKind {
     UnnecessaryEncodeUTF8,
     ConvertTypedDictFunctionalToClass(String),
     ConvertNamedTupleFunctionalToClass(String),
-    RedundantOpenModes,
+    RedundantOpenModes(Option<String>),
     RemoveSixCompat,
     DatetimeTimezoneUTC,
-    NativeLiterals,
+    NativeLiterals(LiteralType),
     OpenAlias,
     ReplaceUniversalNewlines,
     ReplaceStdoutStderr,
     RewriteCElementTree,
+    OSErrorAlias(Option<String>),
     RewriteUnicodeLiteral,
+    RewriteMockImport(MockReference),
+    RewriteListComprehension,
     // pydocstyle
     BlankLineAfterLastSection(String),
     BlankLineAfterSection(String),
@@ -1030,13 +1084,13 @@ impl CheckCode {
             CheckCode::E401 => CheckKind::MultipleImportsOnOneLine,
             CheckCode::E402 => CheckKind::ModuleImportNotAtTopOfFile,
             CheckCode::E501 => CheckKind::LineTooLong(89, 88),
-            CheckCode::E711 => CheckKind::NoneComparison(RejectedCmpop::Eq),
-            CheckCode::E712 => CheckKind::TrueFalseComparison(true, RejectedCmpop::Eq),
+            CheckCode::E711 => CheckKind::NoneComparison(EqCmpop::Eq),
+            CheckCode::E712 => CheckKind::TrueFalseComparison(true, EqCmpop::Eq),
             CheckCode::E713 => CheckKind::NotInTest,
             CheckCode::E714 => CheckKind::NotIsTest,
             CheckCode::E721 => CheckKind::TypeComparison,
             CheckCode::E722 => CheckKind::DoNotUseBareExcept,
-            CheckCode::E731 => CheckKind::DoNotAssignLambda,
+            CheckCode::E731 => CheckKind::DoNotAssignLambda("...".to_string()),
             CheckCode::E741 => CheckKind::AmbiguousVariableName("...".to_string()),
             CheckCode::E742 => CheckKind::AmbiguousClassName("...".to_string()),
             CheckCode::E743 => CheckKind::AmbiguousFunctionName("...".to_string()),
@@ -1046,7 +1100,7 @@ impl CheckCode {
             CheckCode::W292 => CheckKind::NoNewLineAtEndOfFile,
             CheckCode::W605 => CheckKind::InvalidEscapeSequence('c'),
             // pyflakes
-            CheckCode::F401 => CheckKind::UnusedImport("...".to_string(), false),
+            CheckCode::F401 => CheckKind::UnusedImport("...".to_string(), false, false),
             CheckCode::F402 => CheckKind::ImportShadowedByLoopVar("...".to_string(), 1),
             CheckCode::F403 => CheckKind::ImportStarUsed("...".to_string()),
             CheckCode::F404 => CheckKind::LateFutureImport,
@@ -1079,7 +1133,7 @@ impl CheckCode {
             CheckCode::F621 => CheckKind::ExpressionsInStarAssignment,
             CheckCode::F622 => CheckKind::TwoStarredExpressions,
             CheckCode::F631 => CheckKind::AssertTuple,
-            CheckCode::F632 => CheckKind::IsLiteral,
+            CheckCode::F632 => CheckKind::IsLiteral(IsCmpop::Is),
             CheckCode::F633 => CheckKind::InvalidPrintSyntax,
             CheckCode::F634 => CheckKind::IfTuple,
             CheckCode::F701 => CheckKind::BreakOutsideLoop,
@@ -1092,7 +1146,6 @@ impl CheckCode {
             CheckCode::F821 => CheckKind::UndefinedName("...".to_string()),
             CheckCode::F822 => CheckKind::UndefinedExport("...".to_string()),
             CheckCode::F823 => CheckKind::UndefinedLocal("...".to_string()),
-            CheckCode::F831 => CheckKind::DuplicateArgumentName,
             CheckCode::F841 => CheckKind::UnusedVariable("...".to_string()),
             CheckCode::F842 => CheckKind::UnusedAnnotation("...".to_string()),
             CheckCode::F901 => CheckKind::RaiseNotImplemented,
@@ -1236,6 +1289,7 @@ impl CheckCode {
             CheckCode::BLE001 => CheckKind::BlindExcept("Exception".to_string()),
             // flake8-simplify
             CheckCode::SIM118 => CheckKind::KeyInDict("key".to_string(), "dict".to_string()),
+            CheckCode::SIM300 => CheckKind::YodaConditions("left".to_string(), "right".to_string()),
             // pyupgrade
             CheckCode::UP001 => CheckKind::UselessMetaclassType,
             CheckCode::UP003 => CheckKind::TypeOfPrimitive(Primitive::Str),
@@ -1253,16 +1307,19 @@ impl CheckCode {
             CheckCode::UP012 => CheckKind::UnnecessaryEncodeUTF8,
             CheckCode::UP013 => CheckKind::ConvertTypedDictFunctionalToClass("...".to_string()),
             CheckCode::UP014 => CheckKind::ConvertNamedTupleFunctionalToClass("...".to_string()),
-            CheckCode::UP015 => CheckKind::RedundantOpenModes,
+            CheckCode::UP015 => CheckKind::RedundantOpenModes(None),
             CheckCode::UP016 => CheckKind::RemoveSixCompat,
             CheckCode::UP017 => CheckKind::DatetimeTimezoneUTC,
-            CheckCode::UP018 => CheckKind::NativeLiterals,
+            CheckCode::UP018 => CheckKind::NativeLiterals(LiteralType::Str),
             CheckCode::UP019 => CheckKind::TypingTextStrAlias,
             CheckCode::UP020 => CheckKind::OpenAlias,
             CheckCode::UP021 => CheckKind::ReplaceUniversalNewlines,
             CheckCode::UP022 => CheckKind::ReplaceStdoutStderr,
             CheckCode::UP023 => CheckKind::RewriteCElementTree,
+            CheckCode::UP024 => CheckKind::OSErrorAlias(None),
             CheckCode::UP025 => CheckKind::RewriteUnicodeLiteral,
+            CheckCode::UP026 => CheckKind::RewriteMockImport(MockReference::Import),
+            CheckCode::UP027 => CheckKind::RewriteListComprehension,
             // pydocstyle
             CheckCode::D100 => CheckKind::PublicModule,
             CheckCode::D101 => CheckKind::PublicClass,
@@ -1589,7 +1646,6 @@ impl CheckCode {
             CheckCode::F821 => CheckCategory::Pyflakes,
             CheckCode::F822 => CheckCategory::Pyflakes,
             CheckCode::F823 => CheckCategory::Pyflakes,
-            CheckCode::F831 => CheckCategory::Pyflakes,
             CheckCode::F841 => CheckCategory::Pyflakes,
             CheckCode::F842 => CheckCategory::Pyflakes,
             CheckCode::F901 => CheckCategory::Pyflakes,
@@ -1668,6 +1724,7 @@ impl CheckCode {
             CheckCode::S106 => CheckCategory::Flake8Bandit,
             CheckCode::S107 => CheckCategory::Flake8Bandit,
             CheckCode::SIM118 => CheckCategory::Flake8Simplify,
+            CheckCode::SIM300 => CheckCategory::Flake8Simplify,
             CheckCode::T100 => CheckCategory::Flake8Debugger,
             CheckCode::T201 => CheckCategory::Flake8Print,
             CheckCode::T203 => CheckCategory::Flake8Print,
@@ -1695,7 +1752,10 @@ impl CheckCode {
             CheckCode::UP021 => CheckCategory::Pyupgrade,
             CheckCode::UP022 => CheckCategory::Pyupgrade,
             CheckCode::UP023 => CheckCategory::Pyupgrade,
+            CheckCode::UP024 => CheckCategory::Pyupgrade,
             CheckCode::UP025 => CheckCategory::Pyupgrade,
+            CheckCode::UP026 => CheckCategory::Pyupgrade,
+            CheckCode::UP027 => CheckCategory::Pyupgrade,
             CheckCode::W292 => CheckCategory::Pycodestyle,
             CheckCode::W605 => CheckCategory::Pycodestyle,
             CheckCode::YTT101 => CheckCategory::Flake82020,
@@ -1724,9 +1784,8 @@ impl CheckKind {
             CheckKind::BreakOutsideLoop => &CheckCode::F701,
             CheckKind::ContinueOutsideLoop => &CheckCode::F702,
             CheckKind::DefaultExceptNotLast => &CheckCode::F707,
-            CheckKind::DoNotAssignLambda => &CheckCode::E731,
+            CheckKind::DoNotAssignLambda(..) => &CheckCode::E731,
             CheckKind::DoNotUseBareExcept => &CheckCode::E722,
-            CheckKind::DuplicateArgumentName => &CheckCode::F831,
             CheckKind::FStringMissingPlaceholders => &CheckCode::F541,
             CheckKind::ForwardAnnotationSyntaxError(..) => &CheckCode::F722,
             CheckKind::FutureFeatureNotDefined(..) => &CheckCode::F407,
@@ -1737,7 +1796,7 @@ impl CheckKind {
             CheckKind::ImportStarUsage(..) => &CheckCode::F405,
             CheckKind::ImportStarUsed(..) => &CheckCode::F403,
             CheckKind::InvalidPrintSyntax => &CheckCode::F633,
-            CheckKind::IsLiteral => &CheckCode::F632,
+            CheckKind::IsLiteral(..) => &CheckCode::F632,
             CheckKind::LateFutureImport => &CheckCode::F404,
             CheckKind::LineTooLong(..) => &CheckCode::E501,
             CheckKind::MultipleImportsOnOneLine => &CheckCode::E401,
@@ -1895,6 +1954,7 @@ impl CheckKind {
             CheckKind::SysVersionSlice1Referenced => &CheckCode::YTT303,
             // flake8-simplify
             CheckKind::KeyInDict(..) => &CheckCode::SIM118,
+            CheckKind::YodaConditions(..) => &CheckCode::SIM300,
             // pyupgrade
             CheckKind::TypeOfPrimitive(..) => &CheckCode::UP003,
             CheckKind::UselessMetaclassType => &CheckCode::UP001,
@@ -1909,16 +1969,19 @@ impl CheckKind {
             CheckKind::UnnecessaryEncodeUTF8 => &CheckCode::UP012,
             CheckKind::ConvertTypedDictFunctionalToClass(..) => &CheckCode::UP013,
             CheckKind::ConvertNamedTupleFunctionalToClass(..) => &CheckCode::UP014,
-            CheckKind::RedundantOpenModes => &CheckCode::UP015,
+            CheckKind::RedundantOpenModes(..) => &CheckCode::UP015,
             CheckKind::RemoveSixCompat => &CheckCode::UP016,
             CheckKind::DatetimeTimezoneUTC => &CheckCode::UP017,
-            CheckKind::NativeLiterals => &CheckCode::UP018,
+            CheckKind::NativeLiterals(..) => &CheckCode::UP018,
             CheckKind::TypingTextStrAlias => &CheckCode::UP019,
             CheckKind::OpenAlias => &CheckCode::UP020,
             CheckKind::ReplaceUniversalNewlines => &CheckCode::UP021,
             CheckKind::ReplaceStdoutStderr => &CheckCode::UP022,
             CheckKind::RewriteCElementTree => &CheckCode::UP023,
+            CheckKind::OSErrorAlias(..) => &CheckCode::UP024,
             CheckKind::RewriteUnicodeLiteral => &CheckCode::UP025,
+            CheckKind::RewriteMockImport(..) => &CheckCode::UP026,
+            CheckKind::RewriteListComprehension => &CheckCode::UP027,
             // pydocstyle
             CheckKind::BlankLineAfterLastSection(..) => &CheckCode::D413,
             CheckKind::BlankLineAfterSection(..) => &CheckCode::D410,
@@ -2068,13 +2131,10 @@ impl CheckKind {
             CheckKind::DefaultExceptNotLast => {
                 "An `except` block as not the last exception handler".to_string()
             }
-            CheckKind::DoNotAssignLambda => {
-                "Do not assign a lambda expression, use a def".to_string()
+            CheckKind::DoNotAssignLambda(..) => {
+                "Do not assign a `lambda` expression, use a `def`".to_string()
             }
             CheckKind::DoNotUseBareExcept => "Do not use bare `except`".to_string(),
-            CheckKind::DuplicateArgumentName => {
-                "Duplicate argument name in function definition".to_string()
-            }
             CheckKind::ForwardAnnotationSyntaxError(body) => {
                 format!("Syntax error in forward annotation: `{body}`")
             }
@@ -2105,7 +2165,10 @@ impl CheckKind {
                     .join(", ");
                 format!("`{name}` may be undefined, or defined from star imports: {sources}")
             }
-            CheckKind::IsLiteral => "Use `==` and `!=` to compare constant literals".to_string(),
+            CheckKind::IsLiteral(cmpop) => match cmpop {
+                IsCmpop::Is => "Use `==` to compare constant literals".to_string(),
+                IsCmpop::IsNot => "Use `!=` to compare constant literals".to_string(),
+            },
             CheckKind::LateFutureImport => {
                 "`from __future__` imports must occur at the beginning of the file".to_string()
             }
@@ -2123,10 +2186,8 @@ impl CheckKind {
                 format!("Dictionary key `{name}` repeated")
             }
             CheckKind::NoneComparison(op) => match op {
-                RejectedCmpop::Eq => "Comparison to `None` should be `cond is None`".to_string(),
-                RejectedCmpop::NotEq => {
-                    "Comparison to `None` should be `cond is not None`".to_string()
-                }
+                EqCmpop::Eq => "Comparison to `None` should be `cond is None`".to_string(),
+                EqCmpop::NotEq => "Comparison to `None` should be `cond is not None`".to_string(),
             },
             CheckKind::NotInTest => "Test for membership should be `not in`".to_string(),
             CheckKind::NotIsTest => "Test for object identity should be `is not`".to_string(),
@@ -2190,16 +2251,16 @@ impl CheckKind {
             CheckKind::ExpressionsInStarAssignment => {
                 "Too many expressions in star-unpacking assignment".to_string()
             }
-            CheckKind::TrueFalseComparison(true, RejectedCmpop::Eq) => {
+            CheckKind::TrueFalseComparison(true, EqCmpop::Eq) => {
                 "Comparison to `True` should be `cond is True`".to_string()
             }
-            CheckKind::TrueFalseComparison(true, RejectedCmpop::NotEq) => {
+            CheckKind::TrueFalseComparison(true, EqCmpop::NotEq) => {
                 "Comparison to `True` should be `cond is not True`".to_string()
             }
-            CheckKind::TrueFalseComparison(false, RejectedCmpop::Eq) => {
+            CheckKind::TrueFalseComparison(false, EqCmpop::Eq) => {
                 "Comparison to `False` should be `cond is False`".to_string()
             }
-            CheckKind::TrueFalseComparison(false, RejectedCmpop::NotEq) => {
+            CheckKind::TrueFalseComparison(false, EqCmpop::NotEq) => {
                 "Comparison to `False` should be `cond is not False`".to_string()
             }
             CheckKind::TwoStarredExpressions => "Two starred expressions in assignment".to_string(),
@@ -2216,7 +2277,7 @@ impl CheckKind {
             CheckKind::UnusedAnnotation(name) => {
                 format!("Local variable `{name}` is annotated but never used")
             }
-            CheckKind::UnusedImport(name, ignore_init) => {
+            CheckKind::UnusedImport(name, ignore_init, ..) => {
                 if *ignore_init {
                     format!(
                         "`{name}` imported but unused; consider adding to `__all__` or using a \
@@ -2617,6 +2678,9 @@ impl CheckKind {
             CheckKind::KeyInDict(key, dict) => {
                 format!("Use `{key} in {dict}` instead of `{key} in {dict}.keys()`")
             }
+            CheckKind::YodaConditions(left, right) => {
+                format!("Use `{left} == {right}` instead of `{right} == {left} (Yoda-conditions)`")
+            }
             // pyupgrade
             CheckKind::TypeOfPrimitive(primitive) => {
                 format!("Use `{}` instead of `type(...)`", primitive.builtin())
@@ -2627,7 +2691,7 @@ impl CheckKind {
                 format!("`{alias}` is deprecated, use `{target}`")
             }
             CheckKind::UselessObjectInheritance(name) => {
-                format!("Class `{name}` inherits from object")
+                format!("Class `{name}` inherits from `object`")
             }
             CheckKind::UsePEP585Annotation(name) => {
                 format!(
@@ -2653,14 +2717,24 @@ impl CheckKind {
                 "Unnecessary parameters to `functools.lru_cache`".to_string()
             }
             CheckKind::UnnecessaryEncodeUTF8 => "Unnecessary call to `encode` as UTF-8".to_string(),
-            CheckKind::RedundantOpenModes => "Unnecessary open mode parameters".to_string(),
+            CheckKind::RedundantOpenModes(replacement) => match replacement {
+                None => "Unnecessary open mode parameters".to_string(),
+                Some(replacement) => {
+                    format!("Unnecessary open mode parameters, use \"{replacement}\"")
+                }
+            },
             CheckKind::RemoveSixCompat => "Unnecessary `six` compatibility usage".to_string(),
             CheckKind::DatetimeTimezoneUTC => "Use `datetime.UTC` alias".to_string(),
-            CheckKind::NativeLiterals => "Unnecessary call to `str` and `bytes`".to_string(),
+            CheckKind::NativeLiterals(literal_type) => {
+                format!("Unnecessary call to `{literal_type}`")
+            }
             CheckKind::OpenAlias => "Use builtin `open`".to_string(),
             CheckKind::ConvertTypedDictFunctionalToClass(name) => {
                 format!("Convert `{name}` from `TypedDict` functional to class syntax")
             }
+            CheckKind::ConvertNamedTupleFunctionalToClass(name) => {
+                format!("Convert `{name}` from `NamedTuple` functional to class syntax")
+            }
             CheckKind::ReplaceUniversalNewlines => {
                 "`universal_newlines` is deprecated, use `text`".to_string()
             }
@@ -2670,9 +2744,13 @@ impl CheckKind {
             CheckKind::RewriteCElementTree => {
                 "`cElementTree` is deprecated, use `ElementTree`".to_string()
             }
+            CheckKind::OSErrorAlias(..) => "Replace aliased errors with `OSError`".to_string(),
             CheckKind::RewriteUnicodeLiteral => "Remove unicode literals from strings".to_string(),
-            CheckKind::ConvertNamedTupleFunctionalToClass(name) => {
-                format!("Convert `{name}` from `NamedTuple` functional to class syntax")
+            CheckKind::RewriteMockImport(..) => {
+                "`mock` is deprecated, use `unittest.mock`".to_string()
+            }
+            CheckKind::RewriteListComprehension => {
+                "Replace unpacked list comprehension with a generator expression".to_string()
             }
             // pydocstyle
             CheckKind::FitsOnOneLine => "One-line docstring should fit on one line".to_string(),
@@ -2850,14 +2928,13 @@ impl CheckKind {
             CheckKind::HardcodedBindAllInterfaces => {
                 "Possible binding to all interfaces".to_string()
             }
-            CheckKind::HardcodedPasswordString(string) => {
-                format!("Possible hardcoded password: `\"{string}\"`")
-            }
-            CheckKind::HardcodedPasswordFuncArg(string) => {
-                format!("Possible hardcoded password: `\"{string}\"`")
-            }
-            CheckKind::HardcodedPasswordDefault(string) => {
-                format!("Possible hardcoded password: `\"{string}\"`")
+            CheckKind::HardcodedPasswordString(string)
+            | CheckKind::HardcodedPasswordFuncArg(string)
+            | CheckKind::HardcodedPasswordDefault(string) => {
+                format!(
+                    "Possible hardcoded password: `\"{}\"`",
+                    string.escape_debug()
+                )
             }
             // flake8-blind-except
             CheckKind::BlindExcept(name) => format!("Do not catch blind exception: `{name}`"),
@@ -3088,6 +3165,7 @@ impl CheckKind {
         matches!(
             self,
             CheckKind::AmbiguousUnicodeCharacterString(..)
+                | CheckKind::AmbiguousUnicodeCharacterComment(..)
                 | CheckKind::AmbiguousUnicodeCharacterDocstring(..)
                 | CheckKind::BlankLineAfterLastSection(..)
                 | CheckKind::BlankLineAfterSection(..)
@@ -3101,7 +3179,7 @@ impl CheckKind {
                 | CheckKind::DatetimeTimezoneUTC
                 | CheckKind::DeprecatedUnittestAlias(..)
                 | CheckKind::DoNotAssertFalse
-                | CheckKind::DoNotAssignLambda
+                | CheckKind::DoNotAssignLambda(..)
                 | CheckKind::DuplicateHandlerException(..)
                 | CheckKind::EndsInPeriod
                 | CheckKind::EndsInPunctuation
@@ -3109,17 +3187,12 @@ impl CheckKind {
                 | CheckKind::ImplicitReturn
                 | CheckKind::ImplicitReturnValue
                 | CheckKind::InvalidEscapeSequence(..)
-                | CheckKind::IsLiteral
+                | CheckKind::IsLiteral(..)
                 | CheckKind::KeyInDict(..)
                 | CheckKind::MisplacedComparisonConstant(..)
                 | CheckKind::MissingReturnTypeSpecialMethod(..)
-                | CheckKind::NativeLiterals
-                | CheckKind::OpenAlias
+                | CheckKind::NativeLiterals(..)
                 | CheckKind::NewLineAfterLastParagraph
-                | CheckKind::ReplaceUniversalNewlines
-                | CheckKind::ReplaceStdoutStderr
-                | CheckKind::RewriteCElementTree
-                | CheckKind::RewriteUnicodeLiteral
                 | CheckKind::NewLineAfterSectionName(..)
                 | CheckKind::NoBlankLineAfterFunction(..)
                 | CheckKind::NoBlankLineBeforeClass(..)
@@ -3132,16 +3205,24 @@ impl CheckKind {
                 | CheckKind::NoneComparison(..)
                 | CheckKind::NotInTest
                 | CheckKind::NotIsTest
+                | CheckKind::OSErrorAlias(..)
                 | CheckKind::OneBlankLineAfterClass(..)
                 | CheckKind::OneBlankLineBeforeClass(..)
+                | CheckKind::OpenAlias
                 | CheckKind::PEP3120UnnecessaryCodingComment
                 | CheckKind::PPrintFound
                 | CheckKind::PercentFormatExtraNamedArguments(..)
                 | CheckKind::PrintFound
                 | CheckKind::RaiseNotImplemented
-                | CheckKind::RedundantOpenModes
+                | CheckKind::RedundantOpenModes(..)
                 | CheckKind::RedundantTupleInExceptionHandler(..)
                 | CheckKind::RemoveSixCompat
+                | CheckKind::ReplaceStdoutStderr
+                | CheckKind::ReplaceUniversalNewlines
+                | CheckKind::RewriteCElementTree
+                | CheckKind::RewriteMockImport(..)
+                | CheckKind::RewriteUnicodeLiteral
+                | CheckKind::RewriteListComprehension
                 | CheckKind::SectionNameEndsInColon(..)
                 | CheckKind::SectionNotOverIndented(..)
                 | CheckKind::SectionUnderlineAfterName(..)
@@ -3171,7 +3252,7 @@ impl CheckKind {
                 | CheckKind::UnnecessaryLiteralWithinTupleCall(..)
                 | CheckKind::UnnecessaryReturnNone
                 | CheckKind::UnsortedImports
-                | CheckKind::UnusedImport(_, false)
+                | CheckKind::UnusedImport(_, false, _)
                 | CheckKind::UnusedLoopControlVariable(..)
                 | CheckKind::UnusedNOQA(..)
                 | CheckKind::UsePEP585Annotation(..)
@@ -3182,6 +3263,246 @@ impl CheckKind {
                 | CheckKind::UselessObjectInheritance(..)
         )
     }
+
+    /// The message used to describe the fix action for a given `CheckKind`.
+    pub fn commit(&self) -> Option<String> {
+        match self {
+            CheckKind::AmbiguousUnicodeCharacterString(confusable, representant)
+            | CheckKind::AmbiguousUnicodeCharacterDocstring(confusable, representant)
+            | CheckKind::AmbiguousUnicodeCharacterComment(confusable, representant) => {
+                Some(format!("Replace '{confusable}' with '{representant}'"))
+            }
+            CheckKind::BlankLineAfterLastSection(name) => {
+                Some(format!("Add blank line after \"{name}\""))
+            }
+            CheckKind::BlankLineAfterSection(name) => {
+                Some(format!("Add blank line after \"{name}\""))
+            }
+            CheckKind::BlankLineAfterSummary => Some("Insert single blank line".to_string()),
+            CheckKind::BlankLineBeforeSection(name) => {
+                Some(format!("Add blank line before \"{name}\""))
+            }
+            CheckKind::CapitalizeSectionName(name) => Some(format!("Capitalize \"{name}\"")),
+            CheckKind::CommentedOutCode => Some("Remove commented-out code".to_string()),
+            CheckKind::ConvertTypedDictFunctionalToClass(name)
+            | CheckKind::ConvertNamedTupleFunctionalToClass(name) => {
+                Some(format!("Convert `{name}` to class syntax"))
+            }
+            CheckKind::DashedUnderlineAfterSection(name) => {
+                Some(format!("Add dashed line under \"{name}\""))
+            }
+            CheckKind::DatetimeTimezoneUTC => Some("Convert to `datetime.UTC` alias".to_string()),
+            CheckKind::DeprecatedUnittestAlias(alias, target) => {
+                Some(format!("Replace `{target}` with `{alias}`"))
+            }
+            CheckKind::DoNotAssertFalse => Some("Replace `assert False`".to_string()),
+            CheckKind::DoNotAssignLambda(name) => Some(format!("Rewrite `{name}` as a `def`")),
+            CheckKind::DuplicateHandlerException(..) => Some("De-duplicate exceptions".to_string()),
+            CheckKind::EndsInPeriod => Some("Add period".to_string()),
+            CheckKind::EndsInPunctuation => Some("Add closing punctuation".to_string()),
+            CheckKind::GetAttrWithConstant => {
+                Some("Replace `getattr` with attribute access".to_string())
+            }
+            CheckKind::ImplicitReturnValue => Some("Add explicit `None` return value".to_string()),
+            CheckKind::ImplicitReturn => Some("Add explicit `return` statement".to_string()),
+            CheckKind::InvalidEscapeSequence(..) => {
+                Some("Add backslash to escape sequence".to_string())
+            }
+            CheckKind::IsLiteral(cmpop) => Some(match cmpop {
+                IsCmpop::Is => "Replace `is` with `==`".to_string(),
+                IsCmpop::IsNot => "Replace `is not` with `!=`".to_string(),
+            }),
+            CheckKind::KeyInDict(key, dict) => Some(format!("Convert to `{key} in {dict}`")),
+            CheckKind::MisplacedComparisonConstant(comparison) => {
+                Some(format!("Replace with {comparison}"))
+            }
+            CheckKind::MissingReturnTypeSpecialMethod(..) => {
+                Some("Add `None` return type".to_string())
+            }
+            CheckKind::NativeLiterals(literal_type) => {
+                Some(format!("Replace with `{literal_type}`"))
+            }
+            CheckKind::OpenAlias => Some("Replace with builtin `open`".to_string()),
+            CheckKind::NewLineAfterLastParagraph => {
+                Some("Move closing quotes to new line".to_string())
+            }
+            CheckKind::ReplaceUniversalNewlines => {
+                Some("Replace with `text` keyword argument".to_string())
+            }
+            CheckKind::ReplaceStdoutStderr => {
+                Some("Replace with `capture_output` keyword argument".to_string())
+            }
+            CheckKind::RewriteCElementTree => Some("Replace with `ElementTree`".to_string()),
+            CheckKind::RewriteUnicodeLiteral => Some("Remove unicode prefix".to_string()),
+            CheckKind::RewriteMockImport(reference_type) => Some(match reference_type {
+                MockReference::Import => "Import from `unittest.mock` instead".to_string(),
+                MockReference::Attribute => "Replace `mock.mock` with `mock`".to_string(),
+            }),
+            CheckKind::RewriteListComprehension => {
+                Some("Replace with generator expression".to_string())
+            }
+            CheckKind::NewLineAfterSectionName(name) => {
+                Some(format!("Add newline after \"{name}\""))
+            }
+            CheckKind::NoBlankLineBeforeFunction(..) => {
+                Some("Remove blank line(s) before function docstring".to_string())
+            }
+            CheckKind::NoBlankLineAfterFunction(..) => {
+                Some("Remove blank line(s) after function docstring".to_string())
+            }
+            CheckKind::NoBlankLineBeforeClass(..) => {
+                Some("Remove blank line(s) before class docstring".to_string())
+            }
+            CheckKind::OneBlankLineBeforeClass(..) => {
+                Some("Insert 1 blank line before class docstring".to_string())
+            }
+            CheckKind::OneBlankLineAfterClass(..) => {
+                Some("Insert 1 blank line after class docstring".to_string())
+            }
+            CheckKind::OSErrorAlias(name) => Some(match name {
+                None => "Replace with builtin `OSError`".to_string(),
+                Some(name) => format!("Replace `{name}` with builtin `OSError`"),
+            }),
+            CheckKind::NoBlankLinesBetweenHeaderAndContent(..) => {
+                Some("Remove blank line(s)".to_string())
+            }
+            CheckKind::NoNewLineAtEndOfFile => Some("Add trailing newline".to_string()),
+            CheckKind::NoOverIndentation => Some("Remove over-indentation".to_string()),
+            CheckKind::NoSurroundingWhitespace => Some("Trim surrounding whitespace".to_string()),
+            CheckKind::NoUnderIndentation => Some("Increase indentation".to_string()),
+            CheckKind::NoneComparison(op) => Some(match op {
+                EqCmpop::Eq => "Replace with `cond is None`".to_string(),
+                EqCmpop::NotEq => "Replace with `cond is not None`".to_string(),
+            }),
+            CheckKind::NotInTest => Some("Convert to `not in`".to_string()),
+            CheckKind::NotIsTest => Some("Convert to `is not`".to_string()),
+            CheckKind::PEP3120UnnecessaryCodingComment => {
+                Some("Remove unnecessary coding comment".to_string())
+            }
+            CheckKind::PPrintFound => Some("Remove `pprint`".to_string()),
+            CheckKind::PercentFormatExtraNamedArguments(missing)
+            | CheckKind::StringDotFormatExtraNamedArguments(missing) => {
+                let message = missing.join(", ");
+                Some(format!("Remove extra named arguments: {message}"))
+            }
+            CheckKind::PrintFound => Some("Remove `print`".to_string()),
+            CheckKind::RaiseNotImplemented => Some("Use `raise NotImplementedError`".to_string()),
+            CheckKind::RedundantOpenModes(replacement) => Some(match replacement {
+                None => "Remove open mode parameters".to_string(),
+                Some(replacement) => {
+                    format!("Replace with \"{replacement}\"")
+                }
+            }),
+            CheckKind::RedundantTupleInExceptionHandler(name) => {
+                Some(format!("Replace with `except {name}`"))
+            }
+            CheckKind::RemoveSixCompat => Some("Remove `six` usage".to_string()),
+            CheckKind::SectionNameEndsInColon(name) => Some(format!("Add colon to \"{name}\"")),
+            CheckKind::SectionNotOverIndented(name) => {
+                Some(format!("Remove over-indentation from \"{name}\""))
+            }
+            CheckKind::SectionUnderlineAfterName(name) => {
+                Some(format!("Add underline to \"{name}\""))
+            }
+            CheckKind::SectionUnderlineMatchesSectionLength(name) => {
+                Some(format!("Adjust underline length to match \"{name}\""))
+            }
+            CheckKind::SectionUnderlineNotOverIndented(name) => {
+                Some(format!("Remove over-indentation from \"{name}\" underline"))
+            }
+            CheckKind::SetAttrWithConstant => Some("Replace `setattr` with assignment".to_string()),
+            CheckKind::SuperCallWithParameters => Some("Remove `__super__` parameters".to_string()),
+            CheckKind::TrueFalseComparison(true, EqCmpop::Eq) => {
+                Some("Replace with `cond is True`".to_string())
+            }
+            CheckKind::TrueFalseComparison(true, EqCmpop::NotEq) => {
+                Some("Replace with `cond is not True`".to_string())
+            }
+            CheckKind::TrueFalseComparison(false, EqCmpop::Eq) => {
+                Some("Replace with `cond is False`".to_string())
+            }
+            CheckKind::TrueFalseComparison(false, EqCmpop::NotEq) => {
+                Some("Replace with `cond is not False`".to_string())
+            }
+            CheckKind::TypeOfPrimitive(primitive) => Some(format!(
+                "Replace `type(...)` with `{}`",
+                primitive.builtin()
+            )),
+            CheckKind::TypingTextStrAlias => Some("Replace with `str`".to_string()),
+            CheckKind::UnnecessaryCallAroundSorted(func) => {
+                Some(format!("Remove unnecessary `{func}` call"))
+            }
+            CheckKind::UnnecessaryCollectionCall(..) => Some("Rewrite as a literal".to_string()),
+            CheckKind::UnnecessaryComprehension(obj_type) => {
+                Some(format!("Rewrite using `{obj_type}()`"))
+            }
+            CheckKind::UnnecessaryEncodeUTF8 => Some("Remove unnecessary `encode`".to_string()),
+            CheckKind::UnnecessaryFutureImport(..) => {
+                Some("Remove unnecessary `__future__` import".to_string())
+            }
+            CheckKind::UnnecessaryGeneratorDict => {
+                Some("Rewrite as a `dict` comprehension".to_string())
+            }
+            CheckKind::UnnecessaryGeneratorList => {
+                Some("Rewrite as a `list` comprehension".to_string())
+            }
+            CheckKind::UnnecessaryGeneratorSet => {
+                Some("Rewrite as a `set` comprehension".to_string())
+            }
+            CheckKind::UnnecessaryLRUCacheParams => {
+                Some("Remove unnecessary parameters".to_string())
+            }
+            CheckKind::UnnecessaryListCall => Some("Remove outer `list` call".to_string()),
+            CheckKind::UnnecessaryListComprehensionDict => {
+                Some("Rewrite as a `dict` comprehension".to_string())
+            }
+            CheckKind::UnnecessaryListComprehensionSet => {
+                Some("Rewrite as a `set` comprehension".to_string())
+            }
+            CheckKind::UnnecessaryLiteralDict(..) => {
+                Some("Rewrite as a `dict` literal".to_string())
+            }
+            CheckKind::UnnecessaryLiteralSet(..) => Some("Rewrite as a `set` literal".to_string()),
+            CheckKind::UnnecessaryLiteralWithinTupleCall(literal) => Some({
+                if literal == "list" {
+                    "Rewrite as a `tuple` literal".to_string()
+                } else {
+                    "Remove outer `tuple` call".to_string()
+                }
+            }),
+            CheckKind::UnnecessaryLiteralWithinListCall(literal) => Some({
+                if literal == "list" {
+                    "Remove outer `list` call".to_string()
+                } else {
+                    "Rewrite as a `list` literal".to_string()
+                }
+            }),
+            CheckKind::UnnecessaryReturnNone => Some("Remove explicit `return None`".to_string()),
+            CheckKind::UnsortedImports => Some("Organize imports".to_string()),
+            CheckKind::UnusedImport(name, false, multiple) => {
+                if *multiple {
+                    Some("Remove unused import".to_string())
+                } else {
+                    Some(format!("Remove unused import: `{name}`"))
+                }
+            }
+            CheckKind::UnusedLoopControlVariable(name) => {
+                Some(format!("Rename unused `{name}` to `_{name}`"))
+            }
+            CheckKind::UnusedNOQA(..) => Some("Remove unused `noqa` directive".to_string()),
+            CheckKind::UsePEP585Annotation(name) => {
+                Some(format!("Replace `{name}` with `{}`", name.to_lowercase(),))
+            }
+            CheckKind::UsePEP604Annotation => Some("Convert to `X | Y`".to_string()),
+            CheckKind::UseSysExit(name) => Some(format!("Replace `{name}` with `sys.exit()`")),
+            CheckKind::UselessImportAlias => Some("Remove import alias".to_string()),
+            CheckKind::UselessMetaclassType => Some("Remove `__metaclass__ = type`".to_string()),
+            CheckKind::UselessObjectInheritance(..) => {
+                Some("Remove `object` inheritance".to_string())
+            }
+            _ => None,
+        }
+    }
 }
 
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
@@ -3190,6 +3511,7 @@ pub struct Check {
     pub location: Location,
     pub end_location: Location,
     pub fix: Option<Fix>,
+    pub parent: Option<Location>,
 }
 
 impl Check {
@@ -3199,11 +3521,18 @@ impl Check {
             location: range.location,
             end_location: range.end_location,
             fix: None,
+            parent: None,
         }
     }
 
-    pub fn amend(&mut self, fix: Fix) {
+    pub fn amend(&mut self, fix: Fix) -> &mut Self {
         self.fix = Some(fix);
+        self
+    }
+
+    pub fn parent(&mut self, parent: Location) -> &mut Self {
+        self.parent = Some(parent);
+        self
     }
 }
 
@@ -3354,4 +3683,17 @@ mod tests {
             );
         }
     }
+
+    #[test]
+    fn fixable_codes() {
+        for check_code in CheckCode::iter() {
+            let kind = check_code.kind();
+            if kind.fixable() {
+                assert!(
+                    kind.commit().is_some(),
+                    "{check_code:?} is fixable but has no commit message."
+                );
+            }
+        }
+    }
 }

src/checks_gen.rs

@@ -283,8 +283,6 @@ pub enum CheckCodePrefix {
     F821,
     F822,
     F823,
-    F83,
-    F831,
     F84,
     F841,
     F842,
@@ -481,6 +479,9 @@ pub enum CheckCodePrefix {
     SIM1,
     SIM11,
     SIM118,
+    SIM3,
+    SIM30,
+    SIM300,
     T,
     T1,
     T10,
@@ -542,7 +543,10 @@ pub enum CheckCodePrefix {
     UP021,
     UP022,
     UP023,
+    UP024,
     UP025,
+    UP026,
+    UP027,
     W,
     W2,
     W29,
@@ -647,7 +651,6 @@ impl CheckCodePrefix {
                 CheckCode::F821,
                 CheckCode::F822,
                 CheckCode::F823,
-                CheckCode::F831,
                 CheckCode::F841,
                 CheckCode::F842,
                 CheckCode::F901,
@@ -754,6 +757,7 @@ impl CheckCodePrefix {
                 CheckCode::YTT302,
                 CheckCode::YTT303,
                 CheckCode::SIM118,
+                CheckCode::SIM300,
                 CheckCode::UP001,
                 CheckCode::UP003,
                 CheckCode::UP004,
@@ -776,7 +780,10 @@ impl CheckCodePrefix {
                 CheckCode::UP021,
                 CheckCode::UP022,
                 CheckCode::UP023,
+                CheckCode::UP024,
                 CheckCode::UP025,
+                CheckCode::UP026,
+                CheckCode::UP027,
                 CheckCode::D100,
                 CheckCode::D101,
                 CheckCode::D102,
@@ -1506,7 +1513,6 @@ impl CheckCodePrefix {
                 CheckCode::F821,
                 CheckCode::F822,
                 CheckCode::F823,
-                CheckCode::F831,
                 CheckCode::F841,
                 CheckCode::F842,
                 CheckCode::F901,
@@ -1640,7 +1646,6 @@ impl CheckCodePrefix {
                 CheckCode::F821,
                 CheckCode::F822,
                 CheckCode::F823,
-                CheckCode::F831,
                 CheckCode::F841,
                 CheckCode::F842,
             ],
@@ -1650,8 +1655,6 @@ impl CheckCodePrefix {
             CheckCodePrefix::F821 => vec![CheckCode::F821],
             CheckCodePrefix::F822 => vec![CheckCode::F822],
             CheckCodePrefix::F823 => vec![CheckCode::F823],
-            CheckCodePrefix::F83 => vec![CheckCode::F831],
-            CheckCodePrefix::F831 => vec![CheckCode::F831],
             CheckCodePrefix::F84 => vec![CheckCode::F841, CheckCode::F842],
             CheckCodePrefix::F841 => vec![CheckCode::F841],
             CheckCodePrefix::F842 => vec![CheckCode::F842],
@@ -2412,10 +2415,13 @@ impl CheckCodePrefix {
             CheckCodePrefix::S105 => vec![CheckCode::S105],
             CheckCodePrefix::S106 => vec![CheckCode::S106],
             CheckCodePrefix::S107 => vec![CheckCode::S107],
-            CheckCodePrefix::SIM => vec![CheckCode::SIM118],
+            CheckCodePrefix::SIM => vec![CheckCode::SIM118, CheckCode::SIM300],
             CheckCodePrefix::SIM1 => vec![CheckCode::SIM118],
             CheckCodePrefix::SIM11 => vec![CheckCode::SIM118],
             CheckCodePrefix::SIM118 => vec![CheckCode::SIM118],
+            CheckCodePrefix::SIM3 => vec![CheckCode::SIM300],
+            CheckCodePrefix::SIM30 => vec![CheckCode::SIM300],
+            CheckCodePrefix::SIM300 => vec![CheckCode::SIM300],
             CheckCodePrefix::T => vec![CheckCode::T100, CheckCode::T201, CheckCode::T203],
             CheckCodePrefix::T1 => vec![CheckCode::T100],
             CheckCodePrefix::T10 => vec![CheckCode::T100],
@@ -2459,7 +2465,10 @@ impl CheckCodePrefix {
                     CheckCode::UP021,
                     CheckCode::UP022,
                     CheckCode::UP023,
+                    CheckCode::UP024,
                     CheckCode::UP025,
+                    CheckCode::UP026,
+                    CheckCode::UP027,
                 ]
             }
             CheckCodePrefix::U0 => {
@@ -2492,7 +2501,10 @@ impl CheckCodePrefix {
                     CheckCode::UP021,
                     CheckCode::UP022,
                     CheckCode::UP023,
+                    CheckCode::UP024,
                     CheckCode::UP025,
+                    CheckCode::UP026,
+                    CheckCode::UP027,
                 ]
             }
             CheckCodePrefix::U00 => {
@@ -2709,7 +2721,10 @@ impl CheckCodePrefix {
                 CheckCode::UP021,
                 CheckCode::UP022,
                 CheckCode::UP023,
+                CheckCode::UP024,
                 CheckCode::UP025,
+                CheckCode::UP026,
+                CheckCode::UP027,
             ],
             CheckCodePrefix::UP0 => vec![
                 CheckCode::UP001,
@@ -2734,7 +2749,10 @@ impl CheckCodePrefix {
                 CheckCode::UP021,
                 CheckCode::UP022,
                 CheckCode::UP023,
+                CheckCode::UP024,
                 CheckCode::UP025,
+                CheckCode::UP026,
+                CheckCode::UP027,
             ],
             CheckCodePrefix::UP00 => vec![
                 CheckCode::UP001,
@@ -2781,13 +2799,19 @@ impl CheckCodePrefix {
                 CheckCode::UP021,
                 CheckCode::UP022,
                 CheckCode::UP023,
+                CheckCode::UP024,
                 CheckCode::UP025,
+                CheckCode::UP026,
+                CheckCode::UP027,
             ],
             CheckCodePrefix::UP020 => vec![CheckCode::UP020],
             CheckCodePrefix::UP021 => vec![CheckCode::UP021],
             CheckCodePrefix::UP022 => vec![CheckCode::UP022],
             CheckCodePrefix::UP023 => vec![CheckCode::UP023],
+            CheckCodePrefix::UP024 => vec![CheckCode::UP024],
             CheckCodePrefix::UP025 => vec![CheckCode::UP025],
+            CheckCodePrefix::UP026 => vec![CheckCode::UP026],
+            CheckCodePrefix::UP027 => vec![CheckCode::UP027],
             CheckCodePrefix::W => vec![CheckCode::W292, CheckCode::W605],
             CheckCodePrefix::W2 => vec![CheckCode::W292],
             CheckCodePrefix::W29 => vec![CheckCode::W292],
@@ -3102,8 +3126,6 @@ impl CheckCodePrefix {
             CheckCodePrefix::F821 => SuffixLength::Three,
             CheckCodePrefix::F822 => SuffixLength::Three,
             CheckCodePrefix::F823 => SuffixLength::Three,
-            CheckCodePrefix::F83 => SuffixLength::Two,
-            CheckCodePrefix::F831 => SuffixLength::Three,
             CheckCodePrefix::F84 => SuffixLength::Two,
             CheckCodePrefix::F841 => SuffixLength::Three,
             CheckCodePrefix::F842 => SuffixLength::Three,
@@ -3300,6 +3322,9 @@ impl CheckCodePrefix {
             CheckCodePrefix::SIM1 => SuffixLength::One,
             CheckCodePrefix::SIM11 => SuffixLength::Two,
             CheckCodePrefix::SIM118 => SuffixLength::Three,
+            CheckCodePrefix::SIM3 => SuffixLength::One,
+            CheckCodePrefix::SIM30 => SuffixLength::Two,
+            CheckCodePrefix::SIM300 => SuffixLength::Three,
             CheckCodePrefix::T => SuffixLength::Zero,
             CheckCodePrefix::T1 => SuffixLength::One,
             CheckCodePrefix::T10 => SuffixLength::Two,
@@ -3361,7 +3386,10 @@ impl CheckCodePrefix {
             CheckCodePrefix::UP021 => SuffixLength::Three,
             CheckCodePrefix::UP022 => SuffixLength::Three,
             CheckCodePrefix::UP023 => SuffixLength::Three,
+            CheckCodePrefix::UP024 => SuffixLength::Three,
             CheckCodePrefix::UP025 => SuffixLength::Three,
+            CheckCodePrefix::UP026 => SuffixLength::Three,
+            CheckCodePrefix::UP027 => SuffixLength::Three,
             CheckCodePrefix::W => SuffixLength::Zero,
             CheckCodePrefix::W2 => SuffixLength::One,
             CheckCodePrefix::W29 => SuffixLength::Two,

src/cli.rs

@@ -17,7 +17,7 @@ use crate::settings::types::{
 #[command(version)]
 #[allow(clippy::struct_excessive_bools)]
 pub struct Cli {
-    #[arg(required_unless_present_any = ["explain", "generate_shell_completion"])]
+    #[arg(required_unless_present_any = ["clean", "explain", "generate_shell_completion"])]
     pub files: Vec<PathBuf>,
     /// Path to the `pyproject.toml` or `ruff.toml` file to use for
     /// configuration.
@@ -93,6 +93,12 @@ pub struct Cli {
     /// Output serialization format for error messages.
     #[arg(long, value_enum)]
     pub format: Option<SerializationFormat>,
+    /// The name of the file when passing it through stdin.
+    #[arg(long)]
+    pub stdin_filename: Option<PathBuf>,
+    /// Path to the cache directory.
+    #[arg(long)]
+    pub cache_dir: Option<PathBuf>,
     /// Show violations with source code.
     #[arg(long, overrides_with("no_show_source"))]
     show_source: bool,
@@ -115,15 +121,6 @@ pub struct Cli {
     update_check: bool,
     #[clap(long, overrides_with("update_check"), hide = true)]
     no_update_check: bool,
-    /// See the files Ruff will be run against with the current settings.
-    #[arg(long)]
-    pub show_files: bool,
-    /// 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.
-    #[arg(long)]
-    pub add_noqa: bool,
     /// Regular expression matching the name of dummy variables.
     #[arg(long)]
     pub dummy_variable_rgx: Option<Regex>,
@@ -137,22 +134,97 @@ pub struct Cli {
     /// Maximum McCabe complexity allowed for a given function.
     #[arg(long)]
     pub max_complexity: Option<usize>,
-    /// Round-trip auto-formatting.
-    // TODO(charlie): This should be a sub-command.
-    #[arg(long, hide = true)]
-    pub autoformat: bool,
-    /// The name of the file when passing it through stdin.
-    #[arg(long)]
-    pub stdin_filename: Option<PathBuf>,
+    /// Enable automatic additions of `noqa` directives to failing lines.
+    #[arg(
+        long,
+        // conflicts_with = "add_noqa",
+        conflicts_with = "clean",
+        conflicts_with = "explain",
+        conflicts_with = "generate_shell_completion",
+        conflicts_with = "show_files",
+        conflicts_with = "show_settings",
+        // Unsupported default-command arguments.
+        conflicts_with = "stdin_filename",
+        conflicts_with = "watch",
+    )]
+    pub add_noqa: bool,
+    /// Clear any caches in the current directory or any subdirectories.
+    #[arg(
+        long,
+        // Fake subcommands.
+        conflicts_with = "add_noqa",
+        // conflicts_with = "clean",
+        conflicts_with = "explain",
+        conflicts_with = "generate_shell_completion",
+        conflicts_with = "show_files",
+        conflicts_with = "show_settings",
+        // Unsupported default-command arguments.
+        conflicts_with = "stdin_filename",
+        conflicts_with = "watch",
+    )]
+    pub clean: bool,
     /// Explain a rule.
-    #[arg(long)]
+    #[arg(
+        long,
+        // Fake subcommands.
+        conflicts_with = "add_noqa",
+        conflicts_with = "clean",
+        // conflicts_with = "explain",
+        conflicts_with = "generate_shell_completion",
+        conflicts_with = "show_files",
+        conflicts_with = "show_settings",
+        // Unsupported default-command arguments.
+        conflicts_with = "stdin_filename",
+        conflicts_with = "watch",
+    )]
     pub explain: Option<CheckCode>,
     /// Generate shell completion
-    #[arg(long, hide = true, value_name = "SHELL")]
+    #[arg(
+        long,
+        hide = true,
+        value_name = "SHELL",
+        // Fake subcommands.
+        conflicts_with = "add_noqa",
+        conflicts_with = "clean",
+        conflicts_with = "explain",
+        // conflicts_with = "generate_shell_completion",
+        conflicts_with = "show_files",
+        conflicts_with = "show_settings",
+        // Unsupported default-command arguments.
+        conflicts_with = "stdin_filename",
+        conflicts_with = "watch",
+    )]
     pub generate_shell_completion: Option<clap_complete_command::Shell>,
-    /// Path to the cache directory.
-    #[arg(long)]
-    pub cache_dir: Option<PathBuf>,
+    /// See the files Ruff will be run against with the current settings.
+    #[arg(
+        long,
+        // Fake subcommands.
+        conflicts_with = "add_noqa",
+        conflicts_with = "clean",
+        conflicts_with = "explain",
+        conflicts_with = "generate_shell_completion",
+        // conflicts_with = "show_files",
+        conflicts_with = "show_settings",
+        // Unsupported default-command arguments.
+        conflicts_with = "stdin_filename",
+        conflicts_with = "watch",
+    )]
+    pub show_files: bool,
+    /// See the settings Ruff will use to check a given Python file.
+    #[arg(
+        long,
+        // Fake subcommands.
+        conflicts_with = "add_noqa",
+        conflicts_with = "clean",
+        conflicts_with = "explain",
+        conflicts_with = "generate_shell_completion",
+        conflicts_with = "show_files",
+        // conflicts_with = "show_settings",
+        // Unsupported default-command arguments.
+        conflicts_with = "stdin_filename",
+        conflicts_with = "watch",
+    )]
+    pub show_settings: bool,
 }
 
 impl Cli {
@@ -162,7 +234,7 @@ impl Cli {
         (
             Arguments {
                 add_noqa: self.add_noqa,
-                autoformat: self.autoformat,
+                clean: self.clean,
                 config: self.config,
                 diff: self.diff,
                 exit_zero: self.exit_zero,
@@ -223,7 +295,7 @@ fn resolve_bool_arg(yes: bool, no: bool) -> Option<bool> {
 #[allow(clippy::struct_excessive_bools)]
 pub struct Arguments {
     pub add_noqa: bool,
-    pub autoformat: bool,
+    pub clean: bool,
     pub config: Option<PathBuf>,
     pub diff: bool,
     pub exit_zero: bool,

src/commands.rs

@@ -1,26 +1,32 @@
+use std::fs::remove_dir_all;
 use std::io::{self, Read};
 use std::path::{Path, PathBuf};
 use std::time::Instant;
 
 use anyhow::{bail, Result};
+use colored::Colorize;
 use ignore::Error;
 use itertools::Itertools;
 use log::{debug, error};
+use path_absolutize::path_dedot;
 #[cfg(not(target_family = "wasm"))]
 use rayon::prelude::*;
 use rustpython_ast::Location;
 use serde::Serialize;
+use walkdir::WalkDir;
 
 use crate::autofix::fixer;
+use crate::cache::DEFAULT_CACHE_DIR_NAME;
 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::linter::{add_noqa_to_path, lint_path, lint_stdin, Diagnostics};
+use crate::logging::LogLevel;
 use crate::message::Message;
 use crate::resolver::{FileDiscovery, PyprojectDiscovery};
 use crate::settings::flags;
 use crate::settings::types::SerializationFormat;
-use crate::{cache, packages, resolver};
+use crate::{cache, fs, one_time_warning, packages, resolver};
 
 /// Run the linter over a collection of files.
 pub fn run(
@@ -38,6 +44,15 @@ pub fn run(
     let duration = start.elapsed();
     debug!("Identified files to lint in: {:?}", duration);
 
+    if paths.is_empty() {
+        one_time_warning!(
+            "{}: {}",
+            "warning".yellow().bold(),
+            "No Python files found under the given path(s)"
+        );
+        return Ok(Diagnostics::default());
+    }
+
     // Validate the `Settings` and return any errors.
     resolver.validate(pyproject_strategy)?;
 
@@ -179,6 +194,15 @@ pub fn add_noqa(
     let duration = start.elapsed();
     debug!("Identified files to lint in: {:?}", duration);
 
+    if paths.is_empty() {
+        one_time_warning!(
+            "{}: {}",
+            "warning".yellow().bold(),
+            "No Python files found under the given path(s)"
+        );
+        return Ok(0);
+    }
+
     // Validate the `Settings` and return any errors.
     resolver.validate(pyproject_strategy)?;
 
@@ -204,45 +228,6 @@ pub fn add_noqa(
     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);
-
-    // Validate the `Settings` and return any errors.
-    resolver.validate(pyproject_strategy)?;
-
-    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(
     files: &[PathBuf],
@@ -283,6 +268,15 @@ pub fn show_files(
     let (paths, resolver) =
         resolver::python_files_in_path(files, pyproject_strategy, file_strategy, overrides)?;
 
+    if paths.is_empty() {
+        one_time_warning!(
+            "{}: {}",
+            "warning".yellow().bold(),
+            "No Python files found under the given path(s)"
+        );
+        return Ok(());
+    }
+
     // Validate the `Settings` and return any errors.
     resolver.validate(pyproject_strategy)?;
 
@@ -338,3 +332,21 @@ pub fn explain(code: &CheckCode, format: &SerializationFormat) -> Result<()> {
     };
     Ok(())
 }
+
+/// Clear any caches in the current directory or any subdirectories.
+pub fn clean(level: &LogLevel) -> Result<()> {
+    for entry in WalkDir::new(&*path_dedot::CWD)
+        .into_iter()
+        .filter_map(std::result::Result::ok)
+        .filter(|entry| entry.file_type().is_dir())
+    {
+        let cache = entry.path().join(DEFAULT_CACHE_DIR_NAME);
+        if cache.is_dir() {
+            if level >= &LogLevel::Default {
+                eprintln!("Removing cache at: {}", fs::relativize_path(&cache).bold());
+            }
+            remove_dir_all(&cache)?;
+        }
+    }
+    Ok(())
+}

src/cst/matchers.rs

@@ -1,5 +1,5 @@
 use anyhow::{bail, Result};
-use libcst_native::{Expr, Module, SmallStatement, Statement};
+use libcst_native::{Expr, Import, ImportFrom, Module, SmallStatement, Statement};
 
 pub fn match_module(module_text: &str) -> Result<Module> {
     match libcst_native::parse_module(module_text, None) {
@@ -19,3 +19,27 @@ pub fn match_expr<'a, 'b>(module: &'a mut Module<'b>) -> Result<&'a mut Expr<'b>
         bail!("Expected Statement::Simple")
     }
 }
+
+pub fn match_import<'a, 'b>(module: &'a mut Module<'b>) -> Result<&'a mut Import<'b>> {
+    if let Some(Statement::Simple(expr)) = module.body.first_mut() {
+        if let Some(SmallStatement::Import(expr)) = expr.body.first_mut() {
+            Ok(expr)
+        } else {
+            bail!("Expected SmallStatement::Expr")
+        }
+    } else {
+        bail!("Expected Statement::Simple")
+    }
+}
+
+pub fn match_import_from<'a, 'b>(module: &'a mut Module<'b>) -> Result<&'a mut ImportFrom<'b>> {
+    if let Some(Statement::Simple(expr)) = module.body.first_mut() {
+        if let Some(SmallStatement::ImportFrom(expr)) = expr.body.first_mut() {
+            Ok(expr)
+        } else {
+            bail!("Expected SmallStatement::Expr")
+        }
+    } else {
+        bail!("Expected Statement::Simple")
+    }
+}

src/directives.rs

@@ -110,10 +110,7 @@ pub fn extract_isort_directives(lxr: &[LexResult], locator: &SourceCodeLocator)
         }
 
         // TODO(charlie): Modify RustPython to include the comment text in the token.
-        let comment_text = locator.slice_source_code_range(&Range {
-            location: start,
-            end_location: end,
-        });
+        let comment_text = locator.slice_source_code_range(&Range::new(start, end));
 
         if comment_text == "# isort: split" {
             splits.push(start.row());

src/docstrings/constants.rs

@@ -1,9 +1,9 @@
+/// See: <https://docs.python.org/3/reference/lexical_analysis.html#string-and-bytes-literals>
+
 pub const TRIPLE_QUOTE_PREFIXES: &[&str] = &[
-    "ur\"\"\"", "ur'''", "u\"\"\"", "u'''", "r\"\"\"", "r'''", "UR\"\"\"", "UR'''", "Ur\"\"\"",
-    "Ur'''", "U\"\"\"", "U'''", "uR\"\"\"", "uR'''", "R\"\"\"", "R'''", "\"\"\"", "'''",
+    "u\"\"\"", "u'''", "r\"\"\"", "r'''", "U\"\"\"", "U'''", "R\"\"\"", "R'''", "\"\"\"", "'''",
 ];
 
 pub const SINGLE_QUOTE_PREFIXES: &[&str] = &[
-    "ur\"", "ur'", "u\"", "u'", "r\"", "r'", "ur\"", "ur'", "u\"", "u'", "r\"", "r'", "UR\"",
-    "UR'", "Ur\"", "Ur'", "U\"", "U'", "uR\"", "uR'", "R\"", "R'", "\"", "'",
+    "u\"", "u'", "r\"", "r'", "u\"", "u'", "r\"", "r'", "U\"", "U'", "R\"", "R'", "\"", "'",
 ];

src/docstrings/styles.rs

@@ -5,21 +5,21 @@ use crate::docstrings::google::{GOOGLE_SECTION_NAMES, LOWERCASE_GOOGLE_SECTION_N
 use crate::docstrings::numpy::{LOWERCASE_NUMPY_SECTION_NAMES, NUMPY_SECTION_NAMES};
 
 pub(crate) enum SectionStyle {
-    NumPy,
+    Numpy,
     Google,
 }
 
 impl SectionStyle {
     pub(crate) fn section_names(&self) -> &Lazy<FxHashSet<&'static str>> {
         match self {
-            SectionStyle::NumPy => &NUMPY_SECTION_NAMES,
+            SectionStyle::Numpy => &NUMPY_SECTION_NAMES,
             SectionStyle::Google => &GOOGLE_SECTION_NAMES,
         }
     }
 
     pub(crate) fn lowercase_section_names(&self) -> &Lazy<FxHashSet<&'static str>> {
         match self {
-            SectionStyle::NumPy => &LOWERCASE_NUMPY_SECTION_NAMES,
+            SectionStyle::Numpy => &LOWERCASE_NUMPY_SECTION_NAMES,
             SectionStyle::Google => &LOWERCASE_GOOGLE_SECTION_NAMES,
         }
     }

src/eradicate/checks.rs

@@ -28,20 +28,11 @@ pub fn commented_out_code(
 ) -> Option<Check> {
     let location = Location::new(start.row(), 0);
     let end_location = Location::new(end.row() + 1, 0);
-    let line = locator.slice_source_code_range(&Range {
-        location,
-        end_location,
-    });
+    let line = locator.slice_source_code_range(&Range::new(location, end_location));
 
     // Verify that the comment is on its own line, and that it contains code.
     if is_standalone_comment(&line) && comment_contains_code(&line) {
-        let mut check = Check::new(
-            CheckKind::CommentedOutCode,
-            Range {
-                location: start,
-                end_location: end,
-            },
-        );
+        let mut check = Check::new(CheckKind::CommentedOutCode, Range::new(start, end));
         if matches!(autofix, flags::Autofix::Enabled)
             && settings.fixable.contains(&CheckCode::ERA001)
         {

src/eradicate/detection.rs

@@ -24,7 +24,7 @@ static CODING_COMMENT_REGEX: Lazy<Regex> =
     Lazy::new(|| Regex::new(r"^.*?coding[:=][ \t]*([-_.a-zA-Z0-9]+)").unwrap());
 static HASH_NUMBER: Lazy<Regex> = Lazy::new(|| Regex::new(r"#\d").unwrap());
 static MULTILINE_ASSIGNMENT_REGEX: Lazy<Regex> =
-    Lazy::new(|| Regex::new(r"^\s*\w+\s*=.*[(\[{]$").unwrap());
+    Lazy::new(|| Regex::new(r"^\s*([(\[]\s*)?(\w+\s*,\s*)*\w+\s*([)\]]\s*)?=.*[(\[{]$").unwrap());
 static PARTIAL_DICTIONARY_REGEX: Lazy<Regex> =
     Lazy::new(|| Regex::new(r#"^\s*['"]\w+['"]\s*:.+[,{]\s*$"#).unwrap());
 static PRINT_RETURN_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"^(print|return)\b\s*").unwrap());
@@ -153,6 +153,21 @@ mod tests {
         assert!(!comment_contains_code("#or else:"));
         assert!(!comment_contains_code("#else True:"));
 
+        // Unpacking assignments
+        assert!(comment_contains_code(
+            "# user_content_type, _ = TimelineEvent.objects.using(db_alias).get_or_create("
+        ));
+        assert!(comment_contains_code(
+            "# (user_content_type, _) = TimelineEvent.objects.using(db_alias).get_or_create("
+        ));
+        assert!(comment_contains_code(
+            "# ( user_content_type , _ )= TimelineEvent.objects.using(db_alias).get_or_create("
+        ));
+        assert!(comment_contains_code(
+            "#     app_label=\"core\", model=\"user\""
+        ));
+        assert!(comment_contains_code("# )"));
+
         // TODO(charlie): This should be `true` under aggressive mode.
         assert!(!comment_contains_code("#def foo():"));
     }

src/eradicate/mod.rs

@@ -16,13 +16,12 @@ mod tests {
     #[test_case(CheckCode::ERA001, Path::new("ERA001.py"); "ERA001")]
     fn checks(check_code: CheckCode, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", check_code.as_ref(), path.to_string_lossy());
-        let mut checks = test_path(
+        let checks = test_path(
             Path::new("./resources/test/fixtures/eradicate")
                 .join(path)
                 .as_path(),
             &settings::Settings::for_rule(check_code),
         )?;
-        checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);
         Ok(())
     }

src/eradicate/snapshots/ruff__eradicate__tests__ERA001_ERA001.py.snap

@@ -17,6 +17,7 @@ expression: checks
     end_location:
       row: 2
       column: 0
+  parent: ~
 - kind: CommentedOutCode
   location:
     row: 2
@@ -32,6 +33,7 @@ expression: checks
     end_location:
       row: 3
       column: 0
+  parent: ~
 - kind: CommentedOutCode
   location:
     row: 3
@@ -47,6 +49,7 @@ expression: checks
     end_location:
       row: 4
       column: 0
+  parent: ~
 - kind: CommentedOutCode
   location:
     row: 5
@@ -62,6 +65,7 @@ expression: checks
     end_location:
       row: 6
       column: 0
+  parent: ~
 - kind: CommentedOutCode
   location:
     row: 12
@@ -77,4 +81,5 @@ expression: checks
     end_location:
       row: 13
       column: 0
+  parent: ~
 

src/flake8_2020/mod.rs

@@ -24,13 +24,12 @@ mod tests {
     #[test_case(CheckCode::YTT303, Path::new("YTT303.py"); "YTT303")]
     fn checks(check_code: CheckCode, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", check_code.as_ref(), path.to_string_lossy());
-        let mut checks = test_path(
+        let checks = test_path(
             Path::new("./resources/test/fixtures/flake8_2020")
                 .join(path)
                 .as_path(),
             &settings::Settings::for_rule(check_code),
         )?;
-        checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);
         Ok(())
     }

src/flake8_2020/snapshots/ruff__flake8_2020__tests__YTT101_YTT101.py.snap

@@ -10,6 +10,7 @@ expression: checks
     row: 6
     column: 17
   fix: ~
+  parent: ~
 - kind: SysVersionSlice3Referenced
   location:
     row: 7
@@ -18,6 +19,7 @@ expression: checks
     row: 7
     column: 13
   fix: ~
+  parent: ~
 - kind: SysVersionSlice3Referenced
   location:
     row: 8
@@ -26,4 +28,5 @@ expression: checks
     row: 8
     column: 7
   fix: ~
+  parent: ~
 

src/flake8_2020/snapshots/ruff__flake8_2020__tests__YTT102_YTT102.py.snap

@@ -10,6 +10,7 @@ expression: checks
     row: 4
     column: 22
   fix: ~
+  parent: ~
 - kind: SysVersion2Referenced
   location:
     row: 5
@@ -18,4 +19,5 @@ expression: checks
     row: 5
     column: 18
   fix: ~
+  parent: ~
 

src/flake8_2020/snapshots/ruff__flake8_2020__tests__YTT103_YTT103.py.snap

@@ -10,6 +10,7 @@ expression: checks
     row: 4
     column: 7
   fix: ~
+  parent: ~
 - kind: SysVersionCmpStr3
   location:
     row: 5
@@ -18,6 +19,7 @@ expression: checks
     row: 5
     column: 11
   fix: ~
+  parent: ~
 - kind: SysVersionCmpStr3
   location:
     row: 6
@@ -26,6 +28,7 @@ expression: checks
     row: 6
     column: 11
   fix: ~
+  parent: ~
 - kind: SysVersionCmpStr3
   location:
     row: 7
@@ -34,6 +37,7 @@ expression: checks
     row: 7
     column: 11
   fix: ~
+  parent: ~
 - kind: SysVersionCmpStr3
   location:
     row: 8
@@ -42,4 +46,5 @@ expression: checks
     row: 8
     column: 11
   fix: ~
+  parent: ~
 

src/flake8_2020/snapshots/ruff__flake8_2020__tests__YTT201_YTT201.py.snap

@@ -10,6 +10,7 @@ expression: checks
     row: 7
     column: 25
   fix: ~
+  parent: ~
 - kind: SysVersionInfo0Eq3Referenced
   location:
     row: 8
@@ -18,6 +19,7 @@ expression: checks
     row: 8
     column: 21
   fix: ~
+  parent: ~
 - kind: SysVersionInfo0Eq3Referenced
   location:
     row: 9
@@ -26,6 +28,7 @@ expression: checks
     row: 9
     column: 25
   fix: ~
+  parent: ~
 - kind: SysVersionInfo0Eq3Referenced
   location:
     row: 10
@@ -34,4 +37,5 @@ expression: checks
     row: 10
     column: 21
   fix: ~
+  parent: ~
 

src/flake8_2020/snapshots/ruff__flake8_2020__tests__YTT202_YTT202.py.snap

@@ -10,6 +10,7 @@ expression: checks
     row: 4
     column: 10
   fix: ~
+  parent: ~
 - kind: SixPY3Referenced
   location:
     row: 6
@@ -18,4 +19,5 @@ expression: checks
     row: 6
     column: 6
   fix: ~
+  parent: ~
 

src/flake8_2020/snapshots/ruff__flake8_2020__tests__YTT203_YTT203.py.snap

@@ -10,6 +10,7 @@ expression: checks
     row: 4
     column: 19
   fix: ~
+  parent: ~
 - kind: SysVersionInfo1CmpInt
   location:
     row: 5
@@ -18,4 +19,5 @@ expression: checks
     row: 5
     column: 15
   fix: ~
+  parent: ~
 

src/flake8_2020/snapshots/ruff__flake8_2020__tests__YTT204_YTT204.py.snap

@@ -10,6 +10,7 @@ expression: checks
     row: 4
     column: 22
   fix: ~
+  parent: ~
 - kind: SysVersionInfoMinorCmpInt
   location:
     row: 5
@@ -18,4 +19,5 @@ expression: checks
     row: 5
     column: 18
   fix: ~
+  parent: ~
 

src/flake8_2020/snapshots/ruff__flake8_2020__tests__YTT301_YTT301.py.snap

@@ -10,6 +10,7 @@ expression: checks
     row: 4
     column: 22
   fix: ~
+  parent: ~
 - kind: SysVersion0Referenced
   location:
     row: 5
@@ -18,4 +19,5 @@ expression: checks
     row: 5
     column: 18
   fix: ~
+  parent: ~
 

src/flake8_2020/snapshots/ruff__flake8_2020__tests__YTT302_YTT302.py.snap

@@ -10,6 +10,7 @@ expression: checks
     row: 4
     column: 7
   fix: ~
+  parent: ~
 - kind: SysVersionCmpStr10
   location:
     row: 5
@@ -18,6 +19,7 @@ expression: checks
     row: 5
     column: 11
   fix: ~
+  parent: ~
 - kind: SysVersionCmpStr10
   location:
     row: 6
@@ -26,6 +28,7 @@ expression: checks
     row: 6
     column: 11
   fix: ~
+  parent: ~
 - kind: SysVersionCmpStr10
   location:
     row: 7
@@ -34,6 +37,7 @@ expression: checks
     row: 7
     column: 11
   fix: ~
+  parent: ~
 - kind: SysVersionCmpStr10
   location:
     row: 8
@@ -42,4 +46,5 @@ expression: checks
     row: 8
     column: 11
   fix: ~
+  parent: ~
 

src/flake8_2020/snapshots/ruff__flake8_2020__tests__YTT303_YTT303.py.snap

@@ -10,6 +10,7 @@ expression: checks
     row: 4
     column: 17
   fix: ~
+  parent: ~
 - kind: SysVersionSlice1Referenced
   location:
     row: 5
@@ -18,4 +19,5 @@ expression: checks
     row: 5
     column: 13
   fix: ~
+  parent: ~
 

src/flake8_annotations/mod.rs

@@ -15,7 +15,7 @@ mod tests {
 
     #[test]
     fn defaults() -> Result<()> {
-        let mut checks = test_path(
+        let checks = test_path(
             Path::new("./resources/test/fixtures/flake8_annotations/annotation_presence.py"),
             &Settings {
                 ..Settings::for_rules(vec![
@@ -33,14 +33,13 @@ mod tests {
                 ])
             },
         )?;
-        checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(checks);
         Ok(())
     }
 
     #[test]
     fn suppress_dummy_args() -> Result<()> {
-        let mut checks = test_path(
+        let checks = test_path(
             Path::new("./resources/test/fixtures/flake8_annotations/suppress_dummy_args.py"),
             &Settings {
                 flake8_annotations: flake8_annotations::settings::Settings {
@@ -58,14 +57,13 @@ mod tests {
                 ])
             },
         )?;
-        checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(checks);
         Ok(())
     }
 
     #[test]
     fn mypy_init_return() -> Result<()> {
-        let mut checks = test_path(
+        let checks = test_path(
             Path::new("./resources/test/fixtures/flake8_annotations/mypy_init_return.py"),
             &Settings {
                 flake8_annotations: flake8_annotations::settings::Settings {
@@ -83,14 +81,13 @@ mod tests {
                 ])
             },
         )?;
-        checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(checks);
         Ok(())
     }
 
     #[test]
     fn suppress_none_returning() -> Result<()> {
-        let mut checks = test_path(
+        let checks = test_path(
             Path::new("./resources/test/fixtures/flake8_annotations/suppress_none_returning.py"),
             &Settings {
                 flake8_annotations: flake8_annotations::settings::Settings {
@@ -108,14 +105,13 @@ mod tests {
                 ])
             },
         )?;
-        checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(checks);
         Ok(())
     }
 
     #[test]
     fn allow_star_arg_any() -> Result<()> {
-        let mut checks = test_path(
+        let checks = test_path(
             Path::new("./resources/test/fixtures/flake8_annotations/allow_star_arg_any.py"),
             &Settings {
                 flake8_annotations: flake8_annotations::settings::Settings {
@@ -127,14 +123,13 @@ mod tests {
                 ..Settings::for_rules(vec![CheckCode::ANN401])
             },
         )?;
-        checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(checks);
         Ok(())
     }
 
     #[test]
     fn allow_overload() -> Result<()> {
-        let mut checks = test_path(
+        let checks = test_path(
             Path::new("./resources/test/fixtures/flake8_annotations/allow_overload.py"),
             &Settings {
                 ..Settings::for_rules(vec![
@@ -146,7 +141,6 @@ mod tests {
                 ])
             },
         )?;
-        checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(checks);
         Ok(())
     }

src/flake8_annotations/plugins.rs

@@ -332,7 +332,9 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                             );
                             if checker.patch(check.kind.code()) {
                                 match fixes::add_return_none_annotation(checker.locator, stmt) {
-                                    Ok(fix) => check.amend(fix),
+                                    Ok(fix) => {
+                                        check.amend(fix);
+                                    }
                                     Err(e) => error!("Failed to generate fix: {e}"),
                                 }
                             }

src/flake8_annotations/snapshots/ruff__flake8_annotations__tests__allow_overload.snap

@@ -11,4 +11,5 @@ expression: checks
     row: 29
     column: 11
   fix: ~
+  parent: ~
 

src/flake8_annotations/snapshots/ruff__flake8_annotations__tests__allow_star_arg_any.snap

@@ -11,6 +11,7 @@ expression: checks
     row: 10
     column: 14
   fix: ~
+  parent: ~
 - kind:
     DynamicallyTypedExpression: foo
   location:
@@ -20,6 +21,7 @@ expression: checks
     row: 15
     column: 49
   fix: ~
+  parent: ~
 - kind:
     DynamicallyTypedExpression: a
   location:
@@ -29,6 +31,7 @@ expression: checks
     row: 40
     column: 31
   fix: ~
+  parent: ~
 - kind:
     DynamicallyTypedExpression: foo_method
   location:
@@ -38,4 +41,5 @@ expression: checks
     row: 44
     column: 69
   fix: ~
+  parent: ~
 

src/flake8_annotations/snapshots/ruff__flake8_annotations__tests__defaults.snap

@@ -11,6 +11,7 @@ expression: checks
     row: 4
     column: 7
   fix: ~
+  parent: ~
 - kind:
     MissingTypeFunctionArgument: a
   location:
@@ -20,6 +21,7 @@ expression: checks
     row: 4
     column: 9
   fix: ~
+  parent: ~
 - kind:
     MissingTypeFunctionArgument: b
   location:
@@ -29,6 +31,7 @@ expression: checks
     row: 4
     column: 12
   fix: ~
+  parent: ~
 - kind:
     MissingReturnTypePublicFunction: foo
   location:
@@ -38,6 +41,7 @@ expression: checks
     row: 9
     column: 7
   fix: ~
+  parent: ~
 - kind:
     MissingTypeFunctionArgument: b
   location:
@@ -47,6 +51,7 @@ expression: checks
     row: 9
     column: 17
   fix: ~
+  parent: ~
 - kind:
     MissingTypeFunctionArgument: b
   location:
@@ -56,6 +61,7 @@ expression: checks
     row: 14
     column: 17
   fix: ~
+  parent: ~
 - kind:
     MissingReturnTypePublicFunction: foo
   location:
@@ -65,6 +71,7 @@ expression: checks
     row: 19
     column: 7
   fix: ~
+  parent: ~
 - kind:
     MissingReturnTypePublicFunction: foo
   location:
@@ -74,6 +81,7 @@ expression: checks
     row: 24
     column: 7
   fix: ~
+  parent: ~
 - kind:
     DynamicallyTypedExpression: a
   location:
@@ -83,6 +91,7 @@ expression: checks
     row: 44
     column: 14
   fix: ~
+  parent: ~
 - kind:
     DynamicallyTypedExpression: foo
   location:
@@ -92,6 +101,7 @@ expression: checks
     row: 49
     column: 49
   fix: ~
+  parent: ~
 - kind:
     DynamicallyTypedExpression: "*args"
   location:
@@ -101,6 +111,7 @@ expression: checks
     row: 54
     column: 26
   fix: ~
+  parent: ~
 - kind:
     DynamicallyTypedExpression: "**kwargs"
   location:
@@ -110,6 +121,7 @@ expression: checks
     row: 54
     column: 41
   fix: ~
+  parent: ~
 - kind:
     DynamicallyTypedExpression: "*args"
   location:
@@ -119,6 +131,7 @@ expression: checks
     row: 59
     column: 26
   fix: ~
+  parent: ~
 - kind:
     DynamicallyTypedExpression: "**kwargs"
   location:
@@ -128,6 +141,7 @@ expression: checks
     row: 64
     column: 41
   fix: ~
+  parent: ~
 - kind:
     MissingTypeSelf: self
   location:
@@ -137,6 +151,7 @@ expression: checks
     row: 74
     column: 16
   fix: ~
+  parent: ~
 - kind:
     DynamicallyTypedExpression: a
   location:
@@ -146,6 +161,7 @@ expression: checks
     row: 78
     column: 31
   fix: ~
+  parent: ~
 - kind:
     DynamicallyTypedExpression: foo
   location:
@@ -155,6 +171,7 @@ expression: checks
     row: 82
     column: 69
   fix: ~
+  parent: ~
 - kind:
     DynamicallyTypedExpression: "*params"
   location:
@@ -164,6 +181,7 @@ expression: checks
     row: 86
     column: 45
   fix: ~
+  parent: ~
 - kind:
     DynamicallyTypedExpression: "**options"
   location:
@@ -173,6 +191,7 @@ expression: checks
     row: 86
     column: 61
   fix: ~
+  parent: ~
 - kind:
     DynamicallyTypedExpression: "*params"
   location:
@@ -182,6 +201,7 @@ expression: checks
     row: 90
     column: 45
   fix: ~
+  parent: ~
 - kind:
     DynamicallyTypedExpression: "**options"
   location:
@@ -191,6 +211,7 @@ expression: checks
     row: 94
     column: 61
   fix: ~
+  parent: ~
 - kind:
     MissingTypeCls: cls
   location:
@@ -200,4 +221,5 @@ expression: checks
     row: 104
     column: 15
   fix: ~
+  parent: ~
 

src/flake8_annotations/snapshots/ruff__flake8_annotations__tests__mypy_init_return.snap

@@ -18,6 +18,7 @@ expression: checks
     end_location:
       row: 5
       column: 22
+  parent: ~
 - kind:
     MissingReturnTypeSpecialMethod: __init__
   location:
@@ -34,6 +35,7 @@ expression: checks
     end_location:
       row: 11
       column: 27
+  parent: ~
 - kind:
     MissingReturnTypePrivateFunction: __init__
   location:
@@ -43,4 +45,5 @@ expression: checks
     row: 40
     column: 12
   fix: ~
+  parent: ~
 

src/flake8_annotations/snapshots/ruff__flake8_annotations__tests__suppress_none_returning.snap

@@ -11,6 +11,7 @@ expression: checks
     row: 45
     column: 7
   fix: ~
+  parent: ~
 - kind:
     MissingReturnTypePublicFunction: foo
   location:
@@ -20,4 +21,5 @@ expression: checks
     row: 50
     column: 7
   fix: ~
+  parent: ~
 

src/flake8_bandit/mod.rs

@@ -21,13 +21,12 @@ mod tests {
     #[test_case(CheckCode::S107, Path::new("S107.py"); "S107")]
     fn checks(check_code: CheckCode, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", check_code.as_ref(), path.to_string_lossy());
-        let mut checks = test_path(
+        let checks = test_path(
             Path::new("./resources/test/fixtures/flake8_bandit")
                 .join(path)
                 .as_path(),
             &settings::Settings::for_rule(check_code),
         )?;
-        checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);
         Ok(())
     }

src/flake8_bandit/snapshots/ruff__flake8_bandit__tests__S101_S101.py.snap

@@ -10,6 +10,7 @@ expression: checks
     row: 2
     column: 11
   fix: ~
+  parent: ~
 - kind: AssertUsed
   location:
     row: 8
@@ -18,6 +19,7 @@ expression: checks
     row: 8
     column: 17
   fix: ~
+  parent: ~
 - kind: AssertUsed
   location:
     row: 11
@@ -26,4 +28,5 @@ expression: checks
     row: 11
     column: 17
   fix: ~
+  parent: ~
 

src/flake8_bandit/snapshots/ruff__flake8_bandit__tests__S102_S102.py.snap

@@ -10,6 +10,7 @@ expression: checks
     row: 3
     column: 17
   fix: ~
+  parent: ~
 - kind: ExecUsed
   location:
     row: 5
@@ -18,4 +19,5 @@ expression: checks
     row: 5
     column: 13
   fix: ~
+  parent: ~
 

src/flake8_bandit/snapshots/ruff__flake8_bandit__tests__S104_S104.py.snap

@@ -10,6 +10,7 @@ expression: checks
     row: 9
     column: 9
   fix: ~
+  parent: ~
 - kind: HardcodedBindAllInterfaces
   location:
     row: 10
@@ -18,6 +19,7 @@ expression: checks
     row: 10
     column: 9
   fix: ~
+  parent: ~
 - kind: HardcodedBindAllInterfaces
   location:
     row: 14
@@ -26,6 +28,7 @@ expression: checks
     row: 14
     column: 14
   fix: ~
+  parent: ~
 - kind: HardcodedBindAllInterfaces
   location:
     row: 18
@@ -34,4 +37,5 @@ expression: checks
     row: 18
     column: 17
   fix: ~
+  parent: ~
 

src/flake8_bandit/snapshots/ruff__flake8_bandit__tests__S105_S105.py.snap

@@ -11,6 +11,7 @@ expression: checks
     row: 12
     column: 19
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -20,6 +21,7 @@ expression: checks
     row: 13
     column: 16
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -29,6 +31,7 @@ expression: checks
     row: 14
     column: 17
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -38,6 +41,7 @@ expression: checks
     row: 15
     column: 14
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -47,6 +51,7 @@ expression: checks
     row: 16
     column: 17
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -56,6 +61,7 @@ expression: checks
     row: 17
     column: 16
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -65,6 +71,7 @@ expression: checks
     row: 18
     column: 18
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -74,6 +81,7 @@ expression: checks
     row: 19
     column: 26
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -83,6 +91,7 @@ expression: checks
     row: 20
     column: 26
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -92,6 +101,7 @@ expression: checks
     row: 22
     column: 24
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -101,6 +111,7 @@ expression: checks
     row: 23
     column: 20
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -110,6 +121,7 @@ expression: checks
     row: 24
     column: 22
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -119,6 +131,7 @@ expression: checks
     row: 25
     column: 19
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -128,6 +141,7 @@ expression: checks
     row: 26
     column: 22
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -137,6 +151,7 @@ expression: checks
     row: 27
     column: 21
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -146,6 +161,7 @@ expression: checks
     row: 28
     column: 23
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -155,6 +171,7 @@ expression: checks
     row: 29
     column: 31
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -164,6 +181,7 @@ expression: checks
     row: 30
     column: 31
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -173,6 +191,7 @@ expression: checks
     row: 34
     column: 23
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -182,6 +201,7 @@ expression: checks
     row: 38
     column: 27
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -191,6 +211,7 @@ expression: checks
     row: 39
     column: 24
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -200,6 +221,7 @@ expression: checks
     row: 40
     column: 25
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -209,6 +231,7 @@ expression: checks
     row: 41
     column: 22
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -218,6 +241,7 @@ expression: checks
     row: 42
     column: 25
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -227,6 +251,7 @@ expression: checks
     row: 43
     column: 24
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -236,6 +261,7 @@ expression: checks
     row: 44
     column: 26
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -245,6 +271,7 @@ expression: checks
     row: 46
     column: 20
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -254,6 +281,7 @@ expression: checks
     row: 47
     column: 17
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -263,6 +291,7 @@ expression: checks
     row: 48
     column: 18
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -272,6 +301,7 @@ expression: checks
     row: 49
     column: 15
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -281,6 +311,7 @@ expression: checks
     row: 50
     column: 18
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -290,6 +321,7 @@ expression: checks
     row: 51
     column: 17
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -299,6 +331,7 @@ expression: checks
     row: 52
     column: 19
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordString: s3cr3t
   location:
@@ -308,4 +341,35 @@ expression: checks
     row: 53
     column: 28
   fix: ~
+  parent: ~
+- kind:
+    HardcodedPasswordString: "1\n2"
+  location:
+    row: 55
+    column: 12
+  end_location:
+    row: 55
+    column: 18
+  fix: ~
+  parent: ~
+- kind:
+    HardcodedPasswordString: "3\t4"
+  location:
+    row: 58
+    column: 12
+  end_location:
+    row: 58
+    column: 18
+  fix: ~
+  parent: ~
+- kind:
+    HardcodedPasswordString: "5\r6"
+  location:
+    row: 61
+    column: 12
+  end_location:
+    row: 61
+    column: 18
+  fix: ~
+  parent: ~
 

src/flake8_bandit/snapshots/ruff__flake8_bandit__tests__S106_S106.py.snap

@@ -11,4 +11,5 @@ expression: checks
     row: 13
     column: 25
   fix: ~
+  parent: ~
 

src/flake8_bandit/snapshots/ruff__flake8_bandit__tests__S107_S107.py.snap

@@ -11,6 +11,7 @@ expression: checks
     row: 5
     column: 37
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordDefault: posonly
   location:
@@ -20,6 +21,7 @@ expression: checks
     row: 13
     column: 53
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordDefault: kwonly
   location:
@@ -29,6 +31,7 @@ expression: checks
     row: 21
     column: 46
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordDefault: posonly
   location:
@@ -38,6 +41,7 @@ expression: checks
     row: 29
     column: 47
   fix: ~
+  parent: ~
 - kind:
     HardcodedPasswordDefault: kwonly
   location:
@@ -47,4 +51,5 @@ expression: checks
     row: 29
     column: 69
   fix: ~
+  parent: ~
 

src/flake8_blind_except/mod.rs

@@ -15,13 +15,12 @@ mod tests {
     #[test_case(CheckCode::BLE001, Path::new("BLE.py"); "BLE001")]
     fn checks(check_code: CheckCode, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", check_code.as_ref(), path.to_string_lossy());
-        let mut checks = test_path(
+        let checks = test_path(
             Path::new("./resources/test/fixtures/flake8_blind_except")
                 .join(path)
                 .as_path(),
             &settings::Settings::for_rule(check_code),
         )?;
-        checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);
         Ok(())
     }

src/flake8_blind_except/snapshots/ruff__flake8_blind_except__tests__BLE001_BLE.py.snap

@@ -11,6 +11,7 @@ expression: checks
     row: 25
     column: 20
   fix: ~
+  parent: ~
 - kind:
     BlindExcept: Exception
   location:
@@ -20,6 +21,7 @@ expression: checks
     row: 31
     column: 16
   fix: ~
+  parent: ~
 - kind:
     BlindExcept: Exception
   location:
@@ -29,6 +31,7 @@ expression: checks
     row: 42
     column: 16
   fix: ~
+  parent: ~
 - kind:
     BlindExcept: BaseException
   location:
@@ -38,6 +41,7 @@ expression: checks
     row: 45
     column: 24
   fix: ~
+  parent: ~
 - kind:
     BlindExcept: Exception
   location:
@@ -47,6 +51,7 @@ expression: checks
     row: 54
     column: 16
   fix: ~
+  parent: ~
 - kind:
     BlindExcept: Exception
   location:
@@ -56,6 +61,7 @@ expression: checks
     row: 60
     column: 16
   fix: ~
+  parent: ~
 - kind:
     BlindExcept: BaseException
   location:
@@ -65,4 +71,5 @@ expression: checks
     row: 62
     column: 20
   fix: ~
+  parent: ~
 

src/flake8_boolean_trap/mod.rs

@@ -17,13 +17,12 @@ mod tests {
     #[test_case(CheckCode::FBT003, Path::new("FBT.py"); "FBT003")]
     fn checks(check_code: CheckCode, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", check_code.as_ref(), path.to_string_lossy());
-        let mut checks = test_path(
+        let checks = test_path(
             Path::new("./resources/test/fixtures/flake8_boolean_trap")
                 .join(path)
                 .as_path(),
             &settings::Settings::for_rule(check_code),
         )?;
-        checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);
         Ok(())
     }

src/flake8_boolean_trap/snapshots/ruff__flake8_boolean_trap__tests__FBT001_FBT.py.snap

@@ -10,6 +10,7 @@ expression: checks
     row: 4
     column: 26
   fix: ~
+  parent: ~
 - kind: BooleanPositionalArgInFunctionDefinition
   location:
     row: 5
@@ -18,6 +19,7 @@ expression: checks
     row: 5
     column: 31
   fix: ~
+  parent: ~
 - kind: BooleanPositionalArgInFunctionDefinition
   location:
     row: 10
@@ -26,6 +28,7 @@ expression: checks
     row: 10
     column: 36
   fix: ~
+  parent: ~
 - kind: BooleanPositionalArgInFunctionDefinition
   location:
     row: 11
@@ -34,6 +37,7 @@ expression: checks
     row: 11
     column: 41
   fix: ~
+  parent: ~
 - kind: BooleanPositionalArgInFunctionDefinition
   location:
     row: 14
@@ -42,6 +46,7 @@ expression: checks
     row: 14
     column: 37
   fix: ~
+  parent: ~
 - kind: BooleanPositionalArgInFunctionDefinition
   location:
     row: 15
@@ -50,6 +55,7 @@ expression: checks
     row: 15
     column: 42
   fix: ~
+  parent: ~
 - kind: BooleanPositionalArgInFunctionDefinition
   location:
     row: 18
@@ -58,6 +64,7 @@ expression: checks
     row: 18
     column: 40
   fix: ~
+  parent: ~
 - kind: BooleanPositionalArgInFunctionDefinition
   location:
     row: 19
@@ -66,4 +73,5 @@ expression: checks
     row: 19
     column: 45
   fix: ~
+  parent: ~
 

src/flake8_boolean_trap/snapshots/ruff__flake8_boolean_trap__tests__FBT002_FBT.py.snap

@@ -10,6 +10,7 @@ expression: checks
     row: 12
     column: 34
   fix: ~
+  parent: ~
 - kind: BooleanDefaultValueInFunctionDefinition
   location:
     row: 13
@@ -18,6 +19,7 @@ expression: checks
     row: 13
     column: 46
   fix: ~
+  parent: ~
 - kind: BooleanDefaultValueInFunctionDefinition
   location:
     row: 14
@@ -26,6 +28,7 @@ expression: checks
     row: 14
     column: 44
   fix: ~
+  parent: ~
 - kind: BooleanDefaultValueInFunctionDefinition
   location:
     row: 15
@@ -34,4 +37,5 @@ expression: checks
     row: 15
     column: 49
   fix: ~
+  parent: ~
 

src/flake8_boolean_trap/snapshots/ruff__flake8_boolean_trap__tests__FBT003_FBT.py.snap

@@ -10,6 +10,7 @@ expression: checks
     row: 42
     column: 14
   fix: ~
+  parent: ~
 - kind: BooleanPositionalValueInFunctionCall
   location:
     row: 57
@@ -18,6 +19,7 @@ expression: checks
     row: 57
     column: 14
   fix: ~
+  parent: ~
 - kind: BooleanPositionalValueInFunctionCall
   location:
     row: 57
@@ -26,4 +28,5 @@ expression: checks
     row: 57
     column: 21
   fix: ~
+  parent: ~
 

src/flake8_bugbear/mod.rs

@@ -42,13 +42,12 @@ mod tests {
     #[test_case(CheckCode::B905, Path::new("B905.py"); "B905")]
     fn checks(check_code: CheckCode, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", check_code.as_ref(), path.to_string_lossy());
-        let mut checks = test_path(
+        let checks = test_path(
             Path::new("./resources/test/fixtures/flake8_bugbear")
                 .join(path)
                 .as_path(),
             &Settings::for_rule(check_code),
         )?;
-        checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);
         Ok(())
     }
@@ -56,7 +55,7 @@ mod tests {
     #[test]
     fn extend_immutable_calls() -> Result<()> {
         let snapshot = "extend_immutable_calls".to_string();
-        let mut checks = test_path(
+        let checks = test_path(
             Path::new("./resources/test/fixtures/flake8_bugbear/B008_extended.py"),
             &Settings {
                 flake8_bugbear: flake8_bugbear::settings::Settings {
@@ -68,7 +67,6 @@ mod tests {
                 ..Settings::for_rules(vec![CheckCode::B008])
             },
         )?;
-        checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);
         Ok(())
     }

src/flake8_bugbear/plugins/assert_false.rs

@@ -47,8 +47,11 @@ pub fn assert_false(checker: &mut Checker, stmt: &Stmt, test: &Expr, msg: Option
 
     let mut check = Check::new(CheckKind::DoNotAssertFalse, Range::from_located(test));
     if checker.patch(check.kind.code()) {
-        let mut generator =
-            SourceCodeGenerator::new(checker.style.indentation(), checker.style.quote());
+        let mut generator = SourceCodeGenerator::new(
+            checker.style.indentation(),
+            checker.style.quote(),
+            checker.style.line_ending(),
+        );
         generator.unparse_stmt(&assertion_error(msg));
         if let Ok(content) = generator.generate() {
             check.amend(Fix::replacement(

src/flake8_bugbear/plugins/duplicate_exceptions.rs

@@ -54,8 +54,11 @@ fn duplicate_handler_exceptions<'a>(
                 Range::from_located(expr),
             );
             if checker.patch(check.kind.code()) {
-                let mut generator =
-                    SourceCodeGenerator::new(checker.style.indentation(), checker.style.quote());
+                let mut generator = SourceCodeGenerator::new(
+                    checker.style.indentation(),
+                    checker.style.quote(),
+                    checker.style.line_ending(),
+                );
                 if unique_elts.len() == 1 {
                     generator.unparse_expr(unique_elts[0], 0);
                 } else {

src/flake8_bugbear/plugins/function_uses_loop_variable.rs

@@ -12,8 +12,6 @@ use crate::checks::{Check, CheckKind};
 struct LoadedNamesVisitor<'a> {
     // Tuple of: name, defining expression, and defining range.
     names: Vec<(&'a str, &'a Expr, Range)>,
-    // If we're in an f-string, the range of the defining expression.
-    in_f_string: Option<Range>,
 }
 
 /// `Visitor` to collect all used identifiers in a statement.
@@ -24,18 +22,10 @@ where
     fn visit_expr(&mut self, expr: &'b Expr) {
         match &expr.node {
             ExprKind::JoinedStr { .. } => {
-                let prev_in_f_string = self.in_f_string;
-                self.in_f_string = Some(Range::from_located(expr));
                 visitor::walk_expr(self, expr);
-                self.in_f_string = prev_in_f_string;
             }
             ExprKind::Name { id, ctx } if matches!(ctx, ExprContext::Load) => {
-                self.names.push((
-                    id,
-                    expr,
-                    self.in_f_string
-                        .unwrap_or_else(|| Range::from_located(expr)),
-                ));
+                self.names.push((id, expr, Range::from_located(expr)));
             }
             _ => visitor::walk_expr(self, expr),
         }

src/flake8_bugbear/plugins/getattr_with_constant.rs

@@ -46,8 +46,11 @@ pub fn getattr_with_constant(checker: &mut Checker, expr: &Expr, func: &Expr, ar
 
     let mut check = Check::new(CheckKind::GetAttrWithConstant, Range::from_located(expr));
     if checker.patch(check.kind.code()) {
-        let mut generator =
-            SourceCodeGenerator::new(checker.style.indentation(), checker.style.quote());
+        let mut generator = SourceCodeGenerator::new(
+            checker.style.indentation(),
+            checker.style.quote(),
+            checker.style.line_ending(),
+        );
         generator.unparse_expr(&attribute(obj, value), 0);
         if let Ok(content) = generator.generate() {
             check.amend(Fix::replacement(

src/flake8_bugbear/plugins/redundant_tuple_in_exception_handler.rs

@@ -23,8 +23,11 @@ pub fn redundant_tuple_in_exception_handler(checker: &mut Checker, handlers: &[E
             Range::from_located(type_),
         );
         if checker.patch(check.kind.code()) {
-            let mut generator =
-                SourceCodeGenerator::new(checker.style.indentation(), checker.style.quote());
+            let mut generator = SourceCodeGenerator::new(
+                checker.style.indentation(),
+                checker.style.quote(),
+                checker.style.line_ending(),
+            );
             generator.unparse_expr(elt, 0);
             if let Ok(content) = generator.generate() {
                 check.amend(Fix::replacement(