Rename all of these structs

## Summary

We have some code to ensure that if an aliased import is used, any
submodules should be marked as used too. This comment says it best:

```rust
// If the name of a submodule import is the same as an alias of another import, and the
// alias is used, then the submodule import should be marked as used too.
//
// For example, mark `pyarrow.csv` as used in:
//
// ```python
// import pyarrow as pa
// import pyarrow.csv
// print(pa.csv.read_csv("test.csv"))
// ```
```

However, it looks like when we go to look up `pyarrow` (of `import
pyarrow as pa`), we aren't checking to ensure the resolved binding is
_actually_ an import. This was causing us to attribute `print(rm.ANY)`
to `def requests_mock` here:

```python
import requests_mock as rm

def requests_mock(requests_mock: rm.Mocker):
    print(rm.ANY)
```

Closes https://github.com/astral-sh/ruff/issues/6180.

.github/workflows/benchmark.yaml

@@ -2,6 +2,14 @@ name: Benchmark
 
 on:
   pull_request:
+    paths:
+      - 'Cargo.toml'
+      - 'Cargo.lock'
+      - 'rust-toolchain'
+      - 'crates/**'
+      - '!crates/ruff_dev'
+      - '!crates/ruff_shrinking'
+
   workflow_dispatch:
 
 concurrency:

.github/workflows/ci.yaml

@@ -19,6 +19,43 @@ env:
   PYTHON_VERSION: "3.11" # to build abi3 wheels
 
 jobs:
+  determine_changes:
+    name: "Determine changes"
+    runs-on: ubuntu-latest
+    outputs:
+      linter: ${{ steps.changed.outputs.linter_any_changed }}
+      formatter: ${{ steps.changed.outputs.formatter_any_changed }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - uses: tj-actions/changed-files@v37
+        id: changed
+        with:
+          files_yaml: |
+            linter:
+              - Cargo.toml
+              - Cargo.lock
+              - crates/**
+              - "!crates/ruff_python_formatter/**"
+              - "!crates/ruff_formatter/**"
+              - "!crates/ruff_dev/**"
+              - "!crates/ruff_shrinking/**"
+
+            formatter:
+              - Cargo.toml
+              - Cargo.lock
+              - crates/ruff_python_formatter/**
+              - crates/ruff_formatter/**
+              - crates/ruff_python_trivia/**
+              - crates/ruff_python_ast/**
+              - crates/ruff_source_file/**
+              - crates/ruff_python_index/**
+              - crates/ruff_text_size/**
+              - crates/ruff_python_parser/**
+
+
   cargo-fmt:
     name: "cargo fmt"
     runs-on: ubuntu-latest
@@ -53,10 +90,12 @@ jobs:
       - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
-      - uses: Swatinem/rust-cache@v2
-      # cargo insta 1.30.0 fails for some reason (https://github.com/mitsuhiko/insta/issues/392)
-      - run: cargo install cargo-insta@=1.29.0
+      - name: "Install cargo insta"
+        uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-insta
       - run: pip install black[d]==23.1.0
+      - uses: Swatinem/rust-cache@v2
       - name: "Run tests (Ubuntu)"
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: cargo insta test --all --all-features --unreferenced reject
@@ -135,9 +174,11 @@ jobs:
   ecosystem:
     name: "ecosystem"
     runs-on: ubuntu-latest
-    needs: cargo-test
+    needs:
+      - cargo-test
+      - determine_changes
     # Only runs on pull requests, since that is the only we way we can find the base version for comparison.
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request' && needs.determine_changes.outputs.linter == 'true'
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -282,16 +323,23 @@ jobs:
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS != 'true' }}
         run: mkdocs build --strict -f mkdocs.generated.yml
 
-  check-formatter-stability:
-    name: "Check formatter stability"
+  check-formatter-ecosystem:
+    name: "Formatter ecosystem and progress checks"
     runs-on: ubuntu-latest
+    needs: determine_changes
+    if: needs.determine_changes.outputs.formatter == 'true'
     steps:
       - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Cache rust"
         uses: Swatinem/rust-cache@v2
+      - name: "Formatter progress"
+        run: scripts/formatter_progress.sh
+      - name: "Github step summary"
+        run: grep "similarity index" target/progress_projects_report.txt | sort > $GITHUB_STEP_SUMMARY
+      # CPython is not black formatted, so we run only the stability check
       - name: "Clone CPython 3.10"
         run: git clone --branch 3.10 --depth 1 https://github.com/python/cpython.git crates/ruff/resources/test/cpython
-      - name: "Check stability"
+      - name: "Check CPython stability"
         run: cargo run --bin ruff_dev -- format-dev --stability-check crates/ruff/resources/test/cpython

CONTRIBUTING.md

@@ -71,7 +71,7 @@ pipx install pre-commit  # or `pip install pre-commit` if you have a virtualenv
 
 ### Development
 
-After cloning the repository, run Ruff locally with:
+After cloning the repository, run Ruff locally from the repository root with:
 
 ```shell
 cargo run -p ruff_cli -- check /path/to/file.py --no-cache
@@ -122,9 +122,9 @@ At time of writing, the repository includes the following crates:
     intermediate representation. The backend for `ruff_python_formatter`.
 - `crates/ruff_index`: library crate inspired by `rustc_index`.
 - `crates/ruff_macros`: proc macro crate containing macros used by Ruff.
-- `crates/ruff_python_ast`: library crate containing Python-specific AST types and utilities. Note
-    that the AST schema itself is defined in the
-    [rustpython-ast](https://github.com/astral-sh/RustPython-Parser) crate.
+- `crates/ruff_python_ast`: library crate containing Python-specific AST types and utilities.
+- `crates/ruff_python_codegen`: library crate containing utilities for generating Python source code.
+- `crates/ruff_python_codegen`: library crate containing utilities for generating Python source code.
 - `crates/ruff_python_formatter`: library crate implementing the Python formatter. Emits an
     intermediate representation for each node, which `ruff_formatter` prints based on the configured
     line length.
@@ -133,10 +133,9 @@ At time of writing, the repository includes the following crates:
     refer to?"
 - `crates/ruff_python_stdlib`: library crate containing Python-specific standard library data, e.g.
     the names of all built-in exceptions and which standard library types are immutable.
-- `crates/ruff_python_whitespace`: library crate containing Python-specific whitespace analysis
-    logic (indentation and newlines).
-- `crates/ruff_rustpython`: library crate containing `RustPython`-specific utilities.
-- `crates/ruff_textwrap`: library crate to indent and dedent Python source code.
+- `crates/ruff_python_trivia`: library crate containing Python-specific trivia utilities (e.g.,
+    for analyzing indentation, newlines, etc.).
+- `crates/ruff_python_parser`: library crate containing the Python parser.
 - `crates/ruff_wasm`: library crate for exposing Ruff as a WebAssembly module. Powers the
     [Ruff Playground](https://play.ruff.rs/).
 
@@ -156,10 +155,13 @@ At a high level, the steps involved in adding a new lint rule are as follows:
     (e.g., `pub(crate) fn assert_false`) based on whatever inputs are required for the rule (e.g.,
     an `ast::StmtAssert` node).
 
-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. Define the logic for invoking the diagnostic in `crates/ruff/src/checkers/ast/analyze` (for
+    AST-based rules), `crates/ruff/src/checkers/tokens.rs` (for token-based rules),
+    `crates/ruff/src/checkers/physical_lines.rs` (for text-based rules),
+    `crates/ruff/src/checkers/filesystem.rs` (for filesystem-based rules), etc. For AST-based rules,
+    you'll likely want to modify `analyze/statement.rs` (if your rule is based on analyzing
+    statements, like imports) or `analyze/expression.rs` (if your rule is based on analyzing
+    expressions, like function calls).
 
 1. Map the violation struct to a rule code in `crates/ruff/src/codes.rs` (e.g., `B011`).
 
@@ -221,9 +223,12 @@ Once you've completed the code for the rule itself, you can define tests with th
     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
+    cargo run -p ruff_cli -- check crates/ruff/resources/test/fixtures/pycodestyle/E402.py --no-cache --select E402
     ```
 
+    **Note:** Only a subset of rules are enabled by default. When testing a new rule, ensure that
+    you activate it by adding `--select ${rule_code}` to the command.
+
 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,
@@ -310,7 +315,7 @@ even patch releases may contain [non-backwards-compatible changes](https://semve
 1. Run the release workflow with the version number (without starting `v`) as input. Make sure
     main has your merged PR as last commit
 1. The release workflow will do the following:
-    1. Build all the assets. If this fails (even though we tested in step 4), we haven’t tagged or
+    1. Build all the assets. If this fails (even though we tested in step 4), we haven't tagged or
         uploaded anything, you can restart after pushing a fix.
     1. Upload to PyPI.
     1. Create and push the Git tag (as extracted from `pyproject.toml`). We create the Git tag only
@@ -723,9 +728,9 @@ diagnostics, then our current compilation pipeline proceeds as follows:
 
 1. **File discovery**: Given paths like `foo/`, locate all Python files in any specified subdirectories, taking into account our hierarchical settings system and any `exclude` options.
 
-1. **Package resolution**: Determine the “package root” for every file by traversing over its parent directories and looking for `__init__.py` files.
+1. **Package resolution**: Determine the "package root" for every file by traversing over its parent directories and looking for `__init__.py` files.
 
-1. **Cache initialization**: For every “package root”, initialize an empty cache.
+1. **Cache initialization**: For every "package root", initialize an empty cache.
 
 1. **Analysis**: For every file, in parallel:
 
@@ -733,7 +738,7 @@ diagnostics, then our current compilation pipeline proceeds as follows:
 
     1. **Tokenization**: Run the lexer over the file to generate a token stream.
 
-    1. **Indexing**: Extract metadata from the token stream, such as: comment ranges, `# noqa` locations, `# isort: off` locations, “doc lines”, etc.
+    1. **Indexing**: Extract metadata from the token stream, such as: comment ranges, `# noqa` locations, `# isort: off` locations, "doc lines", etc.
 
     1. **Token-based rule evaluation**: Run any lint rules that are based on the contents of the token stream (e.g., commented-out code).
 
@@ -743,9 +748,9 @@ diagnostics, then our current compilation pipeline proceeds as follows:
 
     1. **Parsing**: Run the parser over the token stream to produce an AST. (This consumes the token stream, so anything that relies on the token stream needs to happen before parsing.)
 
-    1. **AST-based rule evaluation**: Run any lint rules that are based on the AST. This includes the vast majority of lint rules. As part of this step, we also build the semantic model for the current file as we traverse over the AST. Some lint rules are evaluated eagerly, as we iterate over the AST, while others are evaluated in a deferred manner (e.g., unused imports, since we can’t determine whether an import is unused until we’ve finished analyzing the entire file), after we’ve finished the initial traversal.
+    1. **AST-based rule evaluation**: Run any lint rules that are based on the AST. This includes the vast majority of lint rules. As part of this step, we also build the semantic model for the current file as we traverse over the AST. Some lint rules are evaluated eagerly, as we iterate over the AST, while others are evaluated in a deferred manner (e.g., unused imports, since we can't determine whether an import is unused until we've finished analyzing the entire file), after we've finished the initial traversal.
 
-    1. **Import-based rule evaluation**: Run any lint rules that are based on the module’s imports (e.g., import sorting). These could, in theory, be included in the AST-based rule evaluation phase — they’re just separated for simplicity.
+    1. **Import-based rule evaluation**: Run any lint rules that are based on the module's imports (e.g., import sorting). These could, in theory, be included in the AST-based rule evaluation phase — they're just separated for simplicity.
 
     1. **Physical line-based rule evaluation**: Run any lint rules that are based on physical lines (e.g., line-length).
 
@@ -754,3 +759,116 @@ diagnostics, then our current compilation pipeline proceeds as follows:
     1. **Cache write**: Write the generated diagnostics to the package cache using the file as a key.
 
 1. **Reporting**: Print diagnostics in the specified format (text, JSON, etc.), to the specified output channel (stdout, a file, etc.).
+
+### Import Categorization
+
+To understand Ruff's import categorization system, we first need to define two concepts:
+
+- "Project root": The directory containing the `pyproject.toml`, `ruff.toml`, or `.ruff.toml` file,
+    discovered by identifying the "closest" such directory for each Python file. (If you're running
+    via `ruff --config /path/to/pyproject.toml`, then the current working directory is used as the
+    "project root".)
+- "Package root": The top-most directory defining the Python package that includes a given Python
+    file. To find the package root for a given Python file, traverse up its parent directories until
+    you reach a parent directory that doesn't contain an `__init__.py` file (and isn't marked as
+    a [namespace package](https://beta.ruff.rs/docs/settings/#namespace-packages)); take the directory
+    just before that, i.e., the first directory in the package.
+
+For example, given:
+
+```text
+my_project
+├── pyproject.toml
+└── src
+    └── foo
+        ├── __init__.py
+        └── bar
+            ├── __init__.py
+            └── baz.py
+```
+
+Then when analyzing `baz.py`, the project root would be the top-level directory (`./my_project`),
+and the package root would be `./my_project/src/foo`.
+
+#### Project root
+
+The project root does not have a significant impact beyond that all relative paths within the loaded
+configuration file are resolved relative to the project root.
+
+For example, to indicate that `bar` above is a namespace package (it isn't, but let's run with it),
+the `pyproject.toml` would list `namespace-packages = ["./src/bar"]`, which would resolve
+to `my_project/src/bar`.
+
+The same logic applies when providing a configuration file via `--config`. In that case, the
+_current working directory_ is used as the project root, and so all paths in that configuration file
+are resolved relative to the current working directory. (As a general rule, we want to avoid relying
+on the current working directory as much as possible, to ensure that Ruff exhibits the same behavior
+regardless of where and how you invoke it — but that's hard to avoid in this case.)
+
+Additionally, if a `pyproject.toml` file _extends_ another configuration file, Ruff will still use
+the directory containing that `pyproject.toml` file as the project root. For example, if
+`./my_project/pyproject.toml` contains:
+
+```toml
+[tool.ruff]
+extend = "/path/to/pyproject.toml"
+```
+
+Then Ruff will use `./my_project` as the project root, even though the configuration file extends
+`/path/to/pyproject.toml`. As such, if the configuration file at `/path/to/pyproject.toml` contains
+any relative paths, they will be resolved relative to `./my_project`.
+
+If a project uses nested configuration files, then Ruff would detect multiple project roots, one for
+each configuration file.
+
+#### Package root
+
+The package root is used to determine a file's "module path". Consider, again, `baz.py`. In that
+case, `./my_project/src/foo` was identified as the package root, so the module path for `baz.py`
+would resolve to  `foo.bar.baz` — as computed by taking the relative path from the package root
+(inclusive of the root itself). The module path can be thought of as "the path you would use to
+import the module" (e.g., `import foo.bar.baz`).
+
+The package root and module path are used to, e.g., convert relative to absolute imports, and for
+import categorization, as described below.
+
+#### Import categorization
+
+When sorting and formatting import blocks, Ruff categorizes every import into one of five
+categories:
+
+1. **"Future"**: the import is a `__future__` import. That's easy: just look at the name of the
+    imported module!
+1. **"Standard library"**: the import comes from the Python standard library (e.g., `import os`).
+    This is easy too: we include a list of all known standard library modules in Ruff itself, so it's
+    a simple lookup.
+1. **"Local folder"**: the import is a relative import (e.g., `from .foo import bar`). This is easy
+    too: just check if the import includes a `level` (i.e., a dot-prefix).
+1. **"First party"**: the import is part of the current project. (More on this below.)
+1. **"Third party"**: everything else.
+
+The real challenge lies in determining whether an import is first-party — everything else is either
+trivial, or (as in the case of third-party) merely defined as "not first-party".
+
+There are three ways in which an import can be categorized as "first-party":
+
+1. **Explicit settings**: the import is marked as such via the `known-first-party` setting. (This
+    should generally be seen as an escape hatch.)
+1. **Same-package**: the imported module is in the same package as the current file. This gets back
+    to the importance of the "package root" and the file's "module path". Imagine that we're
+    analyzing `baz.py` above. If `baz.py` contains any imports that appear to come from the `foo`
+    package (e.g., `from foo import bar` or `import foo.bar`), they'll be classified as first-party
+    automatically. This check is as simple as comparing the first segment of the current file's
+    module path to the first segment of the import.
+1. **Source roots**: Ruff supports a `[src](https://beta.ruff.rs/docs/settings/#src)` setting, which
+    sets the directories to scan when identifying first-party imports. The algorithm is
+    straightforward: given an import, like `import foo`, iterate over the directories enumerated in
+    the `src` setting and, for each directory, check for the existence of a subdirectory `foo` or a
+    file `foo.py`.
+
+By default, `src` is set to the project root. In the above example, we'd want to set
+`src = ["./src"]` to ensure that we locate `./my_project/src/foo` and thus categorize `import foo`
+as first-party in `baz.py`. In practice, for this limited example, setting `src = ["./src"]` is
+unnecessary, as all imports within `./my_project/src/foo` would be categorized as first-party via
+the same-package heuristic; but your project contains multiple packages, you'll want to set `src`
+explicitly.

Cargo.toml

@@ -21,12 +21,11 @@ filetime = { version = "0.2.20" }
 glob = { version = "0.3.1" }
 globset = { version = "0.4.10" }
 ignore = { version = "0.4.20" }
-insta = { version = "1.30.0" }
+insta = { version = "1.31.0", feature = ["filters", "glob"] }
 is-macro = { version = "0.2.2" }
 itertools = { version = "0.10.5" }
 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" }
@@ -52,15 +51,6 @@ wsl = { version = "0.1.0" }
 # v1.0.1
 libcst = { git = "https://github.com/Instagram/LibCST.git", rev = "3cacca1a1029f05707e50703b49fe3dd860aa839", default-features = false }
 
-# Please tag the RustPython version every time you update its revision here and in fuzz/Cargo.toml
-# Tagging the version ensures that older ruff versions continue to build from source even when we rebase our RustPython fork.
-# Current tag: v0.0.7
-ruff_text_size = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "b996b21ffca562ecb2086f632a6a0b05c245c24a" }
-rustpython-ast = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "b996b21ffca562ecb2086f632a6a0b05c245c24a" , default-features = false, features = ["num-bigint"]}
-rustpython-format = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "b996b21ffca562ecb2086f632a6a0b05c245c24a", default-features = false, features = ["num-bigint"] }
-rustpython-literal = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "b996b21ffca562ecb2086f632a6a0b05c245c24a", default-features = false }
-rustpython-parser = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "b996b21ffca562ecb2086f632a6a0b05c245c24a" , default-features = false, features = ["full-lexer", "num-bigint"] }
-
 [profile.release]
 lto = "fat"
 codegen-units = 1
@@ -73,7 +63,7 @@ opt-level = 3
 
 # Reduce complexity of a parser function that would trigger a locals limit in a wasm tool.
 # https://github.com/bytecodealliance/wasm-tools/blob/b5c3d98e40590512a3b12470ef358d5c7b983b15/crates/wasmparser/src/limits.rs#L29
-[profile.dev.package.rustpython-parser]
+[profile.dev.package.ruff_python_parser]
 opt-level = 1
 
 # Use the `--profile release-debug` flag to show symbols in release mode.

README.md

@@ -2,7 +2,7 @@
 
 # Ruff
 
-[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![image](https://img.shields.io/pypi/v/ruff.svg)](https://pypi.python.org/pypi/ruff)
 [![image](https://img.shields.io/pypi/l/ruff.svg)](https://pypi.python.org/pypi/ruff)
 [![image](https://img.shields.io/pypi/pyversions/ruff.svg)](https://pypi.python.org/pypi/ruff)
@@ -140,7 +140,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com) hook:
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.0.278
+  rev: v0.0.280
   hooks:
     - id: ruff
 ```
@@ -397,7 +397,7 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [PyTorch](https://github.com/pytorch/pytorch)
 - [Pydantic](https://github.com/pydantic/pydantic)
 - [Pylint](https://github.com/PyCQA/pylint)
-- [Pynecone](https://github.com/pynecone-io/pynecone)
+- [Reflex](https://github.com/reflex-dev/reflex)
 - [Robyn](https://github.com/sansyrox/robyn)
 - Scale AI ([Launch SDK](https://github.com/scaleapi/launch-python-client))
 - Snowflake ([SnowCLI](https://github.com/Snowflake-Labs/snowcli))
@@ -424,13 +424,13 @@ Ruff is used by a number of major open-source projects and companies, including:
 If you're using Ruff, consider adding the Ruff badge to project's `README.md`:
 
 ```md
-[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 ```
 
 ...or `README.rst`:
 
 ```rst
-.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json
+.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
     :target: https://github.com/astral-sh/ruff
     :alt: Ruff
 ```
@@ -438,7 +438,7 @@ If you're using Ruff, consider adding the Ruff badge to project's `README.md`:
 ...or, as HTML:
 
 ```html
-<a href="https://github.com/astral-sh/ruff"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json" alt="Ruff" style="max-width:100%;"></a>
+<a href="https://github.com/astral-sh/ruff"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json" alt="Ruff" style="max-width:100%;"></a>
 ```
 
 ## License
@@ -447,6 +447,6 @@ MIT
 
 <div align="center">
   <a target="_blank" href="https://astral.sh" style="background:none">
-    <img src="https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/svg/Astral.svg">
+    <img src="https://raw.githubusercontent.com/astral-sh/ruff/main/assets/svg/Astral.svg">
   </a>
 </div>

crates/flake8_to_ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.278"
+version = "0.0.280"
 description = """
 Convert Flake8 configuration files to Ruff configuration files.
 """

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.0.278"
+version = "0.0.280"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -19,13 +19,16 @@ ruff_cache = { path = "../ruff_cache" }
 ruff_diagnostics = { path = "../ruff_diagnostics", features = ["serde"] }
 ruff_index = { path = "../ruff_index" }
 ruff_macros = { path = "../ruff_macros" }
-ruff_python_whitespace = { path = "../ruff_python_whitespace" }
 ruff_python_ast = { path = "../ruff_python_ast", features = ["serde"] }
+ruff_python_codegen = { path = "../ruff_python_codegen" }
+ruff_python_index = { path = "../ruff_python_index" }
+ruff_python_literal = { path = "../ruff_python_literal" }
 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" }
+ruff_python_trivia = { path = "../ruff_python_trivia" }
+ruff_python_parser = { path = "../ruff_python_parser" }
+ruff_source_file = { path = "../ruff_source_file", features = ["serde"] }
+ruff_text_size = { path = "../ruff_text_size" }
 
 annotate-snippets = { version = "0.9.1", features = ["color"] }
 anyhow = { workspace = true }
@@ -45,7 +48,6 @@ libcst = { workspace = true }
 log = { workspace = true }
 memchr = { workspace = true }
 natord = { version = "1.0.9" }
-nohash-hasher = { workspace = true }
 num-bigint = { workspace = true }
 num-traits = { workspace = true }
 once_cell = { workspace = true }
@@ -55,14 +57,13 @@ path-absolutize = { workspace = true, features = [
 ] }
 pathdiff = { version = "0.2.1" }
 pep440_rs = { version = "0.3.1", features = ["serde"] }
-phf = { version = "0.11", features = ["macros"] }
 pyproject-toml = { version = "0.6.0" }
 quick-junit = { version = "0.3.2" }
 regex = { workspace = true }
 result-like = { version = "0.4.6" }
 rustc-hash = { workspace = true }
-rustpython-format = { workspace = true }
-rustpython-parser = { workspace = true }
+
+
 schemars = { workspace = true, optional = true }
 semver = { version = "1.0.16" }
 serde = { workspace = true }
@@ -86,6 +87,7 @@ pretty_assertions = "1.3.0"
 test-case = { workspace = true }
 # Disable colored output in tests
 colored = { workspace = true, features = ["no-color"] }
+tempfile = "3.6.0"
 
 [features]
 default = []

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

@@ -1,6 +1,6 @@
 """
 Should emit:
-B002 - on lines 15 and 20
+B002 - on lines 18, 19, and 24
 """
 
 
@@ -8,13 +8,17 @@ def this_is_all_fine(n):
     x = n + 1
     y = 1 + n
     z = +x + y
-    return +z
+    a = n - 1
+    b = 1 - n
+    c = -a - b
+    return +z, -c
 
 
 def this_is_buggy(n):
     x = ++n
-    return x
+    y = --n
+    return x, y
 
 
 def this_is_buggy_too(n):
-    return ++n
+    return ++n, --n

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

@@ -97,3 +97,10 @@ def f():
 # variable name).
 for line_ in range(self.header_lines):
     fp.readline()
+
+# Regression test: visitor didn't walk the elif test
+for key, value in current_crawler_tags.items():
+    if key:
+        pass
+    elif wanted_tag_value != value:
+        pass

crates/ruff/resources/test/fixtures/flake8_builtins/A003.py

@@ -17,3 +17,37 @@ from typing import TypedDict
 
 class MyClass(TypedDict):
     id: int
+
+
+from threading import Event
+
+
+class CustomEvent(Event):
+    def set(self) -> None:
+        ...
+
+    def str(self) -> None:
+        ...
+
+
+from logging import Filter, LogRecord
+
+
+class CustomFilter(Filter):
+    def filter(self, record: LogRecord) -> bool:
+        ...
+
+    def str(self) -> None:
+        ...
+
+
+from typing_extensions import override
+
+
+class MyClass:
+    @override
+    def str(self):
+        pass
+
+    def int(self):
+        pass

crates/ruff/resources/test/fixtures/flake8_executable/EXE004_4.py

@@ -0,0 +1,2 @@
+
+    #!/usr/bin/env python

crates/ruff/resources/test/fixtures/flake8_implicit_str_concat/ISC.py

@@ -50,3 +50,12 @@ _ = """a""" "b"
 _ = 'a' "b"
 
 _ = rf"a" rf"b"
+
+# Single-line explicit concatenation should be ignored.
+_ = "abc" + "def" + "ghi"
+_ = foo + "abc" + "def"
+_ = "abc" + foo + "def"
+_ = "abc" + "def" + foo
+_ = foo + bar + "abc"
+_ = "abc" + foo + bar
+_ = foo + "abc" + bar

crates/ruff/resources/test/fixtures/flake8_logging_format/G010.py

@@ -1,5 +1,10 @@
 import logging
 from distutils import log
 
+from logging_setup import logger
+
 logging.warn("Hello World!")
 log.warn("Hello world!")  # This shouldn't be considered as a logger candidate
+logger.warn("Hello world!")
+
+logging . warn("Hello World!")

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

@@ -0,0 +1,14 @@
+var: int
+a = var  # OK
+
+b = c = int  # OK
+
+a.b = int  # OK
+
+d, e = int, str  # OK
+
+f, g, h = int, str, TypeVar("T")  # OK
+
+i: TypeAlias = int | str  # OK
+
+j: TypeAlias = int  # OK

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

@@ -0,0 +1,14 @@
+var: int
+a = var  # OK
+
+b = c = int  # PYI017
+
+a.b = int  # PYI017
+
+d, e = int, str  # PYI017
+
+f, g, h = int, str, TypeVar("T")  # PYI017
+
+i: TypeAlias = int | str  # OK
+
+j: TypeAlias = int  # OK

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

@@ -0,0 +1,12 @@
+import typing
+from typing import TypeVar
+
+_T = typing.TypeVar("_T")
+_P = TypeVar("_P")
+
+# OK
+_UsedTypeVar = TypeVar("_UsedTypeVar")
+def func(arg: _UsedTypeVar) -> _UsedTypeVar: ...
+
+_A, _B = TypeVar("_A"), TypeVar("_B")
+_C = _D = TypeVar("_C")

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

@@ -0,0 +1,12 @@
+import typing
+from typing import TypeVar
+
+_T = typing.TypeVar("_T")
+_P = TypeVar("_P")
+
+# OK
+_UsedTypeVar = TypeVar("_UsedTypeVar")
+def func(arg: _UsedTypeVar) -> _UsedTypeVar: ...
+
+_A, _B = TypeVar("_A"), TypeVar("_B")
+_C = _D = TypeVar("_C")

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

@@ -0,0 +1,19 @@
+import typing
+from typing import TypeAlias, Literal, Any
+
+NewAny = Any
+OptionalStr = typing.Optional[str]
+Foo = Literal["foo"]
+IntOrStr = int | str
+AliasNone = None
+
+NewAny: typing.TypeAlias = Any
+OptionalStr: TypeAlias = typing.Optional[str]
+Foo: typing.TypeAlias = Literal["foo"]
+IntOrStr: TypeAlias = int | str
+IntOrFloat: Foo = int | float
+AliasNone: typing.TypeAlias = None
+
+# these are ok
+VarAlias = str
+AliasFoo = Foo

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

@@ -0,0 +1,18 @@
+from typing import Literal, Any
+
+NewAny = Any
+OptionalStr = typing.Optional[str]
+Foo = Literal["foo"]
+IntOrStr = int | str
+AliasNone = None
+
+NewAny: typing.TypeAlias = Any
+OptionalStr: TypeAlias = typing.Optional[str]
+Foo: typing.TypeAlias = Literal["foo"]
+IntOrStr: TypeAlias = int | str
+IntOrFloat: Foo = int | float
+AliasNone: typing.TypeAlias = None
+
+# these are ok
+VarAlias = str
+AliasFoo = Foo

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

@@ -0,0 +1,18 @@
+import typing
+from typing import Protocol
+
+
+class _Foo(Protocol):
+    bar: int
+
+
+class _Bar(typing.Protocol):
+    bar: int
+
+
+# OK
+class _UsedPrivateProtocol(Protocol):
+    bar: int
+
+
+def uses__UsedPrivateProtocol(arg: _UsedPrivateProtocol) -> None: ...

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

@@ -0,0 +1,18 @@
+import typing
+from typing import Protocol
+
+
+class _Foo(object, Protocol):
+    bar: int
+
+
+class _Bar(typing.Protocol):
+    bar: int
+
+
+# OK
+class _UsedPrivateProtocol(Protocol):
+    bar: int
+
+
+def uses__UsedPrivateProtocol(arg: _UsedPrivateProtocol) -> None: ...

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

@@ -0,0 +1,22 @@
+import typing
+import sys
+from typing import TypeAlias
+
+
+_UnusedPrivateTypeAlias: TypeAlias = int | None
+_T: typing.TypeAlias = str
+
+# OK
+_UsedPrivateTypeAlias: TypeAlias = int | None
+
+def func(arg: _UsedPrivateTypeAlias) -> _UsedPrivateTypeAlias:
+  ...
+
+
+if sys.version_info > (3, 9):
+  _PrivateTypeAlias: TypeAlias = str | None
+else:
+  _PrivateTypeAlias: TypeAlias = float | None
+
+
+def func2(arg: _PrivateTypeAlias) -> None: ...

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

@@ -0,0 +1,22 @@
+import typing
+import sys
+from typing import TypeAlias
+
+
+_UnusedPrivateTypeAlias: TypeAlias = int | None
+_T: typing.TypeAlias = str
+
+# OK
+_UsedPrivateTypeAlias: TypeAlias = int | None
+
+def func(arg: _UsedPrivateTypeAlias) -> _UsedPrivateTypeAlias:
+  ...
+
+
+if sys.version_info > (3, 9):
+  _PrivateTypeAlias: TypeAlias = str | None
+else:
+  _PrivateTypeAlias: TypeAlias = float | None
+
+
+def func2(arg: _PrivateTypeAlias) -> None: ...

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

@@ -0,0 +1,18 @@
+import typing
+from typing import TypedDict
+
+
+class _UnusedTypedDict(TypedDict):
+    foo: str
+
+
+class _UnusedTypedDict2(typing.TypedDict):
+    bar: int
+
+
+class _UsedTypedDict(TypedDict):
+   foo: bytes
+
+
+class _CustomClass(_UsedTypedDict):
+    bar: list[int]

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

@@ -0,0 +1,32 @@
+import sys
+import typing
+from typing import TypedDict
+
+
+class _UnusedTypedDict(TypedDict):
+    foo: str
+
+
+class _UnusedTypedDict2(typing.TypedDict):
+    bar: int
+
+
+# OK
+class _UsedTypedDict(TypedDict):
+   foo: bytes
+
+
+class _CustomClass(_UsedTypedDict):
+   bar: list[int]
+
+
+if sys.version_info >= (3, 10):
+   class _UsedTypedDict2(TypedDict):
+       foo: int
+else:
+   class _UsedTypedDict2(TypedDict):
+       foo: float
+
+
+class _CustomClass2(_UsedTypedDict2):
+   bar: list[int]

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

@@ -0,0 +1,12 @@
+__all__ = ["A", "B", "C"]
+
+# Errors
+__all__.append("D")
+__all__.extend(["E", "Foo"])
+__all__.remove("A")
+
+# OK
+__all__ += ["D"]
+foo = ["Hello"]
+foo.append("World")
+foo.bar.append("World")

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

@@ -0,0 +1,12 @@
+__all__ = ["A", "B", "C"]
+
+# Errors
+__all__.append("D")
+__all__.extend(["E", "Foo"])
+__all__.remove("A")
+
+# OK
+__all__ += ["D"]
+foo = ["Hello"]
+foo.append("World")
+foo.bar.append("World")

crates/ruff/resources/test/fixtures/flake8_pytest_style/PT012.py

@@ -11,6 +11,10 @@ async def test_ok_trivial_with():
         with context_manager_under_test():
             pass
 
+    with pytest.raises(ValueError):
+        with context_manager_under_test():
+            raise ValueError
+
     with pytest.raises(AttributeError):
         async with context_manager_under_test():
             pass
@@ -24,6 +28,16 @@ def test_ok_complex_single_call():
         )
 
 
+def test_ok_func_and_class():
+    with pytest.raises(AttributeError):
+        class A:
+            pass
+
+    with pytest.raises(AttributeError):
+        def f():
+            pass
+
+
 def test_error_multiple_statements():
     with pytest.raises(AttributeError):
         len([])
@@ -47,13 +61,10 @@ async def test_error_complex_statement():
         while True:
             [].size
 
-    with pytest.raises(AttributeError):
-        with context_manager_under_test():
-            [].size
-
     with pytest.raises(AttributeError):
         async with context_manager_under_test():
-            [].size
+            if True:
+                raise Exception
 
 
 def test_error_try():

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

@@ -100,6 +100,14 @@ if node.module0123456789:
     ):
         print("Bad module!")
 
+# SIM102
+# Regression test for https://github.com/apache/airflow/blob/145b16caaa43f0c42bffd97344df916c602cddde/airflow/configuration.py#L1161
+if a:
+    if b:
+        if c:
+            print("if")
+elif d:
+    print("elif")
 
 # OK
 if a:
@@ -148,3 +156,12 @@ if False:
 if True:
     if a:
         pass
+
+
+# SIM102
+def f():
+    if a:
+        pass
+    elif b:
+        if c:
+            d

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

@@ -14,6 +14,12 @@ try:
 except (ValueError, OSError):
     pass
 
+# SIM105
+try:
+    foo()
+except (ValueError, OSError) as e:
+    pass
+
 # SIM105
 try:
     foo()
@@ -94,3 +100,13 @@ def with_comment():
         foo()
     except (ValueError, OSError):
         pass  # Trailing comment.
+
+try:
+    print()
+except ("not", "an", "exception"):
+    pass
+
+try:
+    print()
+except "not an exception":
+    pass

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

@@ -23,7 +23,7 @@ elif a:
 else:
     b = 2
 
-# OK (false negative)
+# SIM108
 if True:
     pass
 else:

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

@@ -94,3 +94,23 @@ if result.eofs == "F":
     errors = 1
 else:
     errors = 1
+
+if a:
+    # Ignore branches with diverging comments because it means we're repeating
+    # the bodies because we have different reasons for each branch
+    x = 1
+elif c:
+    x = 1
+
+
+def foo():
+    a = True
+    b = False
+    if a > b:  # end-of-line
+        return 3
+    elif a == b:
+        return 3
+    elif a < b:  # end-of-line
+        return 4
+    elif b is None:
+        return 4

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

@@ -1,7 +1,15 @@
 import contextlib
+import pathlib
+import pathlib as pl
+from pathlib import Path
+from pathlib import Path as P
 
 # SIM115
 f = open("foo.txt")
+f = Path("foo.txt").open()
+f = pathlib.Path("foo.txt").open()
+f = pl.Path("foo.txt").open()
+f = P("foo.txt").open()
 data = f.read()
 f.close()
 

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

@@ -84,3 +84,15 @@ elif func_name == "remove":
     return "D"
 elif func_name == "move":
     return "MV"
+
+# OK
+def no_return_in_else(platform):
+    if platform == "linux":
+        return "auditwheel repair -w {dest_dir} {wheel}"
+    elif platform == "macos":
+        return "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}"
+    elif platform == "windows":
+        return ""
+    else:
+        msg = f"Unknown platform: {platform!r}"
+        raise ValueError(msg)

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

@@ -1,11 +1,19 @@
 key in obj.keys()  # SIM118
 
+key not in obj.keys()  # SIM118
+
 foo["bar"] in obj.keys()  # SIM118
 
+foo["bar"] not in obj.keys()  # SIM118
+
 foo['bar'] in obj.keys()  # SIM118
 
+foo['bar'] not in obj.keys()  # SIM118
+
 foo() in obj.keys()  # SIM118
 
+foo() not in obj.keys()  # SIM118
+
 for key in obj.keys():  # SIM118
     pass
 
@@ -22,3 +30,13 @@ for key in list(obj.keys()):
 (k for k in obj.keys())  # SIM118
 
 key in (obj or {}).keys()  # SIM118
+
+from typing import KeysView
+
+
+class Foo:
+    def keys(self) -> KeysView[object]:
+        ...
+
+    def __contains__(self, key: object) -> bool:
+        return key in self.keys()  # OK

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

@@ -38,6 +38,15 @@ if key in a_dict:
 else:
     vars[idx] = "defaultß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789"
 
+# SIM401
+if foo():
+    pass
+else:
+    if key in a_dict:
+        vars[idx] = a_dict[key]
+    else:
+        vars[idx] = "default"
+
 ###
 # Negative cases
 ###
@@ -105,12 +114,3 @@ elif key in a_dict:
     vars[idx] = a_dict[key]
 else:
     vars[idx] = "default"
-
-# OK (false negative for nested else)
-if foo():
-    pass
-else:
-    if key in a_dict:
-        vars[idx] = a_dict[key]
-    else:
-        vars[idx] = "default"

crates/ruff/resources/test/fixtures/flake8_use_pathlib/PTH201.py

@@ -0,0 +1,15 @@
+from pathlib import Path, PurePath
+from pathlib import Path as pth
+
+# match
+_ = Path(".")
+_ = pth(".")
+_ = PurePath(".")
+_ = Path("")
+
+# no match
+_ = Path()
+print(".")
+Path("file.txt")
+Path(".", "folder")
+PurePath(".", "folder")

crates/ruff/resources/test/fixtures/flake8_use_pathlib/PTH202.py

@@ -0,0 +1,14 @@
+import os.path
+from pathlib import Path
+from os.path import getsize
+
+
+os.path.getsize("filename")
+os.path.getsize(b"filename")
+os.path.getsize(Path("filename"))
+os.path.getsize(__file__)
+
+getsize("filename")
+getsize(b"filename")
+getsize(Path("filename"))
+getsize(__file__)

crates/ruff/resources/test/fixtures/flake8_use_pathlib/PTH203.py

@@ -0,0 +1,12 @@
+import os.path
+from pathlib import Path
+from os.path import getatime
+
+os.path.getatime("filename")
+os.path.getatime(b"filename")
+os.path.getatime(Path("filename"))
+
+
+getatime("filename")
+getatime(b"filename")
+getatime(Path("filename"))

crates/ruff/resources/test/fixtures/flake8_use_pathlib/PTH204.py

@@ -0,0 +1,13 @@
+import os.path
+from pathlib import Path
+from os.path import getmtime
+
+
+os.path.getmtime("filename")
+os.path.getmtime(b"filename")
+os.path.getmtime(Path("filename"))
+
+
+getmtime("filename")
+getmtime(b"filename")
+getmtime(Path("filename"))

crates/ruff/resources/test/fixtures/flake8_use_pathlib/PTH205.py

@@ -0,0 +1,12 @@
+import os.path
+from pathlib import Path
+from os.path import getctime
+
+
+os.path.getctime("filename")
+os.path.getctime(b"filename")
+os.path.getctime(Path("filename"))
+
+getctime("filename")
+getctime(b"filename")
+getctime(Path("filename"))

crates/ruff/resources/test/fixtures/flake8_use_pathlib/PTH206.py

@@ -0,0 +1,20 @@
+import os
+from os import sep
+
+
+file_name = "foo/bar"
+
+# PTH206
+"foo/bar/".split(os.sep)
+"foo/bar/".split(sep=os.sep)
+"foo/bar/".split(os.sep)[-1]
+"foo/bar/".split(os.sep)[-2]
+"foo/bar/".split(os.sep)[-2:]
+"fizz/buzz".split(sep)
+"fizz/buzz".split(sep)[-1]
+os.path.splitext("path/to/hello_world.py")[0].split(os.sep)[-1]
+file_name.split(os.sep)
+(os.path.abspath(file_name)).split(os.sep)
+
+# OK
+"foo/bar/".split("/")

crates/ruff/resources/test/fixtures/flake8_use_pathlib/PTH207.py

@@ -0,0 +1,11 @@
+import os
+import glob
+from glob import glob as search
+
+
+extensions_dir = "./extensions"
+
+# PTH207
+glob.glob(os.path.join(extensions_dir, "ops", "autograd", "*.cpp"))
+list(glob.iglob(os.path.join(extensions_dir, "ops", "autograd", "*.cpp")))
+search("*.png")

crates/ruff/resources/test/fixtures/flake8_use_pathlib/full_name.py

@@ -2,6 +2,7 @@ import os
 import os.path
 
 p = "/foo"
+q = "bar"
 
 a = os.path.abspath(p)
 aa = os.chmod(p)
@@ -21,7 +22,9 @@ bbbbb = os.path.islink(p)
 os.readlink(p)
 os.stat(p)
 os.path.isabs(p)
-os.path.join(p)
+os.path.join(p, q)
+os.sep.join([p, q])
+os.sep.join((p, q))
 os.path.basename(p)
 os.path.dirname(p)
 os.path.samefile(p)

crates/ruff/resources/test/fixtures/flake8_use_pathlib/import_as.py

@@ -2,6 +2,7 @@ import os as foo
 import os.path as foo_p
 
 p = "/foo"
+q = "bar"
 
 a = foo_p.abspath(p)
 aa = foo.chmod(p)
@@ -21,7 +22,9 @@ bbbbb = foo_p.islink(p)
 foo.readlink(p)
 foo.stat(p)
 foo_p.isabs(p)
-foo_p.join(p)
+foo_p.join(p, q)
+foo.sep.join([p, q])
+foo.sep.join((p, q))
 foo_p.basename(p)
 foo_p.dirname(p)
 foo_p.samefile(p)

crates/ruff/resources/test/fixtures/flake8_use_pathlib/import_from.py

@@ -1,9 +1,10 @@
-from os import chmod, mkdir, makedirs, rename, replace, rmdir
+from os import chmod, mkdir, makedirs, rename, replace, rmdir, sep
 from os import remove, unlink, getcwd, readlink, stat
 from os.path import abspath, exists, expanduser, isdir, isfile, islink
 from os.path import isabs, join, basename, dirname, samefile, splitext
 
 p = "/foo"
+q = "bar"
 
 a = abspath(p)
 aa = chmod(p)
@@ -23,7 +24,9 @@ bbbbb = islink(p)
 readlink(p)
 stat(p)
 isabs(p)
-join(p)
+join(p, q)
+sep.join((p, q))
+sep.join([p, q])
 basename(p)
 dirname(p)
 samefile(p)

crates/ruff/resources/test/fixtures/flake8_use_pathlib/import_from_as.py

@@ -1,4 +1,4 @@
-from os import chmod as xchmod, mkdir as xmkdir
+from os import chmod as xchmod, mkdir as xmkdir, sep as s
 from os import makedirs as xmakedirs, rename as xrename, replace as xreplace
 from os import rmdir as xrmdir, remove as xremove, unlink as xunlink
 from os import getcwd as xgetcwd, readlink as xreadlink, stat as xstat
@@ -9,6 +9,7 @@ from os.path import join as xjoin, basename as xbasename, dirname as xdirname
 from os.path import samefile as xsamefile, splitext as xsplitext
 
 p = "/foo"
+q = "bar"
 
 a = xabspath(p)
 aa = xchmod(p)
@@ -28,7 +29,9 @@ bbbbb = xislink(p)
 xreadlink(p)
 xstat(p)
 xisabs(p)
-xjoin(p)
+xjoin(p, q)
+s.join((p, q))
+s.join([p, q])
 xbasename(p)
 xdirname(p)
 xsamefile(p)

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

@@ -0,0 +1,2 @@
+import bar
+import foo

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

@@ -0,0 +1,2 @@
+import foo
+import bar

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

@@ -0,0 +1,7 @@
+if "sdist" in cmds:
+    _sdist = cmds["sdist"]
+elif "setuptools" in sys.modules:
+    from setuptools.command.sdist import sdist as _sdist
+else:
+    from setuptools.command.sdist import sdist as _sdist
+    from distutils.command.sdist import sdist as _sdist

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

@@ -0,0 +1,7 @@
+match 1:
+    case 1:
+        import sys
+        import os
+    case 2:
+        import collections
+        import abc

crates/ruff/resources/test/fixtures/jupyter/not_json.ipynb

@@ -1 +1 @@
-broken "§=($/=(")
+broken "§=($/=()

crates/ruff/resources/test/fixtures/perflint/PERF203.py

@@ -1,28 +1,23 @@
+# PERF203
 for i in range(10):
-    try:  # PERF203
+    try:
         print(f"{i}")
     except:
         print("error")
 
+# OK
 try:
     for i in range(10):
         print(f"{i}")
 except:
     print("error")
 
+# OK
 i = 0
-while i < 10:  # PERF203
+while i < 10:
     try:
         print(f"{i}")
     except:
         print("error")
 
     i += 1
-
-try:
-    i = 0
-    while i < 10:
-        print(f"{i}")
-        i += 1
-except:
-    print("error")

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

@@ -0,0 +1,13 @@
+#: E241
+a = (1,  2)
+#: Okay
+b = (1, 20)
+#: E242
+a = (1,	2)  # tab before 2
+#: Okay
+b = (1, 20)  # space before 20
+#: E241 E241 E241
+# issue 135
+more_spaces = [a,    b,
+               ef,  +h,
+               c,   -d]

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

@@ -41,3 +41,5 @@ regex = '\w'  # noqa
 regex = '''
 \w
 '''  # noqa
+
+regex = '\\\_'

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

@@ -23,3 +23,5 @@ a = []
 '%s %s' % (*a,)
 k = {}
 '%(k)s' % {**k}
+'%s' % [1, 2, 3]
+'%s' % {1, 2, 3}

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

@@ -1,6 +1,11 @@
 if (1, 2):
     pass
 
+if (3, 4):
+    pass
+elif foo:
+    pass
+
 for _ in range(5):
     if True:
         pass

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

@@ -0,0 +1,15 @@
+# Regression test for branch detection from
+# https://github.com/pypa/build/blob/5800521541e5e749d4429617420d1ef8cdb40b46/src/build/_importlib.py
+import sys
+
+if sys.version_info < (3, 8):
+    import importlib_metadata as metadata
+elif sys.version_info < (3, 9, 10) or (3, 10, 0) <= sys.version_info < (3, 10, 2):
+    try:
+        import importlib_metadata as metadata
+    except ModuleNotFoundError:
+        from importlib import metadata
+else:
+    from importlib import metadata
+
+__all__ = ["metadata"]

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

@@ -0,0 +1,6 @@
+class Class:
+    def func(self):
+        pass
+
+    def func(self):
+        pass

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

@@ -0,0 +1,11 @@
+"""Test case: `Literal` with `__future__` annotations."""
+
+from __future__ import annotations
+
+from typing import Literal, Final
+
+from typing_extensions import assert_type
+
+CONSTANT: Final = "ns"
+
+assert_type(CONSTANT, Literal["ns"])

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

@@ -0,0 +1,103 @@
+"""Test type parameters and aliases"""
+
+# Type parameters in type alias statements
+
+from some_module import Bar
+
+type Foo[T] = T # OK
+type Foo[T] = list[T] # OK
+type Foo[T: ForwardA] = T # OK
+type Foo[*Ts] = Bar[Ts] # OK
+type Foo[**P] = Bar[P] # OK
+class ForwardA: ...
+
+# Types used in aliased assignment must exist
+
+type Foo = DoesNotExist  # F821: Undefined name `DoesNotExist`
+type Foo = list[DoesNotExist]  # F821: Undefined name `DoesNotExist`
+
+# Type parameters do not escape alias scopes
+
+type Foo[T] = T
+T  # F821: Undefined name `T` - not accessible afterward alias scope
+
+# Type parameters in functions
+
+def foo[T](t: T) -> T: return t  # OK
+async def afoo[T](t: T) -> T: return t  # OK
+def with_forward_ref[T: ForwardB](t: T) -> T: return t  # OK
+def can_access_inside[T](t: T) -> T:  # OK
+    print(T)  # OK
+    return t  # OK
+class ForwardB: ...
+
+
+# Type parameters do not escape function scopes
+
+from some_library import some_decorator
+
+@some_decorator(T)  # F821: Undefined name `T` - not accessible in decorators
+
+def foo[T](t: T) -> None: ...
+T  # F821: Undefined name `T` - not accessible afterward function scope
+
+
+# Type parameters in classes
+
+class Foo[T](list[T]): ... # OK
+class UsesForward[T: ForwardC](list[T]): ...    # OK
+class ForwardC: ...
+class WithinBody[T](list[T]):   # OK
+    t = T   # OK
+    x: T  # OK
+
+    def foo(self, x: T) -> T:  # OK
+        return x
+    
+    def foo(self):
+        T  # OK
+
+
+# Type parameters do not escape class scopes
+
+from some_library import some_decorator
+@some_decorator(T)  # F821: Undefined name `T` - not accessible in decorators
+
+class Foo[T](list[T]): ...
+T  # F821: Undefined name `T` - not accessible after class scope
+
+# Types specified in bounds should exist
+
+type Foo[T: DoesNotExist] = T  # F821: Undefined name `DoesNotExist`
+def foo[T: DoesNotExist](t: T) -> T: return t  # F821: Undefined name `DoesNotExist`
+class Foo[T: DoesNotExist](list[T]): ...  # F821: Undefined name `DoesNotExist`
+
+type Foo[T: (DoesNotExist1, DoesNotExist2)] = T  # F821: Undefined name `DoesNotExist1`, Undefined name `DoesNotExist2`
+def foo[T: (DoesNotExist1, DoesNotExist2)](t: T) -> T: return t  # F821: Undefined name `DoesNotExist1`, Undefined name `DoesNotExist2`
+class Foo[T: (DoesNotExist1, DoesNotExist2)](list[T]): ...  # F821: Undefined name `DoesNotExist1`, Undefined name `DoesNotExist2`
+
+# Type parameters in nested classes
+
+class Parent[T]:
+    t = T   # OK
+
+    def can_use_class_variable(self, x: t) -> t:  # OK
+        return x
+    
+    class Child:
+        def can_access_parent_type_parameter(self, x: T) -> T:  # OK
+            T  # OK
+            return x
+        
+        def cannot_access_parent_variable(self, x: t) -> t:  # F821: Undefined name `T`
+                t # F821: Undefined name `t`
+                return x
+            
+# Type parameters in nested functions
+
+def can_access_inside_nested[T](t: T) -> T:  # OK
+    def bar(x: T) -> T:  # OK
+        T # OK
+        return x
+    
+    bar(t)

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

@@ -25,3 +25,48 @@ def dec(x):
 def f():
     dec = 1
     return dec
+
+
+class Class:
+    def f(self):
+        print(my_var)
+        my_var = 1
+
+
+class Class:
+    my_var = 0
+
+    def f(self):
+        print(my_var)
+        my_var = 1
+
+
+import sys
+
+
+def main():
+    print(sys.argv)
+
+    try:
+        3 / 0
+    except ZeroDivisionError:
+        import sys
+
+        sys.exit(1)
+
+
+import sys
+
+
+def main():
+    print(sys.argv)
+
+    for sys in range(5):
+        pass
+
+
+import requests_mock as rm
+
+
+def requests_mock(requests_mock: rm.Mocker):
+    print(rm.ANY)

crates/ruff/resources/test/fixtures/pygrep_hooks/PGH003_0.py

@@ -1,6 +1,7 @@
 x = 1  # type: ignore
 x = 1  # type:ignore
 x = 1  # type: ignore[attr-defined]  # type: ignore
+x = 1  # type: ignoreme # type: ignore
 
 x = 1
 x = 1  # type ignore

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

@@ -47,3 +47,17 @@ def not_ok1():
             pass
         else:
             pass
+
+
+# Regression test for https://github.com/apache/airflow/blob/f1e1cdcc3b2826e68ba133f350300b5065bbca33/airflow/models/dag.py#L1737
+def not_ok2():
+    if True:
+        print(1)
+    elif True:
+        print(2)
+    else:
+        if True:
+            print(3)
+        else:
+            print(4)
+

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

@@ -0,0 +1,16 @@
+class Person:
+    def __init__(self):
+        self.name = "monty"
+
+    def __eq__(self, other):
+        return isinstance(other, Person) and other.name == self.name
+
+class Language:
+    def __init__(self):
+        self.name = "python"
+
+    def __eq__(self, other):
+        return isinstance(other, Language) and other.name == self.name
+
+    def __hash__(self):
+        return hash(self.name)

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

@@ -0,0 +1,41 @@
+foo = 1
+bar = 2
+baz = 3
+
+# Errors.
+foo = foo
+bar = bar
+foo, bar = foo, bar
+bar, foo = bar, foo
+(foo, bar) = (foo, bar)
+(bar, foo) = (bar, foo)
+foo, (bar, baz) = foo, (bar, baz)
+bar, (foo, baz) = bar, (foo, baz)
+(foo, bar), baz = (foo, bar), baz
+(foo, (bar, baz)) = (foo, (bar, baz))
+foo, bar = foo, 1
+bar, foo = bar, 1
+(foo, bar) = (foo, 1)
+(bar, foo) = (bar, 1)
+foo, (bar, baz) = foo, (bar, 1)
+bar, (foo, baz) = bar, (foo, 1)
+(foo, bar), baz = (foo, bar), 1
+(foo, (bar, baz)) = (foo, (bar, 1))
+foo: int = foo
+bar: int = bar
+
+# Non-errors.
+foo = bar
+bar = foo
+foo, bar = bar, foo
+foo, bar = bar, foo
+(foo, bar) = (bar, foo)
+foo, bar = bar, 1
+bar, foo = foo, 1
+foo: int = bar
+bar: int = 1
+
+
+class Foo:
+    foo = foo
+    bar = bar

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

@@ -0,0 +1,18 @@
+import subprocess
+
+
+def foo():
+    pass
+
+
+# Errors.
+subprocess.Popen(preexec_fn=foo)
+subprocess.Popen(["ls"], preexec_fn=foo)
+subprocess.Popen(preexec_fn=lambda: print("Hello, world!"))
+subprocess.Popen(["ls"], preexec_fn=lambda: print("Hello, world!"))
+
+# Non-errors.
+subprocess.Popen()
+subprocess.Popen(["ls"])
+subprocess.Popen(preexec_fn=None)  # None is the default.
+subprocess.Popen(["ls"], preexec_fn=None)  # None is the default.

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

@@ -0,0 +1,4 @@
+print('Hello world')
+
+#!/usr/bin/python
+# -*- coding: utf-8 -*-

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

@@ -15,7 +15,22 @@ bytes("foo", **a)
 bytes(b"foo"
       b"bar")
 bytes("foo")
+bytes(1)
 f"{f'{str()}'}"
+int(1.0)
+int("1")
+int(b"11")
+int(10, base=2)
+int("10", base=2)
+int("10", 2)
+float("1.0")
+float(b"1.0")
+bool(1)
+bool(0)
+bool("foo")
+bool("")
+bool(b"")
+bool(1.0)
 
 # These become string or byte literals
 str()
@@ -27,3 +42,10 @@ bytes(b"foo")
 bytes(b"""
 foo""")
 f"{str()}"
+int()
+int(1)
+float()
+float(1.0)
+bool()
+bool(True)
+bool(False)

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

@@ -62,6 +62,16 @@ print("foo {} ".format(x))
     1111111111111111111111111111111111111111111111111111111111111111111111111,
 )
 
+"""
+{}
+""".format(1)
+
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """
+{}
+""".format(
+    111111
+)
+
 ###
 # Non-errors
 ###
@@ -99,6 +109,37 @@ r'"\N{snowman} {}".format(a)'
     11111111111111111111111111111111111111111111111111111111111111111111111111,
 )
 
+"""
+{}
+{}
+{}
+""".format(
+1,
+2,
+111111111111111111111111111111111111111111111111111111111111111111111111111111111111111,
+)
+
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
+""".format(
+    111111
+)
+
+"{}".format(
+    [
+        1,
+        2,
+        3,
+    ]
+)
+
+"{a}".format(
+    a=[
+        1,
+        2,
+        3,
+    ]
+)
+
 async def c():
     return "{}".format(await 3)
 

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

@@ -7,20 +7,20 @@ if True:
 
 if True:
     if foo:
-        pass
+        print()
     elif sys.version_info < (3, 3):
         cmd = [sys.executable, "-m", "test.regrtest"]
 
 if True:
     if foo:
-        pass
+        print()
     elif sys.version_info < (3, 3):
         cmd = [sys.executable, "-m", "test.regrtest"]
     elif foo:
         cmd = [sys.executable, "-m", "test", "-j0"]
 
     if foo:
-        pass
+        print()
     elif sys.version_info < (3, 3):
         cmd = [sys.executable, "-m", "test.regrtest"]
 
@@ -28,7 +28,7 @@ if True:
         cmd = [sys.executable, "-m", "test.regrtest"]
 
     if foo:
-        pass
+        print()
     elif sys.version_info < (3, 3):
         cmd = [sys.executable, "-m", "test.regrtest"]
     else:

crates/ruff/resources/test/fixtures/ruff/RUF015.py

@@ -2,21 +2,9 @@ x = range(10)
 
 # RUF015
 list(x)[0]
-list(x)[:1]
-list(x)[:1:1]
-list(x)[:1:2]
 tuple(x)[0]
-tuple(x)[:1]
-tuple(x)[:1:1]
-tuple(x)[:1:2]
 list(i for i in x)[0]
-list(i for i in x)[:1]
-list(i for i in x)[:1:1]
-list(i for i in x)[:1:2]
 [i for i in x][0]
-[i for i in x][:1]
-[i for i in x][:1:1]
-[i for i in x][:1:2]
 
 # OK (not indexing (solely) the first element)
 list(x)
@@ -29,16 +17,31 @@ list(x)[::]
 [i for i in x]
 [i for i in x][1]
 [i for i in x][-1]
+[i for i in x][:1]
+[i for i in x][:1:1]
+[i for i in x][:1:2]
 [i for i in x][1:]
 [i for i in x][:3:2]
 [i for i in x][::2]
 [i for i in x][::]
 
-# OK (doesn't mirror the underlying list)
+# RUF015 (doesn't mirror the underlying list)
 [i + 1 for i in x][0]
 [i for i in x if i > 5][0]
 [(i, i + 1) for i in x][0]
 
-# OK (multiple generators)
+# RUF015 (multiple generators)
 y = range(10)
 [i + j for i in x for j in y][0]
+
+# RUF015
+list(range(10))[0]
+list(x.y)[0]
+list(x["y"])[0]
+
+# RUF015 (multi-line)
+revision_heads_map_ast = [
+    a
+    for a in revision_heads_map_ast_obj.body
+    if isinstance(a, ast.Assign) and a.targets[0].id == "REVISION_HEADS_MAP"
+][0]

crates/ruff/resources/test/fixtures/ruff/ruff_noqa_invalid.py

@@ -0,0 +1,5 @@
+import os  # ruff: noqa: F401
+
+
+def f():
+    x = 1

crates/ruff/resources/test/fixtures/tryceratops/TRY004.py

@@ -230,6 +230,15 @@ def incorrect_multi_conditional(arg1, arg2):
         raise Exception("...")  # should be typeerror
 
 
+def multiple_is_instance_checks(some_arg):
+    if isinstance(some_arg, str):
+        pass
+    elif isinstance(some_arg, int):
+        pass
+    else:
+        raise Exception("...")   # should be typeerror
+
+
 class MyCustomTypeValidation(Exception):
     pass
 
@@ -296,6 +305,17 @@ def multiple_ifs(some_args):
                 pass
 
 
+def else_body(obj):
+    if isinstance(obj, datetime.timedelta):
+        return "TimeDelta"
+    elif isinstance(obj, relativedelta.relativedelta):
+        return "RelativeDelta"
+    elif isinstance(obj, CronExpression):
+        return "CronExpression"
+    else:
+        raise Exception(f"Unknown object type: {obj.__class__.__name__}")
+
+
 def early_return():
     if isinstance(this, some_type):
         if x in this:

crates/ruff/src/autofix/codemods.rs

@@ -4,9 +4,10 @@ use anyhow::{bail, Result};
 use libcst_native::{
     Codegen, CodegenState, ImportNames, ParenthesizableWhitespace, SmallStatement, Statement,
 };
-use rustpython_parser::ast::{Ranged, Stmt};
+use ruff_python_ast::{Ranged, Stmt};
 
-use ruff_python_ast::source_code::{Locator, Stylist};
+use ruff_python_codegen::Stylist;
+use ruff_source_file::Locator;
 
 use crate::cst::helpers::compose_module_path;
 use crate::cst::matchers::match_statement;
@@ -32,7 +33,7 @@ impl<'a, T: Codegen<'a>> CodegenStylist<'a> for T {
 ///
 /// Returns `Ok(None)` if the statement is empty after removing the imports.
 pub(crate) fn remove_imports<'a>(
-    imports: impl Iterator<Item = &'a str>,
+    member_names: impl Iterator<Item = &'a str>,
     stmt: &Stmt,
     locator: &Locator,
     stylist: &Stylist,
@@ -44,27 +45,20 @@ pub(crate) fn remove_imports<'a>(
         bail!("Expected Statement::Simple");
     };
 
-    let (aliases, import_module) = match body.body.first_mut() {
-        Some(SmallStatement::Import(import_body)) => (&mut import_body.names, None),
+    let aliases = match body.body.first_mut() {
+        Some(SmallStatement::Import(import_body)) => &mut import_body.names,
         Some(SmallStatement::ImportFrom(import_body)) => {
             if let ImportNames::Aliases(names) = &mut import_body.names {
-                (
-                    names,
-                    Some((&import_body.relative, import_body.module.as_ref())),
-                )
+                names
             } else if let ImportNames::Star(..) = &import_body.names {
                 // Special-case: if the import is a `from ... import *`, then we delete the
                 // entire statement.
                 let mut found_star = false;
-                for import in imports {
-                    let qualified_name = match import_body.module.as_ref() {
-                        Some(module_name) => format!("{}.*", compose_module_path(module_name)),
-                        None => "*".to_string(),
-                    };
-                    if import == qualified_name {
+                for member in member_names {
+                    if member == "*" {
                         found_star = true;
                     } else {
-                        bail!("Expected \"*\" for unused import (got: \"{}\")", import);
+                        bail!("Expected \"*\" for unused import (got: \"{}\")", member);
                     }
                 }
                 if !found_star {
@@ -81,30 +75,10 @@ pub(crate) fn remove_imports<'a>(
     // Preserve the trailing comma (or not) from the last entry.
     let trailing_comma = aliases.last().and_then(|alias| alias.comma.clone());
 
-    for import in imports {
-        let alias_index = aliases.iter().position(|alias| {
-            let qualified_name = match import_module {
-                Some((relative, module)) => {
-                    let module = module.map(compose_module_path);
-                    let member = compose_module_path(&alias.name);
-                    let mut qualified_name = String::with_capacity(
-                        relative.len() + module.as_ref().map_or(0, String::len) + member.len() + 1,
-                    );
-                    for _ in 0..relative.len() {
-                        qualified_name.push('.');
-                    }
-                    if let Some(module) = module {
-                        qualified_name.push_str(&module);
-                        qualified_name.push('.');
-                    }
-                    qualified_name.push_str(&member);
-                    qualified_name
-                }
-                None => compose_module_path(&alias.name),
-            };
-            qualified_name == import
-        });
-
+    for member in member_names {
+        let alias_index = aliases
+            .iter()
+            .position(|alias| member == compose_module_path(&alias.name));
         if let Some(index) = alias_index {
             aliases.remove(index);
         }
@@ -138,7 +112,7 @@ pub(crate) fn remove_imports<'a>(
 ///
 /// Returns the modified import statement.
 pub(crate) fn retain_imports(
-    imports: &[&str],
+    member_names: &[&str],
     stmt: &Stmt,
     locator: &Locator,
     stylist: &Stylist,
@@ -150,14 +124,11 @@ pub(crate) fn retain_imports(
         bail!("Expected Statement::Simple");
     };
 
-    let (aliases, import_module) = match body.body.first_mut() {
-        Some(SmallStatement::Import(import_body)) => (&mut import_body.names, None),
+    let aliases = match body.body.first_mut() {
+        Some(SmallStatement::Import(import_body)) => &mut import_body.names,
         Some(SmallStatement::ImportFrom(import_body)) => {
             if let ImportNames::Aliases(names) = &mut import_body.names {
-                (
-                    names,
-                    Some((&import_body.relative, import_body.module.as_ref())),
-                )
+                names
             } else {
                 bail!("Expected: ImportNames::Aliases");
             }
@@ -169,28 +140,9 @@ pub(crate) fn retain_imports(
     let trailing_comma = aliases.last().and_then(|alias| alias.comma.clone());
 
     aliases.retain(|alias| {
-        imports.iter().any(|import| {
-            let qualified_name = match import_module {
-                Some((relative, module)) => {
-                    let module = module.map(compose_module_path);
-                    let member = compose_module_path(&alias.name);
-                    let mut qualified_name = String::with_capacity(
-                        relative.len() + module.as_ref().map_or(0, String::len) + member.len() + 1,
-                    );
-                    for _ in 0..relative.len() {
-                        qualified_name.push('.');
-                    }
-                    if let Some(module) = module {
-                        qualified_name.push_str(&module);
-                        qualified_name.push('.');
-                    }
-                    qualified_name.push_str(&member);
-                    qualified_name
-                }
-                None => compose_module_path(&alias.name),
-            };
-            qualified_name == *import
-        })
+        member_names
+            .iter()
+            .any(|member| *member == compose_module_path(&alias.name))
     });
 
     // But avoid destroying any trailing comments.

crates/ruff/src/autofix/edits.rs

@@ -1,13 +1,14 @@
 //! Interface for generating autofix edits from higher-level actions (e.g., "remove an argument").
 use anyhow::{bail, Result};
+use ruff_python_ast::{self as ast, ExceptHandler, Expr, Keyword, Ranged, Stmt};
+use ruff_python_parser::{lexer, Mode};
 use ruff_text_size::{TextLen, TextRange, TextSize};
-use rustpython_parser::ast::{self, ExceptHandler, Expr, Keyword, Ranged, Stmt};
-use rustpython_parser::{lexer, Mode};
 
 use ruff_diagnostics::Edit;
-use ruff_python_ast::helpers;
-use ruff_python_ast::source_code::{Indexer, Locator, Stylist};
-use ruff_python_whitespace::{is_python_whitespace, NewlineWithTrailingNewline, PythonWhitespace};
+use ruff_python_codegen::Stylist;
+use ruff_python_index::Indexer;
+use ruff_python_trivia::{has_leading_content, is_python_whitespace, PythonWhitespace};
+use ruff_source_file::{Locator, NewlineWithTrailingNewline};
 
 use crate::autofix::codemods;
 
@@ -41,11 +42,9 @@ pub(crate) fn delete_stmt(
         if let Some(semicolon) = trailing_semicolon(stmt.end(), locator) {
             let next = next_stmt_break(semicolon, locator);
             Edit::deletion(stmt.start(), next)
-        } else if helpers::has_leading_content(stmt.start(), locator) {
+        } else if has_leading_content(stmt.start(), locator) {
             Edit::range_deletion(stmt.range())
-        } else if let Some(start) =
-            helpers::preceded_by_continuations(stmt.start(), locator, indexer)
-        {
+        } else if let Some(start) = indexer.preceded_by_continuations(stmt.start(), locator) {
             Edit::range_deletion(TextRange::new(start, stmt.end()))
         } else {
             let range = locator.full_lines_range(stmt.range());
@@ -56,14 +55,14 @@ pub(crate) fn delete_stmt(
 
 /// Generate a `Fix` to remove the specified imports from an `import` statement.
 pub(crate) fn remove_unused_imports<'a>(
-    unused_imports: impl Iterator<Item = &'a str>,
+    member_names: impl Iterator<Item = &'a str>,
     stmt: &Stmt,
     parent: Option<&Stmt>,
     locator: &Locator,
     stylist: &Stylist,
     indexer: &Indexer,
 ) -> Result<Edit> {
-    match codemods::remove_imports(unused_imports, stmt, locator, stylist)? {
+    match codemods::remove_imports(member_names, stmt, locator, stylist)? {
         None => Ok(delete_stmt(stmt, parent, locator, indexer)),
         Some(content) => Ok(Edit::range_replacement(content, stmt.range())),
     }
@@ -190,12 +189,24 @@ fn is_lone_child(child: &Stmt, parent: &Stmt) -> bool {
         }
         Stmt::For(ast::StmtFor { body, orelse, .. })
         | Stmt::AsyncFor(ast::StmtAsyncFor { body, orelse, .. })
-        | Stmt::While(ast::StmtWhile { body, orelse, .. })
-        | Stmt::If(ast::StmtIf { body, orelse, .. }) => {
+        | Stmt::While(ast::StmtWhile { body, orelse, .. }) => {
             if is_only(body, child) || is_only(orelse, child) {
                 return true;
             }
         }
+        Stmt::If(ast::StmtIf {
+            body,
+            elif_else_clauses,
+            ..
+        }) => {
+            if is_only(body, child)
+                || elif_else_clauses
+                    .iter()
+                    .any(|ast::ElifElseClause { body, .. }| is_only(body, child))
+            {
+                return true;
+            }
+        }
         Stmt::Try(ast::StmtTry {
             body,
             handlers,
@@ -283,11 +294,11 @@ fn next_stmt_break(semicolon: TextSize, locator: &Locator) -> TextSize {
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
+    use ruff_python_ast::{Ranged, Suite};
+    use ruff_python_parser::Parse;
     use ruff_text_size::TextSize;
-    use rustpython_parser::ast::{Ranged, Suite};
-    use rustpython_parser::Parse;
 
-    use ruff_python_ast::source_code::Locator;
+    use ruff_source_file::Locator;
 
     use crate::autofix::edits::{next_stmt_break, trailing_semicolon};
 

crates/ruff/src/autofix/mod.rs

@@ -1,12 +1,11 @@
+use itertools::Itertools;
 use std::collections::BTreeSet;
 
-use itertools::Itertools;
-use nohash_hasher::IntSet;
 use ruff_text_size::{TextLen, TextRange, TextSize};
-use rustc_hash::FxHashMap;
+use rustc_hash::{FxHashMap, FxHashSet};
 
 use ruff_diagnostics::{Diagnostic, Edit, Fix, IsolationLevel};
-use ruff_python_ast::source_code::Locator;
+use ruff_source_file::Locator;
 
 use crate::autofix::source_map::SourceMap;
 use crate::linter::FixTable;
@@ -47,7 +46,7 @@ fn apply_fixes<'a>(
     let mut output = String::with_capacity(locator.len());
     let mut last_pos: Option<TextSize> = None;
     let mut applied: BTreeSet<&Edit> = BTreeSet::default();
-    let mut isolated: IntSet<u32> = IntSet::default();
+    let mut isolated: FxHashSet<u32> = FxHashSet::default();
     let mut fixed = FxHashMap::default();
     let mut source_map = SourceMap::default();
 
@@ -60,35 +59,30 @@ fn apply_fixes<'a>(
         })
         .sorted_by(|(rule1, fix1), (rule2, fix2)| cmp_fix(*rule1, *rule2, fix1, fix2))
     {
-        // If we already applied an identical fix as part of another correction, skip
-        // any re-application.
-        if fix.edits().iter().all(|edit| applied.contains(edit)) {
-            *fixed.entry(rule).or_default() += 1;
-            continue;
-        }
+        let mut edits = fix
+            .edits()
+            .iter()
+            .filter(|edit| !applied.contains(edit))
+            .peekable();
 
-        // Best-effort approach: if this fix overlaps with a fix we've already applied,
-        // skip it.
-        if last_pos.map_or(false, |last_pos| {
-            fix.min_start()
-                .map_or(false, |fix_location| last_pos >= fix_location)
-        }) {
-            continue;
-        }
+        // If the fix contains at least one new edit, enforce isolation and positional requirements.
+        if let Some(first) = edits.peek() {
+            // If this fix requires isolation, and we've already applied another fix in the
+            // same isolation group, skip it.
+            if let IsolationLevel::Group(id) = fix.isolation() {
+                if !isolated.insert(id) {
+                    continue;
+                }
+            }
 
-        // If this fix requires isolation, and we've already applied another fix in the
-        // same isolation group, skip it.
-        if let IsolationLevel::Group(id) = fix.isolation() {
-            if !isolated.insert(id) {
+            // If this fix overlaps with a fix we've already applied, skip it.
+            if last_pos.map_or(false, |last_pos| last_pos >= first.start()) {
                 continue;
             }
         }
 
-        for edit in fix
-            .edits()
-            .iter()
-            .sorted_unstable_by_key(|edit| edit.start())
-        {
+        let mut applied_edits = Vec::with_capacity(fix.edits().len());
+        for edit in edits {
             // Add all contents from `last_pos` to `fix.location`.
             let slice = locator.slice(TextRange::new(last_pos.unwrap_or_default(), edit.start()));
             output.push_str(slice);
@@ -104,9 +98,10 @@ fn apply_fixes<'a>(
 
             // Track that the edit was applied.
             last_pos = Some(edit.end());
-            applied.insert(edit);
+            applied_edits.push(edit);
         }
 
+        applied.extend(applied_edits.drain(..));
         *fixed.entry(rule).or_default() += 1;
     }
 
@@ -147,7 +142,7 @@ mod tests {
     use ruff_diagnostics::Diagnostic;
     use ruff_diagnostics::Edit;
     use ruff_diagnostics::Fix;
-    use ruff_python_ast::source_code::Locator;
+    use ruff_source_file::Locator;
 
     use crate::autofix::source_map::SourceMarker;
     use crate::autofix::{apply_fixes, FixResult};

crates/ruff/src/checkers/ast/analyze/argument.rs

@@ -0,0 +1,27 @@
+use ruff_python_ast::{Arg, Ranged};
+
+use crate::checkers::ast::Checker;
+use crate::codes::Rule;
+use crate::rules::{flake8_builtins, pep8_naming, pycodestyle};
+
+/// Run lint rules over an [`Arg`] syntax node.
+pub(crate) fn argument(arg: &Arg, checker: &mut Checker) {
+    if checker.enabled(Rule::AmbiguousVariableName) {
+        if let Some(diagnostic) = pycodestyle::rules::ambiguous_variable_name(&arg.arg, arg.range())
+        {
+            checker.diagnostics.push(diagnostic);
+        }
+    }
+    if checker.enabled(Rule::InvalidArgumentName) {
+        if let Some(diagnostic) = pep8_naming::rules::invalid_argument_name(
+            &arg.arg,
+            arg,
+            &checker.settings.pep8_naming.ignore_names,
+        ) {
+            checker.diagnostics.push(diagnostic);
+        }
+    }
+    if checker.enabled(Rule::BuiltinArgumentShadowing) {
+        flake8_builtins::rules::builtin_argument_shadowing(checker, arg);
+    }
+}

crates/ruff/src/checkers/ast/analyze/arguments.rs

@@ -0,0 +1,26 @@
+use ruff_python_ast::Arguments;
+
+use crate::checkers::ast::Checker;
+use crate::codes::Rule;
+use crate::rules::{flake8_bugbear, flake8_pyi, ruff};
+
+/// Run lint rules over a [`Arguments`] syntax node.
+pub(crate) fn arguments(arguments: &Arguments, checker: &mut Checker) {
+    if checker.enabled(Rule::MutableArgumentDefault) {
+        flake8_bugbear::rules::mutable_argument_default(checker, arguments);
+    }
+    if checker.enabled(Rule::FunctionCallInDefaultArgument) {
+        flake8_bugbear::rules::function_call_in_argument_default(checker, arguments);
+    }
+    if checker.settings.rules.enabled(Rule::ImplicitOptional) {
+        ruff::rules::implicit_optional(checker, arguments);
+    }
+    if checker.is_stub {
+        if checker.enabled(Rule::TypedArgumentDefaultInStub) {
+            flake8_pyi::rules::typed_argument_simple_defaults(checker, arguments);
+        }
+        if checker.enabled(Rule::ArgumentDefaultInStub) {
+            flake8_pyi::rules::argument_simple_defaults(checker, arguments);
+        }
+    }
+}

crates/ruff/src/checkers/ast/analyze/bindings.rs

@@ -0,0 +1,69 @@
+use ruff_diagnostics::{Diagnostic, Fix};
+
+use crate::checkers::ast::Checker;
+use crate::codes::Rule;
+use crate::rules::{flake8_import_conventions, flake8_pyi, pyflakes, pylint};
+
+/// Run lint rules over the [`Binding`]s.
+pub(crate) fn bindings(checker: &mut Checker) {
+    if !checker.any_enabled(&[
+        Rule::InvalidAllFormat,
+        Rule::InvalidAllObject,
+        Rule::UnaliasedCollectionsAbcSetImport,
+        Rule::UnconventionalImportAlias,
+        Rule::UnusedVariable,
+    ]) {
+        return;
+    }
+
+    for binding in checker.semantic.bindings.iter() {
+        if checker.enabled(Rule::UnusedVariable) {
+            if binding.kind.is_bound_exception() && !binding.is_used() {
+                let mut diagnostic = Diagnostic::new(
+                    pyflakes::rules::UnusedVariable {
+                        name: binding.name(checker.locator).to_string(),
+                    },
+                    binding.range,
+                );
+                if checker.patch(Rule::UnusedVariable) {
+                    diagnostic.try_set_fix(|| {
+                        pyflakes::fixes::remove_exception_handler_assignment(
+                            binding,
+                            checker.locator,
+                        )
+                        .map(Fix::automatic)
+                    });
+                }
+                checker.diagnostics.push(diagnostic);
+            }
+        }
+        if checker.enabled(Rule::InvalidAllFormat) {
+            if let Some(diagnostic) = pylint::rules::invalid_all_format(binding) {
+                checker.diagnostics.push(diagnostic);
+            }
+        }
+        if checker.enabled(Rule::InvalidAllObject) {
+            if let Some(diagnostic) = pylint::rules::invalid_all_object(binding) {
+                checker.diagnostics.push(diagnostic);
+            }
+        }
+        if checker.enabled(Rule::UnconventionalImportAlias) {
+            if let Some(diagnostic) = flake8_import_conventions::rules::unconventional_import_alias(
+                checker,
+                binding,
+                &checker.settings.flake8_import_conventions.aliases,
+            ) {
+                checker.diagnostics.push(diagnostic);
+            }
+        }
+        if checker.is_stub {
+            if checker.enabled(Rule::UnaliasedCollectionsAbcSetImport) {
+                if let Some(diagnostic) =
+                    flake8_pyi::rules::unaliased_collections_abc_set_import(checker, binding)
+                {
+                    checker.diagnostics.push(diagnostic);
+                }
+            }
+        }
+    }
+}

crates/ruff/src/checkers/ast/analyze/comprehension.rs

@@ -0,0 +1,16 @@
+use ruff_python_ast::Comprehension;
+
+use crate::checkers::ast::Checker;
+use crate::codes::Rule;
+use crate::rules::flake8_simplify;
+
+/// Run lint rules over a [`Comprehension`] syntax nodes.
+pub(crate) fn comprehension(comprehension: &Comprehension, checker: &mut Checker) {
+    if checker.enabled(Rule::InDictKeys) {
+        flake8_simplify::rules::key_in_dict_for(
+            checker,
+            &comprehension.target,
+            &comprehension.iter,
+        );
+    }
+}

crates/ruff/src/checkers/ast/analyze/deferred_for_loops.rs

@@ -0,0 +1,32 @@
+use ruff_python_ast::{self as ast, Stmt};
+
+use crate::checkers::ast::Checker;
+use crate::codes::Rule;
+use crate::rules::{flake8_bugbear, perflint};
+
+/// Run lint rules over all deferred for-loops in the [`SemanticModel`].
+pub(crate) fn deferred_for_loops(checker: &mut Checker) {
+    while !checker.deferred.for_loops.is_empty() {
+        let for_loops = std::mem::take(&mut checker.deferred.for_loops);
+        for snapshot in for_loops {
+            checker.semantic.restore(snapshot);
+
+            if let Stmt::For(ast::StmtFor {
+                target, iter, body, ..
+            })
+            | Stmt::AsyncFor(ast::StmtAsyncFor {
+                target, iter, body, ..
+            }) = &checker.semantic.stmt()
+            {
+                if checker.enabled(Rule::UnusedLoopControlVariable) {
+                    flake8_bugbear::rules::unused_loop_control_variable(checker, target, body);
+                }
+                if checker.enabled(Rule::IncorrectDictIterator) {
+                    perflint::rules::incorrect_dict_iterator(checker, target, iter);
+                }
+            } else {
+                unreachable!("Expected Expr::For | Expr::AsyncFor");
+            }
+        }
+    }
+}

crates/ruff/src/checkers/ast/analyze/deferred_scopes.rs

@@ -0,0 +1,306 @@
+use ruff_diagnostics::Diagnostic;
+use ruff_python_ast::cast;
+use ruff_python_semantic::analyze::{branch_detection, visibility};
+use ruff_python_semantic::{Binding, BindingKind, ScopeKind};
+
+use crate::checkers::ast::Checker;
+use crate::codes::Rule;
+use crate::rules::{flake8_pyi, flake8_type_checking, flake8_unused_arguments, pyflakes, pylint};
+
+/// Run lint rules over all deferred scopes in the [`SemanticModel`].
+pub(crate) fn deferred_scopes(checker: &mut Checker) {
+    if !checker.any_enabled(&[
+        Rule::GlobalVariableNotAssigned,
+        Rule::ImportShadowedByLoopVar,
+        Rule::RedefinedWhileUnused,
+        Rule::RuntimeImportInTypeCheckingBlock,
+        Rule::TypingOnlyFirstPartyImport,
+        Rule::TypingOnlyStandardLibraryImport,
+        Rule::TypingOnlyThirdPartyImport,
+        Rule::UndefinedLocal,
+        Rule::UnusedAnnotation,
+        Rule::UnusedClassMethodArgument,
+        Rule::UnusedFunctionArgument,
+        Rule::UnusedImport,
+        Rule::UnusedLambdaArgument,
+        Rule::UnusedMethodArgument,
+        Rule::UnusedPrivateProtocol,
+        Rule::UnusedPrivateTypeAlias,
+        Rule::UnusedPrivateTypeVar,
+        Rule::UnusedPrivateTypedDict,
+        Rule::UnusedStaticMethodArgument,
+        Rule::UnusedVariable,
+    ]) {
+        return;
+    }
+
+    // Identify any valid runtime imports. If a module is imported at runtime, and
+    // used at runtime, then by default, we avoid flagging any other
+    // imports from that model as typing-only.
+    let enforce_typing_imports = !checker.is_stub
+        && checker.any_enabled(&[
+            Rule::RuntimeImportInTypeCheckingBlock,
+            Rule::TypingOnlyFirstPartyImport,
+            Rule::TypingOnlyStandardLibraryImport,
+            Rule::TypingOnlyThirdPartyImport,
+        ]);
+    let runtime_imports: Vec<Vec<&Binding>> = if enforce_typing_imports {
+        checker
+            .semantic
+            .scopes
+            .iter()
+            .map(|scope| {
+                scope
+                    .binding_ids()
+                    .map(|binding_id| checker.semantic.binding(binding_id))
+                    .filter(|binding| {
+                        flake8_type_checking::helpers::is_valid_runtime_import(
+                            binding,
+                            &checker.semantic,
+                        )
+                    })
+                    .collect()
+            })
+            .collect::<Vec<_>>()
+    } else {
+        vec![]
+    };
+
+    let mut diagnostics: Vec<Diagnostic> = vec![];
+    for scope_id in checker.deferred.scopes.iter().rev().copied() {
+        let scope = &checker.semantic.scopes[scope_id];
+
+        if checker.enabled(Rule::UndefinedLocal) {
+            pyflakes::rules::undefined_local(checker, scope_id, scope, &mut diagnostics);
+        }
+
+        if checker.enabled(Rule::GlobalVariableNotAssigned) {
+            for (name, binding_id) in scope.bindings() {
+                let binding = checker.semantic.binding(binding_id);
+                if binding.kind.is_global() {
+                    diagnostics.push(Diagnostic::new(
+                        pylint::rules::GlobalVariableNotAssigned {
+                            name: (*name).to_string(),
+                        },
+                        binding.range,
+                    ));
+                }
+            }
+        }
+
+        if checker.enabled(Rule::ImportShadowedByLoopVar) {
+            for (name, binding_id) in scope.bindings() {
+                for shadow in checker.semantic.shadowed_bindings(scope_id, binding_id) {
+                    // If the shadowing binding isn't a loop variable, abort.
+                    let binding = &checker.semantic.bindings[shadow.binding_id()];
+                    if !binding.kind.is_loop_var() {
+                        continue;
+                    }
+
+                    // If the shadowed binding isn't an import, abort.
+                    let shadowed = &checker.semantic.bindings[shadow.shadowed_id()];
+                    if !matches!(
+                        shadowed.kind,
+                        BindingKind::Import(..)
+                            | BindingKind::FromImport(..)
+                            | BindingKind::SubmoduleImport(..)
+                            | BindingKind::FutureImport
+                    ) {
+                        continue;
+                    }
+
+                    // If the bindings are in different forks, abort.
+                    if shadowed.source.map_or(true, |left| {
+                        binding.source.map_or(true, |right| {
+                            branch_detection::different_forks(left, right, &checker.semantic.stmts)
+                        })
+                    }) {
+                        continue;
+                    }
+
+                    #[allow(deprecated)]
+                    let line = checker.locator.compute_line_index(shadowed.range.start());
+
+                    checker.diagnostics.push(Diagnostic::new(
+                        pyflakes::rules::ImportShadowedByLoopVar {
+                            name: name.to_string(),
+                            line,
+                        },
+                        binding.range,
+                    ));
+                }
+            }
+        }
+
+        if checker.enabled(Rule::RedefinedWhileUnused) {
+            for (name, binding_id) in scope.bindings() {
+                for shadow in checker.semantic.shadowed_bindings(scope_id, binding_id) {
+                    // If the shadowing binding is a loop variable, abort, to avoid overlap
+                    // with F402.
+                    let binding = &checker.semantic.bindings[shadow.binding_id()];
+                    if binding.kind.is_loop_var() {
+                        continue;
+                    }
+
+                    // If the shadowed binding is used, abort.
+                    let shadowed = &checker.semantic.bindings[shadow.shadowed_id()];
+                    if shadowed.is_used() {
+                        continue;
+                    }
+
+                    // If the shadowing binding isn't considered a "redefinition" of the
+                    // shadowed binding, abort.
+                    if !binding.redefines(shadowed) {
+                        continue;
+                    }
+
+                    if shadow.same_scope() {
+                        // If the symbol is a dummy variable, abort, unless the shadowed
+                        // binding is an import.
+                        if !matches!(
+                            shadowed.kind,
+                            BindingKind::Import(..)
+                                | BindingKind::FromImport(..)
+                                | BindingKind::SubmoduleImport(..)
+                                | BindingKind::FutureImport
+                        ) && checker.settings.dummy_variable_rgx.is_match(name)
+                        {
+                            continue;
+                        }
+
+                        // If this is an overloaded function, abort.
+                        if shadowed.kind.is_function_definition()
+                            && visibility::is_overload(
+                                cast::decorator_list(
+                                    checker.semantic.stmts[shadowed.source.unwrap()],
+                                ),
+                                &checker.semantic,
+                            )
+                        {
+                            continue;
+                        }
+                    } else {
+                        // Only enforce cross-scope shadowing for imports.
+                        if !matches!(
+                            shadowed.kind,
+                            BindingKind::Import(..)
+                                | BindingKind::FromImport(..)
+                                | BindingKind::SubmoduleImport(..)
+                                | BindingKind::FutureImport
+                        ) {
+                            continue;
+                        }
+                    }
+
+                    // If the bindings are in different forks, abort.
+                    if shadowed.source.map_or(true, |left| {
+                        binding.source.map_or(true, |right| {
+                            branch_detection::different_forks(left, right, &checker.semantic.stmts)
+                        })
+                    }) {
+                        continue;
+                    }
+
+                    #[allow(deprecated)]
+                    let line = checker.locator.compute_line_index(shadowed.range.start());
+                    let mut diagnostic = Diagnostic::new(
+                        pyflakes::rules::RedefinedWhileUnused {
+                            name: (*name).to_string(),
+                            line,
+                        },
+                        binding.range,
+                    );
+                    if let Some(range) = binding.parent_range(&checker.semantic) {
+                        diagnostic.set_parent(range.start());
+                    }
+                    diagnostics.push(diagnostic);
+                }
+            }
+        }
+
+        if checker.is_stub {
+            if checker.enabled(Rule::UnusedPrivateTypeVar) {
+                flake8_pyi::rules::unused_private_type_var(checker, scope, &mut diagnostics);
+            }
+            if checker.enabled(Rule::UnusedPrivateProtocol) {
+                flake8_pyi::rules::unused_private_protocol(checker, scope, &mut diagnostics);
+            }
+            if checker.enabled(Rule::UnusedPrivateTypeAlias) {
+                flake8_pyi::rules::unused_private_type_alias(checker, scope, &mut diagnostics);
+            }
+            if checker.enabled(Rule::UnusedPrivateTypedDict) {
+                flake8_pyi::rules::unused_private_typed_dict(checker, scope, &mut diagnostics);
+            }
+        }
+
+        if matches!(
+            scope.kind,
+            ScopeKind::Function(_) | ScopeKind::AsyncFunction(_) | ScopeKind::Lambda(_)
+        ) {
+            if checker.enabled(Rule::UnusedVariable) {
+                pyflakes::rules::unused_variable(checker, scope, &mut diagnostics);
+            }
+
+            if checker.enabled(Rule::UnusedAnnotation) {
+                pyflakes::rules::unused_annotation(checker, scope, &mut diagnostics);
+            }
+
+            if !checker.is_stub {
+                if checker.any_enabled(&[
+                    Rule::UnusedClassMethodArgument,
+                    Rule::UnusedFunctionArgument,
+                    Rule::UnusedLambdaArgument,
+                    Rule::UnusedMethodArgument,
+                    Rule::UnusedStaticMethodArgument,
+                ]) {
+                    flake8_unused_arguments::rules::unused_arguments(
+                        checker,
+                        scope,
+                        &mut diagnostics,
+                    );
+                }
+            }
+        }
+
+        if matches!(
+            scope.kind,
+            ScopeKind::Function(_) | ScopeKind::AsyncFunction(_) | ScopeKind::Module
+        ) {
+            if enforce_typing_imports {
+                let runtime_imports: Vec<&Binding> = checker
+                    .semantic
+                    .scopes
+                    .ancestor_ids(scope_id)
+                    .flat_map(|scope_id| runtime_imports[scope_id.as_usize()].iter())
+                    .copied()
+                    .collect();
+
+                if checker.enabled(Rule::RuntimeImportInTypeCheckingBlock) {
+                    flake8_type_checking::rules::runtime_import_in_type_checking_block(
+                        checker,
+                        scope,
+                        &mut diagnostics,
+                    );
+                }
+
+                if checker.any_enabled(&[
+                    Rule::TypingOnlyFirstPartyImport,
+                    Rule::TypingOnlyStandardLibraryImport,
+                    Rule::TypingOnlyThirdPartyImport,
+                ]) {
+                    flake8_type_checking::rules::typing_only_runtime_import(
+                        checker,
+                        scope,
+                        &runtime_imports,
+                        &mut diagnostics,
+                    );
+                }
+            }
+
+            if checker.enabled(Rule::UnusedImport) {
+                pyflakes::rules::unused_import(checker, scope, &mut diagnostics);
+            }
+        }
+    }
+    checker.diagnostics.extend(diagnostics);
+}

crates/ruff/src/checkers/ast/analyze/definitions.rs

@@ -0,0 +1,291 @@
+use ruff_python_ast::str::raw_contents_range;
+use ruff_python_ast::Ranged;
+use ruff_text_size::TextRange;
+
+use ruff_python_semantic::{BindingKind, ContextualizedDefinition, Export};
+
+use crate::checkers::ast::Checker;
+use crate::codes::Rule;
+use crate::docstrings::Docstring;
+use crate::fs::relativize_path;
+use crate::rules::{flake8_annotations, flake8_pyi, pydocstyle};
+use crate::{docstrings, warn_user};
+
+/// Run lint rules over all [`Definition`] nodes in the [`SemanticModel`].
+///
+/// This phase is expected to run after the AST has been traversed in its entirety; as such,
+/// it is expected that all [`Definition`] nodes have been visited by the time, and that this
+/// method will not recurse into any other nodes.
+pub(crate) fn definitions(checker: &mut Checker) {
+    let enforce_annotations = checker.any_enabled(&[
+        Rule::AnyType,
+        Rule::MissingReturnTypeClassMethod,
+        Rule::MissingReturnTypePrivateFunction,
+        Rule::MissingReturnTypeSpecialMethod,
+        Rule::MissingReturnTypeStaticMethod,
+        Rule::MissingReturnTypeUndocumentedPublicFunction,
+        Rule::MissingTypeArgs,
+        Rule::MissingTypeCls,
+        Rule::MissingTypeFunctionArgument,
+        Rule::MissingTypeKwargs,
+        Rule::MissingTypeSelf,
+    ]);
+    let enforce_stubs = checker.is_stub
+        && checker.any_enabled(&[Rule::DocstringInStub, Rule::IterMethodReturnIterable]);
+    let enforce_docstrings = checker.any_enabled(&[
+        Rule::BlankLineAfterLastSection,
+        Rule::BlankLineAfterSummary,
+        Rule::BlankLineBeforeClass,
+        Rule::BlankLinesBetweenHeaderAndContent,
+        Rule::CapitalizeSectionName,
+        Rule::DashedUnderlineAfterSection,
+        Rule::DocstringStartsWithThis,
+        Rule::EmptyDocstring,
+        Rule::EmptyDocstringSection,
+        Rule::EndsInPeriod,
+        Rule::EndsInPunctuation,
+        Rule::EscapeSequenceInDocstring,
+        Rule::FirstLineCapitalized,
+        Rule::FitsOnOneLine,
+        Rule::IndentWithSpaces,
+        Rule::MultiLineSummaryFirstLine,
+        Rule::MultiLineSummarySecondLine,
+        Rule::NewLineAfterLastParagraph,
+        Rule::NewLineAfterSectionName,
+        Rule::NoBlankLineAfterFunction,
+        Rule::NoBlankLineAfterSection,
+        Rule::NoBlankLineBeforeFunction,
+        Rule::NoBlankLineBeforeSection,
+        Rule::NoSignature,
+        Rule::NonImperativeMood,
+        Rule::OneBlankLineAfterClass,
+        Rule::OneBlankLineBeforeClass,
+        Rule::OverIndentation,
+        Rule::OverloadWithDocstring,
+        Rule::SectionNameEndsInColon,
+        Rule::SectionNotOverIndented,
+        Rule::SectionUnderlineAfterName,
+        Rule::SectionUnderlineMatchesSectionLength,
+        Rule::SectionUnderlineNotOverIndented,
+        Rule::SurroundingWhitespace,
+        Rule::TripleSingleQuotes,
+        Rule::UnderIndentation,
+        Rule::UndocumentedMagicMethod,
+        Rule::UndocumentedParam,
+        Rule::UndocumentedPublicClass,
+        Rule::UndocumentedPublicFunction,
+        Rule::UndocumentedPublicInit,
+        Rule::UndocumentedPublicMethod,
+        Rule::UndocumentedPublicModule,
+        Rule::UndocumentedPublicNestedClass,
+        Rule::UndocumentedPublicPackage,
+    ]);
+
+    if !enforce_annotations && !enforce_docstrings && !enforce_stubs {
+        return;
+    }
+
+    // Compute visibility of all definitions.
+    let exports: Option<Vec<&str>> = {
+        checker
+            .semantic
+            .global_scope()
+            .get_all("__all__")
+            .map(|binding_id| &checker.semantic.bindings[binding_id])
+            .filter_map(|binding| match &binding.kind {
+                BindingKind::Export(Export { names }) => Some(names.iter().copied()),
+                _ => None,
+            })
+            .fold(None, |acc, names| {
+                Some(acc.into_iter().flatten().chain(names).collect())
+            })
+    };
+
+    let definitions = std::mem::take(&mut checker.semantic.definitions);
+    let mut overloaded_name: Option<String> = None;
+    for ContextualizedDefinition {
+        definition,
+        visibility,
+    } in definitions.resolve(exports.as_deref()).iter()
+    {
+        let docstring = docstrings::extraction::extract_docstring(definition);
+
+        // flake8-annotations
+        if enforce_annotations {
+            // TODO(charlie): This should be even stricter, in that an overload
+            // implementation should come immediately after the overloaded
+            // interfaces, without any AST nodes in between. Right now, we
+            // only error when traversing definition boundaries (functions,
+            // classes, etc.).
+            if !overloaded_name.map_or(false, |overloaded_name| {
+                flake8_annotations::helpers::is_overload_impl(
+                    definition,
+                    &overloaded_name,
+                    &checker.semantic,
+                )
+            }) {
+                checker
+                    .diagnostics
+                    .extend(flake8_annotations::rules::definition(
+                        checker,
+                        definition,
+                        *visibility,
+                    ));
+            }
+            overloaded_name =
+                flake8_annotations::helpers::overloaded_name(definition, &checker.semantic);
+        }
+
+        // flake8-pyi
+        if enforce_stubs {
+            if checker.enabled(Rule::DocstringInStub) {
+                flake8_pyi::rules::docstring_in_stubs(checker, docstring);
+            }
+            if checker.enabled(Rule::IterMethodReturnIterable) {
+                flake8_pyi::rules::iter_method_return_iterable(checker, definition);
+            }
+        }
+
+        // pydocstyle
+        if enforce_docstrings {
+            if pydocstyle::helpers::should_ignore_definition(
+                definition,
+                &checker.settings.pydocstyle.ignore_decorators,
+                &checker.semantic,
+            ) {
+                continue;
+            }
+
+            // Extract a `Docstring` from a `Definition`.
+            let Some(expr) = docstring else {
+                pydocstyle::rules::not_missing(checker, definition, *visibility);
+                continue;
+            };
+
+            let contents = checker.locator.slice(expr.range());
+
+            let indentation = checker.locator.slice(TextRange::new(
+                checker.locator.line_start(expr.start()),
+                expr.start(),
+            ));
+
+            if pydocstyle::helpers::should_ignore_docstring(contents) {
+                #[allow(deprecated)]
+                let location = checker.locator.compute_source_location(expr.start());
+                warn_user!(
+                    "Docstring at {}:{}:{} contains implicit string concatenation; ignoring...",
+                    relativize_path(checker.path),
+                    location.row,
+                    location.column
+                );
+                continue;
+            }
+
+            // SAFETY: Safe for docstrings that pass `should_ignore_docstring`.
+            let body_range = raw_contents_range(contents).unwrap();
+            let docstring = Docstring {
+                definition,
+                expr,
+                contents,
+                body_range,
+                indentation,
+            };
+
+            if !pydocstyle::rules::not_empty(checker, &docstring) {
+                continue;
+            }
+            if checker.enabled(Rule::FitsOnOneLine) {
+                pydocstyle::rules::one_liner(checker, &docstring);
+            }
+            if checker.any_enabled(&[
+                Rule::NoBlankLineAfterFunction,
+                Rule::NoBlankLineBeforeFunction,
+            ]) {
+                pydocstyle::rules::blank_before_after_function(checker, &docstring);
+            }
+            if checker.any_enabled(&[
+                Rule::BlankLineBeforeClass,
+                Rule::OneBlankLineAfterClass,
+                Rule::OneBlankLineBeforeClass,
+            ]) {
+                pydocstyle::rules::blank_before_after_class(checker, &docstring);
+            }
+            if checker.enabled(Rule::BlankLineAfterSummary) {
+                pydocstyle::rules::blank_after_summary(checker, &docstring);
+            }
+            if checker.any_enabled(&[
+                Rule::IndentWithSpaces,
+                Rule::OverIndentation,
+                Rule::UnderIndentation,
+            ]) {
+                pydocstyle::rules::indent(checker, &docstring);
+            }
+            if checker.enabled(Rule::NewLineAfterLastParagraph) {
+                pydocstyle::rules::newline_after_last_paragraph(checker, &docstring);
+            }
+            if checker.enabled(Rule::SurroundingWhitespace) {
+                pydocstyle::rules::no_surrounding_whitespace(checker, &docstring);
+            }
+            if checker.any_enabled(&[
+                Rule::MultiLineSummaryFirstLine,
+                Rule::MultiLineSummarySecondLine,
+            ]) {
+                pydocstyle::rules::multi_line_summary_start(checker, &docstring);
+            }
+            if checker.enabled(Rule::TripleSingleQuotes) {
+                pydocstyle::rules::triple_quotes(checker, &docstring);
+            }
+            if checker.enabled(Rule::EscapeSequenceInDocstring) {
+                pydocstyle::rules::backslashes(checker, &docstring);
+            }
+            if checker.enabled(Rule::EndsInPeriod) {
+                pydocstyle::rules::ends_with_period(checker, &docstring);
+            }
+            if checker.enabled(Rule::NonImperativeMood) {
+                pydocstyle::rules::non_imperative_mood(
+                    checker,
+                    &docstring,
+                    &checker.settings.pydocstyle.property_decorators,
+                );
+            }
+            if checker.enabled(Rule::NoSignature) {
+                pydocstyle::rules::no_signature(checker, &docstring);
+            }
+            if checker.enabled(Rule::FirstLineCapitalized) {
+                pydocstyle::rules::capitalized(checker, &docstring);
+            }
+            if checker.enabled(Rule::DocstringStartsWithThis) {
+                pydocstyle::rules::starts_with_this(checker, &docstring);
+            }
+            if checker.enabled(Rule::EndsInPunctuation) {
+                pydocstyle::rules::ends_with_punctuation(checker, &docstring);
+            }
+            if checker.enabled(Rule::OverloadWithDocstring) {
+                pydocstyle::rules::if_needed(checker, &docstring);
+            }
+            if checker.any_enabled(&[
+                Rule::BlankLineAfterLastSection,
+                Rule::BlankLinesBetweenHeaderAndContent,
+                Rule::CapitalizeSectionName,
+                Rule::DashedUnderlineAfterSection,
+                Rule::EmptyDocstringSection,
+                Rule::MultiLineSummaryFirstLine,
+                Rule::NewLineAfterSectionName,
+                Rule::NoBlankLineAfterSection,
+                Rule::NoBlankLineBeforeSection,
+                Rule::SectionNameEndsInColon,
+                Rule::SectionNotOverIndented,
+                Rule::SectionUnderlineAfterName,
+                Rule::SectionUnderlineMatchesSectionLength,
+                Rule::SectionUnderlineNotOverIndented,
+                Rule::UndocumentedParam,
+            ]) {
+                pydocstyle::rules::sections(
+                    checker,
+                    &docstring,
+                    checker.settings.pydocstyle.convention.as_ref(),
+                );
+            }
+        }
+    }
+}

crates/ruff/src/checkers/ast/analyze/except_handler.rs

@@ -0,0 +1,88 @@
+use ruff_python_ast::{self as ast, ExceptHandler, Ranged};
+
+use crate::checkers::ast::Checker;
+use crate::registry::Rule;
+use crate::rules::{
+    flake8_bandit, flake8_blind_except, flake8_bugbear, flake8_builtins, pycodestyle, pylint,
+    tryceratops,
+};
+
+/// Run lint rules over an [`ExceptHandler`] syntax node.
+pub(crate) fn except_handler(except_handler: &ExceptHandler, checker: &mut Checker) {
+    match except_handler {
+        ExceptHandler::ExceptHandler(ast::ExceptHandlerExceptHandler {
+            type_,
+            name,
+            body,
+            range: _,
+        }) => {
+            if checker.enabled(Rule::BareExcept) {
+                if let Some(diagnostic) = pycodestyle::rules::bare_except(
+                    type_.as_deref(),
+                    body,
+                    except_handler,
+                    checker.locator,
+                ) {
+                    checker.diagnostics.push(diagnostic);
+                }
+            }
+            if checker.enabled(Rule::RaiseWithoutFromInsideExcept) {
+                flake8_bugbear::rules::raise_without_from_inside_except(
+                    checker,
+                    name.as_deref(),
+                    body,
+                );
+            }
+            if checker.enabled(Rule::BlindExcept) {
+                flake8_blind_except::rules::blind_except(
+                    checker,
+                    type_.as_deref(),
+                    name.as_deref(),
+                    body,
+                );
+            }
+            if checker.enabled(Rule::TryExceptPass) {
+                flake8_bandit::rules::try_except_pass(
+                    checker,
+                    except_handler,
+                    type_.as_deref(),
+                    body,
+                    checker.settings.flake8_bandit.check_typed_exception,
+                );
+            }
+            if checker.enabled(Rule::TryExceptContinue) {
+                flake8_bandit::rules::try_except_continue(
+                    checker,
+                    except_handler,
+                    type_.as_deref(),
+                    body,
+                    checker.settings.flake8_bandit.check_typed_exception,
+                );
+            }
+            if checker.enabled(Rule::ExceptWithEmptyTuple) {
+                flake8_bugbear::rules::except_with_empty_tuple(checker, except_handler);
+            }
+            if checker.enabled(Rule::ExceptWithNonExceptionClasses) {
+                flake8_bugbear::rules::except_with_non_exception_classes(checker, except_handler);
+            }
+            if checker.enabled(Rule::ReraiseNoCause) {
+                tryceratops::rules::reraise_no_cause(checker, body);
+            }
+            if checker.enabled(Rule::BinaryOpException) {
+                pylint::rules::binary_op_exception(checker, except_handler);
+            }
+            if let Some(name) = name {
+                if checker.enabled(Rule::AmbiguousVariableName) {
+                    if let Some(diagnostic) =
+                        pycodestyle::rules::ambiguous_variable_name(name.as_str(), name.range())
+                    {
+                        checker.diagnostics.push(diagnostic);
+                    }
+                }
+                if checker.enabled(Rule::BuiltinVariableShadowing) {
+                    flake8_builtins::rules::builtin_variable_shadowing(checker, name, name.range());
+                }
+            }
+        }
+    }
+}

crates/ruff/src/checkers/ast/analyze/mod.rs

@@ -0,0 +1,27 @@
+pub(super) use argument::argument;
+pub(super) use arguments::arguments;
+pub(super) use bindings::bindings;
+pub(super) use comprehension::comprehension;
+pub(super) use deferred_for_loops::deferred_for_loops;
+pub(super) use deferred_scopes::deferred_scopes;
+pub(super) use definitions::definitions;
+pub(super) use except_handler::except_handler;
+pub(super) use expression::expression;
+pub(super) use module::module;
+pub(super) use statement::statement;
+pub(super) use suite::suite;
+pub(super) use unresolved_references::unresolved_references;
+
+mod argument;
+mod arguments;
+mod bindings;
+mod comprehension;
+mod deferred_for_loops;
+mod deferred_scopes;
+mod definitions;
+mod except_handler;
+mod expression;
+mod module;
+mod statement;
+mod suite;
+mod unresolved_references;

crates/ruff/src/checkers/ast/analyze/module.rs

@@ -0,0 +1,12 @@
+use ruff_python_ast::Suite;
+
+use crate::checkers::ast::Checker;
+use crate::codes::Rule;
+use crate::rules::flake8_bugbear;
+
+/// Run lint rules over a module.
+pub(crate) fn module(suite: &Suite, checker: &mut Checker) {
+    if checker.enabled(Rule::FStringDocstring) {
+        flake8_bugbear::rules::f_string_docstring(checker, suite);
+    }
+}

crates/ruff/src/checkers/ast/analyze/suite.rs

@@ -0,0 +1,12 @@
+use ruff_python_ast::Stmt;
+
+use crate::checkers::ast::Checker;
+use crate::codes::Rule;
+use crate::rules::flake8_pie;
+
+/// Run lint rules over a suite of [`Stmt`] syntax nodes.
+pub(crate) fn suite(suite: &[Stmt], checker: &mut Checker) {
+    if checker.enabled(Rule::UnnecessaryPass) {
+        flake8_pie::rules::no_unnecessary_pass(checker, suite);
+    }
+}