Bump version to 0.0.239

As an example, if you have `single` as your preferred style, we'll now allow this:

```py
assert s.to_python(123) == (
    "123 info=SerializationInfo(include=None, exclude=None, mode='python', by_alias=True, exclude_unset=False, "
    "exclude_defaults=False, exclude_none=False, round_trip=False)"
)
```

Previously, the second line of the implicit string concatenation would be flagged as invalid, despite the _first_ line requiring double quotes. (Note that we'll accept either single or double quotes for that second line.)

Mechanically, this required that we process sequences of `Tok::String` rather than a single `Tok::String` at a time. Prior to iterating over the strings in the sequence, we check if any of them require the non-preferred quote style; if so, we let _any_ of them use it.

Closes #2400.

.github/release.yml

@@ -0,0 +1,19 @@
+# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#configuring-automatically-generated-release-notes
+changelog:
+  categories:
+    - title: Breaking Changes
+      labels:
+        - breaking
+    - title: Rules
+      labels:
+        - rule
+        - autofix
+    - title: Settings
+      labels:
+        - configuration
+    - title: Bug Fixes
+      labels:
+        - bug
+    - title: Other Changes
+      labels:
+        - "*"

.github/workflows/ci.yaml

@@ -22,16 +22,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2022-11-01
-          override: true
+      - name: "Install Rust toolchain"
+        run: rustup show
       - uses: Swatinem/rust-cache@v1
       - run: cargo build --all
       - run: ./target/debug/ruff_dev generate-all
-      - run: git diff --quiet README.md || echo "::error file=README.md::This file is outdated. Run 'cargo +nightly dev generate-all'."
-      - run: git diff --quiet ruff.schema.json || echo "::error file=ruff.schema.json::This file is outdated. Run 'cargo +nightly dev generate-all'."
+      - run: git diff --quiet README.md || echo "::error file=README.md::This file is outdated. Run 'cargo dev generate-all'."
+      - run: git diff --quiet ruff.schema.json || echo "::error file=ruff.schema.json::This file is outdated. Run 'cargo dev generate-all'."
       - run: git diff --exit-code -- README.md ruff.schema.json
 
   cargo-fmt:
@@ -39,12 +36,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2022-11-01
-          override: true
-          components: rustfmt
+      - name: "Install Rust toolchain"
+        run: rustup component add rustfmt
       - run: cargo fmt --all --check
 
   cargo_clippy:
@@ -52,13 +45,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2022-11-01
-          override: true
-          components: clippy
-          target: wasm32-unknown-unknown
+      - name: "Install Rust toolchain"
+        run: |
+          rustup component add clippy
+          rustup target add wasm32-unknown-unknown
       - uses: Swatinem/rust-cache@v1
       - run: cargo clippy --workspace --all-targets --all-features -- -D warnings -W clippy::pedantic
       - run: cargo clippy -p ruff --target wasm32-unknown-unknown --all-features -- -D warnings -W clippy::pedantic
@@ -71,20 +61,17 @@ jobs:
     name: "cargo test | ${{ matrix.os }}"
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: 1.65.0
-          override: true
+      - name: "Install Rust toolchain"
+        run: rustup show
       - uses: Swatinem/rust-cache@v1
       - run: cargo install cargo-insta
       - run: pip install black[d]==22.12.0
-      - name: Run tests (Ubuntu)
+      - name: "Run tests (Ubuntu)"
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |
           cargo insta test --all --delete-unreferenced-snapshots
           git diff --exit-code
-      - name: Run tests (Windows)
+      - name: "Run tests (Windows)"
         if: ${{ matrix.os == 'windows-latest' }}
         shell: bash
         run: |
@@ -102,10 +89,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          override: true
+      - name: "Install Rust toolchain"
+        run: rustup show
       - uses: Swatinem/rust-cache@v1
       - run: ./scripts/add_rule.py --name DoTheThing --code PLC999 --linter pylint
       - run: cargo check
@@ -114,61 +99,26 @@ jobs:
          ./scripts/add_rule.py --name FirstRule --code TST001 --linter test
       - run: cargo check
 
-# TODO(charlie): Re-enable the `wasm-pack` tests.
-# See: https://github.com/charliermarsh/ruff/issues/1425
-#  wasm-pack-test:
-#    name: "wasm-pack test"
-#    runs-on: ubuntu-latest
-#    env:
-#      WASM_BINDGEN_TEST_TIMEOUT: 60
-#    steps:
-#      - uses: actions/checkout@v3
-#      - uses: actions-rs/toolchain@v1
-#        with:
-#          profile: minimal
-#          toolchain: nightly-2022-11-01
-#          override: true
-#      - uses: actions/cache@v3
-#        env:
-#          cache-name: cache-cargo
-#        with:
-#          path: |
-#            ~/.cargo/registry
-#            ~/.cargo/git
-#          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
-#          restore-keys: |
-#            ${{ runner.os }}-build-${{ env.cache-name }}-
-#            ${{ runner.os }}-build-
-#            ${{ runner.os }}-
-#      - uses: jetli/wasm-pack-action@v0.4.0
-#      - uses: jetli/wasm-bindgen-action@v0.2.0
-#      - run: wasm-pack test --node
-
   maturin-build:
     name: "maturin build"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: 1.65.0
-          override: true
+      - name: "Install Rust toolchain"
+        run: rustup show
       - uses: Swatinem/rust-cache@v1
       - uses: actions/setup-python@v4
         with:
           python-version: "3.11"
       - run: pip install maturin
       - run: maturin build -b bin
+      - run: python scripts/transform_readme.py --target pypi
 
   typos:
-    name: Spell Check with Typos
+    name: "spell check"
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout Actions Repository
-      uses: actions/checkout@v3
-
-    - name: Check spelling of file.txt
-      uses: crate-ci/typos@master
+    - uses: actions/checkout@v3
+    - uses: crate-ci/typos@master
       with:
         files: .

.github/workflows/docs.yaml

@@ -0,0 +1,35 @@
+name: mkdocs
+
+on:
+  push:
+    paths:
+      - README.md
+      - mkdocs.template.yml
+      - .github/workflows/docs.yaml
+    branches: [ main ]
+  workflow_dispatch:
+
+
+jobs:
+  mkdocs:
+    runs-on: ubuntu-latest
+    env:
+      CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+      - name: "Install dependencies"
+        run: |
+          pip install "mkdocs~=1.4.2" "mkdocs-material~=9.0.6"
+      - name: "Copy README File"
+        run: |
+          python scripts/transform_readme.py --target mkdocs
+          python scripts/generate_mkdocs.py
+          mkdocs build --strict
+      - name: "Deploy to Cloudflare Pages"
+        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
+        uses: cloudflare/wrangler-action@2.0.0
+        with:
+          apiToken: ${{ secrets.CF_API_TOKEN }}
+          accountId: ${{ secrets.CF_ACCOUNT_ID }}
+          command: pages publish site --project-name=ruff-docs --branch ${GITHUB_HEAD_REF} --commit-hash ${GITHUB_SHA}

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

@@ -24,21 +24,17 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
-      - name: Build wheels - x86_64
+      - name: "Install Rust toolchain"
+        run: rustup show
+      - name: "Build wheels - x86_64"
         uses: messense/maturin-action@v1
         with:
           target: x86_64
           args: --release --out dist --sdist -m ./${{ env.CRATE_NAME }}/Cargo.toml
-      - name: Install built wheel - x86_64
+      - name: "Install built wheel - x86_64"
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
-      - name: Upload wheels
+      - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
           name: wheels
@@ -51,20 +47,16 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
-      - name: Build wheels - universal2
+      - name: "Install Rust toolchain"
+        run: rustup show
+      - name: "Build wheels - universal2"
         uses: messense/maturin-action@v1
         with:
           args: --release --universal2 --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
-      - name: Install built wheel - universal2
+      - name: "Install built wheel - universal2"
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*universal2.whl --force-reinstall
-      - name: Upload wheels
+      - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
           name: wheels
@@ -81,22 +73,18 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: ${{ matrix.target }}
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
-      - name: Build wheels
+      - name: "Install Rust toolchain"
+        run: rustup show
+      - name: "Build wheels"
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
-      - name: Install built wheel
+      - name: "Install built wheel"
         shell: bash
         run: |
           python -m pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
-      - name: Upload wheels
+      - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
           name: wheels
@@ -113,17 +101,17 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
-      - name: Build wheels
+      - name: "Build wheels"
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
-      - name: Install built wheel
+      - name: "Install built wheel"
         if: matrix.target == 'x86_64'
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
-      - name: Upload wheels
+      - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
           name: wheels
@@ -139,7 +127,7 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
-      - name: Build wheels
+      - name: "Build wheels"
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
@@ -158,7 +146,7 @@ jobs:
             pip3 install -U pip
           run: |
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
-      - name: Upload wheels
+      - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
           name: wheels
@@ -177,13 +165,13 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
-      - name: Build wheels
+      - name: "Build wheels"
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
           args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
-      - name: Install built wheel
+      - name: "Install built wheel"
         if: matrix.target == 'x86_64-unknown-linux-musl'
         uses: addnab/docker-run-action@v3
         with:
@@ -192,7 +180,7 @@ jobs:
           run: |
             apk add py3-pip
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links /io/dist/ --force-reinstall
-      - name: Upload wheels
+      - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
           name: wheels
@@ -212,7 +200,7 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
-      - name: Build wheels
+      - name: "Build wheels"
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
@@ -228,7 +216,7 @@ jobs:
             apk add py3-pip
           run: |
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
-      - name: Upload wheels
+      - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
           name: wheels
@@ -252,17 +240,17 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: pypy${{ matrix.python-version }}
-      - name: Build wheels
+      - name: "Build wheels"
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --release --out dist -i pypy${{ matrix.python-version }} -m ./${{ env.CRATE_NAME }}/Cargo.toml
-      - name: Install built wheel
+      - name: "Install built wheel"
         if: matrix.target == 'x86_64'
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
-      - name: Upload wheels
+      - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
           name: wheels
@@ -285,7 +273,7 @@ jobs:
         with:
           name: wheels
       - uses: actions/setup-python@v4
-      - name: Publish to PyPi
+      - name: "Publish to PyPi"
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.FLAKE8_TO_RUFF_TOKEN }}

.github/workflows/playground.yaml

@@ -18,12 +18,8 @@ jobs:
        CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2022-11-01
-          override: true
-          target: wasm32-unknown-unknown
+      - name: "Install Rust toolchain"
+        run: rustup target add wasm32-unknown-unknown
       - uses: actions/setup-node@v3
         with:
           node-version: 18

.github/workflows/ruff.yaml

@@ -26,21 +26,17 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
-      - name: Build wheels - x86_64
+      - name: "Prep README.md"
+        run: python scripts/transform_readme.py --target pypi
+      - name: "Build wheels - x86_64"
         uses: messense/maturin-action@v1
         with:
           target: x86_64
           args: --release --out dist --sdist
-      - name: Install built wheel - x86_64
+      - name: "Install built wheel - x86_64"
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
-      - name: Upload wheels
+      - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
           name: wheels
@@ -53,20 +49,16 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
-      - name: Build wheels - universal2
+      - name: "Prep README.md"
+        run: python scripts/transform_readme.py --target pypi
+      - name: "Build wheels - universal2"
         uses: messense/maturin-action@v1
         with:
           args: --release --universal2 --out dist
-      - name: Install built wheel - universal2
+      - name: "Install built wheel - universal2"
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*universal2.whl --force-reinstall
-      - name: Upload wheels
+      - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
           name: wheels
@@ -83,22 +75,18 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: ${{ matrix.target }}
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
-      - name: Build wheels
+      - name: "Prep README.md"
+        run: python scripts/transform_readme.py --target pypi
+      - name: "Build wheels"
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           args: --release --out dist
-      - name: Install built wheel
+      - name: "Install built wheel"
         shell: bash
         run: |
           python -m pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
-      - name: Upload wheels
+      - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
           name: wheels
@@ -115,17 +103,19 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
-      - name: Build wheels
+      - name: "Prep README.md"
+        run: python scripts/transform_readme.py --target pypi
+      - name: "Build wheels"
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --release --out dist
-      - name: Install built wheel
+      - name: "Install built wheel"
         if: matrix.target == 'x86_64'
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
-      - name: Upload wheels
+      - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
           name: wheels
@@ -141,7 +131,9 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
-      - name: Build wheels
+      - name: "Prep README.md"
+        run: python scripts/transform_readme.py --target pypi
+      - name: "Build wheels"
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
@@ -160,7 +152,7 @@ jobs:
             pip3 install -U pip
           run: |
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
-      - name: Upload wheels
+      - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
           name: wheels
@@ -179,13 +171,15 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
-      - name: Build wheels
+      - name: "Prep README.md"
+        run: python scripts/transform_readme.py --target pypi
+      - name: "Build wheels"
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
           args: --release --out dist
-      - name: Install built wheel
+      - name: "Install built wheel"
         if: matrix.target == 'x86_64-unknown-linux-musl'
         uses: addnab/docker-run-action@v3
         with:
@@ -194,7 +188,7 @@ jobs:
           run: |
             apk add py3-pip
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links /io/dist/ --force-reinstall
-      - name: Upload wheels
+      - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
           name: wheels
@@ -214,7 +208,9 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
-      - name: Build wheels
+      - name: "Prep README.md"
+        run: python scripts/transform_readme.py --target pypi
+      - name: "Build wheels"
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
@@ -230,7 +226,7 @@ jobs:
             apk add py3-pip
           run: |
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
-      - name: Upload wheels
+      - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
           name: wheels
@@ -254,17 +250,19 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: pypy${{ matrix.python-version }}
-      - name: Build wheels
+      - name: "Prep README.md"
+        run: python scripts/transform_readme.py --target pypi
+      - name: "Build wheels"
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --release --out dist -i pypy${{ matrix.python-version }}
-      - name: Install built wheel
+      - name: "Install built wheel"
         if: matrix.target == 'x86_64'
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
-      - name: Upload wheels
+      - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
           name: wheels
@@ -288,13 +286,13 @@ jobs:
         with:
           name: wheels
       - uses: actions/setup-python@v4
-      - name: Publish to PyPi
+      - name: "Publish to PyPi"
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.RUFF_TOKEN }}
         run: |
           pip install --upgrade twine
           twine upload --skip-existing *
-      - name: Update pre-commit mirror
+      - name: "Update pre-commit mirror"
         run: |
           curl -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ secrets.RUFF_PRE_COMMIT_PAT }}" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/charliermarsh/ruff-pre-commit/dispatches --data '{"event_type": "pypi_release"}'

.gitignore

@@ -1,6 +1,8 @@
 # Local cache
 .ruff_cache
 resources/test/cpython
+docs/
+mkdocs.yml
 
 ###
 # Rust.gitignore
@@ -182,3 +184,6 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
 .vimspector.json
+
+# Visual Studio Code
+.vscode/

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.236
+    rev: v0.0.239
     hooks:
       - id: ruff
         args: [--fix]
@@ -15,6 +15,17 @@ repos:
     hooks:
       - id: cargo-fmt
         name: cargo fmt
-        entry: cargo +nightly fmt --
+        entry: cargo fmt --
         language: rust
         types: [rust]
+      - id: clippy
+        name: clippy
+        entry: cargo clippy --workspace --all-targets --all-features
+        language: rust
+        pass_filenames: false
+      - id: dev-generate-all
+        name: dev-generate-all
+        entry: cargo dev generate-all
+        language: rust
+        pass_filenames: false
+        exclude: target

BREAKING_CHANGES.md

@@ -1,5 +1,81 @@
 # Breaking Changes
 
+## 0.0.238
+
+### `select`, `extend-select`, `ignore`, and `extend-ignore` have new semantics ([#2312](https://github.com/charliermarsh/ruff/pull/2312))
+
+Previously, the interplay between `select` and its related options could lead to unexpected
+behavior. For example, `ruff --select E501 --ignore ALL` and `ruff --select E501 --extend-ignore
+ALL` behaved differently. (See [#2312](https://github.com/charliermarsh/ruff/pull/2312) for more
+examples.)
+
+When Ruff determines the enabled rule set, it has to reconcile `select` and `ignore` from a variety
+of sources, including the current `pyproject.toml`, any inherited `pyproject.toml` files, and the
+CLI.
+
+The new semantics are such that Ruff uses the "highest-priority" `select` as the basis for the rule
+set, and then applies any `extend-select`, `ignore`, and `extend-ignore` adjustments. CLI options
+are given higher priority than `pyproject.toml` options, and the current `pyproject.toml` file is
+given higher priority than any inherited `pyproject.toml` files.
+
+`extend-select` and `extend-ignore` are no longer given "top priority"; instead, they merely append
+to the `select` and `ignore` lists, as in Flake8.
+
+This change is largely backwards compatible -- most users should experience no change in behavior.
+However, as an example of a breaking change, consider the following:
+
+```toml
+[tool.ruff]
+ignore = ["F401"]
+```
+
+Running `ruff --select F` would previously have enabled all `F` rules, apart from `F401`. Now, it
+will enable all `F` rules, including `F401`, as the command line's `--select` resets the resolution.
+
+### `remove-six-compat` (`UP016`) has been removed ([#2332](https://github.com/charliermarsh/ruff/pull/2332))
+
+The `remove-six-compat` rule has been removed. This rule was only useful for one-time Python 2-to-3
+upgrades.
+
+## 0.0.238
+
+### `--explain`, `--clean`, and `--generate-shell-completion` are now subcommands ([#2190](https://github.com/charliermarsh/ruff/pull/2190))
+
+`--explain`, `--clean`, and `--generate-shell-completion` are now implemented as subcommands:
+
+    ruff .         # Still works! And will always work.
+    ruff check .   # New! Also works.
+
+    ruff --explain E402   # Still works.
+    ruff rule E402        # New! Also works. (And preferred.)
+
+    # Oops! The command has to come first.
+    ruff --format json --explain E402   # No longer works.
+    ruff --explain E402 --format json   # Still works!
+    ruff rule E402   --format json      # Works! (And preferred.)
+
+This change is largely backwards compatible -- most users should experience
+no change in behavior. However, please note the following exceptions:
+
+* Subcommands will now fail when invoked with unsupported arguments, instead
+  of silently ignoring them. For example, the following will now fail:
+
+      ruff --clean --respect-gitignore
+
+  (the `clean` command doesn't support `--respect-gitignore`.)
+
+* The semantics of `ruff <arg>` have changed slightly when `<arg>` is a valid subcommand.
+  For example, prior to this release, running `ruff rule` would run `ruff` over a file or
+  directory called `rule`. Now, `ruff rule` would invoke the `rule` subcommand. This should
+  only impact projects with files or directories named `rule`, `check`, `explain`, `clean`,
+  or `generate-shell-completion`.
+
+* Scripts that invoke ruff should supply `--` before any positional arguments.
+  (The semantics of `ruff -- <arg>` have not changed.)
+
+* `--explain` previously treated `--format grouped` as a synonym for `--format text`.
+  This is no longer supported; instead, use `--format text`.
+
 ## 0.0.226
 
 ### `misplaced-comparison-constant` (`PLC2201`) was deprecated in favor of `SIM300` ([#1980](https://github.com/charliermarsh/ruff/pull/1980))

CONTRIBUTING.md

@@ -39,20 +39,24 @@ cargo run resources/test/fixtures --no-cache
 ```
 
 Prior to opening a pull request, ensure that your code has been auto-formatted,
-and that it passes both the lint and test validation checks.
-
-For rustfmt and Clippy, we use [nightly Rust][nightly], as it is stricter than stable Rust.
-(However, tests and builds use stable Rust.)
+and that it passes both the lint and test validation checks:
 
 ```shell
-cargo +nightly fmt --all     # Auto-formatting...
-cargo +nightly clippy --fix --workspace --all-targets --all-features  # Linting...
+cargo fmt --all     # Auto-formatting...
+cargo clippy --fix --workspace --all-targets --all-features  # Linting...
 cargo test --all    # Testing...
 ```
 
 These checks will run on GitHub Actions when you open your Pull Request, but running them locally
 will save you time and expedite the merge process.
 
+If you have `pre-commit` [installed](https://pre-commit.com/#installation) then you can use it to 
+assist with formatting and linting. The following command will run the `pre-commit` hooks:
+
+```shell
+pre-commit run --all-files
+```
+
 Your Pull Request will be reviewed by a maintainer, which may involve a few rounds of iteration
 prior to merging.
 
@@ -79,7 +83,7 @@ To trigger the violation, you'll likely want to augment the logic in `src/checke
 defines the Python AST visitor, responsible for iterating over the abstract syntax tree and
 collecting diagnostics as it goes.
 
-If you need to inspect the AST, you can run `cargo +nightly dev print-ast` with a Python file. Grep
+If you need to inspect the AST, you can run `cargo dev print-ast` with a Python file. Grep
 for the `Check::new` invocations to understand how other, similar rules are implemented.
 
 To add a test fixture, create a file under `resources/test/fixtures/[linter]`, named to match
@@ -87,7 +91,7 @@ the code you defined earlier (e.g., `resources/test/fixtures/pycodestyle/E402.py
 contain a variety of violations and non-violations designed to evaluate and demonstrate the behavior
 of your lint rule.
 
-Run `cargo +nightly dev generate-all` to generate the code for your new fixture. Then run Ruff
+Run `cargo dev generate-all` to generate the code for your new fixture. Then run Ruff
 locally with (e.g.) `cargo run resources/test/fixtures/pycodestyle/E402.py --no-cache --select E402`.
 
 Once you're satisfied with the output, codify the behavior as a snapshot test by adding a new
@@ -95,7 +99,7 @@ Once you're satisfied with the output, codify the behavior as a snapshot test by
 Your test will fail, but you'll be prompted to follow-up with `cargo insta review`. Accept the
 generated snapshot, then commit the snapshot file alongside the rest of your changes.
 
-Finally, regenerate the documentation and generated code with `cargo +nightly dev generate-all`.
+Finally, regenerate the documentation and generated code with `cargo dev generate-all`.
 
 ### Example: Adding a new configuration option
 
@@ -121,7 +125,7 @@ You may also want to add the new configuration option to the `flake8-to-ruff` to
 responsible for converting `flake8` configuration files to Ruff's TOML format. This logic
 lives in `flake8_to_ruff/src/converter.rs`.
 
-Finally, regenerate the documentation and generated code with `cargo +nightly dev generate-all`.
+Finally, regenerate the documentation and generated code with `cargo dev generate-all`.
 
 ## Release process
 
@@ -131,5 +135,3 @@ them to [PyPI](https://pypi.org/project/ruff/).
 
 Ruff follows the [semver](https://semver.org/) versioning standard. However, as pre-1.0 software,
 even patch releases may contain [non-backwards-compatible changes](https://semver.org/#spec-item-4).
-
-[nightly]: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust

Cargo.lock

@@ -750,7 +750,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.236"
+version = "0.0.239"
 dependencies = [
  "anyhow",
  "clap 4.1.4",
@@ -1922,7 +1922,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.236"
+version = "0.0.239"
 dependencies = [
  "anyhow",
  "bitflags",
@@ -1977,7 +1977,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_cli"
-version = "0.0.236"
+version = "0.0.239"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
@@ -2014,7 +2014,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_dev"
-version = "0.0.236"
+version = "0.0.239"
 dependencies = [
  "anyhow",
  "clap 4.1.4",
@@ -2035,7 +2035,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_macros"
-version = "0.0.236"
+version = "0.0.239"
 dependencies = [
  "once_cell",
  "proc-macro2",

Cargo.toml

@@ -8,7 +8,7 @@ default-members = [".", "ruff_cli"]
 
 [package]
 name = "ruff"
-version = "0.0.236"
+version = "0.0.239"
 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.236", path = "ruff_macros" }
+ruff_macros = { version = "0.0.239", 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" }

LICENSE

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

flake8_to_ruff/Cargo.lock

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

flake8_to_ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.236"
+version = "0.0.239"
 edition = "2021"
 
 [dependencies]

mkdocs.template.yml

@@ -0,0 +1,49 @@
+site_name: Ruff
+theme:
+  name: material
+  features:
+    - navigation.instant
+    - navigation.tracking
+    - content.code.annotate
+    - toc.integrate
+    - toc.follow
+    - navigation.path
+    - navigation.top
+    - content.code.copy
+  palette:
+    - media: "(prefers-color-scheme: light)"
+      scheme: default
+      primary: red
+      toggle:
+        icon: material/weather-sunny
+        name: Switch to dark mode
+    - media: "(prefers-color-scheme: dark)"
+      scheme: slate
+      primary: red
+      toggle:
+        icon: material/weather-night
+        name: Switch to light mode
+repo_url: https://github.com/charliermarsh/ruff
+repo_name: ruff
+site_author: charliermarsh
+site_url: https://beta.ruff.rs/docs/
+site_dir: site/docs
+markdown_extensions:
+  - toc:
+      permalink: "#"
+  - pymdownx.snippets:
+  - pymdownx.magiclink:
+  - attr_list:
+  - md_in_html:
+  - pymdownx.highlight:
+      anchor_linenums: true
+  - pymdownx.inlinehilite:
+  - pymdownx.superfences:
+  - markdown.extensions.attr_list:
+  - pymdownx.keys:
+  - pymdownx.tasklist:
+      custom_checkbox: true
+  - pymdownx.highlight:
+      anchor_linenums: true
+plugins:
+  - search

pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "maturin"
 
 [project]
 name = "ruff"
-version = "0.0.236"
+version = "0.0.239"
 description = "An extremely fast Python linter, written in Rust."
 authors = [
   { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" },
@@ -15,6 +15,7 @@ authors = [
 maintainers = [
   { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" },
 ]
+readme = "README.md"
 requires-python = ">=3.7"
 license = { file = "LICENSE" }
 keywords = ["automation", "flake8", "pycodestyle", "pyflakes", "pylint", "clippy"]

resources/test/fixtures/flake8_annotations/mypy_init_return.py

@@ -39,3 +39,10 @@ class Foo:
 # Error
 def __init__(self, foo: int):
     ...
+
+
+# Error – used to be ok for a moment since the mere presence
+# of a vararg falsely indicated that the function has a typed argument.
+class Foo:
+    def __init__(self, *arg):
+        ...

resources/test/fixtures/flake8_bandit/S105.py

@@ -4,6 +4,7 @@ d = {}
 safe = "s3cr3t"
 password = True
 password = safe
+password = ""
 password is True
 password == 1
 d["safe"] = "s3cr3t"

resources/test/fixtures/flake8_bandit/S106.py

@@ -7,6 +7,7 @@ string = "Hello World"
 # OK
 func("s3cr3t")
 func(1, password=string)
+func(1, password="")
 func(pos="s3cr3t", password=string)
 
 # Error

resources/test/fixtures/flake8_bandit/S107.py

@@ -28,3 +28,7 @@ def ok_all(first, /, pos, default="posonly", *, kwonly="kwonly"):
 
 def default_all(first, /, pos, secret="posonly", *, password="kwonly"):
     pass
+
+
+def ok_empty(first, password=""):
+    pass

resources/test/fixtures/flake8_bandit/S110.py

@@ -0,0 +1,14 @@
+try:
+    pass
+except Exception:
+    pass
+
+try:
+    pass
+except:
+    pass
+
+try:
+    pass
+except ValueError:
+    pass

resources/test/fixtures/flake8_import_conventions/custom.py

@@ -7,6 +7,13 @@ import matplotlib.pyplot  # unconventional
 import numpy  # unconventional
 import pandas  # unconventional
 import seaborn  # unconventional
+import tensorflow  # unconventional
+import holoviews  # unconventional
+import panel  # unconventional
+import plotly.express  # unconventional
+import matplotlib  # unconventional
+import polars  # unconventional
+import pyarrow  # unconventional
 
 import altair as altr  # unconventional
 import matplotlib.pyplot as plot  # unconventional
@@ -15,6 +22,13 @@ import dask.dataframe as ddf  # unconventional
 import numpy as nmp  # unconventional
 import pandas as pdas  # unconventional
 import seaborn as sbrn  # unconventional
+import tensorflow as tfz  # unconventional
+import holoviews as hsv  # unconventional
+import panel as pns  # unconventional
+import plotly.express as pltx  # unconventional
+import matplotlib as ml  # unconventional
+import polars as ps # unconventional
+import pyarrow as arr  # unconventional
 
 import altair as alt  # conventional
 import dask.array as da  # conventional
@@ -23,3 +37,12 @@ import matplotlib.pyplot as plt  # conventional
 import numpy as np  # conventional
 import pandas as pd  # conventional
 import seaborn as sns  # conventional
+import tensorflow as tf # conventional
+import holoviews as hv  # conventional
+import panel as pn  # conventional
+import plotly.express as px  # conventional
+import matplotlib as mpl  # conventional
+import polars as pl # conventional
+import pyarrow as pa  # conventional
+
+from tensorflow.keras import Model  # conventional

resources/test/fixtures/flake8_logging_format/G201.py

@@ -1,3 +1,21 @@
 import logging
+import sys
 
-logging.error('Hello World', exc_info=True)
+# G201
+try:
+    pass
+except:
+    logging.error("Hello World", exc_info=True)
+
+try:
+    pass
+except:
+    logging.error("Hello World", exc_info=sys.exc_info())
+
+# OK
+try:
+    pass
+except:
+    logging.error("Hello World", exc_info=False)
+
+logging.error("Hello World", exc_info=sys.exc_info())

resources/test/fixtures/flake8_logging_format/G202.py

@@ -1,3 +1,21 @@
 import logging
+import sys
 
-logging.exception('Hello World', exc_info=True)
+# G202
+try:
+    pass
+except:
+    logging.exception("Hello World", exc_info=True)
+
+try:
+    pass
+except:
+    logging.exception("Hello World", exc_info=sys.exc_info())
+
+# OK
+try:
+    pass
+except:
+    logging.exception("Hello World", exc_info=False)
+
+logging.exception("Hello World", exc_info=True)

resources/test/fixtures/flake8_pytest_style/PT003.py

@@ -14,3 +14,60 @@ def ok_other_scope():
 @pytest.fixture(scope="function")
 def error():
     ...
+
+
+@pytest.fixture(scope="function", name="my_fixture")
+def error_multiple_args():
+    ...
+
+
+@pytest.fixture(name="my_fixture", scope="function")
+def error_multiple_args():
+    ...
+
+
+@pytest.fixture(name="my_fixture", scope="function", **kwargs)
+def error_second_arg():
+    ...
+
+
+# pytest.fixture does not take positional arguments, however this 
+# tests the general case as we use a helper function that should
+# work for all cases.
+@pytest.fixture("my_fixture", scope="function")
+def error_arg():
+    ...
+
+
+@pytest.fixture(
+    scope="function",
+    name="my_fixture",
+)
+def error_multiple_args():
+    ...
+
+
+@pytest.fixture(
+    name="my_fixture",
+    scope="function",
+)
+def error_multiple_args():
+    ...
+
+
+@pytest.fixture(
+    "hello", 
+    name, 
+    *args
+    , 
+
+    # another comment ,)
+    
+    scope=\
+        "function"  # some comment ),
+    ,
+    
+    name2=name, name3="my_fixture", **kwargs
+)
+def error_multiple_args():
+    ...

resources/test/fixtures/flake8_quotes/doubles.py

@@ -1,2 +1,4 @@
 this_should_be_linted = "double quote string"
 this_should_be_linted = u"double quote string"
+this_should_be_linted = f"double quote string"
+this_should_be_linted = f"double {'quote'} string"

resources/test/fixtures/flake8_quotes/doubles_escaped.py

@@ -4,3 +4,8 @@ this_is_fine = '"This" is a \'string\''
 this_is_fine = "This is a 'string'"
 this_is_fine = "\"This\" is a 'string'"
 this_is_fine = r'This is a \'string\''
+this_is_fine = R'This is a \'string\''
+this_should_raise = (
+    'This is a'
+    '\'string\''
+)

resources/test/fixtures/flake8_quotes/doubles_implicit.py

@@ -0,0 +1,27 @@
+x = (
+    "This"
+    "is"
+    "not"
+)
+
+x = (
+    "This" \
+    "is" \
+    "not"
+)
+
+x = (
+    "This"
+    "is 'actually'"
+    "fine"
+)
+
+x = (
+    "This" \
+    "is 'actually'" \
+    "fine"
+)
+
+if True:
+    "This can use 'double' quotes"
+"But this needs to be changed"

resources/test/fixtures/flake8_quotes/singles.py

@@ -1,2 +1,4 @@
 this_should_be_linted = 'single quote string'
 this_should_be_linted = u'double quote string'
+this_should_be_linted = f'double quote string'
+this_should_be_linted = f'double {"quote"} string'

resources/test/fixtures/flake8_quotes/singles_escaped.py

@@ -3,3 +3,8 @@ this_is_fine = "'This' is a \"string\""
 this_is_fine = 'This is a "string"'
 this_is_fine = '\'This\' is a "string"'
 this_is_fine = r"This is a \"string\""
+this_is_fine = R"This is a \"string\""
+this_should_raise = (
+    "This is a"
+    "\"string\""
+)

resources/test/fixtures/flake8_quotes/singles_implicit.py

@@ -0,0 +1,27 @@
+x = (
+    'This'
+    'is'
+    'not'
+)
+
+x = (
+    'This' \
+    'is' \
+    'not'
+)
+
+x = (
+    'This'
+    'is "actually"'
+    'fine'
+)
+
+x = (
+    'This' \
+    'is "actually"' \
+    'fine'
+)
+
+if True:
+    'This can use "single" quotes'
+'But this needs to be changed'

resources/test/fixtures/flake8_raise/RSE102.py

@@ -0,0 +1,15 @@
+try:
+    y = 6 + "7"
+except TypeError:
+    raise ValueError()  # RSE102
+
+try:
+    x = 1 / 0
+except ZeroDivisionError:
+    raise
+
+raise TypeError()  # RSE102
+
+raise AssertionError
+
+raise AttributeError("test message")

resources/test/fixtures/flake8_simplify/SIM103.py

@@ -6,6 +6,14 @@ def f():
         return False
 
 
+def f():
+    # SIM103
+    if a == b:
+        return True
+    else:
+        return False
+
+
 def f():
     # SIM103
     if a:
@@ -50,3 +58,29 @@ def f():
         return False
     else:
         return True
+
+
+def f():
+    # OK
+    if a:
+        return False
+    else:
+        return False
+
+
+def f():
+    # OK
+    if a:
+        return True
+    else:
+        return True
+
+
+def f():
+    # OK
+    def bool():
+        return False
+    if a:
+        return True
+    else:
+        return False

resources/test/fixtures/flake8_simplify/SIM108.py

@@ -91,3 +91,10 @@ if True:
         b = cccccccccccccccccccccccccccccccccccc
     else:
         b = ddddddddddddddddddddddddddddddddddddd
+
+
+# OK (trailing comments)
+if True:
+    exitcode = 0
+else:
+    exitcode = 1  # Trailing comment

resources/test/fixtures/flake8_simplify/SIM210.py

@@ -5,3 +5,8 @@ a = True if b != c else False  # SIM210
 a = True if b + c else False  # SIM210
 
 a = False if b else True  # OK
+
+def bool():
+    return False
+
+a = True if b else False  # OK

resources/test/fixtures/flake8_simplify/SIM300.py

@@ -1,15 +1,26 @@
 # Errors
 "yoda" == compare  # SIM300
-'yoda' == compare  # SIM300
+"yoda" == compare  # SIM300
 42 == age  # SIM300
+("a", "b") == compare  # SIM300
 "yoda" <= compare  # SIM300
-'yoda' < compare  # SIM300
+"yoda" < compare  # SIM300
 42 > age  # SIM300
+YODA == age  # SIM300
+YODA > age  # SIM300
+YODA >= age  # SIM300
+JediOrder.YODA == age  # SIM300
 
 # OK
 compare == "yoda"
 age == 42
+compare == ("a", "b")
 x == y
 "yoda" == compare == 1
 "yoda" == compare == someothervar
 "yoda" == "yoda"
+age == YODA
+age < YODA
+age <= YODA
+YODA == YODA
+age == JediOrder.YODA

resources/test/fixtures/flake8_use_pathlib/full_name.py

@@ -29,3 +29,4 @@ os.path.splitext(p)
 with open(p) as fp:
     fp.read()
 open(p).close()
+os.getcwdb(p)

resources/test/fixtures/isort/preserve_tabs.py

@@ -0,0 +1,29 @@
+from numpy import (
+	cos,
+	int8,
+	int16,
+	int32,
+	int64,
+	sin,
+	tan,
+	uint8,
+	uint16,
+	uint32,
+	uint64,
+)
+
+if True:
+	# inside nested block
+	from numpy import (
+		cos,
+		int8,
+		int16,
+		int32,
+		int64,
+		sin,
+		tan,
+		uint8,
+		uint16,
+		uint32,
+		uint64,
+	)

resources/test/fixtures/isort/preserve_tabs_2.py

@@ -0,0 +1,13 @@
+from numpy import (
+	cos,
+	int8,
+	int16,
+	int32,
+	int64,
+	sin,
+	tan,
+	uint8,
+	uint16,
+	uint32,
+	uint64,
+)

resources/test/fixtures/isort/star_before_others.py

@@ -0,0 +1,3 @@
+from .logging import config_logging
+from .settings import ENV
+from .settings import *

resources/test/fixtures/pandas_vet/PD002.py

@@ -0,0 +1,20 @@
+import pandas as pd
+
+x = pd.DataFrame()
+
+x.drop(["a"], axis=1, inplace=True)
+
+x.drop(["a"], axis=1, inplace=True)
+
+x.drop(
+    inplace=True,
+    columns=["a"],
+    axis=1,
+)
+
+if True:
+    x.drop(
+        inplace=True,
+        columns=["a"],
+        axis=1,
+    )

resources/test/fixtures/pep8_naming/N806.py

@@ -6,7 +6,7 @@ from typing import NewType
 GLOBAL: str = "foo"
 
 
-def f():
+def assign():
     global GLOBAL
     GLOBAL = "bar"
     lower = 0
@@ -18,4 +18,18 @@ def f():
     MyObj2 = namedtuple("MyObj12", ["a", "b"])
 
     T = TypeVar("T")
-    UserId = NewType('UserId', int)
+    UserId = NewType("UserId", int)
+
+
+def aug_assign(rank, world_size):
+    global CURRENT_PORT
+
+    CURRENT_PORT += 1
+    if CURRENT_PORT > MAX_PORT:
+        CURRENT_PORT = START_PORT
+
+
+def loop_assign():
+    global CURRENT_PORT
+    for CURRENT_PORT in range(5):
+        pass

resources/test/fixtures/pyflakes/F401_8.py

@@ -0,0 +1,6 @@
+"""Test: explicit re-export of shadowed builtins."""
+
+from concurrent.futures import (
+    CancelledError as CancelledError,
+    TimeoutError as TimeoutError,
+)

resources/test/fixtures/pylint/global_variable_not_assigned.py

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

resources/test/fixtures/pylint/invalid_all_format.py

@@ -0,0 +1,19 @@
+__all__ = "CONST"  # [invalid-all-format]
+
+__all__ = ["Hello"] + {"world"}  # [invalid-all-format]
+
+__all__ += {"world"}  # [invalid-all-format]
+
+__all__ = {"world"} + ["Hello"]  # [invalid-all-format]
+
+__all__ = (x for x in ["Hello", "world"])  # [invalid-all-format]
+
+__all__ = {x for x in ["Hello", "world"]}  # [invalid-all-format]
+
+__all__ = ["Hello"]
+
+__all__ = ("Hello",)
+
+__all__ = ["Hello"] + ("world",)
+
+__all__ = [x for x in ["Hello", "world"]]

resources/test/fixtures/pylint/invalid_all_object.py

@@ -0,0 +1,11 @@
+__all__ = (
+    None,  # [invalid-all-object]
+    Fruit,
+    Worm,
+)
+
+class Fruit:
+    pass
+
+class Worm:
+    pass

resources/test/fixtures/pylint/magic_value_comparison.py

@@ -47,7 +47,7 @@ if input_password == "":  # correct
 if input_password == ADMIN_PASSWORD:  # correct
     pass
 
-if input_password == "Hunter2":  # [magic-value-comparison]
+if input_password == "Hunter2":  # correct
     pass
 
 PI = 3.141592653589793238
@@ -62,7 +62,7 @@ if pi_estimation == PI:  # correct
 HELLO_WORLD = b"Hello, World!"
 user_input = b"Hello, There!"
 
-if user_input == b"something":  # [magic-value-comparison]
+if user_input == b"something":  # correct
     pass
 
 if user_input == HELLO_WORLD:  # correct

resources/test/fixtures/pylint/too_many_args.py

@@ -0,0 +1,34 @@
+def f(x, y, z, t, u, v, w, r):  # Too many arguments (8/5)
+    pass
+
+
+def f(x, y, z, t, u):  # OK
+    pass
+
+
+def f(x):  # OK
+    pass
+
+
+def f(x, y, z, _t, _u, _v, _w, r):  # OK (underscore-prefixed names are ignored
+    pass
+
+
+def f(x, y, z, u=1, v=1, r=1):  # Too many arguments (6/5)
+    pass
+
+
+def f(x=1, y=1, z=1):  # OK
+    pass
+
+
+def f(x, y, z, /, u, v, w):  # OK
+    pass
+
+
+def f(x, y, z, *, u, v, w):  # OK
+    pass
+
+
+def f(x, y, z, a, b, c, *, u, v, w):  # Too many arguments (6/5)
+    pass

resources/test/fixtures/pylint/too_many_args_params.py

@@ -0,0 +1,10 @@
+# Too many args (6/4) for max_args=4
+# OK for dummy_variable_rgx ~ "skip_.*"
+def f(x, y, z, skip_t, skip_u, skip_v):
+    pass
+
+
+# Too many args (6/4) for max_args=4
+# Too many args (6/5) for dummy_variable_rgx ~ "skip_.*"
+def f(x, y, z, t, u, v):
+    pass

resources/test/fixtures/pyupgrade/UP016.py

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

resources/test/fixtures/pyupgrade/UP035.py

@@ -0,0 +1,50 @@
+# UP035
+from collections import Mapping
+
+from collections import Mapping as MAP
+
+from collections import Mapping, Sequence
+
+from collections import Counter, Mapping
+
+from collections import (Counter, Mapping)
+
+from collections import (Counter,
+                         Mapping)
+
+from collections import Counter, \
+                         Mapping
+
+from collections import Counter, Mapping, Sequence
+
+from collections import Mapping as mapping, Counter
+
+if True:
+    from collections import Mapping, Counter
+
+if True:
+    if True:
+        pass
+    from collections import Mapping, Counter
+
+if True: from collections import Mapping
+
+import os
+from collections import Counter, Mapping
+import sys
+
+if True:
+    from collections import (
+        Mapping,
+        Callable,
+        Bad,
+        Good,
+    )
+
+from typing import Callable, Match, Pattern, List
+
+if True: from collections import (
+    Mapping, Counter)
+
+# OK
+from a import b

resources/test/fixtures/ruff/RUF100_0.py

@@ -86,3 +86,5 @@ import shelve  # noqa: RUF100
 import sys  # noqa: F401, RUF100
 
 print(sys.path)
+
+"shape:  (6,)\nSeries: '' [duration[μs]]\n[\n\t0µs\n\t1µs\n\t2µs\n\t3µs\n\t4µs\n\t5µs\n]"  # noqa: F401

resources/test/fixtures/ruff/RUF100_2.py

@@ -0,0 +1 @@
+import itertools  # noqa: F401

resources/test/fixtures/tryceratops/TRY201.py

@@ -35,6 +35,16 @@ def still_good():
         raise
 
 
+def still_actually_good():
+    try:
+        process()
+    except MyException as e:
+        try:
+            pass
+        except TypeError:
+            raise e
+
+
 def bad_that_needs_recursion():
     try:
         process()

resources/test/fixtures/tryceratops/TRY400.py

@@ -28,6 +28,16 @@ def bad():
             logger.error("Context message here")
 
 
+def bad():
+    try:
+        a = 1
+    except Exception:
+        log.error("Context message here")
+
+        if True:
+            log.error("Context message here")
+
+
 def bad():
     try:
         a = 1

ruff.schema.json

@@ -66,18 +66,8 @@
         "type": "string"
       }
     },
-    "extend-ignore": {
-      "description": "A list of rule codes or prefixes to ignore, in addition to those specified by `ignore`.\n\nNote that `extend-ignore` is applied after resolving rules from `ignore`/`select` and a less specific rule in `extend-ignore` would overwrite a more specific rule in `select`. It is recommended to only use `extend-ignore` when extending a `pyproject.toml` file via `extend`.",
-      "type": [
-        "array",
-        "null"
-      ],
-      "items": {
-        "$ref": "#/definitions/RuleSelector"
-      }
-    },
     "extend-select": {
-      "description": "A list of rule codes or prefixes to enable, in addition to those specified by `select`.\n\nNote that `extend-select` is applied after resolving rules from `ignore`/`select` and a less specific rule in `extend-select` would overwrite a more specific rule in `ignore`. It is recommended to only use `extend-select` when extending a `pyproject.toml` file via `extend`.",
+      "description": "A list of rule codes or prefixes to enable, in addition to those specified by `select`.",
       "type": [
         "array",
         "null"
@@ -111,7 +101,7 @@
       ]
     },
     "fixable": {
-      "description": "A list of rule codes or prefixes to consider autofixable.",
+      "description": "A list of rule codes or prefixes to consider autofixable. By default, all rules are considered autofixable.",
       "type": [
         "array",
         "null"
@@ -578,6 +568,13 @@
     "Flake8BanditOptions": {
       "type": "object",
       "properties": {
+        "check-typed-exception": {
+          "description": "Whether to disallow `try`-`except`-`pass` (`S110`) for specific exception types. By default, `try`-`except`-`pass` is only disallowed for `Exception` and `BaseException`.",
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
         "hardcoded-tmp-directory": {
           "description": "A list of directories to consider temporary.",
           "type": [
@@ -652,7 +649,7 @@
       "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).",
+          "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).\n\nNote that setting `allow-multiline = false` should typically be coupled with disabling `explicit-string-concatenation` (`ISC003`). Otherwise, both explicit and implicit multiline string concatenations will be seen as violations.",
           "type": [
             "boolean",
             "null"
@@ -771,7 +768,7 @@
           ]
         },
         "docstring-quotes": {
-          "description": "Quote style to prefer for docstrings (either \"single\" (`'`) or \"double\" (`\"`)).",
+          "description": "Quote style to prefer for docstrings (either \"single\" or \"double\").",
           "anyOf": [
             {
               "$ref": "#/definitions/Quote"
@@ -782,7 +779,7 @@
           ]
         },
         "inline-quotes": {
-          "description": "Quote style to prefer for inline strings (either \"single\" (`'`) or \"double\" (`\"`)).",
+          "description": "Quote style to prefer for inline strings (either \"single\" or \"double\").",
           "anyOf": [
             {
               "$ref": "#/definitions/Quote"
@@ -793,7 +790,7 @@
           ]
         },
         "multiline-quotes": {
-          "description": "Quote style to prefer for multiline strings (either \"single\" (`'`) or \"double\" (`\"`)).",
+          "description": "Quote style to prefer for multiline strings (either \"single\" or \"double\").",
           "anyOf": [
             {
               "$ref": "#/definitions/Quote"
@@ -981,7 +978,7 @@
           "description": "Whether to place \"closer\" imports (fewer `.` characters, most local) before \"further\" imports (more `.` characters, least local), or vice versa.\n\nThe default (\"furthest-to-closest\") is equivalent to isort's `reverse-relative` default (`reverse-relative = false`); setting this to \"closest-to-furthest\" is equivalent to isort's `reverse-relative = true`.",
           "anyOf": [
             {
-              "$ref": "#/definitions/RelatveImportsOrder"
+              "$ref": "#/definitions/RelativeImportsOrder"
             },
             {
               "type": "null"
@@ -1157,7 +1154,7 @@
       "type": "object",
       "properties": {
         "allow-magic-value-types": {
-          "description": "Constant types to ignore when used as \"magic values\".",
+          "description": "Constant types to ignore when used as \"magic values\" (see: `PLR2004`).",
           "type": [
             "array",
             "null"
@@ -1165,6 +1162,15 @@
           "items": {
             "$ref": "#/definitions/ConstantType"
           }
+        },
+        "max-args": {
+          "description": "Maximum number of arguments allowed for a function definition (see: `PLR0913`).",
+          "type": [
+            "integer",
+            "null"
+          ],
+          "format": "uint",
+          "minimum": 0.0
         }
       },
       "additionalProperties": false
@@ -1182,14 +1188,14 @@
     "Quote": {
       "oneOf": [
         {
-          "description": "Use single quotes (`'`).",
+          "description": "Use single quotes.",
           "type": "string",
           "enum": [
             "single"
           ]
         },
         {
-          "description": "Use double quotes (`\"`).",
+          "description": "Use double quotes.",
           "type": "string",
           "enum": [
             "double"
@@ -1197,7 +1203,7 @@
         }
       ]
     },
-    "RelatveImportsOrder": {
+    "RelativeImportsOrder": {
       "oneOf": [
         {
           "description": "Place \"closer\" imports (fewer `.` characters, most local) before \"further\" imports (more `.` characters, least local).",
@@ -1615,6 +1621,10 @@
         "PLE011",
         "PLE0117",
         "PLE0118",
+        "PLE06",
+        "PLE060",
+        "PLE0604",
+        "PLE0605",
         "PLE1",
         "PLE11",
         "PLE114",
@@ -1630,6 +1640,9 @@
         "PLR04",
         "PLR040",
         "PLR0402",
+        "PLR09",
+        "PLR091",
+        "PLR0913",
         "PLR1",
         "PLR17",
         "PLR170",
@@ -1726,6 +1739,10 @@
         "RET506",
         "RET507",
         "RET508",
+        "RSE",
+        "RSE1",
+        "RSE10",
+        "RSE102",
         "RUF",
         "RUF0",
         "RUF00",
@@ -1749,6 +1766,7 @@
         "S107",
         "S108",
         "S11",
+        "S110",
         "S113",
         "S3",
         "S32",
@@ -1858,7 +1876,6 @@
         "UP013",
         "UP014",
         "UP015",
-        "UP016",
         "UP017",
         "UP018",
         "UP019",
@@ -1879,6 +1896,7 @@
         "UP032",
         "UP033",
         "UP034",
+        "UP035",
         "W",
         "W2",
         "W29",

ruff_cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_cli"
-version = "0.0.236"
+version = "0.0.239"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 edition = "2021"
 rust-version = "1.65.0"
@@ -53,6 +53,7 @@ similar = { version = "2.2.1" }
 textwrap = { version = "0.16.0" }
 update-informer = { version = "0.6.0", default-features = false, features = ["pypi"], optional = true }
 walkdir = { version = "2.3.2" }
+strum = "0.24.1"
 
 [dev-dependencies]
 assert_cmd = { version = "2.0.4" }

ruff_cli/src/args.rs

@@ -5,6 +5,7 @@ use regex::Regex;
 use ruff::logging::LogLevel;
 use ruff::registry::Rule;
 use ruff::resolver::ConfigProcessor;
+use ruff::settings::configuration::RuleSelection;
 use ruff::settings::types::{
     FilePattern, PatternPrefixPair, PerFileIgnore, PythonVersion, SerializationFormat,
 };
@@ -15,12 +16,50 @@ use rustc_hash::FxHashMap;
 #[command(
     author,
     name = "ruff",
-    about = "Ruff: An extremely fast Python linter."
+    about = "Ruff: An extremely fast Python linter.",
+    after_help = "For help with a specific command, see: `ruff help <command>`."
 )]
 #[command(version)]
-#[allow(clippy::struct_excessive_bools)]
 pub struct Args {
-    #[arg(required_unless_present_any = ["clean", "explain", "generate_shell_completion"])]
+    #[command(subcommand)]
+    pub command: Command,
+    #[clap(flatten)]
+    pub log_level_args: LogLevelArgs,
+}
+
+#[allow(clippy::large_enum_variant)]
+#[derive(Debug, clap::Subcommand)]
+pub enum Command {
+    /// Run Ruff on the given files or directories (default).
+    Check(CheckArgs),
+    /// Explain a rule.
+    #[clap(alias = "--explain")]
+    Rule {
+        #[arg(value_parser=Rule::from_code)]
+        rule: &'static Rule,
+
+        /// Output format
+        #[arg(long, value_enum, default_value = "text")]
+        format: HelpFormat,
+    },
+    /// List all supported upstream linters
+    Linter {
+        /// Output format
+        #[arg(long, value_enum, default_value = "text")]
+        format: HelpFormat,
+    },
+    /// Clear any caches in the current directory and any subdirectories.
+    #[clap(alias = "--clean")]
+    Clean,
+    /// Generate shell completion.
+    #[clap(alias = "--generate-shell-completion", hide = true)]
+    GenerateShellCompletion { shell: clap_complete_command::Shell },
+}
+
+#[derive(Debug, clap::Args)]
+#[allow(clippy::struct_excessive_bools, clippy::module_name_repetitions)]
+pub struct CheckArgs {
+    /// List of files or directories to check.
     pub files: Vec<PathBuf>,
     /// Attempt to automatically fix lint violations.
     #[arg(long, overrides_with("no_fix"))]
@@ -78,13 +117,13 @@ pub struct Args {
         help_heading = "Rule selection"
     )]
     pub extend_select: Option<Vec<RuleSelector>>,
-    /// Like --ignore, but adds additional rule codes on top of the ignored
-    /// ones.
+    /// Like --ignore. (Deprecated: You can just use --ignore instead.)
     #[arg(
         long,
         value_delimiter = ',',
         value_name = "RULE_CODE",
-        help_heading = "Rule selection"
+        help_heading = "Rule selection",
+        hide = true
     )]
     pub extend_ignore: Option<Vec<RuleSelector>>,
     /// List of mappings from file pattern to code to exclude
@@ -179,81 +218,36 @@ pub struct Args {
     update_check: bool,
     #[clap(long, overrides_with("update_check"), hide = true)]
     no_update_check: bool,
+    /// Show counts for every rule with at least one violation.
+    #[arg(
+        long,
+        // Unsupported default-command arguments.
+        conflicts_with = "diff",
+        conflicts_with = "show_source",
+        conflicts_with = "watch",
+    )]
+    pub statistics: bool,
     /// Enable automatic additions of `noqa` directives to failing lines.
     #[arg(
         long,
         // conflicts_with = "add_noqa",
-        conflicts_with = "clean",
-        conflicts_with = "explain",
-        conflicts_with = "generate_shell_completion",
         conflicts_with = "show_files",
         conflicts_with = "show_settings",
         // Unsupported default-command arguments.
+        conflicts_with = "statistics",
         conflicts_with = "stdin_filename",
         conflicts_with = "watch",
     )]
     pub add_noqa: bool,
-    /// Explain a rule.
-    #[arg(
-        long,
-        value_parser=Rule::from_code,
-        help_heading="Subcommands",
-        // Fake subcommands.
-        conflicts_with = "add_noqa",
-        conflicts_with = "clean",
-        // conflicts_with = "explain",
-        conflicts_with = "generate_shell_completion",
-        conflicts_with = "show_files",
-        conflicts_with = "show_settings",
-        // Unsupported default-command arguments.
-        conflicts_with = "stdin_filename",
-        conflicts_with = "watch",
-    )]
-    pub explain: Option<&'static Rule>,
-    /// Clear any caches in the current directory or any subdirectories.
-    #[arg(
-        long,
-        help_heading="Subcommands",
-        // Fake subcommands.
-        conflicts_with = "add_noqa",
-        // conflicts_with = "clean",
-        conflicts_with = "explain",
-        conflicts_with = "generate_shell_completion",
-        conflicts_with = "show_files",
-        conflicts_with = "show_settings",
-        // Unsupported default-command arguments.
-        conflicts_with = "stdin_filename",
-        conflicts_with = "watch",
-    )]
-    pub clean: bool,
-    /// Generate shell completion
-    #[arg(
-        long,
-        hide = true,
-        value_name = "SHELL",
-        // Fake subcommands.
-        conflicts_with = "add_noqa",
-        conflicts_with = "clean",
-        conflicts_with = "explain",
-        // conflicts_with = "generate_shell_completion",
-        conflicts_with = "show_files",
-        conflicts_with = "show_settings",
-        // Unsupported default-command arguments.
-        conflicts_with = "stdin_filename",
-        conflicts_with = "watch",
-    )]
-    pub generate_shell_completion: Option<clap_complete_command::Shell>,
     /// See the files Ruff will be run against with the current settings.
     #[arg(
         long,
         // Fake subcommands.
         conflicts_with = "add_noqa",
-        conflicts_with = "clean",
-        conflicts_with = "explain",
-        conflicts_with = "generate_shell_completion",
         // conflicts_with = "show_files",
         conflicts_with = "show_settings",
         // Unsupported default-command arguments.
+        conflicts_with = "statistics",
         conflicts_with = "stdin_filename",
         conflicts_with = "watch",
     )]
@@ -263,32 +257,52 @@ pub struct Args {
         long,
         // Fake subcommands.
         conflicts_with = "add_noqa",
-        conflicts_with = "clean",
-        conflicts_with = "explain",
-        conflicts_with = "generate_shell_completion",
         conflicts_with = "show_files",
         // conflicts_with = "show_settings",
         // Unsupported default-command arguments.
+        conflicts_with = "statistics",
         conflicts_with = "stdin_filename",
         conflicts_with = "watch",
     )]
     pub show_settings: bool,
-    #[clap(flatten)]
-    pub log_level_args: LogLevelArgs,
+}
+
+#[derive(Debug, Clone, Copy, clap::ValueEnum)]
+pub enum HelpFormat {
+    Text,
+    Json,
 }
 
 #[allow(clippy::module_name_repetitions)]
 #[derive(Debug, clap::Args)]
 pub struct LogLevelArgs {
     /// Enable verbose logging.
-    #[arg(short, long, group = "verbosity", help_heading = "Log levels")]
+    #[arg(
+        short,
+        long,
+        global = true,
+        group = "verbosity",
+        help_heading = "Log levels"
+    )]
     pub verbose: bool,
     /// Print lint violations, but nothing else.
-    #[arg(short, long, group = "verbosity", help_heading = "Log levels")]
+    #[arg(
+        short,
+        long,
+        global = true,
+        group = "verbosity",
+        help_heading = "Log levels"
+    )]
     pub quiet: bool,
     /// Disable all logging (but still exit with status code "1" upon detecting
     /// lint violations).
-    #[arg(short, long, group = "verbosity", help_heading = "Log levels")]
+    #[arg(
+        short,
+        long,
+        global = true,
+        group = "verbosity",
+        help_heading = "Log levels"
+    )]
     pub silent: bool,
 }
 
@@ -306,24 +320,22 @@ impl From<&LogLevelArgs> for LogLevel {
     }
 }
 
-impl Args {
+impl CheckArgs {
     /// Partition the CLI into command-line arguments and configuration
     /// overrides.
     pub fn partition(self) -> (Arguments, Overrides) {
         (
             Arguments {
                 add_noqa: self.add_noqa,
-                clean: self.clean,
                 config: self.config,
                 diff: self.diff,
                 exit_zero: self.exit_zero,
-                explain: self.explain,
                 files: self.files,
-                generate_shell_completion: self.generate_shell_completion,
                 isolated: self.isolated,
                 no_cache: self.no_cache,
                 show_files: self.show_files,
                 show_settings: self.show_settings,
+                statistics: self.statistics,
                 stdin_filename: self.stdin_filename,
                 watch: self.watch,
             },
@@ -371,17 +383,15 @@ fn resolve_bool_arg(yes: bool, no: bool) -> Option<bool> {
 #[allow(clippy::struct_excessive_bools)]
 pub struct Arguments {
     pub add_noqa: bool,
-    pub clean: bool,
     pub config: Option<PathBuf>,
     pub diff: bool,
     pub exit_zero: bool,
-    pub explain: Option<&'static Rule>,
     pub files: Vec<PathBuf>,
-    pub generate_shell_completion: Option<clap_complete_command::Shell>,
     pub isolated: bool,
     pub no_cache: bool,
     pub show_files: bool,
     pub show_settings: bool,
+    pub statistics: bool,
     pub stdin_filename: Option<PathBuf>,
     pub watch: bool,
 }
@@ -433,18 +443,25 @@ impl ConfigProcessor for &Overrides {
         if let Some(fix_only) = &self.fix_only {
             config.fix_only = Some(*fix_only);
         }
-        if let Some(fixable) = &self.fixable {
-            config.fixable = Some(fixable.clone());
-        }
+        config.rule_selections.push(RuleSelection {
+            select: self.select.clone(),
+            ignore: self
+                .ignore
+                .iter()
+                .cloned()
+                .chain(self.extend_ignore.iter().cloned().into_iter())
+                .flatten()
+                .collect(),
+            extend_select: self.extend_select.clone().unwrap_or_default(),
+            fixable: self.fixable.clone(),
+            unfixable: self.unfixable.clone().unwrap_or_default(),
+        });
         if let Some(format) = &self.format {
             config.format = Some(*format);
         }
         if let Some(force_exclude) = &self.force_exclude {
             config.force_exclude = Some(*force_exclude);
         }
-        if let Some(ignore) = &self.ignore {
-            config.ignore = Some(ignore.clone());
-        }
         if let Some(line_length) = &self.line_length {
             config.line_length = Some(*line_length);
         }
@@ -454,38 +471,15 @@ impl ConfigProcessor for &Overrides {
         if let Some(respect_gitignore) = &self.respect_gitignore {
             config.respect_gitignore = Some(*respect_gitignore);
         }
-        if let Some(select) = &self.select {
-            config.select = Some(select.clone());
-        }
         if let Some(show_source) = &self.show_source {
             config.show_source = Some(*show_source);
         }
         if let Some(target_version) = &self.target_version {
             config.target_version = Some(*target_version);
         }
-        if let Some(unfixable) = &self.unfixable {
-            config.unfixable = Some(unfixable.clone());
-        }
         if let Some(update_check) = &self.update_check {
             config.update_check = Some(*update_check);
         }
-        // Special-case: `extend_ignore` and `extend_select` are parallel arrays, so
-        // push an empty array if only one of the two is provided.
-        match (&self.extend_ignore, &self.extend_select) {
-            (Some(extend_ignore), Some(extend_select)) => {
-                config.extend_ignore.push(extend_ignore.clone());
-                config.extend_select.push(extend_select.clone());
-            }
-            (Some(extend_ignore), None) => {
-                config.extend_ignore.push(extend_ignore.clone());
-                config.extend_select.push(Vec::new());
-            }
-            (None, Some(extend_select)) => {
-                config.extend_ignore.push(Vec::new());
-                config.extend_select.push(extend_select.clone());
-            }
-            (None, None) => {}
-        }
     }
 }
 

ruff_cli/src/commands.rs

@@ -18,16 +18,17 @@ use ruff::message::{Location, Message};
 use ruff::registry::{Linter, Rule, RuleNamespace};
 use ruff::resolver::PyprojectDiscovery;
 use ruff::settings::flags;
-use ruff::settings::types::SerializationFormat;
 use ruff::{fix, fs, packaging, resolver, warn_user_once, AutofixAvailability, IOError};
 use serde::Serialize;
 use walkdir::WalkDir;
 
-use crate::args::Overrides;
+use crate::args::{HelpFormat, Overrides};
 use crate::cache;
 use crate::diagnostics::{lint_path, lint_stdin, Diagnostics};
 use crate::iterators::par_iter;
 
+pub mod linter;
+
 /// Run the linter over a collection of files.
 pub fn run(
     files: &[PathBuf],
@@ -111,7 +112,7 @@ pub fn run(
                     let settings = resolver.resolve(path, pyproject_strategy);
                     if settings.rules.enabled(&Rule::IOError) {
                         Diagnostics::new(vec![Message {
-                            kind: IOError(message).into(),
+                            kind: IOError { message }.into(),
                             location: Location::default(),
                             end_location: Location::default(),
                             fix: None,
@@ -269,10 +270,10 @@ struct Explanation<'a> {
 }
 
 /// Explain a `Rule` to the user.
-pub fn explain(rule: &Rule, format: SerializationFormat) -> Result<()> {
+pub fn rule(rule: &Rule, format: HelpFormat) -> Result<()> {
     let (linter, _) = Linter::parse_code(rule.code()).unwrap();
     match format {
-        SerializationFormat::Text | SerializationFormat::Grouped => {
+        HelpFormat::Text => {
             println!("{}\n", rule.as_ref());
             println!("Code: {} ({})\n", rule.code(), linter.name());
 
@@ -290,7 +291,7 @@ pub fn explain(rule: &Rule, format: SerializationFormat) -> Result<()> {
                 println!("* {format}");
             }
         }
-        SerializationFormat::Json => {
+        HelpFormat::Json => {
             println!(
                 "{}",
                 serde_json::to_string_pretty(&Explanation {
@@ -300,24 +301,12 @@ pub fn explain(rule: &Rule, format: SerializationFormat) -> Result<()> {
                 })?
             );
         }
-        SerializationFormat::Junit => {
-            bail!("`--explain` does not support junit format")
-        }
-        SerializationFormat::Github => {
-            bail!("`--explain` does not support GitHub format")
-        }
-        SerializationFormat::Gitlab => {
-            bail!("`--explain` does not support GitLab format")
-        }
-        SerializationFormat::Pylint => {
-            bail!("`--explain` does not support pylint format")
-        }
     };
     Ok(())
 }
 
 /// Clear any caches in the current directory or any subdirectories.
-pub fn clean(level: &LogLevel) -> Result<()> {
+pub fn clean(level: LogLevel) -> Result<()> {
     for entry in WalkDir::new(&*path_dedot::CWD)
         .into_iter()
         .filter_map(Result::ok)
@@ -325,7 +314,7 @@ pub fn clean(level: &LogLevel) -> Result<()> {
     {
         let cache = entry.path().join(CACHE_DIR_NAME);
         if cache.is_dir() {
-            if level >= &LogLevel::Default {
+            if level >= LogLevel::Default {
                 eprintln!("Removing cache at: {}", fs::relativize_path(&cache).bold());
             }
             remove_dir_all(&cache)?;

ruff_cli/src/commands/linter.rs

@@ -0,0 +1,59 @@
+use itertools::Itertools;
+use serde::Serialize;
+use strum::IntoEnumIterator;
+
+use ruff::registry::{Linter, LinterCategory, RuleNamespace};
+
+use crate::args::HelpFormat;
+
+pub fn linter(format: HelpFormat) {
+    match format {
+        HelpFormat::Text => {
+            for linter in Linter::iter() {
+                let prefix = match linter.common_prefix() {
+                    "" => linter
+                        .categories()
+                        .unwrap()
+                        .iter()
+                        .map(|LinterCategory(prefix, ..)| prefix)
+                        .join("/"),
+                    prefix => prefix.to_string(),
+                };
+                println!("{:>4} {}", prefix, linter.name());
+            }
+        }
+
+        HelpFormat::Json => {
+            let linters: Vec<_> = Linter::iter()
+                .map(|linter_info| LinterInfo {
+                    prefix: linter_info.common_prefix(),
+                    name: linter_info.name(),
+                    categories: linter_info.categories().map(|cats| {
+                        cats.iter()
+                            .map(|LinterCategory(prefix, name, ..)| LinterCategoryInfo {
+                                prefix,
+                                name,
+                            })
+                            .collect()
+                    }),
+                })
+                .collect();
+
+            println!("{}", serde_json::to_string_pretty(&linters).unwrap());
+        }
+    }
+}
+
+#[derive(Serialize)]
+struct LinterInfo {
+    prefix: &'static str,
+    name: &'static str,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    categories: Option<Vec<LinterCategoryInfo>>,
+}
+
+#[derive(Serialize)]
+struct LinterCategoryInfo {
+    prefix: &'static str,
+    name: &'static str,
+}

ruff_cli/src/lib.rs

@@ -1,5 +1,5 @@
 //! This library only exists to enable the Ruff internal tooling (`ruff_dev`)
-//! to automatically update the `ruff --help` output in the `README.md`.
+//! to automatically update the `ruff help` output in the `README.md`.
 //!
 //! For the actual Ruff library, see [`ruff`].
 #![forbid(unsafe_code)]
@@ -10,7 +10,21 @@ mod args;
 
 use clap::CommandFactory;
 
-/// Returns the output of `ruff --help`.
-pub fn help() -> String {
+/// Returns the output of `ruff help`.
+pub fn command_help() -> String {
     args::Args::command().render_help().to_string()
 }
+
+/// Returns the output of `ruff help check`.
+pub fn subcommand_help() -> String {
+    let mut cmd = args::Args::command();
+
+    // The build call is necessary for the help output to contain `Usage: ruff check` instead of `Usage: check`
+    // see https://github.com/clap-rs/clap/issues/4685
+    cmd.build();
+
+    cmd.find_subcommand_mut("check")
+        .expect("`check` subcommand not found")
+        .render_help()
+        .to_string()
+}

ruff_cli/src/main.rs

@@ -17,8 +17,8 @@ use ::ruff::resolver::PyprojectDiscovery;
 use ::ruff::settings::types::SerializationFormat;
 use ::ruff::{fix, fs, warn_user_once};
 use anyhow::Result;
-use args::Args;
-use clap::{CommandFactory, Parser};
+use args::{Args, CheckArgs, Command};
+use clap::{CommandFactory, Parser, Subcommand};
 use colored::Colorize;
 use notify::{recommended_watcher, RecursiveMode, Watcher};
 use printer::{Printer, Violations};
@@ -35,38 +35,67 @@ mod resolve;
 pub mod updates;
 
 fn inner_main() -> Result<ExitCode> {
-    // Extract command-line arguments.
-    let args = Args::parse();
+    let mut args: Vec<_> = std::env::args_os().collect();
 
-    let default_panic_hook = std::panic::take_hook();
-    std::panic::set_hook(Box::new(move |info| {
-        eprintln!(
-            r#"
+    // Clap doesn't support default subcommands but we want to run `check` by
+    // default for convenience and backwards-compatibility, so we just
+    // preprocess the arguments accordingly before passing them to Clap.
+    if let Some(arg) = args.get(1).and_then(|s| s.to_str()) {
+        if !Command::has_subcommand(rewrite_legacy_subcommand(arg))
+            && arg != "-h"
+            && arg != "--help"
+            && arg != "-V"
+            && arg != "--version"
+            && arg != "help"
+        {
+            args.insert(1, "check".into());
+        }
+    }
+
+    // Extract command-line arguments.
+    let Args {
+        command,
+        log_level_args,
+    } = Args::parse_from(args);
+
+    #[cfg(not(debug_assertions))]
+    {
+        let default_panic_hook = std::panic::take_hook();
+        std::panic::set_hook(Box::new(move |info| {
+            eprintln!(
+                r#"
 {}: `ruff` crashed. This indicates a bug in `ruff`. If you could open an issue at:
 
 https://github.com/charliermarsh/ruff/issues/new?title=%5BPanic%5D
 
 quoting the executed command, along with the relevant file contents and `pyproject.toml` settings, we'd be very appreciative!
 "#,
-            "error".red().bold(),
-        );
-        default_panic_hook(info);
-    }));
+                "error".red().bold(),
+            );
+            default_panic_hook(info);
+        }));
+    }
 
-    let log_level: LogLevel = (&args.log_level_args).into();
+    let log_level: LogLevel = (&log_level_args).into();
     set_up_logging(&log_level)?;
 
-    let (cli, overrides) = args.partition();
+    match command {
+        Command::Rule { rule, format } => commands::rule(rule, format)?,
+        Command::Linter { format } => commands::linter::linter(format),
+        Command::Clean => commands::clean(log_level)?,
+        Command::GenerateShellCompletion { shell } => {
+            shell.generate(&mut Args::command(), &mut io::stdout());
+        }
 
-    if let Some(shell) = cli.generate_shell_completion {
-        shell.generate(&mut Args::command(), &mut io::stdout());
-        return Ok(ExitCode::SUCCESS);
-    }
-    if cli.clean {
-        commands::clean(&log_level)?;
-        return Ok(ExitCode::SUCCESS);
+        Command::Check(args) => return check(args, log_level),
     }
 
+    Ok(ExitCode::SUCCESS)
+}
+
+fn check(args: CheckArgs, log_level: LogLevel) -> Result<ExitCode> {
+    let (cli, overrides) = args.partition();
+
     // Construct the "default" settings. These are used when no `pyproject.toml`
     // files are present, or files are injected from outside of the hierarchy.
     let pyproject_strategy = resolve::resolve(
@@ -76,6 +105,14 @@ quoting the executed command, along with the relevant file contents and `pyproje
         cli.stdin_filename.as_deref(),
     )?;
 
+    if cli.show_settings {
+        commands::show_settings(&cli.files, &pyproject_strategy, &overrides)?;
+        return Ok(ExitCode::SUCCESS);
+    }
+    if cli.show_files {
+        commands::show_files(&cli.files, &pyproject_strategy, &overrides)?;
+    }
+
     // Extract options that are included in `Settings`, but only apply at the top
     // level.
     let CliSettings {
@@ -89,19 +126,6 @@ quoting the executed command, along with the relevant file contents and `pyproje
         PyprojectDiscovery::Hierarchical(settings) => settings.cli.clone(),
     };
 
-    if let Some(rule) = cli.explain {
-        commands::explain(rule, format)?;
-        return Ok(ExitCode::SUCCESS);
-    }
-    if cli.show_settings {
-        commands::show_settings(&cli.files, &pyproject_strategy, &overrides)?;
-        return Ok(ExitCode::SUCCESS);
-    }
-    if cli.show_files {
-        commands::show_files(&cli.files, &pyproject_strategy, &overrides)?;
-        return Ok(ExitCode::SUCCESS);
-    }
-
     // Autofix rules are as follows:
     // - If `--fix` or `--fix-only` is set, always apply fixes to the filesystem (or
     //   print them to stdout, if we're reading from stdin).
@@ -135,14 +159,17 @@ quoting the executed command, along with the relevant file contents and `pyproje
         warn_user_once!("Detected debug build without --no-cache.");
     }
 
-    let printer = Printer::new(&format, &log_level, &autofix, &violations);
-
     if cli.add_noqa {
         let modifications = commands::add_noqa(&cli.files, &pyproject_strategy, &overrides)?;
         if modifications > 0 && log_level >= LogLevel::Default {
             println!("Added {modifications} noqa directives.");
         }
-    } else if cli.watch {
+        return Ok(ExitCode::SUCCESS);
+    }
+
+    let printer = Printer::new(&format, &log_level, &autofix, &violations);
+
+    if cli.watch {
         if !matches!(autofix, fix::FixMode::None) {
             warn_user_once!("--fix is not enabled in watch mode.");
         }
@@ -221,7 +248,11 @@ quoting the executed command, along with the relevant file contents and `pyproje
         // unless we're writing fixes via stdin (in which case, the transformed
         // source code goes to stdout).
         if !(is_stdin && matches!(autofix, fix::FixMode::Apply | fix::FixMode::Diff)) {
-            printer.write_once(&diagnostics)?;
+            if cli.statistics {
+                printer.write_statistics(&diagnostics)?;
+            } else {
+                printer.write_once(&diagnostics)?;
+            }
         }
 
         // Check for updates if we're in a non-silent log level.
@@ -244,10 +275,18 @@ quoting the executed command, along with the relevant file contents and `pyproje
             }
         }
     }
-
     Ok(ExitCode::SUCCESS)
 }
 
+fn rewrite_legacy_subcommand(cmd: &str) -> &str {
+    match cmd {
+        "--explain" => "rule",
+        "--clean" => "clean",
+        "--generate-shell-completion" => "generate-shell-completion",
+        cmd => cmd,
+    }
+}
+
 #[must_use]
 pub fn main() -> ExitCode {
     match inner_main() {

ruff_cli/src/printer.rs

@@ -7,7 +7,7 @@ use annotate_snippets::display_list::{DisplayList, FormatOptions};
 use annotate_snippets::snippet::{Annotation, AnnotationType, Slice, Snippet, SourceAnnotation};
 use anyhow::Result;
 use colored::Colorize;
-use itertools::iterate;
+use itertools::{iterate, Itertools};
 use ruff::fs::relativize_path;
 use ruff::logging::LogLevel;
 use ruff::message::{Location, Message};
@@ -43,6 +43,13 @@ struct ExpandedMessage<'a> {
     filename: &'a str,
 }
 
+#[derive(Serialize)]
+struct ExpandedStatistics<'a> {
+    count: usize,
+    code: &'a str,
+    message: String,
+}
+
 struct SerializeRuleAsCode<'a>(&'a Rule);
 
 impl Serialize for SerializeRuleAsCode<'_> {
@@ -336,6 +343,80 @@ impl<'a> Printer<'a> {
         Ok(())
     }
 
+    pub fn write_statistics(&self, diagnostics: &Diagnostics) -> Result<()> {
+        let violations = diagnostics
+            .messages
+            .iter()
+            .map(|message| message.kind.rule())
+            .sorted()
+            .dedup()
+            .collect::<Vec<_>>();
+        if violations.is_empty() {
+            return Ok(());
+        }
+
+        let statistics = violations
+            .iter()
+            .map(|rule| ExpandedStatistics {
+                code: rule.code(),
+                count: diagnostics
+                    .messages
+                    .iter()
+                    .filter(|message| message.kind.rule() == *rule)
+                    .count(),
+                message: diagnostics
+                    .messages
+                    .iter()
+                    .find(|message| message.kind.rule() == *rule)
+                    .map(|message| message.kind.body())
+                    .unwrap(),
+            })
+            .collect::<Vec<_>>();
+
+        let mut stdout = BufWriter::new(io::stdout().lock());
+        match self.format {
+            SerializationFormat::Text => {
+                // Compute the maximum number of digits in the count and code, for all messages, to enable
+                // pretty-printing.
+                let count_width = num_digits(
+                    statistics
+                        .iter()
+                        .map(|statistic| statistic.count)
+                        .max()
+                        .unwrap(),
+                );
+                let code_width = statistics
+                    .iter()
+                    .map(|statistic| statistic.code.len())
+                    .max()
+                    .unwrap();
+
+                // By default, we mimic Flake8's `--statistics` format.
+                for msg in statistics {
+                    writeln!(
+                        stdout,
+                        "{:>count_width$}\t{:<code_width$}\t{}",
+                        msg.count, msg.code, msg.message
+                    )?;
+                }
+                return Ok(());
+            }
+            SerializationFormat::Json => {
+                writeln!(stdout, "{}", serde_json::to_string_pretty(&statistics)?)?;
+            }
+            _ => {
+                anyhow::bail!(
+                    "Unsupported serialization format for statistics: {:?}",
+                    self.format
+                )
+            }
+        }
+
+        stdout.flush()?;
+
+        Ok(())
+    }
+
     pub fn write_continuously(&self, diagnostics: &Diagnostics) -> Result<()> {
         if matches!(self.log_level, LogLevel::Silent) {
             return Ok(());

ruff_cli/tests/integration_test.rs

@@ -14,7 +14,7 @@ const BIN_NAME: &str = "ruff";
 #[test]
 fn test_stdin_success() -> Result<()> {
     let mut cmd = Command::cargo_bin(BIN_NAME)?;
-    cmd.args(["-", "--format", "text"])
+    cmd.args(["-", "--format", "text", "--isolated"])
         .write_stdin("")
         .assert()
         .success();
@@ -25,7 +25,7 @@ fn test_stdin_success() -> Result<()> {
 fn test_stdin_error() -> Result<()> {
     let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
-        .args(["-", "--format", "text"])
+        .args(["-", "--format", "text", "--isolated"])
         .write_stdin("import os\n")
         .assert()
         .failure();
@@ -41,7 +41,14 @@ fn test_stdin_error() -> Result<()> {
 fn test_stdin_filename() -> Result<()> {
     let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
-        .args(["-", "--format", "text", "--stdin-filename", "F401.py"])
+        .args([
+            "-",
+            "--format",
+            "text",
+            "--stdin-filename",
+            "F401.py",
+            "--isolated",
+        ])
         .write_stdin("import os\n")
         .assert()
         .failure();
@@ -58,7 +65,14 @@ fn test_stdin_filename() -> Result<()> {
 fn test_stdin_json() -> Result<()> {
     let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
-        .args(["-", "--format", "json", "--stdin-filename", "F401.py"])
+        .args([
+            "-",
+            "--format",
+            "json",
+            "--stdin-filename",
+            "F401.py",
+            "--isolated",
+        ])
         .write_stdin("import os\n")
         .assert()
         .failure();
@@ -107,7 +121,7 @@ fn test_stdin_json() -> Result<()> {
 fn test_stdin_autofix() -> Result<()> {
     let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
-        .args(["-", "--format", "text", "--fix"])
+        .args(["-", "--format", "text", "--fix", "--isolated"])
         .write_stdin("import os\nimport sys\n\nprint(sys.version)\n")
         .assert()
         .success();
@@ -122,7 +136,7 @@ fn test_stdin_autofix() -> Result<()> {
 fn test_stdin_autofix_when_not_fixable_should_still_print_contents() -> Result<()> {
     let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
-        .args(["-", "--format", "text", "--fix"])
+        .args(["-", "--format", "text", "--fix", "--isolated"])
         .write_stdin("import os\nimport sys\n\nif (1, 2):\n     print(sys.version)\n")
         .assert()
         .failure();
@@ -137,7 +151,7 @@ fn test_stdin_autofix_when_not_fixable_should_still_print_contents() -> Result<(
 fn test_stdin_autofix_when_no_issues_should_still_print_contents() -> Result<()> {
     let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
-        .args(["-", "--format", "text", "--fix"])
+        .args(["-", "--format", "text", "--fix", "--isolated"])
         .write_stdin("import sys\n\nprint(sys.version)\n")
         .assert()
         .success();
@@ -152,7 +166,7 @@ fn test_stdin_autofix_when_no_issues_should_still_print_contents() -> Result<()>
 fn test_show_source() -> Result<()> {
     let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
-        .args(["-", "--format", "text", "--show-source"])
+        .args(["-", "--format", "text", "--show-source", "--isolated"])
         .write_stdin("l = 1")
         .assert()
         .failure();
@@ -163,8 +177,26 @@ fn test_show_source() -> Result<()> {
 #[test]
 fn explain_status_codes() -> Result<()> {
     let mut cmd = Command::cargo_bin(BIN_NAME)?;
-    cmd.args(["-", "--explain", "F401"]).assert().success();
+    cmd.args(["--explain", "F401"]).assert().success();
     let mut cmd = Command::cargo_bin(BIN_NAME)?;
-    cmd.args(["-", "--explain", "RUF404"]).assert().failure();
+    cmd.args(["--explain", "RUF404"]).assert().failure();
+    Ok(())
+}
+
+#[test]
+fn show_statistics() -> Result<()> {
+    let mut cmd = Command::cargo_bin(BIN_NAME)?;
+    let output = cmd
+        .args(["-", "--format", "text", "--select", "F401", "--statistics"])
+        .write_stdin("import sys\nimport os\n\nprint(os.getuid())\n")
+        .assert()
+        .failure();
+    assert_eq!(
+        str::from_utf8(&output.get_output().stdout)?
+            .lines()
+            .last()
+            .unwrap(),
+        "1\tF401\t`sys` imported but unused"
+    );
     Ok(())
 }

ruff_dev/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_dev"
-version = "0.0.236"
+version = "0.0.239"
 edition = "2021"
 
 [dependencies]
@@ -15,7 +15,7 @@ rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/
 rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
 rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
 schemars = { version = "0.8.11" }
-serde_json = {version="1.0.91"}
+serde_json = { version = "1.0.91" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
 textwrap = { version = "0.16.0" }

ruff_dev/src/generate_cli_help.rs

@@ -1,11 +1,14 @@
 //! Generate CLI help.
 
-use anyhow::Result;
-
 use crate::utils::replace_readme_section;
+use anyhow::Result;
+use std::str;
 
-const HELP_BEGIN_PRAGMA: &str = "<!-- Begin auto-generated cli help. -->";
-const HELP_END_PRAGMA: &str = "<!-- End auto-generated cli help. -->";
+const COMMAND_HELP_BEGIN_PRAGMA: &str = "<!-- Begin auto-generated command help. -->";
+const COMMAND_HELP_END_PRAGMA: &str = "<!-- End auto-generated command help. -->";
+
+const SUBCOMMAND_HELP_BEGIN_PRAGMA: &str = "<!-- Begin auto-generated subcommand help. -->";
+const SUBCOMMAND_HELP_END_PRAGMA: &str = "<!-- End auto-generated subcommand help. -->";
 
 #[derive(clap::Args)]
 pub struct Args {
@@ -19,15 +22,25 @@ fn trim_lines(s: &str) -> String {
 }
 
 pub fn main(args: &Args) -> Result<()> {
-    let output = trim_lines(ruff_cli::help().trim());
+    // Generate `ruff help`.
+    let command_help = trim_lines(ruff_cli::command_help().trim());
+
+    // Generate `ruff help check`.
+    let subcommand_help = trim_lines(ruff_cli::subcommand_help().trim());
 
     if args.dry_run {
-        print!("{output}");
+        print!("{command_help}");
+        print!("{subcommand_help}");
     } else {
         replace_readme_section(
-            &format!("```\n{output}\n```\n"),
-            HELP_BEGIN_PRAGMA,
-            HELP_END_PRAGMA,
+            &format!("```\n{command_help}\n```\n"),
+            COMMAND_HELP_BEGIN_PRAGMA,
+            COMMAND_HELP_END_PRAGMA,
+        )?;
+        replace_readme_section(
+            &format!("```\n{subcommand_help}\n```\n"),
+            SUBCOMMAND_HELP_BEGIN_PRAGMA,
+            SUBCOMMAND_HELP_END_PRAGMA,
         )?;
     }
 

ruff_dev/src/generate_rules_table.rs

@@ -1,6 +1,7 @@
 //! Generate a Markdown-compatible table of supported lint rules.
 
 use anyhow::Result;
+use itertools::Itertools;
 use ruff::registry::{Linter, LinterCategory, Rule, RuleNamespace};
 use strum::IntoEnumIterator;
 
@@ -47,7 +48,15 @@ pub fn main(args: &Args) -> Result<()> {
     let mut table_out = String::new();
     let mut toc_out = String::new();
     for linter in Linter::iter() {
-        let codes_csv: String = linter.prefixes().join(", ");
+        let codes_csv: String = match linter.common_prefix() {
+            "" => linter
+                .categories()
+                .unwrap()
+                .iter()
+                .map(|LinterCategory(prefix, ..)| prefix)
+                .join(", "),
+            prefix => prefix.to_string(),
+        };
         table_out.push_str(&format!("### {} ({codes_csv})", linter.name()));
         table_out.push('\n');
         table_out.push('\n');

ruff_macros/Cargo.toml

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

ruff_macros/src/rule_code_prefix.rs

@@ -52,6 +52,7 @@ pub fn expand<'a>(
             ::strum_macros::EnumIter,
             ::strum_macros::EnumString,
             ::strum_macros::AsRefStr,
+            ::strum_macros::IntoStaticStr,
             Debug,
             PartialEq,
             Eq,

ruff_macros/src/rule_namespace.rs

@@ -15,13 +15,15 @@ pub fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream>
 
     let mut parsed = Vec::new();
 
-    let mut prefix_match_arms = quote!();
+    let mut common_prefix_match_arms = quote!();
     let mut name_match_arms = quote!(Self::Ruff => "Ruff-specific rules",);
     let mut url_match_arms = quote!(Self::Ruff => None,);
+    let mut into_iter_match_arms = quote!();
 
     let mut all_prefixes = HashSet::new();
 
     for variant in variants {
+        let mut first_chars = HashSet::new();
         let prefixes: Result<Vec<_>, _> = variant
             .attrs
             .iter()
@@ -33,7 +35,9 @@ pub fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream>
                 let str = lit.value();
                 match str.chars().next() {
                     None => return Err(Error::new(lit.span(), "expected prefix string to be non-empty")),
-                    Some(_) => {},
+                    Some(c) => if !first_chars.insert(c) {
+                        return Err(Error::new(lit.span(), format!("this variant already has another prefix starting with the character '{c}'")))
+                    }
                 }
                 if !all_prefixes.insert(str.clone()) {
                     return Err(Error::new(lit.span(), "prefix has already been defined before"));
@@ -63,31 +67,43 @@ pub fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream>
         }
 
         for lit in &prefixes {
-            parsed.push((lit.clone(), variant_ident.clone()));
+            parsed.push((
+                lit.clone(),
+                variant_ident.clone(),
+                match prefixes.len() {
+                    1 => ParseStrategy::SinglePrefix,
+                    _ => ParseStrategy::MultiplePrefixes,
+                },
+            ));
         }
 
-        prefix_match_arms.extend(quote! {
-            Self::#variant_ident => &[#(#prefixes),*],
-        });
+        if let [prefix] = &prefixes[..] {
+            common_prefix_match_arms.extend(quote! { Self::#variant_ident => #prefix, });
+
+            let prefix_ident = Ident::new(prefix, Span::call_site());
+            into_iter_match_arms.extend(quote! {
+                #ident::#variant_ident => RuleCodePrefix::#prefix_ident.into_iter(),
+            });
+        } else {
+            // There is more than one prefix. We already previously asserted
+            // that prefixes of the same variant don't start with the same character
+            // so the common prefix for this variant is the empty string.
+            common_prefix_match_arms.extend(quote! { Self::#variant_ident => "", });
+        }
     }
 
-    parsed.sort_by_key(|(prefix, _)| Reverse(prefix.len()));
+    parsed.sort_by_key(|(prefix, ..)| Reverse(prefix.len()));
 
     let mut if_statements = quote!();
-    let mut into_iter_match_arms = quote!();
 
-    for (prefix, field) in parsed {
+    for (prefix, field, strategy) in parsed {
+        let ret_str = match strategy {
+            ParseStrategy::SinglePrefix => quote!(rest),
+            ParseStrategy::MultiplePrefixes => quote!(code),
+        };
         if_statements.extend(quote! {if let Some(rest) = code.strip_prefix(#prefix) {
-            return Some((#ident::#field, rest));
+            return Some((#ident::#field, #ret_str));
         }});
-
-        let prefix_ident = Ident::new(&prefix, Span::call_site());
-
-        if field != "Pycodestyle" {
-            into_iter_match_arms.extend(quote! {
-                #ident::#field => RuleCodePrefix::#prefix_ident.into_iter(),
-            });
-        }
     }
 
     into_iter_match_arms.extend(quote! {
@@ -104,9 +120,8 @@ pub fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream>
                 None
             }
 
-
-            fn prefixes(&self) -> &'static [&'static str] {
-                match self { #prefix_match_arms }
+            fn common_prefix(&self) -> &'static str {
+                match self { #common_prefix_match_arms }
             }
 
             fn name(&self) -> &'static str {
@@ -152,3 +167,8 @@ fn parse_doc_attr(doc_attr: &Attribute) -> syn::Result<(String, String)> {
 fn parse_markdown_link(link: &str) -> Option<(&str, &str)> {
     link.strip_prefix('[')?.strip_suffix(')')?.split_once("](")
 }
+
+enum ParseStrategy {
+    SinglePrefix,
+    MultiplePrefixes,
+}

rustfmt.toml

@@ -1,15 +1,4 @@
-condense_wildcard_suffixes = true
 edition = "2021"
-format_strings = true
-group_imports = "StdExternalCrate"
-hex_literal_case = "Lower"
-imports_granularity = "Module"
 max_width = 100
-normalize_comments = true
-normalize_doc_attributes = true
-reorder_impl_items = true
 reorder_imports = true
 reorder_modules = true
-unstable_features = true
-use_field_init_shorthand = true
-wrap_comments = true

scripts/generate_mkdocs.py

@@ -0,0 +1,77 @@
+"""Generate an MkDocs-compatible `docs` and `mkdocs.yml` from the README.md."""
+import argparse
+import shutil
+from pathlib import Path
+
+import yaml
+
+SECTIONS: list[tuple[str, str]] = [
+    ("Overview", "index.md"),
+    ("Installation and Usage", "installation-and-usage.md"),
+    ("Configuration", "configuration.md"),
+    ("Rules", "rules.md"),
+    ("Settings", "settings.md"),
+    ("Editor Integrations", "editor-integrations.md"),
+    ("FAQ", "faq.md"),
+]
+
+DOCUMENTATION_LINK: str = (
+    "This README is also available as [documentation](https://beta.ruff.rs/docs/)."
+)
+
+
+def main() -> None:
+    """Generate an MkDocs-compatible `docs` and `mkdocs.yml`."""
+    with Path("README.md").open(encoding="utf8") as fp:
+        content = fp.read()
+
+    # Remove the documentation link, since we're _in_ the docs.
+    if DOCUMENTATION_LINK not in content:
+        msg = "README.md is not in the expected format."
+        raise ValueError(msg)
+    content = content.replace(DOCUMENTATION_LINK, "")
+
+    Path("docs").mkdir(parents=True, exist_ok=True)
+
+    # Split the README.md into sections.
+    for (title, filename) in SECTIONS:
+        with Path(f"docs/{filename}").open("w+") as f:
+            block = content.split(f"<!-- Begin section: {title} -->")
+            if len(block) != 2:
+                msg = f"Section {title} not found in README.md"
+                raise ValueError(msg)
+
+            block = block[1].split(f"<!-- End section: {title} -->")
+            if len(block) != 2:
+                msg = f"Section {title} not found in README.md"
+                raise ValueError(msg)
+
+            f.write(block[0])
+
+    # Copy the CONTRIBUTING.md.
+    shutil.copy("CONTRIBUTING.md", "docs/contributing.md")
+
+    # Add the nav section to mkdocs.yml.
+    with Path("mkdocs.template.yml").open(encoding="utf8") as fp:
+        config = yaml.safe_load(fp)
+    config["nav"] = [
+        {"Overview": "index.md"},
+        {"Installation and Usage": "installation-and-usage.md"},
+        {"Configuration": "configuration.md"},
+        {"Rules": "rules.md"},
+        {"Settings": "settings.md"},
+        {"Editor Integrations": "editor-integrations.md"},
+        {"FAQ": "faq.md"},
+        {"Contributing": "contributing.md"},
+    ]
+
+    with Path("mkdocs.yml").open("w+") as fp:
+        yaml.safe_dump(config, fp)
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        description="Generate an MkDocs-compatible `docs` and `mkdocs.yml`.",
+    )
+    args = parser.parse_args()
+    main()

scripts/pyproject.toml

@@ -5,6 +5,7 @@ ignore = [
   "INP001",  # implicit-namespace-package
   "PLR2004", # magic-value-comparison
   "S101",    # assert-used
+  "EM"
 ]
 
 [tool.ruff.pydocstyle]

scripts/transform_readme.py

@@ -0,0 +1,71 @@
+"""Transform the README.md to support a specific deployment target.
+
+By default, we assume that our README.md will be rendered on GitHub. However, different
+targets have different strategies for rendering light- and dark-mode images. This script
+adjusts the images in the README.md to support the given target.
+"""
+import argparse
+from pathlib import Path
+
+# https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#specifying-the-theme-an-image-is-shown-to
+GITHUB = """
+<p align="center">
+  <picture align="center">
+    <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/1309177/212613422-7faaf278-706b-4294-ad92-236ffcab3430.svg">
+    <source media="(prefers-color-scheme: light)" srcset="https://user-images.githubusercontent.com/1309177/212613257-5f4bca12-6d6b-4c79-9bac-51a4c6d08928.svg">
+    <img alt="Shows a bar chart with benchmark results." src="https://user-images.githubusercontent.com/1309177/212613257-5f4bca12-6d6b-4c79-9bac-51a4c6d08928.svg">
+  </picture>
+</p>
+"""
+
+# https://github.com/pypi/warehouse/issues/11251
+PYPI = """
+<p align="center">
+  <img alt="Shows a bar chart with benchmark results." src="https://user-images.githubusercontent.com/1309177/212613257-5f4bca12-6d6b-4c79-9bac-51a4c6d08928.svg">
+</p>
+"""
+
+# https://squidfunk.github.io/mkdocs-material/reference/images/#light-and-dark-mode
+MK_DOCS = """
+<p align="center">
+  <img alt="Shows a bar chart with benchmark results." src="https://user-images.githubusercontent.com/1309177/212613257-5f4bca12-6d6b-4c79-9bac-51a4c6d08928.svg#only-light">
+</p>
+
+<p align="center">
+  <img alt="Shows a bar chart with benchmark results." src="https://user-images.githubusercontent.com/1309177/212613422-7faaf278-706b-4294-ad92-236ffcab3430.svg#only-dark">
+</p>
+"""
+
+
+def main(target: str) -> None:
+    """Modify the README.md to support the given target."""
+    with Path("README.md").open(encoding="utf8") as fp:
+        content = fp.read()
+        if GITHUB not in content:
+            msg = "README.md is not in the expected format."
+            raise ValueError(msg)
+
+    if target == "pypi":
+        with Path("README.md").open("w", encoding="utf8") as fp:
+            fp.write(content.replace(GITHUB, PYPI))
+    elif target == "mkdocs":
+        with Path("README.md").open("w", encoding="utf8") as fp:
+            fp.write(content.replace(GITHUB, MK_DOCS))
+    else:
+        msg = f"Unknown target: {target}"
+        raise ValueError(msg)
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        description="Modify the README.md to support a specific deployment target.",
+    )
+    parser.add_argument(
+        "--target",
+        type=str,
+        required=True,
+        choices=("pypi", "mkdocs"),
+    )
+    args = parser.parse_args()
+
+    main(target=args.target)

src/ast/helpers.rs

@@ -559,6 +559,17 @@ pub fn collect_arg_names<'a>(arguments: &'a Arguments) -> FxHashSet<&'a str> {
 }
 
 /// Returns `true` if a statement or expression includes at least one comment.
+pub fn has_comments<T>(located: &Located<T>, locator: &Locator) -> bool {
+    has_comments_in(
+        Range::new(
+            Location::new(located.location.row(), 0),
+            Location::new(located.end_location.unwrap().row() + 1, 0),
+        ),
+        locator,
+    )
+}
+
+/// Returns `true` if a [`Range`] includes at least one comment.
 pub fn has_comments_in(range: Range, locator: &Locator) -> bool {
     lexer::make_tokenizer(locator.slice_source_code_range(&range))
         .any(|result| result.map_or(false, |(_, tok, _)| matches!(tok, Tok::Comment(..))))
@@ -651,6 +662,17 @@ pub fn to_absolute(relative: Location, base: Location) -> Location {
     }
 }
 
+pub fn to_relative(absolute: Location, base: Location) -> Location {
+    if absolute.row() == base.row() {
+        Location::new(
+            absolute.row() - base.row() + 1,
+            absolute.column() - base.column(),
+        )
+    } else {
+        Location::new(absolute.row() - base.row() + 1, absolute.column())
+    }
+}
+
 /// Return `true` if a `Stmt` has leading content.
 pub fn match_leading_content(stmt: &Stmt, locator: &Locator) -> bool {
     let range = Range::new(Location::new(stmt.location.row(), 0), stmt.location);
@@ -1010,7 +1032,7 @@ pub fn is_logger_candidate(func: &Expr) -> bool {
     if let ExprKind::Attribute { value, .. } = &func.node {
         let call_path = collect_call_path(value);
         if let Some(tail) = call_path.last() {
-            if *tail == "logging" || tail.ends_with("logger") {
+            if tail.starts_with("log") || tail.ends_with("logger") || tail.ends_with("logging") {
                 return true;
             }
         }

src/ast/operations.rs

@@ -1,3 +1,4 @@
+use bitflags::bitflags;
 use rustc_hash::FxHashMap;
 use rustpython_ast::{Cmpop, Located};
 use rustpython_parser::ast::{Constant, Expr, ExprKind, Stmt, StmtKind};
@@ -9,9 +10,21 @@ use crate::ast::types::{Binding, BindingKind, Scope};
 use crate::ast::visitor;
 use crate::ast::visitor::Visitor;
 
+bitflags! {
+    #[derive(Default)]
+    pub struct AllNamesFlags: u32 {
+        const INVALID_FORMAT = 0b0000_0001;
+        const INVALID_OBJECT = 0b0000_0010;
+    }
+}
+
 /// Extract the names bound to a given __all__ assignment.
-pub fn extract_all_names(stmt: &Stmt, scope: &Scope, bindings: &[Binding]) -> Vec<String> {
-    fn add_to_names(names: &mut Vec<String>, elts: &[Expr]) {
+pub fn extract_all_names(
+    stmt: &Stmt,
+    scope: &Scope,
+    bindings: &[Binding],
+) -> (Vec<String>, AllNamesFlags) {
+    fn add_to_names(names: &mut Vec<String>, elts: &[Expr], flags: &mut AllNamesFlags) {
         for elt in elts {
             if let ExprKind::Constant {
                 value: Constant::Str(value),
@@ -19,11 +32,14 @@ pub fn extract_all_names(stmt: &Stmt, scope: &Scope, bindings: &[Binding]) -> Ve
             } = &elt.node
             {
                 names.push(value.to_string());
+            } else {
+                *flags |= AllNamesFlags::INVALID_OBJECT;
             }
         }
     }
 
     let mut names: Vec<String> = vec![];
+    let mut flags = AllNamesFlags::empty();
 
     // Grab the existing bound __all__ values.
     if let StmtKind::AugAssign { .. } = &stmt.node {
@@ -42,7 +58,7 @@ pub fn extract_all_names(stmt: &Stmt, scope: &Scope, bindings: &[Binding]) -> Ve
     } {
         match &value.node {
             ExprKind::List { elts, .. } | ExprKind::Tuple { elts, .. } => {
-                add_to_names(&mut names, elts);
+                add_to_names(&mut names, elts, &mut flags);
             }
             ExprKind::BinOp { left, right, .. } => {
                 let mut current_left = left;
@@ -50,27 +66,40 @@ pub fn extract_all_names(stmt: &Stmt, scope: &Scope, bindings: &[Binding]) -> Ve
                 while let Some(elts) = match &current_right.node {
                     ExprKind::List { elts, .. } => Some(elts),
                     ExprKind::Tuple { elts, .. } => Some(elts),
-                    _ => None,
+                    _ => {
+                        flags |= AllNamesFlags::INVALID_FORMAT;
+                        None
+                    }
                 } {
-                    add_to_names(&mut names, elts);
+                    add_to_names(&mut names, elts, &mut flags);
                     match &current_left.node {
                         ExprKind::BinOp { left, right, .. } => {
                             current_left = left;
                             current_right = right;
                         }
                         ExprKind::List { elts, .. } | ExprKind::Tuple { elts, .. } => {
-                            add_to_names(&mut names, elts);
+                            add_to_names(&mut names, elts, &mut flags);
+                            break;
+                        }
+                        _ => {
+                            flags |= AllNamesFlags::INVALID_FORMAT;
                             break;
                         }
-                        _ => break,
                     }
                 }
             }
-            _ => {}
+            ExprKind::ListComp { .. } => {
+                // Allow list comprehensions, even though we can't statically analyze them.
+                // TODO(charlie): Allow `list()` and `tuple()` calls too, and extract the members
+                // from them (even if, e.g., it's `list({...})`).
+            }
+            _ => {
+                flags |= AllNamesFlags::INVALID_FORMAT;
+            }
         }
     }
 
-    names
+    (names, flags)
 }
 
 #[derive(Default)]

src/ast/types.rs

@@ -140,7 +140,7 @@ pub enum BindingKind<'a> {
     SubmoduleImportation(&'a str, &'a str),
 }
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct Binding<'a> {
     pub kind: BindingKind<'a>,
     pub range: Range,
@@ -161,7 +161,7 @@ pub struct Binding<'a> {
     pub synthetic_usage: Option<(usize, Range)>,
 }
 
-#[derive(Copy, Clone)]
+#[derive(Copy, Debug, Clone)]
 pub enum ExecutionContext {
     Runtime,
     Typing,

src/autofix/fixer.rs

@@ -1 +0,0 @@
-

src/autofix/helpers.rs

@@ -3,7 +3,9 @@ use itertools::Itertools;
 use libcst_native::{
     Codegen, CodegenState, ImportNames, ParenthesizableWhitespace, SmallStatement, Statement,
 };
-use rustpython_parser::ast::{ExcepthandlerKind, Location, Stmt, StmtKind};
+use rustpython_parser::ast::{ExcepthandlerKind, Expr, Keyword, Location, Stmt, StmtKind};
+use rustpython_parser::lexer;
+use rustpython_parser::lexer::Tok;
 
 use crate::ast::helpers;
 use crate::ast::helpers::to_absolute;
@@ -321,6 +323,109 @@ pub fn remove_unused_imports<'a>(
     }
 }
 
+/// Generic function to remove arguments or keyword arguments in function
+/// calls and class definitions. (For classes `args` should be considered
+/// `bases`)
+///
+/// Supports the removal of parentheses when this is the only (kw)arg left.
+/// For this behavior, set `remove_parentheses` to `true`.
+pub fn remove_argument(
+    locator: &Locator,
+    stmt_at: Location,
+    expr_at: Location,
+    expr_end: Location,
+    args: &[Expr],
+    keywords: &[Keyword],
+    remove_parentheses: bool,
+) -> Result<Fix> {
+    // TODO(sbrugman): Preserve trailing comments.
+    let contents = locator.slice_source_code_at(stmt_at);
+
+    let mut fix_start = None;
+    let mut fix_end = None;
+
+    let n_arguments = keywords.len() + args.len();
+    if n_arguments == 0 {
+        bail!("No arguments or keywords to remove");
+    }
+
+    if n_arguments == 1 {
+        // Case 1: there is only one argument.
+        let mut count: usize = 0;
+        for (start, tok, end) in lexer::make_tokenizer_located(contents, stmt_at).flatten() {
+            if matches!(tok, Tok::Lpar) {
+                if count == 0 {
+                    fix_start = Some(if remove_parentheses {
+                        start
+                    } else {
+                        Location::new(start.row(), start.column() + 1)
+                    });
+                }
+                count += 1;
+            }
+
+            if matches!(tok, Tok::Rpar) {
+                count -= 1;
+                if count == 0 {
+                    fix_end = Some(if remove_parentheses {
+                        end
+                    } else {
+                        Location::new(end.row(), end.column() - 1)
+                    });
+                    break;
+                }
+            }
+        }
+    } else if args
+        .iter()
+        .map(|node| node.location)
+        .chain(keywords.iter().map(|node| node.location))
+        .any(|location| location > expr_at)
+    {
+        // Case 2: argument or keyword is _not_ the last node.
+        let mut seen_comma = false;
+        for (start, tok, end) in lexer::make_tokenizer_located(contents, stmt_at).flatten() {
+            if seen_comma {
+                if matches!(tok, Tok::NonLogicalNewline) {
+                    // Also delete any non-logical newlines after the comma.
+                    continue;
+                }
+                fix_end = Some(if matches!(tok, Tok::Newline) {
+                    end
+                } else {
+                    start
+                });
+                break;
+            }
+            if start == expr_at {
+                fix_start = Some(start);
+            }
+            if fix_start.is_some() && matches!(tok, Tok::Comma) {
+                seen_comma = true;
+            }
+        }
+    } else {
+        // Case 3: argument or keyword is the last node, so we have to find the last
+        // comma in the stmt.
+        for (start, tok, _) in lexer::make_tokenizer_located(contents, stmt_at).flatten() {
+            if start == expr_at {
+                fix_end = Some(expr_end);
+                break;
+            }
+            if matches!(tok, Tok::Comma) {
+                fix_start = Some(start);
+            }
+        }
+    }
+
+    match (fix_start, fix_end) {
+        (Some(start), Some(end)) => Ok(Fix::deletion(start, end)),
+        _ => {
+            bail!("No fix could be constructed")
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use anyhow::Result;

src/autofix/mod.rs

@@ -8,7 +8,6 @@ use crate::fix::Fix;
 use crate::registry::Diagnostic;
 use crate::source_code::Locator;
 
-pub mod fixer;
 pub mod helpers;
 
 /// Auto-fix errors in a file, and write the fixed source code to disk.
@@ -28,7 +27,7 @@ fn apply_fixes<'a>(
     fixes: impl Iterator<Item = &'a Fix>,
     locator: &'a Locator<'a>,
 ) -> (String, usize) {
-    let mut output = String::new();
+    let mut output = String::with_capacity(locator.len());
     let mut last_pos: Location = Location::new(1, 0);
     let mut applied: BTreeSet<&Fix> = BTreeSet::default();
     let mut num_fixed: usize = 0;
@@ -67,11 +66,29 @@ fn apply_fixes<'a>(
     (output, num_fixed)
 }
 
+/// Apply a single fix.
+pub(crate) fn apply_fix(fix: &Fix, locator: &Locator) -> String {
+    let mut output = String::with_capacity(locator.len());
+
+    // Add all contents from `last_pos` to `fix.location`.
+    let slice = locator.slice_source_code_range(&Range::new(Location::new(1, 0), fix.location));
+    output.push_str(slice);
+
+    // Add the patch itself.
+    output.push_str(&fix.content);
+
+    // Add the remaining content.
+    let slice = locator.slice_source_code_at(fix.end_location);
+    output.push_str(slice);
+
+    output
+}
+
 #[cfg(test)]
 mod tests {
     use rustpython_parser::ast::Location;
 
-    use crate::autofix::apply_fixes;
+    use crate::autofix::{apply_fix, apply_fixes};
     use crate::fix::Fix;
     use crate::source_code::Locator;
 
@@ -85,7 +102,7 @@ mod tests {
     }
 
     #[test]
-    fn apply_single_replacement() {
+    fn apply_one_replacement() {
         let fixes = vec![Fix {
             content: "Bar".to_string(),
             location: Location::new(1, 8),
@@ -111,7 +128,7 @@ class A(Bar):
     }
 
     #[test]
-    fn apply_single_removal() {
+    fn apply_one_removal() {
         let fixes = vec![Fix {
             content: String::new(),
             location: Location::new(1, 7),
@@ -137,7 +154,7 @@ class A:
     }
 
     #[test]
-    fn apply_double_removal() {
+    fn apply_two_removals() {
         let fixes = vec![
             Fix {
                 content: String::new(),
@@ -202,4 +219,31 @@ class A:
         );
         assert_eq!(fixed, 1);
     }
+
+    #[test]
+    fn apply_single_fix() {
+        let locator = Locator::new(
+            r#"
+class A(object):
+    ...
+"#
+            .trim(),
+        );
+        let contents = apply_fix(
+            &Fix {
+                content: String::new(),
+                location: Location::new(1, 7),
+                end_location: Location::new(1, 15),
+            },
+            &locator,
+        );
+        assert_eq!(
+            contents,
+            r#"
+class A:
+    ...
+"#
+            .trim()
+        );
+    }
 }

src/checkers/ast.rs

@@ -17,7 +17,7 @@ use rustpython_parser::parser;
 use smallvec::smallvec;
 
 use crate::ast::helpers::{binding_range, collect_call_path, extract_handler_names};
-use crate::ast::operations::extract_all_names;
+use crate::ast::operations::{extract_all_names, AllNamesFlags};
 use crate::ast::relocate::relocate_expr;
 use crate::ast::types::{
     Binding, BindingKind, CallPath, ClassDef, ExecutionContext, FunctionDef, Lambda, Node, Range,
@@ -36,7 +36,7 @@ use crate::rules::{
     flake8_2020, flake8_annotations, flake8_bandit, flake8_blind_except, flake8_boolean_trap,
     flake8_bugbear, flake8_builtins, flake8_comprehensions, flake8_datetimez, flake8_debugger,
     flake8_errmsg, flake8_implicit_str_concat, flake8_import_conventions, flake8_logging_format,
-    flake8_pie, flake8_print, flake8_pytest_style, flake8_return, flake8_simplify,
+    flake8_pie, flake8_print, flake8_pytest_style, flake8_raise, flake8_return, flake8_simplify,
     flake8_tidy_imports, flake8_type_checking, flake8_unused_arguments, flake8_use_pathlib, mccabe,
     pandas_vet, pep8_naming, pycodestyle, pydocstyle, pyflakes, pygrep_hooks, pylint, pyupgrade,
     ruff, tryceratops,
@@ -93,6 +93,7 @@ pub struct Checker<'a> {
     in_type_definition: bool,
     in_deferred_string_type_definition: bool,
     in_deferred_type_definition: bool,
+    in_exception_handler: bool,
     in_literal: bool,
     in_subscript: bool,
     in_type_checking_block: bool,
@@ -153,6 +154,7 @@ impl<'a> Checker<'a> {
             in_type_definition: false,
             in_deferred_string_type_definition: false,
             in_deferred_type_definition: false,
+            in_exception_handler: false,
             in_literal: false,
             in_subscript: false,
             in_type_checking_block: false,
@@ -392,7 +394,9 @@ where
                         if !exists {
                             if self.settings.rules.enabled(&Rule::NonlocalWithoutBinding) {
                                 self.diagnostics.push(Diagnostic::new(
-                                    violations::NonlocalWithoutBinding(name.to_string()),
+                                    violations::NonlocalWithoutBinding {
+                                        name: name.to_string(),
+                                    },
                                     *range,
                                 ));
                             }
@@ -692,6 +696,9 @@ where
                         context,
                     },
                 );
+                if self.settings.rules.enabled(&Rule::TooManyArgs) {
+                    pylint::rules::too_many_args(self, args, stmt);
+                }
             }
             StmtKind::Return { .. } => {
                 if self.settings.rules.enabled(&Rule::ReturnOutsideFunction) {
@@ -1066,6 +1073,15 @@ where
                 if self.settings.rules.enabled(&Rule::RewriteCElementTree) {
                     pyupgrade::rules::replace_c_element_tree(self, stmt);
                 }
+                if self.settings.rules.enabled(&Rule::ImportReplacements) {
+                    pyupgrade::rules::import_replacements(
+                        self,
+                        stmt,
+                        names,
+                        module.as_ref().map(String::as_str),
+                        level.as_ref(),
+                    );
+                }
                 if self.settings.rules.enabled(&Rule::UnnecessaryBuiltinImport) {
                     if let Some(module) = module.as_deref() {
                         pyupgrade::rules::unnecessary_builtin_import(self, stmt, module, names);
@@ -1138,9 +1154,9 @@ where
                         if self.settings.rules.enabled(&Rule::FutureFeatureNotDefined) {
                             if !ALL_FEATURE_NAMES.contains(&&*alias.node.name) {
                                 self.diagnostics.push(Diagnostic::new(
-                                    violations::FutureFeatureNotDefined(
-                                        alias.node.name.to_string(),
-                                    ),
+                                    violations::FutureFeatureNotDefined {
+                                        name: alias.node.name.to_string(),
+                                    },
                                     Range::from_located(alias),
                                 ));
                             }
@@ -1173,12 +1189,12 @@ where
                                 [*(self.scope_stack.last().expect("No current scope found"))];
                             if !matches!(scope.kind, ScopeKind::Module) {
                                 self.diagnostics.push(Diagnostic::new(
-                                    violations::ImportStarNotPermitted(
-                                        helpers::format_import_from(
+                                    violations::ImportStarNotPermitted {
+                                        name: helpers::format_import_from(
                                             level.as_ref(),
                                             module.as_deref(),
                                         ),
-                                    ),
+                                    },
                                     Range::from_located(stmt),
                                 ));
                             }
@@ -1186,10 +1202,12 @@ where
 
                         if self.settings.rules.enabled(&Rule::ImportStarUsed) {
                             self.diagnostics.push(Diagnostic::new(
-                                violations::ImportStarUsed(helpers::format_import_from(
-                                    level.as_ref(),
-                                    module.as_deref(),
-                                )),
+                                violations::ImportStarUsed {
+                                    name: helpers::format_import_from(
+                                        level.as_ref(),
+                                        module.as_deref(),
+                                    ),
+                                },
                                 Range::from_located(stmt),
                             ));
                         }
@@ -1416,6 +1434,15 @@ where
                         tryceratops::rules::raise_vanilla_args(self, expr);
                     }
                 }
+                if self
+                    .settings
+                    .rules
+                    .enabled(&Rule::UnnecessaryParenOnRaiseException)
+                {
+                    if let Some(expr) = exc {
+                        flake8_raise::rules::unnecessary_paren_on_raise_exception(self, expr);
+                    }
+                }
             }
             StmtKind::AugAssign { target, .. } => {
                 self.handle_node_load(target);
@@ -1707,6 +1734,7 @@ where
         }
 
         // Recurse.
+        let prev_in_exception_handler = self.in_exception_handler;
         let prev_visible_scope = self.visible_scope.clone();
         match &stmt.node {
             StmtKind::FunctionDef {
@@ -1858,9 +1886,13 @@ where
                 }
                 self.visit_body(body);
                 self.except_handlers.pop();
+
+                self.in_exception_handler = true;
                 for excepthandler in handlers {
                     self.visit_excepthandler(excepthandler);
                 }
+                self.in_exception_handler = prev_in_exception_handler;
+
                 self.visit_body(orelse);
                 self.visit_body(finalbody);
             }
@@ -2085,11 +2117,6 @@ where
                 {
                     pyupgrade::rules::use_pep585_annotation(self, expr);
                 }
-
-                if self.settings.rules.enabled(&Rule::RemoveSixCompat) {
-                    pyupgrade::rules::remove_six_compat(self, expr);
-                }
-
                 if self.settings.rules.enabled(&Rule::DatetimeTimezoneUTC)
                     && self.settings.target_version >= PythonVersion::Py311
                 {
@@ -2101,16 +2128,13 @@ where
                 if self.settings.rules.enabled(&Rule::RewriteMockImport) {
                     pyupgrade::rules::rewrite_mock_attribute(self, expr);
                 }
-
                 if self.settings.rules.enabled(&Rule::SixPY3Referenced) {
                     flake8_2020::rules::name_or_attribute(self, expr);
                 }
-
-                pandas_vet::rules::check_attr(self, attr, value, expr);
-
                 if self.settings.rules.enabled(&Rule::BannedApi) {
                     flake8_tidy_imports::banned_api::banned_attribute_access(self, expr);
                 }
+                pandas_vet::rules::check_attr(self, attr, value, expr);
             }
             ExprKind::Call {
                 func,
@@ -2144,9 +2168,9 @@ where
                                             .enabled(&Rule::StringDotFormatInvalidFormat)
                                         {
                                             self.diagnostics.push(Diagnostic::new(
-                                                violations::StringDotFormatInvalidFormat(
-                                                    pyflakes::format::error_to_string(&e),
-                                                ),
+                                                violations::StringDotFormatInvalidFormat {
+                                                    message: pyflakes::format::error_to_string(&e),
+                                                },
                                                 location,
                                             ));
                                         }
@@ -2223,9 +2247,6 @@ where
                 if self.settings.rules.enabled(&Rule::RedundantOpenModes) {
                     pyupgrade::rules::redundant_open_modes(self, expr);
                 }
-                if self.settings.rules.enabled(&Rule::RemoveSixCompat) {
-                    pyupgrade::rules::remove_six_compat(self, expr);
-                }
                 if self.settings.rules.enabled(&Rule::NativeLiterals) {
                     pyupgrade::rules::native_literals(self, expr, func, args, keywords);
                 }
@@ -2475,8 +2496,9 @@ where
 
                 // pandas-vet
                 if self.settings.rules.enabled(&Rule::UseOfInplaceArgument) {
-                    self.diagnostics
-                        .extend(pandas_vet::rules::inplace_argument(keywords).into_iter());
+                    self.diagnostics.extend(
+                        pandas_vet::rules::inplace_argument(self, expr, args, keywords).into_iter(),
+                    );
                 }
                 pandas_vet::rules::check_call(self, func);
 
@@ -2705,7 +2727,9 @@ where
                     let scope = self.current_scope();
                     if matches!(scope.kind, ScopeKind::Class(_) | ScopeKind::Module) {
                         self.diagnostics.push(Diagnostic::new(
-                            violations::YieldOutsideFunction(DeferralKeyword::Yield),
+                            violations::YieldOutsideFunction {
+                                keyword: DeferralKeyword::Yield,
+                            },
                             Range::from_located(expr),
                         ));
                     }
@@ -2716,7 +2740,9 @@ where
                     let scope = self.current_scope();
                     if matches!(scope.kind, ScopeKind::Class(_) | ScopeKind::Module) {
                         self.diagnostics.push(Diagnostic::new(
-                            violations::YieldOutsideFunction(DeferralKeyword::YieldFrom),
+                            violations::YieldOutsideFunction {
+                                keyword: DeferralKeyword::YieldFrom,
+                            },
                             Range::from_located(expr),
                         ));
                     }
@@ -2727,7 +2753,9 @@ where
                     let scope = self.current_scope();
                     if matches!(scope.kind, ScopeKind::Class(_) | ScopeKind::Module) {
                         self.diagnostics.push(Diagnostic::new(
-                            violations::YieldOutsideFunction(DeferralKeyword::Await),
+                            violations::YieldOutsideFunction {
+                                keyword: DeferralKeyword::Await,
+                            },
                             Range::from_located(expr),
                         ));
                     }
@@ -2813,7 +2841,9 @@ where
                                     .enabled(&Rule::PercentFormatUnsupportedFormatCharacter)
                                 {
                                     self.diagnostics.push(Diagnostic::new(
-                                        violations::PercentFormatUnsupportedFormatCharacter(c),
+                                        violations::PercentFormatUnsupportedFormatCharacter {
+                                            char: c,
+                                        },
                                         location,
                                     ));
                                 }
@@ -2825,7 +2855,9 @@ where
                                     .enabled(&Rule::PercentFormatInvalidFormat)
                                 {
                                     self.diagnostics.push(Diagnostic::new(
-                                        violations::PercentFormatInvalidFormat(e.to_string()),
+                                        violations::PercentFormatInvalidFormat {
+                                            message: e.to_string(),
+                                        },
                                         location,
                                     ));
                                 }
@@ -3447,6 +3479,15 @@ where
                         body,
                     );
                 }
+                if self.settings.rules.enabled(&Rule::TryExceptPass) {
+                    flake8_bandit::rules::try_except_pass(
+                        self,
+                        type_.as_deref(),
+                        name.as_deref(),
+                        body,
+                        self.settings.flake8_bandit.check_typed_exception,
+                    );
+                }
                 if self.settings.rules.enabled(&Rule::ReraiseNoCause) {
                     tryceratops::rules::reraise_no_cause(self, body);
                 }
@@ -3504,7 +3545,9 @@ where
                             if !self.bindings[*index].used() {
                                 if self.settings.rules.enabled(&Rule::UnusedVariable) {
                                     let mut diagnostic = Diagnostic::new(
-                                        violations::UnusedVariable(name.to_string()),
+                                        violations::UnusedVariable {
+                                            name: name.to_string(),
+                                        },
                                         name_range,
                                     );
                                     if self.patch(&Rule::UnusedVariable) {
@@ -3723,7 +3766,7 @@ impl<'a> Checker<'a> {
                 kind: BindingKind::Builtin,
                 range: Range::default(),
                 runtime_usage: None,
-                synthetic_usage: None,
+                synthetic_usage: Some((0, Range::default())),
                 typing_usage: None,
                 source: None,
                 context: ExecutionContext::Runtime,
@@ -3763,6 +3806,10 @@ impl<'a> Checker<'a> {
             .map(|index| &self.scopes[*index])
     }
 
+    pub fn in_exception_handler(&self) -> bool {
+        self.in_exception_handler
+    }
+
     pub fn execution_context(&self) -> ExecutionContext {
         if self.in_type_checking_block
             || self.in_annotation
@@ -3814,10 +3861,10 @@ impl<'a> Checker<'a> {
                 if matches!(binding.kind, BindingKind::LoopVar) && existing_is_import {
                     if self.settings.rules.enabled(&Rule::ImportShadowedByLoopVar) {
                         self.diagnostics.push(Diagnostic::new(
-                            violations::ImportShadowedByLoopVar(
-                                name.to_string(),
-                                existing.range.location.row(),
-                            ),
+                            violations::ImportShadowedByLoopVar {
+                                name: name.to_string(),
+                                line: existing.range.location.row(),
+                            },
                             binding.range,
                         ));
                     }
@@ -3833,10 +3880,10 @@ impl<'a> Checker<'a> {
                     {
                         if self.settings.rules.enabled(&Rule::RedefinedWhileUnused) {
                             self.diagnostics.push(Diagnostic::new(
-                                violations::RedefinedWhileUnused(
-                                    name.to_string(),
-                                    existing.range.location.row(),
-                                ),
+                                violations::RedefinedWhileUnused {
+                                    name: name.to_string(),
+                                    line: existing.range.location.row(),
+                                },
                                 binding_range(&binding, self.locator),
                             ));
                         }
@@ -3850,16 +3897,41 @@ impl<'a> Checker<'a> {
             }
         }
 
-        // Assume the rebound name is used as a global or within a loop.
         let scope = self.current_scope();
-        let binding = match scope.values.get(&name) {
-            None => binding,
-            Some(index) => Binding {
-                runtime_usage: self.bindings[*index].runtime_usage,
-                synthetic_usage: self.bindings[*index].synthetic_usage,
-                typing_usage: self.bindings[*index].typing_usage,
-                ..binding
-            },
+        let binding = if let Some(index) = scope.values.get(&name) {
+            if matches!(self.bindings[*index].kind, BindingKind::Builtin) {
+                // Avoid overriding builtins.
+                binding
+            } else if matches!(self.bindings[*index].kind, BindingKind::Global) {
+                // If the original binding was a global, and the new binding conflicts within the
+                // current scope, then the new binding is also a global.
+                Binding {
+                    runtime_usage: self.bindings[*index].runtime_usage,
+                    synthetic_usage: self.bindings[*index].synthetic_usage,
+                    typing_usage: self.bindings[*index].typing_usage,
+                    kind: BindingKind::Global,
+                    ..binding
+                }
+            } else if matches!(self.bindings[*index].kind, BindingKind::Nonlocal) {
+                // If the original binding was a nonlocal, and the new binding conflicts within the
+                // current scope, then the new binding is also a nonlocal.
+                Binding {
+                    runtime_usage: self.bindings[*index].runtime_usage,
+                    synthetic_usage: self.bindings[*index].synthetic_usage,
+                    typing_usage: self.bindings[*index].typing_usage,
+                    kind: BindingKind::Nonlocal,
+                    ..binding
+                }
+            } else {
+                Binding {
+                    runtime_usage: self.bindings[*index].runtime_usage,
+                    synthetic_usage: self.bindings[*index].synthetic_usage,
+                    typing_usage: self.bindings[*index].typing_usage,
+                    ..binding
+                }
+            }
+        } else {
+            binding
         };
 
         // Don't treat annotations as assignments if there is an existing value
@@ -3975,7 +4047,10 @@ impl<'a> Checker<'a> {
                     from_list.sort();
 
                     self.diagnostics.push(Diagnostic::new(
-                        violations::ImportStarUsage(id.to_string(), from_list),
+                        violations::ImportStarUsage {
+                            name: id.to_string(),
+                            sources: from_list,
+                        },
                         Range::from_located(expr),
                     ));
                 }
@@ -4006,7 +4081,7 @@ impl<'a> Checker<'a> {
                 }
 
                 self.diagnostics.push(Diagnostic::new(
-                    violations::UndefinedName(id.clone()),
+                    violations::UndefinedName { name: id.clone() },
                     Range::from_located(expr),
                 ));
             }
@@ -4152,14 +4227,25 @@ impl<'a> Checker<'a> {
                 }
                 _ => false,
             } {
+                let (all_names, all_names_flags) =
+                    extract_all_names(parent, current, &self.bindings);
+
+                if self.settings.rules.enabled(&Rule::InvalidAllFormat)
+                    && matches!(all_names_flags, AllNamesFlags::INVALID_FORMAT)
+                {
+                    pylint::rules::invalid_all_format(self, expr);
+                }
+
+                if self.settings.rules.enabled(&Rule::InvalidAllObject)
+                    && matches!(all_names_flags, AllNamesFlags::INVALID_OBJECT)
+                {
+                    pylint::rules::invalid_all_object(self, expr);
+                }
+
                 self.add_binding(
                     id,
                     Binding {
-                        kind: BindingKind::Export(extract_all_names(
-                            parent,
-                            current,
-                            &self.bindings,
-                        )),
+                        kind: BindingKind::Export(all_names),
                         runtime_usage: None,
                         synthetic_usage: None,
                         typing_usage: None,
@@ -4203,7 +4289,9 @@ impl<'a> Checker<'a> {
                 && self.settings.rules.enabled(&Rule::UndefinedName)
             {
                 self.diagnostics.push(Diagnostic::new(
-                    violations::UndefinedName(id.to_string()),
+                    violations::UndefinedName {
+                        name: id.to_string(),
+                    },
                     Range::from_located(expr),
                 ));
             }
@@ -4269,7 +4357,9 @@ impl<'a> Checker<'a> {
                     .enabled(&Rule::ForwardAnnotationSyntaxError)
                 {
                     self.diagnostics.push(Diagnostic::new(
-                        violations::ForwardAnnotationSyntaxError(expression.to_string()),
+                        violations::ForwardAnnotationSyntaxError {
+                            body: expression.to_string(),
+                        },
                         range,
                     ));
                 }
@@ -4438,10 +4528,16 @@ impl<'a> Checker<'a> {
                 for (name, index) in &scope.values {
                     let binding = &self.bindings[*index];
                     if matches!(binding.kind, BindingKind::Global) {
-                        diagnostics.push(Diagnostic::new(
-                            violations::GlobalVariableNotAssigned((*name).to_string()),
-                            binding.range,
-                        ));
+                        if let Some(stmt) = &binding.source {
+                            if matches!(stmt.node, StmtKind::Global { .. }) {
+                                diagnostics.push(Diagnostic::new(
+                                    violations::GlobalVariableNotAssigned {
+                                        name: (*name).to_string(),
+                                    },
+                                    binding.range,
+                                ));
+                            }
+                        }
                     }
                 }
             }
@@ -4468,7 +4564,9 @@ impl<'a> Checker<'a> {
                             for &name in names {
                                 if !scope.values.contains_key(name) {
                                     diagnostics.push(Diagnostic::new(
-                                        violations::UndefinedExport(name.to_string()),
+                                        violations::UndefinedExport {
+                                            name: name.to_string(),
+                                        },
                                         all_binding.range,
                                     ));
                                 }
@@ -4506,10 +4604,10 @@ impl<'a> Checker<'a> {
                         if let Some(indices) = self.redefinitions.get(index) {
                             for index in indices {
                                 diagnostics.push(Diagnostic::new(
-                                    violations::RedefinedWhileUnused(
-                                        (*name).to_string(),
-                                        binding.range.location.row(),
-                                    ),
+                                    violations::RedefinedWhileUnused {
+                                        name: (*name).to_string(),
+                                        line: binding.range.location.row(),
+                                    },
                                     binding_range(&self.bindings[*index], self.locator),
                                 ));
                             }
@@ -4537,10 +4635,10 @@ impl<'a> Checker<'a> {
                             for &name in names {
                                 if !scope.values.contains_key(name) {
                                     diagnostics.push(Diagnostic::new(
-                                        violations::ImportStarUsage(
-                                            name.to_string(),
-                                            from_list.clone(),
-                                        ),
+                                        violations::ImportStarUsage {
+                                            name: name.to_string(),
+                                            sources: from_list.clone(),
+                                        },
                                         all_binding.range,
                                     ));
                                 }
@@ -4703,7 +4801,11 @@ impl<'a> Checker<'a> {
                     let multiple = unused_imports.len() > 1;
                     for (full_name, range) in unused_imports {
                         let mut diagnostic = Diagnostic::new(
-                            violations::UnusedImport(full_name.to_string(), ignore_init, multiple),
+                            violations::UnusedImport {
+                                name: full_name.to_string(),
+                                ignore_init,
+                                multiple,
+                            },
                             *range,
                         );
                         if matches!(child.node, StmtKind::ImportFrom { .. })
@@ -4725,7 +4827,11 @@ impl<'a> Checker<'a> {
                     let multiple = unused_imports.len() > 1;
                     for (full_name, range) in unused_imports {
                         let mut diagnostic = Diagnostic::new(
-                            violations::UnusedImport(full_name.to_string(), ignore_init, multiple),
+                            violations::UnusedImport {
+                                name: full_name.to_string(),
+                                ignore_init,
+                                multiple,
+                            },
                             *range,
                         );
                         if matches!(child.node, StmtKind::ImportFrom { .. })

src/checkers/noqa.rs

@@ -100,10 +100,13 @@ pub fn check_noqa(
     if enforce_noqa {
         for (row, (directive, matches)) in noqa_directives {
             match directive {
-                Directive::All(spaces, start, end) => {
+                Directive::All(spaces, start_byte, end_byte) => {
                     if matches.is_empty() {
+                        let start = lines[row][..start_byte].chars().count();
+                        let end = start + lines[row][start_byte..end_byte].chars().count();
+
                         let mut diagnostic = Diagnostic::new(
-                            violations::UnusedNOQA(None),
+                            violations::UnusedNOQA { codes: None },
                             Range::new(Location::new(row + 1, start), Location::new(row + 1, end)),
                         );
                         if matches!(autofix, flags::Autofix::Enabled)
@@ -117,7 +120,7 @@ pub fn check_noqa(
                         diagnostics.push(diagnostic);
                     }
                 }
-                Directive::Codes(spaces, start, end, codes) => {
+                Directive::Codes(spaces, start_byte, end_byte, codes) => {
                     let mut disabled_codes = vec![];
                     let mut unknown_codes = vec![];
                     let mut unmatched_codes = vec![];
@@ -153,21 +156,26 @@ pub fn check_noqa(
                         && unknown_codes.is_empty()
                         && unmatched_codes.is_empty())
                     {
+                        let start = lines[row][..start_byte].chars().count();
+                        let end = start + lines[row][start_byte..end_byte].chars().count();
+
                         let mut diagnostic = Diagnostic::new(
-                            violations::UnusedNOQA(Some(UnusedCodes {
-                                disabled: disabled_codes
-                                    .iter()
-                                    .map(|code| (*code).to_string())
-                                    .collect(),
-                                unknown: unknown_codes
-                                    .iter()
-                                    .map(|code| (*code).to_string())
-                                    .collect(),
-                                unmatched: unmatched_codes
-                                    .iter()
-                                    .map(|code| (*code).to_string())
-                                    .collect(),
-                            })),
+                            violations::UnusedNOQA {
+                                codes: Some(UnusedCodes {
+                                    disabled: disabled_codes
+                                        .iter()
+                                        .map(|code| (*code).to_string())
+                                        .collect(),
+                                    unknown: unknown_codes
+                                        .iter()
+                                        .map(|code| (*code).to_string())
+                                        .collect(),
+                                    unmatched: unmatched_codes
+                                        .iter()
+                                        .map(|code| (*code).to_string())
+                                        .collect(),
+                                }),
+                            },
                             Range::new(Location::new(row + 1, start), Location::new(row + 1, end)),
                         );
                         if matches!(autofix, flags::Autofix::Enabled)

src/checkers/tokens.rs

@@ -48,77 +48,73 @@ pub fn check_tokens(
         || settings.rules.enabled(&Rule::TrailingCommaProhibited);
     let enforce_extraneous_parenthesis = settings.rules.enabled(&Rule::ExtraneousParentheses);
 
-    let mut state_machine = StateMachine::default();
-    for &(start, ref tok, end) in tokens.iter().flatten() {
-        let is_docstring = if enforce_ambiguous_unicode_character || enforce_quotes {
-            state_machine.consume(tok)
-        } else {
-            false
-        };
+    if enforce_ambiguous_unicode_character
+        || enforce_commented_out_code
+        || enforce_invalid_escape_sequence
+    {
+        let mut state_machine = StateMachine::default();
+        for &(start, ref tok, end) in tokens.iter().flatten() {
+            let is_docstring = if enforce_ambiguous_unicode_character {
+                state_machine.consume(tok)
+            } else {
+                false
+            };
 
-        // RUF001, RUF002, RUF003
-        if enforce_ambiguous_unicode_character {
-            if matches!(tok, Tok::String { .. } | Tok::Comment(_)) {
-                diagnostics.extend(ruff::rules::ambiguous_unicode_character(
-                    locator,
-                    start,
-                    end,
-                    if matches!(tok, Tok::String { .. }) {
-                        if is_docstring {
-                            Context::Docstring
+            // RUF001, RUF002, RUF003
+            if enforce_ambiguous_unicode_character {
+                if matches!(tok, Tok::String { .. } | Tok::Comment(_)) {
+                    diagnostics.extend(ruff::rules::ambiguous_unicode_character(
+                        locator,
+                        start,
+                        end,
+                        if matches!(tok, Tok::String { .. }) {
+                            if is_docstring {
+                                Context::Docstring
+                            } else {
+                                Context::String
+                            }
                         } else {
-                            Context::String
-                        }
-                    } else {
-                        Context::Comment
-                    },
-                    settings,
-                    autofix,
-                ));
+                            Context::Comment
+                        },
+                        settings,
+                        autofix,
+                    ));
+                }
             }
-        }
 
-        // flake8-quotes
-        if enforce_quotes {
-            if matches!(tok, Tok::String { .. }) {
-                if let Some(diagnostic) = flake8_quotes::rules::quotes(
-                    locator,
-                    start,
-                    end,
-                    is_docstring,
-                    settings,
-                    autofix,
-                ) {
-                    if settings.rules.enabled(diagnostic.kind.rule()) {
+            // eradicate
+            if enforce_commented_out_code {
+                if matches!(tok, Tok::Comment(_)) {
+                    if let Some(diagnostic) =
+                        eradicate::rules::commented_out_code(locator, start, end, settings, autofix)
+                    {
                         diagnostics.push(diagnostic);
                     }
                 }
             }
-        }
 
-        // eradicate
-        if enforce_commented_out_code {
-            if matches!(tok, Tok::Comment(_)) {
-                if let Some(diagnostic) =
-                    eradicate::rules::commented_out_code(locator, start, end, settings, autofix)
-                {
-                    diagnostics.push(diagnostic);
+            // W605
+            if enforce_invalid_escape_sequence {
+                if matches!(tok, Tok::String { .. }) {
+                    diagnostics.extend(pycodestyle::rules::invalid_escape_sequence(
+                        locator,
+                        start,
+                        end,
+                        matches!(autofix, flags::Autofix::Enabled)
+                            && settings.rules.should_fix(&Rule::InvalidEscapeSequence),
+                    ));
                 }
             }
         }
+    }
 
-        // W605
-        if enforce_invalid_escape_sequence {
-            if matches!(tok, Tok::String { .. }) {
-                diagnostics.extend(pycodestyle::rules::invalid_escape_sequence(
-                    locator,
-                    start,
-                    end,
-                    matches!(autofix, flags::Autofix::Enabled)
-                        && settings.rules.should_fix(&Rule::InvalidEscapeSequence),
-                ));
-            }
-        }
+    // Q001, Q002, Q003
+    if enforce_quotes {
+        diagnostics.extend(
+            flake8_quotes::rules::from_tokens(tokens, locator, settings, autofix)
+                .into_iter()
+                .filter(|diagnostic| settings.rules.enabled(diagnostic.kind.rule())),
+        );
     }
 
     // ISC001, ISC002

src/fix.rs

@@ -36,6 +36,8 @@ impl Fix {
     }
 
     pub fn replacement(content: String, start: Location, end: Location) -> Self {
+        debug_assert!(!content.is_empty(), "Prefer `Fix::deletion`");
+
         Self {
             content,
             location: start,
@@ -44,6 +46,8 @@ impl Fix {
     }
 
     pub fn insertion(content: String, at: Location) -> Self {
+        debug_assert!(!content.is_empty(), "Insert content is empty");
+
         Self {
             content,
             location: at,

src/flake8_to_ruff/converter.rs

@@ -1,6 +1,7 @@
-use std::collections::{BTreeSet, HashMap};
+use std::collections::{HashMap, HashSet};
 
 use anyhow::Result;
+use itertools::Itertools;
 
 use super::external_config::ExternalConfig;
 use super::plugin::Plugin;
@@ -38,7 +39,7 @@ pub fn convert(
         .expect("Unable to find flake8 section in INI file");
 
     // Extract all referenced rule code prefixes, to power plugin inference.
-    let mut referenced_codes: BTreeSet<RuleSelector> = BTreeSet::default();
+    let mut referenced_codes: HashSet<RuleSelector> = HashSet::default();
     for (key, value) in flake8 {
         if let Some(value) = value {
             match key.as_str() {
@@ -80,15 +81,15 @@ pub fn convert(
         .and_then(|value| {
             value
                 .as_ref()
-                .map(|value| BTreeSet::from_iter(parser::parse_prefix_codes(value)))
+                .map(|value| HashSet::from_iter(parser::parse_prefix_codes(value)))
         })
         .unwrap_or_else(|| resolve_select(&plugins));
-    let mut ignore = flake8
+    let mut ignore: HashSet<RuleSelector> = flake8
         .get("ignore")
         .and_then(|value| {
             value
                 .as_ref()
-                .map(|value| BTreeSet::from_iter(parser::parse_prefix_codes(value)))
+                .map(|value| HashSet::from_iter(parser::parse_prefix_codes(value)))
         })
         .unwrap_or_default();
 
@@ -349,8 +350,18 @@ pub fn convert(
     }
 
     // Deduplicate and sort.
-    options.select = Some(Vec::from_iter(select));
-    options.ignore = Some(Vec::from_iter(ignore));
+    options.select = Some(
+        select
+            .into_iter()
+            .sorted_by_key(RuleSelector::short_code)
+            .collect(),
+    );
+    options.ignore = Some(
+        ignore
+            .into_iter()
+            .sorted_by_key(RuleSelector::short_code)
+            .collect(),
+    );
     if flake8_annotations != flake8_annotations::settings::Options::default() {
         options.flake8_annotations = Some(flake8_annotations);
     }
@@ -414,8 +425,8 @@ pub fn convert(
 
 /// 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();
+fn resolve_select(plugins: &[Plugin]) -> HashSet<RuleSelector> {
+    let mut select: HashSet<_> = DEFAULT_SELECTORS.iter().cloned().collect();
     select.extend(plugins.iter().map(Plugin::selector));
     select
 }
@@ -446,7 +457,7 @@ mod tests {
                     .iter()
                     .cloned()
                     .chain(plugins)
-                    .sorted()
+                    .sorted_by_key(RuleSelector::short_code)
                     .collect(),
             ),
             ..Options::default()

src/flake8_to_ruff/plugin.rs

@@ -1,4 +1,4 @@
-use std::collections::{BTreeSet, HashMap};
+use std::collections::{BTreeSet, HashMap, HashSet};
 use std::fmt;
 use std::str::FromStr;
 
@@ -293,7 +293,7 @@ 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> {
+pub fn infer_plugins_from_codes(selectors: &HashSet<RuleSelector>) -> Vec<Plugin> {
     // Ignore cases in which we've knowingly changed rule prefixes.
     [
         Plugin::Flake82020,

src/fs.rs

@@ -1,8 +1,10 @@
 use std::fs::File;
 use std::io::{BufReader, Read};
+use std::ops::Deref;
 use std::path::{Path, PathBuf};
 
 use anyhow::{anyhow, Result};
+use log::debug;
 use path_absolutize::{path_dedot, Absolutize};
 use rustc_hash::FxHashSet;
 
@@ -34,10 +36,28 @@ pub(crate) fn ignores_from_path<'a>(
     let (file_path, file_basename) = extract_path_names(path)?;
     Ok(pattern_code_pairs
         .iter()
-        .filter(|(absolute, basename, _)| {
-            basename.is_match(file_basename) || absolute.is_match(file_path)
+        .filter_map(|(absolute, basename, codes)| {
+            if basename.is_match(file_basename) {
+                debug!(
+                    "Adding per-file ignores for {:?} due to basename match on {:?}: {:?}",
+                    path,
+                    basename.deref().glob().regex(),
+                    &**codes
+                );
+                return Some(codes.iter());
+            }
+            if absolute.is_match(file_path) {
+                debug!(
+                    "Adding per-file ignores for {:?} due to absolute match on {:?}: {:?}",
+                    path,
+                    absolute.deref().glob().regex(),
+                    &**codes
+                );
+                return Some(codes.iter());
+            }
+            None
         })
-        .flat_map(|(_, _, codes)| codes.iter())
+        .flatten()
         .collect())
 }
 

src/linter.rs

@@ -118,7 +118,9 @@ pub fn check_path(
             Err(parse_error) => {
                 if settings.rules.enabled(&Rule::SyntaxError) {
                     diagnostics.push(Diagnostic::new(
-                        violations::SyntaxError(parse_error.error.to_string()),
+                        violations::SyntaxError {
+                            message: parse_error.error.to_string(),
+                        },
                         Range::new(parse_error.location, parse_error.location),
                     ));
                 }
@@ -149,6 +151,15 @@ pub fn check_path(
         ));
     }
 
+    // Ignore diagnostics based on per-file-ignores.
+    if !diagnostics.is_empty() && !settings.per_file_ignores.is_empty() {
+        let ignores = fs::ignores_from_path(path, &settings.per_file_ignores)?;
+
+        if !ignores.is_empty() {
+            diagnostics.retain(|diagnostic| !ignores.contains(&diagnostic.kind.rule()));
+        }
+    };
+
     // Enforce `noqa` directives.
     if (matches!(noqa, flags::Noqa::Enabled) && !diagnostics.is_empty())
         || settings
@@ -166,17 +177,6 @@ pub fn check_path(
         );
     }
 
-    // Create path ignores.
-    if !diagnostics.is_empty() && !settings.per_file_ignores.is_empty() {
-        let ignores = fs::ignores_from_path(path, &settings.per_file_ignores)?;
-        if !ignores.is_empty() {
-            return Ok(diagnostics
-                .into_iter()
-                .filter(|diagnostic| !ignores.contains(&diagnostic.kind.rule()))
-                .collect());
-        }
-    }
-
     Ok(diagnostics)
 }
 

src/logging.rs

@@ -46,7 +46,7 @@ macro_rules! notify_user {
     }
 }
 
-#[derive(Debug, Default, PartialOrd, Ord, PartialEq, Eq)]
+#[derive(Debug, Default, PartialOrd, Ord, PartialEq, Eq, Copy, Clone)]
 pub enum LogLevel {
     // No output (+ `log::LevelFilter::Off`).
     Silent,
@@ -60,6 +60,7 @@ pub enum LogLevel {
 }
 
 impl LogLevel {
+    #[allow(clippy::trivially_copy_pass_by_ref)]
     fn level_filter(&self) -> log::LevelFilter {
         match self {
             LogLevel::Default => log::LevelFilter::Info,

src/noqa.rs

@@ -166,13 +166,13 @@ fn add_noqa_inner(
                         output.push_str(line_ending);
                         count += 1;
                     }
-                    Directive::Codes(_, start, _, existing) => {
+                    Directive::Codes(_, start_byte, _, existing) => {
                         // Reconstruct the line based on the preserved rule codes.
                         // This enables us to tally the number of edits.
-                        let mut formatted = String::new();
+                        let mut formatted = String::with_capacity(line.len());
 
                         // Add existing content.
-                        formatted.push_str(line[..start].trim_end());
+                        formatted.push_str(line[..start_byte].trim_end());
 
                         // Add `noqa` directive.
                         formatted.push_str("  # noqa: ");
@@ -247,7 +247,9 @@ mod tests {
         assert_eq!(output, format!("{contents}\n"));
 
         let diagnostics = vec![Diagnostic::new(
-            violations::UnusedVariable("x".to_string()),
+            violations::UnusedVariable {
+                name: "x".to_string(),
+            },
             Range::new(Location::new(1, 0), Location::new(1, 0)),
         )];
         let contents = "x = 1";
@@ -269,7 +271,9 @@ mod tests {
                 Range::new(Location::new(1, 0), Location::new(1, 0)),
             ),
             Diagnostic::new(
-                violations::UnusedVariable("x".to_string()),
+                violations::UnusedVariable {
+                    name: "x".to_string(),
+                },
                 Range::new(Location::new(1, 0), Location::new(1, 0)),
             ),
         ];
@@ -292,7 +296,9 @@ mod tests {
                 Range::new(Location::new(1, 0), Location::new(1, 0)),
             ),
             Diagnostic::new(
-                violations::UnusedVariable("x".to_string()),
+                violations::UnusedVariable {
+                    name: "x".to_string(),
+                },
                 Range::new(Location::new(1, 0), Location::new(1, 0)),
             ),
         ];

src/python/sys.rs

@@ -194,6 +194,7 @@ pub static KNOWN_STANDARD_LIBRARY: Lazy<FxHashSet<&'static str>> = Lazy::new(||
         "tkinter",
         "token",
         "tokenize",
+        "tomllib",
         "trace",
         "traceback",
         "tracemalloc",

src/python/typing.rs

@@ -49,7 +49,7 @@ pub static TYPING_EXTENSIONS: Lazy<FxHashSet<&'static str>> = Lazy::new(|| {
         "assert_type",
         "clear_overloads",
         "final",
-        "get_Type_hints",
+        "get_type_hints",
         "get_args",
         "get_origin",
         "get_overloads",

src/registry.rs

@@ -7,7 +7,6 @@ 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};
 
@@ -78,6 +77,8 @@ ruff_macros::define_rule_mapping!(
     F842 => violations::UnusedAnnotation,
     F901 => violations::RaiseNotImplemented,
     // pylint
+    PLE0604 => rules::pylint::rules::InvalidAllObject,
+    PLE0605 => rules::pylint::rules::InvalidAllFormat,
     PLC0414 => violations::UselessImportAlias,
     PLC3002 => violations::UnnecessaryDirectLambdaCall,
     PLE0117 => violations::NonlocalWithoutBinding,
@@ -91,6 +92,7 @@ ruff_macros::define_rule_mapping!(
     PLR2004 => violations::MagicValueComparison,
     PLW0120 => violations::UselessElseOnLoop,
     PLW0602 => violations::GlobalVariableNotAssigned,
+    PLR0913 => rules::pylint::rules::TooManyArgs,
     // flake8-builtins
     A001 => violations::BuiltinVariableShadowing,
     A002 => violations::BuiltinArgumentShadowing,
@@ -235,7 +237,6 @@ ruff_macros::define_rule_mapping!(
     UP013 => violations::ConvertTypedDictFunctionalToClass,
     UP014 => violations::ConvertNamedTupleFunctionalToClass,
     UP015 => violations::RedundantOpenModes,
-    UP016 => violations::RemoveSixCompat,
     UP017 => violations::DatetimeTimezoneUTC,
     UP018 => violations::NativeLiterals,
     UP019 => violations::TypingTextStrAlias,
@@ -254,6 +255,7 @@ ruff_macros::define_rule_mapping!(
     UP032 => violations::FString,
     UP033 => violations::FunctoolsCache,
     UP034 => violations::ExtraneousParentheses,
+    UP035 => rules::pyupgrade::rules::ImportReplacements,
     // pydocstyle
     D100 => violations::PublicModule,
     D101 => violations::PublicClass,
@@ -282,7 +284,7 @@ ruff_macros::define_rule_mapping!(
     D300 => violations::UsesTripleQuotes,
     D301 => violations::UsesRPrefixForBackslashedContent,
     D400 => violations::EndsInPeriod,
-    D401 => crate::rules::pydocstyle::rules::non_imperative_mood::NonImperativeMood,
+    D401 => rules::pydocstyle::rules::non_imperative_mood::NonImperativeMood,
     D402 => violations::NoSignature,
     D403 => violations::FirstLineCapitalized,
     D404 => violations::NoThisPrefix,
@@ -331,6 +333,7 @@ ruff_macros::define_rule_mapping!(
     S106 => violations::HardcodedPasswordFuncArg,
     S107 => violations::HardcodedPasswordDefault,
     S108 => violations::HardcodedTempFile,
+    S110 => rules::flake8_bandit::rules::TryExceptPass,
     S113 => violations::RequestWithoutTimeout,
     S324 => violations::HashlibInsecureHashFunction,
     S501 => violations::RequestWithNoCertValidation,
@@ -367,28 +370,28 @@ ruff_macros::define_rule_mapping!(
     PGH003 => violations::BlanketTypeIgnore,
     PGH004 => violations::BlanketNOQA,
     // pandas-vet
-    PD002 => violations::UseOfInplaceArgument,
-    PD003 => violations::UseOfDotIsNull,
-    PD004 => violations::UseOfDotNotNull,
-    PD007 => violations::UseOfDotIx,
-    PD008 => violations::UseOfDotAt,
-    PD009 => violations::UseOfDotIat,
-    PD010 => violations::UseOfDotPivotOrUnstack,
-    PD011 => violations::UseOfDotValues,
-    PD012 => violations::UseOfDotReadTable,
-    PD013 => violations::UseOfDotStack,
-    PD015 => violations::UseOfPdMerge,
-    PD901 => violations::DfIsABadVariableName,
+    PD002 => rules::pandas_vet::rules::UseOfInplaceArgument,
+    PD003 => rules::pandas_vet::rules::UseOfDotIsNull,
+    PD004 => rules::pandas_vet::rules::UseOfDotNotNull,
+    PD007 => rules::pandas_vet::rules::UseOfDotIx,
+    PD008 => rules::pandas_vet::rules::UseOfDotAt,
+    PD009 => rules::pandas_vet::rules::UseOfDotIat,
+    PD010 => rules::pandas_vet::rules::UseOfDotPivotOrUnstack,
+    PD011 => rules::pandas_vet::rules::UseOfDotValues,
+    PD012 => rules::pandas_vet::rules::UseOfDotReadTable,
+    PD013 => rules::pandas_vet::rules::UseOfDotStack,
+    PD015 => rules::pandas_vet::rules::UseOfPdMerge,
+    PD901 => rules::pandas_vet::rules::DfIsABadVariableName,
     // flake8-errmsg
     EM101 => violations::RawStringInException,
     EM102 => violations::FStringInException,
     EM103 => violations::DotFormatInException,
     // flake8-pytest-style
-    PT001 => violations::IncorrectFixtureParenthesesStyle,
-    PT002 => violations::FixturePositionalArgs,
-    PT003 => violations::ExtraneousScopeFunction,
-    PT004 => violations::MissingFixtureNameUnderscore,
-    PT005 => violations::IncorrectFixtureNameUnderscore,
+    PT001 => rules::flake8_pytest_style::rules::IncorrectFixtureParenthesesStyle,
+    PT002 => rules::flake8_pytest_style::rules::FixturePositionalArgs,
+    PT003 => rules::flake8_pytest_style::rules::ExtraneousScopeFunction,
+    PT004 => rules::flake8_pytest_style::rules::MissingFixtureNameUnderscore,
+    PT005 => rules::flake8_pytest_style::rules::IncorrectFixtureNameUnderscore,
     PT006 => violations::ParametrizeNamesWrongType,
     PT007 => violations::ParametrizeValuesWrongType,
     PT008 => violations::PatchWithLambda,
@@ -401,13 +404,13 @@ ruff_macros::define_rule_mapping!(
     PT016 => violations::FailWithoutMessage,
     PT017 => violations::AssertInExcept,
     PT018 => violations::CompositeAssertion,
-    PT019 => violations::FixtureParamWithoutValue,
-    PT020 => violations::DeprecatedYieldFixture,
-    PT021 => violations::FixtureFinalizerCallback,
-    PT022 => violations::UselessYieldFixture,
+    PT019 => rules::flake8_pytest_style::rules::FixtureParamWithoutValue,
+    PT020 => rules::flake8_pytest_style::rules::DeprecatedYieldFixture,
+    PT021 => rules::flake8_pytest_style::rules::FixtureFinalizerCallback,
+    PT022 => rules::flake8_pytest_style::rules::UselessYieldFixture,
     PT023 => violations::IncorrectMarkParenthesesStyle,
-    PT024 => violations::UnnecessaryAsyncioMarkOnFixture,
-    PT025 => violations::ErroneousUseFixturesOnFixture,
+    PT024 => rules::flake8_pytest_style::rules::UnnecessaryAsyncioMarkOnFixture,
+    PT025 => rules::flake8_pytest_style::rules::ErroneousUseFixturesOnFixture,
     PT026 => violations::UseFixturesWithoutParameters,
     // flake8-pie
     PIE790 => rules::flake8_pie::rules::NoUnnecessaryPass,
@@ -478,6 +481,8 @@ ruff_macros::define_rule_mapping!(
     G101 => rules::flake8_logging_format::violations::LoggingExtraAttrClash,
     G201 => rules::flake8_logging_format::violations::LoggingExcInfo,
     G202 => rules::flake8_logging_format::violations::LoggingRedundantExcInfo,
+    // flake8-raise
+    RSE102 => rules::flake8_raise::rules::UnnecessaryParenOnRaiseException,
     // ruff
     RUF001 => violations::AmbiguousUnicodeCharacterString,
     RUF002 => violations::AmbiguousUnicodeCharacterDocstring,
@@ -607,15 +612,25 @@ pub enum Linter {
     /// [tryceratops](https://pypi.org/project/tryceratops/1.1.0/)
     #[prefix = "TRY"]
     Tryceratops,
+    /// [flake8-raise](https://pypi.org/project/flake8-raise/)
+    #[prefix = "RSE"]
+    Flake8Raise,
     /// Ruff-specific rules
     #[prefix = "RUF"]
     Ruff,
 }
 
 pub trait RuleNamespace: Sized {
-    fn parse_code(code: &str) -> Option<(Self, &str)>;
+    /// Returns the prefix that every single code that ruff uses to identify
+    /// rules from this linter starts with.  In the case that multiple
+    /// `#[prefix]`es are configured for the variant in the `Linter` enum
+    /// definition this is the empty string.
+    fn common_prefix(&self) -> &'static str;
 
-    fn prefixes(&self) -> &'static [&'static str];
+    /// Attempts to parse the given rule code. If the prefix is recognized
+    /// returns the respective variant along with the code with the common
+    /// prefix stripped.
+    fn parse_code(code: &str) -> Option<(Self, &str)>;
 
     fn name(&self) -> &'static str;
 
@@ -623,27 +638,21 @@ 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)),
-];
+pub struct LinterCategory(pub &'static str, pub &'static str, pub RuleCodePrefix);
 
 impl Linter {
     pub fn categories(&self) -> Option<&'static [LinterCategory]> {
         match self {
-            Linter::Pycodestyle => Some(PYCODESTYLE_CATEGORIES),
-            Linter::Pylint => Some(PYLINT_CATEGORIES),
+            Linter::Pycodestyle => Some(&[
+                LinterCategory("E", "Error", RuleCodePrefix::E),
+                LinterCategory("W", "Warning", RuleCodePrefix::W),
+            ]),
+            Linter::Pylint => Some(&[
+                LinterCategory("PLC", "Convention", RuleCodePrefix::PLC),
+                LinterCategory("PLE", "Error", RuleCodePrefix::PLE),
+                LinterCategory("PLR", "Refactor", RuleCodePrefix::PLR),
+                LinterCategory("PLW", "Warning", RuleCodePrefix::PLW),
+            ]),
             _ => None,
         }
     }
@@ -732,12 +741,20 @@ impl Diagnostic {
 }
 
 /// Pairs of checks that shouldn't be enabled together.
-pub const INCOMPATIBLE_CODES: &[(Rule, Rule, &str)] = &[(
-    Rule::OneBlankLineBeforeClass,
-    Rule::NoBlankLineBeforeClass,
-    "`D203` (OneBlankLineBeforeClass) and `D211` (NoBlankLinesBeforeClass) are incompatible. \
-     Consider adding `D203` to `ignore`.",
-)];
+pub const INCOMPATIBLE_CODES: &[(Rule, Rule, &str); 2] = &[
+    (
+        Rule::NoBlankLineBeforeClass,
+        Rule::OneBlankLineBeforeClass,
+        "`one-blank-line-before-class` (D203) and `no-blank-line-before-class` (D211) are \
+         incompatible. Ignoring `one-blank-line-before-class`.",
+    ),
+    (
+        Rule::MultiLineSummaryFirstLine,
+        Rule::MultiLineSummarySecondLine,
+        "`multi-line-summary-first-line` (D212) and `multi-line-summary-second-line` (D213) are \
+         incompatible. Ignoring `multi-line-summary-second-line`.",
+    ),
+];
 
 #[cfg(test)]
 mod tests {
@@ -756,10 +773,12 @@ mod tests {
     }
 
     #[test]
-    fn test_linter_prefixes() {
+    fn test_linter_parse_code() {
         for rule in Rule::iter() {
-            Linter::parse_code(rule.code())
-                .unwrap_or_else(|| panic!("couldn't parse {:?}", rule.code()));
+            let code = rule.code();
+            let (linter, rest) =
+                Linter::parse_code(code).unwrap_or_else(|| panic!("couldn't parse {:?}", code));
+            assert_eq!(code, format!("{}{rest}", linter.common_prefix()));
         }
     }
 }

src/rule_selector.rs

@@ -6,11 +6,12 @@ use schemars::JsonSchema;
 use serde::de::{self, Visitor};
 use serde::{Deserialize, Serialize};
 use strum::IntoEnumIterator;
+use strum_macros::EnumIter;
 
 use crate::registry::{Rule, RuleCodePrefix, RuleIter};
 use crate::rule_redirects::get_redirect;
 
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum RuleSelector {
     /// All rules
     All,
@@ -48,15 +49,21 @@ pub enum ParseError {
     Unknown(String),
 }
 
+impl RuleSelector {
+    pub fn short_code(&self) -> &'static str {
+        match self {
+            RuleSelector::All => "ALL",
+            RuleSelector::Prefix { prefix, .. } => prefix.into(),
+        }
+    }
+}
+
 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),
-        }
+        serializer.serialize_str(self.short_code())
     }
 }
 
@@ -171,7 +178,7 @@ impl RuleSelector {
     }
 }
 
-#[derive(PartialEq, Eq, PartialOrd, Ord)]
+#[derive(EnumIter, PartialEq, Eq, PartialOrd, Ord)]
 pub(crate) enum Specificity {
     All,
     Linter,

src/rules/flake8_annotations/rules.rs

@@ -58,7 +58,7 @@ where
 {
     if checker.match_typing_expr(annotation, "Any") {
         checker.diagnostics.push(Diagnostic::new(
-            violations::DynamicallyTypedExpression(func()),
+            violations::DynamicallyTypedExpression { name: func() },
             Range::from_located(annotation),
         ));
     };
@@ -115,7 +115,9 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                             .enabled(&Rule::MissingTypeFunctionArgument)
                         {
                             checker.diagnostics.push(Diagnostic::new(
-                                violations::MissingTypeFunctionArgument(arg.node.arg.to_string()),
+                                violations::MissingTypeFunctionArgument {
+                                    name: arg.node.arg.to_string(),
+                                },
                                 Range::from_located(arg),
                             ));
                         }
@@ -125,8 +127,8 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
 
             // ANN002, ANN401
             if let Some(arg) = &args.vararg {
-                has_any_typed_arg = true;
                 if let Some(expr) = &arg.node.annotation {
+                    has_any_typed_arg = true;
                     if !checker.settings.flake8_annotations.allow_star_arg_any {
                         if checker
                             .settings
@@ -143,7 +145,9 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                     {
                         if checker.settings.rules.enabled(&Rule::MissingTypeArgs) {
                             checker.diagnostics.push(Diagnostic::new(
-                                violations::MissingTypeArgs(arg.node.arg.to_string()),
+                                violations::MissingTypeArgs {
+                                    name: arg.node.arg.to_string(),
+                                },
                                 Range::from_located(arg),
                             ));
                         }
@@ -153,8 +157,8 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
 
             // ANN003, ANN401
             if let Some(arg) = &args.kwarg {
-                has_any_typed_arg = true;
                 if let Some(expr) = &arg.node.annotation {
+                    has_any_typed_arg = true;
                     if !checker.settings.flake8_annotations.allow_star_arg_any {
                         if checker
                             .settings
@@ -171,7 +175,9 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                     {
                         if checker.settings.rules.enabled(&Rule::MissingTypeKwargs) {
                             checker.diagnostics.push(Diagnostic::new(
-                                violations::MissingTypeKwargs(arg.node.arg.to_string()),
+                                violations::MissingTypeKwargs {
+                                    name: arg.node.arg.to_string(),
+                                },
                                 Range::from_located(arg),
                             ));
                         }
@@ -186,14 +192,18 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                         if visibility::is_classmethod(checker, cast::decorator_list(stmt)) {
                             if checker.settings.rules.enabled(&Rule::MissingTypeCls) {
                                 checker.diagnostics.push(Diagnostic::new(
-                                    violations::MissingTypeCls(arg.node.arg.to_string()),
+                                    violations::MissingTypeCls {
+                                        name: arg.node.arg.to_string(),
+                                    },
                                     Range::from_located(arg),
                                 ));
                             }
                         } else {
                             if checker.settings.rules.enabled(&Rule::MissingTypeSelf) {
                                 checker.diagnostics.push(Diagnostic::new(
-                                    violations::MissingTypeSelf(arg.node.arg.to_string()),
+                                    violations::MissingTypeSelf {
+                                        name: arg.node.arg.to_string(),
+                                    },
                                     Range::from_located(arg),
                                 ));
                             }
@@ -227,7 +237,9 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                         .enabled(&Rule::MissingReturnTypeClassMethod)
                     {
                         checker.diagnostics.push(Diagnostic::new(
-                            violations::MissingReturnTypeClassMethod(name.to_string()),
+                            violations::MissingReturnTypeClassMethod {
+                                name: name.to_string(),
+                            },
                             helpers::identifier_range(stmt, checker.locator),
                         ));
                     }
@@ -240,7 +252,9 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                         .enabled(&Rule::MissingReturnTypeStaticMethod)
                     {
                         checker.diagnostics.push(Diagnostic::new(
-                            violations::MissingReturnTypeStaticMethod(name.to_string()),
+                            violations::MissingReturnTypeStaticMethod {
+                                name: name.to_string(),
+                            },
                             helpers::identifier_range(stmt, checker.locator),
                         ));
                     }
@@ -256,7 +270,9 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                             && has_any_typed_arg)
                         {
                             let mut diagnostic = Diagnostic::new(
-                                violations::MissingReturnTypeSpecialMethod(name.to_string()),
+                                violations::MissingReturnTypeSpecialMethod {
+                                    name: name.to_string(),
+                                },
                                 helpers::identifier_range(stmt, checker.locator),
                             );
                             if checker.patch(diagnostic.kind.rule()) {
@@ -277,7 +293,9 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                         .enabled(&Rule::MissingReturnTypeSpecialMethod)
                     {
                         checker.diagnostics.push(Diagnostic::new(
-                            violations::MissingReturnTypeSpecialMethod(name.to_string()),
+                            violations::MissingReturnTypeSpecialMethod {
+                                name: name.to_string(),
+                            },
                             helpers::identifier_range(stmt, checker.locator),
                         ));
                     }
@@ -290,7 +308,9 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                                 .enabled(&Rule::MissingReturnTypePublicFunction)
                             {
                                 checker.diagnostics.push(Diagnostic::new(
-                                    violations::MissingReturnTypePublicFunction(name.to_string()),
+                                    violations::MissingReturnTypePublicFunction {
+                                        name: name.to_string(),
+                                    },
                                     helpers::identifier_range(stmt, checker.locator),
                                 ));
                             }
@@ -302,7 +322,9 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                                 .enabled(&Rule::MissingReturnTypePrivateFunction)
                             {
                                 checker.diagnostics.push(Diagnostic::new(
-                                    violations::MissingReturnTypePrivateFunction(name.to_string()),
+                                    violations::MissingReturnTypePrivateFunction {
+                                        name: name.to_string(),
+                                    },
                                     helpers::identifier_range(stmt, checker.locator),
                                 ));
                             }

src/rules/flake8_annotations/snapshots/ruff__rules__flake8_annotations__tests__allow_overload.snap

@@ -3,7 +3,8 @@ source: src/rules/flake8_annotations/mod.rs
 expression: diagnostics
 ---
 - kind:
-    MissingReturnTypePublicFunction: bar
+    MissingReturnTypePublicFunction:
+      name: bar
   location:
     row: 29
     column: 8

src/rules/flake8_annotations/snapshots/ruff__rules__flake8_annotations__tests__allow_star_arg_any.snap

@@ -3,7 +3,8 @@ source: src/rules/flake8_annotations/mod.rs
 expression: diagnostics
 ---
 - kind:
-    DynamicallyTypedExpression: a
+    DynamicallyTypedExpression:
+      name: a
   location:
     row: 10
     column: 11
@@ -13,7 +14,8 @@ expression: diagnostics
   fix: ~
   parent: ~
 - kind:
-    DynamicallyTypedExpression: foo
+    DynamicallyTypedExpression:
+      name: foo
   location:
     row: 15
     column: 46
@@ -23,7 +25,8 @@ expression: diagnostics
   fix: ~
   parent: ~
 - kind:
-    DynamicallyTypedExpression: a
+    DynamicallyTypedExpression:
+      name: a
   location:
     row: 40
     column: 28
@@ -33,7 +36,8 @@ expression: diagnostics
   fix: ~
   parent: ~
 - kind:
-    DynamicallyTypedExpression: foo_method
+    DynamicallyTypedExpression:
+      name: foo_method
   location:
     row: 44
     column: 66