Fix lint issues

.github/workflows/ci.yaml

@@ -36,18 +36,12 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
       - run: cargo build --all --release
-      - run: ./target/release/ruff_dev generate-rules-table
-      - run: ./target/release/ruff_dev generate-options
-      - run: git diff --quiet README.md || echo "::error file=README.md::This file is outdated. You may have to rerun 'cargo dev generate-options' and/or 'cargo dev generate-rules-table'."
-      - run: ./target/release/ruff_dev generate-check-code-prefix
-      - run: git diff --quiet src/checks_gen.rs || echo "::error file=src/checks_gen.rs::This file is outdated. You may have to rerun 'cargo dev generate-check-code-prefix'."
-      - run: git diff --exit-code -- README.md src/checks_gen.rs
-      - run: ./target/release/ruff_dev generate-json-schema
-      - run: git diff --quiet ruff.schema.json || echo "::error file=ruff.schema.json::This file is outdated. You may have to rerun 'cargo dev generate-json-schema'."
-      - run: git diff --exit-code -- ruff.schema.json
-      - run: ./target/release/ruff_dev generate-playground-options
-      - run: git diff --quiet playground/src/ruff_options.rs || echo "::error file=playground/src/ruff_options.ts::This file is outdated. You may have to rerun 'cargo dev generate-playground-options'."
-      - run: git diff --exit-code -- README.md src/checks_gen.rs playground/src/ruff_options.ts
+      - run: ./target/release/ruff_dev generate-all
+      - run: git diff --quiet README.md || echo "::error file=README.md::This file is outdated. Run 'cargo +nightly dev generate-all'."
+      - run: git diff --quiet src/checks_gen.rs || echo "::error file=src/checks_gen.rs::This file is outdated. Run 'cargo +nightly dev generate-all'."
+      - run: git diff --quiet ruff.schema.json || echo "::error file=ruff.schema.json::This file is outdated. Run 'cargo +nightly dev generate-all'."
+      - run: git diff --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
 
   cargo-fmt:
     name: "cargo fmt"
@@ -127,30 +121,35 @@ jobs:
       - run: cargo test --all
       - run: cargo test --package ruff --test black_compatibility_test -- --ignored
 
-  wasm-pack-test:
-    name: "wasm-pack test"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2022-11-01
-          override: true
-      - uses: actions/cache@v3
-        env:
-          cache-name: cache-cargo
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-      - uses: jetli/wasm-pack-action@v0.4.0
-      - run: wasm-pack test --node
+# TODO(charlie): Re-enable the `wasm-pack` tests.
+# See: https://github.com/charliermarsh/ruff/issues/1425
+#  wasm-pack-test:
+#    name: "wasm-pack test"
+#    runs-on: ubuntu-latest
+#    env:
+#      WASM_BINDGEN_TEST_TIMEOUT: 60
+#    steps:
+#      - uses: actions/checkout@v3
+#      - uses: actions-rs/toolchain@v1
+#        with:
+#          profile: minimal
+#          toolchain: nightly-2022-11-01
+#          override: true
+#      - uses: actions/cache@v3
+#        env:
+#          cache-name: cache-cargo
+#        with:
+#          path: |
+#            ~/.cargo/registry
+#            ~/.cargo/git
+#          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
+#          restore-keys: |
+#            ${{ runner.os }}-build-${{ env.cache-name }}-
+#            ${{ runner.os }}-build-
+#            ${{ runner.os }}-
+#      - uses: jetli/wasm-pack-action@v0.4.0
+#      - uses: jetli/wasm-bindgen-action@v0.2.0
+#      - run: wasm-pack test --node
 
   maturin-build:
     name: "maturin build"

.github/workflows/playground.yaml

@@ -4,8 +4,6 @@ on:
   workflow_dispatch:
   push:
     branches: [main]
-  pull_request:
-    branches: [main]
 
 env:
   CARGO_INCREMENTAL: 0
@@ -15,6 +13,8 @@ env:
 jobs:
   publish:
     runs-on: ubuntu-latest
+    env:
+       CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
     steps:
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
@@ -29,6 +29,7 @@ jobs:
           cache: "npm"
           cache-dependency-path: playground/package-lock.json
       - uses: jetli/wasm-pack-action@v0.4.0
+      - uses: jetli/wasm-bindgen-action@v0.2.0
       - name: "Run wasm-pack"
         run: wasm-pack build --target web --out-dir playground/src/pkg
       - name: "Install Node dependencies"
@@ -41,9 +42,7 @@ jobs:
         run: npm run build
         working-directory: playground
       - name: "Deploy to Cloudflare Pages"
-        env:
-          CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
-        if: ${{ env.CF_API_TOKEN }} != null
+        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
         uses: cloudflare/wrangler-action@2.0.0
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}

.pre-commit-config.yaml

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

CONTRIBUTING.md

@@ -59,9 +59,9 @@ pattern implemented therein.
 
 To trigger the rule, you'll likely want to augment the logic in `src/check_ast.rs`, which defines
 the Python AST visitor, responsible for iterating over the abstract syntax tree and collecting
-lint-rule violations as it goes. If you need to inspect the AST, you can run `cargo dev print-ast`
-with a Python file. Grep for the `Check::new` invocations to understand how other, similar rules
-are implemented.
+lint-rule violations as it goes. If you need to inspect the AST, you can run
+`cargo +nightly dev print-ast` with a Python file. Grep for the `Check::new` invocations to
+understand how other, similar rules are implemented.
 
 To add a test fixture, create a file under `resources/test/fixtures`, named to match the `CheckCode`
 you defined earlier (e.g., `E402.py`). This file should contain a variety of violations and
@@ -79,9 +79,7 @@ Then, run `cargo test`. Your test will fail, but you'll be prompted to follow-up
 `cargo insta review`. Accept the generated snapshot, then commit the snapshot file alongside the
 rest of your changes.
 
-Finally, to update the documentation, run `cargo dev generate-rules-table` from the repo root. To
-update the generated prefix map, run `cargo dev generate-check-code-prefix`. Both of these commands
-should be run whenever a new check is added to the codebase.
+Finally, regenerate the documentation and generated code with `cargo +nightly dev generate-all`.
 
 ### Example: Adding a new configuration option
 
@@ -105,8 +103,7 @@ You may also want to add the new configuration option to the `flake8-to-ruff` to
 responsible for converting `flake8` configuration files to Ruff's TOML format. This logic
 lives in `flake8_to_ruff/src/converter.rs`.
 
-Run `cargo dev generate-options` to update the documentation for supported configuration options,
-and `cargo dev generate-json-schema` to update the JSON schema for `tool.ruff` in `pyproject.toml`.
+Finally, regenerate the documentation and generated code with `cargo +nightly dev generate-all`.
 
 ## Release process
 

Cargo.lock

@@ -750,7 +750,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.195-dev.0"
+version = "0.0.201-dev.0"
 dependencies = [
  "anyhow",
  "clap 4.0.32",
@@ -1878,7 +1878,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.195"
+version = "0.0.201"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
@@ -1930,6 +1930,7 @@ dependencies = [
  "serde-wasm-bindgen",
  "serde_json",
  "shellexpand",
+ "similar",
  "strum",
  "strum_macros",
  "test-case",
@@ -1945,7 +1946,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_dev"
-version = "0.0.195"
+version = "0.0.201"
 dependencies = [
  "anyhow",
  "clap 4.0.32",
@@ -1966,7 +1967,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_macros"
-version = "0.0.195"
+version = "0.0.201"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2009,7 +2010,7 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.1.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=247e815880766d556ef1ca6f0af69daf1a5fe59a#247e815880766d556ef1ca6f0af69daf1a5fe59a"
+source = "git+https://github.com/RustPython/RustPython.git?rev=68d26955b3e24198a150315e7959719b03709dee#68d26955b3e24198a150315e7959719b03709dee"
 dependencies = [
  "num-bigint",
  "rustpython-common",
@@ -2019,7 +2020,7 @@ dependencies = [
 [[package]]
 name = "rustpython-common"
 version = "0.0.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=247e815880766d556ef1ca6f0af69daf1a5fe59a#247e815880766d556ef1ca6f0af69daf1a5fe59a"
+source = "git+https://github.com/RustPython/RustPython.git?rev=68d26955b3e24198a150315e7959719b03709dee#68d26955b3e24198a150315e7959719b03709dee"
 dependencies = [
  "ascii",
  "cfg-if 1.0.0",
@@ -2042,7 +2043,7 @@ dependencies = [
 [[package]]
 name = "rustpython-compiler-core"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=247e815880766d556ef1ca6f0af69daf1a5fe59a#247e815880766d556ef1ca6f0af69daf1a5fe59a"
+source = "git+https://github.com/RustPython/RustPython.git?rev=68d26955b3e24198a150315e7959719b03709dee#68d26955b3e24198a150315e7959719b03709dee"
 dependencies = [
  "bincode",
  "bitflags",
@@ -2059,7 +2060,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=247e815880766d556ef1ca6f0af69daf1a5fe59a#247e815880766d556ef1ca6f0af69daf1a5fe59a"
+source = "git+https://github.com/RustPython/RustPython.git?rev=68d26955b3e24198a150315e7959719b03709dee#68d26955b3e24198a150315e7959719b03709dee"
 dependencies = [
  "ahash",
  "anyhow",

Cargo.toml

@@ -6,9 +6,15 @@ members = [
 
 [package]
 name = "ruff"
-version = "0.0.195"
+version = "0.0.201"
+authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 edition = "2021"
 rust-version = "1.65.0"
+documentation = "https://github.com/charliermarsh/ruff"
+homepage = "https://github.com/charliermarsh/ruff"
+repository = "https://github.com/charliermarsh/ruff"
+readme = "README.md"
+license = "MIT"
 
 [lib]
 name = "ruff"
@@ -45,16 +51,17 @@ 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.195", path = "ruff_macros" }
+ruff_macros = { version = "0.0.201", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "247e815880766d556ef1ca6f0af69daf1a5fe59a" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "247e815880766d556ef1ca6f0af69daf1a5fe59a" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "247e815880766d556ef1ca6f0af69daf1a5fe59a" }
+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" }
 schemars = { version = "0.8.11" }
 semver = { version = "1.0.16" }
 serde = { version = "1.0.147", features = ["derive"] }
 serde_json = { version = "1.0.87" }
 shellexpand = { version = "3.0.0" }
+similar = { version = "2.2.1" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
 textwrap = { version = "0.16.0" }

LICENSE

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

README.md

@@ -23,15 +23,20 @@ An extremely fast Python linter, written in Rust.
 - 🔧  Autofix support, for automatic error correction (e.g., automatically remove unused imports)
 - ⚖️  [Near-parity](#how-does-ruff-compare-to-flake8) with the built-in Flake8 rule set
 - 🔌  Native re-implementations of popular Flake8 plugins, like [`flake8-bugbear`](https://pypi.org/project/flake8-bugbear/)
+- 🌎  Monorepo-friendly configuration via hierarchical and cascading settings
 
 Ruff aims to be orders of magnitude faster than alternative tools while integrating more
-functionality behind a single, common interface. Ruff can be used to replace Flake8 (plus a variety
-of plugins), [`isort`](https://pypi.org/project/isort/), [`pydocstyle`](https://pypi.org/project/pydocstyle/),
-[`yesqa`](https://github.com/asottile/yesqa), [`eradicate`](https://pypi.org/project/eradicate/),
-and even a subset of [`pyupgrade`](https://pypi.org/project/pyupgrade/) and [`autoflake`](https://pypi.org/project/autoflake/)
-all while executing tens or hundreds of times faster than any individual tool. Ruff goes beyond the
-responsibilities of a traditional linter, instead functioning as an advanced code transformation
-tool capable of upgrading type annotations, rewriting class definitions, sorting imports, and more.
+functionality behind a single, common interface.
+
+Ruff can be used to replace Flake8 (plus a variety of plugins), [`isort`](https://pypi.org/project/isort/),
+[`pydocstyle`](https://pypi.org/project/pydocstyle/), [`yesqa`](https://github.com/asottile/yesqa),
+[`eradicate`](https://pypi.org/project/eradicate/), [`pyupgrade`](https://pypi.org/project/pyupgrade/),
+and [`autoflake`](https://pypi.org/project/autoflake/), all while executing tens or hundreds of
+times faster than any individual tool.
+
+Ruff goes beyond the responsibilities of a traditional linter, instead functioning as an advanced
+code transformation tool capable of upgrading type annotations, rewriting class definitions, sorting
+imports, and more.
 
 Ruff is extremely actively developed and used in major open-source projects like:
 
@@ -39,6 +44,7 @@ Ruff is extremely actively developed and used in major open-source projects like
 - [Bokeh](https://github.com/bokeh/bokeh)
 - [Zulip](https://github.com/zulip/zulip)
 - [Pydantic](https://github.com/pydantic/pydantic)
+- [Sphinx](https://github.com/sphinx-doc/sphinx)
 - [Hatch](https://github.com/pypa/hatch)
 - [Jupyter](https://github.com/jupyter-server/jupyter_server)
 - [Synapse](https://github.com/matrix-org/synapse)
@@ -89,6 +95,7 @@ of [Conda](https://docs.conda.io/en/latest/):
    1. [flake8-comprehensions (C4)](#flake8-comprehensions-c4)
    1. [flake8-debugger (T10)](#flake8-debugger-t10)
    1. [flake8-errmsg (EM)](#flake8-errmsg-em)
+   1. [flake8-implicit-str-concat (ISC)](#flake8-implicit-str-concat-isc)
    1. [flake8-import-conventions (ICN)](#flake8-import-conventions-icn)
    1. [flake8-print (T20)](#flake8-print-t20)
    1. [flake8-quotes (Q)](#flake8-quotes-q)
@@ -162,7 +169,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.195'
+  rev: 'v0.0.201'
   hooks:
     - id: ruff
       # Respect `exclude` and `extend-exclude` settings.
@@ -220,8 +227,8 @@ max-complexity = 10
 ```
 
 As an example, the following would configure Ruff to: (1) avoid checking for line-length
-violations (`E501`); (2), always autofix, but never remove unused imports (`F401`); and (3) ignore
-import-at-top-of-file errors (`E402`) in `__init__.py` files:
+violations (`E501`); (2) never remove unused imports (`F401`); and (3) ignore import-at-top-of-file
+errors (`E402`) in `__init__.py` files:
 
 ```toml
 [tool.ruff]
@@ -231,8 +238,7 @@ select = ["E", "F"]
 # Never enforce `E501` (line length violations).
 ignore = ["E501"]
 
-# Always autofix, but never try to fix `F401` (unused imports).
-fix = true
+# Never try to fix `F401` (unused imports).
 unfixable = ["F401"]
 
 # Ignore `E402` (import violations) in all `__init__.py` files, and in `path/to/file.py`.
@@ -252,6 +258,17 @@ select = ["E", "F", "Q"]
 docstring-quotes = "double"
 ```
 
+Ruff mirrors Flake8's error code system, in which each error code consists of a one-to-three letter
+prefix, followed by three digits (e.g., `F401`). The prefix indicates that "source" of the error
+code (e.g., `F` for Pyflakes, `E` for `pycodestyle`, `ANN` for `flake8-annotations`). The set of
+enabled errors is determined by the `select` and `ignore` options, which support both the full
+error code (e.g., `F401`) and the prefix (e.g., `F`).
+
+As a special-case, Ruff also supports the `ALL` error code, which enables all error codes. Note that
+some of the `pydocstyle` error codes are conflicting (e.g., `D203` and `D211`) as they represent
+alternative docstring formats. Enabling `ALL` without further configuration may result in suboptimal
+behavior, especially for the `pydocstyle` plugin.
+
 As an alternative to `pyproject.toml`, Ruff will also respect a `ruff.toml` file, which implements
 an equivalent schema (though the `[tool.ruff]` hierarchy can be omitted). For example, the above
 `pyproject.toml` described above would be represented via the following `ruff.toml`:
@@ -308,6 +325,8 @@ Options:
           Attempt to automatically fix lint errors
       --fix-only
           Fix any fixable lint errors, but don't report on leftover violations. Implies `--fix`
+      --diff
+          Avoid writing any fixed files back; instead, output a diff for each changed file to stdout
   -n, --no-cache
           Disable cache reads
       --select <SELECT>
@@ -329,13 +348,15 @@ Options:
       --per-file-ignores <PER_FILE_IGNORES>
           List of mappings from file pattern to code to exclude
       --format <FORMAT>
-          Output serialization format for error messages [possible values: text, json, junit, grouped, github]
+          Output serialization format for error messages [possible values: text, json, junit, grouped, github, gitlab]
       --show-source
           Show violations with source code
       --respect-gitignore
           Respect file exclusions via `.gitignore` and other standard ignore files
       --force-exclude
           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
@@ -639,7 +660,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 | 🛠 |
-| UP005 | DeprecatedUnittestAlias | `assertEquals` is deprecated, use `assertEqual` instead | 🛠 |
+| 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 | 🛠 |
 | UP008 | SuperCallWithParameters | Use `super()` instead of `super(__class__, self)` | 🛠 |
@@ -654,6 +675,11 @@ For more, see [pyupgrade](https://pypi.org/project/pyupgrade/3.2.0/) on PyPI.
 | UP017 | DatetimeTimezoneUTC | Use `datetime.UTC` alias | 🛠 |
 | UP018 | NativeLiterals | Unnecessary call to `str` and `bytes` | 🛠 |
 | 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` | 🛠 |
+| UP025 | RewriteUnicodeLiteral | Remove unicode literals from strings | 🛠 |
 
 ### pep8-naming (N)
 
@@ -829,6 +855,16 @@ For more, see [flake8-errmsg](https://pypi.org/project/flake8-errmsg/0.4.0/) on
 | EM102 | FStringInException | Exception must not use an f-string literal, assign to variable first |  |
 | EM103 | DotFormatInException | Exception must not use a `.format()` string directly, assign to variable first |  |
 
+### flake8-implicit-str-concat (ISC)
+
+For more, see [flake8-implicit-str-concat](https://pypi.org/project/flake8-implicit-str-concat/0.3.0/) on PyPI.
+
+| Code | Name | Message | Fix |
+| ---- | ---- | ------- | --- |
+| ISC001 | SingleLineImplicitStringConcatenation | Implicitly concatenated string literals on one line |  |
+| ISC002 | MultiLineImplicitStringConcatenation | Implicitly concatenated string literals over continuation line |  |
+| ISC003 | ExplicitStringConcatenation | Explicitly concatenated string should be implicitly concatenated |  |
+
 ### flake8-import-conventions (ICN)
 
 | Code | Name | Message | Fix |
@@ -884,6 +920,7 @@ For more, see [flake8-tidy-imports](https://pypi.org/project/flake8-tidy-imports
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
+| TID251 | BannedApi | `...` is banned: ... |  |
 | TID252 | BannedRelativeImport | Relative imports are banned |  |
 
 ### flake8-unused-arguments (ARG)
@@ -950,6 +987,7 @@ For more, see [pygrep-hooks](https://github.com/pre-commit/pygrep-hooks) on GitH
 | PGH001 | NoEval | No builtin `eval()` allowed |  |
 | PGH002 | DeprecatedLogWarn | `warn` is deprecated in favor of `warning` |  |
 | PGH003 | BlanketTypeIgnore | Use specific error codes when ignoring type issues |  |
+| PGH004 | BlanketNOQA | Use specific error codes when using `noqa` |  |
 
 ### Pylint (PLC, PLE, PLR, PLW)
 
@@ -977,6 +1015,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'?) |  |
+| RUF004 | KeywordArgumentBeforeStarArgument | Keyword argument `...` must come after starred arguments |  |
 | RUF100 | UnusedNOQA | Unused blanket `noqa` directive | 🛠 |
 
 <!-- End auto-generated sections. -->
@@ -1246,10 +1285,12 @@ natively, including:
 - [`flake8-docstrings`](https://pypi.org/project/flake8-docstrings/)
 - [`flake8-eradicate`](https://pypi.org/project/flake8-eradicate/)
 - [`flake8-errmsg`](https://pypi.org/project/flake8-errmsg/)
+- [`flake8-implicit-str-concat`](https://pypi.org/project/flake8-implicit-str-concat/)
 - [`flake8-import-conventions`](https://github.com/joaopalmeiro/flake8-import-conventions)
 - [`flake8-print`](https://pypi.org/project/flake8-print/)
 - [`flake8-quotes`](https://pypi.org/project/flake8-quotes/)
 - [`flake8-return`](https://pypi.org/project/flake8-return/)
+- [`flake8-simplify`](https://pypi.org/project/flake8-simplify/) (1/37)
 - [`flake8-super`](https://pypi.org/project/flake8-super/)
 - [`flake8-tidy-imports`](https://pypi.org/project/flake8-tidy-imports/) (1/3)
 - [`isort`](https://pypi.org/project/isort/)
@@ -1257,7 +1298,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/) (19/33)
+- [`pyupgrade`](https://pypi.org/project/pyupgrade/) (20/33)
 - [`yesqa`](https://github.com/asottile/yesqa)
 
 Note that, in some cases, Ruff uses different error code prefixes than would be found in the
@@ -1301,10 +1342,12 @@ Today, Ruff can be used to replace Flake8 when used with any of the following pl
 - [`flake8-docstrings`](https://pypi.org/project/flake8-docstrings/)
 - [`flake8-eradicate`](https://pypi.org/project/flake8-eradicate/)
 - [`flake8-errmsg`](https://pypi.org/project/flake8-errmsg/)
+- [`flake8-implicit-str-concat`](https://pypi.org/project/flake8-implicit-str-concat/)
 - [`flake8-import-conventions`](https://github.com/joaopalmeiro/flake8-import-conventions)
 - [`flake8-print`](https://pypi.org/project/flake8-print/)
 - [`flake8-quotes`](https://pypi.org/project/flake8-quotes/)
 - [`flake8-return`](https://pypi.org/project/flake8-return/)
+- [`flake8-simplify`](https://pypi.org/project/flake8-simplify/) (1/37)
 - [`flake8-super`](https://pypi.org/project/flake8-super/)
 - [`flake8-tidy-imports`](https://pypi.org/project/flake8-tidy-imports/) (1/3)
 - [`mccabe`](https://pypi.org/project/mccabe/)
@@ -1314,7 +1357,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/) (19/33).
+implemented in [`pyupgrade`](https://pypi.org/project/pyupgrade/) (20/33).
 
 If you're looking to use Ruff, but rely on an unsupported Flake8 plugin, free to file an Issue.
 
@@ -1361,6 +1404,22 @@ src = ["src", "tests"]
 known-first-party = ["my_module1", "my_module2"]
 ```
 
+### Does Ruff support Jupyter Notebooks?
+
+Ruff is integrated into [nbQA](https://github.com/nbQA-dev/nbQA), a tool for running linters and
+code formatters over Jupyter Notebooks.
+
+After installing `ruff` and `nbqa`, you can run Ruff over a notebook like so:
+
+```shell
+> nbqa ruff Untitled.ipynb
+Untitled.ipynb:cell_1:2:5: F841 Local variable `x` is assigned to but never used
+Untitled.ipynb:cell_2:1:1: E402 Module level import not at top of file
+Untitled.ipynb:cell_2:1:8: F401 `os` imported but unused
+Found 3 error(s).
+1 potentially fixable with the --fix option.
+```
+
 ### Does Ruff support NumPy- or Google-style docstrings?
 
 Yes! To enable a specific docstring convention, start by enabling all `pydocstyle` error codes, and
@@ -1431,6 +1490,18 @@ extend-ignore = [
 ]
 ```
 
+Note that Ruff _also_ supports a [`convention`](#convention) setting:
+
+```toml
+[tool.ruff.pydocstyle]
+convention = "google"
+```
+
+However, this setting is purely used to implement robust detection of Google and NumPy-style
+sections, and thus avoid the [false negatives](https://github.com/PyCQA/pydocstyle/issues/459) seen
+in `pydocstyle`; it does not affect which errors are enabled, which is driven by the `select` and
+`ignore` settings, as described above.
+
 ## Development
 
 Ruff is written in Rust (1.65.0). You'll need to install the [Rust toolchain](https://www.rust-lang.org/tools/install)
@@ -1446,8 +1517,8 @@ For development, we use [nightly Rust](https://rust-lang.github.io/rustup/concep
 
 ```shell
 cargo +nightly fmt
-cargo +nightly clippy
-cargo +nightly test
+cargo +nightly clippy --fix --workspace --all-targets --all-features -- -W clippy::pedantic
+cargo +nightly test --all
 ```
 
 ## Releases
@@ -1883,8 +1954,9 @@ force-exclude = true
 
 The style in which violation messages should be formatted: `"text"`
 (default), `"grouped"` (group messages by file), `"json"`
-(machine-readable), `"junit"` (machine-readable XML), or `"github"`
-(GitHub Actions annotations).
+(machine-readable), `"junit"` (machine-readable XML), `"github"`
+(GitHub Actions annotations) or `"gitlab"`
+(GitLab CI code quality report).
 
 **Default value**: `"text"`
 
@@ -2146,6 +2218,24 @@ unfixable = ["F401"]
 
 ---
 
+#### [`update-check`](#update-check)
+
+Enable or disable automatic update checks (overridden by the
+`--update-check` and `--no-update-check` command-line flags).
+
+**Default value**: `true`
+
+**Type**: `bool`
+
+**Example usage**:
+
+```toml
+[tool.ruff]
+update-check = false
+```
+
+---
+
 ### `flake8-annotations`
 
 #### [`allow-star-arg-any`](#allow-star-arg-any)
@@ -2389,7 +2479,7 @@ multiline-quotes = "single"
 #### [`ban-relative-imports`](#ban-relative-imports)
 
 Whether to ban all relative imports (`"all"`), or only those imports
-that extend into the parent module and beyond (`"parents"`).
+that extend into the parent module or beyond (`"parents"`).
 
 **Default value**: `"parents"`
 
@@ -2405,6 +2495,27 @@ ban-relative-imports = "all"
 
 ---
 
+#### [`banned-api`](#banned-api)
+
+Specific modules or module members that may not be imported or accessed.
+Note that this check is only meant to flag accidental uses,
+and can be circumvented via `eval` or `importlib`.
+
+**Default value**: `{}`
+
+**Type**: `HashMap<String, BannedApi>`
+
+**Example usage**:
+
+```toml
+[tool.ruff.flake8-tidy-imports]
+[tool.ruff.flake8-tidy-imports.banned-api]
+"cgi".msg = "The cgi module is deprecated, see https://peps.python.org/pep-0594/#cgi."
+"typing.TypedDict".msg = "Use typing_extensions.TypedDict instead."
+```
+
+---
+
 ### `flake8-unused-arguments`
 
 #### [`ignore-variadic-names`](#ignore-variadic-names)
@@ -2462,6 +2573,23 @@ extra-standard-library = ["path"]
 
 ---
 
+#### [`force-single-line`](#force-single-line)
+
+Forces all from imports to appear on their own line.
+
+**Default value**: `false`
+
+**Type**: `bool`
+
+**Example usage**:
+
+```toml
+[tool.ruff.isort]
+force-single-line = true
+```
+
+---
+
 #### [`force-wrap-aliases`](#force-wrap-aliases)
 
 Force `import from` statements with multiple members and at least one
@@ -2531,6 +2659,23 @@ known-third-party = ["src"]
 
 ---
 
+#### [`single-line-exclusions`](#single-line-exclusions)
+
+One or more modules to exclude from the single line rule.
+
+**Default value**: `[]`
+
+**Type**: `Vec<String>`
+
+**Example usage**:
+
+```toml
+[tool.ruff.isort]
+single-line-exclusions = ["os", "json"]
+```
+
+---
+
 #### [`split-on-trailing-comma`](#split-on-trailing-comma)
 
 If a comma is placed after the last member in a multi-line import, then
@@ -2632,6 +2777,28 @@ staticmethod-decorators = ["staticmethod", "stcmthd"]
 
 ---
 
+### `pydocstyle`
+
+#### [`convention`](#convention)
+
+Whether to use Google-style or Numpy-style conventions when detecting
+docstring sections. By default, conventions will be inferred from
+the available sections.
+
+**Default value**: `None`
+
+**Type**: `Convention`
+
+**Example usage**:
+
+```toml
+[tool.ruff.pydocstyle]
+# Use Google-style docstrings.
+convention = "google"
+```
+
+---
+
 ### `pyupgrade`
 
 #### [`keep-runtime-typing`](#keep-runtime-typing)

flake8_to_ruff/Cargo.lock

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

flake8_to_ruff/Cargo.toml

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

flake8_to_ruff/src/converter.rs

@@ -4,11 +4,12 @@ use anyhow::Result;
 use ruff::checks_gen::CheckCodePrefix;
 use ruff::flake8_quotes::settings::Quote;
 use ruff::flake8_tidy_imports::settings::Strictness;
+use ruff::pydocstyle::settings::Convention;
 use ruff::settings::options::Options;
 use ruff::settings::pyproject::Pyproject;
 use ruff::{
     flake8_annotations, flake8_bugbear, flake8_errmsg, flake8_quotes, flake8_tidy_imports, mccabe,
-    pep8_naming,
+    pep8_naming, pydocstyle,
 };
 
 use crate::black::Black;
@@ -91,6 +92,7 @@ pub fn convert(
     let mut flake8_tidy_imports = flake8_tidy_imports::settings::Options::default();
     let mut mccabe = mccabe::settings::Options::default();
     let mut pep8_naming = pep8_naming::settings::Options::default();
+    let mut pydocstyle = pydocstyle::settings::Options::default();
     for (key, value) in flake8 {
         if let Some(value) = value {
             match key.as_str() {
@@ -162,17 +164,17 @@ pub fn convert(
                 // flake8-quotes
                 "quotes" | "inline-quotes" | "inline_quotes" => match value.trim() {
                     "'" | "single" => flake8_quotes.inline_quotes = Some(Quote::Single),
-                    "\"" | "double" => flake8_quotes.inline_quotes = Some(Quote::Single),
+                    "\"" | "double" => flake8_quotes.inline_quotes = Some(Quote::Double),
                     _ => eprintln!("Unexpected '{key}' value: {value}"),
                 },
                 "multiline-quotes" | "multiline_quotes" => match value.trim() {
                     "'" | "single" => flake8_quotes.multiline_quotes = Some(Quote::Single),
-                    "\"" | "double" => flake8_quotes.multiline_quotes = Some(Quote::Single),
+                    "\"" | "double" => flake8_quotes.multiline_quotes = Some(Quote::Double),
                     _ => eprintln!("Unexpected '{key}' value: {value}"),
                 },
                 "docstring-quotes" | "docstring_quotes" => match value.trim() {
                     "'" | "single" => flake8_quotes.docstring_quotes = Some(Quote::Single),
-                    "\"" | "double" => flake8_quotes.docstring_quotes = Some(Quote::Single),
+                    "\"" | "double" => flake8_quotes.docstring_quotes = Some(Quote::Double),
                     _ => eprintln!("Unexpected '{key}' value: {value}"),
                 },
                 "avoid-escape" | "avoid_escape" => match parser::parse_bool(value.as_ref()) {
@@ -200,9 +202,12 @@ pub fn convert(
                     _ => eprintln!("Unexpected '{key}' value: {value}"),
                 },
                 // flake8-docstrings
-                "docstring-convention" => {
-                    // No-op (handled above).
-                }
+                "docstring-convention" => match value.trim() {
+                    "google" => pydocstyle.convention = Some(Convention::Google),
+                    "numpy" => pydocstyle.convention = Some(Convention::Numpy),
+                    "pep257" | "all" => pydocstyle.convention = None,
+                    _ => eprintln!("Unexpected '{key}' value: {value}"),
+                },
                 // mccabe
                 "max-complexity" | "max_complexity" => match value.clone().parse::<usize>() {
                     Ok(max_complexity) => mccabe.max_complexity = Some(max_complexity),
@@ -247,6 +252,9 @@ pub fn convert(
     if pep8_naming != pep8_naming::settings::Options::default() {
         options.pep8_naming = Some(pep8_naming);
     }
+    if pydocstyle != pydocstyle::settings::Options::default() {
+        options.pydocstyle = Some(pydocstyle);
+    }
 
     // Extract any settings from the existing `pyproject.toml`.
     if let Some(black) = black {
@@ -271,9 +279,10 @@ mod tests {
 
     use anyhow::Result;
     use ruff::checks_gen::CheckCodePrefix;
-    use ruff::flake8_quotes;
+    use ruff::pydocstyle::settings::Convention;
     use ruff::settings::options::Options;
     use ruff::settings::pyproject::Pyproject;
+    use ruff::{flake8_quotes, pydocstyle};
 
     use crate::converter::convert;
     use crate::plugin::Plugin;
@@ -287,6 +296,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             allowed_confusables: None,
+            cache_dir: None,
             dummy_variable_rgx: None,
             exclude: None,
             extend: None,
@@ -314,7 +324,7 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            cache_dir: None,
+            update_check: None,
             flake8_annotations: None,
             flake8_bugbear: None,
             flake8_errmsg: None,
@@ -325,6 +335,7 @@ mod tests {
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pydocstyle: None,
             pyupgrade: None,
         });
         assert_eq!(actual, expected);
@@ -344,6 +355,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             allowed_confusables: None,
+            cache_dir: None,
             dummy_variable_rgx: None,
             exclude: None,
             extend: None,
@@ -371,7 +383,7 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            cache_dir: None,
+            update_check: None,
             flake8_annotations: None,
             flake8_bugbear: None,
             flake8_errmsg: None,
@@ -382,6 +394,7 @@ mod tests {
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pydocstyle: None,
             pyupgrade: None,
         });
         assert_eq!(actual, expected);
@@ -401,6 +414,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             allowed_confusables: None,
+            cache_dir: None,
             dummy_variable_rgx: None,
             exclude: None,
             extend: None,
@@ -428,7 +442,7 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            cache_dir: None,
+            update_check: None,
             flake8_annotations: None,
             flake8_bugbear: None,
             flake8_errmsg: None,
@@ -439,6 +453,7 @@ mod tests {
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pydocstyle: None,
             pyupgrade: None,
         });
         assert_eq!(actual, expected);
@@ -458,6 +473,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             allowed_confusables: None,
+            cache_dir: None,
             dummy_variable_rgx: None,
             exclude: None,
             extend: None,
@@ -485,7 +501,7 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            cache_dir: None,
+            update_check: None,
             flake8_annotations: None,
             flake8_bugbear: None,
             flake8_errmsg: None,
@@ -496,6 +512,7 @@ mod tests {
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pydocstyle: None,
             pyupgrade: None,
         });
         assert_eq!(actual, expected);
@@ -515,6 +532,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             allowed_confusables: None,
+            cache_dir: None,
             dummy_variable_rgx: None,
             exclude: None,
             extend: None,
@@ -542,7 +560,7 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            cache_dir: None,
+            update_check: None,
             flake8_annotations: None,
             flake8_bugbear: None,
             flake8_errmsg: None,
@@ -558,6 +576,7 @@ mod tests {
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pydocstyle: None,
             pyupgrade: None,
         });
         assert_eq!(actual, expected);
@@ -580,6 +599,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             allowed_confusables: None,
+            cache_dir: None,
             dummy_variable_rgx: None,
             exclude: None,
             extend: None,
@@ -643,7 +663,7 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            cache_dir: None,
+            update_check: None,
             flake8_annotations: None,
             flake8_bugbear: None,
             flake8_errmsg: None,
@@ -654,6 +674,9 @@ mod tests {
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pydocstyle: Some(pydocstyle::settings::Options {
+                convention: Some(Convention::Numpy),
+            }),
             pyupgrade: None,
         });
         assert_eq!(actual, expected);
@@ -673,6 +696,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             allowed_confusables: None,
+            cache_dir: None,
             dummy_variable_rgx: None,
             exclude: None,
             extend: None,
@@ -701,7 +725,7 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
-            cache_dir: None,
+            update_check: None,
             flake8_annotations: None,
             flake8_bugbear: None,
             flake8_errmsg: None,
@@ -717,6 +741,7 @@ mod tests {
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pydocstyle: None,
             pyupgrade: None,
         });
         assert_eq!(actual, expected);

flake8_to_ruff/src/plugin.rs

@@ -16,16 +16,17 @@ pub enum Plugin {
     Flake8Datetimez,
     Flake8Debugger,
     Flake8Docstrings,
-    Flake8ErrMsg,
     Flake8Eradicate,
+    Flake8ErrMsg,
+    Flake8ImplicitStrConcat,
     Flake8Print,
     Flake8Quotes,
     Flake8Return,
     Flake8Simplify,
     Flake8TidyImports,
     McCabe,
-    PandasVet,
     PEP8Naming,
+    PandasVet,
     Pyupgrade,
 }
 
@@ -45,6 +46,7 @@ impl FromStr for Plugin {
             "flake8-docstrings" => Ok(Plugin::Flake8Docstrings),
             "flake8-eradicate" => Ok(Plugin::Flake8Eradicate),
             "flake8-errmsg" => Ok(Plugin::Flake8ErrMsg),
+            "flake8-implicit-str-concat" => Ok(Plugin::Flake8ImplicitStrConcat),
             "flake8-print" => Ok(Plugin::Flake8Print),
             "flake8-quotes" => Ok(Plugin::Flake8Quotes),
             "flake8-return" => Ok(Plugin::Flake8Return),
@@ -76,14 +78,15 @@ impl fmt::Debug for Plugin {
                 Plugin::Flake8Docstrings => "flake8-docstrings",
                 Plugin::Flake8Eradicate => "flake8-eradicate",
                 Plugin::Flake8ErrMsg => "flake8-errmsg",
+                Plugin::Flake8ImplicitStrConcat => "flake8-implicit-str-concat",
                 Plugin::Flake8Print => "flake8-print",
                 Plugin::Flake8Quotes => "flake8-quotes",
                 Plugin::Flake8Return => "flake8-return",
                 Plugin::Flake8Simplify => "flake8-simplify",
                 Plugin::Flake8TidyImports => "flake8-tidy-imports",
                 Plugin::McCabe => "mccabe",
-                Plugin::PandasVet => "pandas-vet",
                 Plugin::PEP8Naming => "pep8-naming",
+                Plugin::PandasVet => "pandas-vet",
                 Plugin::Pyupgrade => "pyupgrade",
             }
         )
@@ -106,6 +109,7 @@ impl Plugin {
             // TODO(charlie): Handle rename of `E` to `ERA`.
             Plugin::Flake8Eradicate => CheckCodePrefix::ERA,
             Plugin::Flake8ErrMsg => CheckCodePrefix::EM,
+            Plugin::Flake8ImplicitStrConcat => CheckCodePrefix::ISC,
             Plugin::Flake8Print => CheckCodePrefix::T2,
             Plugin::Flake8Quotes => CheckCodePrefix::Q,
             Plugin::Flake8Return => CheckCodePrefix::RET,
@@ -146,6 +150,7 @@ impl Plugin {
             }
             Plugin::Flake8Eradicate => vec![CheckCodePrefix::ERA],
             Plugin::Flake8ErrMsg => vec![CheckCodePrefix::EM],
+            Plugin::Flake8ImplicitStrConcat => vec![CheckCodePrefix::ISC],
             Plugin::Flake8Print => vec![CheckCodePrefix::T2],
             Plugin::Flake8Quotes => vec![CheckCodePrefix::Q],
             Plugin::Flake8Return => vec![CheckCodePrefix::RET],
@@ -449,6 +454,7 @@ pub fn infer_plugins_from_codes(codes: &BTreeSet<CheckCodePrefix>) -> Vec<Plugin
         Plugin::Flake8Docstrings,
         Plugin::Flake8Eradicate,
         Plugin::Flake8ErrMsg,
+        Plugin::Flake8ImplicitStrConcat,
         Plugin::Flake8Print,
         Plugin::Flake8Quotes,
         Plugin::Flake8Return,

playground/.prettierignore

@@ -1 +0,0 @@
-src/ruff_options.ts

playground/.prettierrc.json

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

playground/README.md

@@ -8,3 +8,7 @@ In-browser playground for Ruff. Available [https://ruff.pages.dev/](https://ruff
   root directory.
 - Install TypeScript dependencies with: `npm install`.
 - Start the development server with: `npm run dev`.
+
+## Implementation
+
+Design based on [Tailwind Play](https://play.tailwindcss.com/). Themed with [`ayu`](https://github.com/dempfi/ayu).

playground/index.html

@@ -13,10 +13,11 @@
       rel="icon"
       href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>🛠️</text></svg>"
     />
+    <link rel="stylesheet" href="https://rsms.me/inter/inter.css" />
   </head>
   <body>
     <div id="root"></div>
-    <div style="display: flex; position: fixed; right: 16px; top: 16px">
+    <div style="display: flex; position: fixed; right: 16px; bottom: 16px">
       <a href="https://GitHub.com/charliermarsh/ruff"
         ><img
           src="https://img.shields.io/github/stars/charliermarsh/ruff.svg?style=social&label=GitHub&maxAge=2592000&?logoWidth=100"

playground/package.json

@@ -14,6 +14,7 @@
   },
   "dependencies": {
     "@monaco-editor/react": "^4.4.6",
+    "classnames": "^2.3.2",
     "lz-string": "^1.4.4",
     "monaco-editor": "^0.34.1",
     "react": "^18.2.0",
@@ -25,13 +26,16 @@
     "@typescript-eslint/eslint-plugin": "^5.47.1",
     "@typescript-eslint/parser": "^5.47.1",
     "@vitejs/plugin-react-swc": "^3.0.0",
+    "autoprefixer": "^10.4.13",
     "eslint": "^8.30.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.31.11",
     "eslint-plugin-react-hooks": "^4.6.0",
+    "postcss": "^8.4.20",
     "prettier": "^2.8.1",
+    "tailwindcss": "^3.2.4",
     "typescript": "^4.9.3",
     "vite": "^4.0.0"
   }

playground/postcss.config.cjs

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

playground/src/App.tsx

@@ -1,200 +0,0 @@
-import lzstring from "lz-string";
-import Editor, { useMonaco } from "@monaco-editor/react";
-import { MarkerSeverity } from "monaco-editor/esm/vs/editor/editor.api";
-import { useEffect, useState, useCallback } from "react";
-
-import init, { Check, check } from "./pkg/ruff.js";
-import { AVAILABLE_OPTIONS } from "./ruff_options";
-import { Config, getDefaultConfig, toRuffConfig } from "./config";
-import { Options } from "./Options";
-
-const DEFAULT_SOURCE =
-  "# Define a function that takes an integer n and returns the nth number in the Fibonacci\n" +
-  "# sequence.\n" +
-  "def fibonacci(n):\n" +
-  "  if n == 0:\n" +
-  "    return 0\n" +
-  "  elif n == 1:\n" +
-  "    return 1\n" +
-  "  else:\n" +
-  "    return fibonacci(n-1) + fibonacci(n-2)\n" +
-  "\n" +
-  "# Use a for loop to generate and print the first 10 numbers in the Fibonacci sequence.\n" +
-  "for i in range(10):\n" +
-  "  print(fibonacci(i))\n" +
-  "\n" +
-  "# Output:\n" +
-  "# 0\n" +
-  "# 1\n" +
-  "# 1\n" +
-  "# 2\n" +
-  "# 3\n" +
-  "# 5\n" +
-  "# 8\n" +
-  "# 13\n" +
-  "# 21\n" +
-  "# 34\n";
-
-function restoreConfigAndSource(): [Config, string] {
-  const value = lzstring.decompressFromEncodedURIComponent(
-    window.location.hash.slice(1)
-  );
-  let config = {};
-  let source = DEFAULT_SOURCE;
-
-  if (value) {
-    const parts = value.split("$$$");
-    config = JSON.parse(parts[0]);
-    source = parts[1];
-  }
-
-  return [config, source];
-}
-
-function persistConfigAndSource(config: Config, source: string) {
-  window.location.hash = lzstring.compressToEncodedURIComponent(
-    JSON.stringify(config) + "$$$" + source
-  );
-}
-
-const defaultConfig = getDefaultConfig(AVAILABLE_OPTIONS);
-
-export default function App() {
-  const monaco = useMonaco();
-  const [initialized, setInitialized] = useState<boolean>(false);
-  const [config, setConfig] = useState<Config | null>(null);
-  const [source, setSource] = useState<string | null>(null);
-  const [error, setError] = useState<string | null>(null);
-
-  useEffect(() => {
-    init().then(() => setInitialized(true));
-  }, []);
-
-  useEffect(() => {
-    if (source == null && config == null && monaco) {
-      const [config, source] = restoreConfigAndSource();
-      setConfig(config);
-      setSource(source);
-    }
-  }, [monaco, source, config]);
-
-  useEffect(() => {
-    if (config != null && source != null) {
-      persistConfigAndSource(config, source);
-    }
-  }, [config, source]);
-
-  useEffect(() => {
-    const editor = monaco?.editor;
-    const model = editor?.getModels()[0];
-    if (!editor || !model || !initialized || source == null || config == null) {
-      return;
-    }
-
-    let checks: Check[];
-    try {
-      checks = check(source, toRuffConfig(config));
-      setError(null);
-    } catch (e) {
-      setError(String(e));
-      return;
-    }
-
-    editor.setModelMarkers(
-      model,
-      "owner",
-      checks.map((check) => ({
-        startLineNumber: check.location.row,
-        startColumn: check.location.column + 1,
-        endLineNumber: check.end_location.row,
-        endColumn: check.end_location.column + 1,
-        message: `${check.code}: ${check.message}`,
-        severity: MarkerSeverity.Error,
-      }))
-    );
-
-    const codeActionProvider = monaco?.languages.registerCodeActionProvider(
-      "python",
-      {
-        // @ts-expect-error: The type definition is wrong.
-        provideCodeActions: function (model, position) {
-          const actions = checks
-            .filter((check) => position.startLineNumber === check.location.row)
-            .filter((check) => check.fix)
-            .map((check) => ({
-              title: `Fix ${check.code}`,
-              id: `fix-${check.code}`,
-              kind: "quickfix",
-              edit: check.fix
-                ? {
-                    edits: [
-                      {
-                        resource: model.uri,
-                        versionId: model.getVersionId(),
-                        edit: {
-                          range: {
-                            startLineNumber: check.fix.location.row,
-                            startColumn: check.fix.location.column + 1,
-                            endLineNumber: check.fix.end_location.row,
-                            endColumn: check.fix.end_location.column + 1,
-                          },
-                          text: check.fix.content,
-                        },
-                      },
-                    ],
-                  }
-                : undefined,
-            }));
-          return { actions, dispose: () => {} };
-        },
-      }
-    );
-
-    return () => {
-      codeActionProvider?.dispose();
-    };
-  }, [config, source, monaco, initialized]);
-
-  const handleEditorChange = useCallback(
-    (value: string | undefined) => {
-      setSource(value || "");
-    },
-    [setSource]
-  );
-
-  const handleOptionChange = useCallback(
-    (groupName: string, fieldName: string, value: string) => {
-      const group = Object.assign({}, (config || {})[groupName]);
-      if (value === defaultConfig[groupName][fieldName] || value === "") {
-        delete group[fieldName];
-      } else {
-        group[fieldName] = value;
-      }
-
-      setConfig({
-        ...config,
-        [groupName]: group,
-      });
-    },
-    [config]
-  );
-
-  return (
-    <div id="app">
-      <Options
-        config={config}
-        defaultConfig={defaultConfig}
-        onChange={handleOptionChange}
-      />
-      <Editor
-        options={{ readOnly: false, minimap: { enabled: false } }}
-        wrapperProps={{ className: "editor" }}
-        defaultLanguage="python"
-        value={source || ""}
-        theme={"light"}
-        onChange={handleEditorChange}
-      />
-      {error && <div id="error">{error}</div>}
-    </div>
-  );
-}

playground/src/Editor/Editor.tsx

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

playground/src/Editor/ErrorMessage.tsx

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

playground/src/Editor/Header.tsx

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

playground/src/Editor/SettingsEditor.tsx

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

playground/src/Editor/ShareButton.tsx

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

playground/src/Editor/SourceEditor.tsx

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

playground/src/Editor/ThemeButton.tsx

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

playground/src/Editor/VersionTag.tsx

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

playground/src/Editor/index.tsx

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

playground/src/Editor/settings.ts

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

playground/src/Editor/theme.ts

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

playground/src/Editor/utils.ts

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

playground/src/Options.tsx

@@ -1,72 +0,0 @@
-import { Config } from "./config";
-import { AVAILABLE_OPTIONS } from "./ruff_options";
-
-function OptionEntry({
-  config,
-  defaultConfig,
-  groupName,
-  fieldName,
-  onChange,
-}: {
-  config: Config | null;
-  defaultConfig: Config;
-  groupName: string;
-  fieldName: string;
-  onChange: (groupName: string, fieldName: string, value: string) => void;
-}) {
-  const value =
-    config && config[groupName] && config[groupName][fieldName]
-      ? config[groupName][fieldName]
-      : "";
-
-  return (
-    <span>
-      <label>
-        {fieldName}
-        <input
-          value={value}
-          placeholder={defaultConfig[groupName][fieldName]}
-          type="text"
-          onChange={(event) => {
-            onChange(groupName, fieldName, event.target.value);
-          }}
-        />
-      </label>
-    </span>
-  );
-}
-
-export function Options({
-  config,
-  defaultConfig,
-  onChange,
-}: {
-  config: Config | null;
-  defaultConfig: Config;
-  onChange: (groupName: string, fieldName: string, value: string) => void;
-}) {
-  return (
-    <div className="options">
-      {AVAILABLE_OPTIONS.map((group) => (
-        <details key={group.name}>
-          <summary>{group.name}</summary>
-          <div>
-            <ul>
-              {group.fields.map((field) => (
-                <li key={field.name}>
-                  <OptionEntry
-                    config={config}
-                    defaultConfig={defaultConfig}
-                    groupName={group.name}
-                    fieldName={field.name}
-                    onChange={onChange}
-                  />
-                </li>
-              ))}
-            </ul>
-          </div>
-        </details>
-      ))}
-    </div>
-  );
-}

playground/src/config.ts

@@ -1,52 +0,0 @@
-import { OptionGroup } from "./ruff_options";
-
-export type Config = { [key: string]: { [key: string]: string } };
-
-export function getDefaultConfig(availableOptions: OptionGroup[]): Config {
-  const config: Config = {};
-  availableOptions.forEach((group) => {
-    config[group.name] = {};
-    group.fields.forEach((f) => {
-      config[group.name][f.name] = f.default;
-    });
-  });
-  return config;
-}
-
-/**
- * Convert the config in the application to something Ruff accepts.
- *
- * Application config is always nested one level. Ruff allows for some
- * top-level options.
- *
- * Any option value is parsed as JSON to convert it to a native JS object.
- * If that fails, e.g. while a user is typing, we let the application handle that
- * and show an error.
- */
-export function toRuffConfig(config: Config): any {
-  const convertValue = (value: string): any => {
-    return value === "None" ? null : JSON.parse(value);
-  };
-
-  const result: any = {};
-  Object.keys(config).forEach((group_name) => {
-    const fields = config[group_name];
-    if (!fields || Object.keys(fields).length === 0) {
-      return;
-    }
-
-    if (group_name === "globals") {
-      Object.keys(fields).forEach((field_name) => {
-        result[field_name] = convertValue(fields[field_name]);
-      });
-    } else {
-      result[group_name] = {};
-
-      Object.keys(fields).forEach((field_name) => {
-        result[group_name][field_name] = convertValue(fields[field_name]);
-      });
-    }
-  });
-
-  return result;
-}

playground/src/constants.ts

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

playground/src/index.css

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

playground/src/main.tsx

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

playground/src/ruff_options.ts

@@ -1,222 +0,0 @@
-
-// This file is auto-generated by `cargo dev generate-playground-options`.
-export interface OptionGroup {
-    name: string;
-    fields: {
-        name: string;
-        default: string;
-        type: string;
-    }[];
-};
-
-export const AVAILABLE_OPTIONS: OptionGroup[] = [
-    {"name": "globals", "fields": [
-        {
-            "name": "allowed-confusables",
-            "default": '[]',
-            "type": 'Vec<char>',
-        },
-        {
-            "name": "dummy-variable-rgx",
-            "default": '"^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"',
-            "type": 'Regex',
-        },
-        {
-            "name": "extend-ignore",
-            "default": '[]',
-            "type": 'Vec<CheckCodePrefix>',
-        },
-        {
-            "name": "extend-select",
-            "default": '[]',
-            "type": 'Vec<CheckCodePrefix>',
-        },
-        {
-            "name": "external",
-            "default": '[]',
-            "type": 'Vec<String>',
-        },
-        {
-            "name": "fix-only",
-            "default": 'false',
-            "type": 'bool',
-        },
-        {
-            "name": "ignore",
-            "default": '[]',
-            "type": 'Vec<CheckCodePrefix>',
-        },
-        {
-            "name": "line-length",
-            "default": '88',
-            "type": 'usize',
-        },
-        {
-            "name": "required-version",
-            "default": 'None',
-            "type": 'String',
-        },
-        {
-            "name": "select",
-            "default": '["E", "F"]',
-            "type": 'Vec<CheckCodePrefix>',
-        },
-        {
-            "name": "target-version",
-            "default": '"py310"',
-            "type": 'PythonVersion',
-        },
-        {
-            "name": "unfixable",
-            "default": '[]',
-            "type": 'Vec<CheckCodePrefix>',
-        },
-    ]},
-    {"name": "flake8-annotations", "fields": [
-        {
-            "name": "allow-star-arg-any",
-            "default": 'false',
-            "type": 'bool',
-        },
-        {
-            "name": "mypy-init-return",
-            "default": 'false',
-            "type": 'bool',
-        },
-        {
-            "name": "suppress-dummy-args",
-            "default": 'false',
-            "type": 'bool',
-        },
-        {
-            "name": "suppress-none-returning",
-            "default": 'false',
-            "type": 'bool',
-        },
-    ]},
-    {"name": "flake8-bugbear", "fields": [
-        {
-            "name": "extend-immutable-calls",
-            "default": '[]',
-            "type": 'Vec<String>',
-        },
-    ]},
-    {"name": "flake8-errmsg", "fields": [
-        {
-            "name": "max-string-length",
-            "default": '0',
-            "type": 'usize',
-        },
-    ]},
-    {"name": "flake8-import-conventions", "fields": [
-        {
-            "name": "aliases",
-            "default": '{"altair": "alt", "matplotlib.pyplot": "plt", "numpy": "np", "pandas": "pd", "seaborn": "sns"}',
-            "type": 'FxHashMap<String, String>',
-        },
-        {
-            "name": "extend-aliases",
-            "default": '{}',
-            "type": 'FxHashMap<String, String>',
-        },
-    ]},
-    {"name": "flake8-quotes", "fields": [
-        {
-            "name": "avoid-escape",
-            "default": 'true',
-            "type": 'bool',
-        },
-        {
-            "name": "docstring-quotes",
-            "default": '"double"',
-            "type": 'Quote',
-        },
-        {
-            "name": "inline-quotes",
-            "default": '"double"',
-            "type": 'Quote',
-        },
-        {
-            "name": "multiline-quotes",
-            "default": '"double"',
-            "type": 'Quote',
-        },
-    ]},
-    {"name": "flake8-tidy-imports", "fields": [
-        {
-            "name": "ban-relative-imports",
-            "default": '"parents"',
-            "type": 'Strictness',
-        },
-    ]},
-    {"name": "flake8-unused-arguments", "fields": [
-        {
-            "name": "ignore-variadic-names",
-            "default": 'false',
-            "type": 'bool',
-        },
-    ]},
-    {"name": "isort", "fields": [
-        {
-            "name": "combine-as-imports",
-            "default": 'false',
-            "type": 'bool',
-        },
-        {
-            "name": "extra-standard-library",
-            "default": '[]',
-            "type": 'Vec<String>',
-        },
-        {
-            "name": "force-wrap-aliases",
-            "default": 'false',
-            "type": 'bool',
-        },
-        {
-            "name": "known-first-party",
-            "default": '[]',
-            "type": 'Vec<String>',
-        },
-        {
-            "name": "known-third-party",
-            "default": '[]',
-            "type": 'Vec<String>',
-        },
-        {
-            "name": "split-on-trailing-comma",
-            "default": 'true',
-            "type": 'bool',
-        },
-    ]},
-    {"name": "mccabe", "fields": [
-        {
-            "name": "max-complexity",
-            "default": '10',
-            "type": 'usize',
-        },
-    ]},
-    {"name": "pep8-naming", "fields": [
-        {
-            "name": "classmethod-decorators",
-            "default": '["classmethod"]',
-            "type": 'Vec<String>',
-        },
-        {
-            "name": "ignore-names",
-            "default": '["setUp", "tearDown", "setUpClass", "tearDownClass", "setUpModule", "tearDownModule", "asyncSetUp", "asyncTearDown", "setUpTestData", "failureException", "longMessage", "maxDiff"]',
-            "type": 'Vec<String>',
-        },
-        {
-            "name": "staticmethod-decorators",
-            "default": '["staticmethod"]',
-            "type": 'Vec<String>',
-        },
-    ]},
-    {"name": "pyupgrade", "fields": [
-        {
-            "name": "keep-runtime-typing",
-            "default": 'false',
-            "type": 'bool',
-        },
-    ]},
-];

playground/src/style.css

@@ -1,60 +0,0 @@
-* {
-  box-sizing: border-box;
-}
-
-body,
-html,
-#root,
-#app {
-  margin: 0;
-  height: 100%;
-  width: 100%;
-}
-
-#app {
-  display: flex;
-}
-
-.options {
-  height: 100vh;
-  overflow-y: scroll;
-  padding: 1em;
-  min-width: 300px;
-  border-right: 1px solid lightgray;
-}
-
-.options ul {
-  padding-left: 1em;
-  list-style-type: none;
-}
-
-.options li {
-  margin-bottom: 0.3em;
-}
-
-.options details {
-  margin-bottom: 1em;
-}
-
-.options summary {
-  font-size: 1.3rem;
-}
-
-.options input {
-  display: block;
-  width: 100%;
-}
-
-.editor {
-  padding: 1em;
-}
-
-#error {
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  min-height: 1em;
-  padding: 1em;
-  background: darkred;
-  color: white;
-}

playground/src/third-party.d.ts

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

playground/tailwind.config.cjs

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

pyproject.toml

@@ -34,7 +34,13 @@ bindings = "bin"
 strip = true
 
 [tool.ruff]
+update-check = true
 
 [tool.ruff.isort]
 force-wrap-aliases = true
 combine-as-imports = true
+force-single-line = true
+single-line-exclusions = ["os", "logging.handlers"]
+
+[tool.ruff.pydocstyle]
+convention = "google"

resources/test/fixtures/flake8_implicit_str_concat/ISC.py

@@ -0,0 +1,36 @@
+_ = "a" "b" "c"
+
+_ = "abc" + "def"
+
+_ = "abc" \
+    "def"
+
+_ = (
+  "abc" +
+  "def"
+)
+
+_ = (
+  f"abc" +
+  "def"
+)
+
+_ = (
+  b"abc" +
+  b"def"
+)
+
+_ = (
+  "abc"
+  "def"
+)
+
+_ = (
+  f"abc"
+  "def"
+)
+
+_ = (
+  b"abc"
+  b"def"
+)

resources/test/fixtures/flake8_tidy_imports/TID251.py

@@ -0,0 +1,33 @@
+## Banned modules ##
+import cgi
+
+from cgi import *
+
+from cgi import a, b, c
+
+# banning a module also bans any submodules
+import cgi.foo.bar
+
+from cgi.foo import bar
+
+from cgi.foo.bar import *
+
+## Banned module members ##
+
+from typing import TypedDict
+
+import typing
+
+# attribute access is checked
+typing.TypedDict
+
+typing.TypedDict.anything
+
+# function calls are checked
+typing.TypedDict()
+
+typing.TypedDict.anything()
+
+# import aliases are resolved
+import typing as totally_not_typing
+totally_not_typing.TypedDict

resources/test/fixtures/flake8_tidy_imports/TID251_false_positives.py

@@ -0,0 +1,11 @@
+# module members cannot be imported with that syntax
+import typing.TypedDict
+
+# we don't track reassignments
+import typing, other
+typing = other
+typing.TypedDict()
+
+# yet another false positive
+def foo(typing):
+    typing.TypedDict()

resources/test/fixtures/isort/force_single_line.py

@@ -0,0 +1,18 @@
+import sys, math
+from os import path, uname
+from logging.handlers import StreamHandler, FileHandler
+
+# comment 1
+from third_party import lib1, lib2, \
+     lib3, lib7, lib5, lib6
+# comment 2
+from third_party import lib4
+
+from foo import bar  # comment 3
+from foo2 import bar2  # comment 4
+
+# comment 5
+from bar import (
+     a, # comment 6
+     b, # comment 7
+)

resources/test/fixtures/pydocstyle/D417.py

@@ -0,0 +1,84 @@
+def f(x, y, z):
+    """Do f.
+
+    Args:
+        x: the value
+            with a hanging indent
+
+    Returns:
+        the value
+    """
+    return x
+
+
+def f(x, y, z):
+    """Do f.
+
+    Args:
+        x:
+            The whole thing has a hanging indent.
+
+    Returns:
+        the value
+    """
+    return x
+
+
+def f(x, y, z):
+    """Do f.
+
+    Args:
+        x:
+            The whole thing has a hanging indent.
+
+    Returns: the value
+    """
+    return x
+
+
+def f(x, y, z):
+    """Do f.
+
+    Args:
+        x: the value def
+            ghi
+
+    Returns:
+        the value
+    """
+    return x
+
+
+def f(x, y, z):
+    """Do f.
+
+    Args:
+        x: the value
+        z: A final argument
+
+    Returns:
+        the value
+    """
+    return x
+
+
+def f(x, y, z):
+    """Do g.
+
+    Args:
+        x: the value
+        z: A final argument
+
+    Returns: the value
+    """
+    return x
+
+
+def f(x, y, z):
+    """Do h.
+
+    Args:
+        x: the value
+        z: A final argument
+    """
+    return x

resources/test/fixtures/pygrep-hooks/PGH004_0.py

@@ -0,0 +1,11 @@
+x = 1  # noqa
+x = 1  # NOQA:F401,W203
+# noqa
+# NOQA
+# noqa:F401
+# noqa:F401,W203
+
+x = 1
+x = 1  # noqa: F401, W203
+# noqa: F401
+# noqa: F401, W203

resources/test/fixtures/pyproject.toml

@@ -42,6 +42,10 @@ staticmethod-decorators = ["staticmethod"]
 [tool.ruff.flake8-tidy-imports]
 ban-relative-imports = "parents"
 
+[tool.ruff.flake8-tidy-imports.banned-api]
+"cgi".msg = "The cgi module is deprecated."
+"typing.TypedDict".msg = "Use typing_extensions.TypedDict instead."
+
 [tool.ruff.flake8-errmsg]
 max-string-length = 20
 

resources/test/fixtures/pyupgrade/UP020.py

@@ -0,0 +1,9 @@
+from io import open
+
+with open("f.txt") as f:
+    print(f.read())
+
+import io
+
+with io.open("f.txt", mode="r", buffering=-1, **kwargs) as f:
+    print(f.read())

resources/test/fixtures/pyupgrade/UP021.py

@@ -0,0 +1,12 @@
+import subprocess
+import subprocess as somename
+from subprocess import run
+from subprocess import run as anothername
+
+subprocess.run(["foo"], universal_newlines=True, check=True)
+somename.run(["foo"], universal_newlines=True)
+
+run(["foo"], universal_newlines=True, check=False)
+anothername(["foo"], universal_newlines=True)
+
+subprocess.run(["foo"], check=True)

resources/test/fixtures/pyupgrade/UP022.py

@@ -0,0 +1,42 @@
+from subprocess import run
+import subprocess
+
+output = run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+output = subprocess.run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+output = subprocess.run(stdout=subprocess.PIPE, args=["foo"],  stderr=subprocess.PIPE)
+
+output = subprocess.run(
+    ["foo"], stdout=subprocess.PIPE, check=True, stderr=subprocess.PIPE
+)
+
+output = subprocess.run(
+    ["foo"], stderr=subprocess.PIPE, check=True, stdout=subprocess.PIPE
+)
+
+output = subprocess.run(
+    ["foo"],
+    stdout=subprocess.PIPE,
+    check=True,
+    stderr=subprocess.PIPE,
+    text=True,
+    encoding="utf-8",
+    close_fds=True,
+)
+
+if output:
+    output = subprocess.run(
+        ["foo"],
+        stdout=subprocess.PIPE,
+        check=True,
+        stderr=subprocess.PIPE,
+        text=True,
+        encoding="utf-8",
+    )
+
+
+# Examples that should NOT trigger the rule
+from foo import PIPE
+subprocess.run(["foo"], stdout=PIPE, stderr=PIPE)
+run(["foo"], stdout=None, stderr=PIPE)

resources/test/fixtures/pyupgrade/UP023.py

@@ -0,0 +1,31 @@
+# These two imports have something after cElementTree, so they should be fixed.
+from xml.etree.cElementTree import XML, Element, SubElement
+import xml.etree.cElementTree as ET
+
+# Weird spacing should not cause issues.
+from   xml.etree.cElementTree    import  XML
+import    xml.etree.cElementTree       as      ET
+
+# Multi line imports should also work fine.
+from xml.etree.cElementTree import (
+    XML,
+    Element,
+    SubElement,
+)
+if True:
+    import xml.etree.cElementTree as ET
+    from xml.etree import cElementTree as CET
+
+from xml.etree import cElementTree as ET
+
+import contextlib, xml.etree.cElementTree as ET
+
+# This should fix the second, but not the first invocation.
+import xml.etree.cElementTree, xml.etree.cElementTree as ET
+
+# The below items should NOT be changed.
+import xml.etree.cElementTree
+
+from .xml.etree.cElementTree import XML
+
+from xml.etree import cElementTree

resources/test/fixtures/pyupgrade/UP025.py

@@ -0,0 +1,27 @@
+# These should change
+x = u"Hello"
+
+u'world'
+
+print(u"Hello")
+
+print(u'world')
+
+import foo
+
+foo(u"Hello", U"world", a=u"Hello", b=u"world")
+
+# These should stay quoted they way they are
+
+x = u'hello'
+x = u"""hello"""
+x = u'''hello'''
+x = u'Hello "World"'
+
+# These should not change
+u = "Hello"
+
+u = u
+
+def hello():
+    return"Hello"

resources/test/fixtures/ruff/RUF004.py

@@ -0,0 +1,15 @@
+def f(*args, **kwargs):
+    pass
+
+
+a = (1, 2)
+b = (3, 4)
+c = (5, 6)
+d = (7, 8)
+
+f(a, b)
+f(a, kw=b)
+f(*a, kw=b)
+f(kw=a, *b)
+f(kw=a, *b, *c)
+f(*a, kw=b, *c, kw1=d)

ruff.schema.json

@@ -111,7 +111,7 @@
       }
     },
     "flake8-annotations": {
-      "description": "Plugins Options for the `flake8-annotations` plugin.",
+      "description": "Options for the `flake8-annotations` plugin.",
       "anyOf": [
         {
           "$ref": "#/definitions/Flake8AnnotationsOptions"
@@ -195,7 +195,7 @@
       ]
     },
     "format": {
-      "description": "The style in which violation messages should be formatted: `\"text\"` (default), `\"grouped\"` (group messages by file), `\"json\"` (machine-readable), `\"junit\"` (machine-readable XML), or `\"github\"` (GitHub Actions annotations).",
+      "description": "The style in which violation messages should be formatted: `\"text\"` (default), `\"grouped\"` (group messages by file), `\"json\"` (machine-readable), `\"junit\"` (machine-readable XML), `\"github\"` (GitHub Actions annotations) or `\"gitlab\"` (GitLab CI code quality report).",
       "anyOf": [
         {
           "$ref": "#/definitions/SerializationFormat"
@@ -277,6 +277,17 @@
         }
       }
     },
+    "pydocstyle": {
+      "description": "Options for the `pydocstyle` plugin.",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Pydocstyle"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
     "pyupgrade": {
       "description": "Options for the `pyupgrade` plugin.",
       "anyOf": [
@@ -353,10 +364,30 @@
       "items": {
         "$ref": "#/definitions/CheckCodePrefix"
       }
+    },
+    "update-check": {
+      "description": "Enable or disable automatic update checks (overridden by the `--update-check` and `--no-update-check` command-line flags).",
+      "type": [
+        "boolean",
+        "null"
+      ]
     }
   },
   "additionalProperties": false,
   "definitions": {
+    "BannedApi": {
+      "type": "object",
+      "required": [
+        "msg"
+      ],
+      "properties": {
+        "msg": {
+          "description": "The message to display when the API is used.",
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
     "CheckCodePrefix": {
       "type": "string",
       "enum": [
@@ -366,6 +397,7 @@
         "A001",
         "A002",
         "A003",
+        "ALL",
         "ANN",
         "ANN0",
         "ANN00",
@@ -651,6 +683,12 @@
         "ICN0",
         "ICN00",
         "ICN001",
+        "ISC",
+        "ISC0",
+        "ISC00",
+        "ISC001",
+        "ISC002",
+        "ISC003",
         "M",
         "M0",
         "M001",
@@ -714,6 +752,7 @@
         "PGH001",
         "PGH002",
         "PGH003",
+        "PGH004",
         "PLC",
         "PLC0",
         "PLC04",
@@ -794,6 +833,7 @@
         "RUF001",
         "RUF002",
         "RUF003",
+        "RUF004",
         "RUF1",
         "RUF10",
         "RUF100",
@@ -821,6 +861,7 @@
         "TID",
         "TID2",
         "TID25",
+        "TID251",
         "TID252",
         "U",
         "U0",
@@ -865,6 +906,12 @@
         "UP017",
         "UP018",
         "UP019",
+        "UP02",
+        "UP020",
+        "UP021",
+        "UP022",
+        "UP023",
+        "UP025",
         "W",
         "W2",
         "W29",
@@ -891,6 +938,24 @@
         "YTT303"
       ]
     },
+    "Convention": {
+      "oneOf": [
+        {
+          "description": "Use Google-style docstrings.",
+          "type": "string",
+          "enum": [
+            "google"
+          ]
+        },
+        {
+          "description": "Use NumPy-style docstrings.",
+          "type": "string",
+          "enum": [
+            "numpy"
+          ]
+        }
+      ]
+    },
     "Flake8AnnotationsOptions": {
       "type": "object",
       "properties": {
@@ -1030,9 +1095,12 @@
     },
     "Flake8TidyImportsOptions": {
       "type": "object",
+      "required": [
+        "banned-api"
+      ],
       "properties": {
         "ban-relative-imports": {
-          "description": "Whether to ban all relative imports (`\"all\"`), or only those imports that extend into the parent module and beyond (`\"parents\"`).",
+          "description": "Whether to ban all relative imports (`\"all\"`), or only those imports that extend into the parent module or beyond (`\"parents\"`).",
           "anyOf": [
             {
               "$ref": "#/definitions/Strictness"
@@ -1041,6 +1109,13 @@
               "type": "null"
             }
           ]
+        },
+        "banned-api": {
+          "description": "Specific modules or module members that may not be imported or accessed. Note that this check is only meant to flag accidental uses, and can be circumvented via `eval` or `importlib`.",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/BannedApi"
+          }
         }
       },
       "additionalProperties": false
@@ -1078,6 +1153,13 @@
             "type": "string"
           }
         },
+        "force-single-line": {
+          "description": "Forces all from imports to appear on their own line.",
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
         "force-wrap-aliases": {
           "description": "Force `import from` statements with multiple members and at least one alias (e.g., `import A as B`) to wrap such that every line contains exactly one member. For example, this formatting would be retained, rather than condensing to a single line:\n\n```py from .utils import ( test_directory as test_directory, test_id as test_id ) ```\n\nNote that this setting is only effective when combined with `combine-as-imports = true`. When `combine-as-imports` isn't enabled, every aliased `import from` will be given its own line, in which case, wrapping is not necessary.",
           "type": [
@@ -1105,6 +1187,16 @@
             "type": "string"
           }
         },
+        "single-line-exclusions": {
+          "description": "One or more modules to exclude from the single line rule.",
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "type": "string"
+          }
+        },
         "split-on-trailing-comma": {
           "description": "If a comma is placed after the last member in a multi-line import, then the imports will never be folded into one line.\n\nSee isort's [`split-on-trailing-comma`](https://pycqa.github.io/isort/docs/configuration/options.html#split-on-trailing-comma) option.",
           "type": [
@@ -1179,6 +1271,23 @@
       },
       "additionalProperties": false
     },
+    "Pydocstyle": {
+      "type": "object",
+      "properties": {
+        "convention": {
+          "description": "Whether to use Google-style or Numpy-style conventions when detecting docstring sections. By default, conventions will be inferred from the available sections.",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Convention"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
+      },
+      "additionalProperties": false
+    },
     "PythonVersion": {
       "type": "string",
       "enum": [
@@ -1194,10 +1303,21 @@
       ]
     },
     "Quote": {
-      "type": "string",
-      "enum": [
-        "single",
-        "double"
+      "oneOf": [
+        {
+          "description": "Use single quotes (`'`).",
+          "type": "string",
+          "enum": [
+            "single"
+          ]
+        },
+        {
+          "description": "Use double quotes (`\"`).",
+          "type": "string",
+          "enum": [
+            "double"
+          ]
+        }
       ]
     },
     "SerializationFormat": {
@@ -1207,14 +1327,26 @@
         "json",
         "junit",
         "grouped",
-        "github"
+        "github",
+        "gitlab"
       ]
     },
     "Strictness": {
-      "type": "string",
-      "enum": [
-        "parents",
-        "all"
+      "oneOf": [
+        {
+          "description": "Ban imports that extend into the parent module or beyond.",
+          "type": "string",
+          "enum": [
+            "parents"
+          ]
+        },
+        {
+          "description": "Ban all relative imports.",
+          "type": "string",
+          "enum": [
+            "all"
+          ]
+        }
       ]
     },
     "Version": {

ruff_dev/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_dev"
-version = "0.0.195"
+version = "0.0.201"
 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 = "247e815880766d556ef1ca6f0af69daf1a5fe59a" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "247e815880766d556ef1ca6f0af69daf1a5fe59a" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "247e815880766d556ef1ca6f0af69daf1a5fe59a" }
+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" }
 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

@@ -0,0 +1,31 @@
+//! Run all code and documentation generation steps.
+
+use anyhow::Result;
+use clap::Args;
+
+use crate::{
+    generate_check_code_prefix, generate_json_schema, generate_options, generate_rules_table,
+};
+
+#[derive(Args)]
+pub struct Cli {
+    /// Write the generated artifacts to stdout (rather than to the filesystem).
+    #[arg(long)]
+    dry_run: bool,
+}
+
+pub fn main(cli: &Cli) -> Result<()> {
+    generate_check_code_prefix::main(&generate_check_code_prefix::Cli {
+        dry_run: cli.dry_run,
+    })?;
+    generate_json_schema::main(&generate_json_schema::Cli {
+        dry_run: cli.dry_run,
+    })?;
+    generate_rules_table::main(&generate_rules_table::Cli {
+        dry_run: cli.dry_run,
+    })?;
+    generate_options::main(&generate_options::Cli {
+        dry_run: cli.dry_run,
+    })?;
+    Ok(())
+}

ruff_dev/src/generate_check_code_prefix.rs

@@ -13,13 +13,15 @@ use itertools::Itertools;
 use ruff::checks::{CheckCode, PREFIX_REDIRECTS};
 use strum::IntoEnumIterator;
 
+const ALL: &str = "ALL";
+
 #[derive(Parser)]
 #[command(author, version, about, long_about = None)]
 pub struct Cli {
     /// Write the generated source code to stdout (rather than to
     /// `src/checks_gen.rs`).
     #[arg(long)]
-    dry_run: bool,
+    pub(crate) dry_run: bool,
 }
 
 pub fn main(cli: &Cli) -> Result<()> {
@@ -34,9 +36,15 @@ pub fn main(cli: &Cli) -> Result<()> {
         let code_suffix_len = code_str.len() - code_prefix_len;
         for i in 0..=code_suffix_len {
             let prefix = code_str[..code_prefix_len + i].to_string();
-            let entry = prefix_to_codes.entry(prefix).or_default();
-            entry.insert(check_code.clone());
+            prefix_to_codes
+                .entry(prefix)
+                .or_default()
+                .insert(check_code.clone());
         }
+        prefix_to_codes
+            .entry(ALL.to_string())
+            .or_default()
+            .insert(check_code.clone());
     }
 
     // Add any prefix aliases (e.g., "U" to "UP").
@@ -79,6 +87,7 @@ pub fn main(cli: &Cli) -> Result<()> {
         .derive("Eq")
         .derive("PartialOrd")
         .derive("Ord")
+        .push_variant(Variant::new("None"))
         .push_variant(Variant::new("Zero"))
         .push_variant(Variant::new("One"))
         .push_variant(Variant::new("Two"))
@@ -129,14 +138,18 @@ pub fn main(cli: &Cli) -> Result<()> {
         .line("#[allow(clippy::match_same_arms)]")
         .line("match self {");
     for prefix in prefix_to_codes.keys() {
-        let num_numeric = prefix.chars().filter(|char| char.is_numeric()).count();
-        let specificity = match num_numeric {
-            0 => "Zero",
-            1 => "One",
-            2 => "Two",
-            3 => "Three",
-            4 => "Four",
-            _ => panic!("Invalid prefix: {prefix}"),
+        let specificity = if prefix == "ALL" {
+            "None"
+        } else {
+            let num_numeric = prefix.chars().filter(|char| char.is_numeric()).count();
+            match num_numeric {
+                0 => "Zero",
+                1 => "One",
+                2 => "Two",
+                3 => "Three",
+                4 => "Four",
+                _ => panic!("Invalid prefix: {prefix}"),
+            }
         };
         gen = gen.line(format!(
             "CheckCodePrefix::{prefix} => SuffixLength::{specificity},"

ruff_dev/src/generate_json_schema.rs

@@ -10,7 +10,7 @@ use schemars::schema_for;
 pub struct Cli {
     /// Write the generated table to stdout (rather than to `ruff.schema.json`).
     #[arg(long)]
-    dry_run: bool,
+    pub(crate) dry_run: bool,
 }
 
 pub fn main(cli: &Cli) -> Result<()> {

ruff_dev/src/generate_options.rs

@@ -18,7 +18,7 @@ const END_PRAGMA: &str = "<!-- End auto-generated options sections. -->";
 pub struct Cli {
     /// Write the generated table to stdout (rather than to `README.md`).
     #[arg(long)]
-    dry_run: bool,
+    pub(crate) dry_run: bool,
 }
 
 fn emit_field(output: &mut String, field: &OptionField, group_name: Option<&str>) {

ruff_dev/src/generate_playground_options.rs

@@ -1,142 +0,0 @@
-//! Generate typescript file defining options to be used by the web playground.
-
-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};
-
-#[derive(Args)]
-pub struct Cli {
-    /// Write the generated table to stdout (rather than to `TODO`).
-    #[arg(long)]
-    dry_run: bool,
-}
-
-fn emit_field(output: &mut String, field: &OptionField) {
-    output.push_str(&textwrap::indent(
-        &textwrap::dedent(&format!(
-            "
-        {{
-            \"name\": \"{}\",
-            \"default\": '{}',
-            \"type\": '{}',
-        }},",
-            field.name, field.default, field.value_type
-        )),
-        "    ",
-    ));
-}
-
-pub fn main(cli: &Cli) -> Result<()> {
-    let mut output = String::new();
-
-    // Generate all the top-level fields.
-    output.push_str(&format!("{{\"name\": \"{}\", \"fields\": [", "globals"));
-    for field in Options::get_available_options()
-        .into_iter()
-        .filter_map(|entry| {
-            if let OptionEntry::Field(field) = entry {
-                Some(field)
-            } else {
-                None
-            }
-        })
-        // Filter out options that don't make sense in the playground.
-        .filter(|field| {
-            !matches!(
-                field.name,
-                "src"
-                    | "fix"
-                    | "format"
-                    | "exclude"
-                    | "extend"
-                    | "extend-exclude"
-                    | "fixable"
-                    | "force-exclude"
-                    | "ignore-init-module-imports"
-                    | "respect-gitignore"
-                    | "show-source"
-                    | "cache-dir"
-                    | "per-file-ignores"
-            )
-        })
-        .sorted_by_key(|field| field.name)
-    {
-        emit_field(&mut output, &field);
-    }
-    output.push_str("\n]},\n");
-
-    // Generate all the sub-groups.
-    for group in Options::get_available_options()
-        .into_iter()
-        .filter_map(|entry| {
-            if let OptionEntry::Group(group) = entry {
-                Some(group)
-            } else {
-                None
-            }
-        })
-        .sorted_by_key(|group| group.name)
-    {
-        output.push_str(&format!("{{\"name\": \"{}\", \"fields\": [", group.name));
-        for field in group
-            .fields
-            .iter()
-            .filter_map(|entry| {
-                if let OptionEntry::Field(field) = entry {
-                    Some(field)
-                } else {
-                    None
-                }
-            })
-            .sorted_by_key(|field| field.name)
-        {
-            emit_field(&mut output, field);
-        }
-        output.push_str("\n]},\n");
-    }
-
-    let prefix = textwrap::dedent(
-        r"
-        // This file is auto-generated by `cargo dev generate-playground-options`.
-        export interface OptionGroup {
-            name: string;
-            fields: {
-                name: string;
-                default: string;
-                type: string;
-            }[];
-        };
-
-        export const AVAILABLE_OPTIONS: OptionGroup[] = [
-    ",
-    );
-    let postfix = "];";
-
-    if cli.dry_run {
-        print!("{output}");
-    } else {
-        let file = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-            .parent()
-            .expect("Failed to find root directory")
-            .join("playground")
-            .join("src")
-            .join("ruff_options.ts");
-
-        let mut f = OpenOptions::new()
-            .create(true)
-            .write(true)
-            .truncate(true)
-            .open(file)?;
-        write!(f, "{prefix}")?;
-        write!(f, "{}", textwrap::indent(&output, "    "))?;
-        write!(f, "{postfix}")?;
-    }
-
-    Ok(())
-}

ruff_dev/src/generate_rules_table.rs

@@ -21,7 +21,7 @@ const TOC_END_PRAGMA: &str = "<!-- End auto-generated table of contents. -->";
 pub struct Cli {
     /// Write the generated table to stdout (rather than to `README.md`).
     #[arg(long)]
-    dry_run: bool,
+    pub(crate) dry_run: bool,
 }
 
 pub fn main(cli: &Cli) -> Result<()> {

ruff_dev/src/lib.rs

@@ -11,12 +11,12 @@
     clippy::too_many_lines
 )]
 
+pub mod generate_all;
 pub mod generate_check_code_prefix;
 pub mod generate_json_schema;
 pub mod generate_options;
-pub mod generate_playground_options;
 pub mod generate_rules_table;
-pub mod generate_source_code;
 pub mod print_ast;
 pub mod print_cst;
 pub mod print_tokens;
+pub mod round_trip;

ruff_dev/src/main.rs

@@ -14,9 +14,8 @@
 use anyhow::Result;
 use clap::{Parser, Subcommand};
 use ruff_dev::{
-    generate_check_code_prefix, generate_json_schema, generate_options,
-    generate_playground_options, generate_rules_table, generate_source_code, print_ast, print_cst,
-    print_tokens,
+    generate_all, generate_check_code_prefix, generate_json_schema, generate_options,
+    generate_rules_table, print_ast, print_cst, print_tokens, round_trip,
 };
 
 #[derive(Parser)]
@@ -29,6 +28,8 @@ struct Cli {
 
 #[derive(Subcommand)]
 enum Commands {
+    /// Run all code and documentation generation steps.
+    GenerateAll(generate_all::Cli),
     /// Generate the `CheckCodePrefix` enum.
     GenerateCheckCodePrefix(generate_check_code_prefix::Cli),
     /// Generate JSON schema for the TOML configuration file.
@@ -37,31 +38,28 @@ enum Commands {
     GenerateRulesTable(generate_rules_table::Cli),
     /// Generate a Markdown-compatible listing of configuration options.
     GenerateOptions(generate_options::Cli),
-    /// Generate typescript file defining options to be used by the web
-    /// playground.
-    GeneratePlaygroundOptions(generate_playground_options::Cli),
-    /// Run round-trip source code generation on a given Python file.
-    GenerateSourceCode(generate_source_code::Cli),
     /// Print the AST for a given Python file.
     PrintAST(print_ast::Cli),
     /// Print the LibCST CST for a given Python file.
     PrintCST(print_cst::Cli),
     /// Print the token stream for a given Python file.
     PrintTokens(print_tokens::Cli),
+    /// Run round-trip source code generation on a given Python file.
+    RoundTrip(round_trip::Cli),
 }
 
 fn main() -> Result<()> {
     let cli = Cli::parse();
     match &cli.command {
+        Commands::GenerateAll(args) => generate_all::main(args)?,
         Commands::GenerateCheckCodePrefix(args) => generate_check_code_prefix::main(args)?,
         Commands::GenerateJSONSchema(args) => generate_json_schema::main(args)?,
         Commands::GenerateRulesTable(args) => generate_rules_table::main(args)?,
-        Commands::GenerateSourceCode(args) => generate_source_code::main(args)?,
         Commands::GenerateOptions(args) => generate_options::main(args)?,
-        Commands::GeneratePlaygroundOptions(args) => generate_playground_options::main(args)?,
         Commands::PrintAST(args) => print_ast::main(args)?,
         Commands::PrintCST(args) => print_cst::main(args)?,
         Commands::PrintTokens(args) => print_tokens::main(args)?,
+        Commands::RoundTrip(args) => round_trip::main(args)?,
     }
     Ok(())
 }

ruff_dev/src/round_trip.rs

@@ -5,7 +5,9 @@ use std::path::PathBuf;
 
 use anyhow::Result;
 use clap::Args;
-use ruff::code_gen::SourceGenerator;
+use ruff::source_code_generator::SourceCodeGenerator;
+use ruff::source_code_locator::SourceCodeLocator;
+use ruff::source_code_style::SourceCodeStyleDetector;
 use rustpython_parser::parser;
 
 #[derive(Args)]
@@ -18,7 +20,9 @@ pub struct Cli {
 pub fn main(cli: &Cli) -> Result<()> {
     let contents = fs::read_to_string(&cli.file)?;
     let python_ast = parser::parse_program(&contents, &cli.file.to_string_lossy())?;
-    let mut generator = SourceGenerator::new();
+    let locator = SourceCodeLocator::new(&contents);
+    let stylist = SourceCodeStyleDetector::from_contents(&contents, &locator);
+    let mut generator = SourceCodeGenerator::new(stylist.indentation(), stylist.quote());
     generator.unparse_suite(&python_ast);
     println!("{}", generator.generate()?);
     Ok(())

ruff_macros/Cargo.toml

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

src/ast/helpers.rs

@@ -382,10 +382,8 @@ pub fn identifier_range(stmt: &Stmt, locator: &SourceCodeLocator) -> Range {
             | StmtKind::AsyncFunctionDef { .. }
     ) {
         let contents = locator.slice_source_code_range(&Range::from_located(stmt));
-        for (start, tok, end) in lexer::make_tokenizer(&contents).flatten() {
+        for (start, tok, end) in lexer::make_tokenizer_located(&contents, stmt.location).flatten() {
             if matches!(tok, Tok::Name { .. }) {
-                let start = to_absolute(start, stmt.location);
-                let end = to_absolute(end, stmt.location);
                 return Range {
                     location: start,
                     end_location: end,
@@ -412,15 +410,15 @@ pub fn excepthandler_name_range(
                 location: type_end_location,
                 end_location: body[0].location,
             });
-            let range = lexer::make_tokenizer(&contents)
+            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(|((..), (start, _, end))| Range {
-                    location: to_absolute(start, type_end_location),
-                    end_location: to_absolute(end, type_end_location),
+                .map(|((..), (location, _, end_location))| Range {
+                    location,
+                    end_location,
                 });
             range
         }

src/autofix/fixer.rs

@@ -14,6 +14,7 @@ use crate::source_code_locator::SourceCodeLocator;
 pub enum Mode {
     Generate,
     Apply,
+    Diff,
     None,
 }
 

src/cache.rs

@@ -12,7 +12,6 @@ use once_cell::sync::Lazy;
 use path_absolutize::Absolutize;
 use serde::{Deserialize, Serialize};
 
-use crate::autofix::fixer;
 use crate::message::Message;
 use crate::settings::{flags, Settings};
 
@@ -48,7 +47,7 @@ fn content_dir() -> &'static Path {
     Path::new("content")
 }
 
-fn cache_key<P: AsRef<Path>>(path: P, settings: &Settings, autofix: fixer::Mode) -> u64 {
+fn cache_key<P: AsRef<Path>>(path: P, settings: &Settings, autofix: flags::Autofix) -> u64 {
     let mut hasher = DefaultHasher::new();
     CARGO_PKG_VERSION.hash(&mut hasher);
     path.as_ref().absolutize().unwrap().hash(&mut hasher);
@@ -93,13 +92,8 @@ pub fn get<P: AsRef<Path>>(
     path: P,
     metadata: &Metadata,
     settings: &Settings,
-    autofix: fixer::Mode,
-    cache: flags::Cache,
+    autofix: flags::Autofix,
 ) -> Option<Vec<Message>> {
-    if matches!(cache, flags::Cache::Disabled) {
-        return None;
-    };
-
     let encoded = read_sync(&settings.cache_dir, cache_key(path, settings, autofix)).ok()?;
     let (mtime, messages) = match bincode::deserialize::<CheckResult>(&encoded[..]) {
         Ok(CheckResult {
@@ -122,14 +116,9 @@ pub fn set<P: AsRef<Path>>(
     path: P,
     metadata: &Metadata,
     settings: &Settings,
-    autofix: fixer::Mode,
+    autofix: flags::Autofix,
     messages: &[Message],
-    cache: flags::Cache,
 ) {
-    if matches!(cache, flags::Cache::Disabled) {
-        return;
-    };
-
     let check_result = CheckResultRef {
         metadata: &CacheMetadata {
             mtime: FileTime::from_last_modification_time(metadata).unix_seconds(),

src/checkers/ast.rs

@@ -33,14 +33,16 @@ use crate::python::typing::SubscriptKind;
 use crate::settings::types::PythonVersion;
 use crate::settings::{flags, Settings};
 use crate::source_code_locator::SourceCodeLocator;
-use crate::vendored::cformat::{CFormatError, CFormatErrorType};
+use crate::source_code_style::SourceCodeStyleDetector;
+use crate::vendor::cformat::{CFormatError, CFormatErrorType};
 use crate::visibility::{module_visibility, transition_scope, Modifier, Visibility, VisibleScope};
 use crate::{
     docstrings, flake8_2020, flake8_annotations, flake8_bandit, flake8_blind_except,
     flake8_boolean_trap, flake8_bugbear, flake8_builtins, flake8_comprehensions, flake8_datetimez,
-    flake8_debugger, flake8_errmsg, flake8_import_conventions, flake8_print, flake8_return,
-    flake8_simplify, flake8_tidy_imports, flake8_unused_arguments, mccabe, noqa, pandas_vet,
-    pep8_naming, pycodestyle, pydocstyle, pyflakes, pygrep_hooks, pylint, pyupgrade, visibility,
+    flake8_debugger, flake8_errmsg, flake8_implicit_str_concat, flake8_import_conventions,
+    flake8_print, flake8_return, flake8_simplify, flake8_tidy_imports, flake8_unused_arguments,
+    mccabe, noqa, pandas_vet, pep8_naming, pycodestyle, pydocstyle, pyflakes, pygrep_hooks, pylint,
+    pyupgrade, ruff, visibility,
 };
 
 const GLOBAL_SCOPE_INDEX: usize = 0;
@@ -56,6 +58,7 @@ pub struct Checker<'a> {
     pub(crate) settings: &'a Settings,
     pub(crate) noqa_line_for: &'a IntMap<usize, usize>,
     pub(crate) locator: &'a SourceCodeLocator<'a>,
+    pub(crate) style: &'a SourceCodeStyleDetector<'a>,
     // Computed checks.
     checks: Vec<Check>,
     // Function and class definition tracking (e.g., for docstring enforcement).
@@ -107,6 +110,7 @@ impl<'a> Checker<'a> {
         noqa: flags::Noqa,
         path: &'a Path,
         locator: &'a SourceCodeLocator,
+        style: &'a SourceCodeStyleDetector,
     ) -> Checker<'a> {
         Checker {
             settings,
@@ -115,6 +119,7 @@ impl<'a> Checker<'a> {
             noqa,
             path,
             locator,
+            style,
             checks: vec![],
             definitions: vec![],
             deletions: FxHashSet::default(),
@@ -645,6 +650,9 @@ where
                         ));
                     }
                 }
+                if self.settings.enabled.contains(&CheckCode::UP023) {
+                    pyupgrade::plugins::replace_c_element_tree(self, stmt);
+                }
 
                 for alias in names {
                     if alias.node.name.contains('.') && alias.node.asname.is_none() {
@@ -715,6 +723,17 @@ where
                         }
                     }
 
+                    // flake8_tidy_imports
+                    if self.settings.enabled.contains(&CheckCode::TID251) {
+                        if let Some(check) = flake8_tidy_imports::checks::name_or_parent_is_banned(
+                            alias,
+                            &alias.node.name,
+                            &self.settings.flake8_tidy_imports.banned_api,
+                        ) {
+                            self.add_check(check);
+                        }
+                    }
+
                     // pylint
                     if self.settings.enabled.contains(&CheckCode::PLC0414) {
                         pylint::plugins::useless_import_alias(self, alias);
@@ -814,6 +833,9 @@ where
             } => {
                 // Track `import from` statements, to ensure that we can correctly attribute
                 // references like `from typing import Union`.
+                if self.settings.enabled.contains(&CheckCode::UP023) {
+                    pyupgrade::plugins::replace_c_element_tree(self, stmt);
+                }
                 if level.map(|level| level == 0).unwrap_or(true) {
                     if let Some(module) = module {
                         self.from_imports
@@ -843,6 +865,27 @@ where
                     }
                 }
 
+                if self.settings.enabled.contains(&CheckCode::TID251) {
+                    if let Some(module) = module {
+                        for name in names {
+                            if let Some(check) = flake8_tidy_imports::checks::name_is_banned(
+                                module,
+                                name,
+                                &self.settings.flake8_tidy_imports.banned_api,
+                            ) {
+                                self.add_check(check);
+                            }
+                        }
+                        if let Some(check) = flake8_tidy_imports::checks::name_or_parent_is_banned(
+                            stmt,
+                            module,
+                            &self.settings.flake8_tidy_imports.banned_api,
+                        ) {
+                            self.add_check(check);
+                        }
+                    }
+                }
+
                 for alias in names {
                     if let Some("__future__") = module.as_deref() {
                         let name = alias.node.asname.as_ref().unwrap_or(&alias.node.name);
@@ -1547,9 +1590,6 @@ where
                     pyupgrade::plugins::use_pep585_annotation(self, expr, attr);
                 }
 
-                if self.settings.enabled.contains(&CheckCode::UP019) {
-                    pyupgrade::plugins::typing_text_str_alias(self, expr);
-                }
                 if self.settings.enabled.contains(&CheckCode::UP016) {
                     pyupgrade::plugins::remove_six_compat(self, expr);
                 }
@@ -1559,7 +1599,9 @@ where
                 {
                     pyupgrade::plugins::datetime_utc_alias(self, expr);
                 }
-
+                if self.settings.enabled.contains(&CheckCode::UP019) {
+                    pyupgrade::plugins::typing_text_str_alias(self, expr);
+                }
                 if self.settings.enabled.contains(&CheckCode::YTT202) {
                     flake8_2020::plugins::name_or_attribute(self, expr);
                 }
@@ -1576,6 +1618,15 @@ where
                         };
                     }
                 }
+
+                if self.settings.enabled.contains(&CheckCode::TID251) {
+                    flake8_tidy_imports::checks::banned_attribute_access(
+                        self,
+                        &dealias_call_path(collect_call_paths(expr), &self.import_aliases),
+                        expr,
+                        &self.settings.flake8_tidy_imports.banned_api,
+                    );
+                }
             }
             ExprKind::Call {
                 func,
@@ -1642,22 +1693,35 @@ where
                 }
 
                 // pyupgrade
+                if self.settings.enabled.contains(&CheckCode::UP003) {
+                    pyupgrade::plugins::type_of_primitive(self, expr, func, args);
+                }
                 if self.settings.enabled.contains(&CheckCode::UP005) {
                     pyupgrade::plugins::deprecated_unittest_alias(self, func);
                 }
+                if self.settings.enabled.contains(&CheckCode::UP008) {
+                    pyupgrade::plugins::super_call_with_parameters(self, expr, func, args);
+                }
                 if self.settings.enabled.contains(&CheckCode::UP012) {
                     pyupgrade::plugins::unnecessary_encode_utf8(self, expr, func, args, keywords);
                 }
+                if self.settings.enabled.contains(&CheckCode::UP015) {
+                    pyupgrade::plugins::redundant_open_modes(self, expr);
+                }
                 if self.settings.enabled.contains(&CheckCode::UP016) {
                     pyupgrade::plugins::remove_six_compat(self, expr);
                 }
                 if self.settings.enabled.contains(&CheckCode::UP018) {
                     pyupgrade::plugins::native_literals(self, expr, func, args, keywords);
                 }
-
-                // flake8-super
-                if self.settings.enabled.contains(&CheckCode::UP008) {
-                    pyupgrade::plugins::super_call_with_parameters(self, expr, func, args);
+                if self.settings.enabled.contains(&CheckCode::UP020) {
+                    pyupgrade::plugins::open_alias(self, expr, func);
+                }
+                if self.settings.enabled.contains(&CheckCode::UP021) {
+                    pyupgrade::plugins::replace_universal_newlines(self, expr, keywords);
+                }
+                if self.settings.enabled.contains(&CheckCode::UP022) {
+                    pyupgrade::plugins::replace_stdout_stderr(self, expr, keywords);
                 }
 
                 // flake8-print
@@ -1722,7 +1786,6 @@ where
                         self.add_check(check);
                     };
                 }
-
                 if self.settings.enabled.contains(&CheckCode::C401) {
                     if let Some(check) = flake8_comprehensions::checks::unnecessary_generator_set(
                         expr,
@@ -1736,7 +1799,6 @@ where
                         self.add_check(check);
                     };
                 }
-
                 if self.settings.enabled.contains(&CheckCode::C402) {
                     if let Some(check) = flake8_comprehensions::checks::unnecessary_generator_dict(
                         expr,
@@ -1750,7 +1812,6 @@ where
                         self.add_check(check);
                     };
                 }
-
                 if self.settings.enabled.contains(&CheckCode::C403) {
                     if let Some(check) =
                         flake8_comprehensions::checks::unnecessary_list_comprehension_set(
@@ -1766,7 +1827,6 @@ where
                         self.add_check(check);
                     };
                 }
-
                 if self.settings.enabled.contains(&CheckCode::C404) {
                     if let Some(check) =
                         flake8_comprehensions::checks::unnecessary_list_comprehension_dict(
@@ -1782,7 +1842,6 @@ where
                         self.add_check(check);
                     };
                 }
-
                 if self.settings.enabled.contains(&CheckCode::C405) {
                     if let Some(check) = flake8_comprehensions::checks::unnecessary_literal_set(
                         expr,
@@ -1796,7 +1855,6 @@ where
                         self.add_check(check);
                     };
                 }
-
                 if self.settings.enabled.contains(&CheckCode::C406) {
                     if let Some(check) = flake8_comprehensions::checks::unnecessary_literal_dict(
                         expr,
@@ -1810,7 +1868,6 @@ where
                         self.add_check(check);
                     };
                 }
-
                 if self.settings.enabled.contains(&CheckCode::C408) {
                     if let Some(check) = flake8_comprehensions::checks::unnecessary_collection_call(
                         expr,
@@ -1824,7 +1881,6 @@ where
                         self.add_check(check);
                     };
                 }
-
                 if self.settings.enabled.contains(&CheckCode::C409) {
                     if let Some(check) =
                         flake8_comprehensions::checks::unnecessary_literal_within_tuple_call(
@@ -1839,7 +1895,6 @@ where
                         self.add_check(check);
                     };
                 }
-
                 if self.settings.enabled.contains(&CheckCode::C410) {
                     if let Some(check) =
                         flake8_comprehensions::checks::unnecessary_literal_within_list_call(
@@ -1854,7 +1909,6 @@ where
                         self.add_check(check);
                     };
                 }
-
                 if self.settings.enabled.contains(&CheckCode::C411) {
                     if let Some(check) = flake8_comprehensions::checks::unnecessary_list_call(
                         expr,
@@ -1867,7 +1921,6 @@ where
                         self.add_check(check);
                     };
                 }
-
                 if self.settings.enabled.contains(&CheckCode::C413) {
                     if let Some(check) =
                         flake8_comprehensions::checks::unnecessary_call_around_sorted(
@@ -1882,7 +1935,6 @@ where
                         self.add_check(check);
                     };
                 }
-
                 if self.settings.enabled.contains(&CheckCode::C414) {
                     if let Some(check) =
                         flake8_comprehensions::checks::unnecessary_double_cast_or_process(
@@ -1894,7 +1946,6 @@ where
                         self.add_check(check);
                     };
                 }
-
                 if self.settings.enabled.contains(&CheckCode::C415) {
                     if let Some(check) =
                         flake8_comprehensions::checks::unnecessary_subscript_reversal(
@@ -1906,7 +1957,6 @@ where
                         self.add_check(check);
                     };
                 }
-
                 if self.settings.enabled.contains(&CheckCode::C417) {
                     if let Some(check) = flake8_comprehensions::checks::unnecessary_map(
                         func,
@@ -1917,15 +1967,6 @@ where
                     };
                 }
 
-                // pyupgrade
-                if self.settings.enabled.contains(&CheckCode::UP003) {
-                    pyupgrade::plugins::type_of_primitive(self, expr, func, args);
-                }
-
-                if self.settings.enabled.contains(&CheckCode::UP015) {
-                    pyupgrade::plugins::redundant_open_modes(self, expr);
-                }
-
                 // flake8-boolean-trap
                 if self.settings.enabled.contains(&CheckCode::FBT003) {
                     flake8_boolean_trap::plugins::check_boolean_positional_value_in_function_call(
@@ -1956,7 +1997,6 @@ where
                 if self.settings.enabled.contains(&CheckCode::PD002) {
                     self.add_checks(pandas_vet::checks::inplace_argument(keywords).into_iter());
                 }
-
                 for (code, name) in vec![
                     (CheckCode::PD003, "isnull"),
                     (CheckCode::PD004, "notnull"),
@@ -1973,7 +2013,6 @@ where
                         }
                     }
                 }
-
                 if self.settings.enabled.contains(&CheckCode::PD015) {
                     if let Some(check) = pandas_vet::checks::use_of_pd_merge(func) {
                         self.add_check(check);
@@ -2067,6 +2106,14 @@ where
                 if self.settings.enabled.contains(&CheckCode::PLR1722) {
                     pylint::plugins::use_sys_exit(self, func);
                 }
+
+                // ruff
+                if self.settings.enabled.contains(&CheckCode::RUF004) {
+                    self.add_checks(
+                        ruff::checks::keyword_argument_before_star_argument(args, keywords)
+                            .into_iter(),
+                    );
+                }
             }
             ExprKind::Dict { keys, .. } => {
                 let check_repeated_literals = self.settings.enabled.contains(&CheckCode::F601);
@@ -2224,6 +2271,15 @@ where
                     }
                 }
             }
+            ExprKind::BinOp {
+                op: Operator::Add, ..
+            } => {
+                if self.settings.enabled.contains(&CheckCode::ISC003) {
+                    if let Some(check) = flake8_implicit_str_concat::checks::explicit(expr) {
+                        self.add_check(check);
+                    }
+                }
+            }
             ExprKind::UnaryOp { op, operand } => {
                 let check_not_in = self.settings.enabled.contains(&CheckCode::E713);
                 let check_not_is = self.settings.enabled.contains(&CheckCode::E714);
@@ -2323,7 +2379,7 @@ where
             }
             ExprKind::Constant {
                 value: Constant::Str(value),
-                ..
+                kind,
             } => {
                 if self.in_type_definition && !self.in_literal {
                     self.deferred_string_type_definitions.push((
@@ -2341,6 +2397,9 @@ where
                         self.add_check(check);
                     }
                 }
+                if self.settings.enabled.contains(&CheckCode::UP025) {
+                    pyupgrade::plugins::rewrite_unicode_literal(self, expr, value, kind);
+                }
             }
             ExprKind::Lambda { args, body, .. } => {
                 // Visit the arguments, but avoid the body, which will be deferred.
@@ -3872,7 +3931,11 @@ impl<'a> Checker<'a> {
                     || self.settings.enabled.contains(&CheckCode::D416)
                     || self.settings.enabled.contains(&CheckCode::D417)
                 {
-                    pydocstyle::plugins::sections(self, &docstring);
+                    pydocstyle::plugins::sections(
+                        self,
+                        &docstring,
+                        self.settings.pydocstyle.convention.as_ref(),
+                    );
                 }
             }
         }
@@ -3915,16 +3978,26 @@ impl<'a> Checker<'a> {
     }
 }
 
+#[allow(clippy::too_many_arguments)]
 pub fn check_ast(
     python_ast: &Suite,
     locator: &SourceCodeLocator,
+    stylist: &SourceCodeStyleDetector,
     noqa_line_for: &IntMap<usize, usize>,
     settings: &Settings,
     autofix: flags::Autofix,
     noqa: flags::Noqa,
     path: &Path,
 ) -> Vec<Check> {
-    let mut checker = Checker::new(settings, noqa_line_for, autofix, noqa, path, locator);
+    let mut checker = Checker::new(
+        settings,
+        noqa_line_for,
+        autofix,
+        noqa,
+        path,
+        locator,
+        stylist,
+    );
     checker.push_scope(Scope::new(ScopeKind::Module));
     checker.bind_builtins();
 

src/checkers/lines.rs

@@ -2,7 +2,7 @@
 
 use crate::checks::{Check, CheckCode};
 use crate::pycodestyle::checks::{line_too_long, no_newline_at_end_of_file};
-use crate::pygrep_hooks::plugins::blanket_type_ignore;
+use crate::pygrep_hooks::plugins::{blanket_noqa, blanket_type_ignore};
 use crate::pyupgrade::checks::unnecessary_coding_comment;
 use crate::settings::{flags, Settings};
 
@@ -18,6 +18,7 @@ pub fn check_lines(
     let enforce_line_too_long = settings.enabled.contains(&CheckCode::E501);
     let enforce_no_newline_at_end_of_file = settings.enabled.contains(&CheckCode::W292);
     let enforce_blanket_type_ignore = settings.enabled.contains(&CheckCode::PGH003);
+    let enforce_blanket_noqa = settings.enabled.contains(&CheckCode::PGH004);
 
     let mut commented_lines_iter = commented_lines.iter().peekable();
     for (index, line) in contents.lines().enumerate() {
@@ -45,6 +46,14 @@ pub fn check_lines(
                     }
                 }
             }
+
+            if enforce_blanket_noqa {
+                if commented_lines.contains(&(index + 1)) {
+                    if let Some(check) = blanket_noqa(index, line) {
+                        checks.push(check);
+                    }
+                }
+            }
         }
 
         if enforce_line_too_long {

src/checkers/noqa.rs

@@ -49,6 +49,9 @@ pub fn check_noqa(
         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.

src/checkers/tokens.rs

@@ -7,7 +7,7 @@ use crate::lex::docstring_detection::StateMachine;
 use crate::ruff::checks::Context;
 use crate::settings::flags;
 use crate::source_code_locator::SourceCodeLocator;
-use crate::{eradicate, flake8_quotes, pycodestyle, ruff, Settings};
+use crate::{eradicate, flake8_implicit_str_concat, flake8_quotes, pycodestyle, ruff, Settings};
 
 pub fn check_tokens(
     locator: &SourceCodeLocator,
@@ -26,6 +26,8 @@ pub fn check_tokens(
         || settings.enabled.contains(&CheckCode::Q003);
     let enforce_commented_out_code = settings.enabled.contains(&CheckCode::ERA001);
     let enforce_invalid_escape_sequence = settings.enabled.contains(&CheckCode::W605);
+    let enforce_implicit_string_concatenation = settings.enabled.contains(&CheckCode::ISC001)
+        || settings.enabled.contains(&CheckCode::ISC002);
 
     let mut state_machine = StateMachine::default();
     for &(start, ref tok, end) in tokens.iter().flatten() {
@@ -99,5 +101,14 @@ pub fn check_tokens(
         }
     }
 
+    // ISC001, ISC002
+    if enforce_implicit_string_concatenation {
+        checks.extend(
+            flake8_implicit_str_concat::checks::implicit(tokens, locator)
+                .into_iter()
+                .filter(|check| settings.enabled.contains(check.kind.code())),
+        );
+    }
+
     checks
 }

src/checks.rs

@@ -165,6 +165,7 @@ pub enum CheckCode {
     // mccabe
     C901,
     // flake8-tidy-imports
+    TID251,
     TID252,
     // flake8-return
     RET501,
@@ -175,6 +176,10 @@ pub enum CheckCode {
     RET506,
     RET507,
     RET508,
+    // flake8-implicit-str-concat
+    ISC001,
+    ISC002,
+    ISC003,
     // flake8-print
     T201,
     T203,
@@ -227,6 +232,11 @@ pub enum CheckCode {
     UP017,
     UP018,
     UP019,
+    UP020,
+    UP021,
+    UP022,
+    UP023,
+    UP025,
     // pydocstyle
     D100,
     D101,
@@ -326,11 +336,13 @@ pub enum CheckCode {
     RUF001,
     RUF002,
     RUF003,
+    RUF004,
     RUF100,
     // pygrep-hooks
     PGH001,
     PGH002,
     PGH003,
+    PGH004,
     // pandas-vet
     PD002,
     PD003,
@@ -369,6 +381,7 @@ pub enum CheckCategory {
     Flake8Comprehensions,
     Flake8Debugger,
     Flake8ErrMsg,
+    Flake8ImplicitStrConcat,
     Flake8ImportConventions,
     Flake8Print,
     Flake8Quotes,
@@ -412,6 +425,7 @@ impl CheckCategory {
             CheckCategory::Flake8Comprehensions => "flake8-comprehensions",
             CheckCategory::Flake8Debugger => "flake8-debugger",
             CheckCategory::Flake8ErrMsg => "flake8-errmsg",
+            CheckCategory::Flake8ImplicitStrConcat => "flake8-implicit-str-concat",
             CheckCategory::Flake8ImportConventions => "flake8-import-conventions",
             CheckCategory::Flake8Print => "flake8-print",
             CheckCategory::Flake8Quotes => "flake8-quotes",
@@ -445,19 +459,21 @@ impl CheckCategory {
             CheckCategory::Flake8Bugbear => vec![CheckCodePrefix::B],
             CheckCategory::Flake8Builtins => vec![CheckCodePrefix::A],
             CheckCategory::Flake8Comprehensions => vec![CheckCodePrefix::C4],
+            CheckCategory::Flake8Datetimez => vec![CheckCodePrefix::DTZ],
             CheckCategory::Flake8Debugger => vec![CheckCodePrefix::T10],
             CheckCategory::Flake8ErrMsg => vec![CheckCodePrefix::EM],
+            CheckCategory::Flake8ImplicitStrConcat => vec![CheckCodePrefix::ISC],
+            CheckCategory::Flake8ImportConventions => vec![CheckCodePrefix::ICN],
             CheckCategory::Flake8Print => vec![CheckCodePrefix::T20],
             CheckCategory::Flake8Quotes => vec![CheckCodePrefix::Q],
             CheckCategory::Flake8Return => vec![CheckCodePrefix::RET],
             CheckCategory::Flake8Simplify => vec![CheckCodePrefix::SIM],
             CheckCategory::Flake8TidyImports => vec![CheckCodePrefix::TID],
             CheckCategory::Flake8UnusedArguments => vec![CheckCodePrefix::ARG],
-            CheckCategory::Flake8Datetimez => vec![CheckCodePrefix::DTZ],
             CheckCategory::Isort => vec![CheckCodePrefix::I],
             CheckCategory::McCabe => vec![CheckCodePrefix::C90],
-            CheckCategory::PandasVet => vec![CheckCodePrefix::PD],
             CheckCategory::PEP8Naming => vec![CheckCodePrefix::N],
+            CheckCategory::PandasVet => vec![CheckCodePrefix::PD],
             CheckCategory::Pycodestyle => vec![CheckCodePrefix::E, CheckCodePrefix::W],
             CheckCategory::Pydocstyle => vec![CheckCodePrefix::D],
             CheckCategory::Pyflakes => vec![CheckCodePrefix::F],
@@ -469,7 +485,6 @@ impl CheckCategory {
                 CheckCodePrefix::PLW,
             ],
             CheckCategory::Pyupgrade => vec![CheckCodePrefix::UP],
-            CheckCategory::Flake8ImportConventions => vec![CheckCodePrefix::ICN],
             CheckCategory::Ruff => vec![CheckCodePrefix::RUF],
         }
     }
@@ -519,6 +534,10 @@ impl CheckCategory {
                 "https://pypi.org/project/flake8-errmsg/0.4.0/",
                 &Platform::PyPI,
             )),
+            CheckCategory::Flake8ImplicitStrConcat => Some((
+                "https://pypi.org/project/flake8-implicit-str-concat/0.3.0/",
+                &Platform::PyPI,
+            )),
             CheckCategory::Flake8ImportConventions => None,
             CheckCategory::Flake8Print => Some((
                 "https://pypi.org/project/flake8-print/5.0.0/",
@@ -777,6 +796,7 @@ pub enum CheckKind {
     // flake8-debugger
     Debugger(DebuggerUsingType),
     // flake8-tidy-imports
+    BannedApi { name: String, message: String },
     BannedRelativeImport(Strictness),
     // flake8-return
     UnnecessaryReturnNone,
@@ -787,6 +807,10 @@ pub enum CheckKind {
     SuperfluousElseRaise(Branch),
     SuperfluousElseContinue(Branch),
     SuperfluousElseBreak(Branch),
+    // flake8-implicit-str-concat
+    SingleLineImplicitStringConcatenation,
+    MultiLineImplicitStringConcatenation,
+    ExplicitStringConcatenation,
     // flake8-print
     PrintFound,
     PPrintFound,
@@ -839,6 +863,11 @@ pub enum CheckKind {
     RemoveSixCompat,
     DatetimeTimezoneUTC,
     NativeLiterals,
+    OpenAlias,
+    ReplaceUniversalNewlines,
+    ReplaceStdoutStderr,
+    RewriteCElementTree,
+    RewriteUnicodeLiteral,
     // pydocstyle
     BlankLineAfterLastSection(String),
     BlankLineAfterSection(String),
@@ -922,6 +951,7 @@ pub enum CheckKind {
     NoEval,
     DeprecatedLogWarn,
     BlanketTypeIgnore,
+    BlanketNOQA,
     // flake8-unused-arguments
     UnusedFunctionArgument(String),
     UnusedMethodArgument(String),
@@ -951,6 +981,7 @@ pub enum CheckKind {
     AmbiguousUnicodeCharacterString(char, char),
     AmbiguousUnicodeCharacterDocstring(char, char),
     AmbiguousUnicodeCharacterComment(char, char),
+    KeywordArgumentBeforeStarArgument(String),
     UnusedNOQA(Option<UnusedCodes>),
     // flake8-datetimez
     CallDatetimeWithoutTzinfo,
@@ -970,10 +1001,14 @@ impl CheckCode {
     pub fn lint_source(&self) -> &'static LintSource {
         match self {
             CheckCode::RUF100 => &LintSource::NoQA,
-            CheckCode::E501 | CheckCode::W292 | CheckCode::UP009 | CheckCode::PGH003 => {
-                &LintSource::Lines
-            }
+            CheckCode::E501
+            | CheckCode::W292
+            | CheckCode::UP009
+            | CheckCode::PGH003
+            | CheckCode::PGH004 => &LintSource::Lines,
             CheckCode::ERA001
+            | CheckCode::ISC001
+            | CheckCode::ISC002
             | CheckCode::Q000
             | CheckCode::Q001
             | CheckCode::Q002
@@ -1148,6 +1183,10 @@ impl CheckCode {
             // flake8-debugger
             CheckCode::T100 => CheckKind::Debugger(DebuggerUsingType::Import("...".to_string())),
             // flake8-tidy-imports
+            CheckCode::TID251 => CheckKind::BannedApi {
+                name: "...".to_string(),
+                message: "...".to_string(),
+            },
             CheckCode::TID252 => CheckKind::BannedRelativeImport(Strictness::All),
             // flake8-return
             CheckCode::RET501 => CheckKind::UnnecessaryReturnNone,
@@ -1158,6 +1197,10 @@ impl CheckCode {
             CheckCode::RET506 => CheckKind::SuperfluousElseRaise(Branch::Else),
             CheckCode::RET507 => CheckKind::SuperfluousElseContinue(Branch::Else),
             CheckCode::RET508 => CheckKind::SuperfluousElseBreak(Branch::Else),
+            // flake8-implicit-str-concat
+            CheckCode::ISC001 => CheckKind::SingleLineImplicitStringConcatenation,
+            CheckCode::ISC002 => CheckKind::MultiLineImplicitStringConcatenation,
+            CheckCode::ISC003 => CheckKind::ExplicitStringConcatenation,
             // flake8-print
             CheckCode::T201 => CheckKind::PrintFound,
             CheckCode::T203 => CheckKind::PPrintFound,
@@ -1215,6 +1258,11 @@ impl CheckCode {
             CheckCode::UP017 => CheckKind::DatetimeTimezoneUTC,
             CheckCode::UP018 => CheckKind::NativeLiterals,
             CheckCode::UP019 => CheckKind::TypingTextStrAlias,
+            CheckCode::UP020 => CheckKind::OpenAlias,
+            CheckCode::UP021 => CheckKind::ReplaceUniversalNewlines,
+            CheckCode::UP022 => CheckKind::ReplaceStdoutStderr,
+            CheckCode::UP023 => CheckKind::RewriteCElementTree,
+            CheckCode::UP025 => CheckKind::RewriteUnicodeLiteral,
             // pydocstyle
             CheckCode::D100 => CheckKind::PublicModule,
             CheckCode::D101 => CheckKind::PublicClass,
@@ -1313,6 +1361,7 @@ impl CheckCode {
             CheckCode::PGH001 => CheckKind::NoEval,
             CheckCode::PGH002 => CheckKind::DeprecatedLogWarn,
             CheckCode::PGH003 => CheckKind::BlanketTypeIgnore,
+            CheckCode::PGH004 => CheckKind::BlanketNOQA,
             // flake8-unused-arguments
             CheckCode::ARG001 => CheckKind::UnusedFunctionArgument("...".to_string()),
             CheckCode::ARG002 => CheckKind::UnusedMethodArgument("...".to_string()),
@@ -1354,6 +1403,7 @@ impl CheckCode {
             CheckCode::RUF001 => CheckKind::AmbiguousUnicodeCharacterString('𝐁', 'B'),
             CheckCode::RUF002 => CheckKind::AmbiguousUnicodeCharacterDocstring('𝐁', 'B'),
             CheckCode::RUF003 => CheckKind::AmbiguousUnicodeCharacterComment('𝐁', 'B'),
+            CheckCode::RUF004 => CheckKind::KeywordArgumentBeforeStarArgument("...".to_string()),
             CheckCode::RUF100 => CheckKind::UnusedNOQA(None),
         }
     }
@@ -1547,8 +1597,10 @@ impl CheckCode {
             CheckCode::FBT002 => CheckCategory::Flake8BooleanTrap,
             CheckCode::FBT003 => CheckCategory::Flake8BooleanTrap,
             CheckCode::I001 => CheckCategory::Isort,
-            CheckCode::TID252 => CheckCategory::Flake8TidyImports,
             CheckCode::ICN001 => CheckCategory::Flake8ImportConventions,
+            CheckCode::ISC001 => CheckCategory::Flake8ImplicitStrConcat,
+            CheckCode::ISC002 => CheckCategory::Flake8ImplicitStrConcat,
+            CheckCode::ISC003 => CheckCategory::Flake8ImplicitStrConcat,
             CheckCode::N801 => CheckCategory::PEP8Naming,
             CheckCode::N802 => CheckCategory::PEP8Naming,
             CheckCode::N803 => CheckCategory::PEP8Naming,
@@ -1579,6 +1631,7 @@ impl CheckCode {
             CheckCode::PGH001 => CheckCategory::PygrepHooks,
             CheckCode::PGH002 => CheckCategory::PygrepHooks,
             CheckCode::PGH003 => CheckCategory::PygrepHooks,
+            CheckCode::PGH004 => CheckCategory::PygrepHooks,
             CheckCode::PLC0414 => CheckCategory::Pylint,
             CheckCode::PLC2201 => CheckCategory::Pylint,
             CheckCode::PLC3002 => CheckCategory::Pylint,
@@ -1606,6 +1659,7 @@ impl CheckCode {
             CheckCode::RUF001 => CheckCategory::Ruff,
             CheckCode::RUF002 => CheckCategory::Ruff,
             CheckCode::RUF003 => CheckCategory::Ruff,
+            CheckCode::RUF004 => CheckCategory::Ruff,
             CheckCode::RUF100 => CheckCategory::Ruff,
             CheckCode::S101 => CheckCategory::Flake8Bandit,
             CheckCode::S102 => CheckCategory::Flake8Bandit,
@@ -1617,6 +1671,8 @@ impl CheckCode {
             CheckCode::T100 => CheckCategory::Flake8Debugger,
             CheckCode::T201 => CheckCategory::Flake8Print,
             CheckCode::T203 => CheckCategory::Flake8Print,
+            CheckCode::TID251 => CheckCategory::Flake8TidyImports,
+            CheckCode::TID252 => CheckCategory::Flake8TidyImports,
             CheckCode::UP001 => CheckCategory::Pyupgrade,
             CheckCode::UP003 => CheckCategory::Pyupgrade,
             CheckCode::UP004 => CheckCategory::Pyupgrade,
@@ -1635,6 +1691,11 @@ impl CheckCode {
             CheckCode::UP017 => CheckCategory::Pyupgrade,
             CheckCode::UP018 => CheckCategory::Pyupgrade,
             CheckCode::UP019 => CheckCategory::Pyupgrade,
+            CheckCode::UP020 => CheckCategory::Pyupgrade,
+            CheckCode::UP021 => CheckCategory::Pyupgrade,
+            CheckCode::UP022 => CheckCategory::Pyupgrade,
+            CheckCode::UP023 => CheckCategory::Pyupgrade,
+            CheckCode::UP025 => CheckCategory::Pyupgrade,
             CheckCode::W292 => CheckCategory::Pycodestyle,
             CheckCode::W605 => CheckCategory::Pycodestyle,
             CheckCode::YTT101 => CheckCategory::Flake82020,
@@ -1786,6 +1847,7 @@ impl CheckKind {
             // flake8-debugger
             CheckKind::Debugger(..) => &CheckCode::T100,
             // flake8-tidy-imports
+            CheckKind::BannedApi { .. } => &CheckCode::TID251,
             CheckKind::BannedRelativeImport(..) => &CheckCode::TID252,
             // flake8-return
             CheckKind::UnnecessaryReturnNone => &CheckCode::RET501,
@@ -1796,6 +1858,10 @@ impl CheckKind {
             CheckKind::SuperfluousElseRaise(..) => &CheckCode::RET506,
             CheckKind::SuperfluousElseContinue(..) => &CheckCode::RET507,
             CheckKind::SuperfluousElseBreak(..) => &CheckCode::RET508,
+            // flake8-implicit-str-concat
+            CheckKind::SingleLineImplicitStringConcatenation => &CheckCode::ISC001,
+            CheckKind::MultiLineImplicitStringConcatenation => &CheckCode::ISC002,
+            CheckKind::ExplicitStringConcatenation => &CheckCode::ISC003,
             // flake8-print
             CheckKind::PrintFound => &CheckCode::T201,
             CheckKind::PPrintFound => &CheckCode::T203,
@@ -1848,6 +1914,11 @@ impl CheckKind {
             CheckKind::DatetimeTimezoneUTC => &CheckCode::UP017,
             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::RewriteUnicodeLiteral => &CheckCode::UP025,
             // pydocstyle
             CheckKind::BlankLineAfterLastSection(..) => &CheckCode::D413,
             CheckKind::BlankLineAfterSection(..) => &CheckCode::D410,
@@ -1931,6 +2002,7 @@ impl CheckKind {
             CheckKind::NoEval => &CheckCode::PGH001,
             CheckKind::DeprecatedLogWarn => &CheckCode::PGH002,
             CheckKind::BlanketTypeIgnore => &CheckCode::PGH003,
+            CheckKind::BlanketNOQA => &CheckCode::PGH004,
             // flake8-unused-arguments
             CheckKind::UnusedFunctionArgument(..) => &CheckCode::ARG001,
             CheckKind::UnusedMethodArgument(..) => &CheckCode::ARG002,
@@ -1970,6 +2042,7 @@ impl CheckKind {
             CheckKind::AmbiguousUnicodeCharacterString(..) => &CheckCode::RUF001,
             CheckKind::AmbiguousUnicodeCharacterDocstring(..) => &CheckCode::RUF002,
             CheckKind::AmbiguousUnicodeCharacterComment(..) => &CheckCode::RUF003,
+            CheckKind::KeywordArgumentBeforeStarArgument(..) => &CheckCode::RUF004,
             CheckKind::UnusedNOQA(..) => &CheckCode::RUF100,
         }
     }
@@ -2407,6 +2480,7 @@ impl CheckKind {
                 DebuggerUsingType::Import(name) => format!("Import for `{name}` found"),
             },
             // flake8-tidy-imports
+            CheckKind::BannedApi { name, message } => format!("`{name}` is banned: {message}"),
             CheckKind::BannedRelativeImport(strictness) => match strictness {
                 Strictness::Parents => {
                     "Relative imports from parent modules are banned".to_string()
@@ -2438,6 +2512,16 @@ impl CheckKind {
             CheckKind::SuperfluousElseBreak(branch) => {
                 format!("Unnecessary `{branch}` after `break` statement")
             }
+            // flake8-implicit-str-concat
+            CheckKind::SingleLineImplicitStringConcatenation => {
+                "Implicitly concatenated string literals on one line".to_string()
+            }
+            CheckKind::MultiLineImplicitStringConcatenation => {
+                "Implicitly concatenated string literals over continuation line".to_string()
+            }
+            CheckKind::ExplicitStringConcatenation => {
+                "Explicitly concatenated string should be implicitly concatenated".to_string()
+            }
             // flake8-print
             CheckKind::PrintFound => "`print` found".to_string(),
             CheckKind::PPrintFound => "`pprint` found".to_string(),
@@ -2540,7 +2624,7 @@ impl CheckKind {
             CheckKind::UselessMetaclassType => "`__metaclass__ = type` is implied".to_string(),
             CheckKind::TypingTextStrAlias => "`typing.Text` is deprecated, use `str`".to_string(),
             CheckKind::DeprecatedUnittestAlias(alias, target) => {
-                format!("`{alias}` is deprecated, use `{target}` instead")
+                format!("`{alias}` is deprecated, use `{target}`")
             }
             CheckKind::UselessObjectInheritance(name) => {
                 format!("Class `{name}` inherits from object")
@@ -2573,9 +2657,20 @@ impl CheckKind {
             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::OpenAlias => "Use builtin `open`".to_string(),
             CheckKind::ConvertTypedDictFunctionalToClass(name) => {
                 format!("Convert `{name}` from `TypedDict` functional to class syntax")
             }
+            CheckKind::ReplaceUniversalNewlines => {
+                "`universal_newlines` is deprecated, use `text`".to_string()
+            }
+            CheckKind::ReplaceStdoutStderr => {
+                "Sending stdout and stderr to pipe is deprecated, use `capture_output`".to_string()
+            }
+            CheckKind::RewriteCElementTree => {
+                "`cElementTree` is deprecated, use `ElementTree`".to_string()
+            }
+            CheckKind::RewriteUnicodeLiteral => "Remove unicode literals from strings".to_string(),
             CheckKind::ConvertNamedTupleFunctionalToClass(name) => {
                 format!("Convert `{name}` from `NamedTuple` functional to class syntax")
             }
@@ -2781,13 +2876,14 @@ impl CheckKind {
                 "Boolean positional value in function call".to_string()
             }
             // pygrep-hooks
-            CheckKind::NoEval => "No builtin `eval()` allowed".to_string(),
-            CheckKind::DeprecatedLogWarn => {
-                "`warn` is deprecated in favor of `warning`".to_string()
-            }
+            CheckKind::BlanketNOQA => "Use specific error codes when using `noqa`".to_string(),
             CheckKind::BlanketTypeIgnore => {
                 "Use specific error codes when ignoring type issues".to_string()
             }
+            CheckKind::DeprecatedLogWarn => {
+                "`warn` is deprecated in favor of `warning`".to_string()
+            }
+            CheckKind::NoEval => "No builtin `eval()` allowed".to_string(),
             // flake8-unused-arguments
             CheckKind::UnusedFunctionArgument(name) => {
                 format!("Unused function argument: `{name}`")
@@ -2868,6 +2964,9 @@ impl CheckKind {
                      '{representant}'?)"
                 )
             }
+            CheckKind::KeywordArgumentBeforeStarArgument(name) => {
+                format!("Keyword argument `{name}` must come after starred arguments")
+            }
             CheckKind::UnusedNOQA(codes) => match codes {
                 None => "Unused blanket `noqa` directive".to_string(),
                 Some(codes) => {
@@ -3015,7 +3114,12 @@ impl CheckKind {
                 | CheckKind::MisplacedComparisonConstant(..)
                 | CheckKind::MissingReturnTypeSpecialMethod(..)
                 | CheckKind::NativeLiterals
+                | CheckKind::OpenAlias
                 | CheckKind::NewLineAfterLastParagraph
+                | CheckKind::ReplaceUniversalNewlines
+                | CheckKind::ReplaceStdoutStderr
+                | CheckKind::RewriteCElementTree
+                | CheckKind::RewriteUnicodeLiteral
                 | CheckKind::NewLineAfterSectionName(..)
                 | CheckKind::NoBlankLineAfterFunction(..)
                 | CheckKind::NoBlankLineBeforeClass(..)

src/checks_gen.rs

@@ -28,6 +28,7 @@ pub enum CheckCodePrefix {
     A001,
     A002,
     A003,
+    ALL,
     ANN,
     ANN0,
     ANN00,
@@ -313,6 +314,12 @@ pub enum CheckCodePrefix {
     ICN0,
     ICN00,
     ICN001,
+    ISC,
+    ISC0,
+    ISC00,
+    ISC001,
+    ISC002,
+    ISC003,
     M,
     M0,
     M001,
@@ -376,6 +383,7 @@ pub enum CheckCodePrefix {
     PGH001,
     PGH002,
     PGH003,
+    PGH004,
     PLC,
     PLC0,
     PLC04,
@@ -456,6 +464,7 @@ pub enum CheckCodePrefix {
     RUF001,
     RUF002,
     RUF003,
+    RUF004,
     RUF1,
     RUF10,
     RUF100,
@@ -483,6 +492,7 @@ pub enum CheckCodePrefix {
     TID,
     TID2,
     TID25,
+    TID251,
     TID252,
     U,
     U0,
@@ -527,6 +537,12 @@ pub enum CheckCodePrefix {
     UP017,
     UP018,
     UP019,
+    UP02,
+    UP020,
+    UP021,
+    UP022,
+    UP023,
+    UP025,
     W,
     W2,
     W29,
@@ -555,6 +571,7 @@ pub enum CheckCodePrefix {
 
 #[derive(PartialEq, Eq, PartialOrd, Ord)]
 pub enum SuffixLength {
+    None,
     Zero,
     One,
     Two,
@@ -572,6 +589,305 @@ impl CheckCodePrefix {
             CheckCodePrefix::A001 => vec![CheckCode::A001],
             CheckCodePrefix::A002 => vec![CheckCode::A002],
             CheckCodePrefix::A003 => vec![CheckCode::A003],
+            CheckCodePrefix::ALL => vec![
+                CheckCode::E401,
+                CheckCode::E402,
+                CheckCode::E501,
+                CheckCode::E711,
+                CheckCode::E712,
+                CheckCode::E713,
+                CheckCode::E714,
+                CheckCode::E721,
+                CheckCode::E722,
+                CheckCode::E731,
+                CheckCode::E741,
+                CheckCode::E742,
+                CheckCode::E743,
+                CheckCode::E902,
+                CheckCode::E999,
+                CheckCode::W292,
+                CheckCode::W605,
+                CheckCode::F401,
+                CheckCode::F402,
+                CheckCode::F403,
+                CheckCode::F404,
+                CheckCode::F405,
+                CheckCode::F406,
+                CheckCode::F407,
+                CheckCode::F501,
+                CheckCode::F502,
+                CheckCode::F503,
+                CheckCode::F504,
+                CheckCode::F505,
+                CheckCode::F506,
+                CheckCode::F507,
+                CheckCode::F508,
+                CheckCode::F509,
+                CheckCode::F521,
+                CheckCode::F522,
+                CheckCode::F523,
+                CheckCode::F524,
+                CheckCode::F525,
+                CheckCode::F541,
+                CheckCode::F601,
+                CheckCode::F602,
+                CheckCode::F621,
+                CheckCode::F622,
+                CheckCode::F631,
+                CheckCode::F632,
+                CheckCode::F633,
+                CheckCode::F634,
+                CheckCode::F701,
+                CheckCode::F702,
+                CheckCode::F704,
+                CheckCode::F706,
+                CheckCode::F707,
+                CheckCode::F722,
+                CheckCode::F811,
+                CheckCode::F821,
+                CheckCode::F822,
+                CheckCode::F823,
+                CheckCode::F831,
+                CheckCode::F841,
+                CheckCode::F842,
+                CheckCode::F901,
+                CheckCode::PLC0414,
+                CheckCode::PLC2201,
+                CheckCode::PLC3002,
+                CheckCode::PLE0117,
+                CheckCode::PLE0118,
+                CheckCode::PLE1142,
+                CheckCode::PLR0206,
+                CheckCode::PLR0402,
+                CheckCode::PLR1701,
+                CheckCode::PLR1722,
+                CheckCode::PLW0120,
+                CheckCode::PLW0602,
+                CheckCode::A001,
+                CheckCode::A002,
+                CheckCode::A003,
+                CheckCode::B002,
+                CheckCode::B003,
+                CheckCode::B004,
+                CheckCode::B005,
+                CheckCode::B006,
+                CheckCode::B007,
+                CheckCode::B008,
+                CheckCode::B009,
+                CheckCode::B010,
+                CheckCode::B011,
+                CheckCode::B012,
+                CheckCode::B013,
+                CheckCode::B014,
+                CheckCode::B015,
+                CheckCode::B016,
+                CheckCode::B017,
+                CheckCode::B018,
+                CheckCode::B019,
+                CheckCode::B020,
+                CheckCode::B021,
+                CheckCode::B022,
+                CheckCode::B023,
+                CheckCode::B024,
+                CheckCode::B025,
+                CheckCode::B026,
+                CheckCode::B027,
+                CheckCode::B904,
+                CheckCode::B905,
+                CheckCode::BLE001,
+                CheckCode::C400,
+                CheckCode::C401,
+                CheckCode::C402,
+                CheckCode::C403,
+                CheckCode::C404,
+                CheckCode::C405,
+                CheckCode::C406,
+                CheckCode::C408,
+                CheckCode::C409,
+                CheckCode::C410,
+                CheckCode::C411,
+                CheckCode::C413,
+                CheckCode::C414,
+                CheckCode::C415,
+                CheckCode::C416,
+                CheckCode::C417,
+                CheckCode::T100,
+                CheckCode::C901,
+                CheckCode::TID251,
+                CheckCode::TID252,
+                CheckCode::RET501,
+                CheckCode::RET502,
+                CheckCode::RET503,
+                CheckCode::RET504,
+                CheckCode::RET505,
+                CheckCode::RET506,
+                CheckCode::RET507,
+                CheckCode::RET508,
+                CheckCode::ISC001,
+                CheckCode::ISC002,
+                CheckCode::ISC003,
+                CheckCode::T201,
+                CheckCode::T203,
+                CheckCode::Q000,
+                CheckCode::Q001,
+                CheckCode::Q002,
+                CheckCode::Q003,
+                CheckCode::ANN001,
+                CheckCode::ANN002,
+                CheckCode::ANN003,
+                CheckCode::ANN101,
+                CheckCode::ANN102,
+                CheckCode::ANN201,
+                CheckCode::ANN202,
+                CheckCode::ANN204,
+                CheckCode::ANN205,
+                CheckCode::ANN206,
+                CheckCode::ANN401,
+                CheckCode::YTT101,
+                CheckCode::YTT102,
+                CheckCode::YTT103,
+                CheckCode::YTT201,
+                CheckCode::YTT202,
+                CheckCode::YTT203,
+                CheckCode::YTT204,
+                CheckCode::YTT301,
+                CheckCode::YTT302,
+                CheckCode::YTT303,
+                CheckCode::SIM118,
+                CheckCode::UP001,
+                CheckCode::UP003,
+                CheckCode::UP004,
+                CheckCode::UP005,
+                CheckCode::UP006,
+                CheckCode::UP007,
+                CheckCode::UP008,
+                CheckCode::UP009,
+                CheckCode::UP010,
+                CheckCode::UP011,
+                CheckCode::UP012,
+                CheckCode::UP013,
+                CheckCode::UP014,
+                CheckCode::UP015,
+                CheckCode::UP016,
+                CheckCode::UP017,
+                CheckCode::UP018,
+                CheckCode::UP019,
+                CheckCode::UP020,
+                CheckCode::UP021,
+                CheckCode::UP022,
+                CheckCode::UP023,
+                CheckCode::UP025,
+                CheckCode::D100,
+                CheckCode::D101,
+                CheckCode::D102,
+                CheckCode::D103,
+                CheckCode::D104,
+                CheckCode::D105,
+                CheckCode::D106,
+                CheckCode::D107,
+                CheckCode::D200,
+                CheckCode::D201,
+                CheckCode::D202,
+                CheckCode::D203,
+                CheckCode::D204,
+                CheckCode::D205,
+                CheckCode::D206,
+                CheckCode::D207,
+                CheckCode::D208,
+                CheckCode::D209,
+                CheckCode::D210,
+                CheckCode::D211,
+                CheckCode::D212,
+                CheckCode::D213,
+                CheckCode::D214,
+                CheckCode::D215,
+                CheckCode::D300,
+                CheckCode::D301,
+                CheckCode::D400,
+                CheckCode::D402,
+                CheckCode::D403,
+                CheckCode::D404,
+                CheckCode::D405,
+                CheckCode::D406,
+                CheckCode::D407,
+                CheckCode::D408,
+                CheckCode::D409,
+                CheckCode::D410,
+                CheckCode::D411,
+                CheckCode::D412,
+                CheckCode::D413,
+                CheckCode::D414,
+                CheckCode::D415,
+                CheckCode::D416,
+                CheckCode::D417,
+                CheckCode::D418,
+                CheckCode::D419,
+                CheckCode::N801,
+                CheckCode::N802,
+                CheckCode::N803,
+                CheckCode::N804,
+                CheckCode::N805,
+                CheckCode::N806,
+                CheckCode::N807,
+                CheckCode::N811,
+                CheckCode::N812,
+                CheckCode::N813,
+                CheckCode::N814,
+                CheckCode::N815,
+                CheckCode::N816,
+                CheckCode::N817,
+                CheckCode::N818,
+                CheckCode::I001,
+                CheckCode::ERA001,
+                CheckCode::S101,
+                CheckCode::S102,
+                CheckCode::S104,
+                CheckCode::S105,
+                CheckCode::S106,
+                CheckCode::S107,
+                CheckCode::FBT001,
+                CheckCode::FBT002,
+                CheckCode::FBT003,
+                CheckCode::ARG001,
+                CheckCode::ARG002,
+                CheckCode::ARG003,
+                CheckCode::ARG004,
+                CheckCode::ARG005,
+                CheckCode::ICN001,
+                CheckCode::DTZ001,
+                CheckCode::DTZ002,
+                CheckCode::DTZ003,
+                CheckCode::DTZ004,
+                CheckCode::DTZ005,
+                CheckCode::DTZ006,
+                CheckCode::DTZ007,
+                CheckCode::DTZ011,
+                CheckCode::DTZ012,
+                CheckCode::RUF001,
+                CheckCode::RUF002,
+                CheckCode::RUF003,
+                CheckCode::RUF004,
+                CheckCode::RUF100,
+                CheckCode::PGH001,
+                CheckCode::PGH002,
+                CheckCode::PGH003,
+                CheckCode::PGH004,
+                CheckCode::PD002,
+                CheckCode::PD003,
+                CheckCode::PD004,
+                CheckCode::PD007,
+                CheckCode::PD008,
+                CheckCode::PD009,
+                CheckCode::PD010,
+                CheckCode::PD011,
+                CheckCode::PD012,
+                CheckCode::PD013,
+                CheckCode::PD015,
+                CheckCode::PD901,
+                CheckCode::EM101,
+                CheckCode::EM102,
+                CheckCode::EM103,
+            ],
             CheckCodePrefix::ANN => vec![
                 CheckCode::ANN001,
                 CheckCode::ANN002,
@@ -1359,7 +1675,7 @@ impl CheckCodePrefix {
                     ":".bold(),
                     "`I2` has been remapped to `TID2`".bold()
                 );
-                vec![CheckCode::TID252]
+                vec![CheckCode::TID251, CheckCode::TID252]
             }
             CheckCodePrefix::I25 => {
                 one_time_warning!(
@@ -1368,7 +1684,7 @@ impl CheckCodePrefix {
                     ":".bold(),
                     "`I25` has been remapped to `TID25`".bold()
                 );
-                vec![CheckCode::TID252]
+                vec![CheckCode::TID251, CheckCode::TID252]
             }
             CheckCodePrefix::I252 => {
                 one_time_warning!(
@@ -1437,6 +1753,12 @@ impl CheckCodePrefix {
             CheckCodePrefix::ICN0 => vec![CheckCode::ICN001],
             CheckCodePrefix::ICN00 => vec![CheckCode::ICN001],
             CheckCodePrefix::ICN001 => vec![CheckCode::ICN001],
+            CheckCodePrefix::ISC => vec![CheckCode::ISC001, CheckCode::ISC002, CheckCode::ISC003],
+            CheckCodePrefix::ISC0 => vec![CheckCode::ISC001, CheckCode::ISC002, CheckCode::ISC003],
+            CheckCodePrefix::ISC00 => vec![CheckCode::ISC001, CheckCode::ISC002, CheckCode::ISC003],
+            CheckCodePrefix::ISC001 => vec![CheckCode::ISC001],
+            CheckCodePrefix::ISC002 => vec![CheckCode::ISC002],
+            CheckCodePrefix::ISC003 => vec![CheckCode::ISC003],
             CheckCodePrefix::M => {
                 one_time_warning!(
                     "{}{} {}",
@@ -1772,12 +2094,28 @@ impl CheckCodePrefix {
                 );
                 vec![CheckCode::PD901]
             }
-            CheckCodePrefix::PGH => vec![CheckCode::PGH001, CheckCode::PGH002, CheckCode::PGH003],
-            CheckCodePrefix::PGH0 => vec![CheckCode::PGH001, CheckCode::PGH002, CheckCode::PGH003],
-            CheckCodePrefix::PGH00 => vec![CheckCode::PGH001, CheckCode::PGH002, CheckCode::PGH003],
+            CheckCodePrefix::PGH => vec![
+                CheckCode::PGH001,
+                CheckCode::PGH002,
+                CheckCode::PGH003,
+                CheckCode::PGH004,
+            ],
+            CheckCodePrefix::PGH0 => vec![
+                CheckCode::PGH001,
+                CheckCode::PGH002,
+                CheckCode::PGH003,
+                CheckCode::PGH004,
+            ],
+            CheckCodePrefix::PGH00 => vec![
+                CheckCode::PGH001,
+                CheckCode::PGH002,
+                CheckCode::PGH003,
+                CheckCode::PGH004,
+            ],
             CheckCodePrefix::PGH001 => vec![CheckCode::PGH001],
             CheckCodePrefix::PGH002 => vec![CheckCode::PGH002],
             CheckCodePrefix::PGH003 => vec![CheckCode::PGH003],
+            CheckCodePrefix::PGH004 => vec![CheckCode::PGH004],
             CheckCodePrefix::PLC => {
                 vec![CheckCode::PLC0414, CheckCode::PLC2201, CheckCode::PLC3002]
             }
@@ -2022,13 +2360,25 @@ impl CheckCodePrefix {
                 CheckCode::RUF001,
                 CheckCode::RUF002,
                 CheckCode::RUF003,
+                CheckCode::RUF004,
                 CheckCode::RUF100,
             ],
-            CheckCodePrefix::RUF0 => vec![CheckCode::RUF001, CheckCode::RUF002, CheckCode::RUF003],
-            CheckCodePrefix::RUF00 => vec![CheckCode::RUF001, CheckCode::RUF002, CheckCode::RUF003],
+            CheckCodePrefix::RUF0 => vec![
+                CheckCode::RUF001,
+                CheckCode::RUF002,
+                CheckCode::RUF003,
+                CheckCode::RUF004,
+            ],
+            CheckCodePrefix::RUF00 => vec![
+                CheckCode::RUF001,
+                CheckCode::RUF002,
+                CheckCode::RUF003,
+                CheckCode::RUF004,
+            ],
             CheckCodePrefix::RUF001 => vec![CheckCode::RUF001],
             CheckCodePrefix::RUF002 => vec![CheckCode::RUF002],
             CheckCodePrefix::RUF003 => vec![CheckCode::RUF003],
+            CheckCodePrefix::RUF004 => vec![CheckCode::RUF004],
             CheckCodePrefix::RUF1 => vec![CheckCode::RUF100],
             CheckCodePrefix::RUF10 => vec![CheckCode::RUF100],
             CheckCodePrefix::RUF100 => vec![CheckCode::RUF100],
@@ -2074,9 +2424,10 @@ impl CheckCodePrefix {
             CheckCodePrefix::T20 => vec![CheckCode::T201, CheckCode::T203],
             CheckCodePrefix::T201 => vec![CheckCode::T201],
             CheckCodePrefix::T203 => vec![CheckCode::T203],
-            CheckCodePrefix::TID => vec![CheckCode::TID252],
-            CheckCodePrefix::TID2 => vec![CheckCode::TID252],
-            CheckCodePrefix::TID25 => vec![CheckCode::TID252],
+            CheckCodePrefix::TID => vec![CheckCode::TID251, CheckCode::TID252],
+            CheckCodePrefix::TID2 => vec![CheckCode::TID251, CheckCode::TID252],
+            CheckCodePrefix::TID25 => vec![CheckCode::TID251, CheckCode::TID252],
+            CheckCodePrefix::TID251 => vec![CheckCode::TID251],
             CheckCodePrefix::TID252 => vec![CheckCode::TID252],
             CheckCodePrefix::U => {
                 one_time_warning!(
@@ -2104,6 +2455,11 @@ impl CheckCodePrefix {
                     CheckCode::UP017,
                     CheckCode::UP018,
                     CheckCode::UP019,
+                    CheckCode::UP020,
+                    CheckCode::UP021,
+                    CheckCode::UP022,
+                    CheckCode::UP023,
+                    CheckCode::UP025,
                 ]
             }
             CheckCodePrefix::U0 => {
@@ -2132,6 +2488,11 @@ impl CheckCodePrefix {
                     CheckCode::UP017,
                     CheckCode::UP018,
                     CheckCode::UP019,
+                    CheckCode::UP020,
+                    CheckCode::UP021,
+                    CheckCode::UP022,
+                    CheckCode::UP023,
+                    CheckCode::UP025,
                 ]
             }
             CheckCodePrefix::U00 => {
@@ -2344,6 +2705,11 @@ impl CheckCodePrefix {
                 CheckCode::UP017,
                 CheckCode::UP018,
                 CheckCode::UP019,
+                CheckCode::UP020,
+                CheckCode::UP021,
+                CheckCode::UP022,
+                CheckCode::UP023,
+                CheckCode::UP025,
             ],
             CheckCodePrefix::UP0 => vec![
                 CheckCode::UP001,
@@ -2364,6 +2730,11 @@ impl CheckCodePrefix {
                 CheckCode::UP017,
                 CheckCode::UP018,
                 CheckCode::UP019,
+                CheckCode::UP020,
+                CheckCode::UP021,
+                CheckCode::UP022,
+                CheckCode::UP023,
+                CheckCode::UP025,
             ],
             CheckCodePrefix::UP00 => vec![
                 CheckCode::UP001,
@@ -2405,6 +2776,18 @@ impl CheckCodePrefix {
             CheckCodePrefix::UP017 => vec![CheckCode::UP017],
             CheckCodePrefix::UP018 => vec![CheckCode::UP018],
             CheckCodePrefix::UP019 => vec![CheckCode::UP019],
+            CheckCodePrefix::UP02 => vec![
+                CheckCode::UP020,
+                CheckCode::UP021,
+                CheckCode::UP022,
+                CheckCode::UP023,
+                CheckCode::UP025,
+            ],
+            CheckCodePrefix::UP020 => vec![CheckCode::UP020],
+            CheckCodePrefix::UP021 => vec![CheckCode::UP021],
+            CheckCodePrefix::UP022 => vec![CheckCode::UP022],
+            CheckCodePrefix::UP023 => vec![CheckCode::UP023],
+            CheckCodePrefix::UP025 => vec![CheckCode::UP025],
             CheckCodePrefix::W => vec![CheckCode::W292, CheckCode::W605],
             CheckCodePrefix::W2 => vec![CheckCode::W292],
             CheckCodePrefix::W29 => vec![CheckCode::W292],
@@ -2464,6 +2847,7 @@ impl CheckCodePrefix {
             CheckCodePrefix::A001 => SuffixLength::Three,
             CheckCodePrefix::A002 => SuffixLength::Three,
             CheckCodePrefix::A003 => SuffixLength::Three,
+            CheckCodePrefix::ALL => SuffixLength::None,
             CheckCodePrefix::ANN => SuffixLength::Zero,
             CheckCodePrefix::ANN0 => SuffixLength::One,
             CheckCodePrefix::ANN00 => SuffixLength::Two,
@@ -2749,6 +3133,12 @@ impl CheckCodePrefix {
             CheckCodePrefix::ICN0 => SuffixLength::One,
             CheckCodePrefix::ICN00 => SuffixLength::Two,
             CheckCodePrefix::ICN001 => SuffixLength::Three,
+            CheckCodePrefix::ISC => SuffixLength::Zero,
+            CheckCodePrefix::ISC0 => SuffixLength::One,
+            CheckCodePrefix::ISC00 => SuffixLength::Two,
+            CheckCodePrefix::ISC001 => SuffixLength::Three,
+            CheckCodePrefix::ISC002 => SuffixLength::Three,
+            CheckCodePrefix::ISC003 => SuffixLength::Three,
             CheckCodePrefix::M => SuffixLength::Zero,
             CheckCodePrefix::M0 => SuffixLength::One,
             CheckCodePrefix::M001 => SuffixLength::Three,
@@ -2812,6 +3202,7 @@ impl CheckCodePrefix {
             CheckCodePrefix::PGH001 => SuffixLength::Three,
             CheckCodePrefix::PGH002 => SuffixLength::Three,
             CheckCodePrefix::PGH003 => SuffixLength::Three,
+            CheckCodePrefix::PGH004 => SuffixLength::Three,
             CheckCodePrefix::PLC => SuffixLength::Zero,
             CheckCodePrefix::PLC0 => SuffixLength::One,
             CheckCodePrefix::PLC04 => SuffixLength::Two,
@@ -2892,6 +3283,7 @@ impl CheckCodePrefix {
             CheckCodePrefix::RUF001 => SuffixLength::Three,
             CheckCodePrefix::RUF002 => SuffixLength::Three,
             CheckCodePrefix::RUF003 => SuffixLength::Three,
+            CheckCodePrefix::RUF004 => SuffixLength::Three,
             CheckCodePrefix::RUF1 => SuffixLength::One,
             CheckCodePrefix::RUF10 => SuffixLength::Two,
             CheckCodePrefix::RUF100 => SuffixLength::Three,
@@ -2919,6 +3311,7 @@ impl CheckCodePrefix {
             CheckCodePrefix::TID => SuffixLength::Zero,
             CheckCodePrefix::TID2 => SuffixLength::One,
             CheckCodePrefix::TID25 => SuffixLength::Two,
+            CheckCodePrefix::TID251 => SuffixLength::Three,
             CheckCodePrefix::TID252 => SuffixLength::Three,
             CheckCodePrefix::U => SuffixLength::Zero,
             CheckCodePrefix::U0 => SuffixLength::One,
@@ -2963,6 +3356,12 @@ impl CheckCodePrefix {
             CheckCodePrefix::UP017 => SuffixLength::Three,
             CheckCodePrefix::UP018 => SuffixLength::Three,
             CheckCodePrefix::UP019 => SuffixLength::Three,
+            CheckCodePrefix::UP02 => SuffixLength::Two,
+            CheckCodePrefix::UP020 => SuffixLength::Three,
+            CheckCodePrefix::UP021 => SuffixLength::Three,
+            CheckCodePrefix::UP022 => SuffixLength::Three,
+            CheckCodePrefix::UP023 => SuffixLength::Three,
+            CheckCodePrefix::UP025 => SuffixLength::Three,
             CheckCodePrefix::W => SuffixLength::Zero,
             CheckCodePrefix::W2 => SuffixLength::One,
             CheckCodePrefix::W29 => SuffixLength::Two,
@@ -2993,6 +3392,7 @@ impl CheckCodePrefix {
 
 pub const CATEGORIES: &[CheckCodePrefix] = &[
     CheckCodePrefix::A,
+    CheckCodePrefix::ALL,
     CheckCodePrefix::ANN,
     CheckCodePrefix::ARG,
     CheckCodePrefix::B,
@@ -3007,6 +3407,7 @@ pub const CATEGORIES: &[CheckCodePrefix] = &[
     CheckCodePrefix::FBT,
     CheckCodePrefix::I,
     CheckCodePrefix::ICN,
+    CheckCodePrefix::ISC,
     CheckCodePrefix::N,
     CheckCodePrefix::PD,
     CheckCodePrefix::PGH,

src/cli.rs

@@ -50,6 +50,10 @@ pub struct Cli {
     fix_only: bool,
     #[clap(long, overrides_with("fix_only"), hide = true)]
     no_fix_only: bool,
+    /// Avoid writing any fixed files back; instead, output a diff for each
+    /// changed file to stdout.
+    #[arg(long)]
+    pub diff: bool,
     /// Disable cache reads.
     #[arg(short, long)]
     pub no_cache: bool,
@@ -101,10 +105,15 @@ pub struct Cli {
     no_respect_gitignore: bool,
     /// Enforce exclusions, even for paths passed to Ruff directly on the
     /// command-line.
-    #[arg(long, overrides_with("no_show_source"))]
+    #[arg(long, overrides_with("no_force_exclude"))]
     force_exclude: bool,
     #[clap(long, overrides_with("force_exclude"), hide = true)]
     no_force_exclude: bool,
+    /// Enable or disable automatic update checks.
+    #[arg(long, overrides_with("no_update_check"))]
+    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,
@@ -154,6 +163,7 @@ impl Cli {
                 add_noqa: self.add_noqa,
                 autoformat: self.autoformat,
                 config: self.config,
+                diff: self.diff,
                 exit_zero: self.exit_zero,
                 explain: self.explain,
                 files: self.files,
@@ -187,11 +197,12 @@ impl Cli {
                 target_version: self.target_version,
                 unfixable: self.unfixable,
                 // TODO(charlie): Included in `pyproject.toml`, but not inherited.
+                cache_dir: self.cache_dir,
                 fix: resolve_bool_arg(self.fix, self.no_fix),
                 fix_only: resolve_bool_arg(self.fix_only, self.no_fix_only),
-                format: self.format,
                 force_exclude: resolve_bool_arg(self.force_exclude, self.no_force_exclude),
-                cache_dir: self.cache_dir,
+                format: self.format,
+                update_check: resolve_bool_arg(self.update_check, self.no_update_check),
             },
         )
     }
@@ -213,6 +224,7 @@ pub struct Arguments {
     pub add_noqa: bool,
     pub autoformat: bool,
     pub config: Option<PathBuf>,
+    pub diff: bool,
     pub exit_zero: bool,
     pub explain: Option<CheckCode>,
     pub files: Vec<PathBuf>,
@@ -247,11 +259,12 @@ pub struct Overrides {
     pub target_version: Option<PythonVersion>,
     pub unfixable: Option<Vec<CheckCodePrefix>>,
     // TODO(charlie): Captured in pyproject.toml as a default, but not part of `Settings`.
+    pub cache_dir: Option<PathBuf>,
     pub fix: Option<bool>,
     pub fix_only: Option<bool>,
-    pub format: Option<SerializationFormat>,
     pub force_exclude: Option<bool>,
-    pub cache_dir: Option<PathBuf>,
+    pub format: Option<SerializationFormat>,
+    pub update_check: Option<bool>,
 }
 
 /// Map the CLI settings to a `LogLevel`.

src/commands.rs

@@ -332,6 +332,9 @@ pub fn explain(code: &CheckCode, format: &SerializationFormat) -> Result<()> {
         SerializationFormat::Github => {
             bail!("`--explain` does not support GitHub format")
         }
+        SerializationFormat::Gitlab => {
+            bail!("`--explain` does not support GitLab format")
+        }
     };
     Ok(())
 }

src/flake8_annotations/fixes.rs

@@ -3,7 +3,6 @@ use rustpython_ast::Stmt;
 use rustpython_parser::lexer;
 use rustpython_parser::lexer::Tok;
 
-use crate::ast::helpers;
 use crate::ast::types::Range;
 use crate::autofix::Fix;
 use crate::source_code_locator::SourceCodeLocator;
@@ -17,13 +16,10 @@ pub fn add_return_none_annotation(locator: &SourceCodeLocator, stmt: &Stmt) -> R
     let mut seen_lpar = false;
     let mut seen_rpar = false;
     let mut count: usize = 0;
-    for (start, tok, ..) in lexer::make_tokenizer(&contents).flatten() {
+    for (start, tok, ..) in lexer::make_tokenizer_located(&contents, range.location).flatten() {
         if seen_lpar && seen_rpar {
             if matches!(tok, Tok::Colon) {
-                return Ok(Fix::insertion(
-                    " -> None".to_string(),
-                    helpers::to_absolute(start, range.location),
-                ));
+                return Ok(Fix::insertion(" -> None".to_string(), start));
             }
         }
 

src/flake8_annotations/settings.rs

@@ -5,7 +5,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 #[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Default, Serialize, Deserialize, ConfigurationOptions, JsonSchema,
 )]
 #[serde(
     deny_unknown_fields,
@@ -51,7 +51,7 @@ pub struct Options {
     pub allow_star_arg_any: Option<bool>,
 }
 
-#[derive(Debug, Hash, Default)]
+#[derive(Debug, Default, Hash)]
 #[allow(clippy::struct_excessive_bools)]
 pub struct Settings {
     pub mypy_init_return: bool,
@@ -60,14 +60,24 @@ pub struct Settings {
     pub allow_star_arg_any: bool,
 }
 
-impl Settings {
-    #[allow(clippy::needless_pass_by_value)]
-    pub fn from_options(options: Options) -> Self {
+impl From<Options> for Settings {
+    fn from(options: Options) -> Self {
         Self {
-            mypy_init_return: options.mypy_init_return.unwrap_or_default(),
-            suppress_dummy_args: options.suppress_dummy_args.unwrap_or_default(),
-            suppress_none_returning: options.suppress_none_returning.unwrap_or_default(),
-            allow_star_arg_any: options.allow_star_arg_any.unwrap_or_default(),
+            mypy_init_return: options.mypy_init_return.unwrap_or(false),
+            suppress_dummy_args: options.suppress_dummy_args.unwrap_or(false),
+            suppress_none_returning: options.suppress_none_returning.unwrap_or(false),
+            allow_star_arg_any: options.allow_star_arg_any.unwrap_or(false),
+        }
+    }
+}
+
+impl From<Settings> for Options {
+    fn from(settings: Settings) -> Self {
+        Self {
+            mypy_init_return: Some(settings.mypy_init_return),
+            suppress_dummy_args: Some(settings.suppress_dummy_args),
+            suppress_none_returning: Some(settings.suppress_none_returning),
+            allow_star_arg_any: Some(settings.allow_star_arg_any),
         }
     }
 }

src/flake8_bugbear/plugins/assert_false.rs

@@ -4,7 +4,7 @@ use crate::ast::types::Range;
 use crate::autofix::Fix;
 use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
-use crate::code_gen::SourceGenerator;
+use crate::source_code_generator::SourceCodeGenerator;
 
 fn assertion_error(msg: Option<&Expr>) -> Stmt {
     Stmt::new(
@@ -47,7 +47,8 @@ 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 = SourceGenerator::new();
+        let mut generator =
+            SourceCodeGenerator::new(checker.style.indentation(), checker.style.quote());
         generator.unparse_stmt(&assertion_error(msg));
         if let Ok(content) = generator.generate() {
             check.amend(Fix::replacement(

src/flake8_bugbear/plugins/duplicate_exceptions.rs

@@ -7,7 +7,7 @@ use crate::ast::types::Range;
 use crate::autofix::Fix;
 use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckCode, CheckKind};
-use crate::code_gen::SourceGenerator;
+use crate::source_code_generator::SourceCodeGenerator;
 
 fn type_pattern(elts: Vec<&Expr>) -> Expr {
     Expr::new(
@@ -54,7 +54,8 @@ fn duplicate_handler_exceptions<'a>(
                 Range::from_located(expr),
             );
             if checker.patch(check.kind.code()) {
-                let mut generator = SourceGenerator::new();
+                let mut generator =
+                    SourceCodeGenerator::new(checker.style.indentation(), checker.style.quote());
                 if unique_elts.len() == 1 {
                     generator.unparse_expr(unique_elts[0], 0);
                 } else {

src/flake8_bugbear/plugins/getattr_with_constant.rs

@@ -4,9 +4,9 @@ use crate::ast::types::Range;
 use crate::autofix::Fix;
 use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
-use crate::code_gen::SourceGenerator;
 use crate::python::identifiers::IDENTIFIER_REGEX;
 use crate::python::keyword::KWLIST;
+use crate::source_code_generator::SourceCodeGenerator;
 
 fn attribute(value: &Expr, attr: &str) -> Expr {
     Expr::new(
@@ -46,7 +46,8 @@ 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 = SourceGenerator::new();
+        let mut generator =
+            SourceCodeGenerator::new(checker.style.indentation(), checker.style.quote());
         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

@@ -4,7 +4,7 @@ use crate::ast::types::Range;
 use crate::autofix::Fix;
 use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
-use crate::code_gen::SourceGenerator;
+use crate::source_code_generator::SourceCodeGenerator;
 
 /// B013
 pub fn redundant_tuple_in_exception_handler(checker: &mut Checker, handlers: &[Excepthandler]) {
@@ -23,7 +23,8 @@ 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 = SourceGenerator::new();
+            let mut generator =
+                SourceCodeGenerator::new(checker.style.indentation(), checker.style.quote());
             generator.unparse_expr(elt, 0);
             if let Ok(content) = generator.generate() {
                 check.amend(Fix::replacement(

src/flake8_bugbear/plugins/setattr_with_constant.rs

@@ -6,11 +6,17 @@ use crate::ast::types::Range;
 use crate::autofix::Fix;
 use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
-use crate::code_gen::SourceGenerator;
 use crate::python::identifiers::IDENTIFIER_REGEX;
 use crate::python::keyword::KWLIST;
+use crate::source_code_generator::SourceCodeGenerator;
+use crate::source_code_style::SourceCodeStyleDetector;
 
-fn assignment(obj: &Expr, name: &str, value: &Expr) -> Result<String> {
+fn assignment(
+    obj: &Expr,
+    name: &str,
+    value: &Expr,
+    stylist: &SourceCodeStyleDetector,
+) -> Result<String> {
     let stmt = Stmt::new(
         Location::default(),
         Location::default(),
@@ -28,7 +34,7 @@ fn assignment(obj: &Expr, name: &str, value: &Expr) -> Result<String> {
             type_comment: None,
         },
     );
-    let mut generator = SourceGenerator::new();
+    let mut generator = SourceCodeGenerator::new(stylist.indentation(), stylist.quote());
     generator.unparse_stmt(&stmt);
     generator.generate().map_err(std::convert::Into::into)
 }
@@ -63,7 +69,7 @@ pub fn setattr_with_constant(checker: &mut Checker, expr: &Expr, func: &Expr, ar
         if expr == child.as_ref() {
             let mut check = Check::new(CheckKind::SetAttrWithConstant, Range::from_located(expr));
             if checker.patch(check.kind.code()) {
-                match assignment(obj, name, value) {
+                match assignment(obj, name, value, checker.style) {
                     Ok(content) => check.amend(Fix::replacement(
                         content,
                         expr.location,

src/flake8_bugbear/settings.rs

@@ -5,7 +5,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 #[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Default, Serialize, Deserialize, ConfigurationOptions, JsonSchema,
 )]
 #[serde(
     deny_unknown_fields,
@@ -26,15 +26,23 @@ pub struct Options {
     pub extend_immutable_calls: Option<Vec<String>>,
 }
 
-#[derive(Debug, Hash, Default)]
+#[derive(Debug, Default, Hash)]
 pub struct Settings {
     pub extend_immutable_calls: Vec<String>,
 }
 
-impl Settings {
-    pub fn from_options(options: Options) -> Self {
+impl From<Options> for Settings {
+    fn from(options: Options) -> Self {
         Self {
             extend_immutable_calls: options.extend_immutable_calls.unwrap_or_default(),
         }
     }
 }
+
+impl From<Settings> for Options {
+    fn from(settings: Settings) -> Self {
+        Self {
+            extend_immutable_calls: Some(settings.extend_immutable_calls),
+        }
+    }
+}

src/flake8_bugbear/snapshots/ruff__flake8_bugbear__tests__B011_B011.py.snap

@@ -25,7 +25,7 @@ expression: checks
     row: 10
     column: 12
   fix:
-    content: "raise AssertionError('message')"
+    content: "raise AssertionError(\"message\")"
     location:
       row: 10
       column: 0

src/flake8_errmsg/settings.rs

@@ -27,11 +27,18 @@ pub struct Settings {
     pub max_string_length: usize,
 }
 
-impl Settings {
-    #[allow(clippy::needless_pass_by_value)]
-    pub fn from_options(options: Options) -> Self {
+impl From<Options> for Settings {
+    fn from(options: Options) -> Self {
         Self {
             max_string_length: options.max_string_length.unwrap_or_default(),
         }
     }
 }
+
+impl From<Settings> for Options {
+    fn from(settings: Settings) -> Self {
+        Self {
+            max_string_length: Some(settings.max_string_length),
+        }
+    }
+}

src/flake8_implicit_str_concat/checks.rs

@@ -0,0 +1,73 @@
+use itertools::Itertools;
+use rustpython_ast::{Constant, Expr, ExprKind, Location, Operator};
+use rustpython_parser::lexer::{LexResult, Tok};
+
+use crate::ast::types::Range;
+use crate::checks::{Check, CheckKind};
+use crate::source_code_locator::SourceCodeLocator;
+
+/// ISC001, ISC002
+pub fn implicit(tokens: &[LexResult], locator: &SourceCodeLocator) -> Vec<Check> {
+    let mut checks = vec![];
+    for ((a_start, a_tok, a_end), (b_start, b_tok, b_end)) in
+        tokens.iter().flatten().tuple_windows()
+    {
+        if matches!(a_tok, Tok::String { .. }) && matches!(b_tok, Tok::String { .. }) {
+            if a_end.row() == b_start.row() {
+                checks.push(Check::new(
+                    CheckKind::SingleLineImplicitStringConcatenation,
+                    Range {
+                        location: *a_start,
+                        end_location: *b_end,
+                    },
+                ));
+            } else {
+                // TODO(charlie): The RustPython tokenization doesn't differentiate between
+                // continuations and newlines, so we have to detect them manually.
+                let contents = locator.slice_source_code_range(&Range {
+                    location: *a_end,
+                    end_location: Location::new(a_end.row() + 1, 0),
+                });
+                if contents.trim().ends_with('\\') {
+                    checks.push(Check::new(
+                        CheckKind::MultiLineImplicitStringConcatenation,
+                        Range {
+                            location: *a_start,
+                            end_location: *b_end,
+                        },
+                    ));
+                }
+            }
+        }
+    }
+    checks
+}
+
+/// ISC003
+pub fn explicit(expr: &Expr) -> Option<Check> {
+    if let ExprKind::BinOp { left, op, right } = &expr.node {
+        if matches!(op, Operator::Add) {
+            if matches!(
+                left.node,
+                ExprKind::JoinedStr { .. }
+                    | ExprKind::Constant {
+                        value: Constant::Str(..) | Constant::Bytes(..),
+                        ..
+                    }
+            ) && matches!(
+                right.node,
+                ExprKind::JoinedStr { .. }
+                    | ExprKind::Constant {
+                        value: Constant::Str(..) | Constant::Bytes(..),
+                        ..
+                    }
+            ) {
+                return Some(Check::new(
+                    CheckKind::ExplicitStringConcatenation,
+                    Range::from_located(expr),
+                ));
+            }
+        }
+    }
+    None
+}

src/flake8_implicit_str_concat/mod.rs

@@ -0,0 +1,30 @@
+pub mod checks;
+
+#[cfg(test)]
+mod tests {
+    use std::convert::AsRef;
+    use std::path::Path;
+
+    use anyhow::Result;
+    use test_case::test_case;
+
+    use crate::checks::CheckCode;
+    use crate::linter::test_path;
+    use crate::settings;
+
+    #[test_case(CheckCode::ISC001, Path::new("ISC.py"); "ISC001")]
+    #[test_case(CheckCode::ISC002, Path::new("ISC.py"); "ISC002")]
+    #[test_case(CheckCode::ISC003, Path::new("ISC.py"); "ISC003")]
+    fn checks(check_code: CheckCode, path: &Path) -> Result<()> {
+        let snapshot = format!("{}_{}", check_code.as_ref(), path.to_string_lossy());
+        let mut checks = test_path(
+            Path::new("./resources/test/fixtures/flake8_implicit_str_concat")
+                .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_implicit_str_concat/snapshots/ruff__flake8_implicit_str_concat__tests__ISC001_ISC.py.snap

@@ -0,0 +1,21 @@
+---
+source: src/flake8_implicit_str_concat/mod.rs
+expression: checks
+---
+- kind: SingleLineImplicitStringConcatenation
+  location:
+    row: 1
+    column: 4
+  end_location:
+    row: 1
+    column: 11
+  fix: ~
+- kind: SingleLineImplicitStringConcatenation
+  location:
+    row: 1
+    column: 8
+  end_location:
+    row: 1
+    column: 15
+  fix: ~
+

src/flake8_implicit_str_concat/snapshots/ruff__flake8_implicit_str_concat__tests__ISC002_ISC.py.snap

@@ -0,0 +1,13 @@
+---
+source: src/flake8_implicit_str_concat/mod.rs
+expression: checks
+---
+- kind: MultiLineImplicitStringConcatenation
+  location:
+    row: 5
+    column: 4
+  end_location:
+    row: 6
+    column: 9
+  fix: ~
+

src/flake8_implicit_str_concat/snapshots/ruff__flake8_implicit_str_concat__tests__ISC003_ISC.py.snap

@@ -0,0 +1,37 @@
+---
+source: src/flake8_implicit_str_concat/mod.rs
+expression: checks
+---
+- kind: ExplicitStringConcatenation
+  location:
+    row: 3
+    column: 4
+  end_location:
+    row: 3
+    column: 17
+  fix: ~
+- kind: ExplicitStringConcatenation
+  location:
+    row: 9
+    column: 2
+  end_location:
+    row: 10
+    column: 7
+  fix: ~
+- kind: ExplicitStringConcatenation
+  location:
+    row: 14
+    column: 2
+  end_location:
+    row: 15
+    column: 7
+  fix: ~
+- kind: ExplicitStringConcatenation
+  location:
+    row: 19
+    column: 2
+  end_location:
+    row: 20
+    column: 8
+  fix: ~
+

src/flake8_import_conventions/mod.rs

@@ -29,16 +29,14 @@ mod tests {
         let mut checks = test_path(
             Path::new("./resources/test/fixtures/flake8_import_conventions/custom.py"),
             &Settings {
-                flake8_import_conventions:
-                    flake8_import_conventions::settings::Settings::from_options(
-                        flake8_import_conventions::settings::Options {
-                            aliases: None,
-                            extend_aliases: Some(FxHashMap::from_iter([
-                                ("dask.array".to_string(), "da".to_string()),
-                                ("dask.dataframe".to_string(), "dd".to_string()),
-                            ])),
-                        },
-                    ),
+                flake8_import_conventions: flake8_import_conventions::settings::Options {
+                    aliases: None,
+                    extend_aliases: Some(FxHashMap::from_iter([
+                        ("dask.array".to_string(), "da".to_string()),
+                        ("dask.dataframe".to_string(), "dd".to_string()),
+                    ])),
+                }
+                .into(),
                 ..Settings::for_rule(CheckCode::ICN001)
             },
         )?;
@@ -52,18 +50,16 @@ mod tests {
         let mut checks = test_path(
             Path::new("./resources/test/fixtures/flake8_import_conventions/remove_default.py"),
             &Settings {
-                flake8_import_conventions:
-                    flake8_import_conventions::settings::Settings::from_options(
-                        flake8_import_conventions::settings::Options {
-                            aliases: Some(FxHashMap::from_iter([
-                                ("altair".to_string(), "alt".to_string()),
-                                ("matplotlib.pyplot".to_string(), "plt".to_string()),
-                                ("pandas".to_string(), "pd".to_string()),
-                                ("seaborn".to_string(), "sns".to_string()),
-                            ])),
-                            extend_aliases: None,
-                        },
-                    ),
+                flake8_import_conventions: flake8_import_conventions::settings::Options {
+                    aliases: Some(FxHashMap::from_iter([
+                        ("altair".to_string(), "alt".to_string()),
+                        ("matplotlib.pyplot".to_string(), "plt".to_string()),
+                        ("pandas".to_string(), "pd".to_string()),
+                        ("seaborn".to_string(), "sns".to_string()),
+                    ])),
+                    extend_aliases: None,
+                }
+                .into(),
                 ..Settings::for_rule(CheckCode::ICN001)
             },
         )?;
@@ -77,16 +73,14 @@ mod tests {
         let mut checks = test_path(
             Path::new("./resources/test/fixtures/flake8_import_conventions/override_default.py"),
             &Settings {
-                flake8_import_conventions:
-                    flake8_import_conventions::settings::Settings::from_options(
-                        flake8_import_conventions::settings::Options {
-                            aliases: None,
-                            extend_aliases: Some(FxHashMap::from_iter([(
-                                "numpy".to_string(),
-                                "nmp".to_string(),
-                            )])),
-                        },
-                    ),
+                flake8_import_conventions: flake8_import_conventions::settings::Options {
+                    aliases: None,
+                    extend_aliases: Some(FxHashMap::from_iter([(
+                        "numpy".to_string(),
+                        "nmp".to_string(),
+                    )])),
+                }
+                .into(),
                 ..Settings::for_rule(CheckCode::ICN001)
             },
         )?;

src/flake8_import_conventions/settings.rs

@@ -84,14 +84,6 @@ fn resolve_aliases(options: Options) -> FxHashMap<String, String> {
     aliases
 }
 
-impl Settings {
-    pub fn from_options(options: Options) -> Self {
-        Self {
-            aliases: resolve_aliases(options),
-        }
-    }
-}
-
 impl Default for Settings {
     fn default() -> Self {
         Self {
@@ -99,3 +91,20 @@ impl Default for Settings {
         }
     }
 }
+
+impl From<Options> for Settings {
+    fn from(options: Options) -> Self {
+        Self {
+            aliases: resolve_aliases(options),
+        }
+    }
+}
+
+impl From<Settings> for Options {
+    fn from(settings: Settings) -> Self {
+        Self {
+            aliases: Some(settings.aliases),
+            extend_aliases: None,
+        }
+    }
+}

src/flake8_quotes/settings.rs

@@ -7,10 +7,18 @@ use serde::{Deserialize, Serialize};
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash, JsonSchema)]
 #[serde(deny_unknown_fields, rename_all = "kebab-case")]
 pub enum Quote {
+    /// Use single quotes (`'`).
     Single,
+    /// Use double quotes (`"`).
     Double,
 }
 
+impl Default for Quote {
+    fn default() -> Self {
+        Self::Double
+    }
+}
+
 #[derive(
     Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
 )]
@@ -72,24 +80,35 @@ pub struct Settings {
     pub avoid_escape: bool,
 }
 
-impl Settings {
-    pub fn from_options(options: Options) -> Self {
+impl Default for Settings {
+    fn default() -> Self {
         Self {
-            inline_quotes: options.inline_quotes.unwrap_or(Quote::Double),
-            multiline_quotes: options.multiline_quotes.unwrap_or(Quote::Double),
-            docstring_quotes: options.docstring_quotes.unwrap_or(Quote::Double),
+            inline_quotes: Quote::default(),
+            multiline_quotes: Quote::default(),
+            docstring_quotes: Quote::default(),
+            avoid_escape: true,
+        }
+    }
+}
+
+impl From<Options> for Settings {
+    fn from(options: Options) -> Self {
+        Self {
+            inline_quotes: options.inline_quotes.unwrap_or_default(),
+            multiline_quotes: options.multiline_quotes.unwrap_or_default(),
+            docstring_quotes: options.docstring_quotes.unwrap_or_default(),
             avoid_escape: options.avoid_escape.unwrap_or(true),
         }
     }
 }
 
-impl Default for Settings {
-    fn default() -> Self {
+impl From<Settings> for Options {
+    fn from(settings: Settings) -> Self {
         Self {
-            inline_quotes: Quote::Double,
-            multiline_quotes: Quote::Double,
-            docstring_quotes: Quote::Double,
-            avoid_escape: true,
+            inline_quotes: Some(settings.inline_quotes),
+            multiline_quotes: Some(settings.multiline_quotes),
+            docstring_quotes: Some(settings.docstring_quotes),
+            avoid_escape: Some(settings.avoid_escape),
         }
     }
 }

src/flake8_tidy_imports/checks.rs

@@ -1,9 +1,14 @@
-use rustpython_ast::Stmt;
+use rustc_hash::FxHashMap;
+use rustpython_ast::{Alias, Expr, Located, Stmt};
 
+use super::settings::BannedApi;
+use crate::ast::helpers::match_call_path;
 use crate::ast::types::Range;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 use crate::flake8_tidy_imports::settings::Strictness;
 
+/// TID252
 pub fn banned_relative_import(
     stmt: &Stmt,
     level: Option<&usize>,
@@ -22,3 +27,71 @@ pub fn banned_relative_import(
         None
     }
 }
+
+/// TID251
+pub fn name_is_banned(
+    module: &str,
+    name: &Alias,
+    banned_apis: &FxHashMap<String, BannedApi>,
+) -> Option<Check> {
+    let full_name = format!("{module}.{}", &name.node.name);
+    if let Some(ban) = banned_apis.get(&full_name) {
+        return Some(Check::new(
+            CheckKind::BannedApi {
+                name: full_name,
+                message: ban.msg.to_string(),
+            },
+            Range::from_located(name),
+        ));
+    }
+    None
+}
+
+/// TID251
+pub fn name_or_parent_is_banned<T>(
+    located: &Located<T>,
+    name: &str,
+    banned_apis: &FxHashMap<String, BannedApi>,
+) -> Option<Check> {
+    let mut name = name;
+    loop {
+        if let Some(ban) = banned_apis.get(name) {
+            return Some(Check::new(
+                CheckKind::BannedApi {
+                    name: name.to_string(),
+                    message: ban.msg.to_string(),
+                },
+                Range::from_located(located),
+            ));
+        }
+        match name.rfind('.') {
+            Some(idx) => {
+                name = &name[..idx];
+            }
+            None => return None,
+        }
+    }
+}
+
+/// TID251
+pub fn banned_attribute_access(
+    checker: &mut Checker,
+    call_path: &[&str],
+    expr: &Expr,
+    banned_apis: &FxHashMap<String, BannedApi>,
+) {
+    for (banned_path, ban) in banned_apis {
+        if let Some((module, member)) = banned_path.rsplit_once('.') {
+            if match_call_path(call_path, module, member, &checker.from_imports) {
+                checker.add_check(Check::new(
+                    CheckKind::BannedApi {
+                        name: banned_path.to_string(),
+                        message: ban.msg.to_string(),
+                    },
+                    Range::from_located(expr),
+                ));
+                return;
+            }
+        }
+    }
+}

src/flake8_tidy_imports/mod.rs

@@ -6,9 +6,10 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
+    use rustc_hash::FxHashMap;
 
     use crate::checks::CheckCode;
-    use crate::flake8_tidy_imports::settings::Strictness;
+    use crate::flake8_tidy_imports::settings::{BannedApi, Strictness};
     use crate::linter::test_path;
     use crate::{flake8_tidy_imports, Settings};
 
@@ -19,6 +20,7 @@ mod tests {
             &Settings {
                 flake8_tidy_imports: flake8_tidy_imports::settings::Settings {
                     ban_relative_imports: Strictness::Parents,
+                    ..Default::default()
                 },
                 ..Settings::for_rules(vec![CheckCode::TID252])
             },
@@ -35,6 +37,7 @@ mod tests {
             &Settings {
                 flake8_tidy_imports: flake8_tidy_imports::settings::Settings {
                     ban_relative_imports: Strictness::All,
+                    ..Default::default()
                 },
                 ..Settings::for_rules(vec![CheckCode::TID252])
             },
@@ -43,4 +46,56 @@ mod tests {
         insta::assert_yaml_snapshot!(checks);
         Ok(())
     }
+
+    #[test]
+    fn banned_api_true_positives() -> Result<()> {
+        let mut checks = test_path(
+            Path::new("./resources/test/fixtures/flake8_tidy_imports/TID251.py"),
+            &Settings {
+                flake8_tidy_imports: flake8_tidy_imports::settings::Settings {
+                    banned_api: FxHashMap::from_iter([
+                        (
+                            "cgi".to_string(),
+                            BannedApi {
+                                msg: "The cgi module is deprecated.".to_string(),
+                            },
+                        ),
+                        (
+                            "typing.TypedDict".to_string(),
+                            BannedApi {
+                                msg: "Use typing_extensions.TypedDict instead.".to_string(),
+                            },
+                        ),
+                    ]),
+                    ..Default::default()
+                },
+                ..Settings::for_rules(vec![CheckCode::TID251])
+            },
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
+
+    #[test]
+    fn banned_api_false_positives() -> Result<()> {
+        let mut checks = test_path(
+            Path::new("./resources/test/fixtures/flake8_tidy_imports/TID251_false_positives.py"),
+            &Settings {
+                flake8_tidy_imports: flake8_tidy_imports::settings::Settings {
+                    banned_api: FxHashMap::from_iter([(
+                        "typing.TypedDict".to_string(),
+                        BannedApi {
+                            msg: "Use typing_extensions.TypedDict instead.".to_string(),
+                        },
+                    )]),
+                    ..Default::default()
+                },
+                ..Settings::for_rules(vec![CheckCode::TID251])
+            },
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
 }

src/flake8_tidy_imports/settings.rs

@@ -1,16 +1,29 @@
 //! Settings for the `flake8-tidy-imports` plugin.
 
+use std::hash::{Hash, Hasher};
+
+use itertools::Itertools;
 use ruff_macros::ConfigurationOptions;
+use rustc_hash::FxHashMap;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash, JsonSchema)]
 #[serde(deny_unknown_fields, rename_all = "kebab-case")]
 pub enum Strictness {
+    /// Ban imports that extend into the parent module or beyond.
     Parents,
+    /// Ban all relative imports.
     All,
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash, JsonSchema)]
+#[serde(deny_unknown_fields, rename_all = "kebab-case")]
+pub struct BannedApi {
+    /// The message to display when the API is used.
+    pub msg: String,
+}
+
 #[derive(
     Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
 )]
@@ -29,27 +42,62 @@ pub struct Options {
         "#
     )]
     /// Whether to ban all relative imports (`"all"`), or only those imports
-    /// that extend into the parent module and beyond (`"parents"`).
+    /// that extend into the parent module or beyond (`"parents"`).
     pub ban_relative_imports: Option<Strictness>,
+    #[option(
+        default = r#"{}"#,
+        value_type = "HashMap<String, BannedApi>",
+        example = r#"
+            [tool.ruff.flake8-tidy-imports.banned-api]
+            "cgi".msg = "The cgi module is deprecated, see https://peps.python.org/pep-0594/#cgi."
+            "typing.TypedDict".msg = "Use typing_extensions.TypedDict instead."
+        "#
+    )]
+    /// Specific modules or module members that may not be imported or accessed.
+    /// Note that this check is only meant to flag accidental uses,
+    /// and can be circumvented via `eval` or `importlib`.
+    pub banned_api: FxHashMap<String, BannedApi>,
 }
 
-#[derive(Debug, Hash)]
+#[derive(Debug)]
 pub struct Settings {
     pub ban_relative_imports: Strictness,
-}
-
-impl Settings {
-    pub fn from_options(options: Options) -> Self {
-        Self {
-            ban_relative_imports: options.ban_relative_imports.unwrap_or(Strictness::Parents),
-        }
-    }
+    pub banned_api: FxHashMap<String, BannedApi>,
 }
 
 impl Default for Settings {
     fn default() -> Self {
         Self {
             ban_relative_imports: Strictness::Parents,
+            banned_api: FxHashMap::default(),
+        }
+    }
+}
+
+impl From<Options> for Settings {
+    fn from(options: Options) -> Self {
+        Self {
+            ban_relative_imports: options.ban_relative_imports.unwrap_or(Strictness::Parents),
+            banned_api: options.banned_api,
+        }
+    }
+}
+
+impl From<Settings> for Options {
+    fn from(settings: Settings) -> Self {
+        Self {
+            ban_relative_imports: Some(settings.ban_relative_imports),
+            banned_api: settings.banned_api,
+        }
+    }
+}
+
+impl Hash for Settings {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.ban_relative_imports.hash(state);
+        for key in self.banned_api.keys().sorted() {
+            key.hash(state);
+            self.banned_api[key].hash(state);
         }
     }
 }