Bump version to 0.0.234

Actually, rename TYP rules to TCH (#2176 )
Allow manual releases for pre-release testing
2023-01-25 16:55:57 -05:00 · 2023-01-25 16:52:49 -05:00 · 2023-01-25 16:37:04 -05:00 · 2023-01-25 16:27:18 -05:00 · 2023-01-25 16:26:22 -05:00 · 2023-01-25 15:51:24 -05:00
179 changed files with 4164 additions and 2298 deletions
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,10 +1,6 @@
 name: CI

-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
+on: [push, pull_request, workflow_dispatch]

 concurrency:
  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
@@ -13,6 +9,7 @@ concurrency:
 env:
  CARGO_INCREMENTAL: 0
  CARGO_NET_RETRY: 10
+  CARGO_TERM_COLOR: always
  RUSTUP_MAX_RETRIES: 10

 jobs:
@@ -153,7 +150,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - name: Checkout Actions Repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3

    - name: Check spelling of file.txt
      uses: crate-ci/typos@master
--- a/.github/workflows/flake8-to-ruff.yaml
+++ b/.github/workflows/flake8-to-ruff.yaml
@@ -12,6 +12,7 @@ env:
  PYTHON_VERSION: "3.7" # to build abi3 wheels
  CARGO_INCREMENTAL: 0
  CARGO_NET_RETRY: 10
+  CARGO_TERM_COLOR: always
  RUSTUP_MAX_RETRIES: 10

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

 jobs:
--- a/.github/workflows/ruff.yaml
+++ b/.github/workflows/ruff.yaml
@@ -1,6 +1,7 @@
 name: "[ruff] Release"

 on:
+  workflow_dispatch:
  release:
    types: [published]

@@ -13,6 +14,7 @@ env:
  PYTHON_VERSION: "3.7" # to build abi3 wheels
  CARGO_INCREMENTAL: 0
  CARGO_NET_RETRY: 10
+  CARGO_TERM_COLOR: always
  RUSTUP_MAX_RETRIES: 10

 jobs:
@@ -39,7 +41,7 @@ jobs:
        run: |
          pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
      - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: wheels
          path: dist
@@ -65,7 +67,7 @@ jobs:
        run: |
          pip install dist/${{ env.PACKAGE_NAME }}-*universal2.whl --force-reinstall
      - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: wheels
          path: dist
@@ -97,7 +99,7 @@ jobs:
        run: |
          python -m pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
      - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: wheels
          path: dist
@@ -124,7 +126,7 @@ jobs:
        run: |
          pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
      - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: wheels
          path: dist
@@ -145,7 +147,7 @@ jobs:
          target: ${{ matrix.target }}
          manylinux: auto
          args: --no-default-features --release --out dist
-      - uses: uraimo/run-on-arch-action@v2.0.5
+      - uses: uraimo/run-on-arch-action@v2.5.0
        if: matrix.target != 'ppc64'
        name: Install built wheel
        with:
@@ -159,7 +161,7 @@ jobs:
          run: |
            pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
      - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: wheels
          path: dist
@@ -193,7 +195,7 @@ jobs:
            apk add py3-pip
            pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links /io/dist/ --force-reinstall
      - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: wheels
          path: dist
@@ -229,7 +231,7 @@ jobs:
          run: |
            pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
      - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: wheels
          path: dist
@@ -263,7 +265,7 @@ jobs:
        run: |
          pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
      - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: wheels
          path: dist
@@ -282,7 +284,7 @@ jobs:
      - pypy
    if: "startsWith(github.ref, 'refs/tags/')"
    steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
        with:
          name: wheels
      - uses: actions/setup-python@v4
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,8 +1,10 @@
 repos:
  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.231
+    rev: v0.0.234
    hooks:
      - id: ruff
+        args: [--fix]
+        exclude: ^resources

  - repo: https://github.com/abravalheri/validate-pyproject
    rev: v0.10.1
@@ -13,6 +15,6 @@ repos:
    hooks:
      - id: cargo-fmt
        name: cargo fmt
-        entry: cargo fmt --
+        entry: cargo +nightly fmt --
        language: rust
        types: [rust]
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -46,7 +46,7 @@ For rustfmt and Clippy, we use [nightly Rust][nightly], as it is stricter than s

 ```shell
 cargo +nightly fmt --all     # Auto-formatting...
-cargo +nightly clippy --fix --workspace --all-targets --all-features -- -W clippy::pedantic  # Linting...
+cargo +nightly clippy --fix --workspace --all-targets --all-features  # Linting...
 cargo test --all    # Testing...
 ```

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -719,7 +719,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"

 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.231"
+version = "0.0.234"
 dependencies = [
 "anyhow",
 "clap 4.0.32",
@@ -733,7 +733,7 @@ dependencies = [
 "serde_json",
 "strum",
 "strum_macros",
- "toml_edit",
+ "toml 0.6.0",
 ]

 [[package]]
@@ -984,6 +984,15 @@ dependencies = [
 "windows-sys",
 ]

+[[package]]
+name = "is_executable"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -1633,7 +1642,7 @@ checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
 dependencies = [
 "once_cell",
 "thiserror",
- "toml",
+ "toml 0.5.11",
 ]

 [[package]]
@@ -1828,7 +1837,7 @@ dependencies = [

 [[package]]
 name = "ruff"
-version = "0.0.231"
+version = "0.0.234"
 dependencies = [
 "anyhow",
 "bitflags",
@@ -1847,6 +1856,7 @@ dependencies = [
 "ignore",
 "imperative",
 "insta",
+ "is_executable",
 "itertools",
 "js-sys",
 "libcst",
@@ -1875,14 +1885,14 @@ dependencies = [
 "textwrap",
 "thiserror",
 "titlecase",
- "toml_edit",
+ "toml 0.6.0",
 "wasm-bindgen",
 "wasm-bindgen-test",
 ]

 [[package]]
 name = "ruff_cli"
-version = "0.0.231"
+version = "0.0.234"
 dependencies = [
 "annotate-snippets 0.9.1",
 "anyhow",
@@ -1919,7 +1929,7 @@ dependencies = [

 [[package]]
 name = "ruff_dev"
-version = "0.0.231"
+version = "0.0.234"
 dependencies = [
 "anyhow",
 "clap 4.0.32",
@@ -1940,7 +1950,7 @@ dependencies = [

 [[package]]
 name = "ruff_macros"
-version = "0.0.231"
+version = "0.0.234"
 dependencies = [
 "once_cell",
 "proc-macro2",
@@ -2200,6 +2210,15 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "serde_spanned"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c68e921cef53841b8925c2abadd27c9b891d9613bdc43d6b823062866df38e8"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "shellexpand"
 version = "3.0.0"
@@ -2480,32 +2499,44 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.5.10"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
 "serde",
 ]

 [[package]]
-name = "toml_datetime"
-version = "0.5.0"
+name = "toml"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808b51e57d0ef8f71115d8f3a01e7d3750d01c79cac4b3eda910f4389fdf92fd"
+checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
 dependencies = [
 "serde",
 ]

 [[package]]
 name = "toml_edit"
-version = "0.17.1"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34cc558345efd7e88b9eda9626df2138b80bb46a7606f695e751c892bc7dac6"
+checksum = "729bfd096e40da9c001f778f5cdecbd2957929a24e10e5883d9392220a751581"
 dependencies = [
 "indexmap",
- "itertools",
 "nom8",
 "serde",
+ "serde_spanned",
 "toml_datetime",
 ]

--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ default-members = [".", "ruff_cli"]

 [package]
 name = "ruff"
-version = "0.0.231"
+version = "0.0.234"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 edition = "2021"
 rust-version = "1.65.0"
@@ -46,7 +46,7 @@ num-traits = "0.2.15"
 once_cell = { version = "1.16.0" }
 path-absolutize = { version = "3.0.14", features = ["once_cell_cache", "use_unix_paths_on_wasm"] }
 regex = { version = "1.6.0" }
-ruff_macros = { version = "0.0.231", path = "ruff_macros" }
+ruff_macros = { version = "0.0.234", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
 rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
 rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
@@ -61,7 +61,7 @@ strum_macros = { version = "0.24.3" }
 textwrap = { version = "0.16.0" }
 thiserror = { version = "1.0" }
 titlecase = { version = "2.2.1" }
-toml_edit = { version = "0.17.1", features = ["easy"] }
+toml = { version = "0.6.0" }

 # https://docs.rs/getrandom/0.2.7/getrandom/#webassembly-support
 # For (future) wasm-pack support
@@ -73,6 +73,9 @@ serde-wasm-bindgen = { version = "0.4" }
 js-sys = { version = "0.3.60" }
 wasm-bindgen = { version = "0.2.83" }

+[target.'cfg(not(target_family = "wasm"))'.dependencies]
+is_executable = "1.0.1"
+
 [dev-dependencies]
 insta = { version = "1.19.1", features = ["yaml"] }
 test-case = { version = "2.2.2" }
--- a/README.md
+++ b/README.md
@@ -51,19 +51,23 @@ Ruff is extremely actively developed and used in major open-source projects like
 - [Apache Airflow](https://github.com/apache/airflow)
 - [Bokeh](https://github.com/bokeh/bokeh)
 - [Zulip](https://github.com/zulip/zulip)
- [Dagster](https://github.com/dagster-io/dagster)
 - [Pydantic](https://github.com/pydantic/pydantic)
+- [Dagster](https://github.com/dagster-io/dagster)
+- [Dagger](https://github.com/dagger/dagger)
 - [Sphinx](https://github.com/sphinx-doc/sphinx)
 - [Hatch](https://github.com/pypa/hatch)
 - [Jupyter](https://github.com/jupyter-server/jupyter_server)
- [Synapse (Matrix)](https://github.com/matrix-org/synapse)
- [Saleor](https://github.com/saleor/saleor)
+- [Great Expectations](https://github.com/great-expectations/great_expectations)
 - [Polars](https://github.com/pola-rs/polars)
 - [Ibis](https://github.com/ibis-project/ibis)
- [OpenBB](https://github.com/OpenBB-finance/OpenBBTerminal)
- [Cryptography (PyCA)](https://github.com/pyca/cryptography)
+- [Synapse (Matrix)](https://github.com/matrix-org/synapse)
 - [SnowCLI (Snowflake)](https://github.com/Snowflake-Labs/snowcli)
- [cibuildwheel](https://github.com/pypa/cibuildwheel)
+- [Saleor](https://github.com/saleor/saleor)
+- [OpenBB](https://github.com/OpenBB-finance/OpenBBTerminal)
+- [Home Assistant](https://github.com/home-assistant/core)
+- [Cryptography (PyCA)](https://github.com/pyca/cryptography)
+- [cibuildwheel (PyPA)](https://github.com/pypa/cibuildwheel)
+- [Babel](https://github.com/python-babel/babel)

 Read the [launch blog post](https://notes.crmarsh.com/python-tooling-could-be-much-much-faster).

@@ -140,7 +144,7 @@ developer of [Zulip](https://github.com/zulip/zulip):
   1. [flake8-commas (COM)](#flake8-commas-com)
   1. [flake8-no-pep420 (INP)](#flake8-no-pep420-inp)
   1. [flake8-executable (EXE)](#flake8-executable-exe)
-   1. [flake8-type-checking (TYP)](#flake8-type-checking-typ)
+   1. [flake8-type-checking (TCH)](#flake8-type-checking-tch)
   1. [tryceratops (TRY)](#tryceratops-try)
   1. [flake8-use-pathlib (PTH)](#flake8-use-pathlib-pth)
   1. [Ruff-specific rules (RUF)](#ruff-specific-rules-ruf)<!-- End auto-generated table of contents. -->
@@ -180,6 +184,12 @@ For **Arch Linux** users, Ruff is also available as [`ruff`](https://archlinux.o
 pacman -S ruff
 ```

+For **Alpine** users, Ruff is also available as [`ruff`](https://pkgs.alpinelinux.org/package/edge/testing/x86_64/ruff) on the testing repositories:
+
+```shell
+apk add ruff
+```
+
 [![Packaging status](https://repology.org/badge/vertical-allrepos/ruff-python-linter.svg?exclude_unsupported=1)](https://repology.org/project/ruff-python-linter/versions)

 ### Usage
@@ -203,7 +213,7 @@ Ruff also works with [pre-commit](https://pre-commit.com):
 ```yaml
 - repo: https://github.com/charliermarsh/ruff-pre-commit
  # Ruff version.
-  rev: 'v0.0.231'
+  rev: 'v0.0.234'
  hooks:
    - id: ruff
 ```
@@ -668,8 +678,8 @@ For more, see [pydocstyle](https://pypi.org/project/pydocstyle/) on PyPI.
 | D209 | new-line-after-last-paragraph | Multi-line docstring closing quotes should be on a separate line | 🛠 |
 | D210 | no-surrounding-whitespace | No whitespaces allowed surrounding docstring text | 🛠 |
 | D211 | no-blank-line-before-class | No blank lines allowed before class docstring | 🛠 |
-| D212 | multi-line-summary-first-line | Multi-line docstring summary should start at the first line |  |
-| D213 | multi-line-summary-second-line | Multi-line docstring summary should start at the second line |  |
+| D212 | multi-line-summary-first-line | Multi-line docstring summary should start at the first line | 🛠 |
+| D213 | multi-line-summary-second-line | Multi-line docstring summary should start at the second line | 🛠 |
 | D214 | section-not-over-indented | Section is over-indented ("{name}") | 🛠 |
 | D215 | section-underline-not-over-indented | Section underline is over-indented ("{name}") | 🛠 |
 | D300 | uses-triple-quotes | Use """triple double quotes""" |  |
@@ -844,7 +854,7 @@ For more, see [flake8-bugbear](https://pypi.org/project/flake8-bugbear/) on PyPI
 | B004 | unreliable-callable-check |  Using `hasattr(x, '__call__')` to test if x is callable is unreliable. Use `callable(x)` for consistent results. |  |
 | B005 | strip-with-multi-characters | Using `.strip()` with multi-character strings is misleading the reader |  |
 | B006 | mutable-argument-default | Do not use mutable data structures for argument defaults |  |
-| B007 | unused-loop-control-variable | Loop control variable `{name}` not used within the loop body | 🛠 |
+| B007 | unused-loop-control-variable | Loop control variable `{name}` not used within loop body |  |
 | B008 | function-call-argument-default | Do not perform function call `{name}` in argument defaults |  |
 | B009 | get-attr-with-constant | Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. | 🛠 |
 | B010 | set-attr-with-constant | Do not call `setattr` with a constant attribute value. It is not any safer than normal property access. | 🛠 |
@@ -1181,17 +1191,23 @@ For more, see [flake8-executable](https://pypi.org/project/flake8-executable/) o

 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
+| EXE001 | shebang-not-executable | Shebang is present but file is not executable |  |
+| EXE002 | shebang-missing-executable-file | The file is executable but no shebang is present |  |
 | EXE003 | shebang-python | Shebang should contain "python" |  |
 | EXE004 | shebang-whitespace | Avoid whitespace before shebang | 🛠 |
 | EXE005 | shebang-newline | Shebang should be at the beginning of the file |  |

-### flake8-type-checking (TYP)
+### flake8-type-checking (TCH)

 For more, see [flake8-type-checking](https://pypi.org/project/flake8-type-checking/) on PyPI.

 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
-| TYP005 | empty-type-checking-block | Found empty type-checking block |  |
+| TCH001 | typing-only-first-party-import | Move application import `{}` into a type-checking block |  |
+| TCH002 | typing-only-third-party-import | Move third-party import `{}` into a type-checking block |  |
+| TCH003 | typing-only-standard-library-import | Move standard library import `{}` into a type-checking block |  |
+| TCH004 | runtime-import-in-type-checking-block | Move import `{}` out of type-checking block. Import is used for more than type hinting. |  |
+| TCH005 | empty-type-checking-block | Found empty type-checking block |  |

 ### tryceratops (TRY)

@@ -1200,8 +1216,10 @@ For more, see [tryceratops](https://pypi.org/project/tryceratops/1.1.0/) on PyPI
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
 | TRY004 | prefer-type-error | Prefer `TypeError` exception for invalid type | 🛠 |
+| TRY200 | reraise-no-cause | Use `raise from` to specify exception cause |  |
 | TRY201 | verbose-raise | Use `raise` without specifying exception name |  |
 | TRY300 | try-consider-else | Consider `else` block |  |
+| TRY301 | raise-within-try | Abstract `raise` to an inner function |  |

 ### flake8-use-pathlib (PTH)

@@ -1679,7 +1697,7 @@ After installing `ruff` and `nbqa`, you can run Ruff over a notebook like so:
 Untitled.ipynb:cell_1:2:5: F841 Local variable `x` is assigned to but never used
 Untitled.ipynb:cell_2:1:1: E402 Module level import not at top of file
 Untitled.ipynb:cell_2:1:8: F401 `os` imported but unused
-Found 3 error(s).
+Found 3 errors.
 1 potentially fixable with the --fix option.
 ```

@@ -1715,6 +1733,25 @@ matter how they're provided, which avoids accidental incompatibilities and simpl

 Run `ruff /path/to/code.py --show-settings` to view the resolved settings for a given file.

+### Ruff tried to fix something, but it broke my code. What should I do?
+
+Ruff's autofix is a best-effort mechanism. Given the dynamic nature of Python, it's difficult to
+have _complete_ certainty when making changes to code, even for the seemingly trivial fixes.
+
+In the future, Ruff will support enabling autofix behavior based on the safety of the patch.
+
+In the meantime, if you find that the autofix is too aggressive, you can disable it on a per-rule or
+per-category basis using the [`unfixable`](#unfixable) mechanic. For example, to disable autofix
+for some possibly-unsafe rules, you could add the following to your `pyproject.toml`:
+
+```toml
+[tool.ruff]
+unfixable = ["B", "SIM", "TRY", "RUF"]
+```
+
+If you find a case where Ruff's autofix breaks your code, please file an Issue!
+
+
 ## Contributing

 Contributions are welcome and hugely appreciated. To get started, check out the
@@ -2664,6 +2701,25 @@ extend-immutable-calls = ["fastapi.Depends", "fastapi.Query"]

 ---

+### `flake8-builtins`
+
+#### [`builtins-ignorelist`](#builtins-ignorelist)
+
+Ignore list of builtins.
+
+**Default value**: `[]`
+
+**Type**: `Vec<String>`
+
+**Example usage**:
+
+```toml
+[tool.ruff.flake8-builtins]
+builtins-ignorelist = ["id"]
+```
+
+---
+
 ### `flake8-errmsg`

 #### [`max-string-length`](#max-string-length)
@@ -2683,6 +2739,28 @@ max-string-length = 20

 ---

+### `flake8-implicit-str-concat`
+
+#### [`allow-multiline`](#allow-multiline)
+
+Whether to allow implicit string concatenations for multiline strings.
+By default, implicit concatenations of multiline strings are
+allowed (but continuation lines, delimited with a backslash, are
+prohibited).
+
+**Default value**: `true`
+
+**Type**: `bool`
+
+**Example usage**:
+
+```toml
+[tool.ruff.flake8-implicit-str-concat]
+allow-multiline = false
+```
+
+---
+
 ### `flake8-import-conventions`

 #### [`aliases`](#aliases)
--- a/flake8_to_ruff/Cargo.lock
+++ b/flake8_to_ruff/Cargo.lock
@@ -771,7 +771,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"

 [[package]]
 name = "flake8_to_ruff"
-version = "0.0.231"
+version = "0.0.234"
 dependencies = [
 "anyhow",
 "clap",
@@ -1975,7 +1975,7 @@ dependencies = [

 [[package]]
 name = "ruff"
-version = "0.0.231"
+version = "0.0.234"
 dependencies = [
 "anyhow",
 "bincode",
--- a/flake8_to_ruff/Cargo.toml
+++ b/flake8_to_ruff/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.231"
+version = "0.0.234"
 edition = "2021"

 [dependencies]
@@ -16,7 +16,7 @@ serde = { version = "1.0.147", features = ["derive"] }
 serde_json = { version = "1.0.87" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
-toml_edit = { version = "0.17.1", features = ["easy"] }
+toml = { version = "0.6.0" }

 [dev-dependencies]

--- a/flake8_to_ruff/src/main.rs
+++ b/flake8_to_ruff/src/main.rs
@@ -1,4 +1,6 @@
 //! Utility to generate Ruff's `pyproject.toml` section from a Flake8 INI file.
+#![forbid(unsafe_code)]
+#![warn(clippy::pedantic)]
 #![allow(
    clippy::collapsible_else_if,
    clippy::collapsible_if,
@@ -11,7 +13,6 @@
    clippy::similar_names,
    clippy::too_many_lines
 )]
-#![forbid(unsafe_code)]

 use std::path::PathBuf;

@@ -60,7 +61,7 @@ fn main() -> Result<()> {

    // Create Ruff's pyproject.toml section.
    let pyproject = flake8_to_ruff::convert(&config, &external_config, cli.plugin)?;
-    println!("{}", toml_edit::easy::to_string_pretty(&pyproject)?);
+    println!("{}", toml::to_string_pretty(&pyproject)?);

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

 [project]
 name = "ruff"
-version = "0.0.231"
+version = "0.0.234"
 description = "An extremely fast Python linter, written in Rust."
 authors = [
  { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" },
--- a/resources/test/fixtures/flake8_bugbear/B007.py
+++ b/resources/test/fixtures/flake8_bugbear/B007.py
@@ -29,3 +29,19 @@ def strange_generator():

 for i, (j, (k, l)) in strange_generator():  # i, k not used
    print(j, l)
+
+FMT = "{foo} {bar}"
+for foo, bar in [(1, 2)]:
+    if foo:
+        print(FMT.format(**locals()))
+
+for foo, bar in [(1, 2)]:
+    if foo:
+        print(FMT.format(**globals()))
+
+for foo, bar in [(1, 2)]:
+    if foo:
+        print(FMT.format(**vars()))
+
+for foo, bar in [(1, 2)]:
+    print(FMT.format(foo=foo, bar=eval('bar')))
--- a/resources/test/fixtures/flake8_executable/EXE001_1.py
+++ b/resources/test/fixtures/flake8_executable/EXE001_1.py
@@ -0,0 +1,4 @@
+#!/usr/bin/python
+
+if __name__ == '__main__':
+    print('I should be executable.')
--- a/resources/test/fixtures/flake8_executable/EXE001_2.py
+++ b/resources/test/fixtures/flake8_executable/EXE001_2.py
@@ -0,0 +1,2 @@
+if __name__ == '__main__':
+    print('I should be executable.')
--- a/resources/test/fixtures/flake8_executable/EXE001_3.py
+++ b/resources/test/fixtures/flake8_executable/EXE001_3.py
@@ -0,0 +1,4 @@
+#!/usr/bin/python
+
+if __name__ == '__main__':
+    print('I should be executable.')
--- a/resources/test/fixtures/flake8_executable/EXE002_1.py
+++ b/resources/test/fixtures/flake8_executable/EXE002_1.py
@@ -0,0 +1,2 @@
+if __name__ == '__main__':
+    print('I should be executable.')
--- a/resources/test/fixtures/flake8_executable/EXE002_2.py
+++ b/resources/test/fixtures/flake8_executable/EXE002_2.py
@@ -0,0 +1,2 @@
+if __name__ == '__main__':
+    print('I should be executable.')
--- a/resources/test/fixtures/flake8_executable/EXE002_3.py
+++ b/resources/test/fixtures/flake8_executable/EXE002_3.py
@@ -0,0 +1,4 @@
+#!/usr/bin/python
+
+if __name__ == '__main__':
+    print('I should be executable.')
--- a/resources/test/fixtures/flake8_executable/EXE003.py
+++ b/resources/test/fixtures/flake8_executable/EXE003.py
--- a/resources/test/fixtures/flake8_executable/EXE004_1.py
+++ b/resources/test/fixtures/flake8_executable/EXE004_1.py
--- a/resources/test/fixtures/flake8_executable/EXE004_3.py
+++ b/resources/test/fixtures/flake8_executable/EXE004_3.py
--- a/resources/test/fixtures/flake8_executable/EXE005_1.py
+++ b/resources/test/fixtures/flake8_executable/EXE005_1.py
--- a/resources/test/fixtures/flake8_executable/EXE005_2.py
+++ b/resources/test/fixtures/flake8_executable/EXE005_2.py
--- a/resources/test/fixtures/flake8_executable/EXE005_3.py
+++ b/resources/test/fixtures/flake8_executable/EXE005_3.py
--- a/resources/test/fixtures/flake8_return/RET503.py
+++ b/resources/test/fixtures/flake8_return/RET503.py
@@ -114,3 +114,12 @@ def bar3(x, y, z):
        else:
            return z
        return None
+
+
+def prompts(self, foo):
+    if not foo:
+        return []
+
+    for x in foo:
+        yield x
+        yield x + 1
--- a/resources/test/fixtures/flake8_type_checking/TCH001.py
+++ b/resources/test/fixtures/flake8_type_checking/TCH001.py
@@ -0,0 +1,28 @@
+"""Tests to determine first-party import classification.
+
+For typing-only import detection tests, see `TCH002.py`.
+"""
+
+
+def f():
+    import TYP001
+
+    x: TYP001
+
+
+def f():
+    import TYP001
+
+    print(TYP001)
+
+
+def f():
+    from . import TYP001
+
+    x: TYP001
+
+
+def f():
+    from . import TYP001
+
+    print(TYP001)
--- a/resources/test/fixtures/flake8_type_checking/TCH002.py
+++ b/resources/test/fixtures/flake8_type_checking/TCH002.py
@@ -0,0 +1,148 @@
+"""Tests to determine accurate detection of typing-only imports."""
+
+
+def f():
+    import pandas as pd  # TCH002
+
+    x: pd.DataFrame
+
+
+def f():
+    from pandas import DataFrame  # TCH002
+
+    x: DataFrame
+
+
+def f():
+    from pandas import DataFrame as df  # TCH002
+
+    x: df
+
+
+def f():
+    import pandas as pd  # TCH002
+
+    x: pd.DataFrame = 1
+
+
+def f():
+    from pandas import DataFrame  # TCH002
+
+    x: DataFrame = 2
+
+
+def f():
+    from pandas import DataFrame as df  # TCH002
+
+    x: df = 3
+
+
+def f():
+    import pandas as pd  # TCH002
+
+    x: "pd.DataFrame" = 1
+
+
+def f():
+    import pandas as pd
+
+    x = dict["pd.DataFrame", "pd.DataFrame"]  # TCH002
+
+
+def f():
+    import pandas as pd
+
+    print(pd)
+
+
+def f():
+    from pandas import DataFrame
+
+    print(DataFrame)
+
+
+def f():
+    from pandas import DataFrame
+
+    def f():
+        print(DataFrame)
+
+
+def f():
+    from typing import Dict, Any
+
+    def example() -> Any:
+        return 1
+
+    x: Dict[int] = 20
+
+
+def f():
+    from typing import TYPE_CHECKING
+
+    if TYPE_CHECKING:
+        from typing import Dict
+    x: Dict[int] = 20
+
+
+def f():
+    from pathlib import Path
+
+    class ImportVisitor(ast.NodeTransformer):
+        def __init__(self, cwd: Path) -> None:
+            self.cwd = cwd
+            origin = Path(spec.origin)
+
+    class ExampleClass:
+        def __init__(self):
+            self.cwd = Path(pandas.getcwd())
+
+
+def f():
+    import pandas
+
+    class Migration:
+        enum = pandas
+
+
+def f():
+    import pandas
+
+    class Migration:
+        enum = pandas.EnumClass
+
+
+def f():
+    from typing import TYPE_CHECKING
+
+    from pandas import y
+
+    if TYPE_CHECKING:
+        _type = x
+    else:
+        _type = y
+
+
+def f():
+    from typing import TYPE_CHECKING
+
+    from pandas import y
+
+    if TYPE_CHECKING:
+        _type = x
+    elif True:
+        _type = y
+
+
+def f():
+    from typing import cast
+
+    import pandas as pd
+
+    x = cast(pd.DataFrame, 2)
+
+
+def f():
+    import pandas as pd
+
+    x = dict[pd.DataFrame, pd.DataFrame]
--- a/resources/test/fixtures/flake8_type_checking/TCH003.py
+++ b/resources/test/fixtures/flake8_type_checking/TCH003.py
@@ -0,0 +1,16 @@
+"""Tests to determine standard library import classification.
+
+For typing-only import detection tests, see `TCH002.py`.
+"""
+
+
+def f():
+    import os
+
+    x: os
+
+
+def f():
+    import os
+
+    print(os)
--- a/resources/test/fixtures/flake8_type_checking/TCH004_1.py
+++ b/resources/test/fixtures/flake8_type_checking/TCH004_1.py
@@ -0,0 +1,5 @@
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from datetime import datetime
+x = datetime
--- a/resources/test/fixtures/flake8_type_checking/TCH004_2.py
+++ b/resources/test/fixtures/flake8_type_checking/TCH004_2.py
@@ -0,0 +1,8 @@
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from datetime import date
+
+
+def example():
+    return date()
--- a/resources/test/fixtures/flake8_type_checking/TCH004_3.py
+++ b/resources/test/fixtures/flake8_type_checking/TCH004_3.py
@@ -0,0 +1,6 @@
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from typing import Any
+
+    CustomType = Any
--- a/resources/test/fixtures/flake8_type_checking/TCH004_4.py
+++ b/resources/test/fixtures/flake8_type_checking/TCH004_4.py
@@ -0,0 +1,11 @@
+from typing import TYPE_CHECKING, Type
+
+if TYPE_CHECKING:
+    from typing import Any
+
+
+def example(*args: Any, **kwargs: Any):
+    return
+
+
+my_type: Type[Any] | Any
--- a/resources/test/fixtures/flake8_type_checking/TCH004_5.py
+++ b/resources/test/fixtures/flake8_type_checking/TCH004_5.py
@@ -0,0 +1,8 @@
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from typing import List, Sequence, Set
+
+
+def example(a: List[int], /, b: Sequence[int], *, c: Set[int]):
+    return
--- a/resources/test/fixtures/flake8_type_checking/TCH004_6.py
+++ b/resources/test/fixtures/flake8_type_checking/TCH004_6.py
@@ -0,0 +1,10 @@
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from pandas import DataFrame
+
+
+def example():
+    from pandas import DataFrame
+
+    x = DataFrame
--- a/resources/test/fixtures/flake8_type_checking/TCH004_7.py
+++ b/resources/test/fixtures/flake8_type_checking/TCH004_7.py
@@ -0,0 +1,10 @@
+from __future__ import annotations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from typing import AsyncIterator, List
+
+
+class Example:
+    async def example(self) -> AsyncIterator[List[str]]:
+        yield 0
--- a/resources/test/fixtures/flake8_type_checking/TCH004_8.py
+++ b/resources/test/fixtures/flake8_type_checking/TCH004_8.py
@@ -0,0 +1,7 @@
+from typing import TYPE_CHECKING
+from weakref import WeakKeyDictionary
+
+if TYPE_CHECKING:
+    from typing import Any
+
+d = WeakKeyDictionary["Any", "Any"]()
--- a/resources/test/fixtures/flake8_type_checking/TCH005.py
+++ b/resources/test/fixtures/flake8_type_checking/TCH005.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING, List

 if TYPE_CHECKING:
-    pass  # TYP005
+    pass  # TCH005


 def example():
--- a/resources/test/fixtures/flake8_use_pathlib/use_pathlib.py
+++ b/resources/test/fixtures/flake8_use_pathlib/use_pathlib.py
@@ -0,0 +1,3 @@
+from pathlib import Path
+
+(Path("") / "").open()
--- a/resources/test/fixtures/pyupgrade/UP032.py
+++ b/resources/test/fixtures/pyupgrade/UP032.py
@@ -44,6 +44,8 @@ print("foo {} ".format(x))

 "{}".format(a)

+'({}={{0!e}})'.format(a)
+
 ###
 # Non-errors
 ###
--- a/resources/test/fixtures/tryceratops/TRY004.py
+++ b/resources/test/fixtures/tryceratops/TRY004.py
@@ -94,7 +94,7 @@ def incorrect_MemoryError(some_arg):
        # not multiline is on purpose for fix
        raise MemoryError(
            "..."
-        )  
+        )


 def incorrect_NameError(some_arg):
@@ -294,3 +294,39 @@ def multiple_ifs(some_args):
                raise ValueError("...")  # this is ok if we don't simplify
            else:
                pass
+
+
+def early_return():
+    if isinstance(this, some_type):
+        if x in this:
+            return
+
+        raise ValueError(f"{this} has a problem")  # this is ok
+
+
+def early_break():
+    for x in this:
+        if isinstance(this, some_type):
+            if x in this:
+                break
+
+            raise ValueError(f"{this} has a problem")  # this is ok
+
+
+def early_continue():
+    for x in this:
+        if isinstance(this, some_type):
+            if x in this:
+                continue
+
+            raise ValueError(f"{this} has a problem")  # this is ok
+
+
+def early_return_else():
+    if isinstance(this, some_type):
+        pass
+    else:
+        if x in this:
+            return
+
+        raise ValueError(f"{this} has a problem")  # this is ok
--- a/resources/test/fixtures/tryceratops/TRY200.py
+++ b/resources/test/fixtures/tryceratops/TRY200.py
@@ -0,0 +1,32 @@
+"""
+Violation:
+Reraise without using 'from'
+"""
+
+
+class MyException(Exception):
+    pass
+
+
+def func():
+    try:
+        a = 1
+    except Exception:
+        raise MyException()
+
+
+def func():
+    try:
+        a = 1
+    except Exception:
+        if True:
+            raise MyException()
+
+
+def good():
+    try:
+        a = 1
+    except MyException as e:
+        raise e  # This is verbose violation, shouldn't trigger no cause
+    except Exception:
+        raise  # Just re-raising don't need 'from'
--- a/resources/test/fixtures/tryceratops/TRY301.py
+++ b/resources/test/fixtures/tryceratops/TRY301.py
@@ -0,0 +1,29 @@
+class MyException(Exception):
+    pass
+
+
+def bad():
+    try:
+        a = process()
+        if not a:
+            raise MyException(a)
+
+        raise MyException(a)
+
+        try:
+            b = process()
+            if not b:
+                raise MyException(b)
+        except Exception:
+            logger.exception("something failed")
+    except Exception:
+        logger.exception("something failed")
+
+
+def good():
+    try:
+        a = process()  # This throws the exception now
+    except MyException:
+        logger.exception("a failed")
+    except Exception:
+        logger.exception("something failed")
--- a/resources/test/project/README.md
+++ b/resources/test/project/README.md
@@ -16,7 +16,7 @@ resources/test/project/examples/docs/docs/file.py:1:1: I001 Import block is un-s
 resources/test/project/examples/docs/docs/file.py:8:5: F841 Local variable `x` is assigned to but never used
 resources/test/project/project/file.py:1:8: F401 `os` imported but unused
 resources/test/project/project/import_file.py:1:1: I001 Import block is un-sorted or un-formatted
-Found 7 error(s).
+Found 7 errors.
 7 potentially fixable with the --fix option.
 ```

@@ -31,7 +31,7 @@ examples/docs/docs/file.py:1:1: I001 Import block is un-sorted or un-formatted
 examples/docs/docs/file.py:8:5: F841 Local variable `x` is assigned to but never used
 project/file.py:1:8: F401 `os` imported but unused
 project/import_file.py:1:1: I001 Import block is un-sorted or un-formatted
-Found 7 error(s).
+Found 7 errors.
 7 potentially fixable with the --fix option.
 ```

@@ -42,7 +42,7 @@ files:
 ∴ (cd resources/test/project/examples/docs && cargo run .)
 docs/file.py:1:1: I001 Import block is un-sorted or un-formatted
 docs/file.py:8:5: F841 Local variable `x` is assigned to but never used
-Found 2 error(s).
+Found 2 errors.
 2 potentially fixable with the --fix option.
 ```

@@ -60,7 +60,7 @@ resources/test/project/examples/docs/docs/file.py:3:8: F401 `numpy` imported but
 resources/test/project/examples/docs/docs/file.py:4:27: F401 `docs.concepts.file` imported but unused
 resources/test/project/examples/excluded/script.py:1:8: F401 `os` imported but unused
 resources/test/project/project/file.py:1:8: F401 `os` imported but unused
-Found 9 error(s).
+Found 9 errors.
 9 potentially fixable with the --fix option.
 ```

@@ -73,7 +73,7 @@ docs/docs/concepts/file.py:5:5: F841 Local variable `x` is assigned to but never
 docs/docs/file.py:1:1: I001 Import block is un-sorted or un-formatted
 docs/docs/file.py:8:5: F841 Local variable `x` is assigned to but never used
 excluded/script.py:5:5: F841 Local variable `x` is assigned to but never used
-Found 4 error(s).
+Found 4 errors.
 4 potentially fixable with the --fix option.
 ```

@@ -82,7 +82,7 @@ Passing an excluded directory directly should report errors in the contained fil
 ```
 ∴ cargo run resources/test/project/examples/excluded/
 resources/test/project/examples/excluded/script.py:1:8: F401 `os` imported but unused
-Found 1 error(s).
+Found 1 error.
 1 potentially fixable with the --fix option.
 ```

--- a/ruff.schema.json
+++ b/ruff.schema.json
@@ -175,6 +175,17 @@
        }
      ]
    },
+    "flake8-implicit-str-concat": {
+      "description": "Options for the `flake8-implicit-str-concat` plugin.",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Flake8ImplicitStrConcatOptions"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
    "flake8-import-conventions": {
      "description": "Options for the `flake8-import-conventions` plugin.",
      "anyOf": [
@@ -626,6 +637,19 @@
      },
      "additionalProperties": false
    },
+    "Flake8ImplicitStrConcatOptions": {
+      "type": "object",
+      "properties": {
+        "allow-multiline": {
+          "description": "Whether to allow implicit string concatenations for multiline strings. By default, implicit concatenations of multiline strings are allowed (but continuation lines, delimited with a backslash, are prohibited).",
+          "type": [
+            "boolean",
+            "null"
+          ]
+        }
+      },
+      "additionalProperties": false
+    },
    "Flake8ImportConventionsOptions": {
      "type": "object",
      "properties": {
@@ -1114,10 +1138,6 @@
    "PythonVersion": {
      "type": "string",
      "enum": [
-        "py33",
-        "py34",
-        "py35",
-        "py36",
        "py37",
        "py38",
        "py39",
@@ -1164,13 +1184,13 @@
    "RuleSelector": {
      "type": "string",
      "enum": [
+        "ALL",
        "A",
        "A0",
        "A00",
        "A001",
        "A002",
        "A003",
-        "ALL",
        "ANN",
        "ANN0",
        "ANN00",
@@ -1381,6 +1401,8 @@
        "EXE",
        "EXE0",
        "EXE00",
+        "EXE001",
+        "EXE002",
        "EXE003",
        "EXE004",
        "EXE005",
@@ -1458,15 +1480,6 @@
        "I00",
        "I001",
        "I002",
-        "I2",
-        "I25",
-        "I252",
-        "IC",
-        "IC0",
-        "IC001",
-        "IC002",
-        "IC003",
-        "IC004",
        "ICN",
        "ICN0",
        "ICN00",
@@ -1481,9 +1494,6 @@
        "ISC001",
        "ISC002",
        "ISC003",
-        "M",
-        "M0",
-        "M001",
        "N",
        "N8",
        "N80",
@@ -1521,23 +1531,6 @@
        "PD9",
        "PD90",
        "PD901",
-        "PDV",
-        "PDV0",
-        "PDV002",
-        "PDV003",
-        "PDV004",
-        "PDV007",
-        "PDV008",
-        "PDV009",
-        "PDV01",
-        "PDV010",
-        "PDV011",
-        "PDV012",
-        "PDV013",
-        "PDV015",
-        "PDV9",
-        "PDV90",
-        "PDV901",
        "PGH",
        "PGH0",
        "PGH00",
@@ -1672,17 +1665,6 @@
        "Q001",
        "Q002",
        "Q003",
-        "R",
-        "R5",
-        "R50",
-        "R501",
-        "R502",
-        "R503",
-        "R504",
-        "R505",
-        "R506",
-        "R507",
-        "R508",
        "RET",
        "RET5",
        "RET50",
@@ -1778,6 +1760,14 @@
        "T20",
        "T201",
        "T203",
+        "TCH",
+        "TCH0",
+        "TCH00",
+        "TCH001",
+        "TCH002",
+        "TCH003",
+        "TCH004",
+        "TCH005",
        "TID",
        "TID2",
        "TID25",
@@ -1789,35 +1779,12 @@
        "TRY004",
        "TRY2",
        "TRY20",
+        "TRY200",
        "TRY201",
        "TRY3",
        "TRY30",
        "TRY300",
-        "TYP",
-        "TYP0",
-        "TYP00",
-        "TYP005",
-        "U",
-        "U0",
-        "U00",
-        "U001",
-        "U003",
-        "U004",
-        "U005",
-        "U006",
-        "U007",
-        "U008",
-        "U009",
-        "U01",
-        "U010",
-        "U011",
-        "U012",
-        "U013",
-        "U014",
-        "U015",
-        "U016",
-        "U017",
-        "U019",
+        "TRY301",
        "UP",
        "UP0",
        "UP00",
--- a/ruff_cli/Cargo.toml
+++ b/ruff_cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_cli"
-version = "0.0.231"
+version = "0.0.234"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 edition = "2021"
 rust-version = "1.65.0"
--- a/ruff_cli/src/cli.rs
+++ b/ruff_cli/src/cli.rs
@@ -3,11 +3,12 @@ use std::path::PathBuf;
 use clap::{command, Parser};
 use regex::Regex;
 use ruff::logging::LogLevel;
-use ruff::registry::{Rule, RuleSelector};
+use ruff::registry::Rule;
 use ruff::resolver::ConfigProcessor;
 use ruff::settings::types::{
    FilePattern, PatternPrefixPair, PerFileIgnore, PythonVersion, SerializationFormat,
 };
+use ruff::RuleSelector;
 use rustc_hash::FxHashMap;

 #[derive(Debug, Parser)]
--- a/ruff_cli/src/lib.rs
+++ b/ruff_cli/src/lib.rs
@@ -2,6 +2,8 @@
 //! to automatically update the `ruff --help` output in the `README.md`.
 //!
 //! For the actual Ruff library, see [`ruff`].
+#![forbid(unsafe_code)]
+#![warn(clippy::pedantic)]
 #![allow(clippy::must_use_candidate, dead_code)]

 mod cli;
--- a/ruff_cli/src/main.rs
+++ b/ruff_cli/src/main.rs
@@ -1,10 +1,11 @@
+#![forbid(unsafe_code)]
+#![warn(clippy::pedantic)]
 #![allow(
    clippy::match_same_arms,
    clippy::missing_errors_doc,
    clippy::module_name_repetitions,
    clippy::too_many_lines
 )]
-#![forbid(unsafe_code)]

 use std::io::{self};
 use std::path::{Path, PathBuf};
@@ -88,7 +89,7 @@ fn resolve(
    }
 }

-pub fn main() -> Result<ExitCode> {
+fn inner_main() -> Result<ExitCode> {
    // Extract command-line arguments.
    let (cli, overrides) = Cli::parse().partition();

@@ -200,7 +201,7 @@ quoting the executed command, along with the relevant file contents and `pyproje
    if cache {
        // `--no-cache` doesn't respect code changes, and so is often confusing during
        // development.
-        warn_user_once!("debug build without --no-cache.");
+        warn_user_once!("Detected debug build without --no-cache.");
    }

    let printer = Printer::new(&format, &log_level, &autofix, &violations);
@@ -319,3 +320,14 @@ quoting the executed command, along with the relevant file contents and `pyproje

    Ok(ExitCode::SUCCESS)
 }
+
+#[must_use]
+pub fn main() -> ExitCode {
+    match inner_main() {
+        Ok(code) => code,
+        Err(err) => {
+            eprintln!("{}{} {err:?}", "error".red().bold(), ":".bold());
+            ExitCode::FAILURE
+        }
+    }
+}
--- a/ruff_cli/src/printer.rs
+++ b/ruff_cli/src/printer.rs
@@ -96,12 +96,14 @@ impl<'a> Printer<'a> {
                    let remaining = diagnostics.messages.len();
                    let total = fixed + remaining;
                    if fixed > 0 {
+                        let s = if total == 1 { "" } else { "s" };
                        writeln!(
                            stdout,
-                            "Found {total} error(s) ({fixed} fixed, {remaining} remaining)."
+                            "Found {total} error{s}) ({fixed} fixed, {remaining} remaining)."
                        )?;
                    } else if remaining > 0 {
-                        writeln!(stdout, "Found {remaining} error(s).")?;
+                        let s = if remaining == 1 { "" } else { "s" };
+                        writeln!(stdout, "Found {remaining} error{s}.")?;
                    }

                    if !matches!(self.autofix, fix::FixMode::Apply) {
@@ -121,10 +123,11 @@ impl<'a> Printer<'a> {
                Violations::Hide => {
                    let fixed = diagnostics.fixed;
                    if fixed > 0 {
+                        let s = if fixed == 1 { "" } else { "s" };
                        if matches!(self.autofix, fix::FixMode::Apply) {
-                            writeln!(stdout, "Fixed {fixed} error(s).")?;
+                            writeln!(stdout, "Fixed {fixed} error{s}.")?;
                        } else if matches!(self.autofix, fix::FixMode::Diff) {
-                            writeln!(stdout, "Would fix {fixed} error(s).")?;
+                            writeln!(stdout, "Would fix {fixed} error{s}.")?;
                        }
                    }
                }
@@ -339,8 +342,13 @@ impl<'a> Printer<'a> {
        }

        if self.log_level >= &LogLevel::Default {
+            let s = if diagnostics.messages.len() == 1 {
+                ""
+            } else {
+                "s"
+            };
            notify_user!(
-                "Found {} error(s). Watching for file changes.",
+                "Found {} error{s}. Watching for file changes.",
                diagnostics.messages.len()
            );
        }
--- a/ruff_cli/tests/integration_test.rs
+++ b/ruff_cli/tests/integration_test.rs
@@ -28,7 +28,7 @@ fn test_stdin_error() -> Result<()> {
        .failure();
    assert_eq!(
        str::from_utf8(&output.get_output().stdout)?,
-        "-:1:8: F401 `os` imported but unused\nFound 1 error(s).\n1 potentially fixable with the \
+        "-:1:8: F401 `os` imported but unused\nFound 1 error.\n1 potentially fixable with the \
         --fix option.\n"
    );
    Ok(())
@@ -44,8 +44,8 @@ fn test_stdin_filename() -> Result<()> {
        .failure();
    assert_eq!(
        str::from_utf8(&output.get_output().stdout)?,
-        "F401.py:1:8: F401 `os` imported but unused\nFound 1 error(s).\n1 potentially fixable \
-         with the --fix option.\n"
+        "F401.py:1:8: F401 `os` imported but unused\nFound 1 error.\n1 potentially fixable with \
+         the --fix option.\n"
    );
    Ok(())
 }
--- a/ruff_dev/Cargo.toml
+++ b/ruff_dev/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_dev"
-version = "0.0.231"
+version = "0.0.234"
 edition = "2021"

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

 mod generate_all;
 mod generate_cli_help;
--- a/ruff_macros/Cargo.toml
+++ b/ruff_macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_macros"
-version = "0.0.231"
+version = "0.0.234"
 edition = "2021"

 [lib]
--- a/ruff_macros/src/define_rule_mapping.rs
+++ b/ruff_macros/src/define_rule_mapping.rs
@@ -53,7 +53,7 @@ pub fn define_rule_mapping(mapping: &Mapping) -> proc_macro2::TokenStream {

    let rulecodeprefix = super::rule_code_prefix::expand(
        &Ident::new("Rule", Span::call_site()),
-        &Ident::new("RuleSelector", Span::call_site()),
+        &Ident::new("RuleCodePrefix", Span::call_site()),
        mapping.entries.iter().map(|(code, ..)| code),
        |code| code_to_name[code],
    );
--- a/ruff_macros/src/lib.rs
+++ b/ruff_macros/src/lib.rs
@@ -1,4 +1,6 @@
 //! This crate implements internal macros for the `ruff` library.
+#![forbid(unsafe_code)]
+#![warn(clippy::pedantic)]
 #![allow(
    clippy::collapsible_else_if,
    clippy::collapsible_if,
@@ -11,7 +13,6 @@
    clippy::similar_names,
    clippy::too_many_lines
 )]
-#![forbid(unsafe_code)]

 use proc_macro::TokenStream;
 use syn::{parse_macro_input, DeriveInput, ItemFn};
--- a/ruff_macros/src/rule_code_prefix.rs
+++ b/ruff_macros/src/rule_code_prefix.rs
@@ -1,89 +1,9 @@
-use std::collections::{BTreeMap, BTreeSet, HashMap};
+use std::collections::{BTreeMap, BTreeSet};

-use once_cell::sync::Lazy;
 use proc_macro2::Span;
 use quote::quote;
 use syn::Ident;

-const ALL: &str = "ALL";
-
-/// A hash map from deprecated `RuleSelector` to latest
-/// `RuleSelector`.
-pub static PREFIX_REDIRECTS: Lazy<HashMap<&'static str, &'static str>> = Lazy::new(|| {
-    HashMap::from_iter([
-        // TODO(charlie): Remove by 2023-01-01.
-        ("U001", "UP001"),
-        ("U003", "UP003"),
-        ("U004", "UP004"),
-        ("U005", "UP005"),
-        ("U006", "UP006"),
-        ("U007", "UP007"),
-        ("U008", "UP008"),
-        ("U009", "UP009"),
-        ("U010", "UP010"),
-        ("U011", "UP011"),
-        ("U012", "UP012"),
-        ("U013", "UP013"),
-        ("U014", "UP014"),
-        ("U015", "UP015"),
-        ("U016", "UP016"),
-        ("U017", "UP017"),
-        ("U019", "UP019"),
-        // TODO(charlie): Remove by 2023-02-01.
-        ("I252", "TID252"),
-        ("M001", "RUF100"),
-        // TODO(charlie): Remove by 2023-02-01.
-        ("PDV002", "PD002"),
-        ("PDV003", "PD003"),
-        ("PDV004", "PD004"),
-        ("PDV007", "PD007"),
-        ("PDV008", "PD008"),
-        ("PDV009", "PD009"),
-        ("PDV010", "PD010"),
-        ("PDV011", "PD011"),
-        ("PDV012", "PD012"),
-        ("PDV013", "PD013"),
-        ("PDV015", "PD015"),
-        ("PDV901", "PD901"),
-        // TODO(charlie): Remove by 2023-02-01.
-        ("R501", "RET501"),
-        ("R502", "RET502"),
-        ("R503", "RET503"),
-        ("R504", "RET504"),
-        ("R505", "RET505"),
-        ("R506", "RET506"),
-        ("R507", "RET507"),
-        ("R508", "RET508"),
-        ("IC001", "ICN001"),
-        ("IC002", "ICN001"),
-        ("IC003", "ICN001"),
-        ("IC004", "ICN001"),
-        // TODO(charlie): Remove by 2023-01-01.
-        ("U", "UP"),
-        ("U0", "UP0"),
-        ("U00", "UP00"),
-        ("U01", "UP01"),
-        // TODO(charlie): Remove by 2023-02-01.
-        ("I2", "TID2"),
-        ("I25", "TID25"),
-        ("M", "RUF100"),
-        ("M0", "RUF100"),
-        // TODO(charlie): Remove by 2023-02-01.
-        ("PDV", "PD"),
-        ("PDV0", "PD0"),
-        ("PDV01", "PD01"),
-        ("PDV9", "PD9"),
-        ("PDV90", "PD90"),
-        // TODO(charlie): Remove by 2023-02-01.
-        ("R", "RET"),
-        ("R5", "RET5"),
-        ("R50", "RET50"),
-        // TODO(charlie): Remove by 2023-02-01.
-        ("IC", "ICN"),
-        ("IC0", "ICN0"),
-    ])
-});
-
 pub fn expand<'a>(
    rule_type: &Ident,
    prefix_ident: &Ident,
@@ -116,20 +36,8 @@ pub fn expand<'a>(
        all_codes.insert(code_str);
    }

-    prefix_to_codes.insert(ALL.to_string(), all_codes);
    prefix_to_codes.insert("PL".to_string(), pl_codes);

-    // Add any prefix aliases (e.g., "U" to "UP").
-    for (alias, rule_code) in PREFIX_REDIRECTS.iter() {
-        prefix_to_codes.insert(
-            (*alias).to_string(),
-            prefix_to_codes
-                .get(*rule_code)
-                .unwrap_or_else(|| panic!("Unknown RuleCode: {alias:?}"))
-                .clone(),
-        );
-    }
-
    let prefix_variants = prefix_to_codes.keys().map(|prefix| {
        let prefix = Ident::new(prefix, Span::call_site());
        quote! {
@@ -139,26 +47,9 @@ pub fn expand<'a>(

    let prefix_impl = generate_impls(rule_type, prefix_ident, &prefix_to_codes, variant_name);

-    let prefix_redirects = PREFIX_REDIRECTS.iter().map(|(alias, rule_code)| {
-        let code = Ident::new(rule_code, Span::call_site());
-        quote! {
-            (#alias, #prefix_ident::#code)
-        }
-    });
-
    quote! {
-        #[derive(PartialEq, Eq, PartialOrd, Ord)]
-        pub enum SuffixLength {
-            None,
-            Zero,
-            One,
-            Two,
-            Three,
-            Four,
-            Five,
-        }
-
        #[derive(
+            ::strum_macros::EnumIter,
            ::strum_macros::EnumString,
            ::strum_macros::AsRefStr,
            Debug,
@@ -167,22 +58,15 @@ pub fn expand<'a>(
            PartialOrd,
            Ord,
            Clone,
+            Hash,
            ::serde::Serialize,
            ::serde::Deserialize,
-            ::schemars::JsonSchema,
        )]
        pub enum #prefix_ident {
            #(#prefix_variants,)*
        }

        #prefix_impl
-
-        /// A hash map from deprecated `RuleSelector` to latest `RuleSelector`.
-        pub static PREFIX_REDIRECTS: ::once_cell::sync::Lazy<::rustc_hash::FxHashMap<&'static str, #prefix_ident>> = ::once_cell::sync::Lazy::new(|| {
-            ::rustc_hash::FxHashMap::from_iter([
-                #(#prefix_redirects),*
-            ])
-        });
    }
 }

@@ -200,64 +84,37 @@ fn generate_impls<'a>(
            }
        });
        let prefix = Ident::new(prefix_str, Span::call_site());
-        if let Some(target) = PREFIX_REDIRECTS.get(prefix_str.as_str()) {
-            quote! {
-                #prefix_ident::#prefix => {
-                    crate::warn_user_once!(
-                        "`{}` has been remapped to `{}`", #prefix_str, #target
-                    );
-                    vec![#(#codes),*].into_iter()
-                }
-            }
-        } else {
-            quote! {
-                #prefix_ident::#prefix => vec![#(#codes),*].into_iter(),
-            }
+
+        quote! {
+            #prefix_ident::#prefix => vec![#(#codes),*].into_iter(),
        }
    });

    let specificity_match_arms = prefix_to_codes.keys().map(|prefix_str| {
        let prefix = Ident::new(prefix_str, Span::call_site());
-        if prefix_str == ALL {
-            quote! {
-                #prefix_ident::#prefix => SuffixLength::None,
-            }
-        } else {
-            let mut num_numeric = prefix_str.chars().filter(|char| char.is_numeric()).count();
-            if prefix_str != "PL" && prefix_str.starts_with("PL") {
-                num_numeric += 1;
-            }
-            let suffix_len = match num_numeric {
-                0 => quote! { SuffixLength::Zero },
-                1 => quote! { SuffixLength::One },
-                2 => quote! { SuffixLength::Two },
-                3 => quote! { SuffixLength::Three },
-                4 => quote! { SuffixLength::Four },
-                5 => quote! { SuffixLength::Five },
-                _ => panic!("Invalid prefix: {prefix}"),
-            };
-            quote! {
-                #prefix_ident::#prefix => #suffix_len,
-            }
+        let mut num_numeric = prefix_str.chars().filter(|char| char.is_numeric()).count();
+        if prefix_str != "PL" && prefix_str.starts_with("PL") {
+            num_numeric += 1;
        }
-    });
-
-    let categories = prefix_to_codes.keys().map(|prefix_str| {
-        if prefix_str.chars().all(char::is_alphabetic)
-            && !PREFIX_REDIRECTS.contains_key(&prefix_str.as_str())
-        {
-            let prefix = Ident::new(prefix_str, Span::call_site());
-            quote! {
-                #prefix_ident::#prefix,
-            }
-        } else {
-            quote! {}
+        let suffix_len = match num_numeric {
+            0 => quote! { Specificity::Linter },
+            1 => quote! { Specificity::Code1Char },
+            2 => quote! { Specificity::Code2Chars },
+            3 => quote! { Specificity::Code3Chars },
+            4 => quote! { Specificity::Code4Chars },
+            5 => quote! { Specificity::Code5Chars },
+            _ => panic!("Invalid prefix: {prefix}"),
+        };
+        quote! {
+            #prefix_ident::#prefix => #suffix_len,
        }
    });

    quote! {
        impl #prefix_ident {
-            pub fn specificity(&self) -> SuffixLength {
+            pub(crate) fn specificity(&self) -> crate::rule_selector::Specificity {
+                use crate::rule_selector::Specificity;
+
                #[allow(clippy::match_same_arms)]
                match self {
                    #(#specificity_match_arms)*
@@ -270,15 +127,11 @@ fn generate_impls<'a>(
            type IntoIter = ::std::vec::IntoIter<Self::Item>;

            fn into_iter(self) -> Self::IntoIter {
-                use colored::Colorize;
-
                #[allow(clippy::match_same_arms)]
                match self {
                    #(#into_iter_match_arms)*
                }
            }
        }
-
-        pub const CATEGORIES: &[#prefix_ident] = &[#(#categories)*];
    }
 }
--- a/ruff_macros/src/rule_namespace.rs
+++ b/ruff_macros/src/rule_namespace.rs
@@ -84,14 +84,14 @@ pub fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream>

        if field != "Pycodestyle" {
            into_iter_match_arms.extend(quote! {
-                #ident::#field => RuleSelector::#prefix_ident.into_iter(),
+                #ident::#field => RuleCodePrefix::#prefix_ident.into_iter(),
            });
        }
    }

    into_iter_match_arms.extend(quote! {
        #ident::Pycodestyle => {
-            let rules: Vec<_> = (&RuleSelector::E).into_iter().chain(&RuleSelector::W).collect();
+            let rules: Vec<_> = (&RuleCodePrefix::E).into_iter().chain(&RuleCodePrefix::W).collect();
            rules.into_iter()
        }
    });
--- a/scripts/_utils.py
+++ b/scripts/_utils.py
@@ -1,8 +1,7 @@
-import os
 import re
 from pathlib import Path

-ROOT_DIR = Path(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+ROOT_DIR = Path(__file__).resolve().parent.parent


 def dir_name(linter_name: str) -> str:
@@ -15,4 +14,4 @@ def pascal_case(linter_name: str) -> str:


 def get_indent(line: str) -> str:
-    return re.match(r"^\s*", line).group()  # pyright: ignore[reportOptionalMemberAccess]
+    return re.match(r"^\s*", line).group()  # type: ignore[union-attr]
--- a/scripts/add_plugin.py
+++ b/scripts/add_plugin.py
@@ -10,15 +10,14 @@ Example usage:
 """

 import argparse
-import os

 from _utils import ROOT_DIR, dir_name, get_indent, pascal_case


 def main(*, plugin: str, url: str, prefix_code: str) -> None:
+    """Generate boilerplate for a new plugin."""
    # Create the test fixture folder.
-    os.makedirs(
-        ROOT_DIR / "resources/test/fixtures" / dir_name(plugin),
+    (ROOT_DIR / "resources/test/fixtures" / dir_name(plugin)).mkdir(
        exist_ok=True,
    )

@@ -56,7 +55,7 @@ mod tests {
    }
 }
 """
-            % dir_name(plugin)
+            % dir_name(plugin),
        )

    # Create a subdirectory for rules and create a `mod.rs` placeholder
@@ -84,7 +83,7 @@ mod tests {
                fp.write(f"{indent}// {plugin}")
                fp.write("\n")

-            elif line.strip() == '/// Ruff-specific rules':
+            elif line.strip() == "/// Ruff-specific rules":
                fp.write(f"/// [{plugin}]({url})\n")
                fp.write(f'{indent}#[prefix = "{prefix_code}"]\n')
                fp.write(f"{indent}{pascal_case(plugin)},")
--- a/scripts/add_rule.py
+++ b/scripts/add_rule.py
@@ -16,12 +16,17 @@ from _utils import ROOT_DIR, dir_name, get_indent

 def snake_case(name: str) -> str:
    """Convert from PascalCase to snake_case."""
-    return "".join(f"_{word.lower()}" if word.isupper() else word for word in name).lstrip("_")
+    return "".join(
+        f"_{word.lower()}" if word.isupper() else word for word in name
+    ).lstrip("_")


 def main(*, name: str, code: str, linter: str) -> None:
+    """Generate boilerplate for a new rule."""
    # Create a test fixture.
-    with (ROOT_DIR / "resources/test/fixtures" / dir_name(linter) / f"{code}.py").open("a"):
+    with (ROOT_DIR / "resources/test/fixtures" / dir_name(linter) / f"{code}.py").open(
+        "a",
+    ):
        pass

    plugin_module = ROOT_DIR / "src/rules" / dir_name(linter)
@@ -35,13 +40,15 @@ def main(*, name: str, code: str, linter: str) -> None:
        for line in content.splitlines():
            if line.strip() == "fn rules(rule_code: Rule, path: &Path) -> Result<()> {":
                indent = get_indent(line)
-                fp.write(f'{indent}#[test_case(Rule::{name}, Path::new("{code}.py"); "{code}")]')
+                fp.write(
+                    f'{indent}#[test_case(Rule::{name}, Path::new("{code}.py"); "{code}")]',
+                )
                fp.write("\n")

            fp.write(line)
            fp.write("\n")

-    # Add the exports 
+    # Add the exports
    rules_dir = plugin_module / "rules"
    rules_mod = rules_dir / "mod.rs"

@@ -83,14 +90,14 @@ impl Violation for %s {
    }
 }
 """
-            % (name, name)
+            % (name, name),
        )
        fp.write("\n")
        fp.write(
            f"""
 /// {code}
 pub fn {rule_name_snake}(checker: &mut Checker) {{}}
-"""
+""",
        )
        fp.write("\n")

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

 [tool.ruff.pydocstyle]
--- a/src/ast/helpers.rs
+++ b/src/ast/helpers.rs
@@ -40,19 +40,22 @@ pub fn unparse_stmt(stmt: &Stmt, stylist: &Stylist) -> String {
    generator.generate()
 }

-fn collect_call_path_inner<'a>(expr: &'a Expr, parts: &mut CallPath<'a>) {
+fn collect_call_path_inner<'a>(expr: &'a Expr, parts: &mut CallPath<'a>) -> bool {
    match &expr.node {
-        ExprKind::Call { func, .. } => {
-            collect_call_path_inner(func, parts);
-        }
+        ExprKind::Call { func, .. } => collect_call_path_inner(func, parts),
        ExprKind::Attribute { value, attr, .. } => {
-            collect_call_path_inner(value, parts);
-            parts.push(attr);
+            if collect_call_path_inner(value, parts) {
+                parts.push(attr);
+                true
+            } else {
+                false
+            }
        }
        ExprKind::Name { id, .. } => {
            parts.push(id);
+            true
        }
-        _ => {}
+        _ => false,
    }
 }

@@ -236,6 +239,186 @@ where
    }
 }

+pub fn any_over_stmt<F>(stmt: &Stmt, func: &F) -> bool
+where
+    F: Fn(&Expr) -> bool,
+{
+    match &stmt.node {
+        StmtKind::FunctionDef {
+            args,
+            body,
+            decorator_list,
+            returns,
+            ..
+        }
+        | StmtKind::AsyncFunctionDef {
+            args,
+            body,
+            decorator_list,
+            returns,
+            ..
+        } => {
+            args.defaults.iter().any(|expr| any_over_expr(expr, func))
+                || args
+                    .kw_defaults
+                    .iter()
+                    .any(|expr| any_over_expr(expr, func))
+                || args.args.iter().any(|arg| {
+                    arg.node
+                        .annotation
+                        .as_ref()
+                        .map_or(false, |expr| any_over_expr(expr, func))
+                })
+                || args.kwonlyargs.iter().any(|arg| {
+                    arg.node
+                        .annotation
+                        .as_ref()
+                        .map_or(false, |expr| any_over_expr(expr, func))
+                })
+                || args.posonlyargs.iter().any(|arg| {
+                    arg.node
+                        .annotation
+                        .as_ref()
+                        .map_or(false, |expr| any_over_expr(expr, func))
+                })
+                || args.vararg.as_ref().map_or(false, |arg| {
+                    arg.node
+                        .annotation
+                        .as_ref()
+                        .map_or(false, |expr| any_over_expr(expr, func))
+                })
+                || args.kwarg.as_ref().map_or(false, |arg| {
+                    arg.node
+                        .annotation
+                        .as_ref()
+                        .map_or(false, |expr| any_over_expr(expr, func))
+                })
+                || body.iter().any(|stmt| any_over_stmt(stmt, func))
+                || decorator_list.iter().any(|expr| any_over_expr(expr, func))
+                || returns
+                    .as_ref()
+                    .map_or(false, |value| any_over_expr(value, func))
+        }
+        StmtKind::ClassDef {
+            bases,
+            keywords,
+            body,
+            decorator_list,
+            ..
+        } => {
+            bases.iter().any(|expr| any_over_expr(expr, func))
+                || keywords
+                    .iter()
+                    .any(|keyword| any_over_expr(&keyword.node.value, func))
+                || body.iter().any(|stmt| any_over_stmt(stmt, func))
+                || decorator_list.iter().any(|expr| any_over_expr(expr, func))
+        }
+        StmtKind::Return { value } => value
+            .as_ref()
+            .map_or(false, |value| any_over_expr(value, func)),
+        StmtKind::Delete { targets } => targets.iter().any(|expr| any_over_expr(expr, func)),
+        StmtKind::Assign { targets, value, .. } => {
+            targets.iter().any(|expr| any_over_expr(expr, func)) || any_over_expr(value, func)
+        }
+        StmtKind::AugAssign { target, value, .. } => {
+            any_over_expr(target, func) || any_over_expr(value, func)
+        }
+        StmtKind::AnnAssign {
+            target,
+            annotation,
+            value,
+            ..
+        } => {
+            any_over_expr(target, func)
+                || any_over_expr(annotation, func)
+                || value
+                    .as_ref()
+                    .map_or(false, |value| any_over_expr(value, func))
+        }
+        StmtKind::For {
+            target,
+            iter,
+            body,
+            orelse,
+            ..
+        }
+        | StmtKind::AsyncFor {
+            target,
+            iter,
+            body,
+            orelse,
+            ..
+        } => {
+            any_over_expr(target, func)
+                || any_over_expr(iter, func)
+                || any_over_body(body, func)
+                || any_over_body(orelse, func)
+        }
+        StmtKind::While { test, body, orelse } => {
+            any_over_expr(test, func) || any_over_body(body, func) || any_over_body(orelse, func)
+        }
+        StmtKind::If { test, body, orelse } => {
+            any_over_expr(test, func) || any_over_body(body, func) || any_over_body(orelse, func)
+        }
+        StmtKind::With { items, body, .. } | StmtKind::AsyncWith { items, body, .. } => {
+            items.iter().any(|withitem| {
+                any_over_expr(&withitem.context_expr, func)
+                    || withitem
+                        .optional_vars
+                        .as_ref()
+                        .map_or(false, |expr| any_over_expr(expr, func))
+            }) || any_over_body(body, func)
+        }
+        StmtKind::Raise { exc, cause } => {
+            exc.as_ref()
+                .map_or(false, |value| any_over_expr(value, func))
+                || cause
+                    .as_ref()
+                    .map_or(false, |value| any_over_expr(value, func))
+        }
+        StmtKind::Try {
+            body,
+            handlers,
+            orelse,
+            finalbody,
+        } => {
+            any_over_body(body, func)
+                || handlers.iter().any(|handler| {
+                    let ExcepthandlerKind::ExceptHandler { type_, body, .. } = &handler.node;
+                    type_
+                        .as_ref()
+                        .map_or(false, |expr| any_over_expr(expr, func))
+                        || any_over_body(body, func)
+                })
+                || any_over_body(orelse, func)
+                || any_over_body(finalbody, func)
+        }
+        StmtKind::Assert { test, msg } => {
+            any_over_expr(test, func)
+                || msg
+                    .as_ref()
+                    .map_or(false, |value| any_over_expr(value, func))
+        }
+        // TODO(charlie): Handle match statements.
+        StmtKind::Match { .. } => false,
+        StmtKind::Import { .. } => false,
+        StmtKind::ImportFrom { .. } => false,
+        StmtKind::Global { .. } => false,
+        StmtKind::Nonlocal { .. } => false,
+        StmtKind::Expr { value } => any_over_expr(value, func),
+        StmtKind::Pass => false,
+        StmtKind::Break => false,
+        StmtKind::Continue => false,
+    }
+}
+
+pub fn any_over_body<F>(body: &[Stmt], func: &F) -> bool
+where
+    F: Fn(&Expr) -> bool,
+{
+    body.iter().any(|stmt| any_over_stmt(stmt, func))
+}
+
 static DUNDER_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"__[^\s]+__").unwrap());

 /// Return `true` if the [`Stmt`] is an assignment to a dunder (like `__all__`).
@@ -379,6 +562,23 @@ pub fn is_super_call_with_arguments(func: &Expr, args: &[Expr]) -> bool {
    }
 }

+/// Return `true` if the body uses `locals()`, `globals()`, `vars()`, `eval()`.
+pub fn uses_magic_variable_access(checker: &Checker, body: &[Stmt]) -> bool {
+    any_over_body(body, &|expr| {
+        if let ExprKind::Call { func, .. } = &expr.node {
+            checker.resolve_call_path(func).map_or(false, |call_path| {
+                call_path.as_slice() == ["", "locals"]
+                    || call_path.as_slice() == ["", "globals"]
+                    || call_path.as_slice() == ["", "vars"]
+                    || call_path.as_slice() == ["", "eval"]
+                    || call_path.as_slice() == ["", "exec"]
+            })
+        } else {
+            false
+        }
+    })
+}
+
 /// Format the module name for a relative import.
 pub fn format_import_from(level: Option<&usize>, module: Option<&str>) -> String {
    let mut module_name = String::with_capacity(16);
--- a/src/ast/types.rs
+++ b/src/ast/types.rs
@@ -33,6 +33,10 @@ impl Range {
    pub fn from_located<T>(located: &Located<T>) -> Self {
        Range::new(located.location, located.end_location.unwrap())
    }
+
+    pub fn contains(&self, other: &Range) -> bool {
+        self.location <= other.location && self.end_location >= other.end_location
+    }
 }

 #[derive(Debug)]
@@ -130,8 +134,22 @@ pub struct Binding<'a> {
    /// The statement in which the [`Binding`] was defined.
    pub source: Option<RefEquality<'a, Stmt>>,
    /// Tuple of (scope index, range) indicating the scope and range at which
-    /// the binding was last used.
-    pub used: Option<(usize, Range)>,
+    /// the binding was last used in a runtime context.
+    pub runtime_usage: Option<(usize, Range)>,
+    /// Tuple of (scope index, range) indicating the scope and range at which
+    /// the binding was last used in a typing-time context.
+    pub typing_usage: Option<(usize, Range)>,
+    /// Tuple of (scope index, range) indicating the scope and range at which
+    /// the binding was last used in a synthetic context. This is used for
+    /// (e.g.) `__future__` imports, explicit re-exports, and other bindings
+    /// that should be considered used even if they're never referenced.
+    pub synthetic_usage: Option<(usize, Range)>,
+}
+
+#[derive(Copy, Clone)]
+pub enum UsageContext {
+    Runtime,
+    Typing,
 }

 // Pyflakes defines the following binding hierarchy (via inheritance):
@@ -152,6 +170,19 @@ pub struct Binding<'a> {
 //        FutureImportation

 impl<'a> Binding<'a> {
+    pub fn mark_used(&mut self, scope: usize, range: Range, context: UsageContext) {
+        match context {
+            UsageContext::Runtime => self.runtime_usage = Some((scope, range)),
+            UsageContext::Typing => self.typing_usage = Some((scope, range)),
+        }
+    }
+
+    pub fn used(&self) -> bool {
+        self.runtime_usage.is_some()
+            || self.synthetic_usage.is_some()
+            || self.typing_usage.is_some()
+    }
+
    pub fn is_definition(&self) -> bool {
        matches!(
            self.kind,
--- a/src/checkers/ast.rs
+++ b/src/checkers/ast.rs
@@ -20,7 +20,7 @@ use crate::ast::operations::extract_all_names;
 use crate::ast::relocate::relocate_expr;
 use crate::ast::types::{
    Binding, BindingKind, CallPath, ClassDef, FunctionDef, Lambda, Node, Range, RefEquality, Scope,
-    ScopeKind,
+    ScopeKind, UsageContext,
 };
 use crate::ast::visitor::{walk_excepthandler, Visitor};
 use crate::ast::{branch_detection, cast, helpers, operations, visitor};
@@ -54,6 +54,7 @@ type DeferralContext<'a> = (Vec<usize>, Vec<RefEquality<'a, Stmt>>);
 pub struct Checker<'a> {
    // Input data.
    path: &'a Path,
+    package: Option<&'a Path>,
    autofix: flags::Autofix,
    noqa: flags::Noqa,
    pub(crate) settings: &'a Settings,
@@ -92,12 +93,14 @@ pub struct Checker<'a> {
    in_deferred_type_definition: bool,
    in_literal: bool,
    in_subscript: bool,
+    in_type_checking_block: bool,
    seen_import_boundary: bool,
    futures_allowed: bool,
    annotations_future_enabled: bool,
    except_handlers: Vec<Vec<Vec<&'a str>>>,
    // Check-specific state.
    pub(crate) flake8_bugbear_seen: Vec<&'a Expr>,
+    pub(crate) type_checking_blocks: Vec<&'a Stmt>,
 }

 impl<'a> Checker<'a> {
@@ -108,6 +111,7 @@ impl<'a> Checker<'a> {
        autofix: flags::Autofix,
        noqa: flags::Noqa,
        path: &'a Path,
+        package: Option<&'a Path>,
        locator: &'a Locator,
        style: &'a Stylist,
        indexer: &'a Indexer,
@@ -118,6 +122,7 @@ impl<'a> Checker<'a> {
            autofix,
            noqa,
            path,
+            package,
            locator,
            stylist: style,
            indexer,
@@ -149,12 +154,14 @@ impl<'a> Checker<'a> {
            in_deferred_type_definition: false,
            in_literal: false,
            in_subscript: false,
+            in_type_checking_block: false,
            seen_import_boundary: false,
            futures_allowed: true,
            annotations_future_enabled: path.extension().map_or(false, |ext| ext == "pyi"),
            except_handlers: vec![],
            // Check-specific state.
            flake8_bugbear_seen: vec![],
+            type_checking_blocks: vec![],
        }
    }

@@ -329,7 +336,9 @@ where
                        let index = self.bindings.len();
                        self.bindings.push(Binding {
                            kind: BindingKind::Global,
-                            used: usage,
+                            runtime_usage: None,
+                            synthetic_usage: usage,
+                            typing_usage: None,
                            range: *range,
                            source: Some(RefEquality(stmt)),
                        });
@@ -355,7 +364,9 @@ where
                        let index = self.bindings.len();
                        self.bindings.push(Binding {
                            kind: BindingKind::Nonlocal,
-                            used: usage,
+                            runtime_usage: None,
+                            synthetic_usage: usage,
+                            typing_usage: None,
                            range: *range,
                            source: Some(RefEquality(stmt)),
                        });
@@ -369,7 +380,7 @@ where
                        for index in self.scope_stack.iter().skip(1).rev().skip(1) {
                            if let Some(index) = self.scopes[*index].values.get(&name.as_str()) {
                                exists = true;
-                                self.bindings[*index].used = usage;
+                                self.bindings[*index].runtime_usage = usage;
                            }
                        }

@@ -667,7 +678,9 @@ where
                    name,
                    Binding {
                        kind: BindingKind::FunctionDefinition,
-                        used: None,
+                        runtime_usage: None,
+                        synthetic_usage: None,
+                        typing_usage: None,
                        range: Range::from_located(stmt),
                        source: Some(self.current_stmt().clone()),
                    },
@@ -819,7 +832,9 @@ where
                            name,
                            Binding {
                                kind: BindingKind::SubmoduleImportation(name, full_name),
-                                used: None,
+                                runtime_usage: None,
+                                synthetic_usage: None,
+                                typing_usage: None,
                                range: Range::from_located(alias),
                                source: Some(self.current_stmt().clone()),
                            },
@@ -838,9 +853,10 @@ where
                            name,
                            Binding {
                                kind: BindingKind::Importation(name, full_name),
+                                runtime_usage: None,
                                // Treat explicit re-export as usage (e.g., `import applications
                                // as applications`).
-                                used: if alias
+                                synthetic_usage: if alias
                                    .node
                                    .asname
                                    .as_ref()
@@ -857,6 +873,7 @@ where
                                } else {
                                    None
                                },
+                                typing_usage: None,
                                range: Range::from_located(alias),
                                source: Some(self.current_stmt().clone()),
                            },
@@ -1027,7 +1044,9 @@ where
                    }
                }

-                if self.settings.rules.enabled(&Rule::UnnecessaryFutureImport) {
+                if self.settings.rules.enabled(&Rule::UnnecessaryFutureImport)
+                    && self.settings.target_version >= PythonVersion::Py37
+                {
                    if let Some("__future__") = module.as_deref() {
                        pyupgrade::rules::unnecessary_future_import(self, stmt, names);
                    }
@@ -1086,8 +1105,9 @@ where
                            name,
                            Binding {
                                kind: BindingKind::FutureImportation,
+                                runtime_usage: None,
                                // Always mark `__future__` imports as used.
-                                used: Some((
+                                synthetic_usage: Some((
                                    self.scopes[*(self
                                        .scope_stack
                                        .last()
@@ -1095,6 +1115,7 @@ where
                                    .id,
                                    Range::from_located(alias),
                                )),
+                                typing_usage: None,
                                range: Range::from_located(alias),
                                source: Some(self.current_stmt().clone()),
                            },
@@ -1128,7 +1149,9 @@ where
                            "*",
                            Binding {
                                kind: BindingKind::StarImportation(*level, module.clone()),
-                                used: None,
+                                runtime_usage: None,
+                                synthetic_usage: None,
+                                typing_usage: None,
                                range: Range::from_located(stmt),
                                source: Some(self.current_stmt().clone()),
                            },
@@ -1182,9 +1205,10 @@ where
                            name,
                            Binding {
                                kind: BindingKind::FromImportation(name, full_name),
+                                runtime_usage: None,
                                // Treat explicit re-export as usage (e.g., `from .applications
                                // import FastAPI as FastAPI`).
-                                used: if alias
+                                synthetic_usage: if alias
                                    .node
                                    .asname
                                    .as_ref()
@@ -1201,6 +1225,7 @@ where
                                } else {
                                    None
                                },
+                                typing_usage: None,
                                range,
                                source: Some(self.current_stmt().clone()),
                            },
@@ -1377,9 +1402,6 @@ where
                if self.settings.rules.enabled(&Rule::IfTuple) {
                    pyflakes::rules::if_tuple(self, stmt, test);
                }
-                if self.settings.rules.enabled(&Rule::EmptyTypeCheckingBlock) {
-                    flake8_type_checking::rules::empty_type_checking_block(self, test, body);
-                }
                if self.settings.rules.enabled(&Rule::NestedIfStatements) {
                    flake8_simplify::rules::nested_if_statements(
                        self,
@@ -1582,6 +1604,9 @@ where
                if self.settings.rules.enabled(&Rule::VerboseRaise) {
                    tryceratops::rules::verbose_raise(self, handlers);
                }
+                if self.settings.rules.enabled(&Rule::RaiseWithinTry) {
+                    tryceratops::rules::raise_within_try(self, body);
+                }
            }
            StmtKind::Assign { targets, value, .. } => {
                if self.settings.rules.enabled(&Rule::DoNotAssignLambda) {
@@ -1706,7 +1731,9 @@ where
                        let index = self.bindings.len();
                        self.bindings.push(Binding {
                            kind: BindingKind::Assignment,
-                            used: None,
+                            runtime_usage: None,
+                            synthetic_usage: None,
+                            typing_usage: None,
                            range: Range::from_located(stmt),
                            source: Some(RefEquality(stmt)),
                        });
@@ -1767,7 +1794,9 @@ where
                        let index = self.bindings.len();
                        self.bindings.push(Binding {
                            kind: BindingKind::Assignment,
-                            used: None,
+                            runtime_usage: None,
+                            synthetic_usage: None,
+                            typing_usage: None,
                            range: Range::from_located(stmt),
                            source: Some(RefEquality(stmt)),
                        });
@@ -1826,6 +1855,25 @@ where
                }
                self.visit_expr(target);
            }
+            StmtKind::If { test, body, orelse } => {
+                self.visit_expr(test);
+
+                if flake8_type_checking::helpers::is_type_checking_block(self, test) {
+                    if self.settings.rules.enabled(&Rule::EmptyTypeCheckingBlock) {
+                        flake8_type_checking::rules::empty_type_checking_block(self, test, body);
+                    }
+                    self.type_checking_blocks.push(stmt);
+
+                    let prev_in_type_checking_block = self.in_type_checking_block;
+                    self.in_type_checking_block = true;
+                    self.visit_body(body);
+                    self.in_type_checking_block = prev_in_type_checking_block;
+                } else {
+                    self.visit_body(body);
+                }
+
+                self.visit_body(orelse);
+            }
            _ => visitor::walk_stmt(self, stmt),
        };
        self.visible_scope = prev_visible_scope;
@@ -1841,7 +1889,9 @@ where
                    name,
                    Binding {
                        kind: BindingKind::ClassDefinition,
-                        used: None,
+                        runtime_usage: None,
+                        synthetic_usage: None,
+                        typing_usage: None,
                        range: Range::from_located(stmt),
                        source: Some(self.current_stmt().clone()),
                    },
@@ -3357,6 +3407,9 @@ where
                        body,
                    );
                }
+                if self.settings.rules.enabled(&Rule::ReraiseNoCause) {
+                    tryceratops::rules::reraise_no_cause(self, body);
+                }
                match name {
                    Some(name) => {
                        if self.settings.rules.enabled(&Rule::AmbiguousVariableName) {
@@ -3408,7 +3461,7 @@ where
                                [*(self.scope_stack.last().expect("No current scope found"))];
                            &scope.values.remove(&name.as_str())
                        } {
-                            if self.bindings[*index].used.is_none() {
+                            if !self.bindings[*index].used() {
                                if self.settings.rules.enabled(&Rule::UnusedVariable) {
                                    let mut diagnostic = Diagnostic::new(
                                        violations::UnusedVariable(name.to_string()),
@@ -3526,7 +3579,9 @@ where
            &arg.node.arg,
            Binding {
                kind: BindingKind::Argument,
-                used: None,
+                runtime_usage: None,
+                synthetic_usage: None,
+                typing_usage: None,
                range: Range::from_located(arg),
                source: Some(self.current_stmt().clone()),
            },
@@ -3625,7 +3680,9 @@ impl<'a> Checker<'a> {
            self.bindings.push(Binding {
                kind: BindingKind::Builtin,
                range: Range::default(),
-                used: None,
+                runtime_usage: None,
+                synthetic_usage: None,
+                typing_usage: None,
                source: None,
            });
            scope.values.insert(builtin, index);
@@ -3710,7 +3767,7 @@ impl<'a> Checker<'a> {
                        ));
                    }
                } else if in_current_scope {
-                    if existing.used.is_none()
+                    if !existing.used()
                        && binding.redefines(existing)
                        && (!self.settings.dummy_variable_rgx.is_match(name) || existing_is_import)
                        && !(matches!(existing.kind, BindingKind::FunctionDefinition)
@@ -3743,7 +3800,9 @@ impl<'a> Checker<'a> {
        let binding = match scope.values.get(&name) {
            None => binding,
            Some(index) => Binding {
-                used: self.bindings[*index].used,
+                runtime_usage: self.bindings[*index].runtime_usage,
+                synthetic_usage: self.bindings[*index].synthetic_usage,
+                typing_usage: self.bindings[*index].typing_usage,
                ..binding
            },
        };
@@ -3778,8 +3837,18 @@ impl<'a> Checker<'a> {
                }

                if let Some(index) = scope.values.get(&id.as_str()) {
+                    let context = if self.in_type_checking_block
+                        || self.in_annotation
+                        || self.in_deferred_string_type_definition
+                        || self.in_deferred_type_definition
+                    {
+                        UsageContext::Typing
+                    } else {
+                        UsageContext::Runtime
+                    };
+
                    // Mark the binding as used.
-                    self.bindings[*index].used = Some((scope_id, Range::from_located(expr)));
+                    self.bindings[*index].mark_used(scope_id, Range::from_located(expr), context);

                    if matches!(self.bindings[*index].kind, BindingKind::Annotation)
                        && !self.in_deferred_string_type_definition
@@ -3807,8 +3876,11 @@ impl<'a> Checker<'a> {
                            if has_alias {
                                // Mark the sub-importation as used.
                                if let Some(index) = scope.values.get(full_name) {
-                                    self.bindings[*index].used =
-                                        Some((scope_id, Range::from_located(expr)));
+                                    self.bindings[*index].mark_used(
+                                        scope_id,
+                                        Range::from_located(expr),
+                                        context,
+                                    );
                                }
                            }
                        }
@@ -3821,8 +3893,11 @@ impl<'a> Checker<'a> {
                            if has_alias {
                                // Mark the sub-importation as used.
                                if let Some(index) = scope.values.get(full_name.as_str()) {
-                                    self.bindings[*index].used =
-                                        Some((scope_id, Range::from_located(expr)));
+                                    self.bindings[*index].mark_used(
+                                        scope_id,
+                                        Range::from_located(expr),
+                                        context,
+                                    );
                                }
                            }
                        }
@@ -3950,7 +4025,9 @@ impl<'a> Checker<'a> {
                id,
                Binding {
                    kind: BindingKind::Annotation,
-                    used: None,
+                    runtime_usage: None,
+                    synthetic_usage: None,
+                    typing_usage: None,
                    range: Range::from_located(expr),
                    source: Some(self.current_stmt().clone()),
                },
@@ -3967,7 +4044,9 @@ impl<'a> Checker<'a> {
                id,
                Binding {
                    kind: BindingKind::LoopVar,
-                    used: None,
+                    runtime_usage: None,
+                    synthetic_usage: None,
+                    typing_usage: None,
                    range: Range::from_located(expr),
                    source: Some(self.current_stmt().clone()),
                },
@@ -3980,7 +4059,9 @@ impl<'a> Checker<'a> {
                id,
                Binding {
                    kind: BindingKind::Binding,
-                    used: None,
+                    runtime_usage: None,
+                    synthetic_usage: None,
+                    typing_usage: None,
                    range: Range::from_located(expr),
                    source: Some(self.current_stmt().clone()),
                },
@@ -4030,7 +4111,9 @@ impl<'a> Checker<'a> {
                            current,
                            &self.bindings,
                        )),
-                        used: None,
+                        runtime_usage: None,
+                        synthetic_usage: None,
+                        typing_usage: None,
                        range: Range::from_located(expr),
                        source: Some(self.current_stmt().clone()),
                    },
@@ -4043,7 +4126,9 @@ impl<'a> Checker<'a> {
            id,
            Binding {
                kind: BindingKind::Assignment,
-                used: None,
+                runtime_usage: None,
+                synthetic_usage: None,
+                typing_usage: None,
                range: Range::from_located(expr),
                source: Some(self.current_stmt().clone()),
            },
@@ -4223,14 +4308,30 @@ impl<'a> Checker<'a> {
    }

    fn check_dead_scopes(&mut self) {
-        if !self.settings.rules.enabled(&Rule::UnusedImport)
-            && !self.settings.rules.enabled(&Rule::ImportStarUsage)
-            && !self.settings.rules.enabled(&Rule::RedefinedWhileUnused)
-            && !self.settings.rules.enabled(&Rule::UndefinedExport)
-            && !self
+        if !(self.settings.rules.enabled(&Rule::UnusedImport)
+            || self.settings.rules.enabled(&Rule::ImportStarUsage)
+            || self.settings.rules.enabled(&Rule::RedefinedWhileUnused)
+            || self.settings.rules.enabled(&Rule::UndefinedExport)
+            || self
                .settings
                .rules
                .enabled(&Rule::GlobalVariableNotAssigned)
+            || self
+                .settings
+                .rules
+                .enabled(&Rule::RuntimeImportInTypeCheckingBlock)
+            || self
+                .settings
+                .rules
+                .enabled(&Rule::TypingOnlyFirstPartyImport)
+            || self
+                .settings
+                .rules
+                .enabled(&Rule::TypingOnlyThirdPartyImport)
+            || self
+                .settings
+                .rules
+                .enabled(&Rule::TypingOnlyStandardLibraryImport))
        {
            return;
        }
@@ -4307,7 +4408,7 @@ impl<'a> Checker<'a> {
                            | BindingKind::FutureImportation
                    ) {
                        // Skip used exports from `__all__`
-                        if binding.used.is_some()
+                        if binding.used()
                            || all_names
                                .as_ref()
                                .map(|names| names.contains(name))
@@ -4363,6 +4464,53 @@ impl<'a> Checker<'a> {
                }
            }

+            if self
+                .settings
+                .rules
+                .enabled(&Rule::RuntimeImportInTypeCheckingBlock)
+                || self
+                    .settings
+                    .rules
+                    .enabled(&Rule::TypingOnlyFirstPartyImport)
+                || self
+                    .settings
+                    .rules
+                    .enabled(&Rule::TypingOnlyThirdPartyImport)
+                || self
+                    .settings
+                    .rules
+                    .enabled(&Rule::TypingOnlyStandardLibraryImport)
+            {
+                for (.., index) in scope
+                    .values
+                    .iter()
+                    .chain(scope.overridden.iter().map(|(a, b)| (a, b)))
+                {
+                    let binding = &self.bindings[*index];
+
+                    if let Some(diagnostic) =
+                        flake8_type_checking::rules::runtime_import_in_type_checking_block(
+                            binding,
+                            &self.type_checking_blocks,
+                        )
+                    {
+                        diagnostics.push(diagnostic);
+                    }
+                    if let Some(diagnostic) =
+                        flake8_type_checking::rules::typing_only_runtime_import(
+                            binding,
+                            &self.type_checking_blocks,
+                            self.package,
+                            self.settings,
+                        )
+                    {
+                        if self.settings.rules.enabled(diagnostic.kind.rule()) {
+                            diagnostics.push(diagnostic);
+                        }
+                    }
+                }
+            }
+
            if self.settings.rules.enabled(&Rule::UnusedImport) {
                // Collect all unused imports by location. (Multiple unused imports at the same
                // location indicates an `import from`.)
@@ -4389,7 +4537,7 @@ impl<'a> Checker<'a> {
                    };

                    // Skip used exports from `__all__`
-                    if binding.used.is_some()
+                    if binding.used()
                        || all_names
                            .as_ref()
                            .map(|names| names.contains(name))
@@ -4855,6 +5003,7 @@ pub fn check_ast(
    autofix: flags::Autofix,
    noqa: flags::Noqa,
    path: &Path,
+    package: Option<&Path>,
 ) -> Vec<Diagnostic> {
    let mut checker = Checker::new(
        settings,
@@ -4862,6 +5011,7 @@ pub fn check_ast(
        autofix,
        noqa,
        path,
+        package,
        locator,
        stylist,
        indexer,
--- a/src/checkers/lines.rs
+++ b/src/checkers/lines.rs
@@ -1,8 +1,12 @@
 //! Lint rules based on checking raw physical lines.

+use std::path::Path;
+
 use crate::registry::{Diagnostic, Rule};
-use crate::rules::flake8_executable::helpers::extract_shebang;
-use crate::rules::flake8_executable::rules::{shebang_newline, shebang_python, shebang_whitespace};
+use crate::rules::flake8_executable::helpers::{extract_shebang, ShebangDirective};
+use crate::rules::flake8_executable::rules::{
+    shebang_missing, shebang_newline, shebang_not_executable, shebang_python, shebang_whitespace,
+};
 use crate::rules::pycodestyle::rules::{
    doc_line_too_long, line_too_long, mixed_spaces_and_tabs, no_newline_at_end_of_file,
 };
@@ -11,6 +15,7 @@ use crate::rules::pyupgrade::rules::unnecessary_coding_comment;
 use crate::settings::{flags, Settings};

 pub fn check_lines(
+    path: &Path,
    contents: &str,
    commented_lines: &[usize],
    doc_lines: &[usize],
@@ -18,8 +23,11 @@ pub fn check_lines(
    autofix: flags::Autofix,
 ) -> Vec<Diagnostic> {
    let mut diagnostics: Vec<Diagnostic> = vec![];
+    let mut has_any_shebang = false;

    let enforce_blanket_noqa = settings.rules.enabled(&Rule::BlanketNOQA);
+    let enforce_shebang_not_executable = settings.rules.enabled(&Rule::ShebangNotExecutable);
+    let enforce_shebang_missing = settings.rules.enabled(&Rule::ShebangMissingExecutableFile);
    let enforce_shebang_whitespace = settings.rules.enabled(&Rule::ShebangWhitespace);
    let enforce_shebang_newline = settings.rules.enabled(&Rule::ShebangNewline);
    let enforce_shebang_python = settings.rules.enabled(&Rule::ShebangPython);
@@ -68,8 +76,23 @@ pub fn check_lines(
                }
            }

-            if enforce_shebang_whitespace || enforce_shebang_newline || enforce_shebang_python {
+            if enforce_shebang_missing
+                || enforce_shebang_not_executable
+                || enforce_shebang_whitespace
+                || enforce_shebang_newline
+                || enforce_shebang_python
+            {
                let shebang = extract_shebang(line);
+                if enforce_shebang_not_executable {
+                    if let Some(diagnostic) = shebang_not_executable(path, index, &shebang) {
+                        diagnostics.push(diagnostic);
+                    }
+                }
+                if enforce_shebang_missing {
+                    if !has_any_shebang && matches!(shebang, ShebangDirective::Match(_, _, _, _)) {
+                        has_any_shebang = true;
+                    }
+                }
                if enforce_shebang_whitespace {
                    if let Some(diagnostic) =
                        shebang_whitespace(index, &shebang, fix_shebang_whitespace)
@@ -124,12 +147,20 @@ pub fn check_lines(
        }
    }

+    if enforce_shebang_missing && !has_any_shebang {
+        if let Some(diagnostic) = shebang_missing(path) {
+            diagnostics.push(diagnostic);
+        }
+    }
+
    diagnostics
 }

 #[cfg(test)]
 mod tests {

+    use std::path::Path;
+
    use super::check_lines;
    use crate::registry::Rule;
    use crate::settings::{flags, Settings};
@@ -139,6 +170,7 @@ mod tests {
        let line = "'\u{4e9c}' * 2"; // 7 in UTF-32, 9 in UTF-8.
        let check_with_max_line_length = |line_length: usize| {
            check_lines(
+                Path::new("foo.py"),
                line,
                &[],
                &[],
--- a/src/checkers/noqa.rs
+++ b/src/checkers/noqa.rs
@@ -6,7 +6,8 @@ use rustpython_parser::ast::Location;
 use crate::ast::types::Range;
 use crate::fix::Fix;
 use crate::noqa::{is_file_exempt, Directive};
-use crate::registry::{Diagnostic, DiagnosticKind, Rule, CODE_REDIRECTS};
+use crate::registry::{Diagnostic, DiagnosticKind, Rule};
+use crate::rule_redirects::get_redirect_target;
 use crate::settings::{flags, Settings};
 use crate::violations::UnusedCodes;
 use crate::{noqa, violations};
@@ -123,7 +124,7 @@ pub fn check_noqa(
                    let mut valid_codes = vec![];
                    let mut self_ignore = false;
                    for code in codes {
-                        let code = CODE_REDIRECTS.get(code).map_or(code, |r| r.code());
+                        let code = get_redirect_target(code).unwrap_or(code);
                        if code == Rule::UnusedNOQA.code() {
                            self_ignore = true;
                            break;
--- a/src/checkers/tokens.rs
+++ b/src/checkers/tokens.rs
@@ -124,9 +124,12 @@ pub fn check_tokens(
    // ISC001, ISC002
    if enforce_implicit_string_concatenation {
        diagnostics.extend(
-            flake8_implicit_str_concat::rules::implicit(tokens)
-                .into_iter()
-                .filter(|diagnostic| settings.rules.enabled(diagnostic.kind.rule())),
+            flake8_implicit_str_concat::rules::implicit(
+                tokens,
+                &settings.flake8_implicit_str_concat,
+            )
+            .into_iter()
+            .filter(|diagnostic| settings.rules.enabled(diagnostic.kind.rule())),
        );
    }

--- a/src/flake8_to_ruff/converter.rs
+++ b/src/flake8_to_ruff/converter.rs
@@ -1,12 +1,12 @@
 use std::collections::{BTreeSet, HashMap};

 use anyhow::Result;
-use colored::Colorize;

 use super::external_config::ExternalConfig;
 use super::plugin::Plugin;
 use super::{parser, plugin};
-use crate::registry::RuleSelector;
+use crate::registry::RuleCodePrefix;
+use crate::rule_selector::{prefix_to_selector, RuleSelector};
 use crate::rules::flake8_pytest_style::types::{
    ParametrizeNameType, ParametrizeValuesRowType, ParametrizeValuesType,
 };
@@ -21,6 +21,12 @@ use crate::settings::options::Options;
 use crate::settings::pyproject::Pyproject;
 use crate::warn_user;

+const DEFAULT_SELECTORS: &[RuleSelector] = &[
+    prefix_to_selector(RuleCodePrefix::F),
+    prefix_to_selector(RuleCodePrefix::E),
+    prefix_to_selector(RuleCodePrefix::W),
+];
+
 pub fn convert(
    config: &HashMap<String, HashMap<String, Option<String>>>,
    external_config: &ExternalConfig,
@@ -76,7 +82,7 @@ pub fn convert(
                .as_ref()
                .map(|value| BTreeSet::from_iter(parser::parse_prefix_codes(value)))
        })
-        .unwrap_or_else(|| plugin::resolve_select(&plugins));
+        .unwrap_or_else(|| resolve_select(&plugins));
    let mut ignore = flake8
        .get("ignore")
        .and_then(|value| {
@@ -406,21 +412,47 @@ pub fn convert(
    Ok(Pyproject::new(options))
 }

+/// Resolve the set of enabled `RuleSelector` values for the given
+/// plugins.
+fn resolve_select(plugins: &[Plugin]) -> BTreeSet<RuleSelector> {
+    let mut select: BTreeSet<_> = DEFAULT_SELECTORS.iter().cloned().collect();
+    select.extend(plugins.iter().map(Plugin::selector));
+    select
+}
+
 #[cfg(test)]
 mod tests {
    use std::collections::HashMap;

    use anyhow::Result;
+    use itertools::Itertools;

    use super::super::plugin::Plugin;
    use super::convert;
+    use crate::flake8_to_ruff::converter::DEFAULT_SELECTORS;
    use crate::flake8_to_ruff::ExternalConfig;
-    use crate::registry::RuleSelector;
+    use crate::registry::RuleCodePrefix;
+    use crate::rule_selector::RuleSelector;
    use crate::rules::pydocstyle::settings::Convention;
    use crate::rules::{flake8_quotes, pydocstyle};
    use crate::settings::options::Options;
    use crate::settings::pyproject::Pyproject;

+    fn default_options(plugins: impl IntoIterator<Item = RuleSelector>) -> Options {
+        Options {
+            ignore: Some(vec![]),
+            select: Some(
+                DEFAULT_SELECTORS
+                    .iter()
+                    .cloned()
+                    .chain(plugins)
+                    .sorted()
+                    .collect(),
+            ),
+            ..Options::default()
+        }
+    }
+
    #[test]
    fn it_converts_empty() -> Result<()> {
        let actual = convert(
@@ -428,55 +460,7 @@ mod tests {
            &ExternalConfig::default(),
            None,
        )?;
-        let expected = Pyproject::new(Options {
-            allowed_confusables: None,
-            builtins: None,
-            cache_dir: None,
-            dummy_variable_rgx: None,
-            exclude: None,
-            extend: None,
-            extend_exclude: None,
-            extend_ignore: None,
-            extend_select: None,
-            external: None,
-            fix: None,
-            fix_only: None,
-            fixable: None,
-            format: None,
-            force_exclude: None,
-            ignore: Some(vec![]),
-            ignore_init_module_imports: None,
-            line_length: None,
-            namespace_packages: None,
-            per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
-            select: Some(vec![RuleSelector::E, RuleSelector::F, RuleSelector::W]),
-            show_source: None,
-            src: None,
-            target_version: None,
-            unfixable: None,
-            typing_modules: None,
-            task_tags: None,
-            update_check: None,
-            flake8_annotations: None,
-            flake8_bandit: None,
-            flake8_bugbear: None,
-            flake8_builtins: None,
-            flake8_errmsg: None,
-            flake8_pytest_style: None,
-            flake8_quotes: None,
-            flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
-            isort: None,
-            mccabe: None,
-            pep8_naming: None,
-            pycodestyle: None,
-            pydocstyle: None,
-            pylint: None,
-            pyupgrade: None,
-        });
+        let expected = Pyproject::new(default_options([]));
        assert_eq!(actual, expected);

        Ok(())
@@ -493,53 +477,8 @@ mod tests {
            Some(vec![]),
        )?;
        let expected = Pyproject::new(Options {
-            allowed_confusables: None,
-            builtins: None,
-            cache_dir: None,
-            dummy_variable_rgx: None,
-            exclude: None,
-            extend: None,
-            extend_exclude: None,
-            extend_ignore: None,
-            extend_select: None,
-            external: None,
-            fix: None,
-            fix_only: None,
-            fixable: None,
-            format: None,
-            force_exclude: None,
-            ignore: Some(vec![]),
-            ignore_init_module_imports: None,
            line_length: Some(100),
-            namespace_packages: None,
-            per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
-            select: Some(vec![RuleSelector::E, RuleSelector::F, RuleSelector::W]),
-            show_source: None,
-            src: None,
-            target_version: None,
-            unfixable: None,
-            typing_modules: None,
-            task_tags: None,
-            update_check: None,
-            flake8_annotations: None,
-            flake8_bandit: None,
-            flake8_bugbear: None,
-            flake8_builtins: None,
-            flake8_errmsg: None,
-            flake8_pytest_style: None,
-            flake8_quotes: None,
-            flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
-            isort: None,
-            mccabe: None,
-            pep8_naming: None,
-            pycodestyle: None,
-            pydocstyle: None,
-            pylint: None,
-            pyupgrade: None,
+            ..default_options([])
        });
        assert_eq!(actual, expected);

@@ -557,53 +496,8 @@ mod tests {
            Some(vec![]),
        )?;
        let expected = Pyproject::new(Options {
-            allowed_confusables: None,
-            builtins: None,
-            cache_dir: None,
-            dummy_variable_rgx: None,
-            exclude: None,
-            extend: None,
-            extend_exclude: None,
-            extend_ignore: None,
-            extend_select: None,
-            external: None,
-            fix: None,
-            fix_only: None,
-            fixable: None,
-            format: None,
-            force_exclude: None,
-            ignore: Some(vec![]),
-            ignore_init_module_imports: None,
            line_length: Some(100),
-            namespace_packages: None,
-            per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
-            select: Some(vec![RuleSelector::E, RuleSelector::F, RuleSelector::W]),
-            show_source: None,
-            src: None,
-            target_version: None,
-            unfixable: None,
-            typing_modules: None,
-            task_tags: None,
-            update_check: None,
-            flake8_annotations: None,
-            flake8_bandit: None,
-            flake8_bugbear: None,
-            flake8_builtins: None,
-            flake8_errmsg: None,
-            flake8_pytest_style: None,
-            flake8_quotes: None,
-            flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
-            isort: None,
-            mccabe: None,
-            pep8_naming: None,
-            pycodestyle: None,
-            pydocstyle: None,
-            pylint: None,
-            pyupgrade: None,
+            ..default_options([])
        });
        assert_eq!(actual, expected);

@@ -620,55 +514,7 @@ mod tests {
            &ExternalConfig::default(),
            Some(vec![]),
        )?;
-        let expected = Pyproject::new(Options {
-            allowed_confusables: None,
-            builtins: None,
-            cache_dir: None,
-            dummy_variable_rgx: None,
-            exclude: None,
-            extend: None,
-            extend_exclude: None,
-            extend_ignore: None,
-            extend_select: None,
-            external: None,
-            fix: None,
-            fix_only: None,
-            fixable: None,
-            format: None,
-            force_exclude: None,
-            ignore: Some(vec![]),
-            ignore_init_module_imports: None,
-            line_length: None,
-            namespace_packages: None,
-            per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
-            select: Some(vec![RuleSelector::E, RuleSelector::F, RuleSelector::W]),
-            show_source: None,
-            src: None,
-            target_version: None,
-            unfixable: None,
-            typing_modules: None,
-            task_tags: None,
-            update_check: None,
-            flake8_annotations: None,
-            flake8_bandit: None,
-            flake8_bugbear: None,
-            flake8_builtins: None,
-            flake8_errmsg: None,
-            flake8_pytest_style: None,
-            flake8_quotes: None,
-            flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
-            isort: None,
-            mccabe: None,
-            pep8_naming: None,
-            pycodestyle: None,
-            pydocstyle: None,
-            pylint: None,
-            pyupgrade: None,
-        });
+        let expected = Pyproject::new(default_options([]));
        assert_eq!(actual, expected);

        Ok(())
@@ -685,58 +531,13 @@ mod tests {
            Some(vec![]),
        )?;
        let expected = Pyproject::new(Options {
-            allowed_confusables: None,
-            builtins: None,
-            cache_dir: None,
-            dummy_variable_rgx: None,
-            exclude: None,
-            extend: None,
-            extend_exclude: None,
-            extend_ignore: None,
-            extend_select: None,
-            external: None,
-            fix: None,
-            fix_only: None,
-            fixable: None,
-            format: None,
-            force_exclude: None,
-            ignore: Some(vec![]),
-            ignore_init_module_imports: None,
-            line_length: None,
-            namespace_packages: None,
-            per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
-            select: Some(vec![RuleSelector::E, RuleSelector::F, RuleSelector::W]),
-            show_source: None,
-            src: None,
-            target_version: None,
-            unfixable: None,
-            typing_modules: None,
-            task_tags: None,
-            update_check: None,
-            flake8_annotations: None,
-            flake8_bandit: None,
-            flake8_bugbear: None,
-            flake8_builtins: None,
-            flake8_errmsg: None,
-            flake8_pytest_style: None,
            flake8_quotes: Some(flake8_quotes::settings::Options {
                inline_quotes: Some(flake8_quotes::settings::Quote::Single),
                multiline_quotes: None,
                docstring_quotes: None,
                avoid_escape: None,
            }),
-            flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
-            isort: None,
-            mccabe: None,
-            pep8_naming: None,
-            pycodestyle: None,
-            pydocstyle: None,
-            pylint: None,
-            pyupgrade: None,
+            ..default_options([])
        });
        assert_eq!(actual, expected);

@@ -757,60 +558,10 @@ mod tests {
            Some(vec![Plugin::Flake8Docstrings]),
        )?;
        let expected = Pyproject::new(Options {
-            allowed_confusables: None,
-            builtins: None,
-            cache_dir: None,
-            dummy_variable_rgx: None,
-            exclude: None,
-            extend: None,
-            extend_exclude: None,
-            extend_ignore: None,
-            extend_select: None,
-            external: None,
-            fix: None,
-            fix_only: None,
-            fixable: None,
-            format: None,
-            force_exclude: None,
-            ignore: Some(vec![]),
-            ignore_init_module_imports: None,
-            line_length: None,
-            namespace_packages: None,
-            per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
-            select: Some(vec![
-                RuleSelector::D,
-                RuleSelector::E,
-                RuleSelector::F,
-                RuleSelector::W,
-            ]),
-            show_source: None,
-            src: None,
-            target_version: None,
-            unfixable: None,
-            typing_modules: None,
-            task_tags: None,
-            update_check: None,
-            flake8_annotations: None,
-            flake8_bandit: None,
-            flake8_bugbear: None,
-            flake8_builtins: None,
-            flake8_errmsg: None,
-            flake8_pytest_style: None,
-            flake8_quotes: None,
-            flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
-            isort: None,
-            mccabe: None,
-            pep8_naming: None,
-            pycodestyle: None,
            pydocstyle: Some(pydocstyle::settings::Options {
                convention: Some(Convention::Numpy),
            }),
-            pylint: None,
-            pyupgrade: None,
+            ..default_options([RuleCodePrefix::D.into()])
        });
        assert_eq!(actual, expected);

@@ -828,63 +579,13 @@ mod tests {
            None,
        )?;
        let expected = Pyproject::new(Options {
-            allowed_confusables: None,
-            builtins: None,
-            cache_dir: None,
-            dummy_variable_rgx: None,
-            exclude: None,
-            extend: None,
-            extend_exclude: None,
-            extend_ignore: None,
-            extend_select: None,
-            external: None,
-            fix: None,
-            fix_only: None,
-            fixable: None,
-            format: None,
-            force_exclude: None,
-            ignore: Some(vec![]),
-            ignore_init_module_imports: None,
-            line_length: None,
-            namespace_packages: None,
-            per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
-            select: Some(vec![
-                RuleSelector::E,
-                RuleSelector::F,
-                RuleSelector::Q,
-                RuleSelector::W,
-            ]),
-            show_source: None,
-            src: None,
-            target_version: None,
-            unfixable: None,
-            typing_modules: None,
-            task_tags: None,
-            update_check: None,
-            flake8_annotations: None,
-            flake8_bandit: None,
-            flake8_bugbear: None,
-            flake8_builtins: None,
-            flake8_errmsg: None,
-            flake8_pytest_style: None,
            flake8_quotes: Some(flake8_quotes::settings::Options {
                inline_quotes: Some(flake8_quotes::settings::Quote::Single),
                multiline_quotes: None,
                docstring_quotes: None,
                avoid_escape: None,
            }),
-            flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
-            isort: None,
-            mccabe: None,
-            pep8_naming: None,
-            pycodestyle: None,
-            pydocstyle: None,
-            pylint: None,
-            pyupgrade: None,
+            ..default_options([RuleCodePrefix::Q.into()])
        });
        assert_eq!(actual, expected);

--- a/src/flake8_to_ruff/parser.rs
+++ b/src/flake8_to_ruff/parser.rs
@@ -1,12 +1,11 @@
 use std::str::FromStr;

 use anyhow::{bail, Result};
-use colored::Colorize;
 use once_cell::sync::Lazy;
 use regex::Regex;
 use rustc_hash::FxHashMap;

-use crate::registry::{RuleSelector, PREFIX_REDIRECTS};
+use crate::rule_selector::RuleSelector;
 use crate::settings::types::PatternPrefixPair;
 use crate::warn_user;

@@ -21,9 +20,7 @@ pub fn parse_prefix_codes(value: &str) -> Vec<RuleSelector> {
        if code.is_empty() {
            continue;
        }
-        if let Some(code) = PREFIX_REDIRECTS.get(code) {
-            codes.push(code.clone());
-        } else if let Ok(code) = RuleSelector::from_str(code) {
+        if let Ok(code) = RuleSelector::from_str(code) {
            codes.push(code);
        } else {
            warn_user!("Unsupported prefix code: {code}");
@@ -89,14 +86,7 @@ impl State {
    fn parse(&self) -> Vec<PatternPrefixPair> {
        let mut codes: Vec<PatternPrefixPair> = vec![];
        for code in &self.codes {
-            if let Some(code) = PREFIX_REDIRECTS.get(code.as_str()) {
-                for filename in &self.filenames {
-                    codes.push(PatternPrefixPair {
-                        pattern: filename.clone(),
-                        prefix: code.clone(),
-                    });
-                }
-            } else if let Ok(code) = RuleSelector::from_str(code) {
+            if let Ok(code) = RuleSelector::from_str(code) {
                for filename in &self.filenames {
                    codes.push(PatternPrefixPair {
                        pattern: filename.clone(),
@@ -206,7 +196,8 @@ mod tests {
    use anyhow::Result;

    use super::{parse_files_to_codes_mapping, parse_prefix_codes, parse_strings};
-    use crate::registry::RuleSelector;
+    use crate::registry::RuleCodePrefix;
+    use crate::rule_selector::RuleSelector;
    use crate::settings::types::PatternPrefixPair;

    #[test]
@@ -220,19 +211,19 @@ mod tests {
        assert_eq!(actual, expected);

        let actual = parse_prefix_codes("F401");
-        let expected = vec![RuleSelector::F401];
+        let expected = vec![RuleCodePrefix::F401.into()];
        assert_eq!(actual, expected);

        let actual = parse_prefix_codes("F401,");
-        let expected = vec![RuleSelector::F401];
+        let expected = vec![RuleCodePrefix::F401.into()];
        assert_eq!(actual, expected);

        let actual = parse_prefix_codes("F401,E501");
-        let expected = vec![RuleSelector::F401, RuleSelector::E501];
+        let expected = vec![RuleCodePrefix::F401.into(), RuleCodePrefix::E501.into()];
        assert_eq!(actual, expected);

        let actual = parse_prefix_codes("F401, E501");
-        let expected = vec![RuleSelector::F401, RuleSelector::E501];
+        let expected = vec![RuleCodePrefix::F401.into(), RuleCodePrefix::E501.into()];
        assert_eq!(actual, expected);
    }

@@ -285,11 +276,11 @@ mod tests {
        let expected: Vec<PatternPrefixPair> = vec![
            PatternPrefixPair {
                pattern: "locust/test/*".to_string(),
-                prefix: RuleSelector::F841,
+                prefix: RuleCodePrefix::F841.into(),
            },
            PatternPrefixPair {
                pattern: "examples/*".to_string(),
-                prefix: RuleSelector::F841,
+                prefix: RuleCodePrefix::F841.into(),
            },
        ];
        assert_eq!(actual, expected);
@@ -305,23 +296,23 @@ mod tests {
        let expected: Vec<PatternPrefixPair> = vec![
            PatternPrefixPair {
                pattern: "t/*".to_string(),
-                prefix: RuleSelector::D,
+                prefix: RuleCodePrefix::D.into(),
            },
            PatternPrefixPair {
                pattern: "setup.py".to_string(),
-                prefix: RuleSelector::D,
+                prefix: RuleCodePrefix::D.into(),
            },
            PatternPrefixPair {
                pattern: "examples/*".to_string(),
-                prefix: RuleSelector::D,
+                prefix: RuleCodePrefix::D.into(),
            },
            PatternPrefixPair {
                pattern: "docs/*".to_string(),
-                prefix: RuleSelector::D,
+                prefix: RuleCodePrefix::D.into(),
            },
            PatternPrefixPair {
                pattern: "extra/*".to_string(),
-                prefix: RuleSelector::D,
+                prefix: RuleCodePrefix::D.into(),
            },
        ];
        assert_eq!(actual, expected);
@@ -343,47 +334,47 @@ mod tests {
        let expected: Vec<PatternPrefixPair> = vec![
            PatternPrefixPair {
                pattern: "scrapy/__init__.py".to_string(),
-                prefix: RuleSelector::E402,
+                prefix: RuleCodePrefix::E402.into(),
            },
            PatternPrefixPair {
                pattern: "scrapy/core/downloader/handlers/http.py".to_string(),
-                prefix: RuleSelector::F401,
+                prefix: RuleCodePrefix::F401.into(),
            },
            PatternPrefixPair {
                pattern: "scrapy/http/__init__.py".to_string(),
-                prefix: RuleSelector::F401,
+                prefix: RuleCodePrefix::F401.into(),
            },
            PatternPrefixPair {
                pattern: "scrapy/linkextractors/__init__.py".to_string(),
-                prefix: RuleSelector::E402,
+                prefix: RuleCodePrefix::E402.into(),
            },
            PatternPrefixPair {
                pattern: "scrapy/linkextractors/__init__.py".to_string(),
-                prefix: RuleSelector::F401,
+                prefix: RuleCodePrefix::F401.into(),
            },
            PatternPrefixPair {
                pattern: "scrapy/selector/__init__.py".to_string(),
-                prefix: RuleSelector::F401,
+                prefix: RuleCodePrefix::F401.into(),
            },
            PatternPrefixPair {
                pattern: "scrapy/spiders/__init__.py".to_string(),
-                prefix: RuleSelector::E402,
+                prefix: RuleCodePrefix::E402.into(),
            },
            PatternPrefixPair {
                pattern: "scrapy/spiders/__init__.py".to_string(),
-                prefix: RuleSelector::F401,
+                prefix: RuleCodePrefix::F401.into(),
            },
            PatternPrefixPair {
                pattern: "scrapy/utils/url.py".to_string(),
-                prefix: RuleSelector::F403,
+                prefix: RuleCodePrefix::F403.into(),
            },
            PatternPrefixPair {
                pattern: "scrapy/utils/url.py".to_string(),
-                prefix: RuleSelector::F405,
+                prefix: RuleCodePrefix::F405.into(),
            },
            PatternPrefixPair {
                pattern: "tests/test_loader.py".to_string(),
-                prefix: RuleSelector::E741,
+                prefix: RuleCodePrefix::E741.into(),
            },
        ];
        assert_eq!(actual, expected);
--- a/src/flake8_to_ruff/plugin.rs
+++ b/src/flake8_to_ruff/plugin.rs
@@ -4,32 +4,44 @@ use std::str::FromStr;

 use anyhow::anyhow;

-use crate::registry::RuleSelector;
+use crate::registry::RuleCodePrefix;
+use crate::rule_selector::RuleSelector;

 #[derive(Clone, Ord, PartialOrd, Eq, PartialEq)]
 pub enum Plugin {
+    Flake82020,
    Flake8Annotations,
    Flake8Bandit,
    Flake8BlindExcept,
+    Flake8BooleanTrap,
    Flake8Bugbear,
    Flake8Builtins,
+    Flake8Commas,
    Flake8Comprehensions,
    Flake8Datetimez,
    Flake8Debugger,
    Flake8Docstrings,
    Flake8Eradicate,
    Flake8ErrMsg,
+    Flake8Executable,
    Flake8ImplicitStrConcat,
+    Flake8ImportConventions,
+    Flake8NoPep420,
+    Flake8Pie,
    Flake8Print,
    Flake8PytestStyle,
    Flake8Quotes,
    Flake8Return,
    Flake8Simplify,
    Flake8TidyImports,
+    Flake8TypeChecking,
+    Flake8UnusedArguments,
+    Flake8UsePathlib,
    McCabe,
    PEP8Naming,
    PandasVet,
    Pyupgrade,
+    Tryceratops,
 }

 impl FromStr for Plugin {
@@ -37,28 +49,39 @@ impl FromStr for Plugin {

    fn from_str(string: &str) -> Result<Self, Self::Err> {
        match string {
+            "flake8-2020" => Ok(Plugin::Flake82020),
            "flake8-annotations" => Ok(Plugin::Flake8Annotations),
            "flake8-bandit" => Ok(Plugin::Flake8Bandit),
            "flake8-blind-except" => Ok(Plugin::Flake8BlindExcept),
+            "flake8-boolean-trap" => Ok(Plugin::Flake8BooleanTrap),
            "flake8-bugbear" => Ok(Plugin::Flake8Bugbear),
            "flake8-builtins" => Ok(Plugin::Flake8Builtins),
+            "flake8-commas" => Ok(Plugin::Flake8Commas),
            "flake8-comprehensions" => Ok(Plugin::Flake8Comprehensions),
            "flake8-datetimez" => Ok(Plugin::Flake8Datetimez),
            "flake8-debugger" => Ok(Plugin::Flake8Debugger),
            "flake8-docstrings" => Ok(Plugin::Flake8Docstrings),
            "flake8-eradicate" => Ok(Plugin::Flake8Eradicate),
            "flake8-errmsg" => Ok(Plugin::Flake8ErrMsg),
+            "flake8-executable" => Ok(Plugin::Flake8Executable),
            "flake8-implicit-str-concat" => Ok(Plugin::Flake8ImplicitStrConcat),
+            "flake8-import-conventions" => Ok(Plugin::Flake8ImportConventions),
+            "flake8-no-pep420" => Ok(Plugin::Flake8NoPep420),
+            "flake8-pie" => Ok(Plugin::Flake8Pie),
            "flake8-print" => Ok(Plugin::Flake8Print),
            "flake8-pytest-style" => Ok(Plugin::Flake8PytestStyle),
            "flake8-quotes" => Ok(Plugin::Flake8Quotes),
            "flake8-return" => Ok(Plugin::Flake8Return),
            "flake8-simplify" => Ok(Plugin::Flake8Simplify),
            "flake8-tidy-imports" => Ok(Plugin::Flake8TidyImports),
+            "flake8-type-checking" => Ok(Plugin::Flake8TypeChecking),
+            "flake8-unused-arguments" => Ok(Plugin::Flake8UnusedArguments),
+            "flake8-use-pathlib" => Ok(Plugin::Flake8UsePathlib),
            "mccabe" => Ok(Plugin::McCabe),
-            "pandas-vet" => Ok(Plugin::PandasVet),
            "pep8-naming" => Ok(Plugin::PEP8Naming),
+            "pandas-vet" => Ok(Plugin::PandasVet),
            "pyupgrade" => Ok(Plugin::Pyupgrade),
+            "tryceratops" => Ok(Plugin::Tryceratops),
            _ => Err(anyhow!("Unknown plugin: {string}")),
        }
    }
@@ -70,60 +93,81 @@ impl fmt::Debug for Plugin {
            f,
            "{}",
            match self {
+                Plugin::Flake82020 => "flake8-2020",
                Plugin::Flake8Annotations => "flake8-annotations",
                Plugin::Flake8Bandit => "flake8-bandit",
                Plugin::Flake8BlindExcept => "flake8-blind-except",
+                Plugin::Flake8BooleanTrap => "flake8-boolean-trap",
                Plugin::Flake8Bugbear => "flake8-bugbear",
                Plugin::Flake8Builtins => "flake8-builtins",
+                Plugin::Flake8Commas => "flake8-commas",
                Plugin::Flake8Comprehensions => "flake8-comprehensions",
                Plugin::Flake8Datetimez => "flake8-datetimez",
                Plugin::Flake8Debugger => "flake8-debugger",
                Plugin::Flake8Docstrings => "flake8-docstrings",
                Plugin::Flake8Eradicate => "flake8-eradicate",
                Plugin::Flake8ErrMsg => "flake8-errmsg",
+                Plugin::Flake8Executable => "flake8-executable",
                Plugin::Flake8ImplicitStrConcat => "flake8-implicit-str-concat",
+                Plugin::Flake8ImportConventions => "flake8-import-conventions",
+                Plugin::Flake8NoPep420 => "flake8-no-pep420",
+                Plugin::Flake8Pie => "flake8-pie",
                Plugin::Flake8Print => "flake8-print",
                Plugin::Flake8PytestStyle => "flake8-pytest-style",
                Plugin::Flake8Quotes => "flake8-quotes",
                Plugin::Flake8Return => "flake8-return",
                Plugin::Flake8Simplify => "flake8-simplify",
                Plugin::Flake8TidyImports => "flake8-tidy-imports",
+                Plugin::Flake8TypeChecking => "flake8-type-checking",
+                Plugin::Flake8UnusedArguments => "flake8-unused-arguments",
+                Plugin::Flake8UsePathlib => "flake8-use-pathlib",
                Plugin::McCabe => "mccabe",
                Plugin::PEP8Naming => "pep8-naming",
                Plugin::PandasVet => "pandas-vet",
                Plugin::Pyupgrade => "pyupgrade",
+                Plugin::Tryceratops => "tryceratops",
            }
        )
    }
 }

+// TODO(martin): Convert into `impl From<Plugin> for Linter`
 impl Plugin {
    pub fn selector(&self) -> RuleSelector {
        match self {
-            Plugin::Flake8Annotations => RuleSelector::ANN,
-            Plugin::Flake8Bandit => RuleSelector::S,
-            // TODO(charlie): Handle rename of `B` to `BLE`.
-            Plugin::Flake8BlindExcept => RuleSelector::BLE,
-            Plugin::Flake8Bugbear => RuleSelector::B,
-            Plugin::Flake8Builtins => RuleSelector::A,
-            Plugin::Flake8Comprehensions => RuleSelector::C4,
-            Plugin::Flake8Datetimez => RuleSelector::DTZ,
-            Plugin::Flake8Debugger => RuleSelector::T1,
-            Plugin::Flake8Docstrings => RuleSelector::D,
-            // TODO(charlie): Handle rename of `E` to `ERA`.
-            Plugin::Flake8Eradicate => RuleSelector::ERA,
-            Plugin::Flake8ErrMsg => RuleSelector::EM,
-            Plugin::Flake8ImplicitStrConcat => RuleSelector::ISC,
-            Plugin::Flake8Print => RuleSelector::T2,
-            Plugin::Flake8PytestStyle => RuleSelector::PT,
-            Plugin::Flake8Quotes => RuleSelector::Q,
-            Plugin::Flake8Return => RuleSelector::RET,
-            Plugin::Flake8Simplify => RuleSelector::SIM,
-            Plugin::Flake8TidyImports => RuleSelector::TID25,
-            Plugin::McCabe => RuleSelector::C9,
-            Plugin::PandasVet => RuleSelector::PD,
-            Plugin::PEP8Naming => RuleSelector::N,
-            Plugin::Pyupgrade => RuleSelector::UP,
+            Plugin::Flake82020 => RuleCodePrefix::YTT.into(),
+            Plugin::Flake8Annotations => RuleCodePrefix::ANN.into(),
+            Plugin::Flake8Bandit => RuleCodePrefix::S.into(),
+            Plugin::Flake8BlindExcept => RuleCodePrefix::BLE.into(),
+            Plugin::Flake8BooleanTrap => RuleCodePrefix::FBT.into(),
+            Plugin::Flake8Bugbear => RuleCodePrefix::B.into(),
+            Plugin::Flake8Builtins => RuleCodePrefix::A.into(),
+            Plugin::Flake8Commas => RuleCodePrefix::COM.into(),
+            Plugin::Flake8Comprehensions => RuleCodePrefix::C4.into(),
+            Plugin::Flake8Datetimez => RuleCodePrefix::DTZ.into(),
+            Plugin::Flake8Debugger => RuleCodePrefix::T1.into(),
+            Plugin::Flake8Docstrings => RuleCodePrefix::D.into(),
+            Plugin::Flake8Eradicate => RuleCodePrefix::ERA.into(),
+            Plugin::Flake8ErrMsg => RuleCodePrefix::EM.into(),
+            Plugin::Flake8Executable => RuleCodePrefix::EXE.into(),
+            Plugin::Flake8ImplicitStrConcat => RuleCodePrefix::ISC.into(),
+            Plugin::Flake8ImportConventions => RuleCodePrefix::ICN.into(),
+            Plugin::Flake8NoPep420 => RuleCodePrefix::INP.into(),
+            Plugin::Flake8Pie => RuleCodePrefix::PIE.into(),
+            Plugin::Flake8Print => RuleCodePrefix::T2.into(),
+            Plugin::Flake8PytestStyle => RuleCodePrefix::PT.into(),
+            Plugin::Flake8Quotes => RuleCodePrefix::Q.into(),
+            Plugin::Flake8Return => RuleCodePrefix::RET.into(),
+            Plugin::Flake8Simplify => RuleCodePrefix::SIM.into(),
+            Plugin::Flake8TidyImports => RuleCodePrefix::TID.into(),
+            Plugin::Flake8TypeChecking => RuleCodePrefix::TCH.into(),
+            Plugin::Flake8UnusedArguments => RuleCodePrefix::ARG.into(),
+            Plugin::Flake8UsePathlib => RuleCodePrefix::PTH.into(),
+            Plugin::McCabe => RuleCodePrefix::C9.into(),
+            Plugin::PEP8Naming => RuleCodePrefix::N.into(),
+            Plugin::PandasVet => RuleCodePrefix::PD.into(),
+            Plugin::Pyupgrade => RuleCodePrefix::UP.into(),
+            Plugin::Tryceratops => RuleCodePrefix::TRY.into(),
        }
    }
 }
@@ -250,26 +294,40 @@ pub fn infer_plugins_from_options(flake8: &HashMap<String, Option<String>>) -> V
 /// For example, if the user ignores `ANN101`, we should infer that
 /// `flake8-annotations` is active.
 pub fn infer_plugins_from_codes(selectors: &BTreeSet<RuleSelector>) -> Vec<Plugin> {
+    // Ignore cases in which we've knowingly changed rule prefixes.
    [
+        Plugin::Flake82020,
        Plugin::Flake8Annotations,
        Plugin::Flake8Bandit,
-        Plugin::Flake8BlindExcept,
+        // Plugin::Flake8BlindExcept,
+        Plugin::Flake8BooleanTrap,
        Plugin::Flake8Bugbear,
        Plugin::Flake8Builtins,
+        // Plugin::Flake8Commas,
        Plugin::Flake8Comprehensions,
        Plugin::Flake8Datetimez,
        Plugin::Flake8Debugger,
        Plugin::Flake8Docstrings,
-        Plugin::Flake8Eradicate,
+        // Plugin::Flake8Eradicate,
        Plugin::Flake8ErrMsg,
+        Plugin::Flake8Executable,
        Plugin::Flake8ImplicitStrConcat,
+        // Plugin::Flake8ImportConventions,
+        Plugin::Flake8NoPep420,
+        Plugin::Flake8Pie,
        Plugin::Flake8Print,
+        Plugin::Flake8PytestStyle,
        Plugin::Flake8Quotes,
        Plugin::Flake8Return,
        Plugin::Flake8Simplify,
-        Plugin::Flake8TidyImports,
-        Plugin::PandasVet,
+        // Plugin::Flake8TidyImports,
+        // Plugin::Flake8TypeChecking,
+        Plugin::Flake8UnusedArguments,
+        // Plugin::Flake8UsePathlib,
+        Plugin::McCabe,
        Plugin::PEP8Naming,
+        Plugin::PandasVet,
+        Plugin::Tryceratops,
    ]
    .into_iter()
    .filter(|plugin| {
@@ -286,14 +344,6 @@ pub fn infer_plugins_from_codes(selectors: &BTreeSet<RuleSelector>) -> Vec<Plugi
    .collect()
 }

-/// Resolve the set of enabled `RuleSelector` values for the given
-/// plugins.
-pub fn resolve_select(plugins: &[Plugin]) -> BTreeSet<RuleSelector> {
-    let mut select = BTreeSet::from([RuleSelector::F, RuleSelector::E, RuleSelector::W]);
-    select.extend(plugins.iter().map(Plugin::selector));
-    select
-}
-
 #[cfg(test)]
 mod tests {
    use std::collections::HashMap;
--- a/src/flake8_to_ruff/pyproject.rs
+++ b/src/flake8_to_ruff/pyproject.rs
@@ -19,6 +19,6 @@ pub struct Pyproject {

 pub fn parse<P: AsRef<Path>>(path: P) -> Result<Pyproject> {
    let contents = std::fs::read_to_string(path)?;
-    let pyproject = toml_edit::easy::from_str::<Pyproject>(&contents)?;
+    let pyproject = toml::from_str::<Pyproject>(&contents)?;
    Ok(pyproject)
 }
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,6 +4,8 @@
 //! and subject to change drastically.
 //!
 //! [Ruff]: https://github.com/charliermarsh/ruff
+#![forbid(unsafe_code)]
+#![warn(clippy::pedantic)]
 #![allow(
    clippy::collapsible_else_if,
    clippy::collapsible_if,
@@ -16,7 +18,6 @@
    clippy::similar_names,
    clippy::too_many_lines
 )]
-#![forbid(unsafe_code)]

 mod ast;
 mod autofix;
@@ -37,6 +38,8 @@ mod noqa;
 mod python;
 pub mod registry;
 pub mod resolver;
+mod rule_redirects;
+mod rule_selector;
 mod rules;
 mod rustpython_helpers;
 pub mod settings;
@@ -47,6 +50,7 @@ mod violations;
 mod visibility;

 use cfg_if::cfg_if;
+pub use rule_selector::RuleSelector;
 pub use violation::{AutofixKind, Availability as AutofixAvailability};
 pub use violations::IOError;

--- a/src/lib_wasm.rs
+++ b/src/lib_wasm.rs
@@ -10,9 +10,9 @@ use crate::linter::check_path;
 use crate::registry::Rule;
 use crate::rules::{
    flake8_annotations, flake8_bandit, flake8_bugbear, flake8_builtins, flake8_errmsg,
-    flake8_import_conventions, flake8_pytest_style, flake8_quotes, flake8_tidy_imports,
-    flake8_unused_arguments, isort, mccabe, pep8_naming, pycodestyle, pydocstyle, pylint,
-    pyupgrade,
+    flake8_implicit_str_concat, flake8_import_conventions, flake8_pytest_style, flake8_quotes,
+    flake8_tidy_imports, flake8_unused_arguments, isort, mccabe, pep8_naming, pycodestyle,
+    pydocstyle, pylint, pyupgrade,
 };
 use crate::rustpython_helpers::tokenize;
 use crate::settings::configuration::Configuration;
@@ -142,6 +142,9 @@ pub fn defaultSettings() -> Result<JsValue, JsValue> {
        flake8_pytest_style: Some(flake8_pytest_style::settings::Settings::default().into()),
        flake8_quotes: Some(flake8_quotes::settings::Settings::default().into()),
        flake8_tidy_imports: Some(flake8_tidy_imports::Settings::default().into()),
+        flake8_implicit_str_concat: Some(
+            flake8_implicit_str_concat::settings::Settings::default().into(),
+        ),
        flake8_import_conventions: Some(
            flake8_import_conventions::settings::Settings::default().into(),
        ),
--- a/src/linter.rs
+++ b/src/linter.rs
@@ -98,6 +98,7 @@ pub fn check_path(
                        autofix,
                        noqa,
                        path,
+                        package,
                    ));
                }
                if use_imports {
@@ -141,6 +142,7 @@ pub fn check_path(
        .any(|rule_code| matches!(rule_code.lint_source(), LintSource::Lines))
    {
        diagnostics.extend(check_lines(
+            path,
            contents,
            indexer.commented_lines(),
            &doc_lines,
--- a/src/logging.rs
+++ b/src/logging.rs
@@ -4,6 +4,7 @@ use fern;
 #[macro_export]
 macro_rules! warn_user_once {
    ($($arg:tt)*) => {
+        use colored::Colorize;
        static WARNED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
        if !WARNED.swap(true, std::sync::atomic::Ordering::SeqCst) {
            let message = format!("{}", format_args!($($arg)*));
@@ -20,6 +21,7 @@ macro_rules! warn_user_once {
 #[macro_export]
 macro_rules! warn_user {
    ($($arg:tt)*) => {
+        use colored::Colorize;
        let message = format!("{}", format_args!($($arg)*));
        eprintln!(
            "{}{} {}",
--- a/src/noqa.rs
+++ b/src/noqa.rs
@@ -8,7 +8,8 @@ use once_cell::sync::Lazy;
 use regex::Regex;
 use rustc_hash::{FxHashMap, FxHashSet};

-use crate::registry::{Diagnostic, Rule, CODE_REDIRECTS};
+use crate::registry::{Diagnostic, Rule};
+use crate::rule_redirects::get_redirect_target;
 use crate::settings::hashable::HashableHashSet;
 use crate::source_code::LineEnding;

@@ -71,13 +72,9 @@ pub fn extract_noqa_directive(line: &str) -> Directive {
 /// thereof).
 pub fn includes(needle: &Rule, haystack: &[&str]) -> bool {
    let needle: &str = needle.code();
-    haystack.iter().any(|candidate| {
-        if let Some(candidate) = CODE_REDIRECTS.get(candidate) {
-            needle == candidate.code()
-        } else {
-            &needle == candidate
-        }
-    })
+    haystack
+        .iter()
+        .any(|candidate| needle == get_redirect_target(candidate).unwrap_or(candidate))
 }

 pub fn add_noqa(
--- a/src/registry.rs
+++ b/src/registry.rs
@@ -1,14 +1,13 @@
 //! Registry of [`Rule`] to [`DiagnosticKind`] mappings.

-use once_cell::sync::Lazy;
 use ruff_macros::RuleNamespace;
-use rustc_hash::FxHashMap;
 use rustpython_parser::ast::Location;
 use serde::{Deserialize, Serialize};
 use strum_macros::{AsRefStr, EnumIter};

 use crate::ast::types::Range;
 use crate::fix::Fix;
+use crate::rule_selector::{prefix_to_selector, RuleSelector};
 use crate::violation::Violation;
 use crate::{rules, violations};

@@ -424,15 +423,23 @@ ruff_macros::define_rule_mapping!(
    // flake8-no-pep420
    INP001 => violations::ImplicitNamespacePackage,
    // flake8-executable
+    EXE001 => rules::flake8_executable::rules::ShebangNotExecutable,
+    EXE002 => rules::flake8_executable::rules::ShebangMissingExecutableFile,
    EXE003 => rules::flake8_executable::rules::ShebangPython,
    EXE004 => rules::flake8_executable::rules::ShebangWhitespace,
    EXE005 => rules::flake8_executable::rules::ShebangNewline,
    // flake8-type-checking
-    TYP005 => rules::flake8_type_checking::rules::EmptyTypeCheckingBlock,
+    TCH001 => rules::flake8_type_checking::rules::TypingOnlyFirstPartyImport,
+    TCH002 => rules::flake8_type_checking::rules::TypingOnlyThirdPartyImport,
+    TCH003 => rules::flake8_type_checking::rules::TypingOnlyStandardLibraryImport,
+    TCH004 => rules::flake8_type_checking::rules::RuntimeImportInTypeCheckingBlock,
+    TCH005 => rules::flake8_type_checking::rules::EmptyTypeCheckingBlock,
    // tryceratops
    TRY004 => rules::tryceratops::rules::PreferTypeError,
+    TRY200 => rules::tryceratops::rules::ReraiseNoCause,
    TRY201 => rules::tryceratops::rules::VerboseRaise,
    TRY300 => rules::tryceratops::rules::TryConsiderElse,
+    TRY301 => rules::tryceratops::rules::RaiseWithinTry,
    // flake8-use-pathlib
    PTH100 => rules::flake8_use_pathlib::violations::PathlibAbspath,
    PTH101 => rules::flake8_use_pathlib::violations::PathlibChmod,
@@ -577,7 +584,7 @@ pub enum Linter {
    #[prefix = "EXE"]
    Flake8Executable,
    /// [flake8-type-checking](https://pypi.org/project/flake8-type-checking/)
-    #[prefix = "TYP"]
+    #[prefix = "TCH"]
    Flake8TypeChecking,
    /// [tryceratops](https://pypi.org/project/tryceratops/1.1.0/)
    #[prefix = "TRY"]
@@ -603,19 +610,25 @@ pub trait RuleNamespace: Sized {
 /// The prefix, name and selector for an upstream linter category.
 pub struct LinterCategory(pub &'static str, pub &'static str, pub RuleSelector);

+// TODO(martin): Move these constant definitions back to Linter::categories impl
+// once RuleSelector is an enum with a Linter variant
+const PYCODESTYLE_CATEGORIES: &[LinterCategory] = &[
+    LinterCategory("E", "Error", prefix_to_selector(RuleCodePrefix::E)),
+    LinterCategory("W", "Warning", prefix_to_selector(RuleCodePrefix::W)),
+];
+
+const PYLINT_CATEGORIES: &[LinterCategory] = &[
+    LinterCategory("PLC", "Convention", prefix_to_selector(RuleCodePrefix::PLC)),
+    LinterCategory("PLE", "Error", prefix_to_selector(RuleCodePrefix::PLE)),
+    LinterCategory("PLR", "Refactor", prefix_to_selector(RuleCodePrefix::PLR)),
+    LinterCategory("PLW", "Warning", prefix_to_selector(RuleCodePrefix::PLW)),
+];
+
 impl Linter {
    pub fn categories(&self) -> Option<&'static [LinterCategory]> {
        match self {
-            Linter::Pycodestyle => Some(&[
-                LinterCategory("E", "Error", RuleSelector::E),
-                LinterCategory("W", "Warning", RuleSelector::W),
-            ]),
-            Linter::Pylint => Some(&[
-                LinterCategory("PLC", "Convention", RuleSelector::PLC),
-                LinterCategory("PLE", "Error", RuleSelector::PLE),
-                LinterCategory("PLR", "Refactor", RuleSelector::PLR),
-                LinterCategory("PLW", "Warning", RuleSelector::PLW),
-            ]),
+            Linter::Pycodestyle => Some(PYCODESTYLE_CATEGORIES),
+            Linter::Pylint => Some(PYLINT_CATEGORIES),
            _ => None,
        }
    }
@@ -644,6 +657,8 @@ impl Rule {
            | Rule::MixedSpacesAndTabs
            | Rule::NoNewLineAtEndOfFile
            | Rule::PEP3120UnnecessaryCodingComment
+            | Rule::ShebangMissingExecutableFile
+            | Rule::ShebangNotExecutable
            | Rule::ShebangNewline
            | Rule::ShebangPython
            | Rule::ShebangWhitespace => &LintSource::Lines,
@@ -655,9 +670,9 @@ impl Rule {
            | Rule::BadQuotesInlineString
            | Rule::BadQuotesMultilineString
            | Rule::CommentedOutCode
+            | Rule::MultiLineImplicitStringConcatenation
            | Rule::ExtraneousParentheses
            | Rule::InvalidEscapeSequence
-            | Rule::MultiLineImplicitStringConcatenation
            | Rule::SingleLineImplicitStringConcatenation
            | Rule::TrailingCommaMissing
            | Rule::TrailingCommaOnBareTupleProhibited
@@ -709,60 +724,6 @@ pub const INCOMPATIBLE_CODES: &[(Rule, Rule, &str)] = &[(
     Consider adding `D203` to `ignore`.",
 )];

-/// A hash map from deprecated to latest `Rule`.
-pub static CODE_REDIRECTS: Lazy<FxHashMap<&'static str, Rule>> = Lazy::new(|| {
-    FxHashMap::from_iter([
-        // TODO(charlie): Remove by 2023-01-01.
-        ("U001", Rule::UselessMetaclassType),
-        ("U003", Rule::TypeOfPrimitive),
-        ("U004", Rule::UselessObjectInheritance),
-        ("U005", Rule::DeprecatedUnittestAlias),
-        ("U006", Rule::UsePEP585Annotation),
-        ("U007", Rule::UsePEP604Annotation),
-        ("U008", Rule::SuperCallWithParameters),
-        ("U009", Rule::PEP3120UnnecessaryCodingComment),
-        ("U010", Rule::UnnecessaryFutureImport),
-        ("U011", Rule::LRUCacheWithoutParameters),
-        ("U012", Rule::UnnecessaryEncodeUTF8),
-        ("U013", Rule::ConvertTypedDictFunctionalToClass),
-        ("U014", Rule::ConvertNamedTupleFunctionalToClass),
-        ("U015", Rule::RedundantOpenModes),
-        ("U016", Rule::RemoveSixCompat),
-        ("U017", Rule::DatetimeTimezoneUTC),
-        ("U019", Rule::TypingTextStrAlias),
-        // TODO(charlie): Remove by 2023-02-01.
-        ("I252", Rule::RelativeImports),
-        ("M001", Rule::UnusedNOQA),
-        // TODO(charlie): Remove by 2023-02-01.
-        ("PDV002", Rule::UseOfInplaceArgument),
-        ("PDV003", Rule::UseOfDotIsNull),
-        ("PDV004", Rule::UseOfDotNotNull),
-        ("PDV007", Rule::UseOfDotIx),
-        ("PDV008", Rule::UseOfDotAt),
-        ("PDV009", Rule::UseOfDotIat),
-        ("PDV010", Rule::UseOfDotPivotOrUnstack),
-        ("PDV011", Rule::UseOfDotValues),
-        ("PDV012", Rule::UseOfDotReadTable),
-        ("PDV013", Rule::UseOfDotStack),
-        ("PDV015", Rule::UseOfPdMerge),
-        ("PDV901", Rule::DfIsABadVariableName),
-        // TODO(charlie): Remove by 2023-02-01.
-        ("R501", Rule::UnnecessaryReturnNone),
-        ("R502", Rule::ImplicitReturnValue),
-        ("R503", Rule::ImplicitReturn),
-        ("R504", Rule::UnnecessaryAssign),
-        ("R505", Rule::SuperfluousElseReturn),
-        ("R506", Rule::SuperfluousElseRaise),
-        ("R507", Rule::SuperfluousElseContinue),
-        ("R508", Rule::SuperfluousElseBreak),
-        // TODO(charlie): Remove by 2023-02-01.
-        ("IC001", Rule::ImportAliasIsNotConventional),
-        ("IC002", Rule::ImportAliasIsNotConventional),
-        ("IC003", Rule::ImportAliasIsNotConventional),
-        ("IC004", Rule::ImportAliasIsNotConventional),
-    ])
-});
-
 #[cfg(test)]
 mod tests {
    use strum::IntoEnumIterator;
--- a/src/resolver.rs
+++ b/src/resolver.rs
@@ -240,13 +240,16 @@ pub fn python_files_in_path(

    // Search for `pyproject.toml` files in all parent directories.
    let mut resolver = Resolver::default();
+    let mut seen = FxHashSet::default();
    if matches!(pyproject_strategy, PyprojectDiscovery::Hierarchical(..)) {
        for path in &paths {
            for ancestor in path.ancestors() {
-                if let Some(pyproject) = settings_toml(ancestor)? {
-                    let (root, settings) =
-                        resolve_scoped_settings(&pyproject, &Relativity::Parent, processor)?;
-                    resolver.add(root, settings);
+                if seen.insert(ancestor) {
+                    if let Some(pyproject) = settings_toml(ancestor)? {
+                        let (root, settings) =
+                            resolve_scoped_settings(&pyproject, &Relativity::Parent, processor)?;
+                        resolver.add(root, settings);
+                    }
                }
            }
        }
--- a/src/rule_redirects.rs
+++ b/src/rule_redirects.rs
@@ -0,0 +1,88 @@
+use std::collections::HashMap;
+
+use once_cell::sync::Lazy;
+
+/// Returns the redirect target for the given code.
+pub(crate) fn get_redirect_target(code: &str) -> Option<&'static str> {
+    REDIRECTS.get(code).copied()
+}
+
+/// Returns the code and the redirect target if the given code is a redirect.
+/// (The same code is returned to obtain it with a static lifetime).
+pub(crate) fn get_redirect(code: &str) -> Option<(&'static str, &'static str)> {
+    REDIRECTS.get_key_value(code).map(|(k, v)| (*k, *v))
+}
+
+static REDIRECTS: Lazy<HashMap<&'static str, &'static str>> = Lazy::new(|| {
+    HashMap::from_iter([
+        // TODO(charlie): Remove by 2023-02-01.
+        ("R", "RET"),
+        ("R5", "RET5"),
+        ("R50", "RET50"),
+        ("R501", "RET501"),
+        ("R502", "RET502"),
+        ("R503", "RET503"),
+        ("R504", "RET504"),
+        ("R505", "RET505"),
+        ("R506", "RET506"),
+        ("R507", "RET507"),
+        ("R508", "RET508"),
+        ("IC", "ICN"),
+        ("IC0", "ICN0"),
+        ("IC00", "ICN00"),
+        ("IC001", "ICN001"),
+        ("IC002", "ICN001"),
+        ("IC003", "ICN001"),
+        ("IC004", "ICN001"),
+        // TODO(charlie): Remove by 2023-01-01.
+        ("U", "UP"),
+        ("U0", "UP0"),
+        ("U00", "UP00"),
+        ("U001", "UP001"),
+        ("U003", "UP003"),
+        ("U004", "UP004"),
+        ("U005", "UP005"),
+        ("U006", "UP006"),
+        ("U007", "UP007"),
+        ("U008", "UP008"),
+        ("U009", "UP009"),
+        ("U01", "UP01"),
+        ("U010", "UP010"),
+        ("U011", "UP011"),
+        ("U012", "UP012"),
+        ("U013", "UP013"),
+        ("U014", "UP014"),
+        ("U015", "UP015"),
+        ("U016", "UP016"),
+        ("U017", "UP017"),
+        ("U019", "UP019"),
+        // TODO(charlie): Remove by 2023-02-01.
+        ("I2", "TID2"),
+        ("I25", "TID25"),
+        ("I252", "TID252"),
+        ("M", "RUF100"),
+        ("M0", "RUF100"),
+        ("M001", "RUF100"),
+        // TODO(charlie): Remove by 2023-02-01.
+        ("PDV", "PD"),
+        ("PDV0", "PD0"),
+        ("PDV002", "PD002"),
+        ("PDV003", "PD003"),
+        ("PDV004", "PD004"),
+        ("PDV007", "PD007"),
+        ("PDV008", "PD008"),
+        ("PDV009", "PD009"),
+        ("PDV01", "PD01"),
+        ("PDV010", "PD010"),
+        ("PDV011", "PD011"),
+        ("PDV012", "PD012"),
+        ("PDV013", "PD013"),
+        ("PDV015", "PD015"),
+        ("PDV9", "PD9"),
+        ("PDV90", "PD90"),
+        ("PDV901", "PD901"),
+        // TODO(charlie): Remove by 2023-04-01.
+        ("TYP", "TCH"),
+        ("TYP001", "TCH001"),
+    ])
+});
--- a/src/rule_selector.rs
+++ b/src/rule_selector.rs
@@ -0,0 +1,183 @@
+use std::str::FromStr;
+
+use schemars::_serde_json::Value;
+use schemars::schema::{InstanceType, Schema, SchemaObject};
+use schemars::JsonSchema;
+use serde::de::{self, Visitor};
+use serde::{Deserialize, Serialize};
+use strum::IntoEnumIterator;
+
+use crate::registry::{Rule, RuleCodePrefix, RuleIter};
+use crate::rule_redirects::get_redirect;
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub enum RuleSelector {
+    /// All rules
+    All,
+    Prefix {
+        prefix: RuleCodePrefix,
+        redirected_from: Option<&'static str>,
+    },
+}
+
+impl FromStr for RuleSelector {
+    type Err = ParseError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        if s == "ALL" {
+            Ok(Self::All)
+        } else {
+            let (s, redirected_from) = match get_redirect(s) {
+                Some((from, target)) => (target, Some(from)),
+                None => (s, None),
+            };
+            Ok(Self::Prefix {
+                prefix: RuleCodePrefix::from_str(s)
+                    .map_err(|_| ParseError::Unknown(s.to_string()))?,
+                redirected_from,
+            })
+        }
+    }
+}
+
+#[derive(Debug, thiserror::Error)]
+pub enum ParseError {
+    #[error("Unknown rule selector `{0}`")]
+    // TODO(martin): tell the user how to discover rule codes via the CLI once such a command is
+    // implemented (but that should of course be done only in ruff_cli and not here)
+    Unknown(String),
+}
+
+impl Serialize for RuleSelector {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        match self {
+            RuleSelector::All => serializer.serialize_str("ALL"),
+            RuleSelector::Prefix { prefix, .. } => prefix.serialize(serializer),
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for RuleSelector {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        // We are not simply doing:
+        // let s: &str = Deserialize::deserialize(deserializer)?;
+        // FromStr::from_str(s).map_err(de::Error::custom)
+        // here because the toml crate apparently doesn't support that
+        // (as of toml v0.6.0 running `cargo test` failed with the above two lines)
+        deserializer.deserialize_str(SelectorVisitor)
+    }
+}
+
+struct SelectorVisitor;
+
+impl Visitor<'_> for SelectorVisitor {
+    type Value = RuleSelector;
+
+    fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+        formatter.write_str(
+            "expected a string code identifying a linter or specific rule, or a partial rule code \
+             or ALL to refer to all rules",
+        )
+    }
+
+    fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+    where
+        E: de::Error,
+    {
+        FromStr::from_str(v).map_err(de::Error::custom)
+    }
+}
+
+impl From<RuleCodePrefix> for RuleSelector {
+    fn from(prefix: RuleCodePrefix) -> Self {
+        Self::Prefix {
+            prefix,
+            redirected_from: None,
+        }
+    }
+}
+
+impl IntoIterator for &RuleSelector {
+    type IntoIter = RuleSelectorIter;
+    type Item = Rule;
+
+    fn into_iter(self) -> Self::IntoIter {
+        match self {
+            RuleSelector::All => RuleSelectorIter::All(Rule::iter()),
+            RuleSelector::Prefix { prefix, .. } => RuleSelectorIter::Prefix(prefix.into_iter()),
+        }
+    }
+}
+
+pub enum RuleSelectorIter {
+    All(RuleIter),
+    Prefix(std::vec::IntoIter<Rule>),
+}
+
+impl Iterator for RuleSelectorIter {
+    type Item = Rule;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        match self {
+            RuleSelectorIter::All(iter) => iter.next(),
+            RuleSelectorIter::Prefix(iter) => iter.next(),
+        }
+    }
+}
+
+/// A const alternative to the `impl From<RuleCodePrefix> for RuleSelector`
+// to let us keep the fields of RuleSelector private.
+// Note that Rust doesn't yet support `impl const From<RuleCodePrefix> for
+// RuleSelector` (see https://github.com/rust-lang/rust/issues/67792).
+// TODO(martin): Remove once RuleSelector is an enum with Linter & Rule variants
+pub(crate) const fn prefix_to_selector(prefix: RuleCodePrefix) -> RuleSelector {
+    RuleSelector::Prefix {
+        prefix,
+        redirected_from: None,
+    }
+}
+
+impl JsonSchema for RuleSelector {
+    fn schema_name() -> String {
+        "RuleSelector".to_string()
+    }
+
+    fn json_schema(_gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
+        Schema::Object(SchemaObject {
+            instance_type: Some(InstanceType::String.into()),
+            enum_values: Some(
+                std::iter::once("ALL".to_string())
+                    .chain(RuleCodePrefix::iter().map(|s| s.as_ref().to_string()))
+                    .map(Value::String)
+                    .collect(),
+            ),
+            ..SchemaObject::default()
+        })
+    }
+}
+
+impl RuleSelector {
+    pub(crate) fn specificity(&self) -> Specificity {
+        match self {
+            RuleSelector::All => Specificity::All,
+            RuleSelector::Prefix { prefix, .. } => prefix.specificity(),
+        }
+    }
+}
+
+#[derive(PartialEq, Eq, PartialOrd, Ord)]
+pub(crate) enum Specificity {
+    All,
+    Linter,
+    Code1Char,
+    Code2Chars,
+    Code3Chars,
+    Code4Chars,
+    Code5Chars,
+}
--- a/src/rules/flake8_annotations/rules.rs
+++ b/src/rules/flake8_annotations/rules.rs
@@ -74,147 +74,14 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
        DefinitionKind::Package => {}
        DefinitionKind::Class(_) => {}
        DefinitionKind::NestedClass(_) => {}
-        DefinitionKind::Function(stmt) | DefinitionKind::NestedFunction(stmt) => {
+        DefinitionKind::Function(stmt)
+        | DefinitionKind::NestedFunction(stmt)
+        | DefinitionKind::Method(stmt) => {
+            let is_method = matches!(definition.kind, DefinitionKind::Method(_));
            let (name, args, returns, body) = match_function_def(stmt);
+            let mut has_any_typed_arg = false;

            // ANN001, ANN401
-            for arg in args
-                .args
-                .iter()
-                .chain(args.posonlyargs.iter())
-                .chain(args.kwonlyargs.iter())
-            {
-                if let Some(expr) = &arg.node.annotation {
-                    if checker
-                        .settings
-                        .rules
-                        .enabled(&Rule::DynamicallyTypedExpression)
-                    {
-                        check_dynamically_typed(checker, expr, || arg.node.arg.to_string());
-                    };
-                } else {
-                    if !(checker.settings.flake8_annotations.suppress_dummy_args
-                        && checker.settings.dummy_variable_rgx.is_match(&arg.node.arg))
-                    {
-                        if checker
-                            .settings
-                            .rules
-                            .enabled(&Rule::MissingTypeFunctionArgument)
-                        {
-                            checker.diagnostics.push(Diagnostic::new(
-                                violations::MissingTypeFunctionArgument(arg.node.arg.to_string()),
-                                Range::from_located(arg),
-                            ));
-                        }
-                    }
-                }
-            }
-
-            // ANN002, ANN401
-            if let Some(arg) = &args.vararg {
-                if let Some(expr) = &arg.node.annotation {
-                    if !checker.settings.flake8_annotations.allow_star_arg_any {
-                        if checker
-                            .settings
-                            .rules
-                            .enabled(&Rule::DynamicallyTypedExpression)
-                        {
-                            let name = &arg.node.arg;
-                            check_dynamically_typed(checker, expr, || format!("*{name}"));
-                        }
-                    }
-                } else {
-                    if !(checker.settings.flake8_annotations.suppress_dummy_args
-                        && checker.settings.dummy_variable_rgx.is_match(&arg.node.arg))
-                    {
-                        if checker.settings.rules.enabled(&Rule::MissingTypeArgs) {
-                            checker.diagnostics.push(Diagnostic::new(
-                                violations::MissingTypeArgs(arg.node.arg.to_string()),
-                                Range::from_located(arg),
-                            ));
-                        }
-                    }
-                }
-            }
-
-            // ANN003, ANN401
-            if let Some(arg) = &args.kwarg {
-                if let Some(expr) = &arg.node.annotation {
-                    if !checker.settings.flake8_annotations.allow_star_arg_any {
-                        if checker
-                            .settings
-                            .rules
-                            .enabled(&Rule::DynamicallyTypedExpression)
-                        {
-                            let name = &arg.node.arg;
-                            check_dynamically_typed(checker, expr, || format!("**{name}"));
-                        }
-                    }
-                } else {
-                    if !(checker.settings.flake8_annotations.suppress_dummy_args
-                        && checker.settings.dummy_variable_rgx.is_match(&arg.node.arg))
-                    {
-                        if checker.settings.rules.enabled(&Rule::MissingTypeKwargs) {
-                            checker.diagnostics.push(Diagnostic::new(
-                                violations::MissingTypeKwargs(arg.node.arg.to_string()),
-                                Range::from_located(arg),
-                            ));
-                        }
-                    }
-                }
-            }
-
-            // ANN201, ANN202, ANN401
-            if let Some(expr) = &returns {
-                if checker
-                    .settings
-                    .rules
-                    .enabled(&Rule::DynamicallyTypedExpression)
-                {
-                    check_dynamically_typed(checker, expr, || name.to_string());
-                };
-            } else {
-                // Allow omission of return annotation in `__init__` functions, if the function
-                // only returns `None` (explicitly or implicitly).
-                if checker.settings.flake8_annotations.suppress_none_returning
-                    && is_none_returning(body)
-                {
-                    return;
-                }
-
-                match visibility {
-                    Visibility::Public => {
-                        if checker
-                            .settings
-                            .rules
-                            .enabled(&Rule::MissingReturnTypePublicFunction)
-                        {
-                            checker.diagnostics.push(Diagnostic::new(
-                                violations::MissingReturnTypePublicFunction(name.to_string()),
-                                helpers::identifier_range(stmt, checker.locator),
-                            ));
-                        }
-                    }
-                    Visibility::Private => {
-                        if checker
-                            .settings
-                            .rules
-                            .enabled(&Rule::MissingReturnTypePrivateFunction)
-                        {
-                            checker.diagnostics.push(Diagnostic::new(
-                                violations::MissingReturnTypePrivateFunction(name.to_string()),
-                                helpers::identifier_range(stmt, checker.locator),
-                            ));
-                        }
-                    }
-                }
-            }
-        }
-        DefinitionKind::Method(stmt) => {
-            let (name, args, returns, body) = match_function_def(stmt);
-            let mut has_any_typed_arg = false;
-
-            // ANN001
            for arg in args
                .args
                .iter()
@@ -222,10 +89,10 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                .chain(args.kwonlyargs.iter())
                .skip(
                    // If this is a non-static method, skip `cls` or `self`.
-                    usize::from(!visibility::is_staticmethod(
-                        checker,
-                        cast::decorator_list(stmt),
-                    )),
+                    usize::from(
+                        is_method
+                            && !visibility::is_staticmethod(checker, cast::decorator_list(stmt)),
+                    ),
                )
            {
                // ANN401 for dynamically typed arguments
@@ -313,7 +180,7 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
            }

            // ANN101, ANN102
-            if !visibility::is_staticmethod(checker, cast::decorator_list(stmt)) {
+            if is_method && !visibility::is_staticmethod(checker, cast::decorator_list(stmt)) {
                if let Some(arg) = args.args.first() {
                    if arg.node.annotation.is_none() {
                        if visibility::is_classmethod(checker, cast::decorator_list(stmt)) {
@@ -335,7 +202,7 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                }
            }

-            // ANN201, ANN202
+            // ANN201, ANN202, ANN401
            if let Some(expr) = &returns {
                if checker
                    .settings
@@ -353,7 +220,7 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                    return;
                }

-                if visibility::is_classmethod(checker, cast::decorator_list(stmt)) {
+                if is_method && visibility::is_classmethod(checker, cast::decorator_list(stmt)) {
                    if checker
                        .settings
                        .rules
@@ -364,7 +231,9 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                            helpers::identifier_range(stmt, checker.locator),
                        ));
                    }
-                } else if visibility::is_staticmethod(checker, cast::decorator_list(stmt)) {
+                } else if is_method
+                    && visibility::is_staticmethod(checker, cast::decorator_list(stmt))
+                {
                    if checker
                        .settings
                        .rules
@@ -375,7 +244,7 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                            helpers::identifier_range(stmt, checker.locator),
                        ));
                    }
-                } else if visibility::is_init(cast::name(stmt)) {
+                } else if is_method && visibility::is_init(cast::name(stmt)) {
                    // Allow omission of return annotation in `__init__` functions, as long as at
                    // least one argument is typed.
                    if checker
@@ -401,7 +270,7 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                            checker.diagnostics.push(diagnostic);
                        }
                    }
-                } else if visibility::is_magic(cast::name(stmt)) {
+                } else if is_method && visibility::is_magic(cast::name(stmt)) {
                    if checker
                        .settings
                        .rules
--- a/src/rules/flake8_bugbear/rules/assert_false.rs
+++ b/src/rules/flake8_bugbear/rules/assert_false.rs
@@ -1,10 +1,10 @@
 use rustpython_ast::{Constant, Expr, ExprContext, ExprKind, Location, Stmt, StmtKind};

+use crate::ast::helpers::unparse_stmt;
 use crate::ast::types::Range;
 use crate::checkers::ast::Checker;
 use crate::fix::Fix;
 use crate::registry::Diagnostic;
-use crate::source_code::Generator;
 use crate::violations;

 fn assertion_error(msg: Option<&Expr>) -> Stmt {
@@ -48,10 +48,8 @@ pub fn assert_false(checker: &mut Checker, stmt: &Stmt, test: &Expr, msg: Option

    let mut diagnostic = Diagnostic::new(violations::DoNotAssertFalse, Range::from_located(test));
    if checker.patch(diagnostic.kind.rule()) {
-        let mut generator: Generator = checker.stylist.into();
-        generator.unparse_stmt(&assertion_error(msg));
        diagnostic.amend(Fix::replacement(
-            generator.generate(),
+            unparse_stmt(&assertion_error(msg), checker.stylist),
            stmt.location,
            stmt.end_location.unwrap(),
        ));
--- a/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs
+++ b/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs
@@ -3,11 +3,11 @@ use rustc_hash::{FxHashMap, FxHashSet};
 use rustpython_ast::{Excepthandler, ExcepthandlerKind, Expr, ExprContext, ExprKind, Location};

 use crate::ast::helpers;
+use crate::ast::helpers::unparse_expr;
 use crate::ast::types::{CallPath, Range};
 use crate::checkers::ast::Checker;
 use crate::fix::Fix;
 use crate::registry::{Diagnostic, Rule};
-use crate::source_code::Generator;
 use crate::violations;

 fn type_pattern(elts: Vec<&Expr>) -> Expr {
@@ -59,14 +59,12 @@ fn duplicate_handler_exceptions<'a>(
                Range::from_located(expr),
            );
            if checker.patch(diagnostic.kind.rule()) {
-                let mut generator: Generator = checker.stylist.into();
-                if unique_elts.len() == 1 {
-                    generator.unparse_expr(unique_elts[0], 0);
-                } else {
-                    generator.unparse_expr(&type_pattern(unique_elts), 0);
-                }
                diagnostic.amend(Fix::replacement(
-                    generator.generate(),
+                    if unique_elts.len() == 1 {
+                        unparse_expr(unique_elts[0], checker.stylist)
+                    } else {
+                        unparse_expr(&type_pattern(unique_elts), checker.stylist)
+                    },
                    expr.location,
                    expr.end_location.unwrap(),
                ));
--- a/src/rules/flake8_bugbear/rules/getattr_with_constant.rs
+++ b/src/rules/flake8_bugbear/rules/getattr_with_constant.rs
@@ -1,12 +1,12 @@
 use rustpython_ast::{Constant, Expr, ExprContext, ExprKind, Location};

+use crate::ast::helpers::unparse_expr;
 use crate::ast::types::Range;
 use crate::checkers::ast::Checker;
 use crate::fix::Fix;
 use crate::python::identifiers::is_identifier;
 use crate::python::keyword::KWLIST;
 use crate::registry::Diagnostic;
-use crate::source_code::Generator;
 use crate::violations;

 fn attribute(value: &Expr, attr: &str) -> Expr {
@@ -48,10 +48,8 @@ pub fn getattr_with_constant(checker: &mut Checker, expr: &Expr, func: &Expr, ar
    let mut diagnostic =
        Diagnostic::new(violations::GetAttrWithConstant, Range::from_located(expr));
    if checker.patch(diagnostic.kind.rule()) {
-        let mut generator: Generator = checker.stylist.into();
-        generator.unparse_expr(&attribute(obj, value), 0);
        diagnostic.amend(Fix::replacement(
-            generator.generate(),
+            unparse_expr(&attribute(obj, value), checker.stylist),
            expr.location,
            expr.end_location.unwrap(),
        ));
--- a/src/rules/flake8_bugbear/rules/redundant_tuple_in_exception_handler.rs
+++ b/src/rules/flake8_bugbear/rules/redundant_tuple_in_exception_handler.rs
@@ -5,7 +5,6 @@ use crate::ast::types::Range;
 use crate::checkers::ast::Checker;
 use crate::fix::Fix;
 use crate::registry::Diagnostic;
-use crate::source_code::Generator;
 use crate::violations;

 /// B013
@@ -25,10 +24,8 @@ pub fn redundant_tuple_in_exception_handler(checker: &mut Checker, handlers: &[E
            Range::from_located(type_),
        );
        if checker.patch(diagnostic.kind.rule()) {
-            let mut generator: Generator = checker.stylist.into();
-            generator.unparse_expr(elt, 0);
            diagnostic.amend(Fix::replacement(
-                generator.generate(),
+                unparse_expr(elt, checker.stylist),
                type_.location,
                type_.end_location.unwrap(),
            ));
--- a/src/rules/flake8_bugbear/rules/setattr_with_constant.rs
+++ b/src/rules/flake8_bugbear/rules/setattr_with_constant.rs
@@ -1,12 +1,13 @@
 use rustpython_ast::{Constant, Expr, ExprContext, ExprKind, Location, Stmt, StmtKind};

+use crate::ast::helpers::unparse_stmt;
 use crate::ast::types::Range;
 use crate::checkers::ast::Checker;
 use crate::fix::Fix;
 use crate::python::identifiers::is_identifier;
 use crate::python::keyword::KWLIST;
 use crate::registry::Diagnostic;
-use crate::source_code::{Generator, Stylist};
+use crate::source_code::Stylist;
 use crate::violations;

 fn assignment(obj: &Expr, name: &str, value: &Expr, stylist: &Stylist) -> String {
@@ -27,9 +28,7 @@ fn assignment(obj: &Expr, name: &str, value: &Expr, stylist: &Stylist) -> String
            type_comment: None,
        },
    );
-    let mut generator: Generator = stylist.into();
-    generator.unparse_stmt(&stmt);
-    generator.generate()
+    unparse_stmt(&stmt, stylist)
 }

 /// B010
--- a/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs
+++ b/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs
@@ -22,8 +22,8 @@ use rustc_hash::FxHashMap;
 use rustpython_ast::{Expr, ExprKind, Stmt};

 use crate::ast::types::Range;
-use crate::ast::visitor;
 use crate::ast::visitor::Visitor;
+use crate::ast::{helpers, visitor};
 use crate::checkers::ast::Checker;
 use crate::fix::Fix;
 use crate::registry::Diagnostic;
@@ -73,7 +73,7 @@ pub fn unused_loop_control_variable(checker: &mut Checker, target: &Expr, body:

    for (name, expr) in control_names {
        // Ignore names that are already underscore-prefixed.
-        if name.starts_with('_') {
+        if checker.settings.dummy_variable_rgx.is_match(name) {
            continue;
        }

@@ -82,11 +82,15 @@ pub fn unused_loop_control_variable(checker: &mut Checker, target: &Expr, body:
            continue;
        }

+        let safe = !helpers::uses_magic_variable_access(checker, body);
        let mut diagnostic = Diagnostic::new(
-            violations::UnusedLoopControlVariable(name.to_string()),
+            violations::UnusedLoopControlVariable {
+                name: name.to_string(),
+                safe,
+            },
            Range::from_located(expr),
        );
-        if checker.patch(diagnostic.kind.rule()) {
+        if safe && checker.patch(diagnostic.kind.rule()) {
            // Prefix the variable name with an underscore.
            diagnostic.amend(Fix::replacement(
                format!("_{name}"),
--- a/src/rules/flake8_bugbear/snapshots/ruffrulesflake8_bugbeartestsB007_B007.py.snap
+++ b/src/rules/flake8_bugbear/snapshots/ruffrulesflake8_bugbeartestsB007_B007.py.snap
@@ -3,7 +3,9 @@ source: src/rules/flake8_bugbear/mod.rs
 expression: diagnostics
 ---
 - kind:
-    UnusedLoopControlVariable: i
+    UnusedLoopControlVariable:
+      name: i
+      safe: true
  location:
    row: 6
    column: 4
@@ -20,7 +22,9 @@ expression: diagnostics
      column: 5
  parent: ~
 - kind:
-    UnusedLoopControlVariable: k
+    UnusedLoopControlVariable:
+      name: k
+      safe: true
  location:
    row: 18
    column: 12
@@ -37,7 +41,9 @@ expression: diagnostics
      column: 13
  parent: ~
 - kind:
-    UnusedLoopControlVariable: i
+    UnusedLoopControlVariable:
+      name: i
+      safe: true
  location:
    row: 30
    column: 4
@@ -54,7 +60,9 @@ expression: diagnostics
      column: 5
  parent: ~
 - kind:
-    UnusedLoopControlVariable: k
+    UnusedLoopControlVariable:
+      name: k
+      safe: true
  location:
    row: 30
    column: 12
@@ -70,4 +78,52 @@ expression: diagnostics
      row: 30
      column: 13
  parent: ~
+- kind:
+    UnusedLoopControlVariable:
+      name: bar
+      safe: false
+  location:
+    row: 34
+    column: 9
+  end_location:
+    row: 34
+    column: 12
+  fix: ~
+  parent: ~
+- kind:
+    UnusedLoopControlVariable:
+      name: bar
+      safe: false
+  location:
+    row: 38
+    column: 9
+  end_location:
+    row: 38
+    column: 12
+  fix: ~
+  parent: ~
+- kind:
+    UnusedLoopControlVariable:
+      name: bar
+      safe: false
+  location:
+    row: 42
+    column: 9
+  end_location:
+    row: 42
+    column: 12
+  fix: ~
+  parent: ~
+- kind:
+    UnusedLoopControlVariable:
+      name: bar
+      safe: false
+  location:
+    row: 46
+    column: 9
+  end_location:
+    row: 46
+    column: 12
+  fix: ~
+  parent: ~

--- a/src/rules/flake8_executable/mod.rs
+++ b/src/rules/flake8_executable/mod.rs
@@ -13,6 +13,12 @@ mod tests {
    use crate::registry::Rule;
    use crate::settings;

+    #[test_case(Path::new("EXE001_1.py"); "EXE001_1")]
+    #[test_case(Path::new("EXE001_2.py"); "EXE001_2")]
+    #[test_case(Path::new("EXE001_3.py"); "EXE001_3")]
+    #[test_case(Path::new("EXE002_1.py"); "EXE002_1")]
+    #[test_case(Path::new("EXE002_2.py"); "EXE002_2")]
+    #[test_case(Path::new("EXE002_3.py"); "EXE002_3")]
    #[test_case(Path::new("EXE003.py"); "EXE003")]
    #[test_case(Path::new("EXE004_1.py"); "EXE004_1")]
    #[test_case(Path::new("EXE004_2.py"); "EXE004_2")]
@@ -27,6 +33,8 @@ mod tests {
                .join(path)
                .as_path(),
            &settings::Settings::for_rules(vec![
+                Rule::ShebangNotExecutable,
+                Rule::ShebangMissingExecutableFile,
                Rule::ShebangWhitespace,
                Rule::ShebangNewline,
                Rule::ShebangPython,
--- a/src/rules/flake8_executable/rules/mod.rs
+++ b/src/rules/flake8_executable/rules/mod.rs
@@ -1,7 +1,11 @@
+pub use shebang_missing::{shebang_missing, ShebangMissingExecutableFile};
 pub use shebang_newline::{shebang_newline, ShebangNewline};
+pub use shebang_not_executable::{shebang_not_executable, ShebangNotExecutable};
 pub use shebang_python::{shebang_python, ShebangPython};
 pub use shebang_whitespace::{shebang_whitespace, ShebangWhitespace};

+mod shebang_missing;
 mod shebang_newline;
+mod shebang_not_executable;
 mod shebang_python;
 mod shebang_whitespace;
--- a/src/rules/flake8_executable/rules/shebang_missing.rs
+++ b/src/rules/flake8_executable/rules/shebang_missing.rs
@@ -0,0 +1,37 @@
+use std::path::Path;
+
+#[cfg(not(target_family = "wasm"))]
+use is_executable::IsExecutable;
+use ruff_macros::derive_message_formats;
+
+#[cfg(not(target_family = "wasm"))]
+use crate::ast::types::Range;
+use crate::define_violation;
+use crate::registry::Diagnostic;
+use crate::violation::Violation;
+
+define_violation!(
+    pub struct ShebangMissingExecutableFile;
+);
+impl Violation for ShebangMissingExecutableFile {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("The file is executable but no shebang is present")
+    }
+}
+
+/// EXE002
+#[cfg(not(target_family = "wasm"))]
+pub fn shebang_missing(filepath: &Path) -> Option<Diagnostic> {
+    if filepath.is_executable() {
+        let diagnostic = Diagnostic::new(ShebangMissingExecutableFile, Range::default());
+        Some(diagnostic)
+    } else {
+        None
+    }
+}
+
+#[cfg(target_family = "wasm")]
+pub fn shebang_missing(_filepath: &Path) -> Option<Diagnostic> {
+    None
+}
--- a/src/rules/flake8_executable/rules/shebang_not_executable.rs
+++ b/src/rules/flake8_executable/rules/shebang_not_executable.rs
@@ -0,0 +1,58 @@
+use std::path::Path;
+
+#[cfg(not(target_family = "wasm"))]
+use is_executable::IsExecutable;
+use ruff_macros::derive_message_formats;
+#[cfg(not(target_family = "wasm"))]
+use rustpython_ast::Location;
+
+#[cfg(not(target_family = "wasm"))]
+use crate::ast::types::Range;
+use crate::define_violation;
+use crate::registry::Diagnostic;
+use crate::rules::flake8_executable::helpers::ShebangDirective;
+use crate::violation::Violation;
+
+define_violation!(
+    pub struct ShebangNotExecutable;
+);
+impl Violation for ShebangNotExecutable {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Shebang is present but file is not executable")
+    }
+}
+
+/// EXE001
+#[cfg(not(target_family = "wasm"))]
+pub fn shebang_not_executable(
+    filepath: &Path,
+    lineno: usize,
+    shebang: &ShebangDirective,
+) -> Option<Diagnostic> {
+    if let ShebangDirective::Match(_, start, end, _) = shebang {
+        if filepath.is_executable() {
+            None
+        } else {
+            let diagnostic = Diagnostic::new(
+                ShebangNotExecutable,
+                Range::new(
+                    Location::new(lineno + 1, *start),
+                    Location::new(lineno + 1, *end),
+                ),
+            );
+            Some(diagnostic)
+        }
+    } else {
+        None
+    }
+}
+
+#[cfg(target_family = "wasm")]
+pub fn shebang_not_executable(
+    _filepath: &Path,
+    _lineno: usize,
+    _shebang: &ShebangDirective,
+) -> Option<Diagnostic> {
+    None
+}
--- a/src/rules/flake8_executable/snapshots/ruffrulesflake8_executabletestsEXE001_1.py.snap
+++ b/src/rules/flake8_executable/snapshots/ruffrulesflake8_executabletestsEXE001_1.py.snap
@@ -0,0 +1,15 @@
+---
+source: src/rules/flake8_executable/mod.rs
+expression: diagnostics
+---
+- kind:
+    ShebangNotExecutable: ~
+  location:
+    row: 1
+    column: 2
+  end_location:
+    row: 1
+    column: 17
+  fix: ~
+  parent: ~
+
--- a/src/rules/flake8_executable/snapshots/ruffrulesflake8_executabletestsEXE001_2.py.snap
+++ b/src/rules/flake8_executable/snapshots/ruffrulesflake8_executabletestsEXE001_2.py.snap
@@ -0,0 +1,6 @@
+---
+source: src/rules/flake8_executable/mod.rs
+expression: diagnostics
+---
+[]
+
--- a/src/rules/flake8_executable/snapshots/ruffrulesflake8_executabletestsEXE001_3.py.snap
+++ b/src/rules/flake8_executable/snapshots/ruffrulesflake8_executabletestsEXE001_3.py.snap
@@ -0,0 +1,6 @@
+---
+source: src/rules/flake8_executable/mod.rs
+expression: diagnostics
+---
+[]
+
--- a/src/rules/flake8_executable/snapshots/ruffrulesflake8_executabletestsEXE002_1.py.snap
+++ b/src/rules/flake8_executable/snapshots/ruffrulesflake8_executabletestsEXE002_1.py.snap
@@ -0,0 +1,15 @@
+---
+source: src/rules/flake8_executable/mod.rs
+expression: diagnostics
+---
+- kind:
+    ShebangMissingExecutableFile: ~
+  location:
+    row: 1
+    column: 0
+  end_location:
+    row: 1
+    column: 0
+  fix: ~
+  parent: ~
+
--- a/src/rules/flake8_executable/snapshots/ruffrulesflake8_executabletestsEXE002_2.py.snap
+++ b/src/rules/flake8_executable/snapshots/ruffrulesflake8_executabletestsEXE002_2.py.snap
@@ -0,0 +1,6 @@
+---
+source: src/rules/flake8_executable/mod.rs
+expression: diagnostics
+---
+[]
+
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Charlie Marsh	9b07d0bd92	Bump version to 0.0.234	2023-01-25 16:55:57 -05:00
Charlie Marsh	23525a8ea0	Actually, rename TYP rules to TCH (#2176 )	2023-01-25 16:52:49 -05:00
Charlie Marsh	6ede030700	Allow manual releases for pre-release testing	2023-01-25 16:37:04 -05:00
Charlie Marsh	44f3e5013d	Add flake8-type-checking license	2023-01-25 16:27:18 -05:00
Charlie Marsh	35cf9e242e	Rename TYP rules to TYC (#2175 )	2023-01-25 16:26:22 -05:00
Charlie Marsh	d5dff11d4b	Avoid reraise-no-cause for explicit reraises (#2174 )	2023-01-25 15:51:24 -05:00
Charlie Marsh	8e1fac620e	Add flake8-builtins options to README (#2173 )	2023-01-25 15:43:26 -05:00
Aarni Koskela	0da691c0d5	Add Babel to readme (#2170 )	2023-01-25 15:21:26 -05:00
Hugo van Kemenade	233415921b	Add colour to CI for readability	2023-01-25 15:21:10 -05:00
Hugo van Kemenade	81141e2a73	Bump GitHub Actions	2023-01-25 15:21:10 -05:00
Hugo van Kemenade	6e255ad53c	Allow testing feature branches	2023-01-25 15:21:10 -05:00
Hugo van Kemenade	6d87adbcc0	Fix singular and plural for error(s)	2023-01-25 15:21:10 -05:00
Florian Best	43a8ce6c89	fix: avoid flagging unused loop variable (B007) with globals(), vars() or eval() (#2166 )	2023-01-25 15:18:58 -05:00
Charlie Marsh	a978706dce	Re-add error wrapper in main.rs (#2168 )	2023-01-25 15:11:24 -05:00
Florian Best	dc1aa8dd1d	Suggest input format in error case (#2167 )	2023-01-25 14:55:04 -05:00
Charlie Marsh	662e29b1ce	Avoid re-resolving settings for repeated paths (#2165 ) After this change: ```shell > time cargo run -- -n $(find ../django -type f -name '*.py')` 8.85s user 0.20s system 498% cpu 1.814 total > time cargo run -- -n ../django 8.95s user 0.23s system 507% cpu 1.811 total ``` I also verified that we only hit the creation path once via some manual logging. Closes #2154.	2023-01-25 13:38:33 -05:00
Charlie Marsh	6978dcf035	Add an FAQ on autofix (#2163 )	2023-01-25 13:09:16 -05:00
Charlie Marsh	0e6f513607	Avoid prefer-type-error (TRY004) with intermediary control flow (#2162 )	2023-01-25 13:00:59 -05:00
Charlie Marsh	02421d02f5	Avoid flagging unused loop variable (B007) with locals() (#2161 )	2023-01-25 12:53:35 -05:00
Charlie Marsh	38de46ae3c	Treat Python 3.7 as minimum supported version (#2159 )	2023-01-25 12:36:50 -05:00
Martin Fischer	f6fd702d41	Add #![warn(clippy::pedantic)] to lib.rs and main.rs files We already enforced pedantic clippy lints via the following command in .github/workflows/ci.yaml: cargo clippy --workspace --all-targets --all-features -- -D warnings -W clippy::pedantic Additionally adding #![warn(clippy::pedantic)] to all main.rs and lib.rs has the benefit that violations of pedantic clippy lints are also reported when just running `cargo clippy` without any arguments and are thereby also picked up by LSP[1] servers such as rust-analyzer[2]. However for rust-analyzer to run clippy you'll have to configure: "rust-analyzer.check.command": "clippy", in your editor.[3] [1]: https://microsoft.github.io/language-server-protocol/ [2]: https://rust-analyzer.github.io/ [3]: https://rust-analyzer.github.io/manual.html#configuration	2023-01-25 00:40:29 -05:00
Martin Fischer	2125d0bb54	refactor: Move #![forbid(unsafe_code)] attributes up What's forbidden is more important than which clippy lints are ignored and more important directives should come first.	2023-01-25 00:40:29 -05:00
Charlie Marsh	63b4f60ba4	Implement typing-only import detection (TYP001, TYP002, TYP003) (#2147 )	2023-01-24 23:48:11 -05:00
Charlie Marsh	9eb13bc9da	Downgrade recommended pre-commit version to v0.0.231	2023-01-24 23:47:13 -05:00
Charlie Marsh	0758049e49	Implement runtime-import-in-type-checking-block (TYP004) (#2146 )	2023-01-24 23:33:26 -05:00
Charlie Marsh	deff503932	Avoid generating dirty call paths (#2144 )	2023-01-24 20:40:38 -05:00
Jonathan Plasse	82d7814101	Update .pre-commit-config.yml (#2139 )	2023-01-24 19:45:34 -05:00
Eric Roberts	0cac1a0d21	Move is_overlong to helpers (#2137 )	2023-01-24 12:45:35 -05:00
Charlie Marsh	605416922d	Bump version to 0.0.233	2023-01-24 10:46:49 -05:00
Charlie Marsh	7b81f36e54	Enable executable checks on Windows (#2133 )	2023-01-24 10:46:27 -05:00
Eric Roberts	ff63da9f52	Move compare to helpers file (#2131 ) From discussion on https://github.com/charliermarsh/ruff/pull/2123 I didn't originally have a helpers file so I put the function in both places but now that a helpers file exists it seems logical for it to be there.	2023-01-24 10:30:56 -05:00
Charlie Marsh	d645a19e0a	Bump version to 0.0.232	2023-01-24 09:49:07 -05:00
Charlie Marsh	30ae0d3723	Add Dagger and Great Expectations (#2130 )	2023-01-24 09:48:00 -05:00
Charlie Marsh	3fb9e76012	Remove unnecessary manual Generator invocations (#2129 )	2023-01-24 09:38:12 -05:00
Eric Roberts	0f283ae98c	Move pycodestyle rules into individual files (#2123 )	2023-01-24 09:27:26 -05:00
Martin Fischer	269926cec4	refactor: Move redirects out of RuleCodePrefix This commit removes rule redirects such as ("U" -> "UP") from the RuleCodePrefix enum because they complicated the generation of that enum (which we want to change to be prefix-agnostic in the future). To preserve backwards compatibility redirects are now resolved before the strum-generated RuleCodePrefix::from_str is invoked. This change also brings two other advantages: * Redirects are now only defined once (previously they had to be defined twice: once in ruff_macros/src/rule_code_prefix.rs and a second time in src/registry.rs). * The deprecated redirects will no longer be suggested in IDE autocompletion within pyproject.toml since they are now no longer part of the ruff.schema.json.	2023-01-24 09:26:19 -05:00
Martin Fischer	28018442f6	refactor: Move ALL from RuleCodePrefix to RuleSelector	2023-01-24 09:26:19 -05:00
Martin Fischer	abc9810e2b	refactor: Turn RuleSelector into a newtype around RuleCodePrefix Yet another refactor to let us implement the many-to-many mapping between codes and rules in a prefix-agnostic way. We want to break up the RuleCodePrefix[1] enum into smaller enums. To facilitate that this commit introduces a new wrapping type around RuleCodePrefix so that we can start breaking it apart. [1]: Actually `RuleCodePrefix` is the previous name of the autogenerated enum ... I renamed it in `b19258a243` to RuleSelector since `ALL` isn't a prefix. This commit now renames it back but only because the new `RuleSelector` wrapper type, introduced in this commit, will let us move the `ALL` variant from `RuleCodePrefix` to `RuleSelector` in the next commit.	2023-01-24 09:26:19 -05:00
Charlie Marsh	a20482961b	Add tryceratops to flake8-to-ruff	2023-01-24 08:41:18 -05:00
Charlie Marsh	d97c07818e	Update flake8-to-ruff to include latest plugins (#2127 ) Closes #2124 (along with a release).	2023-01-24 08:39:58 -05:00
Ville Skyttä	7e92485f43	feat: autofix `multi-line-summary-*-line` (#2093 )	2023-01-24 08:17:13 -05:00
Charlie Marsh	930c3be69d	Ignore generators in flake8-return rules (#2126 ) We could do a better job of handling them, but they cause too many false-positives right now. Closes #2119.	2023-01-24 08:15:26 -05:00
Aarni Koskela	24d0a980c5	flake8-annotations: deduplicate code between functions and methods (#2125 )	2023-01-24 08:03:33 -05:00
Edgar R. M	f5f0ed280a	Implement `EXE001` and `EXE002` from `flake8-executable` (#2118 )	2023-01-24 08:02:47 -05:00
Martin Fischer	ca58c72fc9	refactor: Convention::codes to rules_to_be_ignored	2023-01-24 07:37:34 -05:00
Martin Fischer	c40f14620a	refactor: Get rid of registry::CATEGORIES	2023-01-24 07:37:34 -05:00
Martin Fischer	04300ce258	refactor: Rename SuffixLength enum to Specificity	2023-01-24 07:37:34 -05:00
Martin Fischer	ead5f948d3	refactor: Move Colorize imports where they're used	2023-01-24 07:37:34 -05:00
Martin Fischer	e93e9fae82	refactor: Make flake8_to_ruff tests even more DRY	2023-01-24 07:37:34 -05:00
Martin Fischer	f5ddec0fb3	refactor: Move resolve_select to converter module The function is only used there and is not plugin-specific since it also specifies the default rule selectors (F, E, W).	2023-01-24 07:37:34 -05:00
Martin Fischer	3de2a57416	refactor: Use ..Options::default() for tests	2023-01-24 07:37:34 -05:00
Hugo	b29b4084ff	Add apk instructions to README (#2121 )	2023-01-24 07:29:03 -05:00
Aarni Koskela	c61ca4a953	Add Home Assistant to Readme (#2120 )	2023-01-24 07:27:45 -05:00
Denis Gavrilyuk	58d5ac08a8	feat: implement TRY301 (#2113 )	2023-01-24 07:25:26 -05:00
Charlie Marsh	cc63a4be6a	Allow flagging of multiline implicit string concatenations (#2117 ) At present, `ISC001` and `ISC002` flag concatenations like the following: ```py "a" "b" # ISC001 "a" \ "b" # ISC002 ``` However, multiline concatenations are allowed. This PR adds a setting: ```toml [tool.ruff.flake8-implicit-str-concat] allow-multiline = false ``` Which extends `ISC002` to _also_ flag multiline concatenations, like: ```py ( "a" # ISC002 "b" ) ``` Note that this is backwards compatible, as `allow-multiline` defaults to `true`.	2023-01-24 00:01:01 -05:00
Charlie Marsh	549a5d44bc	Upgrade to toml v0.6.0 (#2116 ) Closes #1894.	2023-01-23 19:22:42 -05:00
Denis Gavrilyuk	d65ce6308b	feat: implement TRY200 (#2087 ) #2056	2023-01-23 14:12:42 -05:00
Charlie Marsh	b988a268e4	Escape curly braces when converting .format() strings (#2112 ) Closes #2111.	2023-01-23 14:11:24 -05:00