Change iteration-over-set to flag set literals only (#4907)

* Format Binary Expressions

* Extract NeedsParentheses trait

.cargo/config.toml

@@ -1,6 +1,6 @@
 [alias]
 dev = "run --package ruff_dev --bin ruff_dev"
-benchmark = "bench -p ruff_benchmark --"
+benchmark = "bench -p ruff_benchmark --bench linter --bench formatter --"
 
 [target.'cfg(all())']
 rustflags = [

.devcontainer/devcontainer.json

@@ -0,0 +1,46 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/rust
+{
+	"name": "Ruff",
+	"image": "mcr.microsoft.com/devcontainers/rust:0-1-bullseye",
+	"mounts": [
+		{
+			"source": "devcontainer-cargo-cache-${devcontainerId}",
+			"target": "/usr/local/cargo",
+			"type": "volume"
+		}
+	],
+	"customizations": {
+		"codespaces": {
+			"openFiles": [
+				"CONTRIBUTING.md"
+			]
+		},
+		"vscode": {
+			"extensions": [
+				"ms-python.python",
+				"rust-lang.rust-analyzer",
+				"serayuzgur.crates",
+				"tamasfe.even-better-toml",
+				"Swellaby.vscode-rust-test-adapter",
+				"charliermarsh.ruff"
+			],
+			"settings": {
+				"rust-analyzer.updates.askBeforeDownload": false
+			}
+		}
+	},
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	"features": {
+		"ghcr.io/devcontainers/features/python": {
+			"installTools": false
+		}
+	},
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+	"postCreateCommand": ".devcontainer/post-create.sh"
+	// Configure tool-specific properties.
+	// "customizations": {},
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

.devcontainer/post-create.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+rustup default < rust-toolchain
+rustup component add clippy rustfmt
+cargo install cargo-insta
+cargo fetch
+
+pip install maturin pre-commit

.editorconfig

@@ -14,4 +14,7 @@ indent_size = 2
 indent_size = 4
 
 [*.snap]
-trim_trailing_whitespace = false
+trim_trailing_whitespace = false
+
+[*.md]
+max_line_length = 100

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,15 @@
+<!--
+Thank you for contributing to Ruff! To help us out with reviewing, please consider the following:
+
+- Does this pull request include a summary of the change? (See below.)
+- Does this pull request include a descriptive title?
+- Does this pull request include references to any relevant issues?
+-->
+
+## Summary
+
+<!-- What's the purpose of the change? What does it do, and why? -->
+
+## Test Plan
+
+<!-- How was it tested? -->

.github/release.yml

@@ -1,5 +1,9 @@
 # https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#configuring-automatically-generated-release-notes
 changelog:
+  exclude:
+    labels:
+      - internal
+      - documentation
   categories:
     - title: Breaking Changes
       labels:
@@ -11,6 +15,7 @@ changelog:
     - title: Settings
       labels:
         - configuration
+        - cli
     - title: Bug Fixes
       labels:
         - bug

.github/workflows/ci.yaml

@@ -183,18 +183,8 @@ jobs:
       - name: "Install cargo-udeps"
         uses: taiki-e/install-action@cargo-udeps
       - name: "Run cargo-udeps"
-        run: |
-          unused_dependencies=$(cargo +nightly-2023-03-30 udeps > unused.txt && cat unused.txt | cut -d $'\n' -f 2-)
-          if [ -z "$unused_dependencies" ]; then
-            echo "No unused dependencies found" > $GITHUB_STEP_SUMMARY
-            exit 0
-          else
-            echo "Found unused dependencies" > $GITHUB_STEP_SUMMARY
-            echo '```console' >> $GITHUB_STEP_SUMMARY
-            echo "$unused_dependencies" >> $GITHUB_STEP_SUMMARY
-            echo '```' >> $GITHUB_STEP_SUMMARY
-            exit 1
-          fi
+        run: cargo +nightly-2023-03-30 udeps
+
 
   python-package:
     name: "python package"

.github/workflows/docs.yaml

@@ -1,9 +1,9 @@
 name: mkdocs
 
 on:
-  release:
-    types: [published]
   workflow_dispatch:
+  release:
+    types: [ published ]
 
 jobs:
   mkdocs:

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

@@ -52,7 +52,7 @@ jobs:
       - name: "Build wheels - universal2"
         uses: PyO3/maturin-action@v1
         with:
-          args: --release --universal2 --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
+          args: --release --target universal2-apple-darwin --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
       - name: "Install built wheel - universal2"
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*universal2.whl --force-reinstall

.github/workflows/playground.yaml

@@ -2,8 +2,8 @@ name: "[Playground] Release"
 
 on:
   workflow_dispatch:
-  push:
-    branches: [main]
+  release:
+    types: [ published ]
 
 env:
   CARGO_INCREMENTAL: 0

.github/workflows/release.yaml

@@ -3,7 +3,7 @@ name: "[ruff] Release"
 on:
   workflow_dispatch:
   release:
-    types: [published]
+    types: [ published ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -34,6 +34,7 @@ jobs:
           args: --out dist
       - name: "Test sdist"
         run: |
+          rustup default $(cat rust-toolchain)
           pip install dist/${{ env.PACKAGE_NAME }}-*.tar.gz --force-reinstall
           ruff --help
           python -m ruff --help
@@ -94,7 +95,7 @@ jobs:
       - name: "Build wheels - universal2"
         uses: PyO3/maturin-action@v1
         with:
-          args: --release --universal2 --out dist
+          args: --release --target universal2-apple-darwin --out dist
       - name: "Test wheel - universal2"
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*universal2.whl --force-reinstall
@@ -394,21 +395,22 @@ jobs:
       - musllinux
       - musllinux-cross
     if: "startsWith(github.ref, 'refs/tags/')"
+    environment:
+      name: release
+    permissions:
+      # For pypi trusted publishing
+      id-token: write
     steps:
       - uses: actions/download-artifact@v3
         with:
           name: wheels
-      - uses: actions/setup-python@v4
+          path: wheels
       - 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"
-        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"}'
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          skip-existing: true
+          packages-dir: wheels
+          verbose: true
       - uses: actions/download-artifact@v3
         with:
           name: binaries
@@ -417,3 +419,22 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           files: binaries/*
+
+  # After the release has been published, we update downstream repositories
+  # This is separate because if this fails the release is still fine, we just need to do some manual workflow triggers
+  update-dependents:
+    name: Release
+    runs-on: ubuntu-latest
+    needs: release
+    steps:
+      - name: "Update pre-commit mirror"
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.RUFF_PRE_COMMIT_PAT }}
+          script: |
+            github.rest.actions.createWorkflowDispatch({
+              owner: 'astral-sh',
+              repo: 'ruff-pre-commit',
+              workflow_id: 'main.yml',
+              ref: 'main',
+            })

.gitignore

@@ -1,10 +1,11 @@
-# Local cache
-.ruff_cache
 crates/ruff/resources/test/cpython
 mkdocs.yml
 .overrides
 ruff-old
 github_search*.jsonl
+schemastore
+.venv*
+scratch.py
 
 ###
 # Rust.gitignore

.markdownlint.yaml

@@ -0,0 +1,14 @@
+# default to true for all rules
+default: true
+
+# MD033/no-inline-html
+MD033: false
+
+# MD041/first-line-h1
+MD041: false
+
+# MD013/line-length
+MD013:
+  line_length: 100
+  code_blocks: false
+  ignore_code_blocks: true

.pre-commit-config.yaml

@@ -1,4 +1,12 @@
 fail_fast: true
+
+exclude: |
+  (?x)^(
+    crates/ruff/resources/.*|
+    crates/ruff_python_formatter/resources/.*|
+    crates/ruff_python_formatter/src/snapshots/.*
+  )$
+
 repos:
   - repo: https://github.com/abravalheri/validate-pyproject
     rev: v0.12.1
@@ -17,14 +25,9 @@ repos:
     rev: v0.33.0
     hooks:
       - id: markdownlint-fix
-        args:
-          - --disable
-          - MD013 # line-length
-          - MD033 # no-inline-html
-          - --
 
   - repo: https://github.com/crate-ci/typos
-    rev: v1.14.8
+    rev: v1.14.12
     hooks:
       - id: typos
 

BREAKING_CHANGES.md

@@ -86,7 +86,8 @@ the intention of adding a stable public API in the future.
 ### `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
+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

CONTRIBUTING.md

@@ -8,6 +8,7 @@ Welcome! We're happy to have you here. Thank you in advance for your contributio
   - [Project Structure](#project-structure)
   - [Example: Adding a new lint rule](#example-adding-a-new-lint-rule)
     - [Rule naming convention](#rule-naming-convention)
+    - [Rule testing: fixtures and snapshots](#rule-testing-fixtures-and-snapshots)
   - [Example: Adding a new configuration option](#example-adding-a-new-configuration-option)
 - [MkDocs](#mkdocs)
 - [Release Process](#release-process)
@@ -93,9 +94,11 @@ At time of writing, the repository includes the following crates:
 
 - `crates/ruff`: library crate containing all lint rules and the core logic for running them.
 - `crates/ruff_cli`: binary crate containing Ruff's command-line interface.
-- `crates/ruff_dev`: binary crate containing utilities used in the development of Ruff itself (e.g., `cargo dev generate-all`).
+- `crates/ruff_dev`: binary crate containing utilities used in the development of Ruff itself (e.g.,
+  `cargo dev generate-all`).
 - `crates/ruff_macros`: library crate containing macros used by Ruff.
-- `crates/ruff_python`: library crate implementing Python-specific functionality (e.g., lists of standard library modules by versionb).
+- `crates/ruff_python`: library crate implementing Python-specific functionality (e.g., lists of
+  standard library modules by version).
 - `crates/flake8_to_ruff`: binary crate for generating Ruff configuration from Flake8 configuration.
 
 ### Example: Adding a new lint rule
@@ -103,14 +106,20 @@ At time of writing, the repository includes the following crates:
 At a high level, the steps involved in adding a new lint rule are as follows:
 
 1. Determine a name for the new rule as per our [rule naming convention](#rule-naming-convention).
+
 1. Create a file for your rule (e.g., `crates/ruff/src/rules/flake8_bugbear/rules/abstract_base_class.rs`).
+
 1. In that file, define a violation struct. You can grep for `#[violation]` to see examples.
-1. Map the violation struct to a rule code in `crates/ruff/src/registry.rs` (e.g., `E402`).
-1. Define the logic for triggering the violation in `crates/ruff/src/checkers/ast/mod.rs` (for AST-based
-   checks), `crates/ruff/src/checkers/tokens.rs` (for token-based checks), `crates/ruff/src/checkers/lines.rs`
-   (for text-based checks), or `crates/ruff/src/checkers/filesystem.rs` (for filesystem-based
-   checks).
-1. Add a test fixture.
+
+1. Map the violation struct to a rule code in `crates/ruff/src/codes.rs` (e.g., `E402`).
+
+1. Define the logic for triggering the violation in `crates/ruff/src/checkers/ast/mod.rs` (for
+   AST-based checks), `crates/ruff/src/checkers/tokens.rs` (for token-based checks),
+   `crates/ruff/src/checkers/lines.rs` (for text-based checks), or
+   `crates/ruff/src/checkers/filesystem.rs` (for filesystem-based checks).
+
+1. Add proper [testing](#rule-testing-fixtures-and-snapshots) for your rule.
+
 1. Update the generated files (documentation and generated code).
 
 To define the violation, start by creating a dedicated file for your rule under the appropriate
@@ -125,18 +134,8 @@ collecting diagnostics as it goes.
 If you need to inspect the AST, you can run `cargo dev print-ast` with a Python file. Grep
 for the `Check::new` invocations to understand how other, similar rules are implemented.
 
-To add a test fixture, create a file under `crates/ruff/resources/test/fixtures/[linter]`, named to match
-the code you defined earlier (e.g., `crates/ruff/resources/test/fixtures/pycodestyle/E402.py`). This file should
-contain a variety of violations and non-violations designed to evaluate and demonstrate the behavior
-of your lint rule.
-
-Run `cargo dev generate-all` to generate the code for your new fixture. Then run Ruff
-locally with (e.g.) `cargo run -p ruff_cli -- check crates/ruff/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
-`test_case` macro in the relevant `crates/ruff/src/[linter]/mod.rs` file. Then, run `cargo test`.
-Your test will fail, but you'll be prompted to follow-up with `cargo insta review`. Accept the
-generated snapshot, then commit the snapshot file alongside the rest of your changes.
+Once you're satisfied with your code, add tests for your rule. See [rule testing](#rule-testing-fixtures-and-snapshots)
+for more details.
 
 Finally, regenerate the documentation and generated code with `cargo dev generate-all`.
 
@@ -148,12 +147,44 @@ This implies that rule names:
 
 - should state the bad thing being checked for
 
-- should not contain instructions on what you what you should use instead
+- should not contain instructions on what you should use instead
   (these belong in the rule documentation and the `autofix_title` for rules that have autofix)
 
 When re-implementing rules from other linters, this convention is given more importance than
 preserving the original rule name.
 
+#### Rule testing: fixtures and snapshots
+
+To test rules, Ruff uses snapshots of Ruff's output for a given file (fixture). Generally, there
+will be one file per rule (e.g., `E402.py`), and each file will contain all necessary examples of
+both violations and non-violations. `cargo insta review` will generate a snapshot file containing
+Ruff's output for each fixture, which you can then commit alongside your changes.
+
+Once you've completed the code for the rule itself, you can define tests with the following steps:
+
+1. Add a Python file to `crates/ruff/resources/test/fixtures/[linter]` that contains the code you
+   want to test. The file name should match the rule name (e.g., `E402.py`), and it should include
+   examples of both violations and non-violations.
+
+1. Run Ruff locally against your file and verify the output is as expected. Once you're satisfied
+   with the output (you see the violations you expect, and no others), proceed to the next step.
+   For example, if you're adding a new rule named `E402`, you would run:
+
+   ```shell
+   cargo run -p ruff_cli -- check crates/ruff/resources/test/fixtures/pycodestyle/E402.py --no-cache
+   ```
+
+1. Add the test to the relevant `crates/ruff/src/rules/[linter]/mod.rs` file. If you're contributing
+   a rule to a pre-existing set, you should be able to find a similar example to pattern-match
+   against. If you're adding a new linter, you'll need to create a new `mod.rs` file (see,
+   e.g., `crates/ruff/src/rules/flake8_bugbear/mod.rs`)
+
+1. Run `cargo test`. Your test will fail, but you'll be prompted to follow-up
+   with `cargo insta review`. Run `cargo insta review`, review and accept the generated snapshot,
+   then commit the snapshot file alongside the rest of your changes.
+
+1. Run `cargo test` again to ensure that your test passes.
+
 ### Example: Adding a new configuration option
 
 Ruff's user-facing settings live in a few different places.
@@ -184,6 +215,8 @@ Finally, regenerate the documentation and generated code with `cargo dev generat
 
 To preview any changes to the documentation locally:
 
+1. Install the [Rust toolchain](https://www.rust-lang.org/tools/install).
+
 1. Install MkDocs and Material for MkDocs with:
 
    ```shell

Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 
 [workspace.package]
 edition = "2021"
-rust-version = "1.69"
+rust-version = "1.70"
 homepage = "https://beta.ruff.rs/docs/"
 documentation = "https://beta.ruff.rs/docs/"
 repository = "https://github.com/charliermarsh/ruff"
@@ -11,7 +11,7 @@ authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 
 [workspace.dependencies]
 anyhow = { version = "1.0.69" }
-bitflags = { version = "2.2.1" }
+bitflags = { version = "2.3.1" }
 chrono = { version = "0.4.23", default-features = false, features = ["clock"] }
 clap = { version = "4.1.8", features = ["derive"] }
 colored = { version = "2.0.0" }
@@ -24,17 +24,21 @@ is-macro = { version = "0.2.2" }
 itertools = { version = "0.10.5" }
 libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "80e4c1399f95e5beb532fdd1e209ad2dbb470438" }
 log = { version = "0.4.17" }
+memchr = "2.5.0"
 nohash-hasher = { version = "0.2.0" }
+num-bigint = { version = "0.4.3" }
+num-traits = { version = "0.2.15" }
 once_cell = { version = "1.17.1" }
 path-absolutize = { version = "3.0.14" }
 proc-macro2 = { version = "1.0.51" }
 quote = { version = "1.0.23" }
 regex = { version = "1.7.1" }
 rustc-hash = { version = "1.1.0" }
-ruff_text_size = { git = "https://github.com/RustPython/Parser.git", rev = "e820928f11a2453314ad4d5ce23f066d1d3faf73" }
-rustpython-format = { git = "https://github.com/RustPython/Parser.git", rev = "e820928f11a2453314ad4d5ce23f066d1d3faf73" }
-rustpython-literal = { git = "https://github.com/RustPython/Parser.git", rev = "e820928f11a2453314ad4d5ce23f066d1d3faf73" }
-rustpython-parser = { git = "https://github.com/RustPython/Parser.git", rev = "e820928f11a2453314ad4d5ce23f066d1d3faf73", default-features = false, features = ["full-lexer", "all-nodes-with-ranges"] }
+ruff_text_size = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd" }
+rustpython-ast = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd", default-features = false, features = ["all-nodes-with-ranges"]}
+rustpython-format = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd" }
+rustpython-literal = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd" }
+rustpython-parser = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd", default-features = false, features = ["full-lexer", "all-nodes-with-ranges"] }
 schemars = { version = "0.8.12" }
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = { version = "1.0.93", features = ["preserve_order"] }
@@ -45,7 +49,6 @@ strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
 syn = { version = "2.0.15" }
 test-case = { version = "3.0.0" }
-textwrap = { version = "0.16.0" }
 toml = { version = "0.7.2" }
 
 [profile.release]

README.md

@@ -24,17 +24,18 @@ An extremely fast Python linter, written in Rust.
   <i>Linting the CPython codebase from scratch.</i>
 </p>
 
-- ⚡️  10-100x faster than existing linters
-- 🐍  Installable via `pip`
-- 🛠️  `pyproject.toml` support
-- 🤝  Python 3.11 compatibility
-- 📦  Built-in caching, to avoid re-analyzing unchanged files
-- 🔧  Autofix support, for automatic error correction (e.g., automatically remove unused imports)
-- 📏  Over [500 built-in rules](https://beta.ruff.rs/docs/rules/)
-- ⚖️  [Near-parity](https://beta.ruff.rs/docs/faq/#how-does-ruff-compare-to-flake8) with the built-in Flake8 rule set
-- 🔌  Native re-implementations of dozens of Flake8 plugins, like flake8-bugbear
-- ⌨️  First-party editor integrations for [VS Code](https://github.com/charliermarsh/ruff-vscode) and [more](https://github.com/charliermarsh/ruff-lsp)
-- 🌎  Monorepo-friendly, with [hierarchical and cascading configuration](https://beta.ruff.rs/docs/configuration/#pyprojecttoml-discovery)
+- ⚡️ 10-100x faster than existing linters
+- 🐍 Installable via `pip`
+- 🛠️ `pyproject.toml` support
+- 🤝 Python 3.11 compatibility
+- 📦 Built-in caching, to avoid re-analyzing unchanged files
+- 🔧 Autofix support, for automatic error correction (e.g., automatically remove unused imports)
+- 📏 Over [500 built-in rules](https://beta.ruff.rs/docs/rules/)
+- ⚖️ [Near-parity](https://beta.ruff.rs/docs/faq/#how-does-ruff-compare-to-flake8) with the
+  built-in Flake8 rule set
+- 🔌 Native re-implementations of dozens of Flake8 plugins, like flake8-bugbear
+- ⌨️ First-party editor integrations for [VS Code](https://github.com/astral-sh/ruff-vscode) and [more](https://github.com/astral-sh/ruff-lsp)
+- 🌎 Monorepo-friendly, with [hierarchical and cascading configuration](https://beta.ruff.rs/docs/configuration/#pyprojecttoml-discovery)
 
 Ruff aims to be orders of magnitude faster than alternative tools while integrating more
 functionality behind a single, common interface.
@@ -84,7 +85,8 @@ of [Conda](https://docs.conda.io/en/latest/):
 [**Timothy Crosley**](https://twitter.com/timothycrosley/status/1606420868514877440),
 creator of [isort](https://github.com/PyCQA/isort):
 
-> Just switched my first project to Ruff. Only one downside so far: it's so fast I couldn't believe it was working till I intentionally introduced some errors.
+> Just switched my first project to Ruff. Only one downside so far: it's so fast I couldn't believe
+> it was working till I intentionally introduced some errors.
 
 [**Tim Abbott**](https://github.com/charliermarsh/ruff/issues/465#issuecomment-1317400028), lead
 developer of [Zulip](https://github.com/zulip/zulip):
@@ -135,15 +137,15 @@ ruff check path/to/code/to/file.py  # Lint `file.py`
 Ruff can also be used as a [pre-commit](https://pre-commit.com) hook:
 
 ```yaml
-- repo: https://github.com/charliermarsh/ruff-pre-commit
+- repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: 'v0.0.267'
+  rev: v0.0.271
   hooks:
     - id: ruff
 ```
 
-Ruff can also be used as a [VS Code extension](https://github.com/charliermarsh/ruff-vscode) or
-alongside any other editor through the [Ruff LSP](https://github.com/charliermarsh/ruff-lsp).
+Ruff can also be used as a [VS Code extension](https://github.com/astral-sh/ruff-vscode) or
+alongside any other editor through the [Ruff LSP](https://github.com/astral-sh/ruff-lsp).
 
 Ruff can also be used as a [GitHub Action](https://github.com/features/actions) via
 [`ruff-action`](https://github.com/chartboost/ruff-action):
@@ -242,6 +244,8 @@ stylistic rules made obsolete by the use of an autoformatter, like
 If you're just getting started with Ruff, **the default rule set is a great place to start**: it
 catches a wide variety of common errors (like unused imports) with zero configuration.
 
+<!-- End section: Rules -->
+
 Beyond the defaults, Ruff re-implements some of the most popular Flake8 plugins and related code
 quality tools, including:
 
@@ -291,12 +295,11 @@ quality tools, including:
 - [pep8-naming](https://pypi.org/project/pep8-naming/)
 - [pydocstyle](https://pypi.org/project/pydocstyle/)
 - [pygrep-hooks](https://github.com/pre-commit/pygrep-hooks)
+- [pylint-airflow](https://pypi.org/project/pylint-airflow/)
 - [pyupgrade](https://pypi.org/project/pyupgrade/)
 - [tryceratops](https://pypi.org/project/tryceratops/)
 - [yesqa](https://pypi.org/project/yesqa/)
 
-<!-- End section: Rules -->
-
 For a complete enumeration of the supported rules, see [_Rules_](https://beta.ruff.rs/docs/rules/).
 
 ## Contributing
@@ -352,7 +355,9 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [FastAPI](https://github.com/tiangolo/fastapi)
 - [Gradio](https://github.com/gradio-app/gradio)
 - [Great Expectations](https://github.com/great-expectations/great_expectations)
-- Hugging Face ([Transformers](https://github.com/huggingface/transformers), [Datasets](https://github.com/huggingface/datasets), [Diffusers](https://github.com/huggingface/diffusers))
+- Hugging Face ([Transformers](https://github.com/huggingface/transformers),
+  [Datasets](https://github.com/huggingface/datasets),
+  [Diffusers](https://github.com/huggingface/diffusers))
 - [Hatch](https://github.com/pypa/hatch)
 - [Home Assistant](https://github.com/home-assistant/core)
 - [Ibis](https://github.com/ibis-project/ibis)
@@ -364,7 +369,9 @@ Ruff is used by a number of major open-source projects and companies, including:
 - Modern Treasury ([Python SDK](https://github.com/Modern-Treasury/modern-treasury-python-sdk))
 - Mozilla ([Firefox](https://github.com/mozilla/gecko-dev))
 - [MegaLinter](https://github.com/oxsecurity/megalinter)
-- Microsoft ([Semantic Kernel](https://github.com/microsoft/semantic-kernel), [ONNX Runtime](https://github.com/microsoft/onnxruntime), [LightGBM](https://github.com/microsoft/LightGBM))
+- Microsoft ([Semantic Kernel](https://github.com/microsoft/semantic-kernel),
+  [ONNX Runtime](https://github.com/microsoft/onnxruntime),
+  [LightGBM](https://github.com/microsoft/LightGBM))
 - Netflix ([Dispatch](https://github.com/Netflix/dispatch))
 - [Neon](https://github.com/neondatabase/neon)
 - [ONNX](https://github.com/onnx/onnx)
@@ -388,7 +395,7 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [SciPy](https://github.com/scipy/scipy)
 - [Sphinx](https://github.com/sphinx-doc/sphinx)
 - [Stable Baselines3](https://github.com/DLR-RM/stable-baselines3)
-- [Starlite](https://github.com/starlite-api/starlite)
+- [Litestar](https://litestar.dev/)
 - [The Algorithms](https://github.com/TheAlgorithms/Python)
 - [Vega-Altair](https://github.com/altair-viz/altair)
 - WordPress ([Openverse](https://github.com/WordPress/openverse))

_typos.toml

@@ -1,5 +1,5 @@
 [files]
-extend-exclude = ["snapshots", "black"]
+extend-exclude = ["resources", "snapshots"]
 
 [default.extend-words]
 trivias = "trivias"

crates/flake8_to_ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.267"
+version = "0.0.271"
 edition = { workspace = true }
 rust-version = { workspace = true }
 

crates/flake8_to_ruff/pyproject.toml

@@ -26,7 +26,7 @@ requires-python = ">=3.7"
 repository = "https://github.com/charliermarsh/ruff#subdirectory=crates/flake8_to_ruff"
 
 [build-system]
-requires = ["maturin>=0.15.2,<0.16"]
+requires = ["maturin>=1.0,<2.0"]
 build-backend = "maturin"
 
 [tool.maturin]

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.0.267"
+version = "0.0.271"
 authors.workspace = true
 edition.workspace = true
 rust-version.workspace = true
@@ -17,11 +17,13 @@ name = "ruff"
 ruff_cache = { path = "../ruff_cache" }
 ruff_diagnostics = { path = "../ruff_diagnostics", features = ["serde"] }
 ruff_macros = { path = "../ruff_macros" }
+ruff_newlines = { path = "../ruff_newlines" }
 ruff_python_ast = { path = "../ruff_python_ast", features = ["serde"] }
 ruff_python_semantic = { path = "../ruff_python_semantic" }
 ruff_python_stdlib = { path = "../ruff_python_stdlib" }
 ruff_rustpython = { path = "../ruff_rustpython" }
 ruff_text_size = { workspace = true }
+ruff_textwrap = { path = "../ruff_textwrap" }
 
 annotate-snippets = { version = "0.9.1", features = ["color"] }
 anyhow = { workspace = true }
@@ -41,8 +43,8 @@ libcst = { workspace = true }
 log = { workspace = true }
 natord = { version = "1.0.9" }
 nohash-hasher = { workspace = true }
-num-bigint = { version = "0.4.3" }
-num-traits = { version = "0.2.15" }
+num-bigint = { workspace = true }
+num-traits = { workspace = true }
 once_cell = { workspace = true }
 path-absolutize = { workspace = true, features = [
   "once_cell_cache",
@@ -50,6 +52,7 @@ path-absolutize = { workspace = true, features = [
 ] }
 pathdiff = { version = "0.2.1" }
 pep440_rs = { version = "0.3.1", features = ["serde"] }
+pyproject-toml = { version = "0.6.0" }
 quick-junit = { version = "0.3.2" }
 regex = { workspace = true }
 result-like = { version = "0.4.6" }
@@ -65,11 +68,11 @@ shellexpand = { workspace = true }
 smallvec = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
-textwrap = { workspace = true }
 thiserror = { version = "1.0.38" }
 toml = { workspace = true }
 typed-arena = { version = "2.0.2" }
 unicode-width = { version = "0.1.10" }
+unicode_names2 = { version = "0.6.0", git = "https://github.com/youknowone/unicode_names2.git", rev = "4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" }
 
 [dev-dependencies]
 insta = { workspace = true }
@@ -82,4 +85,3 @@ colored = { workspace = true, features = ["no-color"] }
 default = []
 schemars = ["dep:schemars"]
 jupyter_notebook = []
-ecosystem_ci = []

crates/ruff/resources/test/fixtures/airflow/AIR001.py

@@ -0,0 +1,16 @@
+from airflow.operators import PythonOperator
+
+
+def my_callable():
+    pass
+
+
+my_task = PythonOperator(task_id="my_task", callable=my_callable)
+my_task_2 = PythonOperator(callable=my_callable, task_id="my_task_2")
+
+incorrect_name = PythonOperator(task_id="my_task")
+incorrect_name_2 = PythonOperator(callable=my_callable, task_id="my_task_2")
+
+from my_module import MyClass
+
+incorrect_name = MyClass(task_id="my_task")

crates/ruff/resources/test/fixtures/flake8_bandit/S601.py

@@ -0,0 +1,3 @@
+import paramiko
+
+paramiko.exec_command('something; really; unsafe')

crates/ruff/resources/test/fixtures/flake8_bandit/S609.py

@@ -0,0 +1,8 @@
+import os
+import subprocess
+
+os.popen("chmod +w foo*")
+subprocess.Popen("/bin/chown root: *", shell=True)
+subprocess.Popen(["/usr/local/bin/rsync", "*", "some_where:"], shell=True)
+subprocess.Popen("/usr/local/bin/rsync * no_injection_here:")
+os.system("tar cf foo.tar bar/*")

crates/ruff/resources/test/fixtures/flake8_boolean_trap/FBT.py

@@ -57,12 +57,16 @@ dict.fromkeys(("world",), True)
 {}.deploy(True, False)
 getattr(someobj, attrname, False)
 mylist.index(True)
+bool(False)
 int(True)
 str(int(False))
 cfg.get("hello", True)
 cfg.getint("hello", True)
 cfg.getfloat("hello", True)
 cfg.getboolean("hello", True)
+os.set_blocking(0, False)
+g_action.set_enabled(True)
+settings.set_enable_developer_extras(True)
 
 
 class Registry:
@@ -80,3 +84,6 @@ class Registry:
     # FBT001: Boolean positional arg in function definition
     def foo(self, value: bool) -> None:
         pass
+
+    def foo(self) -> None:
+        object.__setattr__(self, "flag", True)

crates/ruff/resources/test/fixtures/flake8_bugbear/B006_B008.py

@@ -1,6 +1,7 @@
 import collections
 import datetime as dt
 from decimal import Decimal
+from fractions import Fraction
 import logging
 import operator
 from pathlib import Path
@@ -158,12 +159,37 @@ def float_infinity_literal(value=float("1e999")):
     pass
 
 
-# But don't allow standard floats
-def float_int_is_wrong(value=float(3)):
+# Allow standard floats
+def float_int_okay(value=float(3)):
     pass
 
 
-def float_str_not_inf_or_nan_is_wrong(value=float("3.14")):
+def float_str_not_inf_or_nan_okay(value=float("3.14")):
+    pass
+
+
+# Allow immutable str() value
+def str_okay(value=str("foo")):
+    pass
+
+
+# Allow immutable bool() value
+def bool_okay(value=bool("bar")):
+    pass
+
+
+# Allow immutable int() value
+def int_okay(value=int("12")):
+    pass
+
+
+# Allow immutable complex() value
+def complex_okay(value=complex(1,2)):
+    pass
+
+
+# Allow immutable Fraction() value
+def fraction_okay(value=Fraction(1,2)):
     pass
 
 

crates/ruff/resources/test/fixtures/flake8_bugbear/B007.py

@@ -73,7 +73,18 @@ def f():
 
 
 def f():
-    # Fixable.
+    # Unfixable.
+    for foo, bar, baz in (["1", "2", "3"],):
+        if foo or baz:
+            break
+    else:
+        bar = 1
+
+    print(bar)
+
+
+def f():
+    # Unfixable (false negative) due to usage of `bar` outside of loop.
     for foo, bar, baz in (["1", "2", "3"],):
         if foo or baz:
             break
@@ -85,4 +96,4 @@ def f():
 # Unfixable due to trailing underscore (`_line_` wouldn't be considered an ignorable
 # variable name).
 for line_ in range(self.header_lines):
-     fp.readline()
+    fp.readline()

crates/ruff/resources/test/fixtures/flake8_bugbear/B027.py

@@ -120,3 +120,11 @@ class AbstractClass(ABC):
     @abstractmethod
     def empty_1(self, foo: Union[str, int, list, float]):
         ...
+
+
+from dataclasses import dataclass
+
+
+@dataclass
+class Foo(ABC):  # noqa: B024
+    ...

crates/ruff/resources/test/fixtures/flake8_bugbear/B033.py

@@ -0,0 +1,11 @@
+###
+# Errors.
+###
+incorrect_set = {"value1", 23, 5, "value1"}
+incorrect_set = {1, 1}
+
+###
+# Non-errors.
+###
+correct_set = {"value1", 23, 5}
+correct_set = {5, "5"}

crates/ruff/resources/test/fixtures/flake8_errmsg/EM.py

@@ -9,6 +9,10 @@ def f_a_short():
     raise RuntimeError("Error")
 
 
+def f_a_empty():
+    raise RuntimeError("")
+
+
 def f_b():
     example = "example"
     raise RuntimeError(f"This is an {example} exception")

crates/ruff/resources/test/fixtures/flake8_fixme/T00.py

@@ -0,0 +1,8 @@
+# TODO: todo
+# todo: todo
+# XXX: xxx
+# xxx: xxx
+# HACK: hack
+# hack: hack
+# FIXME: fixme
+# fixme: fixme

crates/ruff/resources/test/fixtures/flake8_pyi/PYI013.py

@@ -0,0 +1,65 @@
+class OneAttributeClass:
+    value: int
+    ...
+
+
+class OneAttributeClass2:
+    ...
+    value: int
+
+
+class TwoEllipsesClass:
+    ...
+    ...
+
+
+class DocstringClass:
+    """
+    My body only contains an ellipsis.
+    """
+
+    ...
+
+
+class NonEmptyChild(Exception):
+    value: int
+    ...
+
+
+class NonEmptyChild2(Exception):
+    ...
+    value: int
+
+
+class NonEmptyWithInit:
+    value: int
+    ...
+
+    def __init__():
+        pass
+
+
+class EmptyClass:
+    ...
+
+
+class EmptyEllipsis:
+    ...
+
+
+class Dog:
+    eyes: int = 2
+
+
+class WithInit:
+    value: int = 0
+
+    def __init__():
+        ...
+
+
+def function():
+    ...
+
+
+...

crates/ruff/resources/test/fixtures/flake8_pyi/PYI013.pyi

@@ -0,0 +1,56 @@
+# Violations of PYI013
+
+class OneAttributeClass:
+    value: int
+    ...  # Error
+
+class OneAttributeClass2:
+    ...  # Error
+    value: int
+
+class MyClass:
+    ...
+    value: int
+
+class TwoEllipsesClass:
+    ...
+    ...  # Error
+
+class DocstringClass:
+    """
+    My body only contains an ellipsis.
+    """
+
+    ...  # Error
+
+class NonEmptyChild(Exception):
+    value: int
+    ...  # Error
+
+class NonEmptyChild2(Exception):
+    ...  # Error
+    value: int
+
+class NonEmptyWithInit:
+    value: int
+    ...  # Error
+
+    def __init__():
+        pass
+
+# Not violations
+
+class EmptyClass: ...
+class EmptyEllipsis: ...
+
+class Dog:
+    eyes: int = 2
+
+class WithInit:
+    value: int = 0
+
+    def __init__(): ...
+
+def function(): ...
+
+...

crates/ruff/resources/test/fixtures/flake8_pyi/PYI024.py

@@ -0,0 +1,9 @@
+import collections
+
+person: collections.namedtuple  # OK
+
+from collections import namedtuple
+
+person: namedtuple  # OK
+
+person = namedtuple("Person", ["name", "age"])  # OK

crates/ruff/resources/test/fixtures/flake8_pyi/PYI024.pyi

@@ -0,0 +1,11 @@
+import collections
+
+person: collections.namedtuple  # Y024 Use "typing.NamedTuple" instead of "collections.namedtuple"
+
+from collections import namedtuple
+
+person: namedtuple  # Y024 Use "typing.NamedTuple" instead of "collections.namedtuple"
+
+person = namedtuple(
+    "Person", ["name", "age"]
+)  # Y024 Use "typing.NamedTuple" instead of "collections.namedtuple"

crates/ruff/resources/test/fixtures/flake8_pyi/PYI025.py

@@ -0,0 +1,19 @@
+from collections.abc import Set as AbstractSet  # Ok
+
+
+from collections.abc import Set  # Ok
+
+
+from collections.abc import (
+    Container,
+    Sized,
+    Set,  # Ok
+    ValuesView
+)
+
+from collections.abc import (
+    Container,
+    Sized,
+    Set as AbstractSet,  # Ok
+    ValuesView
+)

crates/ruff/resources/test/fixtures/flake8_pyi/PYI025.pyi

@@ -0,0 +1,19 @@
+from collections.abc import Set as AbstractSet  # Ok
+
+
+from collections.abc import Set  # PYI025
+
+
+from collections.abc import (
+    Container,
+    Sized,
+    Set,  # PYI025
+    ValuesView
+)
+
+from collections.abc import (
+    Container,
+    Sized,
+    Set as AbstractSet,
+    ValuesView # Ok
+)

crates/ruff/resources/test/fixtures/flake8_pyi/PYI029.py

@@ -0,0 +1,57 @@
+import builtins
+from abc import abstractmethod
+
+
+def __repr__(self) -> str:
+    ...
+
+
+def __str__(self) -> builtins.str:
+    ...
+
+
+def __repr__(self, /, foo) -> str:
+    ...
+
+
+def __repr__(self, *, foo) -> str:
+    ...
+
+
+class ShouldRemoveSingle:
+    def __str__(self) -> builtins.str:
+        ...
+
+
+class ShouldRemove:
+    def __repr__(self) -> str:
+        ...
+
+    def __str__(self) -> builtins.str:
+        ...
+
+
+class NoReturnSpecified:
+    def __str__(self):
+        ...
+
+    def __repr__(self):
+        ...
+
+
+class NonMatchingArgs:
+    def __str__(self, *, extra) -> builtins.str:
+        ...
+
+    def __repr__(self, /, extra) -> str:
+        ...
+
+
+class MatchingArgsButAbstract:
+    @abstractmethod
+    def __str__(self) -> builtins.str:
+        ...
+
+    @abstractmethod
+    def __repr__(self) -> str:
+        ...

crates/ruff/resources/test/fixtures/flake8_pyi/PYI029.pyi

@@ -0,0 +1,28 @@
+import builtins
+from abc import abstractmethod
+
+def __repr__(self) -> str: ...
+def __str__(self) -> builtins.str: ...
+def __repr__(self, /, foo) -> str: ...
+def __repr__(self, *, foo) -> str: ...
+
+class ShouldRemoveSingle:
+    def __str__(self) -> builtins.str: ...  # Error: PYI029
+
+class ShouldRemove:
+    def __repr__(self) -> str: ...  # Error: PYI029
+    def __str__(self) -> builtins.str: ...  # Error: PYI029
+
+class NoReturnSpecified:
+    def __str__(self): ...
+    def __repr__(self): ...
+
+class NonMatchingArgs:
+    def __str__(self, *, extra) -> builtins.str: ...
+    def __repr__(self, /, extra) -> str: ...
+
+class MatchingArgsButAbstract:
+    @abstractmethod
+    def __str__(self) -> builtins.str: ...
+    @abstractmethod
+    def __repr__(self) -> str: ...

crates/ruff/resources/test/fixtures/flake8_pyi/PYI032.py

@@ -0,0 +1,24 @@
+from typing import Any
+import typing
+
+
+class Bad:
+    def __eq__(self, other: Any) -> bool: ...  # Fine because not a stub file
+    def __ne__(self, other: typing.Any) -> typing.Any: ...  # Fine because not a stub file
+
+
+class Good:
+  def __eq__(self, other: object) -> bool: ...
+
+  def __ne__(self, obj: object) -> int: ...
+
+
+class WeirdButFine:
+    def __eq__(self, other: Any, strange_extra_arg: list[str]) -> Any: ...
+    def __ne__(self, *, kw_only_other: Any) -> bool: ...
+
+
+class Unannotated:
+  def __eq__(self) -> Any: ...
+  def __ne__(self) -> bool: ...
+

crates/ruff/resources/test/fixtures/flake8_pyi/PYI032.pyi

@@ -0,0 +1,24 @@
+from typing import Any
+import typing
+
+
+class Bad:
+    def __eq__(self, other: Any) -> bool: ...  # Y032
+    def __ne__(self, other: typing.Any) -> typing.Any: ...  # Y032
+
+
+class Good:
+  def __eq__(self, other: object) -> bool: ...
+
+  def __ne__(self, obj: object) -> int: ...
+
+
+class WeirdButFine:
+    def __eq__(self, other: Any, strange_extra_arg: list[str]) -> Any: ...
+    def __ne__(self, *, kw_only_other: Any) -> bool: ...
+
+
+class Unannotated:
+  def __eq__(self) -> Any: ...
+  def __ne__(self) -> bool: ...
+

crates/ruff/resources/test/fixtures/flake8_pyi/PYI034.py

@@ -0,0 +1,280 @@
+# flags: --extend-ignore=Y023
+
+import abc
+import builtins
+import collections.abc
+import typing
+from abc import abstractmethod
+from collections.abc import AsyncIterable, AsyncIterator, Iterable, Iterator
+from typing import Any, overload
+
+import typing_extensions
+from _typeshed import Self
+from typing_extensions import final
+
+
+class Bad(
+    object
+):  # Y040 Do not inherit from "object" explicitly, as it is redundant in Python 3
+    def __new__(cls, *args: Any, **kwargs: Any) -> Bad:
+        ...  # Y034 "__new__" methods usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__new__", e.g. "def __new__(cls, *args: Any, **kwargs: Any) -> Self: ..."
+
+    def __repr__(self) -> str:
+        ...  # Y029 Defining __repr__ or __str__ in a stub is almost always redundant
+
+    def __str__(self) -> builtins.str:
+        ...  # Y029 Defining __repr__ or __str__ in a stub is almost always redundant
+
+    def __eq__(self, other: Any) -> bool:
+        ...  # Y032 Prefer "object" to "Any" for the second parameter in "__eq__" methods
+
+    def __ne__(self, other: typing.Any) -> typing.Any:
+        ...  # Y032 Prefer "object" to "Any" for the second parameter in "__ne__" methods
+
+    def __enter__(self) -> Bad:
+        ...  # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__enter__", e.g. "def __enter__(self) -> Self: ..."
+
+    async def __aenter__(self) -> Bad:
+        ...  # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__aenter__", e.g. "async def __aenter__(self) -> Self: ..."
+
+    def __iadd__(self, other: Bad) -> Bad:
+        ...  # Y034 "__iadd__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__iadd__", e.g. "def __iadd__(self, other: Bad) -> Self: ..."
+
+
+class AlsoBad(int, builtins.object):
+    ...  # Y040 Do not inherit from "object" explicitly, as it is redundant in Python 3
+
+
+class Good:
+    def __new__(cls: type[Self], *args: Any, **kwargs: Any) -> Self:
+        ...
+
+    @abstractmethod
+    def __str__(self) -> str:
+        ...
+
+    @abc.abstractmethod
+    def __repr__(self) -> str:
+        ...
+
+    def __eq__(self, other: object) -> bool:
+        ...
+
+    def __ne__(self, obj: object) -> int:
+        ...
+
+    def __enter__(self: Self) -> Self:
+        ...
+
+    async def __aenter__(self: Self) -> Self:
+        ...
+
+    def __ior__(self: Self, other: Self) -> Self:
+        ...
+
+
+class Fine:
+    @overload
+    def __new__(cls, foo: int) -> FineSubclass:
+        ...
+
+    @overload
+    def __new__(cls, *args: Any, **kwargs: Any) -> Fine:
+        ...
+
+    @abc.abstractmethod
+    def __str__(self) -> str:
+        ...
+
+    @abc.abstractmethod
+    def __repr__(self) -> str:
+        ...
+
+    def __eq__(self, other: Any, strange_extra_arg: list[str]) -> Any:
+        ...
+
+    def __ne__(self, *, kw_only_other: Any) -> bool:
+        ...
+
+    def __enter__(self) -> None:
+        ...
+
+    async def __aenter__(self) -> bool:
+        ...
+
+
+class FineSubclass(Fine):
+    ...
+
+
+class StrangeButAcceptable(str):
+    @typing_extensions.overload
+    def __new__(cls, foo: int) -> StrangeButAcceptableSubclass:
+        ...
+
+    @typing_extensions.overload
+    def __new__(cls, *args: Any, **kwargs: Any) -> StrangeButAcceptable:
+        ...
+
+    def __str__(self) -> StrangeButAcceptable:
+        ...
+
+    def __repr__(self) -> StrangeButAcceptable:
+        ...
+
+
+class StrangeButAcceptableSubclass(StrangeButAcceptable):
+    ...
+
+
+class FineAndDandy:
+    def __str__(self, weird_extra_arg) -> str:
+        ...
+
+    def __repr__(self, weird_extra_arg_with_default=...) -> str:
+        ...
+
+
+@final
+class WillNotBeSubclassed:
+    def __new__(cls, *args: Any, **kwargs: Any) -> WillNotBeSubclassed:
+        ...
+
+    def __enter__(self) -> WillNotBeSubclassed:
+        ...
+
+    async def __aenter__(self) -> WillNotBeSubclassed:
+        ...
+
+
+# we don't emit an error for these; out of scope for a linter
+class InvalidButPluginDoesNotCrash:
+    def __new__() -> InvalidButPluginDoesNotCrash:
+        ...
+
+    def __enter__() -> InvalidButPluginDoesNotCrash:
+        ...
+
+    async def __aenter__() -> InvalidButPluginDoesNotCrash:
+        ...
+
+
+class BadIterator1(Iterator[int]):
+    def __iter__(self) -> Iterator[int]:
+        ...  # Y034 "__iter__" methods in classes like "BadIterator1" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator1.__iter__", e.g. "def __iter__(self) -> Self: ..."
+
+
+class BadIterator2(
+    typing.Iterator[int]
+):  # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax)
+    def __iter__(self) -> Iterator[int]:
+        ...  # Y034 "__iter__" methods in classes like "BadIterator2" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator2.__iter__", e.g. "def __iter__(self) -> Self: ..."
+
+
+class BadIterator3(
+    typing.Iterator[int]
+):  # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax)
+    def __iter__(self) -> collections.abc.Iterator[int]:
+        ...  # Y034 "__iter__" methods in classes like "BadIterator3" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator3.__iter__", e.g. "def __iter__(self) -> Self: ..."
+
+
+class BadIterator4(Iterator[int]):
+    # Note: *Iterable*, not *Iterator*, returned!
+    def __iter__(self) -> Iterable[int]:
+        ...  # Y034 "__iter__" methods in classes like "BadIterator4" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator4.__iter__", e.g. "def __iter__(self) -> Self: ..."
+
+
+class IteratorReturningIterable:
+    def __iter__(self) -> Iterable[str]:
+        ...  # Y045 "__iter__" methods should return an Iterator, not an Iterable
+
+
+class BadAsyncIterator(collections.abc.AsyncIterator[str]):
+    def __aiter__(self) -> typing.AsyncIterator[str]:
+        ...  # Y034 "__aiter__" methods in classes like "BadAsyncIterator" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadAsyncIterator.__aiter__", e.g. "def __aiter__(self) -> Self: ..."  # Y022 Use "collections.abc.AsyncIterator[T]" instead of "typing.AsyncIterator[T]" (PEP 585 syntax)
+
+
+class AsyncIteratorReturningAsyncIterable:
+    def __aiter__(self) -> AsyncIterable[str]:
+        ...  # Y045 "__aiter__" methods should return an AsyncIterator, not an AsyncIterable
+
+
+class Abstract(Iterator[str]):
+    @abstractmethod
+    def __iter__(self) -> Iterator[str]:
+        ...
+
+    @abstractmethod
+    def __enter__(self) -> Abstract:
+        ...
+
+    @abstractmethod
+    async def __aenter__(self) -> Abstract:
+        ...
+
+
+class GoodIterator(Iterator[str]):
+    def __iter__(self: Self) -> Self:
+        ...
+
+
+class GoodAsyncIterator(AsyncIterator[int]):
+    def __aiter__(self: Self) -> Self:
+        ...
+
+
+class DoesNotInheritFromIterator:
+    def __iter__(self) -> DoesNotInheritFromIterator:
+        ...
+
+
+class Unannotated:
+    def __new__(cls, *args, **kwargs):
+        ...
+
+    def __iter__(self):
+        ...
+
+    def __aiter__(self):
+        ...
+
+    async def __aenter__(self):
+        ...
+
+    def __repr__(self):
+        ...
+
+    def __str__(self):
+        ...
+
+    def __eq__(self):
+        ...
+
+    def __ne__(self):
+        ...
+
+    def __iadd__(self):
+        ...
+
+    def __ior__(self):
+        ...
+
+
+def __repr__(self) -> str:
+    ...
+
+
+def __str__(self) -> str:
+    ...
+
+
+def __eq__(self, other: Any) -> bool:
+    ...
+
+
+def __ne__(self, other: Any) -> bool:
+    ...
+
+
+def __imul__(self, other: Any) -> list[str]:
+    ...

crates/ruff/resources/test/fixtures/flake8_pyi/PYI034.pyi

@@ -0,0 +1,188 @@
+# flags: --extend-ignore=Y023
+
+import abc
+import builtins
+import collections.abc
+import typing
+from abc import abstractmethod
+from collections.abc import AsyncIterable, AsyncIterator, Iterable, Iterator
+from typing import Any, overload
+
+import typing_extensions
+from _typeshed import Self
+from typing_extensions import final
+
+class Bad(
+    object
+):  # Y040 Do not inherit from "object" explicitly, as it is redundant in Python 3
+    def __new__(
+        cls, *args: Any, **kwargs: Any
+    ) -> Bad: ...  # Y034 "__new__" methods usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__new__", e.g. "def __new__(cls, *args: Any, **kwargs: Any) -> Self: ..."
+    def __repr__(
+        self,
+    ) -> str: ...  # Y029 Defining __repr__ or __str__ in a stub is almost always redundant
+    def __str__(
+        self,
+    ) -> builtins.str: ...  # Y029 Defining __repr__ or __str__ in a stub is almost always redundant
+    def __eq__(
+        self, other: Any
+    ) -> bool: ...  # Y032 Prefer "object" to "Any" for the second parameter in "__eq__" methods
+    def __ne__(
+        self, other: typing.Any
+    ) -> typing.Any: ...  # Y032 Prefer "object" to "Any" for the second parameter in "__ne__" methods
+    def __enter__(
+        self,
+    ) -> Bad: ...  # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__enter__", e.g. "def __enter__(self) -> Self: ..."
+    async def __aenter__(
+        self,
+    ) -> Bad: ...  # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__aenter__", e.g. "async def __aenter__(self) -> Self: ..."
+    def __iadd__(
+        self, other: Bad
+    ) -> Bad: ...  # Y034 "__iadd__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__iadd__", e.g. "def __iadd__(self, other: Bad) -> Self: ..."
+
+class AlsoBad(
+    int, builtins.object
+): ...  # Y040 Do not inherit from "object" explicitly, as it is redundant in Python 3
+
+class Good:
+    def __new__(cls: type[Self], *args: Any, **kwargs: Any) -> Self: ...
+    @abstractmethod
+    def __str__(self) -> str: ...
+    @abc.abstractmethod
+    def __repr__(self) -> str: ...
+    def __eq__(self, other: object) -> bool: ...
+    def __ne__(self, obj: object) -> int: ...
+    def __enter__(self: Self) -> Self: ...
+    async def __aenter__(self: Self) -> Self: ...
+    def __ior__(self: Self, other: Self) -> Self: ...
+
+class Fine:
+    @overload
+    def __new__(cls, foo: int) -> FineSubclass: ...
+    @overload
+    def __new__(cls, *args: Any, **kwargs: Any) -> Fine: ...
+    @abc.abstractmethod
+    def __str__(self) -> str: ...
+    @abc.abstractmethod
+    def __repr__(self) -> str: ...
+    def __eq__(self, other: Any, strange_extra_arg: list[str]) -> Any: ...
+    def __ne__(self, *, kw_only_other: Any) -> bool: ...
+    def __enter__(self) -> None: ...
+    async def __aenter__(self) -> bool: ...
+
+class FineSubclass(Fine): ...
+
+class StrangeButAcceptable(str):
+    @typing_extensions.overload
+    def __new__(cls, foo: int) -> StrangeButAcceptableSubclass: ...
+    @typing_extensions.overload
+    def __new__(cls, *args: Any, **kwargs: Any) -> StrangeButAcceptable: ...
+    def __str__(self) -> StrangeButAcceptable: ...
+    def __repr__(self) -> StrangeButAcceptable: ...
+
+class StrangeButAcceptableSubclass(StrangeButAcceptable): ...
+
+class FineAndDandy:
+    def __str__(self, weird_extra_arg) -> str: ...
+    def __repr__(self, weird_extra_arg_with_default=...) -> str: ...
+
+@final
+class WillNotBeSubclassed:
+    def __new__(cls, *args: Any, **kwargs: Any) -> WillNotBeSubclassed: ...
+    def __enter__(self) -> WillNotBeSubclassed: ...
+    async def __aenter__(self) -> WillNotBeSubclassed: ...
+
+# we don't emit an error for these; out of scope for a linter
+class InvalidButPluginDoesNotCrash:
+    def __new__() -> InvalidButPluginDoesNotCrash: ...
+    def __enter__() -> InvalidButPluginDoesNotCrash: ...
+    async def __aenter__() -> InvalidButPluginDoesNotCrash: ...
+
+class BadIterator1(Iterator[int]):
+    def __iter__(
+        self,
+    ) -> Iterator[
+        int
+    ]: ...  # Y034 "__iter__" methods in classes like "BadIterator1" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator1.__iter__", e.g. "def __iter__(self) -> Self: ..."
+
+class BadIterator2(
+    typing.Iterator[int]
+):  # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax)
+    def __iter__(
+        self,
+    ) -> Iterator[
+        int
+    ]: ...  # Y034 "__iter__" methods in classes like "BadIterator2" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator2.__iter__", e.g. "def __iter__(self) -> Self: ..."
+
+class BadIterator3(
+    typing.Iterator[int]
+):  # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax)
+    def __iter__(
+        self,
+    ) -> collections.abc.Iterator[
+        int
+    ]: ...  # Y034 "__iter__" methods in classes like "BadIterator3" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator3.__iter__", e.g. "def __iter__(self) -> Self: ..."
+
+class BadIterator4(Iterator[int]):
+    # Note: *Iterable*, not *Iterator*, returned!
+    def __iter__(
+        self,
+    ) -> Iterable[
+        int
+    ]: ...  # Y034 "__iter__" methods in classes like "BadIterator4" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator4.__iter__", e.g. "def __iter__(self) -> Self: ..."
+
+class IteratorReturningIterable:
+    def __iter__(
+        self,
+    ) -> Iterable[
+        str
+    ]: ...  # Y045 "__iter__" methods should return an Iterator, not an Iterable
+
+class BadAsyncIterator(collections.abc.AsyncIterator[str]):
+    def __aiter__(
+        self,
+    ) -> typing.AsyncIterator[
+        str
+    ]: ...  # Y034 "__aiter__" methods in classes like "BadAsyncIterator" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadAsyncIterator.__aiter__", e.g. "def __aiter__(self) -> Self: ..."  # Y022 Use "collections.abc.AsyncIterator[T]" instead of "typing.AsyncIterator[T]" (PEP 585 syntax)
+
+class AsyncIteratorReturningAsyncIterable:
+    def __aiter__(
+        self,
+    ) -> AsyncIterable[
+        str
+    ]: ...  # Y045 "__aiter__" methods should return an AsyncIterator, not an AsyncIterable
+
+class Abstract(Iterator[str]):
+    @abstractmethod
+    def __iter__(self) -> Iterator[str]: ...
+    @abstractmethod
+    def __enter__(self) -> Abstract: ...
+    @abstractmethod
+    async def __aenter__(self) -> Abstract: ...
+
+class GoodIterator(Iterator[str]):
+    def __iter__(self: Self) -> Self: ...
+
+class GoodAsyncIterator(AsyncIterator[int]):
+    def __aiter__(self: Self) -> Self: ...
+
+class DoesNotInheritFromIterator:
+    def __iter__(self) -> DoesNotInheritFromIterator: ...
+
+class Unannotated:
+    def __new__(cls, *args, **kwargs): ...
+    def __iter__(self): ...
+    def __aiter__(self): ...
+    async def __aenter__(self): ...
+    def __repr__(self): ...
+    def __str__(self): ...
+    def __eq__(self): ...
+    def __ne__(self): ...
+    def __iadd__(self): ...
+    def __ior__(self): ...
+
+def __repr__(self) -> str: ...
+def __str__(self) -> str: ...
+def __eq__(self, other: Any) -> bool: ...
+def __ne__(self, other: Any) -> bool: ...
+def __imul__(self, other: Any) -> list[str]: ...

crates/ruff/resources/test/fixtures/flake8_pyi/PYI035.py

@@ -0,0 +1,15 @@
+__all__: list[str]
+
+__all__: list[str] = ["foo"]
+
+
+class Foo:
+    __all__: list[str]
+    __match_args__: tuple[str, ...]
+    __slots__: tuple[str, ...]
+
+
+class Bar:
+    __all__: list[str] = ["foo"]
+    __match_args__: tuple[str, ...] = (1,)
+    __slots__: tuple[str, ...] = "foo"

crates/ruff/resources/test/fixtures/flake8_pyi/PYI035.pyi

@@ -0,0 +1,13 @@
+__all__: list[str]  # Error: PYI035
+
+__all__: list[str] = ["foo"]
+
+class Foo:
+    __all__: list[str]
+    __match_args__: tuple[str, ...]  # Error: PYI035
+    __slots__: tuple[str, ...]  # Error: PYI035
+
+class Bar:
+    __all__: list[str] = ["foo"]
+    __match_args__: tuple[str, ...] = (1,)
+    __slots__: tuple[str, ...] = "foo"

crates/ruff/resources/test/fixtures/flake8_pyi/PYI045.py

@@ -0,0 +1,85 @@
+import collections.abc
+import typing
+from collections.abc import Iterator, Iterable
+
+
+class NoReturn:
+    def __iter__(self):
+        ...
+
+
+class TypingIterableTReturn:
+    def __iter__(self) -> typing.Iterable[int]:
+        ...
+
+    def not_iter(self) -> typing.Iterable[int]:
+        ...
+
+
+class TypingIterableReturn:
+    def __iter__(self) -> typing.Iterable:
+        ...
+
+    def not_iter(self) -> typing.Iterable:
+        ...
+
+
+class CollectionsIterableTReturn:
+    def __iter__(self) -> collections.abc.Iterable[int]:
+        ...
+
+    def not_iter(self) -> collections.abc.Iterable[int]:
+        ...
+
+
+class CollectionsIterableReturn:
+    def __iter__(self) -> collections.abc.Iterable:
+        ...
+
+    def not_iter(self) -> collections.abc.Iterable:
+        ...
+
+
+class IterableReturn:
+    def __iter__(self) -> Iterable:
+        ...
+
+
+class IteratorReturn:
+    def __iter__(self) -> Iterator:
+        ...
+
+
+class IteratorTReturn:
+    def __iter__(self) -> Iterator[int]:
+        ...
+
+
+class TypingIteratorReturn:
+    def __iter__(self) -> typing.Iterator:
+        ...
+
+
+class TypingIteratorTReturn:
+    def __iter__(self) -> typing.Iterator[int]:
+        ...
+
+
+class CollectionsIteratorReturn:
+    def __iter__(self) -> collections.abc.Iterator:
+        ...
+
+
+class CollectionsIteratorTReturn:
+    def __iter__(self) -> collections.abc.Iterator[int]:
+        ...
+
+
+class TypingAsyncIterableTReturn:
+    def __aiter__(self) -> typing.AsyncIterable[int]:
+        ...
+
+
+class TypingAsyncIterableReturn:
+    def __aiter__(self) -> typing.AsyncIterable:
+        ...

crates/ruff/resources/test/fixtures/flake8_pyi/PYI045.pyi

@@ -0,0 +1,49 @@
+import collections.abc
+import typing
+from collections.abc import Iterator, Iterable
+
+class NoReturn:
+    def __iter__(self): ...
+
+class TypingIterableTReturn:
+    def __iter__(self) -> typing.Iterable[int]: ...  # Error: PYI045
+    def not_iter(self) -> typing.Iterable[int]: ...
+
+class TypingIterableReturn:
+    def __iter__(self) -> typing.Iterable: ...  # Error: PYI045
+    def not_iter(self) -> typing.Iterable: ...
+
+class CollectionsIterableTReturn:
+    def __iter__(self) -> collections.abc.Iterable[int]: ...  # Error: PYI045
+    def not_iter(self) -> collections.abc.Iterable[int]: ...
+
+class CollectionsIterableReturn:
+    def __iter__(self) -> collections.abc.Iterable: ...  # Error: PYI045
+    def not_iter(self) -> collections.abc.Iterable: ...
+
+class IterableReturn:
+    def __iter__(self) -> Iterable: ...  # Error: PYI045
+
+class IteratorReturn:
+    def __iter__(self) -> Iterator: ...
+
+class IteratorTReturn:
+    def __iter__(self) -> Iterator[int]: ...
+
+class TypingIteratorReturn:
+    def __iter__(self) -> typing.Iterator: ...
+
+class TypingIteratorTReturn:
+    def __iter__(self) -> typing.Iterator[int]: ...
+
+class CollectionsIteratorReturn:
+    def __iter__(self) -> collections.abc.Iterator: ...
+
+class CollectionsIteratorTReturn:
+    def __iter__(self) -> collections.abc.Iterator[int]: ...
+
+class TypingAsyncIterableTReturn:
+    def __aiter__(self) -> typing.AsyncIterable[int]: ...  # Error: PYI045
+
+class TypingAsyncIterableReturn:
+    def __aiter__(self) -> typing.AsyncIterable: ...  # Error: PYI045

crates/ruff/resources/test/fixtures/flake8_pyi/PYI048.py

@@ -0,0 +1,19 @@
+def bar():    # OK
+    ...
+
+
+def oof():    # OK, docstrings are handled by another rule
+    """oof"""
+    print("foo")
+
+
+def foo():    # Ok not in Stub file
+    """foo"""
+    print("foo")
+    print("foo")
+
+
+def buzz():    # Ok not in Stub file
+    print("fizz")
+    print("buzz")
+    print("test")

crates/ruff/resources/test/fixtures/flake8_pyi/PYI048.pyi

@@ -0,0 +1,20 @@
+def bar():
+    ...  # OK
+
+
+def oof():   # OK, docstrings are handled by another rule
+  """oof"""
+  print("foo")
+
+
+
+def foo():   # ERROR PYI048
+    """foo"""
+    print("foo")
+    print("foo")
+
+
+def buzz():   # ERROR PYI048
+    print("fizz")
+    print("buzz")
+    print("test")

crates/ruff/resources/test/fixtures/flake8_pyi/PYI053.py

@@ -0,0 +1,38 @@
+def f1(x: str = "50 character stringggggggggggggggggggggggggggggggg") -> None:
+    ...
+
+
+def f2(x: str = "51 character stringgggggggggggggggggggggggggggggggg") -> None:
+    ...
+
+
+def f3(x: str = "50 character stringggggggggggggggggggggggggggggg\U0001f600") -> None:
+    ...
+
+
+def f4(x: str = "51 character stringgggggggggggggggggggggggggggggg\U0001f600") -> None:
+    ...
+
+
+def f5(x: bytes = b"50 character byte stringgggggggggggggggggggggggggg") -> None:
+    ...
+
+
+def f6(x: bytes = b"51 character byte stringgggggggggggggggggggggggggg") -> None:
+    ...
+
+
+def f7(x: bytes = b"50 character byte stringggggggggggggggggggggggggg\xff") -> None:
+    ...
+
+
+def f8(x: bytes = b"50 character byte stringgggggggggggggggggggggggggg\xff") -> None:
+    ...
+
+
+foo: str = "50 character stringggggggggggggggggggggggggggggggg"
+bar: str = "51 character stringgggggggggggggggggggggggggggggggg"
+
+baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg"
+
+qux: bytes = b"51 character byte stringggggggggggggggggggggggggggg\xff"

crates/ruff/resources/test/fixtures/flake8_pyi/PYI053.pyi

@@ -0,0 +1,30 @@
+def f1(x: str = "50 character stringggggggggggggggggggggggggggggggg") -> None: ...  # OK
+def f2(
+    x: str = "51 character stringgggggggggggggggggggggggggggggggg",  # Error: PYI053
+) -> None: ...
+def f3(
+    x: str = "50 character stringgggggggggggggggggggggggggggggg\U0001f600",  # OK
+) -> None: ...
+def f4(
+    x: str = "51 character stringggggggggggggggggggggggggggggggg\U0001f600",  # Error: PYI053
+) -> None: ...
+def f5(
+    x: bytes = b"50 character byte stringgggggggggggggggggggggggggg",  # OK
+) -> None: ...
+def f6(
+    x: bytes = b"51 character byte stringgggggggggggggggggggggggggg",  # Error: PYI053
+) -> None: ...
+def f7(
+    x: bytes = b"50 character byte stringggggggggggggggggggggggggg\xff",  # OK
+) -> None: ...
+def f8(
+    x: bytes = b"51 character byte stringgggggggggggggggggggggggggg\xff",  # Error: PYI053
+) -> None: ...
+
+foo: str = "50 character stringggggggggggggggggggggggggggggggg"  # OK
+
+bar: str = "51 character stringgggggggggggggggggggggggggggggggg"  # Error: PYI053
+
+baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg"  # OK
+
+qux: bytes = b"51 character byte stringggggggggggggggggggggggggggg\xff"  # Error: PYI053

crates/ruff/resources/test/fixtures/flake8_pyi/PYI054.py

@@ -0,0 +1,20 @@
+field01: int = 0xFFFFFFFF
+field02: int = 0xFFFFFFFFF
+field03: int = -0xFFFFFFFF
+field04: int = -0xFFFFFFFFF
+
+field05: int = 1234567890
+field06: int = 12_456_890
+field07: int = 12345678901
+field08: int = -1234567801
+field09: int = -234_567_890
+
+field10: float = 123.456789
+field11: float = 123.4567890
+field12: float = -123.456789
+field13: float = -123.567_890
+
+field14: complex = 1e1234567j
+field15: complex = 1e12345678j
+field16: complex = -1e1234567j
+field17: complex = 1e123456789j

crates/ruff/resources/test/fixtures/flake8_pyi/PYI054.pyi

@@ -0,0 +1,20 @@
+field01: int = 0xFFFFFFFF
+field02: int = 0xFFFFFFFFF  # Error: PYI054
+field03: int = -0xFFFFFFFF
+field04: int = -0xFFFFFFFFF  # Error: PYI054
+
+field05: int = 1234567890
+field06: int = 12_456_890
+field07: int = 12345678901  # Error: PYI054
+field08: int = -1234567801
+field09: int = -234_567_890  # Error: PYI054
+
+field10: float = 123.456789
+field11: float = 123.4567890  # Error: PYI054
+field12: float = -123.456789
+field13: float = -123.567_890  # Error: PYI054
+
+field14: complex = 1e1234567j
+field15: complex = 1e12345678j  # Error: PYI054
+field16: complex = -1e1234567j
+field17: complex = 1e123456789j  # Error: PYI054

crates/ruff/resources/test/fixtures/flake8_return/RET504.py

@@ -272,3 +272,34 @@ def str_to_bool(val):
     if isinstance(val, bool):
         return some_obj
     return val
+
+
+# Mixed assignments
+def function_assignment(x):
+    def f(): ...
+
+    return f
+
+
+def class_assignment(x):
+    class Foo: ...
+
+    return Foo
+
+
+def mixed_function_assignment(x):
+    if x:
+        def f(): ...
+    else:
+        f = 42
+
+    return f
+
+
+def mixed_class_assignment(x):
+    if x:
+        class Foo: ...
+    else:
+        Foo = 42
+
+    return Foo

crates/ruff/resources/test/fixtures/flake8_simplify/SIM102.py

@@ -86,9 +86,16 @@ while x > 0:
         ):
             print("Bad module!")
 
-# SIM102
-if node.module:
-    if node.module == "multiprocessing" or node.module.startswith(
+# SIM102 (auto-fixable)
+if node.module012345678:
+    if node.module == "multiprocß9💣2ℝ" or node.module.startswith(
+        "multiprocessing."
+    ):
+        print("Bad module!")
+
+# SIM102 (not auto-fixable)
+if node.module0123456789:
+    if node.module == "multiprocß9💣2ℝ" or node.module.startswith(
         "multiprocessing."
     ):
         print("Bad module!")

crates/ruff/resources/test/fixtures/flake8_simplify/SIM108.py

@@ -80,17 +80,25 @@ else:
 
 # SIM108
 if a:
-    b = cccccccccccccccccccccccccccccccccccc
+    b = "cccccccccccccccccccccccccccccccccß"
 else:
-    b = ddddddddddddddddddddddddddddddddddddd
+    b = "ddddddddddddddddddddddddddddddddd💣"
 
 
 # OK (too long)
 if True:
     if a:
-        b = cccccccccccccccccccccccccccccccccccc
+        b = ccccccccccccccccccccccccccccccccccc
     else:
-        b = ddddddddddddddddddddddddddddddddddddd
+        b = ddddddddddddddddddddddddddddddddddd
+
+
+# OK (too long with tabs)
+if True:
+	if a:
+		b = ccccccccccccccccccccccccccccccccccc
+	else:
+		b = ddddddddddddddddddddddddddddddddddd
 
 
 # SIM108 (without fix due to trailing comment)

crates/ruff/resources/test/fixtures/flake8_simplify/SIM110.py

@@ -155,3 +155,19 @@ def f():
         if check(x):
             return False
     return True
+
+
+def f():
+    # SIM110
+    for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ":
+        if x.isdigit():
+            return True
+    return False
+
+
+def f():
+    # OK (too long)
+    for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9":
+        if x.isdigit():
+            return True
+    return False

crates/ruff/resources/test/fixtures/flake8_simplify/SIM111.py

@@ -171,3 +171,19 @@ def f():
         if x > y:
             return False
     return True
+
+
+def f():
+    # SIM111
+    for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9":
+        if x.isdigit():
+            return False
+    return True
+
+
+def f():
+    # OK (too long)
+    for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß90":
+        if x.isdigit():
+            return False
+    return True

crates/ruff/resources/test/fixtures/flake8_simplify/SIM117.py

@@ -90,3 +90,13 @@ with (
         D() as d,
     ):
         print("hello")
+
+# SIM117 (auto-fixable)
+with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as a:
+    with B("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as b:
+        print("hello")
+
+# SIM117 (not auto-fixable too long)
+with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ890") as a:
+    with B("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as b:
+        print("hello")

crates/ruff/resources/test/fixtures/flake8_simplify/SIM401.py

@@ -14,7 +14,7 @@ if key not in a_dict:
 else:
     var = a_dict[key]
 
-# SIM401 (default with a complex expression)
+# OK (default contains effect)
 if key in a_dict:
     var = a_dict[key]
 else:
@@ -36,12 +36,18 @@ else:
 if key in a_dict:
     vars[idx] = a_dict[key]
 else:
-    vars[idx] = "default"
+    vars[idx] = "defaultß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789"
 
 ###
 # Negative cases
 ###
 
+# OK (too long)
+if key in a_dict:
+    vars[idx] = a_dict[key]
+else:
+    vars[idx] = "defaultß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß"
+
 # OK (false negative)
 if not key in a_dict:
     var = "default"

crates/ruff/resources/test/fixtures/flake8_todos/TD001.py

@@ -6,3 +6,4 @@
 # T001 - errors
 # XXX (evanrittenhouse): this is not fine
 # FIXME (evanrittenhouse): this is not fine
+# foo # XXX: this isn't fine either

crates/ruff/resources/test/fixtures/flake8_todos/TD002.py

@@ -5,3 +5,4 @@
 # TODO: this has no author
 # FIXME: neither does this
 # TODO : and neither does this
+# foo # TODO: this doesn't either

crates/ruff/resources/test/fixtures/flake8_todos/TD003.py

@@ -26,4 +26,6 @@ def foo(x):
 # TODO: followed by a new TODO with an issue link
 # TDO-3870
 
+# foo # TODO: no link!
+
 # TODO: here's a TODO on the last line with no link

crates/ruff/resources/test/fixtures/flake8_todos/TD004.py

@@ -4,3 +4,5 @@
 # TODO this has no colon
 # TODO(evanrittenhouse 😀) this has no colon
 # FIXME add a colon
+# foo # TODO add a colon
+# TODO this has a colon but it doesn't terminate the tag, so this should throw. https://www.google.com

crates/ruff/resources/test/fixtures/flake8_todos/TD005.py

@@ -4,3 +4,4 @@
 # TODO(evanrittenhouse):
 # TODO(evanrittenhouse)
 # FIXME
+# foo # TODO

crates/ruff/resources/test/fixtures/flake8_todos/TD006.py

@@ -3,3 +3,4 @@
 # TDO006 - error
 # ToDo (evanrittenhouse): invalid capitalization
 # todo (evanrittenhouse): another invalid capitalization
+# foo # todo: invalid capitalization

crates/ruff/resources/test/fixtures/flake8_todos/TD007.py

@@ -6,3 +6,5 @@
 # TODO (evanrittenhouse):this doesn't either
 # TODO:neither does this
 # FIXME:and lastly neither does this
+# foo # TODO:this is really the last one
+# TODO this colon doesn't terminate the tag, so don't check it. https://www.google.com

crates/ruff/resources/test/fixtures/flake8_type_checking/TCH002.py

@@ -146,3 +146,21 @@ def f():
     import pandas as pd
 
     x = dict[pd.DataFrame, pd.DataFrame]
+
+
+def f():
+    import pandas as pd
+
+
+def f():
+    from pandas import DataFrame  # noqa: TCH002
+
+    x: DataFrame = 2
+
+
+def f():
+    from pandas import (  # noqa: TCH002
+        DataFrame,
+    )
+
+    x: DataFrame = 2

crates/ruff/resources/test/fixtures/flake8_type_checking/strict.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 
 def f():
-    # Even in strict mode, this shouldn't rase an error, since `pkg` is used at runtime,
+    # Even in strict mode, this shouldn't raise an error, since `pkg` is used at runtime,
     # and implicitly imports `pkg.bar`.
     import pkg
     import pkg.bar
@@ -12,7 +12,7 @@ def f():
 
 
 def f():
-    # Even in strict mode, this shouldn't rase an error, since `pkg.bar` is used at
+    # Even in strict mode, this shouldn't raise an error, since `pkg.bar` is used at
     # runtime, and implicitly imports `pkg`.
     import pkg
     import pkg.bar
@@ -22,7 +22,7 @@ def f():
 
 
 def f():
-    # In un-strict mode, this shouldn't rase an error, since `pkg` is used at runtime.
+    # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime.
     import pkg
     from pkg import A
 
@@ -31,7 +31,7 @@ def f():
 
 
 def f():
-    # In un-strict mode, this shouldn't rase an error, since `pkg` is used at runtime.
+    # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime.
     from pkg import A, B
 
     def test(value: A):
@@ -39,7 +39,7 @@ def f():
 
 
 def f():
-    # Even in strict mode, this shouldn't rase an error, since `pkg.baz` is used at
+    # Even in strict mode, this shouldn't raise an error, since `pkg.baz` is used at
     # runtime, and implicitly imports `pkg.bar`.
     import pkg.bar
     import pkg.baz
@@ -49,9 +49,56 @@ def f():
 
 
 def f():
-    # In un-strict mode, this _should_ rase an error, since `pkg` is used at runtime.
+    # In un-strict mode, this _should_ raise an error, since `pkg.bar` isn't used at runtime
     import pkg
     from pkg.bar import A
 
     def test(value: A):
         return pkg.B()
+
+
+def f():
+    # In un-strict mode, this shouldn't raise an error, since `pkg.bar` is used at runtime.
+    import pkg
+    import pkg.bar as B
+
+    def test(value: pkg.A):
+        return B()
+
+
+def f():
+    # In un-strict mode, this shouldn't raise an error, since `pkg.foo.bar` is used at runtime.
+    import pkg.foo as F
+    import pkg.foo.bar as B
+
+    def test(value: F.Foo):
+        return B()
+
+
+def f():
+    # In un-strict mode, this shouldn't raise an error, since `pkg.foo.bar` is used at runtime.
+    import pkg
+    import pkg.foo.bar as B
+
+    def test(value: pkg.A):
+        return B()
+
+
+def f():
+    # In un-strict mode, this _should_ raise an error, since `pkg` isn't used at runtime.
+    # Note that `pkg` is a prefix of `pkgfoo` which are both different modules. This is
+    # testing the implementation.
+    import pkg
+    import pkgfoo.bar as B
+
+    def test(value: pkg.A):
+        return B()
+
+
+def f():
+    # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime.
+    import pkg.bar as B
+    import pkg.foo as F
+
+    def test(value: F.Foo):
+        return B.Bar()

crates/ruff/resources/test/fixtures/isort/fit_line_length_comment.py

@@ -2,3 +2,7 @@ import a
 # Don't take this comment into account when determining whether the next import can fit on one line.
 from b import c
 from d import e  # Do take this comment into account when determining whether the next import can fit on one line.
+# The next import fits on one line.
+from f import g  # 012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ
+# The next import doesn't fit on one line.
+from h import i  # 012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9

crates/ruff/resources/test/fixtures/isort/required_imports/off.py

@@ -0,0 +1,4 @@
+# isort: off
+
+x = 1
+# isort: on

crates/ruff/resources/test/fixtures/isort/split.py

@@ -6,7 +6,16 @@ import f
 import c
 import d
 
-# isort: split  
+# isort: split
 
 import a
 import b
+
+if True:
+    import C
+    import A
+
+    # isort: split
+
+    import D
+    import B

crates/ruff/resources/test/fixtures/pycodestyle/E402.py

@@ -19,7 +19,7 @@ if x > 0:
 else:
     import e
 
-y = x + 1
+__some__magic = 1
 
 import f
 

crates/ruff/resources/test/fixtures/pycodestyle/E501_2.py

@@ -0,0 +1,11 @@
+a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+a	=	"""ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+
+b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+b	=	"""ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+
+c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+c	=	"""2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+
+d       =       """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+d	=	"""💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""

crates/ruff/resources/test/fixtures/pycodestyle/W505_utf_8.py

@@ -0,0 +1,31 @@
+#!/usr/bin/env python3
+"""Here's a top-level ß9💣2ℝing that's over theß9💣2ℝ."""
+
+
+def f1():
+    """Here's a ß9💣2ℝing that's also over theß9💣2ℝ."""
+
+    x = 1  # Here's a comment that's over theß9💣2ℝ, but it's not standalone.
+
+    # Here's a standalone comment that's over theß9💣2ℝ.
+
+    x = 2
+    # Another standalone that is preceded by a newline and indent toke and is over theß9💣2ℝ.
+
+    print("Here's a string that's over theß9💣2ℝ, but it's not a ß9💣2ℝing.")
+
+
+"This is also considered a ß9💣2ℝing, and is over theß9💣2ℝ."
+
+
+def f2():
+    """Here's a multi-line ß9💣2ℝing.
+
+    It's over theß9💣2ℝ on this line, which isn't the first line in the ß9💣2ℝing.
+    """
+
+
+def f3():
+    """Here's a multi-line ß9💣2ℝing.
+
+    It's over theß9💣2ℝ on this line, which isn't the first line in the ß9💣2ℝing."""

crates/ruff/resources/test/fixtures/pyflakes/F401_12.py

@@ -0,0 +1,10 @@
+"""Test: module bindings are preferred over local bindings, for deferred annotations."""
+
+from __future__ import annotations
+
+import datetime
+from typing import Optional
+
+
+class Class:
+    datetime: Optional[datetime.datetime]

crates/ruff/resources/test/fixtures/pyflakes/F401_13.py

@@ -0,0 +1,12 @@
+"""Test: module bindings are preferred over local bindings, for deferred annotations."""
+
+from __future__ import annotations
+
+from typing import TypeAlias, List
+
+
+class Class:
+    List: TypeAlias = List
+
+    def bar(self) -> List:
+        pass

crates/ruff/resources/test/fixtures/pyflakes/F401_14.py

@@ -0,0 +1,8 @@
+"""Test: module bindings are preferred over local bindings, for deferred annotations."""
+
+import datetime
+from typing import Optional
+
+
+class Class:
+    datetime: "Optional[datetime.datetime]"

crates/ruff/resources/test/fixtures/pyflakes/F401_15.py

@@ -0,0 +1,9 @@
+from typing import TYPE_CHECKING
+from django.db.models import ForeignKey
+
+if TYPE_CHECKING:
+    from pathlib import Path
+
+
+class Foo:
+    var = ForeignKey["Path"]()

crates/ruff/resources/test/fixtures/pyflakes/F401_16.py

@@ -0,0 +1,15 @@
+"""Test that `__all__` exports are respected even with multiple declarations."""
+
+import random
+
+
+def some_dependency_check():
+    return random.uniform(0.0, 1.0) > 0.49999
+
+
+if some_dependency_check():
+    import math
+
+    __all__ = ["math"]
+else:
+    __all__ = []

crates/ruff/resources/test/fixtures/pyflakes/F522.py

@@ -2,3 +2,6 @@
 "{bar}{}".format(1, bar=2, spam=3)  # F522
 "{bar:{spam}}".format(bar=2, spam=3)  # No issues
 "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5)  # F522
+# Not fixable
+(''
+ .format(x=2))

crates/ruff/resources/test/fixtures/pyflakes/F523.py

@@ -17,3 +17,17 @@
 "{0}{1}".format(1, *args)  # No issues
 "{0}{1}".format(1, 2, *args)  # No issues
 "{0}{1}".format(1, 2, 3, *args)  # F523
+
+# With nested quotes
+"''1{0}".format(1, 2, 3)  # F523
+"\"\"{1}{0}".format(1, 2, 3)  # F523
+'""{1}{0}'.format(1, 2, 3)  # F523
+
+# With modified indexes
+"{1}{2}".format(1, 2, 3)  # F523, # F524
+"{1}{3}".format(1, 2, 3, 4)  # F523, # F524
+"{1} {8}".format(0, 1)  # F523, # F524
+
+# Not fixable
+(''
+.format(2))

crates/ruff/resources/test/fixtures/pyflakes/F524.py

@@ -4,3 +4,4 @@
 "{0} {bar}".format(1)  # F524
 "{0} {bar}".format()  # F524
 "{bar} {0}".format()  # F524
+"{1} {8}".format(0, 1)

crates/ruff/resources/test/fixtures/pyflakes/F811_23.py

@@ -0,0 +1,4 @@
+"""Test that shadowing an explicit re-export produces a warning."""
+
+import foo as foo
+import bar as foo

crates/ruff/resources/test/fixtures/pyflakes/F811_24.py

@@ -0,0 +1,5 @@
+"""Test that shadowing a `__future__` import does not produce a warning."""
+
+from __future__ import annotations
+
+import annotations

crates/ruff/resources/test/fixtures/pyflakes/F841_3.py

@@ -83,6 +83,11 @@ def f():
         pass
 
 
+def f():
+    with (Nested(m)) as (cm):
+        pass
+
+
 def f():
     toplevel = tt = lexer.get_token()
     if not tt:

crates/ruff/resources/test/fixtures/pylint/invalid_return_type_str.py

@@ -0,0 +1,28 @@
+class Str:
+    def __str__(self):
+        return 1
+
+class Float:
+    def __str__(self):
+        return 3.05
+    
+class Int:
+    def __str__(self):
+        return 0
+    
+class Bool:
+    def __str__(self):
+        return False
+    
+class Str2:
+    def __str__(self):
+        x = "ruff"
+        return x
+    
+# TODO fixme once Ruff has better type checking
+def return_int():
+    return 3
+
+class ComplexReturn:
+    def __str__(self):
+        return return_int()

crates/ruff/resources/test/fixtures/pylint/iteration_over_set.py

@@ -0,0 +1,38 @@
+# Errors
+
+for item in {"apples", "lemons", "water"}:  # flags in-line set literals
+    print(f"I like {item}.")
+
+numbers_list = [i for i in {1, 2, 3}]  # flags sets in list comprehensions
+
+numbers_set = {i for i in {1, 2, 3}}  # flags sets in set comprehensions
+
+numbers_dict = {str(i): i for i in {1, 2, 3}}  # flags sets in dict comprehensions
+
+numbers_gen = (i for i in {1, 2, 3})  # flags sets in generator expressions
+
+# Non-errors
+
+items = {"apples", "lemons", "water"}
+for item in items:  # only complains about in-line sets (as per Pylint)
+    print(f"I like {item}.")
+
+for item in ["apples", "lemons", "water"]:  # lists are fine
+    print(f"I like {item}.")
+
+for item in ("apples", "lemons", "water"):  # tuples are fine
+    print(f"I like {item}.")
+
+numbers_list = [i for i in [1, 2, 3]]  # lists in comprehensions are fine
+
+numbers_set = {i for i in (1, 2, 3)}  # tuples in comprehensions are fine
+
+numbers_dict = {str(i): i for i in [1, 2, 3]}  # lists in dict comprehensions are fine
+
+numbers_gen = (i for i in (1, 2, 3))  # tuples in generator expressions are fine
+
+for item in set(("apples", "lemons", "water")):  # set constructor is fine
+    print(f"I like {item}.")
+
+for number in {i for i in range(10)}:  # set comprehensions are fine
+    print(number)

crates/ruff/resources/test/fixtures/pylint/named_expr_without_context.py

@@ -0,0 +1,19 @@
+# Errors
+(a := 42)
+if True:
+    (b := 1)
+
+
+class Foo:
+    (c := 1)
+
+
+# OK
+if a := 42:
+    print("Success")
+
+a = 0
+while (a := a + 1) < 10:
+    print("Correct")
+
+a = (b := 1)

crates/ruff/resources/test/fixtures/pylint/nested_min_max.py

@@ -25,3 +25,14 @@ min(1, min(a))
 min(1, min(i for i in range(10)))
 max(1, max(a))
 max(1, max(i for i in range(10)))
+
+tuples_list = [
+    (1, 2),
+    (2, 3),
+    (3, 4),
+    (4, 5),
+    (5, 6),
+]
+
+min(min(tuples_list))
+max(max(tuples_list))

crates/ruff/resources/test/fixtures/pylint/nonlocal_without_binding.py

@@ -17,3 +17,30 @@ def f():
 
     def f():
         nonlocal y
+
+
+def f():
+    x = 1
+
+    def g():
+        nonlocal x
+
+    del x
+
+
+def f():
+    def g():
+        nonlocal x
+
+    del x
+
+
+def f():
+    try:
+        pass
+    except Exception as x:
+        pass
+
+    def g():
+        nonlocal x
+        x = 2

crates/ruff/resources/test/fixtures/pylint/sys_exit_alias_10.py

@@ -0,0 +1,8 @@
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from sys import exit as bar
+
+
+def main():
+    exit(0)

crates/ruff/resources/test/fixtures/pylint/yield_from_in_async_function.py

@@ -0,0 +1,7 @@
+async def success():
+    yield 42
+
+
+async def fail():
+    l = (1, 2, 3)
+    yield from l

crates/ruff/resources/test/fixtures/pyupgrade/UP006_1.py

@@ -0,0 +1,10 @@
+from __future__ import annotations
+
+import typing
+
+if typing.TYPE_CHECKING:
+    from collections import defaultdict
+
+
+def f(x: typing.DefaultDict[str, str]) -> None:
+    ...

crates/ruff/resources/test/fixtures/pyupgrade/UP006_2.py

@@ -0,0 +1,8 @@
+import typing
+
+if typing.TYPE_CHECKING:
+    from collections import defaultdict
+
+
+def f(x: typing.DefaultDict[str, str]) -> None:
+    ...

crates/ruff/resources/test/fixtures/pyupgrade/UP006_3.py

@@ -0,0 +1,8 @@
+import typing
+
+if typing.TYPE_CHECKING:
+    from collections import defaultdict
+
+
+def f(x: "typing.DefaultDict[str, str]") -> None:
+    ...

crates/ruff/resources/test/fixtures/pyupgrade/UP018.py

@@ -15,6 +15,7 @@ bytes("foo", **a)
 bytes(b"foo"
       b"bar")
 bytes("foo")
+f"{f'{str()}'}"
 
 # These become string or byte literals
 str()