Make CallPath its own struct

.gitignore

@@ -3,7 +3,6 @@
 crates/ruff/resources/test/cpython
 mkdocs.yml
 .overrides
-github_search.jsonl
 
 ###
 # Rust.gitignore

BREAKING_CHANGES.md

@@ -1,40 +1,5 @@
 # Breaking Changes
 
-## 0.0.260
-
-### Fixes are now represented as a list of edits ([#3709](https://github.com/charliermarsh/ruff/pull/3709))
-
-Previously, Ruff represented each fix as a single edit, which prohibited Ruff from automatically
-fixing violations that required multiple edits across a file. As such, Ruff now represents each
-fix as a list of edits.
-
-This primarily affects the JSON API. Ruff's JSON representation used to represent the `fix` field as
-a single edit, like so:
-
-```json
-{
-    "message": "Remove unused import: `sys`",
-    "content": "",
-    "location": {"row": 1, "column": 0},
-    "end_location": {"row": 2, "column": 0}
-}
-```
-
-The updated representation instead includes a list of edits:
-
-```json
-{
-    "message": "Remove unused import: `sys`",
-    "edits": [
-        {
-            "content": "",
-            "location": {"row": 1, "column": 0},
-            "end_location": {"row": 2, "column": 0},
-        }
-    ]
-}
-```
-
 ## 0.0.246
 
 ### `multiple-statements-on-one-line-def` (`E704`) was removed ([#2773](https://github.com/charliermarsh/ruff/pull/2773))

CONTRIBUTING.md

@@ -116,7 +116,8 @@ At a high level, the steps involved in adding a new lint rule are as follows:
 To define the violation, start by creating a dedicated file for your rule under the appropriate
 rule linter (e.g., `crates/ruff/src/rules/flake8_bugbear/rules/abstract_base_class.rs`). That file should
 contain a struct defined via `#[violation]`, along with a function that creates the violation
-based on any required inputs.
+based on any required inputs. (Many of the existing examples live in `crates/ruff/src/violations.rs`,
+but we're looking to place new rules in their own files.)
 
 To trigger the violation, you'll likely want to augment the logic in `crates/ruff/src/checkers/ast.rs`,
 which defines the Python AST visitor, responsible for iterating over the abstract syntax tree and
@@ -214,20 +215,6 @@ them to [PyPI](https://pypi.org/project/ruff/).
 Ruff follows the [semver](https://semver.org/) versioning standard. However, as pre-1.0 software,
 even patch releases may contain [non-backwards-compatible changes](https://semver.org/#spec-item-4).
 
-## Ecosystem CI
-
-GitHub Actions will run your changes against a number of real-world projects from GitHub and
-report on any diagnostic differences. You can also run those checks locally via:
-
-```shell
-python scripts/check_ecosystem.py path/to/your/ruff path/to/older/ruff
-```
-
-You can also run the Ecosystem CI check in a Docker container across a larger set of projects by
-downloading the [`known-github-tomls.json`](https://github.com/akx/ruff-usage-aggregate/blob/master/data/known-github-tomls.jsonl)
-as `github_search.jsonl` and following the instructions in [scripts/Dockerfile.ecosystem](scripts/Dockerfile.ecosystem).
-Note that this check will take a while to run.
-
 ## Benchmarks
 
 First, clone [CPython](https://github.com/python/cpython). It's a large and diverse Python codebase,

Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 
 [workspace.package]
 edition = "2021"
-rust-version = "1.69"
+rust-version = "1.67"
 homepage = "https://beta.ruff.rs/docs/"
 documentation = "https://beta.ruff.rs/docs/"
 repository = "https://github.com/charliermarsh/ruff"
@@ -11,7 +11,7 @@ authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 
 [workspace.dependencies]
 anyhow = { version = "1.0.69" }
-bitflags = { version = "2.1.0" }
+bitflags = { version = "1.3.2" }
 chrono = { version = "0.4.23", default-features = false, features = ["clock"] }
 clap = { version = "4.1.8", features = ["derive"] }
 colored = { version = "2.0.0" }
@@ -24,7 +24,6 @@ is-macro = { version = "0.2.2" }
 itertools = { version = "0.10.5" }
 libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "80e4c1399f95e5beb532fdd1e209ad2dbb470438" }
 log = { version = "0.4.17" }
-nohash-hasher = { version = "0.2.0" }
 once_cell = { version = "1.17.1" }
 path-absolutize = { version = "3.0.14" }
 proc-macro2 = { version = "1.0.51" }
@@ -41,10 +40,9 @@ serde = { version = "1.0.152", features = ["derive"] }
 serde_json = { version = "1.0.93", features = ["preserve_order"] }
 shellexpand = { version = "3.0.0" }
 similar = { version = "2.2.1" }
-smallvec = { version = "1.10.0" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
-syn = { version = "2.0.15" }
+syn = { version = "1.0.109" }
 test-case = { version = "3.0.0" }
 textwrap = { version = "0.16.0" }
 toml = { version = "0.7.2" }

README.md

@@ -47,16 +47,16 @@ all while executing tens or hundreds of times faster than any individual tool.
 
 Ruff is extremely actively developed and used in major open-source projects like:
 
-- [Apache Airflow](https://github.com/apache/airflow)
+- [pandas](https://github.com/pandas-dev/pandas)
 - [FastAPI](https://github.com/tiangolo/fastapi)
-- [Hugging Face](https://github.com/huggingface/transformers)
-- [Pandas](https://github.com/pandas-dev/pandas)
+- [Transformers (Hugging Face)](https://github.com/huggingface/transformers)
+- [Apache Airflow](https://github.com/apache/airflow)
 - [SciPy](https://github.com/scipy/scipy)
 
 ...and many more.
 
-Ruff is backed by [Astral](https://astral.sh). Read the [launch post](https://astral.sh/blog/announcing-astral-the-company-behind-ruff),
-or the original [project announcement](https://notes.crmarsh.com/python-tooling-could-be-much-much-faster).
+Read the [launch blog post](https://notes.crmarsh.com/python-tooling-could-be-much-much-faster) or
+the most recent [project update](https://notes.crmarsh.com/ruff-the-first-200-releases).
 
 ## Testimonials
 
@@ -137,7 +137,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com) hook:
 ```yaml
 - repo: https://github.com/charliermarsh/ruff-pre-commit
   # Ruff version.
-  rev: 'v0.0.263'
+  rev: 'v0.0.260'
   hooks:
     - id: ruff
 ```
@@ -145,20 +145,6 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com) hook:
 Ruff can also be used as a [VS Code extension](https://github.com/charliermarsh/ruff-vscode) or
 alongside any other editor through the [Ruff LSP](https://github.com/charliermarsh/ruff-lsp).
 
-Ruff can also be used as a [GitHub Action](https://github.com/features/actions) via
-[`ruff-action`](https://github.com/chartboost/ruff-action):
-
-```yaml
-name: Ruff
-on: [ push, pull_request ]
-jobs:
-  ruff:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: chartboost/ruff-action@v1
-```
-
 ### Configuration
 
 Ruff can be configured through a `pyproject.toml`, `ruff.toml`, or `.ruff.toml` file (see:
@@ -332,68 +318,52 @@ Ruff is released under the MIT license.
 
 ## Who's Using Ruff?
 
-Ruff is used by a number of major open-source projects and companies, including:
+Ruff is used in a number of major open-source projects, including:
 
-- Amazon ([AWS SAM](https://github.com/aws/serverless-application-model))
-- [Apache Airflow](https://github.com/apache/airflow)
-- AstraZeneca ([Magnus](https://github.com/AstraZeneca/magnus-core))
-- Benchling ([Refac](https://github.com/benchling/refac))
-- [Babel](https://github.com/python-babel/babel)
-- [Bokeh](https://github.com/bokeh/bokeh)
-- [Cryptography (PyCA)](https://github.com/pyca/cryptography)
-- [Dagger](https://github.com/dagger/dagger)
-- [Dagster](https://github.com/dagster-io/dagster)
-- [DVC](https://github.com/iterative/dvc)
+- [pandas](https://github.com/pandas-dev/pandas)
 - [FastAPI](https://github.com/tiangolo/fastapi)
-- [Gradio](https://github.com/gradio-app/gradio)
-- [Great Expectations](https://github.com/great-expectations/great_expectations)
-- Hugging Face ([Transformers](https://github.com/huggingface/transformers), [Datasets](https://github.com/huggingface/datasets), [Diffusers](https://github.com/huggingface/diffusers))
-- [Hatch](https://github.com/pypa/hatch)
-- [Home Assistant](https://github.com/home-assistant/core)
-- [Ibis](https://github.com/ibis-project/ibis)
-- [Jupyter](https://github.com/jupyter-server/jupyter_server)
-- [LangChain](https://github.com/hwchase17/langchain)
-- [LlamaIndex](https://github.com/jerryjliu/llama_index)
-- Matrix ([Synapse](https://github.com/matrix-org/synapse))
-- Meltano ([Meltano CLI](https://github.com/meltano/meltano), [Singer SDK](https://github.com/meltano/sdk))
-- Modern Treasury ([Python SDK](https://github.com/Modern-Treasury/modern-treasury-python-sdk))
-- Mozilla ([Firefox](https://github.com/mozilla/gecko-dev))
-- [MegaLinter](https://github.com/oxsecurity/megalinter)
-- Microsoft ([Semantic Kernel](https://github.com/microsoft/semantic-kernel), [ONNX Runtime](https://github.com/microsoft/onnxruntime))
-- Netflix ([Dispatch](https://github.com/Netflix/dispatch))
-- [Neon](https://github.com/neondatabase/neon)
-- [ONNX](https://github.com/onnx/onnx)
-- [OpenBB](https://github.com/OpenBB-finance/OpenBBTerminal)
-- [PDM](https://github.com/pdm-project/pdm)
-- [PaddlePaddle](https://github.com/PaddlePaddle/Paddle)
-- [Pandas](https://github.com/pandas-dev/pandas)
-- [Poetry](https://github.com/python-poetry/poetry)
-- [Polars](https://github.com/pola-rs/polars)
-- [PostHog](https://github.com/PostHog/posthog)
-- Prefect ([Python SDK](https://github.com/PrefectHQ/prefect), [Marvin](https://github.com/PrefectHQ/marvin))
-- [Pydantic](https://github.com/pydantic/pydantic)
-- [PyInstaller](https://github.com/pyinstaller/pyinstaller)
-- [Pylint](https://github.com/PyCQA/pylint)
-- [Pynecone](https://github.com/pynecone-io/pynecone)
-- [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))
-- [Saleor](https://github.com/saleor/saleor)
+- [Transformers (Hugging Face)](https://github.com/huggingface/transformers)
+- [Diffusers (Hugging Face)](https://github.com/huggingface/diffusers)
+- [Apache Airflow](https://github.com/apache/airflow)
 - [SciPy](https://github.com/scipy/scipy)
-- [Sphinx](https://github.com/sphinx-doc/sphinx)
-- [Stable Baselines3](https://github.com/DLR-RM/stable-baselines3)
-- [Starlite](https://github.com/starlite-api/starlite)
-- [The Algorithms](https://github.com/TheAlgorithms/Python)
-- [Vega-Altair](https://github.com/altair-viz/altair)
-- WordPress ([Openverse](https://github.com/WordPress/openverse))
-- [ZenML](https://github.com/zenml-io/zenml)
 - [Zulip](https://github.com/zulip/zulip)
-- [build (PyPA)](https://github.com/pypa/build)
+- [Bokeh](https://github.com/bokeh/bokeh)
+- [Pydantic](https://github.com/pydantic/pydantic)
+- [PostHog](https://github.com/PostHog/posthog)
+- [Dagster](https://github.com/dagster-io/dagster)
+- [Dagger](https://github.com/dagger/dagger)
+- [Sphinx](https://github.com/sphinx-doc/sphinx)
+- [Hatch](https://github.com/pypa/hatch)
+- [PDM](https://github.com/pdm-project/pdm)
+- [Jupyter](https://github.com/jupyter-server/jupyter_server)
+- [Great Expectations](https://github.com/great-expectations/great_expectations)
+- [ONNX](https://github.com/onnx/onnx)
+- [Polars](https://github.com/pola-rs/polars)
+- [Ibis](https://github.com/ibis-project/ibis)
+- [Synapse (Matrix)](https://github.com/matrix-org/synapse)
+- [SnowCLI (Snowflake)](https://github.com/Snowflake-Labs/snowcli)
+- [Dispatch (Netflix)](https://github.com/Netflix/dispatch)
+- [Saleor](https://github.com/saleor/saleor)
+- [Pynecone](https://github.com/pynecone-io/pynecone)
+- [OpenBB](https://github.com/OpenBB-finance/OpenBBTerminal)
+- [Home Assistant](https://github.com/home-assistant/core)
+- [Pylint](https://github.com/PyCQA/pylint)
+- [Cryptography (PyCA)](https://github.com/pyca/cryptography)
 - [cibuildwheel (PyPA)](https://github.com/pypa/cibuildwheel)
-- [delta-rs](https://github.com/delta-io/delta-rs)
+- [build (PyPA)](https://github.com/pypa/build)
+- [Babel](https://github.com/python-babel/babel)
 - [featuretools](https://github.com/alteryx/featuretools)
 - [meson-python](https://github.com/mesonbuild/meson-python)
+- [ZenML](https://github.com/zenml-io/zenml)
+- [delta-rs](https://github.com/delta-io/delta-rs)
+- [Starlite](https://github.com/starlite-api/starlite)
+- [telemetry-airflow (Mozilla)](https://github.com/mozilla/telemetry-airflow)
+- [Stable Baselines3](https://github.com/DLR-RM/stable-baselines3)
+- [PaddlePaddle](https://github.com/PaddlePaddle/Paddle)
 - [nox](https://github.com/wntrblm/nox)
+- [Neon](https://github.com/neondatabase/neon)
+- [The Algorithms](https://github.com/TheAlgorithms/Python)
+- [Openverse](https://github.com/WordPress/openverse)
 
 ## License
 

_typos.toml

@@ -5,4 +5,3 @@ extend-exclude = ["snapshots", "black"]
 trivias = "trivias"
 hel = "hel"
 whos = "whos"
-spawnve = "spawnve"

crates/flake8_to_ruff/Cargo.toml

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

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.0.263"
+version = "0.0.260"
 authors.workspace = true
 edition.workspace = true
 rust-version.workspace = true
@@ -18,18 +18,15 @@ ruff_cache = { path = "../ruff_cache" }
 ruff_diagnostics = { path = "../ruff_diagnostics", features = ["serde"] }
 ruff_macros = { path = "../ruff_macros" }
 ruff_python_ast = { path = "../ruff_python_ast" }
-ruff_python_semantic = { path = "../ruff_python_semantic" }
 ruff_python_stdlib = { path = "../ruff_python_stdlib" }
 ruff_rustpython = { path = "../ruff_rustpython" }
-ruff_text_size = { path = "../ruff_text_size" }
 
-annotate-snippets = { version = "0.9.1", features = ["color"] }
 anyhow = { workspace = true }
 bitflags = { workspace = true }
 chrono = { workspace = true }
 clap = { workspace = true, features = ["derive", "string"], optional = true }
 colored = { workspace = true }
-dirs = { version = "5.0.0" }
+dirs = { version = "4.0.0" }
 fern = { version = "0.6.1" }
 glob = { workspace = true }
 globset = { workspace = true }
@@ -40,7 +37,7 @@ itertools = { workspace = true }
 libcst = { workspace = true }
 log = { workspace = true }
 natord = { version = "1.0.9" }
-nohash-hasher = { workspace = true }
+nohash-hasher = { version = "0.2.0" }
 num-bigint = { version = "0.4.3" }
 num-traits = { version = "0.2.15" }
 once_cell = { workspace = true }
@@ -50,7 +47,6 @@ path-absolutize = { workspace = true, features = [
 ] }
 pathdiff = { version = "0.2.1" }
 pep440_rs = { version = "0.3.1", features = ["serde"] }
-quick-junit = { version = "0.3.2" }
 regex = { workspace = true }
 result-like = { version = "0.4.6" }
 rustc-hash = { workspace = true }
@@ -60,9 +56,8 @@ schemars = { workspace = true }
 semver = { version = "1.0.16" }
 serde = { workspace = true }
 serde_json = { workspace = true }
-similar = { workspace = true, features = ["inline"] }
 shellexpand = { workspace = true }
-smallvec = { workspace = true }
+smallvec = { version = "1.10.0" }
 strum = { workspace = true }
 strum_macros = { workspace = true }
 textwrap = { workspace = true }
@@ -72,11 +67,9 @@ typed-arena = { version = "2.0.2" }
 unicode-width = { version = "0.1.10" }
 
 [dev-dependencies]
-insta = { workspace = true }
+insta = { workspace = true, features = ["yaml", "redactions"] }
 pretty_assertions = "1.3.0"
 test-case = { workspace = true }
-# Disable colored output in tests
-colored = { workspace = true, features = ["no-color"] }
 
 [features]
 default = []

crates/ruff/resources/test/fixtures/eradicate/ERA001.py

@@ -9,7 +9,6 @@ def foo(x, y, z):
     print(x, y, z)
 
     # This is a real comment.
-    # # This is a (nested) comment.
     #return True
     return False
 

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

@@ -1,13 +1,11 @@
-assert True  # S101
-
+# Error
+assert True
 
 def fn():
     x = 1
-    assert x == 1  # S101
-    assert x == 2  # S101
 
+    # Error
+    assert x == 1
 
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    assert True  # OK
+    # Error
+    assert x == 2

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

@@ -1,20 +0,0 @@
-from subprocess import Popen, call, check_call, check_output, run
-
-# Check different Popen wrappers are checked.
-Popen("true", shell=True)
-call("true", shell=True)
-check_call("true", shell=True)
-check_output("true", shell=True)
-run("true", shell=True)
-
-# Check values that truthy values are treated as true.
-Popen("true", shell=1)
-Popen("true", shell=[1])
-Popen("true", shell={1: 1})
-Popen("true", shell=(1,))
-
-# Check command argument looks unsafe.
-var_string = "true"
-Popen(var_string, shell=True)
-Popen([var_string], shell=True)
-Popen([var_string, ""], shell=True)

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

@@ -1,20 +0,0 @@
-from subprocess import Popen, call, check_call, check_output, run
-
-# Different Popen wrappers are checked.
-Popen("true", shell=False)
-call("true", shell=False)
-check_call("true", shell=False)
-check_output("true", shell=False)
-run("true", shell=False)
-
-# Values that falsey values are treated as false.
-Popen("true", shell=0)
-Popen("true", shell=[])
-Popen("true", shell={})
-Popen("true", shell=None)
-
-# Unknown values are treated as falsey.
-Popen("true", shell=True if True else False)
-
-# No value is also caught.
-Popen("true")

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

@@ -1,5 +0,0 @@
-def foo(shell):
-    pass
-
-
-foo(shell=True)

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

@@ -1,25 +0,0 @@
-import os
-
-import commands
-import popen2
-
-# Check all shell functions.
-os.system("true")
-os.popen("true")
-os.popen2("true")
-os.popen3("true")
-os.popen4("true")
-popen2.popen2("true")
-popen2.popen3("true")
-popen2.popen4("true")
-popen2.Popen3("true")
-popen2.Popen4("true")
-commands.getoutput("true")
-commands.getstatusoutput("true")
-
-
-# Check command argument looks unsafe.
-var_string = "true"
-os.system(var_string)
-os.system([var_string])
-os.system([var_string, ""])

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

@@ -1,20 +0,0 @@
-import os
-
-# Check all shell functions.
-os.execl("true")
-os.execle("true")
-os.execlp("true")
-os.execlpe("true")
-os.execv("true")
-os.execve("true")
-os.execvp("true")
-os.execvpe("true")
-os.spawnl("true")
-os.spawnle("true")
-os.spawnlp("true")
-os.spawnlpe("true")
-os.spawnv("true")
-os.spawnve("true")
-os.spawnvp("true")
-os.spawnvpe("true")
-os.startfile("true")

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

@@ -1,44 +0,0 @@
-import os
-
-# Check all functions.
-subprocess.Popen("true")
-subprocess.call("true")
-subprocess.check_call("true")
-subprocess.check_output("true")
-subprocess.run("true")
-os.system("true")
-os.popen("true")
-os.popen2("true")
-os.popen3("true")
-os.popen4("true")
-popen2.popen2("true")
-popen2.popen3("true")
-popen2.popen4("true")
-popen2.Popen3("true")
-popen2.Popen4("true")
-commands.getoutput("true")
-commands.getstatusoutput("true")
-os.execl("true")
-os.execle("true")
-os.execlp("true")
-os.execlpe("true")
-os.execv("true")
-os.execve("true")
-os.execvp("true")
-os.execvpe("true")
-os.spawnl("true")
-os.spawnle("true")
-os.spawnlp("true")
-os.spawnlpe("true")
-os.spawnv("true")
-os.spawnve("true")
-os.spawnvp("true")
-os.spawnvpe("true")
-os.startfile("true")
-
-# Check it does not fail for full paths.
-os.system("/bin/ls")
-os.system("./bin/ls")
-os.system(["/bin/ls"])
-os.system(["/bin/ls", "/tmp"])
-os.system(r"C:\\bin\ls")

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

@@ -1,10 +1,9 @@
 """
 Should emit:
-B017 - on lines 23 and 41
+B017 - on lines 20
 """
 import asyncio
 import unittest
-import pytest
 
 CONSTANT = True
 
@@ -35,14 +34,3 @@ class Foobar(unittest.TestCase):
     def raises_with_absolute_reference(self):
         with self.assertRaises(asyncio.CancelledError):
             Foo()
-
-
-def test_pytest_raises():
-    with pytest.raises(Exception):
-        raise ValueError("Hello")
-
-    with pytest.raises(Exception, "hello"):
-        raise ValueError("This is fine")
-
-    with pytest.raises(Exception, match="hello"):
-        raise ValueError("This is also fine")

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

@@ -28,11 +28,6 @@ except (ValueError, *(RuntimeError, (KeyError, TypeError))):  # error
     pass
 
 
-try:
-    pass
-except (*a, *(RuntimeError, (KeyError, TypeError))):  # error
-    pass
-
 try:
     pass
 except (ValueError, *(RuntimeError, TypeError)):  # ok
@@ -43,36 +38,10 @@ try:
 except (ValueError, *[RuntimeError, *(TypeError,)]):  # ok
     pass
 
-
-try:
-    pass
-except (*a, *b):  # ok
-    pass
-
-
-try:
-    pass
-except (*a, *(RuntimeError, TypeError)):  # ok
-    pass
-
-
-try:
-    pass
-except (*a, *(b, c)):  # ok
-    pass
-
-
-try:
-    pass
-except (*a, *(*b, *c)):  # ok
-    pass
-
-
 def what_to_catch():
     return ...
 
-
 try:
     pass
 except what_to_catch():  # ok
-    pass
+    pass

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

@@ -78,87 +78,12 @@ for _section, section_items in itertools.groupby(items, key=lambda p: p[1]):
     for shopper in shoppers:
         collect_shop_items(shopper, section_items)  # B031
 
-for _section, section_items in itertools.groupby(items, key=lambda p: p[1]):
-    _ = [collect_shop_items(shopper, section_items) for shopper in shoppers]  # B031
-
-for _section, section_items in itertools.groupby(items, key=lambda p: p[1]):
-    # The variable is overridden, skip checking.
-    _ = [_ for section_items in range(3)]
-    _ = [collect_shop_items(shopper, section_items) for shopper in shoppers]
-
-for _section, section_items in itertools.groupby(items, key=lambda p: p[1]):
-    _ = [item for item in section_items]
-
-for _section, section_items in itertools.groupby(items, key=lambda p: p[1]):
-    # The iterator is being used for the second time.
-    _ = [(item1, item2) for item1 in section_items for item2 in section_items]  # B031
-
-for _section, section_items in itertools.groupby(items, key=lambda p: p[1]):
-    if _section == "greens":
-        collect_shop_items(shopper, section_items)
-    else:
-        collect_shop_items(shopper, section_items)
-        collect_shop_items(shopper, section_items)  # B031
-
-for _section, section_items in itertools.groupby(items, key=lambda p: p[1]):
-    # Mutually exclusive branches shouldn't trigger the warning
-    if _section == "greens":
-        collect_shop_items(shopper, section_items)
-        if _section == "greens":
-            collect_shop_items(shopper, section_items)  # B031
-        elif _section == "frozen items":
-            collect_shop_items(shopper, section_items)  # B031
-        else:
-            collect_shop_items(shopper, section_items)  # B031
-        collect_shop_items(shopper, section_items)  # B031
-    elif _section == "frozen items":
-        # Mix `match` and `if` statements
-        match shopper:
-            case "Jane":
-                collect_shop_items(shopper, section_items)
-                if _section == "fourth":
-                    collect_shop_items(shopper, section_items)  # B031
-            case _:
-                collect_shop_items(shopper, section_items)
-    else:
-        collect_shop_items(shopper, section_items)
-    # Now, it should detect
-    collect_shop_items(shopper, section_items)  # B031
-
-for _section, section_items in itertools.groupby(items, key=lambda p: p[1]):
-    # Mutually exclusive branches shouldn't trigger the warning
-    match _section:
-        case "greens":
-            collect_shop_items(shopper, section_items)
-            match shopper:
-                case "Jane":
-                    collect_shop_items(shopper, section_items)  # B031
-                case _:
-                    collect_shop_items(shopper, section_items)  # B031
-        case "frozen items":
-            collect_shop_items(shopper, section_items)
-            collect_shop_items(shopper, section_items)  # B031
-        case _:
-            collect_shop_items(shopper, section_items)
-    # Now, it should detect
-    collect_shop_items(shopper, section_items)  # B031
-
 for group in groupby(items, key=lambda p: p[1]):
     # This is bad, but not detected currently
     collect_shop_items("Jane", group[1])
     collect_shop_items("Joe", group[1])
 
 
-# https://github.com/charliermarsh/ruff/issues/4050
-for _section, section_items in itertools.groupby(items, key=lambda p: p[1]):
-    if _section == "greens":
-        for item in section_items:
-            collect_shop_items(shopper, item)
-    elif _section == "frozen items":
-        _ = [item for item in section_items]
-    else:
-        collect_shop_items(shopper, section_items)
-
 #  Make sure we ignore - but don't fail on more complicated invocations
 for _key, (_value1, _value2) in groupby(
     [("a", (1, 2)), ("b", (3, 4)), ("a", (5, 6))], key=lambda p: p[1]

crates/ruff/resources/test/fixtures/flake8_comprehensions/C414.py

@@ -7,14 +7,11 @@ set(set(x))
 set(list(x))
 set(tuple(x))
 set(sorted(x))
-set(sorted(x, key=lambda y: y))
 set(reversed(x))
 sorted(list(x))
 sorted(tuple(x))
 sorted(sorted(x))
-sorted(sorted(x, key=lambda y: y))
 sorted(reversed(x))
-sorted(list(x), key=lambda y: y)
 tuple(
     list(
         [x, 3, "hell"\

crates/ruff/resources/test/fixtures/flake8_comprehensions/C418.py

@@ -1,10 +0,0 @@
-dict({})
-dict({'a': 1})
-dict({'x': 1 for x in range(10)})
-dict(
-    {'x': 1 for x in range(10)}
-)
-
-dict({}, a=1)
-dict({x: 1 for x in range(1)}, a=1)
-

crates/ruff/resources/test/fixtures/flake8_import_conventions/custom_banned.py

@@ -1,16 +0,0 @@
-import typing as t  # banned
-import typing as ty  # banned
-
-import numpy as nmp  # banned
-import numpy as npy  # banned
-import tensorflow.keras.backend as K  # banned
-import torch.nn.functional as F  # banned
-from tensorflow.keras import backend as K  # banned
-from torch.nn import functional as F  # banned
-
-from typing import Any  # ok
-
-import numpy as np  # ok
-import tensorflow as tf  # ok
-import torch.nn as nn  # ok
-from tensorflow.keras import backend  # ok

crates/ruff/resources/test/fixtures/flake8_import_conventions/custom_banned_from.py

@@ -1,10 +0,0 @@
-from logging.config import BaseConfigurator  # banned
-from typing import Any, Dict  # banned
-from typing import *  # banned
-
-from pandas import DataFrame  # banned
-from pandas import *  # banned
-
-import logging.config  # ok
-import typing  # ok
-import pandas  # ok

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

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

crates/ruff/resources/test/fixtures/flake8_pie/PIE802.py

@@ -1,3 +1,4 @@
+# PIE802
 any([x.id for x in bar])
 all([x.id for x in bar])
 any(  # first comment
@@ -14,6 +15,5 @@ all(x.id for x in bar)
 any(x.id for x in bar)
 all((x.id for x in bar))
 
-
 async def f() -> bool:
     return all([await use_greeting(greeting) for greeting in await greetings()])

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

@@ -11,7 +11,3 @@ _T = TypeVar("_T")  # OK
 _TTuple = TypeVarTuple("_TTuple")  # OK
 
 _P = ParamSpec("_P")  # OK
-
-
-def f():
-    T = TypeVar("T")  # OK

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

@@ -11,6 +11,3 @@ _T = TypeVar("_T")  # OK
 _TTuple = TypeVarTuple("_TTuple")  # OK
 
 _P = ParamSpec("_P")  # OK
-
-def f():
-    T = TypeVar("T")  # OK

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

@@ -46,48 +46,3 @@ field229: dict[int, int] = {1: 2, **{3: 4}}  # Y015 Only simple default values a
 field23 = "foo" + "bar"  # Y015 Only simple default values are allowed for assignments
 field24 = b"foo" + b"bar"  # Y015 Only simple default values are allowed for assignments
 field25 = 5 * 5  # Y015 Only simple default values are allowed for assignments
-
-# We shouldn't emit Y015 within functions
-def f():
-  field26: list[int] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
-
-
-# We shouldn't emit Y015 for __slots__ or __match_args__
-class Class1:
-  __slots__ = (
-    '_one',
-    '_two',
-    '_three',
-    '_four',
-    '_five',
-    '_six',
-    '_seven',
-    '_eight',
-    '_nine',
-    '_ten',
-    '_eleven',
-  )
-
-  __match_args__ = (
-    'one',
-    'two',
-    'three',
-    'four',
-    'five',
-    'six',
-    'seven',
-    'eight',
-    'nine',
-    'ten',
-    'eleven',
-  )
-
-# We shouldn't emit Y015 for __all__
-__all__ = ["Class1"]
-
-# Ignore the following for PYI015
-field26 = typing.Sequence[int]
-field27 = list[str]
-field28 = builtins.str
-field29 = str
-field30 = str | bytes | None

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

@@ -1,6 +1,6 @@
 import builtins
 import typing
-from typing import TypeAlias, Final, NewType, TypeVar, TypeVarTuple, ParamSpec
+from typing import TypeAlias, Final
 
 # We shouldn't emit Y015 for simple default values
 field1: int
@@ -26,10 +26,6 @@ field9 = None  # Y026 Use typing_extensions.TypeAlias for type aliases, e.g. "fi
 Field95: TypeAlias = None
 Field96: TypeAlias = int | None
 Field97: TypeAlias = None | typing.SupportsInt | builtins.str | float | bool
-Field98 = NewType('MyInt', int)
-Field99 = TypeVar('Field99')
-Field100 = TypeVarTuple('Field100')
-Field101 = ParamSpec('Field101')
 field19 = [1, 2, 3]  # Y052 Need type annotation for "field19"
 field191: list[int] = [1, 2, 3]
 field20 = (1, 2, 3)  # Y052 Need type annotation for "field20"
@@ -53,48 +49,3 @@ field229: dict[int, int] = {1: 2, **{3: 4}}  # Y015 Only simple default values a
 field23 = "foo" + "bar"  # Y015 Only simple default values are allowed for assignments
 field24 = b"foo" + b"bar"  # Y015 Only simple default values are allowed for assignments
 field25 = 5 * 5  # Y015 Only simple default values are allowed for assignments
-
-# We shouldn't emit Y015 within functions
-def f():
-  field26: list[int] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
-
-
-# We shouldn't emit Y015 for __slots__ or __match_args__
-class Class1:
-  __slots__ = (
-    '_one',
-    '_two',
-    '_three',
-    '_four',
-    '_five',
-    '_six',
-    '_seven',
-    '_eight',
-    '_nine',
-    '_ten',
-    '_eleven',
-  )
-
-  __match_args__ = (
-    'one',
-    'two',
-    'three',
-    'four',
-    'five',
-    'six',
-    'seven',
-    'eight',
-    'nine',
-    'ten',
-    'eleven',
-  )
-
-# We shouldn't emit Y015 for __all__
-__all__ = ["Class1"]
-
-# Ignore the following for PYI015
-field26 = typing.Sequence[int]
-field27 = list[str]
-field28 = builtins.str
-field29 = str
-field30 = str | bytes | None

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

@@ -1,35 +0,0 @@
-# Shouldn't affect non-union field types.
-field1: str
-
-# Should emit for duplicate field types.
-field2: str | str  # PYI016: Duplicate union member `str`
-
-
-# Should emit for union types in arguments.
-def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
-    print(arg1)
-
-
-# Should emit for unions in return types.
-def func2() -> str | str:  # PYI016: Duplicate union member `str`
-    return "my string"
-
-
-# Should emit in longer unions, even if not directly adjacent.
-field3: str | str | int  # PYI016: Duplicate union member `str`
-field4: int | int | str  # PYI016: Duplicate union member `int`
-field5: str | int | str  # PYI016: Duplicate union member `str`
-field6: int | bool | str | int  # PYI016: Duplicate union member `int`
-
-# Shouldn't emit for non-type unions.
-field7 = str | str
-
-# Should emit for strangely-bracketed unions.
-field8: int | (str | int)  # PYI016: Duplicate union member `int`
-
-# Should handle user brackets when fixing.
-field9: int | (int | str)  # PYI016: Duplicate union member `int`
-field10: (str | int) | str  # PYI016: Duplicate union member `str`
-
-# Should emit for nested unions.
-field11: dict[int | int, str]

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

@@ -1,32 +0,0 @@
-# Shouldn't affect non-union field types.
-field1: str
-
-# Should emit for duplicate field types.
-field2: str | str  # PYI016: Duplicate union member `str`
-
-# Should emit for union types in arguments.
-def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
-    print(arg1)
-
-# Should emit for unions in return types.
-def func2() -> str | str:  # PYI016: Duplicate union member `str`
-    return "my string"
-
-# Should emit in longer unions, even if not directly adjacent.
-field3: str | str | int  # PYI016: Duplicate union member `str`
-field4: int | int | str  # PYI016: Duplicate union member `int`
-field5: str | int | str  # PYI016: Duplicate union member `str`
-field6: int | bool | str | int  # PYI016: Duplicate union member `int`
-
-# Shouldn't emit for non-type unions.
-field7 = str | str
-
-# Should emit for strangely-bracketed unions.
-field8: int | (str | int)  # PYI016: Duplicate union member `int`
-
-# Should handle user brackets when fixing.
-field9: int | (int | str)  # PYI016: Duplicate union member `int`
-field10: (str | int) | str  # PYI016: Duplicate union member `str`
-
-# Should emit for nested unions.
-field11: dict[int | int, str]

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

@@ -49,18 +49,3 @@ def test_list_expressions(param1, param2):
 @pytest.mark.parametrize([some_expr, "param2"], [1, 2, 3])
 def test_list_mixed_expr_literal(param1, param2):
     ...
-
-
-@pytest.mark.parametrize(("param1, " "param2, " "param3"), [(1, 2, 3), (4, 5, 6)])
-def test_implicit_str_concat_with_parens(param1, param2, param3):
-    ...
-
-
-@pytest.mark.parametrize("param1, " "param2, " "param3", [(1, 2, 3), (4, 5, 6)])
-def test_implicit_str_concat_no_parens(param1, param2, param3):
-    ...
-
-
-@pytest.mark.parametrize((("param1, " "param2, " "param3")), [(1, 2, 3), (4, 5, 6)])
-def test_implicit_str_concat_with_multi_parens(param1, param2, param3):
-    ...

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

@@ -3,7 +3,7 @@
 ###
 def x():
     a = 1
-    return a  # RET504
+    return a  # error
 
 
 # Can be refactored false positives
@@ -211,10 +211,10 @@ def nonlocal_assignment():
 def decorator() -> Flask:
     app = Flask(__name__)
 
-    @app.route("/hello")
+    @app.route('/hello')
     def hello() -> str:
         """Hello endpoint."""
-        return "Hello, World!"
+        return 'Hello, World!'
 
     return app
 
@@ -222,13 +222,12 @@ def decorator() -> Flask:
 def default():
     y = 1
 
-    def f(x=y) -> X:
+    def f(x = y) -> X:
         return x
 
     return y
 
 
-# Multiple assignment
 def get_queryset(option_1, option_2):
     queryset: Any = None
     queryset = queryset.filter(a=1)
@@ -247,28 +246,4 @@ def get_queryset():
 
 def get_queryset():
     queryset = Model.filter(a=1)
-    return queryset  # RET504
-
-
-# Function arguments
-def str_to_bool(val):
-    if isinstance(val, bool):
-        return val
-    val = val.strip().lower()
-    if val in ("1", "true", "yes"):
-        return True
-
-    return False
-
-
-def str_to_bool(val):
-    if isinstance(val, bool):
-        return val
-    val = 1
-    return val  # RET504
-
-
-def str_to_bool(val):
-    if isinstance(val, bool):
-        return some_obj
-    return val
+    return queryset  # error

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

@@ -59,15 +59,3 @@ def bar():
         return foo()
     except ValueError:
         pass
-
-def with_ellipsis():
-    try:
-        foo()
-    except ValueError:
-        ...
-
-def with_ellipsis_and_return():
-    try:
-        return foo()
-    except ValueError:
-        ...

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

@@ -9,17 +9,6 @@ os.environ.get('foo', 'bar')
 
 os.getenv('foo')
 
-env = os.environ.get('foo')
-
-env = os.environ['foo']
-
-if env := os.environ.get('foo'):
-    pass
-
-if env := os.environ['foo']:
-    pass
-
-
 # Good
 os.environ['FOO']
 
@@ -28,13 +17,3 @@ os.environ.get('FOO')
 os.environ.get('FOO', 'bar')
 
 os.getenv('FOO')
-
-env = os.getenv('FOO')
-
-if env := os.getenv('FOO'):
-    pass
-
-env = os.environ['FOO']
-
-if env := os.environ['FOO']:
-    pass

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

@@ -42,113 +42,3 @@ if False and f() and a and g() and b:  # OK
 
 if a and False and f() and b and g():  # OK
     pass
-
-
-a or "" or True  # SIM222
-
-a or "foo" or True or "bar"  # SIM222
-
-a or 0 or True  # SIM222
-
-a or 1 or True or 2  # SIM222
-
-a or 0.0 or True  # SIM222
-
-a or 0.1 or True or 0.2  # SIM222
-
-a or [] or True  # SIM222
-
-a or list([]) or True  # SIM222
-
-a or [1] or True or [2]  # SIM222
-
-a or list([1]) or True or list([2])  # SIM222
-
-a or {} or True  # SIM222
-
-a or dict() or True  # SIM222
-
-a or {1: 1} or True or {2: 2}  # SIM222
-
-a or dict({1: 1}) or True or dict({2: 2})  # SIM222
-
-a or set() or True  # SIM222
-
-a or set(set()) or True  # SIM222
-
-a or {1} or True or {2}  # SIM222
-
-a or set({1}) or True or set({2})  # SIM222
-
-a or () or True  # SIM222
-
-a or tuple(()) or True  # SIM222
-
-a or (1,) or True or (2,)  # SIM222
-
-a or tuple((1,)) or True or tuple((2,))  # SIM222
-
-a or frozenset() or True  # SIM222
-
-a or frozenset(frozenset()) or True  # SIM222
-
-a or frozenset({1}) or True or frozenset({2})  # SIM222
-
-a or frozenset(frozenset({1})) or True or frozenset(frozenset({2}))  # SIM222
-
-
-# Inside test `a` is simplified.
-
-bool(a or [1] or True or [2])  # SIM222
-
-assert a or [1] or True or [2]  # SIM222
-
-if (a or [1] or True or [2]) and (a or [1] or True or [2]):  # SIM222
-    pass
-
-0 if a or [1] or True or [2] else 1  # SIM222
-
-while a or [1] or True or [2]:  # SIM222
-    pass
-
-[
-    0
-    for a in range(10)
-    for b in range(10)
-    if a or [1] or True or [2]  # SIM222
-    if b or [1] or True or [2]  # SIM222
-]
-
-{
-    0
-    for a in range(10)
-    for b in range(10)
-    if a or [1] or True or [2]  # SIM222
-    if b or [1] or True or [2]  # SIM222
-}
-
-{
-    0: 0
-    for a in range(10)
-    for b in range(10)
-    if a or [1] or True or [2]  # SIM222
-    if b or [1] or True or [2]  # SIM222
-}
-
-(
-    0
-    for a in range(10)
-    for b in range(10)
-    if a or [1] or True or [2]  # SIM222
-    if b or [1] or True or [2]  # SIM222
-)
-
-# Outside test `a` is not simplified.
-
-a or [1] or True or [2]  # SIM222
-
-if (a or [1] or True or [2]) == (a or [1]):  # SIM222
-    pass
-
-if f(a or [1] or True or [2]):  # SIM222
-    pass

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

@@ -37,113 +37,3 @@ if True or f() or a or g() or b:  # OK
 
 if a or True or f() or b or g():  # OK
     pass
-
-
-a and "" and False  # SIM223
-
-a and "foo" and False and "bar"  # SIM223
-
-a and 0 and False  # SIM223
-
-a and 1 and False and 2  # SIM223
-
-a and 0.0 and False  # SIM223
-
-a and 0.1 and False and 0.2  # SIM223
-
-a and [] and False  # SIM223
-
-a and list([]) and False  # SIM223
-
-a and [1] and False and [2]  # SIM223
-
-a and list([1]) and False and list([2])  # SIM223
-
-a and {} and False  # SIM223
-
-a and dict() and False  # SIM223
-
-a and {1: 1} and False and {2: 2}  # SIM223
-
-a and dict({1: 1}) and False and dict({2: 2})  # SIM223
-
-a and set() and False  # SIM223
-
-a and set(set()) and False  # SIM223
-
-a and {1} and False and {2}  # SIM223
-
-a and set({1}) and False and set({2})  # SIM223
-
-a and () and False  # SIM222
-
-a and tuple(()) and False  # SIM222
-
-a and (1,) and False and (2,)  # SIM222
-
-a and tuple((1,)) and False and tuple((2,))  # SIM222
-
-a and frozenset() and False  # SIM222
-
-a and frozenset(frozenset()) and False  # SIM222
-
-a and frozenset({1}) and False and frozenset({2})  # SIM222
-
-a and frozenset(frozenset({1})) and False and frozenset(frozenset({2}))  # SIM222
-
-
-# Inside test `a` is simplified.
-
-bool(a and [] and False and [])  # SIM223
-
-assert a and [] and False and []  # SIM223
-
-if (a and [] and False and []) or (a and [] and False and []):  # SIM223
-    pass
-
-0 if a and [] and False and [] else 1  # SIM222
-
-while a and [] and False and []:  # SIM223
-    pass
-
-[
-    0
-    for a in range(10)
-    for b in range(10)
-    if a and [] and False and []  # SIM223
-    if b and [] and False and []  # SIM223
-]
-
-{
-    0
-    for a in range(10)
-    for b in range(10)
-    if a and [] and False and []  # SIM223
-    if b and [] and False and []  # SIM223
-}
-
-{
-    0: 0
-    for a in range(10)
-    for b in range(10)
-    if a and [] and False and []  # SIM223
-    if b and [] and False and []  # SIM223
-}
-
-(
-    0
-    for a in range(10)
-    for b in range(10)
-    if a and [] and False and []  # SIM223
-    if b and [] and False and []  # SIM223
-)
-
-# Outside test `a` is not simplified.
-
-a and [] and False and []  # SIM223
-
-if (a and [] and False and []) == (a and []):  # SIM223
-    pass
-
-if f(a and [] and False and []):  # SIM223
-    pass

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

@@ -1,27 +0,0 @@
-# SIM910
-{}.get(key, None)
-
-# SIM910
-{}.get("key", None)
-
-# OK
-{}.get(key)
-
-# OK
-{}.get("key")
-
-# OK
-{}.get(key, False)
-
-# OK
-{}.get("key", False)
-
-# SIM910
-if a := {}.get(key, None):
-    pass
-
-# SIM910
-a = {}.get(key, None)
-
-# SIM910
-({}).get(key, None)

crates/ruff/resources/test/fixtures/flake8_tidy_imports/TID251.py

@@ -31,6 +31,3 @@ typing.TypedDict.anything()
 # import aliases are resolved
 import typing as totally_not_typing
 totally_not_typing.TypedDict
-
-# relative imports are respected
-from .typing import TypedDict

crates/ruff/resources/test/fixtures/flake8_tidy_imports/TID251_false_positives.py

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

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

@@ -1,6 +1,3 @@
-from __future__ import annotations
-
-
 def f():
     # Even in strict mode, this shouldn't rase an error, since `pkg` is used at runtime,
     # and implicitly imports `pkg.bar`.

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

@@ -1,4 +0,0 @@
-from mypackage.subpackage import (  # long comment that seems to be a problem
-    a_long_variable_name_that_causes_problems,
-    items,
-)

crates/ruff/resources/test/fixtures/isort/required_imports/docstring.pyi

@@ -1,3 +0,0 @@
-"""Hello, world!"""
-
-x = 1

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

@@ -1,7 +0,0 @@
-from __future__ import annotations
-import os
-import sys
-import pytz
-import django.settings
-from library import foo
-from . import local

crates/ruff/resources/test/fixtures/pep8_naming/N802.py

@@ -39,11 +39,3 @@ class Test(unittest.TestCase):
 
     def testTest(self):
         assert True
-
-
-from typing import override
-
-
-@override
-def BAD_FUNC():
-    pass

crates/ruff/resources/test/fixtures/pep8_naming/N815.py

@@ -13,11 +13,3 @@ class C:
     myObj2 = namedtuple("MyObj2", ["a", "b"])
     Employee = NamedTuple('Employee', [('name', str), ('id', int)])
     Point2D = TypedDict('Point2D', {'in': int, 'x-y': int})
-
-
-class D(TypedDict):
-    lower: int
-    CONSTANT: str
-    mixedCase: bool
-    _mixedCase: list
-    mixed_Case: set

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

@@ -13,7 +13,6 @@ f = lambda: (yield from g())
 class F:
     f = lambda x: 2 * x
 
-
 f = object()
 f.method = lambda: "Method"
 f = {}
@@ -22,30 +21,3 @@ f = []
 f.append(lambda x: x**2)
 f = g = lambda x: x**2
 lambda: "no-op"
-
-# Annotated
-from typing import Callable, ParamSpec
-
-P = ParamSpec("P")
-
-# ParamSpec cannot be used in this context, so do not preserve the annotation.
-f: Callable[P, int] = lambda *args: len(args)
-f: Callable[[], None] = lambda: None
-f: Callable[..., None] = lambda a, b: None
-f: Callable[[int], int] = lambda x: 2 * x
-
-# Let's use the `Callable` type from `collections.abc` instead.
-from collections.abc import Callable
-
-f: Callable[[str, int], str] = lambda a, b: a * b
-f: Callable[[str, int], tuple[str, int]] = lambda a, b: (a, b)
-f: Callable[[str, int, list[str]], list[str]] = lambda a, b, /, c: [*c, a * b]
-
-
-# Override `Callable`
-class Callable:
-    pass
-
-
-# Do not copy the annotation from here on out.
-f: Callable[[str, int], str] = lambda a, b: a * b

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

@@ -97,10 +97,10 @@ if length > options.max_line_length:
 if os.path.exists(os.path.join(path, PEP8_BIN)):
 	cmd = ([os.path.join(path, PEP8_BIN)] +
 	       self._pep8_options(targetfile))
-#: W191 - okay
+#: W191
 '''
 	multiline string with tab in it'''
-#: E101 (W191 okay)
+#: E101 W191
 '''multiline string
 	with tabs
    and spaces
@@ -142,10 +142,4 @@ def test_keys(self):
 x = [
 	'abc'
 ]
-#: W191 - okay
-'''	multiline string with tab in it, same lines'''
-"""	here we're using '''different delimiters'''"""
-'''
-	multiline string with tab in it, different lines
-'''
-"	single line string with tab in it"
+#:

crates/ruff/resources/test/fixtures/pydocstyle/D417.py

@@ -115,20 +115,6 @@ def f(x, *args, **kwargs):
     return x
 
 
-def f(x, *, y, z):
-    """Do something.
-
-    Args:
-        x: some first value
-
-    Keyword Args:
-        y (int): the other value
-        z (int): the last value
-
-    """
-    return x, y, z
-
-
 class Test:
     def f(self, /, arg1: int) -> None:
         """

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

@@ -11,9 +11,3 @@
 "{}".format(1, 2, 3)  # F523
 "{:{}}".format(1, 2)  # No issues
 "{:{}}".format(1, 2, 3)  # F523
-
-# With *args
-"{0}{1}".format(*args)  # No issues
-"{0}{1}".format(1, *args)  # No issues
-"{0}{1}".format(1, 2, *args)  # No issues
-"{0}{1}".format(1, 2, 3, *args)  # F523

crates/ruff/resources/test/fixtures/pygrep-hooks/PGH003_0.py

@@ -1,16 +1,11 @@
 x = 1  # type: ignore
+x = 1  # type ignore
 x = 1  # type:ignore
-x = 1  # type: ignore[attr-defined]  # type: ignore
 
 x = 1
-x = 1  # type ignore
 x = 1  # type ignore  # noqa
 x = 1  # type: ignore[attr-defined]
 x = 1  # type: ignore[attr-defined, name-defined]
-x = 1  # type: ignore[attr-defined]  # type: ignore[type-mismatch]
 x = 1  # type: ignore[type-mismatch]  # noqa
-x = 1  # type: ignore [attr-defined]
-x = 1  # type: ignore [attr-defined, name-defined]
-x = 1  # type: ignore [type-mismatch]  # noqa
 x = 1  # type: Union[int, str]
 x = 1  # type: ignoreme

crates/ruff/resources/test/fixtures/pygrep-hooks/PGH003_1.py

@@ -1,16 +0,0 @@
-x = 1  # pyright: ignore
-x = 1  # pyright:ignore
-x = 1  # pyright: ignore[attr-defined]  # pyright: ignore
-
-x = 1
-x = 1  # pyright ignore
-x = 1  # pyright ignore  # noqa
-x = 1  # pyright: ignore[attr-defined]
-x = 1  # pyright: ignore[attr-defined, name-defined]
-x = 1  # pyright: ignore[attr-defined]  # pyright: ignore[type-mismatch]
-x = 1  # pyright: ignore[type-mismatch]  # noqa
-x = 1  # pyright: ignore [attr-defined]
-x = 1  # pyright: ignore [attr-defined, name-defined]
-x = 1  # pyright: ignore [type-mismatch]  # noqa
-x = 1  # pyright: Union[int, str]
-x = 1  # pyright: ignoreme

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

@@ -1,6 +1,3 @@
-import typing
-from typing import cast
-
 # For -> for, variable reused
 for i in []:
     for i in []:  # error
@@ -46,9 +43,6 @@ for i in []:
 
 # For -> assignment
 for i in []:
-    # ignore typing cast
-    i = cast(int, i)
-    i = typing.cast(int, i)
     i = 5  # error
 
 # For -> augmented assignment
@@ -59,10 +53,6 @@ for i in []:
 for i in []:
     i: int = 5  # error
 
-# For -> annotated assignment without value
-for i in []:
-    i: int  # no error
-
 # Async for -> for, variable reused
 async for i in []:
     for i in []:  # error

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

@@ -1,51 +0,0 @@
-class TestClass:
-    def __bool__(self):
-        ...
-    
-    def __bool__(self, x):  # too many mandatory args
-        ...
-    
-    def __bool__(self, x=1):  # additional optional args OK
-        ...
-    
-    def __bool__(self, *args):  # varargs OK
-        ...
-    
-    def __bool__():  # ignored; should be caughty by E0211/N805
-        ...
-    
-    @staticmethod
-    def __bool__():
-        ...
-
-    @staticmethod
-    def __bool__(x):  # too many mandatory args
-        ...
-    
-    @staticmethod
-    def __bool__(x=1):  # additional optional args OK
-        ...
-    
-    def __eq__(self, other):  # multiple args
-        ...
-    
-    def __eq__(self, other=1):  # expected arg is optional
-        ...
-    
-    def __eq__(self):  # too few mandatory args
-        ...
-    
-    def __eq__(self, other, other_other):  # too many mandatory args
-        ...
-    
-    def __round__(self):  # allow zero additional args.
-        ...
-    
-    def __round__(self, x):  # allow one additional args.
-        ...
-    
-    def __round__(self, x, y):  # disallow 2 args
-        ...
-    
-    def __round__(self, x, y, z=2):  # disallow 3 args even when one is optional
-        ...

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

@@ -83,26 +83,3 @@ print('Hello %s (%s)' % bar['bop'])
 print('Hello %(arg)s' % bar)
 print('Hello %(arg)s' % bar.baz)
 print('Hello %(arg)s' % bar['bop'])
-
-# Hanging modulos
-(
-    "foo %s "
-    "bar %s"
-) % (x, y)
-
-(
-    "foo %(foo)s "
-    "bar %(bar)s"
-) % {"foo": x, "bar": y}
-
-(
-    """foo %s"""
-    % (x,)
-)
-
-(
-    """
-    foo %s
-    """
-    % (x,)
-)

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

@@ -34,6 +34,28 @@ pytest.param('"%8s" % (None,)', id="unsafe width-string conversion"),
 "%(and)s" % {"and": 2}
 
 # OK (arguably false negatives)
+(
+    "foo %s "
+    "bar %s"
+) % (x, y)
+
+(
+    "foo %(foo)s "
+    "bar %(bar)s"
+) % {"foo": x, "bar": y}
+
+(
+    """foo %s"""
+    % (x,)
+)
+
+(
+    """
+    foo %s
+    """
+    % (x,)
+)
+
 'Hello %s' % bar
 
 'Hello %s' % bar.baz

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

@@ -1,27 +0,0 @@
-import typing
-from dataclasses import dataclass, field
-from typing import ClassVar, Sequence
-
-KNOWINGLY_MUTABLE_DEFAULT = []
-
-
-@dataclass()
-class A:
-    mutable_default: list[int] = []
-    immutable_annotation: typing.Sequence[int] = []
-    without_annotation = []
-    ignored_via_comment: list[int] = []  # noqa: RUF008
-    correct_code: list[int] = KNOWINGLY_MUTABLE_DEFAULT
-    perfectly_fine: list[int] = field(default_factory=list)
-    class_variable: typing.ClassVar[list[int]] = []
-
-
-@dataclass
-class B:
-    mutable_default: list[int] = []
-    immutable_annotation: Sequence[int] = []
-    without_annotation = []
-    ignored_via_comment: list[int] = []  # noqa: RUF008
-    correct_code: list[int] = KNOWINGLY_MUTABLE_DEFAULT
-    perfectly_fine: list[int] = field(default_factory=list)
-    class_variable: ClassVar[list[int]] = []

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

@@ -1,31 +0,0 @@
-import typing
-from dataclasses import dataclass
-from typing import ClassVar, NamedTuple
-
-
-def default_function() -> list[int]:
-    return []
-
-
-class ImmutableType(NamedTuple):
-    something: int = 8
-
-
-@dataclass()
-class A:
-    hidden_mutable_default: list[int] = default_function()
-    class_variable: typing.ClassVar[list[int]] = default_function()
-    another_class_var: ClassVar[list[int]] = default_function()
-
-
-DEFAULT_IMMUTABLETYPE_FOR_ALL_DATACLASSES = ImmutableType(40)
-DEFAULT_A_FOR_ALL_DATACLASSES = A([1, 2, 3])
-
-
-@dataclass
-class B:
-    hidden_mutable_default: list[int] = default_function()
-    another_dataclass: A = A()
-    not_optimal: ImmutableType = ImmutableType(20)
-    good_variant: ImmutableType = DEFAULT_IMMUTABLETYPE_FOR_ALL_DATACLASSES
-    okay_variant: A = DEFAULT_A_FOR_ALL_DATACLASSES

crates/ruff/src/autofix/helpers.rs

@@ -1,4 +1,3 @@
-//! Interface for generating autofix edits from higher-level actions (e.g., "remove an argument").
 use anyhow::{bail, Result};
 use itertools::Itertools;
 use libcst_native::{
@@ -8,12 +7,12 @@ use rustpython_parser::ast::{ExcepthandlerKind, Expr, Keyword, Location, Stmt, S
 use rustpython_parser::{lexer, Mode, Tok};
 
 use ruff_diagnostics::Edit;
+use ruff_python_ast::context::Context;
 use ruff_python_ast::helpers;
 use ruff_python_ast::helpers::to_absolute;
 use ruff_python_ast::imports::{AnyImport, Import};
 use ruff_python_ast::newlines::NewlineWithTrailingNewline;
 use ruff_python_ast::source_code::{Indexer, Locator, Stylist};
-use ruff_python_semantic::context::Context;
 
 use crate::cst::helpers::compose_module_path;
 use crate::cst::matchers::match_module;
@@ -103,7 +102,7 @@ fn is_lone_child(child: &Stmt, parent: &Stmt, deleted: &[&Stmt]) -> Result<bool>
 /// Return the location of a trailing semicolon following a `Stmt`, if it's part
 /// of a multi-statement line.
 fn trailing_semicolon(stmt: &Stmt, locator: &Locator) -> Option<Location> {
-    let contents = locator.after(stmt.end_location.unwrap());
+    let contents = locator.skip(stmt.end_location.unwrap());
     for (row, line) in NewlineWithTrailingNewline::from(contents).enumerate() {
         let trimmed = line.trim();
         if trimmed.starts_with(';') {
@@ -126,7 +125,7 @@ fn trailing_semicolon(stmt: &Stmt, locator: &Locator) -> Option<Location> {
 /// Find the next valid break for a `Stmt` after a semicolon.
 fn next_stmt_break(semicolon: Location, locator: &Locator) -> Location {
     let start_location = Location::new(semicolon.row(), semicolon.column() + 1);
-    let contents = locator.after(start_location);
+    let contents = locator.skip(start_location);
     for (row, line) in NewlineWithTrailingNewline::from(contents).enumerate() {
         let trimmed = line.trim();
         // Skip past any continuations.
@@ -158,7 +157,7 @@ fn next_stmt_break(semicolon: Location, locator: &Locator) -> Location {
 
 /// Return `true` if a `Stmt` occurs at the end of a file.
 fn is_end_of_file(stmt: &Stmt, locator: &Locator) -> bool {
-    let contents = locator.after(stmt.end_location.unwrap());
+    let contents = locator.skip(stmt.end_location.unwrap());
     contents.is_empty()
 }
 
@@ -361,7 +360,7 @@ pub fn remove_argument(
     remove_parentheses: bool,
 ) -> Result<Edit> {
     // TODO(sbrugman): Preserve trailing comments.
-    let contents = locator.after(call_at);
+    let contents = locator.skip(call_at);
 
     let mut fix_start = None;
     let mut fix_end = None;
@@ -532,7 +531,7 @@ mod tests {
 
     use ruff_python_ast::source_code::Locator;
 
-    use crate::autofix::actions::{next_stmt_break, trailing_semicolon};
+    use crate::autofix::helpers::{next_stmt_break, trailing_semicolon};
 
     #[test]
     fn find_semicolon() -> Result<()> {

crates/ruff/src/autofix/mod.rs

@@ -11,19 +11,14 @@ use ruff_python_ast::types::Range;
 use crate::linter::FixTable;
 use crate::registry::{AsRule, Rule};
 
-pub mod actions;
+pub mod helpers;
 
 /// Auto-fix errors in a file, and write the fixed source code to disk.
 pub fn fix_file(diagnostics: &[Diagnostic], locator: &Locator) -> Option<(String, FixTable)> {
-    let mut with_fixes = diagnostics
-        .iter()
-        .filter(|diag| !diag.fix.is_empty())
-        .peekable();
-
-    if with_fixes.peek().is_none() {
+    if diagnostics.iter().all(|check| check.fix.is_empty()) {
         None
     } else {
-        Some(apply_fixes(with_fixes, locator))
+        Some(apply_fixes(diagnostics.iter(), locator))
     }
 }
 
@@ -57,7 +52,7 @@ fn apply_fixes<'a>(
         // 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_location()
+            fix.location()
                 .map_or(false, |fix_location| last_pos >= fix_location)
         }) {
             continue;
@@ -65,14 +60,14 @@ fn apply_fixes<'a>(
 
         for edit in fix.edits() {
             // Add all contents from `last_pos` to `fix.location`.
-            let slice = locator.slice(Range::new(last_pos.unwrap_or_default(), edit.location()));
+            let slice = locator.slice(Range::new(last_pos.unwrap_or_default(), edit.location));
             output.push_str(slice);
 
             // Add the patch itself.
-            output.push_str(edit.content().unwrap_or_default());
+            output.push_str(&edit.content);
 
             // Track that the edit was applied.
-            last_pos = Some(edit.end_location());
+            last_pos = Some(edit.end_location);
             applied.insert(edit);
         }
 
@@ -80,7 +75,7 @@ fn apply_fixes<'a>(
     }
 
     // Add the remaining content.
-    let slice = locator.after(last_pos.unwrap_or_default());
+    let slice = locator.skip(last_pos.unwrap_or_default());
     output.push_str(slice);
 
     (output, fixed)
@@ -88,8 +83,8 @@ fn apply_fixes<'a>(
 
 /// Compare two fixes.
 fn cmp_fix(rule1: Rule, rule2: Rule, fix1: &Fix, fix2: &Fix) -> std::cmp::Ordering {
-    fix1.min_location()
-        .cmp(&fix2.min_location())
+    fix1.location()
+        .cmp(&fix2.location())
         .then_with(|| match (&rule1, &rule2) {
             // Apply `EndsInPeriod` fixes before `NewLineAfterLastParagraph` fixes.
             (Rule::EndsInPeriod, Rule::NewLineAfterLastParagraph) => std::cmp::Ordering::Less,
@@ -114,8 +109,8 @@ mod tests {
             .map(|edit| Diagnostic {
                 // The choice of rule here is arbitrary.
                 kind: MissingNewlineAtEndOfFile.into(),
-                location: edit.location(),
-                end_location: edit.end_location(),
+                location: edit.location,
+                end_location: edit.end_location,
                 fix: edit.into(),
                 parent: None,
             })
@@ -140,11 +135,11 @@ class A(object):
 "#
             .trim(),
         );
-        let diagnostics = create_diagnostics([Edit::replacement(
-            "Bar".to_string(),
-            Location::new(1, 8),
-            Location::new(1, 14),
-        )]);
+        let diagnostics = create_diagnostics([Edit {
+            content: "Bar".to_string(),
+            location: Location::new(1, 8),
+            end_location: Location::new(1, 14),
+        }]);
         let (contents, fixed) = apply_fixes(diagnostics.iter(), &locator);
         assert_eq!(
             contents,
@@ -166,8 +161,11 @@ class A(object):
 "#
             .trim(),
         );
-        let diagnostics =
-            create_diagnostics([Edit::deletion(Location::new(1, 7), Location::new(1, 15))]);
+        let diagnostics = create_diagnostics([Edit {
+            content: String::new(),
+            location: Location::new(1, 7),
+            end_location: Location::new(1, 15),
+        }]);
         let (contents, fixed) = apply_fixes(diagnostics.iter(), &locator);
         assert_eq!(
             contents,
@@ -190,8 +188,16 @@ class A(object, object, object):
             .trim(),
         );
         let diagnostics = create_diagnostics([
-            Edit::deletion(Location::new(1, 8), Location::new(1, 16)),
-            Edit::deletion(Location::new(1, 22), Location::new(1, 30)),
+            Edit {
+                content: String::new(),
+                location: Location::new(1, 8),
+                end_location: Location::new(1, 16),
+            },
+            Edit {
+                content: String::new(),
+                location: Location::new(1, 22),
+                end_location: Location::new(1, 30),
+            },
         ]);
         let (contents, fixed) = apply_fixes(diagnostics.iter(), &locator);
 
@@ -216,12 +222,16 @@ class A(object):
             .trim(),
         );
         let diagnostics = create_diagnostics([
-            Edit::deletion(Location::new(1, 7), Location::new(1, 15)),
-            Edit::replacement(
-                "ignored".to_string(),
-                Location::new(1, 9),
-                Location::new(1, 11),
-            ),
+            Edit {
+                content: String::new(),
+                location: Location::new(1, 7),
+                end_location: Location::new(1, 15),
+            },
+            Edit {
+                content: "ignored".to_string(),
+                location: Location::new(1, 9),
+                end_location: Location::new(1, 11),
+            },
         ]);
         let (contents, fixed) = apply_fixes(diagnostics.iter(), &locator);
         assert_eq!(

crates/ruff/src/checkers/ast/deferred.rs

@@ -1,9 +1,9 @@
-use ruff_python_semantic::scope::ScopeStack;
+use ruff_python_ast::scope::ScopeStack;
 use rustpython_parser::ast::{Expr, Stmt};
 
 use ruff_python_ast::types::Range;
 use ruff_python_ast::types::RefEquality;
-use ruff_python_semantic::analyze::visibility::{Visibility, VisibleScope};
+use ruff_python_ast::visibility::{Visibility, VisibleScope};
 
 use crate::checkers::ast::AnnotationContext;
 use crate::docstrings::definition::Definition;

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

@@ -14,22 +14,22 @@ use rustpython_parser::ast::{
 
 use ruff_diagnostics::Diagnostic;
 use ruff_python_ast::all::{extract_all_names, AllNamesFlags};
-use ruff_python_ast::helpers::{extract_handled_exceptions, to_module_path};
-use ruff_python_ast::source_code::{Indexer, Locator, Stylist};
-use ruff_python_ast::types::{Node, Range, RefEquality};
-use ruff_python_ast::typing::parse_type_annotation;
-use ruff_python_ast::visitor::{walk_excepthandler, walk_pattern, Visitor};
-use ruff_python_ast::{branch_detection, cast, helpers, str, visitor};
-use ruff_python_semantic::analyze;
-use ruff_python_semantic::analyze::typing::{Callable, SubscriptKind};
-use ruff_python_semantic::binding::{
+use ruff_python_ast::binding::{
     Binding, BindingId, BindingKind, Exceptions, ExecutionContext, Export, FromImportation,
     Importation, StarImportation, SubmoduleImportation,
 };
-use ruff_python_semantic::context::Context;
-use ruff_python_semantic::scope::{
+use ruff_python_ast::context::Context;
+use ruff_python_ast::helpers::{extract_handled_exceptions, to_module_path};
+use ruff_python_ast::scope::{
     ClassDef, FunctionDef, Lambda, Scope, ScopeId, ScopeKind, ScopeStack,
 };
+use ruff_python_ast::source_code::{Indexer, Locator, Stylist};
+use ruff_python_ast::types::{Node, Range, RefEquality};
+use ruff_python_ast::typing::{
+    match_annotated_subscript, parse_type_annotation, Callable, SubscriptKind,
+};
+use ruff_python_ast::visitor::{walk_excepthandler, walk_pattern, Visitor};
+use ruff_python_ast::{branch_detection, cast, helpers, str, typing, visibility, visitor};
 use ruff_python_stdlib::builtins::{BUILTINS, MAGIC_GLOBALS};
 use ruff_python_stdlib::path::is_python_stub_file;
 
@@ -161,18 +161,6 @@ macro_rules! visit_non_type_definition {
     }};
 }
 
-/// Visit an [`Expr`], and treat it as a boolean test. This is useful for detecting whether an
-/// expressions return value is significant, or whether the calling context only relies on
-/// its truthiness.
-macro_rules! visit_boolean_test {
-    ($self:ident, $expr:expr) => {{
-        let prev_in_boolean_test = $self.ctx.in_boolean_test;
-        $self.ctx.in_boolean_test = true;
-        $self.visit_expr($expr);
-        $self.ctx.in_boolean_test = prev_in_boolean_test;
-    }};
-}
-
 impl<'a, 'b> Visitor<'b> for Checker<'a>
 where
     'b: 'a,
@@ -356,7 +344,6 @@ where
                             |expr| self.ctx.resolve_call_path(expr),
                         ));
                 }
-
                 if self.settings.rules.enabled(Rule::AmbiguousFunctionName) {
                     if let Some(diagnostic) =
                         pycodestyle::rules::ambiguous_function_name(name, || {
@@ -371,9 +358,7 @@ where
                     if let Some(diagnostic) = pep8_naming::rules::invalid_function_name(
                         stmt,
                         name,
-                        decorator_list,
                         &self.settings.pep8_naming.ignore_names,
-                        &self.ctx,
                         self.locator,
                     ) {
                         self.diagnostics.push(diagnostic);
@@ -602,21 +587,6 @@ where
                     );
                 }
 
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UnexpectedSpecialMethodSignature)
-                {
-                    pylint::rules::unexpected_special_method_signature(
-                        self,
-                        stmt,
-                        name,
-                        decorator_list,
-                        args,
-                        self.locator,
-                    );
-                }
-
                 self.check_builtin_shadowing(name, stmt, true);
 
                 // Visit the decorators and arguments, but avoid the body, which will be
@@ -625,9 +595,14 @@ where
                     self.visit_expr(expr);
                 }
 
-                // Function annotations are always evaluated at runtime, unless future annotations
-                // are enabled.
-                let runtime_annotation = !self.ctx.annotations_future_enabled;
+                // If we're in a class or module scope, then the annotation needs to be
+                // available at runtime.
+                // See: https://docs.python.org/3/reference/simple_stmts.html#annotated-assignment-statements
+                let runtime_annotation = !self.ctx.annotations_future_enabled
+                    && matches!(
+                        self.ctx.scope().kind,
+                        ScopeKind::Class(..) | ScopeKind::Module
+                    );
 
                 for arg in &args.posonlyargs {
                     if let Some(expr) = &arg.node.annotation {
@@ -841,24 +816,6 @@ where
                     flake8_pie::rules::non_unique_enums(self, stmt, body);
                 }
 
-                if self.settings.rules.any_enabled(&[
-                    Rule::MutableDataclassDefault,
-                    Rule::FunctionCallInDataclassDefaultArgument,
-                ]) && ruff::rules::is_dataclass(self, decorator_list)
-                {
-                    if self.settings.rules.enabled(Rule::MutableDataclassDefault) {
-                        ruff::rules::mutable_dataclass_default(self, body);
-                    }
-
-                    if self
-                        .settings
-                        .rules
-                        .enabled(Rule::FunctionCallInDataclassDefaultArgument)
-                    {
-                        ruff::rules::function_call_in_dataclass_defaults(self, body);
-                    }
-                }
-
                 self.check_builtin_shadowing(name, stmt, false);
 
                 for expr in bases {
@@ -992,11 +949,15 @@ where
 
                     // flake8_tidy_imports
                     if self.settings.rules.enabled(Rule::BannedApi) {
-                        flake8_tidy_imports::banned_api::name_or_parent_is_banned(
-                            self,
-                            &alias.node.name,
-                            alias,
-                        );
+                        if let Some(diagnostic) =
+                            flake8_tidy_imports::banned_api::name_or_parent_is_banned(
+                                alias,
+                                &alias.node.name,
+                                &self.settings.flake8_tidy_imports.banned_api,
+                            )
+                        {
+                            self.diagnostics.push(diagnostic);
+                        }
                     }
 
                     // pylint
@@ -1084,7 +1045,7 @@ where
 
                     if self.settings.rules.enabled(Rule::UnconventionalImportAlias) {
                         if let Some(diagnostic) =
-                            flake8_import_conventions::rules::conventional_import_alias(
+                            flake8_import_conventions::rules::check_conventional_import(
                                 stmt,
                                 &alias.node.name,
                                 alias.node.asname.as_deref(),
@@ -1095,21 +1056,6 @@ where
                         }
                     }
 
-                    if self.settings.rules.enabled(Rule::BannedImportAlias) {
-                        if let Some(asname) = &alias.node.asname {
-                            if let Some(diagnostic) =
-                                flake8_import_conventions::rules::banned_import_alias(
-                                    stmt,
-                                    &alias.node.name,
-                                    asname,
-                                    &self.settings.flake8_import_conventions.banned_aliases,
-                                )
-                            {
-                                self.diagnostics.push(diagnostic);
-                            }
-                        }
-                    }
-
                     if self
                         .settings
                         .rules
@@ -1177,24 +1123,26 @@ where
                 }
 
                 if self.settings.rules.enabled(Rule::BannedApi) {
-                    if let Some(module) = helpers::resolve_imported_module_path(
-                        *level,
-                        module.as_deref(),
-                        self.module_path.as_deref(),
-                    ) {
-                        flake8_tidy_imports::banned_api::name_or_parent_is_banned(
-                            self, &module, stmt,
-                        );
-
-                        for alias in names {
-                            if alias.node.name == "*" {
-                                continue;
+                    if let Some(module) = module {
+                        for name in names {
+                            if let Some(diagnostic) =
+                                flake8_tidy_imports::banned_api::name_is_banned(
+                                    module,
+                                    name,
+                                    &self.settings.flake8_tidy_imports.banned_api,
+                                )
+                            {
+                                self.diagnostics.push(diagnostic);
                             }
-                            flake8_tidy_imports::banned_api::name_is_banned(
-                                self,
-                                format!("{module}.{}", alias.node.name),
-                                alias,
-                            );
+                        }
+                        if let Some(diagnostic) =
+                            flake8_tidy_imports::banned_api::name_or_parent_is_banned(
+                                stmt,
+                                module,
+                                &self.settings.flake8_tidy_imports.banned_api,
+                            )
+                        {
+                            self.diagnostics.push(diagnostic);
                         }
                     }
                 }
@@ -1333,7 +1281,7 @@ where
                                 stmt,
                                 *level,
                                 module.as_deref(),
-                                self.module_path.as_deref(),
+                                self.module_path.as_ref(),
                                 &self.settings.flake8_tidy_imports.ban_relative_imports,
                             )
                         {
@@ -1359,7 +1307,7 @@ where
                             &alias.node.name,
                         );
                         if let Some(diagnostic) =
-                            flake8_import_conventions::rules::conventional_import_alias(
+                            flake8_import_conventions::rules::check_conventional_import(
                                 stmt,
                                 &full_name,
                                 alias.node.asname.as_deref(),
@@ -1370,26 +1318,6 @@ where
                         }
                     }
 
-                    if self.settings.rules.enabled(Rule::BannedImportAlias) {
-                        if let Some(asname) = &alias.node.asname {
-                            let full_name = helpers::format_import_from_member(
-                                *level,
-                                module.as_deref(),
-                                &alias.node.name,
-                            );
-                            if let Some(diagnostic) =
-                                flake8_import_conventions::rules::banned_import_alias(
-                                    stmt,
-                                    &full_name,
-                                    asname,
-                                    &self.settings.flake8_import_conventions.banned_aliases,
-                                )
-                            {
-                                self.diagnostics.push(diagnostic);
-                            }
-                        }
-                    }
-
                     if let Some(asname) = &alias.node.asname {
                         if self
                             .settings
@@ -1484,16 +1412,6 @@ where
                         }
                     }
                 }
-
-                if self.settings.rules.enabled(Rule::BannedImportFrom) {
-                    if let Some(diagnostic) = flake8_import_conventions::rules::banned_import_from(
-                        stmt,
-                        &helpers::format_import_from(*level, module.as_deref()),
-                        &self.settings.flake8_import_conventions.banned_from,
-                    ) {
-                        self.diagnostics.push(diagnostic);
-                    }
-                }
             }
             StmtKind::Raise { exc, .. } => {
                 if self.settings.rules.enabled(Rule::RaiseNotImplemented) {
@@ -1629,20 +1547,20 @@ where
                 }
             }
             StmtKind::Assert { test, msg } => {
-                if !self.ctx.in_type_checking_block {
-                    if self.settings.rules.enabled(Rule::Assert) {
-                        self.diagnostics
-                            .push(flake8_bandit::rules::assert_used(stmt));
-                    }
-                }
                 if self.settings.rules.enabled(Rule::AssertTuple) {
                     pyflakes::rules::assert_tuple(self, stmt, test);
                 }
                 if self.settings.rules.enabled(Rule::AssertFalse) {
                     flake8_bugbear::rules::assert_false(self, stmt, test, msg.as_deref());
                 }
+                if self.settings.rules.enabled(Rule::Assert) {
+                    self.diagnostics
+                        .push(flake8_bandit::rules::assert_used(stmt));
+                }
                 if self.settings.rules.enabled(Rule::PytestAssertAlwaysFalse) {
-                    flake8_pytest_style::rules::assert_falsy(self, stmt, test);
+                    if let Some(diagnostic) = flake8_pytest_style::rules::assert_falsy(stmt, test) {
+                        self.diagnostics.push(diagnostic);
+                    }
                 }
                 if self.settings.rules.enabled(Rule::PytestCompositeAssertion) {
                     flake8_pytest_style::rules::composite_condition(
@@ -1652,6 +1570,7 @@ where
                         msg.as_deref(),
                     );
                 }
+
                 if self.settings.rules.enabled(Rule::AssertOnStringLiteral) {
                     pylint::rules::assert_on_string_literal(self, test);
                 }
@@ -1810,7 +1729,7 @@ where
             StmtKind::Assign { targets, value, .. } => {
                 if self.settings.rules.enabled(Rule::LambdaAssignment) {
                     if let [target] = &targets[..] {
-                        pycodestyle::rules::lambda_assignment(self, target, value, None, stmt);
+                        pycodestyle::rules::lambda_assignment(self, target, value, stmt);
                     }
                 }
 
@@ -1826,6 +1745,12 @@ where
                     }
                 }
 
+                if self.is_stub {
+                    if self.settings.rules.enabled(Rule::UnprefixedTypeParam) {
+                        flake8_pyi::rules::prefix_type_params(self, value, targets);
+                    }
+                }
+
                 if self.settings.rules.enabled(Rule::GlobalStatement) {
                     for target in targets.iter() {
                         if let ExprKind::Name { id, .. } = &target.node {
@@ -1866,20 +1791,8 @@ where
                 }
 
                 if self.is_stub {
-                    if self
-                        .settings
-                        .rules
-                        .any_enabled(&[Rule::UnprefixedTypeParam, Rule::AssignmentDefaultInStub])
-                    {
-                        // Ignore assignments in function bodies; those are covered by other rules.
-                        if !self.ctx.scopes().any(|scope| scope.kind.is_function()) {
-                            if self.settings.rules.enabled(Rule::UnprefixedTypeParam) {
-                                flake8_pyi::rules::prefix_type_params(self, value, targets);
-                            }
-                            if self.settings.rules.enabled(Rule::AssignmentDefaultInStub) {
-                                flake8_pyi::rules::assignment_default_in_stub(self, targets, value);
-                            }
-                        }
+                    if self.settings.rules.enabled(Rule::AssignmentDefaultInStub) {
+                        flake8_pyi::rules::assignment_default_in_stub(self, value, None);
                     }
                 }
             }
@@ -1891,13 +1804,7 @@ where
             } => {
                 if self.settings.rules.enabled(Rule::LambdaAssignment) {
                     if let Some(value) = value {
-                        pycodestyle::rules::lambda_assignment(
-                            self,
-                            target,
-                            value,
-                            Some(annotation),
-                            stmt,
-                        );
+                        pycodestyle::rules::lambda_assignment(self, target, value, stmt);
                     }
                 }
                 if self
@@ -1915,12 +1822,11 @@ where
                 if self.is_stub {
                     if let Some(value) = value {
                         if self.settings.rules.enabled(Rule::AssignmentDefaultInStub) {
-                            // Ignore assignments in function bodies; those are covered by other rules.
-                            if !self.ctx.scopes().any(|scope| scope.kind.is_function()) {
-                                flake8_pyi::rules::annotated_assignment_default_in_stub(
-                                    self, target, value, annotation,
-                                );
-                            }
+                            flake8_pyi::rules::assignment_default_in_stub(
+                                self,
+                                value,
+                                Some(annotation),
+                            );
                         }
                     }
                 }
@@ -1941,6 +1847,13 @@ where
                 if self.settings.rules.enabled(Rule::UselessExpression) {
                     flake8_bugbear::rules::useless_expression(self, value);
                 }
+                if self
+                    .settings
+                    .rules
+                    .enabled(Rule::UncapitalizedEnvironmentVariables)
+                {
+                    flake8_simplify::rules::use_capital_environment_variables(self, value);
+                }
                 if self.settings.rules.enabled(Rule::AsyncioDanglingTask) {
                     if let Some(diagnostic) = ruff::rules::asyncio_dangling_task(value, |expr| {
                         self.ctx.resolve_call_path(expr)
@@ -2181,19 +2094,8 @@ where
                 }
                 self.visit_expr(target);
             }
-            StmtKind::Assert { test, msg } => {
-                visit_boolean_test!(self, test);
-                if let Some(expr) = msg {
-                    self.visit_expr(expr);
-                }
-            }
-            StmtKind::While { test, body, orelse } => {
-                visit_boolean_test!(self, test);
-                self.visit_body(body);
-                self.visit_body(orelse);
-            }
             StmtKind::If { test, body, orelse } => {
-                visit_boolean_test!(self, test);
+                self.visit_expr(test);
 
                 if flake8_type_checking::helpers::is_type_checking_block(&self.ctx, test) {
                     if self.settings.rules.enabled(Rule::EmptyTypeCheckingBlock) {
@@ -2280,11 +2182,6 @@ where
 
         let prev_in_literal = self.ctx.in_literal;
         let prev_in_type_definition = self.ctx.in_type_definition;
-        let prev_in_boolean_test = self.ctx.in_boolean_test;
-
-        if !matches!(expr.node, ExprKind::BoolOp { .. }) {
-            self.ctx.in_boolean_test = false;
-        }
 
         // Pre-visit.
         match &expr.node {
@@ -2313,14 +2210,6 @@ where
                 ]) {
                     flake8_2020::rules::subscript(self, value, slice);
                 }
-
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UncapitalizedEnvironmentVariables)
-                {
-                    flake8_simplify::rules::use_capital_environment_variables(self, expr);
-                }
             }
             ExprKind::Tuple { elts, ctx } | ExprKind::List { elts, ctx } => {
                 if matches!(ctx, ExprContext::Store) {
@@ -2359,7 +2248,7 @@ where
                                 || (self.settings.target_version >= PythonVersion::Py37
                                     && self.ctx.annotations_future_enabled
                                     && self.ctx.in_annotation))
-                            && analyze::typing::is_pep585_builtin(expr, &self.ctx)
+                            && typing::is_pep585_builtin(expr, &self.ctx)
                         {
                             pyupgrade::rules::use_pep585_annotation(self, expr);
                         }
@@ -2402,7 +2291,7 @@ where
                         || (self.settings.target_version >= PythonVersion::Py37
                             && self.ctx.annotations_future_enabled
                             && self.ctx.in_annotation))
-                    && analyze::typing::is_pep585_builtin(expr, &self.ctx)
+                    && typing::is_pep585_builtin(expr, &self.ctx)
                 {
                     pyupgrade::rules::use_pep585_annotation(self, expr);
                 }
@@ -2638,6 +2527,13 @@ where
                 if self.settings.rules.enabled(Rule::UnnecessaryDictKwargs) {
                     flake8_pie::rules::unnecessary_dict_kwargs(self, expr, keywords);
                 }
+                if self
+                    .settings
+                    .rules
+                    .enabled(Rule::UnnecessaryComprehensionAnyAll)
+                {
+                    flake8_pie::rules::unnecessary_comprehension_any_all(self, expr, func, args);
+                }
 
                 // flake8-bandit
                 if self.settings.rules.enabled(Rule::ExecBuiltin) {
@@ -2697,16 +2593,6 @@ where
                         self, func, args, keywords,
                     );
                 }
-                if self.settings.rules.any_enabled(&[
-                    Rule::SubprocessWithoutShellEqualsTrue,
-                    Rule::SubprocessPopenWithShellEqualsTrue,
-                    Rule::CallWithShellEqualsTrue,
-                    Rule::StartProcessWithAShell,
-                    Rule::StartProcessWithNoShell,
-                    Rule::StartProcessWithPartialPath,
-                ]) {
-                    flake8_bandit::rules::shell_injection(self, func, args, keywords);
-                }
 
                 // flake8-comprehensions
                 if self.settings.rules.enabled(Rule::UnnecessaryGeneratorList) {
@@ -2778,7 +2664,7 @@ where
                     .enabled(Rule::UnnecessaryLiteralWithinTupleCall)
                 {
                     flake8_comprehensions::rules::unnecessary_literal_within_tuple_call(
-                        self, expr, func, args, keywords,
+                        self, expr, func, args,
                     );
                 }
                 if self
@@ -2787,16 +2673,7 @@ where
                     .enabled(Rule::UnnecessaryLiteralWithinListCall)
                 {
                     flake8_comprehensions::rules::unnecessary_literal_within_list_call(
-                        self, expr, func, args, keywords,
-                    );
-                }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UnnecessaryLiteralWithinDictCall)
-                {
-                    flake8_comprehensions::rules::unnecessary_literal_within_dict_call(
-                        self, expr, func, args, keywords,
+                        self, expr, func, args,
                     );
                 }
                 if self.settings.rules.enabled(Rule::UnnecessaryListCall) {
@@ -2838,15 +2715,6 @@ where
                         args,
                     );
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UnnecessaryComprehensionAnyAll)
-                {
-                    flake8_comprehensions::rules::unnecessary_comprehension_any_all(
-                        self, expr, func, args, keywords,
-                    );
-                }
 
                 // flake8-boolean-trap
                 if self
@@ -3042,14 +2910,6 @@ where
                 }
 
                 // flake8-simplify
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UncapitalizedEnvironmentVariables)
-                {
-                    flake8_simplify::rules::use_capital_environment_variables(self, expr);
-                }
-
                 if self
                     .settings
                     .rules
@@ -3058,10 +2918,6 @@ where
                     flake8_simplify::rules::open_file_with_context_handler(self, func);
                 }
 
-                if self.settings.rules.enabled(Rule::DictGetWithNoneDefault) {
-                    flake8_simplify::rules::dict_get_with_none_default(self, expr);
-                }
-
                 // flake8-use-pathlib
                 if self.settings.rules.any_enabled(&[
                     Rule::OsPathAbspath,
@@ -3309,7 +3165,7 @@ where
                     }
 
                     if self.settings.rules.enabled(Rule::PrintfStringFormatting) {
-                        pyupgrade::rules::printf_string_formatting(self, expr, right);
+                        pyupgrade::rules::printf_string_formatting(self, expr, left, right);
                     }
                     if self.settings.rules.enabled(Rule::BadStringFormatType) {
                         pylint::rules::bad_string_format_type(self, expr, right);
@@ -3342,27 +3198,6 @@ where
                     flake8_bandit::rules::hardcoded_sql_expression(self, expr);
                 }
             }
-            ExprKind::BinOp {
-                op: Operator::BitOr,
-                ..
-            } => {
-                if self.is_stub {
-                    if self.settings.rules.enabled(Rule::DuplicateUnionMember)
-                        && self.ctx.in_type_definition
-                        && self.ctx.current_expr_parent().map_or(true, |parent| {
-                            !matches!(
-                                parent.node,
-                                ExprKind::BinOp {
-                                    op: Operator::BitOr,
-                                    ..
-                                }
-                            )
-                        })
-                    {
-                        flake8_pyi::rules::duplicate_union_member(self, expr);
-                    }
-                }
-            }
             ExprKind::UnaryOp { op, operand } => {
                 let check_not_in = self.settings.rules.enabled(Rule::NotInTest);
                 let check_not_is = self.settings.rules.enabled(Rule::NotIsTest);
@@ -3625,11 +3460,6 @@ where
                     (self.ctx.scope_stack.clone(), self.ctx.parents.clone()),
                 ));
             }
-            ExprKind::IfExp { test, body, orelse } => {
-                visit_boolean_test!(self, test);
-                self.visit_expr(body);
-                self.visit_expr(orelse);
-            }
             ExprKind::Call {
                 func,
                 args,
@@ -3658,22 +3488,11 @@ where
                     .any(|target| call_path.as_slice() == ["mypy_extensions", target])
                     {
                         Some(Callable::MypyExtension)
-                    } else if call_path.as_slice() == ["", "bool"] {
-                        Some(Callable::Bool)
                     } else {
                         None
                     }
                 });
                 match callable {
-                    Some(Callable::Bool) => {
-                        self.visit_expr(func);
-                        if !args.is_empty() {
-                            visit_boolean_test!(self, &args[0]);
-                        }
-                        for expr in args.iter().skip(1) {
-                            self.visit_expr(expr);
-                        }
-                    }
                     Some(Callable::Cast) => {
                         self.visit_expr(func);
                         if !args.is_empty() {
@@ -3809,7 +3628,7 @@ where
                     self.ctx.in_subscript = true;
                     visitor::walk_expr(self, expr);
                 } else {
-                    match analyze::typing::match_annotated_subscript(
+                    match match_annotated_subscript(
                         value,
                         &self.ctx,
                         self.settings.typing_modules.iter().map(String::as_str),
@@ -3872,7 +3691,6 @@ where
 
         self.ctx.in_type_definition = prev_in_type_definition;
         self.ctx.in_literal = prev_in_literal;
-        self.ctx.in_boolean_test = prev_in_boolean_test;
 
         self.ctx.pop_expr();
     }
@@ -3885,11 +3703,7 @@ where
                 &comprehension.iter,
             );
         }
-        self.visit_expr(&comprehension.iter);
-        self.visit_expr(&comprehension.target);
-        for expr in &comprehension.ifs {
-            visit_boolean_test!(self, expr);
-        }
+        visitor::walk_comprehension(self, comprehension);
     }
 
     fn visit_excepthandler(&mut self, excepthandler: &'b Excepthandler) {
@@ -4233,7 +4047,7 @@ impl<'a> Checker<'a> {
                         && binding.redefines(existing)
                         && (!self.settings.dummy_variable_rgx.is_match(name) || existing_is_import)
                         && !(existing.kind.is_function_definition()
-                            && analyze::visibility::is_overload(
+                            && visibility::is_overload(
                                 &self.ctx,
                                 cast::decorator_list(existing.source.as_ref().unwrap()),
                             ))
@@ -4267,7 +4081,7 @@ impl<'a> Checker<'a> {
                     }
                 } else if existing_is_import && binding.redefines(existing) {
                     self.ctx
-                        .shadowed_bindings
+                        .redefinitions
                         .entry(existing_binding_index)
                         .or_insert_with(Vec::new)
                         .push(binding_id);
@@ -4309,7 +4123,13 @@ impl<'a> Checker<'a> {
         // in scope.
         let scope = self.ctx.scope_mut();
         if !(binding.kind.is_annotation() && scope.defines(name)) {
-            scope.add(name, binding_id);
+            if let Some(rebound_index) = scope.add(name, binding_id) {
+                scope
+                    .rebounds
+                    .entry(name)
+                    .or_insert_with(Vec::new)
+                    .push(rebound_index);
+            }
         }
 
         self.ctx.bindings.push(binding);
@@ -4528,14 +4348,8 @@ impl<'a> Checker<'a> {
             .rules
             .enabled(Rule::MixedCaseVariableInClassScope)
         {
-            if let ScopeKind::Class(class) = &self.ctx.scope().kind {
-                pep8_naming::rules::mixed_case_variable_in_class_scope(
-                    self,
-                    expr,
-                    parent,
-                    id,
-                    class.bases,
-                );
+            if matches!(self.ctx.scope().kind, ScopeKind::Class(..)) {
+                pep8_naming::rules::mixed_case_variable_in_class_scope(self, expr, parent, id);
             }
         }
 
@@ -4566,6 +4380,7 @@ impl<'a> Checker<'a> {
             return;
         }
 
+        // TODO(charlie): Include comprehensions here.
         if matches!(
             parent.node,
             StmtKind::For { .. } | StmtKind::AsyncFor { .. }
@@ -4637,23 +4452,7 @@ impl<'a> Checker<'a> {
                 }
                 _ => false,
             } {
-                let (all_names, all_names_flags) = {
-                    let (mut names, flags) =
-                        extract_all_names(parent, |name| self.ctx.is_builtin(name));
-
-                    // Grab the existing bound __all__ values.
-                    if let StmtKind::AugAssign { .. } = &parent.node {
-                        if let Some(index) = current.get("__all__") {
-                            if let BindingKind::Export(Export { names: existing }) =
-                                &self.ctx.bindings[*index].kind
-                            {
-                                names.extend_from_slice(existing);
-                            }
-                        }
-                    }
-
-                    (names, flags)
-                };
+                let (all_names, all_names_flags) = extract_all_names(&self.ctx, parent, current);
 
                 if self.settings.rules.enabled(Rule::InvalidAllFormat) {
                     if matches!(all_names_flags, AllNamesFlags::INVALID_FORMAT) {
@@ -4950,7 +4749,7 @@ impl<'a> Checker<'a> {
         // Mark anything referenced in `__all__` as used.
         let all_bindings: Option<(Vec<BindingId>, Range)> = {
             let global_scope = self.ctx.global_scope();
-            let all_names: Option<(&Vec<&str>, Range)> = global_scope
+            let all_names: Option<(&Vec<String>, Range)> = global_scope
                 .get("__all__")
                 .map(|index| &self.ctx.bindings[*index])
                 .and_then(|binding| match &binding.kind {
@@ -4962,7 +4761,7 @@ impl<'a> Checker<'a> {
                 (
                     names
                         .iter()
-                        .filter_map(|name| global_scope.get(name).copied())
+                        .filter_map(|name| global_scope.get(name.as_str()).copied())
                         .collect(),
                     range,
                 )
@@ -4980,13 +4779,15 @@ impl<'a> Checker<'a> {
         }
 
         // Extract `__all__` names from the global scope.
-        let all_names: Option<(&[&str], Range)> = self
+        let all_names: Option<(Vec<&str>, Range)> = self
             .ctx
             .global_scope()
             .get("__all__")
             .map(|index| &self.ctx.bindings[*index])
             .and_then(|binding| match &binding.kind {
-                BindingKind::Export(Export { names }) => Some((names.as_slice(), binding.range)),
+                BindingKind::Export(Export { names }) => {
+                    Some((names.iter().map(String::as_str).collect(), binding.range))
+                }
                 _ => None,
             });
 
@@ -5046,7 +4847,7 @@ impl<'a> Checker<'a> {
                             .dedup()
                             .collect();
                         if !sources.is_empty() {
-                            for &name in names.iter() {
+                            for &name in names {
                                 if !scope.defines(name) {
                                     diagnostics.push(Diagnostic::new(
                                         pyflakes::rules::UndefinedLocalWithImportStarUsage {
@@ -5104,7 +4905,7 @@ impl<'a> Checker<'a> {
                             continue;
                         }
 
-                        if let Some(indices) = self.ctx.shadowed_bindings.get(index) {
+                        if let Some(indices) = self.ctx.redefinitions.get(index) {
                             for index in indices {
                                 let rebound = &self.ctx.bindings[*index];
                                 let mut diagnostic = Diagnostic::new(
@@ -5251,7 +5052,7 @@ impl<'a> Checker<'a> {
 
                     let fix = if !in_init && !in_except_handler && self.patch(Rule::UnusedImport) {
                         let deleted: Vec<&Stmt> = self.deletions.iter().map(Into::into).collect();
-                        match autofix::actions::remove_unused_imports(
+                        match autofix::helpers::remove_unused_imports(
                             unused_imports.iter().map(|(full_name, _)| *full_name),
                             child,
                             parent,
@@ -5261,7 +5062,7 @@ impl<'a> Checker<'a> {
                             self.stylist,
                         ) {
                             Ok(fix) => {
-                                if fix.is_deletion() || fix.content() == Some("pass") {
+                                if fix.content.is_empty() || fix.content == "pass" {
                                     self.deletions.insert(*defined_by);
                                 }
                                 Some(fix)

crates/ruff/src/checkers/imports.rs

@@ -1,15 +1,12 @@
 //! Lint rules based on import analysis.
-use std::borrow::Cow;
+
 use std::path::Path;
 
-use rustpython_parser::ast::{StmtKind, Suite};
+use rustpython_parser::ast::Suite;
 
 use ruff_diagnostics::Diagnostic;
-use ruff_python_ast::helpers::to_module_path;
-use ruff_python_ast::imports::{ImportMap, ModuleImport};
 use ruff_python_ast::source_code::{Indexer, Locator, Stylist};
 use ruff_python_ast::visitor::Visitor;
-use ruff_python_stdlib::path::is_python_stub_file;
 
 use crate::directives::IsortDirectives;
 use crate::registry::Rule;
@@ -17,66 +14,6 @@ use crate::rules::isort;
 use crate::rules::isort::track::{Block, ImportTracker};
 use crate::settings::{flags, Settings};
 
-fn extract_import_map(path: &Path, package: Option<&Path>, blocks: &[&Block]) -> Option<ImportMap> {
-    let Some(package) = package else {
-        return None;
-    };
-    let Some(module_path) = to_module_path(package, path) else {
-        return None;
-    };
-
-    let num_imports = blocks.iter().map(|block| block.imports.len()).sum();
-    let mut module_imports = Vec::with_capacity(num_imports);
-    for stmt in blocks.iter().flat_map(|block| &block.imports) {
-        match &stmt.node {
-            StmtKind::Import { names } => {
-                module_imports.extend(names.iter().map(|name| {
-                    ModuleImport::new(
-                        name.node.name.clone(),
-                        stmt.location,
-                        stmt.end_location.unwrap(),
-                    )
-                }));
-            }
-            StmtKind::ImportFrom {
-                module,
-                names,
-                level,
-            } => {
-                let level = level.unwrap_or(0);
-                let module = if let Some(module) = module {
-                    if level == 0 {
-                        Cow::Borrowed(module)
-                    } else {
-                        if module_path.len() <= level {
-                            continue;
-                        }
-                        let prefix = module_path[..module_path.len() - level].join(".");
-                        Cow::Owned(format!("{prefix}.{module}"))
-                    }
-                } else {
-                    if module_path.len() <= level {
-                        continue;
-                    }
-                    Cow::Owned(module_path[..module_path.len() - level].join("."))
-                };
-                module_imports.extend(names.iter().map(|name| {
-                    ModuleImport::new(
-                        format!("{}.{}", module, name.node.name),
-                        name.location,
-                        name.end_location.unwrap(),
-                    )
-                }));
-            }
-            _ => panic!("Expected StmtKind::Import | StmtKind::ImportFrom"),
-        }
-    }
-
-    let mut import_map = ImportMap::default();
-    import_map.insert(module_path.join("."), module_imports);
-    Some(import_map)
-}
-
 #[allow(clippy::too_many_arguments)]
 pub fn check_imports(
     python_ast: &Suite,
@@ -88,12 +25,10 @@ pub fn check_imports(
     autofix: flags::Autofix,
     path: &Path,
     package: Option<&Path>,
-) -> (Vec<Diagnostic>, Option<ImportMap>) {
-    let is_stub = is_python_stub_file(path);
-
+) -> Vec<Diagnostic> {
     // Extract all imports from the AST.
     let tracker = {
-        let mut tracker = ImportTracker::new(locator, directives, is_stub);
+        let mut tracker = ImportTracker::new(locator, directives, path);
         tracker.visit_body(python_ast);
         tracker
     };
@@ -114,12 +49,8 @@ pub fn check_imports(
     }
     if settings.rules.enabled(Rule::MissingRequiredImport) {
         diagnostics.extend(isort::rules::add_required_imports(
-            &blocks, python_ast, locator, stylist, settings, autofix, is_stub,
+            &blocks, python_ast, locator, stylist, settings, autofix,
         ));
     }
-
-    // Extract import map.
-    let imports = extract_import_map(path, package, &blocks);
-
-    (diagnostics, imports)
+    diagnostics
 }

crates/ruff/src/checkers/logical_lines.rs

@@ -183,7 +183,7 @@ pub fn check_logical_lines(
             if settings.rules.enabled(kind.rule()) {
                 diagnostics.push(Diagnostic {
                     kind,
-                    location: Location::new(start_loc.row(), 0),
+                    location,
                     end_location: location,
                     fix: Fix::empty(),
                     parent: None,

crates/ruff/src/checkers/physical_lines.rs

@@ -4,7 +4,7 @@ use std::path::Path;
 
 use ruff_diagnostics::Diagnostic;
 use ruff_python_ast::newlines::StrExt;
-use ruff_python_ast::source_code::{Indexer, Locator, Stylist};
+use ruff_python_ast::source_code::{Locator, Stylist};
 
 use crate::registry::Rule;
 use crate::rules::flake8_executable::helpers::{extract_shebang, ShebangDirective};
@@ -24,7 +24,7 @@ pub fn check_physical_lines(
     path: &Path,
     locator: &Locator,
     stylist: &Stylist,
-    indexer: &Indexer,
+    commented_lines: &[usize],
     doc_lines: &[usize],
     settings: &Settings,
     autofix: flags::Autofix,
@@ -55,11 +55,8 @@ pub fn check_physical_lines(
     let fix_shebang_whitespace =
         autofix.into() && settings.rules.should_fix(Rule::ShebangLeadingWhitespace);
 
-    let mut commented_lines_iter = indexer.commented_lines().iter().peekable();
+    let mut commented_lines_iter = commented_lines.iter().peekable();
     let mut doc_lines_iter = doc_lines.iter().peekable();
-
-    let string_lines = indexer.string_ranges();
-
     for (index, line) in locator.contents().universal_newlines().enumerate() {
         while commented_lines_iter
             .next_if(|lineno| &(index + 1) == *lineno)
@@ -76,11 +73,15 @@ pub fn check_physical_lines(
             }
 
             if enforce_blanket_type_ignore {
-                blanket_type_ignore(&mut diagnostics, index, line);
+                if let Some(diagnostic) = blanket_type_ignore(index, line) {
+                    diagnostics.push(diagnostic);
+                }
             }
 
             if enforce_blanket_noqa {
-                blanket_noqa(&mut diagnostics, index, line);
+                if let Some(diagnostic) = blanket_noqa(index, line) {
+                    diagnostics.push(diagnostic);
+                }
             }
 
             if enforce_shebang_missing
@@ -154,7 +155,7 @@ pub fn check_physical_lines(
         }
 
         if enforce_tab_indentation {
-            if let Some(diagnostic) = tab_indentation(index + 1, line, string_lines) {
+            if let Some(diagnostic) = tab_indentation(index, line) {
                 diagnostics.push(diagnostic);
             }
         }
@@ -185,7 +186,7 @@ mod tests {
     use rustpython_parser::Mode;
     use std::path::Path;
 
-    use ruff_python_ast::source_code::{Indexer, Locator, Stylist};
+    use ruff_python_ast::source_code::{Locator, Stylist};
 
     use crate::registry::Rule;
     use crate::settings::{flags, Settings};
@@ -197,7 +198,6 @@ mod tests {
         let line = "'\u{4e9c}' * 2"; // 7 in UTF-32, 9 in UTF-8.
         let locator = Locator::new(line);
         let tokens: Vec<_> = lex(line, Mode::Module).collect();
-        let indexer: Indexer = tokens.as_slice().into();
         let stylist = Stylist::from_tokens(&tokens, &locator);
 
         let check_with_max_line_length = |line_length: usize| {
@@ -205,7 +205,7 @@ mod tests {
                 Path::new("foo.py"),
                 &locator,
                 &stylist,
-                &indexer,
+                &[],
                 &[],
                 &Settings {
                     line_length,

crates/ruff/src/codes.rs

@@ -202,7 +202,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<Rule> {
         (Pylint, "W0711") => Rule::BinaryOpException,
         (Pylint, "W1508") => Rule::InvalidEnvvarDefault,
         (Pylint, "W2901") => Rule::RedefinedLoopName,
-        (Pylint, "E0302") => Rule::UnexpectedSpecialMethodSignature,
 
         // flake8-builtins
         (Flake8Builtins, "001") => Rule::BuiltinVariableShadowing,
@@ -264,8 +263,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<Rule> {
         (Flake8Comprehensions, "15") => Rule::UnnecessarySubscriptReversal,
         (Flake8Comprehensions, "16") => Rule::UnnecessaryComprehension,
         (Flake8Comprehensions, "17") => Rule::UnnecessaryMap,
-        (Flake8Comprehensions, "18") => Rule::UnnecessaryLiteralWithinDictCall,
-        (Flake8Comprehensions, "19") => Rule::UnnecessaryComprehensionAnyAll,
 
         // flake8-debugger
         (Flake8Debugger, "0") => Rule::Debugger,
@@ -359,7 +356,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<Rule> {
         (Flake8Simplify, "223") => Rule::ExprAndFalse,
         (Flake8Simplify, "300") => Rule::YodaConditions,
         (Flake8Simplify, "401") => Rule::IfElseBlockInsteadOfDictGet,
-        (Flake8Simplify, "910") => Rule::DictGetWithNoneDefault,
 
         // pyupgrade
         (Pyupgrade, "001") => Rule::UselessMetaclassType,
@@ -510,12 +506,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<Rule> {
         (Flake8Bandit, "506") => Rule::UnsafeYAMLLoad,
         (Flake8Bandit, "508") => Rule::SnmpInsecureVersion,
         (Flake8Bandit, "509") => Rule::SnmpWeakCryptography,
-        (Flake8Bandit, "602") => Rule::SubprocessPopenWithShellEqualsTrue,
-        (Flake8Bandit, "603") => Rule::SubprocessWithoutShellEqualsTrue,
-        (Flake8Bandit, "604") => Rule::CallWithShellEqualsTrue,
-        (Flake8Bandit, "605") => Rule::StartProcessWithAShell,
-        (Flake8Bandit, "606") => Rule::StartProcessWithNoShell,
-        (Flake8Bandit, "607") => Rule::StartProcessWithPartialPath,
         (Flake8Bandit, "608") => Rule::HardcodedSQLExpression,
         (Flake8Bandit, "612") => Rule::LoggingConfigInsecureListen,
         (Flake8Bandit, "701") => Rule::Jinja2AutoescapeFalse,
@@ -534,8 +524,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<Rule> {
 
         // flake8-import-conventions
         (Flake8ImportConventions, "001") => Rule::UnconventionalImportAlias,
-        (Flake8ImportConventions, "002") => Rule::BannedImportAlias,
-        (Flake8ImportConventions, "003") => Rule::BannedImportFrom,
 
         // flake8-datetimez
         (Flake8Datetimez, "001") => Rule::CallDatetimeWithoutTzinfo,
@@ -584,7 +572,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<Rule> {
         (Flake8Pyi, "012") => Rule::PassInClassBody,
         (Flake8Pyi, "014") => Rule::ArgumentDefaultInStub,
         (Flake8Pyi, "015") => Rule::AssignmentDefaultInStub,
-        (Flake8Pyi, "016") => Rule::DuplicateUnionMember,
         (Flake8Pyi, "021") => Rule::DocstringInStub,
         (Flake8Pyi, "033") => Rule::TypeCommentInStub,
 
@@ -620,6 +607,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<Rule> {
         (Flake8Pie, "794") => Rule::DuplicateClassFieldDefinition,
         (Flake8Pie, "796") => Rule::NonUniqueEnums,
         (Flake8Pie, "800") => Rule::UnnecessarySpread,
+        (Flake8Pie, "802") => Rule::UnnecessaryComprehensionAnyAll,
         (Flake8Pie, "804") => Rule::UnnecessaryDictKwargs,
         (Flake8Pie, "807") => Rule::ReimplementedListBuiltin,
         (Flake8Pie, "810") => Rule::MultipleStartsEndsWith,
@@ -711,8 +699,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<Rule> {
         (Ruff, "005") => Rule::CollectionLiteralConcatenation,
         (Ruff, "006") => Rule::AsyncioDanglingTask,
         (Ruff, "007") => Rule::PairwiseOverZipped,
-        (Ruff, "008") => Rule::MutableDataclassDefault,
-        (Ruff, "009") => Rule::FunctionCallInDataclassDefaultArgument,
         (Ruff, "100") => Rule::UnusedNOQA,
 
         // flake8-django

crates/ruff/src/directives.rs

@@ -9,8 +9,7 @@ use rustpython_parser::Tok;
 use crate::settings::Settings;
 
 bitflags! {
-    #[derive(Debug, Copy, Clone)]
-    pub struct Flags: u8 {
+    pub struct Flags: u32 {
         const NOQA = 0b0000_0001;
         const ISORT = 0b0000_0010;
     }

crates/ruff/src/docstrings/definition.rs

@@ -1,8 +1,7 @@
-use rustpython_parser::ast::{Expr, Stmt};
-
-use ruff_python_semantic::analyze::visibility::{
+use ruff_python_ast::visibility::{
     class_visibility, function_visibility, method_visibility, Modifier, Visibility, VisibleScope,
 };
+use rustpython_parser::ast::{Expr, Stmt};
 
 #[derive(Debug, Clone)]
 pub enum DefinitionKind<'a> {

crates/ruff/src/docstrings/extraction.rs

@@ -2,7 +2,7 @@
 
 use rustpython_parser::ast::{Constant, Expr, ExprKind, Stmt, StmtKind};
 
-use ruff_python_semantic::analyze::visibility;
+use ruff_python_ast::visibility::{Modifier, VisibleScope};
 
 use crate::docstrings::definition::{Definition, DefinitionKind, Documentable};
 
@@ -28,7 +28,7 @@ pub fn docstring_from(suite: &[Stmt]) -> Option<&Expr> {
 
 /// Extract a `Definition` from the AST node defined by a `Stmt`.
 pub fn extract<'a>(
-    scope: visibility::VisibleScope,
+    scope: VisibleScope,
     stmt: &'a Stmt,
     body: &'a [Stmt],
     kind: Documentable,
@@ -36,22 +36,22 @@ pub fn extract<'a>(
     let expr = docstring_from(body);
     match kind {
         Documentable::Function => match scope {
-            visibility::VisibleScope {
-                modifier: visibility::Modifier::Module,
+            VisibleScope {
+                modifier: Modifier::Module,
                 ..
             } => Definition {
                 kind: DefinitionKind::Function(stmt),
                 docstring: expr,
             },
-            visibility::VisibleScope {
-                modifier: visibility::Modifier::Class,
+            VisibleScope {
+                modifier: Modifier::Class,
                 ..
             } => Definition {
                 kind: DefinitionKind::Method(stmt),
                 docstring: expr,
             },
-            visibility::VisibleScope {
-                modifier: visibility::Modifier::Function,
+            VisibleScope {
+                modifier: Modifier::Function,
                 ..
             } => Definition {
                 kind: DefinitionKind::NestedFunction(stmt),
@@ -59,22 +59,22 @@ pub fn extract<'a>(
             },
         },
         Documentable::Class => match scope {
-            visibility::VisibleScope {
-                modifier: visibility::Modifier::Module,
+            VisibleScope {
+                modifier: Modifier::Module,
                 ..
             } => Definition {
                 kind: DefinitionKind::Class(stmt),
                 docstring: expr,
             },
-            visibility::VisibleScope {
-                modifier: visibility::Modifier::Class,
+            VisibleScope {
+                modifier: Modifier::Class,
                 ..
             } => Definition {
                 kind: DefinitionKind::NestedClass(stmt),
                 docstring: expr,
             },
-            visibility::VisibleScope {
-                modifier: visibility::Modifier::Function,
+            VisibleScope {
+                modifier: Modifier::Function,
                 ..
             } => Definition {
                 kind: DefinitionKind::NestedClass(stmt),

crates/ruff/src/docstrings/google.rs

@@ -26,8 +26,6 @@ pub(crate) static GOOGLE_SECTIONS: &[SectionKind] = &[
     SectionKind::KeywordArguments,
     SectionKind::Note,
     SectionKind::Notes,
-    SectionKind::OtherArgs,
-    SectionKind::OtherArguments,
     SectionKind::Return,
     SectionKind::Tip,
     SectionKind::Todo,

crates/ruff/src/docstrings/numpy.rs

@@ -14,7 +14,6 @@ pub(crate) static NUMPY_SECTIONS: &[SectionKind] = &[
     SectionKind::Yields,
     // NumPy-only
     SectionKind::ExtendedSummary,
-    SectionKind::OtherParams,
     SectionKind::OtherParameters,
     SectionKind::Parameters,
     SectionKind::ShortSummary,

crates/ruff/src/docstrings/sections.rs

@@ -22,9 +22,6 @@ pub enum SectionKind {
     Methods,
     Note,
     Notes,
-    OtherArgs,
-    OtherArguments,
-    OtherParams,
     OtherParameters,
     Parameters,
     Raises,
@@ -62,9 +59,6 @@ impl SectionKind {
             "methods" => Some(Self::Methods),
             "note" => Some(Self::Note),
             "notes" => Some(Self::Notes),
-            "other args" => Some(Self::OtherArgs),
-            "other arguments" => Some(Self::OtherArguments),
-            "other params" => Some(Self::OtherParams),
             "other parameters" => Some(Self::OtherParameters),
             "parameters" => Some(Self::Parameters),
             "raises" => Some(Self::Raises),
@@ -103,9 +97,6 @@ impl SectionKind {
             Self::Methods => "Methods",
             Self::Note => "Note",
             Self::Notes => "Notes",
-            Self::OtherArgs => "Other Args",
-            Self::OtherArguments => "Other Arguments",
-            Self::OtherParams => "Other Params",
             Self::OtherParameters => "Other Parameters",
             Self::Parameters => "Parameters",
             Self::Raises => "Raises",

crates/ruff/src/fs.rs

@@ -1,21 +1,36 @@
 use std::path::{Path, PathBuf};
 
+use anyhow::{anyhow, Result};
 use globset::GlobMatcher;
 use log::debug;
 use path_absolutize::{path_dedot, Absolutize};
 
 use crate::registry::RuleSet;
 
+/// Extract the absolute path and basename (as strings) from a Path.
+pub fn extract_path_names(path: &Path) -> Result<(&str, &str)> {
+    let file_path = path
+        .to_str()
+        .ok_or_else(|| anyhow!("Unable to parse filename: {:?}", path))?;
+    let file_basename = path
+        .file_name()
+        .ok_or_else(|| anyhow!("Unable to parse filename: {:?}", path))?
+        .to_str()
+        .ok_or_else(|| anyhow!("Unable to parse filename: {:?}", path))?;
+    Ok((file_path, file_basename))
+}
+
 /// Create a set with codes matching the pattern/code pairs.
 pub(crate) fn ignores_from_path(
     path: &Path,
     pattern_code_pairs: &[(GlobMatcher, GlobMatcher, RuleSet)],
 ) -> RuleSet {
-    let file_name = path.file_name().expect("Unable to parse filename");
+    let (file_path, file_basename) = extract_path_names(path).expect("Unable to parse filename");
+
     pattern_code_pairs
         .iter()
         .filter_map(|(absolute, basename, rules)| {
-            if basename.is_match(file_name) {
+            if basename.is_match(file_basename) {
                 debug!(
                     "Adding per-file ignores for {:?} due to basename match on {:?}: {:?}",
                     path,
@@ -23,7 +38,7 @@ pub(crate) fn ignores_from_path(
                     rules
                 );
                 Some(rules)
-            } else if absolute.is_match(path) {
+            } else if absolute.is_match(file_path) {
                 debug!(
                     "Adding per-file ignores for {:?} due to absolute match on {:?}: {:?}",
                     path,

crates/ruff/src/importer.rs

@@ -174,7 +174,7 @@ fn match_docstring_end(body: &[Stmt]) -> Option<Location> {
 /// along with a trailing newline suffix.
 fn end_of_statement_insertion(stmt: &Stmt, locator: &Locator, stylist: &Stylist) -> Insertion {
     let location = stmt.end_location.unwrap();
-    let mut tokens = lexer::lex_located(locator.after(location), Mode::Module, location).flatten();
+    let mut tokens = lexer::lex_located(locator.skip(location), Mode::Module, location).flatten();
     if let Some((.., Tok::Semi, end)) = tokens.next() {
         // If the first token after the docstring is a semicolon, insert after the semicolon as an
         // inline statement;
@@ -207,7 +207,7 @@ fn top_of_file_insertion(body: &[Stmt], locator: &Locator, stylist: &Stylist) ->
     let mut location = if let Some(location) = match_docstring_end(body) {
         // If the first token after the docstring is a semicolon, insert after the semicolon as an
         // inline statement;
-        let first_token = lexer::lex_located(locator.after(location), Mode::Module, location)
+        let first_token = lexer::lex_located(locator.skip(location), Mode::Module, location)
             .flatten()
             .next();
         if let Some((.., Tok::Semi, end)) = first_token {
@@ -222,7 +222,7 @@ fn top_of_file_insertion(body: &[Stmt], locator: &Locator, stylist: &Stylist) ->
 
     // Skip over any comments and empty lines.
     for (.., tok, end) in
-        lexer::lex_located(locator.after(location), Mode::Module, location).flatten()
+        lexer::lex_located(locator.skip(location), Mode::Module, location).flatten()
     {
         if matches!(tok, Tok::Comment(..) | Tok::Newline) {
             location = Location::new(end.row() + 1, 0);

crates/ruff/src/linter.rs

@@ -1,5 +1,4 @@
 use std::borrow::Cow;
-use std::ops::Deref;
 use std::path::Path;
 
 use anyhow::{anyhow, Result};
@@ -10,8 +9,7 @@ use rustpython_parser::lexer::LexResult;
 use rustpython_parser::ParseError;
 
 use ruff_diagnostics::Diagnostic;
-use ruff_python_ast::imports::ImportMap;
-use ruff_python_ast::source_code::{Indexer, Locator, SourceFileBuilder, Stylist};
+use ruff_python_ast::source_code::{Indexer, Locator, Stylist};
 use ruff_python_stdlib::path::is_python_stub_file;
 
 use crate::autofix::fix_file;
@@ -23,7 +21,7 @@ use crate::checkers::physical_lines::check_physical_lines;
 use crate::checkers::tokens::check_tokens;
 use crate::directives::Directives;
 use crate::doc_lines::{doc_lines_from_ast, doc_lines_from_tokens};
-use crate::message::Message;
+use crate::message::{Message, Source};
 use crate::noqa::add_noqa;
 use crate::registry::{AsRule, Rule};
 use crate::rules::pycodestyle;
@@ -53,15 +51,6 @@ impl<T> LinterResult<T> {
 
 pub type FixTable = FxHashMap<Rule, usize>;
 
-pub struct FixerResult<'a> {
-    /// The result returned by the linter, after applying any fixes.
-    pub result: LinterResult<(Vec<Message>, Option<ImportMap>)>,
-    /// The resulting source code, after applying any fixes.
-    pub transformed: Cow<'a, str>,
-    /// The number of fixes applied for each [`Rule`].
-    pub fixed: FixTable,
-}
-
 /// Generate `Diagnostic`s from the source code contents at the
 /// given `Path`.
 #[allow(clippy::too_many_arguments)]
@@ -77,10 +66,9 @@ pub fn check_path(
     settings: &Settings,
     noqa: flags::Noqa,
     autofix: flags::Autofix,
-) -> LinterResult<(Vec<Diagnostic>, Option<ImportMap>)> {
+) -> LinterResult<Vec<Diagnostic>> {
     // Aggregate all diagnostics.
     let mut diagnostics = vec![];
-    let mut imports = None;
     let mut error = None;
 
     // Collect doc lines. This requires a rare mix of tokens (for comments) and AST
@@ -154,7 +142,7 @@ pub fn check_path(
                     ));
                 }
                 if use_imports {
-                    let (import_diagnostics, module_imports) = check_imports(
+                    diagnostics.extend(check_imports(
                         &python_ast,
                         locator,
                         indexer,
@@ -164,9 +152,7 @@ pub fn check_path(
                         autofix,
                         path,
                         package,
-                    );
-                    imports = module_imports;
-                    diagnostics.extend(import_diagnostics);
+                    ));
                 }
                 if use_doc_lines {
                     doc_lines.extend(doc_lines_from_ast(&python_ast));
@@ -197,7 +183,13 @@ pub fn check_path(
         .any(|rule_code| rule_code.lint_source().is_physical_lines())
     {
         diagnostics.extend(check_physical_lines(
-            path, locator, stylist, indexer, &doc_lines, settings, autofix,
+            path,
+            locator,
+            stylist,
+            indexer.commented_lines(),
+            &doc_lines,
+            settings,
+            autofix,
         ));
     }
 
@@ -248,7 +240,7 @@ pub fn check_path(
         }
     }
 
-    LinterResult::new((diagnostics, imports), error)
+    LinterResult::new(diagnostics, error)
 }
 
 const MAX_ITERATIONS: usize = 100;
@@ -305,7 +297,7 @@ pub fn add_noqa_to_path(path: &Path, package: Option<&Path>, settings: &Settings
     // Add any missing `# noqa` pragmas.
     add_noqa(
         path,
-        &diagnostics.0,
+        &diagnostics,
         &contents,
         indexer.commented_lines(),
         &directives.noqa_line_for,
@@ -322,7 +314,7 @@ pub fn lint_only(
     settings: &Settings,
     noqa: flags::Noqa,
     autofix: flags::Autofix,
-) -> LinterResult<(Vec<Message>, Option<ImportMap>)> {
+) -> LinterResult<Vec<Message>> {
     // Tokenize once.
     let tokens: Vec<LexResult> = ruff_rustpython::tokenize(contents);
 
@@ -354,41 +346,25 @@ pub fn lint_only(
         autofix,
     );
 
-    result.map(|(diagnostics, imports)| {
-        (
-            diagnostics_to_messages(diagnostics, path, settings, &locator, &directives),
-            imports,
-        )
+    // Convert from diagnostics to messages.
+    let path_lossy = path.to_string_lossy();
+    result.map(|diagnostics| {
+        diagnostics
+            .into_iter()
+            .map(|diagnostic| {
+                let source = if settings.show_source {
+                    Some(Source::from_diagnostic(&diagnostic, &locator))
+                } else {
+                    None
+                };
+                let lineno = diagnostic.location.row();
+                let noqa_row = *directives.noqa_line_for.get(&lineno).unwrap_or(&lineno);
+                Message::from_diagnostic(diagnostic, path_lossy.to_string(), source, noqa_row)
+            })
+            .collect()
     })
 }
 
-/// Convert from diagnostics to messages.
-fn diagnostics_to_messages(
-    diagnostics: Vec<Diagnostic>,
-    path: &Path,
-    settings: &Settings,
-    locator: &Locator,
-    directives: &Directives,
-) -> Vec<Message> {
-    let file = once_cell::unsync::Lazy::new(|| {
-        let mut builder = SourceFileBuilder::new(&path.to_string_lossy());
-        if settings.show_source {
-            builder.set_source_code(&locator.to_source_code());
-        }
-
-        builder.finish()
-    });
-
-    diagnostics
-        .into_iter()
-        .map(|diagnostic| {
-            let lineno = diagnostic.location.row();
-            let noqa_row = *directives.noqa_line_for.get(&lineno).unwrap_or(&lineno);
-            Message::from_diagnostic(diagnostic, file.deref().clone(), noqa_row)
-        })
-        .collect()
-}
-
 /// Generate `Diagnostic`s from source code content, iteratively autofixing
 /// until stable.
 pub fn lint_fix<'a>(
@@ -397,7 +373,7 @@ pub fn lint_fix<'a>(
     package: Option<&Path>,
     noqa: flags::Noqa,
     settings: &Settings,
-) -> Result<FixerResult<'a>> {
+) -> Result<(LinterResult<Vec<Message>>, Cow<'a, str>, FixTable)> {
     let mut transformed = Cow::Borrowed(contents);
 
     // Track the number of fixed errors across iterations.
@@ -472,7 +448,7 @@ This indicates a bug in `{}`. If you could open an issue at:
         }
 
         // Apply autofix.
-        if let Some((fixed_contents, applied)) = fix_file(&result.data.0, &locator) {
+        if let Some((fixed_contents, applied)) = fix_file(&result.data, &locator) {
             if iterations < MAX_ITERATIONS {
                 // Count the number of fixed errors.
                 for (rule, count) in applied {
@@ -510,15 +486,31 @@ This indicates a bug in `{}`. If you could open an issue at:
             }
         }
 
-        return Ok(FixerResult {
-            result: result.map(|(diagnostics, imports)| {
-                (
-                    diagnostics_to_messages(diagnostics, path, settings, &locator, &directives),
-                    imports,
-                )
+        // Convert to messages.
+        let path_lossy = path.to_string_lossy();
+        return Ok((
+            result.map(|diagnostics| {
+                diagnostics
+                    .into_iter()
+                    .map(|diagnostic| {
+                        let source = if settings.show_source {
+                            Some(Source::from_diagnostic(&diagnostic, &locator))
+                        } else {
+                            None
+                        };
+                        let lineno = diagnostic.location.row();
+                        let noqa_row = *directives.noqa_line_for.get(&lineno).unwrap_or(&lineno);
+                        Message::from_diagnostic(
+                            diagnostic,
+                            path_lossy.to_string(),
+                            source,
+                            noqa_row,
+                        )
+                    })
+                    .collect()
             }),
             transformed,
             fixed,
-        });
+        ));
     }
 }

crates/ruff/src/message.rs

@@ -0,0 +1,89 @@
+use std::cmp::Ordering;
+
+pub use rustpython_parser::ast::Location;
+use serde::{Deserialize, Serialize};
+
+use ruff_diagnostics::{Diagnostic, DiagnosticKind, Fix};
+use ruff_python_ast::source_code::Locator;
+use ruff_python_ast::types::Range;
+
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct Message {
+    pub kind: DiagnosticKind,
+    pub location: Location,
+    pub end_location: Location,
+    pub fix: Fix,
+    pub filename: String,
+    pub source: Option<Source>,
+    pub noqa_row: usize,
+}
+
+impl Message {
+    pub fn from_diagnostic(
+        diagnostic: Diagnostic,
+        filename: String,
+        source: Option<Source>,
+        noqa_row: usize,
+    ) -> Self {
+        Self {
+            kind: diagnostic.kind,
+            location: Location::new(diagnostic.location.row(), diagnostic.location.column() + 1),
+            end_location: Location::new(
+                diagnostic.end_location.row(),
+                diagnostic.end_location.column() + 1,
+            ),
+            fix: diagnostic.fix,
+            filename,
+            source,
+            noqa_row,
+        }
+    }
+}
+
+impl Ord for Message {
+    fn cmp(&self, other: &Self) -> Ordering {
+        (&self.filename, self.location.row(), self.location.column()).cmp(&(
+            &other.filename,
+            other.location.row(),
+            other.location.column(),
+        ))
+    }
+}
+
+impl PartialOrd for Message {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct Source {
+    pub contents: String,
+    pub range: (usize, usize),
+}
+
+impl Source {
+    pub fn from_diagnostic(diagnostic: &Diagnostic, locator: &Locator) -> Self {
+        let location = Location::new(diagnostic.location.row(), 0);
+        // Diagnostics can already extend one-past-the-end. If they do, though, then
+        // they'll end at the start of a line. We need to avoid extending by yet another
+        // line past-the-end.
+        let end_location = if diagnostic.end_location.column() == 0 {
+            diagnostic.end_location
+        } else {
+            Location::new(diagnostic.end_location.row() + 1, 0)
+        };
+        let source = locator.slice(Range::new(location, end_location));
+        let num_chars_in_range = locator
+            .slice(Range::new(diagnostic.location, diagnostic.end_location))
+            .chars()
+            .count();
+        Source {
+            contents: source.to_string(),
+            range: (
+                diagnostic.location.column(),
+                diagnostic.location.column() + num_chars_in_range,
+            ),
+        }
+    }
+}

crates/ruff/src/message/azure.rs

@@ -1,53 +0,0 @@
-use crate::message::{Emitter, EmitterContext, Message};
-use crate::registry::AsRule;
-use std::io::Write;
-
-/// Generate error logging commands for Azure Pipelines format.
-/// See [documentation](https://learn.microsoft.com/en-us/azure/devops/pipelines/scripts/logging-commands?view=azure-devops&tabs=bash#logissue-log-an-error-or-warning)
-#[derive(Default)]
-pub struct AzureEmitter;
-
-impl Emitter for AzureEmitter {
-    fn emit(
-        &mut self,
-        writer: &mut dyn Write,
-        messages: &[Message],
-        context: &EmitterContext,
-    ) -> anyhow::Result<()> {
-        for message in messages {
-            let (line, col) = if context.is_jupyter_notebook(message.filename()) {
-                // We can't give a reasonable location for the structured formats,
-                // so we show one that's clearly a fallback
-                (1, 0)
-            } else {
-                (message.location.row(), message.location.column())
-            };
-
-            writeln!(
-                writer,
-                "##vso[task.logissue type=error\
-                        ;sourcepath={filename};linenumber={line};columnnumber={col};code={code};]{body}",
-                filename = message.filename(),
-                code = message.kind.rule().noqa_code(),
-                body = message.kind.body,
-            )?;
-        }
-
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::message::tests::{capture_emitter_output, create_messages};
-    use crate::message::AzureEmitter;
-    use insta::assert_snapshot;
-
-    #[test]
-    fn output() {
-        let mut emitter = AzureEmitter::default();
-        let content = capture_emitter_output(&mut emitter, &create_messages());
-
-        assert_snapshot!(content);
-    }
-}

crates/ruff/src/message/diff.rs

@@ -1,194 +0,0 @@
-use crate::message::Message;
-use colored::{Color, ColoredString, Colorize, Styles};
-use ruff_diagnostics::Fix;
-use ruff_python_ast::source_code::{OneIndexed, SourceCode};
-use ruff_python_ast::types::Range;
-use ruff_text_size::{TextRange, TextSize};
-use similar::{ChangeTag, TextDiff};
-use std::fmt::{Display, Formatter};
-use std::num::NonZeroUsize;
-
-/// Renders a diff that shows the code fixes.
-///
-/// The implementation isn't fully fledged out and only used by tests. Before using in production, try
-/// * Improve layout
-/// * Replace tabs with spaces for a consistent experience across terminals
-/// * Replace zero-width whitespaces
-/// * Print a simpler diff if only a single line has changed
-/// * Compute the diff from the [`Edit`] because diff calculation is expensive.
-pub(super) struct Diff<'a> {
-    fix: &'a Fix,
-    source_code: SourceCode<'a, 'a>,
-}
-
-impl<'a> Diff<'a> {
-    pub fn from_message(message: &'a Message) -> Option<Diff> {
-        match message.file.source_code() {
-            Some(source_code) if !message.fix.is_empty() => Some(Diff {
-                source_code,
-                fix: &message.fix,
-            }),
-            _ => None,
-        }
-    }
-}
-
-impl Display for Diff<'_> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        let mut output = String::with_capacity(self.source_code.text().len());
-        let mut last_end = TextSize::default();
-
-        for edit in self.fix.edits() {
-            let edit_range = self
-                .source_code
-                .text_range(Range::new(edit.location(), edit.end_location()));
-            output.push_str(&self.source_code.text()[TextRange::new(last_end, edit_range.start())]);
-            output.push_str(edit.content().unwrap_or_default());
-            last_end = edit_range.end();
-        }
-
-        output.push_str(&self.source_code.text()[usize::from(last_end)..]);
-
-        let diff = TextDiff::from_lines(self.source_code.text(), &output);
-
-        writeln!(f, "{}", "ℹ Suggested fix".blue())?;
-
-        let (largest_old, largest_new) = diff
-            .ops()
-            .last()
-            .map(|op| (op.old_range().start, op.new_range().start))
-            .unwrap_or_default();
-
-        let digit_with =
-            calculate_print_width(OneIndexed::from_zero_indexed(largest_new.max(largest_old)));
-
-        for (idx, group) in diff.grouped_ops(3).iter().enumerate() {
-            if idx > 0 {
-                writeln!(f, "{:-^1$}", "-", 80)?;
-            }
-            for op in group {
-                for change in diff.iter_inline_changes(op) {
-                    let sign = match change.tag() {
-                        ChangeTag::Delete => "-",
-                        ChangeTag::Insert => "+",
-                        ChangeTag::Equal => " ",
-                    };
-
-                    let line_style = LineStyle::from(change.tag());
-
-                    let old_index = change.old_index().map(OneIndexed::from_zero_indexed);
-                    let new_index = change.new_index().map(OneIndexed::from_zero_indexed);
-
-                    write!(
-                        f,
-                        "{} {} |{}",
-                        Line {
-                            index: old_index,
-                            width: digit_with
-                        },
-                        Line {
-                            index: new_index,
-                            width: digit_with
-                        },
-                        line_style.apply_to(sign).bold()
-                    )?;
-
-                    for (emphasized, value) in change.iter_strings_lossy() {
-                        if emphasized {
-                            write!(f, "{}", line_style.apply_to(&value).underline().on_black())?;
-                        } else {
-                            write!(f, "{}", line_style.apply_to(&value))?;
-                        }
-                    }
-                    if change.missing_newline() {
-                        writeln!(f)?;
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    }
-}
-
-struct LineStyle {
-    fgcolor: Option<Color>,
-    style: Option<Styles>,
-}
-
-impl LineStyle {
-    fn apply_to(&self, input: &str) -> ColoredString {
-        let mut colored = ColoredString::from(input);
-        if let Some(color) = self.fgcolor {
-            colored = colored.color(color);
-        }
-
-        if let Some(style) = self.style {
-            match style {
-                Styles::Clear => colored.clear(),
-                Styles::Bold => colored.bold(),
-                Styles::Dimmed => colored.dimmed(),
-                Styles::Underline => colored.underline(),
-                Styles::Reversed => colored.reversed(),
-                Styles::Italic => colored.italic(),
-                Styles::Blink => colored.blink(),
-                Styles::Hidden => colored.hidden(),
-                Styles::Strikethrough => colored.strikethrough(),
-            }
-        } else {
-            colored
-        }
-    }
-}
-
-impl From<ChangeTag> for LineStyle {
-    fn from(value: ChangeTag) -> Self {
-        match value {
-            ChangeTag::Equal => LineStyle {
-                fgcolor: None,
-                style: Some(Styles::Dimmed),
-            },
-            ChangeTag::Delete => LineStyle {
-                fgcolor: Some(Color::Red),
-                style: None,
-            },
-            ChangeTag::Insert => LineStyle {
-                fgcolor: Some(Color::Green),
-                style: None,
-            },
-        }
-    }
-}
-
-struct Line {
-    index: Option<OneIndexed>,
-    width: NonZeroUsize,
-}
-
-impl Display for Line {
-    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
-        match self.index {
-            None => {
-                for _ in 0..self.width.get() {
-                    f.write_str(" ")?;
-                }
-                Ok(())
-            }
-            Some(idx) => write!(f, "{:<width$}", idx, width = self.width.get()),
-        }
-    }
-}
-
-/// Calculate the length of the string representation of `value`
-pub(super) fn calculate_print_width(mut value: OneIndexed) -> NonZeroUsize {
-    const TEN: OneIndexed = OneIndexed::from_zero_indexed(9);
-
-    let mut width = OneIndexed::ONE;
-
-    while value >= TEN {
-        value = OneIndexed::new(value.get() / 10).unwrap_or(OneIndexed::MIN);
-        width = width.checked_add(1).unwrap();
-    }
-
-    width
-}

crates/ruff/src/message/github.rs

@@ -1,65 +0,0 @@
-use crate::fs::relativize_path;
-use crate::message::{Emitter, EmitterContext, Message};
-use crate::registry::AsRule;
-use std::io::Write;
-
-/// Generate error workflow command in GitHub Actions format.
-/// See: [GitHub documentation](https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-error-message)
-#[derive(Default)]
-pub struct GithubEmitter;
-
-impl Emitter for GithubEmitter {
-    fn emit(
-        &mut self,
-        writer: &mut dyn Write,
-        messages: &[Message],
-        context: &EmitterContext,
-    ) -> anyhow::Result<()> {
-        for message in messages {
-            let (row, column) = if context.is_jupyter_notebook(message.filename()) {
-                // We can't give a reasonable location for the structured formats,
-                // so we show one that's clearly a fallback
-                (1, 0)
-            } else {
-                (message.location.row(), message.location.column())
-            };
-
-            write!(
-                writer,
-                "::error title=Ruff \
-                         ({code}),file={file},line={row},col={column},endLine={end_row},endColumn={end_column}::",
-                code = message.kind.rule().noqa_code(),
-                file = message.filename(),
-                row = message.location.row(),
-                column = message.location.column(),
-                end_row = message.end_location.row(),
-                end_column = message.end_location.column(),
-            )?;
-
-            writeln!(
-                writer,
-                "{path}:{row}:{column}: {code} {body}",
-                path = relativize_path(message.filename()),
-                code = message.kind.rule().noqa_code(),
-                body = message.kind.body,
-            )?;
-        }
-
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::message::tests::{capture_emitter_output, create_messages};
-    use crate::message::GithubEmitter;
-    use insta::assert_snapshot;
-
-    #[test]
-    fn output() {
-        let mut emitter = GithubEmitter::default();
-        let content = capture_emitter_output(&mut emitter, &create_messages());
-
-        assert_snapshot!(content);
-    }
-}

crates/ruff/src/message/gitlab.rs

@@ -1,153 +0,0 @@
-use crate::fs::{relativize_path, relativize_path_to};
-use crate::message::{Emitter, EmitterContext, Message};
-use crate::registry::AsRule;
-use serde::ser::SerializeSeq;
-use serde::{Serialize, Serializer};
-use serde_json::json;
-use std::collections::hash_map::DefaultHasher;
-use std::hash::{Hash, Hasher};
-use std::io::Write;
-
-/// Generate JSON with violations in GitLab CI format
-//  https://docs.gitlab.com/ee/ci/testing/code_quality.html#implement-a-custom-tool
-pub struct GitlabEmitter {
-    project_dir: Option<String>,
-}
-
-impl Default for GitlabEmitter {
-    fn default() -> Self {
-        Self {
-            project_dir: std::env::var("CI_PROJECT_DIR").ok(),
-        }
-    }
-}
-
-impl Emitter for GitlabEmitter {
-    fn emit(
-        &mut self,
-        writer: &mut dyn Write,
-        messages: &[Message],
-        context: &EmitterContext,
-    ) -> anyhow::Result<()> {
-        serde_json::to_writer_pretty(
-            writer,
-            &SerializedMessages {
-                messages,
-                context,
-                project_dir: self.project_dir.as_deref(),
-            },
-        )?;
-
-        Ok(())
-    }
-}
-
-struct SerializedMessages<'a> {
-    messages: &'a [Message],
-    context: &'a EmitterContext<'a>,
-    project_dir: Option<&'a str>,
-}
-
-impl Serialize for SerializedMessages<'_> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let mut s = serializer.serialize_seq(Some(self.messages.len()))?;
-
-        for message in self.messages {
-            let lines = if self.context.is_jupyter_notebook(message.filename()) {
-                // We can't give a reasonable location for the structured formats,
-                // so we show one that's clearly a fallback
-                json!({
-                    "begin": 1,
-                    "end": 1
-                })
-            } else {
-                json!({
-                    "begin": message.location.row(),
-                    "end": message.end_location.row()
-                })
-            };
-
-            let path = self.project_dir.as_ref().map_or_else(
-                || relativize_path(message.filename()),
-                |project_dir| relativize_path_to(message.filename(), project_dir),
-            );
-
-            let value = json!({
-                "description": format!("({}) {}", message.kind.rule().noqa_code(), message.kind.body),
-                "severity": "major",
-                "fingerprint": fingerprint(message),
-                "location": {
-                    "path": path,
-                    "lines": lines
-                }
-            });
-
-            s.serialize_element(&value)?;
-        }
-
-        s.end()
-    }
-}
-
-/// Generate a unique fingerprint to identify a violation.
-fn fingerprint(message: &Message) -> String {
-    let Message {
-        kind,
-        location,
-        end_location,
-        fix: _fix,
-        file,
-        noqa_row: _noqa_row,
-    } = message;
-
-    let mut hasher = DefaultHasher::new();
-
-    kind.rule().hash(&mut hasher);
-    location.row().hash(&mut hasher);
-    location.column().hash(&mut hasher);
-    end_location.row().hash(&mut hasher);
-    end_location.column().hash(&mut hasher);
-    file.name().hash(&mut hasher);
-
-    format!("{:x}", hasher.finish())
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::message::tests::{capture_emitter_output, create_messages};
-    use crate::message::GitlabEmitter;
-    use insta::assert_snapshot;
-
-    #[test]
-    fn output() {
-        let mut emitter = GitlabEmitter::default();
-        let content = capture_emitter_output(&mut emitter, &create_messages());
-
-        assert_snapshot!(redact_fingerprint(&content));
-    }
-
-    // Redact the fingerprint because the default hasher isn't stable across platforms.
-    fn redact_fingerprint(content: &str) -> String {
-        static FINGERPRINT_HAY_KEY: &str = r#""fingerprint": ""#;
-
-        let mut output = String::with_capacity(content.len());
-        let mut last = 0;
-
-        for (start, _) in content.match_indices(FINGERPRINT_HAY_KEY) {
-            let fingerprint_hash_start = start + FINGERPRINT_HAY_KEY.len();
-            output.push_str(&content[last..fingerprint_hash_start]);
-            output.push_str("<redacted>");
-            last = fingerprint_hash_start
-                + content[fingerprint_hash_start..]
-                    .find('"')
-                    .expect("Expected terminating quote");
-        }
-
-        output.push_str(&content[last..]);
-
-        output
-    }
-}