diff --git a/.cargo/config.toml b/.cargo/config.toml
index 3a7caaff78c0f..d6ef99b66f955 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,6 +1,6 @@
 [alias]
 dev = "run --package ruff_dev --bin ruff_dev"
-benchmark = "bench -p ruff_benchmark --"
+benchmark = "bench -p ruff_benchmark --bench linter --bench formatter --"
 
 [target.'cfg(all())']
 rustflags = [
@@ -33,4 +33,5 @@ rustflags = [
   "-Wclippy::rc_buffer",
   "-Wclippy::rc_mutex",
   "-Wclippy::rest_pat_in_fully_bound_structs",
+  "-Wunreachable_pub"
 ]
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000000..e46e1cc5c33f7
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,46 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/rust
+{
+	"name": "Ruff",
+	"image": "mcr.microsoft.com/devcontainers/rust:0-1-bullseye",
+	"mounts": [
+		{
+			"source": "devcontainer-cargo-cache-${devcontainerId}",
+			"target": "/usr/local/cargo",
+			"type": "volume"
+		}
+	],
+	"customizations": {
+		"codespaces": {
+			"openFiles": [
+				"CONTRIBUTING.md"
+			]
+		},
+		"vscode": {
+			"extensions": [
+				"ms-python.python",
+				"rust-lang.rust-analyzer",
+				"serayuzgur.crates",
+				"tamasfe.even-better-toml",
+				"Swellaby.vscode-rust-test-adapter",
+				"charliermarsh.ruff"
+			],
+			"settings": {
+				"rust-analyzer.updates.askBeforeDownload": false
+			}
+		}
+	},
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	"features": {
+		"ghcr.io/devcontainers/features/python": {
+			"installTools": false
+		}
+	},
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+	"postCreateCommand": ".devcontainer/post-create.sh"
+	// Configure tool-specific properties.
+	// "customizations": {},
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
new file mode 100755
index 0000000000000..0a81beacfdb6a
--- /dev/null
+++ b/.devcontainer/post-create.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+rustup default < rust-toolchain
+rustup component add clippy rustfmt
+cargo install cargo-insta
+cargo fetch
+
+pip install maturin pre-commit
diff --git a/.editorconfig b/.editorconfig
index 776563c1e1f50..11c29680d79e7 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,4 +14,7 @@ indent_size = 2
 indent_size = 4
 
 [*.snap]
-trim_trailing_whitespace = false
\ No newline at end of file
+trim_trailing_whitespace = false
+
+[*.md]
+max_line_length = 100
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000000..5b6455590f091
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,15 @@
+<!--
+Thank you for contributing to Ruff! To help us out with reviewing, please consider the following:
+
+- Does this pull request include a summary of the change? (See below.)
+- Does this pull request include a descriptive title?
+- Does this pull request include references to any relevant issues?
+-->
+
+## Summary
+
+<!-- What's the purpose of the change? What does it do, and why? -->
+
+## Test Plan
+
+<!-- How was it tested? -->
diff --git a/.github/release.yml b/.github/release.yml
index ddaefcb7e5411..a27541985e3d8 100644
--- a/.github/release.yml
+++ b/.github/release.yml
@@ -1,5 +1,9 @@
 # https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#configuring-automatically-generated-release-notes
 changelog:
+  exclude:
+    labels:
+      - internal
+      - documentation
   categories:
     - title: Breaking Changes
       labels:
@@ -11,6 +15,7 @@ changelog:
     - title: Settings
       labels:
         - configuration
+        - cli
     - title: Bug Fixes
       labels:
         - bug
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2a75bd59ada7b..b59061fd59652 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -15,6 +15,8 @@ env:
   CARGO_NET_RETRY: 10
   CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
+  PACKAGE_NAME: ruff
+  PYTHON_VERSION: "3.7" # to build abi3 wheels
 
 jobs:
   cargo-fmt:
@@ -85,6 +87,22 @@ jobs:
           name: ruff
           path: target/debug/ruff
 
+  cargo-fuzz:
+    runs-on: ubuntu-latest
+    name: "cargo fuzz"
+    steps:
+      - uses: actions/checkout@v3
+      - name: "Install Rust toolchain"
+        run: rustup show
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: "fuzz -> target"
+      - name: "Install cargo-fuzz"
+        uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-fuzz@0.11
+      - run: cargo fuzz build -s none
+
   cargo-test-wasm:
     runs-on: ubuntu-latest
     name: "cargo test (wasm)"
@@ -181,18 +199,30 @@ jobs:
       - name: "Install cargo-udeps"
         uses: taiki-e/install-action@cargo-udeps
       - name: "Run cargo-udeps"
+        run: cargo +nightly-2023-03-30 udeps
+
+
+  python-package:
+    name: "python package"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          architecture: x64
+      - name: "Prep README.md"
+        run: python scripts/transform_readme.py --target pypi
+      - name: "Build wheels"
+        uses: PyO3/maturin-action@v1
+        with:
+          manylinux: auto
+          args: --out dist
+      - name: "Test wheel"
         run: |
-          unused_dependencies=$(cargo +nightly-2023-03-30 udeps > unused.txt && cat unused.txt | cut -d $'\n' -f 2-)
-          if [ -z "$unused_dependencies" ]; then
-            echo "No unused dependencies found" > $GITHUB_STEP_SUMMARY
-            exit 0
-          else
-            echo "Found unused dependencies" > $GITHUB_STEP_SUMMARY
-            echo '```console' >> $GITHUB_STEP_SUMMARY
-            echo "$unused_dependencies" >> $GITHUB_STEP_SUMMARY
-            echo '```' >> $GITHUB_STEP_SUMMARY
-            exit 1
-          fi
+          pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
+          ruff --help
+          python -m ruff --help
 
   pre-commit:
     name: "pre-commit"
@@ -237,5 +267,7 @@ jobs:
         run: python scripts/transform_readme.py --target mkdocs
       - name: "Generate docs"
         run: python scripts/generate_mkdocs.py
+      - name: "Check docs formatting"
+        run: python scripts/check_docs_formatted.py
       - name: "Build docs"
         run: mkdocs build --strict
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index 8722d251007cc..cb8f646df5126 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -1,9 +1,9 @@
 name: mkdocs
 
 on:
-  release:
-    types: [published]
   workflow_dispatch:
+  release:
+    types: [ published ]
 
 jobs:
   mkdocs:
diff --git a/.github/workflows/flake8-to-ruff.yaml b/.github/workflows/flake8-to-ruff.yaml
index c207e1884ac48..28fa643788fce 100644
--- a/.github/workflows/flake8-to-ruff.yaml
+++ b/.github/workflows/flake8-to-ruff.yaml
@@ -52,7 +52,7 @@ jobs:
       - name: "Build wheels - universal2"
         uses: PyO3/maturin-action@v1
         with:
-          args: --release --universal2 --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
+          args: --release --target universal2-apple-darwin --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
       - name: "Install built wheel - universal2"
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*universal2.whl --force-reinstall
diff --git a/.github/workflows/playground.yaml b/.github/workflows/playground.yaml
index 40060bcbb7185..dcb582815ea7a 100644
--- a/.github/workflows/playground.yaml
+++ b/.github/workflows/playground.yaml
@@ -2,8 +2,8 @@ name: "[Playground] Release"
 
 on:
   workflow_dispatch:
-  push:
-    branches: [main]
+  release:
+    types: [ published ]
 
 env:
   CARGO_INCREMENTAL: 0
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 4d31e24540d8c..1240298e76174 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -3,7 +3,7 @@ name: "[ruff] Release"
 on:
   workflow_dispatch:
   release:
-    types: [published]
+    types: [ published ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -18,6 +18,32 @@ env:
   RUSTUP_MAX_RETRIES: 10
 
 jobs:
+  sdist:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+      - name: "Prep README.md"
+        run: python scripts/transform_readme.py --target pypi
+      - name: "Build sdist"
+        uses: PyO3/maturin-action@v1
+        with:
+          command: sdist
+          args: --out dist
+      - name: "Test sdist"
+        run: |
+          rustup default $(cat rust-toolchain)
+          pip install dist/${{ env.PACKAGE_NAME }}-*.tar.gz --force-reinstall
+          ruff --help
+          python -m ruff --help
+      - name: "Upload sdist"
+        uses: actions/upload-artifact@v3
+        with:
+          name: wheels
+          path: dist
+
   macos-x86_64:
     runs-on: macos-latest
     steps:
@@ -32,10 +58,12 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: x86_64
-          args: --release --out dist --sdist
-      - name: "Install built wheel - x86_64"
+          args: --release --out dist
+      - name: "Test wheel - x86_64"
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
+          ruff --help
+          python -m ruff --help
       - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
@@ -43,9 +71,9 @@ jobs:
           path: dist
       - name: "Archive binary"
         run: |
-            ARCHIVE_FILE=ruff-x86_64-apple-darwin.tar.gz
-            tar czvf $ARCHIVE_FILE -C target/x86_64-apple-darwin/release ruff
-            shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
+          ARCHIVE_FILE=ruff-x86_64-apple-darwin.tar.gz
+          tar czvf $ARCHIVE_FILE -C target/x86_64-apple-darwin/release ruff
+          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
       - name: "Upload binary"
         uses: actions/upload-artifact@v3
         with:
@@ -67,10 +95,12 @@ jobs:
       - name: "Build wheels - universal2"
         uses: PyO3/maturin-action@v1
         with:
-          args: --release --universal2 --out dist
-      - name: "Install built wheel - universal2"
+          args: --release --target universal2-apple-darwin --out dist
+      - name: "Test wheel - universal2"
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*universal2.whl --force-reinstall
+          ruff --help
+          python -m ruff --help
       - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
@@ -78,9 +108,9 @@ jobs:
           path: dist
       - name: "Archive binary"
         run: |
-            ARCHIVE_FILE=ruff-aarch64-apple-darwin.tar.gz
-            tar czvf $ARCHIVE_FILE -C target/aarch64-apple-darwin/release ruff
-            shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
+          ARCHIVE_FILE=ruff-aarch64-apple-darwin.tar.gz
+          tar czvf $ARCHIVE_FILE -C target/aarch64-apple-darwin/release ruff
+          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
       - name: "Upload binary"
         uses: actions/upload-artifact@v3
         with:
@@ -113,11 +143,13 @@ jobs:
         with:
           target: ${{ matrix.platform.target }}
           args: --release --out dist
-      - name: "Install built wheel"
+      - name: "Test wheel"
         if: ${{ !startsWith(matrix.platform.target, 'aarch64') }}
         shell: bash
         run: |
           python -m pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
+          ruff --help
+          python -m ruff --help
       - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
@@ -126,9 +158,9 @@ jobs:
       - name: "Archive binary"
         shell: bash
         run: |
-            ARCHIVE_FILE=ruff-${{ matrix.platform.target }}.zip
-            7z a $ARCHIVE_FILE ./target/${{ matrix.platform.target }}/release/ruff.exe
-            sha256sum $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
+          ARCHIVE_FILE=ruff-${{ matrix.platform.target }}.zip
+          7z a $ARCHIVE_FILE ./target/${{ matrix.platform.target }}/release/ruff.exe
+          sha256sum $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
       - name: "Upload binary"
         uses: actions/upload-artifact@v3
         with:
@@ -158,10 +190,12 @@ jobs:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --release --out dist
-      - name: "Install built wheel"
+      - name: "Test wheel"
         if: ${{ startsWith(matrix.target, 'x86_64') }}
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
+          ruff --help
+          python -m ruff --help
       - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
@@ -169,9 +203,9 @@ jobs:
           path: dist
       - name: "Archive binary"
         run: |
-            ARCHIVE_FILE=ruff-${{ matrix.target }}.tar.gz
-            tar czvf $ARCHIVE_FILE -C target/${{ matrix.target }}/release ruff
-            shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
+          ARCHIVE_FILE=ruff-${{ matrix.target }}.tar.gz
+          tar czvf $ARCHIVE_FILE -C target/${{ matrix.target }}/release ruff
+          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
       - name: "Upload binary"
         uses: actions/upload-artifact@v3
         with:
@@ -187,6 +221,9 @@ jobs:
         platform:
           - target: aarch64-unknown-linux-gnu
             arch: aarch64
+            # see https://github.com/charliermarsh/ruff/issues/3791
+            # and https://github.com/gnzlbg/jemallocator/issues/170#issuecomment-1503228963
+            maturin_docker_options: -e JEMALLOC_SYS_WITH_LG_PAGE=16
           - target: armv7-unknown-linux-gnueabihf
             arch: armv7
           - target: s390x-unknown-linux-gnu
@@ -195,6 +232,7 @@ jobs:
             arch: ppc64le
           - target: powerpc64-unknown-linux-gnu
             arch: ppc64
+
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -207,10 +245,11 @@ jobs:
         with:
           target: ${{ matrix.platform.target }}
           manylinux: auto
+          docker-options: ${{ matrix.platform.maturin_docker_options }}
           args: --release --out dist
       - uses: uraimo/run-on-arch-action@v2
         if: matrix.platform.arch != 'ppc64'
-        name: Install built wheel
+        name: Test wheel
         with:
           arch: ${{ matrix.platform.arch }}
           distro: ubuntu20.04
@@ -221,6 +260,7 @@ jobs:
             pip3 install -U pip
           run: |
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
+            ruff --help
       - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
@@ -228,9 +268,9 @@ jobs:
           path: dist
       - name: "Archive binary"
         run: |
-            ARCHIVE_FILE=ruff-${{ matrix.platform.target }}.tar.gz
-            tar czvf $ARCHIVE_FILE -C target/${{ matrix.platform.target }}/release ruff
-            shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
+          ARCHIVE_FILE=ruff-${{ matrix.platform.target }}.tar.gz
+          tar czvf $ARCHIVE_FILE -C target/${{ matrix.platform.target }}/release ruff
+          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
       - name: "Upload binary"
         uses: actions/upload-artifact@v3
         with:
@@ -260,7 +300,7 @@ jobs:
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
           args: --release --out dist
-      - name: "Install built wheel"
+      - name: "Test wheel"
         if: matrix.target == 'x86_64-unknown-linux-musl'
         uses: addnab/docker-run-action@v3
         with:
@@ -269,6 +309,8 @@ jobs:
           run: |
             apk add py3-pip
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links /io/dist/ --force-reinstall
+            ruff --help
+            python -m ruff --help
       - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
@@ -276,9 +318,9 @@ jobs:
           path: dist
       - name: "Archive binary"
         run: |
-            ARCHIVE_FILE=ruff-${{ matrix.target }}.tar.gz
-            tar czvf $ARCHIVE_FILE -C target/${{ matrix.target }}/release ruff
-            shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
+          ARCHIVE_FILE=ruff-${{ matrix.target }}.tar.gz
+          tar czvf $ARCHIVE_FILE -C target/${{ matrix.target }}/release ruff
+          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
       - name: "Upload binary"
         uses: actions/upload-artifact@v3
         with:
@@ -294,8 +336,10 @@ jobs:
         platform:
           - target: aarch64-unknown-linux-musl
             arch: aarch64
+            maturin_docker_options: -e JEMALLOC_SYS_WITH_LG_PAGE=16
           - target: armv7-unknown-linux-musleabihf
             arch: armv7
+
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -309,8 +353,9 @@ jobs:
           target: ${{ matrix.platform.target }}
           manylinux: musllinux_1_2
           args: --release --out dist
+          docker-options: ${{ matrix.platform.maturin_docker_options }}
       - uses: uraimo/run-on-arch-action@v2
-        name: Install built wheel
+        name: Test wheel
         with:
           arch: ${{ matrix.platform.arch }}
           distro: alpine_latest
@@ -319,6 +364,7 @@ jobs:
             apk add py3-pip
           run: |
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
+            ruff check --help
       - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
@@ -326,9 +372,9 @@ jobs:
           path: dist
       - name: "Archive binary"
         run: |
-            ARCHIVE_FILE=ruff-${{ matrix.platform.target }}.tar.gz
-            tar czvf $ARCHIVE_FILE -C target/${{ matrix.platform.target }}/release ruff
-            shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
+          ARCHIVE_FILE=ruff-${{ matrix.platform.target }}.tar.gz
+          tar czvf $ARCHIVE_FILE -C target/${{ matrix.platform.target }}/release ruff
+          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
       - name: "Upload binary"
         uses: actions/upload-artifact@v3
         with:
@@ -349,26 +395,48 @@ jobs:
       - musllinux
       - musllinux-cross
     if: "startsWith(github.ref, 'refs/tags/')"
+    environment:
+      name: release
+    permissions:
+      # For pypi trusted publishing
+      id-token: write
+      # For GitHub release publishing
+      contents: write
     steps:
       - uses: actions/download-artifact@v3
         with:
           name: wheels
-      - uses: actions/setup-python@v4
+          path: wheels
       - name: "Publish to PyPi"
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.RUFF_TOKEN }}
-        run: |
-          pip install --upgrade twine
-          twine upload --skip-existing *
-      - name: "Update pre-commit mirror"
-        run: |
-          curl -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ secrets.RUFF_PRE_COMMIT_PAT }}" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/charliermarsh/ruff-pre-commit/dispatches --data '{"event_type": "pypi_release"}'
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          skip-existing: true
+          packages-dir: wheels
+          verbose: true
       - uses: actions/download-artifact@v3
         with:
           name: binaries
           path: binaries
-      - name: Release
+      - name: "Publish to GitHub"
         uses: softprops/action-gh-release@v1
         with:
           files: binaries/*
+
+  # After the release has been published, we update downstream repositories
+  # This is separate because if this fails the release is still fine, we just need to do some manual workflow triggers
+  update-dependents:
+    name: Release
+    runs-on: ubuntu-latest
+    needs: release
+    steps:
+      - name: "Update pre-commit mirror"
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.RUFF_PRE_COMMIT_PAT }}
+          script: |
+            github.rest.actions.createWorkflowDispatch({
+              owner: 'astral-sh',
+              repo: 'ruff-pre-commit',
+              workflow_id: 'main.yml',
+              ref: 'main',
+            })
diff --git a/.gitignore b/.gitignore
index ef50cdef6f752..55de3ba557e24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,11 @@
-# Local cache
-.ruff_cache
 crates/ruff/resources/test/cpython
 mkdocs.yml
 .overrides
-github_search.jsonl
+ruff-old
+github_search*.jsonl
+schemastore
+.venv*
+scratch.py
 
 ###
 # Rust.gitignore
diff --git a/.markdownlint.yaml b/.markdownlint.yaml
new file mode 100644
index 0000000000000..66c4aeca0e459
--- /dev/null
+++ b/.markdownlint.yaml
@@ -0,0 +1,14 @@
+# default to true for all rules
+default: true
+
+# MD033/no-inline-html
+MD033: false
+
+# MD041/first-line-h1
+MD041: false
+
+# MD013/line-length
+MD013:
+  line_length: 100
+  code_blocks: false
+  ignore_code_blocks: true
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index bb10740493b17..572edd2781a71 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,4 +1,12 @@
 fail_fast: true
+
+exclude: |
+  (?x)^(
+    crates/ruff/resources/.*|
+    crates/ruff_python_formatter/resources/.*|
+    crates/ruff_python_formatter/src/snapshots/.*
+  )$
+
 repos:
   - repo: https://github.com/abravalheri/validate-pyproject
     rev: v0.12.1
@@ -17,14 +25,9 @@ repos:
     rev: v0.33.0
     hooks:
       - id: markdownlint-fix
-        args:
-          - --disable
-          - MD013 # line-length
-          - MD033 # no-inline-html
-          - --
 
   - repo: https://github.com/crate-ci/typos
-    rev: v1.14.8
+    rev: v1.14.12
     hooks:
       - id: typos
 
@@ -63,11 +66,6 @@ repos:
     rev: 23.1.0
     hooks:
       - id: black
-        exclude: |
-          (?x)^(
-            crates/ruff/resources/.*|
-            crates/ruff_python_formatter/resources/.*
-          )$
 
 ci:
   skip: [cargo-fmt, clippy, dev-generate-all]
diff --git a/BREAKING_CHANGES.md b/BREAKING_CHANGES.md
index 087c8fddbd01d..b935fed04127e 100644
--- a/BREAKING_CHANGES.md
+++ b/BREAKING_CHANGES.md
@@ -1,5 +1,25 @@
 # Breaking Changes
 
+## 0.0.268
+
+### The `keep-runtime-typing` setting has been removed ([#4427](https://github.com/charliermarsh/ruff/pull/4427))
+
+Enabling the `keep-runtime-typing` option, located under the `pyupgrade` section, is equivalent
+to ignoring the `UP006` and `UP007` rules via Ruff's standard `ignore` mechanism. As there's no
+need for a dedicated setting to disable these rules, the `keep-runtime-typing` option has been
+removed.
+
+## 0.0.267
+
+### `update-check` is no longer a valid configuration option ([#4313](https://github.com/charliermarsh/ruff/pull/4313))
+
+The `update-check` functionality was deprecated in [#2530](https://github.com/charliermarsh/ruff/pull/2530),
+in that the behavior itself was removed, and Ruff was changed to warn when that option was enabled.
+
+Now, Ruff will throw an error when `update-check` is provided via a configuration file (e.g.,
+`update-check = false`) or through the command-line, since it has no effect. Users should remove
+this option from their configuration.
+
 ## 0.0.265
 
 ### `--fix-only` now exits with a zero exit code, unless `--exit-non-zero-on-fix` is specified ([#4146](https://github.com/charliermarsh/ruff/pull/4146))
@@ -66,7 +86,8 @@ the intention of adding a stable public API in the future.
 ### `select`, `extend-select`, `ignore`, and `extend-ignore` have new semantics ([#2312](https://github.com/charliermarsh/ruff/pull/2312))
 
 Previously, the interplay between `select` and its related options could lead to unexpected
-behavior. For example, `ruff --select E501 --ignore ALL` and `ruff --select E501 --extend-ignore ALL` behaved differently. (See [#2312](https://github.com/charliermarsh/ruff/pull/2312) for more
+behavior. For example, `ruff --select E501 --ignore ALL` and `ruff --select E501 --extend-ignore ALL`
+behaved differently. (See [#2312](https://github.com/charliermarsh/ruff/pull/2312) for more
 examples.)
 
 When Ruff determines the enabled rule set, it has to reconcile `select` and `ignore` from a variety
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d8ce7afdeee82..a1be271990735 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,6 +8,7 @@ Welcome! We're happy to have you here. Thank you in advance for your contributio
   - [Project Structure](#project-structure)
   - [Example: Adding a new lint rule](#example-adding-a-new-lint-rule)
     - [Rule naming convention](#rule-naming-convention)
+    - [Rule testing: fixtures and snapshots](#rule-testing-fixtures-and-snapshots)
   - [Example: Adding a new configuration option](#example-adding-a-new-configuration-option)
 - [MkDocs](#mkdocs)
 - [Release Process](#release-process)
@@ -93,9 +94,11 @@ At time of writing, the repository includes the following crates:
 
 - `crates/ruff`: library crate containing all lint rules and the core logic for running them.
 - `crates/ruff_cli`: binary crate containing Ruff's command-line interface.
-- `crates/ruff_dev`: binary crate containing utilities used in the development of Ruff itself (e.g., `cargo dev generate-all`).
+- `crates/ruff_dev`: binary crate containing utilities used in the development of Ruff itself (e.g.,
+  `cargo dev generate-all`).
 - `crates/ruff_macros`: library crate containing macros used by Ruff.
-- `crates/ruff_python`: library crate implementing Python-specific functionality (e.g., lists of standard library modules by versionb).
+- `crates/ruff_python`: library crate implementing Python-specific functionality (e.g., lists of
+  standard library modules by version).
 - `crates/flake8_to_ruff`: binary crate for generating Ruff configuration from Flake8 configuration.
 
 ### Example: Adding a new lint rule
@@ -103,14 +106,20 @@ At time of writing, the repository includes the following crates:
 At a high level, the steps involved in adding a new lint rule are as follows:
 
 1. Determine a name for the new rule as per our [rule naming convention](#rule-naming-convention).
+
 1. Create a file for your rule (e.g., `crates/ruff/src/rules/flake8_bugbear/rules/abstract_base_class.rs`).
+
 1. In that file, define a violation struct. You can grep for `#[violation]` to see examples.
-1. Map the violation struct to a rule code in `crates/ruff/src/registry.rs` (e.g., `E402`).
-1. Define the logic for triggering the violation in `crates/ruff/src/checkers/ast.rs` (for AST-based
-   checks), `crates/ruff/src/checkers/tokens.rs` (for token-based checks), `crates/ruff/src/checkers/lines.rs`
-   (for text-based checks), or `crates/ruff/src/checkers/filesystem.rs` (for filesystem-based
-   checks).
-1. Add a test fixture.
+
+1. Map the violation struct to a rule code in `crates/ruff/src/codes.rs` (e.g., `E402`).
+
+1. Define the logic for triggering the violation in `crates/ruff/src/checkers/ast/mod.rs` (for
+   AST-based checks), `crates/ruff/src/checkers/tokens.rs` (for token-based checks),
+   `crates/ruff/src/checkers/lines.rs` (for text-based checks), or
+   `crates/ruff/src/checkers/filesystem.rs` (for filesystem-based checks).
+
+1. Add proper [testing](#rule-testing-fixtures-and-snapshots) for your rule.
+
 1. Update the generated files (documentation and generated code).
 
 To define the violation, start by creating a dedicated file for your rule under the appropriate
@@ -125,18 +134,8 @@ collecting diagnostics as it goes.
 If you need to inspect the AST, you can run `cargo dev print-ast` with a Python file. Grep
 for the `Check::new` invocations to understand how other, similar rules are implemented.
 
-To add a test fixture, create a file under `crates/ruff/resources/test/fixtures/[linter]`, named to match
-the code you defined earlier (e.g., `crates/ruff/resources/test/fixtures/pycodestyle/E402.py`). This file should
-contain a variety of violations and non-violations designed to evaluate and demonstrate the behavior
-of your lint rule.
-
-Run `cargo dev generate-all` to generate the code for your new fixture. Then run Ruff
-locally with (e.g.) `cargo run -p ruff_cli -- check crates/ruff/resources/test/fixtures/pycodestyle/E402.py --no-cache --select E402`.
-
-Once you're satisfied with the output, codify the behavior as a snapshot test by adding a new
-`test_case` macro in the relevant `crates/ruff/src/[linter]/mod.rs` file. Then, run `cargo test`.
-Your test will fail, but you'll be prompted to follow-up with `cargo insta review`. Accept the
-generated snapshot, then commit the snapshot file alongside the rest of your changes.
+Once you're satisfied with your code, add tests for your rule. See [rule testing](#rule-testing-fixtures-and-snapshots)
+for more details.
 
 Finally, regenerate the documentation and generated code with `cargo dev generate-all`.
 
@@ -148,12 +147,44 @@ This implies that rule names:
 
 - should state the bad thing being checked for
 
-- should not contain instructions on what you what you should use instead
+- should not contain instructions on what you should use instead
   (these belong in the rule documentation and the `autofix_title` for rules that have autofix)
 
 When re-implementing rules from other linters, this convention is given more importance than
 preserving the original rule name.
 
+#### Rule testing: fixtures and snapshots
+
+To test rules, Ruff uses snapshots of Ruff's output for a given file (fixture). Generally, there
+will be one file per rule (e.g., `E402.py`), and each file will contain all necessary examples of
+both violations and non-violations. `cargo insta review` will generate a snapshot file containing
+Ruff's output for each fixture, which you can then commit alongside your changes.
+
+Once you've completed the code for the rule itself, you can define tests with the following steps:
+
+1. Add a Python file to `crates/ruff/resources/test/fixtures/[linter]` that contains the code you
+   want to test. The file name should match the rule name (e.g., `E402.py`), and it should include
+   examples of both violations and non-violations.
+
+1. Run Ruff locally against your file and verify the output is as expected. Once you're satisfied
+   with the output (you see the violations you expect, and no others), proceed to the next step.
+   For example, if you're adding a new rule named `E402`, you would run:
+
+   ```shell
+   cargo run -p ruff_cli -- check crates/ruff/resources/test/fixtures/pycodestyle/E402.py --no-cache
+   ```
+
+1. Add the test to the relevant `crates/ruff/src/rules/[linter]/mod.rs` file. If you're contributing
+   a rule to a pre-existing set, you should be able to find a similar example to pattern-match
+   against. If you're adding a new linter, you'll need to create a new `mod.rs` file (see,
+   e.g., `crates/ruff/src/rules/flake8_bugbear/mod.rs`)
+
+1. Run `cargo test`. Your test will fail, but you'll be prompted to follow-up
+   with `cargo insta review`. Run `cargo insta review`, review and accept the generated snapshot,
+   then commit the snapshot file alongside the rest of your changes.
+
+1. Run `cargo test` again to ensure that your test passes.
+
 ### Example: Adding a new configuration option
 
 Ruff's user-facing settings live in a few different places.
@@ -184,6 +215,8 @@ Finally, regenerate the documentation and generated code with `cargo dev generat
 
 To preview any changes to the documentation locally:
 
+1. Install the [Rust toolchain](https://www.rust-lang.org/tools/install).
+
 1. Install MkDocs and Material for MkDocs with:
 
    ```shell
diff --git a/Cargo.lock b/Cargo.lock
index 98183d8a3a4ef..89efc25897a14 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,17 +14,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "ahash"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-dependencies = [
- "getrandom",
- "once_cell",
- "version_check",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "0.7.20"
@@ -43,6 +32,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -76,9 +71,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -115,9 +110,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd"
+checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
 dependencies = [
  "anstyle",
  "windows-sys 0.48.0",
@@ -125,9 +120,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.70"
+version = "1.0.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
+checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
 
 [[package]]
 name = "argfile"
@@ -138,21 +133,6 @@ dependencies = [
  "os_str_bytes",
 ]
 
-[[package]]
-name = "ascii"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"
-
-[[package]]
-name = "ascii-canvas"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6"
-dependencies = [
- "term",
-]
-
 [[package]]
 name = "assert_cmd"
 version = "2.0.11"
@@ -160,7 +140,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151"
 dependencies = [
  "anstyle",
- "bstr 1.4.0",
+ "bstr",
  "doc-comment",
  "predicates",
  "predicates-core",
@@ -200,21 +180,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bit-set"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
-dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -223,26 +188,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3"
-
-[[package]]
-name = "bstr"
-version = "0.2.17"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
-dependencies = [
- "lazy_static",
- "memchr",
- "regex-automata",
-]
+checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84"
 
 [[package]]
 name = "bstr"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09"
+checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5"
 dependencies = [
  "memchr",
  "once_cell",
@@ -252,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.12.1"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
 
 [[package]]
 name = "cachedir"
@@ -294,13 +248,13 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.24"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
 dependencies = [
+ "android-tzdata",
  "iana-time-zone",
  "js-sys",
- "num-integer",
  "num-traits",
  "time",
  "wasm-bindgen",
@@ -309,9 +263,9 @@ dependencies = [
 
 [[package]]
 name = "ciborium"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f"
+checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
 dependencies = [
  "ciborium-io",
  "ciborium-ll",
@@ -320,15 +274,15 @@ dependencies = [
 
 [[package]]
 name = "ciborium-io"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369"
+checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
 
 [[package]]
 name = "ciborium-ll"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b"
+checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
 dependencies = [
  "ciborium-io",
  "half",
@@ -336,21 +290,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.2.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
-dependencies = [
- "bitflags 1.3.2",
- "clap_lex 0.2.4",
- "indexmap",
- "textwrap",
-]
-
-[[package]]
-name = "clap"
-version = "4.2.4"
+version = "4.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "956ac1f6381d8d82ab4684768f89c0ea3afe66925ceadb4eeb3fc452ffc55d62"
+checksum = "b4ed2379f8603fa2b7509891660e802b88c70a79a6427a70abb5968054de2c28"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -359,24 +301,24 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.2.4"
+version = "4.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84080e799e54cff944f4b4a4b0e71630b0e0443b25b985175c7dddc1a859b749"
+checksum = "72394f3339a76daf211e57d4bcb374410f3965dcc606dd0e03738c7888766980"
 dependencies = [
  "anstream",
  "anstyle",
  "bitflags 1.3.2",
- "clap_lex 0.4.1",
+ "clap_lex",
  "strsim",
 ]
 
 [[package]]
 name = "clap_complete"
-version = "4.2.1"
+version = "4.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a19591b2ab0e3c04b588a0e04ddde7b9eaa423646d1b4a8092879216bf47473"
+checksum = "7f6b5c519bab3ea61843a7923d074b04245624bb84a64a8c150f5deb014e388b"
 dependencies = [
- "clap 4.2.4",
+ "clap",
 ]
 
 [[package]]
@@ -385,7 +327,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "183495371ea78d4c9ff638bfc6497d46fed2396e4f9c50aebc1278a4a9919a3d"
 dependencies = [
- "clap 4.2.4",
+ "clap",
  "clap_complete",
  "clap_complete_fig",
  "clap_complete_nushell",
@@ -393,50 +335,41 @@ dependencies = [
 
 [[package]]
 name = "clap_complete_fig"
-version = "4.2.0"
+version = "4.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3af28956330989baa428ed4d3471b853715d445c62de21b67292e22cf8a41fa"
+checksum = "99fee1d30a51305a6c2ed3fc5709be3c8af626c9c958e04dd9ae94e27bcbce9f"
 dependencies = [
- "clap 4.2.4",
+ "clap",
  "clap_complete",
 ]
 
 [[package]]
 name = "clap_complete_nushell"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fa41f5e6aa83bd151b70fd0ceaee703d68cd669522795dc812df9edad1252c"
+checksum = "5d02bc8b1a18ee47c4d2eec3fb5ac034dc68ebea6125b1509e9ccdffcddce66e"
 dependencies = [
- "clap 4.2.4",
+ "clap",
  "clap_complete",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.2.0"
+version = "4.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
+checksum = "59e9ef9a08ee1c0e1f2e162121665ac45ac3783b0f897db7244ae75ad9a8f65b"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
+ "syn 2.0.18",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
 
 [[package]]
 name = "clearscreen"
@@ -451,16 +384,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "codespan-reporting"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "termcolor",
- "unicode-width",
-]
-
 [[package]]
 name = "colorchoice"
 version = "1.0.0"
@@ -486,14 +409,14 @@ checksum = "5458d9d1a587efaf5091602c59d299696a3877a439c8f6d461a2d3cce11df87a"
 
 [[package]]
 name = "console"
-version = "0.15.5"
+version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60"
+checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
 dependencies = [
  "encode_unicode",
  "lazy_static",
  "libc",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -522,6 +445,12 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 
+[[package]]
+name = "countme"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
+
 [[package]]
 name = "crc32fast"
 version = "1.3.2"
@@ -533,19 +462,19 @@ dependencies = [
 
 [[package]]
 name = "criterion"
-version = "0.4.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb"
+checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
 dependencies = [
  "anes",
- "atty",
  "cast",
  "ciborium",
- "clap 3.2.23",
+ "clap",
  "criterion-plot",
+ "is-terminal",
  "itertools",
- "lazy_static",
  "num-traits",
+ "once_cell",
  "oorandom",
  "plotters",
  "rayon",
@@ -626,50 +555,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "cxx"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
-dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
-dependencies = [
- "cc",
- "codespan-reporting",
- "once_cell",
- "proc-macro2",
- "quote",
- "scratch",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.15",
-]
-
 [[package]]
 name = "diff"
 version = "0.1.13"
@@ -693,21 +578,11 @@ dependencies = [
 
 [[package]]
 name = "dirs"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd"
-dependencies = [
- "dirs-sys 0.4.0",
-]
-
-[[package]]
-name = "dirs-next"
-version = "2.0.0"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
- "cfg-if",
- "dirs-sys-next",
+ "dirs-sys 0.4.1",
 ]
 
 [[package]]
@@ -723,24 +598,14 @@ dependencies = [
 
 [[package]]
 name = "dirs-sys"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b"
-dependencies = [
- "libc",
- "redox_users",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
 dependencies = [
  "libc",
+ "option-ext",
  "redox_users",
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -767,15 +632,6 @@ version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 
-[[package]]
-name = "ena"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1"
-dependencies = [
- "log",
-]
-
 [[package]]
 name = "encode_unicode"
 version = "0.3.6"
@@ -833,18 +689,12 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.265"
+version = "0.0.272"
 dependencies = [
  "anyhow",
- "clap 4.2.4",
+ "clap",
  "colored",
  "configparser",
  "once_cell",
@@ -860,9 +710,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.25"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -899,10 +749,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -918,7 +766,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
 dependencies = [
  "aho-corasick 0.7.20",
- "bstr 1.4.0",
+ "bstr",
  "fnv",
  "log",
  "regex",
@@ -935,9 +783,6 @@ name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash",
-]
 
 [[package]]
 name = "heck"
@@ -991,12 +836,11 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone-haiku"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
 dependencies = [
- "cxx",
- "cxx-build",
+ "cc",
 ]
 
 [[package]]
@@ -1044,6 +888,7 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
  "hashbrown",
+ "serde",
 ]
 
 [[package]]
@@ -1090,9 +935,9 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
  "hermit-abi 0.3.1",
  "libc",
@@ -1141,9 +986,9 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
 
 [[package]]
 name = "js-sys"
-version = "0.3.61"
+version = "0.3.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
+checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1168,37 +1013,11 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "lalrpop"
-version = "0.19.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f34313ec00c2eb5c3c87ca6732ea02dcf3af99c3ff7a8fb622ffb99c9d860a87"
-dependencies = [
- "ascii-canvas",
- "bit-set",
- "diff",
- "ena",
- "is-terminal",
- "itertools",
- "lalrpop-util",
- "petgraph",
- "pico-args",
- "regex",
- "regex-syntax 0.6.29",
- "string_cache",
- "term",
- "tiny-keccak",
- "unicode-xid",
-]
-
 [[package]]
 name = "lalrpop-util"
-version = "0.19.9"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5c1f7869c94d214466c5fd432dfed12c379fd87786768d36455892d46b18edd"
-dependencies = [
- "regex",
-]
+checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d"
 
 [[package]]
 name = "lazy_static"
@@ -1238,9 +1057,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.142"
+version = "0.2.144"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
+checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
 
 [[package]]
 name = "libcst"
@@ -1268,23 +1087,14 @@ dependencies = [
 
 [[package]]
 name = "libmimalloc-sys"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a558e3d911bc3c7bfc8c78bc580b404d6e51c1cefbf656e176a94b49b0df40"
+checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e"
 dependencies = [
  "cc",
  "libc",
 ]
 
-[[package]]
-name = "link-cplusplus"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
@@ -1293,37 +1103,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b085a4f2cde5781fc4b1717f2e86c62f5cda49de7ba99a7c2eae02b61c9064c"
-
-[[package]]
-name = "lock_api"
-version = "0.4.9"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "log"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "lz4_flex"
-version = "0.9.5"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a8cbbb2831780bc3b9c15a41f5b49222ef756b6730a95f3decfdd15903eb5a3"
-dependencies = [
- "twox-hash",
-]
+checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
 
 [[package]]
 name = "matches"
@@ -1348,9 +1136,9 @@ dependencies = [
 
 [[package]]
 name = "mimalloc"
-version = "0.1.36"
+version = "0.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d88dad3f985ec267a3fcb7a1726f5cb1a7e8cad8b646e70a84f967210df23da"
+checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98"
 dependencies = [
  "libmimalloc-sys",
 ]
@@ -1363,23 +1151,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.6.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
 dependencies = [
  "adler",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
  "libc",
  "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1388,12 +1176,6 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c"
 
-[[package]]
-name = "new_debug_unreachable"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
-
 [[package]]
 name = "nextest-workspace-hack"
 version = "0.1.0"
@@ -1430,9 +1212,9 @@ dependencies = [
 
 [[package]]
 name = "notify"
-version = "5.1.0"
+version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58ea850aa68a06e48fdb069c0ec44d0d64c8dbffa49bf3b6f7f0a901fdea1ba9"
+checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486"
 dependencies = [
  "bitflags 1.3.2",
  "crossbeam-channel",
@@ -1443,7 +1225,7 @@ dependencies = [
  "libc",
  "mio",
  "walkdir",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -1457,15 +1239,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "num-complex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -1497,9 +1270,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.17.1"
+version = "1.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b"
 
 [[package]]
 name = "oorandom"
@@ -1507,6 +1280,12 @@ version = "11.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
 [[package]]
 name = "os_str_bytes"
 version = "6.5.0"
@@ -1525,29 +1304,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall 0.2.16",
- "smallvec",
- "windows-sys 0.45.0",
-]
-
 [[package]]
 name = "paste"
 version = "1.0.12"
@@ -1556,18 +1312,18 @@ checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
 
 [[package]]
 name = "path-absolutize"
-version = "3.0.14"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f1d4993b16f7325d90c18c3c6a3327db7808752db8d208cea0acee0abd52c52"
+checksum = "43eb3595c63a214e1b37b44f44b0a84900ef7ae0b4c5efce59e123d246d7a0de"
 dependencies = [
  "path-dedot",
 ]
 
 [[package]]
 name = "path-dedot"
-version = "3.0.18"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a81540d94551664b72b72829b12bd167c73c9d25fbac0e04fafa8023f7e4901"
+checksum = "9d55e486337acb9973cdea3ec5638c1b3bcb22e573b2b7b41969e0c744d5a15e"
 dependencies = [
  "once_cell",
 ]
@@ -1607,9 +1363,9 @@ checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739"
 
 [[package]]
 name = "pep440_rs"
-version = "0.3.5"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac177a025c60a4dd25d638bf33e746d1ead5f7123f6650f35b4394c7ce1a104"
+checksum = "fe1d15693a11422cfa7d401b00dc9ae9fb8edbfbcb711a77130663f4ddf67650"
 dependencies = [
  "lazy_static",
  "regex",
@@ -1619,20 +1375,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "percent-encoding"
-version = "2.2.0"
+name = "pep508_rs"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "969679a29dfdc8278a449f75b3dd45edf57e649bd59f7502429c2840751c46d8"
+dependencies = [
+ "once_cell",
+ "pep440_rs",
+ "regex",
+ "serde",
+ "thiserror",
+ "tracing",
+ "unicode-width",
+ "url",
+]
 
 [[package]]
-name = "petgraph"
-version = "0.6.3"
+name = "percent-encoding"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
-dependencies = [
- "fixedbitset",
- "indexmap",
-]
+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 
 [[package]]
 name = "phf"
@@ -1640,7 +1402,7 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
 dependencies = [
- "phf_shared 0.11.1",
+ "phf_shared",
 ]
 
 [[package]]
@@ -1650,7 +1412,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770"
 dependencies = [
  "phf_generator",
- "phf_shared 0.11.1",
+ "phf_shared",
 ]
 
 [[package]]
@@ -1659,19 +1421,10 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
 dependencies = [
- "phf_shared 0.11.1",
+ "phf_shared",
  "rand",
 ]
 
-[[package]]
-name = "phf_shared"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
-dependencies = [
- "siphasher",
-]
-
 [[package]]
 name = "phf_shared"
 version = "0.11.1"
@@ -1681,12 +1434,6 @@ dependencies = [
  "siphasher",
 ]
 
-[[package]]
-name = "pico-args"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468"
-
 [[package]]
 name = "pin-project-lite"
 version = "0.2.9"
@@ -1732,18 +1479,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "precomputed-hash"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
-
 [[package]]
 name = "predicates"
 version = "3.0.3"
@@ -1810,13 +1545,26 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
 dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "pyproject-toml"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f04dbbb336bd88583943c7cd973a32fed323578243a7569f40cb0c7da673321b"
+dependencies = [
+ "indexmap",
+ "pep440_rs",
+ "pep508_rs",
+ "serde",
+ "toml",
+]
+
 [[package]]
 name = "quick-junit"
 version = "0.3.2"
@@ -1842,37 +1590,19 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.26"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
 dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "radium"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-
 [[package]]
 name = "rand"
 version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
  "rand_core",
 ]
 
@@ -1881,9 +1611,6 @@ name = "rand_core"
 version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
 
 [[package]]
 name = "rayon"
@@ -1938,13 +1665,13 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.8.1"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
+checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
 dependencies = [
  "aho-corasick 1.0.1",
  "memchr",
- "regex-syntax 0.7.1",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -1955,15 +1682,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.29"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
 
 [[package]]
 name = "result-like"
@@ -2004,15 +1725,15 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.265"
+version = "0.0.272"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
- "bitflags 2.1.0",
+ "bitflags 2.3.1",
  "chrono",
- "clap 4.2.4",
+ "clap",
  "colored",
- "dirs 5.0.0",
+ "dirs 5.0.1",
  "fern",
  "glob",
  "globset",
@@ -2032,19 +1753,22 @@ dependencies = [
  "pathdiff",
  "pep440_rs",
  "pretty_assertions",
+ "pyproject-toml",
  "quick-junit",
  "regex",
  "result-like",
  "ruff_cache",
  "ruff_diagnostics",
  "ruff_macros",
+ "ruff_newlines",
  "ruff_python_ast",
  "ruff_python_semantic",
  "ruff_python_stdlib",
  "ruff_rustpython",
  "ruff_text_size",
+ "ruff_textwrap",
  "rustc-hash",
- "rustpython-common",
+ "rustpython-format",
  "rustpython-parser",
  "schemars",
  "semver",
@@ -2056,11 +1780,11 @@ dependencies = [
  "strum",
  "strum_macros",
  "test-case",
- "textwrap",
  "thiserror",
  "toml",
  "typed-arena",
  "unicode-width",
+ "unicode_names2",
 ]
 
 [[package]]
@@ -2072,6 +1796,7 @@ dependencies = [
  "once_cell",
  "ruff",
  "ruff_python_ast",
+ "ruff_python_formatter",
  "rustpython-parser",
  "serde",
  "serde_json",
@@ -2093,7 +1818,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_cli"
-version = "0.0.265"
+version = "0.0.272"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
@@ -2101,10 +1826,10 @@ dependencies = [
  "assert_cmd",
  "atty",
  "bincode",
- "bitflags 2.1.0",
+ "bitflags 2.3.1",
  "cachedir",
  "chrono",
- "clap 4.2.4",
+ "clap",
  "clap_complete_command",
  "clearscreen",
  "colored",
@@ -2122,15 +1847,16 @@ dependencies = [
  "ruff_cache",
  "ruff_diagnostics",
  "ruff_python_ast",
+ "ruff_python_formatter",
  "ruff_python_stdlib",
  "ruff_text_size",
+ "ruff_textwrap",
  "rustc-hash",
  "serde",
  "serde_json",
  "shellexpand",
  "similar",
  "strum",
- "textwrap",
  "tikv-jemallocator",
  "ureq",
  "walkdir",
@@ -2142,7 +1868,7 @@ name = "ruff_dev"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "clap 4.2.4",
+ "clap",
  "itertools",
  "libcst",
  "once_cell",
@@ -2151,13 +1877,13 @@ dependencies = [
  "ruff",
  "ruff_cli",
  "ruff_diagnostics",
- "rustpython-common",
+ "ruff_textwrap",
+ "rustpython-format",
  "rustpython-parser",
  "schemars",
  "serde_json",
  "strum",
  "strum_macros",
- "textwrap",
 ]
 
 [[package]]
@@ -2180,10 +1906,19 @@ dependencies = [
  "rustc-hash",
  "schemars",
  "serde",
+ "static_assertions",
  "tracing",
  "unicode-width",
 ]
 
+[[package]]
+name = "ruff_index"
+version = "0.0.0"
+dependencies = [
+ "ruff_macros",
+ "static_assertions",
+]
+
 [[package]]
 name = "ruff_macros"
 version = "0.0.0"
@@ -2191,8 +1926,16 @@ dependencies = [
  "itertools",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
- "textwrap",
+ "ruff_textwrap",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "ruff_newlines"
+version = "0.0.0"
+dependencies = [
+ "memchr",
+ "ruff_text_size",
 ]
 
 [[package]]
@@ -2200,7 +1943,8 @@ name = "ruff_python_ast"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "bitflags 2.1.0",
+ "bitflags 2.3.1",
+ "insta",
  "is-macro",
  "itertools",
  "log",
@@ -2208,11 +1952,11 @@ dependencies = [
  "num-bigint",
  "num-traits",
  "once_cell",
- "regex",
- "ruff_rustpython",
+ "ruff_newlines",
  "ruff_text_size",
  "rustc-hash",
- "rustpython-common",
+ "rustpython-ast",
+ "rustpython-literal",
  "rustpython-parser",
  "serde",
  "smallvec",
@@ -2223,18 +1967,18 @@ name = "ruff_python_formatter"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "clap 4.2.4",
+ "clap",
+ "countme",
  "insta",
  "is-macro",
  "itertools",
  "once_cell",
  "ruff_formatter",
+ "ruff_newlines",
  "ruff_python_ast",
- "ruff_rustpython",
  "ruff_testing_macros",
  "ruff_text_size",
  "rustc-hash",
- "rustpython-common",
  "rustpython-parser",
  "similar",
  "test-case",
@@ -2244,9 +1988,11 @@ dependencies = [
 name = "ruff_python_semantic"
 version = "0.0.0"
 dependencies = [
- "bitflags 2.1.0",
+ "bitflags 2.3.1",
  "is-macro",
  "nohash-hasher",
+ "num-traits",
+ "ruff_index",
  "ruff_python_ast",
  "ruff_python_stdlib",
  "ruff_text_size",
@@ -2268,8 +2014,6 @@ name = "ruff_rustpython"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "once_cell",
- "rustpython-common",
  "rustpython-parser",
 ]
 
@@ -2280,25 +2024,32 @@ dependencies = [
  "glob",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.18",
 ]
 
 [[package]]
 name = "ruff_text_size"
 version = "0.0.0"
-source = "git+https://github.com/charliermarsh/RustPython.git?rev=c3147d2c1524ebd0e90cf1c2938d770314fd5a5a#c3147d2c1524ebd0e90cf1c2938d770314fd5a5a"
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd#7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd"
 dependencies = [
  "schemars",
  "serde",
 ]
 
+[[package]]
+name = "ruff_textwrap"
+version = "0.0.0"
+dependencies = [
+ "ruff_newlines",
+ "ruff_text_size",
+]
+
 [[package]]
 name = "ruff_wasm"
 version = "0.0.0"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
- "getrandom",
  "js-sys",
  "log",
  "ruff",
@@ -2330,9 +2081,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustix"
-version = "0.37.13"
+version = "0.37.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79bef90eb6d984c72722595b5b1348ab39275a5e5123faca6863bf07d75a4e0"
+checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
 dependencies = [
  "bitflags 1.3.2",
  "errno",
@@ -2357,75 +2108,70 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.2.0"
-source = "git+https://github.com/charliermarsh/RustPython.git?rev=c3147d2c1524ebd0e90cf1c2938d770314fd5a5a#c3147d2c1524ebd0e90cf1c2938d770314fd5a5a"
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd#7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd"
 dependencies = [
+ "is-macro",
  "num-bigint",
- "ruff_text_size",
+ "rustpython-parser-core",
+ "static_assertions",
 ]
 
 [[package]]
-name = "rustpython-common"
+name = "rustpython-format"
 version = "0.2.0"
-source = "git+https://github.com/charliermarsh/RustPython.git?rev=c3147d2c1524ebd0e90cf1c2938d770314fd5a5a#c3147d2c1524ebd0e90cf1c2938d770314fd5a5a"
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd#7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd"
 dependencies = [
- "ascii",
- "bitflags 1.3.2",
- "bstr 0.2.17",
- "cfg-if",
- "getrandom",
- "hexf-parse",
+ "bitflags 2.3.1",
  "itertools",
- "lexical-parse-float",
- "libc",
- "lock_api",
  "num-bigint",
  "num-traits",
- "once_cell",
- "radium",
- "rand",
- "siphasher",
- "unic-ucd-category",
- "volatile",
- "widestring",
+ "rustpython-literal",
 ]
 
 [[package]]
-name = "rustpython-compiler-core"
+name = "rustpython-literal"
 version = "0.2.0"
-source = "git+https://github.com/charliermarsh/RustPython.git?rev=c3147d2c1524ebd0e90cf1c2938d770314fd5a5a#c3147d2c1524ebd0e90cf1c2938d770314fd5a5a"
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd#7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd"
 dependencies = [
- "bitflags 1.3.2",
- "itertools",
- "lz4_flex",
- "num-bigint",
- "num-complex",
- "ruff_text_size",
+ "hexf-parse",
+ "is-macro",
+ "lexical-parse-float",
+ "num-traits",
+ "unic-ucd-category",
 ]
 
 [[package]]
 name = "rustpython-parser"
 version = "0.2.0"
-source = "git+https://github.com/charliermarsh/RustPython.git?rev=c3147d2c1524ebd0e90cf1c2938d770314fd5a5a#c3147d2c1524ebd0e90cf1c2938d770314fd5a5a"
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd#7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd"
 dependencies = [
  "anyhow",
+ "is-macro",
  "itertools",
- "lalrpop",
  "lalrpop-util",
  "log",
  "num-bigint",
  "num-traits",
  "phf",
  "phf_codegen",
- "ruff_text_size",
  "rustc-hash",
  "rustpython-ast",
- "rustpython-compiler-core",
+ "rustpython-parser-core",
  "tiny-keccak",
  "unic-emoji-char",
  "unic-ucd-ident",
  "unicode_names2",
 ]
 
+[[package]]
+name = "rustpython-parser-core"
+version = "0.2.0"
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd#7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd"
+dependencies = [
+ "is-macro",
+ "ruff_text_size",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.12"
@@ -2483,12 +2229,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
-[[package]]
-name = "scratch"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
-
 [[package]]
 name = "sct"
 version = "0.7.0"
@@ -2507,9 +2247,9 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
 
 [[package]]
 name = "serde"
-version = "1.0.160"
+version = "1.0.163"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
 dependencies = [
  "serde_derive",
 ]
@@ -2527,13 +2267,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.160"
+version = "1.0.163"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.18",
 ]
 
 [[package]]
@@ -2561,9 +2301,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
 dependencies = [
  "serde",
 ]
@@ -2574,7 +2314,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b"
 dependencies = [
- "dirs 5.0.0",
+ "dirs 5.0.1",
 ]
 
 [[package]]
@@ -2595,12 +2335,6 @@ version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
 
-[[package]]
-name = "smawk"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043"
-
 [[package]]
 name = "spin"
 version = "0.5.2"
@@ -2613,19 +2347,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "string_cache"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
-dependencies = [
- "new_debug_unreachable",
- "once_cell",
- "parking_lot",
- "phf_shared 0.10.0",
- "precomputed-hash",
-]
-
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -2667,9 +2388,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.15"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2698,26 +2419,6 @@ dependencies = [
  "windows-sys 0.45.0",
 ]
 
-[[package]]
-name = "term"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
-dependencies = [
- "dirs-next",
- "rustversion",
- "winapi",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
-dependencies = [
- "winapi-util",
-]
-
 [[package]]
 name = "terminfo"
 version = "0.8.0"
@@ -2772,17 +2473,6 @@ dependencies = [
  "test-case-core",
 ]
 
-[[package]]
-name = "textwrap"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
-dependencies = [
- "smawk",
- "unicode-linebreak",
- "unicode-width",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.40"
@@ -2800,7 +2490,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.18",
 ]
 
 [[package]]
@@ -2880,9 +2570,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "toml"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
+checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2892,18 +2582,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.19.8"
+version = "0.19.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
+checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
 dependencies = [
  "indexmap",
  "serde",
@@ -2919,6 +2609,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
  "cfg-if",
+ "log",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -2926,34 +2617,24 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.18",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.30"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
 dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "twox-hash"
-version = "1.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
-dependencies = [
- "cfg-if",
- "static_assertions",
-]
-
 [[package]]
 name = "typed-arena"
 version = "2.0.2"
@@ -3032,19 +2713,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
-
-[[package]]
-name = "unicode-linebreak"
-version = "0.1.4"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137"
-dependencies = [
- "hashbrown",
- "regex",
-]
+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
 
 [[package]]
 name = "unicode-normalization"
@@ -3061,12 +2732,6 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
 
-[[package]]
-name = "unicode-xid"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
-
 [[package]]
 name = "unicode_names2"
 version = "0.6.0"
@@ -3106,6 +2771,7 @@ dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
+ "serde",
 ]
 
 [[package]]
@@ -3116,9 +2782,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.3.1"
+version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb"
+checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2"
 
 [[package]]
 name = "version_check"
@@ -3126,12 +2792,6 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
-[[package]]
-name = "volatile"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8e76fae08f03f96e166d2dfda232190638c10e0383841252416f9cfe2ae60e6"
-
 [[package]]
 name = "wait-timeout"
 version = "0.2.0"
@@ -3165,9 +2825,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.84"
+version = "0.2.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
+checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -3175,24 +2835,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.84"
+version = "0.2.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
+checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.18",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.34"
+version = "0.4.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
+checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3202,9 +2862,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.84"
+version = "0.2.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
+checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3212,28 +2872,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.84"
+version = "0.2.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
+checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.18",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.84"
+version = "0.2.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
+checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.34"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db36fc0f9fb209e88fb3642590ae0205bb5a56216dabd963ba15879fe53a30b"
+checksum = "c9e636f3a428ff62b3742ebc3c70e254dfe12b8c2b469d688ea59cdd4abcf502"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
@@ -3245,9 +2905,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.34"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0734759ae6b3b1717d661fe4f016efcfb9828f5edb4520c18eaee05af3b43be9"
+checksum = "f18c1fad2f7c4958e7bcce014fa212f59a65d5e3721d0f77e6c0b27ede936ba3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3255,9 +2915,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.61"
+version = "0.3.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
+checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3293,12 +2953,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "widestring"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
-
 [[package]]
 name = "wild"
 version = "2.1.0"
@@ -3348,21 +3002,6 @@ dependencies = [
  "windows-targets 0.48.0",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.45.0"
@@ -3497,9 +3136,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
 [[package]]
 name = "winnow"
-version = "0.4.1"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
+checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
 dependencies = [
  "memchr",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index cc5b1275c7306..8e477ffd6fa68 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ members = ["crates/*"]
 
 [workspace.package]
 edition = "2021"
-rust-version = "1.69"
+rust-version = "1.70"
 homepage = "https://beta.ruff.rs/docs/"
 documentation = "https://beta.ruff.rs/docs/"
 repository = "https://github.com/charliermarsh/ruff"
@@ -11,7 +11,7 @@ authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 
 [workspace.dependencies]
 anyhow = { version = "1.0.69" }
-bitflags = { version = "2.1.0" }
+bitflags = { version = "2.3.1" }
 chrono = { version = "0.4.23", default-features = false, features = ["clock"] }
 clap = { version = "4.1.8", features = ["derive"] }
 colored = { version = "2.0.0" }
@@ -24,16 +24,21 @@ is-macro = { version = "0.2.2" }
 itertools = { version = "0.10.5" }
 libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "80e4c1399f95e5beb532fdd1e209ad2dbb470438" }
 log = { version = "0.4.17" }
+memchr = "2.5.0"
 nohash-hasher = { version = "0.2.0" }
+num-bigint = { version = "0.4.3" }
+num-traits = { version = "0.2.15" }
 once_cell = { version = "1.17.1" }
 path-absolutize = { version = "3.0.14" }
 proc-macro2 = { version = "1.0.51" }
 quote = { version = "1.0.23" }
 regex = { version = "1.7.1" }
-ruff_text_size = { git = "https://github.com/charliermarsh/RustPython.git", rev = "c3147d2c1524ebd0e90cf1c2938d770314fd5a5a" }
 rustc-hash = { version = "1.1.0" }
-rustpython-common = { git = "https://github.com/charliermarsh/RustPython.git", rev = "c3147d2c1524ebd0e90cf1c2938d770314fd5a5a" }
-rustpython-parser = { git = "https://github.com/charliermarsh/RustPython.git", rev = "c3147d2c1524ebd0e90cf1c2938d770314fd5a5a" }
+ruff_text_size = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd" }
+rustpython-ast = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd", default-features = false, features = ["all-nodes-with-ranges"]}
+rustpython-format = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd" }
+rustpython-literal = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd" }
+rustpython-parser = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd", default-features = false, features = ["full-lexer", "all-nodes-with-ranges"] }
 schemars = { version = "0.8.12" }
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = { version = "1.0.93", features = ["preserve_order"] }
@@ -44,7 +49,6 @@ strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
 syn = { version = "2.0.15" }
 test-case = { version = "3.0.0" }
-textwrap = { version = "0.16.0" }
 toml = { version = "0.7.2" }
 
 [profile.release]
diff --git a/LICENSE b/LICENSE
index 590eda6e8b055..534e3357426bf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -354,6 +354,37 @@ are:
     SOFTWARE.
   """
 
+- flake8-todos, licensed as follows:
+  """
+    Copyright (c) 2019 EclecticIQ. All rights reserved.
+    Copyright (c) 2020 Gram <gram@orsinium.dev>. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+       1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+       2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+       3. Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  """
+
 - flake8-unused-arguments, licensed as follows:
   """
     MIT License
@@ -550,6 +581,30 @@ are:
     THE SOFTWARE.
   """
 
+- flynt, licensed as follows:
+  """
+    MIT License
+
+    Copyright (c) 2019-2022 Ilya Kamenshchikov
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+  """
 
 - isort, licensed as follows:
   """
@@ -759,6 +814,31 @@ are:
     SOFTWARE.
   """
 
+- flake8-async, licensed as follows:
+  """
+    MIT License
+
+    Copyright (c) 2022 Cooper Lees
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+  """
+
 - flake8-type-checking, licensed as follows:
   """
     Copyright (c) 2021, Sondre Lillebø Gundersen
diff --git a/README.md b/README.md
index 1daff088453e7..daa96bbb7d7ad 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # Ruff
 
-[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v1.json)](https://github.com/charliermarsh/ruff)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json)](https://github.com/charliermarsh/ruff)
 [![image](https://img.shields.io/pypi/v/ruff.svg)](https://pypi.python.org/pypi/ruff)
 [![image](https://img.shields.io/pypi/l/ruff.svg)](https://pypi.python.org/pypi/ruff)
 [![image](https://img.shields.io/pypi/pyversions/ruff.svg)](https://pypi.python.org/pypi/ruff)
@@ -24,17 +24,18 @@ An extremely fast Python linter, written in Rust.
   <i>Linting the CPython codebase from scratch.</i>
 </p>
 
-- ⚡️  10-100x faster than existing linters
-- 🐍  Installable via `pip`
-- 🛠️  `pyproject.toml` support
-- 🤝  Python 3.11 compatibility
-- 📦  Built-in caching, to avoid re-analyzing unchanged files
-- 🔧  Autofix support, for automatic error correction (e.g., automatically remove unused imports)
-- 📏  Over [500 built-in rules](https://beta.ruff.rs/docs/rules/)
-- ⚖️  [Near-parity](https://beta.ruff.rs/docs/faq/#how-does-ruff-compare-to-flake8) with the built-in Flake8 rule set
-- 🔌  Native re-implementations of dozens of Flake8 plugins, like flake8-bugbear
-- ⌨️  First-party editor integrations for [VS Code](https://github.com/charliermarsh/ruff-vscode) and [more](https://github.com/charliermarsh/ruff-lsp)
-- 🌎  Monorepo-friendly, with [hierarchical and cascading configuration](https://beta.ruff.rs/docs/configuration/#pyprojecttoml-discovery)
+- ⚡️ 10-100x faster than existing linters
+- 🐍 Installable via `pip`
+- 🛠️ `pyproject.toml` support
+- 🤝 Python 3.11 compatibility
+- 📦 Built-in caching, to avoid re-analyzing unchanged files
+- 🔧 Autofix support, for automatic error correction (e.g., automatically remove unused imports)
+- 📏 Over [500 built-in rules](https://beta.ruff.rs/docs/rules/)
+- ⚖️ [Near-parity](https://beta.ruff.rs/docs/faq/#how-does-ruff-compare-to-flake8) with the
+  built-in Flake8 rule set
+- 🔌 Native re-implementations of dozens of Flake8 plugins, like flake8-bugbear
+- ⌨️ First-party editor integrations for [VS Code](https://github.com/astral-sh/ruff-vscode) and [more](https://github.com/astral-sh/ruff-lsp)
+- 🌎 Monorepo-friendly, with [hierarchical and cascading configuration](https://beta.ruff.rs/docs/configuration/#pyprojecttoml-discovery)
 
 Ruff aims to be orders of magnitude faster than alternative tools while integrating more
 functionality behind a single, common interface.
@@ -84,7 +85,8 @@ of [Conda](https://docs.conda.io/en/latest/):
 [**Timothy Crosley**](https://twitter.com/timothycrosley/status/1606420868514877440),
 creator of [isort](https://github.com/PyCQA/isort):
 
-> Just switched my first project to Ruff. Only one downside so far: it's so fast I couldn't believe it was working till I intentionally introduced some errors.
+> Just switched my first project to Ruff. Only one downside so far: it's so fast I couldn't believe
+> it was working till I intentionally introduced some errors.
 
 [**Tim Abbott**](https://github.com/charliermarsh/ruff/issues/465#issuecomment-1317400028), lead
 developer of [Zulip](https://github.com/zulip/zulip):
@@ -135,15 +137,15 @@ ruff check path/to/code/to/file.py  # Lint `file.py`
 Ruff can also be used as a [pre-commit](https://pre-commit.com) hook:
 
 ```yaml
-- repo: https://github.com/charliermarsh/ruff-pre-commit
+- repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: 'v0.0.265'
+  rev: v0.0.272
   hooks:
     - id: ruff
 ```
 
-Ruff can also be used as a [VS Code extension](https://github.com/charliermarsh/ruff-vscode) or
-alongside any other editor through the [Ruff LSP](https://github.com/charliermarsh/ruff-lsp).
+Ruff can also be used as a [VS Code extension](https://github.com/astral-sh/ruff-vscode) or
+alongside any other editor through the [Ruff LSP](https://github.com/astral-sh/ruff-lsp).
 
 Ruff can also be used as a [GitHub Action](https://github.com/features/actions) via
 [`ruff-action`](https://github.com/chartboost/ruff-action):
@@ -183,6 +185,7 @@ exclude = [
     ".direnv",
     ".eggs",
     ".git",
+    ".git-rewrite",
     ".hg",
     ".mypy_cache",
     ".nox",
@@ -241,6 +244,8 @@ stylistic rules made obsolete by the use of an autoformatter, like
 If you're just getting started with Ruff, **the default rule set is a great place to start**: it
 catches a wide variety of common errors (like unused imports) with zero configuration.
 
+<!-- End section: Rules -->
+
 Beyond the defaults, Ruff re-implements some of the most popular Flake8 plugins and related code
 quality tools, including:
 
@@ -248,6 +253,7 @@ quality tools, including:
 - [eradicate](https://pypi.org/project/eradicate/)
 - [flake8-2020](https://pypi.org/project/flake8-2020/)
 - [flake8-annotations](https://pypi.org/project/flake8-annotations/)
+- [flake8-async](https://pypi.org/project/flake8-async)
 - [flake8-bandit](https://pypi.org/project/flake8-bandit/) ([#1646](https://github.com/charliermarsh/ruff/issues/1646))
 - [flake8-blind-except](https://pypi.org/project/flake8-blind-except/)
 - [flake8-boolean-trap](https://pypi.org/project/flake8-boolean-trap/)
@@ -262,6 +268,7 @@ quality tools, including:
 - [flake8-eradicate](https://pypi.org/project/flake8-eradicate/)
 - [flake8-errmsg](https://pypi.org/project/flake8-errmsg/)
 - [flake8-executable](https://pypi.org/project/flake8-executable/)
+- [flake8-future-annotations](https://pypi.org/project/flake8-future-annotations/)
 - [flake8-gettext](https://pypi.org/project/flake8-gettext/)
 - [flake8-implicit-str-concat](https://pypi.org/project/flake8-implicit-str-concat/)
 - [flake8-import-conventions](https://github.com/joaopalmeiro/flake8-import-conventions)
@@ -278,20 +285,21 @@ quality tools, including:
 - [flake8-simplify](https://pypi.org/project/flake8-simplify/)
 - [flake8-super](https://pypi.org/project/flake8-super/)
 - [flake8-tidy-imports](https://pypi.org/project/flake8-tidy-imports/)
+- [flake8-todos](https://pypi.org/project/flake8-todos/)
 - [flake8-type-checking](https://pypi.org/project/flake8-type-checking/)
 - [flake8-use-pathlib](https://pypi.org/project/flake8-use-pathlib/)
+- [flynt](https://pypi.org/project/flynt/) ([#2102](https://github.com/charliermarsh/ruff/issues/2102))
 - [isort](https://pypi.org/project/isort/)
 - [mccabe](https://pypi.org/project/mccabe/)
 - [pandas-vet](https://pypi.org/project/pandas-vet/)
 - [pep8-naming](https://pypi.org/project/pep8-naming/)
 - [pydocstyle](https://pypi.org/project/pydocstyle/)
-- [pygrep-hooks](https://github.com/pre-commit/pygrep-hooks) ([#980](https://github.com/charliermarsh/ruff/issues/980))
+- [pygrep-hooks](https://github.com/pre-commit/pygrep-hooks)
+- [pylint-airflow](https://pypi.org/project/pylint-airflow/)
 - [pyupgrade](https://pypi.org/project/pyupgrade/)
 - [tryceratops](https://pypi.org/project/tryceratops/)
 - [yesqa](https://pypi.org/project/yesqa/)
 
-<!-- End section: Rules -->
-
 For a complete enumeration of the supported rules, see [_Rules_](https://beta.ruff.rs/docs/rules/).
 
 ## Contributing
@@ -341,13 +349,15 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [Babel](https://github.com/python-babel/babel)
 - [Bokeh](https://github.com/bokeh/bokeh)
 - [Cryptography (PyCA)](https://github.com/pyca/cryptography)
+- [DVC](https://github.com/iterative/dvc)
 - [Dagger](https://github.com/dagger/dagger)
 - [Dagster](https://github.com/dagster-io/dagster)
-- [DVC](https://github.com/iterative/dvc)
 - [FastAPI](https://github.com/tiangolo/fastapi)
 - [Gradio](https://github.com/gradio-app/gradio)
 - [Great Expectations](https://github.com/great-expectations/great_expectations)
-- Hugging Face ([Transformers](https://github.com/huggingface/transformers), [Datasets](https://github.com/huggingface/datasets), [Diffusers](https://github.com/huggingface/diffusers))
+- Hugging Face ([Transformers](https://github.com/huggingface/transformers),
+  [Datasets](https://github.com/huggingface/datasets),
+  [Diffusers](https://github.com/huggingface/diffusers))
 - [Hatch](https://github.com/pypa/hatch)
 - [Home Assistant](https://github.com/home-assistant/core)
 - [Ibis](https://github.com/ibis-project/ibis)
@@ -359,7 +369,9 @@ Ruff is used by a number of major open-source projects and companies, including:
 - Modern Treasury ([Python SDK](https://github.com/Modern-Treasury/modern-treasury-python-sdk))
 - Mozilla ([Firefox](https://github.com/mozilla/gecko-dev))
 - [MegaLinter](https://github.com/oxsecurity/megalinter)
-- Microsoft ([Semantic Kernel](https://github.com/microsoft/semantic-kernel), [ONNX Runtime](https://github.com/microsoft/onnxruntime))
+- Microsoft ([Semantic Kernel](https://github.com/microsoft/semantic-kernel),
+  [ONNX Runtime](https://github.com/microsoft/onnxruntime),
+  [LightGBM](https://github.com/microsoft/LightGBM))
 - Netflix ([Dispatch](https://github.com/Netflix/dispatch))
 - [Neon](https://github.com/neondatabase/neon)
 - [ONNX](https://github.com/onnx/onnx)
@@ -371,8 +383,9 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [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)
+- [PyTorch](https://github.com/pytorch/pytorch)
+- [Pydantic](https://github.com/pydantic/pydantic)
 - [Pylint](https://github.com/PyCQA/pylint)
 - [Pynecone](https://github.com/pynecone-io/pynecone)
 - [Robyn](https://github.com/sansyrox/robyn)
@@ -382,7 +395,7 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [SciPy](https://github.com/scipy/scipy)
 - [Sphinx](https://github.com/sphinx-doc/sphinx)
 - [Stable Baselines3](https://github.com/DLR-RM/stable-baselines3)
-- [Starlite](https://github.com/starlite-api/starlite)
+- [Litestar](https://litestar.dev/)
 - [The Algorithms](https://github.com/TheAlgorithms/Python)
 - [Vega-Altair](https://github.com/altair-viz/altair)
 - WordPress ([Openverse](https://github.com/WordPress/openverse))
@@ -395,6 +408,34 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [meson-python](https://github.com/mesonbuild/meson-python)
 - [nox](https://github.com/wntrblm/nox)
 
+### Show Your Support
+
+If you're using Ruff, consider adding the Ruff badge to project's `README.md`:
+
+```md
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json)](https://github.com/charliermarsh/ruff)
+```
+
+...or `README.rst`:
+
+```rst
+.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json
+    :target: https://github.com/charliermarsh/ruff
+    :alt: Ruff
+```
+
+...or, as HTML:
+
+```html
+<a href="/charliermarsh/ruff"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json" alt="Ruff" style="max-width:100%;"></a>
+```
+
 ## License
 
 MIT
+
+<div align="center">
+  <a target="_blank" href="https://astral.sh" style="background:none">
+    <img src="https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/svg/Astral.svg">
+  </a>
+</div>
diff --git a/_typos.toml b/_typos.toml
index 8f5f834f9b409..778ba59eaf71e 100644
--- a/_typos.toml
+++ b/_typos.toml
@@ -1,5 +1,5 @@
 [files]
-extend-exclude = ["snapshots", "black"]
+extend-exclude = ["resources", "snapshots"]
 
 [default.extend-words]
 trivias = "trivias"
diff --git a/assets/badge/v2.json b/assets/badge/v2.json
new file mode 100644
index 0000000000000..9379c3479837e
--- /dev/null
+++ b/assets/badge/v2.json
@@ -0,0 +1,8 @@
+{
+  "label": "",
+  "message": "Ruff",
+  "logoSvg": "<svg width=\"510\" height=\"622\" viewBox=\"0 0 510 622\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"><path fill-rule=\"evenodd\" clip-rule=\"evenodd\" d=\"M206.701 0C200.964 0 196.314 4.64131 196.314 10.3667V41.4667C196.314 47.192 191.663 51.8333 185.927 51.8333H156.843C151.107 51.8333 146.456 56.4746 146.456 62.2V145.133C146.456 150.859 141.806 155.5 136.069 155.5H106.986C101.249 155.5 96.5988 160.141 96.5988 165.867V222.883C96.5988 228.609 91.9484 233.25 86.2118 233.25H57.1283C51.3917 233.25 46.7413 237.891 46.7413 243.617V300.633C46.7413 306.359 42.0909 311 36.3544 311H10.387C4.6504 311 0 315.641 0 321.367V352.467C0 358.192 4.6504 362.833 10.387 362.833H145.418C151.154 362.833 155.804 367.475 155.804 373.2V430.217C155.804 435.942 151.154 440.583 145.418 440.583H116.334C110.597 440.583 105.947 445.225 105.947 450.95V507.967C105.947 513.692 101.297 518.333 95.5601 518.333H66.4766C60.74 518.333 56.0896 522.975 56.0896 528.7V611.633C56.0896 617.359 60.74 622 66.4766 622H149.572C155.309 622 159.959 617.359 159.959 611.633V570.167H201.507C207.244 570.167 211.894 565.525 211.894 559.8V528.7C211.894 522.975 216.544 518.333 222.281 518.333H251.365C257.101 518.333 261.752 513.692 261.752 507.967V476.867C261.752 471.141 266.402 466.5 272.138 466.5H301.222C306.959 466.5 311.609 461.859 311.609 456.133V425.033C311.609 419.308 316.259 414.667 321.996 414.667H351.079C356.816 414.667 361.466 410.025 361.466 404.3V373.2C361.466 367.475 366.117 362.833 371.853 362.833H400.937C406.673 362.833 411.324 358.192 411.324 352.467V321.367C411.324 315.641 415.974 311 421.711 311H450.794C456.531 311 461.181 306.359 461.181 300.633V217.7C461.181 211.975 456.531 207.333 450.794 207.333H420.672C414.936 207.333 410.285 202.692 410.285 196.967V165.867C410.285 160.141 414.936 155.5 420.672 155.5H449.756C455.492 155.5 460.143 150.859 460.143 145.133V114.033C460.143 108.308 464.793 103.667 470.53 103.667H499.613C505.35 103.667 510 99.0253 510 93.3V10.3667C510 4.64132 505.35 0 499.613 0H206.701ZM168.269 440.583C162.532 440.583 157.882 445.225 157.882 450.95V507.967C157.882 513.692 153.231 518.333 147.495 518.333H118.411C112.675 518.333 108.024 522.975 108.024 528.7V559.8C108.024 565.525 112.675 570.167 118.411 570.167H159.959V528.7C159.959 522.975 164.61 518.333 170.346 518.333H199.43C205.166 518.333 209.817 513.692 209.817 507.967V476.867C209.817 471.141 214.467 466.5 220.204 466.5H249.287C255.024 466.5 259.674 461.859 259.674 456.133V425.033C259.674 419.308 264.325 414.667 270.061 414.667H299.145C304.881 414.667 309.532 410.025 309.532 404.3V373.2C309.532 367.475 314.182 362.833 319.919 362.833H349.002C354.739 362.833 359.389 358.192 359.389 352.467V321.367C359.389 315.641 364.039 311 369.776 311H398.859C404.596 311 409.246 306.359 409.246 300.633V269.533C409.246 263.808 404.596 259.167 398.859 259.167H318.88C313.143 259.167 308.493 254.525 308.493 248.8V217.7C308.493 211.975 313.143 207.333 318.88 207.333H347.963C353.7 207.333 358.35 202.692 358.35 196.967V165.867C358.35 160.141 363.001 155.5 368.737 155.5H397.821C403.557 155.5 408.208 150.859 408.208 145.133V114.033C408.208 108.308 412.858 103.667 418.595 103.667H447.678C453.415 103.667 458.065 99.0253 458.065 93.3V62.2C458.065 56.4746 453.415 51.8333 447.678 51.8333H208.778C203.041 51.8333 198.391 56.4746 198.391 62.2V145.133C198.391 150.859 193.741 155.5 188.004 155.5H158.921C153.184 155.5 148.534 160.141 148.534 165.867V222.883C148.534 228.609 143.883 233.25 138.147 233.25H109.063C103.327 233.25 98.6762 237.891 98.6762 243.617V300.633C98.6762 306.359 103.327 311 109.063 311H197.352C203.089 311 207.739 315.641 207.739 321.367V430.217C207.739 435.942 203.089 440.583 197.352 440.583H168.269Z\" fill=\"#D7FF64\"/></svg>",
+  "logoWidth": 10,
+  "labelColor": "grey",
+  "color": "#261230"
+}
diff --git a/assets/svg/Astral.svg b/assets/svg/Astral.svg
new file mode 100644
index 0000000000000..461be113154df
--- /dev/null
+++ b/assets/svg/Astral.svg
@@ -0,0 +1,24 @@
+<svg width="139" height="24" viewBox="0 0 139 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <rect width="138.764" height="24" rx="2.18182" fill="#261230"/>
+  <path
+    d="M8.72798 15.2726H9.91316V11.8697L9.6887 10.4062L9.8952 10.3343L12.1309 15.1649L14.3486 10.3343L14.5461 10.4062L14.3486 11.8607V15.2726H15.5248V8.72714H13.9535L12.2117 12.7137H12.0142L10.2723 8.72714H8.72798V15.2726Z"
+    fill="#D7FF64"/>
+  <path
+    d="M22.3432 15.2726H23.6631L21.3017 8.72714H19.7574L17.4589 15.2726H18.7069L19.1558 13.9797H21.9033L22.3432 15.2726ZM19.497 13.0279L19.901 11.8607L20.4308 10.0021H20.6463L21.176 11.8607L21.5711 13.0279H19.497Z"
+    fill="#D7FF64"/>
+  <path
+    d="M25.4209 15.2726H28.1234C30.1077 15.2726 30.9876 14.1413 30.9876 12.0044C30.9876 9.92131 30.1706 8.72714 28.1234 8.72714H25.4209V15.2726ZM26.624 14.2131V9.77765H28.0965C29.147 9.77765 29.7306 10.1907 29.7306 11.4477V12.5521C29.7306 13.6923 29.2817 14.2131 28.0965 14.2131H26.624Z"
+    fill="#D7FF64"/>
+  <path
+    d="M33.079 15.2726H37.6491V14.2131H34.2822V12.3815H37.2002V11.3938H34.2822V9.77765H37.6491V8.72714H33.079V15.2726Z"
+    fill="#D7FF64"/>
+  <path
+    d="M42.923 15.2726H46.2451C47.4572 15.2726 48.2025 14.5812 48.2025 13.5487C48.2025 12.7675 47.8343 12.175 47.0532 11.9954V11.7799C47.6637 11.5734 48.0319 11.0436 48.0319 10.3433C48.0319 9.38259 47.4572 8.72714 46.281 8.72714H42.923V15.2726ZM44.0992 11.4746V9.65195H45.9578C46.4875 9.65195 46.7928 9.92131 46.7928 10.3523V10.7653C46.7928 11.1873 46.4965 11.4746 45.9758 11.4746H44.0992ZM44.0992 14.3388V12.3904H46.0296C46.5863 12.3904 46.9365 12.6418 46.9365 13.1806V13.5666C46.9365 14.0425 46.5684 14.3388 45.9309 14.3388H44.0992Z"
+    fill="#D7FF64"/>
+  <path
+    d="M49.6959 8.72714L52.174 12.579V14.1952H50.1898V15.2726H53.3772V12.579L55.8553 8.72714H54.4456L53.5119 10.2535L52.8744 11.3759H52.6679L52.0483 10.2715L51.1056 8.72714H49.6959Z"
+    fill="#D7FF64"/>
+  <path fill-rule="evenodd" clip-rule="evenodd"
+    d="M74.1824 7.63626C74.1824 7.03377 74.6708 6.54535 75.2733 6.54535H84.0006C84.6031 6.54535 85.0915 7.03377 85.0915 7.63626V9.81808H80.0733V8.94535H79.2006V10.6908H84.0006C84.6031 10.6908 85.0915 11.1792 85.0915 11.7817V16.3635C85.0915 16.966 84.6031 17.4544 84.0006 17.4544H75.2733C74.6708 17.4544 74.1824 16.966 74.1824 16.3635V14.1817L79.2006 14.1817V15.0544H80.0733V13.309L75.2733 13.309C74.6708 13.309 74.1824 12.8206 74.1824 12.2181V7.63626ZM63.4912 6.54545C62.8887 6.54545 62.4003 7.03387 62.4003 7.63636V17.4545H67.4185V14.1818H68.2912V17.4545H73.3094V7.63636C73.3094 7.03387 72.821 6.54545 72.2185 6.54545H63.4912ZM69.164 10.6909V11.5636H66.5458V10.6909H69.164ZM110.619 6.54545C110.016 6.54545 109.528 7.03387 109.528 7.63636V17.4545H114.546V14.1818H115.419V17.4545H120.437V7.63636C120.437 7.03387 119.948 6.54545 119.346 6.54545H110.619ZM116.291 10.6909V11.5636H113.673V10.6909H116.291ZM91.8549 8.29091H96.8731V11.3455C96.8731 11.9479 96.3847 12.4364 95.7822 12.4364H91.8549V13.3091H96.8731V17.4545H87.9276C87.3251 17.4545 86.8367 16.9661 86.8367 16.3636V12.4364H85.964V8.29091H86.8367V6.54545H91.8549V8.29091ZM108.655 7.63636C108.655 7.03387 108.166 6.54545 107.564 6.54545H97.7458V17.4545H102.764V14.1818H103.637V17.4545H108.655V13.3091H106.473V12.4364H107.564C108.166 12.4364 108.655 11.9479 108.655 11.3455V7.63636ZM104.509 10.6909V11.5636H101.891V10.6909H104.509ZM132.218 13.3091L126.327 13.3091V6.54547L121.309 6.54547V17.4546H132.218V13.3091Z"
+    fill="#D7FF64"/>
+</svg>
diff --git a/crates/flake8_to_ruff/Cargo.toml b/crates/flake8_to_ruff/Cargo.toml
index dd78fb485a6fa..05109e74955e9 100644
--- a/crates/flake8_to_ruff/Cargo.toml
+++ b/crates/flake8_to_ruff/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.265"
+version = "0.0.272"
 edition = { workspace = true }
 rust-version = { workspace = true }
 
diff --git a/crates/flake8_to_ruff/pyproject.toml b/crates/flake8_to_ruff/pyproject.toml
index 16173f7d0d130..b7278f549aeef 100644
--- a/crates/flake8_to_ruff/pyproject.toml
+++ b/crates/flake8_to_ruff/pyproject.toml
@@ -26,7 +26,7 @@ requires-python = ">=3.7"
 repository = "https://github.com/charliermarsh/ruff#subdirectory=crates/flake8_to_ruff"
 
 [build-system]
-requires = ["maturin>=0.14,<0.15"]
+requires = ["maturin>=1.0,<2.0"]
 build-backend = "maturin"
 
 [tool.maturin]
diff --git a/crates/ruff/Cargo.toml b/crates/ruff/Cargo.toml
index c6c45a038ded9..77cfba42c27cf 100644
--- a/crates/ruff/Cargo.toml
+++ b/crates/ruff/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.0.265"
+version = "0.0.272"
 authors.workspace = true
 edition.workspace = true
 rust-version.workspace = true
@@ -17,11 +17,13 @@ name = "ruff"
 ruff_cache = { path = "../ruff_cache" }
 ruff_diagnostics = { path = "../ruff_diagnostics", features = ["serde"] }
 ruff_macros = { path = "../ruff_macros" }
+ruff_newlines = { path = "../ruff_newlines" }
 ruff_python_ast = { path = "../ruff_python_ast", features = ["serde"] }
 ruff_python_semantic = { path = "../ruff_python_semantic" }
 ruff_python_stdlib = { path = "../ruff_python_stdlib" }
 ruff_rustpython = { path = "../ruff_rustpython" }
 ruff_text_size = { workspace = true }
+ruff_textwrap = { path = "../ruff_textwrap" }
 
 annotate-snippets = { version = "0.9.1", features = ["color"] }
 anyhow = { workspace = true }
@@ -41,8 +43,8 @@ libcst = { workspace = true }
 log = { workspace = true }
 natord = { version = "1.0.9" }
 nohash-hasher = { workspace = true }
-num-bigint = { version = "0.4.3" }
-num-traits = { version = "0.2.15" }
+num-bigint = { workspace = true }
+num-traits = { workspace = true }
 once_cell = { workspace = true }
 path-absolutize = { workspace = true, features = [
   "once_cell_cache",
@@ -50,13 +52,14 @@ path-absolutize = { workspace = true, features = [
 ] }
 pathdiff = { version = "0.2.1" }
 pep440_rs = { version = "0.3.1", features = ["serde"] }
+pyproject-toml = { version = "0.6.0" }
 quick-junit = { version = "0.3.2" }
 regex = { workspace = true }
 result-like = { version = "0.4.6" }
 rustc-hash = { workspace = true }
-rustpython-common = { workspace = true }
+rustpython-format = { workspace = true }
 rustpython-parser = { workspace = true }
-schemars = { workspace = true }
+schemars = { workspace = true, optional = true }
 semver = { version = "1.0.16" }
 serde = { workspace = true }
 serde_json = { workspace = true }
@@ -65,11 +68,11 @@ shellexpand = { workspace = true }
 smallvec = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
-textwrap = { workspace = true }
 thiserror = { version = "1.0.38" }
 toml = { workspace = true }
 typed-arena = { version = "2.0.2" }
 unicode-width = { version = "0.1.10" }
+unicode_names2 = { version = "0.6.0", git = "https://github.com/youknowone/unicode_names2.git", rev = "4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" }
 
 [dev-dependencies]
 insta = { workspace = true }
@@ -80,5 +83,5 @@ colored = { workspace = true, features = ["no-color"] }
 
 [features]
 default = []
-logical_lines = []
+schemars = ["dep:schemars"]
 jupyter_notebook = []
diff --git a/crates/ruff/resources/test/fixtures/airflow/AIR001.py b/crates/ruff/resources/test/fixtures/airflow/AIR001.py
new file mode 100644
index 0000000000000..6e8bffcd9754d
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/airflow/AIR001.py
@@ -0,0 +1,16 @@
+from airflow.operators import PythonOperator
+
+
+def my_callable():
+    pass
+
+
+my_task = PythonOperator(task_id="my_task", callable=my_callable)
+my_task_2 = PythonOperator(callable=my_callable, task_id="my_task_2")
+
+incorrect_name = PythonOperator(task_id="my_task")
+incorrect_name_2 = PythonOperator(callable=my_callable, task_id="my_task_2")
+
+from my_module import MyClass
+
+incorrect_name = MyClass(task_id="my_task")
diff --git a/crates/ruff/resources/test/fixtures/flake8_annotations/annotation_presence.py b/crates/ruff/resources/test/fixtures/flake8_annotations/annotation_presence.py
index 3258eaf736f37..d37f178bbb938 100644
--- a/crates/ruff/resources/test/fixtures/flake8_annotations/annotation_presence.py
+++ b/crates/ruff/resources/test/fixtures/flake8_annotations/annotation_presence.py
@@ -1,4 +1,5 @@
 from typing import Any, Type
+from typing_extensions import override
 
 # Error
 def foo(a, b):
@@ -94,6 +95,31 @@ def foo(self: "Foo", a: int, *params: Any, **options: str) -> int:
     def foo(self: "Foo", a: int, *params: str, **options: Any) -> int:
         pass
 
+    # ANN401
+    @override
+    def foo(self: "Foo", a: Any, *params: str, **options: str) -> int:
+        pass
+
+    # ANN401
+    @override
+    def foo(self: "Foo", a: int, *params: str, **options: str) -> Any:
+        pass
+
+    # ANN401
+    @override
+    def foo(self: "Foo", a: int, *params: Any, **options: Any) -> int:
+        pass
+
+    # ANN401
+    @override
+    def foo(self: "Foo", a: int, *params: Any, **options: str) -> int:
+        pass
+
+    # ANN401
+    @override
+    def foo(self: "Foo", a: int, *params: str, **options: Any) -> int:
+        pass
+
     # OK
     @classmethod
     def foo(cls: Type["Foo"], a: int, b: int) -> int:
diff --git a/crates/ruff/resources/test/fixtures/flake8_async/ASYNC100.py b/crates/ruff/resources/test/fixtures/flake8_async/ASYNC100.py
new file mode 100644
index 0000000000000..532273a7b4676
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_async/ASYNC100.py
@@ -0,0 +1,23 @@
+import urllib.request
+import requests
+import httpx
+
+
+async def foo():
+    urllib.request.urlopen("http://example.com/foo/bar").read()
+
+
+async def foo():
+    requests.get()
+
+
+async def foo():
+    httpx.get()
+
+
+async def foo():
+    requests.post()
+
+
+async def foo():
+    httpx.post()
diff --git a/crates/ruff/resources/test/fixtures/flake8_async/ASYNC101.py b/crates/ruff/resources/test/fixtures/flake8_async/ASYNC101.py
new file mode 100644
index 0000000000000..32fbaeb9aabbe
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_async/ASYNC101.py
@@ -0,0 +1,31 @@
+import os
+import subprocess
+import time
+
+
+async def foo():
+    open("foo")
+
+
+async def foo():
+    time.sleep(1)
+
+
+async def foo():
+    subprocess.run("foo")
+
+
+async def foo():
+    subprocess.call("foo")
+
+
+async def foo():
+    subprocess.foo(0)
+
+
+async def foo():
+    os.wait4(10)
+
+
+async def foo():
+    os.wait(12)
diff --git a/crates/ruff/resources/test/fixtures/flake8_async/ASYNC102.py b/crates/ruff/resources/test/fixtures/flake8_async/ASYNC102.py
new file mode 100644
index 0000000000000..7912bcc9decab
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_async/ASYNC102.py
@@ -0,0 +1,13 @@
+import os
+
+
+async def foo():
+    os.popen()
+
+
+async def foo():
+    os.spawnl()
+
+
+async def foo():
+    os.fspath("foo")
diff --git a/crates/ruff/resources/test/fixtures/flake8_bandit/S601.py b/crates/ruff/resources/test/fixtures/flake8_bandit/S601.py
new file mode 100644
index 0000000000000..1a76018616e35
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_bandit/S601.py
@@ -0,0 +1,3 @@
+import paramiko
+
+paramiko.exec_command('something; really; unsafe')
diff --git a/crates/ruff/resources/test/fixtures/flake8_bandit/S608.py b/crates/ruff/resources/test/fixtures/flake8_bandit/S608.py
index 4592f46e4f515..b4c2aba044a88 100644
--- a/crates/ruff/resources/test/fixtures/flake8_bandit/S608.py
+++ b/crates/ruff/resources/test/fixtures/flake8_bandit/S608.py
@@ -74,8 +74,8 @@ def query40():
 
 def query41():
     return (
-        "SELECT *"
-        "FROM table"
+        "SELECT * "
+        "FROM table "
         f"WHERE var = {var}"
     )
 
@@ -84,7 +84,7 @@ def query41():
 query43 = cursor.execute(f"SELECT * FROM table WHERE var = {var}")
 query44 = cursor.execute("SELECT * FROM table WHERE var = {}".format(var))
 query45 = cursor.executemany("SELECT * FROM table WHERE var = %s" % var, [])
- 
+
 # # pass
 query = "SELECT * FROM table WHERE id = 1"
 query = "DELETE FROM table WHERE id = 1"
@@ -93,3 +93,12 @@ def query41():
 cursor.execute('SELECT * FROM table WHERE id = %s', var)
 cursor.execute('SELECT * FROM table WHERE id = 1')
 cursor.executemany('SELECT * FROM table WHERE id = %s', [var, var2])
+
+# # INSERT without INTO (e.g. MySQL and derivatives)
+query = "INSERT table VALUES (%s)" % (var,)
+
+# # REPLACE (e.g. MySQL and derivatives, SQLite)
+query = "REPLACE INTO table VALUES (%s)" % (var,)
+query = "REPLACE table VALUES (%s)" % (var,)
+
+query = "Deselect something that is not SQL even though it has a ' from ' somewhere in %s." % "there"
diff --git a/crates/ruff/resources/test/fixtures/flake8_bandit/S609.py b/crates/ruff/resources/test/fixtures/flake8_bandit/S609.py
new file mode 100644
index 0000000000000..848eb4a2fce97
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_bandit/S609.py
@@ -0,0 +1,8 @@
+import os
+import subprocess
+
+os.popen("chmod +w foo*")
+subprocess.Popen("/bin/chown root: *", shell=True)
+subprocess.Popen(["/usr/local/bin/rsync", "*", "some_where:"], shell=True)
+subprocess.Popen("/usr/local/bin/rsync * no_injection_here:")
+os.system("tar cf foo.tar bar/*")
diff --git a/crates/ruff/resources/test/fixtures/flake8_boolean_trap/FBT.py b/crates/ruff/resources/test/fixtures/flake8_boolean_trap/FBT.py
index 44195828903da..581668e9320c3 100644
--- a/crates/ruff/resources/test/fixtures/flake8_boolean_trap/FBT.py
+++ b/crates/ruff/resources/test/fixtures/flake8_boolean_trap/FBT.py
@@ -57,12 +57,16 @@ def used(do):
 {}.deploy(True, False)
 getattr(someobj, attrname, False)
 mylist.index(True)
+bool(False)
 int(True)
 str(int(False))
 cfg.get("hello", True)
 cfg.getint("hello", True)
 cfg.getfloat("hello", True)
 cfg.getboolean("hello", True)
+os.set_blocking(0, False)
+g_action.set_enabled(True)
+settings.set_enable_developer_extras(True)
 
 
 class Registry:
@@ -80,3 +84,6 @@ def foo(self, value: bool) -> None:
     # FBT001: Boolean positional arg in function definition
     def foo(self, value: bool) -> None:
         pass
+
+    def foo(self) -> None:
+        object.__setattr__(self, "flag", True)
diff --git a/crates/ruff/resources/test/fixtures/flake8_bugbear/B006_B008.py b/crates/ruff/resources/test/fixtures/flake8_bugbear/B006_B008.py
index 0fa3d6dc5bc6f..297e3ca49e837 100644
--- a/crates/ruff/resources/test/fixtures/flake8_bugbear/B006_B008.py
+++ b/crates/ruff/resources/test/fixtures/flake8_bugbear/B006_B008.py
@@ -1,6 +1,7 @@
 import collections
 import datetime as dt
 from decimal import Decimal
+from fractions import Fraction
 import logging
 import operator
 from pathlib import Path
@@ -158,12 +159,37 @@ def float_infinity_literal(value=float("1e999")):
     pass
 
 
-# But don't allow standard floats
-def float_int_is_wrong(value=float(3)):
+# Allow standard floats
+def float_int_okay(value=float(3)):
     pass
 
 
-def float_str_not_inf_or_nan_is_wrong(value=float("3.14")):
+def float_str_not_inf_or_nan_okay(value=float("3.14")):
+    pass
+
+
+# Allow immutable str() value
+def str_okay(value=str("foo")):
+    pass
+
+
+# Allow immutable bool() value
+def bool_okay(value=bool("bar")):
+    pass
+
+
+# Allow immutable int() value
+def int_okay(value=int("12")):
+    pass
+
+
+# Allow immutable complex() value
+def complex_okay(value=complex(1,2)):
+    pass
+
+
+# Allow immutable Fraction() value
+def fraction_okay(value=Fraction(1,2)):
     pass
 
 
diff --git a/crates/ruff/resources/test/fixtures/flake8_bugbear/B007.py b/crates/ruff/resources/test/fixtures/flake8_bugbear/B007.py
index 6df22e0027c0d..6c855a7989c5c 100644
--- a/crates/ruff/resources/test/fixtures/flake8_bugbear/B007.py
+++ b/crates/ruff/resources/test/fixtures/flake8_bugbear/B007.py
@@ -73,7 +73,18 @@ def f():
 
 
 def f():
-    # Fixable.
+    # Unfixable.
+    for foo, bar, baz in (["1", "2", "3"],):
+        if foo or baz:
+            break
+    else:
+        bar = 1
+
+    print(bar)
+
+
+def f():
+    # Unfixable (false negative) due to usage of `bar` outside of loop.
     for foo, bar, baz in (["1", "2", "3"],):
         if foo or baz:
             break
@@ -85,4 +96,4 @@ def f():
 # Unfixable due to trailing underscore (`_line_` wouldn't be considered an ignorable
 # variable name).
 for line_ in range(self.header_lines):
-     fp.readline()
+    fp.readline()
diff --git a/crates/ruff/resources/test/fixtures/flake8_bugbear/B027.py b/crates/ruff/resources/test/fixtures/flake8_bugbear/B027.py
index d7d563c36550e..803a660cd8a7d 100644
--- a/crates/ruff/resources/test/fixtures/flake8_bugbear/B027.py
+++ b/crates/ruff/resources/test/fixtures/flake8_bugbear/B027.py
@@ -4,7 +4,12 @@
 """
 import abc
 from abc import ABC
-from abc import abstractmethod, abstractproperty
+from abc import (
+    abstractmethod,
+    abstractproperty,
+    abstractclassmethod,
+    abstractstaticmethod,
+)
 from abc import abstractmethod as notabstract
 from abc import abstractproperty as notabstract_property
 
@@ -55,6 +60,22 @@ def abstract_5(self):
     def abstract_6(self):
         ...
 
+    @abstractclassmethod
+    def abstract_7(self):
+        pass
+
+    @abc.abstractclassmethod
+    def abstract_8(self):
+        ...
+
+    @abstractstaticmethod
+    def abstract_9(self):
+        pass
+
+    @abc.abstractstaticmethod
+    def abstract_10(self):
+        ...
+
     def body_1(self):
         print("foo")
         ...
@@ -99,3 +120,11 @@ def empty_1(self, foo: float):
     @abstractmethod
     def empty_1(self, foo: Union[str, int, list, float]):
         ...
+
+
+from dataclasses import dataclass
+
+
+@dataclass
+class Foo(ABC):  # noqa: B024
+    ...
diff --git a/crates/ruff/resources/test/fixtures/flake8_bugbear/B027_extended.py b/crates/ruff/resources/test/fixtures/flake8_bugbear/B027_extended.py
deleted file mode 100644
index 42ce3a66369a4..0000000000000
--- a/crates/ruff/resources/test/fixtures/flake8_bugbear/B027_extended.py
+++ /dev/null
@@ -1,39 +0,0 @@
-"""
-Should emit:
-B027 - on lines 13, 16, 19, 23
-"""
-from abc import ABC
-
-
-class AbstractClass(ABC):
-    def empty_1(self):  # error
-        ...
-
-    def empty_2(self):  # error
-        pass
-
-    def body_1(self):
-        print("foo")
-        ...
-
-    def body_2(self):
-        self.body_1()
-
-
-def foo():
-    class InnerAbstractClass(ABC):
-        def empty_1(self):  # error
-            ...
-
-        def empty_2(self):  # error
-            pass
-
-        def body_1(self):
-            print("foo")
-            ...
-
-        def body_2(self):
-            self.body_1()
-
-    return InnerAbstractClass
-
diff --git a/crates/ruff/resources/test/fixtures/flake8_bugbear/B033.py b/crates/ruff/resources/test/fixtures/flake8_bugbear/B033.py
new file mode 100644
index 0000000000000..61f2dd355ba5c
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_bugbear/B033.py
@@ -0,0 +1,11 @@
+###
+# Errors.
+###
+incorrect_set = {"value1", 23, 5, "value1"}
+incorrect_set = {1, 1}
+
+###
+# Non-errors.
+###
+correct_set = {"value1", 23, 5}
+correct_set = {5, "5"}
diff --git a/crates/ruff/resources/test/fixtures/flake8_bugbear/B905.py b/crates/ruff/resources/test/fixtures/flake8_bugbear/B905.py
index 1a01b5ebac327..4d94cabbceea6 100644
--- a/crates/ruff/resources/test/fixtures/flake8_bugbear/B905.py
+++ b/crates/ruff/resources/test/fixtures/flake8_bugbear/B905.py
@@ -1,3 +1,6 @@
+from itertools import count, cycle, repeat
+
+# Errors
 zip()
 zip(range(3))
 zip("a", "b")
@@ -5,6 +8,18 @@
 zip(zip("a"), strict=False)
 zip(zip("a", strict=True))
 
+# OK
 zip(range(3), strict=True)
 zip("a", "b", strict=False)
 zip("a", "b", "c", strict=True)
+
+# OK (infinite iterators).
+zip([1, 2, 3], cycle("ABCDEF"))
+zip([1, 2, 3], count())
+zip([1, 2, 3], repeat(1))
+zip([1, 2, 3], repeat(1, None))
+zip([1, 2, 3], repeat(1, times=None))
+
+# Errors (limited iterators).
+zip([1, 2, 3], repeat(1, 1))
+zip([1, 2, 3], repeat(1, times=4))
diff --git a/crates/ruff/resources/test/fixtures/flake8_commas/COM81.py b/crates/ruff/resources/test/fixtures/flake8_commas/COM81.py
index dc6db3a3c2889..f76059e98d095 100644
--- a/crates/ruff/resources/test/fixtures/flake8_commas/COM81.py
+++ b/crates/ruff/resources/test/fixtures/flake8_commas/COM81.py
@@ -631,3 +631,11 @@ def foo(
 the_first_one = next(
     (i for i in range(10) if i // 2 == 0)  # COM812 fix should include the final bracket
 )
+
+foo = namedtuple(
+    name="foo",
+    status="bar",
+    message="sfdsdfsdgs fsdfsdf output!dsfdfsdjkg  ghfskdjghkdssd sd fsdf  s\n"[
+        :20
+    ],
+)
diff --git a/crates/ruff/resources/test/fixtures/flake8_comprehensions/C419.py b/crates/ruff/resources/test/fixtures/flake8_comprehensions/C419.py
index 74aea42a533a4..4a9671b1ee020 100644
--- a/crates/ruff/resources/test/fixtures/flake8_comprehensions/C419.py
+++ b/crates/ruff/resources/test/fixtures/flake8_comprehensions/C419.py
@@ -17,3 +17,23 @@
 
 async def f() -> bool:
     return all([await use_greeting(greeting) for greeting in await greetings()])
+
+
+# Special comment handling
+any(
+    [  # lbracket comment
+        # second line comment
+        i.bit_count()
+        # random middle comment
+        for i in range(5)  # rbracket comment
+    ]  # rpar comment
+    # trailing comment
+)
+
+# Weird case where the function call, opening bracket, and comment are all
+# on the same line.
+any([  # lbracket comment
+        # second line comment
+        i.bit_count() for i in range(5)  # rbracket comment
+    ]  # rpar comment
+)
diff --git a/crates/ruff/resources/test/fixtures/flake8_errmsg/EM.py b/crates/ruff/resources/test/fixtures/flake8_errmsg/EM.py
index 1311bbc675f74..9a94763c36528 100644
--- a/crates/ruff/resources/test/fixtures/flake8_errmsg/EM.py
+++ b/crates/ruff/resources/test/fixtures/flake8_errmsg/EM.py
@@ -9,6 +9,10 @@ def f_a_short():
     raise RuntimeError("Error")
 
 
+def f_a_empty():
+    raise RuntimeError("")
+
+
 def f_b():
     example = "example"
     raise RuntimeError(f"This is an {example} exception")
diff --git a/crates/ruff/resources/test/fixtures/flake8_fixme/T00.py b/crates/ruff/resources/test/fixtures/flake8_fixme/T00.py
new file mode 100644
index 0000000000000..a398610c1c234
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_fixme/T00.py
@@ -0,0 +1,8 @@
+# TODO: todo
+# todo: todo
+# XXX: xxx
+# xxx: xxx
+# HACK: hack
+# hack: hack
+# FIXME: fixme
+# fixme: fixme
diff --git a/crates/ruff/resources/test/fixtures/flake8_future_annotations/edge_case.py b/crates/ruff/resources/test/fixtures/flake8_future_annotations/edge_case.py
new file mode 100644
index 0000000000000..f98adefaf4cea
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_future_annotations/edge_case.py
@@ -0,0 +1,7 @@
+from typing import List
+import typing as t
+
+
+def main(_: List[int]) -> None:
+    a_list: t.List[str] = []
+    a_list.append("hello")
diff --git a/crates/ruff/resources/test/fixtures/flake8_future_annotations/from_typing_import.py b/crates/ruff/resources/test/fixtures/flake8_future_annotations/from_typing_import.py
new file mode 100644
index 0000000000000..a8229aca12438
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_future_annotations/from_typing_import.py
@@ -0,0 +1,6 @@
+from typing import List
+
+
+def main() -> None:
+    a_list: List[str] = []
+    a_list.append("hello")
diff --git a/crates/ruff/resources/test/fixtures/flake8_future_annotations/from_typing_import_many.py b/crates/ruff/resources/test/fixtures/flake8_future_annotations/from_typing_import_many.py
new file mode 100644
index 0000000000000..28ccc2e4c3c3c
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_future_annotations/from_typing_import_many.py
@@ -0,0 +1,8 @@
+from typing import Dict, List, Optional, Set, Union, cast
+
+
+def main() -> None:
+    a_list: List[Optional[str]] = []
+    a_list.append("hello")
+    a_dict = cast(Dict[int | None, Union[int, Set[bool]]], {})
+    a_dict[1] = {True, False}
diff --git a/crates/ruff/resources/test/fixtures/flake8_future_annotations/import_typing.py b/crates/ruff/resources/test/fixtures/flake8_future_annotations/import_typing.py
new file mode 100644
index 0000000000000..fccfe30aa2612
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_future_annotations/import_typing.py
@@ -0,0 +1,6 @@
+import typing
+
+
+def main() -> None:
+    a_list: typing.List[str] = []
+    a_list.append("hello")
diff --git a/crates/ruff/resources/test/fixtures/flake8_future_annotations/import_typing_as.py b/crates/ruff/resources/test/fixtures/flake8_future_annotations/import_typing_as.py
new file mode 100644
index 0000000000000..5f634a0334bc1
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_future_annotations/import_typing_as.py
@@ -0,0 +1,6 @@
+import typing as t
+
+
+def main() -> None:
+    a_list: t.List[str] = []
+    a_list.append("hello")
diff --git a/crates/ruff/resources/test/fixtures/flake8_future_annotations/no_future_import_uses_lowercase.py b/crates/ruff/resources/test/fixtures/flake8_future_annotations/no_future_import_uses_lowercase.py
new file mode 100644
index 0000000000000..a573432cd5aad
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_future_annotations/no_future_import_uses_lowercase.py
@@ -0,0 +1,7 @@
+def main() -> None:
+    a_list: list[str] = []
+    a_list.append("hello")
+
+
+def hello(y: dict[str, int]) -> None:
+    del y
diff --git a/crates/ruff/resources/test/fixtures/flake8_future_annotations/no_future_import_uses_union.py b/crates/ruff/resources/test/fixtures/flake8_future_annotations/no_future_import_uses_union.py
new file mode 100644
index 0000000000000..50206192f181b
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_future_annotations/no_future_import_uses_union.py
@@ -0,0 +1,7 @@
+def main() -> None:
+    a_list: list[str] | None = []
+    a_list.append("hello")
+
+
+def hello(y: dict[str, int] | None) -> None:
+    del y
diff --git a/crates/ruff/resources/test/fixtures/flake8_future_annotations/no_future_import_uses_union_inner.py b/crates/ruff/resources/test/fixtures/flake8_future_annotations/no_future_import_uses_union_inner.py
new file mode 100644
index 0000000000000..9f9b5bd574b35
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_future_annotations/no_future_import_uses_union_inner.py
@@ -0,0 +1,8 @@
+def main() -> None:
+    a_list: list[str | None] = []
+    a_list.append("hello")
+
+
+def hello(y: dict[str | None, int]) -> None:
+    z: tuple[str, str | None, str] = tuple(y)
+    del z
diff --git a/crates/ruff/resources/test/fixtures/flake8_future_annotations/ok_no_types.py b/crates/ruff/resources/test/fixtures/flake8_future_annotations/ok_no_types.py
new file mode 100644
index 0000000000000..54fff8090690b
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_future_annotations/ok_no_types.py
@@ -0,0 +1,3 @@
+def main() -> str:
+    a_str = "hello"
+    return a_str
diff --git a/crates/ruff/resources/test/fixtures/flake8_future_annotations/ok_non_simplifiable_types.py b/crates/ruff/resources/test/fixtures/flake8_future_annotations/ok_non_simplifiable_types.py
new file mode 100644
index 0000000000000..b5121a9297ee6
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_future_annotations/ok_non_simplifiable_types.py
@@ -0,0 +1,10 @@
+from typing import NamedTuple
+
+
+class Stuff(NamedTuple):
+    x: int
+
+
+def main() -> None:
+    a_list = Stuff(5)
+    print(a_list)
diff --git a/crates/ruff/resources/test/fixtures/flake8_future_annotations/ok_uses_future.py b/crates/ruff/resources/test/fixtures/flake8_future_annotations/ok_uses_future.py
new file mode 100644
index 0000000000000..281b96d393c33
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_future_annotations/ok_uses_future.py
@@ -0,0 +1,6 @@
+from __future__ import annotations
+
+
+def main() -> None:
+    a_list: list[str] = []
+    a_list.append("hello")
diff --git a/crates/ruff/resources/test/fixtures/flake8_future_annotations/ok_variable_name.py b/crates/ruff/resources/test/fixtures/flake8_future_annotations/ok_variable_name.py
new file mode 100644
index 0000000000000..a1a8febe427d7
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_future_annotations/ok_variable_name.py
@@ -0,0 +1,8 @@
+import typing
+
+IRRELEVANT = typing.TypeVar
+
+
+def main() -> None:
+    List: list[str] = []
+    List.append("hello")
diff --git a/crates/ruff/resources/test/fixtures/flake8_logging_format/G001.py b/crates/ruff/resources/test/fixtures/flake8_logging_format/G001.py
index de1424f3a254a..7a3a49a6a7d10 100644
--- a/crates/ruff/resources/test/fixtures/flake8_logging_format/G001.py
+++ b/crates/ruff/resources/test/fixtures/flake8_logging_format/G001.py
@@ -7,3 +7,12 @@
 logging.log(logging.INFO, msg="Hello {}".format("World!"))
 logging.log(level=logging.INFO, msg="Hello {}".format("World!"))
 logging.log(msg="Hello {}".format("World!"), level=logging.INFO)
+
+# Flask support
+import flask
+from flask import current_app
+from flask import current_app as app
+
+flask.current_app.logger.info("Hello {}".format("World!"))
+current_app.logger.info("Hello {}".format("World!"))
+app.logger.log(logging.INFO, "Hello {}".format("World!"))
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI013.py b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI013.py
new file mode 100644
index 0000000000000..9b3635962e29c
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI013.py
@@ -0,0 +1,65 @@
+class OneAttributeClass:
+    value: int
+    ...
+
+
+class OneAttributeClass2:
+    ...
+    value: int
+
+
+class TwoEllipsesClass:
+    ...
+    ...
+
+
+class DocstringClass:
+    """
+    My body only contains an ellipsis.
+    """
+
+    ...
+
+
+class NonEmptyChild(Exception):
+    value: int
+    ...
+
+
+class NonEmptyChild2(Exception):
+    ...
+    value: int
+
+
+class NonEmptyWithInit:
+    value: int
+    ...
+
+    def __init__():
+        pass
+
+
+class EmptyClass:
+    ...
+
+
+class EmptyEllipsis:
+    ...
+
+
+class Dog:
+    eyes: int = 2
+
+
+class WithInit:
+    value: int = 0
+
+    def __init__():
+        ...
+
+
+def function():
+    ...
+
+
+...
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI013.pyi b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI013.pyi
new file mode 100644
index 0000000000000..aaf2cb0f794f2
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI013.pyi
@@ -0,0 +1,56 @@
+# Violations of PYI013
+
+class OneAttributeClass:
+    value: int
+    ...  # Error
+
+class OneAttributeClass2:
+    ...  # Error
+    value: int
+
+class MyClass:
+    ...
+    value: int
+
+class TwoEllipsesClass:
+    ...
+    ...  # Error
+
+class DocstringClass:
+    """
+    My body only contains an ellipsis.
+    """
+
+    ...  # Error
+
+class NonEmptyChild(Exception):
+    value: int
+    ...  # Error
+
+class NonEmptyChild2(Exception):
+    ...  # Error
+    value: int
+
+class NonEmptyWithInit:
+    value: int
+    ...  # Error
+
+    def __init__():
+        pass
+
+# Not violations
+
+class EmptyClass: ...
+class EmptyEllipsis: ...
+
+class Dog:
+    eyes: int = 2
+
+class WithInit:
+    value: int = 0
+
+    def __init__(): ...
+
+def function(): ...
+
+...
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI024.py b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI024.py
new file mode 100644
index 0000000000000..3090ae76c3192
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI024.py
@@ -0,0 +1,9 @@
+import collections
+
+person: collections.namedtuple  # OK
+
+from collections import namedtuple
+
+person: namedtuple  # OK
+
+person = namedtuple("Person", ["name", "age"])  # OK
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI024.pyi b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI024.pyi
new file mode 100644
index 0000000000000..b3d3b67b9ed03
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI024.pyi
@@ -0,0 +1,11 @@
+import collections
+
+person: collections.namedtuple  # Y024 Use "typing.NamedTuple" instead of "collections.namedtuple"
+
+from collections import namedtuple
+
+person: namedtuple  # Y024 Use "typing.NamedTuple" instead of "collections.namedtuple"
+
+person = namedtuple(
+    "Person", ["name", "age"]
+)  # Y024 Use "typing.NamedTuple" instead of "collections.namedtuple"
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI025.py b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI025.py
new file mode 100644
index 0000000000000..5c8b8fa26baf8
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI025.py
@@ -0,0 +1,19 @@
+from collections.abc import Set as AbstractSet  # Ok
+
+
+from collections.abc import Set  # Ok
+
+
+from collections.abc import (
+    Container,
+    Sized,
+    Set,  # Ok
+    ValuesView
+)
+
+from collections.abc import (
+    Container,
+    Sized,
+    Set as AbstractSet,  # Ok
+    ValuesView
+)
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI025.pyi b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI025.pyi
new file mode 100644
index 0000000000000..c12ccdffb5a53
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI025.pyi
@@ -0,0 +1,19 @@
+from collections.abc import Set as AbstractSet  # Ok
+
+
+from collections.abc import Set  # PYI025
+
+
+from collections.abc import (
+    Container,
+    Sized,
+    Set,  # PYI025
+    ValuesView
+)
+
+from collections.abc import (
+    Container,
+    Sized,
+    Set as AbstractSet,
+    ValuesView # Ok
+)
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI029.py b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI029.py
new file mode 100644
index 0000000000000..20cc7d6ae589a
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI029.py
@@ -0,0 +1,57 @@
+import builtins
+from abc import abstractmethod
+
+
+def __repr__(self) -> str:
+    ...
+
+
+def __str__(self) -> builtins.str:
+    ...
+
+
+def __repr__(self, /, foo) -> str:
+    ...
+
+
+def __repr__(self, *, foo) -> str:
+    ...
+
+
+class ShouldRemoveSingle:
+    def __str__(self) -> builtins.str:
+        ...
+
+
+class ShouldRemove:
+    def __repr__(self) -> str:
+        ...
+
+    def __str__(self) -> builtins.str:
+        ...
+
+
+class NoReturnSpecified:
+    def __str__(self):
+        ...
+
+    def __repr__(self):
+        ...
+
+
+class NonMatchingArgs:
+    def __str__(self, *, extra) -> builtins.str:
+        ...
+
+    def __repr__(self, /, extra) -> str:
+        ...
+
+
+class MatchingArgsButAbstract:
+    @abstractmethod
+    def __str__(self) -> builtins.str:
+        ...
+
+    @abstractmethod
+    def __repr__(self) -> str:
+        ...
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI029.pyi b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI029.pyi
new file mode 100644
index 0000000000000..a082a733a2267
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI029.pyi
@@ -0,0 +1,28 @@
+import builtins
+from abc import abstractmethod
+
+def __repr__(self) -> str: ...
+def __str__(self) -> builtins.str: ...
+def __repr__(self, /, foo) -> str: ...
+def __repr__(self, *, foo) -> str: ...
+
+class ShouldRemoveSingle:
+    def __str__(self) -> builtins.str: ...  # Error: PYI029
+
+class ShouldRemove:
+    def __repr__(self) -> str: ...  # Error: PYI029
+    def __str__(self) -> builtins.str: ...  # Error: PYI029
+
+class NoReturnSpecified:
+    def __str__(self): ...
+    def __repr__(self): ...
+
+class NonMatchingArgs:
+    def __str__(self, *, extra) -> builtins.str: ...
+    def __repr__(self, /, extra) -> str: ...
+
+class MatchingArgsButAbstract:
+    @abstractmethod
+    def __str__(self) -> builtins.str: ...
+    @abstractmethod
+    def __repr__(self) -> str: ...
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI032.py b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI032.py
new file mode 100644
index 0000000000000..2d226ebe975f8
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI032.py
@@ -0,0 +1,24 @@
+from typing import Any
+import typing
+
+
+class Bad:
+    def __eq__(self, other: Any) -> bool: ...  # Fine because not a stub file
+    def __ne__(self, other: typing.Any) -> typing.Any: ...  # Fine because not a stub file
+
+
+class Good:
+  def __eq__(self, other: object) -> bool: ...
+
+  def __ne__(self, obj: object) -> int: ...
+
+
+class WeirdButFine:
+    def __eq__(self, other: Any, strange_extra_arg: list[str]) -> Any: ...
+    def __ne__(self, *, kw_only_other: Any) -> bool: ...
+
+
+class Unannotated:
+  def __eq__(self) -> Any: ...
+  def __ne__(self) -> bool: ...
+
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI032.pyi b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI032.pyi
new file mode 100644
index 0000000000000..82cb899e3b323
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI032.pyi
@@ -0,0 +1,24 @@
+from typing import Any
+import typing
+
+
+class Bad:
+    def __eq__(self, other: Any) -> bool: ...  # Y032
+    def __ne__(self, other: typing.Any) -> typing.Any: ...  # Y032
+
+
+class Good:
+  def __eq__(self, other: object) -> bool: ...
+
+  def __ne__(self, obj: object) -> int: ...
+
+
+class WeirdButFine:
+    def __eq__(self, other: Any, strange_extra_arg: list[str]) -> Any: ...
+    def __ne__(self, *, kw_only_other: Any) -> bool: ...
+
+
+class Unannotated:
+  def __eq__(self) -> Any: ...
+  def __ne__(self) -> bool: ...
+
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI034.py b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI034.py
new file mode 100644
index 0000000000000..850bd057ddd39
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI034.py
@@ -0,0 +1,280 @@
+# flags: --extend-ignore=Y023
+
+import abc
+import builtins
+import collections.abc
+import typing
+from abc import abstractmethod
+from collections.abc import AsyncIterable, AsyncIterator, Iterable, Iterator
+from typing import Any, overload
+
+import typing_extensions
+from _typeshed import Self
+from typing_extensions import final
+
+
+class Bad(
+    object
+):  # Y040 Do not inherit from "object" explicitly, as it is redundant in Python 3
+    def __new__(cls, *args: Any, **kwargs: Any) -> Bad:
+        ...  # Y034 "__new__" methods usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__new__", e.g. "def __new__(cls, *args: Any, **kwargs: Any) -> Self: ..."
+
+    def __repr__(self) -> str:
+        ...  # Y029 Defining __repr__ or __str__ in a stub is almost always redundant
+
+    def __str__(self) -> builtins.str:
+        ...  # Y029 Defining __repr__ or __str__ in a stub is almost always redundant
+
+    def __eq__(self, other: Any) -> bool:
+        ...  # Y032 Prefer "object" to "Any" for the second parameter in "__eq__" methods
+
+    def __ne__(self, other: typing.Any) -> typing.Any:
+        ...  # Y032 Prefer "object" to "Any" for the second parameter in "__ne__" methods
+
+    def __enter__(self) -> Bad:
+        ...  # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__enter__", e.g. "def __enter__(self) -> Self: ..."
+
+    async def __aenter__(self) -> Bad:
+        ...  # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__aenter__", e.g. "async def __aenter__(self) -> Self: ..."
+
+    def __iadd__(self, other: Bad) -> Bad:
+        ...  # Y034 "__iadd__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__iadd__", e.g. "def __iadd__(self, other: Bad) -> Self: ..."
+
+
+class AlsoBad(int, builtins.object):
+    ...  # Y040 Do not inherit from "object" explicitly, as it is redundant in Python 3
+
+
+class Good:
+    def __new__(cls: type[Self], *args: Any, **kwargs: Any) -> Self:
+        ...
+
+    @abstractmethod
+    def __str__(self) -> str:
+        ...
+
+    @abc.abstractmethod
+    def __repr__(self) -> str:
+        ...
+
+    def __eq__(self, other: object) -> bool:
+        ...
+
+    def __ne__(self, obj: object) -> int:
+        ...
+
+    def __enter__(self: Self) -> Self:
+        ...
+
+    async def __aenter__(self: Self) -> Self:
+        ...
+
+    def __ior__(self: Self, other: Self) -> Self:
+        ...
+
+
+class Fine:
+    @overload
+    def __new__(cls, foo: int) -> FineSubclass:
+        ...
+
+    @overload
+    def __new__(cls, *args: Any, **kwargs: Any) -> Fine:
+        ...
+
+    @abc.abstractmethod
+    def __str__(self) -> str:
+        ...
+
+    @abc.abstractmethod
+    def __repr__(self) -> str:
+        ...
+
+    def __eq__(self, other: Any, strange_extra_arg: list[str]) -> Any:
+        ...
+
+    def __ne__(self, *, kw_only_other: Any) -> bool:
+        ...
+
+    def __enter__(self) -> None:
+        ...
+
+    async def __aenter__(self) -> bool:
+        ...
+
+
+class FineSubclass(Fine):
+    ...
+
+
+class StrangeButAcceptable(str):
+    @typing_extensions.overload
+    def __new__(cls, foo: int) -> StrangeButAcceptableSubclass:
+        ...
+
+    @typing_extensions.overload
+    def __new__(cls, *args: Any, **kwargs: Any) -> StrangeButAcceptable:
+        ...
+
+    def __str__(self) -> StrangeButAcceptable:
+        ...
+
+    def __repr__(self) -> StrangeButAcceptable:
+        ...
+
+
+class StrangeButAcceptableSubclass(StrangeButAcceptable):
+    ...
+
+
+class FineAndDandy:
+    def __str__(self, weird_extra_arg) -> str:
+        ...
+
+    def __repr__(self, weird_extra_arg_with_default=...) -> str:
+        ...
+
+
+@final
+class WillNotBeSubclassed:
+    def __new__(cls, *args: Any, **kwargs: Any) -> WillNotBeSubclassed:
+        ...
+
+    def __enter__(self) -> WillNotBeSubclassed:
+        ...
+
+    async def __aenter__(self) -> WillNotBeSubclassed:
+        ...
+
+
+# we don't emit an error for these; out of scope for a linter
+class InvalidButPluginDoesNotCrash:
+    def __new__() -> InvalidButPluginDoesNotCrash:
+        ...
+
+    def __enter__() -> InvalidButPluginDoesNotCrash:
+        ...
+
+    async def __aenter__() -> InvalidButPluginDoesNotCrash:
+        ...
+
+
+class BadIterator1(Iterator[int]):
+    def __iter__(self) -> Iterator[int]:
+        ...  # Y034 "__iter__" methods in classes like "BadIterator1" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator1.__iter__", e.g. "def __iter__(self) -> Self: ..."
+
+
+class BadIterator2(
+    typing.Iterator[int]
+):  # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax)
+    def __iter__(self) -> Iterator[int]:
+        ...  # Y034 "__iter__" methods in classes like "BadIterator2" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator2.__iter__", e.g. "def __iter__(self) -> Self: ..."
+
+
+class BadIterator3(
+    typing.Iterator[int]
+):  # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax)
+    def __iter__(self) -> collections.abc.Iterator[int]:
+        ...  # Y034 "__iter__" methods in classes like "BadIterator3" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator3.__iter__", e.g. "def __iter__(self) -> Self: ..."
+
+
+class BadIterator4(Iterator[int]):
+    # Note: *Iterable*, not *Iterator*, returned!
+    def __iter__(self) -> Iterable[int]:
+        ...  # Y034 "__iter__" methods in classes like "BadIterator4" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator4.__iter__", e.g. "def __iter__(self) -> Self: ..."
+
+
+class IteratorReturningIterable:
+    def __iter__(self) -> Iterable[str]:
+        ...  # Y045 "__iter__" methods should return an Iterator, not an Iterable
+
+
+class BadAsyncIterator(collections.abc.AsyncIterator[str]):
+    def __aiter__(self) -> typing.AsyncIterator[str]:
+        ...  # Y034 "__aiter__" methods in classes like "BadAsyncIterator" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadAsyncIterator.__aiter__", e.g. "def __aiter__(self) -> Self: ..."  # Y022 Use "collections.abc.AsyncIterator[T]" instead of "typing.AsyncIterator[T]" (PEP 585 syntax)
+
+
+class AsyncIteratorReturningAsyncIterable:
+    def __aiter__(self) -> AsyncIterable[str]:
+        ...  # Y045 "__aiter__" methods should return an AsyncIterator, not an AsyncIterable
+
+
+class Abstract(Iterator[str]):
+    @abstractmethod
+    def __iter__(self) -> Iterator[str]:
+        ...
+
+    @abstractmethod
+    def __enter__(self) -> Abstract:
+        ...
+
+    @abstractmethod
+    async def __aenter__(self) -> Abstract:
+        ...
+
+
+class GoodIterator(Iterator[str]):
+    def __iter__(self: Self) -> Self:
+        ...
+
+
+class GoodAsyncIterator(AsyncIterator[int]):
+    def __aiter__(self: Self) -> Self:
+        ...
+
+
+class DoesNotInheritFromIterator:
+    def __iter__(self) -> DoesNotInheritFromIterator:
+        ...
+
+
+class Unannotated:
+    def __new__(cls, *args, **kwargs):
+        ...
+
+    def __iter__(self):
+        ...
+
+    def __aiter__(self):
+        ...
+
+    async def __aenter__(self):
+        ...
+
+    def __repr__(self):
+        ...
+
+    def __str__(self):
+        ...
+
+    def __eq__(self):
+        ...
+
+    def __ne__(self):
+        ...
+
+    def __iadd__(self):
+        ...
+
+    def __ior__(self):
+        ...
+
+
+def __repr__(self) -> str:
+    ...
+
+
+def __str__(self) -> str:
+    ...
+
+
+def __eq__(self, other: Any) -> bool:
+    ...
+
+
+def __ne__(self, other: Any) -> bool:
+    ...
+
+
+def __imul__(self, other: Any) -> list[str]:
+    ...
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI034.pyi b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI034.pyi
new file mode 100644
index 0000000000000..800cf14512d9e
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI034.pyi
@@ -0,0 +1,188 @@
+# flags: --extend-ignore=Y023
+
+import abc
+import builtins
+import collections.abc
+import typing
+from abc import abstractmethod
+from collections.abc import AsyncIterable, AsyncIterator, Iterable, Iterator
+from typing import Any, overload
+
+import typing_extensions
+from _typeshed import Self
+from typing_extensions import final
+
+class Bad(
+    object
+):  # Y040 Do not inherit from "object" explicitly, as it is redundant in Python 3
+    def __new__(
+        cls, *args: Any, **kwargs: Any
+    ) -> Bad: ...  # Y034 "__new__" methods usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__new__", e.g. "def __new__(cls, *args: Any, **kwargs: Any) -> Self: ..."
+    def __repr__(
+        self,
+    ) -> str: ...  # Y029 Defining __repr__ or __str__ in a stub is almost always redundant
+    def __str__(
+        self,
+    ) -> builtins.str: ...  # Y029 Defining __repr__ or __str__ in a stub is almost always redundant
+    def __eq__(
+        self, other: Any
+    ) -> bool: ...  # Y032 Prefer "object" to "Any" for the second parameter in "__eq__" methods
+    def __ne__(
+        self, other: typing.Any
+    ) -> typing.Any: ...  # Y032 Prefer "object" to "Any" for the second parameter in "__ne__" methods
+    def __enter__(
+        self,
+    ) -> Bad: ...  # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__enter__", e.g. "def __enter__(self) -> Self: ..."
+    async def __aenter__(
+        self,
+    ) -> Bad: ...  # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__aenter__", e.g. "async def __aenter__(self) -> Self: ..."
+    def __iadd__(
+        self, other: Bad
+    ) -> Bad: ...  # Y034 "__iadd__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__iadd__", e.g. "def __iadd__(self, other: Bad) -> Self: ..."
+
+class AlsoBad(
+    int, builtins.object
+): ...  # Y040 Do not inherit from "object" explicitly, as it is redundant in Python 3
+
+class Good:
+    def __new__(cls: type[Self], *args: Any, **kwargs: Any) -> Self: ...
+    @abstractmethod
+    def __str__(self) -> str: ...
+    @abc.abstractmethod
+    def __repr__(self) -> str: ...
+    def __eq__(self, other: object) -> bool: ...
+    def __ne__(self, obj: object) -> int: ...
+    def __enter__(self: Self) -> Self: ...
+    async def __aenter__(self: Self) -> Self: ...
+    def __ior__(self: Self, other: Self) -> Self: ...
+
+class Fine:
+    @overload
+    def __new__(cls, foo: int) -> FineSubclass: ...
+    @overload
+    def __new__(cls, *args: Any, **kwargs: Any) -> Fine: ...
+    @abc.abstractmethod
+    def __str__(self) -> str: ...
+    @abc.abstractmethod
+    def __repr__(self) -> str: ...
+    def __eq__(self, other: Any, strange_extra_arg: list[str]) -> Any: ...
+    def __ne__(self, *, kw_only_other: Any) -> bool: ...
+    def __enter__(self) -> None: ...
+    async def __aenter__(self) -> bool: ...
+
+class FineSubclass(Fine): ...
+
+class StrangeButAcceptable(str):
+    @typing_extensions.overload
+    def __new__(cls, foo: int) -> StrangeButAcceptableSubclass: ...
+    @typing_extensions.overload
+    def __new__(cls, *args: Any, **kwargs: Any) -> StrangeButAcceptable: ...
+    def __str__(self) -> StrangeButAcceptable: ...
+    def __repr__(self) -> StrangeButAcceptable: ...
+
+class StrangeButAcceptableSubclass(StrangeButAcceptable): ...
+
+class FineAndDandy:
+    def __str__(self, weird_extra_arg) -> str: ...
+    def __repr__(self, weird_extra_arg_with_default=...) -> str: ...
+
+@final
+class WillNotBeSubclassed:
+    def __new__(cls, *args: Any, **kwargs: Any) -> WillNotBeSubclassed: ...
+    def __enter__(self) -> WillNotBeSubclassed: ...
+    async def __aenter__(self) -> WillNotBeSubclassed: ...
+
+# we don't emit an error for these; out of scope for a linter
+class InvalidButPluginDoesNotCrash:
+    def __new__() -> InvalidButPluginDoesNotCrash: ...
+    def __enter__() -> InvalidButPluginDoesNotCrash: ...
+    async def __aenter__() -> InvalidButPluginDoesNotCrash: ...
+
+class BadIterator1(Iterator[int]):
+    def __iter__(
+        self,
+    ) -> Iterator[
+        int
+    ]: ...  # Y034 "__iter__" methods in classes like "BadIterator1" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator1.__iter__", e.g. "def __iter__(self) -> Self: ..."
+
+class BadIterator2(
+    typing.Iterator[int]
+):  # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax)
+    def __iter__(
+        self,
+    ) -> Iterator[
+        int
+    ]: ...  # Y034 "__iter__" methods in classes like "BadIterator2" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator2.__iter__", e.g. "def __iter__(self) -> Self: ..."
+
+class BadIterator3(
+    typing.Iterator[int]
+):  # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax)
+    def __iter__(
+        self,
+    ) -> collections.abc.Iterator[
+        int
+    ]: ...  # Y034 "__iter__" methods in classes like "BadIterator3" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator3.__iter__", e.g. "def __iter__(self) -> Self: ..."
+
+class BadIterator4(Iterator[int]):
+    # Note: *Iterable*, not *Iterator*, returned!
+    def __iter__(
+        self,
+    ) -> Iterable[
+        int
+    ]: ...  # Y034 "__iter__" methods in classes like "BadIterator4" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator4.__iter__", e.g. "def __iter__(self) -> Self: ..."
+
+class IteratorReturningIterable:
+    def __iter__(
+        self,
+    ) -> Iterable[
+        str
+    ]: ...  # Y045 "__iter__" methods should return an Iterator, not an Iterable
+
+class BadAsyncIterator(collections.abc.AsyncIterator[str]):
+    def __aiter__(
+        self,
+    ) -> typing.AsyncIterator[
+        str
+    ]: ...  # Y034 "__aiter__" methods in classes like "BadAsyncIterator" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadAsyncIterator.__aiter__", e.g. "def __aiter__(self) -> Self: ..."  # Y022 Use "collections.abc.AsyncIterator[T]" instead of "typing.AsyncIterator[T]" (PEP 585 syntax)
+
+class AsyncIteratorReturningAsyncIterable:
+    def __aiter__(
+        self,
+    ) -> AsyncIterable[
+        str
+    ]: ...  # Y045 "__aiter__" methods should return an AsyncIterator, not an AsyncIterable
+
+class Abstract(Iterator[str]):
+    @abstractmethod
+    def __iter__(self) -> Iterator[str]: ...
+    @abstractmethod
+    def __enter__(self) -> Abstract: ...
+    @abstractmethod
+    async def __aenter__(self) -> Abstract: ...
+
+class GoodIterator(Iterator[str]):
+    def __iter__(self: Self) -> Self: ...
+
+class GoodAsyncIterator(AsyncIterator[int]):
+    def __aiter__(self: Self) -> Self: ...
+
+class DoesNotInheritFromIterator:
+    def __iter__(self) -> DoesNotInheritFromIterator: ...
+
+class Unannotated:
+    def __new__(cls, *args, **kwargs): ...
+    def __iter__(self): ...
+    def __aiter__(self): ...
+    async def __aenter__(self): ...
+    def __repr__(self): ...
+    def __str__(self): ...
+    def __eq__(self): ...
+    def __ne__(self): ...
+    def __iadd__(self): ...
+    def __ior__(self): ...
+
+def __repr__(self) -> str: ...
+def __str__(self) -> str: ...
+def __eq__(self, other: Any) -> bool: ...
+def __ne__(self, other: Any) -> bool: ...
+def __imul__(self, other: Any) -> list[str]: ...
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI035.py b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI035.py
new file mode 100644
index 0000000000000..4343b93af6a84
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI035.py
@@ -0,0 +1,15 @@
+__all__: list[str]
+
+__all__: list[str] = ["foo"]
+
+
+class Foo:
+    __all__: list[str]
+    __match_args__: tuple[str, ...]
+    __slots__: tuple[str, ...]
+
+
+class Bar:
+    __all__: list[str] = ["foo"]
+    __match_args__: tuple[str, ...] = (1,)
+    __slots__: tuple[str, ...] = "foo"
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI035.pyi b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI035.pyi
new file mode 100644
index 0000000000000..81dfe26692acf
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI035.pyi
@@ -0,0 +1,13 @@
+__all__: list[str]  # Error: PYI035
+
+__all__: list[str] = ["foo"]
+
+class Foo:
+    __all__: list[str]
+    __match_args__: tuple[str, ...]  # Error: PYI035
+    __slots__: tuple[str, ...]  # Error: PYI035
+
+class Bar:
+    __all__: list[str] = ["foo"]
+    __match_args__: tuple[str, ...] = (1,)
+    __slots__: tuple[str, ...] = "foo"
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI045.py b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI045.py
new file mode 100644
index 0000000000000..3bc27876b22df
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI045.py
@@ -0,0 +1,85 @@
+import collections.abc
+import typing
+from collections.abc import Iterator, Iterable
+
+
+class NoReturn:
+    def __iter__(self):
+        ...
+
+
+class TypingIterableTReturn:
+    def __iter__(self) -> typing.Iterable[int]:
+        ...
+
+    def not_iter(self) -> typing.Iterable[int]:
+        ...
+
+
+class TypingIterableReturn:
+    def __iter__(self) -> typing.Iterable:
+        ...
+
+    def not_iter(self) -> typing.Iterable:
+        ...
+
+
+class CollectionsIterableTReturn:
+    def __iter__(self) -> collections.abc.Iterable[int]:
+        ...
+
+    def not_iter(self) -> collections.abc.Iterable[int]:
+        ...
+
+
+class CollectionsIterableReturn:
+    def __iter__(self) -> collections.abc.Iterable:
+        ...
+
+    def not_iter(self) -> collections.abc.Iterable:
+        ...
+
+
+class IterableReturn:
+    def __iter__(self) -> Iterable:
+        ...
+
+
+class IteratorReturn:
+    def __iter__(self) -> Iterator:
+        ...
+
+
+class IteratorTReturn:
+    def __iter__(self) -> Iterator[int]:
+        ...
+
+
+class TypingIteratorReturn:
+    def __iter__(self) -> typing.Iterator:
+        ...
+
+
+class TypingIteratorTReturn:
+    def __iter__(self) -> typing.Iterator[int]:
+        ...
+
+
+class CollectionsIteratorReturn:
+    def __iter__(self) -> collections.abc.Iterator:
+        ...
+
+
+class CollectionsIteratorTReturn:
+    def __iter__(self) -> collections.abc.Iterator[int]:
+        ...
+
+
+class TypingAsyncIterableTReturn:
+    def __aiter__(self) -> typing.AsyncIterable[int]:
+        ...
+
+
+class TypingAsyncIterableReturn:
+    def __aiter__(self) -> typing.AsyncIterable:
+        ...
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI045.pyi b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI045.pyi
new file mode 100644
index 0000000000000..a7141baa18518
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI045.pyi
@@ -0,0 +1,49 @@
+import collections.abc
+import typing
+from collections.abc import Iterator, Iterable
+
+class NoReturn:
+    def __iter__(self): ...
+
+class TypingIterableTReturn:
+    def __iter__(self) -> typing.Iterable[int]: ...  # Error: PYI045
+    def not_iter(self) -> typing.Iterable[int]: ...
+
+class TypingIterableReturn:
+    def __iter__(self) -> typing.Iterable: ...  # Error: PYI045
+    def not_iter(self) -> typing.Iterable: ...
+
+class CollectionsIterableTReturn:
+    def __iter__(self) -> collections.abc.Iterable[int]: ...  # Error: PYI045
+    def not_iter(self) -> collections.abc.Iterable[int]: ...
+
+class CollectionsIterableReturn:
+    def __iter__(self) -> collections.abc.Iterable: ...  # Error: PYI045
+    def not_iter(self) -> collections.abc.Iterable: ...
+
+class IterableReturn:
+    def __iter__(self) -> Iterable: ...  # Error: PYI045
+
+class IteratorReturn:
+    def __iter__(self) -> Iterator: ...
+
+class IteratorTReturn:
+    def __iter__(self) -> Iterator[int]: ...
+
+class TypingIteratorReturn:
+    def __iter__(self) -> typing.Iterator: ...
+
+class TypingIteratorTReturn:
+    def __iter__(self) -> typing.Iterator[int]: ...
+
+class CollectionsIteratorReturn:
+    def __iter__(self) -> collections.abc.Iterator: ...
+
+class CollectionsIteratorTReturn:
+    def __iter__(self) -> collections.abc.Iterator[int]: ...
+
+class TypingAsyncIterableTReturn:
+    def __aiter__(self) -> typing.AsyncIterable[int]: ...  # Error: PYI045
+
+class TypingAsyncIterableReturn:
+    def __aiter__(self) -> typing.AsyncIterable: ...  # Error: PYI045
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI048.py b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI048.py
new file mode 100644
index 0000000000000..8ec21f2d31c1d
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI048.py
@@ -0,0 +1,19 @@
+def bar():    # OK
+    ...
+
+
+def oof():    # OK, docstrings are handled by another rule
+    """oof"""
+    print("foo")
+
+
+def foo():    # Ok not in Stub file
+    """foo"""
+    print("foo")
+    print("foo")
+
+
+def buzz():    # Ok not in Stub file
+    print("fizz")
+    print("buzz")
+    print("test")
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI048.pyi b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI048.pyi
new file mode 100644
index 0000000000000..29a2120f94359
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI048.pyi
@@ -0,0 +1,20 @@
+def bar():
+    ...  # OK
+
+
+def oof():   # OK, docstrings are handled by another rule
+  """oof"""
+  print("foo")
+
+
+
+def foo():   # ERROR PYI048
+    """foo"""
+    print("foo")
+    print("foo")
+
+
+def buzz():   # ERROR PYI048
+    print("fizz")
+    print("buzz")
+    print("test")
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI050.py b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI050.py
new file mode 100644
index 0000000000000..042fe887ec36d
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI050.py
@@ -0,0 +1,32 @@
+from typing import NoReturn, Never
+import typing_extensions
+
+
+def foo(arg):
+    ...
+
+
+def foo_int(arg: int):
+    ...
+
+
+def foo_no_return(arg: NoReturn):
+    ...
+
+
+def foo_no_return_typing_extensions(
+    arg: typing_extensions.NoReturn,
+):
+    ...
+
+
+def foo_no_return_kwarg(arg: int, *, arg2: NoReturn):
+    ...
+
+
+def foo_no_return_pos_only(arg: int, /, arg2: NoReturn):
+    ...
+
+
+def foo_never(arg: Never):
+    ...
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI050.pyi b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI050.pyi
new file mode 100644
index 0000000000000..4720ee7756b6a
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI050.pyi
@@ -0,0 +1,12 @@
+from typing import NoReturn, Never
+import typing_extensions
+
+def foo(arg): ...
+def foo_int(arg: int): ...
+def foo_no_return(arg: NoReturn): ...  # Error: PYI050
+def foo_no_return_typing_extensions(
+    arg: typing_extensions.NoReturn,
+): ...  # Error: PYI050
+def foo_no_return_kwarg(arg: int, *, arg2: NoReturn): ...  # Error: PYI050
+def foo_no_return_pos_only(arg: int, /, arg2: NoReturn): ...  # Error: PYI050
+def foo_never(arg: Never): ...
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI052.py b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI052.py
new file mode 100644
index 0000000000000..37a4f4d8671c5
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI052.py
@@ -0,0 +1,93 @@
+import builtins
+import typing
+from typing import TypeAlias, Final
+
+field1: int
+field2: int = ...
+field3 = ...  # type: int  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
+field4: int = 0
+field41: int = 0xFFFFFFFF
+field42: int = 1234567890
+field43: int = -0xFFFFFFFF
+field44: int = -1234567890
+field5 = 0  # type: int  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")  # Y052 Need type annotation for "field5"
+field6 = 0  # Y052 Need type annotation for "field6"
+field7 = b""  # Y052 Need type annotation for "field7"
+field71 = "foo"  # Y052 Need type annotation for "field71"
+field72: str = "foo"
+field8 = False  # Y052 Need type annotation for "field8"
+field81 = -1  # Y052 Need type annotation for "field81"
+field82: float = -98.43
+field83 = -42j  # Y052 Need type annotation for "field83"
+field84 = 5 + 42j  # Y052 Need type annotation for "field84"
+field85 = -5 - 42j  # Y052 Need type annotation for "field85"
+field9 = None  # Y026 Use typing_extensions.TypeAlias for type aliases, e.g. "field9: TypeAlias = None"
+Field95: TypeAlias = None
+Field96: TypeAlias = int | None
+Field97: TypeAlias = None | typing.SupportsInt | builtins.str | float | bool
+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"
+field201: tuple[int, ...] = (1, 2, 3)
+field21 = {1, 2, 3}  # Y052 Need type annotation for "field21"
+field211: set[int] = {1, 2, 3}
+field212 = {"foo": "bar"}  # Y052 Need type annotation for "field212"
+field213: dict[str, str] = {"foo": "bar"}
+field22: Final = {"foo": 5}
+field221: list[int] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]  # Y015 Only simple default values are allowed for assignments
+field223: list[int] = [*range(10)]  # Y015 Only simple default values are allowed for assignments
+field224: list[int] = list(range(10))  # Y015 Only simple default values are allowed for assignments
+field225: list[object] = [{}, 1, 2]  # Y015 Only simple default values are allowed for assignments
+field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar"))  # Y015 Only simple default values are allowed for assignments
+field227: dict[str, object] = {"foo": {"foo": "bar"}}  # Y015 Only simple default values are allowed for assignments
+field228: dict[str, list[object]] = {"foo": []}  # Y015 Only simple default values are allowed for assignments
+# When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node
+field229: dict[int, int] = {1: 2, **{3: 4}}  # Y015 Only simple default values are allowed for assignments
+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
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI052.pyi b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI052.pyi
new file mode 100644
index 0000000000000..860ee255fb9b8
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI052.pyi
@@ -0,0 +1,100 @@
+import builtins
+import typing
+from typing import TypeAlias, Final, NewType, TypeVar, TypeVarTuple, ParamSpec
+
+# We shouldn't emit Y015 for simple default values
+field1: int
+field2: int = ...
+field3 = ...  # type: int  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
+field4: int = 0
+field41: int = 0xFFFFFFFF
+field42: int = 1234567890
+field43: int = -0xFFFFFFFF
+field44: int = -1234567890
+field5 = 0  # type: int  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")  # Y052 Need type annotation for "field5"
+field6 = 0  # Y052 Need type annotation for "field6"
+field7 = b""  # Y052 Need type annotation for "field7"
+field71 = "foo"  # Y052 Need type annotation for "field71"
+field72: str = "foo"
+field8 = False  # Y052 Need type annotation for "field8"
+field81 = -1  # Y052 Need type annotation for "field81"
+field82: float = -98.43
+field83 = -42j  # Y052 Need type annotation for "field83"
+field84 = 5 + 42j  # Y052 Need type annotation for "field84"
+field85 = -5 - 42j  # Y052 Need type annotation for "field85"
+field9 = None  # Y026 Use typing_extensions.TypeAlias for type aliases, e.g. "field9: TypeAlias = None"
+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"
+field201: tuple[int, ...] = (1, 2, 3)
+field21 = {1, 2, 3}  # Y052 Need type annotation for "field21"
+field211: set[int] = {1, 2, 3}
+field212 = {"foo": "bar"}  # Y052 Need type annotation for "field212"
+field213: dict[str, str] = {"foo": "bar"}
+field22: Final = {"foo": 5}
+
+# We *should* emit Y015 for more complex default values
+field221: list[int] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]  # Y015 Only simple default values are allowed for assignments
+field223: list[int] = [*range(10)]  # Y015 Only simple default values are allowed for assignments
+field224: list[int] = list(range(10))  # Y015 Only simple default values are allowed for assignments
+field225: list[object] = [{}, 1, 2]  # Y015 Only simple default values are allowed for assignments
+field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar"))  # Y015 Only simple default values are allowed for assignments
+field227: dict[str, object] = {"foo": {"foo": "bar"}}  # Y015 Only simple default values are allowed for assignments
+field228: dict[str, list[object]] = {"foo": []}  # Y015 Only simple default values are allowed for assignments
+# When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node
+field229: dict[int, int] = {1: 2, **{3: 4}}  # Y015 Only simple default values are allowed for assignments
+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
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI053.py b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI053.py
new file mode 100644
index 0000000000000..15631d15f2acd
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI053.py
@@ -0,0 +1,38 @@
+def f1(x: str = "50 character stringggggggggggggggggggggggggggggggg") -> None:
+    ...
+
+
+def f2(x: str = "51 character stringgggggggggggggggggggggggggggggggg") -> None:
+    ...
+
+
+def f3(x: str = "50 character stringggggggggggggggggggggggggggggg\U0001f600") -> None:
+    ...
+
+
+def f4(x: str = "51 character stringgggggggggggggggggggggggggggggg\U0001f600") -> None:
+    ...
+
+
+def f5(x: bytes = b"50 character byte stringgggggggggggggggggggggggggg") -> None:
+    ...
+
+
+def f6(x: bytes = b"51 character byte stringgggggggggggggggggggggggggg") -> None:
+    ...
+
+
+def f7(x: bytes = b"50 character byte stringggggggggggggggggggggggggg\xff") -> None:
+    ...
+
+
+def f8(x: bytes = b"50 character byte stringgggggggggggggggggggggggggg\xff") -> None:
+    ...
+
+
+foo: str = "50 character stringggggggggggggggggggggggggggggggg"
+bar: str = "51 character stringgggggggggggggggggggggggggggggggg"
+
+baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg"
+
+qux: bytes = b"51 character byte stringggggggggggggggggggggggggggg\xff"
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI053.pyi b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI053.pyi
new file mode 100644
index 0000000000000..d2f55531a2660
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI053.pyi
@@ -0,0 +1,30 @@
+def f1(x: str = "50 character stringggggggggggggggggggggggggggggggg") -> None: ...  # OK
+def f2(
+    x: str = "51 character stringgggggggggggggggggggggggggggggggg",  # Error: PYI053
+) -> None: ...
+def f3(
+    x: str = "50 character stringgggggggggggggggggggggggggggggg\U0001f600",  # OK
+) -> None: ...
+def f4(
+    x: str = "51 character stringggggggggggggggggggggggggggggggg\U0001f600",  # Error: PYI053
+) -> None: ...
+def f5(
+    x: bytes = b"50 character byte stringgggggggggggggggggggggggggg",  # OK
+) -> None: ...
+def f6(
+    x: bytes = b"51 character byte stringgggggggggggggggggggggggggg",  # Error: PYI053
+) -> None: ...
+def f7(
+    x: bytes = b"50 character byte stringggggggggggggggggggggggggg\xff",  # OK
+) -> None: ...
+def f8(
+    x: bytes = b"51 character byte stringgggggggggggggggggggggggggg\xff",  # Error: PYI053
+) -> None: ...
+
+foo: str = "50 character stringggggggggggggggggggggggggggggggg"  # OK
+
+bar: str = "51 character stringgggggggggggggggggggggggggggggggg"  # Error: PYI053
+
+baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg"  # OK
+
+qux: bytes = b"51 character byte stringggggggggggggggggggggggggggg\xff"  # Error: PYI053
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI054.py b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI054.py
new file mode 100644
index 0000000000000..9ea9eec654165
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI054.py
@@ -0,0 +1,20 @@
+field01: int = 0xFFFFFFFF
+field02: int = 0xFFFFFFFFF
+field03: int = -0xFFFFFFFF
+field04: int = -0xFFFFFFFFF
+
+field05: int = 1234567890
+field06: int = 12_456_890
+field07: int = 12345678901
+field08: int = -1234567801
+field09: int = -234_567_890
+
+field10: float = 123.456789
+field11: float = 123.4567890
+field12: float = -123.456789
+field13: float = -123.567_890
+
+field14: complex = 1e1234567j
+field15: complex = 1e12345678j
+field16: complex = -1e1234567j
+field17: complex = 1e123456789j
diff --git a/crates/ruff/resources/test/fixtures/flake8_pyi/PYI054.pyi b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI054.pyi
new file mode 100644
index 0000000000000..73c9a37347761
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_pyi/PYI054.pyi
@@ -0,0 +1,20 @@
+field01: int = 0xFFFFFFFF
+field02: int = 0xFFFFFFFFF  # Error: PYI054
+field03: int = -0xFFFFFFFF
+field04: int = -0xFFFFFFFFF  # Error: PYI054
+
+field05: int = 1234567890
+field06: int = 12_456_890
+field07: int = 12345678901  # Error: PYI054
+field08: int = -1234567801
+field09: int = -234_567_890  # Error: PYI054
+
+field10: float = 123.456789
+field11: float = 123.4567890  # Error: PYI054
+field12: float = -123.456789
+field13: float = -123.567_890  # Error: PYI054
+
+field14: complex = 1e1234567j
+field15: complex = 1e12345678j  # Error: PYI054
+field16: complex = -1e1234567j
+field17: complex = 1e123456789j  # Error: PYI054
diff --git a/crates/ruff/resources/test/fixtures/flake8_pytest_style/PT018.py b/crates/ruff/resources/test/fixtures/flake8_pytest_style/PT018.py
index f9261b8620960..9bc5fbe877561 100644
--- a/crates/ruff/resources/test/fixtures/flake8_pytest_style/PT018.py
+++ b/crates/ruff/resources/test/fixtures/flake8_pytest_style/PT018.py
@@ -39,3 +39,8 @@ def test_error():
 message
 """
     )
+
+
+assert something  # OK
+assert something and something_else  # Error
+assert something and something_else and something_third  # Error
diff --git a/crates/ruff/resources/test/fixtures/flake8_return/RET504.py b/crates/ruff/resources/test/fixtures/flake8_return/RET504.py
index 96bc755687e32..80b92b3193cf3 100644
--- a/crates/ruff/resources/test/fixtures/flake8_return/RET504.py
+++ b/crates/ruff/resources/test/fixtures/flake8_return/RET504.py
@@ -272,3 +272,34 @@ def str_to_bool(val):
     if isinstance(val, bool):
         return some_obj
     return val
+
+
+# Mixed assignments
+def function_assignment(x):
+    def f(): ...
+
+    return f
+
+
+def class_assignment(x):
+    class Foo: ...
+
+    return Foo
+
+
+def mixed_function_assignment(x):
+    if x:
+        def f(): ...
+    else:
+        f = 42
+
+    return f
+
+
+def mixed_class_assignment(x):
+    if x:
+        class Foo: ...
+    else:
+        Foo = 42
+
+    return Foo
diff --git a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM102.py b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM102.py
index c1a9c03cf1053..3b47a3e33505f 100644
--- a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM102.py
+++ b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM102.py
@@ -86,9 +86,16 @@
         ):
             print("Bad module!")
 
-# SIM102
-if node.module:
-    if node.module == "multiprocessing" or node.module.startswith(
+# SIM102 (auto-fixable)
+if node.module012345678:
+    if node.module == "multiprocß9💣2ℝ" or node.module.startswith(
+        "multiprocessing."
+    ):
+        print("Bad module!")
+
+# SIM102 (not auto-fixable)
+if node.module0123456789:
+    if node.module == "multiprocß9💣2ℝ" or node.module.startswith(
         "multiprocessing."
     ):
         print("Bad module!")
diff --git a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM105.py b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM105_0.py
similarity index 66%
rename from crates/ruff/resources/test/fixtures/flake8_simplify/SIM105.py
rename to crates/ruff/resources/test/fixtures/flake8_simplify/SIM105_0.py
index d54cf3f9c72ab..8b19fef6f8866 100644
--- a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM105.py
+++ b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM105_0.py
@@ -1,73 +1,96 @@
 def foo():
     pass
 
+
+# SIM105
 try:
     foo()
-except ValueError:  # SIM105
+except ValueError:
     pass
 
+# SIM105
 try:
     foo()
-except (ValueError, OSError):  # SIM105
+except (ValueError, OSError):
     pass
 
+# SIM105
 try:
     foo()
-except:  # SIM105
+except:
     pass
 
+# SIM105
 try:
     foo()
-except (a.Error, b.Error):  # SIM105
+except (a.Error, b.Error):
     pass
 
+# OK
 try:
     foo()
 except ValueError:
-    print('foo')
+    print("foo")
 except OSError:
     pass
 
+# OK
 try:
     foo()
 except ValueError:
     pass
 else:
-    print('bar')
+    print("bar")
 
+# OK
 try:
     foo()
 except ValueError:
     pass
 finally:
-    print('bar')
+    print("bar")
 
+# OK
 try:
     foo()
     foo()
 except ValueError:
     pass
 
+# OK
 try:
     for i in range(3):
         foo()
 except ValueError:
     pass
 
+
 def bar():
+    # OK
     try:
         return foo()
     except ValueError:
         pass
 
+
 def with_ellipsis():
+    # OK
     try:
         foo()
     except ValueError:
         ...
 
+
 def with_ellipsis_and_return():
+    # OK
     try:
         return foo()
     except ValueError:
         ...
+
+
+def with_comment():
+    try:
+        foo()
+    except (ValueError, OSError):
+        pass  # Trailing comment.
diff --git a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM105_1.py b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM105_1.py
index 4cd40b5af6e73..adb719760188d 100644
--- a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM105_1.py
+++ b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM105_1.py
@@ -1,7 +1,8 @@
 """Case: There's a random import, so it should add `contextlib` after it."""
 import math
 
+# SIM105
 try:
     math.sqrt(-1)
-except ValueError:  # SIM105
+except ValueError:
     pass
diff --git a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM105_2.py b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM105_2.py
index 66a9ba35c05da..625ca2161b0c0 100644
--- a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM105_2.py
+++ b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM105_2.py
@@ -6,6 +6,7 @@ def foo():
     pass
 
 
+# SIM105
 try:
     foo()
 except ValueError:
diff --git a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM105_3.py b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM105_3.py
new file mode 100644
index 0000000000000..d630bcdd7a6c7
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM105_3.py
@@ -0,0 +1,16 @@
+"""Case: `contextlib` is imported after the call site."""
+
+
+def foo():
+    pass
+
+
+def bar():
+    # SIM105
+    try:
+        foo()
+    except ValueError:
+        pass
+
+
+import contextlib
diff --git a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM108.py b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM108.py
index ab43e3f2b1d48..94b14f911a52a 100644
--- a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM108.py
+++ b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM108.py
@@ -80,17 +80,25 @@
 
 # SIM108
 if a:
-    b = cccccccccccccccccccccccccccccccccccc
+    b = "cccccccccccccccccccccccccccccccccß"
 else:
-    b = ddddddddddddddddddddddddddddddddddddd
+    b = "ddddddddddddddddddddddddddddddddd💣"
 
 
 # OK (too long)
 if True:
     if a:
-        b = cccccccccccccccccccccccccccccccccccc
+        b = ccccccccccccccccccccccccccccccccccc
     else:
-        b = ddddddddddddddddddddddddddddddddddddd
+        b = ddddddddddddddddddddddddddddddddddd
+
+
+# OK (too long with tabs)
+if True:
+	if a:
+		b = ccccccccccccccccccccccccccccccccccc
+	else:
+		b = ddddddddddddddddddddddddddddddddddd
 
 
 # SIM108 (without fix due to trailing comment)
diff --git a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM110.py b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM110.py
index 30ce25bb0e550..b02ac7c28cb99 100644
--- a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM110.py
+++ b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM110.py
@@ -155,3 +155,19 @@ def f():
         if check(x):
             return False
     return True
+
+
+def f():
+    # SIM110
+    for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ":
+        if x.isdigit():
+            return True
+    return False
+
+
+def f():
+    # OK (too long)
+    for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9":
+        if x.isdigit():
+            return True
+    return False
diff --git a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM111.py b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM111.py
index f0afb793d4ca6..d6908461fcd8d 100644
--- a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM111.py
+++ b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM111.py
@@ -171,3 +171,19 @@ def f():
         if x > y:
             return False
     return True
+
+
+def f():
+    # SIM111
+    for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9":
+        if x.isdigit():
+            return False
+    return True
+
+
+def f():
+    # OK (too long)
+    for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß90":
+        if x.isdigit():
+            return False
+    return True
diff --git a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM117.py b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM117.py
index 34dd47e361ae2..3c99535e43088 100644
--- a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM117.py
+++ b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM117.py
@@ -90,3 +90,13 @@
         D() as d,
     ):
         print("hello")
+
+# SIM117 (auto-fixable)
+with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as a:
+    with B("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as b:
+        print("hello")
+
+# SIM117 (not auto-fixable too long)
+with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ890") as a:
+    with B("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as b:
+        print("hello")
\ No newline at end of file
diff --git a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM208.py b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM208.py
index 1a23f70773a01..5ad2dd6f820ba 100644
--- a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM208.py
+++ b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM208.py
@@ -12,3 +12,10 @@
 
 if not a != b:  # OK
     pass
+
+a = not not b  # SIM208
+
+f(not not a)  # SIM208
+
+if 1 + (not (not a)):  # SIM208
+    pass
diff --git a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM210.py b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM210.py
index dafe5e24dab9b..9def63a549c95 100644
--- a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM210.py
+++ b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM210.py
@@ -6,6 +6,7 @@
 
 a = False if b else True  # OK
 
+
 def f():
     # OK
     def bool():
diff --git a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM401.py b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM401.py
index 0ef88effb7aa7..487f15a5f71e9 100644
--- a/crates/ruff/resources/test/fixtures/flake8_simplify/SIM401.py
+++ b/crates/ruff/resources/test/fixtures/flake8_simplify/SIM401.py
@@ -14,7 +14,7 @@
 else:
     var = a_dict[key]
 
-# SIM401 (default with a complex expression)
+# OK (default contains effect)
 if key in a_dict:
     var = a_dict[key]
 else:
@@ -36,12 +36,18 @@
 if key in a_dict:
     vars[idx] = a_dict[key]
 else:
-    vars[idx] = "default"
+    vars[idx] = "defaultß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789"
 
 ###
 # Negative cases
 ###
 
+# OK (too long)
+if key in a_dict:
+    vars[idx] = a_dict[key]
+else:
+    vars[idx] = "defaultß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß"
+
 # OK (false negative)
 if not key in a_dict:
     var = "default"
diff --git a/crates/ruff/resources/test/fixtures/flake8_todos/TD001.py b/crates/ruff/resources/test/fixtures/flake8_todos/TD001.py
new file mode 100644
index 0000000000000..77ff4ae70d081
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_todos/TD001.py
@@ -0,0 +1,9 @@
+# T001 - accepted
+# TODO (evanrittenhouse): this is a valid TODO
+# SOME_OTHER_TAG: this is impossible to determine
+# this is not a TODO
+
+# T001 - errors
+# XXX (evanrittenhouse): this is not fine
+# FIXME (evanrittenhouse): this is not fine
+# foo # XXX: this isn't fine either
diff --git a/crates/ruff/resources/test/fixtures/flake8_todos/TD002.py b/crates/ruff/resources/test/fixtures/flake8_todos/TD002.py
new file mode 100644
index 0000000000000..3c4867516f783
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_todos/TD002.py
@@ -0,0 +1,8 @@
+# T002 - accepted
+# TODO (evanrittenhouse): this has an author
+# TODO(evanrittenhouse): this also has an author
+# T002 - errors
+# TODO: this has no author
+# FIXME: neither does this
+# TODO : and neither does this
+# foo # TODO: this doesn't either
diff --git a/crates/ruff/resources/test/fixtures/flake8_todos/TD003.py b/crates/ruff/resources/test/fixtures/flake8_todos/TD003.py
new file mode 100644
index 0000000000000..f203bfe4f6605
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_todos/TD003.py
@@ -0,0 +1,31 @@
+# TDO003 - accepted
+# TODO: this comment has a link
+# https://github.com/charliermarsh/ruff/issues/3870
+
+# TODO: this comment has an issue
+# TDO-3870
+
+# TDO003 - errors
+# TODO: this comment has no
+# link after it
+
+# TODO: here's a TODO with no link after it
+def foo(x):
+    return x
+
+# TODO: here's a TODO on the last line with no link
+# Here's more content.
+# TDO-3870
+
+# TODO: here's a TODO on the last line with no link
+# Here's more content, with a space.
+
+# TDO-3870
+
+# TODO: here's a TODO without an issue link
+# TODO: followed by a new TODO with an issue link
+# TDO-3870
+
+# foo # TODO: no link!
+
+# TODO: here's a TODO on the last line with no link
diff --git a/crates/ruff/resources/test/fixtures/flake8_todos/TD004.py b/crates/ruff/resources/test/fixtures/flake8_todos/TD004.py
new file mode 100644
index 0000000000000..9fa5d9c50a105
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_todos/TD004.py
@@ -0,0 +1,8 @@
+# T004 - accepted
+# TODO(evanrittenhouse): this has a colon
+# T004 - errors
+# TODO this has no colon
+# TODO(evanrittenhouse 😀) this has no colon
+# FIXME add a colon
+# foo # TODO add a colon
+# TODO this has a colon but it doesn't terminate the tag, so this should throw. https://www.google.com
diff --git a/crates/ruff/resources/test/fixtures/flake8_todos/TD005.py b/crates/ruff/resources/test/fixtures/flake8_todos/TD005.py
new file mode 100644
index 0000000000000..64e8fe5364ab7
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_todos/TD005.py
@@ -0,0 +1,7 @@
+# T005 - accepted
+# TODO(evanrittenhouse): this has text, while the errors do not
+# T005 - errors
+# TODO(evanrittenhouse):
+# TODO(evanrittenhouse)
+# FIXME
+# foo # TODO
diff --git a/crates/ruff/resources/test/fixtures/flake8_todos/TD006.py b/crates/ruff/resources/test/fixtures/flake8_todos/TD006.py
new file mode 100644
index 0000000000000..90fbbe387b078
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_todos/TD006.py
@@ -0,0 +1,6 @@
+# TDO006 - accepted
+# TODO (evanrittenhouse): this is a valid TODO
+# TDO006 - error
+# ToDo (evanrittenhouse): invalid capitalization
+# todo (evanrittenhouse): another invalid capitalization
+# foo # todo: invalid capitalization
diff --git a/crates/ruff/resources/test/fixtures/flake8_todos/TD007.py b/crates/ruff/resources/test/fixtures/flake8_todos/TD007.py
new file mode 100644
index 0000000000000..44915d6eda5c1
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flake8_todos/TD007.py
@@ -0,0 +1,10 @@
+# T007 - accepted
+# TODO(evanrittenhouse): this has a space after a colon
+# TODO: so does this
+# T007 - errors
+# TODO(evanrittenhouse):this has no space after a colon
+# TODO (evanrittenhouse):this doesn't either
+# TODO:neither does this
+# FIXME:and lastly neither does this
+# foo # TODO:this is really the last one
+# TODO this colon doesn't terminate the tag, so don't check it. https://www.google.com
diff --git a/crates/ruff/resources/test/fixtures/flake8_type_checking/TCH002.py b/crates/ruff/resources/test/fixtures/flake8_type_checking/TCH002.py
index 2bda6ff9838a6..82d6d2f10ba4a 100644
--- a/crates/ruff/resources/test/fixtures/flake8_type_checking/TCH002.py
+++ b/crates/ruff/resources/test/fixtures/flake8_type_checking/TCH002.py
@@ -146,3 +146,21 @@ def f():
     import pandas as pd
 
     x = dict[pd.DataFrame, pd.DataFrame]
+
+
+def f():
+    import pandas as pd
+
+
+def f():
+    from pandas import DataFrame  # noqa: TCH002
+
+    x: DataFrame = 2
+
+
+def f():
+    from pandas import (  # noqa: TCH002
+        DataFrame,
+    )
+
+    x: DataFrame = 2
diff --git a/crates/ruff/resources/test/fixtures/flake8_type_checking/strict.py b/crates/ruff/resources/test/fixtures/flake8_type_checking/strict.py
index d7f9bda9840ad..4882fefe9a638 100644
--- a/crates/ruff/resources/test/fixtures/flake8_type_checking/strict.py
+++ b/crates/ruff/resources/test/fixtures/flake8_type_checking/strict.py
@@ -2,7 +2,7 @@
 
 
 def f():
-    # Even in strict mode, this shouldn't rase an error, since `pkg` is used at runtime,
+    # Even in strict mode, this shouldn't raise an error, since `pkg` is used at runtime,
     # and implicitly imports `pkg.bar`.
     import pkg
     import pkg.bar
@@ -12,7 +12,7 @@ def test(value: pkg.bar.A):
 
 
 def f():
-    # Even in strict mode, this shouldn't rase an error, since `pkg.bar` is used at
+    # Even in strict mode, this shouldn't raise an error, since `pkg.bar` is used at
     # runtime, and implicitly imports `pkg`.
     import pkg
     import pkg.bar
@@ -22,7 +22,7 @@ def test(value: pkg.A):
 
 
 def f():
-    # In un-strict mode, this shouldn't rase an error, since `pkg` is used at runtime.
+    # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime.
     import pkg
     from pkg import A
 
@@ -31,7 +31,7 @@ def test(value: A):
 
 
 def f():
-    # In un-strict mode, this shouldn't rase an error, since `pkg` is used at runtime.
+    # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime.
     from pkg import A, B
 
     def test(value: A):
@@ -39,7 +39,7 @@ def test(value: A):
 
 
 def f():
-    # Even in strict mode, this shouldn't rase an error, since `pkg.baz` is used at
+    # Even in strict mode, this shouldn't raise an error, since `pkg.baz` is used at
     # runtime, and implicitly imports `pkg.bar`.
     import pkg.bar
     import pkg.baz
@@ -49,9 +49,56 @@ def test(value: pkg.bar.A):
 
 
 def f():
-    # In un-strict mode, this _should_ rase an error, since `pkg` is used at runtime.
+    # In un-strict mode, this _should_ raise an error, since `pkg.bar` isn't used at runtime
     import pkg
     from pkg.bar import A
 
     def test(value: A):
         return pkg.B()
+
+
+def f():
+    # In un-strict mode, this shouldn't raise an error, since `pkg.bar` is used at runtime.
+    import pkg
+    import pkg.bar as B
+
+    def test(value: pkg.A):
+        return B()
+
+
+def f():
+    # In un-strict mode, this shouldn't raise an error, since `pkg.foo.bar` is used at runtime.
+    import pkg.foo as F
+    import pkg.foo.bar as B
+
+    def test(value: F.Foo):
+        return B()
+
+
+def f():
+    # In un-strict mode, this shouldn't raise an error, since `pkg.foo.bar` is used at runtime.
+    import pkg
+    import pkg.foo.bar as B
+
+    def test(value: pkg.A):
+        return B()
+
+
+def f():
+    # In un-strict mode, this _should_ raise an error, since `pkg` isn't used at runtime.
+    # Note that `pkg` is a prefix of `pkgfoo` which are both different modules. This is
+    # testing the implementation.
+    import pkg
+    import pkgfoo.bar as B
+
+    def test(value: pkg.A):
+        return B()
+
+
+def f():
+    # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime.
+    import pkg.bar as B
+    import pkg.foo as F
+
+    def test(value: F.Foo):
+        return B.Bar()
diff --git a/crates/ruff/resources/test/fixtures/flynt/FLY002.py b/crates/ruff/resources/test/fixtures/flynt/FLY002.py
new file mode 100644
index 0000000000000..2067b12d5da92
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/flynt/FLY002.py
@@ -0,0 +1,18 @@
+import secrets
+from random import random, choice
+
+a = "Hello"
+ok1 = " ".join([a, " World"])  # OK
+ok2 = "".join(["Finally, ", a, " World"])  # OK
+ok3 = "x".join(("1", "2", "3"))  # OK
+ok4 = "y".join([1, 2, 3])  # Technically OK, though would've been an error originally
+ok5 = "a".join([random(), random()])  # OK (simple calls)
+ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()])  # OK (attr calls)
+
+nok1 = "x".join({"4", "5", "yee"})  # Not OK (set)
+nok2 = a.join(["1", "2", "3"])  # Not OK (not a static joiner)
+nok3 = "a".join(a)  # Not OK (not a static joinee)
+nok4 = "a".join([a, a, *a])  # Not OK (not a static length)
+nok5 = "a".join([choice("flarp")])  # Not OK (not a simple call)
+nok6 = "a".join(x for x in "feefoofum")  # Not OK (generator)
+nok7 = "a".join([f"foo{8}", "bar"])  # Not OK (contains an f-string)
diff --git a/crates/ruff/resources/test/fixtures/isort/fit_line_length_comment.py b/crates/ruff/resources/test/fixtures/isort/fit_line_length_comment.py
index 11f1ee1f6e6ca..94648e045ecb7 100644
--- a/crates/ruff/resources/test/fixtures/isort/fit_line_length_comment.py
+++ b/crates/ruff/resources/test/fixtures/isort/fit_line_length_comment.py
@@ -2,3 +2,7 @@
 # Don't take this comment into account when determining whether the next import can fit on one line.
 from b import c
 from d import e  # Do take this comment into account when determining whether the next import can fit on one line.
+# The next import fits on one line.
+from f import g  # 012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ
+# The next import doesn't fit on one line.
+from h import i  # 012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9
diff --git a/crates/ruff/resources/test/fixtures/isort/required_imports/off.py b/crates/ruff/resources/test/fixtures/isort/required_imports/off.py
new file mode 100644
index 0000000000000..62590951c4f91
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/isort/required_imports/off.py
@@ -0,0 +1,4 @@
+# isort: off
+
+x = 1
+# isort: on
diff --git a/crates/ruff/resources/test/fixtures/isort/split.py b/crates/ruff/resources/test/fixtures/isort/split.py
index acdc032fe5203..e4beaec56334a 100644
--- a/crates/ruff/resources/test/fixtures/isort/split.py
+++ b/crates/ruff/resources/test/fixtures/isort/split.py
@@ -6,7 +6,16 @@
 import c
 import d
 
-# isort: split  
+# isort: split
 
 import a
 import b
+
+if True:
+    import C
+    import A
+
+    # isort: split
+
+    import D
+    import B
diff --git a/crates/ruff/resources/test/fixtures/pandas_vet/PD002.py b/crates/ruff/resources/test/fixtures/pandas_vet/PD002.py
index 094fd0e5b08a6..99dc33a327395 100644
--- a/crates/ruff/resources/test/fixtures/pandas_vet/PD002.py
+++ b/crates/ruff/resources/test/fixtures/pandas_vet/PD002.py
@@ -22,3 +22,7 @@
 x.drop(["a"], axis=1, **kwargs, inplace=True)
 x.drop(["a"], axis=1, inplace=True, **kwargs)
 f(x.drop(["a"], axis=1, inplace=True))
+
+x.apply(lambda x: x.sort_values('a', inplace=True))
+import torch
+torch.m.ReLU(inplace=True) # safe because this isn't a pandas call
diff --git a/crates/ruff/resources/test/fixtures/pycodestyle/E11.py b/crates/ruff/resources/test/fixtures/pycodestyle/E11.py
index f8ace8030b9dc..9f94aea1011c9 100644
--- a/crates/ruff/resources/test/fixtures/pycodestyle/E11.py
+++ b/crates/ruff/resources/test/fixtures/pycodestyle/E11.py
@@ -40,3 +40,27 @@ def start():
 #: E117 W191
 def start():
 		print()
+#: E112
+if False:  #
+print()
+#:
+if False:
+    print()
+#:
+if False:  #
+    print()
+#:
+if False:
+    print()
+
+    print()
+#:
+if False:
+    print()
+    if False:
+
+        print()
+#:
+if False:
+
+    print()
diff --git a/crates/ruff/resources/test/fixtures/pycodestyle/E20.py b/crates/ruff/resources/test/fixtures/pycodestyle/E20.py
index 20c6dfd805d74..2e8f5f7d90ce0 100644
--- a/crates/ruff/resources/test/fixtures/pycodestyle/E20.py
+++ b/crates/ruff/resources/test/fixtures/pycodestyle/E20.py
@@ -76,3 +76,11 @@
 a[b1, :] == a[b1, ...]
 b = a[:, b1]
 #:
+
+#: E201:1:6
+spam[ ~ham]
+
+#: Okay
+x = [  #
+    'some value',
+]
diff --git a/crates/ruff/resources/test/fixtures/pycodestyle/E22.py b/crates/ruff/resources/test/fixtures/pycodestyle/E22.py
index 7ea27927e50fe..556984df20b45 100644
--- a/crates/ruff/resources/test/fixtures/pycodestyle/E22.py
+++ b/crates/ruff/resources/test/fixtures/pycodestyle/E22.py
@@ -160,6 +160,7 @@ def halves(n):
     *a, b = (1, 2, 3)
 
 
+@decorator
 def squares(n):
     return (i**2 for i in range(n))
 
@@ -168,4 +169,14 @@ def squares(n):
     -6: "\u03bc",  # Greek letter mu
     -3: "m",
 }
+
+i = (
+    i +  #
+    1
+)
+
+x[~y]
+
+if i == -1:
+    pass
 #:
diff --git a/crates/ruff/resources/test/fixtures/pycodestyle/E23.py b/crates/ruff/resources/test/fixtures/pycodestyle/E23.py
index f47b124ed66c0..e2c6b9fe661a1 100644
--- a/crates/ruff/resources/test/fixtures/pycodestyle/E23.py
+++ b/crates/ruff/resources/test/fixtures/pycodestyle/E23.py
@@ -18,3 +18,13 @@ def foo() -> None:
     #: E231
     if (1,2):
         pass
+
+#: Okay
+a = (1,\
+2)
+
+#: E231:2:20
+mdtypes_template = {
+    'tag_full': [('mdtype', 'u4'), ('byte_count', 'u4')],
+    'tag_smalldata':[('byte_count_mdtype', 'u4'), ('data', 'S4')],
+}
diff --git a/crates/ruff/resources/test/fixtures/pycodestyle/E26.py b/crates/ruff/resources/test/fixtures/pycodestyle/E26.py
index 2cdd4cf5425b0..9d35553dc521a 100644
--- a/crates/ruff/resources/test/fixtures/pycodestyle/E26.py
+++ b/crates/ruff/resources/test/fixtures/pycodestyle/E26.py
@@ -64,3 +64,11 @@ def oof():
 #: E262:2:9
 #  (Two spaces) Ok for block comment
 a = 42  #  (Two spaces)
+
+#: E265:5:1
+### Means test is not done yet
+# E   Means test is giving error (E)
+# F   Means test is failing (F)
+# EF  Means test is giving error and Failing
+#!   Means test is segfaulting
+# 8   Means test runs forever
diff --git a/crates/ruff/resources/test/fixtures/pycodestyle/E27.py b/crates/ruff/resources/test/fixtures/pycodestyle/E27.py
index ca06930698bfc..576e43ae01300 100644
--- a/crates/ruff/resources/test/fixtures/pycodestyle/E27.py
+++ b/crates/ruff/resources/test/fixtures/pycodestyle/E27.py
@@ -56,3 +56,7 @@
 def f():
     print((yield))
     x = (yield)
+#: Okay
+if (a and
+    b):
+    pass
diff --git a/crates/ruff/resources/test/fixtures/pycodestyle/E402.py b/crates/ruff/resources/test/fixtures/pycodestyle/E402.py
index b95b2ae1e832a..81e6306c7af11 100644
--- a/crates/ruff/resources/test/fixtures/pycodestyle/E402.py
+++ b/crates/ruff/resources/test/fixtures/pycodestyle/E402.py
@@ -19,7 +19,7 @@
 else:
     import e
 
-y = x + 1
+__some__magic = 1
 
 import f
 
diff --git a/crates/ruff/resources/test/fixtures/pycodestyle/E501_2.py b/crates/ruff/resources/test/fixtures/pycodestyle/E501_2.py
new file mode 100644
index 0000000000000..18ea839392ba1
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pycodestyle/E501_2.py
@@ -0,0 +1,11 @@
+a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+a	=	"""ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+
+b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+b	=	"""ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+
+c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+c	=	"""2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+
+d       =       """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+d	=	"""💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
diff --git a/crates/ruff/resources/test/fixtures/pycodestyle/W505.py b/crates/ruff/resources/test/fixtures/pycodestyle/W505.py
index d8085da9892a8..c297b8c1e9e89 100644
--- a/crates/ruff/resources/test/fixtures/pycodestyle/W505.py
+++ b/crates/ruff/resources/test/fixtures/pycodestyle/W505.py
@@ -2,7 +2,7 @@
 """Here's a top-level docstring that's over the limit."""
 
 
-def f():
+def f1():
     """Here's a docstring that's also over the limit."""
 
     x = 1  # Here's a comment that's over the limit, but it's not standalone.
@@ -16,3 +16,16 @@ def f():
 
 
 "This is also considered a docstring, and is over the limit."
+
+
+def f2():
+    """Here's a multi-line docstring.
+
+    It's over the limit on this line, which isn't the first line in the docstring.
+    """
+
+
+def f3():
+    """Here's a multi-line docstring.
+
+    It's over the limit on this line, which isn't the first line in the docstring."""
diff --git a/crates/ruff/resources/test/fixtures/pycodestyle/W505_utf_8.py b/crates/ruff/resources/test/fixtures/pycodestyle/W505_utf_8.py
new file mode 100644
index 0000000000000..6e177dad8f0ea
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pycodestyle/W505_utf_8.py
@@ -0,0 +1,31 @@
+#!/usr/bin/env python3
+"""Here's a top-level ß9💣2ℝing that's over theß9💣2ℝ."""
+
+
+def f1():
+    """Here's a ß9💣2ℝing that's also over theß9💣2ℝ."""
+
+    x = 1  # Here's a comment that's over theß9💣2ℝ, but it's not standalone.
+
+    # Here's a standalone comment that's over theß9💣2ℝ.
+
+    x = 2
+    # Another standalone that is preceded by a newline and indent toke and is over theß9💣2ℝ.
+
+    print("Here's a string that's over theß9💣2ℝ, but it's not a ß9💣2ℝing.")
+
+
+"This is also considered a ß9💣2ℝing, and is over theß9💣2ℝ."
+
+
+def f2():
+    """Here's a multi-line ß9💣2ℝing.
+
+    It's over theß9💣2ℝ on this line, which isn't the first line in the ß9💣2ℝing.
+    """
+
+
+def f3():
+    """Here's a multi-line ß9💣2ℝing.
+
+    It's over theß9💣2ℝ on this line, which isn't the first line in the ß9💣2ℝing."""
diff --git a/crates/ruff/resources/test/fixtures/pycodestyle/shebang.py b/crates/ruff/resources/test/fixtures/pycodestyle/shebang.py
new file mode 100644
index 0000000000000..2d5d0e2441c52
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pycodestyle/shebang.py
@@ -0,0 +1,4 @@
+#!/usr/bin/python
+#
+#!
+#:
diff --git a/crates/ruff/resources/test/fixtures/pydocstyle/D403.py b/crates/ruff/resources/test/fixtures/pydocstyle/D403.py
index 129de7d11a518..d90acb358efab 100644
--- a/crates/ruff/resources/test/fixtures/pydocstyle/D403.py
+++ b/crates/ruff/resources/test/fixtures/pydocstyle/D403.py
@@ -13,3 +13,15 @@ def another_function():
 
 def utf8_function():
     """éste docstring is capitalized."""
+
+def uppercase_char_not_possible():
+    """'args' is not capitalized."""
+
+def non_alphabetic():
+    """th!is is not capitalized."""
+
+def non_ascii():
+    """th•s is not capitalized."""
+
+def all_caps():
+    """th•s is not capitalized."""
diff --git a/crates/ruff/resources/test/fixtures/pydocstyle/all.py b/crates/ruff/resources/test/fixtures/pydocstyle/all.py
new file mode 100644
index 0000000000000..ffe230d817503
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pydocstyle/all.py
@@ -0,0 +1,18 @@
+def public_func():
+    pass
+
+
+def private_func():
+    pass
+
+
+class PublicClass:
+    class PublicNestedClass:
+        pass
+
+
+class PrivateClass:
+    pass
+
+
+__all__ = ("public_func", "PublicClass")
diff --git a/crates/ruff/resources/test/fixtures/pyflakes/F401_12.py b/crates/ruff/resources/test/fixtures/pyflakes/F401_12.py
new file mode 100644
index 0000000000000..f3ba7c360c777
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pyflakes/F401_12.py
@@ -0,0 +1,10 @@
+"""Test: module bindings are preferred over local bindings, for deferred annotations."""
+
+from __future__ import annotations
+
+import datetime
+from typing import Optional
+
+
+class Class:
+    datetime: Optional[datetime.datetime]
diff --git a/crates/ruff/resources/test/fixtures/pyflakes/F401_13.py b/crates/ruff/resources/test/fixtures/pyflakes/F401_13.py
new file mode 100644
index 0000000000000..49ba589ae7d75
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pyflakes/F401_13.py
@@ -0,0 +1,12 @@
+"""Test: module bindings are preferred over local bindings, for deferred annotations."""
+
+from __future__ import annotations
+
+from typing import TypeAlias, List
+
+
+class Class:
+    List: TypeAlias = List
+
+    def bar(self) -> List:
+        pass
diff --git a/crates/ruff/resources/test/fixtures/pyflakes/F401_14.py b/crates/ruff/resources/test/fixtures/pyflakes/F401_14.py
new file mode 100644
index 0000000000000..6e7bb3695cd84
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pyflakes/F401_14.py
@@ -0,0 +1,8 @@
+"""Test: module bindings are preferred over local bindings, for deferred annotations."""
+
+import datetime
+from typing import Optional
+
+
+class Class:
+    datetime: "Optional[datetime.datetime]"
diff --git a/crates/ruff/resources/test/fixtures/pyflakes/F401_15.py b/crates/ruff/resources/test/fixtures/pyflakes/F401_15.py
new file mode 100644
index 0000000000000..ac4b90b2c4cb4
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pyflakes/F401_15.py
@@ -0,0 +1,9 @@
+from typing import TYPE_CHECKING
+from django.db.models import ForeignKey
+
+if TYPE_CHECKING:
+    from pathlib import Path
+
+
+class Foo:
+    var = ForeignKey["Path"]()
diff --git a/crates/ruff/resources/test/fixtures/pyflakes/F401_16.py b/crates/ruff/resources/test/fixtures/pyflakes/F401_16.py
new file mode 100644
index 0000000000000..dd815bb9007ae
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pyflakes/F401_16.py
@@ -0,0 +1,15 @@
+"""Test that `__all__` exports are respected even with multiple declarations."""
+
+import random
+
+
+def some_dependency_check():
+    return random.uniform(0.0, 1.0) > 0.49999
+
+
+if some_dependency_check():
+    import math
+
+    __all__ = ["math"]
+else:
+    __all__ = []
diff --git a/crates/ruff/resources/test/fixtures/pyflakes/F401_17.py b/crates/ruff/resources/test/fixtures/pyflakes/F401_17.py
new file mode 100644
index 0000000000000..0d243eac55195
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pyflakes/F401_17.py
@@ -0,0 +1,32 @@
+"""Test that runtime typing references are properly attributed to scoped imports."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, cast
+
+if TYPE_CHECKING:
+    from threading import Thread
+
+
+def fn(thread: Thread):
+    from threading import Thread
+
+    # The `Thread` on the left-hand side should resolve to the `Thread` imported at the
+    # top level.
+    x: Thread
+
+
+def fn(thread: Thread):
+    from threading import Thread
+
+    # The `Thread` on the left-hand side should resolve to the `Thread` imported at the
+    # top level.
+    cast("Thread", thread)
+
+
+def fn(thread: Thread):
+    from threading import Thread
+
+    # The `Thread` on the right-hand side should resolve to the`Thread` imported within
+    # `fn`.
+    cast(Thread, thread)
diff --git a/crates/ruff/resources/test/fixtures/pyflakes/F522.py b/crates/ruff/resources/test/fixtures/pyflakes/F522.py
index f84a28d53ec20..18e3d072f26a1 100644
--- a/crates/ruff/resources/test/fixtures/pyflakes/F522.py
+++ b/crates/ruff/resources/test/fixtures/pyflakes/F522.py
@@ -2,3 +2,6 @@
 "{bar}{}".format(1, bar=2, spam=3)  # F522
 "{bar:{spam}}".format(bar=2, spam=3)  # No issues
 "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5)  # F522
+# Not fixable
+(''
+ .format(x=2))
\ No newline at end of file
diff --git a/crates/ruff/resources/test/fixtures/pyflakes/F523.py b/crates/ruff/resources/test/fixtures/pyflakes/F523.py
index 2055dd3a3144f..d3dd1b68db7d1 100644
--- a/crates/ruff/resources/test/fixtures/pyflakes/F523.py
+++ b/crates/ruff/resources/test/fixtures/pyflakes/F523.py
@@ -17,3 +17,17 @@
 "{0}{1}".format(1, *args)  # No issues
 "{0}{1}".format(1, 2, *args)  # No issues
 "{0}{1}".format(1, 2, 3, *args)  # F523
+
+# With nested quotes
+"''1{0}".format(1, 2, 3)  # F523
+"\"\"{1}{0}".format(1, 2, 3)  # F523
+'""{1}{0}'.format(1, 2, 3)  # F523
+
+# With modified indexes
+"{1}{2}".format(1, 2, 3)  # F523, # F524
+"{1}{3}".format(1, 2, 3, 4)  # F523, # F524
+"{1} {8}".format(0, 1)  # F523, # F524
+
+# Not fixable
+(''
+.format(2))
diff --git a/crates/ruff/resources/test/fixtures/pyflakes/F524.py b/crates/ruff/resources/test/fixtures/pyflakes/F524.py
index 30cc80ea0ed72..feffa38af3c9a 100644
--- a/crates/ruff/resources/test/fixtures/pyflakes/F524.py
+++ b/crates/ruff/resources/test/fixtures/pyflakes/F524.py
@@ -4,3 +4,4 @@
 "{0} {bar}".format(1)  # F524
 "{0} {bar}".format()  # F524
 "{bar} {0}".format()  # F524
+"{1} {8}".format(0, 1)
diff --git a/crates/ruff/resources/test/fixtures/pyflakes/F811_23.py b/crates/ruff/resources/test/fixtures/pyflakes/F811_23.py
new file mode 100644
index 0000000000000..0332e48bc8401
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pyflakes/F811_23.py
@@ -0,0 +1,4 @@
+"""Test that shadowing an explicit re-export produces a warning."""
+
+import foo as foo
+import bar as foo
diff --git a/crates/ruff/resources/test/fixtures/pyflakes/F811_24.py b/crates/ruff/resources/test/fixtures/pyflakes/F811_24.py
new file mode 100644
index 0000000000000..0207b9329dab0
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pyflakes/F811_24.py
@@ -0,0 +1,5 @@
+"""Test that shadowing a `__future__` import does not produce a warning."""
+
+from __future__ import annotations
+
+import annotations
diff --git a/crates/ruff/resources/test/fixtures/pyflakes/F841_0.py b/crates/ruff/resources/test/fixtures/pyflakes/F841_0.py
index c0e33502d6930..94bc0b6ca507d 100644
--- a/crates/ruff/resources/test/fixtures/pyflakes/F841_0.py
+++ b/crates/ruff/resources/test/fixtures/pyflakes/F841_0.py
@@ -126,3 +126,22 @@ def f(x: int):
 def f():
     if any((key := (value := x)) for x in ["ok"]):
         print(key)
+
+
+def f() -> None:
+    is_connected = False
+
+    class Foo:
+        @property
+        def is_connected(self):
+            nonlocal is_connected
+            return is_connected
+
+        def do_thing(self):
+            # This should resolve to the `is_connected` in the function scope.
+            nonlocal is_connected
+            print(is_connected)
+
+    obj = Foo()
+    obj.do_thing()
+
diff --git a/crates/ruff/resources/test/fixtures/pyflakes/F841_3.py b/crates/ruff/resources/test/fixtures/pyflakes/F841_3.py
index 89bae2b6ef63b..28d5af1f3be58 100644
--- a/crates/ruff/resources/test/fixtures/pyflakes/F841_3.py
+++ b/crates/ruff/resources/test/fixtures/pyflakes/F841_3.py
@@ -83,6 +83,11 @@ def f():
         pass
 
 
+def f():
+    with (Nested(m)) as (cm):
+        pass
+
+
 def f():
     toplevel = tt = lexer.get_token()
     if not tt:
diff --git a/crates/ruff/resources/test/fixtures/pygrep-hooks/PGH005_0.py b/crates/ruff/resources/test/fixtures/pygrep-hooks/PGH005_0.py
new file mode 100644
index 0000000000000..cb80cc8c28048
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pygrep-hooks/PGH005_0.py
@@ -0,0 +1,19 @@
+# Errors
+assert my_mock.not_called()
+assert my_mock.called_once_with()
+assert my_mock.not_called
+assert my_mock.called_once_with
+my_mock.assert_not_called
+my_mock.assert_called
+my_mock.assert_called_once_with
+my_mock.assert_called_once_with
+MyMock.assert_called_once_with
+
+# OK
+assert my_mock.call_count == 1
+assert my_mock.called
+my_mock.assert_not_called()
+my_mock.assert_called()
+my_mock.assert_called_once_with()
+"""like :meth:`Mock.assert_called_once_with`"""
+"""like :meth:`MagicMock.assert_called_once_with`"""
diff --git a/crates/ruff/resources/test/fixtures/pylint/duplicate_bases.py b/crates/ruff/resources/test/fixtures/pylint/duplicate_bases.py
new file mode 100644
index 0000000000000..491421ccf5eb2
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pylint/duplicate_bases.py
@@ -0,0 +1,24 @@
+###
+# Errors.
+###
+class A:
+    ...
+
+
+class B(A, A):
+    ...
+
+
+###
+# Non-errors.
+###
+class C:
+    ...
+
+
+class D(C):
+    ...
+
+
+class E(A, C):
+    ...
diff --git a/crates/ruff/resources/test/fixtures/pylint/invalid_return_type_str.py b/crates/ruff/resources/test/fixtures/pylint/invalid_return_type_str.py
new file mode 100644
index 0000000000000..a47ed1b306ab5
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pylint/invalid_return_type_str.py
@@ -0,0 +1,28 @@
+class Str:
+    def __str__(self):
+        return 1
+
+class Float:
+    def __str__(self):
+        return 3.05
+    
+class Int:
+    def __str__(self):
+        return 0
+    
+class Bool:
+    def __str__(self):
+        return False
+    
+class Str2:
+    def __str__(self):
+        x = "ruff"
+        return x
+    
+# TODO fixme once Ruff has better type checking
+def return_int():
+    return 3
+
+class ComplexReturn:
+    def __str__(self):
+        return return_int()
\ No newline at end of file
diff --git a/crates/ruff/resources/test/fixtures/pylint/iteration_over_set.py b/crates/ruff/resources/test/fixtures/pylint/iteration_over_set.py
new file mode 100644
index 0000000000000..1b22612e52f9c
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pylint/iteration_over_set.py
@@ -0,0 +1,38 @@
+# Errors
+
+for item in {"apples", "lemons", "water"}:  # flags in-line set literals
+    print(f"I like {item}.")
+
+numbers_list = [i for i in {1, 2, 3}]  # flags sets in list comprehensions
+
+numbers_set = {i for i in {1, 2, 3}}  # flags sets in set comprehensions
+
+numbers_dict = {str(i): i for i in {1, 2, 3}}  # flags sets in dict comprehensions
+
+numbers_gen = (i for i in {1, 2, 3})  # flags sets in generator expressions
+
+# Non-errors
+
+items = {"apples", "lemons", "water"}
+for item in items:  # only complains about in-line sets (as per Pylint)
+    print(f"I like {item}.")
+
+for item in ["apples", "lemons", "water"]:  # lists are fine
+    print(f"I like {item}.")
+
+for item in ("apples", "lemons", "water"):  # tuples are fine
+    print(f"I like {item}.")
+
+numbers_list = [i for i in [1, 2, 3]]  # lists in comprehensions are fine
+
+numbers_set = {i for i in (1, 2, 3)}  # tuples in comprehensions are fine
+
+numbers_dict = {str(i): i for i in [1, 2, 3]}  # lists in dict comprehensions are fine
+
+numbers_gen = (i for i in (1, 2, 3))  # tuples in generator expressions are fine
+
+for item in set(("apples", "lemons", "water")):  # set constructor is fine
+    print(f"I like {item}.")
+
+for number in {i for i in range(10)}:  # set comprehensions are fine
+    print(number)
diff --git a/crates/ruff/resources/test/fixtures/pylint/named_expr_without_context.py b/crates/ruff/resources/test/fixtures/pylint/named_expr_without_context.py
new file mode 100644
index 0000000000000..2dcc56cffd206
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pylint/named_expr_without_context.py
@@ -0,0 +1,19 @@
+# Errors
+(a := 42)
+if True:
+    (b := 1)
+
+
+class Foo:
+    (c := 1)
+
+
+# OK
+if a := 42:
+    print("Success")
+
+a = 0
+while (a := a + 1) < 10:
+    print("Correct")
+
+a = (b := 1)
diff --git a/crates/ruff/resources/test/fixtures/pylint/nested_min_max.py b/crates/ruff/resources/test/fixtures/pylint/nested_min_max.py
new file mode 100644
index 0000000000000..2c66580305c6e
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pylint/nested_min_max.py
@@ -0,0 +1,38 @@
+min(1, 2, 3)
+min(1, min(2, 3))
+min(1, min(2, min(3, 4)))
+min(1, foo("a", "b"), min(3, 4))
+min(1, max(2, 3))
+max(1, 2, 3)
+max(1, max(2, 3))
+max(1, max(2, max(3, 4)))
+max(1, foo("a", "b"), max(3, 4))
+
+# These should not trigger; we do not flag cases with keyword args.
+min(1, min(2, 3), key=test)
+min(1, min(2, 3, key=test))
+# This will still trigger, to merge the calls without keyword args.
+min(1, min(2, 3, key=test), min(4, 5))
+
+# Don't provide a fix if there are comments within the call.
+min(
+    1,  # This is a comment.
+    min(2, 3),
+)
+
+# Handle iterable expressions.
+min(1, min(a))
+min(1, min(i for i in range(10)))
+max(1, max(a))
+max(1, max(i for i in range(10)))
+
+tuples_list = [
+    (1, 2),
+    (2, 3),
+    (3, 4),
+    (4, 5),
+    (5, 6),
+]
+
+min(min(tuples_list))
+max(max(tuples_list))
diff --git a/crates/ruff/resources/test/fixtures/pylint/nonlocal_without_binding.py b/crates/ruff/resources/test/fixtures/pylint/nonlocal_without_binding.py
index baa823565b599..154ee23bec74a 100644
--- a/crates/ruff/resources/test/fixtures/pylint/nonlocal_without_binding.py
+++ b/crates/ruff/resources/test/fixtures/pylint/nonlocal_without_binding.py
@@ -17,3 +17,30 @@ def f():
 
     def f():
         nonlocal y
+
+
+def f():
+    x = 1
+
+    def g():
+        nonlocal x
+
+    del x
+
+
+def f():
+    def g():
+        nonlocal x
+
+    del x
+
+
+def f():
+    try:
+        pass
+    except Exception as x:
+        pass
+
+    def g():
+        nonlocal x
+        x = 2
diff --git a/crates/ruff/resources/test/fixtures/pylint/sys_exit_alias_10.py b/crates/ruff/resources/test/fixtures/pylint/sys_exit_alias_10.py
new file mode 100644
index 0000000000000..4344aec3d5219
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pylint/sys_exit_alias_10.py
@@ -0,0 +1,8 @@
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from sys import exit as bar
+
+
+def main():
+    exit(0)
diff --git a/crates/ruff/resources/test/fixtures/pylint/sys_exit_alias_7.py b/crates/ruff/resources/test/fixtures/pylint/sys_exit_alias_7.py
new file mode 100644
index 0000000000000..2771bfa6039cf
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pylint/sys_exit_alias_7.py
@@ -0,0 +1,5 @@
+def main():
+    exit(0)
+
+
+import functools
diff --git a/crates/ruff/resources/test/fixtures/pylint/sys_exit_alias_8.py b/crates/ruff/resources/test/fixtures/pylint/sys_exit_alias_8.py
new file mode 100644
index 0000000000000..822bec52c77be
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pylint/sys_exit_alias_8.py
@@ -0,0 +1,5 @@
+from sys import argv
+
+
+def main():
+    exit(0)
diff --git a/crates/ruff/resources/test/fixtures/pylint/sys_exit_alias_9.py b/crates/ruff/resources/test/fixtures/pylint/sys_exit_alias_9.py
new file mode 100644
index 0000000000000..326901d18378d
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pylint/sys_exit_alias_9.py
@@ -0,0 +1,5 @@
+def main():
+    exit(0)
+
+
+from sys import argv
diff --git a/crates/ruff/resources/test/fixtures/pylint/too_many_arguments.py b/crates/ruff/resources/test/fixtures/pylint/too_many_arguments.py
index 7b272f50894f6..5271910cc53a4 100644
--- a/crates/ruff/resources/test/fixtures/pylint/too_many_arguments.py
+++ b/crates/ruff/resources/test/fixtures/pylint/too_many_arguments.py
@@ -22,13 +22,13 @@ def f(x=1, y=1, z=1):  # OK
     pass
 
 
-def f(x, y, z, /, u, v, w):  # OK
+def f(x, y, z, /, u, v, w):  # Too many arguments (6/5)
     pass
 
 
-def f(x, y, z, *, u, v, w):  # OK
+def f(x, y, z, *, u, v, w):  # Too many arguments (6/5)
     pass
 
 
-def f(x, y, z, a, b, c, *, u, v, w):  # Too many arguments (6/5)
+def f(x, y, z, a, b, c, *, u, v, w):  # Too many arguments (9/5)
     pass
diff --git a/crates/ruff/resources/test/fixtures/pylint/unexpected_special_method_signature.py b/crates/ruff/resources/test/fixtures/pylint/unexpected_special_method_signature.py
index f5270e04594d6..0748872abce6a 100644
--- a/crates/ruff/resources/test/fixtures/pylint/unexpected_special_method_signature.py
+++ b/crates/ruff/resources/test/fixtures/pylint/unexpected_special_method_signature.py
@@ -1,19 +1,16 @@
 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__():
         ...
@@ -21,31 +18,58 @@ 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):  # allow zero additional args
         ...
-    
-    def __round__(self, x):  # allow one 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
-        ...
\ No newline at end of file
+        ...
+
+    def __eq__(self, *args):  # ignore *args
+        ...
+
+    def __eq__(self, x, *args):  # extra *args is ok
+        ...
+
+    def __eq__(self, x, y, *args):  # too many args with *args
+        ...
+
+    def __round__(self, *args):  # allow zero additional args
+        ...
+
+    def __round__(self, x, *args):  # allow one additional args
+        ...
+
+    def __round__(self, x, y, *args):  # disallow 2 args
+        ...
+
+    def __eq__(self, **kwargs):  # ignore **kwargs
+        ...
+
+    def __eq__(self, /, other=42):  # ignore positional-only args
+        ...
+
+    def __eq__(self, *, other=42):  # ignore positional-only args
+        ...
diff --git a/crates/ruff/resources/test/fixtures/pylint/yield_from_in_async_function.py b/crates/ruff/resources/test/fixtures/pylint/yield_from_in_async_function.py
new file mode 100644
index 0000000000000..8130c177277cf
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pylint/yield_from_in_async_function.py
@@ -0,0 +1,7 @@
+async def success():
+    yield 42
+
+
+async def fail():
+    l = (1, 2, 3)
+    yield from l
diff --git a/crates/ruff/resources/test/fixtures/pyupgrade/UP006.py b/crates/ruff/resources/test/fixtures/pyupgrade/UP006_0.py
similarity index 85%
rename from crates/ruff/resources/test/fixtures/pyupgrade/UP006.py
rename to crates/ruff/resources/test/fixtures/pyupgrade/UP006_0.py
index 75a369bfb9254..106366ec2cc2b 100644
--- a/crates/ruff/resources/test/fixtures/pyupgrade/UP006.py
+++ b/crates/ruff/resources/test/fixtures/pyupgrade/UP006_0.py
@@ -56,3 +56,11 @@ def f(x: "List['Li' 'st[str]']") -> None:
 
 def f(x: "Li" "st['List[str]']") -> None:
     ...
+
+
+def f(x: typing.Deque[str]) -> None:
+    ...
+
+
+def f(x: typing.DefaultDict[str, str]) -> None:
+    ...
diff --git a/crates/ruff/resources/test/fixtures/pyupgrade/UP006_1.py b/crates/ruff/resources/test/fixtures/pyupgrade/UP006_1.py
new file mode 100644
index 0000000000000..1f56c64011a15
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pyupgrade/UP006_1.py
@@ -0,0 +1,10 @@
+from __future__ import annotations
+
+import typing
+
+if typing.TYPE_CHECKING:
+    from collections import defaultdict
+
+
+def f(x: typing.DefaultDict[str, str]) -> None:
+    ...
diff --git a/crates/ruff/resources/test/fixtures/pyupgrade/UP006_2.py b/crates/ruff/resources/test/fixtures/pyupgrade/UP006_2.py
new file mode 100644
index 0000000000000..eb4f5e8864f33
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pyupgrade/UP006_2.py
@@ -0,0 +1,8 @@
+import typing
+
+if typing.TYPE_CHECKING:
+    from collections import defaultdict
+
+
+def f(x: typing.DefaultDict[str, str]) -> None:
+    ...
diff --git a/crates/ruff/resources/test/fixtures/pyupgrade/UP006_3.py b/crates/ruff/resources/test/fixtures/pyupgrade/UP006_3.py
new file mode 100644
index 0000000000000..463365102feb1
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pyupgrade/UP006_3.py
@@ -0,0 +1,8 @@
+import typing
+
+if typing.TYPE_CHECKING:
+    from collections import defaultdict
+
+
+def f(x: "typing.DefaultDict[str, str]") -> None:
+    ...
diff --git a/crates/ruff/resources/test/fixtures/pyupgrade/UP012.py b/crates/ruff/resources/test/fixtures/pyupgrade/UP012.py
index af589f15f51a6..266e8431ccf0e 100644
--- a/crates/ruff/resources/test/fixtures/pyupgrade/UP012.py
+++ b/crates/ruff/resources/test/fixtures/pyupgrade/UP012.py
@@ -59,3 +59,14 @@
 R"foo\o".encode("utf-8")  # br"foo\o"
 U"foo".encode("utf-8")  # b"foo"
 print("foo".encode())  # print(b"foo")
+
+# `encode` on parenthesized strings.
+(
+    "abc"
+    "def"
+).encode()
+
+((
+    "abc"
+    "def"
+)).encode()
diff --git a/crates/ruff/resources/test/fixtures/pyupgrade/UP018.py b/crates/ruff/resources/test/fixtures/pyupgrade/UP018.py
index 4f97f3a0bb6d6..adcaa1c4802b5 100644
--- a/crates/ruff/resources/test/fixtures/pyupgrade/UP018.py
+++ b/crates/ruff/resources/test/fixtures/pyupgrade/UP018.py
@@ -15,6 +15,7 @@
 bytes(b"foo"
       b"bar")
 bytes("foo")
+f"{f'{str()}'}"
 
 # These become string or byte literals
 str()
@@ -25,3 +26,4 @@
 bytes(b"foo")
 bytes(b"""
 foo""")
+f"{str()}"
diff --git a/crates/ruff/resources/test/fixtures/pyupgrade/UP032.py b/crates/ruff/resources/test/fixtures/pyupgrade/UP032_0.py
similarity index 100%
rename from crates/ruff/resources/test/fixtures/pyupgrade/UP032.py
rename to crates/ruff/resources/test/fixtures/pyupgrade/UP032_0.py
diff --git a/crates/ruff/resources/test/fixtures/pyupgrade/UP032_1.py b/crates/ruff/resources/test/fixtures/pyupgrade/UP032_1.py
new file mode 100644
index 0000000000000..884f2d9648b11
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pyupgrade/UP032_1.py
@@ -0,0 +1 @@
+"{} {}".format(a, b)  # Intentionally at start-of-file, to ensure graceful handling.
diff --git a/crates/ruff/resources/test/fixtures/pyupgrade/UP032_2.py b/crates/ruff/resources/test/fixtures/pyupgrade/UP032_2.py
new file mode 100644
index 0000000000000..2987164454638
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pyupgrade/UP032_2.py
@@ -0,0 +1,28 @@
+# Errors
+"{.real}".format(1)
+"{0.real}".format(1)
+"{a.real}".format(a=1)
+
+"{.real}".format(1.0)
+"{0.real}".format(1.0)
+"{a.real}".format(a=1.0)
+
+"{.real}".format(1j)
+"{0.real}".format(1j)
+"{a.real}".format(a=1j)
+
+"{.real}".format(0b01)
+"{0.real}".format(0b01)
+"{a.real}".format(a=0b01)
+
+"{}".format(1 + 2)
+"{}".format([1, 2])
+"{}".format({1, 2})
+"{}".format({1: 2, 3: 4})
+"{}".format((i for i in range(2)))
+
+"{.real}".format(1 + 2)
+"{.real}".format([1, 2])
+"{.real}".format({1, 2})
+"{.real}".format({1: 2, 3: 4})
+"{}".format((i for i in range(2)))
diff --git a/crates/ruff/resources/test/fixtures/pyupgrade/UP036_5.py b/crates/ruff/resources/test/fixtures/pyupgrade/UP036_5.py
new file mode 100644
index 0000000000000..c7e1a8778da50
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/pyupgrade/UP036_5.py
@@ -0,0 +1,30 @@
+import sys
+
+if sys.version_info < (3, 8):
+
+    def a():
+        if b:
+            print(1)
+        elif c:
+            print(2)
+        return None
+
+else:
+    pass
+
+
+import sys
+
+if sys.version_info < (3, 8):
+    pass
+
+else:
+
+    def a():
+        if b:
+            print(1)
+        elif c:
+            print(2)
+        else:
+            print(3)
+        return None
diff --git a/crates/ruff/resources/test/fixtures/ruff/RUF005.py b/crates/ruff/resources/test/fixtures/ruff/RUF005.py
index d0a611c26ddc9..2007e47a2e5e8 100644
--- a/crates/ruff/resources/test/fixtures/ruff/RUF005.py
+++ b/crates/ruff/resources/test/fixtures/ruff/RUF005.py
@@ -1,9 +1,38 @@
+###
+# Non-fixable Errors.
+###
+foo + [  # This will be preserved.
+]
+[*foo] + [  # This will be preserved.
+]
+first = [
+    # The order
+    1,  # here
+    2,  # is
+    # extremely
+    3,  # critical
+    # to preserve
+]
+second = first + [
+    # please
+    4,
+    # don't
+    5,
+    # touch
+    6,
+]
+
+
+###
+# Fixable errors.
+###
 class Fun:
     words = ("how", "fun!")
 
     def yay(self):
         return self.words
 
+
 yay = Fun().yay
 
 foo = [4, 5, 6]
@@ -13,33 +42,27 @@ def yay(self):
 spam = quux + (10, 11, 12)
 spom = list(spam)
 eggs = spom + [13, 14, 15]
-elatement = ("we all say", ) + yay()
-excitement = ("we all think", ) + Fun().yay()
-astonishment = ("we all feel", ) + Fun.words
+elatement = ("we all say",) + yay()
+excitement = ("we all think",) + Fun().yay()
+astonishment = ("we all feel",) + Fun.words
 
-chain = ['a', 'b', 'c'] + eggs + list(('yes', 'no', 'pants') + zoob)
+chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob)
 
 baz = () + zoob
 
-first = [
-    # The order
-    1,  # here
-    2,  # is
-    # extremely
-    3,  # critical
-    # to preserve
-]
-second = first + [
-    # please
-    4,
-    # don't
-    5,
-    # touch
-    6,
-]
-
 [] + foo + [
 ]
 
-[] + foo + [  # This will be preserved, but doesn't prevent the fix
-]
+pylint_call = [sys.executable, "-m", "pylint"] + args + [path]
+pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2)
+b = a + [2, 3] + [4]
+
+# Uses the non-preferred quote style, which should be retained.
+f"{a() + ['b']}"
+
+###
+# Non-errors.
+###
+a = (1,) + [2]
+a = [1, 2] + (3, 4)
+a = ([1, 2, 3] + b) + (4, 5, 6)
diff --git a/crates/ruff/resources/test/fixtures/ruff/RUF009.py b/crates/ruff/resources/test/fixtures/ruff/RUF009.py
index 53c6a0598e1bc..3ba1aad6bed96 100644
--- a/crates/ruff/resources/test/fixtures/ruff/RUF009.py
+++ b/crates/ruff/resources/test/fixtures/ruff/RUF009.py
@@ -2,10 +2,10 @@
 import re
 import typing
 from dataclasses import dataclass, field
+from fractions import Fraction
 from pathlib import Path
 from typing import ClassVar, NamedTuple
 
-
 def default_function() -> list[int]:
     return []
 
@@ -25,7 +25,12 @@ class A:
     fine_timedelta: datetime.timedelta = datetime.timedelta(hours=7)
     fine_tuple: tuple[int] = tuple([1])
     fine_regex: re.Pattern = re.compile(r".*")
-
+    fine_float: float = float('-inf')
+    fine_int: int = int(12)
+    fine_complex: complex = complex(1, 2)
+    fine_str: str = str("foo")
+    fine_bool: bool = bool("foo")
+    fine_fraction: Fraction = Fraction(1,2)
 
 DEFAULT_IMMUTABLETYPE_FOR_ALL_DATACLASSES = ImmutableType(40)
 DEFAULT_A_FOR_ALL_DATACLASSES = A([1, 2, 3])
diff --git a/crates/ruff/resources/test/fixtures/ruff/RUF010.py b/crates/ruff/resources/test/fixtures/ruff/RUF010.py
new file mode 100644
index 0000000000000..77e459c21496a
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/ruff/RUF010.py
@@ -0,0 +1,36 @@
+bla = b"bla"
+d = {"a": b"bla", "b": b"bla", "c": b"bla"}
+
+
+def foo(one_arg):
+    pass
+
+
+f"{str(bla)}, {repr(bla)}, {ascii(bla)}"  # RUF010
+
+f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+
+f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+
+f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+
+f"{foo(bla)}"  # OK
+
+f"{str(bla, 'ascii')}, {str(bla, encoding='cp1255')}"  # OK
+
+f"{bla!s} {[]!r} {'bar'!a}"  # OK
+
+"Not an f-string {str(bla)}, {repr(bla)}, {ascii(bla)}"  # OK
+
+
+def ascii(arg):
+    pass
+
+
+f"{ascii(bla)}"  # OK
+
+(
+    f"Member of tuple mismatches type at index {i}. Expected {of_shape_i}. Got "
+    " intermediary content "
+    f" that flows {repr(obj)} of type {type(obj)}.{additional_message}"  # RUF010
+)
diff --git a/crates/ruff/resources/test/fixtures/ruff/RUF100_0.py b/crates/ruff/resources/test/fixtures/ruff/RUF100_0.py
index f89729938bfb6..5e51807ef90c9 100644
--- a/crates/ruff/resources/test/fixtures/ruff/RUF100_0.py
+++ b/crates/ruff/resources/test/fixtures/ruff/RUF100_0.py
@@ -88,3 +88,12 @@ def f() -> None:
 print(sys.path)
 
 "shape:  (6,)\nSeries: '' [duration[μs]]\n[\n\t0µs\n\t1µs\n\t2µs\n\t3µs\n\t4µs\n\t5µs\n]"  # noqa: F401
+
+
+def f():
+    # Ensure that the `noqa` applies to both the overlong line _and_ the unused
+    # variable.
+    a = """Lorem ipsum dolor sit amet.
+
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+    """  # noqa
diff --git a/crates/ruff/resources/test/fixtures/ruff/confusables.py b/crates/ruff/resources/test/fixtures/ruff/confusables.py
index b642cebd6f396..3ae350887fa3f 100644
--- a/crates/ruff/resources/test/fixtures/ruff/confusables.py
+++ b/crates/ruff/resources/test/fixtures/ruff/confusables.py
@@ -8,7 +8,24 @@ def f():
     ...
 
 
-def g():
+def f():
     """Here's a docstring with a greek rho: ρ"""
     # And here's a comment with a greek alpha: ∗
     ...
+
+
+x = "𝐁ad string"
+x = "−"
+
+# This should be ignored, since it contains an unambiguous unicode character, and no
+# ASCII.
+x = "Русский"
+
+# The first word should be ignored, while the second should be included, since it
+# contains ASCII.
+x = "βα Bαd"
+
+# The two characters should be flagged here. The first character is a "word"
+# consisting of a single ambiguous character, while the second character is a "word
+# boundary" (whitespace) that it itself ambiguous.
+x = "Р усский"
diff --git a/crates/ruff/resources/test/fixtures/ruff/noqa.py b/crates/ruff/resources/test/fixtures/ruff/noqa.py
new file mode 100644
index 0000000000000..30e59400c6f2f
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/ruff/noqa.py
@@ -0,0 +1,23 @@
+def f():
+    # These should both be ignored by the `noqa`.
+    I = 1  # noqa: E741, F841
+
+
+def f():
+    # These should both be ignored by the `noqa`.
+    I = 1  # noqa: E741,F841
+
+
+def f():
+    # These should both be ignored by the `noqa`.
+    I = 1  # noqa: E741 F841
+
+
+def f():
+    # These should both be ignored by the `noqa`.
+    I = 1  # noqa: E741 , F841
+
+
+def f():
+    # Only `E741` should be ignored by the `noqa`.
+    I = 1  # noqa: E741.F841
diff --git a/crates/ruff/resources/test/fixtures/ruff/pyproject_toml/bleach/pyproject.toml b/crates/ruff/resources/test/fixtures/ruff/pyproject_toml/bleach/pyproject.toml
new file mode 100644
index 0000000000000..6345a9db16eed
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/ruff/pyproject_toml/bleach/pyproject.toml
@@ -0,0 +1,7 @@
+[project]
+name = "hello-world"
+version = "0.1.0"
+# There's a comma missing here
+dependencies = [
+  "tinycss2>=1.1.0<1.2",
+]
diff --git a/crates/ruff/resources/test/fixtures/ruff/pyproject_toml/invalid_author/pyproject.toml b/crates/ruff/resources/test/fixtures/ruff/pyproject_toml/invalid_author/pyproject.toml
new file mode 100644
index 0000000000000..94243f3807890
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/ruff/pyproject_toml/invalid_author/pyproject.toml
@@ -0,0 +1,7 @@
+[project]
+name = "hello-world"
+version = "0.1.0"
+# Ensure that the spans from toml handle utf-8 correctly
+authors = [
+    { name = "Z͑ͫ̓ͪ̂ͫ̽͏̴̙̤̞͉͚̯̞̠͍A̴̵̜̰͔ͫ͗͢L̠ͨͧͩ͘G̴̻͈͍͔̹̑͗̎̅͛́Ǫ̵̹̻̝̳͂̌̌͘", email = 1 }
+]
diff --git a/crates/ruff/resources/test/fixtures/ruff/pyproject_toml/maturin/pyproject.toml b/crates/ruff/resources/test/fixtures/ruff/pyproject_toml/maturin/pyproject.toml
new file mode 100644
index 0000000000000..6cbcadc76841e
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/ruff/pyproject_toml/maturin/pyproject.toml
@@ -0,0 +1,57 @@
+# This is a valid pyproject.toml
+# https://github.com/PyO3/maturin/blob/87ac3d9f74dd79ef2df9a20880b9f1fa23f9a437/pyproject.toml
+[build-system]
+requires = ["setuptools", "wheel>=0.36.2", "tomli>=1.1.0 ; python_version<'3.11'", "setuptools-rust>=1.4.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "maturin"
+requires-python = ">=3.7"
+classifiers = [
+    "Topic :: Software Development :: Build Tools",
+    "Programming Language :: Rust",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: Implementation :: PyPy",
+]
+dependencies = ["tomli>=1.1.0 ; python_version<'3.11'"]
+dynamic = [
+    "authors",
+    "description",
+    "license",
+    "readme",
+    "version"
+]
+
+[project.optional-dependencies]
+zig = [
+    "ziglang~=0.10.0",
+]
+patchelf = [
+    "patchelf",
+]
+
+[project.urls]
+"Source Code" = "https://github.com/PyO3/maturin"
+Issues = "https://github.com/PyO3/maturin/issues"
+Documentation = "https://maturin.rs"
+Changelog = "https://maturin.rs/changelog.html"
+
+[tool.maturin]
+bindings = "bin"
+
+[tool.black]
+target_version = ['py37']
+extend-exclude = '''
+# Ignore cargo-generate templates
+^/src/templates
+'''
+
+[tool.ruff]
+line-length = 120
+target-version = "py37"
+
+[tool.mypy]
+disallow_untyped_defs = true
+disallow_incomplete_defs = true
+warn_no_return = true
+ignore_missing_imports = true
diff --git a/crates/ruff/resources/test/fixtures/ruff/pyproject_toml/maturin_gh_1615/pyproject.toml b/crates/ruff/resources/test/fixtures/ruff/pyproject_toml/maturin_gh_1615/pyproject.toml
new file mode 100644
index 0000000000000..14e8b567ea1b1
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/ruff/pyproject_toml/maturin_gh_1615/pyproject.toml
@@ -0,0 +1,39 @@
+# license-files is wrong here
+# https://github.com/PyO3/maturin/issues/1615
+[build-system]
+requires = [ "maturin>=0.14", "numpy", "wheel", "patchelf",]
+build-backend = "maturin"
+
+[project]
+name = "..."
+license-files = [ "license.txt",]
+requires-python = ">=3.8"
+requires-dist = [ "maturin>=0.14", "...",]
+dependencies = [ "packaging", "...",]
+zip-safe = false
+version = "..."
+readme = "..."
+description = "..."
+classifiers = [ "...",]
+[[project.authors]]
+name = "..."
+email = "..."
+
+[project.urls]
+homepage = "..."
+documentation = "..."
+repository = "..."
+
+[project.optional-dependencies]
+test = [ "coverage", "...",]
+docs = [ "sphinx", "sphinx-rtd-theme",]
+devel = []
+
+[tool.maturin]
+include = [ "...",]
+bindings = "pyo3"
+compatibility = "manylinux2014"
+
+[tool.pytest.ini_options]
+testpaths = [ "...",]
+addopts = "--color=yes --tb=native --cov-report term --cov-report html:docs/dist_coverage --cov=aisdb --doctest-modules --envfile .env"
diff --git a/crates/ruff/resources/test/fixtures/tryceratops/TRY301.py b/crates/ruff/resources/test/fixtures/tryceratops/TRY301.py
index f9b98b8a0e147..da7c82e487112 100644
--- a/crates/ruff/resources/test/fixtures/tryceratops/TRY301.py
+++ b/crates/ruff/resources/test/fixtures/tryceratops/TRY301.py
@@ -1,3 +1,8 @@
+"""
+Violation:
+
+Checks for `raise` statements within `try` blocks.
+"""
 class MyException(Exception):
     pass
 
@@ -45,3 +50,10 @@ def good():
         logger.exception("a failed")
     except Exception:
         logger.exception("something failed")
+
+
+def fine():
+    try:
+        a = process()  # This throws the exception now
+    finally:
+        print("finally")
diff --git a/crates/ruff/resources/test/fixtures/tryceratops/TRY302.py b/crates/ruff/resources/test/fixtures/tryceratops/TRY302.py
new file mode 100644
index 0000000000000..3691e5472afc5
--- /dev/null
+++ b/crates/ruff/resources/test/fixtures/tryceratops/TRY302.py
@@ -0,0 +1,123 @@
+"""
+Violation:
+
+Checks for uses of `raise` directly after a `rescue`.
+"""
+class MyException(Exception):
+    pass
+
+def bad():
+    try:
+        process()
+    except Exception:
+        raise
+
+def bad():
+    try:
+        process()
+    except Exception:
+        raise
+        print("this code is pointless!")
+
+def bad():
+    try:
+        process()
+    except:
+        # I am a comment, not a statement!
+        raise
+
+def bad():
+    try:
+        process()
+    except Exception:
+        raise
+
+def bad():
+    try:
+        process()
+    except Exception as e:
+        raise
+
+def bad():
+    try:
+        process()
+    except Exception as e:
+        raise e
+
+def bad():
+    try:
+        process()
+    except MyException:
+        raise
+    except Exception:
+        raise
+
+def bad():
+    try:
+        process()
+    except MyException as e:
+        raise e
+    except Exception as e:
+        raise e
+
+def bad():
+    try:
+        process()
+    except MyException as ex:
+        raise ex
+    except Exception as e:
+        raise e
+
+def fine():
+    try:
+        process()
+    except Exception as e:
+        raise e from None
+
+def fine():
+    try:
+        process()
+    except Exception as e:
+        raise e from Exception
+
+def fine():
+    try:
+        process()
+    except Exception as e:
+        raise ex
+
+def fine():
+    try:
+        process()
+    except MyException:
+        raise
+    except Exception:
+        print("bar")
+
+def fine():
+    try:
+        process()
+    except Exception:
+        print("initiating rapid unscheduled disassembly of program")
+
+def fine():
+    try:
+        process()
+    except MyException:
+        print("oh no!")
+        raise
+
+def fine():
+    try:
+        process()
+    except Exception:
+        if True:
+            raise
+
+def fine():
+    try:
+        process()
+    finally:
+        # I am a comment, not a statement!
+        print("but i am a statement")
+        raise
diff --git a/crates/ruff/resources/test/fixtures/tryceratops/TRY400.py b/crates/ruff/resources/test/fixtures/tryceratops/TRY400.py
index f8deb6ad9b51c..1c31197c26754 100644
--- a/crates/ruff/resources/test/fixtures/tryceratops/TRY400.py
+++ b/crates/ruff/resources/test/fixtures/tryceratops/TRY400.py
@@ -4,6 +4,7 @@
 """
 
 import logging
+import sys
 
 logger = logging.getLogger(__name__)
 
@@ -60,3 +61,17 @@ def good():
         a = 1
     except Exception:
         foo.exception("Context message here")
+
+
+def fine():
+    try:
+        a = 1
+    except Exception:
+        logger.error("Context message here", exc_info=True)
+
+
+def fine():
+    try:
+        a = 1
+    except Exception:
+        logger.error("Context message here", exc_info=sys.exc_info())
diff --git a/crates/ruff/src/autofix/actions.rs b/crates/ruff/src/autofix/actions.rs
deleted file mode 100644
index 283c9298a9835..0000000000000
--- a/crates/ruff/src/autofix/actions.rs
+++ /dev/null
@@ -1,570 +0,0 @@
-//! Interface for generating autofix edits from higher-level actions (e.g., "remove an argument").
-use anyhow::{bail, Result};
-use itertools::Itertools;
-use libcst_native::{
-    Codegen, CodegenState, ImportNames, ParenthesizableWhitespace, SmallStatement, Statement,
-};
-use ruff_text_size::{TextLen, TextRange, TextSize};
-use rustpython_parser::ast::{ExcepthandlerKind, Expr, Keyword, Stmt, StmtKind};
-use rustpython_parser::{lexer, Mode, Tok};
-
-use ruff_diagnostics::Edit;
-use ruff_python_ast::helpers;
-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;
-use crate::importer::Importer;
-
-/// Determine if a body contains only a single statement, taking into account
-/// deleted.
-fn has_single_child(body: &[Stmt], deleted: &[&Stmt]) -> bool {
-    body.iter().filter(|child| !deleted.contains(child)).count() == 1
-}
-
-/// Determine if a child is the only statement in its body.
-fn is_lone_child(child: &Stmt, parent: &Stmt, deleted: &[&Stmt]) -> Result<bool> {
-    match &parent.node {
-        StmtKind::FunctionDef { body, .. }
-        | StmtKind::AsyncFunctionDef { body, .. }
-        | StmtKind::ClassDef { body, .. }
-        | StmtKind::With { body, .. }
-        | StmtKind::AsyncWith { body, .. } => {
-            if body.iter().contains(child) {
-                Ok(has_single_child(body, deleted))
-            } else {
-                bail!("Unable to find child in parent body")
-            }
-        }
-        StmtKind::For { body, orelse, .. }
-        | StmtKind::AsyncFor { body, orelse, .. }
-        | StmtKind::While { body, orelse, .. }
-        | StmtKind::If { body, orelse, .. } => {
-            if body.iter().contains(child) {
-                Ok(has_single_child(body, deleted))
-            } else if orelse.iter().contains(child) {
-                Ok(has_single_child(orelse, deleted))
-            } else {
-                bail!("Unable to find child in parent body")
-            }
-        }
-        StmtKind::Try {
-            body,
-            handlers,
-            orelse,
-            finalbody,
-        }
-        | StmtKind::TryStar {
-            body,
-            handlers,
-            orelse,
-            finalbody,
-        } => {
-            if body.iter().contains(child) {
-                Ok(has_single_child(body, deleted))
-            } else if orelse.iter().contains(child) {
-                Ok(has_single_child(orelse, deleted))
-            } else if finalbody.iter().contains(child) {
-                Ok(has_single_child(finalbody, deleted))
-            } else if let Some(body) = handlers.iter().find_map(|handler| match &handler.node {
-                ExcepthandlerKind::ExceptHandler { body, .. } => {
-                    if body.iter().contains(child) {
-                        Some(body)
-                    } else {
-                        None
-                    }
-                }
-            }) {
-                Ok(has_single_child(body, deleted))
-            } else {
-                bail!("Unable to find child in parent body")
-            }
-        }
-        StmtKind::Match { cases, .. } => {
-            if let Some(body) = cases.iter().find_map(|case| {
-                if case.body.iter().contains(child) {
-                    Some(&case.body)
-                } else {
-                    None
-                }
-            }) {
-                Ok(has_single_child(body, deleted))
-            } else {
-                bail!("Unable to find child in parent body")
-            }
-        }
-        _ => bail!("Unable to find child in parent body"),
-    }
-}
-
-/// 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<TextSize> {
-    let contents = locator.after(stmt.end());
-
-    for line in NewlineWithTrailingNewline::from(contents) {
-        let trimmed = line.trim_start();
-
-        if trimmed.starts_with(';') {
-            let colon_offset = line.text_len() - trimmed.text_len();
-            return Some(stmt.end() + line.start() + colon_offset);
-        }
-
-        if !trimmed.starts_with('\\') {
-            break;
-        }
-    }
-    None
-}
-
-/// Find the next valid break for a `Stmt` after a semicolon.
-fn next_stmt_break(semicolon: TextSize, locator: &Locator) -> TextSize {
-    let start_location = semicolon + TextSize::from(1);
-
-    let contents = &locator.contents()[usize::from(start_location)..];
-    for line in NewlineWithTrailingNewline::from(contents) {
-        let trimmed = line.trim();
-        // Skip past any continuations.
-        if trimmed.starts_with('\\') {
-            continue;
-        }
-
-        return start_location
-            + if trimmed.is_empty() {
-                // If the line is empty, then despite the previous statement ending in a
-                // semicolon, we know that it's not a multi-statement line.
-                line.start()
-            } else {
-                // Otherwise, find the start of the next statement. (Or, anything that isn't
-                // whitespace.)
-                let relative_offset = line.find(|c: char| !c.is_whitespace()).unwrap();
-                line.start() + TextSize::try_from(relative_offset).unwrap()
-            };
-    }
-
-    locator.line_end(start_location)
-}
-
-/// Return `true` if a `Stmt` occurs at the end of a file.
-fn is_end_of_file(stmt: &Stmt, locator: &Locator) -> bool {
-    stmt.end() == locator.contents().text_len()
-}
-
-/// Return the `Fix` to use when deleting a `Stmt`.
-///
-/// In some cases, this is as simple as deleting the `Range` of the `Stmt`
-/// itself. However, there are a few exceptions:
-/// - If the `Stmt` is _not_ the terminal statement in a multi-statement line,
-///   we need to delete up to the start of the next statement (and avoid
-///   deleting any content that precedes the statement).
-/// - If the `Stmt` is the terminal statement in a multi-statement line, we need
-///   to avoid deleting any content that precedes the statement.
-/// - If the `Stmt` has no trailing and leading content, then it's convenient to
-///   remove the entire start and end lines.
-/// - If the `Stmt` is the last statement in its parent body, replace it with a
-///   `pass` instead.
-pub fn delete_stmt(
-    stmt: &Stmt,
-    parent: Option<&Stmt>,
-    deleted: &[&Stmt],
-    locator: &Locator,
-    indexer: &Indexer,
-    stylist: &Stylist,
-) -> Result<Edit> {
-    if parent
-        .map(|parent| is_lone_child(stmt, parent, deleted))
-        .map_or(Ok(None), |v| v.map(Some))?
-        .unwrap_or_default()
-    {
-        // If removing this node would lead to an invalid syntax tree, replace
-        // it with a `pass`.
-        Ok(Edit::range_replacement("pass".to_string(), stmt.range()))
-    } else {
-        Ok(if let Some(semicolon) = trailing_semicolon(stmt, locator) {
-            let next = next_stmt_break(semicolon, locator);
-            Edit::deletion(stmt.start(), next)
-        } else if helpers::has_leading_content(stmt, locator) {
-            Edit::range_deletion(stmt.range())
-        } else if helpers::preceded_by_continuation(stmt, indexer, locator) {
-            if is_end_of_file(stmt, locator) && locator.is_at_start_of_line(stmt.start()) {
-                // Special-case: a file can't end in a continuation.
-                Edit::range_replacement(stylist.line_ending().to_string(), stmt.range())
-            } else {
-                Edit::range_deletion(stmt.range())
-            }
-        } else {
-            let range = locator.full_lines_range(stmt.range());
-            Edit::range_deletion(range)
-        })
-    }
-}
-
-/// Generate a `Fix` to remove any unused imports from an `import` statement.
-pub fn remove_unused_imports<'a>(
-    unused_imports: impl Iterator<Item = &'a str>,
-    stmt: &Stmt,
-    parent: Option<&Stmt>,
-    deleted: &[&Stmt],
-    locator: &Locator,
-    indexer: &Indexer,
-    stylist: &Stylist,
-) -> Result<Edit> {
-    let module_text = locator.slice(stmt.range());
-    let mut tree = match_module(module_text)?;
-
-    let Some(Statement::Simple(body)) = tree.body.first_mut() else {
-        bail!("Expected Statement::Simple");
-    };
-
-    let (aliases, import_module) = match body.body.first_mut() {
-        Some(SmallStatement::Import(import_body)) => (&mut import_body.names, None),
-        Some(SmallStatement::ImportFrom(import_body)) => {
-            if let ImportNames::Aliases(names) = &mut import_body.names {
-                (
-                    names,
-                    Some((&import_body.relative, import_body.module.as_ref())),
-                )
-            } else if let ImportNames::Star(..) = &import_body.names {
-                // Special-case: if the import is a `from ... import *`, then we delete the
-                // entire statement.
-                let mut found_star = false;
-                for unused_import in unused_imports {
-                    let full_name = match import_body.module.as_ref() {
-                        Some(module_name) => format!("{}.*", compose_module_path(module_name)),
-                        None => "*".to_string(),
-                    };
-                    if unused_import == full_name {
-                        found_star = true;
-                    } else {
-                        bail!(
-                            "Expected \"*\" for unused import (got: \"{}\")",
-                            unused_import
-                        );
-                    }
-                }
-                if !found_star {
-                    bail!("Expected \'*\' for unused import");
-                }
-                return delete_stmt(stmt, parent, deleted, locator, indexer, stylist);
-            } else {
-                bail!("Expected: ImportNames::Aliases | ImportNames::Star");
-            }
-        }
-        _ => bail!("Expected: SmallStatement::ImportFrom | SmallStatement::Import"),
-    };
-
-    // Preserve the trailing comma (or not) from the last entry.
-    let trailing_comma = aliases.last().and_then(|alias| alias.comma.clone());
-
-    for unused_import in unused_imports {
-        let alias_index = aliases.iter().position(|alias| {
-            let full_name = match import_module {
-                Some((relative, module)) => {
-                    let module = module.map(compose_module_path);
-                    let member = compose_module_path(&alias.name);
-                    let mut full_name = String::with_capacity(
-                        relative.len()
-                            + module.as_ref().map_or(0, std::string::String::len)
-                            + member.len()
-                            + 1,
-                    );
-                    for _ in 0..relative.len() {
-                        full_name.push('.');
-                    }
-                    if let Some(module) = module {
-                        full_name.push_str(&module);
-                        full_name.push('.');
-                    }
-                    full_name.push_str(&member);
-                    full_name
-                }
-                None => compose_module_path(&alias.name),
-            };
-            full_name == unused_import
-        });
-
-        if let Some(index) = alias_index {
-            aliases.remove(index);
-        }
-    }
-
-    // But avoid destroying any trailing comments.
-    if let Some(alias) = aliases.last_mut() {
-        let has_comment = if let Some(comma) = &alias.comma {
-            match &comma.whitespace_after {
-                ParenthesizableWhitespace::SimpleWhitespace(_) => false,
-                ParenthesizableWhitespace::ParenthesizedWhitespace(whitespace) => {
-                    whitespace.first_line.comment.is_some()
-                }
-            }
-        } else {
-            false
-        };
-        if !has_comment {
-            alias.comma = trailing_comma;
-        }
-    }
-
-    if aliases.is_empty() {
-        delete_stmt(stmt, parent, deleted, locator, indexer, stylist)
-    } else {
-        let mut state = CodegenState {
-            default_newline: &stylist.line_ending(),
-            default_indent: stylist.indentation(),
-            ..CodegenState::default()
-        };
-        tree.codegen(&mut state);
-
-        Ok(Edit::range_replacement(state.to_string(), stmt.range()))
-    }
-}
-
-/// Generic function to remove arguments or keyword arguments in function
-/// calls and class definitions. (For classes `args` should be considered
-/// `bases`)
-///
-/// Supports the removal of parentheses when this is the only (kw)arg left.
-/// For this behavior, set `remove_parentheses` to `true`.
-pub fn remove_argument(
-    locator: &Locator,
-    call_at: TextSize,
-    expr_range: TextRange,
-    args: &[Expr],
-    keywords: &[Keyword],
-    remove_parentheses: bool,
-) -> Result<Edit> {
-    // TODO(sbrugman): Preserve trailing comments.
-    let contents = locator.after(call_at);
-
-    let mut fix_start = None;
-    let mut fix_end = None;
-
-    let n_arguments = keywords.len() + args.len();
-    if n_arguments == 0 {
-        bail!("No arguments or keywords to remove");
-    }
-
-    if n_arguments == 1 {
-        // Case 1: there is only one argument.
-        let mut count: usize = 0;
-        for (tok, range) in lexer::lex_located(contents, Mode::Module, call_at).flatten() {
-            if matches!(tok, Tok::Lpar) {
-                if count == 0 {
-                    fix_start = Some(if remove_parentheses {
-                        range.start()
-                    } else {
-                        range.start() + TextSize::from(1)
-                    });
-                }
-                count += 1;
-            }
-
-            if matches!(tok, Tok::Rpar) {
-                count -= 1;
-                if count == 0 {
-                    fix_end = Some(if remove_parentheses {
-                        range.end()
-                    } else {
-                        range.end() - TextSize::from(1)
-                    });
-                    break;
-                }
-            }
-        }
-    } else if args
-        .iter()
-        .map(Expr::start)
-        .chain(keywords.iter().map(Keyword::start))
-        .any(|location| location > expr_range.start())
-    {
-        // Case 2: argument or keyword is _not_ the last node.
-        let mut seen_comma = false;
-        for (tok, range) in lexer::lex_located(contents, Mode::Module, call_at).flatten() {
-            if seen_comma {
-                if matches!(tok, Tok::NonLogicalNewline) {
-                    // Also delete any non-logical newlines after the comma.
-                    continue;
-                }
-                fix_end = Some(if matches!(tok, Tok::Newline) {
-                    range.end()
-                } else {
-                    range.start()
-                });
-                break;
-            }
-            if range.start() == expr_range.start() {
-                fix_start = Some(range.start());
-            }
-            if fix_start.is_some() && matches!(tok, Tok::Comma) {
-                seen_comma = true;
-            }
-        }
-    } else {
-        // Case 3: argument or keyword is the last node, so we have to find the last
-        // comma in the stmt.
-        for (tok, range) in lexer::lex_located(contents, Mode::Module, call_at).flatten() {
-            if range.start() == expr_range.start() {
-                fix_end = Some(expr_range.end());
-                break;
-            }
-            if matches!(tok, Tok::Comma) {
-                fix_start = Some(range.start());
-            }
-        }
-    }
-
-    match (fix_start, fix_end) {
-        (Some(start), Some(end)) => Ok(Edit::deletion(start, end)),
-        _ => {
-            bail!("No fix could be constructed")
-        }
-    }
-}
-
-/// Generate an [`Edit`] to reference the given symbol. Returns the [`Edit`] necessary to make the
-/// symbol available in the current scope along with the bound name of the symbol.
-///
-/// For example, assuming `module` is `"functools"` and `member` is `"lru_cache"`, this function
-/// could return an [`Edit`] to add `import functools` to the top of the file, alongside with the
-/// name on which the `lru_cache` symbol would be made available (`"functools.lru_cache"`).
-///
-/// Attempts to reuse existing imports when possible.
-pub fn get_or_import_symbol(
-    module: &str,
-    member: &str,
-    context: &Context,
-    importer: &Importer,
-    locator: &Locator,
-) -> Result<(Edit, String)> {
-    if let Some((source, binding)) = context.resolve_qualified_import_name(module, member) {
-        // If the symbol is already available in the current scope, use it.
-        //
-        // We also add a no-nop edit to force conflicts with any other fixes that might try to
-        // remove the import. Consider:
-        //
-        // ```py
-        // import sys
-        //
-        // quit()
-        // ```
-        //
-        // Assume you omit this no-op edit. If you run Ruff with `unused-imports` and
-        // `sys-exit-alias` over this snippet, it will generate two fixes: (1) remove the unused
-        // `sys` import; and (2) replace `quit()` with `sys.exit()`, under the assumption that `sys`
-        // is already imported and available.
-        //
-        // By adding this no-op edit, we force the `unused-imports` fix to conflict with the
-        // `sys-exit-alias` fix, and thus will avoid applying both fixes in the same pass.
-        let import_edit =
-            Edit::range_replacement(locator.slice(source.range()).to_string(), source.range());
-        Ok((import_edit, binding))
-    } else {
-        if let Some(stmt) = importer.get_import_from(module) {
-            // Case 1: `from functools import lru_cache` is in scope, and we're trying to reference
-            // `functools.cache`; thus, we add `cache` to the import, and return `"cache"` as the
-            // bound name.
-            if context
-                .find_binding(member)
-                .map_or(true, |binding| binding.kind.is_builtin())
-            {
-                let import_edit = importer.add_member(stmt, member)?;
-                Ok((import_edit, member.to_string()))
-            } else {
-                bail!(
-                    "Unable to insert `{}` into scope due to name conflict",
-                    member
-                )
-            }
-        } else {
-            // Case 2: No `functools` import is in scope; thus, we add `import functools`, and
-            // return `"functools.cache"` as the bound name.
-            if context
-                .find_binding(module)
-                .map_or(true, |binding| binding.kind.is_builtin())
-            {
-                let import_edit = importer.add_import(&AnyImport::Import(Import::module(module)));
-                Ok((import_edit, format!("{module}.{member}")))
-            } else {
-                bail!(
-                    "Unable to insert `{}` into scope due to name conflict",
-                    module
-                )
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use anyhow::Result;
-    use ruff_text_size::TextSize;
-    use rustpython_parser as parser;
-
-    use ruff_python_ast::source_code::Locator;
-
-    use crate::autofix::actions::{next_stmt_break, trailing_semicolon};
-
-    #[test]
-    fn find_semicolon() -> Result<()> {
-        let contents = "x = 1";
-        let program = parser::parse_program(contents, "<filename>")?;
-        let stmt = program.first().unwrap();
-        let locator = Locator::new(contents);
-        assert_eq!(trailing_semicolon(stmt, &locator), None);
-
-        let contents = "x = 1; y = 1";
-        let program = parser::parse_program(contents, "<filename>")?;
-        let stmt = program.first().unwrap();
-        let locator = Locator::new(contents);
-        assert_eq!(trailing_semicolon(stmt, &locator), Some(TextSize::from(5)));
-
-        let contents = "x = 1 ; y = 1";
-        let program = parser::parse_program(contents, "<filename>")?;
-        let stmt = program.first().unwrap();
-        let locator = Locator::new(contents);
-        assert_eq!(trailing_semicolon(stmt, &locator), Some(TextSize::from(6)));
-
-        let contents = r#"
-x = 1 \
-  ; y = 1
-"#
-        .trim();
-        let program = parser::parse_program(contents, "<filename>")?;
-        let stmt = program.first().unwrap();
-        let locator = Locator::new(contents);
-        assert_eq!(trailing_semicolon(stmt, &locator), Some(TextSize::from(10)));
-
-        Ok(())
-    }
-
-    #[test]
-    fn find_next_stmt_break() {
-        let contents = "x = 1; y = 1";
-        let locator = Locator::new(contents);
-        assert_eq!(
-            next_stmt_break(TextSize::from(4), &locator),
-            TextSize::from(5)
-        );
-
-        let contents = "x = 1 ; y = 1";
-        let locator = Locator::new(contents);
-        assert_eq!(
-            next_stmt_break(TextSize::from(5), &locator),
-            TextSize::from(6)
-        );
-
-        let contents = r#"
-x = 1 \
-  ; y = 1
-"#
-        .trim();
-        let locator = Locator::new(contents);
-        assert_eq!(
-            next_stmt_break(TextSize::from(10), &locator),
-            TextSize::from(12)
-        );
-    }
-}
diff --git a/crates/ruff/src/autofix/codemods.rs b/crates/ruff/src/autofix/codemods.rs
new file mode 100644
index 0000000000000..b73b2d50410ec
--- /dev/null
+++ b/crates/ruff/src/autofix/codemods.rs
@@ -0,0 +1,214 @@
+//! Interface for editing code snippets. These functions take statements or expressions as input,
+//! and return the modified code snippet as output.
+use anyhow::{bail, Result};
+use libcst_native::{
+    Codegen, CodegenState, ImportNames, ParenthesizableWhitespace, SmallStatement, Statement,
+};
+use rustpython_parser::ast::{Ranged, Stmt};
+
+use ruff_python_ast::source_code::{Locator, Stylist};
+
+use crate::cst::helpers::compose_module_path;
+use crate::cst::matchers::match_statement;
+
+/// Glue code to make libcst codegen work with ruff's Stylist
+pub(crate) trait CodegenStylist<'a>: Codegen<'a> {
+    fn codegen_stylist(&self, stylist: &'a Stylist) -> String;
+}
+
+impl<'a, T: Codegen<'a>> CodegenStylist<'a> for T {
+    fn codegen_stylist(&self, stylist: &'a Stylist) -> String {
+        let mut state = CodegenState {
+            default_newline: stylist.line_ending().as_str(),
+            default_indent: stylist.indentation(),
+            ..Default::default()
+        };
+        self.codegen(&mut state);
+        state.to_string()
+    }
+}
+
+/// Given an import statement, remove any imports that are specified in the `imports` iterator.
+///
+/// Returns `Ok(None)` if the statement is empty after removing the imports.
+pub(crate) fn remove_imports<'a>(
+    imports: impl Iterator<Item = &'a str>,
+    stmt: &Stmt,
+    locator: &Locator,
+    stylist: &Stylist,
+) -> Result<Option<String>> {
+    let module_text = locator.slice(stmt.range());
+    let mut tree = match_statement(module_text)?;
+
+    let Statement::Simple(body) = &mut tree else {
+        bail!("Expected Statement::Simple");
+    };
+
+    let (aliases, import_module) = match body.body.first_mut() {
+        Some(SmallStatement::Import(import_body)) => (&mut import_body.names, None),
+        Some(SmallStatement::ImportFrom(import_body)) => {
+            if let ImportNames::Aliases(names) = &mut import_body.names {
+                (
+                    names,
+                    Some((&import_body.relative, import_body.module.as_ref())),
+                )
+            } else if let ImportNames::Star(..) = &import_body.names {
+                // Special-case: if the import is a `from ... import *`, then we delete the
+                // entire statement.
+                let mut found_star = false;
+                for import in imports {
+                    let qualified_name = match import_body.module.as_ref() {
+                        Some(module_name) => format!("{}.*", compose_module_path(module_name)),
+                        None => "*".to_string(),
+                    };
+                    if import == qualified_name {
+                        found_star = true;
+                    } else {
+                        bail!("Expected \"*\" for unused import (got: \"{}\")", import);
+                    }
+                }
+                if !found_star {
+                    bail!("Expected \'*\' for unused import");
+                }
+                return Ok(None);
+            } else {
+                bail!("Expected: ImportNames::Aliases | ImportNames::Star");
+            }
+        }
+        _ => bail!("Expected: SmallStatement::ImportFrom | SmallStatement::Import"),
+    };
+
+    // Preserve the trailing comma (or not) from the last entry.
+    let trailing_comma = aliases.last().and_then(|alias| alias.comma.clone());
+
+    for import in imports {
+        let alias_index = aliases.iter().position(|alias| {
+            let qualified_name = match import_module {
+                Some((relative, module)) => {
+                    let module = module.map(compose_module_path);
+                    let member = compose_module_path(&alias.name);
+                    let mut qualified_name = String::with_capacity(
+                        relative.len() + module.as_ref().map_or(0, String::len) + member.len() + 1,
+                    );
+                    for _ in 0..relative.len() {
+                        qualified_name.push('.');
+                    }
+                    if let Some(module) = module {
+                        qualified_name.push_str(&module);
+                        qualified_name.push('.');
+                    }
+                    qualified_name.push_str(&member);
+                    qualified_name
+                }
+                None => compose_module_path(&alias.name),
+            };
+            qualified_name == import
+        });
+
+        if let Some(index) = alias_index {
+            aliases.remove(index);
+        }
+    }
+
+    // But avoid destroying any trailing comments.
+    if let Some(alias) = aliases.last_mut() {
+        let has_comment = if let Some(comma) = &alias.comma {
+            match &comma.whitespace_after {
+                ParenthesizableWhitespace::SimpleWhitespace(_) => false,
+                ParenthesizableWhitespace::ParenthesizedWhitespace(whitespace) => {
+                    whitespace.first_line.comment.is_some()
+                }
+            }
+        } else {
+            false
+        };
+        if !has_comment {
+            alias.comma = trailing_comma;
+        }
+    }
+
+    if aliases.is_empty() {
+        return Ok(None);
+    }
+
+    Ok(Some(tree.codegen_stylist(stylist)))
+}
+
+/// Given an import statement, remove any imports that are not specified in the `imports` slice.
+///
+/// Returns the modified import statement.
+pub(crate) fn retain_imports(
+    imports: &[&str],
+    stmt: &Stmt,
+    locator: &Locator,
+    stylist: &Stylist,
+) -> Result<String> {
+    let module_text = locator.slice(stmt.range());
+    let mut tree = match_statement(module_text)?;
+
+    let Statement::Simple(body) = &mut tree else {
+        bail!("Expected Statement::Simple");
+    };
+
+    let (aliases, import_module) = match body.body.first_mut() {
+        Some(SmallStatement::Import(import_body)) => (&mut import_body.names, None),
+        Some(SmallStatement::ImportFrom(import_body)) => {
+            if let ImportNames::Aliases(names) = &mut import_body.names {
+                (
+                    names,
+                    Some((&import_body.relative, import_body.module.as_ref())),
+                )
+            } else {
+                bail!("Expected: ImportNames::Aliases");
+            }
+        }
+        _ => bail!("Expected: SmallStatement::ImportFrom | SmallStatement::Import"),
+    };
+
+    // Preserve the trailing comma (or not) from the last entry.
+    let trailing_comma = aliases.last().and_then(|alias| alias.comma.clone());
+
+    aliases.retain(|alias| {
+        imports.iter().any(|import| {
+            let qualified_name = match import_module {
+                Some((relative, module)) => {
+                    let module = module.map(compose_module_path);
+                    let member = compose_module_path(&alias.name);
+                    let mut qualified_name = String::with_capacity(
+                        relative.len() + module.as_ref().map_or(0, String::len) + member.len() + 1,
+                    );
+                    for _ in 0..relative.len() {
+                        qualified_name.push('.');
+                    }
+                    if let Some(module) = module {
+                        qualified_name.push_str(&module);
+                        qualified_name.push('.');
+                    }
+                    qualified_name.push_str(&member);
+                    qualified_name
+                }
+                None => compose_module_path(&alias.name),
+            };
+            qualified_name == *import
+        })
+    });
+
+    // But avoid destroying any trailing comments.
+    if let Some(alias) = aliases.last_mut() {
+        let has_comment = if let Some(comma) = &alias.comma {
+            match &comma.whitespace_after {
+                ParenthesizableWhitespace::SimpleWhitespace(_) => false,
+                ParenthesizableWhitespace::ParenthesizedWhitespace(whitespace) => {
+                    whitespace.first_line.comment.is_some()
+                }
+            }
+        } else {
+            false
+        };
+        if !has_comment {
+            alias.comma = trailing_comma;
+        }
+    }
+
+    Ok(tree.codegen_stylist(stylist))
+}
diff --git a/crates/ruff/src/autofix/edits.rs b/crates/ruff/src/autofix/edits.rs
new file mode 100644
index 0000000000000..e660c0f20b346
--- /dev/null
+++ b/crates/ruff/src/autofix/edits.rs
@@ -0,0 +1,363 @@
+//! Interface for generating autofix edits from higher-level actions (e.g., "remove an argument").
+use anyhow::{bail, Result};
+use ruff_text_size::{TextLen, TextRange, TextSize};
+use rustpython_parser::ast::{self, Excepthandler, Expr, Keyword, Ranged, Stmt};
+use rustpython_parser::{lexer, Mode, Tok};
+
+use ruff_diagnostics::Edit;
+use ruff_newlines::NewlineWithTrailingNewline;
+use ruff_python_ast::helpers;
+use ruff_python_ast::source_code::{Indexer, Locator, Stylist};
+
+use crate::autofix::codemods;
+
+/// Return the `Fix` to use when deleting a `Stmt`.
+///
+/// In some cases, this is as simple as deleting the `Range` of the `Stmt`
+/// itself. However, there are a few exceptions:
+/// - If the `Stmt` is _not_ the terminal statement in a multi-statement line,
+///   we need to delete up to the start of the next statement (and avoid
+///   deleting any content that precedes the statement).
+/// - If the `Stmt` is the terminal statement in a multi-statement line, we need
+///   to avoid deleting any content that precedes the statement.
+/// - If the `Stmt` has no trailing and leading content, then it's convenient to
+///   remove the entire start and end lines.
+/// - If the `Stmt` is the last statement in its parent body, replace it with a
+///   `pass` instead.
+pub(crate) fn delete_stmt(
+    stmt: &Stmt,
+    parent: Option<&Stmt>,
+    locator: &Locator,
+    indexer: &Indexer,
+    stylist: &Stylist,
+) -> Edit {
+    if parent
+        .map(|parent| is_lone_child(stmt, parent))
+        .unwrap_or_default()
+    {
+        // If removing this node would lead to an invalid syntax tree, replace
+        // it with a `pass`.
+        Edit::range_replacement("pass".to_string(), stmt.range())
+    } else {
+        if let Some(semicolon) = trailing_semicolon(stmt, locator) {
+            let next = next_stmt_break(semicolon, locator);
+            Edit::deletion(stmt.start(), next)
+        } else if helpers::has_leading_content(stmt, locator) {
+            Edit::range_deletion(stmt.range())
+        } else if helpers::preceded_by_continuation(stmt, indexer, locator) {
+            if is_end_of_file(stmt, locator) && locator.is_at_start_of_line(stmt.start()) {
+                // Special-case: a file can't end in a continuation.
+                Edit::range_replacement(stylist.line_ending().to_string(), stmt.range())
+            } else {
+                Edit::range_deletion(stmt.range())
+            }
+        } else {
+            let range = locator.full_lines_range(stmt.range());
+            Edit::range_deletion(range)
+        }
+    }
+}
+
+/// Generate a `Fix` to remove the specified imports from an `import` statement.
+pub(crate) fn remove_unused_imports<'a>(
+    unused_imports: impl Iterator<Item = &'a str>,
+    stmt: &Stmt,
+    parent: Option<&Stmt>,
+    locator: &Locator,
+    indexer: &Indexer,
+    stylist: &Stylist,
+) -> Result<Edit> {
+    match codemods::remove_imports(unused_imports, stmt, locator, stylist)? {
+        None => Ok(delete_stmt(stmt, parent, locator, indexer, stylist)),
+        Some(content) => Ok(Edit::range_replacement(content, stmt.range())),
+    }
+}
+
+/// Generic function to remove arguments or keyword arguments in function
+/// calls and class definitions. (For classes `args` should be considered
+/// `bases`)
+///
+/// Supports the removal of parentheses when this is the only (kw)arg left.
+/// For this behavior, set `remove_parentheses` to `true`.
+pub(crate) fn remove_argument(
+    locator: &Locator,
+    call_at: TextSize,
+    expr_range: TextRange,
+    args: &[Expr],
+    keywords: &[Keyword],
+    remove_parentheses: bool,
+) -> Result<Edit> {
+    // TODO(sbrugman): Preserve trailing comments.
+    let contents = locator.after(call_at);
+
+    let mut fix_start = None;
+    let mut fix_end = None;
+
+    let n_arguments = keywords.len() + args.len();
+    if n_arguments == 0 {
+        bail!("No arguments or keywords to remove");
+    }
+
+    if n_arguments == 1 {
+        // Case 1: there is only one argument.
+        let mut count = 0u32;
+        for (tok, range) in lexer::lex_starts_at(contents, Mode::Module, call_at).flatten() {
+            if matches!(tok, Tok::Lpar) {
+                if count == 0 {
+                    fix_start = Some(if remove_parentheses {
+                        range.start()
+                    } else {
+                        range.start() + TextSize::from(1)
+                    });
+                }
+                count = count.saturating_add(1);
+            }
+
+            if matches!(tok, Tok::Rpar) {
+                count = count.saturating_sub(1);
+                if count == 0 {
+                    fix_end = Some(if remove_parentheses {
+                        range.end()
+                    } else {
+                        range.end() - TextSize::from(1)
+                    });
+                    break;
+                }
+            }
+        }
+    } else if args
+        .iter()
+        .map(Expr::start)
+        .chain(keywords.iter().map(Keyword::start))
+        .any(|location| location > expr_range.start())
+    {
+        // Case 2: argument or keyword is _not_ the last node.
+        let mut seen_comma = false;
+        for (tok, range) in lexer::lex_starts_at(contents, Mode::Module, call_at).flatten() {
+            if seen_comma {
+                if matches!(tok, Tok::NonLogicalNewline) {
+                    // Also delete any non-logical newlines after the comma.
+                    continue;
+                }
+                fix_end = Some(if matches!(tok, Tok::Newline) {
+                    range.end()
+                } else {
+                    range.start()
+                });
+                break;
+            }
+            if range.start() == expr_range.start() {
+                fix_start = Some(range.start());
+            }
+            if fix_start.is_some() && matches!(tok, Tok::Comma) {
+                seen_comma = true;
+            }
+        }
+    } else {
+        // Case 3: argument or keyword is the last node, so we have to find the last
+        // comma in the stmt.
+        for (tok, range) in lexer::lex_starts_at(contents, Mode::Module, call_at).flatten() {
+            if range.start() == expr_range.start() {
+                fix_end = Some(expr_range.end());
+                break;
+            }
+            if matches!(tok, Tok::Comma) {
+                fix_start = Some(range.start());
+            }
+        }
+    }
+
+    match (fix_start, fix_end) {
+        (Some(start), Some(end)) => Ok(Edit::deletion(start, end)),
+        _ => {
+            bail!("No fix could be constructed")
+        }
+    }
+}
+
+/// Determine if a vector contains only one, specific element.
+fn is_only<T: PartialEq>(vec: &[T], value: &T) -> bool {
+    vec.len() == 1 && vec[0] == *value
+}
+
+/// Determine if a child is the only statement in its body.
+fn is_lone_child(child: &Stmt, parent: &Stmt) -> bool {
+    match parent {
+        Stmt::FunctionDef(ast::StmtFunctionDef { body, .. })
+        | Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef { body, .. })
+        | Stmt::ClassDef(ast::StmtClassDef { body, .. })
+        | Stmt::With(ast::StmtWith { body, .. })
+        | Stmt::AsyncWith(ast::StmtAsyncWith { body, .. }) => {
+            if is_only(body, child) {
+                return true;
+            }
+        }
+        Stmt::For(ast::StmtFor { body, orelse, .. })
+        | Stmt::AsyncFor(ast::StmtAsyncFor { body, orelse, .. })
+        | Stmt::While(ast::StmtWhile { body, orelse, .. })
+        | Stmt::If(ast::StmtIf { body, orelse, .. }) => {
+            if is_only(body, child) || is_only(orelse, child) {
+                return true;
+            }
+        }
+        Stmt::Try(ast::StmtTry {
+            body,
+            handlers,
+            orelse,
+            finalbody,
+            range: _,
+        })
+        | Stmt::TryStar(ast::StmtTryStar {
+            body,
+            handlers,
+            orelse,
+            finalbody,
+            range: _,
+        }) => {
+            if is_only(body, child)
+                || is_only(orelse, child)
+                || is_only(finalbody, child)
+                || handlers.iter().any(|handler| match handler {
+                    Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler {
+                        body, ..
+                    }) => is_only(body, child),
+                })
+            {
+                return true;
+            }
+        }
+        Stmt::Match(ast::StmtMatch { cases, .. }) => {
+            if cases.iter().any(|case| is_only(&case.body, child)) {
+                return true;
+            }
+        }
+        _ => {}
+    }
+    false
+}
+
+/// 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<TextSize> {
+    let contents = locator.after(stmt.end());
+
+    for line in NewlineWithTrailingNewline::from(contents) {
+        let trimmed = line.trim_start();
+
+        if trimmed.starts_with(';') {
+            let colon_offset = line.text_len() - trimmed.text_len();
+            return Some(stmt.end() + line.start() + colon_offset);
+        }
+
+        if !trimmed.starts_with('\\') {
+            break;
+        }
+    }
+    None
+}
+
+/// Find the next valid break for a `Stmt` after a semicolon.
+fn next_stmt_break(semicolon: TextSize, locator: &Locator) -> TextSize {
+    let start_location = semicolon + TextSize::from(1);
+
+    let contents = &locator.contents()[usize::from(start_location)..];
+    for line in NewlineWithTrailingNewline::from(contents) {
+        let trimmed = line.trim();
+        // Skip past any continuations.
+        if trimmed.starts_with('\\') {
+            continue;
+        }
+
+        return start_location
+            + if trimmed.is_empty() {
+                // If the line is empty, then despite the previous statement ending in a
+                // semicolon, we know that it's not a multi-statement line.
+                line.start()
+            } else {
+                // Otherwise, find the start of the next statement. (Or, anything that isn't
+                // whitespace.)
+                let relative_offset = line.find(|c: char| !c.is_whitespace()).unwrap();
+                line.start() + TextSize::try_from(relative_offset).unwrap()
+            };
+    }
+
+    locator.line_end(start_location)
+}
+
+/// Return `true` if a `Stmt` occurs at the end of a file.
+fn is_end_of_file(stmt: &Stmt, locator: &Locator) -> bool {
+    stmt.end() == locator.contents().text_len()
+}
+
+#[cfg(test)]
+mod tests {
+    use anyhow::Result;
+    use ruff_text_size::TextSize;
+    use rustpython_parser::ast::Suite;
+    use rustpython_parser::Parse;
+
+    use ruff_python_ast::source_code::Locator;
+
+    use crate::autofix::edits::{next_stmt_break, trailing_semicolon};
+
+    #[test]
+    fn find_semicolon() -> Result<()> {
+        let contents = "x = 1";
+        let program = Suite::parse(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = Locator::new(contents);
+        assert_eq!(trailing_semicolon(stmt, &locator), None);
+
+        let contents = "x = 1; y = 1";
+        let program = Suite::parse(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = Locator::new(contents);
+        assert_eq!(trailing_semicolon(stmt, &locator), Some(TextSize::from(5)));
+
+        let contents = "x = 1 ; y = 1";
+        let program = Suite::parse(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = Locator::new(contents);
+        assert_eq!(trailing_semicolon(stmt, &locator), Some(TextSize::from(6)));
+
+        let contents = r#"
+x = 1 \
+  ; y = 1
+"#
+        .trim();
+        let program = Suite::parse(contents, "<filename>")?;
+        let stmt = program.first().unwrap();
+        let locator = Locator::new(contents);
+        assert_eq!(trailing_semicolon(stmt, &locator), Some(TextSize::from(10)));
+
+        Ok(())
+    }
+
+    #[test]
+    fn find_next_stmt_break() {
+        let contents = "x = 1; y = 1";
+        let locator = Locator::new(contents);
+        assert_eq!(
+            next_stmt_break(TextSize::from(4), &locator),
+            TextSize::from(5)
+        );
+
+        let contents = "x = 1 ; y = 1";
+        let locator = Locator::new(contents);
+        assert_eq!(
+            next_stmt_break(TextSize::from(5), &locator),
+            TextSize::from(6)
+        );
+
+        let contents = r#"
+x = 1 \
+  ; y = 1
+"#
+        .trim();
+        let locator = Locator::new(contents);
+        assert_eq!(
+            next_stmt_break(TextSize::from(10), &locator),
+            TextSize::from(12)
+        );
+    }
+}
diff --git a/crates/ruff/src/autofix/mod.rs b/crates/ruff/src/autofix/mod.rs
index 50283071e7af9..df4fe0e69cbe1 100644
--- a/crates/ruff/src/autofix/mod.rs
+++ b/crates/ruff/src/autofix/mod.rs
@@ -1,22 +1,27 @@
 use std::collections::BTreeSet;
 
 use itertools::Itertools;
+use nohash_hasher::IntSet;
 use ruff_text_size::{TextRange, TextSize};
 use rustc_hash::FxHashMap;
 
-use ruff_diagnostics::{Diagnostic, Edit, Fix};
+use ruff_diagnostics::{Diagnostic, Edit, Fix, IsolationLevel};
 use ruff_python_ast::source_code::Locator;
 
 use crate::linter::FixTable;
 use crate::registry::{AsRule, Rule};
 
-pub mod actions;
+pub(crate) mod codemods;
+pub(crate) mod edits;
 
 /// 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)> {
+pub(crate) fn fix_file(
+    diagnostics: &[Diagnostic],
+    locator: &Locator,
+) -> Option<(String, FixTable)> {
     let mut with_fixes = diagnostics
         .iter()
-        .filter(|diag| !diag.fix.is_empty())
+        .filter(|diag| diag.fix.is_some())
         .peekable();
 
     if with_fixes.peek().is_none() {
@@ -34,15 +39,15 @@ fn apply_fixes<'a>(
     let mut output = String::with_capacity(locator.len());
     let mut last_pos: Option<TextSize> = None;
     let mut applied: BTreeSet<&Edit> = BTreeSet::default();
+    let mut isolated: IntSet<u32> = IntSet::default();
     let mut fixed = FxHashMap::default();
 
     for (rule, fix) in diagnostics
         .filter_map(|diagnostic| {
-            if diagnostic.fix.is_empty() {
-                None
-            } else {
-                Some((diagnostic.kind.rule(), &diagnostic.fix))
-            }
+            diagnostic
+                .fix
+                .as_ref()
+                .map(|fix| (diagnostic.kind.rule(), fix))
         })
         .sorted_by(|(rule1, fix1), (rule2, fix2)| cmp_fix(*rule1, *rule2, fix1, fix2))
     {
@@ -62,7 +67,19 @@ fn apply_fixes<'a>(
             continue;
         }
 
-        for edit in fix.edits() {
+        // If this fix requires isolation, and we've already applied another fix in the
+        // same isolation group, skip it.
+        if let IsolationLevel::Group(id) = fix.isolation() {
+            if !isolated.insert(id) {
+                continue;
+            }
+        }
+
+        for edit in fix
+            .edits()
+            .iter()
+            .sorted_unstable_by_key(|edit| edit.start())
+        {
             // Add all contents from `last_pos` to `fix.location`.
             let slice = locator.slice(TextRange::new(last_pos.unwrap_or_default(), edit.start()));
             output.push_str(slice);
@@ -93,6 +110,13 @@ fn cmp_fix(rule1: Rule, rule2: Rule, fix1: &Fix, fix2: &Fix) -> std::cmp::Orderi
             // Apply `EndsInPeriod` fixes before `NewLineAfterLastParagraph` fixes.
             (Rule::EndsInPeriod, Rule::NewLineAfterLastParagraph) => std::cmp::Ordering::Less,
             (Rule::NewLineAfterLastParagraph, Rule::EndsInPeriod) => std::cmp::Ordering::Greater,
+            // Apply `IfElseBlockInsteadOfDictGet` fixes before `IfElseBlockInsteadOfIfExp` fixes.
+            (Rule::IfElseBlockInsteadOfDictGet, Rule::IfElseBlockInsteadOfIfExp) => {
+                std::cmp::Ordering::Less
+            }
+            (Rule::IfElseBlockInsteadOfIfExp, Rule::IfElseBlockInsteadOfDictGet) => {
+                std::cmp::Ordering::Greater
+            }
             _ => std::cmp::Ordering::Equal,
         })
 }
@@ -103,18 +127,20 @@ mod tests {
 
     use ruff_diagnostics::Diagnostic;
     use ruff_diagnostics::Edit;
+    use ruff_diagnostics::Fix;
     use ruff_python_ast::source_code::Locator;
 
     use crate::autofix::apply_fixes;
     use crate::rules::pycodestyle::rules::MissingNewlineAtEndOfFile;
 
+    #[allow(deprecated)]
     fn create_diagnostics(edit: impl IntoIterator<Item = Edit>) -> Vec<Diagnostic> {
         edit.into_iter()
             .map(|edit| Diagnostic {
                 // The choice of rule here is arbitrary.
                 kind: MissingNewlineAtEndOfFile.into(),
                 range: edit.range(),
-                fix: edit.into(),
+                fix: Some(Fix::unspecified(edit)),
                 parent: None,
             })
             .collect()
diff --git a/crates/ruff/src/checkers/ast/deferred.rs b/crates/ruff/src/checkers/ast/deferred.rs
index 61f2135f9fcbd..ab74d512345e3 100644
--- a/crates/ruff/src/checkers/ast/deferred.rs
+++ b/crates/ruff/src/checkers/ast/deferred.rs
@@ -1,25 +1,17 @@
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::{Expr, Stmt};
+use rustpython_parser::ast::Expr;
 
-use ruff_python_ast::types::RefEquality;
-use ruff_python_semantic::analyze::visibility::{Visibility, VisibleScope};
-use ruff_python_semantic::scope::ScopeId;
-
-use crate::checkers::ast::AnnotationContext;
-use crate::docstrings::definition::Definition;
-
-type Context<'a> = (ScopeId, Vec<RefEquality<'a, Stmt>>);
+use ruff_python_semantic::model::Snapshot;
 
 /// A collection of AST nodes that are deferred for later analysis.
 /// Used to, e.g., store functions, whose bodies shouldn't be analyzed until all
 /// module-level definitions have been analyzed.
-#[derive(Default)]
-pub struct Deferred<'a> {
-    pub definitions: Vec<(Definition<'a>, Visibility, Context<'a>)>,
-    pub string_type_definitions: Vec<(TextRange, &'a str, AnnotationContext, Context<'a>)>,
-    pub type_definitions: Vec<(&'a Expr, AnnotationContext, Context<'a>)>,
-    pub functions: Vec<(&'a Stmt, Context<'a>, VisibleScope)>,
-    pub lambdas: Vec<(&'a Expr, Context<'a>)>,
-    pub for_loops: Vec<(&'a Stmt, Context<'a>)>,
-    pub assignments: Vec<Context<'a>>,
+#[derive(Debug, Default)]
+pub(crate) struct Deferred<'a> {
+    pub(crate) string_type_definitions: Vec<(TextRange, &'a str, Snapshot)>,
+    pub(crate) future_type_definitions: Vec<(&'a Expr, Snapshot)>,
+    pub(crate) functions: Vec<Snapshot>,
+    pub(crate) lambdas: Vec<(&'a Expr, Snapshot)>,
+    pub(crate) for_loops: Vec<Snapshot>,
+    pub(crate) assignments: Vec<Snapshot>,
 }
diff --git a/crates/ruff/src/checkers/ast/mod.rs b/crates/ruff/src/checkers/ast/mod.rs
index 14febab297f99..8b210f721dc9d 100644
--- a/crates/ruff/src/checkers/ast/mod.rs
+++ b/crates/ruff/src/checkers/ast/mod.rs
@@ -3,91 +3,91 @@ use std::path::Path;
 use itertools::Itertools;
 use log::error;
 use ruff_text_size::{TextRange, TextSize};
-use rustc_hash::{FxHashMap, FxHashSet};
-use rustpython_common::cformat::{CFormatError, CFormatErrorType};
+use rustpython_format::cformat::{CFormatError, CFormatErrorType};
 use rustpython_parser::ast::{
-    Arg, Arguments, Comprehension, Constant, Excepthandler, ExcepthandlerKind, Expr, ExprContext,
-    ExprKind, KeywordData, Located, Operator, Pattern, PatternKind, Stmt, StmtKind, Suite,
+    self, Arg, Arguments, Comprehension, Constant, Excepthandler, Expr, ExprContext, Keyword,
+    Operator, Pattern, Ranged, Stmt, Suite, Unaryop,
 };
 
-use ruff_diagnostics::Diagnostic;
+use ruff_diagnostics::{Diagnostic, IsolationLevel};
 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, RefEquality};
-use ruff_python_ast::typing::parse_type_annotation;
+use ruff_python_ast::source_code::{Generator, Indexer, Locator, Quote, Stylist};
+use ruff_python_ast::str::trailing_quote;
+use ruff_python_ast::types::Node;
+use ruff_python_ast::typing::{parse_type_annotation, AnnotationKind};
 use ruff_python_ast::visitor::{walk_excepthandler, walk_pattern, Visitor};
-use ruff_python_ast::{branch_detection, cast, helpers, str, visitor};
+use ruff_python_ast::{cast, helpers, str, visitor};
 use ruff_python_semantic::analyze;
+use ruff_python_semantic::analyze::branch_detection;
 use ruff_python_semantic::analyze::typing::{Callable, SubscriptKind};
+use ruff_python_semantic::analyze::visibility::ModuleSource;
 use ruff_python_semantic::binding::{
-    Binding, BindingId, BindingKind, Exceptions, ExecutionContext, Export, FromImportation,
+    Binding, BindingFlags, BindingId, BindingKind, Exceptions, Export, FromImportation,
     Importation, StarImportation, SubmoduleImportation,
 };
-use ruff_python_semantic::context::Context;
-use ruff_python_semantic::scope::{ClassDef, FunctionDef, Lambda, Scope, ScopeId, ScopeKind};
+use ruff_python_semantic::context::ExecutionContext;
+use ruff_python_semantic::definition::{ContextualizedDefinition, Module, ModuleKind};
+use ruff_python_semantic::globals::Globals;
+use ruff_python_semantic::model::{ResolvedReference, SemanticModel, SemanticModelFlags};
+use ruff_python_semantic::scope::{Scope, ScopeId, ScopeKind};
 use ruff_python_stdlib::builtins::{BUILTINS, MAGIC_GLOBALS};
 use ruff_python_stdlib::path::is_python_stub_file;
 
 use crate::checkers::ast::deferred::Deferred;
-use crate::docstrings::definition::{
-    transition_scope, Definition, DefinitionKind, Docstring, Documentable,
-};
+use crate::docstrings::extraction::ExtractionTarget;
+use crate::docstrings::Docstring;
 use crate::fs::relativize_path;
 use crate::importer::Importer;
 use crate::noqa::NoqaMapping;
-use crate::registry::{AsRule, Rule};
+use crate::registry::Rule;
+use crate::rules::flake8_builtins::helpers::AnyShadowing;
 use crate::rules::{
-    flake8_2020, flake8_annotations, flake8_bandit, flake8_blind_except, flake8_boolean_trap,
-    flake8_bugbear, flake8_builtins, flake8_comprehensions, flake8_datetimez, flake8_debugger,
-    flake8_django, flake8_errmsg, flake8_gettext, flake8_implicit_str_concat,
-    flake8_import_conventions, flake8_logging_format, flake8_pie, flake8_print, flake8_pyi,
-    flake8_pytest_style, flake8_raise, flake8_return, flake8_self, flake8_simplify,
-    flake8_tidy_imports, flake8_type_checking, flake8_unused_arguments, flake8_use_pathlib, mccabe,
-    numpy, pandas_vet, pep8_naming, pycodestyle, pydocstyle, pyflakes, pygrep_hooks, pylint,
-    pyupgrade, ruff, tryceratops,
+    airflow, flake8_2020, flake8_annotations, flake8_async, flake8_bandit, flake8_blind_except,
+    flake8_boolean_trap, flake8_bugbear, flake8_builtins, flake8_comprehensions, flake8_datetimez,
+    flake8_debugger, flake8_django, flake8_errmsg, flake8_future_annotations, flake8_gettext,
+    flake8_implicit_str_concat, flake8_import_conventions, flake8_logging_format, flake8_pie,
+    flake8_print, flake8_pyi, flake8_pytest_style, flake8_raise, flake8_return, flake8_self,
+    flake8_simplify, flake8_tidy_imports, flake8_type_checking, flake8_unused_arguments,
+    flake8_use_pathlib, flynt, mccabe, numpy, pandas_vet, pep8_naming, pycodestyle, pydocstyle,
+    pyflakes, pygrep_hooks, pylint, pyupgrade, ruff, tryceratops,
 };
 use crate::settings::types::PythonVersion;
 use crate::settings::{flags, Settings};
-use crate::{autofix, docstrings, noqa, warn_user};
+use crate::{docstrings, noqa, warn_user};
 
 mod deferred;
 
-type AnnotationContext = (bool, bool);
-
-pub struct Checker<'a> {
+pub(crate) struct Checker<'a> {
     // Settings, static metadata, etc.
-    pub path: &'a Path,
-    module_path: Option<Vec<String>>,
+    path: &'a Path,
+    module_path: Option<&'a [String]>,
     package: Option<&'a Path>,
     is_stub: bool,
-    autofix: flags::Autofix,
     noqa: flags::Noqa,
-    pub settings: &'a Settings,
-    pub noqa_line_for: &'a NoqaMapping,
-    pub locator: &'a Locator<'a>,
-    pub stylist: &'a Stylist<'a>,
-    pub indexer: &'a Indexer,
-    pub importer: Importer<'a>,
+    noqa_line_for: &'a NoqaMapping,
+    pub(crate) settings: &'a Settings,
+    pub(crate) locator: &'a Locator<'a>,
+    pub(crate) stylist: &'a Stylist<'a>,
+    pub(crate) indexer: &'a Indexer,
+    pub(crate) importer: Importer<'a>,
     // Stateful fields.
-    pub ctx: Context<'a>,
-    pub deferred: Deferred<'a>,
-    pub diagnostics: Vec<Diagnostic>,
-    pub deletions: FxHashSet<RefEquality<'a, Stmt>>,
+    semantic_model: SemanticModel<'a>,
+    deferred: Deferred<'a>,
+    pub(crate) diagnostics: Vec<Diagnostic>,
     // Check-specific state.
-    pub flake8_bugbear_seen: Vec<&'a Expr>,
+    pub(crate) flake8_bugbear_seen: Vec<&'a Expr>,
 }
 
 impl<'a> Checker<'a> {
     #[allow(clippy::too_many_arguments)]
-    pub fn new(
+    pub(crate) fn new(
         settings: &'a Settings,
         noqa_line_for: &'a NoqaMapping,
-        autofix: flags::Autofix,
         noqa: flags::Noqa,
         path: &'a Path,
         package: Option<&'a Path>,
-        module_path: Option<Vec<String>>,
+        module: Module<'a>,
         locator: &'a Locator,
         stylist: &'a Stylist,
         indexer: &'a Indexer,
@@ -96,34 +96,31 @@ impl<'a> Checker<'a> {
         Checker {
             settings,
             noqa_line_for,
-            autofix,
             noqa,
             path,
             package,
-            module_path: module_path.clone(),
+            module_path: module.path(),
             is_stub: is_python_stub_file(path),
             locator,
             stylist,
             indexer,
             importer,
-            ctx: Context::new(&settings.typing_modules, path, module_path),
+            semantic_model: SemanticModel::new(&settings.typing_modules, path, module),
             deferred: Deferred::default(),
             diagnostics: Vec::default(),
-            deletions: FxHashSet::default(),
             flake8_bugbear_seen: Vec::default(),
         }
     }
 }
 
 impl<'a> Checker<'a> {
-    /// Return `true` if a patch should be generated under the given autofix
-    /// `Mode`.
-    pub fn patch(&self, code: Rule) -> bool {
-        self.autofix.into() && self.settings.rules.should_fix(code)
+    /// Return `true` if a patch should be generated for a given [`Rule`].
+    pub(crate) fn patch(&self, code: Rule) -> bool {
+        self.settings.rules.should_fix(code)
     }
 
-    /// Return `true` if a `Rule` is disabled by a `noqa` directive.
-    pub fn rule_is_ignored(&self, code: Rule, offset: TextSize) -> bool {
+    /// Return `true` if a [`Rule`] is disabled by a `noqa` directive.
+    pub(crate) fn rule_is_ignored(&self, code: Rule, offset: TextSize) -> bool {
         // TODO(charlie): `noqa` directives are mostly enforced in `check_lines.rs`.
         // However, in rare cases, we need to check them here. For example, when
         // removing unused imports, we create a single fix that's applied to all
@@ -136,38 +133,76 @@ impl<'a> Checker<'a> {
         }
         noqa::rule_is_ignored(code, offset, self.noqa_line_for, self.locator)
     }
-}
 
-/// Visit an [`Expr`], and treat it as a type definition.
-macro_rules! visit_type_definition {
-    ($self:ident, $expr:expr) => {{
-        let prev_in_type_definition = $self.ctx.in_type_definition;
-        $self.ctx.in_type_definition = true;
-        $self.visit_expr($expr);
-        $self.ctx.in_type_definition = prev_in_type_definition;
-    }};
-}
+    /// Create a [`Generator`] to generate source code based on the current AST state.
+    pub(crate) fn generator(&self) -> Generator {
+        fn quote_style(
+            model: &SemanticModel,
+            locator: &Locator,
+            indexer: &Indexer,
+        ) -> Option<Quote> {
+            if !model.in_f_string() {
+                return None;
+            }
 
-/// Visit an [`Expr`], and treat it as _not_ a type definition.
-macro_rules! visit_non_type_definition {
-    ($self:ident, $expr:expr) => {{
-        let prev_in_type_definition = $self.ctx.in_type_definition;
-        $self.ctx.in_type_definition = false;
-        $self.visit_expr($expr);
-        $self.ctx.in_type_definition = prev_in_type_definition;
-    }};
-}
+            // Find the quote character used to start the containing f-string.
+            let expr = model.expr()?;
+            let string_range = indexer.f_string_range(expr.start())?;
+            let trailing_quote = trailing_quote(locator.slice(string_range))?;
+
+            // Invert the quote character, if it's a single quote.
+            match *trailing_quote {
+                "'" => Some(Quote::Double),
+                "\"" => Some(Quote::Single),
+                _ => None,
+            }
+        }
+
+        Generator::new(
+            self.stylist.indentation(),
+            quote_style(&self.semantic_model, self.locator, self.indexer)
+                .unwrap_or(self.stylist.quote()),
+            self.stylist.line_ending(),
+        )
+    }
+
+    /// Returns the [`IsolationLevel`] for fixes in the current context.
+    ///
+    /// The primary use-case for fix isolation is to ensure that we don't delete all statements
+    /// in a given indented block, which would cause a syntax error. We therefore need to ensure
+    /// that we delete at most one statement per indented block per fixer pass. Fix isolation should
+    /// thus be applied whenever we delete a statement, but can otherwise be omitted.
+    pub(crate) fn isolation(&self, parent: Option<&Stmt>) -> IsolationLevel {
+        parent
+            .and_then(|stmt| self.semantic_model.stmts.node_id(stmt))
+            .map_or(IsolationLevel::default(), |node_id| {
+                IsolationLevel::Group(node_id.into())
+            })
+    }
+
+    pub(crate) const fn semantic_model(&self) -> &SemanticModel<'a> {
+        &self.semantic_model
+    }
+
+    pub(crate) const fn package(&self) -> Option<&'a Path> {
+        self.package
+    }
+
+    pub(crate) const fn path(&self) -> &'a Path {
+        self.path
+    }
+
+    /// Returns whether the given rule should be checked.
+    #[inline]
+    pub(crate) const fn enabled(&self, rule: Rule) -> bool {
+        self.settings.rules.enabled(rule)
+    }
 
-/// 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;
-    }};
+    /// Returns whether any of the given rules should be checked.
+    #[inline]
+    pub(crate) const fn any_enabled(&self, rules: &[Rule]) -> bool {
+        self.settings.rules.any_enabled(rules)
+    }
 }
 
 impl<'a, 'b> Visitor<'b> for Checker<'a>
@@ -175,114 +210,115 @@ where
     'b: 'a,
 {
     fn visit_stmt(&mut self, stmt: &'b Stmt) {
-        self.ctx.push_parent(stmt);
+        self.semantic_model.push_stmt(stmt);
 
         // Track whether we've seen docstrings, non-imports, etc.
-        match &stmt.node {
-            StmtKind::ImportFrom { module, .. } => {
+        match stmt {
+            Stmt::ImportFrom(ast::StmtImportFrom { module, names, .. }) => {
                 // Allow __future__ imports until we see a non-__future__ import.
-                if self.ctx.futures_allowed {
-                    if let Some(module) = module {
-                        if module != "__future__" {
-                            self.ctx.futures_allowed = false;
-                        }
+                if let Some("__future__") = module.as_deref() {
+                    if names
+                        .iter()
+                        .any(|alias| alias.name.as_str() == "annotations")
+                    {
+                        self.semantic_model.flags |= SemanticModelFlags::FUTURE_ANNOTATIONS;
                     }
+                } else {
+                    self.semantic_model.flags |= SemanticModelFlags::FUTURES_BOUNDARY;
                 }
             }
-            StmtKind::Import { .. } => {
-                self.ctx.futures_allowed = false;
+            Stmt::Import(_) => {
+                self.semantic_model.flags |= SemanticModelFlags::FUTURES_BOUNDARY;
             }
             _ => {
-                self.ctx.futures_allowed = false;
-                if !self.ctx.seen_import_boundary
+                self.semantic_model.flags |= SemanticModelFlags::FUTURES_BOUNDARY;
+                if !self.semantic_model.seen_import_boundary()
                     && !helpers::is_assignment_to_a_dunder(stmt)
-                    && !helpers::in_nested_block(self.ctx.parents.iter().rev().map(Into::into))
+                    && !helpers::in_nested_block(self.semantic_model.parents())
                 {
-                    self.ctx.seen_import_boundary = true;
+                    self.semantic_model.flags |= SemanticModelFlags::IMPORT_BOUNDARY;
                 }
             }
         }
 
         // Track each top-level import, to guide import insertions.
-        if matches!(
-            &stmt.node,
-            StmtKind::Import { .. } | StmtKind::ImportFrom { .. }
-        ) {
-            if self.ctx.scope_id.is_global() && self.ctx.current_stmt_parent().is_none() {
+        if matches!(stmt, Stmt::Import(_) | Stmt::ImportFrom(_)) {
+            if self.semantic_model.at_top_level() {
                 self.importer.visit_import(stmt);
             }
         }
 
+        // Store the flags prior to any further descent, so that we can restore them after visiting
+        // the node.
+        let flags_snapshot = self.semantic_model.flags;
+
         // Pre-visit.
-        match &stmt.node {
-            StmtKind::Global { names } => {
+        match stmt {
+            Stmt::Global(ast::StmtGlobal { names, range: _ }) => {
                 let ranges: Vec<TextRange> = helpers::find_names(stmt, self.locator).collect();
-                if !self.ctx.scope_id.is_global() {
-                    // Add the binding to the current scope.
-                    let context = self.ctx.execution_context();
-                    let exceptions = self.ctx.exceptions();
-                    let scope = &mut self.ctx.scopes[self.ctx.scope_id];
-                    let usage = Some((self.ctx.scope_id, stmt.range()));
+                if !self.semantic_model.scope_id.is_global() {
                     for (name, range) in names.iter().zip(ranges.iter()) {
-                        let id = self.ctx.bindings.push(Binding {
-                            kind: BindingKind::Global,
-                            runtime_usage: None,
-                            synthetic_usage: usage,
-                            typing_usage: None,
-                            range: *range,
-                            source: Some(RefEquality(stmt)),
-                            context,
-                            exceptions,
-                        });
-                        scope.add(name, id);
+                        // Add a binding to the current scope.
+                        let binding_id = self.semantic_model.push_binding(
+                            *range,
+                            BindingKind::Global,
+                            BindingFlags::empty(),
+                        );
+                        let scope = self.semantic_model.scope_mut();
+                        scope.add(name, binding_id);
                     }
                 }
 
-                if self.settings.rules.enabled(Rule::AmbiguousVariableName) {
+                if self.enabled(Rule::AmbiguousVariableName) {
                     self.diagnostics
                         .extend(names.iter().zip(ranges.iter()).filter_map(|(name, range)| {
                             pycodestyle::rules::ambiguous_variable_name(name, *range)
                         }));
                 }
             }
-            StmtKind::Nonlocal { names } => {
+            Stmt::Nonlocal(ast::StmtNonlocal { names, range: _ }) => {
                 let ranges: Vec<TextRange> = helpers::find_names(stmt, self.locator).collect();
-                if !self.ctx.scope_id.is_global() {
-                    let context = self.ctx.execution_context();
-                    let exceptions = self.ctx.exceptions();
-                    let scope = &mut self.ctx.scopes[self.ctx.scope_id];
-                    let usage = Some((self.ctx.scope_id, stmt.range()));
+                if !self.semantic_model.scope_id.is_global() {
                     for (name, range) in names.iter().zip(ranges.iter()) {
                         // Add a binding to the current scope.
-                        let id = self.ctx.bindings.push(Binding {
-                            kind: BindingKind::Nonlocal,
-                            runtime_usage: None,
-                            synthetic_usage: usage,
-                            typing_usage: None,
-                            range: *range,
-                            source: Some(RefEquality(stmt)),
-                            context,
-                            exceptions,
-                        });
-                        scope.add(name, id);
+                        let binding_id = self.semantic_model.push_binding(
+                            *range,
+                            BindingKind::Nonlocal,
+                            BindingFlags::empty(),
+                        );
+                        let scope = self.semantic_model.scope_mut();
+                        scope.add(name, binding_id);
                     }
 
                     // Mark the binding in the defining scopes as used too. (Skip the global scope
-                    // and the current scope.)
+                    // and the current scope, and, per standard resolution rules, any class scopes.)
                     for (name, range) in names.iter().zip(ranges.iter()) {
                         let binding_id = self
-                            .ctx
+                            .semantic_model
                             .scopes
-                            .ancestors(self.ctx.scope_id)
+                            .ancestors(self.semantic_model.scope_id)
                             .skip(1)
-                            .take_while(|scope| !scope.kind.is_module())
+                            .filter(|scope| !(scope.kind.is_module() || scope.kind.is_class()))
                             .find_map(|scope| scope.get(name.as_str()));
 
                         if let Some(binding_id) = binding_id {
-                            self.ctx.bindings[*binding_id].runtime_usage = usage;
-                        } else {
-                            // Ensure that every nonlocal has an existing binding from a parent scope.
-                            if self.settings.rules.enabled(Rule::NonlocalWithoutBinding) {
+                            self.semantic_model.add_local_reference(
+                                binding_id,
+                                stmt.range(),
+                                ExecutionContext::Runtime,
+                            );
+                        }
+
+                        // Ensure that every nonlocal has an existing binding from a parent scope.
+                        if self.enabled(Rule::NonlocalWithoutBinding) {
+                            if self
+                                .semantic_model
+                                .scopes
+                                .ancestors(self.semantic_model.scope_id)
+                                .skip(1)
+                                .take_while(|scope| !scope.kind.is_module())
+                                .all(|scope| !scope.declares(name.as_str()))
+                            {
                                 self.diagnostics.push(Diagnostic::new(
                                     pylint::rules::NonlocalWithoutBinding {
                                         name: name.to_string(),
@@ -294,62 +330,58 @@ where
                     }
                 }
 
-                if self.settings.rules.enabled(Rule::AmbiguousVariableName) {
+                if self.enabled(Rule::AmbiguousVariableName) {
                     self.diagnostics
                         .extend(names.iter().zip(ranges.iter()).filter_map(|(name, range)| {
                             pycodestyle::rules::ambiguous_variable_name(name, *range)
                         }));
                 }
             }
-            StmtKind::Break => {
-                if self.settings.rules.enabled(Rule::BreakOutsideLoop) {
+            Stmt::Break(_) => {
+                if self.enabled(Rule::BreakOutsideLoop) {
                     if let Some(diagnostic) = pyflakes::rules::break_outside_loop(
                         stmt,
-                        &mut self.ctx.parents.iter().rev().map(Into::into).skip(1),
+                        &mut self.semantic_model.parents().skip(1),
                     ) {
                         self.diagnostics.push(diagnostic);
                     }
                 }
             }
-            StmtKind::Continue => {
-                if self.settings.rules.enabled(Rule::ContinueOutsideLoop) {
+            Stmt::Continue(_) => {
+                if self.enabled(Rule::ContinueOutsideLoop) {
                     if let Some(diagnostic) = pyflakes::rules::continue_outside_loop(
                         stmt,
-                        &mut self.ctx.parents.iter().rev().map(Into::into).skip(1),
+                        &mut self.semantic_model.parents().skip(1),
                     ) {
                         self.diagnostics.push(diagnostic);
                     }
                 }
             }
-            StmtKind::FunctionDef {
+            Stmt::FunctionDef(ast::StmtFunctionDef {
                 name,
                 decorator_list,
                 returns,
                 args,
                 body,
                 ..
-            }
-            | StmtKind::AsyncFunctionDef {
+            })
+            | Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef {
                 name,
                 decorator_list,
                 returns,
                 args,
                 body,
                 ..
-            } => {
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::DjangoNonLeadingReceiverDecorator)
-                {
+            }) => {
+                if self.enabled(Rule::DjangoNonLeadingReceiverDecorator) {
                     self.diagnostics
                         .extend(flake8_django::rules::non_leading_receiver_decorator(
                             decorator_list,
-                            |expr| self.ctx.resolve_call_path(expr),
+                            |expr| self.semantic_model.resolve_call_path(expr),
                         ));
                 }
 
-                if self.settings.rules.enabled(Rule::AmbiguousFunctionName) {
+                if self.enabled(Rule::AmbiguousFunctionName) {
                     if let Some(diagnostic) =
                         pycodestyle::rules::ambiguous_function_name(name, || {
                             helpers::identifier_range(stmt, self.locator)
@@ -359,28 +391,28 @@ where
                     }
                 }
 
-                if self.settings.rules.enabled(Rule::InvalidFunctionName) {
+                if self.enabled(Rule::InvalidStrReturnType) {
+                    pylint::rules::invalid_str_return(self, name, body);
+                }
+
+                if self.enabled(Rule::InvalidFunctionName) {
                     if let Some(diagnostic) = pep8_naming::rules::invalid_function_name(
                         stmt,
                         name,
                         decorator_list,
                         &self.settings.pep8_naming.ignore_names,
-                        &self.ctx,
+                        &self.semantic_model,
                         self.locator,
                     ) {
                         self.diagnostics.push(diagnostic);
                     }
                 }
 
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::InvalidFirstArgumentNameForClassMethod)
-                {
+                if self.enabled(Rule::InvalidFirstArgumentNameForClassMethod) {
                     if let Some(diagnostic) =
                         pep8_naming::rules::invalid_first_argument_name_for_class_method(
                             self,
-                            self.ctx.scope(),
+                            self.semantic_model.scope(),
                             name,
                             decorator_list,
                             args,
@@ -390,15 +422,11 @@ where
                     }
                 }
 
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::InvalidFirstArgumentNameForMethod)
-                {
+                if self.enabled(Rule::InvalidFirstArgumentNameForMethod) {
                     if let Some(diagnostic) =
                         pep8_naming::rules::invalid_first_argument_name_for_method(
                             self,
-                            self.ctx.scope(),
+                            self.semantic_model.scope(),
                             name,
                             decorator_list,
                             args,
@@ -409,17 +437,40 @@ where
                 }
 
                 if self.is_stub {
-                    if self.settings.rules.enabled(Rule::PassStatementStubBody) {
+                    if self.enabled(Rule::PassStatementStubBody) {
                         flake8_pyi::rules::pass_statement_stub_body(self, body);
                     }
-                    if self.settings.rules.enabled(Rule::NonEmptyStubBody) {
+                    if self.enabled(Rule::NonEmptyStubBody) {
                         flake8_pyi::rules::non_empty_stub_body(self, body);
                     }
+                    if self.enabled(Rule::StubBodyMultipleStatements) {
+                        flake8_pyi::rules::stub_body_multiple_statements(self, stmt, body);
+                    }
+                    if self.enabled(Rule::AnyEqNeAnnotation) {
+                        flake8_pyi::rules::any_eq_ne_annotation(self, name, args);
+                    }
+                    if self.enabled(Rule::NonSelfReturnType) {
+                        flake8_pyi::rules::non_self_return_type(
+                            self,
+                            stmt,
+                            name,
+                            decorator_list,
+                            returns.as_ref().map(|expr| &**expr),
+                            args,
+                            stmt.is_async_function_def_stmt(),
+                        );
+                    }
+                    if self.enabled(Rule::StrOrReprDefinedInStub) {
+                        flake8_pyi::rules::str_or_repr_defined_in_stub(self, stmt);
+                    }
+                    if self.enabled(Rule::NoReturnArgumentAnnotationInStub) {
+                        flake8_pyi::rules::no_return_argument_annotation(self, args);
+                    }
                 }
 
-                if self.settings.rules.enabled(Rule::DunderFunctionName) {
+                if self.enabled(Rule::DunderFunctionName) {
                     if let Some(diagnostic) = pep8_naming::rules::dunder_function_name(
-                        self.ctx.scope(),
+                        self.semantic_model.scope(),
                         stmt,
                         name,
                         self.locator,
@@ -428,26 +479,26 @@ where
                     }
                 }
 
-                if self.settings.rules.enabled(Rule::GlobalStatement) {
+                if self.enabled(Rule::GlobalStatement) {
                     pylint::rules::global_statement(self, name);
                 }
 
-                if self.settings.rules.enabled(Rule::LRUCacheWithoutParameters)
+                if self.enabled(Rule::LRUCacheWithoutParameters)
                     && self.settings.target_version >= PythonVersion::Py38
                 {
                     pyupgrade::rules::lru_cache_without_parameters(self, decorator_list);
                 }
-                if self.settings.rules.enabled(Rule::LRUCacheWithMaxsizeNone)
+                if self.enabled(Rule::LRUCacheWithMaxsizeNone)
                     && self.settings.target_version >= PythonVersion::Py39
                 {
                     pyupgrade::rules::lru_cache_with_maxsize_none(self, decorator_list);
                 }
 
-                if self.settings.rules.enabled(Rule::CachedInstanceMethod) {
+                if self.enabled(Rule::CachedInstanceMethod) {
                     flake8_bugbear::rules::cached_instance_method(self, decorator_list);
                 }
 
-                if self.settings.rules.any_enabled(&[
+                if self.any_enabled(&[
                     Rule::UnnecessaryReturnNone,
                     Rule::ImplicitReturnValue,
                     Rule::ImplicitReturn,
@@ -464,7 +515,7 @@ where
                     );
                 }
 
-                if self.settings.rules.enabled(Rule::UselessReturn) {
+                if self.enabled(Rule::UselessReturn) {
                     pylint::rules::useless_return(
                         self,
                         stmt,
@@ -473,7 +524,7 @@ where
                     );
                 }
 
-                if self.settings.rules.enabled(Rule::ComplexStructure) {
+                if self.enabled(Rule::ComplexStructure) {
                     if let Some(diagnostic) = mccabe::rules::function_is_too_complex(
                         stmt,
                         name,
@@ -485,20 +536,20 @@ where
                     }
                 }
 
-                if self.settings.rules.enabled(Rule::HardcodedPasswordDefault) {
+                if self.enabled(Rule::HardcodedPasswordDefault) {
                     self.diagnostics
                         .extend(flake8_bandit::rules::hardcoded_password_default(args));
                 }
 
-                if self.settings.rules.enabled(Rule::PropertyWithParameters) {
+                if self.enabled(Rule::PropertyWithParameters) {
                     pylint::rules::property_with_parameters(self, stmt, decorator_list, args);
                 }
 
-                if self.settings.rules.enabled(Rule::TooManyArguments) {
+                if self.enabled(Rule::TooManyArguments) {
                     pylint::rules::too_many_arguments(self, args, stmt);
                 }
 
-                if self.settings.rules.enabled(Rule::TooManyReturnStatements) {
+                if self.enabled(Rule::TooManyReturnStatements) {
                     if let Some(diagnostic) = pylint::rules::too_many_return_statements(
                         stmt,
                         body,
@@ -509,7 +560,7 @@ where
                     }
                 }
 
-                if self.settings.rules.enabled(Rule::TooManyBranches) {
+                if self.enabled(Rule::TooManyBranches) {
                     if let Some(diagnostic) = pylint::rules::too_many_branches(
                         stmt,
                         body,
@@ -520,7 +571,7 @@ where
                     }
                 }
 
-                if self.settings.rules.enabled(Rule::TooManyStatements) {
+                if self.enabled(Rule::TooManyStatements) {
                     if let Some(diagnostic) = pylint::rules::too_many_statements(
                         stmt,
                         body,
@@ -531,7 +582,7 @@ where
                     }
                 }
 
-                if self.settings.rules.any_enabled(&[
+                if self.any_enabled(&[
                     Rule::PytestFixtureIncorrectParenthesesStyle,
                     Rule::PytestFixturePositionalArgs,
                     Rule::PytestExtraneousScopeFunction,
@@ -554,25 +605,21 @@ where
                     );
                 }
 
-                if self.settings.rules.any_enabled(&[
+                if self.any_enabled(&[
                     Rule::PytestParametrizeNamesWrongType,
                     Rule::PytestParametrizeValuesWrongType,
                 ]) {
                     flake8_pytest_style::rules::parametrize(self, decorator_list);
                 }
 
-                if self.settings.rules.any_enabled(&[
+                if self.any_enabled(&[
                     Rule::PytestIncorrectMarkParenthesesStyle,
                     Rule::PytestUseFixturesWithoutParameters,
                 ]) {
                     flake8_pytest_style::rules::marks(self, decorator_list);
                 }
 
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::BooleanPositionalArgInFunctionDefinition)
-                {
+                if self.enabled(Rule::BooleanPositionalArgInFunctionDefinition) {
                     flake8_boolean_trap::rules::check_positional_boolean_in_def(
                         self,
                         name,
@@ -581,11 +628,7 @@ where
                     );
                 }
 
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::BooleanDefaultValueInFunctionDefinition)
-                {
+                if self.enabled(Rule::BooleanDefaultValueInFunctionDefinition) {
                     flake8_boolean_trap::rules::check_boolean_default_value_in_function_definition(
                         self,
                         name,
@@ -594,11 +637,7 @@ where
                     );
                 }
 
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UnexpectedSpecialMethodSignature)
-                {
+                if self.enabled(Rule::UnexpectedSpecialMethodSignature) {
                     pylint::rules::unexpected_special_method_signature(
                         self,
                         stmt,
@@ -609,161 +648,87 @@ where
                     );
                 }
 
-                self.check_builtin_shadowing(name, stmt, true);
-
-                // Visit the decorators and arguments, but avoid the body, which will be
-                // deferred.
-                for expr in decorator_list {
-                    self.visit_expr(expr);
+                if self.enabled(Rule::FStringDocstring) {
+                    flake8_bugbear::rules::f_string_docstring(self, body);
                 }
 
-                // Function annotations are always evaluated at runtime, unless future annotations
-                // are enabled.
-                let runtime_annotation = !self.ctx.annotations_future_enabled;
-
-                for arg in &args.posonlyargs {
-                    if let Some(expr) = &arg.node.annotation {
-                        if runtime_annotation {
-                            visit_type_definition!(self, expr);
-                        } else {
-                            self.visit_annotation(expr);
-                        };
-                    }
-                }
-                for arg in &args.args {
-                    if let Some(expr) = &arg.node.annotation {
-                        if runtime_annotation {
-                            visit_type_definition!(self, expr);
-                        } else {
-                            self.visit_annotation(expr);
-                        };
-                    }
-                }
-                if let Some(arg) = &args.vararg {
-                    if let Some(expr) = &arg.node.annotation {
-                        if runtime_annotation {
-                            visit_type_definition!(self, expr);
-                        } else {
-                            self.visit_annotation(expr);
-                        };
-                    }
+                if self.enabled(Rule::YieldInForLoop) {
+                    pyupgrade::rules::yield_in_for_loop(self, stmt);
                 }
-                for arg in &args.kwonlyargs {
-                    if let Some(expr) = &arg.node.annotation {
-                        if runtime_annotation {
-                            visit_type_definition!(self, expr);
-                        } else {
-                            self.visit_annotation(expr);
-                        };
+
+                if self.semantic_model.scope().kind.is_class() {
+                    if self.enabled(Rule::BuiltinAttributeShadowing) {
+                        flake8_builtins::rules::builtin_attribute_shadowing(
+                            self,
+                            name,
+                            AnyShadowing::from(stmt),
+                        );
                     }
-                }
-                if let Some(arg) = &args.kwarg {
-                    if let Some(expr) = &arg.node.annotation {
-                        if runtime_annotation {
-                            visit_type_definition!(self, expr);
-                        } else {
-                            self.visit_annotation(expr);
-                        };
+                } else {
+                    if self.enabled(Rule::BuiltinVariableShadowing) {
+                        flake8_builtins::rules::builtin_variable_shadowing(
+                            self,
+                            name,
+                            AnyShadowing::from(stmt),
+                        );
                     }
                 }
-                for expr in returns {
-                    if runtime_annotation {
-                        visit_type_definition!(self, expr);
-                    } else {
-                        self.visit_annotation(expr);
-                    };
-                }
-                for expr in &args.kw_defaults {
-                    self.visit_expr(expr);
-                }
-                for expr in &args.defaults {
-                    self.visit_expr(expr);
-                }
-
-                self.add_binding(
-                    name,
-                    Binding {
-                        kind: BindingKind::FunctionDefinition,
-                        runtime_usage: None,
-                        synthetic_usage: None,
-                        typing_usage: None,
-                        range: stmt.range(),
-                        source: Some(*self.ctx.current_stmt()),
-                        context: self.ctx.execution_context(),
-                        exceptions: self.ctx.exceptions(),
-                    },
-                );
             }
-            StmtKind::Return { .. } => {
-                if self.settings.rules.enabled(Rule::ReturnOutsideFunction) {
+            Stmt::Return(_) => {
+                if self.enabled(Rule::ReturnOutsideFunction) {
                     pyflakes::rules::return_outside_function(self, stmt);
                 }
-                if self.settings.rules.enabled(Rule::ReturnInInit) {
+                if self.enabled(Rule::ReturnInInit) {
                     pylint::rules::return_in_init(self, stmt);
                 }
             }
-            StmtKind::ClassDef {
+            Stmt::ClassDef(ast::StmtClassDef {
                 name,
                 bases,
                 keywords,
                 decorator_list,
                 body,
-            } => {
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::DjangoNullableModelStringField)
-                {
+                range: _,
+            }) => {
+                if self.enabled(Rule::DjangoNullableModelStringField) {
                     self.diagnostics
                         .extend(flake8_django::rules::nullable_model_string_field(
                             self, body,
                         ));
                 }
 
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::DjangoExcludeWithModelForm)
-                {
+                if self.enabled(Rule::DjangoExcludeWithModelForm) {
                     if let Some(diagnostic) =
                         flake8_django::rules::exclude_with_model_form(self, bases, body)
                     {
                         self.diagnostics.push(diagnostic);
                     }
                 }
-                if self.settings.rules.enabled(Rule::DjangoAllWithModelForm) {
+                if self.enabled(Rule::DjangoAllWithModelForm) {
                     if let Some(diagnostic) =
                         flake8_django::rules::all_with_model_form(self, bases, body)
                     {
                         self.diagnostics.push(diagnostic);
                     }
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::DjangoModelWithoutDunderStr)
-                {
+                if self.enabled(Rule::DjangoModelWithoutDunderStr) {
                     if let Some(diagnostic) =
                         flake8_django::rules::model_without_dunder_str(self, bases, body, stmt)
                     {
                         self.diagnostics.push(diagnostic);
                     }
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::DjangoUnorderedBodyContentInModel)
-                {
+                if self.enabled(Rule::DjangoUnorderedBodyContentInModel) {
                     flake8_django::rules::unordered_body_content_in_model(self, bases, body);
                 }
-                if self.settings.rules.enabled(Rule::GlobalStatement) {
+                if self.enabled(Rule::GlobalStatement) {
                     pylint::rules::global_statement(self, name);
                 }
-                if self.settings.rules.enabled(Rule::UselessObjectInheritance) {
+                if self.enabled(Rule::UselessObjectInheritance) {
                     pyupgrade::rules::useless_object_inheritance(self, stmt, name, bases, keywords);
                 }
 
-                if self.settings.rules.enabled(Rule::AmbiguousClassName) {
+                if self.enabled(Rule::AmbiguousClassName) {
                     if let Some(diagnostic) = pycodestyle::rules::ambiguous_class_name(name, || {
                         helpers::identifier_range(stmt, self.locator)
                     }) {
@@ -771,7 +736,7 @@ where
                     }
                 }
 
-                if self.settings.rules.enabled(Rule::InvalidClassName) {
+                if self.enabled(Rule::InvalidClassName) {
                     if let Some(diagnostic) =
                         pep8_naming::rules::invalid_class_name(stmt, name, self.locator)
                     {
@@ -779,11 +744,7 @@ where
                     }
                 }
 
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::ErrorSuffixOnExceptionName)
-                {
+                if self.enabled(Rule::ErrorSuffixOnExceptionName) {
                     if let Some(diagnostic) = pep8_naming::rules::error_suffix_on_exception_name(
                         stmt,
                         bases,
@@ -795,7 +756,7 @@ where
                 }
 
                 if !self.is_stub {
-                    if self.settings.rules.any_enabled(&[
+                    if self.any_enabled(&[
                         Rule::AbstractBaseClassWithoutAbstractMethod,
                         Rule::EmptyMethodWithoutAbstractDecorator,
                     ]) {
@@ -805,216 +766,182 @@ where
                     }
                 }
                 if self.is_stub {
-                    if self.settings.rules.enabled(Rule::PassStatementStubBody) {
+                    if self.enabled(Rule::PassStatementStubBody) {
                         flake8_pyi::rules::pass_statement_stub_body(self, body);
                     }
-                    if self.settings.rules.enabled(Rule::PassInClassBody) {
+                    if self.enabled(Rule::PassInClassBody) {
                         flake8_pyi::rules::pass_in_class_body(self, stmt, body);
                     }
+                    if self.enabled(Rule::EllipsisInNonEmptyClassBody) {
+                        flake8_pyi::rules::ellipsis_in_non_empty_class_body(self, stmt, body);
+                    }
                 }
 
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::PytestIncorrectMarkParenthesesStyle)
-                {
+                if self.enabled(Rule::PytestIncorrectMarkParenthesesStyle) {
                     flake8_pytest_style::rules::marks(self, decorator_list);
                 }
 
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::DuplicateClassFieldDefinition)
-                {
+                if self.enabled(Rule::DuplicateClassFieldDefinition) {
                     flake8_pie::rules::duplicate_class_field_definition(self, stmt, body);
                 }
 
-                if self.settings.rules.enabled(Rule::NonUniqueEnums) {
+                if self.enabled(Rule::NonUniqueEnums) {
                     flake8_pie::rules::non_unique_enums(self, stmt, body);
                 }
 
-                if self.settings.rules.any_enabled(&[
+                if self.any_enabled(&[
                     Rule::MutableDataclassDefault,
                     Rule::FunctionCallInDataclassDefaultArgument,
-                ]) && ruff::rules::is_dataclass(self, decorator_list)
+                ]) && ruff::rules::is_dataclass(&self.semantic_model, decorator_list)
                 {
-                    if self.settings.rules.enabled(Rule::MutableDataclassDefault) {
+                    if self.enabled(Rule::MutableDataclassDefault) {
                         ruff::rules::mutable_dataclass_default(self, body);
                     }
 
-                    if self
-                        .settings
-                        .rules
-                        .enabled(Rule::FunctionCallInDataclassDefaultArgument)
-                    {
+                    if self.enabled(Rule::FunctionCallInDataclassDefaultArgument) {
                         ruff::rules::function_call_in_dataclass_defaults(self, body);
                     }
                 }
 
-                self.check_builtin_shadowing(name, stmt, false);
-
-                for expr in bases {
-                    self.visit_expr(expr);
+                if self.enabled(Rule::FStringDocstring) {
+                    flake8_bugbear::rules::f_string_docstring(self, body);
                 }
-                for keyword in keywords {
-                    self.visit_keyword(keyword);
+
+                if self.enabled(Rule::BuiltinVariableShadowing) {
+                    flake8_builtins::rules::builtin_variable_shadowing(
+                        self,
+                        name,
+                        AnyShadowing::from(stmt),
+                    );
                 }
-                for expr in decorator_list {
-                    self.visit_expr(expr);
+
+                if self.enabled(Rule::DuplicateBases) {
+                    pylint::rules::duplicate_bases(self, name, bases);
                 }
             }
-            StmtKind::Import { names } => {
-                if self.settings.rules.enabled(Rule::MultipleImportsOnOneLine) {
+            Stmt::Import(ast::StmtImport { names, range: _ }) => {
+                if self.enabled(Rule::MultipleImportsOnOneLine) {
                     pycodestyle::rules::multiple_imports_on_one_line(self, stmt, names);
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::ModuleImportNotAtTopOfFile)
-                {
+                if self.enabled(Rule::ModuleImportNotAtTopOfFile) {
                     pycodestyle::rules::module_import_not_at_top_of_file(self, stmt, self.locator);
                 }
 
-                if self.settings.rules.enabled(Rule::GlobalStatement) {
+                if self.enabled(Rule::GlobalStatement) {
                     for name in names.iter() {
-                        if let Some(asname) = name.node.asname.as_ref() {
+                        if let Some(asname) = name.asname.as_ref() {
                             pylint::rules::global_statement(self, asname);
                         } else {
-                            pylint::rules::global_statement(self, &name.node.name);
+                            pylint::rules::global_statement(self, &name.name);
                         }
                     }
                 }
 
-                if self.settings.rules.enabled(Rule::DeprecatedCElementTree) {
+                if self.enabled(Rule::DeprecatedCElementTree) {
                     pyupgrade::rules::deprecated_c_element_tree(self, stmt);
                 }
-                if self.settings.rules.enabled(Rule::DeprecatedMockImport) {
+                if self.enabled(Rule::DeprecatedMockImport) {
                     pyupgrade::rules::deprecated_mock_import(self, stmt);
                 }
 
                 for alias in names {
-                    if alias.node.name == "__future__" {
-                        let name = alias.node.asname.as_ref().unwrap_or(&alias.node.name);
+                    if &alias.name == "__future__" {
+                        let name = alias.asname.as_ref().unwrap_or(&alias.name);
                         self.add_binding(
                             name,
-                            Binding {
-                                kind: BindingKind::FutureImportation,
-                                runtime_usage: None,
-                                // Always mark `__future__` imports as used.
-                                synthetic_usage: Some((self.ctx.scope_id, alias.range())),
-                                typing_usage: None,
-                                range: alias.range(),
-                                source: Some(*self.ctx.current_stmt()),
-                                context: self.ctx.execution_context(),
-                                exceptions: self.ctx.exceptions(),
-                            },
+                            alias.range(),
+                            BindingKind::FutureImportation,
+                            BindingFlags::empty(),
                         );
 
-                        if self.settings.rules.enabled(Rule::LateFutureImport)
-                            && !self.ctx.futures_allowed
-                        {
-                            self.diagnostics.push(Diagnostic::new(
-                                pyflakes::rules::LateFutureImport,
-                                stmt.range(),
-                            ));
+                        if self.enabled(Rule::LateFutureImport) {
+                            if self.semantic_model.seen_futures_boundary() {
+                                self.diagnostics.push(Diagnostic::new(
+                                    pyflakes::rules::LateFutureImport,
+                                    stmt.range(),
+                                ));
+                            }
                         }
-                    } else if alias.node.name.contains('.') && alias.node.asname.is_none() {
-                        // Given `import foo.bar`, `name` would be "foo", and `full_name` would be
+                    } else if alias.name.contains('.') && alias.asname.is_none() {
+                        // Given `import foo.bar`, `name` would be "foo", and `qualified_name` would be
                         // "foo.bar".
-                        let name = alias.node.name.split('.').next().unwrap();
-                        let full_name = &alias.node.name;
+                        let name = alias.name.split('.').next().unwrap();
+                        let qualified_name = &alias.name;
                         self.add_binding(
                             name,
-                            Binding {
-                                kind: BindingKind::SubmoduleImportation(SubmoduleImportation {
-                                    name,
-                                    full_name,
-                                }),
-                                runtime_usage: None,
-                                synthetic_usage: None,
-                                typing_usage: None,
-                                range: alias.range(),
-                                source: Some(*self.ctx.current_stmt()),
-                                context: self.ctx.execution_context(),
-                                exceptions: self.ctx.exceptions(),
-                            },
+                            alias.range(),
+                            BindingKind::SubmoduleImportation(SubmoduleImportation {
+                                qualified_name,
+                            }),
+                            BindingFlags::empty(),
                         );
                     } else {
-                        // Treat explicit re-export as usage (e.g., `from .applications
-                        // import FastAPI as FastAPI`).
-                        let is_explicit_reexport = alias
-                            .node
-                            .asname
-                            .as_ref()
-                            .map_or(false, |asname| asname == &alias.node.name);
-
-                        let name = alias.node.asname.as_ref().unwrap_or(&alias.node.name);
-                        let full_name = &alias.node.name;
+                        let name = alias.asname.as_ref().unwrap_or(&alias.name);
+                        let qualified_name = &alias.name;
                         self.add_binding(
                             name,
-                            Binding {
-                                kind: BindingKind::Importation(Importation { name, full_name }),
-                                runtime_usage: None,
-                                synthetic_usage: if is_explicit_reexport {
-                                    Some((self.ctx.scope_id, alias.range()))
-                                } else {
-                                    None
-                                },
-                                typing_usage: None,
-                                range: alias.range(),
-                                source: Some(*self.ctx.current_stmt()),
-                                context: self.ctx.execution_context(),
-                                exceptions: self.ctx.exceptions(),
+                            alias.range(),
+                            BindingKind::Importation(Importation { qualified_name }),
+                            if alias
+                                .asname
+                                .as_ref()
+                                .map_or(false, |asname| asname == &alias.name)
+                            {
+                                BindingFlags::EXPLICIT_EXPORT
+                            } else {
+                                BindingFlags::empty()
                             },
                         );
 
-                        if let Some(asname) = &alias.node.asname {
-                            self.check_builtin_shadowing(asname, stmt, false);
+                        if let Some(asname) = &alias.asname {
+                            if self.enabled(Rule::BuiltinVariableShadowing) {
+                                flake8_builtins::rules::builtin_variable_shadowing(
+                                    self,
+                                    asname,
+                                    AnyShadowing::from(stmt),
+                                );
+                            }
                         }
                     }
 
                     // flake8-debugger
-                    if self.settings.rules.enabled(Rule::Debugger) {
+                    if self.enabled(Rule::Debugger) {
                         if let Some(diagnostic) =
-                            flake8_debugger::rules::debugger_import(stmt, None, &alias.node.name)
+                            flake8_debugger::rules::debugger_import(stmt, None, &alias.name)
                         {
                             self.diagnostics.push(diagnostic);
                         }
                     }
 
                     // flake8_tidy_imports
-                    if self.settings.rules.enabled(Rule::BannedApi) {
-                        flake8_tidy_imports::banned_api::name_or_parent_is_banned(
+                    if self.enabled(Rule::BannedApi) {
+                        flake8_tidy_imports::rules::name_or_parent_is_banned(
                             self,
-                            &alias.node.name,
+                            &alias.name,
                             alias,
                         );
                     }
 
                     // pylint
                     if !self.is_stub {
-                        if self.settings.rules.enabled(Rule::UselessImportAlias) {
+                        if self.enabled(Rule::UselessImportAlias) {
                             pylint::rules::useless_import_alias(self, alias);
                         }
                     }
-                    if self.settings.rules.enabled(Rule::ManualFromImport) {
+                    if self.enabled(Rule::ManualFromImport) {
                         pylint::rules::manual_from_import(self, stmt, alias, names);
                     }
-                    if self.settings.rules.enabled(Rule::ImportSelf) {
+                    if self.enabled(Rule::ImportSelf) {
                         if let Some(diagnostic) =
-                            pylint::rules::import_self(alias, self.module_path.as_deref())
+                            pylint::rules::import_self(alias, self.module_path)
                         {
                             self.diagnostics.push(diagnostic);
                         }
                     }
 
-                    if let Some(asname) = &alias.node.asname {
-                        let name = alias.node.name.split('.').last().unwrap();
-                        if self
-                            .settings
-                            .rules
-                            .enabled(Rule::ConstantImportedAsNonConstant)
-                        {
+                    if let Some(asname) = &alias.asname {
+                        let name = alias.name.split('.').last().unwrap();
+                        if self.enabled(Rule::ConstantImportedAsNonConstant) {
                             if let Some(diagnostic) =
                                 pep8_naming::rules::constant_imported_as_non_constant(
                                     name, asname, alias, stmt,
@@ -1024,11 +951,7 @@ where
                             }
                         }
 
-                        if self
-                            .settings
-                            .rules
-                            .enabled(Rule::LowercaseImportedAsNonLowercase)
-                        {
+                        if self.enabled(Rule::LowercaseImportedAsNonLowercase) {
                             if let Some(diagnostic) =
                                 pep8_naming::rules::lowercase_imported_as_non_lowercase(
                                     name, asname, alias, stmt,
@@ -1038,11 +961,7 @@ where
                             }
                         }
 
-                        if self
-                            .settings
-                            .rules
-                            .enabled(Rule::CamelcaseImportedAsLowercase)
-                        {
+                        if self.enabled(Rule::CamelcaseImportedAsLowercase) {
                             if let Some(diagnostic) =
                                 pep8_naming::rules::camelcase_imported_as_lowercase(
                                     name, asname, alias, stmt,
@@ -1052,11 +971,7 @@ where
                             }
                         }
 
-                        if self
-                            .settings
-                            .rules
-                            .enabled(Rule::CamelcaseImportedAsConstant)
-                        {
+                        if self.enabled(Rule::CamelcaseImportedAsConstant) {
                             if let Some(diagnostic) =
                                 pep8_naming::rules::camelcase_imported_as_constant(
                                     name, asname, alias, stmt,
@@ -1066,11 +981,7 @@ where
                             }
                         }
 
-                        if self
-                            .settings
-                            .rules
-                            .enabled(Rule::CamelcaseImportedAsAcronym)
-                        {
+                        if self.enabled(Rule::CamelcaseImportedAsAcronym) {
                             if let Some(diagnostic) =
                                 pep8_naming::rules::camelcase_imported_as_acronym(
                                     name, asname, alias, stmt,
@@ -1081,12 +992,12 @@ where
                         }
                     }
 
-                    if self.settings.rules.enabled(Rule::UnconventionalImportAlias) {
+                    if self.enabled(Rule::UnconventionalImportAlias) {
                         if let Some(diagnostic) =
                             flake8_import_conventions::rules::conventional_import_alias(
                                 stmt,
-                                &alias.node.name,
-                                alias.node.asname.as_deref(),
+                                &alias.name,
+                                alias.asname.as_deref(),
                                 &self.settings.flake8_import_conventions.aliases,
                             )
                         {
@@ -1094,12 +1005,12 @@ where
                         }
                     }
 
-                    if self.settings.rules.enabled(Rule::BannedImportAlias) {
-                        if let Some(asname) = &alias.node.asname {
+                    if self.enabled(Rule::BannedImportAlias) {
+                        if let Some(asname) = &alias.asname {
                             if let Some(diagnostic) =
                                 flake8_import_conventions::rules::banned_import_alias(
                                     stmt,
-                                    &alias.node.name,
+                                    &alias.name,
                                     asname,
                                     &self.settings.flake8_import_conventions.banned_aliases,
                                 )
@@ -1109,259 +1020,205 @@ where
                         }
                     }
 
-                    if self
-                        .settings
-                        .rules
-                        .enabled(Rule::PytestIncorrectPytestImport)
-                    {
+                    if self.enabled(Rule::PytestIncorrectPytestImport) {
                         if let Some(diagnostic) = flake8_pytest_style::rules::import(
                             stmt,
-                            &alias.node.name,
-                            alias.node.asname.as_deref(),
+                            &alias.name,
+                            alias.asname.as_deref(),
                         ) {
                             self.diagnostics.push(diagnostic);
                         }
                     }
                 }
             }
-            StmtKind::ImportFrom {
-                names,
-                module,
-                level,
-            } => {
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::ModuleImportNotAtTopOfFile)
-                {
+            Stmt::ImportFrom(
+                import_from @ ast::StmtImportFrom {
+                    names,
+                    module,
+                    level,
+                    range: _,
+                },
+            ) => {
+                let module = module.as_deref();
+                let level = level.map(|level| level.to_u32());
+                if self.enabled(Rule::ModuleImportNotAtTopOfFile) {
                     pycodestyle::rules::module_import_not_at_top_of_file(self, stmt, self.locator);
                 }
 
-                if self.settings.rules.enabled(Rule::GlobalStatement) {
+                if self.enabled(Rule::GlobalStatement) {
                     for name in names.iter() {
-                        if let Some(asname) = name.node.asname.as_ref() {
+                        if let Some(asname) = name.asname.as_ref() {
                             pylint::rules::global_statement(self, asname);
                         } else {
-                            pylint::rules::global_statement(self, &name.node.name);
+                            pylint::rules::global_statement(self, &name.name);
                         }
                     }
                 }
 
-                if self.settings.rules.enabled(Rule::UnnecessaryFutureImport)
+                if self.enabled(Rule::UnnecessaryFutureImport)
                     && self.settings.target_version >= PythonVersion::Py37
                 {
-                    if let Some("__future__") = module.as_deref() {
+                    if let Some("__future__") = module {
                         pyupgrade::rules::unnecessary_future_import(self, stmt, names);
                     }
                 }
-                if self.settings.rules.enabled(Rule::DeprecatedMockImport) {
+                if self.enabled(Rule::DeprecatedMockImport) {
                     pyupgrade::rules::deprecated_mock_import(self, stmt);
                 }
-                if self.settings.rules.enabled(Rule::DeprecatedCElementTree) {
+                if self.enabled(Rule::DeprecatedCElementTree) {
                     pyupgrade::rules::deprecated_c_element_tree(self, stmt);
                 }
-                if self.settings.rules.enabled(Rule::DeprecatedImport) {
-                    pyupgrade::rules::deprecated_import(
-                        self,
-                        stmt,
-                        names,
-                        module.as_ref().map(String::as_str),
-                        *level,
-                    );
+                if self.enabled(Rule::DeprecatedImport) {
+                    pyupgrade::rules::deprecated_import(self, stmt, names, module, level);
                 }
-                if self.settings.rules.enabled(Rule::UnnecessaryBuiltinImport) {
-                    if let Some(module) = module.as_deref() {
+                if self.enabled(Rule::UnnecessaryBuiltinImport) {
+                    if let Some(module) = module {
                         pyupgrade::rules::unnecessary_builtin_import(self, stmt, module, names);
                     }
                 }
-
-                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,
-                        );
+                if self.enabled(Rule::BannedApi) {
+                    if let Some(module) =
+                        helpers::resolve_imported_module_path(level, module, self.module_path)
+                    {
+                        flake8_tidy_imports::rules::name_or_parent_is_banned(self, &module, stmt);
 
                         for alias in names {
-                            if alias.node.name == "*" {
+                            if &alias.name == "*" {
                                 continue;
                             }
-                            flake8_tidy_imports::banned_api::name_is_banned(
+                            flake8_tidy_imports::rules::name_is_banned(
                                 self,
-                                format!("{module}.{}", alias.node.name),
+                                format!("{module}.{}", alias.name),
                                 alias,
                             );
                         }
                     }
                 }
 
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::PytestIncorrectPytestImport)
-                {
+                if self.enabled(Rule::PytestIncorrectPytestImport) {
                     if let Some(diagnostic) =
-                        flake8_pytest_style::rules::import_from(stmt, module.as_deref(), *level)
+                        flake8_pytest_style::rules::import_from(stmt, module, level)
                     {
                         self.diagnostics.push(diagnostic);
                     }
                 }
 
+                if self.is_stub {
+                    if self.enabled(Rule::UnaliasedCollectionsAbcSetImport) {
+                        flake8_pyi::rules::unaliased_collections_abc_set_import(self, import_from);
+                    }
+                }
                 for alias in names {
-                    if let Some("__future__") = module.as_deref() {
-                        let name = alias.node.asname.as_ref().unwrap_or(&alias.node.name);
+                    if let Some("__future__") = module {
+                        let name = alias.asname.as_ref().unwrap_or(&alias.name);
+
                         self.add_binding(
                             name,
-                            Binding {
-                                kind: BindingKind::FutureImportation,
-                                runtime_usage: None,
-                                // Always mark `__future__` imports as used.
-                                synthetic_usage: Some((self.ctx.scope_id, alias.range())),
-                                typing_usage: None,
-                                range: alias.range(),
-                                source: Some(*self.ctx.current_stmt()),
-                                context: self.ctx.execution_context(),
-                                exceptions: self.ctx.exceptions(),
-                            },
+                            alias.range(),
+                            BindingKind::FutureImportation,
+                            BindingFlags::empty(),
                         );
 
-                        if alias.node.name == "annotations" {
-                            self.ctx.annotations_future_enabled = true;
-                        }
-
-                        if self.settings.rules.enabled(Rule::FutureFeatureNotDefined) {
+                        if self.enabled(Rule::FutureFeatureNotDefined) {
                             pyflakes::rules::future_feature_not_defined(self, alias);
                         }
 
-                        if self.settings.rules.enabled(Rule::LateFutureImport)
-                            && !self.ctx.futures_allowed
-                        {
-                            self.diagnostics.push(Diagnostic::new(
-                                pyflakes::rules::LateFutureImport,
-                                stmt.range(),
-                            ));
+                        if self.enabled(Rule::LateFutureImport) {
+                            if self.semantic_model.seen_futures_boundary() {
+                                self.diagnostics.push(Diagnostic::new(
+                                    pyflakes::rules::LateFutureImport,
+                                    stmt.range(),
+                                ));
+                            }
                         }
-                    } else if alias.node.name == "*" {
-                        self.ctx.scope_mut().add_star_import(StarImportation {
-                            module: module.as_ref().map(String::as_str),
-                            level: *level,
-                        });
+                    } else if &alias.name == "*" {
+                        self.semantic_model
+                            .scope_mut()
+                            .add_star_import(StarImportation { level, module });
 
-                        if self
-                            .settings
-                            .rules
-                            .enabled(Rule::UndefinedLocalWithNestedImportStarUsage)
-                        {
-                            let scope = self.ctx.scope();
+                        if self.enabled(Rule::UndefinedLocalWithNestedImportStarUsage) {
+                            let scope = self.semantic_model.scope();
                             if !matches!(scope.kind, ScopeKind::Module) {
                                 self.diagnostics.push(Diagnostic::new(
                                     pyflakes::rules::UndefinedLocalWithNestedImportStarUsage {
-                                        name: helpers::format_import_from(
-                                            *level,
-                                            module.as_deref(),
-                                        ),
+                                        name: helpers::format_import_from(level, module),
                                     },
                                     stmt.range(),
                                 ));
                             }
                         }
 
-                        if self
-                            .settings
-                            .rules
-                            .enabled(Rule::UndefinedLocalWithImportStar)
-                        {
+                        if self.enabled(Rule::UndefinedLocalWithImportStar) {
                             self.diagnostics.push(Diagnostic::new(
                                 pyflakes::rules::UndefinedLocalWithImportStar {
-                                    name: helpers::format_import_from(*level, module.as_deref()),
+                                    name: helpers::format_import_from(level, module),
                                 },
                                 stmt.range(),
                             ));
                         }
                     } else {
-                        if let Some(asname) = &alias.node.asname {
-                            self.check_builtin_shadowing(asname, stmt, false);
+                        if let Some(asname) = &alias.asname {
+                            if self.enabled(Rule::BuiltinVariableShadowing) {
+                                flake8_builtins::rules::builtin_variable_shadowing(
+                                    self,
+                                    asname,
+                                    AnyShadowing::from(stmt),
+                                );
+                            }
                         }
 
-                        // Treat explicit re-export as usage (e.g., `from .applications
-                        // import FastAPI as FastAPI`).
-                        let is_explicit_reexport = alias
-                            .node
-                            .asname
-                            .as_ref()
-                            .map_or(false, |asname| asname == &alias.node.name);
-
-                        // Given `from foo import bar`, `name` would be "bar" and `full_name` would
+                        // Given `from foo import bar`, `name` would be "bar" and `qualified_name` would
                         // be "foo.bar". Given `from foo import bar as baz`, `name` would be "baz"
-                        // and `full_name` would be "foo.bar".
-                        let name = alias.node.asname.as_ref().unwrap_or(&alias.node.name);
-                        let full_name = helpers::format_import_from_member(
-                            *level,
-                            module.as_deref(),
-                            &alias.node.name,
-                        );
+                        // and `qualified_name` would be "foo.bar".
+                        let name = alias.asname.as_ref().unwrap_or(&alias.name);
+                        let qualified_name =
+                            helpers::format_import_from_member(level, module, &alias.name);
                         self.add_binding(
                             name,
-                            Binding {
-                                kind: BindingKind::FromImportation(FromImportation {
-                                    name,
-                                    full_name,
-                                }),
-                                runtime_usage: None,
-                                synthetic_usage: if is_explicit_reexport {
-                                    Some((self.ctx.scope_id, alias.range()))
-                                } else {
-                                    None
-                                },
-                                typing_usage: None,
-                                range: alias.range(),
-                                source: Some(*self.ctx.current_stmt()),
-                                context: self.ctx.execution_context(),
-                                exceptions: self.ctx.exceptions(),
+                            alias.range(),
+                            BindingKind::FromImportation(FromImportation { qualified_name }),
+                            if alias
+                                .asname
+                                .as_ref()
+                                .map_or(false, |asname| asname == &alias.name)
+                            {
+                                BindingFlags::EXPLICIT_EXPORT
+                            } else {
+                                BindingFlags::empty()
                             },
                         );
                     }
 
-                    if self.settings.rules.enabled(Rule::RelativeImports) {
-                        if let Some(diagnostic) =
-                            flake8_tidy_imports::relative_imports::banned_relative_import(
-                                self,
-                                stmt,
-                                *level,
-                                module.as_deref(),
-                                self.module_path.as_deref(),
-                                &self.settings.flake8_tidy_imports.ban_relative_imports,
-                            )
-                        {
+                    if self.enabled(Rule::RelativeImports) {
+                        if let Some(diagnostic) = flake8_tidy_imports::rules::banned_relative_import(
+                            self,
+                            stmt,
+                            level,
+                            module,
+                            self.module_path,
+                            self.settings.flake8_tidy_imports.ban_relative_imports,
+                        ) {
                             self.diagnostics.push(diagnostic);
                         }
                     }
 
                     // flake8-debugger
-                    if self.settings.rules.enabled(Rule::Debugger) {
-                        if let Some(diagnostic) = flake8_debugger::rules::debugger_import(
-                            stmt,
-                            module.as_deref(),
-                            &alias.node.name,
-                        ) {
+                    if self.enabled(Rule::Debugger) {
+                        if let Some(diagnostic) =
+                            flake8_debugger::rules::debugger_import(stmt, module, &alias.name)
+                        {
                             self.diagnostics.push(diagnostic);
                         }
                     }
 
-                    if self.settings.rules.enabled(Rule::UnconventionalImportAlias) {
-                        let full_name = helpers::format_import_from_member(
-                            *level,
-                            module.as_deref(),
-                            &alias.node.name,
-                        );
+                    if self.enabled(Rule::UnconventionalImportAlias) {
+                        let qualified_name =
+                            helpers::format_import_from_member(level, module, &alias.name);
                         if let Some(diagnostic) =
                             flake8_import_conventions::rules::conventional_import_alias(
                                 stmt,
-                                &full_name,
-                                alias.node.asname.as_deref(),
+                                &qualified_name,
+                                alias.asname.as_deref(),
                                 &self.settings.flake8_import_conventions.aliases,
                             )
                         {
@@ -1369,17 +1226,14 @@ 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 self.enabled(Rule::BannedImportAlias) {
+                        if let Some(asname) = &alias.asname {
+                            let qualified_name =
+                                helpers::format_import_from_member(level, module, &alias.name);
                             if let Some(diagnostic) =
                                 flake8_import_conventions::rules::banned_import_alias(
                                     stmt,
-                                    &full_name,
+                                    &qualified_name,
                                     asname,
                                     &self.settings.flake8_import_conventions.banned_aliases,
                                 )
@@ -1389,15 +1243,11 @@ where
                         }
                     }
 
-                    if let Some(asname) = &alias.node.asname {
-                        if self
-                            .settings
-                            .rules
-                            .enabled(Rule::ConstantImportedAsNonConstant)
-                        {
+                    if let Some(asname) = &alias.asname {
+                        if self.enabled(Rule::ConstantImportedAsNonConstant) {
                             if let Some(diagnostic) =
                                 pep8_naming::rules::constant_imported_as_non_constant(
-                                    &alias.node.name,
+                                    &alias.name,
                                     asname,
                                     alias,
                                     stmt,
@@ -1407,14 +1257,10 @@ where
                             }
                         }
 
-                        if self
-                            .settings
-                            .rules
-                            .enabled(Rule::LowercaseImportedAsNonLowercase)
-                        {
+                        if self.enabled(Rule::LowercaseImportedAsNonLowercase) {
                             if let Some(diagnostic) =
                                 pep8_naming::rules::lowercase_imported_as_non_lowercase(
-                                    &alias.node.name,
+                                    &alias.name,
                                     asname,
                                     alias,
                                     stmt,
@@ -1424,14 +1270,10 @@ where
                             }
                         }
 
-                        if self
-                            .settings
-                            .rules
-                            .enabled(Rule::CamelcaseImportedAsLowercase)
-                        {
+                        if self.enabled(Rule::CamelcaseImportedAsLowercase) {
                             if let Some(diagnostic) =
                                 pep8_naming::rules::camelcase_imported_as_lowercase(
-                                    &alias.node.name,
+                                    &alias.name,
                                     asname,
                                     alias,
                                     stmt,
@@ -1441,14 +1283,10 @@ where
                             }
                         }
 
-                        if self
-                            .settings
-                            .rules
-                            .enabled(Rule::CamelcaseImportedAsConstant)
-                        {
+                        if self.enabled(Rule::CamelcaseImportedAsConstant) {
                             if let Some(diagnostic) =
                                 pep8_naming::rules::camelcase_imported_as_constant(
-                                    &alias.node.name,
+                                    &alias.name,
                                     asname,
                                     alias,
                                     stmt,
@@ -1458,14 +1296,10 @@ where
                             }
                         }
 
-                        if self
-                            .settings
-                            .rules
-                            .enabled(Rule::CamelcaseImportedAsAcronym)
-                        {
+                        if self.enabled(Rule::CamelcaseImportedAsAcronym) {
                             if let Some(diagnostic) =
                                 pep8_naming::rules::camelcase_imported_as_acronym(
-                                    &alias.node.name,
+                                    &alias.name,
                                     asname,
                                     alias,
                                     stmt,
@@ -1477,46 +1311,43 @@ where
 
                         // pylint
                         if !self.is_stub {
-                            if self.settings.rules.enabled(Rule::UselessImportAlias) {
+                            if self.enabled(Rule::UselessImportAlias) {
                                 pylint::rules::useless_import_alias(self, alias);
                             }
                         }
                     }
                 }
 
-                if self.settings.rules.enabled(Rule::ImportSelf) {
-                    if let Some(diagnostic) = pylint::rules::import_from_self(
-                        *level,
-                        module.as_deref(),
-                        names,
-                        self.module_path.as_deref(),
-                    ) {
+                if self.enabled(Rule::ImportSelf) {
+                    if let Some(diagnostic) =
+                        pylint::rules::import_from_self(level, module, names, self.module_path)
+                    {
                         self.diagnostics.push(diagnostic);
                     }
                 }
 
-                if self.settings.rules.enabled(Rule::BannedImportFrom) {
+                if self.enabled(Rule::BannedImportFrom) {
                     if let Some(diagnostic) = flake8_import_conventions::rules::banned_import_from(
                         stmt,
-                        &helpers::format_import_from(*level, module.as_deref()),
+                        &helpers::format_import_from(level, module),
                         &self.settings.flake8_import_conventions.banned_from,
                     ) {
                         self.diagnostics.push(diagnostic);
                     }
                 }
             }
-            StmtKind::Raise { exc, .. } => {
-                if self.settings.rules.enabled(Rule::RaiseNotImplemented) {
+            Stmt::Raise(ast::StmtRaise { exc, .. }) => {
+                if self.enabled(Rule::RaiseNotImplemented) {
                     if let Some(expr) = exc {
                         pyflakes::rules::raise_not_implemented(self, expr);
                     }
                 }
-                if self.settings.rules.enabled(Rule::CannotRaiseLiteral) {
+                if self.enabled(Rule::CannotRaiseLiteral) {
                     if let Some(exc) = exc {
                         flake8_bugbear::rules::cannot_raise_literal(self, exc);
                     }
                 }
-                if self.settings.rules.any_enabled(&[
+                if self.any_enabled(&[
                     Rule::RawStringInException,
                     Rule::FStringInException,
                     Rule::DotFormatInException,
@@ -1525,112 +1356,105 @@ where
                         flake8_errmsg::rules::string_in_exception(self, stmt, exc);
                     }
                 }
-                if self.settings.rules.enabled(Rule::OSErrorAlias) {
+                if self.enabled(Rule::OSErrorAlias) {
                     if let Some(item) = exc {
                         pyupgrade::rules::os_error_alias_raise(self, item);
                     }
                 }
-                if self.settings.rules.enabled(Rule::RaiseVanillaClass) {
+                if self.enabled(Rule::RaiseVanillaClass) {
                     if let Some(expr) = exc {
                         tryceratops::rules::raise_vanilla_class(self, expr);
                     }
                 }
-                if self.settings.rules.enabled(Rule::RaiseVanillaArgs) {
+                if self.enabled(Rule::RaiseVanillaArgs) {
                     if let Some(expr) = exc {
                         tryceratops::rules::raise_vanilla_args(self, expr);
                     }
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UnnecessaryParenOnRaiseException)
-                {
+                if self.enabled(Rule::UnnecessaryParenOnRaiseException) {
                     if let Some(expr) = exc {
                         flake8_raise::rules::unnecessary_paren_on_raise_exception(self, expr);
                     }
                 }
             }
-            StmtKind::AugAssign { target, .. } => {
+            Stmt::AugAssign(ast::StmtAugAssign { target, .. }) => {
                 self.handle_node_load(target);
 
-                if self.settings.rules.enabled(Rule::GlobalStatement) {
-                    if let ExprKind::Name { id, .. } = &target.node {
+                if self.enabled(Rule::GlobalStatement) {
+                    if let Expr::Name(ast::ExprName { id, .. }) = target.as_ref() {
                         pylint::rules::global_statement(self, id);
                     }
                 }
             }
-            StmtKind::If { test, body, orelse } => {
-                if self.settings.rules.enabled(Rule::IfTuple) {
+            Stmt::If(ast::StmtIf {
+                test,
+                body,
+                orelse,
+                range: _,
+            }) => {
+                if self.enabled(Rule::IfTuple) {
                     pyflakes::rules::if_tuple(self, stmt, test);
                 }
-                if self.settings.rules.enabled(Rule::CollapsibleIf) {
+                if self.enabled(Rule::CollapsibleIf) {
                     flake8_simplify::rules::nested_if_statements(
                         self,
                         stmt,
                         test,
                         body,
                         orelse,
-                        self.ctx.current_stmt_parent().map(Into::into),
+                        self.semantic_model.stmt_parent(),
                     );
                 }
-                if self.settings.rules.enabled(Rule::IfWithSameArms) {
+                if self.enabled(Rule::IfWithSameArms) {
                     flake8_simplify::rules::if_with_same_arms(
                         self,
                         stmt,
-                        self.ctx.current_stmt_parent().map(Into::into),
+                        self.semantic_model.stmt_parent(),
                     );
                 }
-                if self.settings.rules.enabled(Rule::NeedlessBool) {
+                if self.enabled(Rule::NeedlessBool) {
                     flake8_simplify::rules::needless_bool(self, stmt);
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::IfElseBlockInsteadOfDictLookup)
-                {
+                if self.enabled(Rule::IfElseBlockInsteadOfDictLookup) {
                     flake8_simplify::rules::manual_dict_lookup(
                         self,
                         stmt,
                         test,
                         body,
                         orelse,
-                        self.ctx.current_stmt_parent().map(Into::into),
+                        self.semantic_model.stmt_parent(),
                     );
                 }
-                if self.settings.rules.enabled(Rule::IfElseBlockInsteadOfIfExp) {
+                if self.enabled(Rule::IfElseBlockInsteadOfIfExp) {
                     flake8_simplify::rules::use_ternary_operator(
                         self,
                         stmt,
-                        self.ctx.current_stmt_parent().map(Into::into),
+                        self.semantic_model.stmt_parent(),
                     );
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::IfElseBlockInsteadOfDictGet)
-                {
+                if self.enabled(Rule::IfElseBlockInsteadOfDictGet) {
                     flake8_simplify::rules::use_dict_get_with_default(
                         self,
                         stmt,
                         test,
                         body,
                         orelse,
-                        self.ctx.current_stmt_parent().map(Into::into),
+                        self.semantic_model.stmt_parent(),
                     );
                 }
-                if self.settings.rules.enabled(Rule::TypeCheckWithoutTypeError) {
+                if self.enabled(Rule::TypeCheckWithoutTypeError) {
                     tryceratops::rules::type_check_without_type_error(
                         self,
                         body,
                         test,
                         orelse,
-                        self.ctx.current_stmt_parent().map(Into::into),
+                        self.semantic_model.stmt_parent(),
                     );
                 }
-                if self.settings.rules.enabled(Rule::OutdatedVersionBlock) {
+                if self.enabled(Rule::OutdatedVersionBlock) {
                     pyupgrade::rules::outdated_version_block(self, stmt, test, body, orelse);
                 }
-                if self.settings.rules.enabled(Rule::CollapsibleElseIf) {
+                if self.enabled(Rule::CollapsibleElseIf) {
                     if let Some(diagnostic) =
                         pylint::rules::collapsible_else_if(orelse, self.locator)
                     {
@@ -1638,23 +1462,27 @@ where
                     }
                 }
             }
-            StmtKind::Assert { test, msg } => {
-                if !self.ctx.in_type_checking_block {
-                    if self.settings.rules.enabled(Rule::Assert) {
+            Stmt::Assert(ast::StmtAssert {
+                test,
+                msg,
+                range: _,
+            }) => {
+                if !self.semantic_model.in_type_checking_block() {
+                    if self.enabled(Rule::Assert) {
                         self.diagnostics
                             .push(flake8_bandit::rules::assert_used(stmt));
                     }
                 }
-                if self.settings.rules.enabled(Rule::AssertTuple) {
+                if self.enabled(Rule::AssertTuple) {
                     pyflakes::rules::assert_tuple(self, stmt, test);
                 }
-                if self.settings.rules.enabled(Rule::AssertFalse) {
+                if self.enabled(Rule::AssertFalse) {
                     flake8_bugbear::rules::assert_false(self, stmt, test, msg.as_deref());
                 }
-                if self.settings.rules.enabled(Rule::PytestAssertAlwaysFalse) {
+                if self.enabled(Rule::PytestAssertAlwaysFalse) {
                     flake8_pytest_style::rules::assert_falsy(self, stmt, test);
                 }
-                if self.settings.rules.enabled(Rule::PytestCompositeAssertion) {
+                if self.enabled(Rule::PytestCompositeAssertion) {
                     flake8_pytest_style::rules::composite_condition(
                         self,
                         stmt,
@@ -1662,243 +1490,244 @@ where
                         msg.as_deref(),
                     );
                 }
-                if self.settings.rules.enabled(Rule::AssertOnStringLiteral) {
+                if self.enabled(Rule::AssertOnStringLiteral) {
                     pylint::rules::assert_on_string_literal(self, test);
                 }
+                if self.enabled(Rule::InvalidMockAccess) {
+                    pygrep_hooks::rules::non_existent_mock_method(self, test);
+                }
             }
-            StmtKind::With { items, body, .. } => {
-                if self.settings.rules.enabled(Rule::AssertRaisesException) {
+            Stmt::With(ast::StmtWith { items, body, .. }) => {
+                if self.enabled(Rule::AssertRaisesException) {
                     flake8_bugbear::rules::assert_raises_exception(self, stmt, items);
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::PytestRaisesWithMultipleStatements)
-                {
+                if self.enabled(Rule::PytestRaisesWithMultipleStatements) {
                     flake8_pytest_style::rules::complex_raises(self, stmt, items, body);
                 }
-                if self.settings.rules.enabled(Rule::MultipleWithStatements) {
+                if self.enabled(Rule::MultipleWithStatements) {
                     flake8_simplify::rules::multiple_with_statements(
                         self,
                         stmt,
                         body,
-                        self.ctx.current_stmt_parent().map(Into::into),
+                        self.semantic_model.stmt_parent(),
                     );
                 }
-                if self.settings.rules.enabled(Rule::RedefinedLoopName) {
+                if self.enabled(Rule::RedefinedLoopName) {
                     pylint::rules::redefined_loop_name(self, &Node::Stmt(stmt));
                 }
             }
-            StmtKind::While { body, orelse, .. } => {
-                if self.settings.rules.enabled(Rule::FunctionUsesLoopVariable) {
+            Stmt::While(ast::StmtWhile { body, orelse, .. }) => {
+                if self.enabled(Rule::FunctionUsesLoopVariable) {
                     flake8_bugbear::rules::function_uses_loop_variable(self, &Node::Stmt(stmt));
                 }
-                if self.settings.rules.enabled(Rule::UselessElseOnLoop) {
+                if self.enabled(Rule::UselessElseOnLoop) {
                     pylint::rules::useless_else_on_loop(self, stmt, body, orelse);
                 }
             }
-            StmtKind::For {
+            Stmt::For(ast::StmtFor {
                 target,
                 body,
                 iter,
                 orelse,
                 ..
-            }
-            | StmtKind::AsyncFor {
+            })
+            | Stmt::AsyncFor(ast::StmtAsyncFor {
                 target,
                 body,
                 iter,
                 orelse,
                 ..
-            } => {
-                if self.settings.rules.enabled(Rule::UnusedLoopControlVariable) {
-                    self.deferred
-                        .for_loops
-                        .push((stmt, (self.ctx.scope_id, self.ctx.parents.clone())));
+            }) => {
+                if self.enabled(Rule::UnusedLoopControlVariable) {
+                    self.deferred.for_loops.push(self.semantic_model.snapshot());
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::LoopVariableOverridesIterator)
-                {
+                if self.enabled(Rule::LoopVariableOverridesIterator) {
                     flake8_bugbear::rules::loop_variable_overrides_iterator(self, target, iter);
                 }
-                if self.settings.rules.enabled(Rule::FunctionUsesLoopVariable) {
+                if self.enabled(Rule::FunctionUsesLoopVariable) {
                     flake8_bugbear::rules::function_uses_loop_variable(self, &Node::Stmt(stmt));
                 }
-                if self.settings.rules.enabled(Rule::ReuseOfGroupbyGenerator) {
+                if self.enabled(Rule::ReuseOfGroupbyGenerator) {
                     flake8_bugbear::rules::reuse_of_groupby_generator(self, target, body, iter);
                 }
-                if self.settings.rules.enabled(Rule::UselessElseOnLoop) {
+                if self.enabled(Rule::UselessElseOnLoop) {
                     pylint::rules::useless_else_on_loop(self, stmt, body, orelse);
                 }
-                if self.settings.rules.enabled(Rule::RedefinedLoopName) {
+                if self.enabled(Rule::RedefinedLoopName) {
                     pylint::rules::redefined_loop_name(self, &Node::Stmt(stmt));
                 }
-                if matches!(stmt.node, StmtKind::For { .. }) {
-                    if self.settings.rules.enabled(Rule::ReimplementedBuiltin) {
+                if self.enabled(Rule::IterationOverSet) {
+                    pylint::rules::iteration_over_set(self, iter);
+                }
+                if stmt.is_for_stmt() {
+                    if self.enabled(Rule::ReimplementedBuiltin) {
                         flake8_simplify::rules::convert_for_loop_to_any_all(
                             self,
                             stmt,
-                            self.ctx.current_sibling_stmt(),
+                            self.semantic_model.sibling_stmt(),
                         );
                     }
-                    if self.settings.rules.enabled(Rule::InDictKeys) {
+                    if self.enabled(Rule::InDictKeys) {
                         flake8_simplify::rules::key_in_dict_for(self, target, iter);
                     }
                 }
             }
-            StmtKind::Try {
+            Stmt::Try(ast::StmtTry {
                 body,
                 handlers,
                 orelse,
                 finalbody,
-                ..
-            }
-            | StmtKind::TryStar {
+                range: _,
+            })
+            | Stmt::TryStar(ast::StmtTryStar {
                 body,
                 handlers,
                 orelse,
                 finalbody,
-                ..
-            } => {
-                if self.settings.rules.enabled(Rule::DefaultExceptNotLast) {
+                range: _,
+            }) => {
+                if self.enabled(Rule::DefaultExceptNotLast) {
                     if let Some(diagnostic) =
                         pyflakes::rules::default_except_not_last(handlers, self.locator)
                     {
                         self.diagnostics.push(diagnostic);
                     }
                 }
-                if self.settings.rules.any_enabled(&[
+                if self.any_enabled(&[
                     Rule::DuplicateHandlerException,
                     Rule::DuplicateTryBlockException,
                 ]) {
                     flake8_bugbear::rules::duplicate_exceptions(self, handlers);
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::RedundantTupleInExceptionHandler)
-                {
+                if self.enabled(Rule::RedundantTupleInExceptionHandler) {
                     flake8_bugbear::rules::redundant_tuple_in_exception_handler(self, handlers);
                 }
-                if self.settings.rules.enabled(Rule::OSErrorAlias) {
+                if self.enabled(Rule::OSErrorAlias) {
                     pyupgrade::rules::os_error_alias_handlers(self, handlers);
                 }
-                if self.settings.rules.enabled(Rule::PytestAssertInExcept) {
+                if self.enabled(Rule::PytestAssertInExcept) {
                     self.diagnostics.extend(
                         flake8_pytest_style::rules::assert_in_exception_handler(handlers),
                     );
                 }
-                if self.settings.rules.enabled(Rule::SuppressibleException) {
+                if self.enabled(Rule::SuppressibleException) {
                     flake8_simplify::rules::suppressible_exception(
                         self, stmt, body, handlers, orelse, finalbody,
                     );
                 }
-                if self.settings.rules.enabled(Rule::ReturnInTryExceptFinally) {
+                if self.enabled(Rule::ReturnInTryExceptFinally) {
                     flake8_simplify::rules::return_in_try_except_finally(
                         self, body, handlers, finalbody,
                     );
                 }
-                if self.settings.rules.enabled(Rule::TryConsiderElse) {
+                if self.enabled(Rule::TryConsiderElse) {
                     tryceratops::rules::try_consider_else(self, body, orelse, handlers);
                 }
-                if self.settings.rules.enabled(Rule::VerboseRaise) {
+                if self.enabled(Rule::VerboseRaise) {
                     tryceratops::rules::verbose_raise(self, handlers);
                 }
-                if self.settings.rules.enabled(Rule::VerboseLogMessage) {
+                if self.enabled(Rule::VerboseLogMessage) {
                     tryceratops::rules::verbose_log_message(self, handlers);
                 }
-                if self.settings.rules.enabled(Rule::RaiseWithinTry) {
-                    tryceratops::rules::raise_within_try(self, body);
+                if self.enabled(Rule::RaiseWithinTry) {
+                    tryceratops::rules::raise_within_try(self, body, handlers);
+                }
+                if self.enabled(Rule::UselessTryExcept) {
+                    tryceratops::rules::useless_try_except(self, handlers);
                 }
-                if self.settings.rules.enabled(Rule::ErrorInsteadOfException) {
+                if self.enabled(Rule::ErrorInsteadOfException) {
                     tryceratops::rules::error_instead_of_exception(self, handlers);
                 }
             }
-            StmtKind::Assign { targets, value, .. } => {
-                if self.settings.rules.enabled(Rule::LambdaAssignment) {
+            Stmt::Assign(ast::StmtAssign { targets, value, .. }) => {
+                if self.enabled(Rule::LambdaAssignment) {
                     if let [target] = &targets[..] {
                         pycodestyle::rules::lambda_assignment(self, target, value, None, stmt);
                     }
                 }
-
-                if self.settings.rules.enabled(Rule::AssignmentToOsEnviron) {
+                if self.enabled(Rule::AssignmentToOsEnviron) {
                     flake8_bugbear::rules::assignment_to_os_environ(self, targets);
                 }
-
-                if self.settings.rules.enabled(Rule::HardcodedPasswordString) {
+                if self.enabled(Rule::HardcodedPasswordString) {
                     if let Some(diagnostic) =
                         flake8_bandit::rules::assign_hardcoded_password_string(value, targets)
                     {
                         self.diagnostics.push(diagnostic);
                     }
                 }
-
-                if self.settings.rules.enabled(Rule::GlobalStatement) {
+                if self.enabled(Rule::GlobalStatement) {
                     for target in targets.iter() {
-                        if let ExprKind::Name { id, .. } = &target.node {
+                        if let Expr::Name(ast::ExprName { id, .. }) = target {
                             pylint::rules::global_statement(self, id);
                         }
                     }
                 }
-
-                if self.settings.rules.enabled(Rule::UselessMetaclassType) {
+                if self.enabled(Rule::UselessMetaclassType) {
                     pyupgrade::rules::useless_metaclass_type(self, stmt, value, targets);
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::ConvertTypedDictFunctionalToClass)
-                {
+                if self.enabled(Rule::ConvertTypedDictFunctionalToClass) {
                     pyupgrade::rules::convert_typed_dict_functional_to_class(
                         self, stmt, targets, value,
                     );
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::ConvertNamedTupleFunctionalToClass)
-                {
+                if self.enabled(Rule::ConvertNamedTupleFunctionalToClass) {
                     pyupgrade::rules::convert_named_tuple_functional_to_class(
                         self, stmt, targets, value,
                     );
                 }
-                if self.settings.rules.enabled(Rule::UnpackedListComprehension) {
+                if self.enabled(Rule::UnpackedListComprehension) {
                     pyupgrade::rules::unpacked_list_comprehension(self, targets, value);
                 }
-
-                if self.settings.rules.enabled(Rule::PandasDfVariableName) {
+                if self.enabled(Rule::PandasDfVariableName) {
                     if let Some(diagnostic) = pandas_vet::rules::assignment_to_df(targets) {
                         self.diagnostics.push(diagnostic);
                     }
                 }
-
-                if self.is_stub {
-                    if self
-                        .settings
-                        .rules
-                        .any_enabled(&[Rule::UnprefixedTypeParam, Rule::AssignmentDefaultInStub])
+                if self
+                    .settings
+                    .rules
+                    .enabled(Rule::AirflowVariableNameTaskIdMismatch)
+                {
+                    if let Some(diagnostic) =
+                        airflow::rules::variable_name_task_id(self, targets, value)
                     {
+                        self.diagnostics.push(diagnostic);
+                    }
+                }
+                if self.is_stub {
+                    if self.any_enabled(&[
+                        Rule::UnprefixedTypeParam,
+                        Rule::AssignmentDefaultInStub,
+                        Rule::UnannotatedAssignmentInStub,
+                    ]) {
                         // 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) {
+                        if !self
+                            .semantic_model
+                            .scopes()
+                            .any(|scope| scope.kind.is_any_function())
+                        {
+                            if self.enabled(Rule::UnprefixedTypeParam) {
                                 flake8_pyi::rules::prefix_type_params(self, value, targets);
                             }
-                            if self.settings.rules.enabled(Rule::AssignmentDefaultInStub) {
+                            if self.enabled(Rule::AssignmentDefaultInStub) {
                                 flake8_pyi::rules::assignment_default_in_stub(self, targets, value);
                             }
+                            if self.enabled(Rule::UnannotatedAssignmentInStub) {
+                                flake8_pyi::rules::unannotated_assignment_in_stub(
+                                    self, targets, value,
+                                );
+                            }
                         }
                     }
                 }
             }
-            StmtKind::AnnAssign {
+            Stmt::AnnAssign(ast::StmtAnnAssign {
                 target,
                 value,
                 annotation,
                 ..
-            } => {
-                if self.settings.rules.enabled(Rule::LambdaAssignment) {
+            }) => {
+                if self.enabled(Rule::LambdaAssignment) {
                     if let Some(value) = value {
                         pycodestyle::rules::lambda_assignment(
                             self,
@@ -1909,11 +1738,7 @@ where
                         );
                     }
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UnintentionalTypeAnnotation)
-                {
+                if self.enabled(Rule::UnintentionalTypeAnnotation) {
                     flake8_bugbear::rules::unintentional_type_annotation(
                         self,
                         target,
@@ -1923,44 +1748,63 @@ where
                 }
                 if self.is_stub {
                     if let Some(value) = value {
-                        if self.settings.rules.enabled(Rule::AssignmentDefaultInStub) {
+                        if self.enabled(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
+                                .semantic_model
+                                .scopes()
+                                .any(|scope| scope.kind.is_any_function())
+                            {
                                 flake8_pyi::rules::annotated_assignment_default_in_stub(
                                     self, target, value, annotation,
                                 );
                             }
                         }
+                    } else {
+                        if self.enabled(Rule::UnassignedSpecialVariableInStub) {
+                            flake8_pyi::rules::unassigned_special_variable_in_stub(
+                                self, target, stmt,
+                            );
+                        }
                     }
-                    if self.ctx.match_typing_expr(annotation, "TypeAlias") {
-                        if self.settings.rules.enabled(Rule::SnakeCaseTypeAlias) {
+                    if self
+                        .semantic_model
+                        .match_typing_expr(annotation, "TypeAlias")
+                    {
+                        if self.enabled(Rule::SnakeCaseTypeAlias) {
                             flake8_pyi::rules::snake_case_type_alias(self, target);
                         }
-                        if self.settings.rules.enabled(Rule::TSuffixedTypeAlias) {
+                        if self.enabled(Rule::TSuffixedTypeAlias) {
                             flake8_pyi::rules::t_suffixed_type_alias(self, target);
                         }
                     }
                 }
             }
-            StmtKind::Delete { targets } => {
-                if self.settings.rules.enabled(Rule::GlobalStatement) {
+            Stmt::Delete(ast::StmtDelete { targets, range: _ }) => {
+                if self.enabled(Rule::GlobalStatement) {
                     for target in targets.iter() {
-                        if let ExprKind::Name { id, .. } = &target.node {
+                        if let Expr::Name(ast::ExprName { id, .. }) = target {
                             pylint::rules::global_statement(self, id);
                         }
                     }
                 }
             }
-            StmtKind::Expr { value, .. } => {
-                if self.settings.rules.enabled(Rule::UselessComparison) {
+            Stmt::Expr(ast::StmtExpr { value, range: _ }) => {
+                if self.enabled(Rule::UselessComparison) {
                     flake8_bugbear::rules::useless_comparison(self, value);
                 }
-                if self.settings.rules.enabled(Rule::UselessExpression) {
+                if self.enabled(Rule::UselessExpression) {
                     flake8_bugbear::rules::useless_expression(self, value);
                 }
-                if self.settings.rules.enabled(Rule::AsyncioDanglingTask) {
+                if self.enabled(Rule::InvalidMockAccess) {
+                    pygrep_hooks::rules::uncalled_mock_method(self, value);
+                }
+                if self.enabled(Rule::NamedExprWithoutContext) {
+                    pylint::rules::named_expr_without_context(self, value);
+                }
+                if self.enabled(Rule::AsyncioDanglingTask) {
                     if let Some(diagnostic) = ruff::rules::asyncio_dangling_task(value, |expr| {
-                        self.ctx.resolve_call_path(expr)
+                        self.semantic_model.resolve_call_path(expr)
                     }) {
                         self.diagnostics.push(diagnostic);
                     }
@@ -1970,197 +1814,224 @@ where
         }
 
         // Recurse.
-        let prev_in_exception_handler = self.ctx.in_exception_handler;
-        let prev_visible_scope = self.ctx.visible_scope;
-        match &stmt.node {
-            StmtKind::FunctionDef {
+        match stmt {
+            Stmt::FunctionDef(ast::StmtFunctionDef {
                 body,
                 name,
                 args,
                 decorator_list,
+                returns,
                 ..
-            }
-            | StmtKind::AsyncFunctionDef {
+            })
+            | Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef {
                 body,
                 name,
                 args,
                 decorator_list,
+                returns,
                 ..
-            } => {
-                if self.settings.rules.enabled(Rule::FStringDocstring) {
-                    flake8_bugbear::rules::f_string_docstring(self, body);
-                }
-                let definition = docstrings::extraction::extract(
-                    self.ctx.visible_scope,
-                    stmt,
-                    body,
-                    Documentable::Function,
-                );
-                if self.settings.rules.enabled(Rule::YieldInForLoop) {
-                    pyupgrade::rules::yield_in_for_loop(self, stmt);
+            }) => {
+                // Visit the decorators and arguments, but avoid the body, which will be
+                // deferred.
+                for expr in decorator_list {
+                    self.visit_expr(expr);
                 }
-                let scope = transition_scope(self.ctx.visible_scope, stmt, Documentable::Function);
-                self.deferred.definitions.push((
-                    definition,
-                    scope.visibility,
-                    (self.ctx.scope_id, self.ctx.parents.clone()),
-                ));
-                self.ctx.visible_scope = scope;
 
-                // If any global bindings don't already exist in the global scope, add it.
-                let globals = helpers::extract_globals(body);
-                for (name, stmt) in helpers::extract_globals(body) {
-                    if self
-                        .ctx
-                        .global_scope()
-                        .get(name)
-                        .map_or(true, |index| self.ctx.bindings[*index].kind.is_annotation())
-                    {
-                        let id = self.ctx.bindings.push(Binding {
-                            kind: BindingKind::Assignment,
-                            runtime_usage: None,
-                            synthetic_usage: None,
-                            typing_usage: None,
-                            range: stmt.range(),
-                            source: Some(RefEquality(stmt)),
-                            context: self.ctx.execution_context(),
-                            exceptions: self.ctx.exceptions(),
-                        });
-                        self.ctx.global_scope_mut().add(name, id);
+                // Function annotations are always evaluated at runtime, unless future annotations
+                // are enabled.
+                let runtime_annotation = !self.semantic_model.future_annotations();
+
+                for arg in &args.posonlyargs {
+                    if let Some(expr) = &arg.annotation {
+                        if runtime_annotation {
+                            self.visit_type_definition(expr);
+                        } else {
+                            self.visit_annotation(expr);
+                        };
+                    }
+                }
+                for arg in &args.args {
+                    if let Some(expr) = &arg.annotation {
+                        if runtime_annotation {
+                            self.visit_type_definition(expr);
+                        } else {
+                            self.visit_annotation(expr);
+                        };
+                    }
+                }
+                if let Some(arg) = &args.vararg {
+                    if let Some(expr) = &arg.annotation {
+                        if runtime_annotation {
+                            self.visit_type_definition(expr);
+                        } else {
+                            self.visit_annotation(expr);
+                        };
+                    }
+                }
+                for arg in &args.kwonlyargs {
+                    if let Some(expr) = &arg.annotation {
+                        if runtime_annotation {
+                            self.visit_type_definition(expr);
+                        } else {
+                            self.visit_annotation(expr);
+                        };
                     }
                 }
+                if let Some(arg) = &args.kwarg {
+                    if let Some(expr) = &arg.annotation {
+                        if runtime_annotation {
+                            self.visit_type_definition(expr);
+                        } else {
+                            self.visit_annotation(expr);
+                        };
+                    }
+                }
+                for expr in returns {
+                    if runtime_annotation {
+                        self.visit_type_definition(expr);
+                    } else {
+                        self.visit_annotation(expr);
+                    };
+                }
+                for expr in &args.kw_defaults {
+                    self.visit_expr(expr);
+                }
+                for expr in &args.defaults {
+                    self.visit_expr(expr);
+                }
 
-                self.ctx.push_scope(ScopeKind::Function(FunctionDef {
+                self.add_binding(
                     name,
-                    body,
-                    args,
-                    decorator_list,
-                    async_: matches!(stmt.node, StmtKind::AsyncFunctionDef { .. }),
-                    globals,
-                }));
+                    stmt.range(),
+                    BindingKind::FunctionDefinition,
+                    BindingFlags::empty(),
+                );
 
-                self.deferred.functions.push((
-                    stmt,
-                    (self.ctx.scope_id, self.ctx.parents.clone()),
-                    self.ctx.visible_scope,
-                ));
-            }
-            StmtKind::ClassDef {
-                body,
-                name,
-                bases,
-                keywords,
-                decorator_list,
-                ..
-            } => {
-                if self.settings.rules.enabled(Rule::FStringDocstring) {
-                    flake8_bugbear::rules::f_string_docstring(self, body);
-                }
-                let definition = docstrings::extraction::extract(
-                    self.ctx.visible_scope,
+                let definition = docstrings::extraction::extract_definition(
+                    ExtractionTarget::Function,
                     stmt,
-                    body,
-                    Documentable::Class,
+                    self.semantic_model.definition_id,
+                    &self.semantic_model.definitions,
                 );
-                let scope = transition_scope(self.ctx.visible_scope, stmt, Documentable::Class);
-                self.deferred.definitions.push((
-                    definition,
-                    scope.visibility,
-                    (self.ctx.scope_id, self.ctx.parents.clone()),
-                ));
-                self.ctx.visible_scope = scope;
+                self.semantic_model.push_definition(definition);
 
-                // If any global bindings don't already exist in the global scope, add it.
-                let globals = helpers::extract_globals(body);
-                for (name, stmt) in &globals {
-                    if self
-                        .ctx
-                        .global_scope()
-                        .get(name)
-                        .map_or(true, |index| self.ctx.bindings[*index].kind.is_annotation())
-                    {
-                        let id = self.ctx.bindings.push(Binding {
-                            kind: BindingKind::Assignment,
-                            runtime_usage: None,
-                            synthetic_usage: None,
-                            typing_usage: None,
-                            range: stmt.range(),
-                            source: Some(RefEquality(stmt)),
-                            context: self.ctx.execution_context(),
-                            exceptions: self.ctx.exceptions(),
-                        });
-                        self.ctx.global_scope_mut().add(name, id);
-                    }
-                }
+                self.semantic_model.push_scope(match &stmt {
+                    Stmt::FunctionDef(stmt) => ScopeKind::Function(stmt),
+                    Stmt::AsyncFunctionDef(stmt) => ScopeKind::AsyncFunction(stmt),
+                    _ => unreachable!("Expected Stmt::FunctionDef | Stmt::AsyncFunctionDef"),
+                });
 
-                self.ctx.push_scope(ScopeKind::Class(ClassDef {
-                    name,
+                self.deferred.functions.push(self.semantic_model.snapshot());
+
+                // Extract any global bindings from the function body.
+                if let Some(globals) = Globals::from_body(body) {
+                    self.semantic_model.set_globals(globals);
+                }
+            }
+            Stmt::ClassDef(
+                class_def @ ast::StmtClassDef {
+                    body,
                     bases,
                     keywords,
                     decorator_list,
-                    globals,
-                }));
+                    ..
+                },
+            ) => {
+                for expr in bases {
+                    self.visit_expr(expr);
+                }
+                for keyword in keywords {
+                    self.visit_keyword(keyword);
+                }
+                for expr in decorator_list {
+                    self.visit_expr(expr);
+                }
+
+                let definition = docstrings::extraction::extract_definition(
+                    ExtractionTarget::Class,
+                    stmt,
+                    self.semantic_model.definition_id,
+                    &self.semantic_model.definitions,
+                );
+                self.semantic_model.push_definition(definition);
+
+                self.semantic_model.push_scope(ScopeKind::Class(class_def));
+
+                // Extract any global bindings from the class body.
+                if let Some(globals) = Globals::from_body(body) {
+                    self.semantic_model.set_globals(globals);
+                }
 
                 self.visit_body(body);
             }
-            StmtKind::Try {
+            Stmt::Try(ast::StmtTry {
                 body,
                 handlers,
                 orelse,
                 finalbody,
-            }
-            | StmtKind::TryStar {
+                range: _,
+            })
+            | Stmt::TryStar(ast::StmtTryStar {
                 body,
                 handlers,
                 orelse,
                 finalbody,
-            } => {
+                range: _,
+            }) => {
                 let mut handled_exceptions = Exceptions::empty();
                 for type_ in extract_handled_exceptions(handlers) {
-                    if let Some(call_path) = self.ctx.resolve_call_path(type_) {
-                        if call_path.as_slice() == ["", "NameError"] {
-                            handled_exceptions |= Exceptions::NAME_ERROR;
-                        } else if call_path.as_slice() == ["", "ModuleNotFoundError"] {
-                            handled_exceptions |= Exceptions::MODULE_NOT_FOUND_ERROR;
+                    if let Some(call_path) = self.semantic_model.resolve_call_path(type_) {
+                        match call_path.as_slice() {
+                            ["", "NameError"] => {
+                                handled_exceptions |= Exceptions::NAME_ERROR;
+                            }
+                            ["", "ModuleNotFoundError"] => {
+                                handled_exceptions |= Exceptions::MODULE_NOT_FOUND_ERROR;
+                            }
+                            ["", "ImportError"] => {
+                                handled_exceptions |= Exceptions::IMPORT_ERROR;
+                            }
+                            _ => {}
                         }
                     }
                 }
 
-                self.ctx.handled_exceptions.push(handled_exceptions);
+                self.semantic_model
+                    .handled_exceptions
+                    .push(handled_exceptions);
 
-                if self.settings.rules.enabled(Rule::JumpStatementInFinally) {
+                if self.enabled(Rule::JumpStatementInFinally) {
                     flake8_bugbear::rules::jump_statement_in_finally(self, finalbody);
                 }
 
-                if self.settings.rules.enabled(Rule::ContinueInFinally) {
+                if self.enabled(Rule::ContinueInFinally) {
                     if self.settings.target_version <= PythonVersion::Py38 {
                         pylint::rules::continue_in_finally(self, finalbody);
                     }
                 }
 
                 self.visit_body(body);
-                self.ctx.handled_exceptions.pop();
+                self.semantic_model.handled_exceptions.pop();
 
-                self.ctx.in_exception_handler = true;
+                self.semantic_model.flags |= SemanticModelFlags::EXCEPTION_HANDLER;
                 for excepthandler in handlers {
                     self.visit_excepthandler(excepthandler);
                 }
-                self.ctx.in_exception_handler = prev_in_exception_handler;
 
                 self.visit_body(orelse);
                 self.visit_body(finalbody);
             }
-            StmtKind::AnnAssign {
+            Stmt::AnnAssign(ast::StmtAnnAssign {
                 target,
                 annotation,
                 value,
                 ..
-            } => {
+            }) => {
                 // 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 = if self.ctx.annotations_future_enabled {
-                    if matches!(self.ctx.scope().kind, ScopeKind::Class(..)) {
+                let runtime_annotation = if self.semantic_model.future_annotations() {
+                    if self.semantic_model.scope().kind.is_class() {
                         let baseclasses = &self
                             .settings
                             .flake8_type_checking
@@ -2170,7 +2041,7 @@ where
                             .flake8_type_checking
                             .runtime_evaluated_decorators;
                         flake8_type_checking::helpers::runtime_evaluated(
-                            &self.ctx,
+                            &self.semantic_model,
                             baseclasses,
                             decorators,
                         )
@@ -2179,48 +2050,68 @@ where
                     }
                 } else {
                     matches!(
-                        self.ctx.scope().kind,
-                        ScopeKind::Class(..) | ScopeKind::Module
+                        self.semantic_model.scope().kind,
+                        ScopeKind::Class(_) | ScopeKind::Module
                     )
                 };
 
                 if runtime_annotation {
-                    visit_type_definition!(self, annotation);
+                    self.visit_type_definition(annotation);
                 } else {
                     self.visit_annotation(annotation);
                 }
                 if let Some(expr) = value {
-                    if self.ctx.match_typing_expr(annotation, "TypeAlias") {
-                        visit_type_definition!(self, expr);
+                    if self
+                        .semantic_model
+                        .match_typing_expr(annotation, "TypeAlias")
+                    {
+                        self.visit_type_definition(expr);
                     } else {
                         self.visit_expr(expr);
                     }
                 }
                 self.visit_expr(target);
             }
-            StmtKind::Assert { test, msg } => {
-                visit_boolean_test!(self, test);
+            Stmt::Assert(ast::StmtAssert {
+                test,
+                msg,
+                range: _,
+            }) => {
+                self.visit_boolean_test(test);
                 if let Some(expr) = msg {
                     self.visit_expr(expr);
                 }
             }
-            StmtKind::While { test, body, orelse } => {
-                visit_boolean_test!(self, test);
+            Stmt::While(ast::StmtWhile {
+                test,
+                body,
+                orelse,
+                range: _,
+            }) => {
+                self.visit_boolean_test(test);
                 self.visit_body(body);
                 self.visit_body(orelse);
             }
-            StmtKind::If { test, body, orelse } => {
-                visit_boolean_test!(self, test);
+            Stmt::If(
+                stmt_if @ ast::StmtIf {
+                    test,
+                    body,
+                    orelse,
+                    range: _,
+                },
+            ) => {
+                self.visit_boolean_test(test);
 
-                if flake8_type_checking::helpers::is_type_checking_block(&self.ctx, test) {
-                    if self.settings.rules.enabled(Rule::EmptyTypeCheckingBlock) {
-                        flake8_type_checking::rules::empty_type_checking_block(self, stmt, body);
+                if analyze::typing::is_type_checking_block(stmt_if, &self.semantic_model) {
+                    if self.semantic_model.at_top_level() {
+                        self.importer.visit_type_checking_block(stmt);
                     }
 
-                    let prev_in_type_checking_block = self.ctx.in_type_checking_block;
-                    self.ctx.in_type_checking_block = true;
-                    self.visit_body(body);
-                    self.ctx.in_type_checking_block = prev_in_type_checking_block;
+                    if self.enabled(Rule::EmptyTypeCheckingBlock) {
+                        flake8_type_checking::rules::empty_type_checking_block(self, stmt_if);
+                    }
+
+                    self.visit_type_checking_block(body);
                 } else {
                     self.visit_body(body);
                 }
@@ -2229,99 +2120,136 @@ where
             }
             _ => visitor::walk_stmt(self, stmt),
         };
-        self.ctx.visible_scope = prev_visible_scope;
 
         // Post-visit.
-        match &stmt.node {
-            StmtKind::FunctionDef { .. } | StmtKind::AsyncFunctionDef { .. } => {
-                self.ctx.pop_scope();
+        match stmt {
+            Stmt::FunctionDef(_) | Stmt::AsyncFunctionDef(_) => {
+                self.semantic_model.pop_scope();
+                self.semantic_model.pop_definition();
             }
-            StmtKind::ClassDef { name, .. } => {
-                self.ctx.pop_scope();
+            Stmt::ClassDef(ast::StmtClassDef { name, .. }) => {
+                self.semantic_model.pop_scope();
+                self.semantic_model.pop_definition();
                 self.add_binding(
                     name,
-                    Binding {
-                        kind: BindingKind::ClassDefinition,
-                        runtime_usage: None,
-                        synthetic_usage: None,
-                        typing_usage: None,
-                        range: stmt.range(),
-                        source: Some(*self.ctx.current_stmt()),
-                        context: self.ctx.execution_context(),
-                        exceptions: self.ctx.exceptions(),
-                    },
+                    stmt.range(),
+                    BindingKind::ClassDefinition,
+                    BindingFlags::empty(),
                 );
             }
             _ => {}
         }
 
-        self.ctx.pop_parent();
+        self.semantic_model.flags = flags_snapshot;
+        self.semantic_model.pop_stmt();
     }
 
     fn visit_annotation(&mut self, expr: &'b Expr) {
-        let prev_in_annotation = self.ctx.in_annotation;
-        self.ctx.in_annotation = true;
-        visit_type_definition!(self, expr);
-        self.ctx.in_annotation = prev_in_annotation;
+        let flags_snapshot = self.semantic_model.flags;
+        self.semantic_model.flags |= SemanticModelFlags::ANNOTATION;
+        self.visit_type_definition(expr);
+        self.semantic_model.flags = flags_snapshot;
     }
 
     fn visit_expr(&mut self, expr: &'b Expr) {
-        if !self.ctx.in_f_string
-            && !self.ctx.in_deferred_type_definition
-            && self.ctx.in_deferred_string_type_definition.is_none()
-            && self.ctx.in_type_definition
-            && self.ctx.annotations_future_enabled
+        if !self.semantic_model.in_f_string()
+            && !self.semantic_model.in_deferred_type_definition()
+            && self.semantic_model.in_type_definition()
+            && self.semantic_model.future_annotations()
         {
-            if let ExprKind::Constant {
+            if let Expr::Constant(ast::ExprConstant {
                 value: Constant::Str(value),
                 ..
-            } = &expr.node
+            }) = expr
             {
                 self.deferred.string_type_definitions.push((
                     expr.range(),
                     value,
-                    (self.ctx.in_annotation, self.ctx.in_type_checking_block),
-                    (self.ctx.scope_id, self.ctx.parents.clone()),
+                    self.semantic_model.snapshot(),
                 ));
             } else {
-                self.deferred.type_definitions.push((
-                    expr,
-                    (self.ctx.in_annotation, self.ctx.in_type_checking_block),
-                    (self.ctx.scope_id, self.ctx.parents.clone()),
-                ));
+                self.deferred
+                    .future_type_definitions
+                    .push((expr, self.semantic_model.snapshot()));
             }
             return;
         }
 
-        self.ctx.push_expr(expr);
+        self.semantic_model.push_expr(expr);
 
-        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;
+        // Store the flags prior to any further descent, so that we can restore them after visiting
+        // the node.
+        let flags_snapshot = self.semantic_model.flags;
 
-        if !matches!(expr.node, ExprKind::BoolOp { .. }) {
-            self.ctx.in_boolean_test = false;
+        // If we're in a boolean test (e.g., the `test` of a `Stmt::If`), but now within a
+        // subexpression (e.g., `a` in `f(a)`), then we're no longer in a boolean test.
+        if !matches!(
+            expr,
+            Expr::BoolOp(_)
+                | Expr::UnaryOp(ast::ExprUnaryOp {
+                    op: Unaryop::Not,
+                    ..
+                })
+        ) {
+            self.semantic_model.flags -= SemanticModelFlags::BOOLEAN_TEST;
         }
 
         // Pre-visit.
-        match &expr.node {
-            ExprKind::Subscript { value, slice, .. } => {
+        match expr {
+            Expr::Subscript(ast::ExprSubscript { value, slice, .. }) => {
                 // Ex) Optional[...], Union[...]
-                if !self.settings.pyupgrade.keep_runtime_typing
-                    && self.settings.rules.enabled(Rule::NonPEP604Annotation)
-                    && (self.settings.target_version >= PythonVersion::Py310
-                        || (self.settings.target_version >= PythonVersion::Py37
-                            && self.ctx.annotations_future_enabled
-                            && self.ctx.in_annotation))
-                {
-                    pyupgrade::rules::use_pep604_annotation(self, expr, value, slice);
+                if self.any_enabled(&[
+                    Rule::FutureRewritableTypeAnnotation,
+                    Rule::NonPEP604Annotation,
+                ]) {
+                    if let Some(operator) =
+                        analyze::typing::to_pep604_operator(value, slice, &self.semantic_model)
+                    {
+                        if self.enabled(Rule::FutureRewritableTypeAnnotation) {
+                            if self.settings.target_version < PythonVersion::Py310
+                                && self.settings.target_version >= PythonVersion::Py37
+                                && !self.semantic_model.future_annotations()
+                                && self.semantic_model.in_annotation()
+                            {
+                                flake8_future_annotations::rules::future_rewritable_type_annotation(
+                                    self, value,
+                                );
+                            }
+                        }
+                        if self.enabled(Rule::NonPEP604Annotation) {
+                            if self.settings.target_version >= PythonVersion::Py310
+                                || (self.settings.target_version >= PythonVersion::Py37
+                                    && self.semantic_model.future_annotations()
+                                    && self.semantic_model.in_annotation())
+                            {
+                                pyupgrade::rules::use_pep604_annotation(
+                                    self, expr, slice, operator,
+                                );
+                            }
+                        }
+                    }
+                }
+
+                // Ex) list[...]
+                if self.enabled(Rule::FutureRequiredTypeAnnotation) {
+                    if self.settings.target_version < PythonVersion::Py39
+                        && !self.semantic_model.future_annotations()
+                        && self.semantic_model.in_annotation()
+                        && analyze::typing::is_pep585_generic(value, &self.semantic_model)
+                    {
+                        flake8_future_annotations::rules::future_required_type_annotation(
+                            self,
+                            expr,
+                            flake8_future_annotations::rules::Reason::PEP585,
+                        );
+                    }
                 }
 
-                if self.ctx.match_typing_expr(value, "Literal") {
-                    self.ctx.in_literal = true;
+                if self.semantic_model.match_typing_expr(value, "Literal") {
+                    self.semantic_model.flags |= SemanticModelFlags::LITERAL;
                 }
 
-                if self.settings.rules.any_enabled(&[
+                if self.any_enabled(&[
                     Rule::SysVersionSlice3,
                     Rule::SysVersion2,
                     Rule::SysVersion0,
@@ -2330,24 +2258,27 @@ where
                     flake8_2020::rules::subscript(self, value, slice);
                 }
 
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UncapitalizedEnvironmentVariables)
-                {
+                if self.enabled(Rule::UncapitalizedEnvironmentVariables) {
                     flake8_simplify::rules::use_capital_environment_variables(self, expr);
                 }
+
+                pandas_vet::rules::subscript(self, value, expr);
             }
-            ExprKind::Tuple { elts, ctx } | ExprKind::List { elts, ctx } => {
+            Expr::Tuple(ast::ExprTuple {
+                elts,
+                ctx,
+                range: _,
+            })
+            | Expr::List(ast::ExprList {
+                elts,
+                ctx,
+                range: _,
+            }) => {
                 if matches!(ctx, ExprContext::Store) {
-                    let check_too_many_expressions = self
-                        .settings
-                        .rules
-                        .enabled(Rule::ExpressionsInStarAssignment);
-                    let check_two_starred_expressions = self
-                        .settings
-                        .rules
-                        .enabled(Rule::MultipleStarredExpressions);
+                    let check_too_many_expressions =
+                        self.enabled(Rule::ExpressionsInStarAssignment);
+                    let check_two_starred_expressions =
+                        self.enabled(Rule::MultipleStarredExpressions);
                     if let Some(diagnostic) = pyflakes::rules::starred_expressions(
                         elts,
                         check_too_many_expressions,
@@ -2358,32 +2289,60 @@ where
                     }
                 }
             }
-            ExprKind::Name { id, ctx } => {
+            Expr::Name(ast::ExprName { id, ctx, range: _ }) => {
                 match ctx {
                     ExprContext::Load => {
-                        if self.settings.rules.enabled(Rule::TypingTextStrAlias) {
+                        if self.enabled(Rule::TypingTextStrAlias) {
                             pyupgrade::rules::typing_text_str_alias(self, expr);
                         }
-                        if self.settings.rules.enabled(Rule::NumpyDeprecatedTypeAlias) {
+                        if self.enabled(Rule::NumpyDeprecatedTypeAlias) {
                             numpy::rules::deprecated_type_alias(self, expr);
                         }
+                        if self.is_stub {
+                            if self.enabled(Rule::CollectionsNamedTuple) {
+                                flake8_pyi::rules::collections_named_tuple(self, expr);
+                            }
+                        }
 
                         // Ex) List[...]
-                        if !self.settings.pyupgrade.keep_runtime_typing
-                            && self.settings.rules.enabled(Rule::NonPEP585Annotation)
-                            && (self.settings.target_version >= PythonVersion::Py39
-                                || (self.settings.target_version >= PythonVersion::Py37
-                                    && self.ctx.annotations_future_enabled
-                                    && self.ctx.in_annotation))
-                            && analyze::typing::is_pep585_builtin(expr, &self.ctx)
-                        {
-                            pyupgrade::rules::use_pep585_annotation(self, expr);
+                        if self.any_enabled(&[
+                            Rule::FutureRewritableTypeAnnotation,
+                            Rule::NonPEP585Annotation,
+                        ]) {
+                            if let Some(replacement) =
+                                analyze::typing::to_pep585_generic(expr, &self.semantic_model)
+                            {
+                                if self.enabled(Rule::FutureRewritableTypeAnnotation) {
+                                    if self.settings.target_version < PythonVersion::Py39
+                                        && self.settings.target_version >= PythonVersion::Py37
+                                        && !self.semantic_model.future_annotations()
+                                        && self.semantic_model.in_annotation()
+                                    {
+                                        flake8_future_annotations::rules::future_rewritable_type_annotation(
+                                            self, expr,
+                                        );
+                                    }
+                                }
+                                if self.enabled(Rule::NonPEP585Annotation) {
+                                    if self.settings.target_version >= PythonVersion::Py39
+                                        || (self.settings.target_version >= PythonVersion::Py37
+                                            && self.semantic_model.future_annotations()
+                                            && self.semantic_model.in_annotation())
+                                    {
+                                        pyupgrade::rules::use_pep585_annotation(
+                                            self,
+                                            expr,
+                                            &replacement,
+                                        );
+                                    }
+                                }
+                            }
                         }
 
                         self.handle_node_load(expr);
                     }
                     ExprContext::Store => {
-                        if self.settings.rules.enabled(Rule::AmbiguousVariableName) {
+                        if self.enabled(Rule::AmbiguousVariableName) {
                             if let Some(diagnostic) =
                                 pycodestyle::rules::ambiguous_variable_name(id, expr.range())
                             {
@@ -2391,68 +2350,105 @@ where
                             }
                         }
 
-                        self.check_builtin_shadowing(id, expr, true);
+                        if self.semantic_model.scope().kind.is_class() {
+                            if self.enabled(Rule::BuiltinAttributeShadowing) {
+                                flake8_builtins::rules::builtin_attribute_shadowing(
+                                    self,
+                                    id,
+                                    AnyShadowing::from(expr),
+                                );
+                            }
+                        } else {
+                            if self.enabled(Rule::BuiltinVariableShadowing) {
+                                flake8_builtins::rules::builtin_variable_shadowing(
+                                    self,
+                                    id,
+                                    AnyShadowing::from(expr),
+                                );
+                            }
+                        }
 
                         self.handle_node_store(id, expr);
                     }
                     ExprContext::Del => self.handle_node_delete(expr),
                 }
 
-                if self.settings.rules.enabled(Rule::SixPY3) {
+                if self.enabled(Rule::SixPY3) {
                     flake8_2020::rules::name_or_attribute(self, expr);
                 }
 
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::LoadBeforeGlobalDeclaration)
-                {
+                if self.enabled(Rule::LoadBeforeGlobalDeclaration) {
                     pylint::rules::load_before_global_declaration(self, id, expr);
                 }
             }
-            ExprKind::Attribute { attr, value, .. } => {
+            Expr::Attribute(ast::ExprAttribute { attr, value, .. }) => {
                 // Ex) typing.List[...]
-                if !self.settings.pyupgrade.keep_runtime_typing
-                    && self.settings.rules.enabled(Rule::NonPEP585Annotation)
-                    && (self.settings.target_version >= PythonVersion::Py39
-                        || (self.settings.target_version >= PythonVersion::Py37
-                            && self.ctx.annotations_future_enabled
-                            && self.ctx.in_annotation))
-                    && analyze::typing::is_pep585_builtin(expr, &self.ctx)
-                {
-                    pyupgrade::rules::use_pep585_annotation(self, expr);
+                if self.any_enabled(&[
+                    Rule::FutureRewritableTypeAnnotation,
+                    Rule::NonPEP585Annotation,
+                ]) {
+                    if let Some(replacement) =
+                        analyze::typing::to_pep585_generic(expr, &self.semantic_model)
+                    {
+                        if self.enabled(Rule::FutureRewritableTypeAnnotation) {
+                            if self.settings.target_version < PythonVersion::Py39
+                                && self.settings.target_version >= PythonVersion::Py37
+                                && !self.semantic_model.future_annotations()
+                                && self.semantic_model.in_annotation()
+                            {
+                                flake8_future_annotations::rules::future_rewritable_type_annotation(
+                                    self, expr,
+                                );
+                            }
+                        }
+                        if self.enabled(Rule::NonPEP585Annotation) {
+                            if self.settings.target_version >= PythonVersion::Py39
+                                || (self.settings.target_version >= PythonVersion::Py37
+                                    && self.semantic_model.future_annotations()
+                                    && self.semantic_model.in_annotation())
+                            {
+                                pyupgrade::rules::use_pep585_annotation(self, expr, &replacement);
+                            }
+                        }
+                    }
                 }
-                if self.settings.rules.enabled(Rule::DatetimeTimezoneUTC)
+                if self.enabled(Rule::DatetimeTimezoneUTC)
                     && self.settings.target_version >= PythonVersion::Py311
                 {
                     pyupgrade::rules::datetime_utc_alias(self, expr);
                 }
-                if self.settings.rules.enabled(Rule::TypingTextStrAlias) {
+                if self.enabled(Rule::TypingTextStrAlias) {
                     pyupgrade::rules::typing_text_str_alias(self, expr);
                 }
-                if self.settings.rules.enabled(Rule::NumpyDeprecatedTypeAlias) {
+                if self.enabled(Rule::NumpyDeprecatedTypeAlias) {
                     numpy::rules::deprecated_type_alias(self, expr);
                 }
-                if self.settings.rules.enabled(Rule::DeprecatedMockImport) {
+                if self.enabled(Rule::DeprecatedMockImport) {
                     pyupgrade::rules::deprecated_mock_attribute(self, expr);
                 }
-                if self.settings.rules.enabled(Rule::SixPY3) {
+                if self.enabled(Rule::SixPY3) {
                     flake8_2020::rules::name_or_attribute(self, expr);
                 }
-                if self.settings.rules.enabled(Rule::BannedApi) {
-                    flake8_tidy_imports::banned_api::banned_attribute_access(self, expr);
+                if self.enabled(Rule::BannedApi) {
+                    flake8_tidy_imports::rules::banned_attribute_access(self, expr);
                 }
-                if self.settings.rules.enabled(Rule::PrivateMemberAccess) {
+                if self.enabled(Rule::PrivateMemberAccess) {
                     flake8_self::rules::private_member_access(self, expr);
                 }
-                pandas_vet::rules::check_attr(self, attr, value, expr);
+                if self.is_stub {
+                    if self.enabled(Rule::CollectionsNamedTuple) {
+                        flake8_pyi::rules::collections_named_tuple(self, expr);
+                    }
+                }
+                pandas_vet::rules::attr(self, attr, value, expr);
             }
-            ExprKind::Call {
+            Expr::Call(ast::ExprCall {
                 func,
                 args,
                 keywords,
-            } => {
-                if self.settings.rules.any_enabled(&[
+                range: _,
+            }) => {
+                if self.any_enabled(&[
                     // pyflakes
                     Rule::StringDotFormatInvalidFormat,
                     Rule::StringDotFormatExtraNamedArguments,
@@ -2462,23 +2458,27 @@ where
                     // pyupgrade
                     Rule::FormatLiterals,
                     Rule::FString,
+                    // flynt
+                    Rule::StaticJoinToFString,
                 ]) {
-                    if let ExprKind::Attribute { value, attr, .. } = &func.node {
-                        if let ExprKind::Constant {
+                    if let Expr::Attribute(ast::ExprAttribute { value, attr, .. }) = func.as_ref() {
+                        let attr = attr.as_str();
+                        if let Expr::Constant(ast::ExprConstant {
                             value: Constant::Str(value),
                             ..
-                        } = &value.node
+                        }) = value.as_ref()
                         {
-                            if attr == "format" {
+                            if attr == "join" {
+                                // "...".join(...) call
+                                if self.enabled(Rule::StaticJoinToFString) {
+                                    flynt::rules::static_join_to_fstring(self, expr, value);
+                                }
+                            } else if attr == "format" {
                                 // "...".format(...) call
                                 let location = expr.range();
                                 match pyflakes::format::FormatSummary::try_from(value.as_ref()) {
                                     Err(e) => {
-                                        if self
-                                            .settings
-                                            .rules
-                                            .enabled(Rule::StringDotFormatInvalidFormat)
-                                        {
+                                        if self.enabled(Rule::StringDotFormatInvalidFormat) {
                                             self.diagnostics.push(Diagnostic::new(
                                                 pyflakes::rules::StringDotFormatInvalidFormat {
                                                     message: pyflakes::format::error_to_string(&e),
@@ -2488,19 +2488,13 @@ where
                                         }
                                     }
                                     Ok(summary) => {
-                                        if self
-                                            .settings
-                                            .rules
-                                            .enabled(Rule::StringDotFormatExtraNamedArguments)
-                                        {
+                                        if self.enabled(Rule::StringDotFormatExtraNamedArguments) {
                                             pyflakes::rules::string_dot_format_extra_named_arguments(
                                                 self, &summary, keywords, location,
                                             );
                                         }
 
                                         if self
-                                            .settings
-                                            .rules
                                             .enabled(Rule::StringDotFormatExtraPositionalArguments)
                                         {
                                             pyflakes::rules::string_dot_format_extra_positional_arguments(
@@ -2509,31 +2503,23 @@ where
                                             );
                                         }
 
-                                        if self
-                                            .settings
-                                            .rules
-                                            .enabled(Rule::StringDotFormatMissingArguments)
-                                        {
+                                        if self.enabled(Rule::StringDotFormatMissingArguments) {
                                             pyflakes::rules::string_dot_format_missing_argument(
                                                 self, &summary, args, keywords, location,
                                             );
                                         }
 
-                                        if self
-                                            .settings
-                                            .rules
-                                            .enabled(Rule::StringDotFormatMixingAutomatic)
-                                        {
+                                        if self.enabled(Rule::StringDotFormatMixingAutomatic) {
                                             pyflakes::rules::string_dot_format_mixing_automatic(
                                                 self, &summary, location,
                                             );
                                         }
 
-                                        if self.settings.rules.enabled(Rule::FormatLiterals) {
+                                        if self.enabled(Rule::FormatLiterals) {
                                             pyupgrade::rules::format_literals(self, &summary, expr);
                                         }
 
-                                        if self.settings.rules.enabled(Rule::FString) {
+                                        if self.enabled(Rule::FString) {
                                             pyupgrade::rules::f_strings(self, &summary, expr);
                                         }
                                     }
@@ -2544,53 +2530,60 @@ where
                 }
 
                 // pyupgrade
-                if self.settings.rules.enabled(Rule::TypeOfPrimitive) {
+                if self.enabled(Rule::TypeOfPrimitive) {
                     pyupgrade::rules::type_of_primitive(self, expr, func, args);
                 }
-                if self.settings.rules.enabled(Rule::DeprecatedUnittestAlias) {
+                if self.enabled(Rule::DeprecatedUnittestAlias) {
                     pyupgrade::rules::deprecated_unittest_alias(self, func);
                 }
-                if self.settings.rules.enabled(Rule::SuperCallWithParameters) {
+                if self.enabled(Rule::SuperCallWithParameters) {
                     pyupgrade::rules::super_call_with_parameters(self, expr, func, args);
                 }
-                if self.settings.rules.enabled(Rule::UnnecessaryEncodeUTF8) {
+                if self.enabled(Rule::UnnecessaryEncodeUTF8) {
                     pyupgrade::rules::unnecessary_encode_utf8(self, expr, func, args, keywords);
                 }
-                if self.settings.rules.enabled(Rule::RedundantOpenModes) {
+                if self.enabled(Rule::RedundantOpenModes) {
                     pyupgrade::rules::redundant_open_modes(self, expr);
                 }
-                if self.settings.rules.enabled(Rule::NativeLiterals) {
+                if self.enabled(Rule::NativeLiterals) {
                     pyupgrade::rules::native_literals(self, expr, func, args, keywords);
                 }
-                if self.settings.rules.enabled(Rule::OpenAlias) {
+                if self.enabled(Rule::OpenAlias) {
                     pyupgrade::rules::open_alias(self, expr, func);
                 }
-                if self.settings.rules.enabled(Rule::ReplaceUniversalNewlines) {
+                if self.enabled(Rule::ReplaceUniversalNewlines) {
                     pyupgrade::rules::replace_universal_newlines(self, func, keywords);
                 }
-                if self.settings.rules.enabled(Rule::ReplaceStdoutStderr) {
+                if self.enabled(Rule::ReplaceStdoutStderr) {
                     pyupgrade::rules::replace_stdout_stderr(self, expr, func, args, keywords);
                 }
-                if self.settings.rules.enabled(Rule::OSErrorAlias) {
+                if self.enabled(Rule::OSErrorAlias) {
                     pyupgrade::rules::os_error_alias_call(self, func);
                 }
-                if self.settings.rules.enabled(Rule::NonPEP604Isinstance)
+                if self.enabled(Rule::NonPEP604Isinstance)
                     && self.settings.target_version >= PythonVersion::Py310
                 {
                     pyupgrade::rules::use_pep604_isinstance(self, expr, func, args);
                 }
 
+                // flake8-async
+                if self.enabled(Rule::BlockingHttpCallInAsyncFunction) {
+                    flake8_async::rules::blocking_http_call(self, expr);
+                }
+                if self.enabled(Rule::OpenSleepOrSubprocessInAsyncFunction) {
+                    flake8_async::rules::open_sleep_or_subprocess_call(self, expr);
+                }
+                if self.enabled(Rule::BlockingOsCallInAsyncFunction) {
+                    flake8_async::rules::blocking_os_call(self, expr);
+                }
+
                 // flake8-print
-                if self
-                    .settings
-                    .rules
-                    .any_enabled(&[Rule::Print, Rule::PPrint])
-                {
+                if self.any_enabled(&[Rule::Print, Rule::PPrint]) {
                     flake8_print::rules::print_call(self, func, keywords);
                 }
 
                 // flake8-bandit
-                if self.settings.rules.any_enabled(&[
+                if self.any_enabled(&[
                     Rule::SuspiciousPickleUsage,
                     Rule::SuspiciousMarshalUsage,
                     Rule::SuspiciousInsecureHashUsage,
@@ -2617,168 +2610,150 @@ where
                 }
 
                 // flake8-bugbear
-                if self.settings.rules.enabled(Rule::UnreliableCallableCheck) {
+                if self.enabled(Rule::UnreliableCallableCheck) {
                     flake8_bugbear::rules::unreliable_callable_check(self, expr, func, args);
                 }
-                if self.settings.rules.enabled(Rule::StripWithMultiCharacters) {
+                if self.enabled(Rule::StripWithMultiCharacters) {
                     flake8_bugbear::rules::strip_with_multi_characters(self, expr, func, args);
                 }
-                if self.settings.rules.enabled(Rule::GetAttrWithConstant) {
+                if self.enabled(Rule::GetAttrWithConstant) {
                     flake8_bugbear::rules::getattr_with_constant(self, expr, func, args);
                 }
-                if self.settings.rules.enabled(Rule::SetAttrWithConstant) {
+                if self.enabled(Rule::SetAttrWithConstant) {
                     flake8_bugbear::rules::setattr_with_constant(self, expr, func, args);
                 }
-                if self.settings.rules.enabled(Rule::UselessContextlibSuppress) {
+                if self.enabled(Rule::UselessContextlibSuppress) {
                     flake8_bugbear::rules::useless_contextlib_suppress(self, expr, func, args);
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::StarArgUnpackingAfterKeywordArg)
-                {
+                if self.enabled(Rule::StarArgUnpackingAfterKeywordArg) {
                     flake8_bugbear::rules::star_arg_unpacking_after_keyword_arg(
                         self, args, keywords,
                     );
                 }
-                if self.settings.rules.enabled(Rule::ZipWithoutExplicitStrict)
+                if self.enabled(Rule::ZipWithoutExplicitStrict)
                     && self.settings.target_version >= PythonVersion::Py310
                 {
-                    flake8_bugbear::rules::zip_without_explicit_strict(self, expr, func, keywords);
+                    flake8_bugbear::rules::zip_without_explicit_strict(
+                        self, expr, func, args, keywords,
+                    );
                 }
-                if self.settings.rules.enabled(Rule::NoExplicitStacklevel) {
+                if self.enabled(Rule::NoExplicitStacklevel) {
                     flake8_bugbear::rules::no_explicit_stacklevel(self, func, args, keywords);
                 }
 
                 // flake8-pie
-                if self.settings.rules.enabled(Rule::UnnecessaryDictKwargs) {
+                if self.enabled(Rule::UnnecessaryDictKwargs) {
                     flake8_pie::rules::unnecessary_dict_kwargs(self, expr, keywords);
                 }
 
                 // flake8-bandit
-                if self.settings.rules.enabled(Rule::ExecBuiltin) {
+                if self.enabled(Rule::ExecBuiltin) {
                     if let Some(diagnostic) = flake8_bandit::rules::exec_used(expr, func) {
                         self.diagnostics.push(diagnostic);
                     }
                 }
-                if self.settings.rules.enabled(Rule::BadFilePermissions) {
+                if self.enabled(Rule::BadFilePermissions) {
                     flake8_bandit::rules::bad_file_permissions(self, func, args, keywords);
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::RequestWithNoCertValidation)
-                {
+                if self.enabled(Rule::RequestWithNoCertValidation) {
                     flake8_bandit::rules::request_with_no_cert_validation(
                         self, func, args, keywords,
                     );
                 }
-                if self.settings.rules.enabled(Rule::UnsafeYAMLLoad) {
+                if self.enabled(Rule::UnsafeYAMLLoad) {
                     flake8_bandit::rules::unsafe_yaml_load(self, func, args, keywords);
                 }
-                if self.settings.rules.enabled(Rule::SnmpInsecureVersion) {
+                if self.enabled(Rule::SnmpInsecureVersion) {
                     flake8_bandit::rules::snmp_insecure_version(self, func, args, keywords);
                 }
-                if self.settings.rules.enabled(Rule::SnmpWeakCryptography) {
+                if self.enabled(Rule::SnmpWeakCryptography) {
                     flake8_bandit::rules::snmp_weak_cryptography(self, func, args, keywords);
                 }
-                if self.settings.rules.enabled(Rule::Jinja2AutoescapeFalse) {
+                if self.enabled(Rule::Jinja2AutoescapeFalse) {
                     flake8_bandit::rules::jinja2_autoescape_false(self, func, args, keywords);
                 }
-                if self.settings.rules.enabled(Rule::HardcodedPasswordFuncArg) {
+                if self.enabled(Rule::HardcodedPasswordFuncArg) {
                     self.diagnostics
                         .extend(flake8_bandit::rules::hardcoded_password_func_arg(keywords));
                 }
-                if self.settings.rules.enabled(Rule::HardcodedSQLExpression) {
+                if self.enabled(Rule::HardcodedSQLExpression) {
                     flake8_bandit::rules::hardcoded_sql_expression(self, expr);
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::HashlibInsecureHashFunction)
-                {
+                if self.enabled(Rule::HashlibInsecureHashFunction) {
                     flake8_bandit::rules::hashlib_insecure_hash_functions(
                         self, func, args, keywords,
                     );
                 }
-                if self.settings.rules.enabled(Rule::RequestWithoutTimeout) {
+                if self.enabled(Rule::RequestWithoutTimeout) {
                     flake8_bandit::rules::request_without_timeout(self, func, args, keywords);
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::LoggingConfigInsecureListen)
-                {
+                if self.enabled(Rule::ParamikoCall) {
+                    flake8_bandit::rules::paramiko_call(self, func);
+                }
+                if self.enabled(Rule::LoggingConfigInsecureListen) {
                     flake8_bandit::rules::logging_config_insecure_listen(
                         self, func, args, keywords,
                     );
                 }
-                if self.settings.rules.any_enabled(&[
+                if self.any_enabled(&[
                     Rule::SubprocessWithoutShellEqualsTrue,
                     Rule::SubprocessPopenWithShellEqualsTrue,
                     Rule::CallWithShellEqualsTrue,
                     Rule::StartProcessWithAShell,
                     Rule::StartProcessWithNoShell,
                     Rule::StartProcessWithPartialPath,
+                    Rule::UnixCommandWildcardInjection,
                 ]) {
                     flake8_bandit::rules::shell_injection(self, func, args, keywords);
                 }
 
                 // flake8-comprehensions
-                if self.settings.rules.enabled(Rule::UnnecessaryGeneratorList) {
+                if self.enabled(Rule::UnnecessaryGeneratorList) {
                     flake8_comprehensions::rules::unnecessary_generator_list(
                         self, expr, func, args, keywords,
                     );
                 }
-                if self.settings.rules.enabled(Rule::UnnecessaryGeneratorSet) {
+                if self.enabled(Rule::UnnecessaryGeneratorSet) {
                     flake8_comprehensions::rules::unnecessary_generator_set(
                         self,
                         expr,
-                        self.ctx.current_expr_parent().map(Into::into),
+                        self.semantic_model.expr_parent(),
                         func,
                         args,
                         keywords,
                     );
                 }
-                if self.settings.rules.enabled(Rule::UnnecessaryGeneratorDict) {
+                if self.enabled(Rule::UnnecessaryGeneratorDict) {
                     flake8_comprehensions::rules::unnecessary_generator_dict(
                         self,
                         expr,
-                        self.ctx.current_expr_parent().map(Into::into),
+                        self.semantic_model.expr_parent(),
                         func,
                         args,
                         keywords,
                     );
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UnnecessaryListComprehensionSet)
-                {
+                if self.enabled(Rule::UnnecessaryListComprehensionSet) {
                     flake8_comprehensions::rules::unnecessary_list_comprehension_set(
                         self, expr, func, args, keywords,
                     );
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UnnecessaryListComprehensionDict)
-                {
+                if self.enabled(Rule::UnnecessaryListComprehensionDict) {
                     flake8_comprehensions::rules::unnecessary_list_comprehension_dict(
                         self, expr, func, args, keywords,
                     );
                 }
-                if self.settings.rules.enabled(Rule::UnnecessaryLiteralSet) {
+                if self.enabled(Rule::UnnecessaryLiteralSet) {
                     flake8_comprehensions::rules::unnecessary_literal_set(
                         self, expr, func, args, keywords,
                     );
                 }
-                if self.settings.rules.enabled(Rule::UnnecessaryLiteralDict) {
+                if self.enabled(Rule::UnnecessaryLiteralDict) {
                     flake8_comprehensions::rules::unnecessary_literal_dict(
                         self, expr, func, args, keywords,
                     );
                 }
-                if self.settings.rules.enabled(Rule::UnnecessaryCollectionCall) {
+                if self.enabled(Rule::UnnecessaryCollectionCall) {
                     flake8_comprehensions::rules::unnecessary_collection_call(
                         self,
                         expr,
@@ -2788,124 +2763,89 @@ where
                         &self.settings.flake8_comprehensions,
                     );
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UnnecessaryLiteralWithinTupleCall)
-                {
+                if self.enabled(Rule::UnnecessaryLiteralWithinTupleCall) {
                     flake8_comprehensions::rules::unnecessary_literal_within_tuple_call(
                         self, expr, func, args, keywords,
                     );
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UnnecessaryLiteralWithinListCall)
-                {
+                if self.enabled(Rule::UnnecessaryLiteralWithinListCall) {
                     flake8_comprehensions::rules::unnecessary_literal_within_list_call(
                         self, expr, func, args, keywords,
                     );
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UnnecessaryLiteralWithinDictCall)
-                {
+                if self.enabled(Rule::UnnecessaryLiteralWithinDictCall) {
                     flake8_comprehensions::rules::unnecessary_literal_within_dict_call(
                         self, expr, func, args, keywords,
                     );
                 }
-                if self.settings.rules.enabled(Rule::UnnecessaryListCall) {
+                if self.enabled(Rule::UnnecessaryListCall) {
                     flake8_comprehensions::rules::unnecessary_list_call(self, expr, func, args);
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UnnecessaryCallAroundSorted)
-                {
+                if self.enabled(Rule::UnnecessaryCallAroundSorted) {
                     flake8_comprehensions::rules::unnecessary_call_around_sorted(
                         self, expr, func, args,
                     );
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UnnecessaryDoubleCastOrProcess)
-                {
+                if self.enabled(Rule::UnnecessaryDoubleCastOrProcess) {
                     flake8_comprehensions::rules::unnecessary_double_cast_or_process(
                         self, expr, func, args,
                     );
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UnnecessarySubscriptReversal)
-                {
+                if self.enabled(Rule::UnnecessarySubscriptReversal) {
                     flake8_comprehensions::rules::unnecessary_subscript_reversal(
                         self, expr, func, args,
                     );
                 }
-                if self.settings.rules.enabled(Rule::UnnecessaryMap) {
+                if self.enabled(Rule::UnnecessaryMap) {
                     flake8_comprehensions::rules::unnecessary_map(
                         self,
                         expr,
-                        self.ctx.current_expr_parent().map(Into::into),
+                        self.semantic_model.expr_parent(),
                         func,
                         args,
                     );
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UnnecessaryComprehensionAnyAll)
-                {
+                if self.enabled(Rule::UnnecessaryComprehensionAnyAll) {
                     flake8_comprehensions::rules::unnecessary_comprehension_any_all(
                         self, expr, func, args, keywords,
                     );
                 }
 
                 // flake8-boolean-trap
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::BooleanPositionalValueInFunctionCall)
-                {
+                if self.enabled(Rule::BooleanPositionalValueInFunctionCall) {
                     flake8_boolean_trap::rules::check_boolean_positional_value_in_function_call(
                         self, args, func,
                     );
                 }
-                if let ExprKind::Name { id, ctx } = &func.node {
+                if let Expr::Name(ast::ExprName { id, ctx, range: _ }) = func.as_ref() {
                     if id == "locals" && matches!(ctx, ExprContext::Load) {
-                        let scope = self.ctx.scope_mut();
-                        scope.uses_locals = true;
+                        let scope = self.semantic_model.scope_mut();
+                        scope.set_uses_locals();
                     }
                 }
 
                 // flake8-debugger
-                if self.settings.rules.enabled(Rule::Debugger) {
+                if self.enabled(Rule::Debugger) {
                     flake8_debugger::rules::debugger_call(self, expr, func);
                 }
 
                 // pandas-vet
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::PandasUseOfInplaceArgument)
-                {
+                if self.enabled(Rule::PandasUseOfInplaceArgument) {
                     self.diagnostics.extend(
-                        pandas_vet::rules::inplace_argument(self, expr, args, keywords).into_iter(),
+                        pandas_vet::rules::inplace_argument(self, expr, func, args, keywords)
+                            .into_iter(),
                     );
                 }
-                pandas_vet::rules::check_call(self, func);
+                pandas_vet::rules::call(self, func);
 
-                if self.settings.rules.enabled(Rule::PandasUseOfPdMerge) {
+                if self.enabled(Rule::PandasUseOfPdMerge) {
                     if let Some(diagnostic) = pandas_vet::rules::use_of_pd_merge(func) {
                         self.diagnostics.push(diagnostic);
                     };
                 }
 
                 // flake8-datetimez
-                if self.settings.rules.enabled(Rule::CallDatetimeWithoutTzinfo) {
+                if self.enabled(Rule::CallDatetimeWithoutTzinfo) {
                     flake8_datetimez::rules::call_datetime_without_tzinfo(
                         self,
                         func,
@@ -2914,28 +2854,20 @@ where
                         expr.range(),
                     );
                 }
-                if self.settings.rules.enabled(Rule::CallDatetimeToday) {
+                if self.enabled(Rule::CallDatetimeToday) {
                     flake8_datetimez::rules::call_datetime_today(self, func, expr.range());
                 }
-                if self.settings.rules.enabled(Rule::CallDatetimeUtcnow) {
+                if self.enabled(Rule::CallDatetimeUtcnow) {
                     flake8_datetimez::rules::call_datetime_utcnow(self, func, expr.range());
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::CallDatetimeUtcfromtimestamp)
-                {
+                if self.enabled(Rule::CallDatetimeUtcfromtimestamp) {
                     flake8_datetimez::rules::call_datetime_utcfromtimestamp(
                         self,
                         func,
                         expr.range(),
                     );
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::CallDatetimeNowWithoutTzinfo)
-                {
+                if self.enabled(Rule::CallDatetimeNowWithoutTzinfo) {
                     flake8_datetimez::rules::call_datetime_now_without_tzinfo(
                         self,
                         func,
@@ -2944,7 +2876,7 @@ where
                         expr.range(),
                     );
                 }
-                if self.settings.rules.enabled(Rule::CallDatetimeFromtimestamp) {
+                if self.enabled(Rule::CallDatetimeFromtimestamp) {
                     flake8_datetimez::rules::call_datetime_fromtimestamp(
                         self,
                         func,
@@ -2953,11 +2885,7 @@ where
                         expr.range(),
                     );
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::CallDatetimeStrptimeWithoutZone)
-                {
+                if self.enabled(Rule::CallDatetimeStrptimeWithoutZone) {
                     flake8_datetimez::rules::call_datetime_strptime_without_zone(
                         self,
                         func,
@@ -2965,51 +2893,50 @@ where
                         expr.range(),
                     );
                 }
-                if self.settings.rules.enabled(Rule::CallDateToday) {
+                if self.enabled(Rule::CallDateToday) {
                     flake8_datetimez::rules::call_date_today(self, func, expr.range());
                 }
-                if self.settings.rules.enabled(Rule::CallDateFromtimestamp) {
+                if self.enabled(Rule::CallDateFromtimestamp) {
                     flake8_datetimez::rules::call_date_fromtimestamp(self, func, expr.range());
                 }
 
                 // pygrep-hooks
-                if self.settings.rules.enabled(Rule::Eval) {
+                if self.enabled(Rule::Eval) {
                     pygrep_hooks::rules::no_eval(self, func);
                 }
-                if self.settings.rules.enabled(Rule::DeprecatedLogWarn) {
+                if self.enabled(Rule::DeprecatedLogWarn) {
                     pygrep_hooks::rules::deprecated_log_warn(self, func);
                 }
 
                 // pylint
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UnnecessaryDirectLambdaCall)
-                {
+                if self.enabled(Rule::UnnecessaryDirectLambdaCall) {
                     pylint::rules::unnecessary_direct_lambda_call(self, expr, func);
                 }
-                if self.settings.rules.enabled(Rule::SysExitAlias) {
+                if self.enabled(Rule::SysExitAlias) {
                     pylint::rules::sys_exit_alias(self, func);
                 }
-                if self.settings.rules.enabled(Rule::BadStrStripCall) {
+                if self.enabled(Rule::BadStrStripCall) {
                     pylint::rules::bad_str_strip_call(self, func, args);
                 }
-                if self.settings.rules.enabled(Rule::InvalidEnvvarDefault) {
+                if self.enabled(Rule::InvalidEnvvarDefault) {
                     pylint::rules::invalid_envvar_default(self, func, args, keywords);
                 }
-                if self.settings.rules.enabled(Rule::InvalidEnvvarValue) {
+                if self.enabled(Rule::InvalidEnvvarValue) {
                     pylint::rules::invalid_envvar_value(self, func, args, keywords);
                 }
+                if self.enabled(Rule::NestedMinMax) {
+                    pylint::rules::nested_min_max(self, expr, func, args, keywords);
+                }
 
                 // flake8-pytest-style
-                if self.settings.rules.enabled(Rule::PytestPatchWithLambda) {
+                if self.enabled(Rule::PytestPatchWithLambda) {
                     if let Some(diagnostic) =
                         flake8_pytest_style::rules::patch_with_lambda(func, args, keywords)
                     {
                         self.diagnostics.push(diagnostic);
                     }
                 }
-                if self.settings.rules.enabled(Rule::PytestUnittestAssertion) {
+                if self.enabled(Rule::PytestUnittestAssertion) {
                     if let Some(diagnostic) = flake8_pytest_style::rules::unittest_assertion(
                         self, expr, func, args, keywords,
                     ) {
@@ -3017,25 +2944,25 @@ where
                     }
                 }
 
-                if self.settings.rules.any_enabled(&[
+                if self.any_enabled(&[
                     Rule::PytestRaisesWithoutException,
                     Rule::PytestRaisesTooBroad,
                 ]) {
                     flake8_pytest_style::rules::raises_call(self, func, args, keywords);
                 }
 
-                if self.settings.rules.enabled(Rule::PytestFailWithoutMessage) {
+                if self.enabled(Rule::PytestFailWithoutMessage) {
                     flake8_pytest_style::rules::fail_call(self, func, args, keywords);
                 }
 
-                if self.settings.rules.enabled(Rule::PairwiseOverZipped) {
+                if self.enabled(Rule::PairwiseOverZipped) {
                     if self.settings.target_version >= PythonVersion::Py310 {
                         ruff::rules::pairwise_over_zipped(self, func, args);
                     }
                 }
 
                 // flake8-gettext
-                if self.settings.rules.any_enabled(&[
+                if self.any_enabled(&[
                     Rule::FStringInGetTextFuncCall,
                     Rule::FormatInGetTextFuncCall,
                     Rule::PrintfInGetTextFuncCall,
@@ -3043,49 +2970,41 @@ where
                     func,
                     &self.settings.flake8_gettext.functions_names,
                 ) {
-                    if self.settings.rules.enabled(Rule::FStringInGetTextFuncCall) {
+                    if self.enabled(Rule::FStringInGetTextFuncCall) {
                         self.diagnostics
                             .extend(flake8_gettext::rules::f_string_in_gettext_func_call(args));
                     }
-                    if self.settings.rules.enabled(Rule::FormatInGetTextFuncCall) {
+                    if self.enabled(Rule::FormatInGetTextFuncCall) {
                         self.diagnostics
                             .extend(flake8_gettext::rules::format_in_gettext_func_call(args));
                     }
-                    if self.settings.rules.enabled(Rule::PrintfInGetTextFuncCall) {
+                    if self.enabled(Rule::PrintfInGetTextFuncCall) {
                         self.diagnostics
                             .extend(flake8_gettext::rules::printf_in_gettext_func_call(args));
                     }
                 }
 
                 // flake8-simplify
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UncapitalizedEnvironmentVariables)
-                {
+                if self.enabled(Rule::UncapitalizedEnvironmentVariables) {
                     flake8_simplify::rules::use_capital_environment_variables(self, expr);
                 }
 
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::OpenFileWithContextHandler)
-                {
+                if self.enabled(Rule::OpenFileWithContextHandler) {
                     flake8_simplify::rules::open_file_with_context_handler(self, func);
                 }
 
-                if self.settings.rules.enabled(Rule::DictGetWithNoneDefault) {
+                if self.enabled(Rule::DictGetWithNoneDefault) {
                     flake8_simplify::rules::dict_get_with_none_default(self, expr);
                 }
 
                 // flake8-use-pathlib
-                if self.settings.rules.any_enabled(&[
+                if self.any_enabled(&[
                     Rule::OsPathAbspath,
                     Rule::OsChmod,
                     Rule::OsMkdir,
                     Rule::OsMakedirs,
                     Rule::OsRename,
-                    Rule::PathlibReplace,
+                    Rule::OsReplace,
                     Rule::OsRmdir,
                     Rule::OsRemove,
                     Rule::OsUnlink,
@@ -3105,16 +3024,16 @@ where
                     Rule::BuiltinOpen,
                     Rule::PyPath,
                 ]) {
-                    flake8_use_pathlib::helpers::replaceable_by_pathlib(self, func);
+                    flake8_use_pathlib::rules::replaceable_by_pathlib(self, func);
                 }
 
                 // numpy
-                if self.settings.rules.enabled(Rule::NumpyLegacyRandom) {
+                if self.enabled(Rule::NumpyLegacyRandom) {
                     numpy::rules::numpy_legacy_random(self, func);
                 }
 
                 // flake8-logging-format
-                if self.settings.rules.any_enabled(&[
+                if self.any_enabled(&[
                     Rule::LoggingStringFormat,
                     Rule::LoggingPercentFormat,
                     Rule::LoggingStringConcat,
@@ -3128,91 +3047,95 @@ where
                 }
 
                 // pylint logging checker
-                if self
-                    .settings
-                    .rules
-                    .any_enabled(&[Rule::LoggingTooFewArgs, Rule::LoggingTooManyArgs])
-                {
+                if self.any_enabled(&[Rule::LoggingTooFewArgs, Rule::LoggingTooManyArgs]) {
                     pylint::rules::logging_call(self, func, args, keywords);
                 }
 
                 // flake8-django
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::DjangoLocalsInRenderFunction)
-                {
+                if self.enabled(Rule::DjangoLocalsInRenderFunction) {
                     flake8_django::rules::locals_in_render_function(self, func, args, keywords);
                 }
             }
-            ExprKind::Dict { keys, values } => {
-                if self.settings.rules.any_enabled(&[
+            Expr::Dict(ast::ExprDict {
+                keys,
+                values,
+                range: _,
+            }) => {
+                if self.any_enabled(&[
                     Rule::MultiValueRepeatedKeyLiteral,
                     Rule::MultiValueRepeatedKeyVariable,
                 ]) {
                     pyflakes::rules::repeated_keys(self, keys, values);
                 }
 
-                if self.settings.rules.enabled(Rule::UnnecessarySpread) {
+                if self.enabled(Rule::UnnecessarySpread) {
                     flake8_pie::rules::unnecessary_spread(self, keys, values);
                 }
             }
-            ExprKind::Yield { .. } => {
-                if self.settings.rules.enabled(Rule::YieldOutsideFunction) {
+            Expr::Set(ast::ExprSet { elts, range: _ }) => {
+                if self.enabled(Rule::DuplicateValue) {
+                    flake8_bugbear::rules::duplicate_value(self, elts);
+                }
+            }
+            Expr::Yield(_) => {
+                if self.enabled(Rule::YieldOutsideFunction) {
                     pyflakes::rules::yield_outside_function(self, expr);
                 }
-                if self.settings.rules.enabled(Rule::YieldInInit) {
+                if self.enabled(Rule::YieldInInit) {
                     pylint::rules::yield_in_init(self, expr);
                 }
             }
-            ExprKind::YieldFrom { .. } => {
-                if self.settings.rules.enabled(Rule::YieldOutsideFunction) {
+            Expr::YieldFrom(yield_from) => {
+                if self.enabled(Rule::YieldOutsideFunction) {
                     pyflakes::rules::yield_outside_function(self, expr);
                 }
-                if self.settings.rules.enabled(Rule::YieldInInit) {
+                if self.enabled(Rule::YieldInInit) {
                     pylint::rules::yield_in_init(self, expr);
                 }
+                if self.enabled(Rule::YieldFromInAsyncFunction) {
+                    pylint::rules::yield_from_in_async_function(self, yield_from);
+                }
             }
-            ExprKind::Await { .. } => {
-                if self.settings.rules.enabled(Rule::YieldOutsideFunction) {
+            Expr::Await(_) => {
+                if self.enabled(Rule::YieldOutsideFunction) {
                     pyflakes::rules::yield_outside_function(self, expr);
                 }
-                if self.settings.rules.enabled(Rule::AwaitOutsideAsync) {
+                if self.enabled(Rule::AwaitOutsideAsync) {
                     pylint::rules::await_outside_async(self, expr);
                 }
             }
-            ExprKind::JoinedStr { values } => {
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::FStringMissingPlaceholders)
-                {
+            Expr::JoinedStr(ast::ExprJoinedStr { values, range: _ }) => {
+                if self.enabled(Rule::FStringMissingPlaceholders) {
                     pyflakes::rules::f_string_missing_placeholders(expr, values, self);
                 }
-                if self.settings.rules.enabled(Rule::HardcodedSQLExpression) {
+                if self.enabled(Rule::HardcodedSQLExpression) {
                     flake8_bandit::rules::hardcoded_sql_expression(self, expr);
                 }
+                if self.enabled(Rule::ExplicitFStringTypeConversion) {
+                    ruff::rules::explicit_f_string_type_conversion(self, expr, values);
+                }
             }
-            ExprKind::BinOp {
+            Expr::BinOp(ast::ExprBinOp {
                 left,
                 op: Operator::RShift,
                 ..
-            } => {
-                if self.settings.rules.enabled(Rule::InvalidPrintSyntax) {
+            }) => {
+                if self.enabled(Rule::InvalidPrintSyntax) {
                     pyflakes::rules::invalid_print_syntax(self, left);
                 }
             }
-            ExprKind::BinOp {
+            Expr::BinOp(ast::ExprBinOp {
                 left,
                 op: Operator::Mod,
                 right,
-            } => {
-                if let ExprKind::Constant {
+                range: _,
+            }) => {
+                if let Expr::Constant(ast::ExprConstant {
                     value: Constant::Str(value),
                     ..
-                } = &left.node
+                }) = left.as_ref()
                 {
-                    if self.settings.rules.any_enabled(&[
+                    if self.any_enabled(&[
                         Rule::PercentFormatInvalidFormat,
                         Rule::PercentFormatExpectedMapping,
                         Rule::PercentFormatExpectedSequence,
@@ -3229,11 +3152,7 @@ where
                                 typ: CFormatErrorType::UnsupportedFormatChar(c),
                                 ..
                             }) => {
-                                if self
-                                    .settings
-                                    .rules
-                                    .enabled(Rule::PercentFormatUnsupportedFormatCharacter)
-                                {
+                                if self.enabled(Rule::PercentFormatUnsupportedFormatCharacter) {
                                     self.diagnostics.push(Diagnostic::new(
                                         pyflakes::rules::PercentFormatUnsupportedFormatCharacter {
                                             char: c,
@@ -3243,11 +3162,7 @@ where
                                 }
                             }
                             Err(e) => {
-                                if self
-                                    .settings
-                                    .rules
-                                    .enabled(Rule::PercentFormatInvalidFormat)
-                                {
+                                if self.enabled(Rule::PercentFormatInvalidFormat) {
                                     self.diagnostics.push(Diagnostic::new(
                                         pyflakes::rules::PercentFormatInvalidFormat {
                                             message: e.to_string(),
@@ -3257,65 +3172,37 @@ where
                                 }
                             }
                             Ok(summary) => {
-                                if self
-                                    .settings
-                                    .rules
-                                    .enabled(Rule::PercentFormatExpectedMapping)
-                                {
+                                if self.enabled(Rule::PercentFormatExpectedMapping) {
                                     pyflakes::rules::percent_format_expected_mapping(
                                         self, &summary, right, location,
                                     );
                                 }
-                                if self
-                                    .settings
-                                    .rules
-                                    .enabled(Rule::PercentFormatExpectedSequence)
-                                {
+                                if self.enabled(Rule::PercentFormatExpectedSequence) {
                                     pyflakes::rules::percent_format_expected_sequence(
                                         self, &summary, right, location,
                                     );
                                 }
-                                if self
-                                    .settings
-                                    .rules
-                                    .enabled(Rule::PercentFormatExtraNamedArguments)
-                                {
+                                if self.enabled(Rule::PercentFormatExtraNamedArguments) {
                                     pyflakes::rules::percent_format_extra_named_arguments(
                                         self, &summary, right, location,
                                     );
                                 }
-                                if self
-                                    .settings
-                                    .rules
-                                    .enabled(Rule::PercentFormatMissingArgument)
-                                {
+                                if self.enabled(Rule::PercentFormatMissingArgument) {
                                     pyflakes::rules::percent_format_missing_arguments(
                                         self, &summary, right, location,
                                     );
                                 }
-                                if self
-                                    .settings
-                                    .rules
-                                    .enabled(Rule::PercentFormatMixedPositionalAndNamed)
-                                {
+                                if self.enabled(Rule::PercentFormatMixedPositionalAndNamed) {
                                     pyflakes::rules::percent_format_mixed_positional_and_named(
                                         self, &summary, location,
                                     );
                                 }
-                                if self
-                                    .settings
-                                    .rules
-                                    .enabled(Rule::PercentFormatPositionalCountMismatch)
-                                {
+                                if self.enabled(Rule::PercentFormatPositionalCountMismatch) {
                                     pyflakes::rules::percent_format_positional_count_mismatch(
                                         self, &summary, right, location,
                                     );
                                 }
-                                if self
-                                    .settings
-                                    .rules
-                                    .enabled(Rule::PercentFormatStarRequiresSequence)
-                                {
+                                if self.enabled(Rule::PercentFormatStarRequiresSequence) {
                                     pyflakes::rules::percent_format_star_requires_sequence(
                                         self, &summary, right, location,
                                     );
@@ -3324,54 +3211,60 @@ where
                         }
                     }
 
-                    if self.settings.rules.enabled(Rule::PrintfStringFormatting) {
+                    if self.enabled(Rule::PrintfStringFormatting) {
                         pyupgrade::rules::printf_string_formatting(self, expr, right, self.locator);
                     }
-                    if self.settings.rules.enabled(Rule::BadStringFormatType) {
+                    if self.enabled(Rule::BadStringFormatType) {
                         pylint::rules::bad_string_format_type(self, expr, right);
                     }
-                    if self.settings.rules.enabled(Rule::HardcodedSQLExpression) {
+                    if self.enabled(Rule::HardcodedSQLExpression) {
                         flake8_bandit::rules::hardcoded_sql_expression(self, expr);
                     }
                 }
             }
-            ExprKind::BinOp {
+            Expr::BinOp(ast::ExprBinOp {
                 op: Operator::Add, ..
-            } => {
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::ExplicitStringConcatenation)
-                {
+            }) => {
+                if self.enabled(Rule::ExplicitStringConcatenation) {
                     if let Some(diagnostic) = flake8_implicit_str_concat::rules::explicit(expr) {
                         self.diagnostics.push(diagnostic);
                     }
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::CollectionLiteralConcatenation)
-                {
+                if self.enabled(Rule::CollectionLiteralConcatenation) {
                     ruff::rules::collection_literal_concatenation(self, expr);
                 }
-                if self.settings.rules.enabled(Rule::HardcodedSQLExpression) {
+                if self.enabled(Rule::HardcodedSQLExpression) {
                     flake8_bandit::rules::hardcoded_sql_expression(self, expr);
                 }
             }
-            ExprKind::BinOp {
+            Expr::BinOp(ast::ExprBinOp {
                 op: Operator::BitOr,
                 ..
-            } => {
+            }) => {
+                // Ex) `str | None`
+                if self.enabled(Rule::FutureRequiredTypeAnnotation) {
+                    if self.settings.target_version < PythonVersion::Py310
+                        && !self.semantic_model.future_annotations()
+                        && self.semantic_model.in_annotation()
+                    {
+                        flake8_future_annotations::rules::future_required_type_annotation(
+                            self,
+                            expr,
+                            flake8_future_annotations::rules::Reason::PEP604,
+                        );
+                    }
+                }
+
                 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| {
+                    if self.enabled(Rule::DuplicateUnionMember)
+                        && self.semantic_model.in_type_definition()
+                        && self.semantic_model.expr_parent().map_or(true, |parent| {
                             !matches!(
-                                parent.node,
-                                ExprKind::BinOp {
+                                parent,
+                                Expr::BinOp(ast::ExprBinOp {
                                     op: Operator::BitOr,
                                     ..
-                                }
+                                })
                             )
                         })
                     {
@@ -3379,42 +3272,46 @@ where
                     }
                 }
             }
-            ExprKind::UnaryOp { op, operand } => {
-                let check_not_in = self.settings.rules.enabled(Rule::NotInTest);
-                let check_not_is = self.settings.rules.enabled(Rule::NotIsTest);
+            Expr::UnaryOp(ast::ExprUnaryOp {
+                op,
+                operand,
+                range: _,
+            }) => {
+                let check_not_in = self.enabled(Rule::NotInTest);
+                let check_not_is = self.enabled(Rule::NotIsTest);
                 if check_not_in || check_not_is {
                     pycodestyle::rules::not_tests(
                         self,
                         expr,
-                        op,
+                        *op,
                         operand,
                         check_not_in,
                         check_not_is,
                     );
                 }
 
-                if self.settings.rules.enabled(Rule::UnaryPrefixIncrement) {
-                    flake8_bugbear::rules::unary_prefix_increment(self, expr, op, operand);
+                if self.enabled(Rule::UnaryPrefixIncrement) {
+                    flake8_bugbear::rules::unary_prefix_increment(self, expr, *op, operand);
                 }
 
-                if self.settings.rules.enabled(Rule::NegateEqualOp) {
-                    flake8_simplify::rules::negation_with_equal_op(self, expr, op, operand);
+                if self.enabled(Rule::NegateEqualOp) {
+                    flake8_simplify::rules::negation_with_equal_op(self, expr, *op, operand);
                 }
-                if self.settings.rules.enabled(Rule::NegateNotEqualOp) {
-                    flake8_simplify::rules::negation_with_not_equal_op(self, expr, op, operand);
+                if self.enabled(Rule::NegateNotEqualOp) {
+                    flake8_simplify::rules::negation_with_not_equal_op(self, expr, *op, operand);
                 }
-                if self.settings.rules.enabled(Rule::DoubleNegation) {
-                    flake8_simplify::rules::double_negation(self, expr, op, operand);
+                if self.enabled(Rule::DoubleNegation) {
+                    flake8_simplify::rules::double_negation(self, expr, *op, operand);
                 }
             }
-            ExprKind::Compare {
+            Expr::Compare(ast::ExprCompare {
                 left,
                 ops,
                 comparators,
-            } => {
-                let check_none_comparisons = self.settings.rules.enabled(Rule::NoneComparison);
-                let check_true_false_comparisons =
-                    self.settings.rules.enabled(Rule::TrueFalseComparison);
+                range: _,
+            }) => {
+                let check_none_comparisons = self.enabled(Rule::NoneComparison);
+                let check_true_false_comparisons = self.enabled(Rule::TrueFalseComparison);
                 if check_none_comparisons || check_true_false_comparisons {
                     pycodestyle::rules::literal_comparisons(
                         self,
@@ -3427,7 +3324,7 @@ where
                     );
                 }
 
-                if self.settings.rules.enabled(Rule::IsLiteral) {
+                if self.enabled(Rule::IsLiteral) {
                     pyflakes::rules::invalid_literal_comparison(
                         self,
                         left,
@@ -3437,11 +3334,11 @@ where
                     );
                 }
 
-                if self.settings.rules.enabled(Rule::TypeComparison) {
+                if self.enabled(Rule::TypeComparison) {
                     pycodestyle::rules::type_comparison(self, expr, ops, comparators);
                 }
 
-                if self.settings.rules.any_enabled(&[
+                if self.any_enabled(&[
                     Rule::SysVersionCmpStr3,
                     Rule::SysVersionInfo0Eq3,
                     Rule::SysVersionInfo1CmpInt,
@@ -3451,7 +3348,7 @@ where
                     flake8_2020::rules::compare(self, left, ops, comparators);
                 }
 
-                if self.settings.rules.enabled(Rule::HardcodedPasswordString) {
+                if self.enabled(Rule::HardcodedPasswordString) {
                     self.diagnostics.extend(
                         flake8_bandit::rules::compare_to_hardcoded_password_string(
                             left,
@@ -3460,28 +3357,28 @@ where
                     );
                 }
 
-                if self.settings.rules.enabled(Rule::ComparisonOfConstant) {
+                if self.enabled(Rule::ComparisonOfConstant) {
                     pylint::rules::comparison_of_constant(self, left, ops, comparators);
                 }
 
-                if self.settings.rules.enabled(Rule::CompareToEmptyString) {
+                if self.enabled(Rule::CompareToEmptyString) {
                     pylint::rules::compare_to_empty_string(self, left, ops, comparators);
                 }
 
-                if self.settings.rules.enabled(Rule::MagicValueComparison) {
+                if self.enabled(Rule::MagicValueComparison) {
                     pylint::rules::magic_value_comparison(self, left, comparators);
                 }
 
-                if self.settings.rules.enabled(Rule::InDictKeys) {
+                if self.enabled(Rule::InDictKeys) {
                     flake8_simplify::rules::key_in_dict_compare(self, expr, left, ops, comparators);
                 }
 
-                if self.settings.rules.enabled(Rule::YodaConditions) {
+                if self.enabled(Rule::YodaConditions) {
                     flake8_simplify::rules::yoda_conditions(self, expr, left, ops, comparators);
                 }
 
                 if self.is_stub {
-                    if self.settings.rules.any_enabled(&[
+                    if self.any_enabled(&[
                         Rule::UnrecognizedPlatformCheck,
                         Rule::UnrecognizedPlatformName,
                     ]) {
@@ -3494,7 +3391,7 @@ where
                         );
                     }
 
-                    if self.settings.rules.enabled(Rule::BadVersionInfoComparison) {
+                    if self.enabled(Rule::BadVersionInfoComparison) {
                         flake8_pyi::rules::bad_version_info_comparison(
                             self,
                             expr,
@@ -3505,30 +3402,47 @@ where
                     }
                 }
             }
-            ExprKind::Constant {
+            Expr::Constant(ast::ExprConstant {
+                value: Constant::Int(_) | Constant::Float(_) | Constant::Complex { .. },
+                kind: _,
+                range: _,
+            }) => {
+                if self.is_stub && self.enabled(Rule::NumericLiteralTooLong) {
+                    flake8_pyi::rules::numeric_literal_too_long(self, expr);
+                }
+            }
+            Expr::Constant(ast::ExprConstant {
+                value: Constant::Bytes(_),
+                kind: _,
+                range: _,
+            }) => {
+                if self.is_stub && self.enabled(Rule::StringOrBytesTooLong) {
+                    flake8_pyi::rules::string_or_bytes_too_long(self, expr);
+                }
+            }
+            Expr::Constant(ast::ExprConstant {
                 value: Constant::Str(value),
                 kind,
-            } => {
-                if self.ctx.in_type_definition && !self.ctx.in_literal && !self.ctx.in_f_string {
+                range: _,
+            }) => {
+                if self.semantic_model.in_type_definition()
+                    && !self.semantic_model.in_literal()
+                    && !self.semantic_model.in_f_string()
+                {
                     self.deferred.string_type_definitions.push((
                         expr.range(),
                         value,
-                        (self.ctx.in_annotation, self.ctx.in_type_checking_block),
-                        (self.ctx.scope_id, self.ctx.parents.clone()),
+                        self.semantic_model.snapshot(),
                     ));
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::HardcodedBindAllInterfaces)
-                {
+                if self.enabled(Rule::HardcodedBindAllInterfaces) {
                     if let Some(diagnostic) =
                         flake8_bandit::rules::hardcoded_bind_all_interfaces(value, expr.range())
                     {
                         self.diagnostics.push(diagnostic);
                     }
                 }
-                if self.settings.rules.enabled(Rule::HardcodedTempFile) {
+                if self.enabled(Rule::HardcodedTempFile) {
                     if let Some(diagnostic) = flake8_bandit::rules::hardcoded_tmp_directory(
                         expr,
                         value,
@@ -3537,13 +3451,22 @@ where
                         self.diagnostics.push(diagnostic);
                     }
                 }
-                if self.settings.rules.enabled(Rule::UnicodeKindPrefix) {
+                if self.enabled(Rule::UnicodeKindPrefix) {
                     pyupgrade::rules::unicode_kind_prefix(self, expr, kind.as_deref());
                 }
+                if self.is_stub && self.enabled(Rule::StringOrBytesTooLong) {
+                    flake8_pyi::rules::string_or_bytes_too_long(self, expr);
+                }
             }
-            ExprKind::Lambda { args, body, .. } => {
-                if self.settings.rules.enabled(Rule::ReimplementedListBuiltin) {
-                    flake8_pie::rules::reimplemented_list_builtin(self, expr);
+            Expr::Lambda(
+                lambda @ ast::ExprLambda {
+                    args,
+                    body: _,
+                    range: _,
+                },
+            ) => {
+                if self.enabled(Rule::ReimplementedListBuiltin) {
+                    flake8_pie::rules::reimplemented_list_builtin(self, lambda);
                 }
 
                 // Visit the default arguments, but avoid the body, which will be deferred.
@@ -3553,79 +3476,140 @@ where
                 for expr in &args.defaults {
                     self.visit_expr(expr);
                 }
-                self.ctx
-                    .push_scope(ScopeKind::Lambda(Lambda { args, body }));
+                self.semantic_model.push_scope(ScopeKind::Lambda(lambda));
             }
-            ExprKind::IfExp { test, body, orelse } => {
-                if self.settings.rules.enabled(Rule::IfExprWithTrueFalse) {
+            Expr::IfExp(ast::ExprIfExp {
+                test,
+                body,
+                orelse,
+                range: _,
+            }) => {
+                if self.enabled(Rule::IfExprWithTrueFalse) {
                     flake8_simplify::rules::explicit_true_false_in_ifexpr(
                         self, expr, test, body, orelse,
                     );
                 }
-                if self.settings.rules.enabled(Rule::IfExprWithFalseTrue) {
+                if self.enabled(Rule::IfExprWithFalseTrue) {
                     flake8_simplify::rules::explicit_false_true_in_ifexpr(
                         self, expr, test, body, orelse,
                     );
                 }
-                if self.settings.rules.enabled(Rule::IfExprWithTwistedArms) {
+                if self.enabled(Rule::IfExprWithTwistedArms) {
                     flake8_simplify::rules::twisted_arms_in_ifexpr(self, expr, test, body, orelse);
                 }
             }
-            ExprKind::ListComp { elt, generators } | ExprKind::SetComp { elt, generators } => {
-                if self.settings.rules.enabled(Rule::UnnecessaryComprehension) {
+            Expr::ListComp(ast::ExprListComp {
+                elt,
+                generators,
+                range: _,
+            })
+            | Expr::SetComp(ast::ExprSetComp {
+                elt,
+                generators,
+                range: _,
+            }) => {
+                if self.enabled(Rule::UnnecessaryComprehension) {
                     flake8_comprehensions::rules::unnecessary_list_set_comprehension(
                         self, expr, elt, generators,
                     );
                 }
-                if self.settings.rules.enabled(Rule::FunctionUsesLoopVariable) {
+                if self.enabled(Rule::FunctionUsesLoopVariable) {
                     flake8_bugbear::rules::function_uses_loop_variable(self, &Node::Expr(expr));
                 }
-                self.ctx.push_scope(ScopeKind::Generator);
+                if self.enabled(Rule::InDictKeys) {
+                    for generator in generators {
+                        flake8_simplify::rules::key_in_dict_for(
+                            self,
+                            &generator.target,
+                            &generator.iter,
+                        );
+                    }
+                }
+                if self.enabled(Rule::IterationOverSet) {
+                    for generator in generators {
+                        pylint::rules::iteration_over_set(self, &generator.iter);
+                    }
+                }
             }
-            ExprKind::DictComp {
+            Expr::DictComp(ast::ExprDictComp {
                 key,
                 value,
                 generators,
-            } => {
-                if self.settings.rules.enabled(Rule::UnnecessaryComprehension) {
+                range: _,
+            }) => {
+                if self.enabled(Rule::UnnecessaryComprehension) {
                     flake8_comprehensions::rules::unnecessary_dict_comprehension(
                         self, expr, key, value, generators,
                     );
                 }
-                if self.settings.rules.enabled(Rule::FunctionUsesLoopVariable) {
+                if self.enabled(Rule::FunctionUsesLoopVariable) {
                     flake8_bugbear::rules::function_uses_loop_variable(self, &Node::Expr(expr));
                 }
-                self.ctx.push_scope(ScopeKind::Generator);
+                if self.enabled(Rule::InDictKeys) {
+                    for generator in generators {
+                        flake8_simplify::rules::key_in_dict_for(
+                            self,
+                            &generator.target,
+                            &generator.iter,
+                        );
+                    }
+                }
+                if self.enabled(Rule::IterationOverSet) {
+                    for generator in generators {
+                        pylint::rules::iteration_over_set(self, &generator.iter);
+                    }
+                }
             }
-            ExprKind::GeneratorExp { .. } => {
-                if self.settings.rules.enabled(Rule::FunctionUsesLoopVariable) {
+            Expr::GeneratorExp(ast::ExprGeneratorExp {
+                generators,
+                elt: _,
+                range: _,
+            }) => {
+                if self.enabled(Rule::FunctionUsesLoopVariable) {
                     flake8_bugbear::rules::function_uses_loop_variable(self, &Node::Expr(expr));
                 }
-                self.ctx.push_scope(ScopeKind::Generator);
-            }
-            ExprKind::BoolOp { op, values } => {
-                if self.settings.rules.enabled(Rule::RepeatedIsinstanceCalls) {
-                    pylint::rules::repeated_isinstance_calls(self, expr, op, values);
+                if self.enabled(Rule::InDictKeys) {
+                    for generator in generators {
+                        flake8_simplify::rules::key_in_dict_for(
+                            self,
+                            &generator.target,
+                            &generator.iter,
+                        );
+                    }
                 }
-                if self.settings.rules.enabled(Rule::MultipleStartsEndsWith) {
+                if self.enabled(Rule::IterationOverSet) {
+                    for generator in generators {
+                        pylint::rules::iteration_over_set(self, &generator.iter);
+                    }
+                }
+            }
+            Expr::BoolOp(ast::ExprBoolOp {
+                op,
+                values,
+                range: _,
+            }) => {
+                if self.enabled(Rule::RepeatedIsinstanceCalls) {
+                    pylint::rules::repeated_isinstance_calls(self, expr, *op, values);
+                }
+                if self.enabled(Rule::MultipleStartsEndsWith) {
                     flake8_pie::rules::multiple_starts_ends_with(self, expr);
                 }
-                if self.settings.rules.enabled(Rule::DuplicateIsinstanceCall) {
+                if self.enabled(Rule::DuplicateIsinstanceCall) {
                     flake8_simplify::rules::duplicate_isinstance_call(self, expr);
                 }
-                if self.settings.rules.enabled(Rule::CompareWithTuple) {
+                if self.enabled(Rule::CompareWithTuple) {
                     flake8_simplify::rules::compare_with_tuple(self, expr);
                 }
-                if self.settings.rules.enabled(Rule::ExprAndNotExpr) {
+                if self.enabled(Rule::ExprAndNotExpr) {
                     flake8_simplify::rules::expr_and_not_expr(self, expr);
                 }
-                if self.settings.rules.enabled(Rule::ExprOrNotExpr) {
+                if self.enabled(Rule::ExprOrNotExpr) {
                     flake8_simplify::rules::expr_or_not_expr(self, expr);
                 }
-                if self.settings.rules.enabled(Rule::ExprOrTrue) {
+                if self.enabled(Rule::ExprOrTrue) {
                     flake8_simplify::rules::expr_or_true(self, expr);
                 }
-                if self.settings.rules.enabled(Rule::ExprAndFalse) {
+                if self.enabled(Rule::ExprAndFalse) {
                     flake8_simplify::rules::expr_and_false(self, expr);
                 }
             }
@@ -3633,88 +3617,154 @@ where
         };
 
         // Recurse.
-        match &expr.node {
-            ExprKind::Lambda { .. } => {
-                self.deferred
-                    .lambdas
-                    .push((expr, (self.ctx.scope_id, self.ctx.parents.clone())));
+        match expr {
+            Expr::ListComp(ast::ExprListComp {
+                elt,
+                generators,
+                range: _,
+            })
+            | Expr::SetComp(ast::ExprSetComp {
+                elt,
+                generators,
+                range: _,
+            })
+            | Expr::GeneratorExp(ast::ExprGeneratorExp {
+                elt,
+                generators,
+                range: _,
+            }) => {
+                self.visit_generators(generators);
+                self.visit_expr(elt);
             }
-            ExprKind::IfExp { test, body, orelse } => {
-                visit_boolean_test!(self, test);
-                self.visit_expr(body);
-                self.visit_expr(orelse);
+            Expr::DictComp(ast::ExprDictComp {
+                key,
+                value,
+                generators,
+                range: _,
+            }) => {
+                self.visit_generators(generators);
+                self.visit_expr(key);
+                self.visit_expr(value);
+            }
+            Expr::Lambda(_) => {
+                self.deferred
+                    .lambdas
+                    .push((expr, self.semantic_model.snapshot()));
+            }
+            Expr::IfExp(ast::ExprIfExp {
+                test,
+                body,
+                orelse,
+                range: _,
+            }) => {
+                self.visit_boolean_test(test);
+                self.visit_expr(body);
+                self.visit_expr(orelse);
             }
-            ExprKind::Call {
+            Expr::Call(ast::ExprCall {
                 func,
                 args,
                 keywords,
-            } => {
-                let callable = self.ctx.resolve_call_path(func).and_then(|call_path| {
-                    if self.ctx.match_typing_call_path(&call_path, "cast") {
-                        Some(Callable::Cast)
-                    } else if self.ctx.match_typing_call_path(&call_path, "NewType") {
-                        Some(Callable::NewType)
-                    } else if self.ctx.match_typing_call_path(&call_path, "TypeVar") {
-                        Some(Callable::TypeVar)
-                    } else if self.ctx.match_typing_call_path(&call_path, "NamedTuple") {
-                        Some(Callable::NamedTuple)
-                    } else if self.ctx.match_typing_call_path(&call_path, "TypedDict") {
-                        Some(Callable::TypedDict)
-                    } else if [
-                        "Arg",
-                        "DefaultArg",
-                        "NamedArg",
-                        "DefaultNamedArg",
-                        "VarArg",
-                        "KwArg",
-                    ]
-                    .iter()
-                    .any(|target| call_path.as_slice() == ["mypy_extensions", target])
-                    {
-                        Some(Callable::MypyExtension)
-                    } else if call_path.as_slice() == ["", "bool"] {
-                        Some(Callable::Bool)
-                    } else {
-                        None
-                    }
-                });
+                range: _,
+            }) => {
+                let callable = self
+                    .semantic_model
+                    .resolve_call_path(func)
+                    .and_then(|call_path| {
+                        if self
+                            .semantic_model
+                            .match_typing_call_path(&call_path, "cast")
+                        {
+                            Some(Callable::Cast)
+                        } else if self
+                            .semantic_model
+                            .match_typing_call_path(&call_path, "NewType")
+                        {
+                            Some(Callable::NewType)
+                        } else if self
+                            .semantic_model
+                            .match_typing_call_path(&call_path, "TypeVar")
+                        {
+                            Some(Callable::TypeVar)
+                        } else if self
+                            .semantic_model
+                            .match_typing_call_path(&call_path, "NamedTuple")
+                        {
+                            Some(Callable::NamedTuple)
+                        } else if self
+                            .semantic_model
+                            .match_typing_call_path(&call_path, "TypedDict")
+                        {
+                            Some(Callable::TypedDict)
+                        } else if [
+                            "Arg",
+                            "DefaultArg",
+                            "NamedArg",
+                            "DefaultNamedArg",
+                            "VarArg",
+                            "KwArg",
+                        ]
+                        .iter()
+                        .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]);
+                        let mut args = args.iter();
+                        if let Some(arg) = args.next() {
+                            self.visit_boolean_test(arg);
                         }
-                        for expr in args.iter().skip(1) {
-                            self.visit_expr(expr);
+                        for arg in args {
+                            self.visit_expr(arg);
                         }
                     }
                     Some(Callable::Cast) => {
                         self.visit_expr(func);
-                        if !args.is_empty() {
-                            visit_type_definition!(self, &args[0]);
+                        let mut args = args.iter();
+                        if let Some(arg) = args.next() {
+                            self.visit_type_definition(arg);
                         }
-                        for expr in args.iter().skip(1) {
-                            self.visit_expr(expr);
+                        for arg in args {
+                            self.visit_expr(arg);
                         }
                     }
                     Some(Callable::NewType) => {
                         self.visit_expr(func);
-                        for expr in args.iter().skip(1) {
-                            visit_type_definition!(self, expr);
+                        let mut args = args.iter();
+                        if let Some(arg) = args.next() {
+                            self.visit_non_type_definition(arg);
+                        }
+                        for arg in args {
+                            self.visit_type_definition(arg);
                         }
                     }
                     Some(Callable::TypeVar) => {
                         self.visit_expr(func);
-                        for expr in args.iter().skip(1) {
-                            visit_type_definition!(self, expr);
+                        let mut args = args.iter();
+                        if let Some(arg) = args.next() {
+                            self.visit_non_type_definition(arg);
+                        }
+                        for arg in args {
+                            self.visit_type_definition(arg);
                         }
                         for keyword in keywords {
-                            let KeywordData { arg, value } = &keyword.node;
+                            let Keyword {
+                                arg,
+                                value,
+                                range: _,
+                            } = keyword;
                             if let Some(id) = arg {
                                 if id == "bound" {
-                                    visit_type_definition!(self, value);
+                                    self.visit_type_definition(value);
                                 } else {
-                                    visit_non_type_definition!(self, value);
+                                    self.visit_non_type_definition(value);
                                 }
                             }
                         }
@@ -3723,75 +3773,98 @@ where
                         self.visit_expr(func);
 
                         // Ex) NamedTuple("a", [("a", int)])
-                        if args.len() > 1 {
-                            match &args[1].node {
-                                ExprKind::List { elts, .. } | ExprKind::Tuple { elts, .. } => {
-                                    for elt in elts {
-                                        match &elt.node {
-                                            ExprKind::List { elts, .. }
-                                            | ExprKind::Tuple { elts, .. } => {
-                                                if elts.len() == 2 {
-                                                    visit_non_type_definition!(self, &elts[0]);
-                                                    visit_type_definition!(self, &elts[1]);
-                                                }
-                                            }
-                                            _ => {}
+                        let mut args = args.iter();
+                        if let Some(arg) = args.next() {
+                            self.visit_non_type_definition(arg);
+                        }
+                        for arg in args {
+                            if let Expr::List(ast::ExprList { elts, .. })
+                            | Expr::Tuple(ast::ExprTuple { elts, .. }) = arg
+                            {
+                                for elt in elts {
+                                    match elt {
+                                        Expr::List(ast::ExprList { elts, .. })
+                                        | Expr::Tuple(ast::ExprTuple { elts, .. })
+                                            if elts.len() == 2 =>
+                                        {
+                                            self.visit_non_type_definition(&elts[0]);
+                                            self.visit_type_definition(&elts[1]);
+                                        }
+                                        _ => {
+                                            self.visit_non_type_definition(elt);
                                         }
                                     }
                                 }
-                                _ => {}
+                            } else {
+                                self.visit_non_type_definition(arg);
                             }
                         }
 
                         // Ex) NamedTuple("a", a=int)
                         for keyword in keywords {
-                            let KeywordData { value, .. } = &keyword.node;
-                            visit_type_definition!(self, value);
+                            let Keyword { value, .. } = keyword;
+                            self.visit_type_definition(value);
                         }
                     }
                     Some(Callable::TypedDict) => {
                         self.visit_expr(func);
 
                         // Ex) TypedDict("a", {"a": int})
-                        if args.len() > 1 {
-                            if let ExprKind::Dict { keys, values } = &args[1].node {
+                        let mut args = args.iter();
+                        if let Some(arg) = args.next() {
+                            self.visit_non_type_definition(arg);
+                        }
+                        for arg in args {
+                            if let Expr::Dict(ast::ExprDict {
+                                keys,
+                                values,
+                                range: _,
+                            }) = arg
+                            {
                                 for key in keys.iter().flatten() {
-                                    visit_non_type_definition!(self, key);
+                                    self.visit_non_type_definition(key);
                                 }
                                 for value in values {
-                                    visit_type_definition!(self, value);
+                                    self.visit_type_definition(value);
                                 }
+                            } else {
+                                self.visit_non_type_definition(arg);
                             }
                         }
 
                         // Ex) TypedDict("a", a=int)
                         for keyword in keywords {
-                            let KeywordData { value, .. } = &keyword.node;
-                            visit_type_definition!(self, value);
+                            let Keyword { value, .. } = keyword;
+                            self.visit_type_definition(value);
                         }
                     }
                     Some(Callable::MypyExtension) => {
                         self.visit_expr(func);
 
-                        if let Some(arg) = args.first() {
+                        let mut args = args.iter();
+                        if let Some(arg) = args.next() {
                             // Ex) DefaultNamedArg(bool | None, name="some_prop_name")
-                            visit_type_definition!(self, arg);
+                            self.visit_type_definition(arg);
 
-                            for arg in args.iter().skip(1) {
-                                visit_non_type_definition!(self, arg);
+                            for arg in args {
+                                self.visit_non_type_definition(arg);
                             }
                             for keyword in keywords {
-                                let KeywordData { value, .. } = &keyword.node;
-                                visit_non_type_definition!(self, value);
+                                let Keyword { value, .. } = keyword;
+                                self.visit_non_type_definition(value);
                             }
                         } else {
                             // Ex) DefaultNamedArg(type="bool", name="some_prop_name")
                             for keyword in keywords {
-                                let KeywordData { value, arg } = &keyword.node;
+                                let Keyword {
+                                    value,
+                                    arg,
+                                    range: _,
+                                } = keyword;
                                 if arg.as_ref().map_or(false, |arg| arg == "type") {
-                                    visit_type_definition!(self, value);
+                                    self.visit_type_definition(value);
                                 } else {
-                                    visit_non_type_definition!(self, value);
+                                    self.visit_non_type_definition(value);
                                 }
                             }
                         }
@@ -3802,38 +3875,43 @@ where
                         // any strings as deferred type definitions).
                         self.visit_expr(func);
                         for arg in args {
-                            visit_non_type_definition!(self, arg);
+                            self.visit_non_type_definition(arg);
                         }
                         for keyword in keywords {
-                            let KeywordData { value, .. } = &keyword.node;
-                            visit_non_type_definition!(self, value);
+                            let Keyword { value, .. } = keyword;
+                            self.visit_non_type_definition(value);
                         }
                     }
                 }
             }
-            ExprKind::Subscript { value, slice, ctx } => {
+            Expr::Subscript(ast::ExprSubscript {
+                value,
+                slice,
+                ctx,
+                range: _,
+            }) => {
                 // Only allow annotations in `ExprContext::Load`. If we have, e.g.,
                 // `obj["foo"]["bar"]`, we need to avoid treating the `obj["foo"]`
                 // portion as an annotation, despite having `ExprContext::Load`. Thus, we track
                 // the `ExprContext` at the top-level.
-                let prev_in_subscript = self.ctx.in_subscript;
-                if self.ctx.in_subscript {
+                if self.semantic_model.in_subscript() {
                     visitor::walk_expr(self, expr);
                 } else if matches!(ctx, ExprContext::Store | ExprContext::Del) {
-                    self.ctx.in_subscript = true;
+                    self.semantic_model.flags |= SemanticModelFlags::SUBSCRIPT;
                     visitor::walk_expr(self, expr);
                 } else {
                     match analyze::typing::match_annotated_subscript(
                         value,
-                        &self.ctx,
+                        &self.semantic_model,
                         self.settings.typing_modules.iter().map(String::as_str),
+                        &self.settings.pyflakes.extend_generics,
                     ) {
                         Some(subscript) => {
                             match subscript {
                                 // Ex) Optional[int]
                                 SubscriptKind::AnnotatedSubscript => {
                                     self.visit_expr(value);
-                                    visit_type_definition!(self, slice);
+                                    self.visit_type_definition(slice);
                                     self.visit_expr_context(ctx);
                                 }
                                 // Ex) Annotated[int, "Hello, world!"]
@@ -3841,17 +3919,22 @@ where
                                     // First argument is a type (including forward references); the
                                     // rest are arbitrary Python objects.
                                     self.visit_expr(value);
-                                    if let ExprKind::Tuple { elts, ctx } = &slice.node {
+                                    if let Expr::Tuple(ast::ExprTuple {
+                                        elts,
+                                        ctx,
+                                        range: _,
+                                    }) = slice.as_ref()
+                                    {
                                         if let Some(expr) = elts.first() {
                                             self.visit_expr(expr);
                                             for expr in elts.iter().skip(1) {
-                                                visit_non_type_definition!(self, expr);
+                                                self.visit_non_type_definition(expr);
                                             }
                                             self.visit_expr_context(ctx);
                                         }
                                     } else {
                                         error!(
-                                            "Found non-ExprKind::Tuple argument to PEP 593 \
+                                            "Found non-Expr::Tuple argument to PEP 593 \
                                              Annotation."
                                         );
                                     }
@@ -3861,57 +3944,44 @@ where
                         None => visitor::walk_expr(self, expr),
                     }
                 }
-                self.ctx.in_subscript = prev_in_subscript;
             }
-            ExprKind::JoinedStr { .. } => {
-                let prev_in_f_string = self.ctx.in_f_string;
-                self.ctx.in_f_string = true;
+            Expr::JoinedStr(_) => {
+                self.semantic_model.flags |= if self.semantic_model.in_f_string() {
+                    SemanticModelFlags::NESTED_F_STRING
+                } else {
+                    SemanticModelFlags::F_STRING
+                };
                 visitor::walk_expr(self, expr);
-                self.ctx.in_f_string = prev_in_f_string;
             }
             _ => visitor::walk_expr(self, expr),
         }
 
         // Post-visit.
-        match &expr.node {
-            ExprKind::Lambda { .. }
-            | ExprKind::GeneratorExp { .. }
-            | ExprKind::ListComp { .. }
-            | ExprKind::DictComp { .. }
-            | ExprKind::SetComp { .. } => {
-                self.ctx.pop_scope();
+        match expr {
+            Expr::Lambda(_)
+            | Expr::GeneratorExp(_)
+            | Expr::ListComp(_)
+            | Expr::DictComp(_)
+            | Expr::SetComp(_) => {
+                self.semantic_model.pop_scope();
             }
             _ => {}
         };
 
-        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();
-    }
-
-    fn visit_comprehension(&mut self, comprehension: &'b Comprehension) {
-        if self.settings.rules.enabled(Rule::InDictKeys) {
-            flake8_simplify::rules::key_in_dict_for(
-                self,
-                &comprehension.target,
-                &comprehension.iter,
-            );
-        }
-        self.visit_expr(&comprehension.iter);
-        self.visit_expr(&comprehension.target);
-        for expr in &comprehension.ifs {
-            visit_boolean_test!(self, expr);
-        }
+        self.semantic_model.flags = flags_snapshot;
+        self.semantic_model.pop_expr();
     }
 
     fn visit_excepthandler(&mut self, excepthandler: &'b Excepthandler) {
-        match &excepthandler.node {
-            ExcepthandlerKind::ExceptHandler {
-                type_, name, body, ..
-            } => {
-                if self.settings.rules.enabled(Rule::BareExcept) {
+        match excepthandler {
+            Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler {
+                type_,
+                name,
+                body,
+                range: _,
+            }) => {
+                let name = name.as_deref();
+                if self.enabled(Rule::BareExcept) {
                     if let Some(diagnostic) = pycodestyle::rules::bare_except(
                         type_.as_deref(),
                         body,
@@ -3921,61 +3991,48 @@ where
                         self.diagnostics.push(diagnostic);
                     }
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::RaiseWithoutFromInsideExcept)
-                {
+                if self.enabled(Rule::RaiseWithoutFromInsideExcept) {
                     flake8_bugbear::rules::raise_without_from_inside_except(self, body);
                 }
-                if self.settings.rules.enabled(Rule::BlindExcept) {
-                    flake8_blind_except::rules::blind_except(
-                        self,
-                        type_.as_deref(),
-                        name.as_deref(),
-                        body,
-                    );
+                if self.enabled(Rule::BlindExcept) {
+                    flake8_blind_except::rules::blind_except(self, type_.as_deref(), name, body);
                 }
-                if self.settings.rules.enabled(Rule::TryExceptPass) {
+                if self.enabled(Rule::TryExceptPass) {
                     flake8_bandit::rules::try_except_pass(
                         self,
                         excepthandler,
                         type_.as_deref(),
-                        name.as_deref(),
+                        name,
                         body,
                         self.settings.flake8_bandit.check_typed_exception,
                     );
                 }
-                if self.settings.rules.enabled(Rule::TryExceptContinue) {
+                if self.enabled(Rule::TryExceptContinue) {
                     flake8_bandit::rules::try_except_continue(
                         self,
                         excepthandler,
                         type_.as_deref(),
-                        name.as_deref(),
+                        name,
                         body,
                         self.settings.flake8_bandit.check_typed_exception,
                     );
                 }
-                if self.settings.rules.enabled(Rule::ExceptWithEmptyTuple) {
+                if self.enabled(Rule::ExceptWithEmptyTuple) {
                     flake8_bugbear::rules::except_with_empty_tuple(self, excepthandler);
                 }
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::ExceptWithNonExceptionClasses)
-                {
+                if self.enabled(Rule::ExceptWithNonExceptionClasses) {
                     flake8_bugbear::rules::except_with_non_exception_classes(self, excepthandler);
                 }
-                if self.settings.rules.enabled(Rule::ReraiseNoCause) {
+                if self.enabled(Rule::ReraiseNoCause) {
                     tryceratops::rules::reraise_no_cause(self, body);
                 }
 
-                if self.settings.rules.enabled(Rule::BinaryOpException) {
+                if self.enabled(Rule::BinaryOpException) {
                     pylint::rules::binary_op_exception(self, excepthandler);
                 }
                 match name {
                     Some(name) => {
-                        if self.settings.rules.enabled(Rule::AmbiguousVariableName) {
+                        if self.enabled(Rule::AmbiguousVariableName) {
                             if let Some(diagnostic) = pycodestyle::rules::ambiguous_variable_name(
                                 name,
                                 helpers::excepthandler_name_range(excepthandler, self.locator)
@@ -3985,52 +4042,53 @@ where
                             }
                         }
 
-                        self.check_builtin_shadowing(name, excepthandler, false);
+                        if self.enabled(Rule::BuiltinVariableShadowing) {
+                            flake8_builtins::rules::builtin_variable_shadowing(
+                                self,
+                                name,
+                                AnyShadowing::from(excepthandler),
+                            );
+                        }
 
                         let name_range =
                             helpers::excepthandler_name_range(excepthandler, self.locator).unwrap();
 
-                        if self.ctx.scope().defines(name.as_str()) {
+                        if self.semantic_model.scope().has(name) {
                             self.handle_node_store(
                                 name,
-                                &Expr::with_range(
-                                    ExprKind::Name {
-                                        id: name.to_string(),
-                                        ctx: ExprContext::Store,
-                                    },
-                                    name_range,
-                                ),
+                                &Expr::Name(ast::ExprName {
+                                    id: name.into(),
+                                    ctx: ExprContext::Store,
+                                    range: name_range,
+                                }),
                             );
                         }
 
-                        let definition = self.ctx.scope().get(name.as_str()).copied();
+                        let definition = self.semantic_model.scope().get(name);
                         self.handle_node_store(
                             name,
-                            &Expr::with_range(
-                                ExprKind::Name {
-                                    id: name.to_string(),
-                                    ctx: ExprContext::Store,
-                                },
-                                name_range,
-                            ),
+                            &Expr::Name(ast::ExprName {
+                                id: name.into(),
+                                ctx: ExprContext::Store,
+                                range: name_range,
+                            }),
                         );
 
                         walk_excepthandler(self, excepthandler);
 
-                        if let Some(index) = {
-                            let scope = self.ctx.scope_mut();
-                            &scope.remove(name.as_str())
+                        if let Some(binding_id) = {
+                            let scope = self.semantic_model.scope_mut();
+                            scope.delete(name)
                         } {
-                            if !self.ctx.bindings[*index].used() {
-                                if self.settings.rules.enabled(Rule::UnusedVariable) {
+                            if !self.semantic_model.is_used(binding_id) {
+                                if self.enabled(Rule::UnusedVariable) {
                                     let mut diagnostic = Diagnostic::new(
-                                        pyflakes::rules::UnusedVariable {
-                                            name: name.to_string(),
-                                        },
+                                        pyflakes::rules::UnusedVariable { name: name.into() },
                                         name_range,
                                     );
                                     if self.patch(Rule::UnusedVariable) {
-                                        diagnostic.try_set_fix(|| {
+                                        #[allow(deprecated)]
+                                        diagnostic.try_set_fix_from_edit(|| {
                                             pyflakes::fixes::remove_exception_handler_assignment(
                                                 excepthandler,
                                                 self.locator,
@@ -4042,9 +4100,9 @@ where
                             }
                         }
 
-                        if let Some(index) = definition {
-                            let scope = self.ctx.scope_mut();
-                            scope.add(name, index);
+                        if let Some(binding_id) = definition {
+                            let scope = self.semantic_model.scope_mut();
+                            scope.add(name, binding_id);
                         }
                     }
                     None => walk_excepthandler(self, excepthandler),
@@ -4054,8 +4112,8 @@ where
     }
 
     fn visit_format_spec(&mut self, format_spec: &'b Expr) {
-        match &format_spec.node {
-            ExprKind::JoinedStr { values } => {
+        match format_spec {
+            Expr::JoinedStr(ast::ExprJoinedStr { values, range: _ }) => {
                 for value in values {
                     self.visit_expr(value);
                 }
@@ -4065,28 +4123,20 @@ where
     }
 
     fn visit_arguments(&mut self, arguments: &'b Arguments) {
-        if self.settings.rules.enabled(Rule::MutableArgumentDefault) {
+        if self.enabled(Rule::MutableArgumentDefault) {
             flake8_bugbear::rules::mutable_argument_default(self, arguments);
         }
-        if self
-            .settings
-            .rules
-            .enabled(Rule::FunctionCallInDefaultArgument)
-        {
+        if self.enabled(Rule::FunctionCallInDefaultArgument) {
             flake8_bugbear::rules::function_call_argument_default(self, arguments);
         }
 
         if self.is_stub {
-            if self
-                .settings
-                .rules
-                .enabled(Rule::TypedArgumentDefaultInStub)
-            {
+            if self.enabled(Rule::TypedArgumentDefaultInStub) {
                 flake8_pyi::rules::typed_argument_simple_defaults(self, arguments);
             }
         }
         if self.is_stub {
-            if self.settings.rules.enabled(Rule::ArgumentDefaultInStub) {
+            if self.enabled(Rule::ArgumentDefaultInStub) {
                 flake8_pyi::rules::argument_simple_defaults(self, arguments);
             }
         }
@@ -4114,30 +4164,23 @@ where
         // Bind, but intentionally avoid walking the annotation, as we handle it
         // upstream.
         self.add_binding(
-            &arg.node.arg,
-            Binding {
-                kind: BindingKind::Argument,
-                runtime_usage: None,
-                synthetic_usage: None,
-                typing_usage: None,
-                range: arg.range(),
-                source: Some(*self.ctx.current_stmt()),
-                context: self.ctx.execution_context(),
-                exceptions: self.ctx.exceptions(),
-            },
+            &arg.arg,
+            arg.range(),
+            BindingKind::Argument,
+            BindingFlags::empty(),
         );
 
-        if self.settings.rules.enabled(Rule::AmbiguousVariableName) {
+        if self.enabled(Rule::AmbiguousVariableName) {
             if let Some(diagnostic) =
-                pycodestyle::rules::ambiguous_variable_name(&arg.node.arg, arg.range())
+                pycodestyle::rules::ambiguous_variable_name(&arg.arg, arg.range())
             {
                 self.diagnostics.push(diagnostic);
             }
         }
 
-        if self.settings.rules.enabled(Rule::InvalidArgumentName) {
+        if self.enabled(Rule::InvalidArgumentName) {
             if let Some(diagnostic) = pep8_naming::rules::invalid_argument_name(
-                &arg.node.arg,
+                &arg.arg,
                 arg,
                 &self.settings.pep8_naming.ignore_names,
             ) {
@@ -4145,30 +4188,28 @@ where
             }
         }
 
-        self.check_builtin_arg_shadowing(&arg.node.arg, arg);
+        if self.enabled(Rule::BuiltinArgumentShadowing) {
+            flake8_builtins::rules::builtin_argument_shadowing(self, arg);
+        }
     }
 
     fn visit_pattern(&mut self, pattern: &'b Pattern) {
-        if let PatternKind::MatchAs {
+        if let Pattern::MatchAs(ast::PatternMatchAs {
             name: Some(name), ..
-        }
-        | PatternKind::MatchStar { name: Some(name) }
-        | PatternKind::MatchMapping {
+        })
+        | Pattern::MatchStar(ast::PatternMatchStar {
+            name: Some(name),
+            range: _,
+        })
+        | Pattern::MatchMapping(ast::PatternMatchMapping {
             rest: Some(name), ..
-        } = &pattern.node
+        }) = pattern
         {
             self.add_binding(
                 name,
-                Binding {
-                    kind: BindingKind::Assignment,
-                    runtime_usage: None,
-                    synthetic_usage: None,
-                    typing_usage: None,
-                    range: pattern.range(),
-                    source: Some(*self.ctx.current_stmt()),
-                    context: self.ctx.execution_context(),
-                    exceptions: self.ctx.exceptions(),
-                },
+                pattern.range(),
+                BindingKind::Assignment,
+                BindingFlags::empty(),
             );
         }
 
@@ -4176,62 +4217,177 @@ where
     }
 
     fn visit_body(&mut self, body: &'b [Stmt]) {
-        if self.settings.rules.enabled(Rule::UnnecessaryPass) {
+        if self.enabled(Rule::UnnecessaryPass) {
             flake8_pie::rules::no_unnecessary_pass(self, body);
         }
 
-        let prev_body = self.ctx.body;
-        let prev_body_index = self.ctx.body_index;
-        self.ctx.body = body;
-        self.ctx.body_index = 0;
+        let prev_body = self.semantic_model.body;
+        let prev_body_index = self.semantic_model.body_index;
+        self.semantic_model.body = body;
+        self.semantic_model.body_index = 0;
 
         for stmt in body {
             self.visit_stmt(stmt);
-            self.ctx.body_index += 1;
+            self.semantic_model.body_index += 1;
         }
 
-        self.ctx.body = prev_body;
-        self.ctx.body_index = prev_body_index;
+        self.semantic_model.body = prev_body;
+        self.semantic_model.body_index = prev_body_index;
     }
 }
 
 impl<'a> Checker<'a> {
-    fn add_binding(&mut self, name: &'a str, binding: Binding<'a>) {
-        let binding_id = self.ctx.bindings.next_id();
-        if let Some((stack_index, existing_binding_id)) = self
-            .ctx
+    /// Visit a [`Module`]. Returns `true` if the module contains a module-level docstring.
+    fn visit_module(&mut self, python_ast: &'a Suite) -> bool {
+        if self.enabled(Rule::FStringDocstring) {
+            flake8_bugbear::rules::f_string_docstring(self, python_ast);
+        }
+        let docstring = docstrings::extraction::docstring_from(python_ast);
+        docstring.is_some()
+    }
+
+    /// Visit a list of [`Comprehension`] nodes, assumed to be the comprehensions that compose a
+    /// generator expression, like a list or set comprehension.
+    fn visit_generators(&mut self, generators: &'a [Comprehension]) {
+        let mut generators = generators.iter();
+
+        let Some(generator) = generators.next() else {
+            unreachable!("Generator expression must contain at least one generator");
+        };
+
+        // Generators are compiled as nested functions. (This may change with PEP 709.)
+        // As such, the `iter` of the first generator is evaluated in the outer scope, while all
+        // subsequent nodes are evaluated in the inner scope.
+        //
+        // For example, given:
+        // ```py
+        // class A:
+        //     T = range(10)
+        //
+        //     L = [x for x in T for y in T]
+        // ```
+        //
+        // Conceptually, this is compiled as:
+        // ```py
+        // class A:
+        //     T = range(10)
+        //
+        //     def foo(x=T):
+        //         def bar(y=T):
+        //             pass
+        //         return bar()
+        //     foo()
+        // ```
+        //
+        // Following Python's scoping rules, the `T` in `x=T` is thus evaluated in the outer scope,
+        // while all subsequent reads and writes are evaluated in the inner scope. In particular,
+        // `x` is local to `foo`, and the `T` in `y=T` skips the class scope when resolving.
+        self.visit_expr(&generator.iter);
+        self.semantic_model.push_scope(ScopeKind::Generator);
+        self.visit_expr(&generator.target);
+        for expr in &generator.ifs {
+            self.visit_boolean_test(expr);
+        }
+
+        for generator in generators {
+            self.visit_expr(&generator.iter);
+            self.visit_expr(&generator.target);
+            for expr in &generator.ifs {
+                self.visit_boolean_test(expr);
+            }
+        }
+    }
+
+    /// Visit an body of [`Stmt`] nodes within a type-checking block.
+    fn visit_type_checking_block(&mut self, body: &'a [Stmt]) {
+        let snapshot = self.semantic_model.flags;
+        self.semantic_model.flags |= SemanticModelFlags::TYPE_CHECKING_BLOCK;
+        self.visit_body(body);
+        self.semantic_model.flags = snapshot;
+    }
+
+    /// Visit an [`Expr`], and treat it as a type definition.
+    fn visit_type_definition(&mut self, expr: &'a Expr) {
+        let snapshot = self.semantic_model.flags;
+        self.semantic_model.flags |= SemanticModelFlags::TYPE_DEFINITION;
+        self.visit_expr(expr);
+        self.semantic_model.flags = snapshot;
+    }
+
+    /// Visit an [`Expr`], and treat it as _not_ a type definition.
+    fn visit_non_type_definition(&mut self, expr: &'a Expr) {
+        let snapshot = self.semantic_model.flags;
+        self.semantic_model.flags -= SemanticModelFlags::TYPE_DEFINITION;
+        self.visit_expr(expr);
+        self.semantic_model.flags = snapshot;
+    }
+
+    /// 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.
+    fn visit_boolean_test(&mut self, expr: &'a Expr) {
+        let snapshot = self.semantic_model.flags;
+        self.semantic_model.flags |= SemanticModelFlags::BOOLEAN_TEST;
+        self.visit_expr(expr);
+        self.semantic_model.flags = snapshot;
+    }
+
+    /// Add a [`Binding`] to the current scope, bound to the given name.
+    fn add_binding(
+        &mut self,
+        name: &'a str,
+        range: TextRange,
+        kind: BindingKind<'a>,
+        flags: BindingFlags,
+    ) -> BindingId {
+        // Determine the scope to which the binding belongs.
+        // Per [PEP 572](https://peps.python.org/pep-0572/#scope-of-the-target), named
+        // expressions in generators and comprehensions bind to the scope that contains the
+        // outermost comprehension.
+        let scope_id = if kind.is_named_expr_assignment() {
+            self.semantic_model
+                .scopes
+                .ancestor_ids(self.semantic_model.scope_id)
+                .find_or_last(|scope_id| !self.semantic_model.scopes[*scope_id].kind.is_generator())
+                .unwrap_or(self.semantic_model.scope_id)
+        } else {
+            self.semantic_model.scope_id
+        };
+
+        // Create the `Binding`.
+        let binding_id = self.semantic_model.push_binding(range, kind, flags);
+        let binding = &self.semantic_model.bindings[binding_id];
+
+        // Determine whether the binding shadows any existing bindings.
+        if let Some((stack_index, shadowed_id)) = self
+            .semantic_model
             .scopes
-            .ancestors(self.ctx.scope_id)
+            .ancestors(self.semantic_model.scope_id)
             .enumerate()
             .find_map(|(stack_index, scope)| {
-                scope.get(name).map(|binding_id| (stack_index, *binding_id))
+                scope.get(name).map(|binding_id| (stack_index, binding_id))
             })
         {
-            let existing = &self.ctx.bindings[existing_binding_id];
+            let shadowed = &self.semantic_model.bindings[shadowed_id];
             let in_current_scope = stack_index == 0;
-            if !existing.kind.is_builtin()
-                && existing.source.map_or(true, |left| {
+            if !shadowed.kind.is_builtin()
+                && shadowed.source.map_or(true, |left| {
                     binding.source.map_or(true, |right| {
-                        !branch_detection::different_forks(
-                            left,
-                            right,
-                            &self.ctx.depths,
-                            &self.ctx.child_to_parent,
-                        )
+                        !branch_detection::different_forks(left, right, &self.semantic_model.stmts)
                     })
                 })
             {
-                let existing_is_import = matches!(
-                    existing.kind,
+                let shadows_import = matches!(
+                    shadowed.kind,
                     BindingKind::Importation(..)
                         | BindingKind::FromImportation(..)
                         | BindingKind::SubmoduleImportation(..)
                         | BindingKind::FutureImportation
                 );
-                if binding.kind.is_loop_var() && existing_is_import {
-                    if self.settings.rules.enabled(Rule::ImportShadowedByLoopVar) {
+                if binding.kind.is_loop_var() && shadows_import {
+                    if self.enabled(Rule::ImportShadowedByLoopVar) {
                         #[allow(deprecated)]
-                        let line = self.locator.compute_line_index(existing.range.start());
+                        let line = self.locator.compute_line_index(shadowed.range.start());
 
                         self.diagnostics.push(Diagnostic::new(
                             pyflakes::rules::ImportShadowedByLoopVar {
@@ -4242,364 +4398,217 @@ impl<'a> Checker<'a> {
                         ));
                     }
                 } else if in_current_scope {
-                    if !existing.used()
-                        && binding.redefines(existing)
-                        && (!self.settings.dummy_variable_rgx.is_match(name) || existing_is_import)
-                        && !(existing.kind.is_function_definition()
+                    if !shadowed.is_used()
+                        && binding.redefines(shadowed)
+                        && (!self.settings.dummy_variable_rgx.is_match(name) || shadows_import)
+                        && !(shadowed.kind.is_function_definition()
                             && analyze::visibility::is_overload(
-                                &self.ctx,
-                                cast::decorator_list(existing.source.as_ref().unwrap()),
+                                &self.semantic_model,
+                                cast::decorator_list(
+                                    self.semantic_model.stmts[shadowed.source.unwrap()],
+                                ),
                             ))
                     {
-                        if self.settings.rules.enabled(Rule::RedefinedWhileUnused) {
+                        if self.enabled(Rule::RedefinedWhileUnused) {
                             #[allow(deprecated)]
-                            let line = self.locator.compute_line_index(existing.range.start());
+                            let line = self.locator.compute_line_index(
+                                shadowed
+                                    .trimmed_range(&self.semantic_model, self.locator)
+                                    .start(),
+                            );
 
                             let mut diagnostic = Diagnostic::new(
                                 pyflakes::rules::RedefinedWhileUnused {
                                     name: name.to_string(),
                                     line,
                                 },
-                                matches!(
-                                    binding.kind,
-                                    BindingKind::ClassDefinition | BindingKind::FunctionDefinition
-                                )
-                                .then(|| {
-                                    binding.source.as_ref().map_or(binding.range, |source| {
-                                        helpers::identifier_range(source, self.locator)
-                                    })
-                                })
-                                .unwrap_or(binding.range),
+                                binding.trimmed_range(&self.semantic_model, self.locator),
                             );
-                            if let Some(parent) = binding.source.as_ref() {
-                                if matches!(parent.node, StmtKind::ImportFrom { .. })
-                                    && parent.range().contains_range(binding.range)
-                                {
-                                    diagnostic.set_parent(parent.start());
-                                }
+                            if let Some(range) = binding.parent_range(&self.semantic_model) {
+                                diagnostic.set_parent(range.start());
                             }
                             self.diagnostics.push(diagnostic);
                         }
                     }
-                } else if existing_is_import && binding.redefines(existing) {
-                    self.ctx
+                } else if shadows_import && binding.redefines(shadowed) {
+                    self.semantic_model
                         .shadowed_bindings
-                        .entry(existing_binding_id)
-                        .or_insert_with(Vec::new)
-                        .push(binding_id);
+                        .insert(binding_id, shadowed_id);
                 }
             }
         }
 
-        // Per [PEP 572](https://peps.python.org/pep-0572/#scope-of-the-target), named
-        // expressions in generators and comprehensions bind to the scope that contains the
-        // outermost comprehension.
-        let scope_id = if binding.kind.is_named_expr_assignment() {
-            self.ctx
-                .scopes
-                .ancestor_ids(self.ctx.scope_id)
-                .find_or_last(|scope_id| !self.ctx.scopes[*scope_id].kind.is_generator())
-                .unwrap_or(self.ctx.scope_id)
-        } else {
-            self.ctx.scope_id
-        };
-        let scope = &mut self.ctx.scopes[scope_id];
-
-        let binding = if let Some(index) = scope.get(name) {
-            let existing = &self.ctx.bindings[*index];
-            match &existing.kind {
+        // If there's an existing binding in this scope, copy its references.
+        if let Some(shadowed) = self.semantic_model.scopes[scope_id]
+            .get(name)
+            .map(|binding_id| &self.semantic_model.bindings[binding_id])
+        {
+            match &shadowed.kind {
                 BindingKind::Builtin => {
                     // Avoid overriding builtins.
-                    binding
                 }
                 kind @ (BindingKind::Global | BindingKind::Nonlocal) => {
-                    // If the original binding was a global or nonlocal, and the new binding conflicts within
-                    // the current scope, then the new binding is also as the same.
-                    Binding {
-                        runtime_usage: existing.runtime_usage,
-                        synthetic_usage: existing.synthetic_usage,
-                        typing_usage: existing.typing_usage,
-                        kind: kind.clone(),
-                        ..binding
-                    }
-                }
-                _ => Binding {
-                    runtime_usage: existing.runtime_usage,
-                    synthetic_usage: existing.synthetic_usage,
-                    typing_usage: existing.typing_usage,
-                    ..binding
-                },
+                    // If the original binding was a global or nonlocal, then the new binding is
+                    // too.
+                    let references = shadowed.references.clone();
+                    self.semantic_model.bindings[binding_id].kind = kind.clone();
+                    self.semantic_model.bindings[binding_id].references = references;
+                }
+                _ => {
+                    let references = shadowed.references.clone();
+                    self.semantic_model.bindings[binding_id].references = references;
+                }
             }
-        } else {
-            binding
-        };
 
-        // Don't treat annotations as assignments if there is an existing value
-        // in scope.
-        if binding.kind.is_annotation() && scope.defines(name) {
-            self.ctx.bindings.push(binding);
-            return;
+            // If this is an annotation, and we already have an existing value in the same scope,
+            // don't treat it as an assignment (i.e., avoid adding it to the scope).
+            if self.semantic_model.bindings[binding_id]
+                .kind
+                .is_annotation()
+            {
+                return binding_id;
+            }
         }
 
         // Add the binding to the scope.
+        let scope = &mut self.semantic_model.scopes[scope_id];
         scope.add(name, binding_id);
 
-        // Add the binding to the arena.
-        self.ctx.bindings.push(binding);
+        binding_id
     }
 
     fn bind_builtins(&mut self) {
-        let scope = &mut self.ctx.scopes[self.ctx.scope_id];
-
         for builtin in BUILTINS
             .iter()
             .chain(MAGIC_GLOBALS.iter())
             .copied()
             .chain(self.settings.builtins.iter().map(String::as_str))
         {
-            let id = self.ctx.bindings.push(Binding {
-                kind: BindingKind::Builtin,
-                range: TextRange::default(),
-                runtime_usage: None,
-                synthetic_usage: Some((ScopeId::global(), TextRange::default())),
-                typing_usage: None,
-                source: None,
-                context: ExecutionContext::Runtime,
-                exceptions: Exceptions::empty(),
-            });
-            scope.add(builtin, id);
+            // Add the builtin to the scope.
+            let binding_id = self.semantic_model.push_builtin();
+            let scope = self.semantic_model.scope_mut();
+            scope.add(builtin, binding_id);
         }
     }
 
     fn handle_node_load(&mut self, expr: &Expr) {
-        let ExprKind::Name { id, .. } = &expr.node else {
+        let Expr::Name(ast::ExprName { id, .. } )= expr else {
             return;
         };
-
-        let mut first_iter = true;
-        let mut in_generator = false;
-        let mut import_starred = false;
-
-        for scope in self.ctx.scopes.ancestors(self.ctx.scope_id) {
-            if scope.kind.is_class() {
-                if id == "__class__" {
-                    return;
-                } else if !first_iter && !in_generator {
-                    continue;
-                }
+        match self.semantic_model.resolve_reference(id, expr.range()) {
+            ResolvedReference::Resolved(..) | ResolvedReference::ImplicitGlobal => {
+                // Nothing to do.
             }
-
-            if let Some(index) = scope.get(id.as_str()) {
-                // Mark the binding as used.
-                let context = self.ctx.execution_context();
-                self.ctx.bindings[*index].mark_used(self.ctx.scope_id, expr.range(), context);
-
-                if self.ctx.bindings[*index].kind.is_annotation()
-                    && self.ctx.in_deferred_string_type_definition.is_none()
-                    && !self.ctx.in_deferred_type_definition
-                {
-                    continue;
+            ResolvedReference::StarImport => {
+                // F405
+                if self.enabled(Rule::UndefinedLocalWithImportStarUsage) {
+                    let sources: Vec<String> = self
+                        .semantic_model
+                        .scopes
+                        .iter()
+                        .flat_map(Scope::star_imports)
+                        .map(|StarImportation { level, module }| {
+                            helpers::format_import_from(*level, *module)
+                        })
+                        .sorted()
+                        .dedup()
+                        .collect();
+                    self.diagnostics.push(Diagnostic::new(
+                        pyflakes::rules::UndefinedLocalWithImportStarUsage {
+                            name: id.to_string(),
+                            sources,
+                        },
+                        expr.range(),
+                    ));
                 }
+            }
+            ResolvedReference::NotFound => {
+                // F821
+                if self.enabled(Rule::UndefinedName) {
+                    // Allow __path__.
+                    if self.path.ends_with("__init__.py") && id == "__path__" {
+                        return;
+                    }
 
-                // If the name of the sub-importation is the same as an alias of another
-                // importation and the alias is used, that sub-importation should be
-                // marked as used too.
-                //
-                // This handles code like:
-                //   import pyarrow as pa
-                //   import pyarrow.csv
-                //   print(pa.csv.read_csv("test.csv"))
-                match &self.ctx.bindings[*index].kind {
-                    BindingKind::Importation(Importation { name, full_name })
-                    | BindingKind::SubmoduleImportation(SubmoduleImportation { name, full_name }) =>
+                    // Avoid flagging if `NameError` is handled.
+                    if self
+                        .semantic_model
+                        .handled_exceptions
+                        .iter()
+                        .any(|handler_names| handler_names.contains(Exceptions::NAME_ERROR))
                     {
-                        let has_alias = full_name
-                            .split('.')
-                            .last()
-                            .map(|segment| &segment != name)
-                            .unwrap_or_default();
-                        if has_alias {
-                            // Mark the sub-importation as used.
-                            if let Some(index) = scope.get(full_name) {
-                                self.ctx.bindings[*index].mark_used(
-                                    self.ctx.scope_id,
-                                    expr.range(),
-                                    context,
-                                );
-                            }
-                        }
-                    }
-                    BindingKind::FromImportation(FromImportation { name, full_name }) => {
-                        let has_alias = full_name
-                            .split('.')
-                            .last()
-                            .map(|segment| &segment != name)
-                            .unwrap_or_default();
-                        if has_alias {
-                            // Mark the sub-importation as used.
-                            if let Some(index) = scope.get(full_name.as_str()) {
-                                self.ctx.bindings[*index].mark_used(
-                                    self.ctx.scope_id,
-                                    expr.range(),
-                                    context,
-                                );
-                            }
-                        }
+                        return;
                     }
-                    _ => {}
-                }
-
-                return;
-            }
 
-            first_iter = false;
-            in_generator = matches!(scope.kind, ScopeKind::Generator);
-            import_starred = import_starred || scope.uses_star_imports();
-        }
-
-        if import_starred {
-            // F405
-            if self
-                .settings
-                .rules
-                .enabled(Rule::UndefinedLocalWithImportStarUsage)
-            {
-                let sources: Vec<String> = self
-                    .ctx
-                    .scopes
-                    .iter()
-                    .flat_map(Scope::star_imports)
-                    .map(|StarImportation { level, module }| {
-                        helpers::format_import_from(*level, *module)
-                    })
-                    .sorted()
-                    .dedup()
-                    .collect();
-                self.diagnostics.push(Diagnostic::new(
-                    pyflakes::rules::UndefinedLocalWithImportStarUsage {
-                        name: id.to_string(),
-                        sources,
-                    },
-                    expr.range(),
-                ));
-            }
-            return;
-        }
-
-        if self.settings.rules.enabled(Rule::UndefinedName) {
-            // Allow __path__.
-            if self.path.ends_with("__init__.py") && id == "__path__" {
-                return;
-            }
-
-            // Allow "__module__" and "__qualname__" in class scopes.
-            if (id == "__module__" || id == "__qualname__")
-                && matches!(self.ctx.scope().kind, ScopeKind::Class(..))
-            {
-                return;
-            }
-
-            // Avoid flagging if NameError is handled.
-            if self
-                .ctx
-                .handled_exceptions
-                .iter()
-                .any(|handler_names| handler_names.contains(Exceptions::NAME_ERROR))
-            {
-                return;
+                    self.diagnostics.push(Diagnostic::new(
+                        pyflakes::rules::UndefinedName {
+                            name: id.to_string(),
+                        },
+                        expr.range(),
+                    ));
+                }
             }
-
-            self.diagnostics.push(Diagnostic::new(
-                pyflakes::rules::UndefinedName { name: id.clone() },
-                expr.range(),
-            ));
         }
     }
 
     fn handle_node_store(&mut self, id: &'a str, expr: &Expr) {
-        let parent = self.ctx.current_stmt().0;
+        let parent = self.semantic_model.stmt();
 
-        if self.settings.rules.enabled(Rule::UndefinedLocal) {
+        if self.enabled(Rule::UndefinedLocal) {
             pyflakes::rules::undefined_local(self, id);
         }
 
-        if self
-            .settings
-            .rules
-            .enabled(Rule::NonLowercaseVariableInFunction)
-        {
-            if matches!(self.ctx.scope().kind, ScopeKind::Function(..)) {
+        if self.enabled(Rule::NonLowercaseVariableInFunction) {
+            if self.semantic_model.scope().kind.is_any_function() {
                 // Ignore globals.
                 if !self
-                    .ctx
+                    .semantic_model
                     .scope()
                     .get(id)
-                    .map_or(false, |index| self.ctx.bindings[*index].kind.is_global())
+                    .map_or(false, |binding_id| {
+                        self.semantic_model.bindings[binding_id].kind.is_global()
+                    })
                 {
                     pep8_naming::rules::non_lowercase_variable_in_function(self, expr, parent, id);
                 }
             }
         }
 
-        if self
-            .settings
-            .rules
-            .enabled(Rule::MixedCaseVariableInClassScope)
-        {
-            if let ScopeKind::Class(class) = &self.ctx.scope().kind {
+        if self.enabled(Rule::MixedCaseVariableInClassScope) {
+            if let ScopeKind::Class(ast::StmtClassDef { bases, .. }) =
+                &self.semantic_model.scope().kind
+            {
                 pep8_naming::rules::mixed_case_variable_in_class_scope(
-                    self,
-                    expr,
-                    parent,
-                    id,
-                    class.bases,
+                    self, expr, parent, id, bases,
                 );
             }
         }
 
-        if self
-            .settings
-            .rules
-            .enabled(Rule::MixedCaseVariableInGlobalScope)
-        {
-            if matches!(self.ctx.scope().kind, ScopeKind::Module) {
+        if self.enabled(Rule::MixedCaseVariableInGlobalScope) {
+            if matches!(self.semantic_model.scope().kind, ScopeKind::Module) {
                 pep8_naming::rules::mixed_case_variable_in_global_scope(self, expr, parent, id);
             }
         }
 
-        if matches!(parent.node, StmtKind::AnnAssign { value: None, .. }) {
+        if matches!(
+            parent,
+            Stmt::AnnAssign(ast::StmtAnnAssign { value: None, .. })
+        ) {
             self.add_binding(
                 id,
-                Binding {
-                    kind: BindingKind::Annotation,
-                    runtime_usage: None,
-                    synthetic_usage: None,
-                    typing_usage: None,
-                    range: expr.range(),
-                    source: Some(*self.ctx.current_stmt()),
-                    context: self.ctx.execution_context(),
-                    exceptions: self.ctx.exceptions(),
-                },
+                expr.range(),
+                BindingKind::Annotation,
+                BindingFlags::empty(),
             );
             return;
         }
 
-        if matches!(
-            parent.node,
-            StmtKind::For { .. } | StmtKind::AsyncFor { .. }
-        ) {
+        if matches!(parent, Stmt::For(_) | Stmt::AsyncFor(_)) {
             self.add_binding(
                 id,
-                Binding {
-                    kind: BindingKind::LoopVar,
-                    runtime_usage: None,
-                    synthetic_usage: None,
-                    typing_usage: None,
-                    range: expr.range(),
-                    source: Some(*self.ctx.current_stmt()),
-                    context: self.ctx.execution_context(),
-                    exceptions: self.ctx.exceptions(),
-                },
+                expr.range(),
+                BindingKind::LoopVar,
+                BindingFlags::empty(),
             );
             return;
         }
@@ -4607,199 +4616,119 @@ impl<'a> Checker<'a> {
         if helpers::is_unpacking_assignment(parent, expr) {
             self.add_binding(
                 id,
-                Binding {
-                    kind: BindingKind::Binding,
-                    runtime_usage: None,
-                    synthetic_usage: None,
-                    typing_usage: None,
-                    range: expr.range(),
-                    source: Some(*self.ctx.current_stmt()),
-                    context: self.ctx.execution_context(),
-                    exceptions: self.ctx.exceptions(),
-                },
+                expr.range(),
+                BindingKind::Binding,
+                BindingFlags::empty(),
             );
             return;
         }
 
-        let scope = self.ctx.scope();
+        let scope = self.semantic_model.scope();
 
-        if id == "__all__"
-            && scope.kind.is_module()
-            && matches!(
-                parent.node,
-                StmtKind::Assign { .. } | StmtKind::AugAssign { .. } | StmtKind::AnnAssign { .. }
-            )
-        {
-            if match &parent.node {
-                StmtKind::Assign { targets, .. } => {
-                    if let Some(ExprKind::Name { id, .. }) =
-                        targets.first().map(|target| &target.node)
-                    {
+        if scope.kind.is_module()
+            && match parent {
+                Stmt::Assign(ast::StmtAssign { targets, .. }) => {
+                    if let Some(Expr::Name(ast::ExprName { id, .. })) = targets.first() {
                         id == "__all__"
                     } else {
                         false
                     }
                 }
-                StmtKind::AugAssign { target, .. } => {
-                    if let ExprKind::Name { id, .. } = &target.node {
+                Stmt::AugAssign(ast::StmtAugAssign { target, .. }) => {
+                    if let Expr::Name(ast::ExprName { id, .. }) = target.as_ref() {
                         id == "__all__"
                     } else {
                         false
                     }
                 }
-                StmtKind::AnnAssign { target, .. } => {
-                    if let ExprKind::Name { id, .. } = &target.node {
+                Stmt::AnnAssign(ast::StmtAnnAssign { target, .. }) => {
+                    if let Expr::Name(ast::ExprName { id, .. }) = target.as_ref() {
                         id == "__all__"
                     } else {
                         false
                     }
                 }
                 _ => 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) = scope.get("__all__") {
-                            if let BindingKind::Export(Export { names: existing }) =
-                                &self.ctx.bindings[*index].kind
-                            {
-                                names.extend_from_slice(existing);
-                            }
-                        }
-                    }
-
-                    (names, flags)
-                };
+            }
+        {
+            let (names, flags) =
+                extract_all_names(parent, |name| self.semantic_model.is_builtin(name));
 
-                if self.settings.rules.enabled(Rule::InvalidAllFormat) {
-                    if matches!(all_names_flags, AllNamesFlags::INVALID_FORMAT) {
-                        self.diagnostics
-                            .push(pylint::rules::invalid_all_format(expr));
-                    }
+            if self.enabled(Rule::InvalidAllFormat) {
+                if matches!(flags, AllNamesFlags::INVALID_FORMAT) {
+                    self.diagnostics
+                        .push(pylint::rules::invalid_all_format(expr));
                 }
+            }
 
-                if self.settings.rules.enabled(Rule::InvalidAllObject) {
-                    if matches!(all_names_flags, AllNamesFlags::INVALID_OBJECT) {
-                        self.diagnostics
-                            .push(pylint::rules::invalid_all_object(expr));
-                    }
+            if self.enabled(Rule::InvalidAllObject) {
+                if matches!(flags, AllNamesFlags::INVALID_OBJECT) {
+                    self.diagnostics
+                        .push(pylint::rules::invalid_all_object(expr));
                 }
-
-                self.add_binding(
-                    id,
-                    Binding {
-                        kind: BindingKind::Export(Export { names: all_names }),
-                        runtime_usage: None,
-                        synthetic_usage: None,
-                        typing_usage: None,
-                        range: expr.range(),
-                        source: Some(*self.ctx.current_stmt()),
-                        context: self.ctx.execution_context(),
-                        exceptions: self.ctx.exceptions(),
-                    },
-                );
-                return;
             }
+
+            self.add_binding(
+                id,
+                expr.range(),
+                BindingKind::Export(Export { names }),
+                BindingFlags::empty(),
+            );
+            return;
         }
 
         if self
-            .ctx
+            .semantic_model
             .expr_ancestors()
-            .any(|expr| matches!(expr.node, ExprKind::NamedExpr { .. }))
+            .any(|expr| matches!(expr, Expr::NamedExpr(_)))
         {
             self.add_binding(
                 id,
-                Binding {
-                    kind: BindingKind::NamedExprAssignment,
-                    runtime_usage: None,
-                    synthetic_usage: None,
-                    typing_usage: None,
-                    range: expr.range(),
-                    source: Some(*self.ctx.current_stmt()),
-                    context: self.ctx.execution_context(),
-                    exceptions: self.ctx.exceptions(),
-                },
+                expr.range(),
+                BindingKind::NamedExprAssignment,
+                BindingFlags::empty(),
             );
             return;
         }
 
         self.add_binding(
             id,
-            Binding {
-                kind: BindingKind::Assignment,
-                runtime_usage: None,
-                synthetic_usage: None,
-                typing_usage: None,
-                range: expr.range(),
-                source: Some(*self.ctx.current_stmt()),
-                context: self.ctx.execution_context(),
-                exceptions: self.ctx.exceptions(),
-            },
+            expr.range(),
+            BindingKind::Assignment,
+            BindingFlags::empty(),
         );
     }
 
     fn handle_node_delete(&mut self, expr: &'a Expr) {
-        let ExprKind::Name { id, .. } = &expr.node else {
+        let Expr::Name(ast::ExprName { id, .. } )= expr else {
             return;
         };
-        if helpers::on_conditional_branch(&mut self.ctx.parents.iter().rev().map(Into::into)) {
+        if helpers::on_conditional_branch(&mut self.semantic_model.parents()) {
             return;
         }
 
-        let scope = self.ctx.scope_mut();
-        if scope.remove(id.as_str()).is_some() {
-            return;
-        }
-        if !self.settings.rules.enabled(Rule::UndefinedName) {
-            return;
+        let scope = self.semantic_model.scope_mut();
+        if scope.delete(id.as_str()).is_none() {
+            if self.enabled(Rule::UndefinedName) {
+                self.diagnostics.push(Diagnostic::new(
+                    pyflakes::rules::UndefinedName {
+                        name: id.to_string(),
+                    },
+                    expr.range(),
+                ));
+            }
         }
-
-        self.diagnostics.push(Diagnostic::new(
-            pyflakes::rules::UndefinedName {
-                name: id.to_string(),
-            },
-            expr.range(),
-        ));
     }
 
-    fn visit_docstring(&mut self, python_ast: &'a Suite) -> bool {
-        if self.settings.rules.enabled(Rule::FStringDocstring) {
-            flake8_bugbear::rules::f_string_docstring(self, python_ast);
-        }
-        let docstring = docstrings::extraction::docstring_from(python_ast);
-        self.deferred.definitions.push((
-            Definition {
-                kind: if self.path.ends_with("__init__.py") {
-                    DefinitionKind::Package
-                } else {
-                    DefinitionKind::Module
-                },
-                docstring,
-            },
-            self.ctx.visible_scope.visibility,
-            (self.ctx.scope_id, self.ctx.parents.clone()),
-        ));
-        docstring.is_some()
-    }
+    fn check_deferred_future_type_definitions(&mut self) {
+        while !self.deferred.future_type_definitions.is_empty() {
+            let type_definitions = std::mem::take(&mut self.deferred.future_type_definitions);
+            for (expr, snapshot) in type_definitions {
+                self.semantic_model.restore(snapshot);
 
-    fn check_deferred_type_definitions(&mut self) {
-        while !self.deferred.type_definitions.is_empty() {
-            let type_definitions = std::mem::take(&mut self.deferred.type_definitions);
-            for (expr, (in_annotation, in_type_checking_block), (scope_id, parents)) in
-                type_definitions
-            {
-                self.ctx.scope_id = scope_id;
-                self.ctx.parents = parents;
-                self.ctx.in_annotation = in_annotation;
-                self.ctx.in_type_checking_block = in_type_checking_block;
-                self.ctx.in_type_definition = true;
-                self.ctx.in_deferred_type_definition = true;
+                self.semantic_model.flags |= SemanticModelFlags::TYPE_DEFINITION
+                    | SemanticModelFlags::FUTURE_TYPE_DEFINITION;
                 self.visit_expr(expr);
-                self.ctx.in_deferred_type_definition = false;
-                self.ctx.in_type_definition = false;
             }
         }
     }
@@ -4807,38 +4736,37 @@ impl<'a> Checker<'a> {
     fn check_deferred_string_type_definitions(&mut self, allocator: &'a typed_arena::Arena<Expr>) {
         while !self.deferred.string_type_definitions.is_empty() {
             let type_definitions = std::mem::take(&mut self.deferred.string_type_definitions);
-            for (range, value, (in_annotation, in_type_checking_block), (scope_id, parents)) in
-                type_definitions
-            {
+            for (range, value, snapshot) in type_definitions {
                 if let Ok((expr, kind)) = parse_type_annotation(value, range, self.locator) {
-                    if in_annotation && self.ctx.annotations_future_enabled {
-                        if self.settings.rules.enabled(Rule::QuotedAnnotation) {
+                    let expr = allocator.alloc(expr);
+
+                    self.semantic_model.restore(snapshot);
+
+                    if self.semantic_model.in_annotation()
+                        && self.semantic_model.future_annotations()
+                    {
+                        if self.enabled(Rule::QuotedAnnotation) {
                             pyupgrade::rules::quoted_annotation(self, value, range);
                         }
                     }
                     if self.is_stub {
-                        if self.settings.rules.enabled(Rule::QuotedAnnotationInStub) {
+                        if self.enabled(Rule::QuotedAnnotationInStub) {
                             flake8_pyi::rules::quoted_annotation_in_stub(self, value, range);
                         }
                     }
 
-                    let expr = allocator.alloc(expr);
+                    let type_definition_flag = match kind {
+                        AnnotationKind::Simple => SemanticModelFlags::SIMPLE_STRING_TYPE_DEFINITION,
+                        AnnotationKind::Complex => {
+                            SemanticModelFlags::COMPLEX_STRING_TYPE_DEFINITION
+                        }
+                    };
 
-                    self.ctx.scope_id = scope_id;
-                    self.ctx.parents = parents;
-                    self.ctx.in_annotation = in_annotation;
-                    self.ctx.in_type_checking_block = in_type_checking_block;
-                    self.ctx.in_type_definition = true;
-                    self.ctx.in_deferred_string_type_definition = Some(kind);
+                    self.semantic_model.flags |=
+                        SemanticModelFlags::TYPE_DEFINITION | type_definition_flag;
                     self.visit_expr(expr);
-                    self.ctx.in_deferred_string_type_definition = None;
-                    self.ctx.in_type_definition = false;
                 } else {
-                    if self
-                        .settings
-                        .rules
-                        .enabled(Rule::ForwardAnnotationSyntaxError)
-                    {
+                    if self.enabled(Rule::ForwardAnnotationSyntaxError) {
                         self.diagnostics.push(Diagnostic::new(
                             pyflakes::rules::ForwardAnnotationSyntaxError {
                                 body: value.to_string(),
@@ -4854,27 +4782,21 @@ impl<'a> Checker<'a> {
     fn check_deferred_functions(&mut self) {
         while !self.deferred.functions.is_empty() {
             let deferred_functions = std::mem::take(&mut self.deferred.functions);
-            for (stmt, (scope_id, parents), visibility) in deferred_functions {
-                let parents_snapshot = parents.len();
-                self.ctx.scope_id = scope_id;
-                self.ctx.parents = parents;
-                self.ctx.visible_scope = visibility;
-
-                match &stmt.node {
-                    StmtKind::FunctionDef { body, args, .. }
-                    | StmtKind::AsyncFunctionDef { body, args, .. } => {
+            for snapshot in deferred_functions {
+                self.semantic_model.restore(snapshot);
+
+                match &self.semantic_model.stmt() {
+                    Stmt::FunctionDef(ast::StmtFunctionDef { body, args, .. })
+                    | Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef { body, args, .. }) => {
                         self.visit_arguments(args);
                         self.visit_body(body);
                     }
                     _ => {
-                        unreachable!("Expected StmtKind::FunctionDef | StmtKind::AsyncFunctionDef")
+                        unreachable!("Expected Stmt::FunctionDef | Stmt::AsyncFunctionDef")
                     }
                 }
 
-                let mut parents = std::mem::take(&mut self.ctx.parents);
-                parents.truncate(parents_snapshot);
-
-                self.deferred.assignments.push((scope_id, parents));
+                self.deferred.assignments.push(snapshot);
             }
         }
     }
@@ -4882,22 +4804,22 @@ impl<'a> Checker<'a> {
     fn check_deferred_lambdas(&mut self) {
         while !self.deferred.lambdas.is_empty() {
             let lambdas = std::mem::take(&mut self.deferred.lambdas);
-            for (expr, (scope_id, parents)) in lambdas {
-                let parents_snapshot = parents.len();
+            for (expr, snapshot) in lambdas {
+                self.semantic_model.restore(snapshot);
 
-                self.ctx.scope_id = scope_id;
-                self.ctx.parents = parents;
-
-                if let ExprKind::Lambda { args, body } = &expr.node {
+                if let Expr::Lambda(ast::ExprLambda {
+                    args,
+                    body,
+                    range: _,
+                }) = expr
+                {
                     self.visit_arguments(args);
                     self.visit_expr(body);
                 } else {
-                    unreachable!("Expected ExprKind::Lambda");
+                    unreachable!("Expected Expr::Lambda");
                 }
 
-                let mut parents = std::mem::take(&mut self.ctx.parents);
-                parents.truncate(parents_snapshot);
-                self.deferred.assignments.push((scope_id, parents));
+                self.deferred.assignments.push(snapshot);
             }
         }
     }
@@ -4905,32 +4827,34 @@ impl<'a> Checker<'a> {
     fn check_deferred_assignments(&mut self) {
         while !self.deferred.assignments.is_empty() {
             let assignments = std::mem::take(&mut self.deferred.assignments);
-            for (scope_id, ..) in assignments {
+            for snapshot in assignments {
+                self.semantic_model.restore(snapshot);
+
                 // pyflakes
-                if self.settings.rules.enabled(Rule::UnusedVariable) {
-                    pyflakes::rules::unused_variable(self, scope_id);
+                if self.enabled(Rule::UnusedVariable) {
+                    pyflakes::rules::unused_variable(self, self.semantic_model.scope_id);
                 }
-                if self.settings.rules.enabled(Rule::UnusedAnnotation) {
-                    pyflakes::rules::unused_annotation(self, scope_id);
+                if self.enabled(Rule::UnusedAnnotation) {
+                    pyflakes::rules::unused_annotation(self, self.semantic_model.scope_id);
                 }
 
                 if !self.is_stub {
                     // flake8-unused-arguments
-                    if self.settings.rules.any_enabled(&[
+                    if self.any_enabled(&[
                         Rule::UnusedFunctionArgument,
                         Rule::UnusedMethodArgument,
                         Rule::UnusedClassMethodArgument,
                         Rule::UnusedStaticMethodArgument,
                         Rule::UnusedLambdaArgument,
                     ]) {
-                        let scope = &self.ctx.scopes[scope_id];
-                        let parent = &self.ctx.scopes[scope.parent.unwrap()];
+                        let scope = &self.semantic_model.scopes[self.semantic_model.scope_id];
+                        let parent = &self.semantic_model.scopes[scope.parent.unwrap()];
                         self.diagnostics
                             .extend(flake8_unused_arguments::rules::unused_arguments(
                                 self,
                                 parent,
                                 scope,
-                                &self.ctx.bindings,
+                                &self.semantic_model.bindings,
                             ));
                     }
                 }
@@ -4942,20 +4866,18 @@ impl<'a> Checker<'a> {
         while !self.deferred.for_loops.is_empty() {
             let for_loops = std::mem::take(&mut self.deferred.for_loops);
 
-            for (stmt, (scope_id, parents)) in for_loops {
-                self.ctx.scope_id = scope_id;
-                self.ctx.parents = parents;
+            for snapshot in for_loops {
+                self.semantic_model.restore(snapshot);
 
-                if let StmtKind::For { target, body, .. }
-                | StmtKind::AsyncFor { target, body, .. } = &stmt.node
+                if let Stmt::For(ast::StmtFor { target, body, .. })
+                | Stmt::AsyncFor(ast::StmtAsyncFor { target, body, .. }) =
+                    &self.semantic_model.stmt()
                 {
-                    if self.settings.rules.enabled(Rule::UnusedLoopControlVariable) {
-                        flake8_bugbear::rules::unused_loop_control_variable(
-                            self, stmt, target, body,
-                        );
+                    if self.enabled(Rule::UnusedLoopControlVariable) {
+                        flake8_bugbear::rules::unused_loop_control_variable(self, target, body);
                     }
                 } else {
-                    unreachable!("Expected ExprKind::For | ExprKind::AsyncFor");
+                    unreachable!("Expected Expr::For | Expr::AsyncFor");
                 }
             }
         }
@@ -4963,7 +4885,7 @@ impl<'a> Checker<'a> {
 
     fn check_dead_scopes(&mut self) {
         let enforce_typing_imports = !self.is_stub
-            && self.settings.rules.any_enabled(&[
+            && self.any_enabled(&[
                 Rule::GlobalVariableNotAssigned,
                 Rule::RuntimeImportInTypeCheckingBlock,
                 Rule::TypingOnlyFirstPartyImport,
@@ -4972,7 +4894,7 @@ impl<'a> Checker<'a> {
             ]);
 
         if !(enforce_typing_imports
-            || self.settings.rules.any_enabled(&[
+            || self.any_enabled(&[
                 Rule::UnusedImport,
                 Rule::UndefinedLocalWithImportStarUsage,
                 Rule::RedefinedWhileUnused,
@@ -4983,48 +4905,31 @@ impl<'a> Checker<'a> {
         }
 
         // Mark anything referenced in `__all__` as used.
-        let all_bindings: Option<(Vec<BindingId>, TextRange)> = {
-            let global_scope = self.ctx.global_scope();
-            let all_names: Option<(&Vec<&str>, TextRange)> = global_scope
-                .get("__all__")
-                .map(|index| &self.ctx.bindings[*index])
-                .and_then(|binding| match &binding.kind {
-                    BindingKind::Export(Export { names }) => Some((names, binding.range)),
+        let exports: Vec<(&str, TextRange)> = {
+            let global_scope = self.semantic_model.global_scope();
+            global_scope
+                .bindings_for_name("__all__")
+                .map(|binding_id| &self.semantic_model.bindings[binding_id])
+                .filter_map(|binding| match &binding.kind {
+                    BindingKind::Export(Export { names }) => {
+                        Some(names.iter().map(|name| (*name, binding.range)))
+                    }
                     _ => None,
-                });
-
-            all_names.map(|(names, range)| {
-                (
-                    names
-                        .iter()
-                        .filter_map(|name| global_scope.get(name).copied())
-                        .collect(),
-                    range,
-                )
-            })
+                })
+                .flatten()
+                .collect()
         };
 
-        if let Some((bindings, range)) = all_bindings {
-            for index in bindings {
-                self.ctx.bindings[index].mark_used(
-                    ScopeId::global(),
-                    range,
+        for (name, range) in &exports {
+            if let Some(binding_id) = self.semantic_model.global_scope().get(name) {
+                self.semantic_model.add_global_reference(
+                    binding_id,
+                    *range,
                     ExecutionContext::Runtime,
                 );
             }
         }
 
-        // Extract `__all__` names from the global scope.
-        let all_names: Option<(&[&str], TextRange)> = 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)),
-                _ => None,
-            });
-
         // Identify any valid runtime imports. If a module is imported at runtime, and
         // used at runtime, then by default, we avoid flagging any other
         // imports from that model as typing-only.
@@ -5032,15 +4937,18 @@ impl<'a> Checker<'a> {
             if self.settings.flake8_type_checking.strict {
                 vec![]
             } else {
-                self.ctx
+                self.semantic_model
                     .scopes
                     .iter()
                     .map(|scope| {
                         scope
                             .binding_ids()
-                            .map(|index| &self.ctx.bindings[*index])
+                            .map(|binding_id| &self.semantic_model.bindings[binding_id])
                             .filter(|binding| {
-                                flake8_type_checking::helpers::is_valid_runtime_import(binding)
+                                flake8_type_checking::helpers::is_valid_runtime_import(
+                                    &self.semantic_model,
+                                    binding,
+                                )
                             })
                             .collect()
                     })
@@ -5051,46 +4959,40 @@ impl<'a> Checker<'a> {
         };
 
         let mut diagnostics: Vec<Diagnostic> = vec![];
-        for scope_id in self.ctx.dead_scopes.iter().rev() {
-            let scope = &self.ctx.scopes[*scope_id];
+        for scope_id in self.semantic_model.dead_scopes.iter().rev() {
+            let scope = &self.semantic_model.scopes[*scope_id];
 
             if scope.kind.is_module() {
                 // F822
-                if self.settings.rules.enabled(Rule::UndefinedExport) {
+                if self.enabled(Rule::UndefinedExport) {
                     if !self.path.ends_with("__init__.py") {
-                        if let Some((names, range)) = all_names {
+                        for (name, range) in &exports {
                             diagnostics
-                                .extend(pyflakes::rules::undefined_export(names, range, scope));
+                                .extend(pyflakes::rules::undefined_export(name, *range, scope));
                         }
                     }
                 }
 
                 // F405
-                if self
-                    .settings
-                    .rules
-                    .enabled(Rule::UndefinedLocalWithImportStarUsage)
-                {
-                    if let Some((names, range)) = &all_names {
-                        let sources: Vec<String> = scope
-                            .star_imports()
-                            .map(|StarImportation { level, module }| {
-                                helpers::format_import_from(*level, *module)
-                            })
-                            .sorted()
-                            .dedup()
-                            .collect();
-                        if !sources.is_empty() {
-                            for &name in names.iter() {
-                                if !scope.defines(name) {
-                                    diagnostics.push(Diagnostic::new(
-                                        pyflakes::rules::UndefinedLocalWithImportStarUsage {
-                                            name: name.to_string(),
-                                            sources: sources.clone(),
-                                        },
-                                        *range,
-                                    ));
-                                }
+                if self.enabled(Rule::UndefinedLocalWithImportStarUsage) {
+                    let sources: Vec<String> = scope
+                        .star_imports()
+                        .map(|StarImportation { level, module }| {
+                            helpers::format_import_from(*level, *module)
+                        })
+                        .sorted()
+                        .dedup()
+                        .collect();
+                    if !sources.is_empty() {
+                        for (name, range) in &exports {
+                            if !scope.has(name) {
+                                diagnostics.push(Diagnostic::new(
+                                    pyflakes::rules::UndefinedLocalWithImportStarUsage {
+                                        name: (*name).to_string(),
+                                        sources: sources.clone(),
+                                    },
+                                    *range,
+                                ));
                             }
                         }
                     }
@@ -5098,12 +5000,13 @@ impl<'a> Checker<'a> {
             }
 
             // PLW0602
-            if self.settings.rules.enabled(Rule::GlobalVariableNotAssigned) {
-                for (name, index) in scope.bindings() {
-                    let binding = &self.ctx.bindings[*index];
+            if self.enabled(Rule::GlobalVariableNotAssigned) {
+                for (name, binding_id) in scope.bindings() {
+                    let binding = &self.semantic_model.bindings[binding_id];
                     if binding.kind.is_global() {
-                        if let Some(stmt) = &binding.source {
-                            if matches!(stmt.node, StmtKind::Global { .. }) {
+                        if let Some(source) = binding.source {
+                            let stmt = &self.semantic_model.stmts[source];
+                            if stmt.is_global_stmt() {
                                 diagnostics.push(Diagnostic::new(
                                     pylint::rules::GlobalVariableNotAssigned {
                                         name: (*name).to_string(),
@@ -5117,61 +5020,40 @@ impl<'a> Checker<'a> {
             }
 
             // Imports in classes are public members.
-            if matches!(scope.kind, ScopeKind::Class(..)) {
+            if scope.kind.is_class() {
                 continue;
             }
 
             // Look for any bindings that were redefined in another scope, and remain
-            // unused. Note that we only store references in `redefinitions` if
+            // unused. Note that we only store references in `shadowed_bindings` if
             // the bindings are in different scopes.
-            if self.settings.rules.enabled(Rule::RedefinedWhileUnused) {
-                for (name, index) in scope.bindings() {
-                    let binding = &self.ctx.bindings[*index];
-
-                    if matches!(
-                        binding.kind,
-                        BindingKind::Importation(..)
-                            | BindingKind::FromImportation(..)
-                            | BindingKind::SubmoduleImportation(..)
-                            | BindingKind::FutureImportation
-                    ) {
-                        if binding.used() {
+            if self.enabled(Rule::RedefinedWhileUnused) {
+                for (name, binding_id) in scope.bindings() {
+                    if let Some(shadowed) = self.semantic_model.shadowed_binding(binding_id) {
+                        if shadowed.is_used() {
                             continue;
                         }
 
-                        if let Some(indices) = self.ctx.shadowed_bindings.get(index) {
-                            for index in indices {
-                                let rebound = &self.ctx.bindings[*index];
-                                #[allow(deprecated)]
-                                let line = self.locator.compute_line_index(binding.range.start());
+                        let binding = &self.semantic_model.bindings[binding_id];
 
-                                let mut diagnostic = Diagnostic::new(
-                                    pyflakes::rules::RedefinedWhileUnused {
-                                        name: (*name).to_string(),
-                                        line,
-                                    },
-                                    matches!(
-                                        rebound.kind,
-                                        BindingKind::ClassDefinition
-                                            | BindingKind::FunctionDefinition
-                                    )
-                                    .then(|| {
-                                        rebound.source.as_ref().map_or(rebound.range, |source| {
-                                            helpers::identifier_range(source, self.locator)
-                                        })
-                                    })
-                                    .unwrap_or(rebound.range),
-                                );
-                                if let Some(parent) = &rebound.source {
-                                    if matches!(parent.node, StmtKind::ImportFrom { .. })
-                                        && parent.range().contains_range(rebound.range)
-                                    {
-                                        diagnostic.set_parent(parent.start());
-                                    }
-                                };
-                                diagnostics.push(diagnostic);
-                            }
+                        #[allow(deprecated)]
+                        let line = self.locator.compute_line_index(
+                            shadowed
+                                .trimmed_range(&self.semantic_model, self.locator)
+                                .start(),
+                        );
+
+                        let mut diagnostic = Diagnostic::new(
+                            pyflakes::rules::RedefinedWhileUnused {
+                                name: (*name).to_string(),
+                                line,
+                            },
+                            binding.trimmed_range(&self.semantic_model, self.locator),
+                        );
+                        if let Some(range) = binding.parent_range(&self.semantic_model) {
+                            diagnostic.set_parent(range.start());
                         }
+                        diagnostics.push(diagnostic);
                     }
                 }
             }
@@ -5180,198 +5062,42 @@ impl<'a> Checker<'a> {
                 let runtime_imports: Vec<&Binding> = if self.settings.flake8_type_checking.strict {
                     vec![]
                 } else {
-                    self.ctx
+                    self.semantic_model
                         .scopes
                         .ancestor_ids(*scope_id)
-                        .flat_map(|scope_id| runtime_imports[usize::from(scope_id)].iter())
+                        .flat_map(|scope_id| runtime_imports[scope_id.as_usize()].iter())
                         .copied()
                         .collect()
                 };
-                for index in scope.binding_ids() {
-                    let binding = &self.ctx.bindings[*index];
 
-                    if let Some(diagnostic) =
-                        flake8_type_checking::rules::runtime_import_in_type_checking_block(binding)
-                    {
-                        if self.settings.rules.enabled(diagnostic.kind.rule()) {
-                            diagnostics.push(diagnostic);
-                        }
-                    }
-                    if let Some(diagnostic) =
-                        flake8_type_checking::rules::typing_only_runtime_import(
-                            binding,
-                            &runtime_imports,
-                            self.package,
-                            self.settings,
-                        )
-                    {
-                        if self.settings.rules.enabled(diagnostic.kind.rule()) {
-                            diagnostics.push(diagnostic);
-                        }
-                    }
-                }
-            }
-
-            if self.settings.rules.enabled(Rule::UnusedImport) {
-                // Collect all unused imports by location. (Multiple unused imports at the same
-                // location indicates an `import from`.)
-                type UnusedImport<'a> = (&'a str, &'a TextRange);
-                type BindingContext<'a, 'b> = (
-                    &'a RefEquality<'b, Stmt>,
-                    Option<&'a RefEquality<'b, Stmt>>,
-                    Exceptions,
+                flake8_type_checking::rules::runtime_import_in_type_checking_block(
+                    self,
+                    scope,
+                    &mut diagnostics,
                 );
 
-                let mut unused: FxHashMap<BindingContext, Vec<UnusedImport>> = FxHashMap::default();
-                let mut ignored: FxHashMap<BindingContext, Vec<UnusedImport>> =
-                    FxHashMap::default();
-
-                for index in scope.binding_ids() {
-                    let binding = &self.ctx.bindings[*index];
-
-                    let full_name = match &binding.kind {
-                        BindingKind::Importation(Importation { full_name, .. }) => full_name,
-                        BindingKind::FromImportation(FromImportation { full_name, .. }) => {
-                            full_name.as_str()
-                        }
-                        BindingKind::SubmoduleImportation(SubmoduleImportation {
-                            full_name,
-                            ..
-                        }) => full_name,
-                        _ => continue,
-                    };
-
-                    if binding.used() {
-                        continue;
-                    }
-
-                    let defined_by = binding.source.as_ref().unwrap();
-                    let defined_in = self.ctx.child_to_parent.get(defined_by);
-                    let exceptions = binding.exceptions;
-                    let child: &Stmt = defined_by.into();
-
-                    let diagnostic_offset = binding.range.start();
-                    let parent_offset = if matches!(child.node, StmtKind::ImportFrom { .. }) {
-                        Some(child.start())
-                    } else {
-                        None
-                    };
-
-                    if self.rule_is_ignored(Rule::UnusedImport, diagnostic_offset)
-                        || parent_offset.map_or(false, |parent_offset| {
-                            self.rule_is_ignored(Rule::UnusedImport, parent_offset)
-                        })
-                    {
-                        ignored
-                            .entry((defined_by, defined_in, exceptions))
-                            .or_default()
-                            .push((full_name, &binding.range));
-                    } else {
-                        unused
-                            .entry((defined_by, defined_in, exceptions))
-                            .or_default()
-                            .push((full_name, &binding.range));
-                    }
-                }
-
-                let in_init =
-                    self.settings.ignore_init_module_imports && self.path.ends_with("__init__.py");
-                for ((defined_by, defined_in, exceptions), unused_imports) in unused
-                    .into_iter()
-                    .sorted_by_key(|((defined_by, ..), ..)| defined_by.start())
-                {
-                    let child: &Stmt = defined_by.into();
-                    let parent: Option<&Stmt> = defined_in.map(Into::into);
-                    let multiple = unused_imports.len() > 1;
-                    let in_except_handler = exceptions
-                        .intersects(Exceptions::MODULE_NOT_FOUND_ERROR | Exceptions::IMPORT_ERROR);
-
-                    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(
-                            unused_imports.iter().map(|(full_name, _)| *full_name),
-                            child,
-                            parent,
-                            &deleted,
-                            self.locator,
-                            self.indexer,
-                            self.stylist,
-                        ) {
-                            Ok(fix) => {
-                                if fix.is_deletion() || fix.content() == Some("pass") {
-                                    self.deletions.insert(*defined_by);
-                                }
-                                Some(fix)
-                            }
-                            Err(e) => {
-                                error!("Failed to remove unused imports: {e}");
-                                None
-                            }
-                        }
-                    } else {
-                        None
-                    };
+                flake8_type_checking::rules::typing_only_runtime_import(
+                    self,
+                    scope,
+                    &runtime_imports,
+                    &mut diagnostics,
+                );
+            }
 
-                    for (full_name, range) in unused_imports {
-                        let mut diagnostic = Diagnostic::new(
-                            pyflakes::rules::UnusedImport {
-                                name: full_name.to_string(),
-                                context: if in_except_handler {
-                                    Some(pyflakes::rules::UnusedImportContext::ExceptHandler)
-                                } else if in_init {
-                                    Some(pyflakes::rules::UnusedImportContext::Init)
-                                } else {
-                                    None
-                                },
-                                multiple,
-                            },
-                            *range,
-                        );
-                        if matches!(child.node, StmtKind::ImportFrom { .. }) {
-                            diagnostic.set_parent(child.start());
-                        }
-                        if let Some(fix) = &fix {
-                            diagnostic.set_fix(fix.clone());
-                        }
-                        diagnostics.push(diagnostic);
-                    }
-                }
-                for ((defined_by, .., exceptions), unused_imports) in ignored
-                    .into_iter()
-                    .sorted_by_key(|((defined_by, ..), ..)| defined_by.start())
-                {
-                    let child: &Stmt = defined_by.into();
-                    let multiple = unused_imports.len() > 1;
-                    let in_except_handler = exceptions
-                        .intersects(Exceptions::MODULE_NOT_FOUND_ERROR | Exceptions::IMPORT_ERROR);
-                    for (full_name, range) in unused_imports {
-                        let mut diagnostic = Diagnostic::new(
-                            pyflakes::rules::UnusedImport {
-                                name: full_name.to_string(),
-                                context: if in_except_handler {
-                                    Some(pyflakes::rules::UnusedImportContext::ExceptHandler)
-                                } else if in_init {
-                                    Some(pyflakes::rules::UnusedImportContext::Init)
-                                } else {
-                                    None
-                                },
-                                multiple,
-                            },
-                            *range,
-                        );
-                        if matches!(child.node, StmtKind::ImportFrom { .. }) {
-                            diagnostic.set_parent(child.start());
-                        }
-                        diagnostics.push(diagnostic);
-                    }
-                }
+            if self.enabled(Rule::UnusedImport) {
+                pyflakes::rules::unused_import(self, scope, &mut diagnostics);
             }
         }
         self.diagnostics.extend(diagnostics);
     }
 
+    /// Visit all the [`Definition`] nodes in the AST.
+    ///
+    /// This phase is expected to run after the AST has been traversed in its entirety; as such,
+    /// it is expected that all [`Definition`] nodes have been visited by the time, and that this
+    /// method will not recurse into any other nodes.
     fn check_definitions(&mut self) {
-        let enforce_annotations = self.settings.rules.any_enabled(&[
+        let enforce_annotations = self.any_enabled(&[
             Rule::MissingTypeFunctionArgument,
             Rule::MissingTypeArgs,
             Rule::MissingTypeKwargs,
@@ -5384,7 +5110,9 @@ impl<'a> Checker<'a> {
             Rule::MissingReturnTypeClassMethod,
             Rule::AnyType,
         ]);
-        let enforce_docstrings = self.settings.rules.any_enabled(&[
+        let enforce_stubs = self.is_stub
+            && self.any_enabled(&[Rule::DocstringInStub, Rule::IterMethodReturnIterable]);
+        let enforce_docstrings = self.any_enabled(&[
             Rule::UndocumentedPublicModule,
             Rule::UndocumentedPublicClass,
             Rule::UndocumentedPublicMethod,
@@ -5433,252 +5161,246 @@ impl<'a> Checker<'a> {
             Rule::EmptyDocstring,
         ]);
 
+        if !enforce_annotations && !enforce_docstrings && !enforce_stubs {
+            return;
+        }
+
+        // Compute visibility of all definitions.
+        let global_scope = self.semantic_model.global_scope();
+        let exports: Option<&[&str]> = global_scope
+            .get("__all__")
+            .map(|binding_id| &self.semantic_model.bindings[binding_id])
+            .and_then(|binding| match &binding.kind {
+                BindingKind::Export(Export { names }) => Some(names.as_slice()),
+                _ => None,
+            });
+        let definitions = std::mem::take(&mut self.semantic_model.definitions);
+
         let mut overloaded_name: Option<String> = None;
-        while !self.deferred.definitions.is_empty() {
-            let definitions = std::mem::take(&mut self.deferred.definitions);
-            for (definition, visibility, (scope_id, parents)) in definitions {
-                self.ctx.scope_id = scope_id;
-                self.ctx.parents = parents;
-
-                // flake8-annotations
-                if enforce_annotations {
-                    // TODO(charlie): This should be even stricter, in that an overload
-                    // implementation should come immediately after the overloaded
-                    // interfaces, without any AST nodes in between. Right now, we
-                    // only error when traversing definition boundaries (functions,
-                    // classes, etc.).
-                    if !overloaded_name.map_or(false, |overloaded_name| {
-                        flake8_annotations::helpers::is_overload_impl(
+        for ContextualizedDefinition {
+            definition,
+            visibility,
+        } in definitions.resolve(exports).iter()
+        {
+            let docstring = docstrings::extraction::extract_docstring(definition);
+
+            // flake8-annotations
+            if enforce_annotations {
+                // TODO(charlie): This should be even stricter, in that an overload
+                // implementation should come immediately after the overloaded
+                // interfaces, without any AST nodes in between. Right now, we
+                // only error when traversing definition boundaries (functions,
+                // classes, etc.).
+                if !overloaded_name.map_or(false, |overloaded_name| {
+                    flake8_annotations::helpers::is_overload_impl(
+                        &self.semantic_model,
+                        definition,
+                        &overloaded_name,
+                    )
+                }) {
+                    self.diagnostics
+                        .extend(flake8_annotations::rules::definition(
                             self,
-                            &definition,
-                            &overloaded_name,
-                        )
-                    }) {
-                        self.diagnostics
-                            .extend(flake8_annotations::rules::definition(
-                                self,
-                                &definition,
-                                visibility,
-                            ));
-                    }
-                    overloaded_name =
-                        flake8_annotations::helpers::overloaded_name(self, &definition);
+                            definition,
+                            *visibility,
+                        ));
                 }
+                overloaded_name =
+                    flake8_annotations::helpers::overloaded_name(&self.semantic_model, definition);
+            }
 
+            // flake8-pyi
+            if enforce_stubs {
                 if self.is_stub {
-                    if self.settings.rules.enabled(Rule::DocstringInStub) {
-                        flake8_pyi::rules::docstring_in_stubs(self, definition.docstring);
+                    if self.enabled(Rule::DocstringInStub) {
+                        flake8_pyi::rules::docstring_in_stubs(self, docstring);
                     }
-                }
-
-                // pydocstyle
-                if enforce_docstrings {
-                    if pydocstyle::helpers::should_ignore_definition(
-                        self,
-                        &definition,
-                        &self.settings.pydocstyle.ignore_decorators,
-                    ) {
-                        continue;
+                    if self.enabled(Rule::IterMethodReturnIterable) {
+                        flake8_pyi::rules::iter_method_return_iterable(self, definition);
                     }
+                }
+            }
 
-                    if definition.docstring.is_none() {
-                        pydocstyle::rules::not_missing(self, &definition, visibility);
-                        continue;
-                    }
+            // pydocstyle
+            if enforce_docstrings {
+                if pydocstyle::helpers::should_ignore_definition(
+                    &self.semantic_model,
+                    definition,
+                    &self.settings.pydocstyle.ignore_decorators,
+                ) {
+                    continue;
+                }
 
-                    // Extract a `Docstring` from a `Definition`.
-                    let expr = definition.docstring.unwrap();
-                    let contents = self.locator.slice(expr.range());
+                // Extract a `Docstring` from a `Definition`.
+                let Some(expr) = docstring else {
+                    pydocstyle::rules::not_missing(self, definition, *visibility);
+                    continue;
+                };
 
-                    let indentation = self.locator.slice(TextRange::new(
-                        self.locator.line_start(expr.start()),
-                        expr.start(),
-                    ));
+                let contents = self.locator.slice(expr.range());
 
-                    if pydocstyle::helpers::should_ignore_docstring(contents) {
-                        #[allow(deprecated)]
-                        let location = self.locator.compute_source_location(expr.start());
-                        warn_user!(
-                            "Docstring at {}:{}:{} contains implicit string concatenation; ignoring...",
-                            relativize_path(self.path),
-                            location.row,
-                            location.column
-                        );
-                        continue;
-                    }
+                let indentation = self.locator.slice(TextRange::new(
+                    self.locator.line_start(expr.start()),
+                    expr.start(),
+                ));
 
-                    // SAFETY: Safe for docstrings that pass `should_ignore_docstring`.
-                    let body_range = str::raw_contents_range(contents).unwrap();
-                    let docstring = Docstring {
-                        kind: definition.kind,
-                        expr,
-                        contents,
-                        indentation,
-                        body_range,
-                    };
+                if pydocstyle::helpers::should_ignore_docstring(contents) {
+                    #[allow(deprecated)]
+                    let location = self.locator.compute_source_location(expr.start());
+                    warn_user!(
+                        "Docstring at {}:{}:{} contains implicit string concatenation; ignoring...",
+                        relativize_path(self.path),
+                        location.row,
+                        location.column
+                    );
+                    continue;
+                }
 
-                    if !pydocstyle::rules::not_empty(self, &docstring) {
-                        continue;
-                    }
+                // SAFETY: Safe for docstrings that pass `should_ignore_docstring`.
+                let body_range = str::raw_contents_range(contents).unwrap();
+                let docstring = Docstring {
+                    definition,
+                    expr,
+                    contents,
+                    body_range,
+                    indentation,
+                };
 
-                    if self.settings.rules.enabled(Rule::FitsOnOneLine) {
-                        pydocstyle::rules::one_liner(self, &docstring);
-                    }
-                    if self.settings.rules.any_enabled(&[
-                        Rule::NoBlankLineBeforeFunction,
-                        Rule::NoBlankLineAfterFunction,
-                    ]) {
-                        pydocstyle::rules::blank_before_after_function(self, &docstring);
-                    }
-                    if self.settings.rules.any_enabled(&[
-                        Rule::OneBlankLineBeforeClass,
-                        Rule::OneBlankLineAfterClass,
-                        Rule::BlankLineBeforeClass,
-                    ]) {
-                        pydocstyle::rules::blank_before_after_class(self, &docstring);
-                    }
-                    if self.settings.rules.enabled(Rule::BlankLineAfterSummary) {
-                        pydocstyle::rules::blank_after_summary(self, &docstring);
-                    }
-                    if self.settings.rules.any_enabled(&[
-                        Rule::IndentWithSpaces,
-                        Rule::UnderIndentation,
-                        Rule::OverIndentation,
-                    ]) {
-                        pydocstyle::rules::indent(self, &docstring);
-                    }
-                    if self.settings.rules.enabled(Rule::NewLineAfterLastParagraph) {
-                        pydocstyle::rules::newline_after_last_paragraph(self, &docstring);
-                    }
-                    if self.settings.rules.enabled(Rule::SurroundingWhitespace) {
-                        pydocstyle::rules::no_surrounding_whitespace(self, &docstring);
-                    }
-                    if self.settings.rules.any_enabled(&[
-                        Rule::MultiLineSummaryFirstLine,
-                        Rule::MultiLineSummarySecondLine,
-                    ]) {
-                        pydocstyle::rules::multi_line_summary_start(self, &docstring);
-                    }
-                    if self.settings.rules.enabled(Rule::TripleSingleQuotes) {
-                        pydocstyle::rules::triple_quotes(self, &docstring);
-                    }
-                    if self.settings.rules.enabled(Rule::EscapeSequenceInDocstring) {
-                        pydocstyle::rules::backslashes(self, &docstring);
-                    }
-                    if self.settings.rules.enabled(Rule::EndsInPeriod) {
-                        pydocstyle::rules::ends_with_period(self, &docstring);
-                    }
-                    if self.settings.rules.enabled(Rule::NonImperativeMood) {
-                        pydocstyle::rules::non_imperative_mood(
-                            self,
-                            &docstring,
-                            &self.settings.pydocstyle.property_decorators,
-                        );
-                    }
-                    if self.settings.rules.enabled(Rule::NoSignature) {
-                        pydocstyle::rules::no_signature(self, &docstring);
-                    }
-                    if self.settings.rules.enabled(Rule::FirstLineCapitalized) {
-                        pydocstyle::rules::capitalized(self, &docstring);
-                    }
-                    if self.settings.rules.enabled(Rule::DocstringStartsWithThis) {
-                        pydocstyle::rules::starts_with_this(self, &docstring);
-                    }
-                    if self.settings.rules.enabled(Rule::EndsInPunctuation) {
-                        pydocstyle::rules::ends_with_punctuation(self, &docstring);
-                    }
-                    if self.settings.rules.enabled(Rule::OverloadWithDocstring) {
-                        pydocstyle::rules::if_needed(self, &docstring);
-                    }
-                    if self.settings.rules.any_enabled(&[
-                        Rule::MultiLineSummaryFirstLine,
-                        Rule::SectionNotOverIndented,
-                        Rule::SectionUnderlineNotOverIndented,
-                        Rule::CapitalizeSectionName,
-                        Rule::NewLineAfterSectionName,
-                        Rule::DashedUnderlineAfterSection,
-                        Rule::SectionUnderlineAfterName,
-                        Rule::SectionUnderlineMatchesSectionLength,
-                        Rule::NoBlankLineAfterSection,
-                        Rule::NoBlankLineBeforeSection,
-                        Rule::BlankLinesBetweenHeaderAndContent,
-                        Rule::BlankLineAfterLastSection,
-                        Rule::EmptyDocstringSection,
-                        Rule::SectionNameEndsInColon,
-                        Rule::UndocumentedParam,
-                    ]) {
-                        pydocstyle::rules::sections(
-                            self,
-                            &docstring,
-                            self.settings.pydocstyle.convention.as_ref(),
-                        );
-                    }
+                if !pydocstyle::rules::not_empty(self, &docstring) {
+                    continue;
                 }
-            }
-        }
-    }
 
-    fn check_builtin_shadowing<T>(&mut self, name: &str, located: &Located<T>, is_attribute: bool) {
-        if is_attribute && matches!(self.ctx.scope().kind, ScopeKind::Class(_)) {
-            if self.settings.rules.enabled(Rule::BuiltinAttributeShadowing) {
-                if let Some(diagnostic) = flake8_builtins::rules::builtin_shadowing(
-                    name,
-                    located,
-                    flake8_builtins::types::ShadowingType::Attribute,
-                    &self.settings.flake8_builtins.builtins_ignorelist,
-                ) {
-                    self.diagnostics.push(diagnostic);
+                if self.enabled(Rule::FitsOnOneLine) {
+                    pydocstyle::rules::one_liner(self, &docstring);
                 }
-            }
-        } else {
-            if self.settings.rules.enabled(Rule::BuiltinVariableShadowing) {
-                if let Some(diagnostic) = flake8_builtins::rules::builtin_shadowing(
-                    name,
-                    located,
-                    flake8_builtins::types::ShadowingType::Variable,
-                    &self.settings.flake8_builtins.builtins_ignorelist,
-                ) {
-                    self.diagnostics.push(diagnostic);
+                if self.any_enabled(&[
+                    Rule::NoBlankLineBeforeFunction,
+                    Rule::NoBlankLineAfterFunction,
+                ]) {
+                    pydocstyle::rules::blank_before_after_function(self, &docstring);
+                }
+                if self.any_enabled(&[
+                    Rule::OneBlankLineBeforeClass,
+                    Rule::OneBlankLineAfterClass,
+                    Rule::BlankLineBeforeClass,
+                ]) {
+                    pydocstyle::rules::blank_before_after_class(self, &docstring);
+                }
+                if self.enabled(Rule::BlankLineAfterSummary) {
+                    pydocstyle::rules::blank_after_summary(self, &docstring);
+                }
+                if self.any_enabled(&[
+                    Rule::IndentWithSpaces,
+                    Rule::UnderIndentation,
+                    Rule::OverIndentation,
+                ]) {
+                    pydocstyle::rules::indent(self, &docstring);
+                }
+                if self.enabled(Rule::NewLineAfterLastParagraph) {
+                    pydocstyle::rules::newline_after_last_paragraph(self, &docstring);
+                }
+                if self.enabled(Rule::SurroundingWhitespace) {
+                    pydocstyle::rules::no_surrounding_whitespace(self, &docstring);
+                }
+                if self.any_enabled(&[
+                    Rule::MultiLineSummaryFirstLine,
+                    Rule::MultiLineSummarySecondLine,
+                ]) {
+                    pydocstyle::rules::multi_line_summary_start(self, &docstring);
+                }
+                if self.enabled(Rule::TripleSingleQuotes) {
+                    pydocstyle::rules::triple_quotes(self, &docstring);
+                }
+                if self.enabled(Rule::EscapeSequenceInDocstring) {
+                    pydocstyle::rules::backslashes(self, &docstring);
+                }
+                if self.enabled(Rule::EndsInPeriod) {
+                    pydocstyle::rules::ends_with_period(self, &docstring);
+                }
+                if self.enabled(Rule::NonImperativeMood) {
+                    pydocstyle::rules::non_imperative_mood(
+                        self,
+                        &docstring,
+                        &self.settings.pydocstyle.property_decorators,
+                    );
+                }
+                if self.enabled(Rule::NoSignature) {
+                    pydocstyle::rules::no_signature(self, &docstring);
+                }
+                if self.enabled(Rule::FirstLineCapitalized) {
+                    pydocstyle::rules::capitalized(self, &docstring);
+                }
+                if self.enabled(Rule::DocstringStartsWithThis) {
+                    pydocstyle::rules::starts_with_this(self, &docstring);
+                }
+                if self.enabled(Rule::EndsInPunctuation) {
+                    pydocstyle::rules::ends_with_punctuation(self, &docstring);
+                }
+                if self.enabled(Rule::OverloadWithDocstring) {
+                    pydocstyle::rules::if_needed(self, &docstring);
+                }
+                if self.any_enabled(&[
+                    Rule::MultiLineSummaryFirstLine,
+                    Rule::SectionNotOverIndented,
+                    Rule::SectionUnderlineNotOverIndented,
+                    Rule::CapitalizeSectionName,
+                    Rule::NewLineAfterSectionName,
+                    Rule::DashedUnderlineAfterSection,
+                    Rule::SectionUnderlineAfterName,
+                    Rule::SectionUnderlineMatchesSectionLength,
+                    Rule::NoBlankLineAfterSection,
+                    Rule::NoBlankLineBeforeSection,
+                    Rule::BlankLinesBetweenHeaderAndContent,
+                    Rule::BlankLineAfterLastSection,
+                    Rule::EmptyDocstringSection,
+                    Rule::SectionNameEndsInColon,
+                    Rule::UndocumentedParam,
+                ]) {
+                    pydocstyle::rules::sections(
+                        self,
+                        &docstring,
+                        self.settings.pydocstyle.convention.as_ref(),
+                    );
                 }
-            }
-        }
-    }
-
-    fn check_builtin_arg_shadowing(&mut self, name: &str, arg: &Arg) {
-        if self.settings.rules.enabled(Rule::BuiltinArgumentShadowing) {
-            if let Some(diagnostic) = flake8_builtins::rules::builtin_shadowing(
-                name,
-                arg,
-                flake8_builtins::types::ShadowingType::Argument,
-                &self.settings.flake8_builtins.builtins_ignorelist,
-            ) {
-                self.diagnostics.push(diagnostic);
             }
         }
     }
 }
 
 #[allow(clippy::too_many_arguments)]
-pub fn check_ast(
+pub(crate) fn check_ast(
     python_ast: &Suite,
     locator: &Locator,
     stylist: &Stylist,
     indexer: &Indexer,
     noqa_line_for: &NoqaMapping,
     settings: &Settings,
-    autofix: flags::Autofix,
     noqa: flags::Noqa,
     path: &Path,
     package: Option<&Path>,
 ) -> Vec<Diagnostic> {
+    let module_path = package.and_then(|package| to_module_path(package, path));
+    let module = Module {
+        kind: if path.ends_with("__init__.py") {
+            ModuleKind::Package
+        } else {
+            ModuleKind::Module
+        },
+        source: if let Some(module_path) = module_path.as_ref() {
+            ModuleSource::Path(module_path)
+        } else {
+            ModuleSource::File(path)
+        },
+        python_ast,
+    };
+
     let mut checker = Checker::new(
         settings,
         noqa_line_for,
-        autofix,
         noqa,
         path,
         package,
-        package.and_then(|package| to_module_path(package, path)),
+        module,
         locator,
         stylist,
         indexer,
@@ -5687,18 +5409,19 @@ pub fn check_ast(
     checker.bind_builtins();
 
     // Check for module docstring.
-    let python_ast = if checker.visit_docstring(python_ast) {
+    let python_ast = if checker.visit_module(python_ast) {
         &python_ast[1..]
     } else {
         python_ast
     };
+
     // Iterate over the AST.
     checker.visit_body(python_ast);
 
     // Check any deferred statements.
     checker.check_deferred_functions();
     checker.check_deferred_lambdas();
-    checker.check_deferred_type_definitions();
+    checker.check_deferred_future_type_definitions();
     let allocator = typed_arena::Arena::new();
     checker.check_deferred_string_type_definitions(&allocator);
     checker.check_deferred_assignments();
@@ -5708,8 +5431,8 @@ pub fn check_ast(
     checker.check_definitions();
 
     // Reset the scope to module-level, and check all consumed scopes.
-    checker.ctx.scope_id = ScopeId::global();
-    checker.ctx.dead_scopes.push(ScopeId::global());
+    checker.semantic_model.scope_id = ScopeId::global();
+    checker.semantic_model.dead_scopes.push(ScopeId::global());
     checker.check_dead_scopes();
 
     checker.diagnostics
diff --git a/crates/ruff/src/checkers/filesystem.rs b/crates/ruff/src/checkers/filesystem.rs
index 0238b6b8946f3..83df0ba87b8f7 100644
--- a/crates/ruff/src/checkers/filesystem.rs
+++ b/crates/ruff/src/checkers/filesystem.rs
@@ -7,7 +7,7 @@ use crate::rules::flake8_no_pep420::rules::implicit_namespace_package;
 use crate::rules::pep8_naming::rules::invalid_module_name;
 use crate::settings::Settings;
 
-pub fn check_file_path(
+pub(crate) fn check_file_path(
     path: &Path,
     package: Option<&Path>,
     settings: &Settings,
diff --git a/crates/ruff/src/checkers/imports.rs b/crates/ruff/src/checkers/imports.rs
index ad0cba81f2993..a985c0daafdec 100644
--- a/crates/ruff/src/checkers/imports.rs
+++ b/crates/ruff/src/checkers/imports.rs
@@ -2,20 +2,20 @@
 use std::borrow::Cow;
 use std::path::Path;
 
-use rustpython_parser::ast::{StmtKind, Suite};
+use rustpython_parser::ast::{self, Ranged, Stmt, 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_ast::statement_visitor::StatementVisitor;
 use ruff_python_stdlib::path::is_python_stub_file;
 
 use crate::directives::IsortDirectives;
 use crate::registry::Rule;
 use crate::rules::isort;
-use crate::rules::isort::track::{Block, ImportTracker};
-use crate::settings::{flags, Settings};
+use crate::rules::isort::block::{Block, BlockBuilder};
+use crate::settings::Settings;
 
 fn extract_import_map(path: &Path, package: Option<&Path>, blocks: &[&Block]) -> Option<ImportMap> {
     let Some(package) = package else {
@@ -28,21 +28,23 @@ fn extract_import_map(path: &Path, package: Option<&Path>, blocks: &[&Block]) ->
     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 } => {
+        match stmt {
+            Stmt::Import(ast::StmtImport { names, range: _ }) => {
                 module_imports.extend(
                     names
                         .iter()
-                        .map(|name| ModuleImport::new(name.node.name.clone(), stmt.range())),
+                        .map(|name| ModuleImport::new(name.name.to_string(), stmt.range())),
                 );
             }
-            StmtKind::ImportFrom {
+            Stmt::ImportFrom(ast::StmtImportFrom {
                 module,
                 names,
                 level,
-            } => {
-                let level = level.unwrap_or(0);
+                range: _,
+            }) => {
+                let level = level.map_or(0, |level| level.to_usize());
                 let module = if let Some(module) = module {
+                    let module: &String = module.as_ref();
                     if level == 0 {
                         Cow::Borrowed(module)
                     } else {
@@ -59,10 +61,10 @@ fn extract_import_map(path: &Path, package: Option<&Path>, blocks: &[&Block]) ->
                     Cow::Owned(module_path[..module_path.len() - level].join("."))
                 };
                 module_imports.extend(names.iter().map(|name| {
-                    ModuleImport::new(format!("{}.{}", module, name.node.name), name.range())
+                    ModuleImport::new(format!("{}.{}", module, name.name), name.range())
                 }));
             }
-            _ => panic!("Expected StmtKind::Import | StmtKind::ImportFrom"),
+            _ => panic!("Expected Stmt::Import | Stmt::ImportFrom"),
         }
     }
 
@@ -72,22 +74,21 @@ fn extract_import_map(path: &Path, package: Option<&Path>, blocks: &[&Block]) ->
 }
 
 #[allow(clippy::too_many_arguments)]
-pub fn check_imports(
+pub(crate) fn check_imports(
     python_ast: &Suite,
     locator: &Locator,
     indexer: &Indexer,
     directives: &IsortDirectives,
     settings: &Settings,
     stylist: &Stylist,
-    autofix: flags::Autofix,
     path: &Path,
     package: Option<&Path>,
 ) -> (Vec<Diagnostic>, Option<ImportMap>) {
     let is_stub = is_python_stub_file(path);
 
-    // Extract all imports from the AST.
+    // Extract all import blocks from the AST.
     let tracker = {
-        let mut tracker = ImportTracker::new(locator, directives, is_stub);
+        let mut tracker = BlockBuilder::new(locator, directives, is_stub);
         tracker.visit_body(python_ast);
         tracker
     };
@@ -99,7 +100,7 @@ pub fn check_imports(
         for block in &blocks {
             if !block.imports.is_empty() {
                 if let Some(diagnostic) = isort::rules::organize_imports(
-                    block, locator, stylist, indexer, settings, autofix, package,
+                    block, locator, stylist, indexer, settings, package,
                 ) {
                     diagnostics.push(diagnostic);
                 }
@@ -108,7 +109,7 @@ 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,
+            python_ast, locator, stylist, settings, is_stub,
         ));
     }
 
diff --git a/crates/ruff/src/checkers/logical_lines.rs b/crates/ruff/src/checkers/logical_lines.rs
index d51ea0937d272..cbf9263c70a65 100644
--- a/crates/ruff/src/checkers/logical_lines.rs
+++ b/crates/ruff/src/checkers/logical_lines.rs
@@ -1,7 +1,7 @@
 use ruff_text_size::TextRange;
 use rustpython_parser::lexer::LexResult;
 
-use ruff_diagnostics::{Diagnostic, DiagnosticKind, Fix};
+use ruff_diagnostics::{Diagnostic, DiagnosticKind};
 use ruff_python_ast::source_code::{Locator, Stylist};
 use ruff_python_ast::token_kind::TokenKind;
 
@@ -12,7 +12,7 @@ use crate::rules::pycodestyle::rules::logical_lines::{
     whitespace_around_named_parameter_equals, whitespace_before_comment,
     whitespace_before_parameters, LogicalLines, TokenFlags,
 };
-use crate::settings::{flags, Settings};
+use crate::settings::Settings;
 
 /// Return the amount of indentation, expanding tabs to the next multiple of 8.
 fn expand_indent(line: &str) -> usize {
@@ -30,28 +30,24 @@ fn expand_indent(line: &str) -> usize {
     indent
 }
 
-pub fn check_logical_lines(
+pub(crate) fn check_logical_lines(
     tokens: &[LexResult],
     locator: &Locator,
     stylist: &Stylist,
     settings: &Settings,
-    autofix: flags::Autofix,
 ) -> Vec<Diagnostic> {
     let mut context = LogicalLinesContext::new(settings);
 
-    #[cfg(feature = "logical_lines")]
-    let should_fix_missing_whitespace =
-        autofix.into() && settings.rules.should_fix(Rule::MissingWhitespace);
-
-    #[cfg(not(feature = "logical_lines"))]
-    let should_fix_missing_whitespace = false;
-
-    #[cfg(feature = "logical_lines")]
+    let should_fix_missing_whitespace = settings.rules.should_fix(Rule::MissingWhitespace);
     let should_fix_whitespace_before_parameters =
-        autofix.into() && settings.rules.should_fix(Rule::WhitespaceBeforeParameters);
-
-    #[cfg(not(feature = "logical_lines"))]
-    let should_fix_whitespace_before_parameters = false;
+        settings.rules.should_fix(Rule::WhitespaceBeforeParameters);
+    let should_fix_whitespace_after_open_bracket =
+        settings.rules.should_fix(Rule::WhitespaceAfterOpenBracket);
+    let should_fix_whitespace_before_close_bracket = settings
+        .rules
+        .should_fix(Rule::WhitespaceBeforeCloseBracket);
+    let should_fix_whitespace_before_punctuation =
+        settings.rules.should_fix(Rule::WhitespaceBeforePunctuation);
 
     let mut prev_line = None;
     let mut prev_indent_level = None;
@@ -67,17 +63,24 @@ pub fn check_logical_lines(
 
         if line
             .flags()
-            .contains(TokenFlags::OPERATOR | TokenFlags::PUNCTUATION)
+            .intersects(TokenFlags::OPERATOR | TokenFlags::BRACKET | TokenFlags::PUNCTUATION)
         {
-            extraneous_whitespace(&line, &mut context);
+            extraneous_whitespace(
+                &line,
+                &mut context,
+                should_fix_whitespace_after_open_bracket,
+                should_fix_whitespace_before_close_bracket,
+                should_fix_whitespace_before_punctuation,
+            );
         }
+
         if line.flags().contains(TokenFlags::KEYWORD) {
             whitespace_around_keywords(&line, &mut context);
             missing_whitespace_after_keyword(&line, &mut context);
         }
 
         if line.flags().contains(TokenFlags::COMMENT) {
-            whitespace_before_comment(&line, locator, prev_line.is_none(), &mut context);
+            whitespace_before_comment(&line, locator, &mut context);
         }
 
         if line.flags().contains(TokenFlags::BRACKET) {
@@ -138,115 +141,21 @@ impl<'a> LogicalLinesContext<'a> {
         }
     }
 
-    pub fn push<K: Into<DiagnosticKind>>(&mut self, kind: K, range: TextRange) {
+    pub(crate) fn push<K: Into<DiagnosticKind>>(&mut self, kind: K, range: TextRange) {
         let kind = kind.into();
         if self.settings.rules.enabled(kind.rule()) {
             self.diagnostics.push(Diagnostic {
                 kind,
                 range,
-                fix: Fix::empty(),
+                fix: None,
                 parent: None,
             });
         }
     }
 
-    pub fn push_diagnostic(&mut self, diagnostic: Diagnostic) {
+    pub(crate) fn push_diagnostic(&mut self, diagnostic: Diagnostic) {
         if self.settings.rules.enabled(diagnostic.kind.rule()) {
             self.diagnostics.push(diagnostic);
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use rustpython_parser::lexer::LexResult;
-    use rustpython_parser::{lexer, Mode};
-
-    use crate::rules::pycodestyle::rules::logical_lines::LogicalLines;
-    use ruff_python_ast::source_code::Locator;
-
-    #[test]
-    fn split_logical_lines() {
-        let contents = r#"
-x = 1
-y = 2
-z = x + 1"#;
-        let lxr: Vec<LexResult> = lexer::lex(contents, Mode::Module).collect();
-        let locator = Locator::new(contents);
-        let actual: Vec<String> = LogicalLines::from_tokens(&lxr, &locator)
-            .into_iter()
-            .map(|line| line.text_trimmed().to_string())
-            .collect();
-        let expected = vec![
-            "x = 1".to_string(),
-            "y = 2".to_string(),
-            "z = x + 1".to_string(),
-        ];
-        assert_eq!(actual, expected);
-
-        let contents = r#"
-x = [
-  1,
-  2,
-  3,
-]
-y = 2
-z = x + 1"#;
-        let lxr: Vec<LexResult> = lexer::lex(contents, Mode::Module).collect();
-        let locator = Locator::new(contents);
-        let actual: Vec<String> = LogicalLines::from_tokens(&lxr, &locator)
-            .into_iter()
-            .map(|line| line.text_trimmed().to_string())
-            .collect();
-        let expected = vec![
-            "x = [\n  1,\n  2,\n  3,\n]".to_string(),
-            "y = 2".to_string(),
-            "z = x + 1".to_string(),
-        ];
-        assert_eq!(actual, expected);
-
-        let contents = "x = 'abc'";
-        let lxr: Vec<LexResult> = lexer::lex(contents, Mode::Module).collect();
-        let locator = Locator::new(contents);
-        let actual: Vec<String> = LogicalLines::from_tokens(&lxr, &locator)
-            .into_iter()
-            .map(|line| line.text_trimmed().to_string())
-            .collect();
-        let expected = vec!["x = 'abc'".to_string()];
-        assert_eq!(actual, expected);
-
-        let contents = r#"
-def f():
-  x = 1
-f()"#;
-        let lxr: Vec<LexResult> = lexer::lex(contents, Mode::Module).collect();
-        let locator = Locator::new(contents);
-        let actual: Vec<String> = LogicalLines::from_tokens(&lxr, &locator)
-            .into_iter()
-            .map(|line| line.text_trimmed().to_string())
-            .collect();
-        let expected = vec!["def f():", "x = 1", "f()"];
-        assert_eq!(actual, expected);
-
-        let contents = r#"
-def f():
-  """Docstring goes here."""
-  # Comment goes here.
-  x = 1
-f()"#;
-        let lxr: Vec<LexResult> = lexer::lex(contents, Mode::Module).collect();
-        let locator = Locator::new(contents);
-        let actual: Vec<String> = LogicalLines::from_tokens(&lxr, &locator)
-            .into_iter()
-            .map(|line| line.text_trimmed().to_string())
-            .collect();
-        let expected = vec![
-            "def f():",
-            "\"\"\"Docstring goes here.\"\"\"",
-            "",
-            "x = 1",
-            "f()",
-        ];
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/crates/ruff/src/checkers/mod.rs b/crates/ruff/src/checkers/mod.rs
index 13c937dd60e2f..5178e7e6647ec 100644
--- a/crates/ruff/src/checkers/mod.rs
+++ b/crates/ruff/src/checkers/mod.rs
@@ -1,8 +1,7 @@
-pub mod ast;
-pub mod filesystem;
-pub mod imports;
-#[cfg(feature = "logical_lines")]
+pub(crate) mod ast;
+pub(crate) mod filesystem;
+pub(crate) mod imports;
 pub(crate) mod logical_lines;
-pub mod noqa;
-pub mod physical_lines;
-pub mod tokens;
+pub(crate) mod noqa;
+pub(crate) mod physical_lines;
+pub(crate) mod tokens;
diff --git a/crates/ruff/src/checkers/noqa.rs b/crates/ruff/src/checkers/noqa.rs
index 25ad27a9992cd..52d47182b5343 100644
--- a/crates/ruff/src/checkers/noqa.rs
+++ b/crates/ruff/src/checkers/noqa.rs
@@ -3,7 +3,7 @@
 use itertools::Itertools;
 use ruff_text_size::{TextLen, TextRange, TextSize};
 
-use ruff_diagnostics::{Diagnostic, Edit};
+use ruff_diagnostics::{Diagnostic, Edit, Fix};
 use ruff_python_ast::source_code::Locator;
 
 use crate::noqa;
@@ -11,18 +11,16 @@ use crate::noqa::{Directive, FileExemption, NoqaDirectives, NoqaMapping};
 use crate::registry::{AsRule, Rule};
 use crate::rule_redirects::get_redirect_target;
 use crate::rules::ruff::rules::{UnusedCodes, UnusedNOQA};
-use crate::settings::{flags, Settings};
+use crate::settings::Settings;
 
-pub fn check_noqa(
+pub(crate) fn check_noqa(
     diagnostics: &mut Vec<Diagnostic>,
     locator: &Locator,
     comment_ranges: &[TextRange],
     noqa_line_for: &NoqaMapping,
+    analyze_directives: bool,
     settings: &Settings,
-    autofix: flags::Autofix,
 ) -> Vec<usize> {
-    let enforce_noqa = settings.rules.enabled(Rule::UnusedNOQA);
-
     // Identify any codes that are globally exempted (within the current file).
     let exemption = noqa::file_exemption(locator.contents(), comment_ranges);
 
@@ -94,15 +92,16 @@ pub fn check_noqa(
     }
 
     // Enforce that the noqa directive was actually used (RUF100).
-    if enforce_noqa {
+    if analyze_directives && settings.rules.enabled(Rule::UnusedNOQA) {
         for line in noqa_directives.lines() {
             match &line.directive {
                 Directive::All(leading_spaces, noqa_range, trailing_spaces) => {
                     if line.matches.is_empty() {
                         let mut diagnostic =
                             Diagnostic::new(UnusedNOQA { codes: None }, *noqa_range);
-                        if autofix.into() && settings.rules.should_fix(diagnostic.kind.rule()) {
-                            diagnostic.set_fix(delete_noqa(
+                        if settings.rules.should_fix(diagnostic.kind.rule()) {
+                            #[allow(deprecated)]
+                            diagnostic.set_fix_from_edit(delete_noqa(
                                 *leading_spaces,
                                 *noqa_range,
                                 *trailing_spaces,
@@ -169,19 +168,21 @@ pub fn check_noqa(
                             },
                             *range,
                         );
-                        if autofix.into() && settings.rules.should_fix(diagnostic.kind.rule()) {
+                        if settings.rules.should_fix(diagnostic.kind.rule()) {
                             if valid_codes.is_empty() {
-                                diagnostic.set_fix(delete_noqa(
+                                #[allow(deprecated)]
+                                diagnostic.set_fix_from_edit(delete_noqa(
                                     *leading_spaces,
                                     *range,
                                     *trailing_spaces,
                                     locator,
                                 ));
                             } else {
-                                diagnostic.set_fix(Edit::range_replacement(
+                                #[allow(deprecated)]
+                                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
                                     format!("# noqa: {}", valid_codes.join(", ")),
                                     *range,
-                                ));
+                                )));
                             }
                         }
                         diagnostics.push(diagnostic);
diff --git a/crates/ruff/src/checkers/physical_lines.rs b/crates/ruff/src/checkers/physical_lines.rs
index b4437cad5208f..124821f221c59 100644
--- a/crates/ruff/src/checkers/physical_lines.rs
+++ b/crates/ruff/src/checkers/physical_lines.rs
@@ -4,7 +4,7 @@ use ruff_text_size::TextSize;
 use std::path::Path;
 
 use ruff_diagnostics::Diagnostic;
-use ruff_python_ast::newlines::StrExt;
+use ruff_newlines::StrExt;
 use ruff_python_ast::source_code::{Indexer, Locator, Stylist};
 
 use crate::registry::Rule;
@@ -19,16 +19,15 @@ use crate::rules::pycodestyle::rules::{
 use crate::rules::pygrep_hooks::rules::{blanket_noqa, blanket_type_ignore};
 use crate::rules::pylint;
 use crate::rules::pyupgrade::rules::unnecessary_coding_comment;
-use crate::settings::{flags, Settings};
+use crate::settings::Settings;
 
-pub fn check_physical_lines(
+pub(crate) fn check_physical_lines(
     path: &Path,
     locator: &Locator,
     stylist: &Stylist,
     indexer: &Indexer,
     doc_lines: &[TextSize],
     settings: &Settings,
-    autofix: flags::Autofix,
 ) -> Vec<Diagnostic> {
     let mut diagnostics: Vec<Diagnostic> = vec![];
     let mut has_any_shebang = false;
@@ -51,14 +50,11 @@ pub fn check_physical_lines(
         settings.rules.enabled(Rule::BlankLineWithWhitespace);
     let enforce_tab_indentation = settings.rules.enabled(Rule::TabIndentation);
 
-    let fix_unnecessary_coding_comment =
-        autofix.into() && settings.rules.should_fix(Rule::UTF8EncodingDeclaration);
-    let fix_shebang_whitespace =
-        autofix.into() && settings.rules.should_fix(Rule::ShebangLeadingWhitespace);
+    let fix_unnecessary_coding_comment = settings.rules.should_fix(Rule::UTF8EncodingDeclaration);
+    let fix_shebang_whitespace = settings.rules.should_fix(Rule::ShebangLeadingWhitespace);
 
     let mut commented_lines_iter = indexer.comment_ranges().iter().peekable();
     let mut doc_lines_iter = doc_lines.iter().peekable();
-    let string_lines = indexer.triple_quoted_string_ranges();
 
     for (index, line) in locator.contents().universal_newlines().enumerate() {
         while commented_lines_iter
@@ -121,7 +117,7 @@ pub fn check_physical_lines(
         }
 
         while doc_lines_iter
-            .next_if(|doc_line_start| line.range().contains(**doc_line_start))
+            .next_if(|doc_line_start| line.range().contains_inclusive(**doc_line_start))
             .is_some()
         {
             if enforce_doc_line_too_long {
@@ -148,13 +144,13 @@ pub fn check_physical_lines(
         }
 
         if enforce_trailing_whitespace || enforce_blank_line_contains_whitespace {
-            if let Some(diagnostic) = trailing_whitespace(&line, settings, autofix) {
+            if let Some(diagnostic) = trailing_whitespace(&line, settings) {
                 diagnostics.push(diagnostic);
             }
         }
 
         if enforce_tab_indentation {
-            if let Some(diagnostic) = tab_indentation(&line, string_lines) {
+            if let Some(diagnostic) = tab_indentation(&line, indexer) {
                 diagnostics.push(diagnostic);
             }
         }
@@ -164,7 +160,7 @@ pub fn check_physical_lines(
         if let Some(diagnostic) = no_newline_at_end_of_file(
             locator,
             stylist,
-            autofix.into() && settings.rules.should_fix(Rule::MissingNewlineAtEndOfFile),
+            settings.rules.should_fix(Rule::MissingNewlineAtEndOfFile),
         ) {
             diagnostics.push(diagnostic);
         }
@@ -187,8 +183,9 @@ mod tests {
 
     use ruff_python_ast::source_code::{Indexer, Locator, Stylist};
 
+    use crate::line_width::LineLength;
     use crate::registry::Rule;
-    use crate::settings::{flags, Settings};
+    use crate::settings::Settings;
 
     use super::check_physical_lines;
 
@@ -200,7 +197,7 @@ mod tests {
         let indexer = Indexer::from_tokens(&tokens, &locator);
         let stylist = Stylist::from_tokens(&tokens, &locator);
 
-        let check_with_max_line_length = |line_length: usize| {
+        let check_with_max_line_length = |line_length: LineLength| {
             check_physical_lines(
                 Path::new("foo.py"),
                 &locator,
@@ -211,10 +208,10 @@ mod tests {
                     line_length,
                     ..Settings::for_rule(Rule::LineTooLong)
                 },
-                flags::Autofix::Enabled,
             )
         };
-        assert_eq!(check_with_max_line_length(8), vec![]);
-        assert_eq!(check_with_max_line_length(8), vec![]);
+        let line_length = LineLength::from(8);
+        assert_eq!(check_with_max_line_length(line_length), vec![]);
+        assert_eq!(check_with_max_line_length(line_length), vec![]);
     }
 }
diff --git a/crates/ruff/src/checkers/tokens.rs b/crates/ruff/src/checkers/tokens.rs
index 0b9f76e6199c0..4f71610a7cdbd 100644
--- a/crates/ruff/src/checkers/tokens.rs
+++ b/crates/ruff/src/checkers/tokens.rs
@@ -3,22 +3,23 @@
 use rustpython_parser::lexer::LexResult;
 use rustpython_parser::Tok;
 
+use crate::directives::TodoComment;
 use crate::lex::docstring_detection::StateMachine;
 use crate::registry::{AsRule, Rule};
 use crate::rules::ruff::rules::Context;
 use crate::rules::{
-    eradicate, flake8_commas, flake8_implicit_str_concat, flake8_pyi, flake8_quotes, pycodestyle,
-    pylint, pyupgrade, ruff,
+    eradicate, flake8_commas, flake8_fixme, flake8_implicit_str_concat, flake8_pyi, flake8_quotes,
+    flake8_todos, pycodestyle, pylint, pyupgrade, ruff,
 };
-use crate::settings::{flags, Settings};
+use crate::settings::Settings;
 use ruff_diagnostics::Diagnostic;
-use ruff_python_ast::source_code::Locator;
+use ruff_python_ast::source_code::{Indexer, Locator};
 
-pub fn check_tokens(
+pub(crate) fn check_tokens(
     locator: &Locator,
+    indexer: &Indexer,
     tokens: &[LexResult],
     settings: &Settings,
-    autofix: flags::Autofix,
     is_stub: bool,
 ) -> Vec<Diagnostic> {
     let mut diagnostics: Vec<Diagnostic> = vec![];
@@ -61,6 +62,21 @@ pub fn check_tokens(
     let enforce_extraneous_parenthesis = settings.rules.enabled(Rule::ExtraneousParentheses);
     let enforce_type_comment_in_stub = settings.rules.enabled(Rule::TypeCommentInStub);
 
+    // Combine flake8_todos and flake8_fixme so that we can reuse detected [`TodoDirective`]s.
+    let enforce_todos = settings.rules.any_enabled(&[
+        Rule::InvalidTodoTag,
+        Rule::MissingTodoAuthor,
+        Rule::MissingTodoLink,
+        Rule::MissingTodoColon,
+        Rule::MissingTodoDescription,
+        Rule::InvalidTodoCapitalization,
+        Rule::MissingSpaceAfterTodoColon,
+        Rule::LineContainsFixme,
+        Rule::LineContainsXxx,
+        Rule::LineContainsTodo,
+        Rule::LineContainsHack,
+    ]);
+
     // RUF001, RUF002, RUF003
     if enforce_ambiguous_unicode_character {
         let mut state_machine = StateMachine::default();
@@ -85,7 +101,6 @@ pub fn check_tokens(
                         Context::Comment
                     },
                     settings,
-                    autofix,
                 ));
             }
         }
@@ -93,15 +108,9 @@ pub fn check_tokens(
 
     // ERA001
     if enforce_commented_out_code {
-        for (tok, range) in tokens.iter().flatten() {
-            if matches!(tok, Tok::Comment(_)) {
-                if let Some(diagnostic) =
-                    eradicate::rules::commented_out_code(locator, *range, settings, autofix)
-                {
-                    diagnostics.push(diagnostic);
-                }
-            }
-        }
+        diagnostics.extend(eradicate::rules::commented_out_code(
+            indexer, locator, settings,
+        ));
     }
 
     // W605
@@ -111,7 +120,7 @@ pub fn check_tokens(
                 diagnostics.extend(pycodestyle::rules::invalid_escape_sequence(
                     locator,
                     *range,
-                    autofix.into() && settings.rules.should_fix(Rule::InvalidEscapeSequence),
+                    settings.rules.should_fix(Rule::InvalidEscapeSequence),
                 ));
             }
         }
@@ -121,7 +130,7 @@ pub fn check_tokens(
         for (tok, range) in tokens.iter().flatten() {
             if matches!(tok, Tok::String { .. }) {
                 diagnostics.extend(
-                    pylint::rules::invalid_string_characters(locator, *range, autofix.into())
+                    pylint::rules::invalid_string_characters(locator, *range)
                         .into_iter()
                         .filter(|diagnostic| settings.rules.enabled(diagnostic.kind.rule())),
                 );
@@ -132,7 +141,7 @@ pub fn check_tokens(
     // E701, E702, E703
     if enforce_compound_statements {
         diagnostics.extend(
-            pycodestyle::rules::compound_statements(tokens, settings, autofix)
+            pycodestyle::rules::compound_statements(tokens, settings)
                 .into_iter()
                 .filter(|diagnostic| settings.rules.enabled(diagnostic.kind.rule())),
         );
@@ -141,7 +150,7 @@ pub fn check_tokens(
     // Q001, Q002, Q003
     if enforce_quotes {
         diagnostics.extend(
-            flake8_quotes::rules::from_tokens(tokens, locator, settings, autofix)
+            flake8_quotes::rules::from_tokens(tokens, locator, settings)
                 .into_iter()
                 .filter(|diagnostic| settings.rules.enabled(diagnostic.kind.rule())),
         );
@@ -163,7 +172,7 @@ pub fn check_tokens(
     // COM812, COM818, COM819
     if enforce_trailing_comma {
         diagnostics.extend(
-            flake8_commas::rules::trailing_commas(tokens, locator, settings, autofix)
+            flake8_commas::rules::trailing_commas(tokens, locator, settings)
                 .into_iter()
                 .filter(|diagnostic| settings.rules.enabled(diagnostic.kind.rule())),
         );
@@ -172,14 +181,39 @@ pub fn check_tokens(
     // UP034
     if enforce_extraneous_parenthesis {
         diagnostics.extend(
-            pyupgrade::rules::extraneous_parentheses(tokens, locator, settings, autofix)
-                .into_iter(),
+            pyupgrade::rules::extraneous_parentheses(tokens, locator, settings).into_iter(),
         );
     }
 
     // PYI033
     if enforce_type_comment_in_stub && is_stub {
-        diagnostics.extend(flake8_pyi::rules::type_comment_in_stub(tokens));
+        diagnostics.extend(flake8_pyi::rules::type_comment_in_stub(indexer, locator));
+    }
+
+    // TD001, TD002, TD003, TD004, TD005, TD006, TD007
+    // T001, T002, T003, T004
+    if enforce_todos {
+        let todo_comments: Vec<TodoComment> = indexer
+            .comment_ranges()
+            .iter()
+            .enumerate()
+            .filter_map(|(i, comment_range)| {
+                let comment = locator.slice(*comment_range);
+                TodoComment::from_comment(comment, *comment_range, i)
+            })
+            .collect();
+
+        diagnostics.extend(
+            flake8_todos::rules::todos(&todo_comments, indexer, locator, settings)
+                .into_iter()
+                .filter(|diagnostic| settings.rules.enabled(diagnostic.kind.rule())),
+        );
+
+        diagnostics.extend(
+            flake8_fixme::rules::todos(&todo_comments)
+                .into_iter()
+                .filter(|diagnostic| settings.rules.enabled(diagnostic.kind.rule())),
+        );
     }
 
     diagnostics
diff --git a/crates/ruff/src/codes.rs b/crates/ruff/src/codes.rs
index cffdf12abe94e..641755699e5a8 100644
--- a/crates/ruff/src/codes.rs
+++ b/crates/ruff/src/codes.rs
@@ -1,6 +1,16 @@
-use crate::registry::{Linter, Rule};
+/// In this module we generate [`Rule`], an enum of all rules, and [`RuleCodePrefix`], an enum of
+/// all rules categories. A rule category is something like pyflakes or flake8-todos. Each rule
+/// category contains all rules and their common prefixes, i.e. everything you can specify in
+/// `--select`. For pylint this is e.g. C0414 and E0118 but also C and E01.
 use std::fmt::Formatter;
 
+use strum_macros::{AsRefStr, EnumIter};
+
+use ruff_diagnostics::Violation;
+
+use crate::registry::{AsRule, Linter};
+use crate::rules;
+
 #[derive(PartialEq, Eq, PartialOrd, Ord)]
 pub struct NoqaCode(&'static str, &'static str);
 
@@ -11,7 +21,7 @@ impl std::fmt::Debug for NoqaCode {
 }
 
 impl std::fmt::Display for NoqaCode {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), std::fmt::Error> {
         write!(f, "{}{}", self.0, self.1)
     }
 }
@@ -25,715 +35,750 @@ impl PartialEq<&str> for NoqaCode {
     }
 }
 
+#[derive(Debug, Copy, Clone)]
+pub enum RuleGroup {
+    /// The rule has not been assigned to any specific group.
+    Unspecified,
+    /// The rule is still under development, and must be enabled explicitly.
+    Nursery,
+}
+
 #[ruff_macros::map_codes]
-pub fn code_to_rule(linter: Linter, code: &str) -> Option<Rule> {
+pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
     #[allow(clippy::enum_glob_use)]
     use Linter::*;
 
+    #[rustfmt::skip]
     Some(match (linter, code) {
         // pycodestyle errors
-        (Pycodestyle, "E101") => Rule::MixedSpacesAndTabs,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E111") => Rule::IndentationWithInvalidMultiple,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E112") => Rule::NoIndentedBlock,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E113") => Rule::UnexpectedIndentation,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E114") => Rule::IndentationWithInvalidMultipleComment,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E115") => Rule::NoIndentedBlockComment,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E116") => Rule::UnexpectedIndentationComment,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E117") => Rule::OverIndented,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E201") => Rule::WhitespaceAfterOpenBracket,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E202") => Rule::WhitespaceBeforeCloseBracket,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E203") => Rule::WhitespaceBeforePunctuation,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E211") => Rule::WhitespaceBeforeParameters,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E221") => Rule::MultipleSpacesBeforeOperator,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E222") => Rule::MultipleSpacesAfterOperator,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E223") => Rule::TabBeforeOperator,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E224") => Rule::TabAfterOperator,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E225") => Rule::MissingWhitespaceAroundOperator,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E226") => Rule::MissingWhitespaceAroundArithmeticOperator,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E227") => Rule::MissingWhitespaceAroundBitwiseOrShiftOperator,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E228") => Rule::MissingWhitespaceAroundModuloOperator,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E231") => Rule::MissingWhitespace,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E251") => Rule::UnexpectedSpacesAroundKeywordParameterEquals,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E252") => Rule::MissingWhitespaceAroundParameterEquals,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E261") => Rule::TooFewSpacesBeforeInlineComment,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E262") => Rule::NoSpaceAfterInlineComment,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E265") => Rule::NoSpaceAfterBlockComment,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E266") => Rule::MultipleLeadingHashesForBlockComment,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E271") => Rule::MultipleSpacesAfterKeyword,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E272") => Rule::MultipleSpacesBeforeKeyword,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E273") => Rule::TabAfterKeyword,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E274") => Rule::TabBeforeKeyword,
-        #[cfg(feature = "logical_lines")]
-        (Pycodestyle, "E275") => Rule::MissingWhitespaceAfterKeyword,
-        (Pycodestyle, "E401") => Rule::MultipleImportsOnOneLine,
-        (Pycodestyle, "E402") => Rule::ModuleImportNotAtTopOfFile,
-        (Pycodestyle, "E501") => Rule::LineTooLong,
-        (Pycodestyle, "E701") => Rule::MultipleStatementsOnOneLineColon,
-        (Pycodestyle, "E702") => Rule::MultipleStatementsOnOneLineSemicolon,
-        (Pycodestyle, "E703") => Rule::UselessSemicolon,
-        (Pycodestyle, "E711") => Rule::NoneComparison,
-        (Pycodestyle, "E712") => Rule::TrueFalseComparison,
-        (Pycodestyle, "E713") => Rule::NotInTest,
-        (Pycodestyle, "E714") => Rule::NotIsTest,
-        (Pycodestyle, "E721") => Rule::TypeComparison,
-        (Pycodestyle, "E722") => Rule::BareExcept,
-        (Pycodestyle, "E731") => Rule::LambdaAssignment,
-        (Pycodestyle, "E741") => Rule::AmbiguousVariableName,
-        (Pycodestyle, "E742") => Rule::AmbiguousClassName,
-        (Pycodestyle, "E743") => Rule::AmbiguousFunctionName,
-        (Pycodestyle, "E902") => Rule::IOError,
-        (Pycodestyle, "E999") => Rule::SyntaxError,
+        (Pycodestyle, "E101") => (RuleGroup::Unspecified, rules::pycodestyle::rules::MixedSpacesAndTabs),
+        (Pycodestyle, "E111") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::IndentationWithInvalidMultiple),
+        (Pycodestyle, "E112") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::NoIndentedBlock),
+        (Pycodestyle, "E113") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::UnexpectedIndentation),
+        (Pycodestyle, "E114") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::IndentationWithInvalidMultipleComment),
+        (Pycodestyle, "E115") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::NoIndentedBlockComment),
+        (Pycodestyle, "E116") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::UnexpectedIndentationComment),
+        (Pycodestyle, "E117") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::OverIndented),
+        (Pycodestyle, "E201") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::WhitespaceAfterOpenBracket),
+        (Pycodestyle, "E202") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::WhitespaceBeforeCloseBracket),
+        (Pycodestyle, "E203") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::WhitespaceBeforePunctuation),
+        (Pycodestyle, "E211") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::WhitespaceBeforeParameters),
+        (Pycodestyle, "E221") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MultipleSpacesBeforeOperator),
+        (Pycodestyle, "E222") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MultipleSpacesAfterOperator),
+        (Pycodestyle, "E223") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TabBeforeOperator),
+        (Pycodestyle, "E224") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TabAfterOperator),
+        (Pycodestyle, "E225") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundOperator),
+        (Pycodestyle, "E226") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundArithmeticOperator),
+        (Pycodestyle, "E227") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundBitwiseOrShiftOperator),
+        (Pycodestyle, "E228") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundModuloOperator),
+        (Pycodestyle, "E231") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespace),
+        (Pycodestyle, "E251") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::UnexpectedSpacesAroundKeywordParameterEquals),
+        (Pycodestyle, "E252") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundParameterEquals),
+        (Pycodestyle, "E261") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TooFewSpacesBeforeInlineComment),
+        (Pycodestyle, "E262") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::NoSpaceAfterInlineComment),
+        (Pycodestyle, "E265") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::NoSpaceAfterBlockComment),
+        (Pycodestyle, "E266") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MultipleLeadingHashesForBlockComment),
+        (Pycodestyle, "E271") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MultipleSpacesAfterKeyword),
+        (Pycodestyle, "E272") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MultipleSpacesBeforeKeyword),
+        (Pycodestyle, "E273") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TabAfterKeyword),
+        (Pycodestyle, "E274") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TabBeforeKeyword),
+        (Pycodestyle, "E275") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAfterKeyword),
+        (Pycodestyle, "E401") => (RuleGroup::Unspecified, rules::pycodestyle::rules::MultipleImportsOnOneLine),
+        (Pycodestyle, "E402") => (RuleGroup::Unspecified, rules::pycodestyle::rules::ModuleImportNotAtTopOfFile),
+        (Pycodestyle, "E501") => (RuleGroup::Unspecified, rules::pycodestyle::rules::LineTooLong),
+        (Pycodestyle, "E701") => (RuleGroup::Unspecified, rules::pycodestyle::rules::MultipleStatementsOnOneLineColon),
+        (Pycodestyle, "E702") => (RuleGroup::Unspecified, rules::pycodestyle::rules::MultipleStatementsOnOneLineSemicolon),
+        (Pycodestyle, "E703") => (RuleGroup::Unspecified, rules::pycodestyle::rules::UselessSemicolon),
+        (Pycodestyle, "E711") => (RuleGroup::Unspecified, rules::pycodestyle::rules::NoneComparison),
+        (Pycodestyle, "E712") => (RuleGroup::Unspecified, rules::pycodestyle::rules::TrueFalseComparison),
+        (Pycodestyle, "E713") => (RuleGroup::Unspecified, rules::pycodestyle::rules::NotInTest),
+        (Pycodestyle, "E714") => (RuleGroup::Unspecified, rules::pycodestyle::rules::NotIsTest),
+        (Pycodestyle, "E721") => (RuleGroup::Unspecified, rules::pycodestyle::rules::TypeComparison),
+        (Pycodestyle, "E722") => (RuleGroup::Unspecified, rules::pycodestyle::rules::BareExcept),
+        (Pycodestyle, "E731") => (RuleGroup::Unspecified, rules::pycodestyle::rules::LambdaAssignment),
+        (Pycodestyle, "E741") => (RuleGroup::Unspecified, rules::pycodestyle::rules::AmbiguousVariableName),
+        (Pycodestyle, "E742") => (RuleGroup::Unspecified, rules::pycodestyle::rules::AmbiguousClassName),
+        (Pycodestyle, "E743") => (RuleGroup::Unspecified, rules::pycodestyle::rules::AmbiguousFunctionName),
+        (Pycodestyle, "E902") => (RuleGroup::Unspecified, rules::pycodestyle::rules::IOError),
+        (Pycodestyle, "E999") => (RuleGroup::Unspecified, rules::pycodestyle::rules::SyntaxError),
 
         // pycodestyle warnings
-        (Pycodestyle, "W191") => Rule::TabIndentation,
-        (Pycodestyle, "W291") => Rule::TrailingWhitespace,
-        (Pycodestyle, "W292") => Rule::MissingNewlineAtEndOfFile,
-        (Pycodestyle, "W293") => Rule::BlankLineWithWhitespace,
-        (Pycodestyle, "W505") => Rule::DocLineTooLong,
-        (Pycodestyle, "W605") => Rule::InvalidEscapeSequence,
+        (Pycodestyle, "W191") => (RuleGroup::Unspecified, rules::pycodestyle::rules::TabIndentation),
+        (Pycodestyle, "W291") => (RuleGroup::Unspecified, rules::pycodestyle::rules::TrailingWhitespace),
+        (Pycodestyle, "W292") => (RuleGroup::Unspecified, rules::pycodestyle::rules::MissingNewlineAtEndOfFile),
+        (Pycodestyle, "W293") => (RuleGroup::Unspecified, rules::pycodestyle::rules::BlankLineWithWhitespace),
+        (Pycodestyle, "W505") => (RuleGroup::Unspecified, rules::pycodestyle::rules::DocLineTooLong),
+        (Pycodestyle, "W605") => (RuleGroup::Unspecified, rules::pycodestyle::rules::InvalidEscapeSequence),
 
         // pyflakes
-        (Pyflakes, "401") => Rule::UnusedImport,
-        (Pyflakes, "402") => Rule::ImportShadowedByLoopVar,
-        (Pyflakes, "403") => Rule::UndefinedLocalWithImportStar,
-        (Pyflakes, "404") => Rule::LateFutureImport,
-        (Pyflakes, "405") => Rule::UndefinedLocalWithImportStarUsage,
-        (Pyflakes, "406") => Rule::UndefinedLocalWithNestedImportStarUsage,
-        (Pyflakes, "407") => Rule::FutureFeatureNotDefined,
-        (Pyflakes, "501") => Rule::PercentFormatInvalidFormat,
-        (Pyflakes, "502") => Rule::PercentFormatExpectedMapping,
-        (Pyflakes, "503") => Rule::PercentFormatExpectedSequence,
-        (Pyflakes, "504") => Rule::PercentFormatExtraNamedArguments,
-        (Pyflakes, "505") => Rule::PercentFormatMissingArgument,
-        (Pyflakes, "506") => Rule::PercentFormatMixedPositionalAndNamed,
-        (Pyflakes, "507") => Rule::PercentFormatPositionalCountMismatch,
-        (Pyflakes, "508") => Rule::PercentFormatStarRequiresSequence,
-        (Pyflakes, "509") => Rule::PercentFormatUnsupportedFormatCharacter,
-        (Pyflakes, "521") => Rule::StringDotFormatInvalidFormat,
-        (Pyflakes, "522") => Rule::StringDotFormatExtraNamedArguments,
-        (Pyflakes, "523") => Rule::StringDotFormatExtraPositionalArguments,
-        (Pyflakes, "524") => Rule::StringDotFormatMissingArguments,
-        (Pyflakes, "525") => Rule::StringDotFormatMixingAutomatic,
-        (Pyflakes, "541") => Rule::FStringMissingPlaceholders,
-        (Pyflakes, "601") => Rule::MultiValueRepeatedKeyLiteral,
-        (Pyflakes, "602") => Rule::MultiValueRepeatedKeyVariable,
-        (Pyflakes, "621") => Rule::ExpressionsInStarAssignment,
-        (Pyflakes, "622") => Rule::MultipleStarredExpressions,
-        (Pyflakes, "631") => Rule::AssertTuple,
-        (Pyflakes, "632") => Rule::IsLiteral,
-        (Pyflakes, "633") => Rule::InvalidPrintSyntax,
-        (Pyflakes, "634") => Rule::IfTuple,
-        (Pyflakes, "701") => Rule::BreakOutsideLoop,
-        (Pyflakes, "702") => Rule::ContinueOutsideLoop,
-        (Pyflakes, "704") => Rule::YieldOutsideFunction,
-        (Pyflakes, "706") => Rule::ReturnOutsideFunction,
-        (Pyflakes, "707") => Rule::DefaultExceptNotLast,
-        (Pyflakes, "722") => Rule::ForwardAnnotationSyntaxError,
-        (Pyflakes, "811") => Rule::RedefinedWhileUnused,
-        (Pyflakes, "821") => Rule::UndefinedName,
-        (Pyflakes, "822") => Rule::UndefinedExport,
-        (Pyflakes, "823") => Rule::UndefinedLocal,
-        (Pyflakes, "841") => Rule::UnusedVariable,
-        (Pyflakes, "842") => Rule::UnusedAnnotation,
-        (Pyflakes, "901") => Rule::RaiseNotImplemented,
+        (Pyflakes, "401") => (RuleGroup::Unspecified, rules::pyflakes::rules::UnusedImport),
+        (Pyflakes, "402") => (RuleGroup::Unspecified, rules::pyflakes::rules::ImportShadowedByLoopVar),
+        (Pyflakes, "403") => (RuleGroup::Unspecified, rules::pyflakes::rules::UndefinedLocalWithImportStar),
+        (Pyflakes, "404") => (RuleGroup::Unspecified, rules::pyflakes::rules::LateFutureImport),
+        (Pyflakes, "405") => (RuleGroup::Unspecified, rules::pyflakes::rules::UndefinedLocalWithImportStarUsage),
+        (Pyflakes, "406") => (RuleGroup::Unspecified, rules::pyflakes::rules::UndefinedLocalWithNestedImportStarUsage),
+        (Pyflakes, "407") => (RuleGroup::Unspecified, rules::pyflakes::rules::FutureFeatureNotDefined),
+        (Pyflakes, "501") => (RuleGroup::Unspecified, rules::pyflakes::rules::PercentFormatInvalidFormat),
+        (Pyflakes, "502") => (RuleGroup::Unspecified, rules::pyflakes::rules::PercentFormatExpectedMapping),
+        (Pyflakes, "503") => (RuleGroup::Unspecified, rules::pyflakes::rules::PercentFormatExpectedSequence),
+        (Pyflakes, "504") => (RuleGroup::Unspecified, rules::pyflakes::rules::PercentFormatExtraNamedArguments),
+        (Pyflakes, "505") => (RuleGroup::Unspecified, rules::pyflakes::rules::PercentFormatMissingArgument),
+        (Pyflakes, "506") => (RuleGroup::Unspecified, rules::pyflakes::rules::PercentFormatMixedPositionalAndNamed),
+        (Pyflakes, "507") => (RuleGroup::Unspecified, rules::pyflakes::rules::PercentFormatPositionalCountMismatch),
+        (Pyflakes, "508") => (RuleGroup::Unspecified, rules::pyflakes::rules::PercentFormatStarRequiresSequence),
+        (Pyflakes, "509") => (RuleGroup::Unspecified, rules::pyflakes::rules::PercentFormatUnsupportedFormatCharacter),
+        (Pyflakes, "521") => (RuleGroup::Unspecified, rules::pyflakes::rules::StringDotFormatInvalidFormat),
+        (Pyflakes, "522") => (RuleGroup::Unspecified, rules::pyflakes::rules::StringDotFormatExtraNamedArguments),
+        (Pyflakes, "523") => (RuleGroup::Unspecified, rules::pyflakes::rules::StringDotFormatExtraPositionalArguments),
+        (Pyflakes, "524") => (RuleGroup::Unspecified, rules::pyflakes::rules::StringDotFormatMissingArguments),
+        (Pyflakes, "525") => (RuleGroup::Unspecified, rules::pyflakes::rules::StringDotFormatMixingAutomatic),
+        (Pyflakes, "541") => (RuleGroup::Unspecified, rules::pyflakes::rules::FStringMissingPlaceholders),
+        (Pyflakes, "601") => (RuleGroup::Unspecified, rules::pyflakes::rules::MultiValueRepeatedKeyLiteral),
+        (Pyflakes, "602") => (RuleGroup::Unspecified, rules::pyflakes::rules::MultiValueRepeatedKeyVariable),
+        (Pyflakes, "621") => (RuleGroup::Unspecified, rules::pyflakes::rules::ExpressionsInStarAssignment),
+        (Pyflakes, "622") => (RuleGroup::Unspecified, rules::pyflakes::rules::MultipleStarredExpressions),
+        (Pyflakes, "631") => (RuleGroup::Unspecified, rules::pyflakes::rules::AssertTuple),
+        (Pyflakes, "632") => (RuleGroup::Unspecified, rules::pyflakes::rules::IsLiteral),
+        (Pyflakes, "633") => (RuleGroup::Unspecified, rules::pyflakes::rules::InvalidPrintSyntax),
+        (Pyflakes, "634") => (RuleGroup::Unspecified, rules::pyflakes::rules::IfTuple),
+        (Pyflakes, "701") => (RuleGroup::Unspecified, rules::pyflakes::rules::BreakOutsideLoop),
+        (Pyflakes, "702") => (RuleGroup::Unspecified, rules::pyflakes::rules::ContinueOutsideLoop),
+        (Pyflakes, "704") => (RuleGroup::Unspecified, rules::pyflakes::rules::YieldOutsideFunction),
+        (Pyflakes, "706") => (RuleGroup::Unspecified, rules::pyflakes::rules::ReturnOutsideFunction),
+        (Pyflakes, "707") => (RuleGroup::Unspecified, rules::pyflakes::rules::DefaultExceptNotLast),
+        (Pyflakes, "722") => (RuleGroup::Unspecified, rules::pyflakes::rules::ForwardAnnotationSyntaxError),
+        (Pyflakes, "811") => (RuleGroup::Unspecified, rules::pyflakes::rules::RedefinedWhileUnused),
+        (Pyflakes, "821") => (RuleGroup::Unspecified, rules::pyflakes::rules::UndefinedName),
+        (Pyflakes, "822") => (RuleGroup::Unspecified, rules::pyflakes::rules::UndefinedExport),
+        (Pyflakes, "823") => (RuleGroup::Unspecified, rules::pyflakes::rules::UndefinedLocal),
+        (Pyflakes, "841") => (RuleGroup::Unspecified, rules::pyflakes::rules::UnusedVariable),
+        (Pyflakes, "842") => (RuleGroup::Unspecified, rules::pyflakes::rules::UnusedAnnotation),
+        (Pyflakes, "901") => (RuleGroup::Unspecified, rules::pyflakes::rules::RaiseNotImplemented),
 
         // pylint
-        (Pylint, "C0414") => Rule::UselessImportAlias,
-        (Pylint, "C1901") => Rule::CompareToEmptyString,
-        (Pylint, "C3002") => Rule::UnnecessaryDirectLambdaCall,
-        (Pylint, "E0100") => Rule::YieldInInit,
-        (Pylint, "E0101") => Rule::ReturnInInit,
-        (Pylint, "E0116") => Rule::ContinueInFinally,
-        (Pylint, "E0117") => Rule::NonlocalWithoutBinding,
-        (Pylint, "E0118") => Rule::LoadBeforeGlobalDeclaration,
-        (Pylint, "E0604") => Rule::InvalidAllObject,
-        (Pylint, "E0605") => Rule::InvalidAllFormat,
-        (Pylint, "E1142") => Rule::AwaitOutsideAsync,
-        (Pylint, "E1205") => Rule::LoggingTooManyArgs,
-        (Pylint, "E1206") => Rule::LoggingTooFewArgs,
-        (Pylint, "E1307") => Rule::BadStringFormatType,
-        (Pylint, "E1310") => Rule::BadStrStripCall,
-        (Pylint, "E1507") => Rule::InvalidEnvvarValue,
-        (Pylint, "E2502") => Rule::BidirectionalUnicode,
-        (Pylint, "E2510") => Rule::InvalidCharacterBackspace,
-        (Pylint, "E2512") => Rule::InvalidCharacterSub,
-        (Pylint, "E2513") => Rule::InvalidCharacterEsc,
-        (Pylint, "E2514") => Rule::InvalidCharacterNul,
-        (Pylint, "E2515") => Rule::InvalidCharacterZeroWidthSpace,
-        (Pylint, "R0133") => Rule::ComparisonOfConstant,
-        (Pylint, "R0206") => Rule::PropertyWithParameters,
-        (Pylint, "R0402") => Rule::ManualFromImport,
-        (Pylint, "R0911") => Rule::TooManyReturnStatements,
-        (Pylint, "R0912") => Rule::TooManyBranches,
-        (Pylint, "R0913") => Rule::TooManyArguments,
-        (Pylint, "R0915") => Rule::TooManyStatements,
-        (Pylint, "R1701") => Rule::RepeatedIsinstanceCalls,
-        (Pylint, "R1711") => Rule::UselessReturn,
-        (Pylint, "R1722") => Rule::SysExitAlias,
-        (Pylint, "R2004") => Rule::MagicValueComparison,
-        (Pylint, "R5501") => Rule::CollapsibleElseIf,
-        (Pylint, "W0120") => Rule::UselessElseOnLoop,
-        (Pylint, "W0129") => Rule::AssertOnStringLiteral,
-        (Pylint, "W0406") => Rule::ImportSelf,
-        (Pylint, "W0602") => Rule::GlobalVariableNotAssigned,
-        (Pylint, "W0603") => Rule::GlobalStatement,
-        (Pylint, "W0711") => Rule::BinaryOpException,
-        (Pylint, "W1508") => Rule::InvalidEnvvarDefault,
-        (Pylint, "W2901") => Rule::RedefinedLoopName,
-        (Pylint, "E0302") => Rule::UnexpectedSpecialMethodSignature,
+        (Pylint, "C0414") => (RuleGroup::Unspecified, rules::pylint::rules::UselessImportAlias),
+        (Pylint, "C1901") => (RuleGroup::Unspecified, rules::pylint::rules::CompareToEmptyString),
+        (Pylint, "C3002") => (RuleGroup::Unspecified, rules::pylint::rules::UnnecessaryDirectLambdaCall),
+        (Pylint, "C0208") => (RuleGroup::Unspecified, rules::pylint::rules::IterationOverSet),
+        (Pylint, "E0100") => (RuleGroup::Unspecified, rules::pylint::rules::YieldInInit),
+        (Pylint, "E0101") => (RuleGroup::Unspecified, rules::pylint::rules::ReturnInInit),
+        (Pylint, "E0116") => (RuleGroup::Unspecified, rules::pylint::rules::ContinueInFinally),
+        (Pylint, "E0117") => (RuleGroup::Unspecified, rules::pylint::rules::NonlocalWithoutBinding),
+        (Pylint, "E0118") => (RuleGroup::Unspecified, rules::pylint::rules::LoadBeforeGlobalDeclaration),
+        (Pylint, "E0241") => (RuleGroup::Unspecified, rules::pylint::rules::DuplicateBases),
+        (Pylint, "E0302") => (RuleGroup::Unspecified, rules::pylint::rules::UnexpectedSpecialMethodSignature),
+        (Pylint, "E0307") => (RuleGroup::Unspecified, rules::pylint::rules::InvalidStrReturnType),
+        (Pylint, "E0604") => (RuleGroup::Unspecified, rules::pylint::rules::InvalidAllObject),
+        (Pylint, "E0605") => (RuleGroup::Unspecified, rules::pylint::rules::InvalidAllFormat),
+        (Pylint, "E1142") => (RuleGroup::Unspecified, rules::pylint::rules::AwaitOutsideAsync),
+        (Pylint, "E1205") => (RuleGroup::Unspecified, rules::pylint::rules::LoggingTooManyArgs),
+        (Pylint, "E1206") => (RuleGroup::Unspecified, rules::pylint::rules::LoggingTooFewArgs),
+        (Pylint, "E1307") => (RuleGroup::Unspecified, rules::pylint::rules::BadStringFormatType),
+        (Pylint, "E1310") => (RuleGroup::Unspecified, rules::pylint::rules::BadStrStripCall),
+        (Pylint, "E1507") => (RuleGroup::Unspecified, rules::pylint::rules::InvalidEnvvarValue),
+        (Pylint, "E1700") => (RuleGroup::Unspecified, rules::pylint::rules::YieldFromInAsyncFunction),
+        (Pylint, "E2502") => (RuleGroup::Unspecified, rules::pylint::rules::BidirectionalUnicode),
+        (Pylint, "E2510") => (RuleGroup::Unspecified, rules::pylint::rules::InvalidCharacterBackspace),
+        (Pylint, "E2512") => (RuleGroup::Unspecified, rules::pylint::rules::InvalidCharacterSub),
+        (Pylint, "E2513") => (RuleGroup::Unspecified, rules::pylint::rules::InvalidCharacterEsc),
+        (Pylint, "E2514") => (RuleGroup::Unspecified, rules::pylint::rules::InvalidCharacterNul),
+        (Pylint, "E2515") => (RuleGroup::Unspecified, rules::pylint::rules::InvalidCharacterZeroWidthSpace),
+        (Pylint, "R0133") => (RuleGroup::Unspecified, rules::pylint::rules::ComparisonOfConstant),
+        (Pylint, "R0206") => (RuleGroup::Unspecified, rules::pylint::rules::PropertyWithParameters),
+        (Pylint, "R0402") => (RuleGroup::Unspecified, rules::pylint::rules::ManualFromImport),
+        (Pylint, "R0911") => (RuleGroup::Unspecified, rules::pylint::rules::TooManyReturnStatements),
+        (Pylint, "R0912") => (RuleGroup::Unspecified, rules::pylint::rules::TooManyBranches),
+        (Pylint, "R0913") => (RuleGroup::Unspecified, rules::pylint::rules::TooManyArguments),
+        (Pylint, "R0915") => (RuleGroup::Unspecified, rules::pylint::rules::TooManyStatements),
+        (Pylint, "R1701") => (RuleGroup::Unspecified, rules::pylint::rules::RepeatedIsinstanceCalls),
+        (Pylint, "R1711") => (RuleGroup::Unspecified, rules::pylint::rules::UselessReturn),
+        (Pylint, "R1722") => (RuleGroup::Unspecified, rules::pylint::rules::SysExitAlias),
+        (Pylint, "R2004") => (RuleGroup::Unspecified, rules::pylint::rules::MagicValueComparison),
+        (Pylint, "R5501") => (RuleGroup::Unspecified, rules::pylint::rules::CollapsibleElseIf),
+        (Pylint, "W0120") => (RuleGroup::Unspecified, rules::pylint::rules::UselessElseOnLoop),
+        (Pylint, "W0129") => (RuleGroup::Unspecified, rules::pylint::rules::AssertOnStringLiteral),
+        (Pylint, "W0131") => (RuleGroup::Unspecified, rules::pylint::rules::NamedExprWithoutContext),
+        (Pylint, "W0406") => (RuleGroup::Unspecified, rules::pylint::rules::ImportSelf),
+        (Pylint, "W0602") => (RuleGroup::Unspecified, rules::pylint::rules::GlobalVariableNotAssigned),
+        (Pylint, "W0603") => (RuleGroup::Unspecified, rules::pylint::rules::GlobalStatement),
+        (Pylint, "W0711") => (RuleGroup::Unspecified, rules::pylint::rules::BinaryOpException),
+        (Pylint, "W1508") => (RuleGroup::Unspecified, rules::pylint::rules::InvalidEnvvarDefault),
+        (Pylint, "W2901") => (RuleGroup::Unspecified, rules::pylint::rules::RedefinedLoopName),
+        (Pylint, "W3301") => (RuleGroup::Unspecified, rules::pylint::rules::NestedMinMax),
+
+        // flake8-async
+        (Flake8Async, "100") => (RuleGroup::Unspecified, rules::flake8_async::rules::BlockingHttpCallInAsyncFunction),
+        (Flake8Async, "101") => (RuleGroup::Unspecified, rules::flake8_async::rules::OpenSleepOrSubprocessInAsyncFunction),
+        (Flake8Async, "102") => (RuleGroup::Unspecified, rules::flake8_async::rules::BlockingOsCallInAsyncFunction),
 
         // flake8-builtins
-        (Flake8Builtins, "001") => Rule::BuiltinVariableShadowing,
-        (Flake8Builtins, "002") => Rule::BuiltinArgumentShadowing,
-        (Flake8Builtins, "003") => Rule::BuiltinAttributeShadowing,
+        (Flake8Builtins, "001") => (RuleGroup::Unspecified, rules::flake8_builtins::rules::BuiltinVariableShadowing),
+        (Flake8Builtins, "002") => (RuleGroup::Unspecified, rules::flake8_builtins::rules::BuiltinArgumentShadowing),
+        (Flake8Builtins, "003") => (RuleGroup::Unspecified, rules::flake8_builtins::rules::BuiltinAttributeShadowing),
 
         // flake8-bugbear
-        (Flake8Bugbear, "002") => Rule::UnaryPrefixIncrement,
-        (Flake8Bugbear, "003") => Rule::AssignmentToOsEnviron,
-        (Flake8Bugbear, "004") => Rule::UnreliableCallableCheck,
-        (Flake8Bugbear, "005") => Rule::StripWithMultiCharacters,
-        (Flake8Bugbear, "006") => Rule::MutableArgumentDefault,
-        (Flake8Bugbear, "007") => Rule::UnusedLoopControlVariable,
-        (Flake8Bugbear, "008") => Rule::FunctionCallInDefaultArgument,
-        (Flake8Bugbear, "009") => Rule::GetAttrWithConstant,
-        (Flake8Bugbear, "010") => Rule::SetAttrWithConstant,
-        (Flake8Bugbear, "011") => Rule::AssertFalse,
-        (Flake8Bugbear, "012") => Rule::JumpStatementInFinally,
-        (Flake8Bugbear, "013") => Rule::RedundantTupleInExceptionHandler,
-        (Flake8Bugbear, "014") => Rule::DuplicateHandlerException,
-        (Flake8Bugbear, "015") => Rule::UselessComparison,
-        (Flake8Bugbear, "016") => Rule::CannotRaiseLiteral,
-        (Flake8Bugbear, "017") => Rule::AssertRaisesException,
-        (Flake8Bugbear, "018") => Rule::UselessExpression,
-        (Flake8Bugbear, "019") => Rule::CachedInstanceMethod,
-        (Flake8Bugbear, "020") => Rule::LoopVariableOverridesIterator,
-        (Flake8Bugbear, "021") => Rule::FStringDocstring,
-        (Flake8Bugbear, "022") => Rule::UselessContextlibSuppress,
-        (Flake8Bugbear, "023") => Rule::FunctionUsesLoopVariable,
-        (Flake8Bugbear, "024") => Rule::AbstractBaseClassWithoutAbstractMethod,
-        (Flake8Bugbear, "025") => Rule::DuplicateTryBlockException,
-        (Flake8Bugbear, "026") => Rule::StarArgUnpackingAfterKeywordArg,
-        (Flake8Bugbear, "027") => Rule::EmptyMethodWithoutAbstractDecorator,
-        (Flake8Bugbear, "028") => Rule::NoExplicitStacklevel,
-        (Flake8Bugbear, "029") => Rule::ExceptWithEmptyTuple,
-        (Flake8Bugbear, "030") => Rule::ExceptWithNonExceptionClasses,
-        (Flake8Bugbear, "031") => Rule::ReuseOfGroupbyGenerator,
-        (Flake8Bugbear, "032") => Rule::UnintentionalTypeAnnotation,
-        (Flake8Bugbear, "904") => Rule::RaiseWithoutFromInsideExcept,
-        (Flake8Bugbear, "905") => Rule::ZipWithoutExplicitStrict,
+        (Flake8Bugbear, "002") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::UnaryPrefixIncrement),
+        (Flake8Bugbear, "003") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::AssignmentToOsEnviron),
+        (Flake8Bugbear, "004") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::UnreliableCallableCheck),
+        (Flake8Bugbear, "005") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::StripWithMultiCharacters),
+        (Flake8Bugbear, "006") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::MutableArgumentDefault),
+        (Flake8Bugbear, "007") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::UnusedLoopControlVariable),
+        (Flake8Bugbear, "008") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::FunctionCallInDefaultArgument),
+        (Flake8Bugbear, "009") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::GetAttrWithConstant),
+        (Flake8Bugbear, "010") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::SetAttrWithConstant),
+        (Flake8Bugbear, "011") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::AssertFalse),
+        (Flake8Bugbear, "012") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::JumpStatementInFinally),
+        (Flake8Bugbear, "013") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::RedundantTupleInExceptionHandler),
+        (Flake8Bugbear, "014") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::DuplicateHandlerException),
+        (Flake8Bugbear, "015") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::UselessComparison),
+        (Flake8Bugbear, "016") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::CannotRaiseLiteral),
+        (Flake8Bugbear, "017") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::AssertRaisesException),
+        (Flake8Bugbear, "018") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::UselessExpression),
+        (Flake8Bugbear, "019") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::CachedInstanceMethod),
+        (Flake8Bugbear, "020") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::LoopVariableOverridesIterator),
+        (Flake8Bugbear, "021") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::FStringDocstring),
+        (Flake8Bugbear, "022") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::UselessContextlibSuppress),
+        (Flake8Bugbear, "023") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::FunctionUsesLoopVariable),
+        (Flake8Bugbear, "024") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::AbstractBaseClassWithoutAbstractMethod),
+        (Flake8Bugbear, "025") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::DuplicateTryBlockException),
+        (Flake8Bugbear, "026") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::StarArgUnpackingAfterKeywordArg),
+        (Flake8Bugbear, "027") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::EmptyMethodWithoutAbstractDecorator),
+        (Flake8Bugbear, "028") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::NoExplicitStacklevel),
+        (Flake8Bugbear, "029") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::ExceptWithEmptyTuple),
+        (Flake8Bugbear, "030") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::ExceptWithNonExceptionClasses),
+        (Flake8Bugbear, "031") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::ReuseOfGroupbyGenerator),
+        (Flake8Bugbear, "032") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::UnintentionalTypeAnnotation),
+        (Flake8Bugbear, "033") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::DuplicateValue),
+        (Flake8Bugbear, "904") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::RaiseWithoutFromInsideExcept),
+        (Flake8Bugbear, "905") => (RuleGroup::Unspecified, rules::flake8_bugbear::rules::ZipWithoutExplicitStrict),
 
         // flake8-blind-except
-        (Flake8BlindExcept, "001") => Rule::BlindExcept,
+        (Flake8BlindExcept, "001") => (RuleGroup::Unspecified, rules::flake8_blind_except::rules::BlindExcept),
 
         // flake8-comprehensions
-        (Flake8Comprehensions, "00") => Rule::UnnecessaryGeneratorList,
-        (Flake8Comprehensions, "01") => Rule::UnnecessaryGeneratorSet,
-        (Flake8Comprehensions, "02") => Rule::UnnecessaryGeneratorDict,
-        (Flake8Comprehensions, "03") => Rule::UnnecessaryListComprehensionSet,
-        (Flake8Comprehensions, "04") => Rule::UnnecessaryListComprehensionDict,
-        (Flake8Comprehensions, "05") => Rule::UnnecessaryLiteralSet,
-        (Flake8Comprehensions, "06") => Rule::UnnecessaryLiteralDict,
-        (Flake8Comprehensions, "08") => Rule::UnnecessaryCollectionCall,
-        (Flake8Comprehensions, "09") => Rule::UnnecessaryLiteralWithinTupleCall,
-        (Flake8Comprehensions, "10") => Rule::UnnecessaryLiteralWithinListCall,
-        (Flake8Comprehensions, "11") => Rule::UnnecessaryListCall,
-        (Flake8Comprehensions, "13") => Rule::UnnecessaryCallAroundSorted,
-        (Flake8Comprehensions, "14") => Rule::UnnecessaryDoubleCastOrProcess,
-        (Flake8Comprehensions, "15") => Rule::UnnecessarySubscriptReversal,
-        (Flake8Comprehensions, "16") => Rule::UnnecessaryComprehension,
-        (Flake8Comprehensions, "17") => Rule::UnnecessaryMap,
-        (Flake8Comprehensions, "18") => Rule::UnnecessaryLiteralWithinDictCall,
-        (Flake8Comprehensions, "19") => Rule::UnnecessaryComprehensionAnyAll,
+        (Flake8Comprehensions, "00") => (RuleGroup::Unspecified, rules::flake8_comprehensions::rules::UnnecessaryGeneratorList),
+        (Flake8Comprehensions, "01") => (RuleGroup::Unspecified, rules::flake8_comprehensions::rules::UnnecessaryGeneratorSet),
+        (Flake8Comprehensions, "02") => (RuleGroup::Unspecified, rules::flake8_comprehensions::rules::UnnecessaryGeneratorDict),
+        (Flake8Comprehensions, "03") => (RuleGroup::Unspecified, rules::flake8_comprehensions::rules::UnnecessaryListComprehensionSet),
+        (Flake8Comprehensions, "04") => (RuleGroup::Unspecified, rules::flake8_comprehensions::rules::UnnecessaryListComprehensionDict),
+        (Flake8Comprehensions, "05") => (RuleGroup::Unspecified, rules::flake8_comprehensions::rules::UnnecessaryLiteralSet),
+        (Flake8Comprehensions, "06") => (RuleGroup::Unspecified, rules::flake8_comprehensions::rules::UnnecessaryLiteralDict),
+        (Flake8Comprehensions, "08") => (RuleGroup::Unspecified, rules::flake8_comprehensions::rules::UnnecessaryCollectionCall),
+        (Flake8Comprehensions, "09") => (RuleGroup::Unspecified, rules::flake8_comprehensions::rules::UnnecessaryLiteralWithinTupleCall),
+        (Flake8Comprehensions, "10") => (RuleGroup::Unspecified, rules::flake8_comprehensions::rules::UnnecessaryLiteralWithinListCall),
+        (Flake8Comprehensions, "11") => (RuleGroup::Unspecified, rules::flake8_comprehensions::rules::UnnecessaryListCall),
+        (Flake8Comprehensions, "13") => (RuleGroup::Unspecified, rules::flake8_comprehensions::rules::UnnecessaryCallAroundSorted),
+        (Flake8Comprehensions, "14") => (RuleGroup::Unspecified, rules::flake8_comprehensions::rules::UnnecessaryDoubleCastOrProcess),
+        (Flake8Comprehensions, "15") => (RuleGroup::Unspecified, rules::flake8_comprehensions::rules::UnnecessarySubscriptReversal),
+        (Flake8Comprehensions, "16") => (RuleGroup::Unspecified, rules::flake8_comprehensions::rules::UnnecessaryComprehension),
+        (Flake8Comprehensions, "17") => (RuleGroup::Unspecified, rules::flake8_comprehensions::rules::UnnecessaryMap),
+        (Flake8Comprehensions, "18") => (RuleGroup::Unspecified, rules::flake8_comprehensions::rules::UnnecessaryLiteralWithinDictCall),
+        (Flake8Comprehensions, "19") => (RuleGroup::Unspecified, rules::flake8_comprehensions::rules::UnnecessaryComprehensionAnyAll),
 
         // flake8-debugger
-        (Flake8Debugger, "0") => Rule::Debugger,
+        (Flake8Debugger, "0") => (RuleGroup::Unspecified, rules::flake8_debugger::rules::Debugger),
 
         // mccabe
-        (McCabe, "1") => Rule::ComplexStructure,
+        (McCabe, "1") => (RuleGroup::Unspecified, rules::mccabe::rules::ComplexStructure),
 
         // flake8-tidy-imports
-        (Flake8TidyImports, "251") => Rule::BannedApi,
-        (Flake8TidyImports, "252") => Rule::RelativeImports,
+        (Flake8TidyImports, "251") => (RuleGroup::Unspecified, rules::flake8_tidy_imports::rules::BannedApi),
+        (Flake8TidyImports, "252") => (RuleGroup::Unspecified, rules::flake8_tidy_imports::rules::RelativeImports),
 
         // flake8-return
-        (Flake8Return, "501") => Rule::UnnecessaryReturnNone,
-        (Flake8Return, "502") => Rule::ImplicitReturnValue,
-        (Flake8Return, "503") => Rule::ImplicitReturn,
-        (Flake8Return, "504") => Rule::UnnecessaryAssign,
-        (Flake8Return, "505") => Rule::SuperfluousElseReturn,
-        (Flake8Return, "506") => Rule::SuperfluousElseRaise,
-        (Flake8Return, "507") => Rule::SuperfluousElseContinue,
-        (Flake8Return, "508") => Rule::SuperfluousElseBreak,
+        (Flake8Return, "501") => (RuleGroup::Unspecified, rules::flake8_return::rules::UnnecessaryReturnNone),
+        (Flake8Return, "502") => (RuleGroup::Unspecified, rules::flake8_return::rules::ImplicitReturnValue),
+        (Flake8Return, "503") => (RuleGroup::Unspecified, rules::flake8_return::rules::ImplicitReturn),
+        (Flake8Return, "504") => (RuleGroup::Unspecified, rules::flake8_return::rules::UnnecessaryAssign),
+        (Flake8Return, "505") => (RuleGroup::Unspecified, rules::flake8_return::rules::SuperfluousElseReturn),
+        (Flake8Return, "506") => (RuleGroup::Unspecified, rules::flake8_return::rules::SuperfluousElseRaise),
+        (Flake8Return, "507") => (RuleGroup::Unspecified, rules::flake8_return::rules::SuperfluousElseContinue),
+        (Flake8Return, "508") => (RuleGroup::Unspecified, rules::flake8_return::rules::SuperfluousElseBreak),
 
         // flake8-gettext
-        (Flake8GetText, "001") => Rule::FStringInGetTextFuncCall,
-        (Flake8GetText, "002") => Rule::FormatInGetTextFuncCall,
-        (Flake8GetText, "003") => Rule::PrintfInGetTextFuncCall,
+        (Flake8GetText, "001") => (RuleGroup::Unspecified, rules::flake8_gettext::rules::FStringInGetTextFuncCall),
+        (Flake8GetText, "002") => (RuleGroup::Unspecified, rules::flake8_gettext::rules::FormatInGetTextFuncCall),
+        (Flake8GetText, "003") => (RuleGroup::Unspecified, rules::flake8_gettext::rules::PrintfInGetTextFuncCall),
 
         // flake8-implicit-str-concat
-        (Flake8ImplicitStrConcat, "001") => Rule::SingleLineImplicitStringConcatenation,
-        (Flake8ImplicitStrConcat, "002") => Rule::MultiLineImplicitStringConcatenation,
-        (Flake8ImplicitStrConcat, "003") => Rule::ExplicitStringConcatenation,
+        (Flake8ImplicitStrConcat, "001") => (RuleGroup::Unspecified, rules::flake8_implicit_str_concat::rules::SingleLineImplicitStringConcatenation),
+        (Flake8ImplicitStrConcat, "002") => (RuleGroup::Unspecified, rules::flake8_implicit_str_concat::rules::MultiLineImplicitStringConcatenation),
+        (Flake8ImplicitStrConcat, "003") => (RuleGroup::Unspecified, rules::flake8_implicit_str_concat::rules::ExplicitStringConcatenation),
 
         // flake8-print
-        (Flake8Print, "1") => Rule::Print,
-        (Flake8Print, "3") => Rule::PPrint,
+        (Flake8Print, "1") => (RuleGroup::Unspecified, rules::flake8_print::rules::Print),
+        (Flake8Print, "3") => (RuleGroup::Unspecified, rules::flake8_print::rules::PPrint),
 
         // flake8-quotes
-        (Flake8Quotes, "000") => Rule::BadQuotesInlineString,
-        (Flake8Quotes, "001") => Rule::BadQuotesMultilineString,
-        (Flake8Quotes, "002") => Rule::BadQuotesDocstring,
-        (Flake8Quotes, "003") => Rule::AvoidableEscapedQuote,
+        (Flake8Quotes, "000") => (RuleGroup::Unspecified, rules::flake8_quotes::rules::BadQuotesInlineString),
+        (Flake8Quotes, "001") => (RuleGroup::Unspecified, rules::flake8_quotes::rules::BadQuotesMultilineString),
+        (Flake8Quotes, "002") => (RuleGroup::Unspecified, rules::flake8_quotes::rules::BadQuotesDocstring),
+        (Flake8Quotes, "003") => (RuleGroup::Unspecified, rules::flake8_quotes::rules::AvoidableEscapedQuote),
 
         // flake8-annotations
-        (Flake8Annotations, "001") => Rule::MissingTypeFunctionArgument,
-        (Flake8Annotations, "002") => Rule::MissingTypeArgs,
-        (Flake8Annotations, "003") => Rule::MissingTypeKwargs,
-        (Flake8Annotations, "101") => Rule::MissingTypeSelf,
-        (Flake8Annotations, "102") => Rule::MissingTypeCls,
-        (Flake8Annotations, "201") => Rule::MissingReturnTypeUndocumentedPublicFunction,
-        (Flake8Annotations, "202") => Rule::MissingReturnTypePrivateFunction,
-        (Flake8Annotations, "204") => Rule::MissingReturnTypeSpecialMethod,
-        (Flake8Annotations, "205") => Rule::MissingReturnTypeStaticMethod,
-        (Flake8Annotations, "206") => Rule::MissingReturnTypeClassMethod,
-        (Flake8Annotations, "401") => Rule::AnyType,
+        (Flake8Annotations, "001") => (RuleGroup::Unspecified, rules::flake8_annotations::rules::MissingTypeFunctionArgument),
+        (Flake8Annotations, "002") => (RuleGroup::Unspecified, rules::flake8_annotations::rules::MissingTypeArgs),
+        (Flake8Annotations, "003") => (RuleGroup::Unspecified, rules::flake8_annotations::rules::MissingTypeKwargs),
+        (Flake8Annotations, "101") => (RuleGroup::Unspecified, rules::flake8_annotations::rules::MissingTypeSelf),
+        (Flake8Annotations, "102") => (RuleGroup::Unspecified, rules::flake8_annotations::rules::MissingTypeCls),
+        (Flake8Annotations, "201") => (RuleGroup::Unspecified, rules::flake8_annotations::rules::MissingReturnTypeUndocumentedPublicFunction),
+        (Flake8Annotations, "202") => (RuleGroup::Unspecified, rules::flake8_annotations::rules::MissingReturnTypePrivateFunction),
+        (Flake8Annotations, "204") => (RuleGroup::Unspecified, rules::flake8_annotations::rules::MissingReturnTypeSpecialMethod),
+        (Flake8Annotations, "205") => (RuleGroup::Unspecified, rules::flake8_annotations::rules::MissingReturnTypeStaticMethod),
+        (Flake8Annotations, "206") => (RuleGroup::Unspecified, rules::flake8_annotations::rules::MissingReturnTypeClassMethod),
+        (Flake8Annotations, "401") => (RuleGroup::Unspecified, rules::flake8_annotations::rules::AnyType),
+
+        // flake8-future-annotations
+        (Flake8FutureAnnotations, "100") => (RuleGroup::Unspecified, rules::flake8_future_annotations::rules::FutureRewritableTypeAnnotation),
+        (Flake8FutureAnnotations, "102") => (RuleGroup::Unspecified, rules::flake8_future_annotations::rules::FutureRequiredTypeAnnotation),
 
         // flake8-2020
-        (Flake82020, "101") => Rule::SysVersionSlice3,
-        (Flake82020, "102") => Rule::SysVersion2,
-        (Flake82020, "103") => Rule::SysVersionCmpStr3,
-        (Flake82020, "201") => Rule::SysVersionInfo0Eq3,
-        (Flake82020, "202") => Rule::SixPY3,
-        (Flake82020, "203") => Rule::SysVersionInfo1CmpInt,
-        (Flake82020, "204") => Rule::SysVersionInfoMinorCmpInt,
-        (Flake82020, "301") => Rule::SysVersion0,
-        (Flake82020, "302") => Rule::SysVersionCmpStr10,
-        (Flake82020, "303") => Rule::SysVersionSlice1,
+        (Flake82020, "101") => (RuleGroup::Unspecified, rules::flake8_2020::rules::SysVersionSlice3),
+        (Flake82020, "102") => (RuleGroup::Unspecified, rules::flake8_2020::rules::SysVersion2),
+        (Flake82020, "103") => (RuleGroup::Unspecified, rules::flake8_2020::rules::SysVersionCmpStr3),
+        (Flake82020, "201") => (RuleGroup::Unspecified, rules::flake8_2020::rules::SysVersionInfo0Eq3),
+        (Flake82020, "202") => (RuleGroup::Unspecified, rules::flake8_2020::rules::SixPY3),
+        (Flake82020, "203") => (RuleGroup::Unspecified, rules::flake8_2020::rules::SysVersionInfo1CmpInt),
+        (Flake82020, "204") => (RuleGroup::Unspecified, rules::flake8_2020::rules::SysVersionInfoMinorCmpInt),
+        (Flake82020, "301") => (RuleGroup::Unspecified, rules::flake8_2020::rules::SysVersion0),
+        (Flake82020, "302") => (RuleGroup::Unspecified, rules::flake8_2020::rules::SysVersionCmpStr10),
+        (Flake82020, "303") => (RuleGroup::Unspecified, rules::flake8_2020::rules::SysVersionSlice1),
 
         // flake8-simplify
-        (Flake8Simplify, "101") => Rule::DuplicateIsinstanceCall,
-        (Flake8Simplify, "102") => Rule::CollapsibleIf,
-        (Flake8Simplify, "103") => Rule::NeedlessBool,
-        (Flake8Simplify, "105") => Rule::SuppressibleException,
-        (Flake8Simplify, "107") => Rule::ReturnInTryExceptFinally,
-        (Flake8Simplify, "108") => Rule::IfElseBlockInsteadOfIfExp,
-        (Flake8Simplify, "109") => Rule::CompareWithTuple,
-        (Flake8Simplify, "110") => Rule::ReimplementedBuiltin,
-        (Flake8Simplify, "112") => Rule::UncapitalizedEnvironmentVariables,
-        (Flake8Simplify, "114") => Rule::IfWithSameArms,
-        (Flake8Simplify, "115") => Rule::OpenFileWithContextHandler,
-        (Flake8Simplify, "116") => Rule::IfElseBlockInsteadOfDictLookup,
-        (Flake8Simplify, "117") => Rule::MultipleWithStatements,
-        (Flake8Simplify, "118") => Rule::InDictKeys,
-        (Flake8Simplify, "201") => Rule::NegateEqualOp,
-        (Flake8Simplify, "202") => Rule::NegateNotEqualOp,
-        (Flake8Simplify, "208") => Rule::DoubleNegation,
-        (Flake8Simplify, "210") => Rule::IfExprWithTrueFalse,
-        (Flake8Simplify, "211") => Rule::IfExprWithFalseTrue,
-        (Flake8Simplify, "212") => Rule::IfExprWithTwistedArms,
-        (Flake8Simplify, "220") => Rule::ExprAndNotExpr,
-        (Flake8Simplify, "221") => Rule::ExprOrNotExpr,
-        (Flake8Simplify, "222") => Rule::ExprOrTrue,
-        (Flake8Simplify, "223") => Rule::ExprAndFalse,
-        (Flake8Simplify, "300") => Rule::YodaConditions,
-        (Flake8Simplify, "401") => Rule::IfElseBlockInsteadOfDictGet,
-        (Flake8Simplify, "910") => Rule::DictGetWithNoneDefault,
+        (Flake8Simplify, "101") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::DuplicateIsinstanceCall),
+        (Flake8Simplify, "102") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::CollapsibleIf),
+        (Flake8Simplify, "103") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::NeedlessBool),
+        (Flake8Simplify, "105") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::SuppressibleException),
+        (Flake8Simplify, "107") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::ReturnInTryExceptFinally),
+        (Flake8Simplify, "108") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::IfElseBlockInsteadOfIfExp),
+        (Flake8Simplify, "109") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::CompareWithTuple),
+        (Flake8Simplify, "110") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::ReimplementedBuiltin),
+        (Flake8Simplify, "112") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::UncapitalizedEnvironmentVariables),
+        (Flake8Simplify, "114") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::IfWithSameArms),
+        (Flake8Simplify, "115") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::OpenFileWithContextHandler),
+        (Flake8Simplify, "116") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::IfElseBlockInsteadOfDictLookup),
+        (Flake8Simplify, "117") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::MultipleWithStatements),
+        (Flake8Simplify, "118") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::InDictKeys),
+        (Flake8Simplify, "201") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::NegateEqualOp),
+        (Flake8Simplify, "202") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::NegateNotEqualOp),
+        (Flake8Simplify, "208") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::DoubleNegation),
+        (Flake8Simplify, "210") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::IfExprWithTrueFalse),
+        (Flake8Simplify, "211") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::IfExprWithFalseTrue),
+        (Flake8Simplify, "212") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::IfExprWithTwistedArms),
+        (Flake8Simplify, "220") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::ExprAndNotExpr),
+        (Flake8Simplify, "221") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::ExprOrNotExpr),
+        (Flake8Simplify, "222") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::ExprOrTrue),
+        (Flake8Simplify, "223") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::ExprAndFalse),
+        (Flake8Simplify, "300") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::YodaConditions),
+        (Flake8Simplify, "401") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::IfElseBlockInsteadOfDictGet),
+        (Flake8Simplify, "910") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::DictGetWithNoneDefault),
 
         // pyupgrade
-        (Pyupgrade, "001") => Rule::UselessMetaclassType,
-        (Pyupgrade, "003") => Rule::TypeOfPrimitive,
-        (Pyupgrade, "004") => Rule::UselessObjectInheritance,
-        (Pyupgrade, "005") => Rule::DeprecatedUnittestAlias,
-        (Pyupgrade, "006") => Rule::NonPEP585Annotation,
-        (Pyupgrade, "007") => Rule::NonPEP604Annotation,
-        (Pyupgrade, "008") => Rule::SuperCallWithParameters,
-        (Pyupgrade, "009") => Rule::UTF8EncodingDeclaration,
-        (Pyupgrade, "010") => Rule::UnnecessaryFutureImport,
-        (Pyupgrade, "011") => Rule::LRUCacheWithoutParameters,
-        (Pyupgrade, "012") => Rule::UnnecessaryEncodeUTF8,
-        (Pyupgrade, "013") => Rule::ConvertTypedDictFunctionalToClass,
-        (Pyupgrade, "014") => Rule::ConvertNamedTupleFunctionalToClass,
-        (Pyupgrade, "015") => Rule::RedundantOpenModes,
-        (Pyupgrade, "017") => Rule::DatetimeTimezoneUTC,
-        (Pyupgrade, "018") => Rule::NativeLiterals,
-        (Pyupgrade, "019") => Rule::TypingTextStrAlias,
-        (Pyupgrade, "020") => Rule::OpenAlias,
-        (Pyupgrade, "021") => Rule::ReplaceUniversalNewlines,
-        (Pyupgrade, "022") => Rule::ReplaceStdoutStderr,
-        (Pyupgrade, "023") => Rule::DeprecatedCElementTree,
-        (Pyupgrade, "024") => Rule::OSErrorAlias,
-        (Pyupgrade, "025") => Rule::UnicodeKindPrefix,
-        (Pyupgrade, "026") => Rule::DeprecatedMockImport,
-        (Pyupgrade, "027") => Rule::UnpackedListComprehension,
-        (Pyupgrade, "028") => Rule::YieldInForLoop,
-        (Pyupgrade, "029") => Rule::UnnecessaryBuiltinImport,
-        (Pyupgrade, "030") => Rule::FormatLiterals,
-        (Pyupgrade, "031") => Rule::PrintfStringFormatting,
-        (Pyupgrade, "032") => Rule::FString,
-        (Pyupgrade, "033") => Rule::LRUCacheWithMaxsizeNone,
-        (Pyupgrade, "034") => Rule::ExtraneousParentheses,
-        (Pyupgrade, "035") => Rule::DeprecatedImport,
-        (Pyupgrade, "036") => Rule::OutdatedVersionBlock,
-        (Pyupgrade, "037") => Rule::QuotedAnnotation,
-        (Pyupgrade, "038") => Rule::NonPEP604Isinstance,
+        (Pyupgrade, "001") => (RuleGroup::Unspecified, rules::pyupgrade::rules::UselessMetaclassType),
+        (Pyupgrade, "003") => (RuleGroup::Unspecified, rules::pyupgrade::rules::TypeOfPrimitive),
+        (Pyupgrade, "004") => (RuleGroup::Unspecified, rules::pyupgrade::rules::UselessObjectInheritance),
+        (Pyupgrade, "005") => (RuleGroup::Unspecified, rules::pyupgrade::rules::DeprecatedUnittestAlias),
+        (Pyupgrade, "006") => (RuleGroup::Unspecified, rules::pyupgrade::rules::NonPEP585Annotation),
+        (Pyupgrade, "007") => (RuleGroup::Unspecified, rules::pyupgrade::rules::NonPEP604Annotation),
+        (Pyupgrade, "008") => (RuleGroup::Unspecified, rules::pyupgrade::rules::SuperCallWithParameters),
+        (Pyupgrade, "009") => (RuleGroup::Unspecified, rules::pyupgrade::rules::UTF8EncodingDeclaration),
+        (Pyupgrade, "010") => (RuleGroup::Unspecified, rules::pyupgrade::rules::UnnecessaryFutureImport),
+        (Pyupgrade, "011") => (RuleGroup::Unspecified, rules::pyupgrade::rules::LRUCacheWithoutParameters),
+        (Pyupgrade, "012") => (RuleGroup::Unspecified, rules::pyupgrade::rules::UnnecessaryEncodeUTF8),
+        (Pyupgrade, "013") => (RuleGroup::Unspecified, rules::pyupgrade::rules::ConvertTypedDictFunctionalToClass),
+        (Pyupgrade, "014") => (RuleGroup::Unspecified, rules::pyupgrade::rules::ConvertNamedTupleFunctionalToClass),
+        (Pyupgrade, "015") => (RuleGroup::Unspecified, rules::pyupgrade::rules::RedundantOpenModes),
+        (Pyupgrade, "017") => (RuleGroup::Unspecified, rules::pyupgrade::rules::DatetimeTimezoneUTC),
+        (Pyupgrade, "018") => (RuleGroup::Unspecified, rules::pyupgrade::rules::NativeLiterals),
+        (Pyupgrade, "019") => (RuleGroup::Unspecified, rules::pyupgrade::rules::TypingTextStrAlias),
+        (Pyupgrade, "020") => (RuleGroup::Unspecified, rules::pyupgrade::rules::OpenAlias),
+        (Pyupgrade, "021") => (RuleGroup::Unspecified, rules::pyupgrade::rules::ReplaceUniversalNewlines),
+        (Pyupgrade, "022") => (RuleGroup::Unspecified, rules::pyupgrade::rules::ReplaceStdoutStderr),
+        (Pyupgrade, "023") => (RuleGroup::Unspecified, rules::pyupgrade::rules::DeprecatedCElementTree),
+        (Pyupgrade, "024") => (RuleGroup::Unspecified, rules::pyupgrade::rules::OSErrorAlias),
+        (Pyupgrade, "025") => (RuleGroup::Unspecified, rules::pyupgrade::rules::UnicodeKindPrefix),
+        (Pyupgrade, "026") => (RuleGroup::Unspecified, rules::pyupgrade::rules::DeprecatedMockImport),
+        (Pyupgrade, "027") => (RuleGroup::Unspecified, rules::pyupgrade::rules::UnpackedListComprehension),
+        (Pyupgrade, "028") => (RuleGroup::Unspecified, rules::pyupgrade::rules::YieldInForLoop),
+        (Pyupgrade, "029") => (RuleGroup::Unspecified, rules::pyupgrade::rules::UnnecessaryBuiltinImport),
+        (Pyupgrade, "030") => (RuleGroup::Unspecified, rules::pyupgrade::rules::FormatLiterals),
+        (Pyupgrade, "031") => (RuleGroup::Unspecified, rules::pyupgrade::rules::PrintfStringFormatting),
+        (Pyupgrade, "032") => (RuleGroup::Unspecified, rules::pyupgrade::rules::FString),
+        (Pyupgrade, "033") => (RuleGroup::Unspecified, rules::pyupgrade::rules::LRUCacheWithMaxsizeNone),
+        (Pyupgrade, "034") => (RuleGroup::Unspecified, rules::pyupgrade::rules::ExtraneousParentheses),
+        (Pyupgrade, "035") => (RuleGroup::Unspecified, rules::pyupgrade::rules::DeprecatedImport),
+        (Pyupgrade, "036") => (RuleGroup::Unspecified, rules::pyupgrade::rules::OutdatedVersionBlock),
+        (Pyupgrade, "037") => (RuleGroup::Unspecified, rules::pyupgrade::rules::QuotedAnnotation),
+        (Pyupgrade, "038") => (RuleGroup::Unspecified, rules::pyupgrade::rules::NonPEP604Isinstance),
 
         // pydocstyle
-        (Pydocstyle, "100") => Rule::UndocumentedPublicModule,
-        (Pydocstyle, "101") => Rule::UndocumentedPublicClass,
-        (Pydocstyle, "102") => Rule::UndocumentedPublicMethod,
-        (Pydocstyle, "103") => Rule::UndocumentedPublicFunction,
-        (Pydocstyle, "104") => Rule::UndocumentedPublicPackage,
-        (Pydocstyle, "105") => Rule::UndocumentedMagicMethod,
-        (Pydocstyle, "106") => Rule::UndocumentedPublicNestedClass,
-        (Pydocstyle, "107") => Rule::UndocumentedPublicInit,
-        (Pydocstyle, "200") => Rule::FitsOnOneLine,
-        (Pydocstyle, "201") => Rule::NoBlankLineBeforeFunction,
-        (Pydocstyle, "202") => Rule::NoBlankLineAfterFunction,
-        (Pydocstyle, "203") => Rule::OneBlankLineBeforeClass,
-        (Pydocstyle, "204") => Rule::OneBlankLineAfterClass,
-        (Pydocstyle, "205") => Rule::BlankLineAfterSummary,
-        (Pydocstyle, "206") => Rule::IndentWithSpaces,
-        (Pydocstyle, "207") => Rule::UnderIndentation,
-        (Pydocstyle, "208") => Rule::OverIndentation,
-        (Pydocstyle, "209") => Rule::NewLineAfterLastParagraph,
-        (Pydocstyle, "210") => Rule::SurroundingWhitespace,
-        (Pydocstyle, "211") => Rule::BlankLineBeforeClass,
-        (Pydocstyle, "212") => Rule::MultiLineSummaryFirstLine,
-        (Pydocstyle, "213") => Rule::MultiLineSummarySecondLine,
-        (Pydocstyle, "214") => Rule::SectionNotOverIndented,
-        (Pydocstyle, "215") => Rule::SectionUnderlineNotOverIndented,
-        (Pydocstyle, "300") => Rule::TripleSingleQuotes,
-        (Pydocstyle, "301") => Rule::EscapeSequenceInDocstring,
-        (Pydocstyle, "400") => Rule::EndsInPeriod,
-        (Pydocstyle, "401") => Rule::NonImperativeMood,
-        (Pydocstyle, "402") => Rule::NoSignature,
-        (Pydocstyle, "403") => Rule::FirstLineCapitalized,
-        (Pydocstyle, "404") => Rule::DocstringStartsWithThis,
-        (Pydocstyle, "405") => Rule::CapitalizeSectionName,
-        (Pydocstyle, "406") => Rule::NewLineAfterSectionName,
-        (Pydocstyle, "407") => Rule::DashedUnderlineAfterSection,
-        (Pydocstyle, "408") => Rule::SectionUnderlineAfterName,
-        (Pydocstyle, "409") => Rule::SectionUnderlineMatchesSectionLength,
-        (Pydocstyle, "410") => Rule::NoBlankLineAfterSection,
-        (Pydocstyle, "411") => Rule::NoBlankLineBeforeSection,
-        (Pydocstyle, "412") => Rule::BlankLinesBetweenHeaderAndContent,
-        (Pydocstyle, "413") => Rule::BlankLineAfterLastSection,
-        (Pydocstyle, "414") => Rule::EmptyDocstringSection,
-        (Pydocstyle, "415") => Rule::EndsInPunctuation,
-        (Pydocstyle, "416") => Rule::SectionNameEndsInColon,
-        (Pydocstyle, "417") => Rule::UndocumentedParam,
-        (Pydocstyle, "418") => Rule::OverloadWithDocstring,
-        (Pydocstyle, "419") => Rule::EmptyDocstring,
+        (Pydocstyle, "100") => (RuleGroup::Unspecified, rules::pydocstyle::rules::UndocumentedPublicModule),
+        (Pydocstyle, "101") => (RuleGroup::Unspecified, rules::pydocstyle::rules::UndocumentedPublicClass),
+        (Pydocstyle, "102") => (RuleGroup::Unspecified, rules::pydocstyle::rules::UndocumentedPublicMethod),
+        (Pydocstyle, "103") => (RuleGroup::Unspecified, rules::pydocstyle::rules::UndocumentedPublicFunction),
+        (Pydocstyle, "104") => (RuleGroup::Unspecified, rules::pydocstyle::rules::UndocumentedPublicPackage),
+        (Pydocstyle, "105") => (RuleGroup::Unspecified, rules::pydocstyle::rules::UndocumentedMagicMethod),
+        (Pydocstyle, "106") => (RuleGroup::Unspecified, rules::pydocstyle::rules::UndocumentedPublicNestedClass),
+        (Pydocstyle, "107") => (RuleGroup::Unspecified, rules::pydocstyle::rules::UndocumentedPublicInit),
+        (Pydocstyle, "200") => (RuleGroup::Unspecified, rules::pydocstyle::rules::FitsOnOneLine),
+        (Pydocstyle, "201") => (RuleGroup::Unspecified, rules::pydocstyle::rules::NoBlankLineBeforeFunction),
+        (Pydocstyle, "202") => (RuleGroup::Unspecified, rules::pydocstyle::rules::NoBlankLineAfterFunction),
+        (Pydocstyle, "203") => (RuleGroup::Unspecified, rules::pydocstyle::rules::OneBlankLineBeforeClass),
+        (Pydocstyle, "204") => (RuleGroup::Unspecified, rules::pydocstyle::rules::OneBlankLineAfterClass),
+        (Pydocstyle, "205") => (RuleGroup::Unspecified, rules::pydocstyle::rules::BlankLineAfterSummary),
+        (Pydocstyle, "206") => (RuleGroup::Unspecified, rules::pydocstyle::rules::IndentWithSpaces),
+        (Pydocstyle, "207") => (RuleGroup::Unspecified, rules::pydocstyle::rules::UnderIndentation),
+        (Pydocstyle, "208") => (RuleGroup::Unspecified, rules::pydocstyle::rules::OverIndentation),
+        (Pydocstyle, "209") => (RuleGroup::Unspecified, rules::pydocstyle::rules::NewLineAfterLastParagraph),
+        (Pydocstyle, "210") => (RuleGroup::Unspecified, rules::pydocstyle::rules::SurroundingWhitespace),
+        (Pydocstyle, "211") => (RuleGroup::Unspecified, rules::pydocstyle::rules::BlankLineBeforeClass),
+        (Pydocstyle, "212") => (RuleGroup::Unspecified, rules::pydocstyle::rules::MultiLineSummaryFirstLine),
+        (Pydocstyle, "213") => (RuleGroup::Unspecified, rules::pydocstyle::rules::MultiLineSummarySecondLine),
+        (Pydocstyle, "214") => (RuleGroup::Unspecified, rules::pydocstyle::rules::SectionNotOverIndented),
+        (Pydocstyle, "215") => (RuleGroup::Unspecified, rules::pydocstyle::rules::SectionUnderlineNotOverIndented),
+        (Pydocstyle, "300") => (RuleGroup::Unspecified, rules::pydocstyle::rules::TripleSingleQuotes),
+        (Pydocstyle, "301") => (RuleGroup::Unspecified, rules::pydocstyle::rules::EscapeSequenceInDocstring),
+        (Pydocstyle, "400") => (RuleGroup::Unspecified, rules::pydocstyle::rules::EndsInPeriod),
+        (Pydocstyle, "401") => (RuleGroup::Unspecified, rules::pydocstyle::rules::NonImperativeMood),
+        (Pydocstyle, "402") => (RuleGroup::Unspecified, rules::pydocstyle::rules::NoSignature),
+        (Pydocstyle, "403") => (RuleGroup::Unspecified, rules::pydocstyle::rules::FirstLineCapitalized),
+        (Pydocstyle, "404") => (RuleGroup::Unspecified, rules::pydocstyle::rules::DocstringStartsWithThis),
+        (Pydocstyle, "405") => (RuleGroup::Unspecified, rules::pydocstyle::rules::CapitalizeSectionName),
+        (Pydocstyle, "406") => (RuleGroup::Unspecified, rules::pydocstyle::rules::NewLineAfterSectionName),
+        (Pydocstyle, "407") => (RuleGroup::Unspecified, rules::pydocstyle::rules::DashedUnderlineAfterSection),
+        (Pydocstyle, "408") => (RuleGroup::Unspecified, rules::pydocstyle::rules::SectionUnderlineAfterName),
+        (Pydocstyle, "409") => (RuleGroup::Unspecified, rules::pydocstyle::rules::SectionUnderlineMatchesSectionLength),
+        (Pydocstyle, "410") => (RuleGroup::Unspecified, rules::pydocstyle::rules::NoBlankLineAfterSection),
+        (Pydocstyle, "411") => (RuleGroup::Unspecified, rules::pydocstyle::rules::NoBlankLineBeforeSection),
+        (Pydocstyle, "412") => (RuleGroup::Unspecified, rules::pydocstyle::rules::BlankLinesBetweenHeaderAndContent),
+        (Pydocstyle, "413") => (RuleGroup::Unspecified, rules::pydocstyle::rules::BlankLineAfterLastSection),
+        (Pydocstyle, "414") => (RuleGroup::Unspecified, rules::pydocstyle::rules::EmptyDocstringSection),
+        (Pydocstyle, "415") => (RuleGroup::Unspecified, rules::pydocstyle::rules::EndsInPunctuation),
+        (Pydocstyle, "416") => (RuleGroup::Unspecified, rules::pydocstyle::rules::SectionNameEndsInColon),
+        (Pydocstyle, "417") => (RuleGroup::Unspecified, rules::pydocstyle::rules::UndocumentedParam),
+        (Pydocstyle, "418") => (RuleGroup::Unspecified, rules::pydocstyle::rules::OverloadWithDocstring),
+        (Pydocstyle, "419") => (RuleGroup::Unspecified, rules::pydocstyle::rules::EmptyDocstring),
 
         // pep8-naming
-        (PEP8Naming, "801") => Rule::InvalidClassName,
-        (PEP8Naming, "802") => Rule::InvalidFunctionName,
-        (PEP8Naming, "803") => Rule::InvalidArgumentName,
-        (PEP8Naming, "804") => Rule::InvalidFirstArgumentNameForClassMethod,
-        (PEP8Naming, "805") => Rule::InvalidFirstArgumentNameForMethod,
-        (PEP8Naming, "806") => Rule::NonLowercaseVariableInFunction,
-        (PEP8Naming, "807") => Rule::DunderFunctionName,
-        (PEP8Naming, "811") => Rule::ConstantImportedAsNonConstant,
-        (PEP8Naming, "812") => Rule::LowercaseImportedAsNonLowercase,
-        (PEP8Naming, "813") => Rule::CamelcaseImportedAsLowercase,
-        (PEP8Naming, "814") => Rule::CamelcaseImportedAsConstant,
-        (PEP8Naming, "815") => Rule::MixedCaseVariableInClassScope,
-        (PEP8Naming, "816") => Rule::MixedCaseVariableInGlobalScope,
-        (PEP8Naming, "817") => Rule::CamelcaseImportedAsAcronym,
-        (PEP8Naming, "818") => Rule::ErrorSuffixOnExceptionName,
-        (PEP8Naming, "999") => Rule::InvalidModuleName,
+        (PEP8Naming, "801") => (RuleGroup::Unspecified, rules::pep8_naming::rules::InvalidClassName),
+        (PEP8Naming, "802") => (RuleGroup::Unspecified, rules::pep8_naming::rules::InvalidFunctionName),
+        (PEP8Naming, "803") => (RuleGroup::Unspecified, rules::pep8_naming::rules::InvalidArgumentName),
+        (PEP8Naming, "804") => (RuleGroup::Unspecified, rules::pep8_naming::rules::InvalidFirstArgumentNameForClassMethod),
+        (PEP8Naming, "805") => (RuleGroup::Unspecified, rules::pep8_naming::rules::InvalidFirstArgumentNameForMethod),
+        (PEP8Naming, "806") => (RuleGroup::Unspecified, rules::pep8_naming::rules::NonLowercaseVariableInFunction),
+        (PEP8Naming, "807") => (RuleGroup::Unspecified, rules::pep8_naming::rules::DunderFunctionName),
+        (PEP8Naming, "811") => (RuleGroup::Unspecified, rules::pep8_naming::rules::ConstantImportedAsNonConstant),
+        (PEP8Naming, "812") => (RuleGroup::Unspecified, rules::pep8_naming::rules::LowercaseImportedAsNonLowercase),
+        (PEP8Naming, "813") => (RuleGroup::Unspecified, rules::pep8_naming::rules::CamelcaseImportedAsLowercase),
+        (PEP8Naming, "814") => (RuleGroup::Unspecified, rules::pep8_naming::rules::CamelcaseImportedAsConstant),
+        (PEP8Naming, "815") => (RuleGroup::Unspecified, rules::pep8_naming::rules::MixedCaseVariableInClassScope),
+        (PEP8Naming, "816") => (RuleGroup::Unspecified, rules::pep8_naming::rules::MixedCaseVariableInGlobalScope),
+        (PEP8Naming, "817") => (RuleGroup::Unspecified, rules::pep8_naming::rules::CamelcaseImportedAsAcronym),
+        (PEP8Naming, "818") => (RuleGroup::Unspecified, rules::pep8_naming::rules::ErrorSuffixOnExceptionName),
+        (PEP8Naming, "999") => (RuleGroup::Unspecified, rules::pep8_naming::rules::InvalidModuleName),
 
         // isort
-        (Isort, "001") => Rule::UnsortedImports,
-        (Isort, "002") => Rule::MissingRequiredImport,
+        (Isort, "001") => (RuleGroup::Unspecified, rules::isort::rules::UnsortedImports),
+        (Isort, "002") => (RuleGroup::Unspecified, rules::isort::rules::MissingRequiredImport),
 
         // eradicate
-        (Eradicate, "001") => Rule::CommentedOutCode,
+        (Eradicate, "001") => (RuleGroup::Unspecified, rules::eradicate::rules::CommentedOutCode),
 
         // flake8-bandit
-        (Flake8Bandit, "101") => Rule::Assert,
-        (Flake8Bandit, "102") => Rule::ExecBuiltin,
-        (Flake8Bandit, "103") => Rule::BadFilePermissions,
-        (Flake8Bandit, "104") => Rule::HardcodedBindAllInterfaces,
-        (Flake8Bandit, "105") => Rule::HardcodedPasswordString,
-        (Flake8Bandit, "106") => Rule::HardcodedPasswordFuncArg,
-        (Flake8Bandit, "107") => Rule::HardcodedPasswordDefault,
-        (Flake8Bandit, "108") => Rule::HardcodedTempFile,
-        (Flake8Bandit, "110") => Rule::TryExceptPass,
-        (Flake8Bandit, "112") => Rule::TryExceptContinue,
-        (Flake8Bandit, "113") => Rule::RequestWithoutTimeout,
-        (Flake8Bandit, "301") => Rule::SuspiciousPickleUsage,
-        (Flake8Bandit, "302") => Rule::SuspiciousMarshalUsage,
-        (Flake8Bandit, "303") => Rule::SuspiciousInsecureHashUsage,
-        (Flake8Bandit, "304") => Rule::SuspiciousInsecureCipherUsage,
-        (Flake8Bandit, "305") => Rule::SuspiciousInsecureCipherModeUsage,
-        (Flake8Bandit, "306") => Rule::SuspiciousMktempUsage,
-        (Flake8Bandit, "307") => Rule::SuspiciousEvalUsage,
-        (Flake8Bandit, "308") => Rule::SuspiciousMarkSafeUsage,
-        (Flake8Bandit, "310") => Rule::SuspiciousURLOpenUsage,
-        (Flake8Bandit, "311") => Rule::SuspiciousNonCryptographicRandomUsage,
-        (Flake8Bandit, "312") => Rule::SuspiciousTelnetUsage,
-        (Flake8Bandit, "313") => Rule::SuspiciousXMLCElementTreeUsage,
-        (Flake8Bandit, "314") => Rule::SuspiciousXMLElementTreeUsage,
-        (Flake8Bandit, "315") => Rule::SuspiciousXMLExpatReaderUsage,
-        (Flake8Bandit, "316") => Rule::SuspiciousXMLExpatBuilderUsage,
-        (Flake8Bandit, "317") => Rule::SuspiciousXMLSaxUsage,
-        (Flake8Bandit, "318") => Rule::SuspiciousXMLMiniDOMUsage,
-        (Flake8Bandit, "319") => Rule::SuspiciousXMLPullDOMUsage,
-        (Flake8Bandit, "320") => Rule::SuspiciousXMLETreeUsage,
-        (Flake8Bandit, "321") => Rule::SuspiciousFTPLibUsage,
-        (Flake8Bandit, "323") => Rule::SuspiciousUnverifiedContextUsage,
-        (Flake8Bandit, "324") => Rule::HashlibInsecureHashFunction,
-        (Flake8Bandit, "501") => Rule::RequestWithNoCertValidation,
-        (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,
+        (Flake8Bandit, "101") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::Assert),
+        (Flake8Bandit, "102") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::ExecBuiltin),
+        (Flake8Bandit, "103") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::BadFilePermissions),
+        (Flake8Bandit, "104") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::HardcodedBindAllInterfaces),
+        (Flake8Bandit, "105") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::HardcodedPasswordString),
+        (Flake8Bandit, "106") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::HardcodedPasswordFuncArg),
+        (Flake8Bandit, "107") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::HardcodedPasswordDefault),
+        (Flake8Bandit, "108") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::HardcodedTempFile),
+        (Flake8Bandit, "110") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::TryExceptPass),
+        (Flake8Bandit, "112") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::TryExceptContinue),
+        (Flake8Bandit, "113") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::RequestWithoutTimeout),
+        (Flake8Bandit, "301") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousPickleUsage),
+        (Flake8Bandit, "302") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousMarshalUsage),
+        (Flake8Bandit, "303") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousInsecureHashUsage),
+        (Flake8Bandit, "304") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousInsecureCipherUsage),
+        (Flake8Bandit, "305") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousInsecureCipherModeUsage),
+        (Flake8Bandit, "306") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousMktempUsage),
+        (Flake8Bandit, "307") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousEvalUsage),
+        (Flake8Bandit, "308") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousMarkSafeUsage),
+        (Flake8Bandit, "310") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousURLOpenUsage),
+        (Flake8Bandit, "311") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousNonCryptographicRandomUsage),
+        (Flake8Bandit, "312") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousTelnetUsage),
+        (Flake8Bandit, "313") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousXMLCElementTreeUsage),
+        (Flake8Bandit, "314") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousXMLElementTreeUsage),
+        (Flake8Bandit, "315") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousXMLExpatReaderUsage),
+        (Flake8Bandit, "316") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousXMLExpatBuilderUsage),
+        (Flake8Bandit, "317") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousXMLSaxUsage),
+        (Flake8Bandit, "318") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousXMLMiniDOMUsage),
+        (Flake8Bandit, "319") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousXMLPullDOMUsage),
+        (Flake8Bandit, "320") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousXMLETreeUsage),
+        (Flake8Bandit, "321") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousFTPLibUsage),
+        (Flake8Bandit, "323") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousUnverifiedContextUsage),
+        (Flake8Bandit, "324") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::HashlibInsecureHashFunction),
+        (Flake8Bandit, "501") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::RequestWithNoCertValidation),
+        (Flake8Bandit, "506") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::UnsafeYAMLLoad),
+        (Flake8Bandit, "508") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SnmpInsecureVersion),
+        (Flake8Bandit, "509") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SnmpWeakCryptography),
+        (Flake8Bandit, "601") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::ParamikoCall),
+        (Flake8Bandit, "602") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SubprocessPopenWithShellEqualsTrue),
+        (Flake8Bandit, "603") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SubprocessWithoutShellEqualsTrue),
+        (Flake8Bandit, "604") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::CallWithShellEqualsTrue),
+        (Flake8Bandit, "605") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::StartProcessWithAShell),
+        (Flake8Bandit, "606") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::StartProcessWithNoShell),
+        (Flake8Bandit, "607") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::StartProcessWithPartialPath),
+        (Flake8Bandit, "608") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::HardcodedSQLExpression),
+        (Flake8Bandit, "609") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::UnixCommandWildcardInjection),
+        (Flake8Bandit, "612") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::LoggingConfigInsecureListen),
+        (Flake8Bandit, "701") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::Jinja2AutoescapeFalse),
 
         // flake8-boolean-trap
-        (Flake8BooleanTrap, "001") => Rule::BooleanPositionalArgInFunctionDefinition,
-        (Flake8BooleanTrap, "002") => Rule::BooleanDefaultValueInFunctionDefinition,
-        (Flake8BooleanTrap, "003") => Rule::BooleanPositionalValueInFunctionCall,
+        (Flake8BooleanTrap, "001") => (RuleGroup::Unspecified, rules::flake8_boolean_trap::rules::BooleanPositionalArgInFunctionDefinition),
+        (Flake8BooleanTrap, "002") => (RuleGroup::Unspecified, rules::flake8_boolean_trap::rules::BooleanDefaultValueInFunctionDefinition),
+        (Flake8BooleanTrap, "003") => (RuleGroup::Unspecified, rules::flake8_boolean_trap::rules::BooleanPositionalValueInFunctionCall),
 
         // flake8-unused-arguments
-        (Flake8UnusedArguments, "001") => Rule::UnusedFunctionArgument,
-        (Flake8UnusedArguments, "002") => Rule::UnusedMethodArgument,
-        (Flake8UnusedArguments, "003") => Rule::UnusedClassMethodArgument,
-        (Flake8UnusedArguments, "004") => Rule::UnusedStaticMethodArgument,
-        (Flake8UnusedArguments, "005") => Rule::UnusedLambdaArgument,
+        (Flake8UnusedArguments, "001") => (RuleGroup::Unspecified, rules::flake8_unused_arguments::rules::UnusedFunctionArgument),
+        (Flake8UnusedArguments, "002") => (RuleGroup::Unspecified, rules::flake8_unused_arguments::rules::UnusedMethodArgument),
+        (Flake8UnusedArguments, "003") => (RuleGroup::Unspecified, rules::flake8_unused_arguments::rules::UnusedClassMethodArgument),
+        (Flake8UnusedArguments, "004") => (RuleGroup::Unspecified, rules::flake8_unused_arguments::rules::UnusedStaticMethodArgument),
+        (Flake8UnusedArguments, "005") => (RuleGroup::Unspecified, rules::flake8_unused_arguments::rules::UnusedLambdaArgument),
 
         // flake8-import-conventions
-        (Flake8ImportConventions, "001") => Rule::UnconventionalImportAlias,
-        (Flake8ImportConventions, "002") => Rule::BannedImportAlias,
-        (Flake8ImportConventions, "003") => Rule::BannedImportFrom,
+        (Flake8ImportConventions, "001") => (RuleGroup::Unspecified, rules::flake8_import_conventions::rules::UnconventionalImportAlias),
+        (Flake8ImportConventions, "002") => (RuleGroup::Unspecified, rules::flake8_import_conventions::rules::BannedImportAlias),
+        (Flake8ImportConventions, "003") => (RuleGroup::Unspecified, rules::flake8_import_conventions::rules::BannedImportFrom),
 
         // flake8-datetimez
-        (Flake8Datetimez, "001") => Rule::CallDatetimeWithoutTzinfo,
-        (Flake8Datetimez, "002") => Rule::CallDatetimeToday,
-        (Flake8Datetimez, "003") => Rule::CallDatetimeUtcnow,
-        (Flake8Datetimez, "004") => Rule::CallDatetimeUtcfromtimestamp,
-        (Flake8Datetimez, "005") => Rule::CallDatetimeNowWithoutTzinfo,
-        (Flake8Datetimez, "006") => Rule::CallDatetimeFromtimestamp,
-        (Flake8Datetimez, "007") => Rule::CallDatetimeStrptimeWithoutZone,
-        (Flake8Datetimez, "011") => Rule::CallDateToday,
-        (Flake8Datetimez, "012") => Rule::CallDateFromtimestamp,
+        (Flake8Datetimez, "001") => (RuleGroup::Unspecified, rules::flake8_datetimez::rules::CallDatetimeWithoutTzinfo),
+        (Flake8Datetimez, "002") => (RuleGroup::Unspecified, rules::flake8_datetimez::rules::CallDatetimeToday),
+        (Flake8Datetimez, "003") => (RuleGroup::Unspecified, rules::flake8_datetimez::rules::CallDatetimeUtcnow),
+        (Flake8Datetimez, "004") => (RuleGroup::Unspecified, rules::flake8_datetimez::rules::CallDatetimeUtcfromtimestamp),
+        (Flake8Datetimez, "005") => (RuleGroup::Unspecified, rules::flake8_datetimez::rules::CallDatetimeNowWithoutTzinfo),
+        (Flake8Datetimez, "006") => (RuleGroup::Unspecified, rules::flake8_datetimez::rules::CallDatetimeFromtimestamp),
+        (Flake8Datetimez, "007") => (RuleGroup::Unspecified, rules::flake8_datetimez::rules::CallDatetimeStrptimeWithoutZone),
+        (Flake8Datetimez, "011") => (RuleGroup::Unspecified, rules::flake8_datetimez::rules::CallDateToday),
+        (Flake8Datetimez, "012") => (RuleGroup::Unspecified, rules::flake8_datetimez::rules::CallDateFromtimestamp),
 
         // pygrep-hooks
-        (PygrepHooks, "001") => Rule::Eval,
-        (PygrepHooks, "002") => Rule::DeprecatedLogWarn,
-        (PygrepHooks, "003") => Rule::BlanketTypeIgnore,
-        (PygrepHooks, "004") => Rule::BlanketNOQA,
+        (PygrepHooks, "001") => (RuleGroup::Unspecified, rules::pygrep_hooks::rules::Eval),
+        (PygrepHooks, "002") => (RuleGroup::Unspecified, rules::pygrep_hooks::rules::DeprecatedLogWarn),
+        (PygrepHooks, "003") => (RuleGroup::Unspecified, rules::pygrep_hooks::rules::BlanketTypeIgnore),
+        (PygrepHooks, "004") => (RuleGroup::Unspecified, rules::pygrep_hooks::rules::BlanketNOQA),
+        (PygrepHooks, "005") => (RuleGroup::Unspecified, rules::pygrep_hooks::rules::InvalidMockAccess),
 
         // pandas-vet
-        (PandasVet, "002") => Rule::PandasUseOfInplaceArgument,
-        (PandasVet, "003") => Rule::PandasUseOfDotIsNull,
-        (PandasVet, "004") => Rule::PandasUseOfDotNotNull,
-        (PandasVet, "007") => Rule::PandasUseOfDotIx,
-        (PandasVet, "008") => Rule::PandasUseOfDotAt,
-        (PandasVet, "009") => Rule::PandasUseOfDotIat,
-        (PandasVet, "010") => Rule::PandasUseOfDotPivotOrUnstack,
-        (PandasVet, "011") => Rule::PandasUseOfDotValues,
-        (PandasVet, "012") => Rule::PandasUseOfDotReadTable,
-        (PandasVet, "013") => Rule::PandasUseOfDotStack,
-        (PandasVet, "015") => Rule::PandasUseOfPdMerge,
-        (PandasVet, "901") => Rule::PandasDfVariableName,
+        (PandasVet, "002") => (RuleGroup::Unspecified, rules::pandas_vet::rules::PandasUseOfInplaceArgument),
+        (PandasVet, "003") => (RuleGroup::Unspecified, rules::pandas_vet::rules::PandasUseOfDotIsNull),
+        (PandasVet, "004") => (RuleGroup::Unspecified, rules::pandas_vet::rules::PandasUseOfDotNotNull),
+        (PandasVet, "007") => (RuleGroup::Unspecified, rules::pandas_vet::rules::PandasUseOfDotIx),
+        (PandasVet, "008") => (RuleGroup::Unspecified, rules::pandas_vet::rules::PandasUseOfDotAt),
+        (PandasVet, "009") => (RuleGroup::Unspecified, rules::pandas_vet::rules::PandasUseOfDotIat),
+        (PandasVet, "010") => (RuleGroup::Unspecified, rules::pandas_vet::rules::PandasUseOfDotPivotOrUnstack),
+        (PandasVet, "011") => (RuleGroup::Unspecified, rules::pandas_vet::rules::PandasUseOfDotValues),
+        (PandasVet, "012") => (RuleGroup::Unspecified, rules::pandas_vet::rules::PandasUseOfDotReadTable),
+        (PandasVet, "013") => (RuleGroup::Unspecified, rules::pandas_vet::rules::PandasUseOfDotStack),
+        (PandasVet, "015") => (RuleGroup::Unspecified, rules::pandas_vet::rules::PandasUseOfPdMerge),
+        (PandasVet, "901") => (RuleGroup::Unspecified, rules::pandas_vet::rules::PandasDfVariableName),
 
         // flake8-errmsg
-        (Flake8ErrMsg, "101") => Rule::RawStringInException,
-        (Flake8ErrMsg, "102") => Rule::FStringInException,
-        (Flake8ErrMsg, "103") => Rule::DotFormatInException,
+        (Flake8ErrMsg, "101") => (RuleGroup::Unspecified, rules::flake8_errmsg::rules::RawStringInException),
+        (Flake8ErrMsg, "102") => (RuleGroup::Unspecified, rules::flake8_errmsg::rules::FStringInException),
+        (Flake8ErrMsg, "103") => (RuleGroup::Unspecified, rules::flake8_errmsg::rules::DotFormatInException),
 
         // flake8-pyi
-        (Flake8Pyi, "001") => Rule::UnprefixedTypeParam,
-        (Flake8Pyi, "006") => Rule::BadVersionInfoComparison,
-        (Flake8Pyi, "007") => Rule::UnrecognizedPlatformCheck,
-        (Flake8Pyi, "008") => Rule::UnrecognizedPlatformName,
-        (Flake8Pyi, "009") => Rule::PassStatementStubBody,
-        (Flake8Pyi, "010") => Rule::NonEmptyStubBody,
-        (Flake8Pyi, "011") => Rule::TypedArgumentDefaultInStub,
-        (Flake8Pyi, "012") => Rule::PassInClassBody,
-        (Flake8Pyi, "014") => Rule::ArgumentDefaultInStub,
-        (Flake8Pyi, "015") => Rule::AssignmentDefaultInStub,
-        (Flake8Pyi, "016") => Rule::DuplicateUnionMember,
-        (Flake8Pyi, "020") => Rule::QuotedAnnotationInStub,
-        (Flake8Pyi, "021") => Rule::DocstringInStub,
-        (Flake8Pyi, "033") => Rule::TypeCommentInStub,
-        (Flake8Pyi, "042") => Rule::SnakeCaseTypeAlias,
-        (Flake8Pyi, "043") => Rule::TSuffixedTypeAlias,
+        (Flake8Pyi, "001") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::UnprefixedTypeParam),
+        (Flake8Pyi, "006") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::BadVersionInfoComparison),
+        (Flake8Pyi, "007") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::UnrecognizedPlatformCheck),
+        (Flake8Pyi, "008") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::UnrecognizedPlatformName),
+        (Flake8Pyi, "009") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::PassStatementStubBody),
+        (Flake8Pyi, "010") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::NonEmptyStubBody),
+        (Flake8Pyi, "011") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::TypedArgumentDefaultInStub),
+        (Flake8Pyi, "012") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::PassInClassBody),
+        (Flake8Pyi, "013") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::EllipsisInNonEmptyClassBody),
+        (Flake8Pyi, "014") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::ArgumentDefaultInStub),
+        (Flake8Pyi, "015") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::AssignmentDefaultInStub),
+        (Flake8Pyi, "016") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::DuplicateUnionMember),
+        (Flake8Pyi, "020") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::QuotedAnnotationInStub),
+        (Flake8Pyi, "021") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::DocstringInStub),
+        (Flake8Pyi, "024") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::CollectionsNamedTuple),
+        (Flake8Pyi, "025") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::UnaliasedCollectionsAbcSetImport),
+        (Flake8Pyi, "029") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::StrOrReprDefinedInStub),
+        (Flake8Pyi, "032") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::AnyEqNeAnnotation),
+        (Flake8Pyi, "033") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::TypeCommentInStub),
+        (Flake8Pyi, "034") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::NonSelfReturnType),
+        (Flake8Pyi, "035") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::UnassignedSpecialVariableInStub),
+        (Flake8Pyi, "042") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::SnakeCaseTypeAlias),
+        (Flake8Pyi, "043") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::TSuffixedTypeAlias),
+        (Flake8Pyi, "045") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::IterMethodReturnIterable),
+        (Flake8Pyi, "048") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::StubBodyMultipleStatements),
+        (Flake8Pyi, "050") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::NoReturnArgumentAnnotationInStub),
+        (Flake8Pyi, "052") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::UnannotatedAssignmentInStub),
+        (Flake8Pyi, "054") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::NumericLiteralTooLong),
+        (Flake8Pyi, "053") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::StringOrBytesTooLong),
 
         // flake8-pytest-style
-        (Flake8PytestStyle, "001") => Rule::PytestFixtureIncorrectParenthesesStyle,
-        (Flake8PytestStyle, "002") => Rule::PytestFixturePositionalArgs,
-        (Flake8PytestStyle, "003") => Rule::PytestExtraneousScopeFunction,
-        (Flake8PytestStyle, "004") => Rule::PytestMissingFixtureNameUnderscore,
-        (Flake8PytestStyle, "005") => Rule::PytestIncorrectFixtureNameUnderscore,
-        (Flake8PytestStyle, "006") => Rule::PytestParametrizeNamesWrongType,
-        (Flake8PytestStyle, "007") => Rule::PytestParametrizeValuesWrongType,
-        (Flake8PytestStyle, "008") => Rule::PytestPatchWithLambda,
-        (Flake8PytestStyle, "009") => Rule::PytestUnittestAssertion,
-        (Flake8PytestStyle, "010") => Rule::PytestRaisesWithoutException,
-        (Flake8PytestStyle, "011") => Rule::PytestRaisesTooBroad,
-        (Flake8PytestStyle, "012") => Rule::PytestRaisesWithMultipleStatements,
-        (Flake8PytestStyle, "013") => Rule::PytestIncorrectPytestImport,
-        (Flake8PytestStyle, "015") => Rule::PytestAssertAlwaysFalse,
-        (Flake8PytestStyle, "016") => Rule::PytestFailWithoutMessage,
-        (Flake8PytestStyle, "017") => Rule::PytestAssertInExcept,
-        (Flake8PytestStyle, "018") => Rule::PytestCompositeAssertion,
-        (Flake8PytestStyle, "019") => Rule::PytestFixtureParamWithoutValue,
-        (Flake8PytestStyle, "020") => Rule::PytestDeprecatedYieldFixture,
-        (Flake8PytestStyle, "021") => Rule::PytestFixtureFinalizerCallback,
-        (Flake8PytestStyle, "022") => Rule::PytestUselessYieldFixture,
-        (Flake8PytestStyle, "023") => Rule::PytestIncorrectMarkParenthesesStyle,
-        (Flake8PytestStyle, "024") => Rule::PytestUnnecessaryAsyncioMarkOnFixture,
-        (Flake8PytestStyle, "025") => Rule::PytestErroneousUseFixturesOnFixture,
-        (Flake8PytestStyle, "026") => Rule::PytestUseFixturesWithoutParameters,
+        (Flake8PytestStyle, "001") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestFixtureIncorrectParenthesesStyle),
+        (Flake8PytestStyle, "002") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestFixturePositionalArgs),
+        (Flake8PytestStyle, "003") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestExtraneousScopeFunction),
+        (Flake8PytestStyle, "004") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestMissingFixtureNameUnderscore),
+        (Flake8PytestStyle, "005") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestIncorrectFixtureNameUnderscore),
+        (Flake8PytestStyle, "006") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestParametrizeNamesWrongType),
+        (Flake8PytestStyle, "007") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestParametrizeValuesWrongType),
+        (Flake8PytestStyle, "008") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestPatchWithLambda),
+        (Flake8PytestStyle, "009") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestUnittestAssertion),
+        (Flake8PytestStyle, "010") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestRaisesWithoutException),
+        (Flake8PytestStyle, "011") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestRaisesTooBroad),
+        (Flake8PytestStyle, "012") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestRaisesWithMultipleStatements),
+        (Flake8PytestStyle, "013") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestIncorrectPytestImport),
+        (Flake8PytestStyle, "015") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestAssertAlwaysFalse),
+        (Flake8PytestStyle, "016") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestFailWithoutMessage),
+        (Flake8PytestStyle, "017") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestAssertInExcept),
+        (Flake8PytestStyle, "018") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestCompositeAssertion),
+        (Flake8PytestStyle, "019") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestFixtureParamWithoutValue),
+        (Flake8PytestStyle, "020") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestDeprecatedYieldFixture),
+        (Flake8PytestStyle, "021") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestFixtureFinalizerCallback),
+        (Flake8PytestStyle, "022") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestUselessYieldFixture),
+        (Flake8PytestStyle, "023") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestIncorrectMarkParenthesesStyle),
+        (Flake8PytestStyle, "024") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestUnnecessaryAsyncioMarkOnFixture),
+        (Flake8PytestStyle, "025") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestErroneousUseFixturesOnFixture),
+        (Flake8PytestStyle, "026") => (RuleGroup::Unspecified, rules::flake8_pytest_style::rules::PytestUseFixturesWithoutParameters),
 
         // flake8-pie
-        (Flake8Pie, "790") => Rule::UnnecessaryPass,
-        (Flake8Pie, "794") => Rule::DuplicateClassFieldDefinition,
-        (Flake8Pie, "796") => Rule::NonUniqueEnums,
-        (Flake8Pie, "800") => Rule::UnnecessarySpread,
-        (Flake8Pie, "804") => Rule::UnnecessaryDictKwargs,
-        (Flake8Pie, "807") => Rule::ReimplementedListBuiltin,
-        (Flake8Pie, "810") => Rule::MultipleStartsEndsWith,
+        (Flake8Pie, "790") => (RuleGroup::Unspecified, rules::flake8_pie::rules::UnnecessaryPass),
+        (Flake8Pie, "794") => (RuleGroup::Unspecified, rules::flake8_pie::rules::DuplicateClassFieldDefinition),
+        (Flake8Pie, "796") => (RuleGroup::Unspecified, rules::flake8_pie::rules::NonUniqueEnums),
+        (Flake8Pie, "800") => (RuleGroup::Unspecified, rules::flake8_pie::rules::UnnecessarySpread),
+        (Flake8Pie, "804") => (RuleGroup::Unspecified, rules::flake8_pie::rules::UnnecessaryDictKwargs),
+        (Flake8Pie, "807") => (RuleGroup::Unspecified, rules::flake8_pie::rules::ReimplementedListBuiltin),
+        (Flake8Pie, "810") => (RuleGroup::Unspecified, rules::flake8_pie::rules::MultipleStartsEndsWith),
 
         // flake8-commas
-        (Flake8Commas, "812") => Rule::MissingTrailingComma,
-        (Flake8Commas, "818") => Rule::TrailingCommaOnBareTuple,
-        (Flake8Commas, "819") => Rule::ProhibitedTrailingComma,
+        (Flake8Commas, "812") => (RuleGroup::Unspecified, rules::flake8_commas::rules::MissingTrailingComma),
+        (Flake8Commas, "818") => (RuleGroup::Unspecified, rules::flake8_commas::rules::TrailingCommaOnBareTuple),
+        (Flake8Commas, "819") => (RuleGroup::Unspecified, rules::flake8_commas::rules::ProhibitedTrailingComma),
 
         // flake8-no-pep420
-        (Flake8NoPep420, "001") => Rule::ImplicitNamespacePackage,
+        (Flake8NoPep420, "001") => (RuleGroup::Unspecified, rules::flake8_no_pep420::rules::ImplicitNamespacePackage),
 
         // flake8-executable
-        (Flake8Executable, "001") => Rule::ShebangNotExecutable,
-        (Flake8Executable, "002") => Rule::ShebangMissingExecutableFile,
-        (Flake8Executable, "003") => Rule::ShebangMissingPython,
-        (Flake8Executable, "004") => Rule::ShebangLeadingWhitespace,
-        (Flake8Executable, "005") => Rule::ShebangNotFirstLine,
+        (Flake8Executable, "001") => (RuleGroup::Unspecified, rules::flake8_executable::rules::ShebangNotExecutable),
+        (Flake8Executable, "002") => (RuleGroup::Unspecified, rules::flake8_executable::rules::ShebangMissingExecutableFile),
+        (Flake8Executable, "003") => (RuleGroup::Unspecified, rules::flake8_executable::rules::ShebangMissingPython),
+        (Flake8Executable, "004") => (RuleGroup::Unspecified, rules::flake8_executable::rules::ShebangLeadingWhitespace),
+        (Flake8Executable, "005") => (RuleGroup::Unspecified, rules::flake8_executable::rules::ShebangNotFirstLine),
 
         // flake8-type-checking
-        (Flake8TypeChecking, "001") => Rule::TypingOnlyFirstPartyImport,
-        (Flake8TypeChecking, "002") => Rule::TypingOnlyThirdPartyImport,
-        (Flake8TypeChecking, "003") => Rule::TypingOnlyStandardLibraryImport,
-        (Flake8TypeChecking, "004") => Rule::RuntimeImportInTypeCheckingBlock,
-        (Flake8TypeChecking, "005") => Rule::EmptyTypeCheckingBlock,
+        (Flake8TypeChecking, "001") => (RuleGroup::Unspecified, rules::flake8_type_checking::rules::TypingOnlyFirstPartyImport),
+        (Flake8TypeChecking, "002") => (RuleGroup::Unspecified, rules::flake8_type_checking::rules::TypingOnlyThirdPartyImport),
+        (Flake8TypeChecking, "003") => (RuleGroup::Unspecified, rules::flake8_type_checking::rules::TypingOnlyStandardLibraryImport),
+        (Flake8TypeChecking, "004") => (RuleGroup::Unspecified, rules::flake8_type_checking::rules::RuntimeImportInTypeCheckingBlock),
+        (Flake8TypeChecking, "005") => (RuleGroup::Unspecified, rules::flake8_type_checking::rules::EmptyTypeCheckingBlock),
 
         // tryceratops
-        (Tryceratops, "002") => Rule::RaiseVanillaClass,
-        (Tryceratops, "003") => Rule::RaiseVanillaArgs,
-        (Tryceratops, "004") => Rule::TypeCheckWithoutTypeError,
-        (Tryceratops, "200") => Rule::ReraiseNoCause,
-        (Tryceratops, "201") => Rule::VerboseRaise,
-        (Tryceratops, "300") => Rule::TryConsiderElse,
-        (Tryceratops, "301") => Rule::RaiseWithinTry,
-        (Tryceratops, "400") => Rule::ErrorInsteadOfException,
-        (Tryceratops, "401") => Rule::VerboseLogMessage,
+        (Tryceratops, "002") => (RuleGroup::Unspecified, rules::tryceratops::rules::RaiseVanillaClass),
+        (Tryceratops, "003") => (RuleGroup::Unspecified, rules::tryceratops::rules::RaiseVanillaArgs),
+        (Tryceratops, "004") => (RuleGroup::Unspecified, rules::tryceratops::rules::TypeCheckWithoutTypeError),
+        (Tryceratops, "200") => (RuleGroup::Unspecified, rules::tryceratops::rules::ReraiseNoCause),
+        (Tryceratops, "201") => (RuleGroup::Unspecified, rules::tryceratops::rules::VerboseRaise),
+        (Tryceratops, "300") => (RuleGroup::Unspecified, rules::tryceratops::rules::TryConsiderElse),
+        (Tryceratops, "301") => (RuleGroup::Unspecified, rules::tryceratops::rules::RaiseWithinTry),
+        (Tryceratops, "302") => (RuleGroup::Unspecified, rules::tryceratops::rules::UselessTryExcept),
+        (Tryceratops, "400") => (RuleGroup::Unspecified, rules::tryceratops::rules::ErrorInsteadOfException),
+        (Tryceratops, "401") => (RuleGroup::Unspecified, rules::tryceratops::rules::VerboseLogMessage),
 
         // flake8-use-pathlib
-        (Flake8UsePathlib, "100") => Rule::OsPathAbspath,
-        (Flake8UsePathlib, "101") => Rule::OsChmod,
-        (Flake8UsePathlib, "102") => Rule::OsMkdir,
-        (Flake8UsePathlib, "103") => Rule::OsMakedirs,
-        (Flake8UsePathlib, "104") => Rule::OsRename,
-        (Flake8UsePathlib, "105") => Rule::PathlibReplace,
-        (Flake8UsePathlib, "106") => Rule::OsRmdir,
-        (Flake8UsePathlib, "107") => Rule::OsRemove,
-        (Flake8UsePathlib, "108") => Rule::OsUnlink,
-        (Flake8UsePathlib, "109") => Rule::OsGetcwd,
-        (Flake8UsePathlib, "110") => Rule::OsPathExists,
-        (Flake8UsePathlib, "111") => Rule::OsPathExpanduser,
-        (Flake8UsePathlib, "112") => Rule::OsPathIsdir,
-        (Flake8UsePathlib, "113") => Rule::OsPathIsfile,
-        (Flake8UsePathlib, "114") => Rule::OsPathIslink,
-        (Flake8UsePathlib, "115") => Rule::OsReadlink,
-        (Flake8UsePathlib, "116") => Rule::OsStat,
-        (Flake8UsePathlib, "117") => Rule::OsPathIsabs,
-        (Flake8UsePathlib, "118") => Rule::OsPathJoin,
-        (Flake8UsePathlib, "119") => Rule::OsPathBasename,
-        (Flake8UsePathlib, "120") => Rule::OsPathDirname,
-        (Flake8UsePathlib, "121") => Rule::OsPathSamefile,
-        (Flake8UsePathlib, "122") => Rule::OsPathSplitext,
-        (Flake8UsePathlib, "123") => Rule::BuiltinOpen,
-        (Flake8UsePathlib, "124") => Rule::PyPath,
+        (Flake8UsePathlib, "100") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsPathAbspath),
+        (Flake8UsePathlib, "101") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsChmod),
+        (Flake8UsePathlib, "102") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsMkdir),
+        (Flake8UsePathlib, "103") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsMakedirs),
+        (Flake8UsePathlib, "104") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsRename),
+        (Flake8UsePathlib, "105") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsReplace),
+        (Flake8UsePathlib, "106") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsRmdir),
+        (Flake8UsePathlib, "107") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsRemove),
+        (Flake8UsePathlib, "108") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsUnlink),
+        (Flake8UsePathlib, "109") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsGetcwd),
+        (Flake8UsePathlib, "110") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsPathExists),
+        (Flake8UsePathlib, "111") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsPathExpanduser),
+        (Flake8UsePathlib, "112") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsPathIsdir),
+        (Flake8UsePathlib, "113") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsPathIsfile),
+        (Flake8UsePathlib, "114") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsPathIslink),
+        (Flake8UsePathlib, "115") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsReadlink),
+        (Flake8UsePathlib, "116") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsStat),
+        (Flake8UsePathlib, "117") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsPathIsabs),
+        (Flake8UsePathlib, "118") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsPathJoin),
+        (Flake8UsePathlib, "119") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsPathBasename),
+        (Flake8UsePathlib, "120") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsPathDirname),
+        (Flake8UsePathlib, "121") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsPathSamefile),
+        (Flake8UsePathlib, "122") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::OsPathSplitext),
+        (Flake8UsePathlib, "123") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::BuiltinOpen),
+        (Flake8UsePathlib, "124") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::violations::PyPath),
 
         // flake8-logging-format
-        (Flake8LoggingFormat, "001") => Rule::LoggingStringFormat,
-        (Flake8LoggingFormat, "002") => Rule::LoggingPercentFormat,
-        (Flake8LoggingFormat, "003") => Rule::LoggingStringConcat,
-        (Flake8LoggingFormat, "004") => Rule::LoggingFString,
-        (Flake8LoggingFormat, "010") => Rule::LoggingWarn,
-        (Flake8LoggingFormat, "101") => Rule::LoggingExtraAttrClash,
-        (Flake8LoggingFormat, "201") => Rule::LoggingExcInfo,
-        (Flake8LoggingFormat, "202") => Rule::LoggingRedundantExcInfo,
+        (Flake8LoggingFormat, "001") => (RuleGroup::Unspecified, rules::flake8_logging_format::violations::LoggingStringFormat),
+        (Flake8LoggingFormat, "002") => (RuleGroup::Unspecified, rules::flake8_logging_format::violations::LoggingPercentFormat),
+        (Flake8LoggingFormat, "003") => (RuleGroup::Unspecified, rules::flake8_logging_format::violations::LoggingStringConcat),
+        (Flake8LoggingFormat, "004") => (RuleGroup::Unspecified, rules::flake8_logging_format::violations::LoggingFString),
+        (Flake8LoggingFormat, "010") => (RuleGroup::Unspecified, rules::flake8_logging_format::violations::LoggingWarn),
+        (Flake8LoggingFormat, "101") => (RuleGroup::Unspecified, rules::flake8_logging_format::violations::LoggingExtraAttrClash),
+        (Flake8LoggingFormat, "201") => (RuleGroup::Unspecified, rules::flake8_logging_format::violations::LoggingExcInfo),
+        (Flake8LoggingFormat, "202") => (RuleGroup::Unspecified, rules::flake8_logging_format::violations::LoggingRedundantExcInfo),
 
         // flake8-raise
-        (Flake8Raise, "102") => Rule::UnnecessaryParenOnRaiseException,
+        (Flake8Raise, "102") => (RuleGroup::Unspecified, rules::flake8_raise::rules::UnnecessaryParenOnRaiseException),
 
         // flake8-self
-        (Flake8Self, "001") => Rule::PrivateMemberAccess,
+        (Flake8Self, "001") => (RuleGroup::Unspecified, rules::flake8_self::rules::PrivateMemberAccess),
 
         // numpy
-        (Numpy, "001") => Rule::NumpyDeprecatedTypeAlias,
-        (Numpy, "002") => Rule::NumpyLegacyRandom,
+        (Numpy, "001") => (RuleGroup::Unspecified, rules::numpy::rules::NumpyDeprecatedTypeAlias),
+        (Numpy, "002") => (RuleGroup::Unspecified, rules::numpy::rules::NumpyLegacyRandom),
 
         // ruff
-        (Ruff, "001") => Rule::AmbiguousUnicodeCharacterString,
-        (Ruff, "002") => Rule::AmbiguousUnicodeCharacterDocstring,
-        (Ruff, "003") => Rule::AmbiguousUnicodeCharacterComment,
-        (Ruff, "005") => Rule::CollectionLiteralConcatenation,
-        (Ruff, "006") => Rule::AsyncioDanglingTask,
-        (Ruff, "007") => Rule::PairwiseOverZipped,
-        (Ruff, "008") => Rule::MutableDataclassDefault,
-        (Ruff, "009") => Rule::FunctionCallInDataclassDefaultArgument,
-        (Ruff, "100") => Rule::UnusedNOQA,
+        (Ruff, "001") => (RuleGroup::Unspecified, rules::ruff::rules::AmbiguousUnicodeCharacterString),
+        (Ruff, "002") => (RuleGroup::Unspecified, rules::ruff::rules::AmbiguousUnicodeCharacterDocstring),
+        (Ruff, "003") => (RuleGroup::Unspecified, rules::ruff::rules::AmbiguousUnicodeCharacterComment),
+        (Ruff, "005") => (RuleGroup::Unspecified, rules::ruff::rules::CollectionLiteralConcatenation),
+        (Ruff, "006") => (RuleGroup::Unspecified, rules::ruff::rules::AsyncioDanglingTask),
+        (Ruff, "007") => (RuleGroup::Unspecified, rules::ruff::rules::PairwiseOverZipped),
+        (Ruff, "008") => (RuleGroup::Unspecified, rules::ruff::rules::MutableDataclassDefault),
+        (Ruff, "009") => (RuleGroup::Unspecified, rules::ruff::rules::FunctionCallInDataclassDefaultArgument),
+        (Ruff, "010") => (RuleGroup::Unspecified, rules::ruff::rules::ExplicitFStringTypeConversion),
+        (Ruff, "100") => (RuleGroup::Unspecified, rules::ruff::rules::UnusedNOQA),
+        (Ruff, "200") => (RuleGroup::Unspecified, rules::ruff::rules::InvalidPyprojectToml),
 
         // flake8-django
-        (Flake8Django, "001") => Rule::DjangoNullableModelStringField,
-        (Flake8Django, "003") => Rule::DjangoLocalsInRenderFunction,
-        (Flake8Django, "006") => Rule::DjangoExcludeWithModelForm,
-        (Flake8Django, "007") => Rule::DjangoAllWithModelForm,
-        (Flake8Django, "008") => Rule::DjangoModelWithoutDunderStr,
-        (Flake8Django, "012") => Rule::DjangoUnorderedBodyContentInModel,
-        (Flake8Django, "013") => Rule::DjangoNonLeadingReceiverDecorator,
+        (Flake8Django, "001") => (RuleGroup::Unspecified, rules::flake8_django::rules::DjangoNullableModelStringField),
+        (Flake8Django, "003") => (RuleGroup::Unspecified, rules::flake8_django::rules::DjangoLocalsInRenderFunction),
+        (Flake8Django, "006") => (RuleGroup::Unspecified, rules::flake8_django::rules::DjangoExcludeWithModelForm),
+        (Flake8Django, "007") => (RuleGroup::Unspecified, rules::flake8_django::rules::DjangoAllWithModelForm),
+        (Flake8Django, "008") => (RuleGroup::Unspecified, rules::flake8_django::rules::DjangoModelWithoutDunderStr),
+        (Flake8Django, "012") => (RuleGroup::Unspecified, rules::flake8_django::rules::DjangoUnorderedBodyContentInModel),
+        (Flake8Django, "013") => (RuleGroup::Unspecified, rules::flake8_django::rules::DjangoNonLeadingReceiverDecorator),
+
+        // flynt
+        // Reserved: (Flynt, "001") => (RuleGroup::Unspecified, Rule: :StringConcatenationToFString),
+        (Flynt, "002") => (RuleGroup::Unspecified, rules::flynt::rules::StaticJoinToFString),
+
+        // flake8-todos
+        (Flake8Todos, "001") => (RuleGroup::Unspecified, rules::flake8_todos::rules::InvalidTodoTag),
+        (Flake8Todos, "002") => (RuleGroup::Unspecified, rules::flake8_todos::rules::MissingTodoAuthor),
+        (Flake8Todos, "003") => (RuleGroup::Unspecified, rules::flake8_todos::rules::MissingTodoLink),
+        (Flake8Todos, "004") => (RuleGroup::Unspecified, rules::flake8_todos::rules::MissingTodoColon),
+        (Flake8Todos, "005") => (RuleGroup::Unspecified, rules::flake8_todos::rules::MissingTodoDescription),
+        (Flake8Todos, "006") => (RuleGroup::Unspecified, rules::flake8_todos::rules::InvalidTodoCapitalization),
+        (Flake8Todos, "007") => (RuleGroup::Unspecified, rules::flake8_todos::rules::MissingSpaceAfterTodoColon),
+
+        // airflow
+        (Airflow, "001") => (RuleGroup::Unspecified, rules::airflow::rules::AirflowVariableNameTaskIdMismatch),
+
+        // flake8-fixme
+        (Flake8Fixme, "001") => (RuleGroup::Unspecified, rules::flake8_fixme::rules::LineContainsFixme),
+        (Flake8Fixme, "002") => (RuleGroup::Unspecified, rules::flake8_fixme::rules::LineContainsTodo),
+        (Flake8Fixme, "003") => (RuleGroup::Unspecified, rules::flake8_fixme::rules::LineContainsXxx),
+        (Flake8Fixme, "004") => (RuleGroup::Unspecified, rules::flake8_fixme::rules::LineContainsHack),
 
         _ => return None,
     })
diff --git a/crates/ruff/src/cst/helpers.rs b/crates/ruff/src/cst/helpers.rs
index 2235afeb7f39a..c2cc95f79c951 100644
--- a/crates/ruff/src/cst/helpers.rs
+++ b/crates/ruff/src/cst/helpers.rs
@@ -1,7 +1,7 @@
 use libcst_native::{Expression, NameOrAttribute};
 
 fn compose_call_path_inner<'a>(expr: &'a Expression, parts: &mut Vec<&'a str>) {
-    match &expr {
+    match expr {
         Expression::Call(expr) => {
             compose_call_path_inner(&expr.func, parts);
         }
@@ -16,7 +16,7 @@ fn compose_call_path_inner<'a>(expr: &'a Expression, parts: &mut Vec<&'a str>) {
     }
 }
 
-pub fn compose_call_path(expr: &Expression) -> Option<String> {
+pub(crate) fn compose_call_path(expr: &Expression) -> Option<String> {
     let mut segments = vec![];
     compose_call_path_inner(expr, &mut segments);
     if segments.is_empty() {
@@ -26,7 +26,7 @@ pub fn compose_call_path(expr: &Expression) -> Option<String> {
     }
 }
 
-pub fn compose_module_path(module: &NameOrAttribute) -> String {
+pub(crate) fn compose_module_path(module: &NameOrAttribute) -> String {
     match module {
         NameOrAttribute::N(name) => name.value.to_string(),
         NameOrAttribute::A(attr) => {
diff --git a/crates/ruff/src/cst/matchers.rs b/crates/ruff/src/cst/matchers.rs
index fbebdca0a82c8..dad1e689eb142 100644
--- a/crates/ruff/src/cst/matchers.rs
+++ b/crates/ruff/src/cst/matchers.rs
@@ -1,37 +1,33 @@
 use anyhow::{bail, Result};
 use libcst_native::{
-    Attribute, Call, Comparison, Dict, Expr, Expression, Import, ImportAlias, ImportFrom,
-    ImportNames, Module, SimpleString, SmallStatement, Statement,
+    Arg, Attribute, Call, Comparison, CompoundStatement, Dict, Expression, FunctionDef,
+    GeneratorExp, If, Import, ImportAlias, ImportFrom, ImportNames, IndentedBlock, Lambda,
+    ListComp, Module, Name, SmallStatement, Statement, Suite, Tuple, With,
 };
 
-pub fn match_module(module_text: &str) -> Result<Module> {
+pub(crate) fn match_module(module_text: &str) -> Result<Module> {
     match libcst_native::parse_module(module_text, None) {
         Ok(module) => Ok(module),
         Err(_) => bail!("Failed to extract CST from source"),
     }
 }
 
-pub fn match_expression(expression_text: &str) -> Result<Expression> {
+pub(crate) fn match_expression(expression_text: &str) -> Result<Expression> {
     match libcst_native::parse_expression(expression_text) {
         Ok(expression) => Ok(expression),
-        Err(_) => bail!("Failed to extract CST from source"),
+        Err(_) => bail!("Failed to extract expression from source"),
     }
 }
 
-pub fn match_expr<'a, 'b>(module: &'a mut Module<'b>) -> Result<&'a mut Expr<'b>> {
-    if let Some(Statement::Simple(expr)) = module.body.first_mut() {
-        if let Some(SmallStatement::Expr(expr)) = expr.body.first_mut() {
-            Ok(expr)
-        } else {
-            bail!("Expected SmallStatement::Expr")
-        }
-    } else {
-        bail!("Expected Statement::Simple")
+pub(crate) fn match_statement(statement_text: &str) -> Result<Statement> {
+    match libcst_native::parse_statement(statement_text) {
+        Ok(statement) => Ok(statement),
+        Err(_) => bail!("Failed to extract statement from source"),
     }
 }
 
-pub fn match_import<'a, 'b>(module: &'a mut Module<'b>) -> Result<&'a mut Import<'b>> {
-    if let Some(Statement::Simple(expr)) = module.body.first_mut() {
+pub(crate) fn match_import<'a, 'b>(statement: &'a mut Statement<'b>) -> Result<&'a mut Import<'b>> {
+    if let Statement::Simple(expr) = statement {
         if let Some(SmallStatement::Import(expr)) = expr.body.first_mut() {
             Ok(expr)
         } else {
@@ -42,8 +38,10 @@ pub fn match_import<'a, 'b>(module: &'a mut Module<'b>) -> Result<&'a mut Import
     }
 }
 
-pub fn match_import_from<'a, 'b>(module: &'a mut Module<'b>) -> Result<&'a mut ImportFrom<'b>> {
-    if let Some(Statement::Simple(expr)) = module.body.first_mut() {
+pub(crate) fn match_import_from<'a, 'b>(
+    statement: &'a mut Statement<'b>,
+) -> Result<&'a mut ImportFrom<'b>> {
+    if let Statement::Simple(expr) = statement {
         if let Some(SmallStatement::ImportFrom(expr)) = expr.body.first_mut() {
             Ok(expr)
         } else {
@@ -54,7 +52,7 @@ pub fn match_import_from<'a, 'b>(module: &'a mut Module<'b>) -> Result<&'a mut I
     }
 }
 
-pub fn match_aliases<'a, 'b>(
+pub(crate) fn match_aliases<'a, 'b>(
     import_from: &'a mut ImportFrom<'b>,
 ) -> Result<&'a mut Vec<ImportAlias<'b>>> {
     if let ImportNames::Aliases(aliases) = &mut import_from.names {
@@ -64,7 +62,7 @@ pub fn match_aliases<'a, 'b>(
     }
 }
 
-pub fn match_call<'a, 'b>(expression: &'a mut Expression<'b>) -> Result<&'a mut Call<'b>> {
+pub(crate) fn match_call<'a, 'b>(expression: &'a Expression<'b>) -> Result<&'a Call<'b>> {
     if let Expression::Call(call) = expression {
         Ok(call)
     } else {
@@ -72,7 +70,17 @@ pub fn match_call<'a, 'b>(expression: &'a mut Expression<'b>) -> Result<&'a mut
     }
 }
 
-pub fn match_comparison<'a, 'b>(
+pub(crate) fn match_call_mut<'a, 'b>(
+    expression: &'a mut Expression<'b>,
+) -> Result<&'a mut Call<'b>> {
+    if let Expression::Call(call) = expression {
+        Ok(call)
+    } else {
+        bail!("Expected Expression::Call")
+    }
+}
+
+pub(crate) fn match_comparison<'a, 'b>(
     expression: &'a mut Expression<'b>,
 ) -> Result<&'a mut Comparison<'b>> {
     if let Expression::Comparison(comparison) = expression {
@@ -82,7 +90,7 @@ pub fn match_comparison<'a, 'b>(
     }
 }
 
-pub fn match_dict<'a, 'b>(expression: &'a mut Expression<'b>) -> Result<&'a mut Dict<'b>> {
+pub(crate) fn match_dict<'a, 'b>(expression: &'a mut Expression<'b>) -> Result<&'a mut Dict<'b>> {
     if let Expression::Dict(dict) = expression {
         Ok(dict)
     } else {
@@ -90,7 +98,7 @@ pub fn match_dict<'a, 'b>(expression: &'a mut Expression<'b>) -> Result<&'a mut
     }
 }
 
-pub fn match_attribute<'a, 'b>(
+pub(crate) fn match_attribute<'a, 'b>(
     expression: &'a mut Expression<'b>,
 ) -> Result<&'a mut Attribute<'b>> {
     if let Expression::Attribute(attribute) = expression {
@@ -100,12 +108,100 @@ pub fn match_attribute<'a, 'b>(
     }
 }
 
-pub fn match_simple_string<'a, 'b>(
-    expression: &'a mut Expression<'b>,
-) -> Result<&'a mut SimpleString<'b>> {
-    if let Expression::SimpleString(simple_string) = expression {
-        Ok(simple_string)
+pub(crate) fn match_name<'a, 'b>(expression: &'a Expression<'b>) -> Result<&'a Name<'b>> {
+    if let Expression::Name(name) = expression {
+        Ok(name)
+    } else {
+        bail!("Expected Expression::Name")
+    }
+}
+
+pub(crate) fn match_arg<'a, 'b>(call: &'a Call<'b>) -> Result<&'a Arg<'b>> {
+    if let Some(arg) = call.args.first() {
+        Ok(arg)
+    } else {
+        bail!("Expected Arg")
+    }
+}
+
+pub(crate) fn match_generator_exp<'a, 'b>(
+    expression: &'a Expression<'b>,
+) -> Result<&'a GeneratorExp<'b>> {
+    if let Expression::GeneratorExp(generator_exp) = expression {
+        Ok(generator_exp)
+    } else {
+        bail!("Expected Expression::GeneratorExp")
+    }
+}
+
+pub(crate) fn match_tuple<'a, 'b>(expression: &'a Expression<'b>) -> Result<&'a Tuple<'b>> {
+    if let Expression::Tuple(tuple) = expression {
+        Ok(tuple)
+    } else {
+        bail!("Expected Expression::Tuple")
+    }
+}
+
+pub(crate) fn match_list_comp<'a, 'b>(expression: &'a Expression<'b>) -> Result<&'a ListComp<'b>> {
+    if let Expression::ListComp(list_comp) = expression {
+        Ok(list_comp)
+    } else {
+        bail!("Expected Expression::ListComp")
+    }
+}
+
+pub(crate) fn match_lambda<'a, 'b>(expression: &'a Expression<'b>) -> Result<&'a Lambda<'b>> {
+    if let Expression::Lambda(lambda) = expression {
+        Ok(lambda)
+    } else {
+        bail!("Expected Expression::Lambda")
+    }
+}
+
+pub(crate) fn match_function_def<'a, 'b>(
+    statement: &'a mut Statement<'b>,
+) -> Result<&'a mut FunctionDef<'b>> {
+    if let Statement::Compound(compound) = statement {
+        if let CompoundStatement::FunctionDef(function_def) = compound {
+            Ok(function_def)
+        } else {
+            bail!("Expected CompoundStatement::FunctionDef")
+        }
+    } else {
+        bail!("Expected Statement::Compound")
+    }
+}
+
+pub(crate) fn match_indented_block<'a, 'b>(
+    suite: &'a mut Suite<'b>,
+) -> Result<&'a mut IndentedBlock<'b>> {
+    if let Suite::IndentedBlock(indented_block) = suite {
+        Ok(indented_block)
+    } else {
+        bail!("Expected Suite::IndentedBlock")
+    }
+}
+
+pub(crate) fn match_with<'a, 'b>(statement: &'a mut Statement<'b>) -> Result<&'a mut With<'b>> {
+    if let Statement::Compound(compound) = statement {
+        if let CompoundStatement::With(with) = compound {
+            Ok(with)
+        } else {
+            bail!("Expected CompoundStatement::With")
+        }
+    } else {
+        bail!("Expected Statement::Compound")
+    }
+}
+
+pub(crate) fn match_if<'a, 'b>(statement: &'a mut Statement<'b>) -> Result<&'a mut If<'b>> {
+    if let Statement::Compound(compound) = statement {
+        if let CompoundStatement::If(if_) = compound {
+            Ok(if_)
+        } else {
+            bail!("Expected CompoundStatement::If")
+        }
     } else {
-        bail!("Expected Expression::SimpleString")
+        bail!("Expected Statement::Compound")
     }
 }
diff --git a/crates/ruff/src/cst/mod.rs b/crates/ruff/src/cst/mod.rs
index d4cf6cc5d76f2..9060c74698a17 100644
--- a/crates/ruff/src/cst/mod.rs
+++ b/crates/ruff/src/cst/mod.rs
@@ -1,2 +1,2 @@
-pub mod helpers;
-pub mod matchers;
+pub(crate) mod helpers;
+pub(crate) mod matchers;
diff --git a/crates/ruff/src/directives.rs b/crates/ruff/src/directives.rs
index 77e94177b40b2..2f3c0187ac4a9 100644
--- a/crates/ruff/src/directives.rs
+++ b/crates/ruff/src/directives.rs
@@ -1,12 +1,15 @@
-//! Extract `# noqa` and `# isort: skip` directives from tokenized source.
+//! Extract `# noqa`, `# isort: skip`, and `# TODO` directives from tokenized source.
+
+use std::str::FromStr;
 
-use crate::noqa::NoqaMapping;
 use bitflags::bitflags;
-use ruff_python_ast::source_code::{Indexer, Locator};
 use ruff_text_size::{TextLen, TextRange, TextSize};
 use rustpython_parser::lexer::LexResult;
 use rustpython_parser::Tok;
 
+use ruff_python_ast::source_code::{Indexer, Locator};
+
+use crate::noqa::NoqaMapping;
 use crate::settings::Settings;
 
 bitflags! {
@@ -82,11 +85,7 @@ pub fn extract_directives(
 }
 
 /// Extract a mapping from logical line to noqa line.
-pub fn extract_noqa_line_for(
-    lxr: &[LexResult],
-    locator: &Locator,
-    indexer: &Indexer,
-) -> NoqaMapping {
+fn extract_noqa_line_for(lxr: &[LexResult], locator: &Locator, indexer: &Indexer) -> NoqaMapping {
     let mut string_mappings = Vec::new();
 
     for (tok, range) in lxr.iter().flatten() {
@@ -102,7 +101,10 @@ pub fn extract_noqa_line_for(
                 ..
             } => {
                 if locator.contains_line_break(*range) {
-                    string_mappings.push(*range);
+                    string_mappings.push(TextRange::new(
+                        locator.line_start(range.start()),
+                        range.end(),
+                    ));
                 }
             }
 
@@ -162,7 +164,7 @@ pub fn extract_noqa_line_for(
 }
 
 /// Extract a set of ranges over which to disable isort.
-pub fn extract_isort_directives(lxr: &[LexResult], locator: &Locator) -> IsortDirectives {
+fn extract_isort_directives(lxr: &[LexResult], locator: &Locator) -> IsortDirectives {
     let mut exclusions: Vec<TextRange> = Vec::default();
     let mut splits: Vec<TextSize> = Vec::default();
     let mut off: Option<TextSize> = None;
@@ -217,14 +219,144 @@ pub fn extract_isort_directives(lxr: &[LexResult], locator: &Locator) -> IsortDi
     }
 }
 
+/// A comment that contains a [`TodoDirective`]
+pub(crate) struct TodoComment<'a> {
+    /// The comment's text
+    pub(crate) content: &'a str,
+    /// The directive found within the comment.
+    pub(crate) directive: TodoDirective<'a>,
+    /// The comment's actual [`TextRange`].
+    pub(crate) range: TextRange,
+    /// The comment range's position in [`Indexer`].comment_ranges()
+    pub(crate) range_index: usize,
+}
+
+impl<'a> TodoComment<'a> {
+    /// Attempt to transform a normal comment into a [`TodoComment`].
+    pub(crate) fn from_comment(
+        content: &'a str,
+        range: TextRange,
+        range_index: usize,
+    ) -> Option<Self> {
+        TodoDirective::from_comment(content, range).map(|directive| Self {
+            content,
+            directive,
+            range,
+            range_index,
+        })
+    }
+}
+
+#[derive(Debug, PartialEq)]
+pub(crate) struct TodoDirective<'a> {
+    /// The actual directive
+    pub(crate) content: &'a str,
+    /// The directive's [`TextRange`] in the file.
+    pub(crate) range: TextRange,
+    /// The directive's kind: HACK, XXX, FIXME, or TODO.
+    pub(crate) kind: TodoDirectiveKind,
+}
+
+impl<'a> TodoDirective<'a> {
+    /// Extract a [`TodoDirective`] from a comment.
+    pub(crate) fn from_comment(comment: &'a str, comment_range: TextRange) -> Option<Self> {
+        // The directive's offset from the start of the comment.
+        let mut relative_offset = TextSize::new(0);
+        let mut subset_opt = Some(comment);
+
+        // Loop over `#`-delimited sections of the comment to check for directives. This will
+        // correctly handle cases like `# foo # TODO`.
+        while let Some(subset) = subset_opt {
+            let trimmed = subset.trim_start_matches('#').trim_start();
+
+            let offset = subset.text_len() - trimmed.text_len();
+            relative_offset += offset;
+
+            // If we detect a TodoDirectiveKind variant substring in the comment, construct and
+            // return the appropriate TodoDirective
+            if let Ok(directive_kind) = trimmed.parse::<TodoDirectiveKind>() {
+                let len = directive_kind.len();
+
+                return Some(Self {
+                    content: &comment[TextRange::at(relative_offset, len)],
+                    range: TextRange::at(comment_range.start() + relative_offset, len),
+                    kind: directive_kind,
+                });
+            }
+
+            // Shrink the subset to check for the next phrase starting with "#".
+            subset_opt = if let Some(new_offset) = trimmed.find('#') {
+                relative_offset += TextSize::try_from(new_offset).unwrap();
+                subset.get(relative_offset.to_usize()..)
+            } else {
+                None
+            };
+        }
+
+        None
+    }
+}
+
+#[derive(Debug, PartialEq)]
+pub(crate) enum TodoDirectiveKind {
+    Todo,
+    Fixme,
+    Xxx,
+    Hack,
+}
+
+impl FromStr for TodoDirectiveKind {
+    type Err = ();
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        // The lengths of the respective variant strings: TODO, FIXME, HACK, XXX
+        for length in [3, 4, 5] {
+            let Some(substr) = s.get(..length) else {
+                break;
+            };
+
+            match substr.to_lowercase().as_str() {
+                "fixme" => {
+                    return Ok(TodoDirectiveKind::Fixme);
+                }
+                "hack" => {
+                    return Ok(TodoDirectiveKind::Hack);
+                }
+                "todo" => {
+                    return Ok(TodoDirectiveKind::Todo);
+                }
+                "xxx" => {
+                    return Ok(TodoDirectiveKind::Xxx);
+                }
+                _ => continue,
+            }
+        }
+
+        Err(())
+    }
+}
+
+impl TodoDirectiveKind {
+    fn len(&self) -> TextSize {
+        match self {
+            TodoDirectiveKind::Xxx => TextSize::new(3),
+            TodoDirectiveKind::Hack | TodoDirectiveKind::Todo => TextSize::new(4),
+            TodoDirectiveKind::Fixme => TextSize::new(5),
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
-    use ruff_python_ast::source_code::{Indexer, Locator};
     use ruff_text_size::{TextLen, TextRange, TextSize};
     use rustpython_parser::lexer::LexResult;
     use rustpython_parser::{lexer, Mode};
 
-    use crate::directives::{extract_isort_directives, extract_noqa_line_for};
+    use ruff_python_ast::source_code::{Indexer, Locator};
+
+    use crate::directives::{
+        extract_isort_directives, extract_noqa_line_for, TodoDirective, TodoDirectiveKind,
+    };
     use crate::noqa::NoqaMapping;
 
     fn noqa_mappings(contents: &str) -> NoqaMapping {
@@ -271,7 +403,7 @@ y = 2
 z = x + 1";
         assert_eq!(
             noqa_mappings(contents),
-            NoqaMapping::from_iter([TextRange::new(TextSize::from(4), TextSize::from(22)),])
+            NoqaMapping::from_iter([TextRange::new(TextSize::from(0), TextSize::from(22)),])
         );
 
         let contents = "x = 1
@@ -282,7 +414,7 @@ ghi
 z = 2";
         assert_eq!(
             noqa_mappings(contents),
-            NoqaMapping::from_iter([TextRange::new(TextSize::from(10), TextSize::from(28))])
+            NoqaMapping::from_iter([TextRange::new(TextSize::from(6), TextSize::from(28))])
         );
 
         let contents = "x = 1
@@ -292,7 +424,7 @@ ghi
 '''";
         assert_eq!(
             noqa_mappings(contents),
-            NoqaMapping::from_iter([TextRange::new(TextSize::from(10), TextSize::from(28))])
+            NoqaMapping::from_iter([TextRange::new(TextSize::from(6), TextSize::from(28))])
         );
 
         let contents = r#"x = \
@@ -427,4 +559,62 @@ z = x + 1";
             vec![TextSize::from(13)]
         );
     }
+
+    #[test]
+    fn todo_directives() {
+        let test_comment = "# TODO: todo tag";
+        let test_comment_range = TextRange::at(TextSize::new(0), test_comment.text_len());
+        let expected = TodoDirective {
+            content: "TODO",
+            range: TextRange::new(TextSize::new(2), TextSize::new(6)),
+            kind: TodoDirectiveKind::Todo,
+        };
+        assert_eq!(
+            expected,
+            TodoDirective::from_comment(test_comment, test_comment_range).unwrap()
+        );
+
+        let test_comment = "#TODO: todo tag";
+        let test_comment_range = TextRange::at(TextSize::new(0), test_comment.text_len());
+        let expected = TodoDirective {
+            content: "TODO",
+            range: TextRange::new(TextSize::new(1), TextSize::new(5)),
+            kind: TodoDirectiveKind::Todo,
+        };
+        assert_eq!(
+            expected,
+            TodoDirective::from_comment(test_comment, test_comment_range).unwrap()
+        );
+
+        let test_comment = "# fixme: fixme tag";
+        let test_comment_range = TextRange::at(TextSize::new(0), test_comment.text_len());
+        let expected = TodoDirective {
+            content: "fixme",
+            range: TextRange::new(TextSize::new(2), TextSize::new(7)),
+            kind: TodoDirectiveKind::Fixme,
+        };
+        assert_eq!(
+            expected,
+            TodoDirective::from_comment(test_comment, test_comment_range).unwrap()
+        );
+
+        let test_comment = "# noqa # TODO: todo";
+        let test_comment_range = TextRange::at(TextSize::new(0), test_comment.text_len());
+        let expected = TodoDirective {
+            content: "TODO",
+            range: TextRange::new(TextSize::new(9), TextSize::new(13)),
+            kind: TodoDirectiveKind::Todo,
+        };
+        assert_eq!(
+            expected,
+            TodoDirective::from_comment(test_comment, test_comment_range).unwrap()
+        );
+
+        let test_comment = "# no directive";
+        let test_comment_range = TextRange::at(TextSize::new(0), test_comment.text_len());
+        assert_eq!(
+            None,
+            TodoDirective::from_comment(test_comment, test_comment_range)
+        );
+    }
 }
diff --git a/crates/ruff/src/doc_lines.rs b/crates/ruff/src/doc_lines.rs
index 7cb8de1ff6972..3e2de44920b2a 100644
--- a/crates/ruff/src/doc_lines.rs
+++ b/crates/ruff/src/doc_lines.rs
@@ -1,33 +1,31 @@
 //! Doc line extraction. In this context, a doc line is a line consisting of a
 //! standalone comment or a constant string statement.
 
-use ruff_text_size::{TextRange, TextSize};
 use std::iter::FusedIterator;
 
-use ruff_python_ast::source_code::Locator;
-use rustpython_parser::ast::{Constant, ExprKind, Stmt, StmtKind, Suite};
+use ruff_text_size::TextSize;
+use rustpython_parser::ast::{self, Constant, Expr, Ranged, Stmt, Suite};
 use rustpython_parser::lexer::LexResult;
 use rustpython_parser::Tok;
 
-use ruff_python_ast::visitor;
-use ruff_python_ast::visitor::Visitor;
+use ruff_newlines::UniversalNewlineIterator;
+use ruff_python_ast::source_code::Locator;
+use ruff_python_ast::statement_visitor::{walk_stmt, StatementVisitor};
 
 /// Extract doc lines (standalone comments) from a token sequence.
-pub fn doc_lines_from_tokens<'a>(lxr: &'a [LexResult], locator: &'a Locator<'a>) -> DocLines<'a> {
-    DocLines::new(lxr, locator)
+pub(crate) fn doc_lines_from_tokens(lxr: &[LexResult]) -> DocLines {
+    DocLines::new(lxr)
 }
 
-pub struct DocLines<'a> {
+pub(crate) struct DocLines<'a> {
     inner: std::iter::Flatten<core::slice::Iter<'a, LexResult>>,
-    locator: &'a Locator<'a>,
     prev: TextSize,
 }
 
 impl<'a> DocLines<'a> {
-    fn new(lxr: &'a [LexResult], locator: &'a Locator) -> Self {
+    fn new(lxr: &'a [LexResult]) -> Self {
         Self {
             inner: lxr.iter().flatten(),
-            locator,
             prev: TextSize::default(),
         }
     }
@@ -43,15 +41,11 @@ impl Iterator for DocLines<'_> {
 
             match tok {
                 Tok::Comment(..) => {
-                    if at_start_of_line
-                        || self
-                            .locator
-                            .contains_line_break(TextRange::new(self.prev, range.start()))
-                    {
+                    if at_start_of_line {
                         break Some(range.start());
                     }
                 }
-                Tok::Newline => {
+                Tok::Newline | Tok::NonLogicalNewline => {
                     at_start_of_line = true;
                 }
                 Tok::Indent | Tok::Dedent => {
@@ -69,29 +63,43 @@ impl Iterator for DocLines<'_> {
 
 impl FusedIterator for DocLines<'_> {}
 
-#[derive(Default)]
-struct StringLinesVisitor {
+struct StringLinesVisitor<'a> {
     string_lines: Vec<TextSize>,
+    locator: &'a Locator<'a>,
 }
 
-impl Visitor<'_> for StringLinesVisitor {
+impl StatementVisitor<'_> for StringLinesVisitor<'_> {
     fn visit_stmt(&mut self, stmt: &Stmt) {
-        if let StmtKind::Expr { value } = &stmt.node {
-            if let ExprKind::Constant {
+        if let Stmt::Expr(ast::StmtExpr { value, range: _ }) = stmt {
+            if let Expr::Constant(ast::ExprConstant {
                 value: Constant::Str(..),
                 ..
-            } = &value.node
+            }) = value.as_ref()
             {
-                self.string_lines.push(value.start());
+                for line in UniversalNewlineIterator::with_offset(
+                    self.locator.slice(value.range()),
+                    value.start(),
+                ) {
+                    self.string_lines.push(line.start());
+                }
             }
         }
-        visitor::walk_stmt(self, stmt);
+        walk_stmt(self, stmt);
+    }
+}
+
+impl<'a> StringLinesVisitor<'a> {
+    fn new(locator: &'a Locator<'a>) -> Self {
+        Self {
+            string_lines: Vec::new(),
+            locator,
+        }
     }
 }
 
 /// Extract doc lines (standalone strings) start positions from an AST.
-pub fn doc_lines_from_ast(python_ast: &Suite) -> Vec<TextSize> {
-    let mut visitor = StringLinesVisitor::default();
+pub(crate) fn doc_lines_from_ast(python_ast: &Suite, locator: &Locator) -> Vec<TextSize> {
+    let mut visitor = StringLinesVisitor::new(locator);
     visitor.visit_body(python_ast);
     visitor.string_lines
 }
diff --git a/crates/ruff/src/docstrings/definition.rs b/crates/ruff/src/docstrings/definition.rs
deleted file mode 100644
index cf338a364adb4..0000000000000
--- a/crates/ruff/src/docstrings/definition.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-use ruff_text_size::{TextRange, TextSize};
-use rustpython_parser::ast::{Expr, Stmt};
-use std::fmt::{Debug, Formatter};
-use std::ops::Deref;
-
-use ruff_python_semantic::analyze::visibility::{
-    class_visibility, function_visibility, method_visibility, Modifier, Visibility, VisibleScope,
-};
-
-#[derive(Debug, Clone)]
-pub enum DefinitionKind<'a> {
-    Module,
-    Package,
-    Class(&'a Stmt),
-    NestedClass(&'a Stmt),
-    Function(&'a Stmt),
-    NestedFunction(&'a Stmt),
-    Method(&'a Stmt),
-}
-
-#[derive(Debug)]
-pub struct Definition<'a> {
-    pub kind: DefinitionKind<'a>,
-    pub docstring: Option<&'a Expr>,
-}
-
-#[derive(Debug)]
-pub struct Docstring<'a> {
-    pub kind: DefinitionKind<'a>,
-    pub expr: &'a Expr,
-    /// The content of the docstring, including the leading and trailing quotes.
-    pub contents: &'a str,
-
-    /// The range of the docstring body (without the quotes). The range is relative to [`Self::contents`].
-    pub body_range: TextRange,
-    pub indentation: &'a str,
-}
-
-impl<'a> Docstring<'a> {
-    pub fn body(&self) -> DocstringBody {
-        DocstringBody { docstring: self }
-    }
-
-    pub const fn start(&self) -> TextSize {
-        self.expr.start()
-    }
-
-    pub const fn end(&self) -> TextSize {
-        self.expr.end()
-    }
-
-    pub const fn range(&self) -> TextRange {
-        self.expr.range()
-    }
-
-    pub fn leading_quote(&self) -> &'a str {
-        &self.contents[TextRange::up_to(self.body_range.start())]
-    }
-}
-
-#[derive(Copy, Clone)]
-pub struct DocstringBody<'a> {
-    docstring: &'a Docstring<'a>,
-}
-
-impl<'a> DocstringBody<'a> {
-    #[inline]
-    pub fn start(self) -> TextSize {
-        self.range().start()
-    }
-
-    #[inline]
-    pub fn end(self) -> TextSize {
-        self.range().end()
-    }
-
-    pub fn range(self) -> TextRange {
-        self.docstring.body_range + self.docstring.start()
-    }
-
-    pub fn as_str(self) -> &'a str {
-        &self.docstring.contents[self.docstring.body_range]
-    }
-}
-
-impl Deref for DocstringBody<'_> {
-    type Target = str;
-
-    fn deref(&self) -> &Self::Target {
-        self.as_str()
-    }
-}
-
-impl Debug for DocstringBody<'_> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("DocstringBody")
-            .field("text", &self.as_str())
-            .field("range", &self.range())
-            .finish()
-    }
-}
-
-#[derive(Copy, Clone)]
-pub enum Documentable {
-    Class,
-    Function,
-}
-
-pub fn transition_scope(scope: VisibleScope, stmt: &Stmt, kind: Documentable) -> VisibleScope {
-    match kind {
-        Documentable::Function => VisibleScope {
-            modifier: Modifier::Function,
-            visibility: match scope {
-                VisibleScope {
-                    modifier: Modifier::Module,
-                    visibility: Visibility::Public,
-                } => function_visibility(stmt),
-                VisibleScope {
-                    modifier: Modifier::Class,
-                    visibility: Visibility::Public,
-                } => method_visibility(stmt),
-                _ => Visibility::Private,
-            },
-        },
-        Documentable::Class => VisibleScope {
-            modifier: Modifier::Class,
-            visibility: match scope {
-                VisibleScope {
-                    modifier: Modifier::Module,
-                    visibility: Visibility::Public,
-                } => class_visibility(stmt),
-                VisibleScope {
-                    modifier: Modifier::Class,
-                    visibility: Visibility::Public,
-                } => class_visibility(stmt),
-                _ => Visibility::Private,
-            },
-        },
-    }
-}
diff --git a/crates/ruff/src/docstrings/extraction.rs b/crates/ruff/src/docstrings/extraction.rs
index 7fbe79a2d1a95..aa64249425074 100644
--- a/crates/ruff/src/docstrings/extraction.rs
+++ b/crates/ruff/src/docstrings/extraction.rs
@@ -1,84 +1,90 @@
 //! Extract docstrings from an AST.
 
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Constant, Expr, Stmt};
 
-use ruff_python_semantic::analyze::visibility;
-
-use crate::docstrings::definition::{Definition, DefinitionKind, Documentable};
+use ruff_python_semantic::definition::{Definition, DefinitionId, Definitions, Member, MemberKind};
 
 /// Extract a docstring from a function or class body.
-pub fn docstring_from(suite: &[Stmt]) -> Option<&Expr> {
+pub(crate) fn docstring_from(suite: &[Stmt]) -> Option<&Expr> {
     let stmt = suite.first()?;
     // Require the docstring to be a standalone expression.
-    let StmtKind::Expr { value } = &stmt.node else {
+    let Stmt::Expr(ast::StmtExpr { value, range: _ }) = stmt else {
         return None;
     };
     // Only match strings.
     if !matches!(
-        &value.node,
-        ExprKind::Constant {
+        value.as_ref(),
+        Expr::Constant(ast::ExprConstant {
             value: Constant::Str(_),
             ..
-        }
+        })
     ) {
         return None;
     }
     Some(value)
 }
 
+/// Extract a docstring from a `Definition`.
+pub(crate) fn extract_docstring<'a>(definition: &'a Definition<'a>) -> Option<&'a Expr> {
+    match definition {
+        Definition::Module(module) => docstring_from(module.python_ast),
+        Definition::Member(member) => {
+            if let Stmt::ClassDef(ast::StmtClassDef { body, .. })
+            | Stmt::FunctionDef(ast::StmtFunctionDef { body, .. })
+            | Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef { body, .. }) = &member.stmt
+            {
+                docstring_from(body)
+            } else {
+                None
+            }
+        }
+    }
+}
+
+#[derive(Copy, Clone)]
+pub(crate) enum ExtractionTarget {
+    Class,
+    Function,
+}
+
 /// Extract a `Definition` from the AST node defined by a `Stmt`.
-pub fn extract<'a>(
-    scope: visibility::VisibleScope,
+pub(crate) fn extract_definition<'a>(
+    target: ExtractionTarget,
     stmt: &'a Stmt,
-    body: &'a [Stmt],
-    kind: Documentable,
-) -> Definition<'a> {
-    let expr = docstring_from(body);
-    match kind {
-        Documentable::Function => match scope {
-            visibility::VisibleScope {
-                modifier: visibility::Modifier::Module,
-                ..
-            } => Definition {
-                kind: DefinitionKind::Function(stmt),
-                docstring: expr,
+    parent: DefinitionId,
+    definitions: &Definitions<'a>,
+) -> Member<'a> {
+    match target {
+        ExtractionTarget::Function => match &definitions[parent] {
+            Definition::Module(..) => Member {
+                parent,
+                kind: MemberKind::Function,
+                stmt,
             },
-            visibility::VisibleScope {
-                modifier: visibility::Modifier::Class,
+            Definition::Member(Member {
+                kind: MemberKind::Class | MemberKind::NestedClass,
                 ..
-            } => Definition {
-                kind: DefinitionKind::Method(stmt),
-                docstring: expr,
+            }) => Member {
+                parent,
+                kind: MemberKind::Method,
+                stmt,
             },
-            visibility::VisibleScope {
-                modifier: visibility::Modifier::Function,
-                ..
-            } => Definition {
-                kind: DefinitionKind::NestedFunction(stmt),
-                docstring: expr,
+            Definition::Member(..) => Member {
+                parent,
+                kind: MemberKind::NestedFunction,
+                stmt,
             },
         },
-        Documentable::Class => match scope {
-            visibility::VisibleScope {
-                modifier: visibility::Modifier::Module,
-                ..
-            } => Definition {
-                kind: DefinitionKind::Class(stmt),
-                docstring: expr,
+        ExtractionTarget::Class => match &definitions[parent] {
+            Definition::Module(..) => Member {
+                parent,
+                kind: MemberKind::Class,
+                stmt,
             },
-            visibility::VisibleScope {
-                modifier: visibility::Modifier::Class,
-                ..
-            } => Definition {
-                kind: DefinitionKind::NestedClass(stmt),
-                docstring: expr,
-            },
-            visibility::VisibleScope {
-                modifier: visibility::Modifier::Function,
-                ..
-            } => Definition {
-                kind: DefinitionKind::NestedClass(stmt),
-                docstring: expr,
+            Definition::Member(..) => Member {
+                parent,
+                kind: MemberKind::NestedClass,
+                stmt,
             },
         },
     }
diff --git a/crates/ruff/src/docstrings/mod.rs b/crates/ruff/src/docstrings/mod.rs
index 468f9f460845e..b9df42d41598b 100644
--- a/crates/ruff/src/docstrings/mod.rs
+++ b/crates/ruff/src/docstrings/mod.rs
@@ -1,6 +1,84 @@
-pub mod definition;
-pub mod extraction;
-pub mod google;
-pub mod numpy;
-pub mod sections;
-pub mod styles;
+use std::fmt::{Debug, Formatter};
+use std::ops::Deref;
+
+use ruff_text_size::{TextRange, TextSize};
+use rustpython_parser::ast::{Expr, Ranged};
+
+use ruff_python_semantic::definition::Definition;
+
+pub(crate) mod extraction;
+pub(crate) mod google;
+pub(crate) mod numpy;
+pub(crate) mod sections;
+pub(crate) mod styles;
+
+#[derive(Debug)]
+pub(crate) struct Docstring<'a> {
+    pub(crate) definition: &'a Definition<'a>,
+    pub(crate) expr: &'a Expr,
+    /// The content of the docstring, including the leading and trailing quotes.
+    pub(crate) contents: &'a str,
+
+    /// The range of the docstring body (without the quotes). The range is relative to [`Self::contents`].
+    pub(crate) body_range: TextRange,
+    pub(crate) indentation: &'a str,
+}
+
+impl<'a> Docstring<'a> {
+    pub(crate) fn body(&self) -> DocstringBody {
+        DocstringBody { docstring: self }
+    }
+
+    pub(crate) fn start(&self) -> TextSize {
+        self.expr.start()
+    }
+
+    pub(crate) fn end(&self) -> TextSize {
+        self.expr.end()
+    }
+
+    pub(crate) fn range(&self) -> TextRange {
+        self.expr.range()
+    }
+
+    pub(crate) fn leading_quote(&self) -> &'a str {
+        &self.contents[TextRange::up_to(self.body_range.start())]
+    }
+}
+
+#[derive(Copy, Clone)]
+pub(crate) struct DocstringBody<'a> {
+    docstring: &'a Docstring<'a>,
+}
+
+impl<'a> DocstringBody<'a> {
+    #[inline]
+    pub(crate) fn start(self) -> TextSize {
+        self.range().start()
+    }
+
+    pub(crate) fn range(self) -> TextRange {
+        self.docstring.body_range + self.docstring.start()
+    }
+
+    pub(crate) fn as_str(self) -> &'a str {
+        &self.docstring.contents[self.docstring.body_range]
+    }
+}
+
+impl Deref for DocstringBody<'_> {
+    type Target = str;
+
+    fn deref(&self) -> &Self::Target {
+        self.as_str()
+    }
+}
+
+impl Debug for DocstringBody<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("DocstringBody")
+            .field("text", &self.as_str())
+            .field("range", &self.range())
+            .finish()
+    }
+}
diff --git a/crates/ruff/src/docstrings/sections.rs b/crates/ruff/src/docstrings/sections.rs
index 1685c7e76181b..f1b4ced28661e 100644
--- a/crates/ruff/src/docstrings/sections.rs
+++ b/crates/ruff/src/docstrings/sections.rs
@@ -1,15 +1,17 @@
-use ruff_python_ast::newlines::{StrExt, UniversalNewlineIterator};
-use ruff_text_size::{TextLen, TextRange, TextSize};
 use std::fmt::{Debug, Formatter};
 use std::iter::FusedIterator;
+
+use ruff_text_size::{TextLen, TextRange, TextSize};
 use strum_macros::EnumIter;
 
-use crate::docstrings::definition::{Docstring, DocstringBody};
-use crate::docstrings::styles::SectionStyle;
+use ruff_newlines::{StrExt, UniversalNewlineIterator};
 use ruff_python_ast::whitespace;
 
+use crate::docstrings::styles::SectionStyle;
+use crate::docstrings::{Docstring, DocstringBody};
+
 #[derive(EnumIter, PartialEq, Eq, Debug, Clone, Copy)]
-pub enum SectionKind {
+pub(crate) enum SectionKind {
     Args,
     Arguments,
     Attention,
@@ -48,7 +50,7 @@ pub enum SectionKind {
 }
 
 impl SectionKind {
-    pub fn from_str(s: &str) -> Option<Self> {
+    pub(crate) fn from_str(s: &str) -> Option<Self> {
         match s.to_ascii_lowercase().as_str() {
             "args" => Some(Self::Args),
             "arguments" => Some(Self::Arguments),
@@ -89,7 +91,7 @@ impl SectionKind {
         }
     }
 
-    pub fn as_str(self) -> &'static str {
+    pub(crate) fn as_str(self) -> &'static str {
         match self {
             Self::Args => "Args",
             Self::Arguments => "Arguments",
@@ -137,7 +139,7 @@ pub(crate) struct SectionContexts<'a> {
 
 impl<'a> SectionContexts<'a> {
     /// Extract all `SectionContext` values from a docstring.
-    pub fn from_docstring(docstring: &'a Docstring<'a>, style: SectionStyle) -> Self {
+    pub(crate) fn from_docstring(docstring: &'a Docstring<'a>, style: SectionStyle) -> Self {
         let contents = docstring.body();
 
         let mut contexts = Vec::new();
@@ -190,11 +192,11 @@ impl<'a> SectionContexts<'a> {
         }
     }
 
-    pub fn len(&self) -> usize {
+    pub(crate) fn len(&self) -> usize {
         self.contexts.len()
     }
 
-    pub fn iter(&self) -> SectionContextsIter {
+    pub(crate) fn iter(&self) -> SectionContextsIter {
         SectionContextsIter {
             docstring_body: self.docstring.body(),
             inner: self.contexts.iter(),
@@ -217,7 +219,7 @@ impl Debug for SectionContexts<'_> {
     }
 }
 
-pub struct SectionContextsIter<'a> {
+pub(crate) struct SectionContextsIter<'a> {
     docstring_body: DocstringBody<'a>,
     inner: std::slice::Iter<'a, SectionContextData>,
 }
@@ -266,28 +268,24 @@ struct SectionContextData {
     summary_full_end: TextSize,
 }
 
-pub struct SectionContext<'a> {
+pub(crate) struct SectionContext<'a> {
     data: &'a SectionContextData,
     docstring_body: DocstringBody<'a>,
 }
 
 impl<'a> SectionContext<'a> {
-    pub fn is_last(&self) -> bool {
-        self.range().end() == self.docstring_body.end()
-    }
-
     /// The `kind` of the section, e.g. [`SectionKind::Args`] or [`SectionKind::Returns`].
-    pub const fn kind(&self) -> SectionKind {
+    pub(crate) const fn kind(&self) -> SectionKind {
         self.data.kind
     }
 
     /// The name of the section as it appears in the docstring, e.g. "Args" or "Returns".
-    pub fn section_name(&self) -> &'a str {
+    pub(crate) fn section_name(&self) -> &'a str {
         &self.docstring_body.as_str()[self.data.name_range]
     }
 
     /// Returns the rest of the summary line after the section name.
-    pub fn summary_after_section_name(&self) -> &'a str {
+    pub(crate) fn summary_after_section_name(&self) -> &'a str {
         &self.summary_line()[usize::from(self.data.name_range.end() - self.data.range.start())..]
     }
 
@@ -296,17 +294,12 @@ impl<'a> SectionContext<'a> {
     }
 
     /// The absolute range of the section name
-    pub fn section_name_range(&self) -> TextRange {
+    pub(crate) fn section_name_range(&self) -> TextRange {
         self.data.name_range + self.offset()
     }
 
-    /// Summary range relative to the start of the document. Includes the trailing newline.
-    pub fn summary_full_range(&self) -> TextRange {
-        self.summary_full_range_relative() + self.offset()
-    }
-
     /// The absolute range of the summary line, excluding any trailing newline character.
-    pub fn summary_range(&self) -> TextRange {
+    pub(crate) fn summary_range(&self) -> TextRange {
         TextRange::at(self.range().start(), self.summary_line().text_len())
     }
 
@@ -321,12 +314,12 @@ impl<'a> SectionContext<'a> {
     }
 
     /// The absolute range of the full-section.
-    pub fn range(&self) -> TextRange {
+    pub(crate) fn range(&self) -> TextRange {
         self.range_relative() + self.offset()
     }
 
     /// Summary line without the trailing newline characters
-    pub fn summary_line(&self) -> &'a str {
+    pub(crate) fn summary_line(&self) -> &'a str {
         let full_summary = &self.docstring_body.as_str()[self.summary_full_range_relative()];
 
         let mut bytes = full_summary.bytes().rev();
@@ -347,14 +340,14 @@ impl<'a> SectionContext<'a> {
     }
 
     /// Returns the text of the last line of the previous section or an empty string if it is the first section.
-    pub fn previous_line(&self) -> Option<&'a str> {
+    pub(crate) fn previous_line(&self) -> Option<&'a str> {
         let previous =
             &self.docstring_body.as_str()[TextRange::up_to(self.range_relative().start())];
         previous.universal_newlines().last().map(|l| l.as_str())
     }
 
     /// Returns the lines belonging to this section after the summary line.
-    pub fn following_lines(&self) -> UniversalNewlineIterator<'a> {
+    pub(crate) fn following_lines(&self) -> UniversalNewlineIterator<'a> {
         let lines = self.following_lines_str();
         UniversalNewlineIterator::with_offset(lines, self.offset() + self.data.summary_full_end)
     }
@@ -369,7 +362,7 @@ impl<'a> SectionContext<'a> {
     }
 
     /// Returns the absolute range of the following lines.
-    pub fn following_range(&self) -> TextRange {
+    pub(crate) fn following_range(&self) -> TextRange {
         self.following_range_relative() + self.offset()
     }
 }
diff --git a/crates/ruff/src/flake8_to_ruff/converter.rs b/crates/ruff/src/flake8_to_ruff/converter.rs
index 8e54ae57bcfc7..5bccf6369199d 100644
--- a/crates/ruff/src/flake8_to_ruff/converter.rs
+++ b/crates/ruff/src/flake8_to_ruff/converter.rs
@@ -3,16 +3,14 @@ use std::collections::{HashMap, HashSet};
 use anyhow::Result;
 use itertools::Itertools;
 
-use super::external_config::ExternalConfig;
-use super::plugin::Plugin;
-use super::{parser, plugin};
+use crate::line_width::LineLength;
 use crate::registry::Linter;
 use crate::rule_selector::RuleSelector;
 use crate::rules::flake8_pytest_style::types::{
     ParametrizeNameType, ParametrizeValuesRowType, ParametrizeValuesType,
 };
 use crate::rules::flake8_quotes::settings::Quote;
-use crate::rules::flake8_tidy_imports::relative_imports::Strictness;
+use crate::rules::flake8_tidy_imports::settings::Strictness;
 use crate::rules::pydocstyle::settings::Convention;
 use crate::rules::{
     flake8_annotations, flake8_bugbear, flake8_builtins, flake8_errmsg, flake8_pytest_style,
@@ -23,6 +21,10 @@ use crate::settings::pyproject::Pyproject;
 use crate::settings::types::PythonVersion;
 use crate::warn_user;
 
+use super::external_config::ExternalConfig;
+use super::plugin::Plugin;
+use super::{parser, plugin};
+
 const DEFAULT_SELECTORS: &[RuleSelector] = &[
     RuleSelector::Linter(Linter::Pyflakes),
     RuleSelector::Linter(Linter::Pycodestyle),
@@ -119,7 +121,9 @@ pub fn convert(
                     options.builtins = Some(parser::parse_strings(value.as_ref()));
                 }
                 "max-line-length" | "max_line_length" => match value.parse::<usize>() {
-                    Ok(line_length) => options.line_length = Some(line_length),
+                    Ok(line_length) => {
+                        options.line_length = Some(LineLength::from(line_length));
+                    }
                     Err(e) => {
                         warn_user!("Unable to parse '{key}' property: {e}");
                     }
@@ -402,7 +406,7 @@ pub fn convert(
     // Extract any settings from the existing `pyproject.toml`.
     if let Some(black) = &external_config.black {
         if let Some(line_length) = &black.line_length {
-            options.line_length = Some(*line_length);
+            options.line_length = Some(LineLength::from(*line_length));
         }
 
         if let Some(target_version) = &black.target_version {
@@ -456,11 +460,10 @@ mod tests {
     use pep440_rs::VersionSpecifiers;
     use pretty_assertions::assert_eq;
 
-    use super::super::plugin::Plugin;
-    use super::convert;
     use crate::flake8_to_ruff::converter::DEFAULT_SELECTORS;
     use crate::flake8_to_ruff::pep621::Project;
     use crate::flake8_to_ruff::ExternalConfig;
+    use crate::line_width::LineLength;
     use crate::registry::Linter;
     use crate::rule_selector::RuleSelector;
     use crate::rules::pydocstyle::settings::Convention;
@@ -469,6 +472,9 @@ mod tests {
     use crate::settings::pyproject::Pyproject;
     use crate::settings::types::PythonVersion;
 
+    use super::super::plugin::Plugin;
+    use super::convert;
+
     fn default_options(plugins: impl IntoIterator<Item = RuleSelector>) -> Options {
         Options {
             ignore: Some(vec![]),
@@ -508,7 +514,7 @@ mod tests {
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
-            line_length: Some(100),
+            line_length: Some(LineLength::from(100)),
             ..default_options([])
         });
         assert_eq!(actual, expected);
@@ -527,7 +533,7 @@ mod tests {
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
-            line_length: Some(100),
+            line_length: Some(LineLength::from(100)),
             ..default_options([])
         });
         assert_eq!(actual, expected);
diff --git a/crates/ruff/src/flake8_to_ruff/mod.rs b/crates/ruff/src/flake8_to_ruff/mod.rs
index 629b4831c2d9a..1b847b97d42b4 100644
--- a/crates/ruff/src/flake8_to_ruff/mod.rs
+++ b/crates/ruff/src/flake8_to_ruff/mod.rs
@@ -1,3 +1,8 @@
+pub use converter::convert;
+pub use external_config::ExternalConfig;
+pub use plugin::Plugin;
+pub use pyproject::parse;
+
 mod black;
 mod converter;
 mod external_config;
@@ -6,8 +11,3 @@ mod parser;
 pub mod pep621;
 mod plugin;
 mod pyproject;
-
-pub use converter::convert;
-pub use external_config::ExternalConfig;
-pub use plugin::Plugin;
-pub use pyproject::parse;
diff --git a/crates/ruff/src/flake8_to_ruff/parser.rs b/crates/ruff/src/flake8_to_ruff/parser.rs
index 3e44adab5a904..5c305aafcde65 100644
--- a/crates/ruff/src/flake8_to_ruff/parser.rs
+++ b/crates/ruff/src/flake8_to_ruff/parser.rs
@@ -13,7 +13,7 @@ static COMMA_SEPARATED_LIST_RE: Lazy<Regex> = Lazy::new(|| Regex::new(r"[,\s]").
 
 /// Parse a comma-separated list of `RuleSelector` values (e.g.,
 /// "F401,E501").
-pub fn parse_prefix_codes(value: &str) -> Vec<RuleSelector> {
+pub(crate) fn parse_prefix_codes(value: &str) -> Vec<RuleSelector> {
     let mut codes: Vec<RuleSelector> = vec![];
     for code in COMMA_SEPARATED_LIST_RE.split(value) {
         let code = code.trim();
@@ -30,7 +30,7 @@ pub fn parse_prefix_codes(value: &str) -> Vec<RuleSelector> {
 }
 
 /// Parse a comma-separated list of strings (e.g., "__init__.py,__main__.py").
-pub fn parse_strings(value: &str) -> Vec<String> {
+pub(crate) fn parse_strings(value: &str) -> Vec<String> {
     COMMA_SEPARATED_LIST_RE
         .split(value)
         .map(str::trim)
@@ -40,7 +40,7 @@ pub fn parse_strings(value: &str) -> Vec<String> {
 }
 
 /// Parse a boolean.
-pub fn parse_bool(value: &str) -> Result<bool> {
+pub(crate) fn parse_bool(value: &str) -> Result<bool> {
     match value.trim() {
         "true" => Ok(true),
         "false" => Ok(false),
@@ -138,7 +138,7 @@ fn tokenize_files_to_codes_mapping(value: &str) -> Vec<Token> {
 
 /// Parse a 'files-to-codes' mapping, mimicking Flake8's internal logic.
 /// See: <https://github.com/PyCQA/flake8/blob/7dfe99616fc2f07c0017df2ba5fa884158f3ea8a/src/flake8/utils.py#L45>
-pub fn parse_files_to_codes_mapping(value: &str) -> Result<Vec<PatternPrefixPair>> {
+pub(crate) fn parse_files_to_codes_mapping(value: &str) -> Result<Vec<PatternPrefixPair>> {
     if value.trim().is_empty() {
         return Ok(vec![]);
     }
@@ -178,7 +178,7 @@ pub fn parse_files_to_codes_mapping(value: &str) -> Result<Vec<PatternPrefixPair
 }
 
 /// Collect a list of `PatternPrefixPair` structs as a `BTreeMap`.
-pub fn collect_per_file_ignores(
+pub(crate) fn collect_per_file_ignores(
     pairs: Vec<PatternPrefixPair>,
 ) -> FxHashMap<String, Vec<RuleSelector>> {
     let mut per_file_ignores: FxHashMap<String, Vec<RuleSelector>> = FxHashMap::default();
@@ -195,12 +195,13 @@ pub fn collect_per_file_ignores(
 mod tests {
     use anyhow::Result;
 
-    use super::{parse_files_to_codes_mapping, parse_prefix_codes, parse_strings};
     use crate::codes;
     use crate::registry::Linter;
     use crate::rule_selector::RuleSelector;
     use crate::settings::types::PatternPrefixPair;
 
+    use super::{parse_files_to_codes_mapping, parse_prefix_codes, parse_strings};
+
     #[test]
     fn it_parses_prefix_codes() {
         let actual = parse_prefix_codes("");
diff --git a/crates/ruff/src/flake8_to_ruff/plugin.rs b/crates/ruff/src/flake8_to_ruff/plugin.rs
index 93e39d6b03b94..77f6645d29a12 100644
--- a/crates/ruff/src/flake8_to_ruff/plugin.rs
+++ b/crates/ruff/src/flake8_to_ruff/plugin.rs
@@ -175,7 +175,7 @@ impl From<&Plugin> for Linter {
 ///
 /// For example, if the user specified a `mypy-init-return` setting, we should
 /// infer that `flake8-annotations` is active.
-pub fn infer_plugins_from_options(flake8: &HashMap<String, Option<String>>) -> Vec<Plugin> {
+pub(crate) fn infer_plugins_from_options(flake8: &HashMap<String, Option<String>>) -> Vec<Plugin> {
     let mut plugins = BTreeSet::new();
     for key in flake8.keys() {
         match key.as_str() {
@@ -292,7 +292,7 @@ pub fn infer_plugins_from_options(flake8: &HashMap<String, Option<String>>) -> V
 ///
 /// For example, if the user ignores `ANN101`, we should infer that
 /// `flake8-annotations` is active.
-pub fn infer_plugins_from_codes(selectors: &HashSet<RuleSelector>) -> Vec<Plugin> {
+pub(crate) fn infer_plugins_from_codes(selectors: &HashSet<RuleSelector>) -> Vec<Plugin> {
     // Ignore cases in which we've knowingly changed rule prefixes.
     [
         Plugin::Flake82020,
diff --git a/crates/ruff/src/importer.rs b/crates/ruff/src/importer.rs
deleted file mode 100644
index fe003d18193d9..0000000000000
--- a/crates/ruff/src/importer.rs
+++ /dev/null
@@ -1,363 +0,0 @@
-//! Add and modify import statements to make module members available during fix execution.
-
-use anyhow::Result;
-use libcst_native::{Codegen, CodegenState, ImportAlias, Name, NameOrAttribute};
-use ruff_text_size::TextSize;
-use rustc_hash::FxHashMap;
-use rustpython_parser::ast::{Stmt, StmtKind, Suite};
-use rustpython_parser::{lexer, Mode, Tok};
-
-use ruff_diagnostics::Edit;
-use ruff_python_ast::helpers::is_docstring_stmt;
-use ruff_python_ast::imports::AnyImport;
-use ruff_python_ast::source_code::{Locator, Stylist};
-
-use crate::cst::matchers::{match_aliases, match_import_from, match_module};
-
-pub struct Importer<'a> {
-    python_ast: &'a Suite,
-    locator: &'a Locator<'a>,
-    stylist: &'a Stylist<'a>,
-    /// A map from module name to top-level `StmtKind::ImportFrom` statements.
-    import_from_map: FxHashMap<&'a str, &'a Stmt>,
-    /// The last top-level import statement.
-    trailing_import: Option<&'a Stmt>,
-}
-
-impl<'a> Importer<'a> {
-    pub fn new(python_ast: &'a Suite, locator: &'a Locator<'a>, stylist: &'a Stylist<'a>) -> Self {
-        Self {
-            python_ast,
-            locator,
-            stylist,
-            import_from_map: FxHashMap::default(),
-            trailing_import: None,
-        }
-    }
-
-    /// Visit a top-level import statement.
-    pub fn visit_import(&mut self, import: &'a Stmt) {
-        // Store a reference to the import statement in the appropriate map.
-        match &import.node {
-            StmtKind::Import { .. } => {
-                // Nothing to do here, we don't extend top-level `import` statements at all, so
-                // no need to track them.
-            }
-            StmtKind::ImportFrom { module, level, .. } => {
-                // Store a reverse-map from module name to `import ... from` statement.
-                if level.map_or(true, |level| level == 0) {
-                    if let Some(module) = module {
-                        self.import_from_map.insert(module.as_str(), import);
-                    }
-                }
-            }
-            _ => {
-                panic!("Expected StmtKind::Import | StmtKind::ImportFrom");
-            }
-        }
-
-        // Store a reference to the last top-level import statement.
-        self.trailing_import = Some(import);
-    }
-
-    /// Add an import statement to import the given module.
-    ///
-    /// If there are no existing imports, the new import will be added at the top
-    /// of the file. Otherwise, it will be added after the most recent top-level
-    /// import statement.
-    pub fn add_import(&self, import: &AnyImport) -> Edit {
-        let required_import = import.to_string();
-        if let Some(stmt) = self.trailing_import {
-            // Insert after the last top-level import.
-            let Insertion {
-                prefix,
-                location,
-                suffix,
-            } = end_of_statement_insertion(stmt, self.locator, self.stylist);
-            let content = format!("{prefix}{required_import}{suffix}");
-            Edit::insertion(content, location)
-        } else {
-            // Insert at the top of the file.
-            let Insertion {
-                prefix,
-                location,
-                suffix,
-            } = top_of_file_insertion(self.python_ast, self.locator, self.stylist);
-            let content = format!("{prefix}{required_import}{suffix}");
-            Edit::insertion(content, location)
-        }
-    }
-
-    /// Return the top-level [`Stmt`] that imports the given module using `StmtKind::ImportFrom`.
-    /// if it exists.
-    pub fn get_import_from(&self, module: &str) -> Option<&Stmt> {
-        self.import_from_map.get(module).copied()
-    }
-
-    /// Add the given member to an existing `StmtKind::ImportFrom` statement.
-    pub fn add_member(&self, stmt: &Stmt, member: &str) -> Result<Edit> {
-        let mut tree = match_module(self.locator.slice(stmt.range()))?;
-        let import_from = match_import_from(&mut tree)?;
-        let aliases = match_aliases(import_from)?;
-        aliases.push(ImportAlias {
-            name: NameOrAttribute::N(Box::new(Name {
-                value: member,
-                lpar: vec![],
-                rpar: vec![],
-            })),
-            asname: None,
-            comma: aliases.last().and_then(|alias| alias.comma.clone()),
-        });
-        let mut state = CodegenState {
-            default_newline: &self.stylist.line_ending(),
-            default_indent: self.stylist.indentation(),
-            ..CodegenState::default()
-        };
-        tree.codegen(&mut state);
-        Ok(Edit::range_replacement(state.to_string(), stmt.range()))
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-struct Insertion {
-    /// The content to add before the insertion.
-    prefix: &'static str,
-    /// The location at which to insert.
-    location: TextSize,
-    /// The content to add after the insertion.
-    suffix: &'static str,
-}
-
-impl Insertion {
-    fn new(prefix: &'static str, location: TextSize, suffix: &'static str) -> Self {
-        Self {
-            prefix,
-            location,
-            suffix,
-        }
-    }
-}
-
-/// Find the end of the last docstring.
-fn match_docstring_end(body: &[Stmt]) -> Option<TextSize> {
-    let mut iter = body.iter();
-    let Some(mut stmt) = iter.next() else {
-        return None;
-    };
-    if !is_docstring_stmt(stmt) {
-        return None;
-    }
-    for next in iter {
-        if !is_docstring_stmt(next) {
-            break;
-        }
-        stmt = next;
-    }
-    Some(stmt.end())
-}
-
-/// Find the location at which an "end-of-statement" import should be inserted,
-/// along with a prefix and suffix to use for the insertion.
-///
-/// For example, given the following code:
-///
-/// ```python
-/// """Hello, world!"""
-///
-/// import os
-/// import math
-///
-///
-/// def foo():
-///     pass
-/// ```
-///
-/// The location returned will be the start of new line after the last
-/// import statement, which in this case is the line after `import math`,
-/// along with a trailing newline suffix.
-fn end_of_statement_insertion(stmt: &Stmt, locator: &Locator, stylist: &Stylist) -> Insertion {
-    let location = stmt.end();
-    let mut tokens = lexer::lex_located(locator.after(location), Mode::Module, location).flatten();
-    if let Some((Tok::Semi, range)) = tokens.next() {
-        // If the first token after the docstring is a semicolon, insert after the semicolon as an
-        // inline statement;
-        Insertion::new(" ", range.end(), ";")
-    } else {
-        // Otherwise, insert on the next line.
-        Insertion::new(
-            "",
-            locator.full_line_end(location),
-            stylist.line_ending().as_str(),
-        )
-    }
-}
-
-/// Find the location at which a "top-of-file" import should be inserted,
-/// along with a prefix and suffix to use for the insertion.
-///
-/// For example, given the following code:
-///
-/// ```python
-/// """Hello, world!"""
-///
-/// import os
-/// ```
-///
-/// The location returned will be the start of the `import os` statement,
-/// along with a trailing newline suffix.
-fn top_of_file_insertion(body: &[Stmt], locator: &Locator, stylist: &Stylist) -> Insertion {
-    // Skip over any docstrings.
-    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)
-            .flatten()
-            .next();
-        if let Some((Tok::Semi, range)) = first_token {
-            return Insertion::new(" ", range.end(), ";");
-        }
-
-        // Otherwise, advance to the next row.
-        locator.full_line_end(location)
-    } else {
-        TextSize::default()
-    };
-
-    // Skip over any comments and empty lines.
-    for (tok, range) in
-        lexer::lex_located(locator.after(location), Mode::Module, location).flatten()
-    {
-        if matches!(tok, Tok::Comment(..) | Tok::Newline) {
-            location = locator.full_line_end(range.end());
-        } else {
-            break;
-        }
-    }
-
-    return Insertion::new("", location, stylist.line_ending().as_str());
-}
-
-#[cfg(test)]
-mod tests {
-    use anyhow::Result;
-    use ruff_python_ast::newlines::LineEnding;
-    use ruff_text_size::TextSize;
-    use rustpython_parser as parser;
-    use rustpython_parser::lexer::LexResult;
-
-    use ruff_python_ast::source_code::{Locator, Stylist};
-
-    use crate::importer::{top_of_file_insertion, Insertion};
-
-    fn insert(contents: &str) -> Result<Insertion> {
-        let program = parser::parse_program(contents, "<filename>")?;
-        let tokens: Vec<LexResult> = ruff_rustpython::tokenize(contents);
-        let locator = Locator::new(contents);
-        let stylist = Stylist::from_tokens(&tokens, &locator);
-        Ok(top_of_file_insertion(&program, &locator, &stylist))
-    }
-
-    #[test]
-    fn top_of_file_insertions() -> Result<()> {
-        let contents = "";
-        assert_eq!(
-            insert(contents)?,
-            Insertion::new("", TextSize::from(0), LineEnding::default().as_str())
-        );
-
-        let contents = r#"
-"""Hello, world!""""#
-            .trim_start();
-        assert_eq!(
-            insert(contents)?,
-            Insertion::new("", TextSize::from(19), LineEnding::default().as_str())
-        );
-
-        let contents = r#"
-"""Hello, world!"""
-"#
-        .trim_start();
-        assert_eq!(
-            insert(contents)?,
-            Insertion::new("", TextSize::from(20), "\n")
-        );
-
-        let contents = r#"
-"""Hello, world!"""
-"""Hello, world!"""
-"#
-        .trim_start();
-        assert_eq!(
-            insert(contents)?,
-            Insertion::new("", TextSize::from(40), "\n")
-        );
-
-        let contents = r#"
-x = 1
-"#
-        .trim_start();
-        assert_eq!(
-            insert(contents)?,
-            Insertion::new("", TextSize::from(0), "\n")
-        );
-
-        let contents = r#"
-#!/usr/bin/env python3
-"#
-        .trim_start();
-        assert_eq!(
-            insert(contents)?,
-            Insertion::new("", TextSize::from(23), "\n")
-        );
-
-        let contents = r#"
-#!/usr/bin/env python3
-"""Hello, world!"""
-"#
-        .trim_start();
-        assert_eq!(
-            insert(contents)?,
-            Insertion::new("", TextSize::from(43), "\n")
-        );
-
-        let contents = r#"
-"""Hello, world!"""
-#!/usr/bin/env python3
-"#
-        .trim_start();
-        assert_eq!(
-            insert(contents)?,
-            Insertion::new("", TextSize::from(43), "\n")
-        );
-
-        let contents = r#"
-"""%s""" % "Hello, world!"
-"#
-        .trim_start();
-        assert_eq!(
-            insert(contents)?,
-            Insertion::new("", TextSize::from(0), "\n")
-        );
-
-        let contents = r#"
-"""Hello, world!"""; x = 1
-"#
-        .trim_start();
-        assert_eq!(
-            insert(contents)?,
-            Insertion::new(" ", TextSize::from(20), ";")
-        );
-
-        let contents = r#"
-"""Hello, world!"""; x = 1; y = \
-    2
-"#
-        .trim_start();
-        assert_eq!(
-            insert(contents)?,
-            Insertion::new(" ", TextSize::from(20), ";")
-        );
-
-        Ok(())
-    }
-}
diff --git a/crates/ruff/src/importer/insertion.rs b/crates/ruff/src/importer/insertion.rs
new file mode 100644
index 0000000000000..713ca8524e2ad
--- /dev/null
+++ b/crates/ruff/src/importer/insertion.rs
@@ -0,0 +1,449 @@
+//! Insert statements into Python code.
+use std::ops::Add;
+
+use ruff_text_size::TextSize;
+use rustpython_parser::ast::{Ranged, Stmt};
+use rustpython_parser::{lexer, Mode, Tok};
+
+use ruff_diagnostics::Edit;
+use ruff_newlines::UniversalNewlineIterator;
+use ruff_python_ast::helpers::is_docstring_stmt;
+use ruff_python_ast::source_code::{Locator, Stylist};
+use ruff_textwrap::indent;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub(super) enum Placement<'a> {
+    /// The content will be inserted inline with the existing code (i.e., within semicolon-delimited
+    /// statements).
+    Inline,
+    /// The content will be inserted on its own line.
+    OwnLine,
+    /// The content will be inserted as an indented block.
+    Indented(&'a str),
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub(super) struct Insertion<'a> {
+    /// The content to add before the insertion.
+    prefix: &'a str,
+    /// The location at which to insert.
+    location: TextSize,
+    /// The content to add after the insertion.
+    suffix: &'a str,
+    /// The line placement of insertion.
+    placement: Placement<'a>,
+}
+
+impl<'a> Insertion<'a> {
+    /// Create an [`Insertion`] to insert (e.g.) an import statement at the start of a given
+    /// file, along with a prefix and suffix to use for the insertion.
+    ///
+    /// For example, given the following code:
+    ///
+    /// ```python
+    /// """Hello, world!"""
+    ///
+    /// import os
+    /// ```
+    ///
+    /// The insertion returned will begin at the start of the `import os` statement, and will
+    /// include a trailing newline.
+    pub(super) fn start_of_file(
+        body: &[Stmt],
+        locator: &Locator,
+        stylist: &Stylist,
+    ) -> Insertion<'static> {
+        // Skip over any docstrings.
+        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.
+            if let Some(offset) = match_leading_semicolon(locator.after(location)) {
+                return Insertion::inline(" ", location.add(offset).add(TextSize::of(';')), ";");
+            }
+
+            // Otherwise, advance to the next row.
+            locator.full_line_end(location)
+        } else {
+            TextSize::default()
+        };
+
+        // Skip over commented lines.
+        for line in UniversalNewlineIterator::with_offset(locator.after(location), location) {
+            if line.trim_start().starts_with('#') {
+                location = line.full_end();
+            } else {
+                break;
+            }
+        }
+
+        Insertion::own_line("", location, stylist.line_ending().as_str())
+    }
+
+    /// Create an [`Insertion`] to insert (e.g.) an import after the end of the given
+    /// [`Stmt`], along with a prefix and suffix to use for the insertion.
+    ///
+    /// For example, given the following code:
+    ///
+    /// ```python
+    /// """Hello, world!"""
+    ///
+    /// import os
+    /// import math
+    ///
+    ///
+    /// def foo():
+    ///     pass
+    /// ```
+    ///
+    /// The insertion returned will begin after the newline after the last import statement, which
+    /// in this case is the line after `import math`, and will include a trailing newline.
+    ///
+    /// The statement itself is assumed to be at the top-level of the module.
+    pub(super) fn end_of_statement(
+        stmt: &Stmt,
+        locator: &Locator,
+        stylist: &Stylist,
+    ) -> Insertion<'static> {
+        let location = stmt.end();
+        if let Some(offset) = match_leading_semicolon(locator.after(location)) {
+            // If the first token after the statement is a semicolon, insert after the semicolon as
+            // an inline statement.
+            Insertion::inline(" ", location.add(offset).add(TextSize::of(';')), ";")
+        } else {
+            // Otherwise, insert on the next line.
+            Insertion::own_line(
+                "",
+                locator.full_line_end(location),
+                stylist.line_ending().as_str(),
+            )
+        }
+    }
+
+    /// Create an [`Insertion`] to insert (e.g.) an import statement at the start of a given
+    /// block, along with a prefix and suffix to use for the insertion.
+    ///
+    /// For example, given the following code:
+    ///
+    /// ```python
+    /// if TYPE_CHECKING:
+    ///     import os
+    /// ```
+    ///
+    /// The insertion returned will begin at the start of the `import os` statement, and will
+    /// include a trailing newline.
+    ///
+    /// The block itself is assumed to be at the top-level of the module.
+    pub(super) fn start_of_block(
+        mut location: TextSize,
+        locator: &Locator<'a>,
+        stylist: &Stylist,
+    ) -> Insertion<'a> {
+        enum Awaiting {
+            Colon(u32),
+            Newline,
+            Indent,
+        }
+
+        let mut state = Awaiting::Colon(0);
+        for (tok, range) in
+            lexer::lex_starts_at(locator.after(location), Mode::Module, location).flatten()
+        {
+            match state {
+                // Iterate until we find the colon indicating the start of the block body.
+                Awaiting::Colon(depth) => match tok {
+                    Tok::Colon if depth == 0 => {
+                        state = Awaiting::Newline;
+                    }
+                    Tok::Lpar | Tok::Lbrace | Tok::Lsqb => {
+                        state = Awaiting::Colon(depth.saturating_add(1));
+                    }
+                    Tok::Rpar | Tok::Rbrace | Tok::Rsqb => {
+                        state = Awaiting::Colon(depth.saturating_sub(1));
+                    }
+                    _ => {}
+                },
+                // Once we've seen the colon, we're looking for a newline; otherwise, there's no
+                // block body (e.g. `if True: pass`).
+                Awaiting::Newline => match tok {
+                    Tok::Comment(..) => {}
+                    Tok::Newline => {
+                        state = Awaiting::Indent;
+                    }
+                    _ => {
+                        location = range.start();
+                        break;
+                    }
+                },
+                // Once we've seen the newline, we're looking for the indentation of the block body.
+                Awaiting::Indent => match tok {
+                    Tok::Comment(..) => {}
+                    Tok::NonLogicalNewline => {}
+                    Tok::Indent => {
+                        // This is like:
+                        // ```py
+                        // if True:
+                        //     pass
+                        // ```
+                        // Where `range` is the indentation before the `pass` token.
+                        return Insertion::indented(
+                            "",
+                            range.start(),
+                            stylist.line_ending().as_str(),
+                            locator.slice(range),
+                        );
+                    }
+                    _ => {
+                        location = range.start();
+                        break;
+                    }
+                },
+            }
+        }
+
+        // This is like: `if True: pass`, where `location` is the start of the `pass` token.
+        Insertion::inline("", location, "; ")
+    }
+
+    /// Convert this [`Insertion`] into an [`Edit`] that inserts the given content.
+    pub(super) fn into_edit(self, content: &str) -> Edit {
+        let Insertion {
+            prefix,
+            location,
+            suffix,
+            placement,
+        } = self;
+        let content = format!("{prefix}{content}{suffix}");
+        Edit::insertion(
+            match placement {
+                Placement::Indented(indentation) if !indentation.is_empty() => {
+                    indent(&content, indentation).to_string()
+                }
+                _ => content,
+            },
+            location,
+        )
+    }
+
+    /// Returns `true` if this [`Insertion`] is inline.
+    pub(super) fn is_inline(&self) -> bool {
+        matches!(self.placement, Placement::Inline)
+    }
+
+    /// Create an [`Insertion`] that inserts content inline (i.e., within semicolon-delimited
+    /// statements).
+    fn inline(prefix: &'a str, location: TextSize, suffix: &'a str) -> Self {
+        Self {
+            prefix,
+            location,
+            suffix,
+            placement: Placement::Inline,
+        }
+    }
+
+    /// Create an [`Insertion`] that starts on its own line.
+    fn own_line(prefix: &'a str, location: TextSize, suffix: &'a str) -> Self {
+        Self {
+            prefix,
+            location,
+            suffix,
+            placement: Placement::OwnLine,
+        }
+    }
+
+    /// Create an [`Insertion`] that starts on its own line, with the given indentation.
+    fn indented(
+        prefix: &'a str,
+        location: TextSize,
+        suffix: &'a str,
+        indentation: &'a str,
+    ) -> Self {
+        Self {
+            prefix,
+            location,
+            suffix,
+            placement: Placement::Indented(indentation),
+        }
+    }
+}
+
+/// Find the end of the last docstring.
+fn match_docstring_end(body: &[Stmt]) -> Option<TextSize> {
+    let mut iter = body.iter();
+    let Some(mut stmt) = iter.next() else {
+        return None;
+    };
+    if !is_docstring_stmt(stmt) {
+        return None;
+    }
+    for next in iter {
+        if !is_docstring_stmt(next) {
+            break;
+        }
+        stmt = next;
+    }
+    Some(stmt.end())
+}
+
+/// If a line starts with a semicolon, return its offset.
+fn match_leading_semicolon(s: &str) -> Option<TextSize> {
+    for (offset, c) in s.char_indices() {
+        match c {
+            ' ' | '\t' => continue,
+            ';' => return Some(TextSize::try_from(offset).unwrap()),
+            _ => break,
+        }
+    }
+    None
+}
+
+#[cfg(test)]
+mod tests {
+    use anyhow::Result;
+    use ruff_text_size::TextSize;
+    use rustpython_parser::ast::Suite;
+    use rustpython_parser::lexer::LexResult;
+    use rustpython_parser::Parse;
+
+    use ruff_newlines::LineEnding;
+    use ruff_python_ast::source_code::{Locator, Stylist};
+
+    use super::Insertion;
+
+    #[test]
+    fn start_of_file() -> Result<()> {
+        fn insert(contents: &str) -> Result<Insertion> {
+            let program = Suite::parse(contents, "<filename>")?;
+            let tokens: Vec<LexResult> = ruff_rustpython::tokenize(contents);
+            let locator = Locator::new(contents);
+            let stylist = Stylist::from_tokens(&tokens, &locator);
+            Ok(Insertion::start_of_file(&program, &locator, &stylist))
+        }
+
+        let contents = "";
+        assert_eq!(
+            insert(contents)?,
+            Insertion::own_line("", TextSize::from(0), LineEnding::default().as_str())
+        );
+
+        let contents = r#"
+"""Hello, world!""""#
+            .trim_start();
+        assert_eq!(
+            insert(contents)?,
+            Insertion::own_line("", TextSize::from(19), LineEnding::default().as_str())
+        );
+
+        let contents = r#"
+"""Hello, world!"""
+"#
+        .trim_start();
+        assert_eq!(
+            insert(contents)?,
+            Insertion::own_line("", TextSize::from(20), "\n")
+        );
+
+        let contents = r#"
+"""Hello, world!"""
+"""Hello, world!"""
+"#
+        .trim_start();
+        assert_eq!(
+            insert(contents)?,
+            Insertion::own_line("", TextSize::from(40), "\n")
+        );
+
+        let contents = r#"
+x = 1
+"#
+        .trim_start();
+        assert_eq!(
+            insert(contents)?,
+            Insertion::own_line("", TextSize::from(0), "\n")
+        );
+
+        let contents = r#"
+#!/usr/bin/env python3
+"#
+        .trim_start();
+        assert_eq!(
+            insert(contents)?,
+            Insertion::own_line("", TextSize::from(23), "\n")
+        );
+
+        let contents = r#"
+#!/usr/bin/env python3
+"""Hello, world!"""
+"#
+        .trim_start();
+        assert_eq!(
+            insert(contents)?,
+            Insertion::own_line("", TextSize::from(43), "\n")
+        );
+
+        let contents = r#"
+"""Hello, world!"""
+#!/usr/bin/env python3
+"#
+        .trim_start();
+        assert_eq!(
+            insert(contents)?,
+            Insertion::own_line("", TextSize::from(43), "\n")
+        );
+
+        let contents = r#"
+"""%s""" % "Hello, world!"
+"#
+        .trim_start();
+        assert_eq!(
+            insert(contents)?,
+            Insertion::own_line("", TextSize::from(0), "\n")
+        );
+
+        let contents = r#"
+"""Hello, world!"""; x = 1
+"#
+        .trim_start();
+        assert_eq!(
+            insert(contents)?,
+            Insertion::inline(" ", TextSize::from(20), ";")
+        );
+
+        let contents = r#"
+"""Hello, world!"""; x = 1; y = \
+    2
+"#
+        .trim_start();
+        assert_eq!(
+            insert(contents)?,
+            Insertion::inline(" ", TextSize::from(20), ";")
+        );
+
+        Ok(())
+    }
+
+    #[test]
+    fn start_of_block() {
+        fn insert(contents: &str, offset: TextSize) -> Insertion {
+            let tokens: Vec<LexResult> = ruff_rustpython::tokenize(contents);
+            let locator = Locator::new(contents);
+            let stylist = Stylist::from_tokens(&tokens, &locator);
+            Insertion::start_of_block(offset, &locator, &stylist)
+        }
+
+        let contents = "if True: pass";
+        assert_eq!(
+            insert(contents, TextSize::from(0)),
+            Insertion::inline("", TextSize::from(9), "; ")
+        );
+
+        let contents = r#"
+if True:
+    pass
+"#
+        .trim_start();
+        assert_eq!(
+            insert(contents, TextSize::from(0)),
+            Insertion::indented("", TextSize::from(9), "\n", "    ")
+        );
+    }
+}
diff --git a/crates/ruff/src/importer/mod.rs b/crates/ruff/src/importer/mod.rs
new file mode 100644
index 0000000000000..aca15cd632d2a
--- /dev/null
+++ b/crates/ruff/src/importer/mod.rs
@@ -0,0 +1,487 @@
+//! Add and modify import statements to make module members available during fix execution.
+
+use std::error::Error;
+
+use anyhow::Result;
+use libcst_native::{ImportAlias, Name, NameOrAttribute};
+use ruff_text_size::TextSize;
+use rustpython_parser::ast::{self, Ranged, Stmt, Suite};
+
+use crate::autofix;
+use crate::autofix::codemods::CodegenStylist;
+use ruff_diagnostics::Edit;
+use ruff_python_ast::imports::{AnyImport, Import, ImportFrom};
+use ruff_python_ast::source_code::{Locator, Stylist};
+use ruff_python_semantic::model::SemanticModel;
+use ruff_textwrap::indent;
+
+use crate::cst::matchers::{match_aliases, match_import_from, match_statement};
+use crate::importer::insertion::Insertion;
+
+mod insertion;
+
+pub(crate) struct Importer<'a> {
+    /// The Python AST to which we are adding imports.
+    python_ast: &'a Suite,
+    /// The [`Locator`] for the Python AST.
+    locator: &'a Locator<'a>,
+    /// The [`Stylist`] for the Python AST.
+    stylist: &'a Stylist<'a>,
+    /// The list of visited, top-level runtime imports in the Python AST.
+    runtime_imports: Vec<&'a Stmt>,
+    /// The list of visited, top-level `if TYPE_CHECKING:` blocks in the Python AST.
+    type_checking_blocks: Vec<&'a Stmt>,
+}
+
+impl<'a> Importer<'a> {
+    pub(crate) fn new(
+        python_ast: &'a Suite,
+        locator: &'a Locator<'a>,
+        stylist: &'a Stylist<'a>,
+    ) -> Self {
+        Self {
+            python_ast,
+            locator,
+            stylist,
+            runtime_imports: Vec::default(),
+            type_checking_blocks: Vec::default(),
+        }
+    }
+
+    /// Visit a top-level import statement.
+    pub(crate) fn visit_import(&mut self, import: &'a Stmt) {
+        self.runtime_imports.push(import);
+    }
+
+    /// Visit a top-level type-checking block.
+    pub(crate) fn visit_type_checking_block(&mut self, type_checking_block: &'a Stmt) {
+        self.type_checking_blocks.push(type_checking_block);
+    }
+
+    /// Add an import statement to import the given module.
+    ///
+    /// If there are no existing imports, the new import will be added at the top
+    /// of the file. Otherwise, it will be added after the most recent top-level
+    /// import statement.
+    pub(crate) fn add_import(&self, import: &AnyImport, at: TextSize) -> Edit {
+        let required_import = import.to_string();
+        if let Some(stmt) = self.preceding_import(at) {
+            // Insert after the last top-level import.
+            Insertion::end_of_statement(stmt, self.locator, self.stylist)
+                .into_edit(&required_import)
+        } else {
+            // Insert at the start of the file.
+            Insertion::start_of_file(self.python_ast, self.locator, self.stylist)
+                .into_edit(&required_import)
+        }
+    }
+
+    /// Move an existing import to the top-level, thereby making it available at runtime.
+    ///
+    /// If there are no existing imports, the new import will be added at the top
+    /// of the file. Otherwise, it will be added after the most recent top-level
+    /// import statement.
+    pub(crate) fn runtime_import_edit(
+        &self,
+        import: &StmtImports,
+        at: TextSize,
+    ) -> Result<RuntimeImportEdit> {
+        // Generate the modified import statement.
+        let content = autofix::codemods::retain_imports(
+            &import.qualified_names,
+            import.stmt,
+            self.locator,
+            self.stylist,
+        )?;
+
+        // Add the import to the top-level.
+        let insertion = if let Some(stmt) = self.preceding_import(at) {
+            // Insert after the last top-level import.
+            Insertion::end_of_statement(stmt, self.locator, self.stylist)
+        } else {
+            // Insert at the start of the file.
+            Insertion::start_of_file(self.python_ast, self.locator, self.stylist)
+        };
+        let add_import_edit = insertion.into_edit(&content);
+
+        Ok(RuntimeImportEdit { add_import_edit })
+    }
+
+    /// Move an existing import into a `TYPE_CHECKING` block.
+    ///
+    /// If there are no existing `TYPE_CHECKING` blocks, a new one will be added at the top
+    /// of the file. Otherwise, it will be added after the most recent top-level
+    /// `TYPE_CHECKING` block.
+    pub(crate) fn typing_import_edit(
+        &self,
+        import: &StmtImports,
+        at: TextSize,
+        semantic_model: &SemanticModel,
+    ) -> Result<TypingImportEdit> {
+        // Generate the modified import statement.
+        let content = autofix::codemods::retain_imports(
+            &import.qualified_names,
+            import.stmt,
+            self.locator,
+            self.stylist,
+        )?;
+
+        // Import the `TYPE_CHECKING` symbol from the typing module.
+        let (type_checking_edit, type_checking) = self.get_or_import_symbol(
+            &ImportRequest::import_from("typing", "TYPE_CHECKING"),
+            at,
+            semantic_model,
+        )?;
+
+        // Add the import to a `TYPE_CHECKING` block.
+        let add_import_edit = if let Some(block) = self.preceding_type_checking_block(at) {
+            // Add the import to the `TYPE_CHECKING` block.
+            self.add_to_type_checking_block(&content, block.start())
+        } else {
+            // Add the import to a new `TYPE_CHECKING` block.
+            self.add_type_checking_block(
+                &format!(
+                    "{}if {type_checking}:{}{}",
+                    self.stylist.line_ending().as_str(),
+                    self.stylist.line_ending().as_str(),
+                    indent(&content, self.stylist.indentation())
+                ),
+                at,
+            )?
+        };
+
+        Ok(TypingImportEdit {
+            type_checking_edit,
+            add_import_edit,
+        })
+    }
+
+    /// Generate an [`Edit`] to reference the given symbol. Returns the [`Edit`] necessary to make
+    /// the symbol available in the current scope along with the bound name of the symbol.
+    ///
+    /// Attempts to reuse existing imports when possible.
+    pub(crate) fn get_or_import_symbol(
+        &self,
+        symbol: &ImportRequest,
+        at: TextSize,
+        semantic_model: &SemanticModel,
+    ) -> Result<(Edit, String), ResolutionError> {
+        match self.get_symbol(symbol, at, semantic_model) {
+            Some(result) => result,
+            None => self.import_symbol(symbol, at, semantic_model),
+        }
+    }
+
+    /// Return an [`Edit`] to reference an existing symbol, if it's present in the given [`SemanticModel`].
+    fn get_symbol(
+        &self,
+        symbol: &ImportRequest,
+        at: TextSize,
+        semantic_model: &SemanticModel,
+    ) -> Option<Result<(Edit, String), ResolutionError>> {
+        // If the symbol is already available in the current scope, use it.
+        let imported_name =
+            semantic_model.resolve_qualified_import_name(symbol.module, symbol.member)?;
+
+        // If the symbol source (i.e., the import statement) comes after the current location,
+        // abort. For example, we could be generating an edit within a function, and the import
+        // could be defined in the module scope, but after the function definition. In this case,
+        // it's unclear whether we can use the symbol (the function could be called between the
+        // import and the current location, and thus the symbol would not be available). It's also
+        // unclear whether should add an import statement at the start of the file, since it could
+        // be shadowed between the import and the current location.
+        if imported_name.range().start() > at {
+            return Some(Err(ResolutionError::ImportAfterUsage));
+        }
+
+        // If the symbol source (i.e., the import statement) is in a typing-only context, but we're
+        // in a runtime context, abort.
+        if imported_name.context().is_typing() && semantic_model.execution_context().is_runtime() {
+            return Some(Err(ResolutionError::IncompatibleContext));
+        }
+
+        // We also add a no-op edit to force conflicts with any other fixes that might try to
+        // remove the import. Consider:
+        //
+        // ```py
+        // import sys
+        //
+        // quit()
+        // ```
+        //
+        // Assume you omit this no-op edit. If you run Ruff with `unused-imports` and
+        // `sys-exit-alias` over this snippet, it will generate two fixes: (1) remove the unused
+        // `sys` import; and (2) replace `quit()` with `sys.exit()`, under the assumption that `sys`
+        // is already imported and available.
+        //
+        // By adding this no-op edit, we force the `unused-imports` fix to conflict with the
+        // `sys-exit-alias` fix, and thus will avoid applying both fixes in the same pass.
+        let import_edit = Edit::range_replacement(
+            self.locator.slice(imported_name.range()).to_string(),
+            imported_name.range(),
+        );
+        Some(Ok((import_edit, imported_name.into_name())))
+    }
+
+    /// Generate an [`Edit`] to reference the given symbol. Returns the [`Edit`] necessary to make
+    /// the symbol available in the current scope along with the bound name of the symbol.
+    ///
+    /// For example, assuming `module` is `"functools"` and `member` is `"lru_cache"`, this function
+    /// could return an [`Edit`] to add `import functools` to the start of the file, alongside with
+    /// the name on which the `lru_cache` symbol would be made available (`"functools.lru_cache"`).
+    fn import_symbol(
+        &self,
+        symbol: &ImportRequest,
+        at: TextSize,
+        semantic_model: &SemanticModel,
+    ) -> Result<(Edit, String), ResolutionError> {
+        if let Some(stmt) = self.find_import_from(symbol.module, at) {
+            // Case 1: `from functools import lru_cache` is in scope, and we're trying to reference
+            // `functools.cache`; thus, we add `cache` to the import, and return `"cache"` as the
+            // bound name.
+            if semantic_model.is_unbound(symbol.member) {
+                let Ok(import_edit) = self.add_member(stmt, symbol.member) else {
+                    return Err(ResolutionError::InvalidEdit);
+                };
+                Ok((import_edit, symbol.member.to_string()))
+            } else {
+                Err(ResolutionError::ConflictingName(symbol.member.to_string()))
+            }
+        } else {
+            match symbol.style {
+                ImportStyle::Import => {
+                    // Case 2a: No `functools` import is in scope; thus, we add `import functools`,
+                    // and return `"functools.cache"` as the bound name.
+                    if semantic_model.is_unbound(symbol.module) {
+                        let import_edit =
+                            self.add_import(&AnyImport::Import(Import::module(symbol.module)), at);
+                        Ok((
+                            import_edit,
+                            format!(
+                                "{module}.{member}",
+                                module = symbol.module,
+                                member = symbol.member
+                            ),
+                        ))
+                    } else {
+                        Err(ResolutionError::ConflictingName(symbol.module.to_string()))
+                    }
+                }
+                ImportStyle::ImportFrom => {
+                    // Case 2b: No `functools` import is in scope; thus, we add
+                    // `from functools import cache`, and return `"cache"` as the bound name.
+                    if semantic_model.is_unbound(symbol.member) {
+                        let import_edit = self.add_import(
+                            &AnyImport::ImportFrom(ImportFrom::member(
+                                symbol.module,
+                                symbol.member,
+                            )),
+                            at,
+                        );
+                        Ok((import_edit, symbol.member.to_string()))
+                    } else {
+                        Err(ResolutionError::ConflictingName(symbol.member.to_string()))
+                    }
+                }
+            }
+        }
+    }
+
+    /// Return the top-level [`Stmt`] that imports the given module using `Stmt::ImportFrom`
+    /// preceding the given position, if any.
+    fn find_import_from(&self, module: &str, at: TextSize) -> Option<&Stmt> {
+        let mut import_from = None;
+        for stmt in &self.runtime_imports {
+            if stmt.start() >= at {
+                break;
+            }
+            if let Stmt::ImportFrom(ast::StmtImportFrom {
+                module: name,
+                level,
+                ..
+            }) = stmt
+            {
+                if level.map_or(true, |level| level.to_u32() == 0)
+                    && name.as_ref().map_or(false, |name| name == module)
+                {
+                    import_from = Some(*stmt);
+                }
+            }
+        }
+        import_from
+    }
+
+    /// Add the given member to an existing `Stmt::ImportFrom` statement.
+    fn add_member(&self, stmt: &Stmt, member: &str) -> Result<Edit> {
+        let mut statement = match_statement(self.locator.slice(stmt.range()))?;
+        let import_from = match_import_from(&mut statement)?;
+        let aliases = match_aliases(import_from)?;
+        aliases.push(ImportAlias {
+            name: NameOrAttribute::N(Box::new(Name {
+                value: member,
+                lpar: vec![],
+                rpar: vec![],
+            })),
+            asname: None,
+            comma: aliases.last().and_then(|alias| alias.comma.clone()),
+        });
+        Ok(Edit::range_replacement(
+            statement.codegen_stylist(self.stylist),
+            stmt.range(),
+        ))
+    }
+
+    /// Add a `TYPE_CHECKING` block to the given module.
+    fn add_type_checking_block(&self, content: &str, at: TextSize) -> Result<Edit> {
+        let insertion = if let Some(stmt) = self.preceding_import(at) {
+            // Insert after the last top-level import.
+            Insertion::end_of_statement(stmt, self.locator, self.stylist)
+        } else {
+            // Insert at the start of the file.
+            Insertion::start_of_file(self.python_ast, self.locator, self.stylist)
+        };
+        if insertion.is_inline() {
+            Err(anyhow::anyhow!(
+                "Cannot insert `TYPE_CHECKING` block inline"
+            ))
+        } else {
+            Ok(insertion.into_edit(content))
+        }
+    }
+
+    /// Add an import statement to an existing `TYPE_CHECKING` block.
+    fn add_to_type_checking_block(&self, content: &str, at: TextSize) -> Edit {
+        Insertion::start_of_block(at, self.locator, self.stylist).into_edit(content)
+    }
+
+    /// Return the import statement that precedes the given position, if any.
+    fn preceding_import(&self, at: TextSize) -> Option<&'a Stmt> {
+        self.runtime_imports
+            .partition_point(|stmt| stmt.start() < at)
+            .checked_sub(1)
+            .map(|idx| self.runtime_imports[idx])
+    }
+
+    /// Return the `TYPE_CHECKING` block that precedes the given position, if any.
+    fn preceding_type_checking_block(&self, at: TextSize) -> Option<&'a Stmt> {
+        let block = self.type_checking_blocks.first()?;
+        if block.start() <= at {
+            Some(block)
+        } else {
+            None
+        }
+    }
+}
+
+/// An edit to the top-level of a module, making it available at runtime.
+#[derive(Debug)]
+pub(crate) struct RuntimeImportEdit {
+    /// The edit to add the import to the top-level of the module.
+    add_import_edit: Edit,
+}
+
+impl RuntimeImportEdit {
+    pub(crate) fn into_edits(self) -> Vec<Edit> {
+        vec![self.add_import_edit]
+    }
+}
+
+/// An edit to an import to a typing-only context.
+#[derive(Debug)]
+pub(crate) struct TypingImportEdit {
+    /// The edit to add the `TYPE_CHECKING` symbol to the module.
+    type_checking_edit: Edit,
+    /// The edit to add the import to a `TYPE_CHECKING` block.
+    add_import_edit: Edit,
+}
+
+impl TypingImportEdit {
+    pub(crate) fn into_edits(self) -> Vec<Edit> {
+        vec![self.type_checking_edit, self.add_import_edit]
+    }
+}
+
+#[derive(Debug)]
+enum ImportStyle {
+    /// Import the symbol using the `import` statement (e.g. `import foo; foo.bar`).
+    Import,
+    /// Import the symbol using the `from` statement (e.g. `from foo import bar; bar`).
+    ImportFrom,
+}
+
+#[derive(Debug)]
+pub(crate) struct ImportRequest<'a> {
+    /// The module from which the symbol can be imported (e.g., `foo`, in `from foo import bar`).
+    module: &'a str,
+    /// The member to import (e.g., `bar`, in `from foo import bar`).
+    member: &'a str,
+    /// The preferred style to use when importing the symbol (e.g., `import foo` or
+    /// `from foo import bar`), if it's not already in scope.
+    style: ImportStyle,
+}
+
+impl<'a> ImportRequest<'a> {
+    /// Create a new `ImportRequest` from a module and member. If not present in the scope,
+    /// the symbol should be imported using the "import" statement.
+    pub(crate) fn import(module: &'a str, member: &'a str) -> Self {
+        Self {
+            module,
+            member,
+            style: ImportStyle::Import,
+        }
+    }
+
+    /// Create a new `ImportRequest` from a module and member. If not present in the scope,
+    /// the symbol should be imported using the "import from" statement.
+    pub(crate) fn import_from(module: &'a str, member: &'a str) -> Self {
+        Self {
+            module,
+            member,
+            style: ImportStyle::ImportFrom,
+        }
+    }
+}
+
+/// An existing list of module or member imports, located within an import statement.
+pub(crate) struct StmtImports<'a> {
+    /// The import statement.
+    pub(crate) stmt: &'a Stmt,
+    /// The "qualified names" of the imported modules or members.
+    pub(crate) qualified_names: Vec<&'a str>,
+}
+
+/// The result of an [`Importer::get_or_import_symbol`] call.
+#[derive(Debug)]
+pub(crate) enum ResolutionError {
+    /// The symbol is imported, but the import came after the current location.
+    ImportAfterUsage,
+    /// The symbol is imported, but in an incompatible context (e.g., in typing-only context, while
+    /// we're in a runtime context).
+    IncompatibleContext,
+    /// The symbol can't be imported, because another symbol is bound to the same name.
+    ConflictingName(String),
+    /// The symbol can't be imported due to an error in editing an existing import statement.
+    InvalidEdit,
+}
+
+impl std::fmt::Display for ResolutionError {
+    fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ResolutionError::ImportAfterUsage => {
+                fmt.write_str("Unable to use existing symbol due to late binding")
+            }
+            ResolutionError::IncompatibleContext => {
+                fmt.write_str("Unable to use existing symbol due to incompatible context")
+            }
+            ResolutionError::ConflictingName(binding) => std::write!(
+                fmt,
+                "Unable to insert `{binding}` into scope due to name conflict"
+            ),
+            ResolutionError::InvalidEdit => {
+                fmt.write_str("Unable to modify existing import statement")
+            }
+        }
+    }
+}
+
+impl Error for ResolutionError {}
diff --git a/crates/ruff/src/jupyter/mod.rs b/crates/ruff/src/jupyter/mod.rs
index 92ee1e8a03cfc..ce6b9ef3bcaca 100644
--- a/crates/ruff/src/jupyter/mod.rs
+++ b/crates/ruff/src/jupyter/mod.rs
@@ -1,7 +1,7 @@
 //! Utils for reading and writing jupyter notebooks
 
-mod notebook;
-mod schema;
-
 pub use notebook::*;
 pub use schema::*;
+
+mod notebook;
+mod schema;
diff --git a/crates/ruff/src/jupyter/notebook.rs b/crates/ruff/src/jupyter/notebook.rs
index 85a97dd6e6b5d..81a75805d1a38 100644
--- a/crates/ruff/src/jupyter/notebook.rs
+++ b/crates/ruff/src/jupyter/notebook.rs
@@ -1,9 +1,9 @@
-use ruff_text_size::TextRange;
 use std::fs::File;
 use std::io::{BufReader, BufWriter};
 use std::iter;
 use std::path::Path;
 
+use ruff_text_size::TextRange;
 use serde::Serialize;
 use serde_json::error::Category;
 
diff --git a/crates/ruff/src/lex/docstring_detection.rs b/crates/ruff/src/lex/docstring_detection.rs
index 09956511b47b6..58bdbf4a4c2c3 100644
--- a/crates/ruff/src/lex/docstring_detection.rs
+++ b/crates/ruff/src/lex/docstring_detection.rs
@@ -25,13 +25,13 @@ enum State {
 }
 
 #[derive(Default)]
-pub struct StateMachine {
+pub(crate) struct StateMachine {
     state: State,
     bracket_count: usize,
 }
 
 impl StateMachine {
-    pub fn consume(&mut self, tok: &Tok) -> bool {
+    pub(crate) fn consume(&mut self, tok: &Tok) -> bool {
         match tok {
             Tok::NonLogicalNewline
             | Tok::Newline
@@ -79,7 +79,7 @@ impl StateMachine {
             }
 
             Tok::Lpar | Tok::Lbrace | Tok::Lsqb => {
-                self.bracket_count += 1;
+                self.bracket_count = self.bracket_count.saturating_add(1);
                 if matches!(
                     self.state,
                     State::ExpectModuleDocstring
@@ -92,7 +92,7 @@ impl StateMachine {
             }
 
             Tok::Rpar | Tok::Rbrace | Tok::Rsqb => {
-                self.bracket_count -= 1;
+                self.bracket_count = self.bracket_count.saturating_sub(1);
                 if matches!(
                     self.state,
                     State::ExpectModuleDocstring
diff --git a/crates/ruff/src/lex/mod.rs b/crates/ruff/src/lex/mod.rs
index e2b4c3e5a0441..c6673c215d638 100644
--- a/crates/ruff/src/lex/mod.rs
+++ b/crates/ruff/src/lex/mod.rs
@@ -1 +1 @@
-pub mod docstring_detection;
+pub(crate) mod docstring_detection;
diff --git a/crates/ruff/src/lib.rs b/crates/ruff/src/lib.rs
index e359ffdbd0d09..fc73e6e40223a 100644
--- a/crates/ruff/src/lib.rs
+++ b/crates/ruff/src/lib.rs
@@ -21,11 +21,13 @@ pub mod fs;
 mod importer;
 pub mod jupyter;
 mod lex;
+pub mod line_width;
 pub mod linter;
 pub mod logging;
 pub mod message;
 mod noqa;
 pub mod packaging;
+pub mod pyproject_toml;
 pub mod registry;
 pub mod resolver;
 mod rule_redirects;
@@ -33,5 +35,5 @@ mod rule_selector;
 pub mod rules;
 pub mod settings;
 
-#[cfg(test)]
-mod test;
+#[cfg(any(test, fuzzing))]
+pub mod test;
diff --git a/crates/ruff/src/line_width.rs b/crates/ruff/src/line_width.rs
new file mode 100644
index 0000000000000..8619b42aa36ac
--- /dev/null
+++ b/crates/ruff/src/line_width.rs
@@ -0,0 +1,165 @@
+use serde::{Deserialize, Serialize};
+use unicode_width::UnicodeWidthChar;
+
+use ruff_macros::CacheKey;
+
+/// The length of a line of text that is considered too long.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, CacheKey)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+pub struct LineLength(usize);
+
+impl Default for LineLength {
+    /// The default line length.
+    fn default() -> Self {
+        Self(88)
+    }
+}
+
+impl LineLength {
+    pub const fn get(&self) -> usize {
+        self.0
+    }
+}
+
+impl From<usize> for LineLength {
+    fn from(value: usize) -> Self {
+        Self(value)
+    }
+}
+
+/// A measure of the width of a line of text.
+///
+/// This is used to determine if a line is too long.
+/// It should be compared to a [`LineLength`].
+#[derive(Clone, Copy, Debug)]
+pub struct LineWidth {
+    /// The width of the line.
+    width: usize,
+    /// The column of the line.
+    /// This is used to calculate the width of tabs.
+    column: usize,
+    /// The tab size to use when calculating the width of tabs.
+    tab_size: TabSize,
+}
+
+impl Default for LineWidth {
+    fn default() -> Self {
+        Self::new(TabSize::default())
+    }
+}
+
+impl PartialEq for LineWidth {
+    fn eq(&self, other: &Self) -> bool {
+        self.width == other.width
+    }
+}
+
+impl Eq for LineWidth {}
+
+impl PartialOrd for LineWidth {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        self.width.partial_cmp(&other.width)
+    }
+}
+
+impl Ord for LineWidth {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.width.cmp(&other.width)
+    }
+}
+
+impl LineWidth {
+    pub fn get(&self) -> usize {
+        self.width
+    }
+
+    /// Creates a new `LineWidth` with the given tab size.
+    pub fn new(tab_size: TabSize) -> Self {
+        LineWidth {
+            width: 0,
+            column: 0,
+            tab_size,
+        }
+    }
+
+    fn update(mut self, chars: impl Iterator<Item = char>) -> Self {
+        let tab_size: usize = self.tab_size.into();
+        for c in chars {
+            match c {
+                '\t' => {
+                    let tab_offset = tab_size - (self.column % tab_size);
+                    self.width += tab_offset;
+                    self.column += tab_offset;
+                }
+                '\n' | '\r' => {
+                    self.width = 0;
+                    self.column = 0;
+                }
+                _ => {
+                    self.width += c.width().unwrap_or(0);
+                    self.column += 1;
+                }
+            }
+        }
+        self
+    }
+
+    /// Adds the given text to the line width.
+    #[must_use]
+    pub fn add_str(self, text: &str) -> Self {
+        self.update(text.chars())
+    }
+
+    /// Adds the given character to the line width.
+    #[must_use]
+    pub fn add_char(self, c: char) -> Self {
+        self.update(std::iter::once(c))
+    }
+
+    /// Adds the given width to the line width.
+    /// Also adds the given width to the column.
+    /// It is generally better to use [`LineWidth::add_str`] or [`LineWidth::add_char`].
+    /// The width and column should be the same for the corresponding text.
+    /// Currently, this is only used to add spaces.
+    #[must_use]
+    pub fn add_width(mut self, width: usize) -> Self {
+        self.width += width;
+        self.column += width;
+        self
+    }
+}
+
+impl PartialEq<LineLength> for LineWidth {
+    fn eq(&self, other: &LineLength) -> bool {
+        self.width == other.0
+    }
+}
+
+impl PartialOrd<LineLength> for LineWidth {
+    fn partial_cmp(&self, other: &LineLength) -> Option<std::cmp::Ordering> {
+        self.width.partial_cmp(&other.0)
+    }
+}
+
+/// The size of a tab.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, CacheKey)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+pub struct TabSize(pub u8);
+
+impl Default for TabSize {
+    fn default() -> Self {
+        Self(4)
+    }
+}
+
+impl From<u8> for TabSize {
+    fn from(tab_size: u8) -> Self {
+        Self(tab_size)
+    }
+}
+
+impl From<TabSize> for usize {
+    fn from(tab_size: TabSize) -> Self {
+        tab_size.0 as usize
+    }
+}
diff --git a/crates/ruff/src/linter.rs b/crates/ruff/src/linter.rs
index a9810042c511c..bd8f713d87f92 100644
--- a/crates/ruff/src/linter.rs
+++ b/crates/ruff/src/linter.rs
@@ -77,7 +77,6 @@ pub fn check_path(
     directives: &Directives,
     settings: &Settings,
     noqa: flags::Noqa,
-    autofix: flags::Autofix,
 ) -> LinterResult<(Vec<Diagnostic>, Option<ImportMap>)> {
     // Aggregate all diagnostics.
     let mut diagnostics = vec![];
@@ -89,7 +88,7 @@ pub fn check_path(
     let use_doc_lines = settings.rules.enabled(Rule::DocLineTooLong);
     let mut doc_lines = vec![];
     if use_doc_lines {
-        doc_lines.extend(doc_lines_from_tokens(&tokens, locator));
+        doc_lines.extend(doc_lines_from_tokens(&tokens));
     }
 
     // Run the token-based rules.
@@ -99,7 +98,7 @@ pub fn check_path(
         .any(|rule_code| rule_code.lint_source().is_tokens())
     {
         let is_stub = is_python_stub_file(path);
-        diagnostics.extend(check_tokens(locator, &tokens, settings, autofix, is_stub));
+        diagnostics.extend(check_tokens(locator, indexer, &tokens, settings, is_stub));
     }
 
     // Run the filesystem-based rules.
@@ -117,13 +116,8 @@ pub fn check_path(
         .iter_enabled()
         .any(|rule_code| rule_code.lint_source().is_logical_lines())
     {
-        #[cfg(feature = "logical_lines")]
         diagnostics.extend(crate::checkers::logical_lines::check_logical_lines(
-            &tokens,
-            locator,
-            stylist,
-            settings,
-            flags::Autofix::Enabled,
+            &tokens, locator, stylist, settings,
         ));
     }
 
@@ -148,7 +142,6 @@ pub fn check_path(
                         indexer,
                         &directives.noqa_line_for,
                         settings,
-                        autofix,
                         noqa,
                         path,
                         package,
@@ -162,7 +155,6 @@ pub fn check_path(
                         &directives.isort,
                         settings,
                         stylist,
-                        autofix,
                         path,
                         package,
                     );
@@ -170,7 +162,7 @@ pub fn check_path(
                     diagnostics.extend(import_diagnostics);
                 }
                 if use_doc_lines {
-                    doc_lines.extend(doc_lines_from_ast(&python_ast));
+                    doc_lines.extend(doc_lines_from_ast(&python_ast, locator));
                 }
             }
             Err(parse_error) => {
@@ -198,7 +190,7 @@ 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, &doc_lines, settings,
         ));
     }
 
@@ -222,8 +214,8 @@ pub fn check_path(
             locator,
             indexer.comment_ranges(),
             &directives.noqa_line_for,
+            error.is_none(),
             settings,
-            error.as_ref().map_or(autofix, |_| flags::Autofix::Disabled),
         );
         if noqa.into() {
             for index in ignored.iter().rev() {
@@ -293,7 +285,6 @@ pub fn add_noqa_to_path(path: &Path, package: Option<&Path>, settings: &Settings
         &directives,
         settings,
         flags::Noqa::Disabled,
-        flags::Autofix::Disabled,
     );
 
     // Log any parse errors.
@@ -320,7 +311,6 @@ pub fn lint_only(
     package: Option<&Path>,
     settings: &Settings,
     noqa: flags::Noqa,
-    autofix: flags::Autofix,
 ) -> LinterResult<(Vec<Message>, Option<ImportMap>)> {
     // Tokenize once.
     let tokens: Vec<LexResult> = ruff_rustpython::tokenize(contents);
@@ -353,7 +343,6 @@ pub fn lint_only(
         &directives,
         settings,
         noqa,
-        autofix,
     );
 
     result.map(|(diagnostics, imports)| {
@@ -444,7 +433,6 @@ pub fn lint_fix<'a>(
             &directives,
             settings,
             noqa,
-            flags::Autofix::Enabled,
         );
 
         if iterations == 0 {
@@ -509,8 +497,8 @@ fn collect_rule_codes(rules: impl IntoIterator<Item = Rule>) -> String {
 
 #[allow(clippy::print_stderr)]
 fn report_failed_to_converge_error(path: &Path, transformed: &str, diagnostics: &[Diagnostic]) {
+    let codes = collect_rule_codes(diagnostics.iter().map(|diagnostic| diagnostic.kind.rule()));
     if cfg!(debug_assertions) {
-        let codes = collect_rule_codes(diagnostics.iter().map(|diagnostic| diagnostic.kind.rule()));
         eprintln!(
             "{}: Failed to converge after {} iterations in `{}` with rule codes {}:---\n{}\n---",
             "debug error".red().bold(),
@@ -528,13 +516,14 @@ This indicates a bug in `{}`. If you could open an issue at:
 
     {}/issues/new?title=%5BInfinite%20loop%5D
 
-...quoting the contents of `{}`, along with the `pyproject.toml` settings and executed command, we'd be very appreciative!
+...quoting the contents of `{}`, the rule codes {}, along with the `pyproject.toml` settings and executed command, we'd be very appreciative!
 "#,
             "error".red().bold(),
             MAX_ITERATIONS,
             CARGO_PKG_NAME,
             CARGO_PKG_REPOSITORY,
             fs::relativize_path(path),
+            codes
         );
     }
 }
@@ -546,8 +535,8 @@ fn report_autofix_syntax_error(
     error: &ParseError,
     rules: impl IntoIterator<Item = Rule>,
 ) {
+    let codes = collect_rule_codes(rules);
     if cfg!(debug_assertions) {
-        let codes = collect_rule_codes(rules);
         eprintln!(
             "{}: Autofix introduced a syntax error in `{}` with rule codes {}: {}\n---\n{}\n---",
             "error".red().bold(),
@@ -565,12 +554,13 @@ This indicates a bug in `{}`. If you could open an issue at:
 
     {}/issues/new?title=%5BAutofix%20error%5D
 
-...quoting the contents of `{}`, along with the `pyproject.toml` settings and executed command, we'd be very appreciative!
+...quoting the contents of `{}`, the rule codes {}, along with the `pyproject.toml` settings and executed command, we'd be very appreciative!
 "#,
             "error".red().bold(),
             CARGO_PKG_NAME,
             CARGO_PKG_REPOSITORY,
             fs::relativize_path(path),
+            codes,
         );
     }
 }
diff --git a/crates/ruff/src/logging.rs b/crates/ruff/src/logging.rs
index 1607508ead203..ede7c8f43bc0d 100644
--- a/crates/ruff/src/logging.rs
+++ b/crates/ruff/src/logging.rs
@@ -1,15 +1,17 @@
-use std::fmt::{Display, Formatter};
+use std::fmt::{Display, Formatter, Write};
 use std::path::Path;
 use std::sync::Mutex;
 
-use crate::fs;
 use anyhow::Result;
 use colored::Colorize;
 use fern;
 use log::Level;
 use once_cell::sync::Lazy;
+use rustpython_parser::{ParseError, ParseErrorType};
+
 use ruff_python_ast::source_code::SourceCode;
-use rustpython_parser::ParseError;
+
+use crate::fs;
 
 pub(crate) static WARNINGS: Lazy<Mutex<Vec<&'static str>>> = Lazy::new(Mutex::default);
 
@@ -145,17 +147,89 @@ impl<'a> DisplayParseError<'a> {
 
 impl Display for DisplayParseError<'_> {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        let source_location = self.source_code.source_location(self.error.location);
+        let source_location = self.source_code.source_location(self.error.offset);
 
         write!(
             f,
             "{header} {path}{colon}{row}{colon}{column}{colon} {inner}",
-            header = "Failed to parse ".bold(),
+            header = "Failed to parse".bold(),
             path = fs::relativize_path(Path::new(&self.error.source_path)).bold(),
             row = source_location.row,
             column = source_location.column,
             colon = ":".cyan(),
-            inner = &self.error.error
+            inner = &DisplayParseErrorType(&self.error.error)
+        )
+    }
+}
+
+pub(crate) struct DisplayParseErrorType<'a>(&'a ParseErrorType);
+
+impl<'a> DisplayParseErrorType<'a> {
+    pub(crate) fn new(error: &'a ParseErrorType) -> Self {
+        Self(error)
+    }
+}
+
+impl Display for DisplayParseErrorType<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self.0 {
+            ParseErrorType::Eof => write!(f, "Expected token but reached end of file."),
+            ParseErrorType::ExtraToken(ref tok) => write!(
+                f,
+                "Got extraneous token: {tok}",
+                tok = TruncateAtNewline(&tok)
+            ),
+            ParseErrorType::InvalidToken => write!(f, "Got invalid token"),
+            ParseErrorType::UnrecognizedToken(ref tok, ref expected) => {
+                if let Some(expected) = expected.as_ref() {
+                    write!(
+                        f,
+                        "expected '{expected}', but got {tok}",
+                        tok = TruncateAtNewline(&tok)
+                    )
+                } else {
+                    write!(f, "unexpected token {tok}", tok = TruncateAtNewline(&tok))
+                }
+            }
+            ParseErrorType::Lexical(ref error) => write!(f, "{error}"),
+        }
+    }
+}
+
+/// Truncates the display text before the first newline character to avoid line breaks.
+struct TruncateAtNewline<'a>(&'a dyn Display);
+
+impl Display for TruncateAtNewline<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        struct TruncateAdapter<'a> {
+            inner: &'a mut dyn Write,
+            after_new_line: bool,
+        }
+
+        impl Write for TruncateAdapter<'_> {
+            fn write_str(&mut self, s: &str) -> std::fmt::Result {
+                if self.after_new_line {
+                    Ok(())
+                } else {
+                    if let Some(end) = s.find(['\n', '\r']) {
+                        self.inner.write_str(&s[..end])?;
+                        self.inner.write_str("\u{23ce}...")?;
+                        self.after_new_line = true;
+                        Ok(())
+                    } else {
+                        self.inner.write_str(s)
+                    }
+                }
+            }
+        }
+
+        write!(
+            TruncateAdapter {
+                inner: f,
+                after_new_line: false,
+            },
+            "{}",
+            self.0
         )
     }
 }
diff --git a/crates/ruff/src/message/azure.rs b/crates/ruff/src/message/azure.rs
index f29a89ce9cbc6..d5119faca03aa 100644
--- a/crates/ruff/src/message/azure.rs
+++ b/crates/ruff/src/message/azure.rs
@@ -1,7 +1,9 @@
+use std::io::Write;
+
+use ruff_python_ast::source_code::SourceLocation;
+
 use crate::message::{Emitter, EmitterContext, Message};
 use crate::registry::AsRule;
-use ruff_python_ast::source_code::{OneIndexed, SourceLocation};
-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)
@@ -19,10 +21,7 @@ impl Emitter for AzureEmitter {
             let location = 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
-                SourceLocation {
-                    row: OneIndexed::from_zero_indexed(0),
-                    column: OneIndexed::from_zero_indexed(0),
-                }
+                SourceLocation::default()
             } else {
                 message.compute_start_location()
             };
@@ -45,9 +44,10 @@ impl Emitter for AzureEmitter {
 
 #[cfg(test)]
 mod tests {
+    use insta::assert_snapshot;
+
     use crate::message::tests::{capture_emitter_output, create_messages};
     use crate::message::AzureEmitter;
-    use insta::assert_snapshot;
 
     #[test]
     fn output() {
diff --git a/crates/ruff/src/message/diff.rs b/crates/ruff/src/message/diff.rs
index 76b9ef2901ace..8bda1c0534d51 100644
--- a/crates/ruff/src/message/diff.rs
+++ b/crates/ruff/src/message/diff.rs
@@ -1,11 +1,15 @@
-use crate::message::Message;
+use std::fmt::{Display, Formatter};
+use std::num::NonZeroUsize;
+
 use colored::{Color, ColoredString, Colorize, Styles};
-use ruff_diagnostics::Fix;
-use ruff_python_ast::source_code::{OneIndexed, SourceFile};
+use itertools::Itertools;
 use ruff_text_size::{TextRange, TextSize};
 use similar::{ChangeTag, TextDiff};
-use std::fmt::{Display, Formatter};
-use std::num::NonZeroUsize;
+
+use ruff_diagnostics::{Applicability, Fix};
+use ruff_python_ast::source_code::{OneIndexed, SourceFile};
+
+use crate::message::Message;
 
 /// Renders a diff that shows the code fixes.
 ///
@@ -21,15 +25,11 @@ pub(super) struct Diff<'a> {
 }
 
 impl<'a> Diff<'a> {
-    pub fn from_message(message: &'a Message) -> Option<Diff> {
-        if message.fix.is_empty() {
-            None
-        } else {
-            Some(Diff {
-                source_code: &message.file,
-                fix: &message.fix,
-            })
-        }
+    pub(crate) fn from_message(message: &'a Message) -> Option<Diff> {
+        message.fix.as_ref().map(|fix| Diff {
+            source_code: &message.file,
+            fix,
+        })
     }
 }
 
@@ -38,7 +38,12 @@ impl Display for Diff<'_> {
         let mut output = String::with_capacity(self.source_code.source_text().len());
         let mut last_end = TextSize::default();
 
-        for edit in self.fix.edits() {
+        for edit in self
+            .fix
+            .edits()
+            .iter()
+            .sorted_unstable_by_key(|edit| edit.start())
+        {
             output.push_str(
                 self.source_code
                     .slice(TextRange::new(last_end, edit.start())),
@@ -51,7 +56,13 @@ impl Display for Diff<'_> {
 
         let diff = TextDiff::from_lines(self.source_code.source_text(), &output);
 
-        writeln!(f, "{}", "ℹ Suggested fix".blue())?;
+        let message = match self.fix.applicability() {
+            Applicability::Automatic => "Fix",
+            Applicability::Suggested => "Suggested fix",
+            Applicability::Manual => "Possible fix",
+            Applicability::Unspecified => "Suggested fix", // For backwards compatibility, unspecified fixes are 'suggested'
+        };
+        writeln!(f, "ℹ {}", message.blue())?;
 
         let (largest_old, largest_new) = diff
             .ops()
diff --git a/crates/ruff/src/message/github.rs b/crates/ruff/src/message/github.rs
index 5b3552473dacc..23ddae5d6701d 100644
--- a/crates/ruff/src/message/github.rs
+++ b/crates/ruff/src/message/github.rs
@@ -1,8 +1,10 @@
+use std::io::Write;
+
+use ruff_python_ast::source_code::SourceLocation;
+
 use crate::fs::relativize_path;
 use crate::message::{Emitter, EmitterContext, Message};
 use crate::registry::AsRule;
-use ruff_python_ast::source_code::{OneIndexed, SourceLocation};
-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)
@@ -21,10 +23,7 @@ impl Emitter for GithubEmitter {
             let location = 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
-                SourceLocation {
-                    row: OneIndexed::from_zero_indexed(0),
-                    column: OneIndexed::from_zero_indexed(0),
-                }
+                SourceLocation::default()
             } else {
                 source_location.clone()
             };
@@ -60,9 +59,10 @@ impl Emitter for GithubEmitter {
 
 #[cfg(test)]
 mod tests {
+    use insta::assert_snapshot;
+
     use crate::message::tests::{capture_emitter_output, create_messages};
     use crate::message::GithubEmitter;
-    use insta::assert_snapshot;
 
     #[test]
     fn output() {
diff --git a/crates/ruff/src/message/gitlab.rs b/crates/ruff/src/message/gitlab.rs
index 355bdf0dbdea2..8538245b391c8 100644
--- a/crates/ruff/src/message/gitlab.rs
+++ b/crates/ruff/src/message/gitlab.rs
@@ -1,14 +1,17 @@
-use crate::fs::{relativize_path, relativize_path_to};
-use crate::message::{Emitter, EmitterContext, Message};
-use crate::registry::AsRule;
-use ruff_python_ast::source_code::SourceLocation;
-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;
 
+use serde::ser::SerializeSeq;
+use serde::{Serialize, Serializer};
+use serde_json::json;
+
+use ruff_python_ast::source_code::SourceLocation;
+
+use crate::fs::{relativize_path, relativize_path_to};
+use crate::message::{Emitter, EmitterContext, Message};
+use crate::registry::AsRule;
+
 /// 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 {
@@ -122,9 +125,10 @@ fn fingerprint(
 
 #[cfg(test)]
 mod tests {
+    use insta::assert_snapshot;
+
     use crate::message::tests::{capture_emitter_output, create_messages};
     use crate::message::GitlabEmitter;
-    use insta::assert_snapshot;
 
     #[test]
     fn output() {
diff --git a/crates/ruff/src/message/grouped.rs b/crates/ruff/src/message/grouped.rs
index 4502f2e20c334..5f8bfa411dbf5 100644
--- a/crates/ruff/src/message/grouped.rs
+++ b/crates/ruff/src/message/grouped.rs
@@ -1,3 +1,11 @@
+use std::fmt::{Display, Formatter};
+use std::io::Write;
+use std::num::NonZeroUsize;
+
+use colored::Colorize;
+
+use ruff_python_ast::source_code::OneIndexed;
+
 use crate::fs::relativize_path;
 use crate::jupyter::JupyterIndex;
 use crate::message::diff::calculate_print_width;
@@ -5,11 +13,6 @@ use crate::message::text::{MessageCodeFrame, RuleCodeAndBody};
 use crate::message::{
     group_messages_by_filename, Emitter, EmitterContext, Message, MessageWithLocation,
 };
-use colored::Colorize;
-use ruff_python_ast::source_code::OneIndexed;
-use std::fmt::{Display, Formatter};
-use std::io::Write;
-use std::num::NonZeroUsize;
 
 #[derive(Default)]
 pub struct GroupedEmitter {
@@ -71,7 +74,12 @@ impl Emitter for GroupedEmitter {
                     }
                 )?;
             }
-            writeln!(writer)?;
+
+            // Print a blank line between files, unless we're showing the source, in which case
+            // we'll have already printed a blank line between messages.
+            if !self.show_source {
+                writeln!(writer)?;
+            }
         }
 
         Ok(())
@@ -125,7 +133,7 @@ impl Display for DisplayGroupedMessage<'_> {
                 self.column_length.get() - calculate_print_width(start_location.column).get()
             ),
             code_and_body = RuleCodeAndBody {
-                message_kind: &message.kind,
+                message,
                 show_fix_status: self.show_fix_status
             },
         )?;
@@ -133,11 +141,9 @@ impl Display for DisplayGroupedMessage<'_> {
         if self.show_source {
             use std::fmt::Write;
             let mut padded = PadAdapter::new(f);
-            write!(padded, "{}", MessageCodeFrame { message })?;
+            writeln!(padded, "{}", MessageCodeFrame { message })?;
         }
 
-        writeln!(f)?;
-
         Ok(())
     }
 }
@@ -175,12 +181,21 @@ impl std::fmt::Write for PadAdapter<'_> {
 
 #[cfg(test)]
 mod tests {
+    use insta::assert_snapshot;
+
     use crate::message::tests::{capture_emitter_output, create_messages};
     use crate::message::GroupedEmitter;
-    use insta::assert_snapshot;
 
     #[test]
     fn default() {
+        let mut emitter = GroupedEmitter::default();
+        let content = capture_emitter_output(&mut emitter, &create_messages());
+
+        assert_snapshot!(content);
+    }
+
+    #[test]
+    fn show_source() {
         let mut emitter = GroupedEmitter::default().with_show_source(true);
         let content = capture_emitter_output(&mut emitter, &create_messages());
 
diff --git a/crates/ruff/src/message/json.rs b/crates/ruff/src/message/json.rs
index 1e980f78b59f0..c3adda51ba3d8 100644
--- a/crates/ruff/src/message/json.rs
+++ b/crates/ruff/src/message/json.rs
@@ -1,11 +1,14 @@
-use crate::message::{Emitter, EmitterContext, Message};
-use crate::registry::AsRule;
-use ruff_diagnostics::Edit;
-use ruff_python_ast::source_code::{SourceCode, SourceLocation};
+use std::io::Write;
+
 use serde::ser::SerializeSeq;
 use serde::{Serialize, Serializer};
-use serde_json::{json, Value};
-use std::io::Write;
+use serde_json::json;
+
+use ruff_diagnostics::Edit;
+use ruff_python_ast::source_code::SourceCode;
+
+use crate::message::{Emitter, EmitterContext, Message};
+use crate::registry::AsRule;
 
 #[derive(Default)]
 pub struct JsonEmitter;
@@ -37,14 +40,13 @@ impl Serialize for ExpandedMessages<'_> {
         for message in self.messages {
             let source_code = message.file.to_source_code();
 
-            let fix = if message.fix.is_empty() {
-                None
-            } else {
-                Some(json!({
+            let fix = message.fix.as_ref().map(|fix| {
+                json!({
+                    "applicability": fix.applicability(),
                     "message": message.kind.suggestion.as_deref(),
-                    "edits": &ExpandedEdits { edits: message.fix.edits(), source_code: &source_code },
-                }))
-            };
+                    "edits": &ExpandedEdits { edits: fix.edits(), source_code: &source_code },
+                })
+            });
 
             let start_location = source_code.source_location(message.start());
             let end_location = source_code.source_location(message.end());
@@ -80,12 +82,10 @@ impl Serialize for ExpandedEdits<'_> {
         let mut s = serializer.serialize_seq(Some(self.edits.len()))?;
 
         for edit in self.edits {
-            let start_location = self.source_code.source_location(edit.start());
-            let end_location = self.source_code.source_location(edit.end());
             let value = json!({
                 "content": edit.content().unwrap_or_default(),
-                "location": to_zero_indexed_column(&start_location),
-                "end_location": to_zero_indexed_column(&end_location)
+                "location": self.source_code.source_location(edit.start()),
+                "end_location": self.source_code.source_location(edit.end())
             });
 
             s.serialize_element(&value)?;
@@ -95,18 +95,12 @@ impl Serialize for ExpandedEdits<'_> {
     }
 }
 
-fn to_zero_indexed_column(location: &SourceLocation) -> Value {
-    json!({
-        "row": location.row,
-        "column": location.column.to_zero_indexed()
-    })
-}
-
 #[cfg(test)]
 mod tests {
+    use insta::assert_snapshot;
+
     use crate::message::tests::{capture_emitter_output, create_messages};
     use crate::message::JsonEmitter;
-    use insta::assert_snapshot;
 
     #[test]
     fn output() {
diff --git a/crates/ruff/src/message/junit.rs b/crates/ruff/src/message/junit.rs
index 2ed8e6dd7f007..f910b7e6ed4b0 100644
--- a/crates/ruff/src/message/junit.rs
+++ b/crates/ruff/src/message/junit.rs
@@ -1,11 +1,14 @@
+use std::io::Write;
+use std::path::Path;
+
+use quick_junit::{NonSuccessKind, Report, TestCase, TestCaseStatus, TestSuite};
+
+use ruff_python_ast::source_code::SourceLocation;
+
 use crate::message::{
     group_messages_by_filename, Emitter, EmitterContext, Message, MessageWithLocation,
 };
 use crate::registry::AsRule;
-use quick_junit::{NonSuccessKind, Report, TestCase, TestCaseStatus, TestSuite};
-use ruff_python_ast::source_code::{OneIndexed, SourceLocation};
-use std::io::Write;
-use std::path::Path;
 
 #[derive(Default)]
 pub struct JunitEmitter;
@@ -19,52 +22,60 @@ impl Emitter for JunitEmitter {
     ) -> anyhow::Result<()> {
         let mut report = Report::new("ruff");
 
-        for (filename, messages) in group_messages_by_filename(messages) {
-            let mut test_suite = TestSuite::new(filename);
+        if messages.is_empty() {
+            let mut test_suite = TestSuite::new("ruff");
             test_suite
                 .extra
                 .insert("package".to_string(), "org.ruff".to_string());
+            let mut case = TestCase::new("No errors found", TestCaseStatus::success());
+            case.set_classname("ruff");
+            test_suite.add_test_case(case);
+            report.add_test_suite(test_suite);
+        } else {
+            for (filename, messages) in group_messages_by_filename(messages) {
+                let mut test_suite = TestSuite::new(filename);
+                test_suite
+                    .extra
+                    .insert("package".to_string(), "org.ruff".to_string());
 
-            for message in messages {
-                let MessageWithLocation {
-                    message,
-                    start_location,
-                } = message;
-                let mut status = TestCaseStatus::non_success(NonSuccessKind::Failure);
-                status.set_message(message.kind.body.clone());
-                let location = 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
-                    SourceLocation {
-                        row: OneIndexed::from_zero_indexed(0),
-                        column: OneIndexed::from_zero_indexed(0),
-                    }
-                } else {
-                    start_location
-                };
+                for message in messages {
+                    let MessageWithLocation {
+                        message,
+                        start_location,
+                    } = message;
+                    let mut status = TestCaseStatus::non_success(NonSuccessKind::Failure);
+                    status.set_message(message.kind.body.clone());
+                    let location = 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
+                        SourceLocation::default()
+                    } else {
+                        start_location
+                    };
 
-                status.set_description(format!(
-                    "line {row}, col {col}, {body}",
-                    row = location.row,
-                    col = location.column,
-                    body = message.kind.body
-                ));
-                let mut case = TestCase::new(
-                    format!("org.ruff.{}", message.kind.rule().noqa_code()),
-                    status,
-                );
-                let file_path = Path::new(filename);
-                let file_stem = file_path.file_stem().unwrap().to_str().unwrap();
-                let classname = file_path.parent().unwrap().join(file_stem);
-                case.set_classname(classname.to_str().unwrap());
-                case.extra
-                    .insert("line".to_string(), location.row.to_string());
-                case.extra
-                    .insert("column".to_string(), location.column.to_string());
+                    status.set_description(format!(
+                        "line {row}, col {col}, {body}",
+                        row = location.row,
+                        col = location.column,
+                        body = message.kind.body
+                    ));
+                    let mut case = TestCase::new(
+                        format!("org.ruff.{}", message.kind.rule().noqa_code()),
+                        status,
+                    );
+                    let file_path = Path::new(filename);
+                    let file_stem = file_path.file_stem().unwrap().to_str().unwrap();
+                    let classname = file_path.parent().unwrap().join(file_stem);
+                    case.set_classname(classname.to_str().unwrap());
+                    case.extra
+                        .insert("line".to_string(), location.row.to_string());
+                    case.extra
+                        .insert("column".to_string(), location.column.to_string());
 
-                test_suite.add_test_case(case);
+                    test_suite.add_test_case(case);
+                }
+                report.add_test_suite(test_suite);
             }
-            report.add_test_suite(test_suite);
         }
 
         report.serialize(writer)?;
@@ -75,9 +86,10 @@ impl Emitter for JunitEmitter {
 
 #[cfg(test)]
 mod tests {
+    use insta::assert_snapshot;
+
     use crate::message::tests::{capture_emitter_output, create_messages};
     use crate::message::JunitEmitter;
-    use insta::assert_snapshot;
 
     #[test]
     fn output() {
diff --git a/crates/ruff/src/message/mod.rs b/crates/ruff/src/message/mod.rs
index 41c1776a884ba..072bf79fae918 100644
--- a/crates/ruff/src/message/mod.rs
+++ b/crates/ruff/src/message/mod.rs
@@ -1,20 +1,11 @@
-mod azure;
-mod diff;
-mod github;
-mod gitlab;
-mod grouped;
-mod json;
-mod junit;
-mod pylint;
-mod text;
-
-use ruff_text_size::{TextRange, TextSize};
-use rustc_hash::FxHashMap;
 use std::cmp::Ordering;
 use std::collections::BTreeMap;
 use std::io::Write;
 use std::ops::Deref;
 
+use ruff_text_size::{TextRange, TextSize};
+use rustc_hash::FxHashMap;
+
 pub use azure::AzureEmitter;
 pub use github::GithubEmitter;
 pub use gitlab::GitlabEmitter;
@@ -22,18 +13,27 @@ pub use grouped::GroupedEmitter;
 pub use json::JsonEmitter;
 pub use junit::JunitEmitter;
 pub use pylint::PylintEmitter;
+use ruff_diagnostics::{Diagnostic, DiagnosticKind, Fix};
+use ruff_python_ast::source_code::{SourceFile, SourceLocation};
 pub use text::TextEmitter;
 
 use crate::jupyter::JupyterIndex;
-use crate::registry::AsRule;
-use ruff_diagnostics::{Diagnostic, DiagnosticKind, Fix};
-use ruff_python_ast::source_code::{SourceFile, SourceLocation};
+
+mod azure;
+mod diff;
+mod github;
+mod gitlab;
+mod grouped;
+mod json;
+mod junit;
+mod pylint;
+mod text;
 
 #[derive(Debug, PartialEq, Eq)]
 pub struct Message {
     pub kind: DiagnosticKind,
     pub range: TextRange,
-    pub fix: Fix,
+    pub fix: Option<Fix>,
     pub file: SourceFile,
     pub noqa_offset: TextSize,
 }
@@ -76,11 +76,7 @@ impl Message {
 
 impl Ord for Message {
     fn cmp(&self, other: &Self) -> Ordering {
-        (self.filename(), self.start(), self.kind.rule()).cmp(&(
-            other.filename(),
-            other.start(),
-            other.kind.rule(),
-        ))
+        (&self.file, self.start()).cmp(&(&other.file, other.start()))
     }
 }
 
@@ -152,13 +148,14 @@ impl<'a> EmitterContext<'a> {
 
 #[cfg(test)]
 mod tests {
-    use crate::message::{Emitter, EmitterContext, Message};
-    use crate::rules::pyflakes::rules::{UndefinedName, UnusedImport, UnusedVariable};
-    use ruff_diagnostics::{Diagnostic, Edit, Fix};
-    use ruff_python_ast::source_code::SourceFileBuilder;
     use ruff_text_size::{TextRange, TextSize};
     use rustc_hash::FxHashMap;
 
+    use ruff_diagnostics::{Diagnostic, DiagnosticKind, Edit, Fix};
+    use ruff_python_ast::source_code::SourceFileBuilder;
+
+    use crate::message::{Emitter, EmitterContext, Message};
+
     pub(super) fn create_messages() -> Vec<Message> {
         let fib = r#"import os
 
@@ -175,32 +172,40 @@ def fibonacci(n):
 "#;
 
         let unused_import = Diagnostic::new(
-            UnusedImport {
-                name: "os".to_string(),
-                context: None,
-                multiple: false,
+            DiagnosticKind {
+                name: "UnusedImport".to_string(),
+                body: "`os` imported but unused".to_string(),
+                suggestion: Some("Remove unused import: `os`".to_string()),
             },
             TextRange::new(TextSize::from(7), TextSize::from(9)),
-        );
+        )
+        .with_fix(Fix::suggested(Edit::range_deletion(TextRange::new(
+            TextSize::from(0),
+            TextSize::from(10),
+        ))));
 
         let fib_source = SourceFileBuilder::new("fib.py", fib).finish();
 
         let unused_variable = Diagnostic::new(
-            UnusedVariable {
-                name: "x".to_string(),
+            DiagnosticKind {
+                name: "UnusedVariable".to_string(),
+                body: "Local variable `x` is assigned to but never used".to_string(),
+                suggestion: Some("Remove assignment to unused variable `x`".to_string()),
             },
             TextRange::new(TextSize::from(94), TextSize::from(95)),
         )
-        .with_fix(Fix::new(vec![Edit::deletion(
+        .with_fix(Fix::suggested(Edit::deletion(
             TextSize::from(94),
             TextSize::from(99),
-        )]));
+        )));
 
         let file_2 = r#"if a == 1: pass"#;
 
         let undefined_name = Diagnostic::new(
-            UndefinedName {
-                name: "a".to_string(),
+            DiagnosticKind {
+                name: "UndefinedName".to_string(),
+                body: "Undefined name `a`".to_string(),
+                suggestion: None,
             },
             TextRange::new(TextSize::from(3), TextSize::from(4)),
         );
diff --git a/crates/ruff/src/message/pylint.rs b/crates/ruff/src/message/pylint.rs
index d456fa6e1083c..edede90422f16 100644
--- a/crates/ruff/src/message/pylint.rs
+++ b/crates/ruff/src/message/pylint.rs
@@ -1,8 +1,10 @@
+use std::io::Write;
+
+use ruff_python_ast::source_code::OneIndexed;
+
 use crate::fs::relativize_path;
 use crate::message::{Emitter, EmitterContext, Message};
 use crate::registry::AsRule;
-use ruff_python_ast::source_code::OneIndexed;
-use std::io::Write;
 
 /// Generate violations in Pylint format.
 /// See: [Flake8 documentation](https://flake8.pycqa.org/en/latest/internal/formatters.html#pylint-formatter)
@@ -40,9 +42,10 @@ impl Emitter for PylintEmitter {
 
 #[cfg(test)]
 mod tests {
+    use insta::assert_snapshot;
+
     use crate::message::tests::{capture_emitter_output, create_messages};
     use crate::message::PylintEmitter;
-    use insta::assert_snapshot;
 
     #[test]
     fn output() {
diff --git a/crates/ruff/src/message/snapshots/ruff__message__grouped__tests__default.snap b/crates/ruff/src/message/snapshots/ruff__message__grouped__tests__default.snap
index b8f57564005dd..00d89c9ceb6b0 100644
--- a/crates/ruff/src/message/snapshots/ruff__message__grouped__tests__default.snap
+++ b/crates/ruff/src/message/snapshots/ruff__message__grouped__tests__default.snap
@@ -4,30 +4,9 @@ expression: content
 ---
 fib.py:
   1:8 F401 `os` imported but unused
-    |
-  1 | import os
-    |        ^^ F401
-    |
-    = help: Remove unused import: `os`
-
   6:5 F841 Local variable `x` is assigned to but never used
-     |
-   6 | def fibonacci(n):
-   7 |     """Compute the nth number in the Fibonacci sequence."""
-   8 |     x = 1
-     |     ^ F841
-   9 |     if n == 0:
-  10 |         return 0
-     |
-     = help: Remove assignment to unused variable `x`
-
 
 undef.py:
   1:4 F821 Undefined name `a`
-    |
-  1 | if a == 1: pass
-    |    ^ F821
-    |
-
 
 
diff --git a/crates/ruff/src/message/snapshots/ruff__message__grouped__tests__fix_status.snap b/crates/ruff/src/message/snapshots/ruff__message__grouped__tests__fix_status.snap
index ebea79e6400b7..5da6d7cfaa447 100644
--- a/crates/ruff/src/message/snapshots/ruff__message__grouped__tests__fix_status.snap
+++ b/crates/ruff/src/message/snapshots/ruff__message__grouped__tests__fix_status.snap
@@ -9,7 +9,7 @@ fib.py:
     |        ^^ F401
     |
     = help: Remove unused import: `os`
-
+  
   6:5 F841 [*] Local variable `x` is assigned to but never used
      |
    6 | def fibonacci(n):
@@ -20,14 +20,12 @@ fib.py:
   10 |         return 0
      |
      = help: Remove assignment to unused variable `x`
-
-
+  
 undef.py:
   1:4 F821 Undefined name `a`
     |
   1 | if a == 1: pass
     |    ^ F821
     |
-
-
+  
 
diff --git a/crates/ruff/src/message/snapshots/ruff__message__grouped__tests__show_source.snap b/crates/ruff/src/message/snapshots/ruff__message__grouped__tests__show_source.snap
new file mode 100644
index 0000000000000..957c3d877b37d
--- /dev/null
+++ b/crates/ruff/src/message/snapshots/ruff__message__grouped__tests__show_source.snap
@@ -0,0 +1,31 @@
+---
+source: crates/ruff/src/message/grouped.rs
+expression: content
+---
+fib.py:
+  1:8 F401 `os` imported but unused
+    |
+  1 | import os
+    |        ^^ F401
+    |
+    = help: Remove unused import: `os`
+  
+  6:5 F841 Local variable `x` is assigned to but never used
+     |
+   6 | def fibonacci(n):
+   7 |     """Compute the nth number in the Fibonacci sequence."""
+   8 |     x = 1
+     |     ^ F841
+   9 |     if n == 0:
+  10 |         return 0
+     |
+     = help: Remove assignment to unused variable `x`
+  
+undef.py:
+  1:4 F821 Undefined name `a`
+    |
+  1 | if a == 1: pass
+    |    ^ F821
+    |
+  
+
diff --git a/crates/ruff/src/message/snapshots/ruff__message__json__tests__output.snap b/crates/ruff/src/message/snapshots/ruff__message__json__tests__output.snap
index 2aa4807b1033f..e9272931d6a33 100644
--- a/crates/ruff/src/message/snapshots/ruff__message__json__tests__output.snap
+++ b/crates/ruff/src/message/snapshots/ruff__message__json__tests__output.snap
@@ -6,7 +6,23 @@ expression: content
   {
     "code": "F401",
     "message": "`os` imported but unused",
-    "fix": null,
+    "fix": {
+      "applicability": "Suggested",
+      "message": "Remove unused import: `os`",
+      "edits": [
+        {
+          "content": "",
+          "location": {
+            "row": 1,
+            "column": 1
+          },
+          "end_location": {
+            "row": 2,
+            "column": 1
+          }
+        }
+      ]
+    },
     "location": {
       "row": 1,
       "column": 8
@@ -22,17 +38,18 @@ expression: content
     "code": "F841",
     "message": "Local variable `x` is assigned to but never used",
     "fix": {
+      "applicability": "Suggested",
       "message": "Remove assignment to unused variable `x`",
       "edits": [
         {
           "content": "",
           "location": {
             "row": 6,
-            "column": 4
+            "column": 5
           },
           "end_location": {
             "row": 6,
-            "column": 9
+            "column": 10
           }
         }
       ]
diff --git a/crates/ruff/src/message/text.rs b/crates/ruff/src/message/text.rs
index 547cb64e77a3c..d467926a67d61 100644
--- a/crates/ruff/src/message/text.rs
+++ b/crates/ruff/src/message/text.rs
@@ -1,23 +1,29 @@
-use crate::fs::relativize_path;
-use crate::message::diff::Diff;
-use crate::message::{Emitter, EmitterContext, Message};
-use crate::registry::AsRule;
+use std::borrow::Cow;
+use std::fmt::{Display, Formatter};
+use std::io::Write;
+
 use annotate_snippets::display_list::{DisplayList, FormatOptions};
 use annotate_snippets::snippet::{Annotation, AnnotationType, Slice, Snippet, SourceAnnotation};
 use bitflags::bitflags;
 use colored::Colorize;
-use ruff_diagnostics::DiagnosticKind;
-use ruff_python_ast::source_code::{OneIndexed, SourceLocation};
 use ruff_text_size::{TextRange, TextSize};
-use std::borrow::Cow;
-use std::fmt::{Display, Formatter};
-use std::io::Write;
+
+use ruff_python_ast::source_code::{OneIndexed, SourceLocation};
+
+use crate::fs::relativize_path;
+use crate::line_width::{LineWidth, TabSize};
+use crate::message::diff::Diff;
+use crate::message::{Emitter, EmitterContext, Message};
+use crate::registry::AsRule;
 
 bitflags! {
     #[derive(Default)]
     struct EmitterFlags: u8 {
+        /// Whether to show the fix status of a diagnostic.
         const SHOW_FIX_STATUS = 0b0000_0001;
-        const SHOW_FIX        = 0b0000_0010;
+        /// Whether to show the diff of a fix, for diagnostics that have a fix.
+        const SHOW_FIX_DIFF   = 0b0000_0010;
+        /// Whether to show the source code of a diagnostic.
         const SHOW_SOURCE     = 0b0000_0100;
     }
 }
@@ -36,8 +42,8 @@ impl TextEmitter {
     }
 
     #[must_use]
-    pub fn with_show_fix(mut self, show_fix: bool) -> Self {
-        self.flags.set(EmitterFlags::SHOW_FIX, show_fix);
+    pub fn with_show_fix_diff(mut self, show_fix_diff: bool) -> Self {
+        self.flags.set(EmitterFlags::SHOW_FIX_DIFF, show_fix_diff);
         self
     }
 
@@ -93,7 +99,7 @@ impl Emitter for TextEmitter {
                 col = diagnostic_location.column,
                 sep = ":".cyan(),
                 code_and_body = RuleCodeAndBody {
-                    message_kind: &message.kind,
+                    message,
                     show_fix_status: self.flags.contains(EmitterFlags::SHOW_FIX_STATUS)
                 }
             )?;
@@ -102,7 +108,7 @@ impl Emitter for TextEmitter {
                 writeln!(writer, "{}", MessageCodeFrame { message })?;
             }
 
-            if self.flags.contains(EmitterFlags::SHOW_FIX) {
+            if self.flags.contains(EmitterFlags::SHOW_FIX_DIFF) {
                 if let Some(diff) = Diff::from_message(message) {
                     writeln!(writer, "{diff}")?;
                 }
@@ -114,45 +120,35 @@ impl Emitter for TextEmitter {
 }
 
 pub(super) struct RuleCodeAndBody<'a> {
-    pub message_kind: &'a DiagnosticKind,
-    pub show_fix_status: bool,
+    pub(crate) message: &'a Message,
+    pub(crate) show_fix_status: bool,
 }
 
 impl Display for RuleCodeAndBody<'_> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        if self.show_fix_status && self.message_kind.fixable {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        let kind = &self.message.kind;
+
+        if self.show_fix_status && self.message.fix.is_some() {
             write!(
                 f,
                 "{code} {autofix}{body}",
-                code = self
-                    .message_kind
-                    .rule()
-                    .noqa_code()
-                    .to_string()
-                    .red()
-                    .bold(),
+                code = kind.rule().noqa_code().to_string().red().bold(),
                 autofix = format_args!("[{}] ", "*".cyan()),
-                body = self.message_kind.body,
+                body = kind.body,
             )
         } else {
             write!(
                 f,
                 "{code} {body}",
-                code = self
-                    .message_kind
-                    .rule()
-                    .noqa_code()
-                    .to_string()
-                    .red()
-                    .bold(),
-                body = self.message_kind.body,
+                code = kind.rule().noqa_code().to_string().red().bold(),
+                body = kind.body,
             )
         }
     }
 }
 
 pub(super) struct MessageCodeFrame<'a> {
-    pub message: &'a Message,
+    pub(crate) message: &'a Message,
 }
 
 impl Display for MessageCodeFrame<'_> {
@@ -245,36 +241,35 @@ impl Display for MessageCodeFrame<'_> {
 }
 
 fn replace_whitespace(source: &str, annotation_range: TextRange) -> SourceCode {
-    static TAB_SIZE: TextSize = TextSize::new(4);
+    static TAB_SIZE: TabSize = TabSize(4); // TODO(jonathan): use `tab-size`
 
     let mut result = String::new();
     let mut last_end = 0;
     let mut range = annotation_range;
-    let mut column = 0;
+    let mut line_width = LineWidth::new(TAB_SIZE);
 
-    for (index, m) in source.match_indices(['\t', '\n', '\r']) {
-        match m {
-            "\t" => {
-                let tab_width = TAB_SIZE - TextSize::new(column % 4);
+    for (index, c) in source.char_indices() {
+        let old_width = line_width.get();
+        line_width = line_width.add_char(c);
 
-                if index < usize::from(annotation_range.start()) {
-                    range += tab_width - TextSize::new(1);
-                } else if index < usize::from(annotation_range.end()) {
-                    range = range.add_end(tab_width - TextSize::new(1));
-                }
+        if matches!(c, '\t') {
+            // SAFETY: The difference is a value in the range [1..TAB_SIZE] which is guaranteed to be less than `u32`.
+            #[allow(clippy::cast_possible_truncation)]
+            let tab_width = (line_width.get() - old_width) as u32;
 
-                result.push_str(&source[last_end..index]);
+            if index < usize::from(annotation_range.start()) {
+                range += TextSize::new(tab_width - 1);
+            } else if index < usize::from(annotation_range.end()) {
+                range = range.add_end(TextSize::new(tab_width - 1));
+            }
 
-                for _ in 0..u32::from(tab_width) {
-                    result.push(' ');
-                }
+            result.push_str(&source[last_end..index]);
 
-                last_end = index + 1;
+            for _ in 0..tab_width {
+                result.push(' ');
             }
-            "\n" | "\r" => {
-                column = 0;
-            }
-            _ => unreachable!(),
+
+            last_end = index + 1;
         }
     }
 
@@ -300,9 +295,10 @@ struct SourceCode<'a> {
 
 #[cfg(test)]
 mod tests {
+    use insta::assert_snapshot;
+
     use crate::message::tests::{capture_emitter_output, create_messages};
     use crate::message::TextEmitter;
-    use insta::assert_snapshot;
 
     #[test]
     fn default() {
diff --git a/crates/ruff/src/noqa.rs b/crates/ruff/src/noqa.rs
index 4434837f01873..62fcdf4b77142 100644
--- a/crates/ruff/src/noqa.rs
+++ b/crates/ruff/src/noqa.rs
@@ -11,7 +11,7 @@ use regex::Regex;
 use ruff_text_size::{TextLen, TextRange, TextSize};
 
 use ruff_diagnostics::Diagnostic;
-use ruff_python_ast::newlines::LineEnding;
+use ruff_newlines::LineEnding;
 use ruff_python_ast::source_code::Locator;
 
 use crate::codes::NoqaCode;
@@ -24,10 +24,9 @@ static NOQA_LINE_REGEX: Lazy<Regex> = Lazy::new(|| {
     )
     .unwrap()
 });
-static SPLIT_COMMA_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"[,\s]").unwrap());
 
 #[derive(Debug)]
-pub enum Directive<'a> {
+pub(crate) enum Directive<'a> {
     None,
     // (leading spaces, noqa_range, trailing_spaces)
     All(TextSize, TextRange, TextSize),
@@ -36,7 +35,7 @@ pub enum Directive<'a> {
 }
 
 /// Extract the noqa `Directive` from a line of Python source code.
-pub fn extract_noqa_directive<'a>(range: TextRange, locator: &'a Locator) -> Directive<'a> {
+pub(crate) fn extract_noqa_directive<'a>(range: TextRange, locator: &'a Locator) -> Directive<'a> {
     let text = &locator.contents()[range];
     match NOQA_LINE_REGEX.captures(text) {
         Some(caps) => match (
@@ -46,12 +45,12 @@ pub fn extract_noqa_directive<'a>(range: TextRange, locator: &'a Locator) -> Dir
             caps.name("trailing_spaces"),
         ) {
             (Some(leading_spaces), Some(noqa), Some(codes), Some(trailing_spaces)) => {
-                let codes: Vec<&str> = SPLIT_COMMA_REGEX
-                    .split(codes.as_str().trim())
+                let codes = codes
+                    .as_str()
+                    .split(|c: char| c.is_whitespace() || c == ',')
                     .map(str::trim)
                     .filter(|code| !code.is_empty())
-                    .collect();
-
+                    .collect_vec();
                 let start = range.start() + TextSize::try_from(noqa.start()).unwrap();
                 if codes.is_empty() {
                     #[allow(deprecated)]
@@ -105,11 +104,11 @@ fn parse_file_exemption(line: &str) -> ParsedExemption {
         if remainder.is_empty() {
             return ParsedExemption::All;
         } else if let Some(codes) = remainder.strip_prefix(':') {
-            let codes: Vec<&str> = SPLIT_COMMA_REGEX
-                .split(codes.trim())
+            let codes = codes
+                .split(|c: char| c.is_whitespace() || c == ',')
                 .map(str::trim)
                 .filter(|code| !code.is_empty())
-                .collect();
+                .collect_vec();
             if codes.is_empty() {
                 warn!("Expected rule codes on `noqa` directive: \"{line}\"");
             }
@@ -123,7 +122,7 @@ fn parse_file_exemption(line: &str) -> ParsedExemption {
 
 /// Returns `true` if the string list of `codes` includes `code` (or an alias
 /// thereof).
-pub fn includes(needle: Rule, haystack: &[&str]) -> bool {
+pub(crate) fn includes(needle: Rule, haystack: &[&str]) -> bool {
     let needle = needle.noqa_code();
     haystack
         .iter()
@@ -131,7 +130,7 @@ pub fn includes(needle: Rule, haystack: &[&str]) -> bool {
 }
 
 /// Returns `true` if the given [`Rule`] is ignored at the specified `lineno`.
-pub fn rule_is_ignored(
+pub(crate) fn rule_is_ignored(
     code: Rule,
     offset: TextSize,
     noqa_line_for: &NoqaMapping,
@@ -146,7 +145,7 @@ pub fn rule_is_ignored(
     }
 }
 
-pub enum FileExemption {
+pub(crate) enum FileExemption {
     None,
     All,
     Codes(Vec<NoqaCode>),
@@ -154,7 +153,7 @@ pub enum FileExemption {
 
 /// Extract the [`FileExemption`] for a given Python source file, enumerating any rules that are
 /// globally ignored within the file.
-pub fn file_exemption(contents: &str, comment_ranges: &[TextRange]) -> FileExemption {
+pub(crate) fn file_exemption(contents: &str, comment_ranges: &[TextRange]) -> FileExemption {
     let mut exempt_codes: Vec<NoqaCode> = vec![];
 
     for range in comment_ranges {
@@ -184,7 +183,7 @@ pub fn file_exemption(contents: &str, comment_ranges: &[TextRange]) -> FileExemp
 }
 
 /// Adds noqa comments to suppress all diagnostics of a file.
-pub fn add_noqa(
+pub(crate) fn add_noqa(
     path: &Path,
     diagnostics: &[Diagnostic],
     locator: &Locator,
@@ -368,9 +367,9 @@ fn push_codes<I: Display>(str: &mut String, codes: impl Iterator<Item = I>) {
 #[derive(Debug)]
 pub(crate) struct NoqaDirectiveLine<'a> {
     // The range of the text line for which the noqa directive applies.
-    pub range: TextRange,
-    pub directive: Directive<'a>,
-    pub matches: Vec<NoqaCode>,
+    pub(crate) range: TextRange,
+    pub(crate) directive: Directive<'a>,
+    pub(crate) matches: Vec<NoqaCode>,
 }
 
 #[derive(Debug, Default)]
@@ -379,7 +378,10 @@ pub(crate) struct NoqaDirectives<'a> {
 }
 
 impl<'a> NoqaDirectives<'a> {
-    pub fn from_commented_ranges(comment_ranges: &[TextRange], locator: &'a Locator<'a>) -> Self {
+    pub(crate) fn from_commented_ranges(
+        comment_ranges: &[TextRange],
+        locator: &'a Locator<'a>,
+    ) -> Self {
         let mut directives = Vec::new();
 
         for comment_range in comment_ranges {
@@ -409,11 +411,11 @@ impl<'a> NoqaDirectives<'a> {
         Self { inner: directives }
     }
 
-    pub fn find_line_with_directive(&self, offset: TextSize) -> Option<&NoqaDirectiveLine> {
+    pub(crate) fn find_line_with_directive(&self, offset: TextSize) -> Option<&NoqaDirectiveLine> {
         self.find_line_index(offset).map(|index| &self.inner[index])
     }
 
-    pub fn find_line_with_directive_mut(
+    pub(crate) fn find_line_with_directive_mut(
         &mut self,
         offset: TextSize,
     ) -> Option<&mut NoqaDirectiveLine<'a>> {
@@ -438,7 +440,7 @@ impl<'a> NoqaDirectives<'a> {
             .ok()
     }
 
-    pub fn lines(&self) -> &[NoqaDirectiveLine] {
+    pub(crate) fn lines(&self) -> &[NoqaDirectiveLine] {
         &self.inner
     }
 }
@@ -512,7 +514,7 @@ mod tests {
     use ruff_text_size::{TextRange, TextSize};
 
     use ruff_diagnostics::Diagnostic;
-    use ruff_python_ast::newlines::LineEnding;
+    use ruff_newlines::LineEnding;
     use ruff_python_ast::source_code::Locator;
 
     use crate::noqa::{add_noqa_inner, NoqaMapping, NOQA_LINE_REGEX};
diff --git a/crates/ruff/src/pyproject_toml.rs b/crates/ruff/src/pyproject_toml.rs
new file mode 100644
index 0000000000000..21d3c04d1afe7
--- /dev/null
+++ b/crates/ruff/src/pyproject_toml.rs
@@ -0,0 +1,62 @@
+use anyhow::Result;
+use pyproject_toml::{BuildSystem, Project};
+use ruff_text_size::{TextRange, TextSize};
+use serde::{Deserialize, Serialize};
+
+use ruff_diagnostics::Diagnostic;
+use ruff_python_ast::source_code::SourceFile;
+
+use crate::message::Message;
+use crate::rules::ruff::rules::InvalidPyprojectToml;
+use crate::IOError;
+
+/// Unlike [`pyproject_toml::PyProjectToml`], in our case `build_system` is also optional
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+#[serde(rename_all = "kebab-case")]
+struct PyProjectToml {
+    /// Build-related data
+    build_system: Option<BuildSystem>,
+    /// Project metadata
+    project: Option<Project>,
+}
+
+pub fn lint_pyproject_toml(source_file: SourceFile) -> Result<Vec<Message>> {
+    let err = match toml::from_str::<PyProjectToml>(source_file.source_text()) {
+        Ok(_) => return Ok(Vec::default()),
+        Err(err) => err,
+    };
+
+    let range = match err.span() {
+        // This is bad but sometimes toml and/or serde just don't give us spans
+        // TODO(konstin,micha): https://github.com/charliermarsh/ruff/issues/4571
+        None => TextRange::default(),
+        Some(range) => {
+            let Ok(end) = TextSize::try_from(range.end) else {
+                let diagnostic = Diagnostic::new(
+                    IOError {
+                        message: "pyproject.toml is larger than 4GB".to_string(),
+                    },
+                    TextRange::default(),
+                );
+                return Ok(vec![Message::from_diagnostic(
+                    diagnostic,
+                    source_file,
+                    TextSize::default(),
+                )]);
+            };
+            TextRange::new(
+                // start <= end, so if end < 4GB follows start < 4GB
+                TextSize::try_from(range.start).unwrap(),
+                end,
+            )
+        }
+    };
+
+    let toml_err = err.message().to_string();
+    let diagnostic = Diagnostic::new(InvalidPyprojectToml { message: toml_err }, range);
+    Ok(vec![Message::from_diagnostic(
+        diagnostic,
+        source_file,
+        TextSize::default(),
+    )])
+}
diff --git a/crates/ruff/src/registry.rs b/crates/ruff/src/registry.rs
index cc342b9d0eab7..c57390c0598d6 100644
--- a/crates/ruff/src/registry.rs
+++ b/crates/ruff/src/registry.rs
@@ -1,675 +1,15 @@
-//! Registry of all [`Rule`] implementations.
+//! Remnant of the registry of all [`Rule`] implementations, now it's reexporting from codes.rs
+//! with some helper symbols
 
-mod rule_set;
-
-use strum_macros::{AsRefStr, EnumIter};
+use strum_macros::EnumIter;
 
-use ruff_diagnostics::Violation;
+pub use codes::Rule;
 use ruff_macros::RuleNamespace;
+pub use rule_set::{RuleSet, RuleSetIterator};
 
 use crate::codes::{self, RuleCodePrefix};
-use crate::rules;
-pub use rule_set::{RuleSet, RuleSetIterator};
 
-ruff_macros::register_rules!(
-    // pycodestyle errors
-    rules::pycodestyle::rules::MixedSpacesAndTabs,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::IndentationWithInvalidMultiple,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::NoIndentedBlock,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::UnexpectedIndentation,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::IndentationWithInvalidMultipleComment,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::NoIndentedBlockComment,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::UnexpectedIndentationComment,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::OverIndented,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::WhitespaceAfterOpenBracket,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::WhitespaceBeforeCloseBracket,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::WhitespaceBeforePunctuation,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::MultipleSpacesBeforeOperator,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::MultipleSpacesAfterOperator,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::TabBeforeOperator,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::TabAfterOperator,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::TooFewSpacesBeforeInlineComment,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::NoSpaceAfterInlineComment,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::NoSpaceAfterBlockComment,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::MultipleLeadingHashesForBlockComment,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::MultipleSpacesAfterKeyword,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::MissingWhitespace,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::MissingWhitespaceAfterKeyword,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::MultipleSpacesBeforeKeyword,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundOperator,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundArithmeticOperator,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundBitwiseOrShiftOperator,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundModuloOperator,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::TabAfterKeyword,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::UnexpectedSpacesAroundKeywordParameterEquals,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundParameterEquals,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::WhitespaceBeforeParameters,
-    #[cfg(feature = "logical_lines")]
-    rules::pycodestyle::rules::logical_lines::TabBeforeKeyword,
-    rules::pycodestyle::rules::MultipleImportsOnOneLine,
-    rules::pycodestyle::rules::ModuleImportNotAtTopOfFile,
-    rules::pycodestyle::rules::LineTooLong,
-    rules::pycodestyle::rules::MultipleStatementsOnOneLineColon,
-    rules::pycodestyle::rules::MultipleStatementsOnOneLineSemicolon,
-    rules::pycodestyle::rules::UselessSemicolon,
-    rules::pycodestyle::rules::NoneComparison,
-    rules::pycodestyle::rules::TrueFalseComparison,
-    rules::pycodestyle::rules::NotInTest,
-    rules::pycodestyle::rules::NotIsTest,
-    rules::pycodestyle::rules::TypeComparison,
-    rules::pycodestyle::rules::BareExcept,
-    rules::pycodestyle::rules::LambdaAssignment,
-    rules::pycodestyle::rules::AmbiguousVariableName,
-    rules::pycodestyle::rules::AmbiguousClassName,
-    rules::pycodestyle::rules::AmbiguousFunctionName,
-    rules::pycodestyle::rules::IOError,
-    rules::pycodestyle::rules::SyntaxError,
-    // pycodestyle warnings
-    rules::pycodestyle::rules::TabIndentation,
-    rules::pycodestyle::rules::TrailingWhitespace,
-    rules::pycodestyle::rules::MissingNewlineAtEndOfFile,
-    rules::pycodestyle::rules::BlankLineWithWhitespace,
-    rules::pycodestyle::rules::DocLineTooLong,
-    rules::pycodestyle::rules::InvalidEscapeSequence,
-    // pyflakes
-    rules::pyflakes::rules::UnusedImport,
-    rules::pyflakes::rules::ImportShadowedByLoopVar,
-    rules::pyflakes::rules::UndefinedLocalWithImportStar,
-    rules::pyflakes::rules::LateFutureImport,
-    rules::pyflakes::rules::UndefinedLocalWithImportStarUsage,
-    rules::pyflakes::rules::UndefinedLocalWithNestedImportStarUsage,
-    rules::pyflakes::rules::FutureFeatureNotDefined,
-    rules::pyflakes::rules::PercentFormatInvalidFormat,
-    rules::pyflakes::rules::PercentFormatExpectedMapping,
-    rules::pyflakes::rules::PercentFormatExpectedSequence,
-    rules::pyflakes::rules::PercentFormatExtraNamedArguments,
-    rules::pyflakes::rules::PercentFormatMissingArgument,
-    rules::pyflakes::rules::PercentFormatMixedPositionalAndNamed,
-    rules::pyflakes::rules::PercentFormatPositionalCountMismatch,
-    rules::pyflakes::rules::PercentFormatStarRequiresSequence,
-    rules::pyflakes::rules::PercentFormatUnsupportedFormatCharacter,
-    rules::pyflakes::rules::StringDotFormatInvalidFormat,
-    rules::pyflakes::rules::StringDotFormatExtraNamedArguments,
-    rules::pyflakes::rules::StringDotFormatExtraPositionalArguments,
-    rules::pyflakes::rules::StringDotFormatMissingArguments,
-    rules::pyflakes::rules::StringDotFormatMixingAutomatic,
-    rules::pyflakes::rules::FStringMissingPlaceholders,
-    rules::pyflakes::rules::MultiValueRepeatedKeyLiteral,
-    rules::pyflakes::rules::MultiValueRepeatedKeyVariable,
-    rules::pyflakes::rules::ExpressionsInStarAssignment,
-    rules::pyflakes::rules::MultipleStarredExpressions,
-    rules::pyflakes::rules::AssertTuple,
-    rules::pyflakes::rules::IsLiteral,
-    rules::pyflakes::rules::InvalidPrintSyntax,
-    rules::pyflakes::rules::IfTuple,
-    rules::pyflakes::rules::BreakOutsideLoop,
-    rules::pyflakes::rules::ContinueOutsideLoop,
-    rules::pyflakes::rules::YieldOutsideFunction,
-    rules::pyflakes::rules::ReturnOutsideFunction,
-    rules::pyflakes::rules::DefaultExceptNotLast,
-    rules::pyflakes::rules::ForwardAnnotationSyntaxError,
-    rules::pyflakes::rules::RedefinedWhileUnused,
-    rules::pyflakes::rules::UndefinedName,
-    rules::pyflakes::rules::UndefinedExport,
-    rules::pyflakes::rules::UndefinedLocal,
-    rules::pyflakes::rules::UnusedVariable,
-    rules::pyflakes::rules::UnusedAnnotation,
-    rules::pyflakes::rules::RaiseNotImplemented,
-    // pylint
-    rules::pylint::rules::AssertOnStringLiteral,
-    rules::pylint::rules::UselessReturn,
-    rules::pylint::rules::YieldInInit,
-    rules::pylint::rules::InvalidAllObject,
-    rules::pylint::rules::InvalidAllFormat,
-    rules::pylint::rules::InvalidEnvvarDefault,
-    rules::pylint::rules::InvalidEnvvarValue,
-    rules::pylint::rules::BadStringFormatType,
-    rules::pylint::rules::BidirectionalUnicode,
-    rules::pylint::rules::BinaryOpException,
-    rules::pylint::rules::ImportSelf,
-    rules::pylint::rules::InvalidCharacterBackspace,
-    rules::pylint::rules::InvalidCharacterSub,
-    rules::pylint::rules::InvalidCharacterEsc,
-    rules::pylint::rules::InvalidCharacterNul,
-    rules::pylint::rules::InvalidCharacterZeroWidthSpace,
-    rules::pylint::rules::BadStrStripCall,
-    rules::pylint::rules::CollapsibleElseIf,
-    rules::pylint::rules::ContinueInFinally,
-    rules::pylint::rules::UselessImportAlias,
-    rules::pylint::rules::UnnecessaryDirectLambdaCall,
-    rules::pylint::rules::NonlocalWithoutBinding,
-    rules::pylint::rules::LoadBeforeGlobalDeclaration,
-    rules::pylint::rules::AwaitOutsideAsync,
-    rules::pylint::rules::PropertyWithParameters,
-    rules::pylint::rules::ReturnInInit,
-    rules::pylint::rules::ManualFromImport,
-    rules::pylint::rules::CompareToEmptyString,
-    rules::pylint::rules::ComparisonOfConstant,
-    rules::pylint::rules::RepeatedIsinstanceCalls,
-    rules::pylint::rules::SysExitAlias,
-    rules::pylint::rules::MagicValueComparison,
-    rules::pylint::rules::UselessElseOnLoop,
-    rules::pylint::rules::GlobalStatement,
-    rules::pylint::rules::GlobalVariableNotAssigned,
-    rules::pylint::rules::TooManyReturnStatements,
-    rules::pylint::rules::TooManyArguments,
-    rules::pylint::rules::TooManyBranches,
-    rules::pylint::rules::TooManyStatements,
-    rules::pylint::rules::RedefinedLoopName,
-    rules::pylint::rules::LoggingTooFewArgs,
-    rules::pylint::rules::LoggingTooManyArgs,
-    rules::pylint::rules::UnexpectedSpecialMethodSignature,
-    // flake8-builtins
-    rules::flake8_builtins::rules::BuiltinVariableShadowing,
-    rules::flake8_builtins::rules::BuiltinArgumentShadowing,
-    rules::flake8_builtins::rules::BuiltinAttributeShadowing,
-    // flake8-bugbear
-    rules::flake8_bugbear::rules::UnaryPrefixIncrement,
-    rules::flake8_bugbear::rules::AssignmentToOsEnviron,
-    rules::flake8_bugbear::rules::UnreliableCallableCheck,
-    rules::flake8_bugbear::rules::StripWithMultiCharacters,
-    rules::flake8_bugbear::rules::MutableArgumentDefault,
-    rules::flake8_bugbear::rules::NoExplicitStacklevel,
-    rules::flake8_bugbear::rules::UnusedLoopControlVariable,
-    rules::flake8_bugbear::rules::FunctionCallInDefaultArgument,
-    rules::flake8_bugbear::rules::GetAttrWithConstant,
-    rules::flake8_bugbear::rules::SetAttrWithConstant,
-    rules::flake8_bugbear::rules::AssertFalse,
-    rules::flake8_bugbear::rules::JumpStatementInFinally,
-    rules::flake8_bugbear::rules::RedundantTupleInExceptionHandler,
-    rules::flake8_bugbear::rules::DuplicateHandlerException,
-    rules::flake8_bugbear::rules::UselessComparison,
-    rules::flake8_bugbear::rules::CannotRaiseLiteral,
-    rules::flake8_bugbear::rules::AssertRaisesException,
-    rules::flake8_bugbear::rules::UselessExpression,
-    rules::flake8_bugbear::rules::CachedInstanceMethod,
-    rules::flake8_bugbear::rules::LoopVariableOverridesIterator,
-    rules::flake8_bugbear::rules::FStringDocstring,
-    rules::flake8_bugbear::rules::UselessContextlibSuppress,
-    rules::flake8_bugbear::rules::FunctionUsesLoopVariable,
-    rules::flake8_bugbear::rules::AbstractBaseClassWithoutAbstractMethod,
-    rules::flake8_bugbear::rules::DuplicateTryBlockException,
-    rules::flake8_bugbear::rules::StarArgUnpackingAfterKeywordArg,
-    rules::flake8_bugbear::rules::EmptyMethodWithoutAbstractDecorator,
-    rules::flake8_bugbear::rules::RaiseWithoutFromInsideExcept,
-    rules::flake8_bugbear::rules::ZipWithoutExplicitStrict,
-    rules::flake8_bugbear::rules::ExceptWithEmptyTuple,
-    rules::flake8_bugbear::rules::ExceptWithNonExceptionClasses,
-    rules::flake8_bugbear::rules::ReuseOfGroupbyGenerator,
-    rules::flake8_bugbear::rules::UnintentionalTypeAnnotation,
-    // flake8-blind-except
-    rules::flake8_blind_except::rules::BlindExcept,
-    // flake8-comprehensions
-    rules::flake8_comprehensions::rules::UnnecessaryCallAroundSorted,
-    rules::flake8_comprehensions::rules::UnnecessaryCollectionCall,
-    rules::flake8_comprehensions::rules::UnnecessaryComprehension,
-    rules::flake8_comprehensions::rules::UnnecessaryComprehensionAnyAll,
-    rules::flake8_comprehensions::rules::UnnecessaryDoubleCastOrProcess,
-    rules::flake8_comprehensions::rules::UnnecessaryGeneratorDict,
-    rules::flake8_comprehensions::rules::UnnecessaryGeneratorList,
-    rules::flake8_comprehensions::rules::UnnecessaryGeneratorSet,
-    rules::flake8_comprehensions::rules::UnnecessaryListCall,
-    rules::flake8_comprehensions::rules::UnnecessaryListComprehensionDict,
-    rules::flake8_comprehensions::rules::UnnecessaryListComprehensionSet,
-    rules::flake8_comprehensions::rules::UnnecessaryLiteralDict,
-    rules::flake8_comprehensions::rules::UnnecessaryLiteralSet,
-    rules::flake8_comprehensions::rules::UnnecessaryLiteralWithinDictCall,
-    rules::flake8_comprehensions::rules::UnnecessaryLiteralWithinListCall,
-    rules::flake8_comprehensions::rules::UnnecessaryLiteralWithinTupleCall,
-    rules::flake8_comprehensions::rules::UnnecessaryMap,
-    rules::flake8_comprehensions::rules::UnnecessarySubscriptReversal,
-    // flake8-debugger
-    rules::flake8_debugger::rules::Debugger,
-    // mccabe
-    rules::mccabe::rules::ComplexStructure,
-    // flake8-tidy-imports
-    rules::flake8_tidy_imports::banned_api::BannedApi,
-    rules::flake8_tidy_imports::relative_imports::RelativeImports,
-    // flake8-return
-    rules::flake8_return::rules::UnnecessaryReturnNone,
-    rules::flake8_return::rules::ImplicitReturnValue,
-    rules::flake8_return::rules::ImplicitReturn,
-    rules::flake8_return::rules::UnnecessaryAssign,
-    rules::flake8_return::rules::SuperfluousElseReturn,
-    rules::flake8_return::rules::SuperfluousElseRaise,
-    rules::flake8_return::rules::SuperfluousElseContinue,
-    rules::flake8_return::rules::SuperfluousElseBreak,
-    // flake8-implicit-str-concat
-    rules::flake8_implicit_str_concat::rules::SingleLineImplicitStringConcatenation,
-    rules::flake8_implicit_str_concat::rules::MultiLineImplicitStringConcatenation,
-    rules::flake8_implicit_str_concat::rules::ExplicitStringConcatenation,
-    // flake8-print
-    rules::flake8_print::rules::Print,
-    rules::flake8_print::rules::PPrint,
-    // flake8-quotes
-    rules::flake8_quotes::rules::BadQuotesInlineString,
-    rules::flake8_quotes::rules::BadQuotesMultilineString,
-    rules::flake8_quotes::rules::BadQuotesDocstring,
-    rules::flake8_quotes::rules::AvoidableEscapedQuote,
-    // flake8-annotations
-    rules::flake8_annotations::rules::MissingTypeFunctionArgument,
-    rules::flake8_annotations::rules::MissingTypeArgs,
-    rules::flake8_annotations::rules::MissingTypeKwargs,
-    rules::flake8_annotations::rules::MissingTypeSelf,
-    rules::flake8_annotations::rules::MissingTypeCls,
-    rules::flake8_annotations::rules::MissingReturnTypeUndocumentedPublicFunction,
-    rules::flake8_annotations::rules::MissingReturnTypePrivateFunction,
-    rules::flake8_annotations::rules::MissingReturnTypeSpecialMethod,
-    rules::flake8_annotations::rules::MissingReturnTypeStaticMethod,
-    rules::flake8_annotations::rules::MissingReturnTypeClassMethod,
-    rules::flake8_annotations::rules::AnyType,
-    // flake8-2020
-    rules::flake8_2020::rules::SysVersionSlice3,
-    rules::flake8_2020::rules::SysVersion2,
-    rules::flake8_2020::rules::SysVersionCmpStr3,
-    rules::flake8_2020::rules::SysVersionInfo0Eq3,
-    rules::flake8_2020::rules::SixPY3,
-    rules::flake8_2020::rules::SysVersionInfo1CmpInt,
-    rules::flake8_2020::rules::SysVersionInfoMinorCmpInt,
-    rules::flake8_2020::rules::SysVersion0,
-    rules::flake8_2020::rules::SysVersionCmpStr10,
-    rules::flake8_2020::rules::SysVersionSlice1,
-    // flake8-simplify
-    rules::flake8_simplify::rules::IfElseBlockInsteadOfDictLookup,
-    rules::flake8_simplify::rules::DuplicateIsinstanceCall,
-    rules::flake8_simplify::rules::CollapsibleIf,
-    rules::flake8_simplify::rules::NeedlessBool,
-    rules::flake8_simplify::rules::SuppressibleException,
-    rules::flake8_simplify::rules::ReturnInTryExceptFinally,
-    rules::flake8_simplify::rules::IfElseBlockInsteadOfIfExp,
-    rules::flake8_simplify::rules::CompareWithTuple,
-    rules::flake8_simplify::rules::ReimplementedBuiltin,
-    rules::flake8_simplify::rules::UncapitalizedEnvironmentVariables,
-    rules::flake8_simplify::rules::IfWithSameArms,
-    rules::flake8_simplify::rules::OpenFileWithContextHandler,
-    rules::flake8_simplify::rules::MultipleWithStatements,
-    rules::flake8_simplify::rules::InDictKeys,
-    rules::flake8_simplify::rules::NegateEqualOp,
-    rules::flake8_simplify::rules::NegateNotEqualOp,
-    rules::flake8_simplify::rules::DoubleNegation,
-    rules::flake8_simplify::rules::IfExprWithTrueFalse,
-    rules::flake8_simplify::rules::IfExprWithFalseTrue,
-    rules::flake8_simplify::rules::IfExprWithTwistedArms,
-    rules::flake8_simplify::rules::ExprAndNotExpr,
-    rules::flake8_simplify::rules::ExprOrNotExpr,
-    rules::flake8_simplify::rules::ExprOrTrue,
-    rules::flake8_simplify::rules::ExprAndFalse,
-    rules::flake8_simplify::rules::YodaConditions,
-    rules::flake8_simplify::rules::IfElseBlockInsteadOfDictGet,
-    rules::flake8_simplify::rules::DictGetWithNoneDefault,
-    // pyupgrade
-    rules::pyupgrade::rules::UselessMetaclassType,
-    rules::pyupgrade::rules::TypeOfPrimitive,
-    rules::pyupgrade::rules::UselessObjectInheritance,
-    rules::pyupgrade::rules::DeprecatedUnittestAlias,
-    rules::pyupgrade::rules::NonPEP585Annotation,
-    rules::pyupgrade::rules::NonPEP604Annotation,
-    rules::pyupgrade::rules::SuperCallWithParameters,
-    rules::pyupgrade::rules::UTF8EncodingDeclaration,
-    rules::pyupgrade::rules::UnnecessaryFutureImport,
-    rules::pyupgrade::rules::LRUCacheWithoutParameters,
-    rules::pyupgrade::rules::UnnecessaryEncodeUTF8,
-    rules::pyupgrade::rules::ConvertTypedDictFunctionalToClass,
-    rules::pyupgrade::rules::ConvertNamedTupleFunctionalToClass,
-    rules::pyupgrade::rules::RedundantOpenModes,
-    rules::pyupgrade::rules::DatetimeTimezoneUTC,
-    rules::pyupgrade::rules::NativeLiterals,
-    rules::pyupgrade::rules::TypingTextStrAlias,
-    rules::pyupgrade::rules::OpenAlias,
-    rules::pyupgrade::rules::ReplaceUniversalNewlines,
-    rules::pyupgrade::rules::ReplaceStdoutStderr,
-    rules::pyupgrade::rules::DeprecatedCElementTree,
-    rules::pyupgrade::rules::OSErrorAlias,
-    rules::pyupgrade::rules::UnicodeKindPrefix,
-    rules::pyupgrade::rules::DeprecatedMockImport,
-    rules::pyupgrade::rules::UnpackedListComprehension,
-    rules::pyupgrade::rules::YieldInForLoop,
-    rules::pyupgrade::rules::UnnecessaryBuiltinImport,
-    rules::pyupgrade::rules::FormatLiterals,
-    rules::pyupgrade::rules::PrintfStringFormatting,
-    rules::pyupgrade::rules::FString,
-    rules::pyupgrade::rules::LRUCacheWithMaxsizeNone,
-    rules::pyupgrade::rules::ExtraneousParentheses,
-    rules::pyupgrade::rules::DeprecatedImport,
-    rules::pyupgrade::rules::OutdatedVersionBlock,
-    rules::pyupgrade::rules::QuotedAnnotation,
-    rules::pyupgrade::rules::NonPEP604Isinstance,
-    // pydocstyle
-    rules::pydocstyle::rules::UndocumentedPublicModule,
-    rules::pydocstyle::rules::UndocumentedPublicClass,
-    rules::pydocstyle::rules::UndocumentedPublicMethod,
-    rules::pydocstyle::rules::UndocumentedPublicFunction,
-    rules::pydocstyle::rules::UndocumentedPublicPackage,
-    rules::pydocstyle::rules::UndocumentedMagicMethod,
-    rules::pydocstyle::rules::UndocumentedPublicNestedClass,
-    rules::pydocstyle::rules::UndocumentedPublicInit,
-    rules::pydocstyle::rules::FitsOnOneLine,
-    rules::pydocstyle::rules::NoBlankLineBeforeFunction,
-    rules::pydocstyle::rules::NoBlankLineAfterFunction,
-    rules::pydocstyle::rules::OneBlankLineBeforeClass,
-    rules::pydocstyle::rules::OneBlankLineAfterClass,
-    rules::pydocstyle::rules::BlankLineAfterSummary,
-    rules::pydocstyle::rules::IndentWithSpaces,
-    rules::pydocstyle::rules::UnderIndentation,
-    rules::pydocstyle::rules::OverIndentation,
-    rules::pydocstyle::rules::NewLineAfterLastParagraph,
-    rules::pydocstyle::rules::SurroundingWhitespace,
-    rules::pydocstyle::rules::BlankLineBeforeClass,
-    rules::pydocstyle::rules::MultiLineSummaryFirstLine,
-    rules::pydocstyle::rules::MultiLineSummarySecondLine,
-    rules::pydocstyle::rules::SectionNotOverIndented,
-    rules::pydocstyle::rules::SectionUnderlineNotOverIndented,
-    rules::pydocstyle::rules::TripleSingleQuotes,
-    rules::pydocstyle::rules::EscapeSequenceInDocstring,
-    rules::pydocstyle::rules::EndsInPeriod,
-    rules::pydocstyle::rules::NonImperativeMood,
-    rules::pydocstyle::rules::NoSignature,
-    rules::pydocstyle::rules::FirstLineCapitalized,
-    rules::pydocstyle::rules::DocstringStartsWithThis,
-    rules::pydocstyle::rules::CapitalizeSectionName,
-    rules::pydocstyle::rules::NewLineAfterSectionName,
-    rules::pydocstyle::rules::DashedUnderlineAfterSection,
-    rules::pydocstyle::rules::SectionUnderlineAfterName,
-    rules::pydocstyle::rules::SectionUnderlineMatchesSectionLength,
-    rules::pydocstyle::rules::NoBlankLineAfterSection,
-    rules::pydocstyle::rules::NoBlankLineBeforeSection,
-    rules::pydocstyle::rules::BlankLinesBetweenHeaderAndContent,
-    rules::pydocstyle::rules::BlankLineAfterLastSection,
-    rules::pydocstyle::rules::EmptyDocstringSection,
-    rules::pydocstyle::rules::EndsInPunctuation,
-    rules::pydocstyle::rules::SectionNameEndsInColon,
-    rules::pydocstyle::rules::UndocumentedParam,
-    rules::pydocstyle::rules::OverloadWithDocstring,
-    rules::pydocstyle::rules::EmptyDocstring,
-    // pep8-naming
-    rules::pep8_naming::rules::InvalidClassName,
-    rules::pep8_naming::rules::InvalidFunctionName,
-    rules::pep8_naming::rules::InvalidArgumentName,
-    rules::pep8_naming::rules::InvalidFirstArgumentNameForClassMethod,
-    rules::pep8_naming::rules::InvalidFirstArgumentNameForMethod,
-    rules::pep8_naming::rules::NonLowercaseVariableInFunction,
-    rules::pep8_naming::rules::DunderFunctionName,
-    rules::pep8_naming::rules::ConstantImportedAsNonConstant,
-    rules::pep8_naming::rules::LowercaseImportedAsNonLowercase,
-    rules::pep8_naming::rules::CamelcaseImportedAsLowercase,
-    rules::pep8_naming::rules::CamelcaseImportedAsConstant,
-    rules::pep8_naming::rules::MixedCaseVariableInClassScope,
-    rules::pep8_naming::rules::MixedCaseVariableInGlobalScope,
-    rules::pep8_naming::rules::CamelcaseImportedAsAcronym,
-    rules::pep8_naming::rules::ErrorSuffixOnExceptionName,
-    rules::pep8_naming::rules::InvalidModuleName,
-    // isort
-    rules::isort::rules::UnsortedImports,
-    rules::isort::rules::MissingRequiredImport,
-    // eradicate
-    rules::eradicate::rules::CommentedOutCode,
-    // flake8-bandit
-    rules::flake8_bandit::rules::Assert,
-    rules::flake8_bandit::rules::BadFilePermissions,
-    rules::flake8_bandit::rules::ExecBuiltin,
-    rules::flake8_bandit::rules::HardcodedBindAllInterfaces,
-    rules::flake8_bandit::rules::HardcodedPasswordDefault,
-    rules::flake8_bandit::rules::HardcodedPasswordFuncArg,
-    rules::flake8_bandit::rules::HardcodedPasswordString,
-    rules::flake8_bandit::rules::HardcodedSQLExpression,
-    rules::flake8_bandit::rules::HardcodedTempFile,
-    rules::flake8_bandit::rules::HashlibInsecureHashFunction,
-    rules::flake8_bandit::rules::Jinja2AutoescapeFalse,
-    rules::flake8_bandit::rules::LoggingConfigInsecureListen,
-    rules::flake8_bandit::rules::RequestWithNoCertValidation,
-    rules::flake8_bandit::rules::RequestWithoutTimeout,
-    rules::flake8_bandit::rules::SnmpInsecureVersion,
-    rules::flake8_bandit::rules::SnmpWeakCryptography,
-    rules::flake8_bandit::rules::SubprocessPopenWithShellEqualsTrue,
-    rules::flake8_bandit::rules::SubprocessWithoutShellEqualsTrue,
-    rules::flake8_bandit::rules::CallWithShellEqualsTrue,
-    rules::flake8_bandit::rules::StartProcessWithAShell,
-    rules::flake8_bandit::rules::StartProcessWithNoShell,
-    rules::flake8_bandit::rules::StartProcessWithPartialPath,
-    rules::flake8_bandit::rules::SuspiciousEvalUsage,
-    rules::flake8_bandit::rules::SuspiciousFTPLibUsage,
-    rules::flake8_bandit::rules::SuspiciousInsecureCipherUsage,
-    rules::flake8_bandit::rules::SuspiciousInsecureCipherModeUsage,
-    rules::flake8_bandit::rules::SuspiciousInsecureHashUsage,
-    rules::flake8_bandit::rules::SuspiciousMarkSafeUsage,
-    rules::flake8_bandit::rules::SuspiciousMarshalUsage,
-    rules::flake8_bandit::rules::SuspiciousMktempUsage,
-    rules::flake8_bandit::rules::SuspiciousNonCryptographicRandomUsage,
-    rules::flake8_bandit::rules::SuspiciousPickleUsage,
-    rules::flake8_bandit::rules::SuspiciousTelnetUsage,
-    rules::flake8_bandit::rules::SuspiciousURLOpenUsage,
-    rules::flake8_bandit::rules::SuspiciousUnverifiedContextUsage,
-    rules::flake8_bandit::rules::SuspiciousXMLCElementTreeUsage,
-    rules::flake8_bandit::rules::SuspiciousXMLETreeUsage,
-    rules::flake8_bandit::rules::SuspiciousXMLElementTreeUsage,
-    rules::flake8_bandit::rules::SuspiciousXMLExpatBuilderUsage,
-    rules::flake8_bandit::rules::SuspiciousXMLExpatReaderUsage,
-    rules::flake8_bandit::rules::SuspiciousXMLMiniDOMUsage,
-    rules::flake8_bandit::rules::SuspiciousXMLPullDOMUsage,
-    rules::flake8_bandit::rules::SuspiciousXMLSaxUsage,
-    rules::flake8_bandit::rules::TryExceptContinue,
-    rules::flake8_bandit::rules::TryExceptPass,
-    rules::flake8_bandit::rules::UnsafeYAMLLoad,
-    // flake8-boolean-trap
-    rules::flake8_boolean_trap::rules::BooleanPositionalArgInFunctionDefinition,
-    rules::flake8_boolean_trap::rules::BooleanDefaultValueInFunctionDefinition,
-    rules::flake8_boolean_trap::rules::BooleanPositionalValueInFunctionCall,
-    // flake8-unused-arguments
-    rules::flake8_unused_arguments::rules::UnusedFunctionArgument,
-    rules::flake8_unused_arguments::rules::UnusedMethodArgument,
-    rules::flake8_unused_arguments::rules::UnusedClassMethodArgument,
-    rules::flake8_unused_arguments::rules::UnusedStaticMethodArgument,
-    rules::flake8_unused_arguments::rules::UnusedLambdaArgument,
-    // flake8-import-conventions
-    rules::flake8_import_conventions::rules::UnconventionalImportAlias,
-    rules::flake8_import_conventions::rules::BannedImportAlias,
-    rules::flake8_import_conventions::rules::BannedImportFrom,
-    // flake8-datetimez
-    rules::flake8_datetimez::rules::CallDatetimeWithoutTzinfo,
-    rules::flake8_datetimez::rules::CallDatetimeToday,
-    rules::flake8_datetimez::rules::CallDatetimeUtcnow,
-    rules::flake8_datetimez::rules::CallDatetimeUtcfromtimestamp,
-    rules::flake8_datetimez::rules::CallDatetimeNowWithoutTzinfo,
-    rules::flake8_datetimez::rules::CallDatetimeFromtimestamp,
-    rules::flake8_datetimez::rules::CallDatetimeStrptimeWithoutZone,
-    rules::flake8_datetimez::rules::CallDateToday,
-    rules::flake8_datetimez::rules::CallDateFromtimestamp,
-    // pygrep-hooks
-    rules::pygrep_hooks::rules::Eval,
-    rules::pygrep_hooks::rules::DeprecatedLogWarn,
-    rules::pygrep_hooks::rules::BlanketTypeIgnore,
-    rules::pygrep_hooks::rules::BlanketNOQA,
-    // pandas-vet
-    rules::pandas_vet::rules::PandasUseOfInplaceArgument,
-    rules::pandas_vet::rules::PandasUseOfDotIsNull,
-    rules::pandas_vet::rules::PandasUseOfDotNotNull,
-    rules::pandas_vet::rules::PandasUseOfDotIx,
-    rules::pandas_vet::rules::PandasUseOfDotAt,
-    rules::pandas_vet::rules::PandasUseOfDotIat,
-    rules::pandas_vet::rules::PandasUseOfDotPivotOrUnstack,
-    rules::pandas_vet::rules::PandasUseOfDotValues,
-    rules::pandas_vet::rules::PandasUseOfDotReadTable,
-    rules::pandas_vet::rules::PandasUseOfDotStack,
-    rules::pandas_vet::rules::PandasUseOfPdMerge,
-    rules::pandas_vet::rules::PandasDfVariableName,
-    // flake8-errmsg
-    rules::flake8_errmsg::rules::RawStringInException,
-    rules::flake8_errmsg::rules::FStringInException,
-    rules::flake8_errmsg::rules::DotFormatInException,
-    // flake8-pyi
-    rules::flake8_pyi::rules::ArgumentDefaultInStub,
-    rules::flake8_pyi::rules::AssignmentDefaultInStub,
-    rules::flake8_pyi::rules::BadVersionInfoComparison,
-    rules::flake8_pyi::rules::DocstringInStub,
-    rules::flake8_pyi::rules::NonEmptyStubBody,
-    rules::flake8_pyi::rules::PassStatementStubBody,
-    rules::flake8_pyi::rules::TypeCommentInStub,
-    rules::flake8_pyi::rules::TypedArgumentDefaultInStub,
-    rules::flake8_pyi::rules::UnprefixedTypeParam,
-    rules::flake8_pyi::rules::UnrecognizedPlatformCheck,
-    rules::flake8_pyi::rules::UnrecognizedPlatformName,
-    rules::flake8_pyi::rules::PassInClassBody,
-    rules::flake8_pyi::rules::DuplicateUnionMember,
-    rules::flake8_pyi::rules::QuotedAnnotationInStub,
-    rules::flake8_pyi::rules::SnakeCaseTypeAlias,
-    rules::flake8_pyi::rules::TSuffixedTypeAlias,
-    // flake8-pytest-style
-    rules::flake8_pytest_style::rules::PytestFixtureIncorrectParenthesesStyle,
-    rules::flake8_pytest_style::rules::PytestFixturePositionalArgs,
-    rules::flake8_pytest_style::rules::PytestExtraneousScopeFunction,
-    rules::flake8_pytest_style::rules::PytestMissingFixtureNameUnderscore,
-    rules::flake8_pytest_style::rules::PytestIncorrectFixtureNameUnderscore,
-    rules::flake8_pytest_style::rules::PytestParametrizeNamesWrongType,
-    rules::flake8_pytest_style::rules::PytestParametrizeValuesWrongType,
-    rules::flake8_pytest_style::rules::PytestPatchWithLambda,
-    rules::flake8_pytest_style::rules::PytestUnittestAssertion,
-    rules::flake8_pytest_style::rules::PytestRaisesWithoutException,
-    rules::flake8_pytest_style::rules::PytestRaisesTooBroad,
-    rules::flake8_pytest_style::rules::PytestRaisesWithMultipleStatements,
-    rules::flake8_pytest_style::rules::PytestIncorrectPytestImport,
-    rules::flake8_pytest_style::rules::PytestAssertAlwaysFalse,
-    rules::flake8_pytest_style::rules::PytestFailWithoutMessage,
-    rules::flake8_pytest_style::rules::PytestAssertInExcept,
-    rules::flake8_pytest_style::rules::PytestCompositeAssertion,
-    rules::flake8_pytest_style::rules::PytestFixtureParamWithoutValue,
-    rules::flake8_pytest_style::rules::PytestDeprecatedYieldFixture,
-    rules::flake8_pytest_style::rules::PytestFixtureFinalizerCallback,
-    rules::flake8_pytest_style::rules::PytestUselessYieldFixture,
-    rules::flake8_pytest_style::rules::PytestIncorrectMarkParenthesesStyle,
-    rules::flake8_pytest_style::rules::PytestUnnecessaryAsyncioMarkOnFixture,
-    rules::flake8_pytest_style::rules::PytestErroneousUseFixturesOnFixture,
-    rules::flake8_pytest_style::rules::PytestUseFixturesWithoutParameters,
-    // flake8-pie
-    rules::flake8_pie::rules::UnnecessaryPass,
-    rules::flake8_pie::rules::DuplicateClassFieldDefinition,
-    rules::flake8_pie::rules::NonUniqueEnums,
-    rules::flake8_pie::rules::UnnecessarySpread,
-    rules::flake8_pie::rules::UnnecessaryDictKwargs,
-    rules::flake8_pie::rules::ReimplementedListBuiltin,
-    rules::flake8_pie::rules::MultipleStartsEndsWith,
-    // flake8-commas
-    rules::flake8_commas::rules::MissingTrailingComma,
-    rules::flake8_commas::rules::TrailingCommaOnBareTuple,
-    rules::flake8_commas::rules::ProhibitedTrailingComma,
-    // flake8-no-pep420
-    rules::flake8_no_pep420::rules::ImplicitNamespacePackage,
-    // flake8-executable
-    rules::flake8_executable::rules::ShebangNotExecutable,
-    rules::flake8_executable::rules::ShebangMissingExecutableFile,
-    rules::flake8_executable::rules::ShebangMissingPython,
-    rules::flake8_executable::rules::ShebangLeadingWhitespace,
-    rules::flake8_executable::rules::ShebangNotFirstLine,
-    // flake8-type-checking
-    rules::flake8_type_checking::rules::TypingOnlyFirstPartyImport,
-    rules::flake8_type_checking::rules::TypingOnlyThirdPartyImport,
-    rules::flake8_type_checking::rules::TypingOnlyStandardLibraryImport,
-    rules::flake8_type_checking::rules::RuntimeImportInTypeCheckingBlock,
-    rules::flake8_type_checking::rules::EmptyTypeCheckingBlock,
-    // tryceratops
-    rules::tryceratops::rules::RaiseVanillaClass,
-    rules::tryceratops::rules::RaiseVanillaArgs,
-    rules::tryceratops::rules::TypeCheckWithoutTypeError,
-    rules::tryceratops::rules::ReraiseNoCause,
-    rules::tryceratops::rules::VerboseRaise,
-    rules::tryceratops::rules::TryConsiderElse,
-    rules::tryceratops::rules::RaiseWithinTry,
-    rules::tryceratops::rules::ErrorInsteadOfException,
-    rules::tryceratops::rules::VerboseLogMessage,
-    // flake8-use-pathlib
-    rules::flake8_use_pathlib::violations::OsPathAbspath,
-    rules::flake8_use_pathlib::violations::OsChmod,
-    rules::flake8_use_pathlib::violations::OsMkdir,
-    rules::flake8_use_pathlib::violations::OsMakedirs,
-    rules::flake8_use_pathlib::violations::OsRename,
-    rules::flake8_use_pathlib::violations::PathlibReplace,
-    rules::flake8_use_pathlib::violations::OsRmdir,
-    rules::flake8_use_pathlib::violations::OsRemove,
-    rules::flake8_use_pathlib::violations::OsUnlink,
-    rules::flake8_use_pathlib::violations::OsGetcwd,
-    rules::flake8_use_pathlib::violations::OsPathExists,
-    rules::flake8_use_pathlib::violations::OsPathExpanduser,
-    rules::flake8_use_pathlib::violations::OsPathIsdir,
-    rules::flake8_use_pathlib::violations::OsPathIsfile,
-    rules::flake8_use_pathlib::violations::OsPathIslink,
-    rules::flake8_use_pathlib::violations::OsReadlink,
-    rules::flake8_use_pathlib::violations::OsStat,
-    rules::flake8_use_pathlib::violations::OsPathIsabs,
-    rules::flake8_use_pathlib::violations::OsPathJoin,
-    rules::flake8_use_pathlib::violations::OsPathBasename,
-    rules::flake8_use_pathlib::violations::OsPathDirname,
-    rules::flake8_use_pathlib::violations::OsPathSamefile,
-    rules::flake8_use_pathlib::violations::OsPathSplitext,
-    rules::flake8_use_pathlib::violations::BuiltinOpen,
-    rules::flake8_use_pathlib::violations::PyPath,
-    // flake8-logging-format
-    rules::flake8_logging_format::violations::LoggingStringFormat,
-    rules::flake8_logging_format::violations::LoggingPercentFormat,
-    rules::flake8_logging_format::violations::LoggingStringConcat,
-    rules::flake8_logging_format::violations::LoggingFString,
-    rules::flake8_logging_format::violations::LoggingWarn,
-    rules::flake8_logging_format::violations::LoggingExtraAttrClash,
-    rules::flake8_logging_format::violations::LoggingExcInfo,
-    rules::flake8_logging_format::violations::LoggingRedundantExcInfo,
-    // flake8-raise
-    rules::flake8_raise::rules::UnnecessaryParenOnRaiseException,
-    // flake8-self
-    rules::flake8_self::rules::PrivateMemberAccess,
-    // flake8-gettext
-    rules::flake8_gettext::rules::FStringInGetTextFuncCall,
-    rules::flake8_gettext::rules::FormatInGetTextFuncCall,
-    rules::flake8_gettext::rules::PrintfInGetTextFuncCall,
-    // numpy
-    rules::numpy::rules::NumpyDeprecatedTypeAlias,
-    rules::numpy::rules::NumpyLegacyRandom,
-    // ruff
-    rules::ruff::rules::AmbiguousUnicodeCharacterString,
-    rules::ruff::rules::AmbiguousUnicodeCharacterDocstring,
-    rules::ruff::rules::AmbiguousUnicodeCharacterComment,
-    rules::ruff::rules::CollectionLiteralConcatenation,
-    rules::ruff::rules::AsyncioDanglingTask,
-    rules::ruff::rules::UnusedNOQA,
-    rules::ruff::rules::PairwiseOverZipped,
-    rules::ruff::rules::MutableDataclassDefault,
-    rules::ruff::rules::FunctionCallInDataclassDefaultArgument,
-    // flake8-django
-    rules::flake8_django::rules::DjangoNullableModelStringField,
-    rules::flake8_django::rules::DjangoLocalsInRenderFunction,
-    rules::flake8_django::rules::DjangoExcludeWithModelForm,
-    rules::flake8_django::rules::DjangoAllWithModelForm,
-    rules::flake8_django::rules::DjangoModelWithoutDunderStr,
-    rules::flake8_django::rules::DjangoUnorderedBodyContentInModel,
-    rules::flake8_django::rules::DjangoNonLeadingReceiverDecorator,
-);
+mod rule_set;
 
 pub trait AsRule {
     fn rule(&self) -> Rule;
@@ -719,6 +59,9 @@ pub enum Linter {
     /// [flake8-annotations](https://pypi.org/project/flake8-annotations/)
     #[prefix = "ANN"]
     Flake8Annotations,
+    /// [flake8-async](https://pypi.org/project/flake8-async/)
+    #[prefix = "ASYNC"]
+    Flake8Async,
     /// [flake8-bandit](https://pypi.org/project/flake8-bandit/)
     #[prefix = "S"]
     Flake8Bandit,
@@ -755,6 +98,9 @@ pub enum Linter {
     /// [flake8-executable](https://pypi.org/project/flake8-executable/)
     #[prefix = "EXE"]
     Flake8Executable,
+    /// [flake8-future-annotations](https://pypi.org/project/flake8-future-annotations/)
+    #[prefix = "FA"]
+    Flake8FutureAnnotations,
     /// [flake8-implicit-str-concat](https://pypi.org/project/flake8-implicit-str-concat/)
     #[prefix = "ISC"]
     Flake8ImplicitStrConcat,
@@ -809,6 +155,12 @@ pub enum Linter {
     /// [flake8-use-pathlib](https://pypi.org/project/flake8-use-pathlib/)
     #[prefix = "PTH"]
     Flake8UsePathlib,
+    /// [flake8-todos](https://github.com/orsinium-labs/flake8-todos/)
+    #[prefix = "TD"]
+    Flake8Todos,
+    /// [flake8-fixme](https://github.com/tommilligan/flake8-fixme)
+    #[prefix = "FIX"]
+    Flake8Fixme,
     /// [eradicate](https://pypi.org/project/eradicate/)
     #[prefix = "ERA"]
     Eradicate,
@@ -824,9 +176,15 @@ pub enum Linter {
     /// [tryceratops](https://pypi.org/project/tryceratops/1.1.0/)
     #[prefix = "TRY"]
     Tryceratops,
+    /// [flynt](https://pypi.org/project/flynt/)
+    #[prefix = "FLY"]
+    Flynt,
     /// NumPy-specific rules
     #[prefix = "NPY"]
     Numpy,
+    /// [Airflow](https://pypi.org/project/apache-airflow/)
+    #[prefix = "AIR"]
+    Airflow,
     /// Ruff-specific rules
     #[prefix = "RUF"]
     Ruff,
@@ -930,11 +288,21 @@ impl Rule {
             | Rule::UselessSemicolon
             | Rule::MultipleStatementsOnOneLineSemicolon
             | Rule::ProhibitedTrailingComma
-            | Rule::TypeCommentInStub => LintSource::Tokens,
+            | Rule::TypeCommentInStub
+            | Rule::InvalidTodoTag
+            | Rule::MissingTodoAuthor
+            | Rule::MissingTodoLink
+            | Rule::MissingTodoColon
+            | Rule::MissingTodoDescription
+            | Rule::InvalidTodoCapitalization
+            | Rule::MissingSpaceAfterTodoColon
+            | Rule::LineContainsFixme
+            | Rule::LineContainsHack
+            | Rule::LineContainsTodo
+            | Rule::LineContainsXxx => LintSource::Tokens,
             Rule::IOError => LintSource::Io,
             Rule::UnsortedImports | Rule::MissingRequiredImport => LintSource::Imports,
             Rule::ImplicitNamespacePackage | Rule::InvalidModuleName => LintSource::Filesystem,
-            #[cfg(feature = "logical_lines")]
             Rule::IndentationWithInvalidMultiple
             | Rule::IndentationWithInvalidMultipleComment
             | Rule::MissingWhitespace
@@ -990,6 +358,7 @@ pub const INCOMPATIBLE_CODES: &[(Rule, Rule, &str); 2] = &[
 #[cfg(test)]
 mod tests {
     use std::mem::size_of;
+
     use strum::IntoEnumIterator;
 
     use super::{Linter, Rule, RuleNamespace};
diff --git a/crates/ruff/src/registry/rule_set.rs b/crates/ruff/src/registry/rule_set.rs
index 4cb6df76b423a..7fdbf8b19d970 100644
--- a/crates/ruff/src/registry/rule_set.rs
+++ b/crates/ruff/src/registry/rule_set.rs
@@ -3,14 +3,16 @@ use ruff_macros::CacheKey;
 use std::fmt::{Debug, Formatter};
 use std::iter::FusedIterator;
 
+const RULESET_SIZE: usize = 10;
+
 /// A set of [`Rule`]s.
 ///
 /// Uses a bitset where a bit of one signals that the Rule with that [u16] is in this set.
 #[derive(Clone, Default, CacheKey, PartialEq, Eq)]
-pub struct RuleSet([u64; 10]);
+pub struct RuleSet([u64; RULESET_SIZE]);
 
 impl RuleSet {
-    const EMPTY: [u64; 10] = [0; 10];
+    const EMPTY: [u64; RULESET_SIZE] = [0; RULESET_SIZE];
 
     // 64 fits into a u16 without truncation
     #[allow(clippy::cast_possible_truncation)]
@@ -252,7 +254,7 @@ impl RuleSet {
     ///
     /// let iter: Vec<_> = set.iter().collect();
     ///
-    /// assert_eq!(iter, vec![Rule::AmbiguousFunctionName, Rule::AnyType]);
+    /// assert_eq!(iter, vec![Rule::AnyType, Rule::AmbiguousFunctionName]);
     /// ```
     pub fn iter(&self) -> RuleSetIterator {
         RuleSetIterator {
diff --git a/crates/ruff/src/rule_redirects.rs b/crates/ruff/src/rule_redirects.rs
index 4749b64ccacb4..a9fd305027db2 100644
--- a/crates/ruff/src/rule_redirects.rs
+++ b/crates/ruff/src/rule_redirects.rs
@@ -93,5 +93,10 @@ static REDIRECTS: Lazy<HashMap<&'static str, &'static str>> = Lazy::new(|| {
         // TODO(charlie): Remove by 2023-06-01.
         ("RUF004", "B026"),
         ("PIE802", "C419"),
+        ("PLW0130", "B033"),
+        ("T001", "FIX001"),
+        ("T002", "FIX002"),
+        ("T003", "FIX003"),
+        ("T004", "FIX004"),
     ])
 });
diff --git a/crates/ruff/src/rule_selector.rs b/crates/ruff/src/rule_selector.rs
index b3ce3df5bebae..6985c1be3cf40 100644
--- a/crates/ruff/src/rule_selector.rs
+++ b/crates/ruff/src/rule_selector.rs
@@ -1,22 +1,21 @@
 use std::str::FromStr;
 
-use itertools::Itertools;
-use schemars::_serde_json::Value;
-use schemars::schema::{InstanceType, Schema, SchemaObject};
-use schemars::JsonSchema;
 use serde::de::{self, Visitor};
 use serde::{Deserialize, Serialize};
 use strum::IntoEnumIterator;
 use strum_macros::EnumIter;
 
 use crate::codes::RuleCodePrefix;
-use crate::registry::{Linter, Rule, RuleIter, RuleNamespace};
+use crate::codes::RuleIter;
+use crate::registry::{Linter, Rule, RuleNamespace};
 use crate::rule_redirects::get_redirect;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum RuleSelector {
-    /// Select all rules.
+    /// Select all stable rules.
     All,
+    /// Select all nursery rules.
+    Nursery,
     /// Legacy category to select both the `mccabe` and `flake8-comprehensions` linters
     /// via a single selector.
     C,
@@ -42,30 +41,30 @@ impl FromStr for RuleSelector {
     type Err = ParseError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        if s == "ALL" {
-            Ok(Self::All)
-        } else if s == "C" {
-            Ok(Self::C)
-        } else if s == "T" {
-            Ok(Self::T)
-        } else {
-            let (s, redirected_from) = match get_redirect(s) {
-                Some((from, target)) => (target, Some(from)),
-                None => (s, None),
-            };
-
-            let (linter, code) =
-                Linter::parse_code(s).ok_or_else(|| ParseError::Unknown(s.to_string()))?;
-
-            if code.is_empty() {
-                return Ok(Self::Linter(linter));
-            }
+        match s {
+            "ALL" => Ok(Self::All),
+            "NURSERY" => Ok(Self::Nursery),
+            "C" => Ok(Self::C),
+            "T" => Ok(Self::T),
+            _ => {
+                let (s, redirected_from) = match get_redirect(s) {
+                    Some((from, target)) => (target, Some(from)),
+                    None => (s, None),
+                };
+
+                let (linter, code) =
+                    Linter::parse_code(s).ok_or_else(|| ParseError::Unknown(s.to_string()))?;
+
+                if code.is_empty() {
+                    return Ok(Self::Linter(linter));
+                }
 
-            Ok(Self::Prefix {
-                prefix: RuleCodePrefix::parse(&linter, code)
-                    .map_err(|_| ParseError::Unknown(s.to_string()))?,
-                redirected_from,
-            })
+                Ok(Self::Prefix {
+                    prefix: RuleCodePrefix::parse(&linter, code)
+                        .map_err(|_| ParseError::Unknown(s.to_string()))?,
+                    redirected_from,
+                })
+            }
         }
     }
 }
@@ -82,6 +81,7 @@ impl RuleSelector {
     pub fn prefix_and_code(&self) -> (&'static str, &'static str) {
         match self {
             RuleSelector::All => ("", "ALL"),
+            RuleSelector::Nursery => ("", "NURSERY"),
             RuleSelector::C => ("", "C"),
             RuleSelector::T => ("", "T"),
             RuleSelector::Prefix { prefix, .. } => {
@@ -123,8 +123,7 @@ impl Visitor<'_> for SelectorVisitor {
 
     fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
         formatter.write_str(
-            "expected a string code identifying a linter or specific rule, or a partial rule code \
-             or ALL to refer to all rules",
+            "expected a string code identifying a linter or specific rule, or a partial rule code or ALL to refer to all rules",
         )
     }
 
@@ -146,12 +145,17 @@ impl From<RuleCodePrefix> for RuleSelector {
 }
 
 impl IntoIterator for &RuleSelector {
-    type IntoIter = RuleSelectorIter;
     type Item = Rule;
+    type IntoIter = RuleSelectorIter;
 
     fn into_iter(self) -> Self::IntoIter {
         match self {
-            RuleSelector::All => RuleSelectorIter::All(Rule::iter()),
+            RuleSelector::All => {
+                RuleSelectorIter::All(Rule::iter().filter(|rule| !rule.is_nursery()))
+            }
+            RuleSelector::Nursery => {
+                RuleSelectorIter::Nursery(Rule::iter().filter(Rule::is_nursery))
+            }
             RuleSelector::C => RuleSelectorIter::Chain(
                 Linter::Flake8Comprehensions
                     .into_iter()
@@ -169,7 +173,8 @@ impl IntoIterator for &RuleSelector {
 }
 
 pub enum RuleSelectorIter {
-    All(RuleIter),
+    All(std::iter::Filter<RuleIter, fn(&Rule) -> bool>),
+    Nursery(std::iter::Filter<RuleIter, fn(&Rule) -> bool>),
     Chain(std::iter::Chain<std::vec::IntoIter<Rule>, std::vec::IntoIter<Rule>>),
     Vec(std::vec::IntoIter<Rule>),
 }
@@ -180,6 +185,7 @@ impl Iterator for RuleSelectorIter {
     fn next(&mut self) -> Option<Self::Item> {
         match self {
             RuleSelectorIter::All(iter) => iter.next(),
+            RuleSelectorIter::Nursery(iter) => iter.next(),
             RuleSelectorIter::Chain(iter) => iter.next(),
             RuleSelectorIter::Vec(iter) => iter.next(),
         }
@@ -198,59 +204,58 @@ pub(crate) const fn prefix_to_selector(prefix: RuleCodePrefix) -> RuleSelector {
     }
 }
 
-impl JsonSchema for RuleSelector {
-    fn schema_name() -> String {
-        "RuleSelector".to_string()
-    }
+#[cfg(feature = "schemars")]
+mod schema {
+    use itertools::Itertools;
+    use schemars::JsonSchema;
+    use schemars::_serde_json::Value;
+    use schemars::schema::{InstanceType, Schema, SchemaObject};
+    use strum::IntoEnumIterator;
 
-    fn json_schema(_gen: &mut schemars::gen::SchemaGenerator) -> Schema {
-        Schema::Object(SchemaObject {
-            instance_type: Some(InstanceType::String.into()),
-            enum_values: Some(
-                [
-                    // Include the non-standard "ALL" selector.
-                    "ALL".to_string(),
-                    // Include the legacy "C" and "T" selectors.
-                    "C".to_string(),
-                    "T".to_string(),
-                    // Include some common redirect targets for those legacy selectors.
-                    "C9".to_string(),
-                    "T1".to_string(),
-                    "T2".to_string(),
-                ]
-                .into_iter()
-                .chain(
-                    RuleCodePrefix::iter()
-                        .filter(|p| {
-                            // Once logical lines are active by default, please remove this.
-                            // This is here because generate-all output otherwise depends on
-                            // the feature sets which makes the test running with
-                            // `--all-features` fail
-                            !Rule::from_code(&format!(
-                                "{}{}",
-                                p.linter().common_prefix(),
-                                p.short_code()
-                            ))
-                            .unwrap()
-                            .lint_source()
-                            .is_logical_lines()
-                        })
-                        .map(|p| {
-                            let prefix = p.linter().common_prefix();
-                            let code = p.short_code();
-                            format!("{prefix}{code}")
-                        })
-                        .chain(Linter::iter().filter_map(|l| {
-                            let prefix = l.common_prefix();
-                            (!prefix.is_empty()).then(|| prefix.to_string())
-                        })),
-                )
-                .sorted()
-                .map(Value::String)
-                .collect(),
-            ),
-            ..SchemaObject::default()
-        })
+    use crate::registry::RuleNamespace;
+    use crate::rule_selector::{Linter, RuleCodePrefix};
+    use crate::RuleSelector;
+
+    impl JsonSchema for RuleSelector {
+        fn schema_name() -> String {
+            "RuleSelector".to_string()
+        }
+
+        fn json_schema(_gen: &mut schemars::gen::SchemaGenerator) -> Schema {
+            Schema::Object(SchemaObject {
+                instance_type: Some(InstanceType::String.into()),
+                enum_values: Some(
+                    [
+                        // Include the non-standard "ALL" selector.
+                        "ALL".to_string(),
+                        // Include the legacy "C" and "T" selectors.
+                        "C".to_string(),
+                        "T".to_string(),
+                        // Include some common redirect targets for those legacy selectors.
+                        "C9".to_string(),
+                        "T1".to_string(),
+                        "T2".to_string(),
+                    ]
+                    .into_iter()
+                    .chain(
+                        RuleCodePrefix::iter()
+                            .map(|p| {
+                                let prefix = p.linter().common_prefix();
+                                let code = p.short_code();
+                                format!("{prefix}{code}")
+                            })
+                            .chain(Linter::iter().filter_map(|l| {
+                                let prefix = l.common_prefix();
+                                (!prefix.is_empty()).then(|| prefix.to_string())
+                            })),
+                    )
+                    .sorted()
+                    .map(Value::String)
+                    .collect(),
+                ),
+                ..SchemaObject::default()
+            })
+        }
     }
 }
 
@@ -258,6 +263,7 @@ impl RuleSelector {
     pub(crate) fn specificity(&self) -> Specificity {
         match self {
             RuleSelector::All => Specificity::All,
+            RuleSelector::Nursery => Specificity::All,
             RuleSelector::T => Specificity::LinterGroup,
             RuleSelector::C => Specificity::LinterGroup,
             RuleSelector::Linter(..) => Specificity::Linter,
diff --git a/crates/ruff/src/rules/airflow/mod.rs b/crates/ruff/src/rules/airflow/mod.rs
new file mode 100644
index 0000000000000..12871a42aabc6
--- /dev/null
+++ b/crates/ruff/src/rules/airflow/mod.rs
@@ -0,0 +1,25 @@
+//! Airflow-specific rules.
+pub(crate) mod rules;
+
+#[cfg(test)]
+mod tests {
+    use std::path::Path;
+
+    use anyhow::Result;
+    use test_case::test_case;
+
+    use crate::registry::Rule;
+    use crate::test::test_path;
+    use crate::{assert_messages, settings};
+
+    #[test_case(Rule::AirflowVariableNameTaskIdMismatch, Path::new("AIR001.py"))]
+    fn rules(rule_code: Rule, path: &Path) -> Result<()> {
+        let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
+        let diagnostics = test_path(
+            Path::new("airflow").join(path).as_path(),
+            &settings::Settings::for_rule(rule_code),
+        )?;
+        assert_messages!(snapshot, diagnostics);
+        Ok(())
+    }
+}
diff --git a/crates/ruff/src/rules/airflow/rules/mod.rs b/crates/ruff/src/rules/airflow/rules/mod.rs
new file mode 100644
index 0000000000000..0dbd1cf914ea6
--- /dev/null
+++ b/crates/ruff/src/rules/airflow/rules/mod.rs
@@ -0,0 +1,3 @@
+mod task_variable_name;
+
+pub(crate) use task_variable_name::{variable_name_task_id, AirflowVariableNameTaskIdMismatch};
diff --git a/crates/ruff/src/rules/airflow/rules/task_variable_name.rs b/crates/ruff/src/rules/airflow/rules/task_variable_name.rs
new file mode 100644
index 0000000000000..eae2490138f39
--- /dev/null
+++ b/crates/ruff/src/rules/airflow/rules/task_variable_name.rs
@@ -0,0 +1,102 @@
+use rustpython_parser::ast;
+use rustpython_parser::ast::{Expr, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::prelude::Constant;
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks that the task variable name matches the `task_id` value for
+/// Airflow Operators.
+///
+/// ## Why is this bad?
+/// When initializing an Airflow Operator, for consistency, the variable
+/// name should match the `task_id` value. This makes it easier to
+/// follow the flow of the DAG.
+///
+/// ## Example
+/// ```python
+/// from airflow.operators import PythonOperator
+///
+///
+/// incorrect_name = PythonOperator(task_id="my_task")
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from airflow.operators import PythonOperator
+///
+///
+/// my_task = PythonOperator(task_id="my_task")
+/// ```
+#[violation]
+pub struct AirflowVariableNameTaskIdMismatch {
+    task_id: String,
+}
+
+impl Violation for AirflowVariableNameTaskIdMismatch {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let AirflowVariableNameTaskIdMismatch { task_id } = self;
+        format!("Task variable name should match the `task_id`: \"{task_id}\"")
+    }
+}
+
+/// AIR001
+pub(crate) fn variable_name_task_id(
+    checker: &mut Checker,
+    targets: &[Expr],
+    value: &Expr,
+) -> Option<Diagnostic> {
+    // If we have more than one target, we can't do anything.
+    if targets.len() != 1 {
+        return None;
+    }
+
+    let target = &targets[0];
+    let Expr::Name(ast::ExprName { id, .. }) = target else {
+        return None;
+    };
+
+    // If the value is not a call, we can't do anything.
+    let Expr::Call(ast::ExprCall { func, keywords, .. }) = value else {
+        return None;
+    };
+
+    // If the function doesn't come from Airflow, we can't do anything.
+    if !checker
+        .semantic_model()
+        .resolve_call_path(func)
+        .map_or(false, |call_path| matches!(call_path[0], "airflow"))
+    {
+        return None;
+    }
+
+    // If the call doesn't have a `task_id` keyword argument, we can't do anything.
+    let keyword = keywords
+        .iter()
+        .find(|keyword| keyword.arg.as_ref().map_or(false, |arg| arg == "task_id"))?;
+
+    // If the keyword argument is not a string, we can't do anything.
+    let task_id = match &keyword.value {
+        Expr::Constant(constant) => match &constant.value {
+            Constant::Str(value) => value,
+            _ => return None,
+        },
+        _ => return None,
+    };
+
+    // If the target name is the same as the task_id, no violation.
+    if id == task_id {
+        return None;
+    }
+
+    Some(Diagnostic::new(
+        AirflowVariableNameTaskIdMismatch {
+            task_id: task_id.to_string(),
+        },
+        target.range(),
+    ))
+}
diff --git a/crates/ruff/src/rules/airflow/snapshots/ruff__rules__airflow__tests__AIR001_AIR001.py.snap b/crates/ruff/src/rules/airflow/snapshots/ruff__rules__airflow__tests__AIR001_AIR001.py.snap
new file mode 100644
index 0000000000000..be7e9d7af654a
--- /dev/null
+++ b/crates/ruff/src/rules/airflow/snapshots/ruff__rules__airflow__tests__AIR001_AIR001.py.snap
@@ -0,0 +1,22 @@
+---
+source: crates/ruff/src/rules/airflow/mod.rs
+---
+AIR001.py:11:1: AIR001 Task variable name should match the `task_id`: "my_task"
+   |
+11 | my_task_2 = PythonOperator(callable=my_callable, task_id="my_task_2")
+12 | 
+13 | incorrect_name = PythonOperator(task_id="my_task")
+   | ^^^^^^^^^^^^^^ AIR001
+14 | incorrect_name_2 = PythonOperator(callable=my_callable, task_id="my_task_2")
+   |
+
+AIR001.py:12:1: AIR001 Task variable name should match the `task_id`: "my_task_2"
+   |
+12 | incorrect_name = PythonOperator(task_id="my_task")
+13 | incorrect_name_2 = PythonOperator(callable=my_callable, task_id="my_task_2")
+   | ^^^^^^^^^^^^^^^^ AIR001
+14 | 
+15 | from my_module import MyClass
+   |
+
+
diff --git a/crates/ruff/src/rules/eradicate/detection.rs b/crates/ruff/src/rules/eradicate/detection.rs
index 2cff42cd6466e..4f3a77f15a924 100644
--- a/crates/ruff/src/rules/eradicate/detection.rs
+++ b/crates/ruff/src/rules/eradicate/detection.rs
@@ -1,11 +1,12 @@
 /// See: [eradicate.py](https://github.com/myint/eradicate/blob/98f199940979c94447a461d50d27862b118b282d/eradicate.py)
 use once_cell::sync::Lazy;
 use regex::Regex;
-use rustpython_parser as parser;
+use rustpython_parser::ast::Suite;
+use rustpython_parser::Parse;
 
 static ALLOWLIST_REGEX: Lazy<Regex> = Lazy::new(|| {
     Regex::new(
-        r"^(?i)(?:pylint|pyright|noqa|nosec|type:\s*ignore|fmt:\s*(on|off)|isort:\s*(on|off|skip|skip_file|split|dont-add-imports(:\s*\[.*?])?)|mypy:|SPDX-License-Identifier:)"
+        r"^(?i)(?:pylint|pyright|noqa|nosec|region|endregion|type:\s*ignore|fmt:\s*(on|off)|isort:\s*(on|off|skip|skip_file|split|dont-add-imports(:\s*\[.*?])?)|mypy:|SPDX-License-Identifier:)"
     ).unwrap()
 });
 static BRACKET_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"^[()\[\]{}\s]+$").unwrap());
@@ -31,7 +32,7 @@ static PARTIAL_DICTIONARY_REGEX: Lazy<Regex> =
 static PRINT_RETURN_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"^(print|return)\b\s*").unwrap());
 
 /// Returns `true` if a comment contains Python code.
-pub fn comment_contains_code(line: &str, task_tags: &[String]) -> bool {
+pub(crate) fn comment_contains_code(line: &str, task_tags: &[String]) -> bool {
     let line = if let Some(line) = line.trim().strip_prefix('#') {
         line.trim_start_matches([' ', '#'])
     } else {
@@ -78,7 +79,7 @@ pub fn comment_contains_code(line: &str, task_tags: &[String]) -> bool {
     }
 
     // Finally, compile the source code.
-    parser::parse_program(&line, "<filename>").is_ok()
+    Suite::parse(&line, "<filename>").is_ok()
 }
 
 /// Returns `true` if a line is probably part of some multiline code.
@@ -224,6 +225,11 @@ mod tests {
         assert!(!comment_contains_code("# noqa: A123", &[]));
         assert!(!comment_contains_code("# noqa:A123", &[]));
         assert!(!comment_contains_code("# nosec", &[]));
+        assert!(!comment_contains_code("# region", &[]));
+        assert!(!comment_contains_code("# endregion", &[]));
+        assert!(!comment_contains_code("# region.name", &[]));
+        assert!(!comment_contains_code("# region name", &[]));
+        assert!(!comment_contains_code("# region: name", &[]));
         assert!(!comment_contains_code("# fmt: on", &[]));
         assert!(!comment_contains_code("# fmt: off", &[]));
         assert!(!comment_contains_code("# fmt:on", &[]));
diff --git a/crates/ruff/src/rules/eradicate/mod.rs b/crates/ruff/src/rules/eradicate/mod.rs
index b355e2bda32ce..a363458154a5e 100644
--- a/crates/ruff/src/rules/eradicate/mod.rs
+++ b/crates/ruff/src/rules/eradicate/mod.rs
@@ -7,14 +7,13 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::CommentedOutCode, Path::new("ERA001.py"); "ERA001")]
+    #[test_case(Rule::CommentedOutCode, Path::new("ERA001.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/eradicate/rules.rs b/crates/ruff/src/rules/eradicate/rules/commented_out_code.rs
similarity index 52%
rename from crates/ruff/src/rules/eradicate/rules.rs
rename to crates/ruff/src/rules/eradicate/rules/commented_out_code.rs
index 2a67f4ec9ea5e..3d1a5d22901f3 100644
--- a/crates/ruff/src/rules/eradicate/rules.rs
+++ b/crates/ruff/src/rules/eradicate/rules/commented_out_code.rs
@@ -1,13 +1,11 @@
-use ruff_text_size::TextRange;
-
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::source_code::Locator;
+use ruff_python_ast::source_code::{Indexer, Locator};
 
 use crate::registry::Rule;
-use crate::settings::{flags, Settings};
+use crate::settings::Settings;
 
-use super::detection::comment_contains_code;
+use super::super::detection::comment_contains_code;
 
 /// ## What it does
 /// Checks for commented-out Python code.
@@ -16,6 +14,9 @@ use super::detection::comment_contains_code;
 /// Commented-out code is dead code, and is often included inadvertently.
 /// It should be removed.
 ///
+/// ## Options
+/// - `task-tags`
+///
 /// ## Example
 /// ```python
 /// # print('foo')
@@ -46,22 +47,29 @@ fn is_standalone_comment(line: &str) -> bool {
 }
 
 /// ERA001
-pub fn commented_out_code(
+pub(crate) fn commented_out_code(
+    indexer: &Indexer,
     locator: &Locator,
-    range: TextRange,
     settings: &Settings,
-    autofix: flags::Autofix,
-) -> Option<Diagnostic> {
-    let line = locator.full_lines(range);
+) -> Vec<Diagnostic> {
+    let mut diagnostics = vec![];
+
+    for range in indexer.comment_ranges() {
+        let line = locator.full_lines(*range);
 
-    // Verify that the comment is on its own line, and that it contains code.
-    if is_standalone_comment(line) && comment_contains_code(line, &settings.task_tags[..]) {
-        let mut diagnostic = Diagnostic::new(CommentedOutCode, range);
-        if autofix.into() && settings.rules.should_fix(Rule::CommentedOutCode) {
-            diagnostic.set_fix(Edit::range_deletion(locator.full_lines_range(range)));
+        // Verify that the comment is on its own line, and that it contains code.
+        if is_standalone_comment(line) && comment_contains_code(line, &settings.task_tags[..]) {
+            let mut diagnostic = Diagnostic::new(CommentedOutCode, *range);
+
+            if settings.rules.should_fix(Rule::CommentedOutCode) {
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_deletion(
+                    locator.full_lines_range(*range),
+                )));
+            }
+            diagnostics.push(diagnostic);
         }
-        Some(diagnostic)
-    } else {
-        None
     }
+
+    diagnostics
 }
diff --git a/crates/ruff/src/rules/eradicate/rules/mod.rs b/crates/ruff/src/rules/eradicate/rules/mod.rs
new file mode 100644
index 0000000000000..8ec37813d9f35
--- /dev/null
+++ b/crates/ruff/src/rules/eradicate/rules/mod.rs
@@ -0,0 +1,3 @@
+pub(crate) use commented_out_code::{commented_out_code, CommentedOutCode};
+
+mod commented_out_code;
diff --git a/crates/ruff/src/rules/flake8_2020/helpers.rs b/crates/ruff/src/rules/flake8_2020/helpers.rs
new file mode 100644
index 0000000000000..e5bb8fd4b60c5
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_2020/helpers.rs
@@ -0,0 +1,8 @@
+use ruff_python_semantic::model::SemanticModel;
+use rustpython_parser::ast::Expr;
+
+pub(super) fn is_sys(model: &SemanticModel, expr: &Expr, target: &str) -> bool {
+    model
+        .resolve_call_path(expr)
+        .map_or(false, |call_path| call_path.as_slice() == ["sys", target])
+}
diff --git a/crates/ruff/src/rules/flake8_2020/mod.rs b/crates/ruff/src/rules/flake8_2020/mod.rs
index b34b124e70938..ac20ee0b38816 100644
--- a/crates/ruff/src/rules/flake8_2020/mod.rs
+++ b/crates/ruff/src/rules/flake8_2020/mod.rs
@@ -1,4 +1,5 @@
 //! Rules from [flake8-2020](https://pypi.org/project/flake8-2020/).
+mod helpers;
 pub(crate) mod rules;
 
 #[cfg(test)]
@@ -6,23 +7,22 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::SysVersionSlice3, Path::new("YTT101.py"); "YTT101")]
-    #[test_case(Rule::SysVersion2, Path::new("YTT102.py"); "YTT102")]
-    #[test_case(Rule::SysVersionCmpStr3, Path::new("YTT103.py"); "YTT103")]
-    #[test_case(Rule::SysVersionInfo0Eq3, Path::new("YTT201.py"); "YTT201")]
-    #[test_case(Rule::SixPY3, Path::new("YTT202.py"); "YTT202")]
-    #[test_case(Rule::SysVersionInfo1CmpInt, Path::new("YTT203.py"); "YTT203")]
-    #[test_case(Rule::SysVersionInfoMinorCmpInt, Path::new("YTT204.py"); "YTT204")]
-    #[test_case(Rule::SysVersion0, Path::new("YTT301.py"); "YTT301")]
-    #[test_case(Rule::SysVersionCmpStr10, Path::new("YTT302.py"); "YTT302")]
-    #[test_case(Rule::SysVersionSlice1, Path::new("YTT303.py"); "YTT303")]
+    #[test_case(Rule::SysVersionSlice3, Path::new("YTT101.py"))]
+    #[test_case(Rule::SysVersion2, Path::new("YTT102.py"))]
+    #[test_case(Rule::SysVersionCmpStr3, Path::new("YTT103.py"))]
+    #[test_case(Rule::SysVersionInfo0Eq3, Path::new("YTT201.py"))]
+    #[test_case(Rule::SixPY3, Path::new("YTT202.py"))]
+    #[test_case(Rule::SysVersionInfo1CmpInt, Path::new("YTT203.py"))]
+    #[test_case(Rule::SysVersionInfoMinorCmpInt, Path::new("YTT204.py"))]
+    #[test_case(Rule::SysVersion0, Path::new("YTT301.py"))]
+    #[test_case(Rule::SysVersionCmpStr10, Path::new("YTT302.py"))]
+    #[test_case(Rule::SysVersionSlice1, Path::new("YTT303.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_2020/rules.rs b/crates/ruff/src/rules/flake8_2020/rules.rs
deleted file mode 100644
index a4d7bd3898164..0000000000000
--- a/crates/ruff/src/rules/flake8_2020/rules.rs
+++ /dev/null
@@ -1,297 +0,0 @@
-use num_bigint::BigInt;
-use rustpython_parser::ast::{Cmpop, Constant, Expr, ExprKind, Located};
-
-use ruff_diagnostics::{Diagnostic, Violation};
-use ruff_macros::{derive_message_formats, violation};
-
-use crate::checkers::ast::Checker;
-use crate::registry::Rule;
-
-#[violation]
-pub struct SysVersionSlice3;
-
-impl Violation for SysVersionSlice3 {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("`sys.version[:3]` referenced (python3.10), use `sys.version_info`")
-    }
-}
-
-#[violation]
-pub struct SysVersion2;
-
-impl Violation for SysVersion2 {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("`sys.version[2]` referenced (python3.10), use `sys.version_info`")
-    }
-}
-
-#[violation]
-pub struct SysVersionCmpStr3;
-
-impl Violation for SysVersionCmpStr3 {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("`sys.version` compared to string (python3.10), use `sys.version_info`")
-    }
-}
-
-#[violation]
-pub struct SysVersionInfo0Eq3;
-
-impl Violation for SysVersionInfo0Eq3 {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("`sys.version_info[0] == 3` referenced (python4), use `>=`")
-    }
-}
-
-#[violation]
-pub struct SixPY3;
-
-impl Violation for SixPY3 {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("`six.PY3` referenced (python4), use `not six.PY2`")
-    }
-}
-
-#[violation]
-pub struct SysVersionInfo1CmpInt;
-
-impl Violation for SysVersionInfo1CmpInt {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!(
-            "`sys.version_info[1]` compared to integer (python4), compare `sys.version_info` to \
-             tuple"
-        )
-    }
-}
-
-#[violation]
-pub struct SysVersionInfoMinorCmpInt;
-
-impl Violation for SysVersionInfoMinorCmpInt {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!(
-            "`sys.version_info.minor` compared to integer (python4), compare `sys.version_info` \
-             to tuple"
-        )
-    }
-}
-
-#[violation]
-pub struct SysVersion0;
-
-impl Violation for SysVersion0 {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("`sys.version[0]` referenced (python10), use `sys.version_info`")
-    }
-}
-
-#[violation]
-pub struct SysVersionCmpStr10;
-
-impl Violation for SysVersionCmpStr10 {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("`sys.version` compared to string (python10), use `sys.version_info`")
-    }
-}
-
-#[violation]
-pub struct SysVersionSlice1;
-
-impl Violation for SysVersionSlice1 {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("`sys.version[:1]` referenced (python10), use `sys.version_info`")
-    }
-}
-
-fn is_sys(checker: &Checker, expr: &Expr, target: &str) -> bool {
-    checker
-        .ctx
-        .resolve_call_path(expr)
-        .map_or(false, |call_path| call_path.as_slice() == ["sys", target])
-}
-
-/// YTT101, YTT102, YTT301, YTT303
-pub fn subscript(checker: &mut Checker, value: &Expr, slice: &Expr) {
-    if is_sys(checker, value, "version") {
-        match &slice.node {
-            ExprKind::Slice {
-                lower: None,
-                upper: Some(upper),
-                step: None,
-                ..
-            } => {
-                if let ExprKind::Constant {
-                    value: Constant::Int(i),
-                    ..
-                } = &upper.node
-                {
-                    if *i == BigInt::from(1)
-                        && checker.settings.rules.enabled(Rule::SysVersionSlice1)
-                    {
-                        checker
-                            .diagnostics
-                            .push(Diagnostic::new(SysVersionSlice1, value.range()));
-                    } else if *i == BigInt::from(3)
-                        && checker.settings.rules.enabled(Rule::SysVersionSlice3)
-                    {
-                        checker
-                            .diagnostics
-                            .push(Diagnostic::new(SysVersionSlice3, value.range()));
-                    }
-                }
-            }
-
-            ExprKind::Constant {
-                value: Constant::Int(i),
-                ..
-            } => {
-                if *i == BigInt::from(2) && checker.settings.rules.enabled(Rule::SysVersion2) {
-                    checker
-                        .diagnostics
-                        .push(Diagnostic::new(SysVersion2, value.range()));
-                } else if *i == BigInt::from(0) && checker.settings.rules.enabled(Rule::SysVersion0)
-                {
-                    checker
-                        .diagnostics
-                        .push(Diagnostic::new(SysVersion0, value.range()));
-                }
-            }
-
-            _ => {}
-        }
-    }
-}
-
-/// YTT103, YTT201, YTT203, YTT204, YTT302
-pub fn compare(checker: &mut Checker, left: &Expr, ops: &[Cmpop], comparators: &[Expr]) {
-    match &left.node {
-        ExprKind::Subscript { value, slice, .. } if is_sys(checker, value, "version_info") => {
-            if let ExprKind::Constant {
-                value: Constant::Int(i),
-                ..
-            } = &slice.node
-            {
-                if *i == BigInt::from(0) {
-                    if let (
-                        [Cmpop::Eq | Cmpop::NotEq],
-                        [Located {
-                            node:
-                                ExprKind::Constant {
-                                    value: Constant::Int(n),
-                                    ..
-                                },
-                            ..
-                        }],
-                    ) = (ops, comparators)
-                    {
-                        if *n == BigInt::from(3)
-                            && checker.settings.rules.enabled(Rule::SysVersionInfo0Eq3)
-                        {
-                            checker
-                                .diagnostics
-                                .push(Diagnostic::new(SysVersionInfo0Eq3, left.range()));
-                        }
-                    }
-                } else if *i == BigInt::from(1) {
-                    if let (
-                        [Cmpop::Lt | Cmpop::LtE | Cmpop::Gt | Cmpop::GtE],
-                        [Located {
-                            node:
-                                ExprKind::Constant {
-                                    value: Constant::Int(_),
-                                    ..
-                                },
-                            ..
-                        }],
-                    ) = (ops, comparators)
-                    {
-                        if checker.settings.rules.enabled(Rule::SysVersionInfo1CmpInt) {
-                            checker
-                                .diagnostics
-                                .push(Diagnostic::new(SysVersionInfo1CmpInt, left.range()));
-                        }
-                    }
-                }
-            }
-        }
-
-        ExprKind::Attribute { value, attr, .. }
-            if is_sys(checker, value, "version_info") && attr == "minor" =>
-        {
-            if let (
-                [Cmpop::Lt | Cmpop::LtE | Cmpop::Gt | Cmpop::GtE],
-                [Located {
-                    node:
-                        ExprKind::Constant {
-                            value: Constant::Int(_),
-                            ..
-                        },
-                    ..
-                }],
-            ) = (ops, comparators)
-            {
-                if checker
-                    .settings
-                    .rules
-                    .enabled(Rule::SysVersionInfoMinorCmpInt)
-                {
-                    checker
-                        .diagnostics
-                        .push(Diagnostic::new(SysVersionInfoMinorCmpInt, left.range()));
-                }
-            }
-        }
-
-        _ => {}
-    }
-
-    if is_sys(checker, left, "version") {
-        if let (
-            [Cmpop::Lt | Cmpop::LtE | Cmpop::Gt | Cmpop::GtE],
-            [Located {
-                node:
-                    ExprKind::Constant {
-                        value: Constant::Str(s),
-                        ..
-                    },
-                ..
-            }],
-        ) = (ops, comparators)
-        {
-            if s.len() == 1 {
-                if checker.settings.rules.enabled(Rule::SysVersionCmpStr10) {
-                    checker
-                        .diagnostics
-                        .push(Diagnostic::new(SysVersionCmpStr10, left.range()));
-                }
-            } else if checker.settings.rules.enabled(Rule::SysVersionCmpStr3) {
-                checker
-                    .diagnostics
-                    .push(Diagnostic::new(SysVersionCmpStr3, left.range()));
-            }
-        }
-    }
-}
-
-/// YTT202
-pub fn name_or_attribute(checker: &mut Checker, expr: &Expr) {
-    if checker
-        .ctx
-        .resolve_call_path(expr)
-        .map_or(false, |call_path| call_path.as_slice() == ["six", "PY3"])
-    {
-        checker
-            .diagnostics
-            .push(Diagnostic::new(SixPY3, expr.range()));
-    }
-}
diff --git a/crates/ruff/src/rules/flake8_2020/rules/compare.rs b/crates/ruff/src/rules/flake8_2020/rules/compare.rs
new file mode 100644
index 0000000000000..9877be4fae83b
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_2020/rules/compare.rs
@@ -0,0 +1,157 @@
+use num_bigint::BigInt;
+use rustpython_parser::ast::{self, Cmpop, Constant, Expr, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+use crate::registry::Rule;
+
+use super::super::helpers::is_sys;
+
+#[violation]
+pub struct SysVersionCmpStr3;
+
+impl Violation for SysVersionCmpStr3 {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("`sys.version` compared to string (python3.10), use `sys.version_info`")
+    }
+}
+
+#[violation]
+pub struct SysVersionInfo0Eq3;
+
+impl Violation for SysVersionInfo0Eq3 {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("`sys.version_info[0] == 3` referenced (python4), use `>=`")
+    }
+}
+
+#[violation]
+pub struct SysVersionInfo1CmpInt;
+
+impl Violation for SysVersionInfo1CmpInt {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!(
+            "`sys.version_info[1]` compared to integer (python4), compare `sys.version_info` to \
+             tuple"
+        )
+    }
+}
+
+#[violation]
+pub struct SysVersionInfoMinorCmpInt;
+
+impl Violation for SysVersionInfoMinorCmpInt {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!(
+            "`sys.version_info.minor` compared to integer (python4), compare `sys.version_info` \
+             to tuple"
+        )
+    }
+}
+
+#[violation]
+pub struct SysVersionCmpStr10;
+
+impl Violation for SysVersionCmpStr10 {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("`sys.version` compared to string (python10), use `sys.version_info`")
+    }
+}
+
+/// YTT103, YTT201, YTT203, YTT204, YTT302
+pub(crate) fn compare(checker: &mut Checker, left: &Expr, ops: &[Cmpop], comparators: &[Expr]) {
+    match left {
+        Expr::Subscript(ast::ExprSubscript { value, slice, .. })
+            if is_sys(checker.semantic_model(), value, "version_info") =>
+        {
+            if let Expr::Constant(ast::ExprConstant {
+                value: Constant::Int(i),
+                ..
+            }) = slice.as_ref()
+            {
+                if *i == BigInt::from(0) {
+                    if let (
+                        [Cmpop::Eq | Cmpop::NotEq],
+                        [Expr::Constant(ast::ExprConstant {
+                            value: Constant::Int(n),
+                            ..
+                        })],
+                    ) = (ops, comparators)
+                    {
+                        if *n == BigInt::from(3) && checker.enabled(Rule::SysVersionInfo0Eq3) {
+                            checker
+                                .diagnostics
+                                .push(Diagnostic::new(SysVersionInfo0Eq3, left.range()));
+                        }
+                    }
+                } else if *i == BigInt::from(1) {
+                    if let (
+                        [Cmpop::Lt | Cmpop::LtE | Cmpop::Gt | Cmpop::GtE],
+                        [Expr::Constant(ast::ExprConstant {
+                            value: Constant::Int(_),
+                            ..
+                        })],
+                    ) = (ops, comparators)
+                    {
+                        if checker.enabled(Rule::SysVersionInfo1CmpInt) {
+                            checker
+                                .diagnostics
+                                .push(Diagnostic::new(SysVersionInfo1CmpInt, left.range()));
+                        }
+                    }
+                }
+            }
+        }
+
+        Expr::Attribute(ast::ExprAttribute { value, attr, .. })
+            if is_sys(checker.semantic_model(), value, "version_info") && attr == "minor" =>
+        {
+            if let (
+                [Cmpop::Lt | Cmpop::LtE | Cmpop::Gt | Cmpop::GtE],
+                [Expr::Constant(ast::ExprConstant {
+                    value: Constant::Int(_),
+                    ..
+                })],
+            ) = (ops, comparators)
+            {
+                if checker.enabled(Rule::SysVersionInfoMinorCmpInt) {
+                    checker
+                        .diagnostics
+                        .push(Diagnostic::new(SysVersionInfoMinorCmpInt, left.range()));
+                }
+            }
+        }
+
+        _ => {}
+    }
+
+    if is_sys(checker.semantic_model(), left, "version") {
+        if let (
+            [Cmpop::Lt | Cmpop::LtE | Cmpop::Gt | Cmpop::GtE],
+            [Expr::Constant(ast::ExprConstant {
+                value: Constant::Str(s),
+                ..
+            })],
+        ) = (ops, comparators)
+        {
+            if s.len() == 1 {
+                if checker.enabled(Rule::SysVersionCmpStr10) {
+                    checker
+                        .diagnostics
+                        .push(Diagnostic::new(SysVersionCmpStr10, left.range()));
+                }
+            } else if checker.enabled(Rule::SysVersionCmpStr3) {
+                checker
+                    .diagnostics
+                    .push(Diagnostic::new(SysVersionCmpStr3, left.range()));
+            }
+        }
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_2020/rules/mod.rs b/crates/ruff/src/rules/flake8_2020/rules/mod.rs
new file mode 100644
index 0000000000000..cb77bcc0ddda0
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_2020/rules/mod.rs
@@ -0,0 +1,12 @@
+pub(crate) use compare::{
+    compare, SysVersionCmpStr10, SysVersionCmpStr3, SysVersionInfo0Eq3, SysVersionInfo1CmpInt,
+    SysVersionInfoMinorCmpInt,
+};
+pub(crate) use name_or_attribute::{name_or_attribute, SixPY3};
+pub(crate) use subscript::{
+    subscript, SysVersion0, SysVersion2, SysVersionSlice1, SysVersionSlice3,
+};
+
+mod compare;
+mod name_or_attribute;
+mod subscript;
diff --git a/crates/ruff/src/rules/flake8_2020/rules/name_or_attribute.rs b/crates/ruff/src/rules/flake8_2020/rules/name_or_attribute.rs
new file mode 100644
index 0000000000000..d861abd262f51
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_2020/rules/name_or_attribute.rs
@@ -0,0 +1,29 @@
+use rustpython_parser::ast::{Expr, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+#[violation]
+pub struct SixPY3;
+
+impl Violation for SixPY3 {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("`six.PY3` referenced (python4), use `not six.PY2`")
+    }
+}
+
+/// YTT202
+pub(crate) fn name_or_attribute(checker: &mut Checker, expr: &Expr) {
+    if checker
+        .semantic_model()
+        .resolve_call_path(expr)
+        .map_or(false, |call_path| call_path.as_slice() == ["six", "PY3"])
+    {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(SixPY3, expr.range()));
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_2020/rules/subscript.rs b/crates/ruff/src/rules/flake8_2020/rules/subscript.rs
new file mode 100644
index 0000000000000..b55a602423a6f
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_2020/rules/subscript.rs
@@ -0,0 +1,96 @@
+use num_bigint::BigInt;
+use rustpython_parser::ast::{self, Constant, Expr, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+use crate::registry::Rule;
+use crate::rules::flake8_2020::helpers::is_sys;
+
+#[violation]
+pub struct SysVersionSlice3;
+
+impl Violation for SysVersionSlice3 {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("`sys.version[:3]` referenced (python3.10), use `sys.version_info`")
+    }
+}
+
+#[violation]
+pub struct SysVersion2;
+
+impl Violation for SysVersion2 {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("`sys.version[2]` referenced (python3.10), use `sys.version_info`")
+    }
+}
+
+#[violation]
+pub struct SysVersion0;
+
+impl Violation for SysVersion0 {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("`sys.version[0]` referenced (python10), use `sys.version_info`")
+    }
+}
+
+#[violation]
+pub struct SysVersionSlice1;
+
+impl Violation for SysVersionSlice1 {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("`sys.version[:1]` referenced (python10), use `sys.version_info`")
+    }
+}
+
+/// YTT101, YTT102, YTT301, YTT303
+pub(crate) fn subscript(checker: &mut Checker, value: &Expr, slice: &Expr) {
+    if is_sys(checker.semantic_model(), value, "version") {
+        match slice {
+            Expr::Slice(ast::ExprSlice {
+                lower: None,
+                upper: Some(upper),
+                step: None,
+                range: _,
+            }) => {
+                if let Expr::Constant(ast::ExprConstant {
+                    value: Constant::Int(i),
+                    ..
+                }) = upper.as_ref()
+                {
+                    if *i == BigInt::from(1) && checker.enabled(Rule::SysVersionSlice1) {
+                        checker
+                            .diagnostics
+                            .push(Diagnostic::new(SysVersionSlice1, value.range()));
+                    } else if *i == BigInt::from(3) && checker.enabled(Rule::SysVersionSlice3) {
+                        checker
+                            .diagnostics
+                            .push(Diagnostic::new(SysVersionSlice3, value.range()));
+                    }
+                }
+            }
+
+            Expr::Constant(ast::ExprConstant {
+                value: Constant::Int(i),
+                ..
+            }) => {
+                if *i == BigInt::from(2) && checker.enabled(Rule::SysVersion2) {
+                    checker
+                        .diagnostics
+                        .push(Diagnostic::new(SysVersion2, value.range()));
+                } else if *i == BigInt::from(0) && checker.enabled(Rule::SysVersion0) {
+                    checker
+                        .diagnostics
+                        .push(Diagnostic::new(SysVersion0, value.range()));
+                }
+            }
+
+            _ => {}
+        }
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_annotations/fixes.rs b/crates/ruff/src/rules/flake8_annotations/fixes.rs
index 5a6fea6f4f670..26ae559005131 100644
--- a/crates/ruff/src/rules/flake8_annotations/fixes.rs
+++ b/crates/ruff/src/rules/flake8_annotations/fixes.rs
@@ -1,19 +1,23 @@
 use anyhow::{bail, Result};
-use rustpython_parser::ast::Stmt;
+use rustpython_parser::ast::{Ranged, Stmt};
 use rustpython_parser::{lexer, Mode, Tok};
 
 use ruff_diagnostics::Edit;
 use ruff_python_ast::source_code::Locator;
 
 /// ANN204
-pub fn add_return_annotation(locator: &Locator, stmt: &Stmt, annotation: &str) -> Result<Edit> {
+pub(crate) fn add_return_annotation(
+    locator: &Locator,
+    stmt: &Stmt,
+    annotation: &str,
+) -> Result<Edit> {
     let contents = &locator.contents()[stmt.range()];
 
     // Find the colon (following the `def` keyword).
     let mut seen_lpar = false;
     let mut seen_rpar = false;
-    let mut count: usize = 0;
-    for (tok, range) in lexer::lex_located(contents, Mode::Module, stmt.start()).flatten() {
+    let mut count = 0u32;
+    for (tok, range) in lexer::lex_starts_at(contents, Mode::Module, stmt.start()).flatten() {
         if seen_lpar && seen_rpar {
             if matches!(tok, Tok::Colon) {
                 return Ok(Edit::insertion(format!(" -> {annotation}"), range.start()));
@@ -24,10 +28,10 @@ pub fn add_return_annotation(locator: &Locator, stmt: &Stmt, annotation: &str) -
             if count == 0 {
                 seen_lpar = true;
             }
-            count += 1;
+            count = count.saturating_add(1);
         }
         if matches!(tok, Tok::Rpar) {
-            count -= 1;
+            count = count.saturating_sub(1);
             if count == 0 {
                 seen_rpar = true;
             }
diff --git a/crates/ruff/src/rules/flake8_annotations/helpers.rs b/crates/ruff/src/rules/flake8_annotations/helpers.rs
index 8702c6f9578fa..6813af958180a 100644
--- a/crates/ruff/src/rules/flake8_annotations/helpers.rs
+++ b/crates/ruff/src/rules/flake8_annotations/helpers.rs
@@ -1,38 +1,49 @@
-use rustpython_parser::ast::{Arguments, Expr, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Arguments, Expr, Stmt};
 
 use ruff_python_ast::cast;
 use ruff_python_semantic::analyze::visibility;
+use ruff_python_semantic::definition::{Definition, Member, MemberKind};
+use ruff_python_semantic::model::SemanticModel;
 
-use crate::checkers::ast::Checker;
-use crate::docstrings::definition::{Definition, DefinitionKind};
-
-pub(super) fn match_function_def(stmt: &Stmt) -> (&str, &Arguments, Option<&Expr>, &Vec<Stmt>) {
-    match &stmt.node {
-        StmtKind::FunctionDef {
+pub(super) fn match_function_def(
+    stmt: &Stmt,
+) -> (&str, &Arguments, Option<&Expr>, &[Stmt], &[Expr]) {
+    match stmt {
+        Stmt::FunctionDef(ast::StmtFunctionDef {
             name,
             args,
             returns,
             body,
+            decorator_list,
             ..
-        }
-        | StmtKind::AsyncFunctionDef {
+        })
+        | Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef {
             name,
             args,
             returns,
             body,
+            decorator_list,
             ..
-        } => (name, args, returns.as_ref().map(|expr| &**expr), body),
+        }) => (
+            name,
+            args,
+            returns.as_ref().map(|expr| &**expr),
+            body,
+            decorator_list,
+        ),
         _ => panic!("Found non-FunctionDef in match_name"),
     }
 }
 
 /// Return the name of the function, if it's overloaded.
-pub fn overloaded_name(checker: &Checker, definition: &Definition) -> Option<String> {
-    if let DefinitionKind::Function(stmt)
-    | DefinitionKind::NestedFunction(stmt)
-    | DefinitionKind::Method(stmt) = definition.kind
+pub(crate) fn overloaded_name(model: &SemanticModel, definition: &Definition) -> Option<String> {
+    if let Definition::Member(Member {
+        kind: MemberKind::Function | MemberKind::NestedFunction | MemberKind::Method,
+        stmt,
+        ..
+    }) = definition
     {
-        if visibility::is_overload(&checker.ctx, cast::decorator_list(stmt)) {
+        if visibility::is_overload(model, cast::decorator_list(stmt)) {
             let (name, ..) = match_function_def(stmt);
             Some(name.to_string())
         } else {
@@ -45,12 +56,18 @@ pub fn overloaded_name(checker: &Checker, definition: &Definition) -> Option<Str
 
 /// Return `true` if the definition is the implementation for an overloaded
 /// function.
-pub fn is_overload_impl(checker: &Checker, definition: &Definition, overloaded_name: &str) -> bool {
-    if let DefinitionKind::Function(stmt)
-    | DefinitionKind::NestedFunction(stmt)
-    | DefinitionKind::Method(stmt) = definition.kind
+pub(crate) fn is_overload_impl(
+    model: &SemanticModel,
+    definition: &Definition,
+    overloaded_name: &str,
+) -> bool {
+    if let Definition::Member(Member {
+        kind: MemberKind::Function | MemberKind::NestedFunction | MemberKind::Method,
+        stmt,
+        ..
+    }) = definition
     {
-        if visibility::is_overload(&checker.ctx, cast::decorator_list(stmt)) {
+        if visibility::is_overload(model, cast::decorator_list(stmt)) {
             false
         } else {
             let (name, ..) = match_function_def(stmt);
diff --git a/crates/ruff/src/rules/flake8_annotations/mod.rs b/crates/ruff/src/rules/flake8_annotations/mod.rs
index ecfab2d4be75a..9928a48fb1434 100644
--- a/crates/ruff/src/rules/flake8_annotations/mod.rs
+++ b/crates/ruff/src/rules/flake8_annotations/mod.rs
@@ -8,9 +8,9 @@ pub mod settings;
 mod tests {
     use std::path::Path;
 
-    use crate::assert_messages;
     use anyhow::Result;
 
+    use crate::assert_messages;
     use crate::registry::Rule;
     use crate::settings::Settings;
     use crate::test::test_path;
diff --git a/crates/ruff/src/rules/flake8_annotations/rules.rs b/crates/ruff/src/rules/flake8_annotations/rules/definition.rs
similarity index 55%
rename from crates/ruff/src/rules/flake8_annotations/rules.rs
rename to crates/ruff/src/rules/flake8_annotations/rules/definition.rs
index f3f479ab3af23..492be796130c5 100644
--- a/crates/ruff/src/rules/flake8_annotations/rules.rs
+++ b/crates/ruff/src/rules/flake8_annotations/rules/definition.rs
@@ -1,20 +1,21 @@
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Stmt};
+use rustpython_parser::ast::{Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::ReturnStatementVisitor;
-use ruff_python_ast::visitor::Visitor;
+use ruff_python_ast::statement_visitor::StatementVisitor;
 use ruff_python_ast::{cast, helpers};
 use ruff_python_semantic::analyze::visibility;
 use ruff_python_semantic::analyze::visibility::Visibility;
+use ruff_python_semantic::definition::{Definition, Member, MemberKind};
+use ruff_python_semantic::model::SemanticModel;
 use ruff_python_stdlib::typing::SIMPLE_MAGIC_RETURN_TYPES;
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::{Definition, DefinitionKind};
 use crate::registry::{AsRule, Rule};
 
-use super::fixes;
-use super::helpers::match_function_def;
+use super::super::fixes;
+use super::super::helpers::match_function_def;
 
 /// ## What it does
 /// Checks that function arguments have type annotations.
@@ -37,7 +38,7 @@ use super::helpers::match_function_def;
 /// ```
 #[violation]
 pub struct MissingTypeFunctionArgument {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for MissingTypeFunctionArgument {
@@ -69,7 +70,7 @@ impl Violation for MissingTypeFunctionArgument {
 /// ```
 #[violation]
 pub struct MissingTypeArgs {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for MissingTypeArgs {
@@ -101,7 +102,7 @@ impl Violation for MissingTypeArgs {
 /// ```
 #[violation]
 pub struct MissingTypeKwargs {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for MissingTypeKwargs {
@@ -138,7 +139,7 @@ impl Violation for MissingTypeKwargs {
 /// ```
 #[violation]
 pub struct MissingTypeSelf {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for MissingTypeSelf {
@@ -177,7 +178,7 @@ impl Violation for MissingTypeSelf {
 /// ```
 #[violation]
 pub struct MissingTypeCls {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for MissingTypeCls {
@@ -209,7 +210,7 @@ impl Violation for MissingTypeCls {
 /// ```
 #[violation]
 pub struct MissingReturnTypeUndocumentedPublicFunction {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for MissingReturnTypeUndocumentedPublicFunction {
@@ -241,7 +242,7 @@ impl Violation for MissingReturnTypeUndocumentedPublicFunction {
 /// ```
 #[violation]
 pub struct MissingReturnTypePrivateFunction {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for MissingReturnTypePrivateFunction {
@@ -286,7 +287,7 @@ impl Violation for MissingReturnTypePrivateFunction {
 /// ```
 #[violation]
 pub struct MissingReturnTypeSpecialMethod {
-    pub name: String,
+    name: String,
 }
 
 impl AlwaysAutofixableViolation for MissingReturnTypeSpecialMethod {
@@ -326,7 +327,7 @@ impl AlwaysAutofixableViolation for MissingReturnTypeSpecialMethod {
 /// ```
 #[violation]
 pub struct MissingReturnTypeStaticMethod {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for MissingReturnTypeStaticMethod {
@@ -362,7 +363,7 @@ impl Violation for MissingReturnTypeStaticMethod {
 /// ```
 #[violation]
 pub struct MissingReturnTypeClassMethod {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for MissingReturnTypeClassMethod {
@@ -403,7 +404,7 @@ impl Violation for MissingReturnTypeClassMethod {
 /// - [Mypy: The Any type](https://mypy.readthedocs.io/en/stable/kinds_of_types.html#the-any-type)
 #[violation]
 pub struct AnyType {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for AnyType {
@@ -416,18 +417,15 @@ impl Violation for AnyType {
 
 fn is_none_returning(body: &[Stmt]) -> bool {
     let mut visitor = ReturnStatementVisitor::default();
-    for stmt in body {
-        visitor.visit_stmt(stmt);
-    }
-    for expr in visitor.returns.into_iter().flatten() {
-        if !matches!(
-            expr.node,
-            ExprKind::Constant {
-                value: Constant::None,
-                ..
+    visitor.visit_body(body);
+    for stmt in visitor.returns {
+        if let Some(value) = stmt.value.as_deref() {
+            if !matches!(
+                value,
+                Expr::Constant(constant) if constant.value.is_none()
+            ) {
+                return false;
             }
-        ) {
-            return false;
         }
     }
     true
@@ -435,14 +433,15 @@ fn is_none_returning(body: &[Stmt]) -> bool {
 
 /// ANN401
 fn check_dynamically_typed<F>(
-    checker: &Checker,
+    model: &SemanticModel,
     annotation: &Expr,
     func: F,
     diagnostics: &mut Vec<Diagnostic>,
+    is_overridden: bool,
 ) where
     F: FnOnce() -> String,
 {
-    if checker.ctx.match_typing_expr(annotation, "Any") {
+    if !is_overridden && model.match_typing_expr(annotation, "Any") {
         diagnostics.push(Diagnostic::new(
             AnyType { name: func() },
             annotation.range(),
@@ -451,7 +450,7 @@ fn check_dynamically_typed<F>(
 }
 
 /// Generate flake8-annotation checks for a given `Definition`.
-pub fn definition(
+pub(crate) fn definition(
     checker: &Checker,
     definition: &Definition,
     visibility: Visibility,
@@ -459,285 +458,283 @@ pub fn definition(
     // TODO(charlie): Consider using the AST directly here rather than `Definition`.
     // We could adhere more closely to `flake8-annotations` by defining public
     // vs. secret vs. protected.
-    if let DefinitionKind::Function(stmt)
-    | DefinitionKind::NestedFunction(stmt)
-    | DefinitionKind::Method(stmt) = &definition.kind
+    let Definition::Member(Member {
+        kind,
+        stmt,
+        ..
+    }) = definition else {
+        return vec![];
+    };
+
+    let is_method = match kind {
+        MemberKind::Method => true,
+        MemberKind::Function | MemberKind::NestedFunction => false,
+        _ => return vec![],
+    };
+
+    let (name, args, returns, body, decorator_list) = match_function_def(stmt);
+    // Keep track of whether we've seen any typed arguments or return values.
+    let mut has_any_typed_arg = false; // Any argument has been typed?
+    let mut has_typed_return = false; // Return value has been typed?
+    let mut has_typed_self_or_cls = false; // Has a typed `self` or `cls` argument?
+
+    // Temporary storage for diagnostics; we emit them at the end
+    // unless configured to suppress ANN* for declarations that are fully untyped.
+    let mut diagnostics = Vec::new();
+
+    let is_overridden = visibility::is_override(checker.semantic_model(), decorator_list);
+
+    // ANN001, ANN401
+    for arg in args
+        .posonlyargs
+        .iter()
+        .chain(args.args.iter())
+        .chain(args.kwonlyargs.iter())
+        .skip(
+            // If this is a non-static method, skip `cls` or `self`.
+            usize::from(
+                is_method
+                    && !visibility::is_staticmethod(
+                        checker.semantic_model(),
+                        cast::decorator_list(stmt),
+                    ),
+            ),
+        )
     {
-        let is_method = matches!(definition.kind, DefinitionKind::Method(_));
-        let (name, args, returns, body) = match_function_def(stmt);
-        // Keep track of whether we've seen any typed arguments or return values.
-        let mut has_any_typed_arg = false; // Any argument has been typed?
-        let mut has_typed_return = false; // Return value has been typed?
-        let mut has_typed_self_or_cls = false; // Has a typed `self` or `cls` argument?
-
-        // Temporary storage for diagnostics; we emit them at the end
-        // unless configured to suppress ANN* for declarations that are fully untyped.
-        let mut diagnostics = Vec::new();
-
-        // ANN001, ANN401
-        for arg in args
-            .posonlyargs
-            .iter()
-            .chain(args.args.iter())
-            .chain(args.kwonlyargs.iter())
-            .skip(
-                // If this is a non-static method, skip `cls` or `self`.
-                usize::from(
-                    is_method
-                        && !visibility::is_staticmethod(&checker.ctx, cast::decorator_list(stmt)),
-                ),
-            )
-        {
-            // ANN401 for dynamically typed arguments
-            if let Some(annotation) = &arg.node.annotation {
-                has_any_typed_arg = true;
-                if checker.settings.rules.enabled(Rule::AnyType) {
+        // ANN401 for dynamically typed arguments
+        if let Some(annotation) = &arg.annotation {
+            has_any_typed_arg = true;
+            if checker.enabled(Rule::AnyType) {
+                check_dynamically_typed(
+                    checker.semantic_model(),
+                    annotation,
+                    || arg.arg.to_string(),
+                    &mut diagnostics,
+                    is_overridden,
+                );
+            }
+        } else {
+            if !(checker.settings.flake8_annotations.suppress_dummy_args
+                && checker.settings.dummy_variable_rgx.is_match(&arg.arg))
+            {
+                if checker.enabled(Rule::MissingTypeFunctionArgument) {
+                    diagnostics.push(Diagnostic::new(
+                        MissingTypeFunctionArgument {
+                            name: arg.arg.to_string(),
+                        },
+                        arg.range(),
+                    ));
+                }
+            }
+        }
+    }
+
+    // ANN002, ANN401
+    if let Some(arg) = &args.vararg {
+        if let Some(expr) = &arg.annotation {
+            has_any_typed_arg = true;
+            if !checker.settings.flake8_annotations.allow_star_arg_any {
+                if checker.enabled(Rule::AnyType) {
+                    let name = &arg.arg;
                     check_dynamically_typed(
-                        checker,
-                        annotation,
-                        || arg.node.arg.to_string(),
+                        checker.semantic_model(),
+                        expr,
+                        || format!("*{name}"),
                         &mut diagnostics,
+                        is_overridden,
                     );
                 }
-            } else {
-                if !(checker.settings.flake8_annotations.suppress_dummy_args
-                    && checker.settings.dummy_variable_rgx.is_match(&arg.node.arg))
-                {
-                    if checker
-                        .settings
-                        .rules
-                        .enabled(Rule::MissingTypeFunctionArgument)
-                    {
-                        diagnostics.push(Diagnostic::new(
-                            MissingTypeFunctionArgument {
-                                name: arg.node.arg.to_string(),
-                            },
-                            arg.range(),
-                        ));
-                    }
+            }
+        } else {
+            if !(checker.settings.flake8_annotations.suppress_dummy_args
+                && checker.settings.dummy_variable_rgx.is_match(&arg.arg))
+            {
+                if checker.enabled(Rule::MissingTypeArgs) {
+                    diagnostics.push(Diagnostic::new(
+                        MissingTypeArgs {
+                            name: arg.arg.to_string(),
+                        },
+                        arg.range(),
+                    ));
                 }
             }
         }
+    }
 
-        // ANN002, ANN401
-        if let Some(arg) = &args.vararg {
-            if let Some(expr) = &arg.node.annotation {
-                has_any_typed_arg = true;
-                if !checker.settings.flake8_annotations.allow_star_arg_any {
-                    if checker.settings.rules.enabled(Rule::AnyType) {
-                        let name = &arg.node.arg;
-                        check_dynamically_typed(
-                            checker,
-                            expr,
-                            || format!("*{name}"),
-                            &mut diagnostics,
-                        );
-                    }
+    // ANN003, ANN401
+    if let Some(arg) = &args.kwarg {
+        if let Some(expr) = &arg.annotation {
+            has_any_typed_arg = true;
+            if !checker.settings.flake8_annotations.allow_star_arg_any {
+                if checker.enabled(Rule::AnyType) {
+                    let name = &arg.arg;
+                    check_dynamically_typed(
+                        checker.semantic_model(),
+                        expr,
+                        || format!("**{name}"),
+                        &mut diagnostics,
+                        is_overridden,
+                    );
                 }
-            } else {
-                if !(checker.settings.flake8_annotations.suppress_dummy_args
-                    && checker.settings.dummy_variable_rgx.is_match(&arg.node.arg))
+            }
+        } else {
+            if !(checker.settings.flake8_annotations.suppress_dummy_args
+                && checker.settings.dummy_variable_rgx.is_match(&arg.arg))
+            {
+                if checker.enabled(Rule::MissingTypeKwargs) {
+                    diagnostics.push(Diagnostic::new(
+                        MissingTypeKwargs {
+                            name: arg.arg.to_string(),
+                        },
+                        arg.range(),
+                    ));
+                }
+            }
+        }
+    }
+
+    // ANN101, ANN102
+    if is_method
+        && !visibility::is_staticmethod(checker.semantic_model(), cast::decorator_list(stmt))
+    {
+        if let Some(arg) = args.posonlyargs.first().or_else(|| args.args.first()) {
+            if arg.annotation.is_none() {
+                if visibility::is_classmethod(checker.semantic_model(), cast::decorator_list(stmt))
                 {
-                    if checker.settings.rules.enabled(Rule::MissingTypeArgs) {
+                    if checker.enabled(Rule::MissingTypeCls) {
                         diagnostics.push(Diagnostic::new(
-                            MissingTypeArgs {
-                                name: arg.node.arg.to_string(),
+                            MissingTypeCls {
+                                name: arg.arg.to_string(),
                             },
                             arg.range(),
                         ));
                     }
-                }
-            }
-        }
-
-        // ANN003, ANN401
-        if let Some(arg) = &args.kwarg {
-            if let Some(expr) = &arg.node.annotation {
-                has_any_typed_arg = true;
-                if !checker.settings.flake8_annotations.allow_star_arg_any {
-                    if checker.settings.rules.enabled(Rule::AnyType) {
-                        let name = &arg.node.arg;
-                        check_dynamically_typed(
-                            checker,
-                            expr,
-                            || format!("**{name}"),
-                            &mut diagnostics,
-                        );
-                    }
-                }
-            } else {
-                if !(checker.settings.flake8_annotations.suppress_dummy_args
-                    && checker.settings.dummy_variable_rgx.is_match(&arg.node.arg))
-                {
-                    if checker.settings.rules.enabled(Rule::MissingTypeKwargs) {
+                } else {
+                    if checker.enabled(Rule::MissingTypeSelf) {
                         diagnostics.push(Diagnostic::new(
-                            MissingTypeKwargs {
-                                name: arg.node.arg.to_string(),
+                            MissingTypeSelf {
+                                name: arg.arg.to_string(),
                             },
                             arg.range(),
                         ));
                     }
                 }
+            } else {
+                has_typed_self_or_cls = true;
             }
         }
+    }
 
-        // ANN101, ANN102
-        if is_method && !visibility::is_staticmethod(&checker.ctx, cast::decorator_list(stmt)) {
-            if let Some(arg) = args.posonlyargs.first().or_else(|| args.args.first()) {
-                if arg.node.annotation.is_none() {
-                    if visibility::is_classmethod(&checker.ctx, cast::decorator_list(stmt)) {
-                        if checker.settings.rules.enabled(Rule::MissingTypeCls) {
-                            diagnostics.push(Diagnostic::new(
-                                MissingTypeCls {
-                                    name: arg.node.arg.to_string(),
-                                },
-                                arg.range(),
-                            ));
-                        }
-                    } else {
-                        if checker.settings.rules.enabled(Rule::MissingTypeSelf) {
-                            diagnostics.push(Diagnostic::new(
-                                MissingTypeSelf {
-                                    name: arg.node.arg.to_string(),
-                                },
-                                arg.range(),
-                            ));
-                        }
-                    }
-                } else {
-                    has_typed_self_or_cls = true;
-                }
-            }
+    // ANN201, ANN202, ANN401
+    if let Some(expr) = &returns {
+        has_typed_return = true;
+        if checker.enabled(Rule::AnyType) {
+            check_dynamically_typed(
+                checker.semantic_model(),
+                expr,
+                || name.to_string(),
+                &mut diagnostics,
+                is_overridden,
+            );
         }
-
-        // ANN201, ANN202, ANN401
-        if let Some(expr) = &returns {
-            has_typed_return = true;
-            if checker.settings.rules.enabled(Rule::AnyType) {
-                check_dynamically_typed(checker, expr, || name.to_string(), &mut diagnostics);
+    } else if !(
+        // Allow omission of return annotation if the function only returns `None`
+        // (explicitly or implicitly).
+        checker.settings.flake8_annotations.suppress_none_returning && is_none_returning(body)
+    ) {
+        if is_method
+            && visibility::is_classmethod(checker.semantic_model(), cast::decorator_list(stmt))
+        {
+            if checker.enabled(Rule::MissingReturnTypeClassMethod) {
+                diagnostics.push(Diagnostic::new(
+                    MissingReturnTypeClassMethod {
+                        name: name.to_string(),
+                    },
+                    helpers::identifier_range(stmt, checker.locator),
+                ));
             }
-        } else if !(
-            // Allow omission of return annotation if the function only returns `None`
-            // (explicitly or implicitly).
-            checker.settings.flake8_annotations.suppress_none_returning && is_none_returning(body)
-        ) {
-            if is_method && visibility::is_classmethod(&checker.ctx, cast::decorator_list(stmt)) {
-                if checker
-                    .settings
-                    .rules
-                    .enabled(Rule::MissingReturnTypeClassMethod)
-                {
-                    diagnostics.push(Diagnostic::new(
-                        MissingReturnTypeClassMethod {
-                            name: name.to_string(),
-                        },
-                        helpers::identifier_range(stmt, checker.locator),
-                    ));
-                }
-            } else if is_method
-                && visibility::is_staticmethod(&checker.ctx, cast::decorator_list(stmt))
-            {
-                if checker
-                    .settings
-                    .rules
-                    .enabled(Rule::MissingReturnTypeStaticMethod)
-                {
-                    diagnostics.push(Diagnostic::new(
-                        MissingReturnTypeStaticMethod {
-                            name: name.to_string(),
-                        },
-                        helpers::identifier_range(stmt, checker.locator),
-                    ));
-                }
-            } else if is_method && visibility::is_init(name) {
-                // Allow omission of return annotation in `__init__` functions, as long as at
-                // least one argument is typed.
-                if checker
-                    .settings
-                    .rules
-                    .enabled(Rule::MissingReturnTypeSpecialMethod)
-                {
-                    if !(checker.settings.flake8_annotations.mypy_init_return && has_any_typed_arg)
-                    {
-                        let mut diagnostic = Diagnostic::new(
-                            MissingReturnTypeSpecialMethod {
-                                name: name.to_string(),
-                            },
-                            helpers::identifier_range(stmt, checker.locator),
-                        );
-                        if checker.patch(diagnostic.kind.rule()) {
-                            diagnostic.try_set_fix(|| {
-                                fixes::add_return_annotation(checker.locator, stmt, "None")
-                            });
-                        }
-                        diagnostics.push(diagnostic);
-                    }
-                }
-            } else if is_method && visibility::is_magic(name) {
-                if checker
-                    .settings
-                    .rules
-                    .enabled(Rule::MissingReturnTypeSpecialMethod)
-                {
+        } else if is_method
+            && visibility::is_staticmethod(checker.semantic_model(), cast::decorator_list(stmt))
+        {
+            if checker.enabled(Rule::MissingReturnTypeStaticMethod) {
+                diagnostics.push(Diagnostic::new(
+                    MissingReturnTypeStaticMethod {
+                        name: name.to_string(),
+                    },
+                    helpers::identifier_range(stmt, checker.locator),
+                ));
+            }
+        } else if is_method && visibility::is_init(name) {
+            // Allow omission of return annotation in `__init__` functions, as long as at
+            // least one argument is typed.
+            if checker.enabled(Rule::MissingReturnTypeSpecialMethod) {
+                if !(checker.settings.flake8_annotations.mypy_init_return && has_any_typed_arg) {
                     let mut diagnostic = Diagnostic::new(
                         MissingReturnTypeSpecialMethod {
                             name: name.to_string(),
                         },
                         helpers::identifier_range(stmt, checker.locator),
                     );
-                    let return_type = SIMPLE_MAGIC_RETURN_TYPES.get(name);
-                    if let Some(return_type) = return_type {
-                        if checker.patch(diagnostic.kind.rule()) {
-                            diagnostic.try_set_fix(|| {
-                                fixes::add_return_annotation(checker.locator, stmt, return_type)
-                            });
-                        }
+                    if checker.patch(diagnostic.kind.rule()) {
+                        #[allow(deprecated)]
+                        diagnostic.try_set_fix_from_edit(|| {
+                            fixes::add_return_annotation(checker.locator, stmt, "None")
+                        });
                     }
                     diagnostics.push(diagnostic);
                 }
-            } else {
-                match visibility {
-                    Visibility::Public => {
-                        if checker
-                            .settings
-                            .rules
-                            .enabled(Rule::MissingReturnTypeUndocumentedPublicFunction)
-                        {
-                            diagnostics.push(Diagnostic::new(
-                                MissingReturnTypeUndocumentedPublicFunction {
-                                    name: name.to_string(),
-                                },
-                                helpers::identifier_range(stmt, checker.locator),
-                            ));
-                        }
-                    }
-                    Visibility::Private => {
-                        if checker
-                            .settings
-                            .rules
-                            .enabled(Rule::MissingReturnTypePrivateFunction)
-                        {
-                            diagnostics.push(Diagnostic::new(
-                                MissingReturnTypePrivateFunction {
-                                    name: name.to_string(),
-                                },
-                                helpers::identifier_range(stmt, checker.locator),
-                            ));
-                        }
+            }
+        } else if is_method && visibility::is_magic(name) {
+            if checker.enabled(Rule::MissingReturnTypeSpecialMethod) {
+                let mut diagnostic = Diagnostic::new(
+                    MissingReturnTypeSpecialMethod {
+                        name: name.to_string(),
+                    },
+                    helpers::identifier_range(stmt, checker.locator),
+                );
+                let return_type = SIMPLE_MAGIC_RETURN_TYPES.get(name);
+                if let Some(return_type) = return_type {
+                    if checker.patch(diagnostic.kind.rule()) {
+                        #[allow(deprecated)]
+                        diagnostic.try_set_fix_from_edit(|| {
+                            fixes::add_return_annotation(checker.locator, stmt, return_type)
+                        });
                     }
                 }
+                diagnostics.push(diagnostic);
             }
-        }
-        // If settings say so, don't report any of the
-        // diagnostics gathered here if there were no type annotations at all.
-        if checker.settings.flake8_annotations.ignore_fully_untyped
-            && !(has_any_typed_arg || has_typed_self_or_cls || has_typed_return)
-        {
-            vec![]
         } else {
-            diagnostics
+            match visibility {
+                Visibility::Public => {
+                    if checker.enabled(Rule::MissingReturnTypeUndocumentedPublicFunction) {
+                        diagnostics.push(Diagnostic::new(
+                            MissingReturnTypeUndocumentedPublicFunction {
+                                name: name.to_string(),
+                            },
+                            helpers::identifier_range(stmt, checker.locator),
+                        ));
+                    }
+                }
+                Visibility::Private => {
+                    if checker.enabled(Rule::MissingReturnTypePrivateFunction) {
+                        diagnostics.push(Diagnostic::new(
+                            MissingReturnTypePrivateFunction {
+                                name: name.to_string(),
+                            },
+                            helpers::identifier_range(stmt, checker.locator),
+                        ));
+                    }
+                }
+            }
         }
-    } else {
+    }
+    // If settings say so, don't report any of the
+    // diagnostics gathered here if there were no type annotations at all.
+    if checker.settings.flake8_annotations.ignore_fully_untyped
+        && !(has_any_typed_arg || has_typed_self_or_cls || has_typed_return)
+    {
         vec![]
+    } else {
+        diagnostics
     }
 }
diff --git a/crates/ruff/src/rules/flake8_annotations/rules/mod.rs b/crates/ruff/src/rules/flake8_annotations/rules/mod.rs
new file mode 100644
index 0000000000000..b57c156b183dc
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_annotations/rules/mod.rs
@@ -0,0 +1,8 @@
+pub(crate) use definition::{
+    definition, AnyType, MissingReturnTypeClassMethod, MissingReturnTypePrivateFunction,
+    MissingReturnTypeSpecialMethod, MissingReturnTypeStaticMethod,
+    MissingReturnTypeUndocumentedPublicFunction, MissingTypeArgs, MissingTypeCls,
+    MissingTypeFunctionArgument, MissingTypeKwargs, MissingTypeSelf,
+};
+
+mod definition;
diff --git a/crates/ruff/src/rules/flake8_annotations/settings.rs b/crates/ruff/src/rules/flake8_annotations/settings.rs
index 4bf40f2b4cd81..a0c3ba5115e66 100644
--- a/crates/ruff/src/rules/flake8_annotations/settings.rs
+++ b/crates/ruff/src/rules/flake8_annotations/settings.rs
@@ -1,19 +1,18 @@
 //! Settings for the `flake-annotations` plugin.
 
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::CacheKey;
-use ruff_macros::ConfigurationOptions;
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
 
 #[derive(
-    Debug, PartialEq, Eq, Default, Serialize, Deserialize, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Default, Serialize, Deserialize, ConfigurationOptions, CombineOptions,
 )]
 #[serde(
     deny_unknown_fields,
     rename_all = "kebab-case",
     rename = "Flake8AnnotationsOptions"
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = "false",
diff --git a/crates/ruff/src/rules/flake8_annotations/snapshots/ruff__rules__flake8_annotations__tests__defaults.snap b/crates/ruff/src/rules/flake8_annotations/snapshots/ruff__rules__flake8_annotations__tests__defaults.snap
index 85337e599e468..61d69da4b50e3 100644
--- a/crates/ruff/src/rules/flake8_annotations/snapshots/ruff__rules__flake8_annotations__tests__defaults.snap
+++ b/crates/ruff/src/rules/flake8_annotations/snapshots/ruff__rules__flake8_annotations__tests__defaults.snap
@@ -1,189 +1,189 @@
 ---
 source: crates/ruff/src/rules/flake8_annotations/mod.rs
 ---
-annotation_presence.py:4:5: ANN201 Missing return type annotation for public function `foo`
+annotation_presence.py:5:5: ANN201 Missing return type annotation for public function `foo`
   |
-4 | # Error
-5 | def foo(a, b):
+5 | # Error
+6 | def foo(a, b):
   |     ^^^ ANN201
-6 |     pass
+7 |     pass
   |
 
-annotation_presence.py:4:9: ANN001 Missing type annotation for function argument `a`
+annotation_presence.py:5:9: ANN001 Missing type annotation for function argument `a`
   |
-4 | # Error
-5 | def foo(a, b):
+5 | # Error
+6 | def foo(a, b):
   |         ^ ANN001
-6 |     pass
+7 |     pass
   |
 
-annotation_presence.py:4:12: ANN001 Missing type annotation for function argument `b`
+annotation_presence.py:5:12: ANN001 Missing type annotation for function argument `b`
   |
-4 | # Error
-5 | def foo(a, b):
+5 | # Error
+6 | def foo(a, b):
   |            ^ ANN001
-6 |     pass
+7 |     pass
   |
 
-annotation_presence.py:9:5: ANN201 Missing return type annotation for public function `foo`
+annotation_presence.py:10:5: ANN201 Missing return type annotation for public function `foo`
    |
- 9 | # Error
-10 | def foo(a: int, b):
+10 | # Error
+11 | def foo(a: int, b):
    |     ^^^ ANN201
-11 |     pass
+12 |     pass
    |
 
-annotation_presence.py:9:17: ANN001 Missing type annotation for function argument `b`
+annotation_presence.py:10:17: ANN001 Missing type annotation for function argument `b`
    |
- 9 | # Error
-10 | def foo(a: int, b):
+10 | # Error
+11 | def foo(a: int, b):
    |                 ^ ANN001
-11 |     pass
+12 |     pass
    |
 
-annotation_presence.py:14:17: ANN001 Missing type annotation for function argument `b`
+annotation_presence.py:15:17: ANN001 Missing type annotation for function argument `b`
    |
-14 | # Error
-15 | def foo(a: int, b) -> int:
+15 | # Error
+16 | def foo(a: int, b) -> int:
    |                 ^ ANN001
-16 |     pass
+17 |     pass
    |
 
-annotation_presence.py:19:5: ANN201 Missing return type annotation for public function `foo`
+annotation_presence.py:20:5: ANN201 Missing return type annotation for public function `foo`
    |
-19 | # Error
-20 | def foo(a: int, b: int):
+20 | # Error
+21 | def foo(a: int, b: int):
    |     ^^^ ANN201
-21 |     pass
+22 |     pass
    |
 
-annotation_presence.py:24:5: ANN201 Missing return type annotation for public function `foo`
+annotation_presence.py:25:5: ANN201 Missing return type annotation for public function `foo`
    |
-24 | # Error
-25 | def foo():
+25 | # Error
+26 | def foo():
    |     ^^^ ANN201
-26 |     pass
+27 |     pass
    |
 
-annotation_presence.py:44:12: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `a`
+annotation_presence.py:45:12: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `a`
    |
-44 | # ANN401
-45 | def foo(a: Any, *args: str, **kwargs: str) -> int:
+45 | # ANN401
+46 | def foo(a: Any, *args: str, **kwargs: str) -> int:
    |            ^^^ ANN401
-46 |     pass
+47 |     pass
    |
 
-annotation_presence.py:49:47: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `foo`
+annotation_presence.py:50:47: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `foo`
    |
-49 | # ANN401
-50 | def foo(a: int, *args: str, **kwargs: str) -> Any:
+50 | # ANN401
+51 | def foo(a: int, *args: str, **kwargs: str) -> Any:
    |                                               ^^^ ANN401
-51 |     pass
+52 |     pass
    |
 
-annotation_presence.py:54:24: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `*args`
+annotation_presence.py:55:24: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `*args`
    |
-54 | # ANN401
-55 | def foo(a: int, *args: Any, **kwargs: Any) -> int:
+55 | # ANN401
+56 | def foo(a: int, *args: Any, **kwargs: Any) -> int:
    |                        ^^^ ANN401
-56 |     pass
+57 |     pass
    |
 
-annotation_presence.py:54:39: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `**kwargs`
+annotation_presence.py:55:39: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `**kwargs`
    |
-54 | # ANN401
-55 | def foo(a: int, *args: Any, **kwargs: Any) -> int:
+55 | # ANN401
+56 | def foo(a: int, *args: Any, **kwargs: Any) -> int:
    |                                       ^^^ ANN401
-56 |     pass
+57 |     pass
    |
 
-annotation_presence.py:59:24: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `*args`
+annotation_presence.py:60:24: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `*args`
    |
-59 | # ANN401
-60 | def foo(a: int, *args: Any, **kwargs: str) -> int:
+60 | # ANN401
+61 | def foo(a: int, *args: Any, **kwargs: str) -> int:
    |                        ^^^ ANN401
-61 |     pass
+62 |     pass
    |
 
-annotation_presence.py:64:39: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `**kwargs`
+annotation_presence.py:65:39: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `**kwargs`
    |
-64 | # ANN401
-65 | def foo(a: int, *args: str, **kwargs: Any) -> int:
+65 | # ANN401
+66 | def foo(a: int, *args: str, **kwargs: Any) -> int:
    |                                       ^^^ ANN401
-66 |     pass
+67 |     pass
    |
 
-annotation_presence.py:74:13: ANN101 Missing type annotation for `self` in method
+annotation_presence.py:75:13: ANN101 Missing type annotation for `self` in method
    |
-74 |     # ANN101
-75 |     def foo(self, a: int, b: int) -> int:
+75 |     # ANN101
+76 |     def foo(self, a: int, b: int) -> int:
    |             ^^^^ ANN101
-76 |         pass
+77 |         pass
    |
 
-annotation_presence.py:78:29: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `a`
+annotation_presence.py:79:29: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `a`
    |
-78 |     # ANN401
-79 |     def foo(self: "Foo", a: Any, *params: str, **options: str) -> int:
+79 |     # ANN401
+80 |     def foo(self: "Foo", a: Any, *params: str, **options: str) -> int:
    |                             ^^^ ANN401
-80 |         pass
+81 |         pass
    |
 
-annotation_presence.py:82:67: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `foo`
+annotation_presence.py:83:67: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `foo`
    |
-82 |     # ANN401
-83 |     def foo(self: "Foo", a: int, *params: str, **options: str) -> Any:
+83 |     # ANN401
+84 |     def foo(self: "Foo", a: int, *params: str, **options: str) -> Any:
    |                                                                   ^^^ ANN401
-84 |         pass
+85 |         pass
    |
 
-annotation_presence.py:86:43: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `*params`
+annotation_presence.py:87:43: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `*params`
    |
-86 |     # ANN401
-87 |     def foo(self: "Foo", a: int, *params: Any, **options: Any) -> int:
+87 |     # ANN401
+88 |     def foo(self: "Foo", a: int, *params: Any, **options: Any) -> int:
    |                                           ^^^ ANN401
-88 |         pass
+89 |         pass
    |
 
-annotation_presence.py:86:59: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `**options`
+annotation_presence.py:87:59: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `**options`
    |
-86 |     # ANN401
-87 |     def foo(self: "Foo", a: int, *params: Any, **options: Any) -> int:
+87 |     # ANN401
+88 |     def foo(self: "Foo", a: int, *params: Any, **options: Any) -> int:
    |                                                           ^^^ ANN401
-88 |         pass
+89 |         pass
    |
 
-annotation_presence.py:90:43: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `*params`
+annotation_presence.py:91:43: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `*params`
    |
-90 |     # ANN401
-91 |     def foo(self: "Foo", a: int, *params: Any, **options: str) -> int:
+91 |     # ANN401
+92 |     def foo(self: "Foo", a: int, *params: Any, **options: str) -> int:
    |                                           ^^^ ANN401
-92 |         pass
+93 |         pass
    |
 
-annotation_presence.py:94:59: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `**options`
+annotation_presence.py:95:59: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `**options`
    |
-94 |     # ANN401
-95 |     def foo(self: "Foo", a: int, *params: str, **options: Any) -> int:
+95 |     # ANN401
+96 |     def foo(self: "Foo", a: int, *params: str, **options: Any) -> int:
    |                                                           ^^^ ANN401
-96 |         pass
+97 |         pass
    |
 
-annotation_presence.py:104:13: ANN102 Missing type annotation for `cls` in classmethod
+annotation_presence.py:130:13: ANN102 Missing type annotation for `cls` in classmethod
     |
-104 |     # ANN102
-105 |     @classmethod
-106 |     def foo(cls, a: int, b: int) -> int:
+130 |     # ANN102
+131 |     @classmethod
+132 |     def foo(cls, a: int, b: int) -> int:
     |             ^^^ ANN102
-107 |         pass
+133 |         pass
     |
 
-annotation_presence.py:108:13: ANN101 Missing type annotation for `self` in method
+annotation_presence.py:134:13: ANN101 Missing type annotation for `self` in method
     |
-108 |     # ANN101
-109 |     def foo(self, /, a: int, b: int) -> int:
+134 |     # ANN101
+135 |     def foo(self, /, a: int, b: int) -> int:
     |             ^^^^ ANN101
-110 |         pass
+136 |         pass
     |
 
 
diff --git a/crates/ruff/src/rules/flake8_async/mod.rs b/crates/ruff/src/rules/flake8_async/mod.rs
new file mode 100644
index 0000000000000..7865ddf6b0a66
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_async/mod.rs
@@ -0,0 +1,28 @@
+//! Rules from [flake8-async](https://pypi.org/project/flake8-async/).
+pub(crate) mod rules;
+
+#[cfg(test)]
+mod tests {
+    use std::path::Path;
+
+    use anyhow::Result;
+    use test_case::test_case;
+
+    use crate::assert_messages;
+    use crate::registry::Rule;
+    use crate::settings::Settings;
+    use crate::test::test_path;
+
+    #[test_case(Rule::BlockingHttpCallInAsyncFunction, Path::new("ASYNC100.py"))]
+    #[test_case(Rule::OpenSleepOrSubprocessInAsyncFunction, Path::new("ASYNC101.py"))]
+    #[test_case(Rule::BlockingOsCallInAsyncFunction, Path::new("ASYNC102.py"))]
+    fn rules(rule_code: Rule, path: &Path) -> Result<()> {
+        let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
+        let diagnostics = test_path(
+            Path::new("flake8_async").join(path).as_path(),
+            &Settings::for_rule(rule_code),
+        )?;
+        assert_messages!(snapshot, diagnostics);
+        Ok(())
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_async/rules/blocking_http_call.rs b/crates/ruff/src/rules/flake8_async/rules/blocking_http_call.rs
new file mode 100644
index 0000000000000..e7d72f8e4579d
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_async/rules/blocking_http_call.rs
@@ -0,0 +1,81 @@
+use rustpython_parser::ast;
+use rustpython_parser::ast::{Expr, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks that async functions do not contain blocking HTTP calls.
+///
+/// ## Why is this bad?
+/// Blocking an async function via a blocking HTTP call will block the entire
+/// event loop, preventing it from executing other tasks while waiting for the
+/// HTTP response, negating the benefits of asynchronous programming.
+///
+/// Instead of making a blocking HTTP call, use an asynchronous HTTP client
+/// library such as `aiohttp` or `httpx`.
+///
+/// ## Example
+/// ```python
+/// async def fetch():
+///     urllib.request.urlopen("https://example.com/foo/bar").read()
+/// ```
+///
+/// Use instead:
+/// ```python
+/// async def fetch():
+///     async with aiohttp.ClientSession() as session:
+///         async with session.get("https://example.com/foo/bar") as resp:
+///             ...
+/// ```
+#[violation]
+pub struct BlockingHttpCallInAsyncFunction;
+
+impl Violation for BlockingHttpCallInAsyncFunction {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Async functions should not call blocking HTTP methods")
+    }
+}
+
+const BLOCKING_HTTP_CALLS: &[&[&str]] = &[
+    &["urllib", "request", "urlopen"],
+    &["httpx", "get"],
+    &["httpx", "post"],
+    &["httpx", "delete"],
+    &["httpx", "patch"],
+    &["httpx", "put"],
+    &["httpx", "head"],
+    &["httpx", "connect"],
+    &["httpx", "options"],
+    &["httpx", "trace"],
+    &["requests", "get"],
+    &["requests", "post"],
+    &["requests", "delete"],
+    &["requests", "patch"],
+    &["requests", "put"],
+    &["requests", "head"],
+    &["requests", "connect"],
+    &["requests", "options"],
+    &["requests", "trace"],
+];
+
+/// ASYNC100
+pub(crate) fn blocking_http_call(checker: &mut Checker, expr: &Expr) {
+    if checker.semantic_model().in_async_context() {
+        if let Expr::Call(ast::ExprCall { func, .. }) = expr {
+            let call_path = checker.semantic_model().resolve_call_path(func);
+            let is_blocking =
+                call_path.map_or(false, |path| BLOCKING_HTTP_CALLS.contains(&path.as_slice()));
+
+            if is_blocking {
+                checker.diagnostics.push(Diagnostic::new(
+                    BlockingHttpCallInAsyncFunction,
+                    func.range(),
+                ));
+            }
+        }
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_async/rules/blocking_os_call.rs b/crates/ruff/src/rules/flake8_async/rules/blocking_os_call.rs
new file mode 100644
index 0000000000000..ab0316f276083
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_async/rules/blocking_os_call.rs
@@ -0,0 +1,73 @@
+use rustpython_parser::ast;
+use rustpython_parser::ast::{Expr, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks that async functions do not contain calls to blocking synchronous
+/// process calls via the `os` module.
+///
+/// ## Why is this bad?
+/// Blocking an async function via a blocking call will block the entire
+/// event loop, preventing it from executing other tasks while waiting for the
+/// call to complete, negating the benefits of asynchronous programming.
+///
+/// Instead of making a blocking call, use an equivalent asynchronous library
+/// or function.
+///
+/// ## Example
+/// ```python
+/// async def foo():
+///     os.popen()
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def foo():
+///     os.popen()
+/// ```
+#[violation]
+pub struct BlockingOsCallInAsyncFunction;
+
+impl Violation for BlockingOsCallInAsyncFunction {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Async functions should not call synchronous `os` methods")
+    }
+}
+
+const UNSAFE_OS_METHODS: &[&[&str]] = &[
+    &["os", "popen"],
+    &["os", "posix_spawn"],
+    &["os", "posix_spawnp"],
+    &["os", "spawnl"],
+    &["os", "spawnle"],
+    &["os", "spawnlp"],
+    &["os", "spawnlpe"],
+    &["os", "spawnv"],
+    &["os", "spawnve"],
+    &["os", "spawnvp"],
+    &["os", "spawnvpe"],
+    &["os", "system"],
+];
+
+/// ASYNC102
+pub(crate) fn blocking_os_call(checker: &mut Checker, expr: &Expr) {
+    if checker.semantic_model().in_async_context() {
+        if let Expr::Call(ast::ExprCall { func, .. }) = expr {
+            let is_unsafe_os_method = checker
+                .semantic_model()
+                .resolve_call_path(func)
+                .map_or(false, |path| UNSAFE_OS_METHODS.contains(&path.as_slice()));
+
+            if is_unsafe_os_method {
+                checker
+                    .diagnostics
+                    .push(Diagnostic::new(BlockingOsCallInAsyncFunction, func.range()));
+            }
+        }
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_async/rules/mod.rs b/crates/ruff/src/rules/flake8_async/rules/mod.rs
new file mode 100644
index 0000000000000..0f6e8faaca1e6
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_async/rules/mod.rs
@@ -0,0 +1,9 @@
+pub(crate) use blocking_http_call::{blocking_http_call, BlockingHttpCallInAsyncFunction};
+pub(crate) use blocking_os_call::{blocking_os_call, BlockingOsCallInAsyncFunction};
+pub(crate) use open_sleep_or_subprocess_call::{
+    open_sleep_or_subprocess_call, OpenSleepOrSubprocessInAsyncFunction,
+};
+
+mod blocking_http_call;
+mod blocking_os_call;
+mod open_sleep_or_subprocess_call;
diff --git a/crates/ruff/src/rules/flake8_async/rules/open_sleep_or_subprocess_call.rs b/crates/ruff/src/rules/flake8_async/rules/open_sleep_or_subprocess_call.rs
new file mode 100644
index 0000000000000..1a252118c76d3
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_async/rules/open_sleep_or_subprocess_call.rs
@@ -0,0 +1,79 @@
+use rustpython_parser::ast;
+use rustpython_parser::ast::{Expr, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks that async functions do not contain calls to `open`, `time.sleep`,
+/// or `subprocess` methods.
+///
+/// ## Why is this bad?
+/// Blocking an async function via a blocking call will block the entire
+/// event loop, preventing it from executing other tasks while waiting for the
+/// call to complete, negating the benefits of asynchronous programming.
+///
+/// Instead of making a blocking call, use an equivalent asynchronous library
+/// or function.
+///
+/// ## Example
+/// ```python
+/// async def foo():
+///     time.sleep(1000)
+/// ```
+///
+/// Use instead:
+/// ```python
+/// async def foo():
+///     await asyncio.sleep(1000)
+/// ```
+#[violation]
+pub struct OpenSleepOrSubprocessInAsyncFunction;
+
+impl Violation for OpenSleepOrSubprocessInAsyncFunction {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Async functions should not call `open`, `time.sleep`, or `subprocess` methods")
+    }
+}
+
+const OPEN_SLEEP_OR_SUBPROCESS_CALL: &[&[&str]] = &[
+    &["", "open"],
+    &["time", "sleep"],
+    &["subprocess", "run"],
+    &["subprocess", "Popen"],
+    // Deprecated subprocess calls:
+    &["subprocess", "call"],
+    &["subprocess", "check_call"],
+    &["subprocess", "check_output"],
+    &["subprocess", "getoutput"],
+    &["subprocess", "getstatusoutput"],
+    &["os", "wait"],
+    &["os", "wait3"],
+    &["os", "wait4"],
+    &["os", "waitid"],
+    &["os", "waitpid"],
+];
+
+/// ASYNC101
+pub(crate) fn open_sleep_or_subprocess_call(checker: &mut Checker, expr: &Expr) {
+    if checker.semantic_model().in_async_context() {
+        if let Expr::Call(ast::ExprCall { func, .. }) = expr {
+            let is_open_sleep_or_subprocess_call = checker
+                .semantic_model()
+                .resolve_call_path(func)
+                .map_or(false, |path| {
+                    OPEN_SLEEP_OR_SUBPROCESS_CALL.contains(&path.as_slice())
+                });
+
+            if is_open_sleep_or_subprocess_call {
+                checker.diagnostics.push(Diagnostic::new(
+                    OpenSleepOrSubprocessInAsyncFunction,
+                    func.range(),
+                ));
+            }
+        }
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_async/snapshots/ruff__rules__flake8_async__tests__ASYNC100_ASYNC100.py.snap b/crates/ruff/src/rules/flake8_async/snapshots/ruff__rules__flake8_async__tests__ASYNC100_ASYNC100.py.snap
new file mode 100644
index 0000000000000..233e7b4c93431
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_async/snapshots/ruff__rules__flake8_async__tests__ASYNC100_ASYNC100.py.snap
@@ -0,0 +1,39 @@
+---
+source: crates/ruff/src/rules/flake8_async/mod.rs
+---
+ASYNC100.py:7:5: ASYNC100 Async functions should not call blocking HTTP methods
+  |
+7 | async def foo():
+8 |     urllib.request.urlopen("http://example.com/foo/bar").read()
+  |     ^^^^^^^^^^^^^^^^^^^^^^ ASYNC100
+  |
+
+ASYNC100.py:11:5: ASYNC100 Async functions should not call blocking HTTP methods
+   |
+11 | async def foo():
+12 |     requests.get()
+   |     ^^^^^^^^^^^^ ASYNC100
+   |
+
+ASYNC100.py:15:5: ASYNC100 Async functions should not call blocking HTTP methods
+   |
+15 | async def foo():
+16 |     httpx.get()
+   |     ^^^^^^^^^ ASYNC100
+   |
+
+ASYNC100.py:19:5: ASYNC100 Async functions should not call blocking HTTP methods
+   |
+19 | async def foo():
+20 |     requests.post()
+   |     ^^^^^^^^^^^^^ ASYNC100
+   |
+
+ASYNC100.py:23:5: ASYNC100 Async functions should not call blocking HTTP methods
+   |
+23 | async def foo():
+24 |     httpx.post()
+   |     ^^^^^^^^^^ ASYNC100
+   |
+
+
diff --git a/crates/ruff/src/rules/flake8_async/snapshots/ruff__rules__flake8_async__tests__ASYNC101_ASYNC101.py.snap b/crates/ruff/src/rules/flake8_async/snapshots/ruff__rules__flake8_async__tests__ASYNC101_ASYNC101.py.snap
new file mode 100644
index 0000000000000..d7af63516ebd6
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_async/snapshots/ruff__rules__flake8_async__tests__ASYNC101_ASYNC101.py.snap
@@ -0,0 +1,46 @@
+---
+source: crates/ruff/src/rules/flake8_async/mod.rs
+---
+ASYNC101.py:7:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
+  |
+7 | async def foo():
+8 |     open("foo")
+  |     ^^^^ ASYNC101
+  |
+
+ASYNC101.py:11:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
+   |
+11 | async def foo():
+12 |     time.sleep(1)
+   |     ^^^^^^^^^^ ASYNC101
+   |
+
+ASYNC101.py:15:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
+   |
+15 | async def foo():
+16 |     subprocess.run("foo")
+   |     ^^^^^^^^^^^^^^ ASYNC101
+   |
+
+ASYNC101.py:19:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
+   |
+19 | async def foo():
+20 |     subprocess.call("foo")
+   |     ^^^^^^^^^^^^^^^ ASYNC101
+   |
+
+ASYNC101.py:27:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
+   |
+27 | async def foo():
+28 |     os.wait4(10)
+   |     ^^^^^^^^ ASYNC101
+   |
+
+ASYNC101.py:31:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
+   |
+31 | async def foo():
+32 |     os.wait(12)
+   |     ^^^^^^^ ASYNC101
+   |
+
+
diff --git a/crates/ruff/src/rules/flake8_async/snapshots/ruff__rules__flake8_async__tests__ASYNC102_ASYNC102.py.snap b/crates/ruff/src/rules/flake8_async/snapshots/ruff__rules__flake8_async__tests__ASYNC102_ASYNC102.py.snap
new file mode 100644
index 0000000000000..f48cd3405b017
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_async/snapshots/ruff__rules__flake8_async__tests__ASYNC102_ASYNC102.py.snap
@@ -0,0 +1,18 @@
+---
+source: crates/ruff/src/rules/flake8_async/mod.rs
+---
+ASYNC102.py:5:5: ASYNC102 Async functions should not call synchronous `os` methods
+  |
+5 | async def foo():
+6 |     os.popen()
+  |     ^^^^^^^^ ASYNC102
+  |
+
+ASYNC102.py:9:5: ASYNC102 Async functions should not call synchronous `os` methods
+   |
+ 9 | async def foo():
+10 |     os.spawnl()
+   |     ^^^^^^^^^ ASYNC102
+   |
+
+
diff --git a/crates/ruff/src/rules/flake8_bandit/helpers.rs b/crates/ruff/src/rules/flake8_bandit/helpers.rs
index e578cb8430cd0..1de1cc92e16ac 100644
--- a/crates/ruff/src/rules/flake8_bandit/helpers.rs
+++ b/crates/ruff/src/rules/flake8_bandit/helpers.rs
@@ -1,47 +1,41 @@
 use once_cell::sync::Lazy;
 use regex::Regex;
-use rustpython_parser::ast::{Constant, Expr, ExprKind};
+use rustpython_parser::ast::{self, Constant, Expr};
 
-use crate::checkers::ast::Checker;
+use ruff_python_semantic::model::SemanticModel;
 
 static PASSWORD_CANDIDATE_REGEX: Lazy<Regex> = Lazy::new(|| {
     Regex::new(r"(^|_)(?i)(pas+wo?r?d|pass(phrase)?|pwd|token|secrete?)($|_)").unwrap()
 });
 
-pub fn string_literal(expr: &Expr) -> Option<&str> {
-    match &expr.node {
-        ExprKind::Constant {
+pub(crate) fn string_literal(expr: &Expr) -> Option<&str> {
+    match expr {
+        Expr::Constant(ast::ExprConstant {
             value: Constant::Str(string),
             ..
-        } => Some(string),
+        }) => Some(string),
         _ => None,
     }
 }
 
-pub fn matches_password_name(string: &str) -> bool {
+pub(crate) fn matches_password_name(string: &str) -> bool {
     PASSWORD_CANDIDATE_REGEX.is_match(string)
 }
 
-pub fn is_untyped_exception(type_: Option<&Expr>, checker: &Checker) -> bool {
+pub(crate) fn is_untyped_exception(type_: Option<&Expr>, model: &SemanticModel) -> bool {
     type_.map_or(true, |type_| {
-        if let ExprKind::Tuple { elts, .. } = &type_.node {
+        if let Expr::Tuple(ast::ExprTuple { elts, .. }) = &type_ {
             elts.iter().any(|type_| {
-                checker
-                    .ctx
-                    .resolve_call_path(type_)
-                    .map_or(false, |call_path| {
-                        call_path.as_slice() == ["", "Exception"]
-                            || call_path.as_slice() == ["", "BaseException"]
-                    })
-            })
-        } else {
-            checker
-                .ctx
-                .resolve_call_path(type_)
-                .map_or(false, |call_path| {
+                model.resolve_call_path(type_).map_or(false, |call_path| {
                     call_path.as_slice() == ["", "Exception"]
                         || call_path.as_slice() == ["", "BaseException"]
                 })
+            })
+        } else {
+            model.resolve_call_path(type_).map_or(false, |call_path| {
+                call_path.as_slice() == ["", "Exception"]
+                    || call_path.as_slice() == ["", "BaseException"]
+            })
         }
     })
 }
diff --git a/crates/ruff/src/rules/flake8_bandit/mod.rs b/crates/ruff/src/rules/flake8_bandit/mod.rs
index 91cd61a150715..4abd69f58af28 100644
--- a/crates/ruff/src/rules/flake8_bandit/mod.rs
+++ b/crates/ruff/src/rules/flake8_bandit/mod.rs
@@ -7,42 +7,43 @@ pub mod settings;
 mod tests {
     use std::path::Path;
 
-    use crate::assert_messages;
     use anyhow::Result;
-
     use test_case::test_case;
 
+    use crate::assert_messages;
     use crate::registry::Rule;
     use crate::settings::Settings;
     use crate::test::test_path;
 
-    #[test_case(Rule::Assert, Path::new("S101.py"); "S101")]
-    #[test_case(Rule::BadFilePermissions, Path::new("S103.py"); "S103")]
-    #[test_case(Rule::CallWithShellEqualsTrue, Path::new("S604.py"); "S604")]
-    #[test_case(Rule::ExecBuiltin, Path::new("S102.py"); "S102")]
-    #[test_case(Rule::HardcodedBindAllInterfaces, Path::new("S104.py"); "S104")]
-    #[test_case(Rule::HardcodedPasswordDefault, Path::new("S107.py"); "S107")]
-    #[test_case(Rule::HardcodedPasswordFuncArg, Path::new("S106.py"); "S106")]
-    #[test_case(Rule::HardcodedPasswordString, Path::new("S105.py"); "S105")]
-    #[test_case(Rule::HardcodedSQLExpression, Path::new("S608.py"); "S608")]
-    #[test_case(Rule::HardcodedTempFile, Path::new("S108.py"); "S108")]
-    #[test_case(Rule::HashlibInsecureHashFunction, Path::new("S324.py"); "S324")]
-    #[test_case(Rule::Jinja2AutoescapeFalse, Path::new("S701.py"); "S701")]
-    #[test_case(Rule::LoggingConfigInsecureListen, Path::new("S612.py"); "S612")]
-    #[test_case(Rule::RequestWithNoCertValidation, Path::new("S501.py"); "S501")]
-    #[test_case(Rule::RequestWithoutTimeout, Path::new("S113.py"); "S113")]
-    #[test_case(Rule::SnmpInsecureVersion, Path::new("S508.py"); "S508")]
-    #[test_case(Rule::SnmpWeakCryptography, Path::new("S509.py"); "S509")]
-    #[test_case(Rule::StartProcessWithAShell, Path::new("S605.py"); "S605")]
-    #[test_case(Rule::StartProcessWithNoShell, Path::new("S606.py"); "S606")]
-    #[test_case(Rule::StartProcessWithPartialPath, Path::new("S607.py"); "S607")]
-    #[test_case(Rule::SubprocessPopenWithShellEqualsTrue, Path::new("S602.py"); "S602")]
-    #[test_case(Rule::SubprocessWithoutShellEqualsTrue, Path::new("S603.py"); "S603")]
-    #[test_case(Rule::SuspiciousPickleUsage, Path::new("S301.py"); "S301")]
-    #[test_case(Rule::SuspiciousTelnetUsage, Path::new("S312.py"); "S312")]
-    #[test_case(Rule::TryExceptContinue, Path::new("S112.py"); "S112")]
-    #[test_case(Rule::TryExceptPass, Path::new("S110.py"); "S110")]
-    #[test_case(Rule::UnsafeYAMLLoad, Path::new("S506.py"); "S506")]
+    #[test_case(Rule::Assert, Path::new("S101.py"))]
+    #[test_case(Rule::BadFilePermissions, Path::new("S103.py"))]
+    #[test_case(Rule::CallWithShellEqualsTrue, Path::new("S604.py"))]
+    #[test_case(Rule::ExecBuiltin, Path::new("S102.py"))]
+    #[test_case(Rule::HardcodedBindAllInterfaces, Path::new("S104.py"))]
+    #[test_case(Rule::HardcodedPasswordDefault, Path::new("S107.py"))]
+    #[test_case(Rule::HardcodedPasswordFuncArg, Path::new("S106.py"))]
+    #[test_case(Rule::HardcodedPasswordString, Path::new("S105.py"))]
+    #[test_case(Rule::HardcodedSQLExpression, Path::new("S608.py"))]
+    #[test_case(Rule::HardcodedTempFile, Path::new("S108.py"))]
+    #[test_case(Rule::HashlibInsecureHashFunction, Path::new("S324.py"))]
+    #[test_case(Rule::Jinja2AutoescapeFalse, Path::new("S701.py"))]
+    #[test_case(Rule::LoggingConfigInsecureListen, Path::new("S612.py"))]
+    #[test_case(Rule::ParamikoCall, Path::new("S601.py"))]
+    #[test_case(Rule::RequestWithNoCertValidation, Path::new("S501.py"))]
+    #[test_case(Rule::RequestWithoutTimeout, Path::new("S113.py"))]
+    #[test_case(Rule::SnmpInsecureVersion, Path::new("S508.py"))]
+    #[test_case(Rule::SnmpWeakCryptography, Path::new("S509.py"))]
+    #[test_case(Rule::StartProcessWithAShell, Path::new("S605.py"))]
+    #[test_case(Rule::StartProcessWithNoShell, Path::new("S606.py"))]
+    #[test_case(Rule::StartProcessWithPartialPath, Path::new("S607.py"))]
+    #[test_case(Rule::SubprocessPopenWithShellEqualsTrue, Path::new("S602.py"))]
+    #[test_case(Rule::SubprocessWithoutShellEqualsTrue, Path::new("S603.py"))]
+    #[test_case(Rule::SuspiciousPickleUsage, Path::new("S301.py"))]
+    #[test_case(Rule::SuspiciousTelnetUsage, Path::new("S312.py"))]
+    #[test_case(Rule::TryExceptContinue, Path::new("S112.py"))]
+    #[test_case(Rule::TryExceptPass, Path::new("S110.py"))]
+    #[test_case(Rule::UnixCommandWildcardInjection, Path::new("S609.py"))]
+    #[test_case(Rule::UnsafeYAMLLoad, Path::new("S506.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/assert_used.rs b/crates/ruff/src/rules/flake8_bandit/rules/assert_used.rs
index 5678602b245fe..28fba960c0490 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/assert_used.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/assert_used.rs
@@ -1,5 +1,5 @@
 use ruff_text_size::{TextLen, TextRange};
-use rustpython_parser::ast::Stmt;
+use rustpython_parser::ast::{Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -36,6 +36,6 @@ impl Violation for Assert {
 }
 
 /// S101
-pub fn assert_used(stmt: &Stmt) -> Diagnostic {
+pub(crate) fn assert_used(stmt: &Stmt) -> Diagnostic {
     Diagnostic::new(Assert, TextRange::at(stmt.start(), "assert".text_len()))
 }
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/bad_file_permissions.rs b/crates/ruff/src/rules/flake8_bandit/rules/bad_file_permissions.rs
index 65daba361e73a..7bcf81dff6b48 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/bad_file_permissions.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/bad_file_permissions.rs
@@ -1,7 +1,7 @@
 use num_traits::ToPrimitive;
 use once_cell::sync::Lazy;
 use rustc_hash::FxHashMap;
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword, Operator};
+use rustpython_parser::ast::{self, Constant, Expr, Keyword, Operator, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -12,7 +12,7 @@ use crate::checkers::ast::Checker;
 
 #[violation]
 pub struct BadFilePermissions {
-    pub mask: u16,
+    mask: u16,
 }
 
 impl Violation for BadFilePermissions {
@@ -69,15 +69,20 @@ static PYSTAT_MAPPING: Lazy<FxHashMap<&'static str, u16>> = Lazy::new(|| {
 });
 
 fn get_int_value(expr: &Expr) -> Option<u16> {
-    match &expr.node {
-        ExprKind::Constant {
+    match expr {
+        Expr::Constant(ast::ExprConstant {
             value: Constant::Int(value),
             ..
-        } => value.to_u16(),
-        ExprKind::Attribute { .. } => {
+        }) => value.to_u16(),
+        Expr::Attribute(_) => {
             compose_call_path(expr).and_then(|path| PYSTAT_MAPPING.get(path.as_str()).copied())
         }
-        ExprKind::BinOp { left, op, right } => {
+        Expr::BinOp(ast::ExprBinOp {
+            left,
+            op,
+            right,
+            range: _,
+        }) => {
             if let (Some(left_value), Some(right_value)) =
                 (get_int_value(left), get_int_value(right))
             {
@@ -96,14 +101,14 @@ fn get_int_value(expr: &Expr) -> Option<u16> {
 }
 
 /// S103
-pub fn bad_file_permissions(
+pub(crate) fn bad_file_permissions(
     checker: &mut Checker,
     func: &Expr,
     args: &[Expr],
     keywords: &[Keyword],
 ) {
     if checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(func)
         .map_or(false, |call_path| call_path.as_slice() == ["os", "chmod"])
     {
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/exec_used.rs b/crates/ruff/src/rules/flake8_bandit/rules/exec_used.rs
index d54dee0850d41..3ff3db8dedc87 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/exec_used.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/exec_used.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -14,8 +14,8 @@ impl Violation for ExecBuiltin {
 }
 
 /// S102
-pub fn exec_used(expr: &Expr, func: &Expr) -> Option<Diagnostic> {
-    let ExprKind::Name { id, .. } = &func.node else {
+pub(crate) fn exec_used(expr: &Expr, func: &Expr) -> Option<Diagnostic> {
+    let Expr::Name(ast::ExprName { id, .. }) = func else {
         return None;
     };
     if id != "exec" {
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_bind_all_interfaces.rs b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_bind_all_interfaces.rs
index a74288a8416c8..86f68e10b8c42 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_bind_all_interfaces.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_bind_all_interfaces.rs
@@ -1,6 +1,7 @@
+use ruff_text_size::TextRange;
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_text_size::TextRange;
 
 #[violation]
 pub struct HardcodedBindAllInterfaces;
@@ -13,7 +14,7 @@ impl Violation for HardcodedBindAllInterfaces {
 }
 
 /// S104
-pub fn hardcoded_bind_all_interfaces(value: &str, range: TextRange) -> Option<Diagnostic> {
+pub(crate) fn hardcoded_bind_all_interfaces(value: &str, range: TextRange) -> Option<Diagnostic> {
     if value == "0.0.0.0" {
         Some(Diagnostic::new(HardcodedBindAllInterfaces, range))
     } else {
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_default.rs b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_default.rs
index 76669b993cf83..0f61c414dfd89 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_default.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_default.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Arg, Arguments, Expr};
+use rustpython_parser::ast::{Arg, Arguments, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -7,33 +7,36 @@ use super::super::helpers::{matches_password_name, string_literal};
 
 #[violation]
 pub struct HardcodedPasswordDefault {
-    pub string: String,
+    name: String,
 }
 
 impl Violation for HardcodedPasswordDefault {
     #[derive_message_formats]
     fn message(&self) -> String {
-        let HardcodedPasswordDefault { string } = self;
-        format!("Possible hardcoded password: \"{}\"", string.escape_debug())
+        let HardcodedPasswordDefault { name } = self;
+        format!(
+            "Possible hardcoded password assigned to function default: \"{}\"",
+            name.escape_debug()
+        )
     }
 }
 
 fn check_password_kwarg(arg: &Arg, default: &Expr) -> Option<Diagnostic> {
-    let string = string_literal(default).filter(|string| !string.is_empty())?;
-    let kwarg_name = &arg.node.arg;
+    string_literal(default).filter(|string| !string.is_empty())?;
+    let kwarg_name = &arg.arg;
     if !matches_password_name(kwarg_name) {
         return None;
     }
     Some(Diagnostic::new(
         HardcodedPasswordDefault {
-            string: string.to_string(),
+            name: kwarg_name.to_string(),
         },
         default.range(),
     ))
 }
 
 /// S107
-pub fn hardcoded_password_default(arguments: &Arguments) -> Vec<Diagnostic> {
+pub(crate) fn hardcoded_password_default(arguments: &Arguments) -> Vec<Diagnostic> {
     let mut diagnostics: Vec<Diagnostic> = Vec::new();
 
     let defaults_start =
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_func_arg.rs b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_func_arg.rs
index f64e6abd74cca..b98b5e5efa159 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_func_arg.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_func_arg.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::Keyword;
+use rustpython_parser::ast::{Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -7,30 +7,33 @@ use super::super::helpers::{matches_password_name, string_literal};
 
 #[violation]
 pub struct HardcodedPasswordFuncArg {
-    pub string: String,
+    name: String,
 }
 
 impl Violation for HardcodedPasswordFuncArg {
     #[derive_message_formats]
     fn message(&self) -> String {
-        let HardcodedPasswordFuncArg { string } = self;
-        format!("Possible hardcoded password: \"{}\"", string.escape_debug())
+        let HardcodedPasswordFuncArg { name } = self;
+        format!(
+            "Possible hardcoded password assigned to argument: \"{}\"",
+            name.escape_debug()
+        )
     }
 }
 
 /// S106
-pub fn hardcoded_password_func_arg(keywords: &[Keyword]) -> Vec<Diagnostic> {
+pub(crate) fn hardcoded_password_func_arg(keywords: &[Keyword]) -> Vec<Diagnostic> {
     keywords
         .iter()
         .filter_map(|keyword| {
-            let string = string_literal(&keyword.node.value).filter(|string| !string.is_empty())?;
-            let arg = keyword.node.arg.as_ref()?;
+            string_literal(&keyword.value).filter(|string| !string.is_empty())?;
+            let arg = keyword.arg.as_ref()?;
             if !matches_password_name(arg) {
                 return None;
             }
             Some(Diagnostic::new(
                 HardcodedPasswordFuncArg {
-                    string: string.to_string(),
+                    name: arg.to_string(),
                 },
                 keyword.range(),
             ))
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_string.rs b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_string.rs
index 633c7c338ec9e..c69d5cdbe4d5b 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_string.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_string.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Constant, Expr, ExprKind};
+use rustpython_parser::ast::{self, Constant, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -7,49 +7,59 @@ use super::super::helpers::{matches_password_name, string_literal};
 
 #[violation]
 pub struct HardcodedPasswordString {
-    pub string: String,
+    name: String,
 }
 
 impl Violation for HardcodedPasswordString {
     #[derive_message_formats]
     fn message(&self) -> String {
-        let HardcodedPasswordString { string } = self;
-        format!("Possible hardcoded password: \"{}\"", string.escape_debug())
+        let HardcodedPasswordString { name } = self;
+        format!(
+            "Possible hardcoded password assigned to: \"{}\"",
+            name.escape_debug()
+        )
     }
 }
 
-fn is_password_target(target: &Expr) -> bool {
-    let target_name = match &target.node {
+fn password_target(target: &Expr) -> Option<&str> {
+    let target_name = match target {
         // variable = "s3cr3t"
-        ExprKind::Name { id, .. } => id,
+        Expr::Name(ast::ExprName { id, .. }) => id.as_str(),
         // d["password"] = "s3cr3t"
-        ExprKind::Subscript { slice, .. } => match &slice.node {
-            ExprKind::Constant {
+        Expr::Subscript(ast::ExprSubscript { slice, .. }) => match slice.as_ref() {
+            Expr::Constant(ast::ExprConstant {
                 value: Constant::Str(string),
                 ..
-            } => string,
-            _ => return false,
+            }) => string,
+            _ => return None,
         },
         // obj.password = "s3cr3t"
-        ExprKind::Attribute { attr, .. } => attr,
-        _ => return false,
+        Expr::Attribute(ast::ExprAttribute { attr, .. }) => attr,
+        _ => return None,
     };
 
-    matches_password_name(target_name)
+    if matches_password_name(target_name) {
+        Some(target_name)
+    } else {
+        None
+    }
 }
 
 /// S105
-pub fn compare_to_hardcoded_password_string(left: &Expr, comparators: &[Expr]) -> Vec<Diagnostic> {
+pub(crate) fn compare_to_hardcoded_password_string(
+    left: &Expr,
+    comparators: &[Expr],
+) -> Vec<Diagnostic> {
     comparators
         .iter()
         .filter_map(|comp| {
-            let string = string_literal(comp).filter(|string| !string.is_empty())?;
-            if !is_password_target(left) {
+            string_literal(comp).filter(|string| !string.is_empty())?;
+            let Some(name) = password_target(left) else {
                 return None;
-            }
+            };
             Some(Diagnostic::new(
                 HardcodedPasswordString {
-                    string: string.to_string(),
+                    name: name.to_string(),
                 },
                 comp.range(),
             ))
@@ -58,13 +68,19 @@ pub fn compare_to_hardcoded_password_string(left: &Expr, comparators: &[Expr]) -
 }
 
 /// S105
-pub fn assign_hardcoded_password_string(value: &Expr, targets: &[Expr]) -> Option<Diagnostic> {
-    if let Some(string) = string_literal(value).filter(|string| !string.is_empty()) {
+pub(crate) fn assign_hardcoded_password_string(
+    value: &Expr,
+    targets: &[Expr],
+) -> Option<Diagnostic> {
+    if string_literal(value)
+        .filter(|string| !string.is_empty())
+        .is_some()
+    {
         for target in targets {
-            if is_password_target(target) {
+            if let Some(name) = password_target(target) {
                 return Some(Diagnostic::new(
                     HardcodedPasswordString {
-                        string: string.to_string(),
+                        name: name.to_string(),
                     },
                     value.range(),
                 ));
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_sql_expression.rs b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_sql_expression.rs
index 72216ff9d4ae6..4595dce6c73d7 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_sql_expression.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_sql_expression.rs
@@ -1,17 +1,17 @@
 use once_cell::sync::Lazy;
 use regex::Regex;
-use rustpython_parser::ast::{Expr, ExprKind, Operator};
+use rustpython_parser::ast::{self, Expr, Operator, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::{any_over_expr, unparse_expr};
+use ruff_python_ast::helpers::any_over_expr;
 
 use crate::checkers::ast::Checker;
 
 use super::super::helpers::string_literal;
 
 static SQL_REGEX: Lazy<Regex> = Lazy::new(|| {
-    Regex::new(r"(?i)(select\s.*from\s|delete\s+from\s|insert\s+into\s.*values\s|update\s.*set\s)")
+    Regex::new(r"(?i)\b(select\s.+\sfrom\s|delete\s+from\s|(insert|replace)\s.+\svalues\s|update\s.+\sset\s)")
         .unwrap()
 });
 
@@ -53,46 +53,46 @@ fn matches_sql_statement(string: &str) -> bool {
 }
 
 fn unparse_string_format_expression(checker: &mut Checker, expr: &Expr) -> Option<String> {
-    match &expr.node {
+    match expr {
         // "select * from table where val = " + "str" + ...
         // "select * from table where val = %s" % ...
-        ExprKind::BinOp {
+        Expr::BinOp(ast::ExprBinOp {
             op: Operator::Add | Operator::Mod,
             ..
-        } => {
-            let Some(parent) = checker.ctx.current_expr_parent() else {
+        }) => {
+            let Some(parent) = checker.semantic_model().expr_parent() else {
                 if any_over_expr(expr, &has_string_literal) {
-                    return Some(unparse_expr(expr, checker.stylist));
+                    return Some(checker.generator().expr(expr));
                 }
                 return None;
             };
             // Only evaluate the full BinOp, not the nested components.
-            let ExprKind::BinOp { .. } = &parent.node else {
+            let Expr::BinOp(_ )= parent else {
                 if any_over_expr(expr, &has_string_literal) {
-                    return Some(unparse_expr(expr, checker.stylist));
+                    return Some(checker.generator().expr(expr));
                 }
                 return None;
             };
             None
         }
-        ExprKind::Call { func, .. } => {
-            let ExprKind::Attribute{ attr, value, .. } = &func.node else {
+        Expr::Call(ast::ExprCall { func, .. }) => {
+            let Expr::Attribute(ast::ExprAttribute { attr, value, .. }) = func.as_ref() else {
                 return None;
             };
             // "select * from table where val = {}".format(...)
             if attr == "format" && string_literal(value).is_some() {
-                return Some(unparse_expr(expr, checker.stylist));
+                return Some(checker.generator().expr(expr));
             };
             None
         }
         // f"select * from table where val = {val}"
-        ExprKind::JoinedStr { .. } => Some(unparse_expr(expr, checker.stylist)),
+        Expr::JoinedStr(_) => Some(checker.generator().expr(expr)),
         _ => None,
     }
 }
 
 /// S608
-pub fn hardcoded_sql_expression(checker: &mut Checker, expr: &Expr) {
+pub(crate) fn hardcoded_sql_expression(checker: &mut Checker, expr: &Expr) {
     match unparse_string_format_expression(checker, expr) {
         Some(string) if matches_sql_statement(&string) => {
             checker
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_tmp_directory.rs b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_tmp_directory.rs
index 840243c0a2484..8c27763f806bd 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_tmp_directory.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/hardcoded_tmp_directory.rs
@@ -1,11 +1,11 @@
-use rustpython_parser::ast::Expr;
+use rustpython_parser::ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
 #[violation]
 pub struct HardcodedTempFile {
-    pub string: String,
+    string: String,
 }
 
 impl Violation for HardcodedTempFile {
@@ -20,7 +20,7 @@ impl Violation for HardcodedTempFile {
 }
 
 /// S108
-pub fn hardcoded_tmp_directory(
+pub(crate) fn hardcoded_tmp_directory(
     expr: &Expr,
     value: &str,
     prefixes: &[String],
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/hashlib_insecure_hash_functions.rs b/crates/ruff/src/rules/flake8_bandit/rules/hashlib_insecure_hash_functions.rs
index 9ade65368c3d2..6948f6323b310 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/hashlib_insecure_hash_functions.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/hashlib_insecure_hash_functions.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Constant, Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -10,7 +10,7 @@ use super::super::helpers::string_literal;
 
 #[violation]
 pub struct HashlibInsecureHashFunction {
-    pub string: String,
+    string: String,
 }
 
 impl Violation for HashlibInsecureHashFunction {
@@ -26,11 +26,11 @@ const WEAK_HASHES: [&str; 4] = ["md4", "md5", "sha", "sha1"];
 fn is_used_for_security(call_args: &SimpleCallArgs) -> bool {
     match call_args.keyword_argument("usedforsecurity") {
         Some(expr) => !matches!(
-            &expr.node,
-            ExprKind::Constant {
+            expr,
+            Expr::Constant(ast::ExprConstant {
                 value: Constant::Bool(false),
                 ..
-            }
+            })
         ),
         _ => true,
     }
@@ -42,22 +42,27 @@ enum HashlibCall {
 }
 
 /// S324
-pub fn hashlib_insecure_hash_functions(
+pub(crate) fn hashlib_insecure_hash_functions(
     checker: &mut Checker,
     func: &Expr,
     args: &[Expr],
     keywords: &[Keyword],
 ) {
-    if let Some(hashlib_call) = checker.ctx.resolve_call_path(func).and_then(|call_path| {
-        if call_path.as_slice() == ["hashlib", "new"] {
-            Some(HashlibCall::New)
-        } else {
-            WEAK_HASHES
-                .iter()
-                .find(|hash| call_path.as_slice() == ["hashlib", hash])
-                .map(|hash| HashlibCall::WeakHash(hash))
-        }
-    }) {
+    if let Some(hashlib_call) =
+        checker
+            .semantic_model()
+            .resolve_call_path(func)
+            .and_then(|call_path| {
+                if call_path.as_slice() == ["hashlib", "new"] {
+                    Some(HashlibCall::New)
+                } else {
+                    WEAK_HASHES
+                        .iter()
+                        .find(|hash| call_path.as_slice() == ["hashlib", hash])
+                        .map(|hash| HashlibCall::WeakHash(hash))
+                }
+            })
+    {
         match hashlib_call {
             HashlibCall::New => {
                 let call_args = SimpleCallArgs::new(args, keywords);
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/jinja2_autoescape_false.rs b/crates/ruff/src/rules/flake8_bandit/rules/jinja2_autoescape_false.rs
index 519bfafd779c6..06a2e770812b8 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/jinja2_autoescape_false.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/jinja2_autoescape_false.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Constant, Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -8,7 +8,7 @@ use crate::checkers::ast::Checker;
 
 #[violation]
 pub struct Jinja2AutoescapeFalse {
-    pub value: bool,
+    value: bool,
 }
 
 impl Violation for Jinja2AutoescapeFalse {
@@ -30,14 +30,14 @@ impl Violation for Jinja2AutoescapeFalse {
 }
 
 /// S701
-pub fn jinja2_autoescape_false(
+pub(crate) fn jinja2_autoescape_false(
     checker: &mut Checker,
     func: &Expr,
     args: &[Expr],
     keywords: &[Keyword],
 ) {
     if checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(func)
         .map_or(false, |call_path| {
             call_path.as_slice() == ["jinja2", "Environment"]
@@ -46,14 +46,14 @@ pub fn jinja2_autoescape_false(
         let call_args = SimpleCallArgs::new(args, keywords);
 
         if let Some(autoescape_arg) = call_args.keyword_argument("autoescape") {
-            match &autoescape_arg.node {
-                ExprKind::Constant {
+            match autoescape_arg {
+                Expr::Constant(ast::ExprConstant {
                     value: Constant::Bool(true),
                     ..
-                } => (),
-                ExprKind::Call { func, .. } => {
-                    if let ExprKind::Name { id, .. } = &func.node {
-                        if id.as_str() != "select_autoescape" {
+                }) => (),
+                Expr::Call(ast::ExprCall { func, .. }) => {
+                    if let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() {
+                        if id != "select_autoescape" {
                             checker.diagnostics.push(Diagnostic::new(
                                 Jinja2AutoescapeFalse { value: true },
                                 autoescape_arg.range(),
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/logging_config_insecure_listen.rs b/crates/ruff/src/rules/flake8_bandit/rules/logging_config_insecure_listen.rs
index d838fe9dd1b9a..6fc645bb88119 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/logging_config_insecure_listen.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/logging_config_insecure_listen.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, Keyword};
+use rustpython_parser::ast::{Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -17,14 +17,14 @@ impl Violation for LoggingConfigInsecureListen {
 }
 
 /// S612
-pub fn logging_config_insecure_listen(
+pub(crate) fn logging_config_insecure_listen(
     checker: &mut Checker,
     func: &Expr,
     args: &[Expr],
     keywords: &[Keyword],
 ) {
     if checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(func)
         .map_or(false, |call_path| {
             call_path.as_slice() == ["logging", "config", "listen"]
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/mod.rs b/crates/ruff/src/rules/flake8_bandit/rules/mod.rs
index aa836f6eba26e..90f1266e42621 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/mod.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/mod.rs
@@ -1,35 +1,38 @@
-pub use assert_used::{assert_used, Assert};
-pub use bad_file_permissions::{bad_file_permissions, BadFilePermissions};
-pub use exec_used::{exec_used, ExecBuiltin};
-pub use hardcoded_bind_all_interfaces::{
+pub(crate) use assert_used::{assert_used, Assert};
+pub(crate) use bad_file_permissions::{bad_file_permissions, BadFilePermissions};
+pub(crate) use exec_used::{exec_used, ExecBuiltin};
+pub(crate) use hardcoded_bind_all_interfaces::{
     hardcoded_bind_all_interfaces, HardcodedBindAllInterfaces,
 };
-pub use hardcoded_password_default::{hardcoded_password_default, HardcodedPasswordDefault};
-pub use hardcoded_password_func_arg::{hardcoded_password_func_arg, HardcodedPasswordFuncArg};
-pub use hardcoded_password_string::{
+pub(crate) use hardcoded_password_default::{hardcoded_password_default, HardcodedPasswordDefault};
+pub(crate) use hardcoded_password_func_arg::{
+    hardcoded_password_func_arg, HardcodedPasswordFuncArg,
+};
+pub(crate) use hardcoded_password_string::{
     assign_hardcoded_password_string, compare_to_hardcoded_password_string, HardcodedPasswordString,
 };
-pub use hardcoded_sql_expression::{hardcoded_sql_expression, HardcodedSQLExpression};
-pub use hardcoded_tmp_directory::{hardcoded_tmp_directory, HardcodedTempFile};
-pub use hashlib_insecure_hash_functions::{
+pub(crate) use hardcoded_sql_expression::{hardcoded_sql_expression, HardcodedSQLExpression};
+pub(crate) use hardcoded_tmp_directory::{hardcoded_tmp_directory, HardcodedTempFile};
+pub(crate) use hashlib_insecure_hash_functions::{
     hashlib_insecure_hash_functions, HashlibInsecureHashFunction,
 };
-pub use jinja2_autoescape_false::{jinja2_autoescape_false, Jinja2AutoescapeFalse};
-pub use logging_config_insecure_listen::{
+pub(crate) use jinja2_autoescape_false::{jinja2_autoescape_false, Jinja2AutoescapeFalse};
+pub(crate) use logging_config_insecure_listen::{
     logging_config_insecure_listen, LoggingConfigInsecureListen,
 };
-pub use request_with_no_cert_validation::{
+pub(crate) use paramiko_calls::{paramiko_call, ParamikoCall};
+pub(crate) use request_with_no_cert_validation::{
     request_with_no_cert_validation, RequestWithNoCertValidation,
 };
-pub use request_without_timeout::{request_without_timeout, RequestWithoutTimeout};
-pub use shell_injection::{
+pub(crate) use request_without_timeout::{request_without_timeout, RequestWithoutTimeout};
+pub(crate) use shell_injection::{
     shell_injection, CallWithShellEqualsTrue, StartProcessWithAShell, StartProcessWithNoShell,
     StartProcessWithPartialPath, SubprocessPopenWithShellEqualsTrue,
-    SubprocessWithoutShellEqualsTrue,
+    SubprocessWithoutShellEqualsTrue, UnixCommandWildcardInjection,
 };
-pub use snmp_insecure_version::{snmp_insecure_version, SnmpInsecureVersion};
-pub use snmp_weak_cryptography::{snmp_weak_cryptography, SnmpWeakCryptography};
-pub use suspicious_function_call::{
+pub(crate) use snmp_insecure_version::{snmp_insecure_version, SnmpInsecureVersion};
+pub(crate) use snmp_weak_cryptography::{snmp_weak_cryptography, SnmpWeakCryptography};
+pub(crate) use suspicious_function_call::{
     suspicious_function_call, SuspiciousEvalUsage, SuspiciousFTPLibUsage,
     SuspiciousInsecureCipherModeUsage, SuspiciousInsecureCipherUsage, SuspiciousInsecureHashUsage,
     SuspiciousMarkSafeUsage, SuspiciousMarshalUsage, SuspiciousMktempUsage,
@@ -39,9 +42,9 @@ pub use suspicious_function_call::{
     SuspiciousXMLExpatReaderUsage, SuspiciousXMLMiniDOMUsage, SuspiciousXMLPullDOMUsage,
     SuspiciousXMLSaxUsage,
 };
-pub use try_except_continue::{try_except_continue, TryExceptContinue};
-pub use try_except_pass::{try_except_pass, TryExceptPass};
-pub use unsafe_yaml_load::{unsafe_yaml_load, UnsafeYAMLLoad};
+pub(crate) use try_except_continue::{try_except_continue, TryExceptContinue};
+pub(crate) use try_except_pass::{try_except_pass, TryExceptPass};
+pub(crate) use unsafe_yaml_load::{unsafe_yaml_load, UnsafeYAMLLoad};
 
 mod assert_used;
 mod bad_file_permissions;
@@ -55,6 +58,7 @@ mod hardcoded_tmp_directory;
 mod hashlib_insecure_hash_functions;
 mod jinja2_autoescape_false;
 mod logging_config_insecure_listen;
+mod paramiko_calls;
 mod request_with_no_cert_validation;
 mod request_without_timeout;
 mod shell_injection;
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/paramiko_calls.rs b/crates/ruff/src/rules/flake8_bandit/rules/paramiko_calls.rs
new file mode 100644
index 0000000000000..e340a09ca4d41
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_bandit/rules/paramiko_calls.rs
@@ -0,0 +1,31 @@
+use rustpython_parser::ast::{Expr, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+#[violation]
+pub struct ParamikoCall;
+
+impl Violation for ParamikoCall {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Possible shell injection via Paramiko call; check inputs are properly sanitized")
+    }
+}
+
+/// S601
+pub(crate) fn paramiko_call(checker: &mut Checker, func: &Expr) {
+    if checker
+        .semantic_model()
+        .resolve_call_path(func)
+        .map_or(false, |call_path| {
+            call_path.as_slice() == ["paramiko", "exec_command"]
+        })
+    {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(ParamikoCall, func.range()));
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/request_with_no_cert_validation.rs b/crates/ruff/src/rules/flake8_bandit/rules/request_with_no_cert_validation.rs
index 3974eee8fdaef..fe45fb6e769a7 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/request_with_no_cert_validation.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/request_with_no_cert_validation.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Constant, Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -8,7 +8,7 @@ use crate::checkers::ast::Checker;
 
 #[violation]
 pub struct RequestWithNoCertValidation {
-    pub string: String,
+    string: String,
 }
 
 impl Violation for RequestWithNoCertValidation {
@@ -37,29 +37,33 @@ const HTTPX_METHODS: [&str; 11] = [
 ];
 
 /// S501
-pub fn request_with_no_cert_validation(
+pub(crate) fn request_with_no_cert_validation(
     checker: &mut Checker,
     func: &Expr,
     args: &[Expr],
     keywords: &[Keyword],
 ) {
-    if let Some(target) = checker.ctx.resolve_call_path(func).and_then(|call_path| {
-        if call_path.len() == 2 {
-            if call_path[0] == "requests" && REQUESTS_HTTP_VERBS.contains(&call_path[1]) {
-                return Some("requests");
+    if let Some(target) = checker
+        .semantic_model()
+        .resolve_call_path(func)
+        .and_then(|call_path| {
+            if call_path.len() == 2 {
+                if call_path[0] == "requests" && REQUESTS_HTTP_VERBS.contains(&call_path[1]) {
+                    return Some("requests");
+                }
+                if call_path[0] == "httpx" && HTTPX_METHODS.contains(&call_path[1]) {
+                    return Some("httpx");
+                }
             }
-            if call_path[0] == "httpx" && HTTPX_METHODS.contains(&call_path[1]) {
-                return Some("httpx");
-            }
-        }
-        None
-    }) {
+            None
+        })
+    {
         let call_args = SimpleCallArgs::new(args, keywords);
         if let Some(verify_arg) = call_args.keyword_argument("verify") {
-            if let ExprKind::Constant {
+            if let Expr::Constant(ast::ExprConstant {
                 value: Constant::Bool(false),
                 ..
-            } = &verify_arg.node
+            }) = &verify_arg
             {
                 checker.diagnostics.push(Diagnostic::new(
                     RequestWithNoCertValidation {
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/request_without_timeout.rs b/crates/ruff/src/rules/flake8_bandit/rules/request_without_timeout.rs
index 0ac9bf93b4fa7..b08edbd4faf22 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/request_without_timeout.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/request_without_timeout.rs
@@ -1,8 +1,8 @@
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Constant, Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::{unparse_constant, SimpleCallArgs};
+use ruff_python_ast::helpers::SimpleCallArgs;
 
 use crate::checkers::ast::Checker;
 
@@ -27,14 +27,14 @@ impl Violation for RequestWithoutTimeout {
 const HTTP_VERBS: [&str; 7] = ["get", "options", "head", "post", "put", "patch", "delete"];
 
 /// S113
-pub fn request_without_timeout(
+pub(crate) fn request_without_timeout(
     checker: &mut Checker,
     func: &Expr,
     args: &[Expr],
     keywords: &[Keyword],
 ) {
     if checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(func)
         .map_or(false, |call_path| {
             HTTP_VERBS
@@ -44,11 +44,11 @@ pub fn request_without_timeout(
     {
         let call_args = SimpleCallArgs::new(args, keywords);
         if let Some(timeout_arg) = call_args.keyword_argument("timeout") {
-            if let Some(timeout) = match &timeout_arg.node {
-                ExprKind::Constant {
+            if let Some(timeout) = match timeout_arg {
+                Expr::Constant(ast::ExprConstant {
                     value: value @ Constant::None,
                     ..
-                } => Some(unparse_constant(value, checker.stylist)),
+                }) => Some(checker.generator().constant(value)),
                 _ => None,
             } {
                 checker.diagnostics.push(Diagnostic::new(
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/shell_injection.rs b/crates/ruff/src/rules/flake8_bandit/rules/shell_injection.rs
index dec37b05ff022..6eb6c9f5e2149 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/shell_injection.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/shell_injection.rs
@@ -1,20 +1,16 @@
 //! Checks relating to shell injection.
 
-use once_cell::sync::Lazy;
-use regex::Regex;
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Constant, Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::Truthiness;
-use ruff_python_semantic::context::Context;
+use ruff_python_semantic::model::SemanticModel;
 
 use crate::{
     checkers::ast::Checker, registry::Rule, rules::flake8_bandit::helpers::string_literal,
 };
 
-static FULL_PATH_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"^([A-Za-z]:|[\\/.])").unwrap());
-
 #[violation]
 pub struct SubprocessPopenWithShellEqualsTrue {
     seems_safe: bool,
@@ -89,114 +85,35 @@ impl Violation for StartProcessWithPartialPath {
     }
 }
 
-#[derive(Copy, Clone, Debug)]
-enum CallKind {
-    Subprocess,
-    Shell,
-    NoShell,
-}
-
-/// Return the [`CallKind`] of the given function call.
-fn get_call_kind(func: &Expr, context: &Context) -> Option<CallKind> {
-    context
-        .resolve_call_path(func)
-        .and_then(|call_path| match call_path.as_slice() {
-            &[module, submodule] => match module {
-                "os" => match submodule {
-                    "execl" | "execle" | "execlp" | "execlpe" | "execv" | "execve" | "execvp"
-                    | "execvpe" | "spawnl" | "spawnle" | "spawnlp" | "spawnlpe" | "spawnv"
-                    | "spawnve" | "spawnvp" | "spawnvpe" | "startfile" => Some(CallKind::NoShell),
-                    "system" | "popen" | "popen2" | "popen3" | "popen4" => Some(CallKind::Shell),
-                    _ => None,
-                },
-                "subprocess" => match submodule {
-                    "Popen" | "call" | "check_call" | "check_output" | "run" => {
-                        Some(CallKind::Subprocess)
-                    }
-                    _ => None,
-                },
-                "popen2" => match submodule {
-                    "popen2" | "popen3" | "popen4" | "Popen3" | "Popen4" => Some(CallKind::Shell),
-                    _ => None,
-                },
-                "commands" => match submodule {
-                    "getoutput" | "getstatusoutput" => Some(CallKind::Shell),
-                    _ => None,
-                },
-                _ => None,
-            },
-            _ => None,
-        })
-}
-
-#[derive(Copy, Clone, Debug)]
-struct ShellKeyword<'a> {
-    /// Whether the `shell` keyword argument is set and evaluates to `True`.
-    truthiness: Truthiness,
-    /// The `shell` keyword argument.
-    keyword: &'a Keyword,
-}
-
-/// Return the `shell` keyword argument to the given function call, if any.
-fn find_shell_keyword<'a>(ctx: &Context, keywords: &'a [Keyword]) -> Option<ShellKeyword<'a>> {
-    keywords
-        .iter()
-        .find(|keyword| {
-            keyword
-                .node
-                .arg
-                .as_ref()
-                .map_or(false, |arg| arg == "shell")
-        })
-        .map(|keyword| ShellKeyword {
-            truthiness: Truthiness::from_expr(&keyword.node.value, |id| ctx.is_builtin(id)),
-            keyword,
-        })
-}
-
-/// Return `true` if the value provided to the `shell` call seems safe. This is based on Bandit's
-/// definition: string literals are considered okay, but dynamically-computed values are not.
-fn shell_call_seems_safe(arg: &Expr) -> bool {
-    matches!(
-        arg.node,
-        ExprKind::Constant {
-            value: Constant::Str(_),
-            ..
-        }
-    )
-}
+#[violation]
+pub struct UnixCommandWildcardInjection;
 
-/// Return the [`Expr`] as a string literal, if it's a string or a list of strings.
-fn try_string_literal(expr: &Expr) -> Option<&str> {
-    match &expr.node {
-        ExprKind::List { elts, .. } => {
-            if elts.is_empty() {
-                None
-            } else {
-                string_literal(&elts[0])
-            }
-        }
-        _ => string_literal(expr),
+impl Violation for UnixCommandWildcardInjection {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Possible wildcard injection in call due to `*` usage")
     }
 }
 
-/// S602, S603, S604, S605, S606, S607
-pub fn shell_injection(checker: &mut Checker, func: &Expr, args: &[Expr], keywords: &[Keyword]) {
-    let call_kind = get_call_kind(func, &checker.ctx);
+/// S602, S603, S604, S605, S606, S607, S609
+pub(crate) fn shell_injection(
+    checker: &mut Checker,
+    func: &Expr,
+    args: &[Expr],
+    keywords: &[Keyword],
+) {
+    let call_kind = get_call_kind(func, checker.semantic_model());
+    let shell_keyword = find_shell_keyword(checker.semantic_model(), keywords);
 
     if matches!(call_kind, Some(CallKind::Subprocess)) {
         if let Some(arg) = args.first() {
-            match find_shell_keyword(&checker.ctx, keywords) {
+            match shell_keyword {
                 // S602
                 Some(ShellKeyword {
                     truthiness: Truthiness::Truthy,
                     keyword,
                 }) => {
-                    if checker
-                        .settings
-                        .rules
-                        .enabled(Rule::SubprocessPopenWithShellEqualsTrue)
-                    {
+                    if checker.enabled(Rule::SubprocessPopenWithShellEqualsTrue) {
                         checker.diagnostics.push(Diagnostic::new(
                             SubprocessPopenWithShellEqualsTrue {
                                 seems_safe: shell_call_seems_safe(arg),
@@ -210,11 +127,7 @@ pub fn shell_injection(checker: &mut Checker, func: &Expr, args: &[Expr], keywor
                     truthiness: Truthiness::Falsey | Truthiness::Unknown,
                     keyword,
                 }) => {
-                    if checker
-                        .settings
-                        .rules
-                        .enabled(Rule::SubprocessWithoutShellEqualsTrue)
-                    {
+                    if checker.enabled(Rule::SubprocessWithoutShellEqualsTrue) {
                         checker.diagnostics.push(Diagnostic::new(
                             SubprocessWithoutShellEqualsTrue,
                             keyword.range(),
@@ -223,11 +136,7 @@ pub fn shell_injection(checker: &mut Checker, func: &Expr, args: &[Expr], keywor
                 }
                 // S603
                 None => {
-                    if checker
-                        .settings
-                        .rules
-                        .enabled(Rule::SubprocessWithoutShellEqualsTrue)
-                    {
+                    if checker.enabled(Rule::SubprocessWithoutShellEqualsTrue) {
                         checker.diagnostics.push(Diagnostic::new(
                             SubprocessWithoutShellEqualsTrue,
                             arg.range(),
@@ -239,14 +148,10 @@ pub fn shell_injection(checker: &mut Checker, func: &Expr, args: &[Expr], keywor
     } else if let Some(ShellKeyword {
         truthiness: Truthiness::Truthy,
         keyword,
-    }) = find_shell_keyword(&checker.ctx, keywords)
+    }) = shell_keyword
     {
         // S604
-        if checker
-            .settings
-            .rules
-            .enabled(Rule::CallWithShellEqualsTrue)
-        {
+        if checker.enabled(Rule::CallWithShellEqualsTrue) {
             checker
                 .diagnostics
                 .push(Diagnostic::new(CallWithShellEqualsTrue, keyword.range()));
@@ -254,9 +159,9 @@ pub fn shell_injection(checker: &mut Checker, func: &Expr, args: &[Expr], keywor
     }
 
     // S605
-    if matches!(call_kind, Some(CallKind::Shell)) {
-        if let Some(arg) = args.first() {
-            if checker.settings.rules.enabled(Rule::StartProcessWithAShell) {
+    if checker.enabled(Rule::StartProcessWithAShell) {
+        if matches!(call_kind, Some(CallKind::Shell)) {
+            if let Some(arg) = args.first() {
                 checker.diagnostics.push(Diagnostic::new(
                     StartProcessWithAShell {
                         seems_safe: shell_call_seems_safe(arg),
@@ -268,12 +173,8 @@ pub fn shell_injection(checker: &mut Checker, func: &Expr, args: &[Expr], keywor
     }
 
     // S606
-    if matches!(call_kind, Some(CallKind::NoShell)) {
-        if checker
-            .settings
-            .rules
-            .enabled(Rule::StartProcessWithNoShell)
-        {
+    if checker.enabled(Rule::StartProcessWithNoShell) {
+        if matches!(call_kind, Some(CallKind::NoShell)) {
             checker
                 .diagnostics
                 .push(Diagnostic::new(StartProcessWithNoShell, func.range()));
@@ -281,21 +182,195 @@ pub fn shell_injection(checker: &mut Checker, func: &Expr, args: &[Expr], keywor
     }
 
     // S607
-    if call_kind.is_some() {
-        if let Some(arg) = args.first() {
-            if checker
-                .settings
-                .rules
-                .enabled(Rule::StartProcessWithPartialPath)
-            {
-                if let Some(value) = try_string_literal(arg) {
-                    if FULL_PATH_REGEX.find(value).is_none() {
-                        checker
-                            .diagnostics
-                            .push(Diagnostic::new(StartProcessWithPartialPath, arg.range()));
-                    }
+    if checker.enabled(Rule::StartProcessWithPartialPath) {
+        if call_kind.is_some() {
+            if let Some(arg) = args.first() {
+                if is_partial_path(arg) {
+                    checker
+                        .diagnostics
+                        .push(Diagnostic::new(StartProcessWithPartialPath, arg.range()));
+                }
+            }
+        }
+    }
+
+    // S609
+    if checker.enabled(Rule::UnixCommandWildcardInjection) {
+        if matches!(call_kind, Some(CallKind::Shell))
+            || matches!(
+                (call_kind, shell_keyword),
+                (
+                    Some(CallKind::Subprocess),
+                    Some(ShellKeyword {
+                        truthiness: Truthiness::Truthy,
+                        keyword: _,
+                    })
+                )
+            )
+        {
+            if let Some(arg) = args.first() {
+                if is_wildcard_command(arg) {
+                    checker
+                        .diagnostics
+                        .push(Diagnostic::new(UnixCommandWildcardInjection, func.range()));
                 }
             }
         }
     }
 }
+
+#[derive(Copy, Clone, Debug)]
+enum CallKind {
+    Subprocess,
+    Shell,
+    NoShell,
+}
+
+/// Return the [`CallKind`] of the given function call.
+fn get_call_kind(func: &Expr, model: &SemanticModel) -> Option<CallKind> {
+    model
+        .resolve_call_path(func)
+        .and_then(|call_path| match call_path.as_slice() {
+            &[module, submodule] => match module {
+                "os" => match submodule {
+                    "execl" | "execle" | "execlp" | "execlpe" | "execv" | "execve" | "execvp"
+                    | "execvpe" | "spawnl" | "spawnle" | "spawnlp" | "spawnlpe" | "spawnv"
+                    | "spawnve" | "spawnvp" | "spawnvpe" | "startfile" => Some(CallKind::NoShell),
+                    "system" | "popen" | "popen2" | "popen3" | "popen4" => Some(CallKind::Shell),
+                    _ => None,
+                },
+                "subprocess" => match submodule {
+                    "Popen" | "call" | "check_call" | "check_output" | "run" => {
+                        Some(CallKind::Subprocess)
+                    }
+                    _ => None,
+                },
+                "popen2" => match submodule {
+                    "popen2" | "popen3" | "popen4" | "Popen3" | "Popen4" => Some(CallKind::Shell),
+                    _ => None,
+                },
+                "commands" => match submodule {
+                    "getoutput" | "getstatusoutput" => Some(CallKind::Shell),
+                    _ => None,
+                },
+                _ => None,
+            },
+            _ => None,
+        })
+}
+
+#[derive(Copy, Clone, Debug)]
+struct ShellKeyword<'a> {
+    /// Whether the `shell` keyword argument is set and evaluates to `True`.
+    truthiness: Truthiness,
+    /// The `shell` keyword argument.
+    keyword: &'a Keyword,
+}
+
+/// Return the `shell` keyword argument to the given function call, if any.
+fn find_shell_keyword<'a>(
+    model: &SemanticModel,
+    keywords: &'a [Keyword],
+) -> Option<ShellKeyword<'a>> {
+    keywords
+        .iter()
+        .find(|keyword| keyword.arg.as_ref().map_or(false, |arg| arg == "shell"))
+        .map(|keyword| ShellKeyword {
+            truthiness: Truthiness::from_expr(&keyword.value, |id| model.is_builtin(id)),
+            keyword,
+        })
+}
+
+/// Return `true` if the value provided to the `shell` call seems safe. This is based on Bandit's
+/// definition: string literals are considered okay, but dynamically-computed values are not.
+fn shell_call_seems_safe(arg: &Expr) -> bool {
+    matches!(
+        arg,
+        Expr::Constant(ast::ExprConstant {
+            value: Constant::Str(_),
+            ..
+        })
+    )
+}
+
+/// Return `true` if the string appears to be a full file path.
+///
+/// ## Examples
+/// ```python
+/// import subprocess
+///
+/// os.system("/bin/ls")
+/// os.system("./bin/ls")
+/// os.system(["/bin/ls"])
+/// os.system(["/bin/ls", "/tmp"])
+/// os.system(r"C:\\bin\ls")
+fn is_full_path(text: &str) -> bool {
+    let mut chars = text.chars();
+    let Some(first_char) = chars.next() else {
+        return false;
+    };
+
+    // Ex) `/bin/ls`
+    if first_char == '\\' || first_char == '/' || first_char == '.' {
+        return true;
+    }
+
+    // Ex) `C:`
+    if first_char.is_alphabetic() {
+        if let Some(second_char) = chars.next() {
+            if second_char == ':' {
+                return true;
+            }
+        }
+    }
+
+    false
+}
+
+/// Return `true` if the [`Expr`] is a string literal or list of string literals that starts with a
+/// partial path.
+fn is_partial_path(expr: &Expr) -> bool {
+    let string_literal = match expr {
+        Expr::List(ast::ExprList { elts, .. }) => elts.first().and_then(string_literal),
+        _ => string_literal(expr),
+    };
+    string_literal.map_or(false, |text| !is_full_path(text))
+}
+
+/// Return `true` if the [`Expr`] is a wildcard command.
+///
+/// ## Examples
+/// ```python
+/// import subprocess
+///
+/// subprocess.Popen("/bin/chown root: *", shell=True)
+/// subprocess.Popen(["/usr/local/bin/rsync", "*", "some_where:"], shell=True)
+/// ```
+fn is_wildcard_command(expr: &Expr) -> bool {
+    if let Expr::List(ast::ExprList { elts, .. }) = expr {
+        let mut has_star = false;
+        let mut has_command = false;
+        for elt in elts.iter() {
+            if let Some(text) = string_literal(elt) {
+                has_star |= text.contains('*');
+                has_command |= text.contains("chown")
+                    || text.contains("chmod")
+                    || text.contains("tar")
+                    || text.contains("rsync");
+            }
+            if has_star && has_command {
+                break;
+            }
+        }
+        has_star && has_command
+    } else {
+        let string_literal = string_literal(expr);
+        string_literal.map_or(false, |text| {
+            text.contains('*')
+                && (text.contains("chown")
+                    || text.contains("chmod")
+                    || text.contains("tar")
+                    || text.contains("rsync"))
+        })
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/snmp_insecure_version.rs b/crates/ruff/src/rules/flake8_bandit/rules/snmp_insecure_version.rs
index 1a32c9620b587..60fc3b33dda77 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/snmp_insecure_version.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/snmp_insecure_version.rs
@@ -1,5 +1,5 @@
 use num_traits::{One, Zero};
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Constant, Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -18,14 +18,14 @@ impl Violation for SnmpInsecureVersion {
 }
 
 /// S508
-pub fn snmp_insecure_version(
+pub(crate) fn snmp_insecure_version(
     checker: &mut Checker,
     func: &Expr,
     args: &[Expr],
     keywords: &[Keyword],
 ) {
     if checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(func)
         .map_or(false, |call_path| {
             call_path.as_slice() == ["pysnmp", "hlapi", "CommunityData"]
@@ -33,10 +33,10 @@ pub fn snmp_insecure_version(
     {
         let call_args = SimpleCallArgs::new(args, keywords);
         if let Some(mp_model_arg) = call_args.keyword_argument("mpModel") {
-            if let ExprKind::Constant {
+            if let Expr::Constant(ast::ExprConstant {
                 value: Constant::Int(value),
                 ..
-            } = &mp_model_arg.node
+            }) = &mp_model_arg
             {
                 if value.is_zero() || value.is_one() {
                     checker
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/snmp_weak_cryptography.rs b/crates/ruff/src/rules/flake8_bandit/rules/snmp_weak_cryptography.rs
index 72a586a8fbfa2..313c32a187e9d 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/snmp_weak_cryptography.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/snmp_weak_cryptography.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, Keyword};
+use rustpython_parser::ast::{Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -20,14 +20,14 @@ impl Violation for SnmpWeakCryptography {
 }
 
 /// S509
-pub fn snmp_weak_cryptography(
+pub(crate) fn snmp_weak_cryptography(
     checker: &mut Checker,
     func: &Expr,
     args: &[Expr],
     keywords: &[Keyword],
 ) {
     if checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(func)
         .map_or(false, |call_path| {
             call_path.as_slice() == ["pysnmp", "hlapi", "UsmUserData"]
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/suspicious_function_call.rs b/crates/ruff/src/rules/flake8_bandit/rules/suspicious_function_call.rs
index 2921c9569be0d..6c6eba80feb99 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/suspicious_function_call.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/suspicious_function_call.rs
@@ -1,7 +1,7 @@
 //! Check for calls to suspicious functions, or calls into suspicious modules.
 //!
 //! See: <https://bandit.readthedocs.io/en/latest/blacklists/blacklist_calls.html>
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, DiagnosticKind, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -220,7 +220,7 @@ impl Violation for SuspiciousFTPLibUsage {
 }
 
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum Reason {
+pub(crate) enum Reason {
     Pickle,
     Marshal,
     InsecureHash,
@@ -250,7 +250,7 @@ struct SuspiciousMembers<'a> {
 }
 
 impl<'a> SuspiciousMembers<'a> {
-    pub const fn new(members: &'a [&'a [&'a str]], reason: Reason) -> Self {
+    pub(crate) const fn new(members: &'a [&'a [&'a str]], reason: Reason) -> Self {
         Self { members, reason }
     }
 }
@@ -261,7 +261,7 @@ struct SuspiciousModule<'a> {
 }
 
 impl<'a> SuspiciousModule<'a> {
-    pub const fn new(name: &'a str, reason: Reason) -> Self {
+    pub(crate) const fn new(name: &'a str, reason: Reason) -> Self {
         Self { name, reason }
     }
 }
@@ -465,12 +465,12 @@ const SUSPICIOUS_MODULES: &[SuspiciousModule] = &[
 ];
 
 /// S001
-pub fn suspicious_function_call(checker: &mut Checker, expr: &Expr) {
-    let ExprKind::Call { func, .. } = &expr.node else {
+pub(crate) fn suspicious_function_call(checker: &mut Checker, expr: &Expr) {
+    let Expr::Call(ast::ExprCall { func, .. }) = expr else {
         return;
     };
 
-    let Some(reason) = checker.ctx.resolve_call_path(func).and_then(|call_path| {
+    let Some(reason) = checker.semantic_model().resolve_call_path(func).and_then(|call_path| {
         for module in SUSPICIOUS_MEMBERS {
             for member in module.members {
                 if call_path.as_slice() == *member {
@@ -512,7 +512,7 @@ pub fn suspicious_function_call(checker: &mut Checker, expr: &Expr) {
         Reason::FTPLib => SuspiciousFTPLibUsage.into(),
     };
     let diagnostic = Diagnostic::new::<DiagnosticKind>(diagnostic_kind, expr.range());
-    if checker.settings.rules.enabled(diagnostic.kind.rule()) {
+    if checker.enabled(diagnostic.kind.rule()) {
         checker.diagnostics.push(diagnostic);
     }
 }
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/try_except_continue.rs b/crates/ruff/src/rules/flake8_bandit/rules/try_except_continue.rs
index 9a48016b75139..a64c33bc39bec 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/try_except_continue.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/try_except_continue.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Excepthandler, Expr, Stmt, StmtKind};
+use rustpython_parser::ast::{Excepthandler, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -17,7 +17,7 @@ impl Violation for TryExceptContinue {
 }
 
 /// S112
-pub fn try_except_continue(
+pub(crate) fn try_except_continue(
     checker: &mut Checker,
     excepthandler: &Excepthandler,
     type_: Option<&Expr>,
@@ -26,8 +26,8 @@ pub fn try_except_continue(
     check_typed_exception: bool,
 ) {
     if body.len() == 1
-        && body[0].node == StmtKind::Continue
-        && (check_typed_exception || is_untyped_exception(type_, checker))
+        && body[0].is_continue_stmt()
+        && (check_typed_exception || is_untyped_exception(type_, checker.semantic_model()))
     {
         checker
             .diagnostics
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/try_except_pass.rs b/crates/ruff/src/rules/flake8_bandit/rules/try_except_pass.rs
index 3700fe79d7407..c740399349316 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/try_except_pass.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/try_except_pass.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Excepthandler, Expr, Stmt, StmtKind};
+use rustpython_parser::ast::{Excepthandler, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -17,7 +17,7 @@ impl Violation for TryExceptPass {
 }
 
 /// S110
-pub fn try_except_pass(
+pub(crate) fn try_except_pass(
     checker: &mut Checker,
     excepthandler: &Excepthandler,
     type_: Option<&Expr>,
@@ -26,8 +26,8 @@ pub fn try_except_pass(
     check_typed_exception: bool,
 ) {
     if body.len() == 1
-        && body[0].node == StmtKind::Pass
-        && (check_typed_exception || is_untyped_exception(type_, checker))
+        && body[0].is_pass_stmt()
+        && (check_typed_exception || is_untyped_exception(type_, checker.semantic_model()))
     {
         checker
             .diagnostics
diff --git a/crates/ruff/src/rules/flake8_bandit/rules/unsafe_yaml_load.rs b/crates/ruff/src/rules/flake8_bandit/rules/unsafe_yaml_load.rs
index cd05f639b6946..e5225eb0d49c1 100644
--- a/crates/ruff/src/rules/flake8_bandit/rules/unsafe_yaml_load.rs
+++ b/crates/ruff/src/rules/flake8_bandit/rules/unsafe_yaml_load.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -31,25 +31,30 @@ impl Violation for UnsafeYAMLLoad {
 }
 
 /// S506
-pub fn unsafe_yaml_load(checker: &mut Checker, func: &Expr, args: &[Expr], keywords: &[Keyword]) {
+pub(crate) fn unsafe_yaml_load(
+    checker: &mut Checker,
+    func: &Expr,
+    args: &[Expr],
+    keywords: &[Keyword],
+) {
     if checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(func)
         .map_or(false, |call_path| call_path.as_slice() == ["yaml", "load"])
     {
         let call_args = SimpleCallArgs::new(args, keywords);
         if let Some(loader_arg) = call_args.argument("Loader", 1) {
             if !checker
-                .ctx
+                .semantic_model()
                 .resolve_call_path(loader_arg)
                 .map_or(false, |call_path| {
                     call_path.as_slice() == ["yaml", "SafeLoader"]
                         || call_path.as_slice() == ["yaml", "CSafeLoader"]
                 })
             {
-                let loader = match &loader_arg.node {
-                    ExprKind::Attribute { attr, .. } => Some(attr.to_string()),
-                    ExprKind::Name { id, .. } => Some(id.to_string()),
+                let loader = match loader_arg {
+                    Expr::Attribute(ast::ExprAttribute { attr, .. }) => Some(attr.to_string()),
+                    Expr::Name(ast::ExprName { id, .. }) => Some(id.to_string()),
                     _ => None,
                 };
                 checker.diagnostics.push(Diagnostic::new(
diff --git a/crates/ruff/src/rules/flake8_bandit/settings.rs b/crates/ruff/src/rules/flake8_bandit/settings.rs
index 97ed127336831..d43bd48700ec8 100644
--- a/crates/ruff/src/rules/flake8_bandit/settings.rs
+++ b/crates/ruff/src/rules/flake8_bandit/settings.rs
@@ -1,24 +1,24 @@
 //! Settings for the `flake8-bandit` plugin.
 
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::{CacheKey, ConfigurationOptions};
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
 
 fn default_tmp_dirs() -> Vec<String> {
     ["/tmp", "/var/tmp", "/dev/shm"]
-        .map(std::string::ToString::to_string)
+        .map(ToString::to_string)
         .to_vec()
 }
 
 #[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, CombineOptions,
 )]
 #[serde(
     deny_unknown_fields,
     rename_all = "kebab-case",
     rename = "Flake8BanditOptions"
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = "[\"/tmp\", \"/var/tmp\", \"/dev/shm\"]",
diff --git a/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S105_S105.py.snap b/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S105_S105.py.snap
index f4a844b1d16a5..58e7ab259c8ae 100644
--- a/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S105_S105.py.snap
+++ b/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S105_S105.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_bandit/mod.rs
 ---
-S105.py:13:12: S105 Possible hardcoded password: "s3cr3t"
+S105.py:13:12: S105 Possible hardcoded password assigned to: "password"
    |
 13 | # Errors
 14 | password = "s3cr3t"
@@ -10,7 +10,7 @@ S105.py:13:12: S105 Possible hardcoded password: "s3cr3t"
 16 | passwd = "s3cr3t"
    |
 
-S105.py:14:9: S105 Possible hardcoded password: "s3cr3t"
+S105.py:14:9: S105 Possible hardcoded password assigned to: "_pass"
    |
 14 | # Errors
 15 | password = "s3cr3t"
@@ -20,7 +20,7 @@ S105.py:14:9: S105 Possible hardcoded password: "s3cr3t"
 18 | pwd = "s3cr3t"
    |
 
-S105.py:15:10: S105 Possible hardcoded password: "s3cr3t"
+S105.py:15:10: S105 Possible hardcoded password assigned to: "passwd"
    |
 15 | password = "s3cr3t"
 16 | _pass = "s3cr3t"
@@ -30,7 +30,7 @@ S105.py:15:10: S105 Possible hardcoded password: "s3cr3t"
 19 | secret = "s3cr3t"
    |
 
-S105.py:16:7: S105 Possible hardcoded password: "s3cr3t"
+S105.py:16:7: S105 Possible hardcoded password assigned to: "pwd"
    |
 16 | _pass = "s3cr3t"
 17 | passwd = "s3cr3t"
@@ -40,7 +40,7 @@ S105.py:16:7: S105 Possible hardcoded password: "s3cr3t"
 20 | token = "s3cr3t"
    |
 
-S105.py:17:10: S105 Possible hardcoded password: "s3cr3t"
+S105.py:17:10: S105 Possible hardcoded password assigned to: "secret"
    |
 17 | passwd = "s3cr3t"
 18 | pwd = "s3cr3t"
@@ -50,7 +50,7 @@ S105.py:17:10: S105 Possible hardcoded password: "s3cr3t"
 21 | secrete = "s3cr3t"
    |
 
-S105.py:18:9: S105 Possible hardcoded password: "s3cr3t"
+S105.py:18:9: S105 Possible hardcoded password assigned to: "token"
    |
 18 | pwd = "s3cr3t"
 19 | secret = "s3cr3t"
@@ -60,7 +60,7 @@ S105.py:18:9: S105 Possible hardcoded password: "s3cr3t"
 22 | safe = password = "s3cr3t"
    |
 
-S105.py:19:11: S105 Possible hardcoded password: "s3cr3t"
+S105.py:19:11: S105 Possible hardcoded password assigned to: "secrete"
    |
 19 | secret = "s3cr3t"
 20 | token = "s3cr3t"
@@ -70,7 +70,7 @@ S105.py:19:11: S105 Possible hardcoded password: "s3cr3t"
 23 | password = safe = "s3cr3t"
    |
 
-S105.py:20:19: S105 Possible hardcoded password: "s3cr3t"
+S105.py:20:19: S105 Possible hardcoded password assigned to: "password"
    |
 20 | token = "s3cr3t"
 21 | secrete = "s3cr3t"
@@ -80,7 +80,7 @@ S105.py:20:19: S105 Possible hardcoded password: "s3cr3t"
 24 | PASSWORD = "s3cr3t"
    |
 
-S105.py:21:19: S105 Possible hardcoded password: "s3cr3t"
+S105.py:21:19: S105 Possible hardcoded password assigned to: "password"
    |
 21 | secrete = "s3cr3t"
 22 | safe = password = "s3cr3t"
@@ -90,7 +90,7 @@ S105.py:21:19: S105 Possible hardcoded password: "s3cr3t"
 25 | PassWord = "s3cr3t"
    |
 
-S105.py:22:12: S105 Possible hardcoded password: "s3cr3t"
+S105.py:22:12: S105 Possible hardcoded password assigned to: "PASSWORD"
    |
 22 | safe = password = "s3cr3t"
 23 | password = safe = "s3cr3t"
@@ -99,7 +99,7 @@ S105.py:22:12: S105 Possible hardcoded password: "s3cr3t"
 25 | PassWord = "s3cr3t"
    |
 
-S105.py:23:12: S105 Possible hardcoded password: "s3cr3t"
+S105.py:23:12: S105 Possible hardcoded password assigned to: "PassWord"
    |
 23 | password = safe = "s3cr3t"
 24 | PASSWORD = "s3cr3t"
@@ -109,7 +109,7 @@ S105.py:23:12: S105 Possible hardcoded password: "s3cr3t"
 27 | d["password"] = "s3cr3t"
    |
 
-S105.py:25:17: S105 Possible hardcoded password: "s3cr3t"
+S105.py:25:17: S105 Possible hardcoded password assigned to: "password"
    |
 25 | PassWord = "s3cr3t"
 26 | 
@@ -119,7 +119,7 @@ S105.py:25:17: S105 Possible hardcoded password: "s3cr3t"
 29 | d["passwd"] = "s3cr3t"
    |
 
-S105.py:26:13: S105 Possible hardcoded password: "s3cr3t"
+S105.py:26:13: S105 Possible hardcoded password assigned to: "pass"
    |
 26 | d["password"] = "s3cr3t"
 27 | d["pass"] = "s3cr3t"
@@ -128,7 +128,7 @@ S105.py:26:13: S105 Possible hardcoded password: "s3cr3t"
 29 | d["pwd"] = "s3cr3t"
    |
 
-S105.py:27:15: S105 Possible hardcoded password: "s3cr3t"
+S105.py:27:15: S105 Possible hardcoded password assigned to: "passwd"
    |
 27 | d["password"] = "s3cr3t"
 28 | d["pass"] = "s3cr3t"
@@ -138,7 +138,7 @@ S105.py:27:15: S105 Possible hardcoded password: "s3cr3t"
 31 | d["secret"] = "s3cr3t"
    |
 
-S105.py:28:12: S105 Possible hardcoded password: "s3cr3t"
+S105.py:28:12: S105 Possible hardcoded password assigned to: "pwd"
    |
 28 | d["pass"] = "s3cr3t"
 29 | d["passwd"] = "s3cr3t"
@@ -148,7 +148,7 @@ S105.py:28:12: S105 Possible hardcoded password: "s3cr3t"
 32 | d["token"] = "s3cr3t"
    |
 
-S105.py:29:15: S105 Possible hardcoded password: "s3cr3t"
+S105.py:29:15: S105 Possible hardcoded password assigned to: "secret"
    |
 29 | d["passwd"] = "s3cr3t"
 30 | d["pwd"] = "s3cr3t"
@@ -158,7 +158,7 @@ S105.py:29:15: S105 Possible hardcoded password: "s3cr3t"
 33 | d["secrete"] = "s3cr3t"
    |
 
-S105.py:30:14: S105 Possible hardcoded password: "s3cr3t"
+S105.py:30:14: S105 Possible hardcoded password assigned to: "token"
    |
 30 | d["pwd"] = "s3cr3t"
 31 | d["secret"] = "s3cr3t"
@@ -168,7 +168,7 @@ S105.py:30:14: S105 Possible hardcoded password: "s3cr3t"
 34 | safe = d["password"] = "s3cr3t"
    |
 
-S105.py:31:16: S105 Possible hardcoded password: "s3cr3t"
+S105.py:31:16: S105 Possible hardcoded password assigned to: "secrete"
    |
 31 | d["secret"] = "s3cr3t"
 32 | d["token"] = "s3cr3t"
@@ -178,7 +178,7 @@ S105.py:31:16: S105 Possible hardcoded password: "s3cr3t"
 35 | d["password"] = safe = "s3cr3t"
    |
 
-S105.py:32:24: S105 Possible hardcoded password: "s3cr3t"
+S105.py:32:24: S105 Possible hardcoded password assigned to: "password"
    |
 32 | d["token"] = "s3cr3t"
 33 | d["secrete"] = "s3cr3t"
@@ -187,7 +187,7 @@ S105.py:32:24: S105 Possible hardcoded password: "s3cr3t"
 35 | d["password"] = safe = "s3cr3t"
    |
 
-S105.py:33:24: S105 Possible hardcoded password: "s3cr3t"
+S105.py:33:24: S105 Possible hardcoded password assigned to: "password"
    |
 33 | d["secrete"] = "s3cr3t"
 34 | safe = d["password"] = "s3cr3t"
@@ -195,7 +195,7 @@ S105.py:33:24: S105 Possible hardcoded password: "s3cr3t"
    |                        ^^^^^^^^ S105
    |
 
-S105.py:37:16: S105 Possible hardcoded password: "s3cr3t"
+S105.py:37:16: S105 Possible hardcoded password assigned to: "password"
    |
 37 | class MyClass:
 38 |     password = "s3cr3t"
@@ -203,7 +203,7 @@ S105.py:37:16: S105 Possible hardcoded password: "s3cr3t"
 39 |     safe = password
    |
 
-S105.py:41:20: S105 Possible hardcoded password: "s3cr3t"
+S105.py:41:20: S105 Possible hardcoded password assigned to: "password"
    |
 41 | MyClass.password = "s3cr3t"
    |                    ^^^^^^^^ S105
@@ -211,7 +211,7 @@ S105.py:41:20: S105 Possible hardcoded password: "s3cr3t"
 43 | MyClass.passwd = "s3cr3t"
    |
 
-S105.py:42:17: S105 Possible hardcoded password: "s3cr3t"
+S105.py:42:17: S105 Possible hardcoded password assigned to: "_pass"
    |
 42 | MyClass.password = "s3cr3t"
 43 | MyClass._pass = "s3cr3t"
@@ -220,7 +220,7 @@ S105.py:42:17: S105 Possible hardcoded password: "s3cr3t"
 45 | MyClass.pwd = "s3cr3t"
    |
 
-S105.py:43:18: S105 Possible hardcoded password: "s3cr3t"
+S105.py:43:18: S105 Possible hardcoded password assigned to: "passwd"
    |
 43 | MyClass.password = "s3cr3t"
 44 | MyClass._pass = "s3cr3t"
@@ -230,7 +230,7 @@ S105.py:43:18: S105 Possible hardcoded password: "s3cr3t"
 47 | MyClass.secret = "s3cr3t"
    |
 
-S105.py:44:15: S105 Possible hardcoded password: "s3cr3t"
+S105.py:44:15: S105 Possible hardcoded password assigned to: "pwd"
    |
 44 | MyClass._pass = "s3cr3t"
 45 | MyClass.passwd = "s3cr3t"
@@ -240,7 +240,7 @@ S105.py:44:15: S105 Possible hardcoded password: "s3cr3t"
 48 | MyClass.token = "s3cr3t"
    |
 
-S105.py:45:18: S105 Possible hardcoded password: "s3cr3t"
+S105.py:45:18: S105 Possible hardcoded password assigned to: "secret"
    |
 45 | MyClass.passwd = "s3cr3t"
 46 | MyClass.pwd = "s3cr3t"
@@ -250,7 +250,7 @@ S105.py:45:18: S105 Possible hardcoded password: "s3cr3t"
 49 | MyClass.secrete = "s3cr3t"
    |
 
-S105.py:46:17: S105 Possible hardcoded password: "s3cr3t"
+S105.py:46:17: S105 Possible hardcoded password assigned to: "token"
    |
 46 | MyClass.pwd = "s3cr3t"
 47 | MyClass.secret = "s3cr3t"
@@ -259,7 +259,7 @@ S105.py:46:17: S105 Possible hardcoded password: "s3cr3t"
 49 | MyClass.secrete = "s3cr3t"
    |
 
-S105.py:47:19: S105 Possible hardcoded password: "s3cr3t"
+S105.py:47:19: S105 Possible hardcoded password assigned to: "secrete"
    |
 47 | MyClass.secret = "s3cr3t"
 48 | MyClass.token = "s3cr3t"
@@ -269,7 +269,7 @@ S105.py:47:19: S105 Possible hardcoded password: "s3cr3t"
 51 | password == "s3cr3t"
    |
 
-S105.py:49:13: S105 Possible hardcoded password: "s3cr3t"
+S105.py:49:13: S105 Possible hardcoded password assigned to: "password"
    |
 49 | MyClass.secrete = "s3cr3t"
 50 | 
@@ -279,7 +279,7 @@ S105.py:49:13: S105 Possible hardcoded password: "s3cr3t"
 53 | passwd == "s3cr3t"
    |
 
-S105.py:50:10: S105 Possible hardcoded password: "s3cr3t"
+S105.py:50:10: S105 Possible hardcoded password assigned to: "_pass"
    |
 50 | password == "s3cr3t"
 51 | _pass == "s3cr3t"
@@ -288,7 +288,7 @@ S105.py:50:10: S105 Possible hardcoded password: "s3cr3t"
 53 | pwd == "s3cr3t"
    |
 
-S105.py:51:11: S105 Possible hardcoded password: "s3cr3t"
+S105.py:51:11: S105 Possible hardcoded password assigned to: "passwd"
    |
 51 | password == "s3cr3t"
 52 | _pass == "s3cr3t"
@@ -298,7 +298,7 @@ S105.py:51:11: S105 Possible hardcoded password: "s3cr3t"
 55 | secret == "s3cr3t"
    |
 
-S105.py:52:8: S105 Possible hardcoded password: "s3cr3t"
+S105.py:52:8: S105 Possible hardcoded password assigned to: "pwd"
    |
 52 | _pass == "s3cr3t"
 53 | passwd == "s3cr3t"
@@ -308,7 +308,7 @@ S105.py:52:8: S105 Possible hardcoded password: "s3cr3t"
 56 | token == "s3cr3t"
    |
 
-S105.py:53:11: S105 Possible hardcoded password: "s3cr3t"
+S105.py:53:11: S105 Possible hardcoded password assigned to: "secret"
    |
 53 | passwd == "s3cr3t"
 54 | pwd == "s3cr3t"
@@ -318,7 +318,7 @@ S105.py:53:11: S105 Possible hardcoded password: "s3cr3t"
 57 | secrete == "s3cr3t"
    |
 
-S105.py:54:10: S105 Possible hardcoded password: "s3cr3t"
+S105.py:54:10: S105 Possible hardcoded password assigned to: "token"
    |
 54 | pwd == "s3cr3t"
 55 | secret == "s3cr3t"
@@ -328,7 +328,7 @@ S105.py:54:10: S105 Possible hardcoded password: "s3cr3t"
 58 | password == safe == "s3cr3t"
    |
 
-S105.py:55:12: S105 Possible hardcoded password: "s3cr3t"
+S105.py:55:12: S105 Possible hardcoded password assigned to: "secrete"
    |
 55 | secret == "s3cr3t"
 56 | token == "s3cr3t"
@@ -337,7 +337,7 @@ S105.py:55:12: S105 Possible hardcoded password: "s3cr3t"
 58 | password == safe == "s3cr3t"
    |
 
-S105.py:56:21: S105 Possible hardcoded password: "s3cr3t"
+S105.py:56:21: S105 Possible hardcoded password assigned to: "password"
    |
 56 | token == "s3cr3t"
 57 | secrete == "s3cr3t"
@@ -347,7 +347,7 @@ S105.py:56:21: S105 Possible hardcoded password: "s3cr3t"
 60 | if token == "1\n2":
    |
 
-S105.py:58:13: S105 Possible hardcoded password: "1\n2"
+S105.py:58:13: S105 Possible hardcoded password assigned to: "token"
    |
 58 | password == safe == "s3cr3t"
 59 | 
@@ -356,7 +356,7 @@ S105.py:58:13: S105 Possible hardcoded password: "1\n2"
 61 |     pass
    |
 
-S105.py:61:13: S105 Possible hardcoded password: "3\t4"
+S105.py:61:13: S105 Possible hardcoded password assigned to: "token"
    |
 61 |     pass
 62 | 
@@ -365,7 +365,7 @@ S105.py:61:13: S105 Possible hardcoded password: "3\t4"
 64 |     pass
    |
 
-S105.py:64:13: S105 Possible hardcoded password: "5\r6"
+S105.py:64:13: S105 Possible hardcoded password assigned to: "token"
    |
 64 |     pass
 65 | 
diff --git a/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S106_S106.py.snap b/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S106_S106.py.snap
index a20ebddeef06e..150ebb7aa1538 100644
--- a/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S106_S106.py.snap
+++ b/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S106_S106.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_bandit/mod.rs
 ---
-S106.py:14:9: S106 Possible hardcoded password: "s3cr3t"
+S106.py:14:9: S106 Possible hardcoded password assigned to argument: "password"
    |
 14 | # Error
 15 | func(1, password="s3cr3t")
diff --git a/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S107_S107.py.snap b/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S107_S107.py.snap
index 39ac4461cba9d..ccfba2b0c9768 100644
--- a/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S107_S107.py.snap
+++ b/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S107_S107.py.snap
@@ -1,35 +1,35 @@
 ---
 source: crates/ruff/src/rules/flake8_bandit/mod.rs
 ---
-S107.py:5:29: S107 Possible hardcoded password: "default"
+S107.py:5:29: S107 Possible hardcoded password assigned to function default: "password"
   |
 5 | def default(first, password="default"):
   |                             ^^^^^^^^^ S107
 6 |     pass
   |
 
-S107.py:13:45: S107 Possible hardcoded password: "posonly"
+S107.py:13:45: S107 Possible hardcoded password assigned to function default: "password"
    |
 13 | def default_posonly(first, /, pos, password="posonly"):
    |                                             ^^^^^^^^^ S107
 14 |     pass
    |
 
-S107.py:21:39: S107 Possible hardcoded password: "kwonly"
+S107.py:21:39: S107 Possible hardcoded password assigned to function default: "password"
    |
 21 | def default_kwonly(first, *, password="kwonly"):
    |                                       ^^^^^^^^ S107
 22 |     pass
    |
 
-S107.py:29:39: S107 Possible hardcoded password: "posonly"
+S107.py:29:39: S107 Possible hardcoded password assigned to function default: "secret"
    |
 29 | def default_all(first, /, pos, secret="posonly", *, password="kwonly"):
    |                                       ^^^^^^^^^ S107
 30 |     pass
    |
 
-S107.py:29:62: S107 Possible hardcoded password: "kwonly"
+S107.py:29:62: S107 Possible hardcoded password assigned to function default: "password"
    |
 29 | def default_all(first, /, pos, secret="posonly", *, password="kwonly"):
    |                                                              ^^^^^^^^ S107
diff --git a/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S601_S601.py.snap b/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S601_S601.py.snap
new file mode 100644
index 0000000000000..8e11bc8541f8a
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S601_S601.py.snap
@@ -0,0 +1,12 @@
+---
+source: crates/ruff/src/rules/flake8_bandit/mod.rs
+---
+S601.py:3:1: S601 Possible shell injection via Paramiko call; check inputs are properly sanitized
+  |
+3 | import paramiko
+4 | 
+5 | paramiko.exec_command('something; really; unsafe')
+  | ^^^^^^^^^^^^^^^^^^^^^ S601
+  |
+
+
diff --git a/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S608_S608.py.snap b/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S608_S608.py.snap
index c182e6ea1c710..b9d7fcb74591c 100644
--- a/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S608_S608.py.snap
+++ b/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S608_S608.py.snap
@@ -406,9 +406,9 @@ S608.py:77:9: S608 Possible SQL injection vector through string-based query cons
    |
 77 |   def query41():
 78 |       return (
-79 |           "SELECT *"
+79 |           "SELECT * "
    |  _________^
-80 | |         "FROM table"
+80 | |         "FROM table "
 81 | |         f"WHERE var = {var}"
    | |____________________________^ S608
 82 |       )
@@ -448,8 +448,35 @@ S608.py:86:30: S608 Possible SQL injection vector through string-based query con
 87 | query44 = cursor.execute("SELECT * FROM table WHERE var = {}".format(var))
 88 | query45 = cursor.executemany("SELECT * FROM table WHERE var = %s" % var, [])
    |                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ S608
-89 |  
+89 | 
 90 | # # pass
    |
 
+S608.py:98:9: S608 Possible SQL injection vector through string-based query construction
+    |
+ 98 | # # INSERT without INTO (e.g. MySQL and derivatives)
+ 99 | query = "INSERT table VALUES (%s)" % (var,)
+    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ S608
+100 | 
+101 | # # REPLACE (e.g. MySQL and derivatives, SQLite)
+    |
+
+S608.py:101:9: S608 Possible SQL injection vector through string-based query construction
+    |
+101 | # # REPLACE (e.g. MySQL and derivatives, SQLite)
+102 | query = "REPLACE INTO table VALUES (%s)" % (var,)
+    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ S608
+103 | query = "REPLACE table VALUES (%s)" % (var,)
+    |
+
+S608.py:102:9: S608 Possible SQL injection vector through string-based query construction
+    |
+102 | # # REPLACE (e.g. MySQL and derivatives, SQLite)
+103 | query = "REPLACE INTO table VALUES (%s)" % (var,)
+104 | query = "REPLACE table VALUES (%s)" % (var,)
+    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ S608
+105 | 
+106 | query = "Deselect something that is not SQL even though it has a ' from ' somewhere in %s." % "there"
+    |
+
 
diff --git a/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S609_S609.py.snap b/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S609_S609.py.snap
new file mode 100644
index 0000000000000..d22cefbae2f87
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S609_S609.py.snap
@@ -0,0 +1,41 @@
+---
+source: crates/ruff/src/rules/flake8_bandit/mod.rs
+---
+S609.py:4:1: S609 Possible wildcard injection in call due to `*` usage
+  |
+4 | import subprocess
+5 | 
+6 | os.popen("chmod +w foo*")
+  | ^^^^^^^^ S609
+7 | subprocess.Popen("/bin/chown root: *", shell=True)
+8 | subprocess.Popen(["/usr/local/bin/rsync", "*", "some_where:"], shell=True)
+  |
+
+S609.py:5:1: S609 Possible wildcard injection in call due to `*` usage
+  |
+5 | os.popen("chmod +w foo*")
+6 | subprocess.Popen("/bin/chown root: *", shell=True)
+  | ^^^^^^^^^^^^^^^^ S609
+7 | subprocess.Popen(["/usr/local/bin/rsync", "*", "some_where:"], shell=True)
+8 | subprocess.Popen("/usr/local/bin/rsync * no_injection_here:")
+  |
+
+S609.py:6:1: S609 Possible wildcard injection in call due to `*` usage
+   |
+ 6 | os.popen("chmod +w foo*")
+ 7 | subprocess.Popen("/bin/chown root: *", shell=True)
+ 8 | subprocess.Popen(["/usr/local/bin/rsync", "*", "some_where:"], shell=True)
+   | ^^^^^^^^^^^^^^^^ S609
+ 9 | subprocess.Popen("/usr/local/bin/rsync * no_injection_here:")
+10 | os.system("tar cf foo.tar bar/*")
+   |
+
+S609.py:8:1: S609 Possible wildcard injection in call due to `*` usage
+   |
+ 8 | subprocess.Popen(["/usr/local/bin/rsync", "*", "some_where:"], shell=True)
+ 9 | subprocess.Popen("/usr/local/bin/rsync * no_injection_here:")
+10 | os.system("tar cf foo.tar bar/*")
+   | ^^^^^^^^^ S609
+   |
+
+
diff --git a/crates/ruff/src/rules/flake8_blind_except/mod.rs b/crates/ruff/src/rules/flake8_blind_except/mod.rs
index ba972c84711c5..ce2611ffaa984 100644
--- a/crates/ruff/src/rules/flake8_blind_except/mod.rs
+++ b/crates/ruff/src/rules/flake8_blind_except/mod.rs
@@ -6,14 +6,13 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::BlindExcept, Path::new("BLE.py"); "BLE001")]
+    #[test_case(Rule::BlindExcept, Path::new("BLE.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_blind_except/rules.rs b/crates/ruff/src/rules/flake8_blind_except/rules/blind_except.rs
similarity index 71%
rename from crates/ruff/src/rules/flake8_blind_except/rules.rs
rename to crates/ruff/src/rules/flake8_blind_except/rules/blind_except.rs
index 97772b3e8a1cb..ef4f52524ece7 100644
--- a/crates/ruff/src/rules/flake8_blind_except/rules.rs
+++ b/crates/ruff/src/rules/flake8_blind_except/rules/blind_except.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -9,7 +9,7 @@ use crate::checkers::ast::Checker;
 
 #[violation]
 pub struct BlindExcept {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for BlindExcept {
@@ -21,7 +21,7 @@ impl Violation for BlindExcept {
 }
 
 /// BLE001
-pub fn blind_except(
+pub(crate) fn blind_except(
     checker: &mut Checker,
     type_: Option<&Expr>,
     name: Option<&str>,
@@ -30,17 +30,17 @@ pub fn blind_except(
     let Some(type_) = type_ else {
         return;
     };
-    let ExprKind::Name { id, .. } = &type_.node else {
+    let Expr::Name(ast::ExprName { id, .. }) = &type_ else {
         return;
     };
     for exception in ["BaseException", "Exception"] {
-        if id == exception && checker.ctx.is_builtin(exception) {
+        if id == exception && checker.semantic_model().is_builtin(exception) {
             // If the exception is re-raised, don't flag an error.
             if body.iter().any(|stmt| {
-                if let StmtKind::Raise { exc, .. } = &stmt.node {
+                if let Stmt::Raise(ast::StmtRaise { exc, .. }) = stmt {
                     if let Some(exc) = exc {
-                        if let ExprKind::Name { id, .. } = &exc.node {
-                            name.map_or(false, |name| name == id)
+                        if let Expr::Name(ast::ExprName { id, .. }) = exc.as_ref() {
+                            name.map_or(false, |name| id == name)
                         } else {
                             false
                         }
@@ -56,16 +56,17 @@ pub fn blind_except(
 
             // If the exception is logged, don't flag an error.
             if body.iter().any(|stmt| {
-                if let StmtKind::Expr { value } = &stmt.node {
-                    if let ExprKind::Call { func, keywords, .. } = &value.node {
-                        if logging::is_logger_candidate(&checker.ctx, func) {
-                            if let ExprKind::Attribute { attr, .. } = &func.node {
+                if let Stmt::Expr(ast::StmtExpr { value, range: _ }) = stmt {
+                    if let Expr::Call(ast::ExprCall { func, keywords, .. }) = value.as_ref() {
+                        if logging::is_logger_candidate(func, checker.semantic_model()) {
+                            if let Some(attribute) = func.as_attribute_expr() {
+                                let attr = attribute.attr.as_str();
                                 if attr == "exception" {
                                     return true;
                                 }
                                 if attr == "error" {
                                     if let Some(keyword) = find_keyword(keywords, "exc_info") {
-                                        if is_const_true(&keyword.node.value) {
+                                        if is_const_true(&keyword.value) {
                                             return true;
                                         }
                                     }
diff --git a/crates/ruff/src/rules/flake8_blind_except/rules/mod.rs b/crates/ruff/src/rules/flake8_blind_except/rules/mod.rs
new file mode 100644
index 0000000000000..520b3ece06db7
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_blind_except/rules/mod.rs
@@ -0,0 +1,3 @@
+pub(crate) use blind_except::{blind_except, BlindExcept};
+
+mod blind_except;
diff --git a/crates/ruff/src/rules/flake8_boolean_trap/helpers.rs b/crates/ruff/src/rules/flake8_boolean_trap/helpers.rs
new file mode 100644
index 0000000000000..2c397470b7e36
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_boolean_trap/helpers.rs
@@ -0,0 +1,70 @@
+use rustpython_parser::ast::{self, Constant, Expr, Ranged};
+
+use ruff_diagnostics::{Diagnostic, DiagnosticKind};
+
+use crate::checkers::ast::Checker;
+
+pub(super) const FUNC_CALL_NAME_ALLOWLIST: &[&str] = &[
+    "append",
+    "assertEqual",
+    "assertEquals",
+    "assertNotEqual",
+    "assertNotEquals",
+    "bool",
+    "bytes",
+    "count",
+    "failIfEqual",
+    "failUnlessEqual",
+    "float",
+    "fromkeys",
+    "get",
+    "getattr",
+    "getboolean",
+    "getfloat",
+    "getint",
+    "index",
+    "insert",
+    "int",
+    "param",
+    "pop",
+    "remove",
+    "set_blocking",
+    "set_enabled",
+    "setattr",
+    "__setattr__",
+    "setdefault",
+    "str",
+];
+
+pub(super) const FUNC_DEF_NAME_ALLOWLIST: &[&str] = &["__setitem__"];
+
+/// Returns `true` if an argument is allowed to use a boolean trap. To return
+/// `true`, the function name must be explicitly allowed, and the argument must
+/// be either the first or second argument in the call.
+pub(super) fn allow_boolean_trap(func: &Expr) -> bool {
+    if let Expr::Attribute(ast::ExprAttribute { attr, .. }) = func {
+        return FUNC_CALL_NAME_ALLOWLIST.contains(&attr.as_ref());
+    }
+
+    if let Expr::Name(ast::ExprName { id, .. }) = func {
+        return FUNC_CALL_NAME_ALLOWLIST.contains(&id.as_ref());
+    }
+
+    false
+}
+
+const fn is_boolean_arg(arg: &Expr) -> bool {
+    matches!(
+        &arg,
+        Expr::Constant(ast::ExprConstant {
+            value: Constant::Bool(_),
+            ..
+        })
+    )
+}
+
+pub(super) fn add_if_boolean(checker: &mut Checker, arg: &Expr, kind: DiagnosticKind) {
+    if is_boolean_arg(arg) {
+        checker.diagnostics.push(Diagnostic::new(kind, arg.range()));
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_boolean_trap/mod.rs b/crates/ruff/src/rules/flake8_boolean_trap/mod.rs
index a90031bcee6a4..ab0d6f87418fb 100644
--- a/crates/ruff/src/rules/flake8_boolean_trap/mod.rs
+++ b/crates/ruff/src/rules/flake8_boolean_trap/mod.rs
@@ -1,4 +1,5 @@
 //! Rules from [flake8-boolean-trap](https://pypi.org/project/flake8-boolean-trap/).
+mod helpers;
 pub(crate) mod rules;
 
 #[cfg(test)]
@@ -6,16 +7,15 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::BooleanPositionalArgInFunctionDefinition, Path::new("FBT.py"); "FBT001")]
-    #[test_case(Rule::BooleanDefaultValueInFunctionDefinition, Path::new("FBT.py"); "FBT002")]
-    #[test_case(Rule::BooleanPositionalValueInFunctionCall, Path::new("FBT.py"); "FBT003")]
+    #[test_case(Rule::BooleanPositionalArgInFunctionDefinition, Path::new("FBT.py"))]
+    #[test_case(Rule::BooleanDefaultValueInFunctionDefinition, Path::new("FBT.py"))]
+    #[test_case(Rule::BooleanPositionalValueInFunctionCall, Path::new("FBT.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_boolean_trap/rules.rs b/crates/ruff/src/rules/flake8_boolean_trap/rules.rs
deleted file mode 100644
index f09ece952f205..0000000000000
--- a/crates/ruff/src/rules/flake8_boolean_trap/rules.rs
+++ /dev/null
@@ -1,172 +0,0 @@
-use rustpython_parser::ast::{Arguments, Constant, Expr, ExprKind};
-
-use ruff_diagnostics::Violation;
-use ruff_diagnostics::{Diagnostic, DiagnosticKind};
-use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::call_path::collect_call_path;
-
-use crate::checkers::ast::Checker;
-
-#[violation]
-pub struct BooleanPositionalArgInFunctionDefinition;
-
-impl Violation for BooleanPositionalArgInFunctionDefinition {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("Boolean positional arg in function definition")
-    }
-}
-
-#[violation]
-pub struct BooleanDefaultValueInFunctionDefinition;
-
-impl Violation for BooleanDefaultValueInFunctionDefinition {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("Boolean default value in function definition")
-    }
-}
-
-#[violation]
-pub struct BooleanPositionalValueInFunctionCall;
-
-impl Violation for BooleanPositionalValueInFunctionCall {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("Boolean positional value in function call")
-    }
-}
-
-const FUNC_CALL_NAME_ALLOWLIST: &[&str] = &[
-    "assertEqual",
-    "assertEquals",
-    "assertNotEqual",
-    "assertNotEquals",
-    "bytes",
-    "failIfEqual",
-    "failUnlessEqual",
-    "float",
-    "fromkeys",
-    "get",
-    "getattr",
-    "getboolean",
-    "getfloat",
-    "getint",
-    "index",
-    "int",
-    "param",
-    "pop",
-    "setattr",
-    "setdefault",
-    "str",
-];
-
-const FUNC_DEF_NAME_ALLOWLIST: &[&str] = &["__setitem__"];
-
-/// Returns `true` if an argument is allowed to use a boolean trap. To return
-/// `true`, the function name must be explicitly allowed, and the argument must
-/// be either the first or second argument in the call.
-fn allow_boolean_trap(func: &Expr) -> bool {
-    if let ExprKind::Attribute { attr, .. } = &func.node {
-        return FUNC_CALL_NAME_ALLOWLIST.contains(&attr.as_ref());
-    }
-
-    if let ExprKind::Name { id, .. } = &func.node {
-        return FUNC_CALL_NAME_ALLOWLIST.contains(&id.as_ref());
-    }
-
-    false
-}
-
-const fn is_boolean_arg(arg: &Expr) -> bool {
-    matches!(
-        &arg.node,
-        ExprKind::Constant {
-            value: Constant::Bool(_),
-            ..
-        }
-    )
-}
-
-fn add_if_boolean(checker: &mut Checker, arg: &Expr, kind: DiagnosticKind) {
-    if is_boolean_arg(arg) {
-        checker.diagnostics.push(Diagnostic::new(kind, arg.range()));
-    }
-}
-
-pub fn check_positional_boolean_in_def(
-    checker: &mut Checker,
-    name: &str,
-    decorator_list: &[Expr],
-    arguments: &Arguments,
-) {
-    if FUNC_DEF_NAME_ALLOWLIST.contains(&name) {
-        return;
-    }
-
-    if decorator_list.iter().any(|expr| {
-        collect_call_path(expr).map_or(false, |call_path| call_path.as_slice() == [name, "setter"])
-    }) {
-        return;
-    }
-
-    for arg in arguments.posonlyargs.iter().chain(arguments.args.iter()) {
-        if arg.node.annotation.is_none() {
-            continue;
-        }
-        let Some(expr) = &arg.node.annotation else {
-            continue;
-        };
-
-        // check for both bool (python class) and 'bool' (string annotation)
-        let hint = match &expr.node {
-            ExprKind::Name { id, .. } => id == "bool",
-            ExprKind::Constant {
-                value: Constant::Str(value),
-                ..
-            } => value == "bool",
-            _ => false,
-        };
-        if !hint {
-            continue;
-        }
-        checker.diagnostics.push(Diagnostic::new(
-            BooleanPositionalArgInFunctionDefinition,
-            arg.range(),
-        ));
-    }
-}
-
-pub fn check_boolean_default_value_in_function_definition(
-    checker: &mut Checker,
-    name: &str,
-    decorator_list: &[Expr],
-    arguments: &Arguments,
-) {
-    if FUNC_DEF_NAME_ALLOWLIST.contains(&name) {
-        return;
-    }
-
-    if decorator_list.iter().any(|expr| {
-        collect_call_path(expr).map_or(false, |call_path| call_path.as_slice() == [name, "setter"])
-    }) {
-        return;
-    }
-
-    for arg in &arguments.defaults {
-        add_if_boolean(checker, arg, BooleanDefaultValueInFunctionDefinition.into());
-    }
-}
-
-pub fn check_boolean_positional_value_in_function_call(
-    checker: &mut Checker,
-    args: &[Expr],
-    func: &Expr,
-) {
-    if allow_boolean_trap(func) {
-        return;
-    }
-    for arg in args {
-        add_if_boolean(checker, arg, BooleanPositionalValueInFunctionCall.into());
-    }
-}
diff --git a/crates/ruff/src/rules/flake8_boolean_trap/rules/check_boolean_default_value_in_function_definition.rs b/crates/ruff/src/rules/flake8_boolean_trap/rules/check_boolean_default_value_in_function_definition.rs
new file mode 100644
index 0000000000000..610a6c8491f30
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_boolean_trap/rules/check_boolean_default_value_in_function_definition.rs
@@ -0,0 +1,80 @@
+use rustpython_parser::ast::{Arguments, Expr};
+
+use ruff_diagnostics::Violation;
+
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::call_path::collect_call_path;
+
+use crate::checkers::ast::Checker;
+use crate::rules::flake8_boolean_trap::helpers::add_if_boolean;
+
+use super::super::helpers::FUNC_DEF_NAME_ALLOWLIST;
+
+/// ## What it does
+/// Checks for the use of booleans as default values in function definitions.
+///
+/// ## Why is this bad?
+/// Calling a function with boolean default means that the keyword argument
+/// argument can be omitted, which makes the function call ambiguous.
+///
+/// Instead, define the relevant argument as keyword-only.
+///
+/// ## Example
+/// ```python
+/// from math import ceil, floor
+///
+///
+/// def round_number(number: float, *, up: bool = True) -> int:
+///     return ceil(number) if up else floor(number)
+///
+///
+/// round_number(1.5)
+/// round_number(1.5, up=False)
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from math import ceil, floor
+///
+///
+/// def round_number(number: float, *, up: bool) -> int:
+///     return ceil(number) if up else floor(number)
+///
+///
+/// round_number(1.5, up=True)
+/// round_number(1.5, up=False)
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/expressions.html#calls)
+/// - [_How to Avoid “The Boolean Trap”_ by Adam Johnson](https://adamj.eu/tech/2021/07/10/python-type-hints-how-to-avoid-the-boolean-trap/)
+#[violation]
+pub struct BooleanDefaultValueInFunctionDefinition;
+
+impl Violation for BooleanDefaultValueInFunctionDefinition {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Boolean default value in function definition")
+    }
+}
+
+pub(crate) fn check_boolean_default_value_in_function_definition(
+    checker: &mut Checker,
+    name: &str,
+    decorator_list: &[Expr],
+    arguments: &Arguments,
+) {
+    if FUNC_DEF_NAME_ALLOWLIST.contains(&name) {
+        return;
+    }
+
+    if decorator_list.iter().any(|expr| {
+        collect_call_path(expr).map_or(false, |call_path| call_path.as_slice() == [name, "setter"])
+    }) {
+        return;
+    }
+
+    for arg in &arguments.defaults {
+        add_if_boolean(checker, arg, BooleanDefaultValueInFunctionDefinition.into());
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_boolean_trap/rules/check_boolean_positional_value_in_function_call.rs b/crates/ruff/src/rules/flake8_boolean_trap/rules/check_boolean_positional_value_in_function_call.rs
new file mode 100644
index 0000000000000..5b39f0f24a308
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_boolean_trap/rules/check_boolean_positional_value_in_function_call.rs
@@ -0,0 +1,60 @@
+use rustpython_parser::ast::Expr;
+
+use ruff_diagnostics::Violation;
+
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+use crate::rules::flake8_boolean_trap::helpers::{add_if_boolean, allow_boolean_trap};
+
+/// ## What it does
+/// Checks for boolean positional arguments in function calls.
+///
+/// ## Why is this bad?
+/// Calling a function with boolean positional arguments is confusing as the
+/// meaning of the boolean value is not clear to the caller, and to future
+/// readers of the code.
+///
+/// ## Example
+/// ```python
+/// def foo(flag: bool) -> None:
+///     ...
+///
+///
+/// foo(True)
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def foo(flag: bool) -> None:
+///     ...
+///
+///
+/// foo(flag=True)
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/expressions.html#calls)
+/// - [_How to Avoid “The Boolean Trap”_ by Adam Johnson](https://adamj.eu/tech/2021/07/10/python-type-hints-how-to-avoid-the-boolean-trap/)
+#[violation]
+pub struct BooleanPositionalValueInFunctionCall;
+
+impl Violation for BooleanPositionalValueInFunctionCall {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Boolean positional value in function call")
+    }
+}
+
+pub(crate) fn check_boolean_positional_value_in_function_call(
+    checker: &mut Checker,
+    args: &[Expr],
+    func: &Expr,
+) {
+    if allow_boolean_trap(func) {
+        return;
+    }
+    for arg in args {
+        add_if_boolean(checker, arg, BooleanPositionalValueInFunctionCall.into());
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_boolean_trap/rules/check_positional_boolean_in_def.rs b/crates/ruff/src/rules/flake8_boolean_trap/rules/check_positional_boolean_in_def.rs
new file mode 100644
index 0000000000000..3a6f2d4df36eb
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_boolean_trap/rules/check_positional_boolean_in_def.rs
@@ -0,0 +1,120 @@
+use rustpython_parser::ast::{self, Arguments, Constant, Expr, Ranged};
+
+use ruff_diagnostics::Diagnostic;
+use ruff_diagnostics::Violation;
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::call_path::collect_call_path;
+
+use crate::checkers::ast::Checker;
+use crate::rules::flake8_boolean_trap::helpers::FUNC_DEF_NAME_ALLOWLIST;
+
+/// ## What it does
+/// Checks for boolean positional arguments in function definitions.
+///
+/// ## Why is this bad?
+/// Calling a function with boolean positional arguments is confusing as the
+/// meaning of the boolean value is not clear to the caller, and to future
+/// readers of the code.
+///
+/// The use of a boolean will also limit the function to only two possible
+/// behaviors, which makes the function difficult to extend in the future.
+///
+/// ## Example
+/// ```python
+/// from math import ceil, floor
+///
+///
+/// def round_number(number: float, up: bool) -> int:
+///     return ceil(number) if up else floor(number)
+///
+///
+/// round_number(1.5, True)  # What does `True` mean?
+/// round_number(1.5, False)  # What does `False` mean?
+/// ```
+///
+/// Instead, refactor into separate implementations:
+/// ```python
+/// from math import ceil, floor
+///
+///
+/// def round_up(number: float) -> int:
+///     return ceil(number)
+///
+///
+/// def round_down(number: float) -> int:
+///     return floor(number)
+///
+///
+/// round_up(1.5)
+/// round_down(1.5)
+/// ```
+///
+/// Or, refactor to use an `Enum`:
+/// ```python
+/// from enum import Enum
+///
+///
+/// class RoundingMethod(Enum):
+///     UP = 1
+///     DOWN = 2
+///
+///
+/// def round_number(value: float, method: RoundingMethod) -> float:
+///     ...
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/expressions.html#calls)
+/// - [_How to Avoid “The Boolean Trap”_ by Adam Johnson](https://adamj.eu/tech/2021/07/10/python-type-hints-how-to-avoid-the-boolean-trap/)
+#[violation]
+pub struct BooleanPositionalArgInFunctionDefinition;
+
+impl Violation for BooleanPositionalArgInFunctionDefinition {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Boolean positional arg in function definition")
+    }
+}
+
+pub(crate) fn check_positional_boolean_in_def(
+    checker: &mut Checker,
+    name: &str,
+    decorator_list: &[Expr],
+    arguments: &Arguments,
+) {
+    if FUNC_DEF_NAME_ALLOWLIST.contains(&name) {
+        return;
+    }
+
+    if decorator_list.iter().any(|expr| {
+        collect_call_path(expr).map_or(false, |call_path| call_path.as_slice() == [name, "setter"])
+    }) {
+        return;
+    }
+
+    for arg in arguments.posonlyargs.iter().chain(arguments.args.iter()) {
+        if arg.annotation.is_none() {
+            continue;
+        }
+        let Some(expr) = &arg.annotation else {
+            continue;
+        };
+
+        // check for both bool (python class) and 'bool' (string annotation)
+        let hint = match expr.as_ref() {
+            Expr::Name(name) => &name.id == "bool",
+            Expr::Constant(ast::ExprConstant {
+                value: Constant::Str(value),
+                ..
+            }) => value == "bool",
+            _ => false,
+        };
+        if !hint {
+            continue;
+        }
+        checker.diagnostics.push(Diagnostic::new(
+            BooleanPositionalArgInFunctionDefinition,
+            arg.range(),
+        ));
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_boolean_trap/rules/mod.rs b/crates/ruff/src/rules/flake8_boolean_trap/rules/mod.rs
new file mode 100644
index 0000000000000..a0e9b8bd66727
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_boolean_trap/rules/mod.rs
@@ -0,0 +1,13 @@
+pub(crate) use check_boolean_default_value_in_function_definition::{
+    check_boolean_default_value_in_function_definition, BooleanDefaultValueInFunctionDefinition,
+};
+pub(crate) use check_boolean_positional_value_in_function_call::{
+    check_boolean_positional_value_in_function_call, BooleanPositionalValueInFunctionCall,
+};
+pub(crate) use check_positional_boolean_in_def::{
+    check_positional_boolean_in_def, BooleanPositionalArgInFunctionDefinition,
+};
+
+mod check_boolean_default_value_in_function_definition;
+mod check_boolean_positional_value_in_function_call;
+mod check_positional_boolean_in_def;
diff --git a/crates/ruff/src/rules/flake8_boolean_trap/snapshots/ruff__rules__flake8_boolean_trap__tests__FBT001_FBT.py.snap b/crates/ruff/src/rules/flake8_boolean_trap/snapshots/ruff__rules__flake8_boolean_trap__tests__FBT001_FBT.py.snap
index c940e93364d0f..4f54d13871d74 100644
--- a/crates/ruff/src/rules/flake8_boolean_trap/snapshots/ruff__rules__flake8_boolean_trap__tests__FBT001_FBT.py.snap
+++ b/crates/ruff/src/rules/flake8_boolean_trap/snapshots/ruff__rules__flake8_boolean_trap__tests__FBT001_FBT.py.snap
@@ -81,12 +81,12 @@ FBT.py:19:5: FBT001 Boolean positional arg in function definition
 23 |     kwonly_nonvalued_nohint,
    |
 
-FBT.py:81:19: FBT001 Boolean positional arg in function definition
+FBT.py:85:19: FBT001 Boolean positional arg in function definition
    |
-81 |     # FBT001: Boolean positional arg in function definition
-82 |     def foo(self, value: bool) -> None:
+85 |     # FBT001: Boolean positional arg in function definition
+86 |     def foo(self, value: bool) -> None:
    |                   ^^^^^^^^^^^ FBT001
-83 |         pass
+87 |         pass
    |
 
 
diff --git a/crates/ruff/src/rules/flake8_boolean_trap/snapshots/ruff__rules__flake8_boolean_trap__tests__FBT003_FBT.py.snap b/crates/ruff/src/rules/flake8_boolean_trap/snapshots/ruff__rules__flake8_boolean_trap__tests__FBT003_FBT.py.snap
index 43058488d336c..1aeb008182e70 100644
--- a/crates/ruff/src/rules/flake8_boolean_trap/snapshots/ruff__rules__flake8_boolean_trap__tests__FBT003_FBT.py.snap
+++ b/crates/ruff/src/rules/flake8_boolean_trap/snapshots/ruff__rules__flake8_boolean_trap__tests__FBT003_FBT.py.snap
@@ -28,4 +28,12 @@ FBT.py:57:17: FBT003 Boolean positional value in function call
 61 | mylist.index(True)
    |
 
+FBT.py:69:38: FBT003 Boolean positional value in function call
+   |
+69 | os.set_blocking(0, False)
+70 | g_action.set_enabled(True)
+71 | settings.set_enable_developer_extras(True)
+   |                                      ^^^^ FBT003
+   |
+
 
diff --git a/crates/ruff/src/rules/flake8_bugbear/mod.rs b/crates/ruff/src/rules/flake8_bugbear/mod.rs
index 2a090ae515bc2..2bf567630621c 100644
--- a/crates/ruff/src/rules/flake8_bugbear/mod.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/mod.rs
@@ -6,50 +6,49 @@ pub mod settings;
 mod tests {
     use std::path::Path;
 
-    use crate::assert_messages;
     use anyhow::Result;
-
     use test_case::test_case;
 
+    use crate::assert_messages;
     use crate::registry::Rule;
     use crate::settings::Settings;
     use crate::test::test_path;
 
-    #[test_case(Rule::UnaryPrefixIncrement, Path::new("B002.py"); "B002")]
-    #[test_case(Rule::AssignmentToOsEnviron, Path::new("B003.py"); "B003")]
-    #[test_case(Rule::UnreliableCallableCheck, Path::new("B004.py"); "B004")]
-    #[test_case(Rule::StripWithMultiCharacters, Path::new("B005.py"); "B005")]
-    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_B008.py"); "B006")]
-    #[test_case(Rule::UnusedLoopControlVariable, Path::new("B007.py"); "B007")]
-    #[test_case(Rule::FunctionCallInDefaultArgument, Path::new("B006_B008.py"); "B008")]
-    #[test_case(Rule::GetAttrWithConstant, Path::new("B009_B010.py"); "B009")]
-    #[test_case(Rule::SetAttrWithConstant, Path::new("B009_B010.py"); "B010")]
-    #[test_case(Rule::AssertFalse, Path::new("B011.py"); "B011")]
-    #[test_case(Rule::JumpStatementInFinally, Path::new("B012.py"); "B012")]
-    #[test_case(Rule::RedundantTupleInExceptionHandler, Path::new("B013.py"); "B013")]
-    #[test_case(Rule::DuplicateHandlerException, Path::new("B014.py"); "B014")]
-    #[test_case(Rule::UselessComparison, Path::new("B015.py"); "B015")]
-    #[test_case(Rule::CannotRaiseLiteral, Path::new("B016.py"); "B016")]
-    #[test_case(Rule::AssertRaisesException, Path::new("B017.py"); "B017")]
-    #[test_case(Rule::UselessExpression, Path::new("B018.py"); "B018")]
-    #[test_case(Rule::CachedInstanceMethod, Path::new("B019.py"); "B019")]
-    #[test_case(Rule::LoopVariableOverridesIterator, Path::new("B020.py"); "B020")]
-    #[test_case(Rule::FStringDocstring, Path::new("B021.py"); "B021")]
-    #[test_case(Rule::UselessContextlibSuppress, Path::new("B022.py"); "B022")]
-    #[test_case(Rule::FunctionUsesLoopVariable, Path::new("B023.py"); "B023")]
-    #[test_case(Rule::AbstractBaseClassWithoutAbstractMethod, Path::new("B024.py"); "B024")]
-    #[test_case(Rule::DuplicateTryBlockException, Path::new("B025.py"); "B025")]
-    #[test_case(Rule::StarArgUnpackingAfterKeywordArg, Path::new("B026.py"); "B026")]
-    #[test_case(Rule::EmptyMethodWithoutAbstractDecorator, Path::new("B027.py"); "B027")]
-    #[test_case(Rule::EmptyMethodWithoutAbstractDecorator, Path::new("B027.pyi"); "B027_pyi")]
-    #[test_case(Rule::EmptyMethodWithoutAbstractDecorator, Path::new("B027_extended.py"); "B027_extended")]
-    #[test_case(Rule::NoExplicitStacklevel, Path::new("B028.py"); "B028")]
-    #[test_case(Rule::ExceptWithEmptyTuple, Path::new("B029.py"); "B029")]
-    #[test_case(Rule::ExceptWithNonExceptionClasses, Path::new("B030.py"); "B030")]
-    #[test_case(Rule::ReuseOfGroupbyGenerator, Path::new("B031.py"); "B031")]
-    #[test_case(Rule::UnintentionalTypeAnnotation, Path::new("B032.py"); "B032")]
-    #[test_case(Rule::RaiseWithoutFromInsideExcept, Path::new("B904.py"); "B904")]
-    #[test_case(Rule::ZipWithoutExplicitStrict, Path::new("B905.py"); "B905")]
+    #[test_case(Rule::AbstractBaseClassWithoutAbstractMethod, Path::new("B024.py"))]
+    #[test_case(Rule::AssertFalse, Path::new("B011.py"))]
+    #[test_case(Rule::AssertRaisesException, Path::new("B017.py"))]
+    #[test_case(Rule::AssignmentToOsEnviron, Path::new("B003.py"))]
+    #[test_case(Rule::CachedInstanceMethod, Path::new("B019.py"))]
+    #[test_case(Rule::CannotRaiseLiteral, Path::new("B016.py"))]
+    #[test_case(Rule::DuplicateHandlerException, Path::new("B014.py"))]
+    #[test_case(Rule::DuplicateTryBlockException, Path::new("B025.py"))]
+    #[test_case(Rule::DuplicateValue, Path::new("B033.py"))]
+    #[test_case(Rule::EmptyMethodWithoutAbstractDecorator, Path::new("B027.py"))]
+    #[test_case(Rule::EmptyMethodWithoutAbstractDecorator, Path::new("B027.pyi"))]
+    #[test_case(Rule::ExceptWithEmptyTuple, Path::new("B029.py"))]
+    #[test_case(Rule::ExceptWithNonExceptionClasses, Path::new("B030.py"))]
+    #[test_case(Rule::FStringDocstring, Path::new("B021.py"))]
+    #[test_case(Rule::FunctionCallInDefaultArgument, Path::new("B006_B008.py"))]
+    #[test_case(Rule::FunctionUsesLoopVariable, Path::new("B023.py"))]
+    #[test_case(Rule::GetAttrWithConstant, Path::new("B009_B010.py"))]
+    #[test_case(Rule::JumpStatementInFinally, Path::new("B012.py"))]
+    #[test_case(Rule::LoopVariableOverridesIterator, Path::new("B020.py"))]
+    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_B008.py"))]
+    #[test_case(Rule::NoExplicitStacklevel, Path::new("B028.py"))]
+    #[test_case(Rule::RaiseWithoutFromInsideExcept, Path::new("B904.py"))]
+    #[test_case(Rule::RedundantTupleInExceptionHandler, Path::new("B013.py"))]
+    #[test_case(Rule::ReuseOfGroupbyGenerator, Path::new("B031.py"))]
+    #[test_case(Rule::SetAttrWithConstant, Path::new("B009_B010.py"))]
+    #[test_case(Rule::StarArgUnpackingAfterKeywordArg, Path::new("B026.py"))]
+    #[test_case(Rule::StripWithMultiCharacters, Path::new("B005.py"))]
+    #[test_case(Rule::UnaryPrefixIncrement, Path::new("B002.py"))]
+    #[test_case(Rule::UnintentionalTypeAnnotation, Path::new("B032.py"))]
+    #[test_case(Rule::UnreliableCallableCheck, Path::new("B004.py"))]
+    #[test_case(Rule::UnusedLoopControlVariable, Path::new("B007.py"))]
+    #[test_case(Rule::UselessComparison, Path::new("B015.py"))]
+    #[test_case(Rule::UselessContextlibSuppress, Path::new("B022.py"))]
+    #[test_case(Rule::UselessExpression, Path::new("B018.py"))]
+    #[test_case(Rule::ZipWithoutExplicitStrict, Path::new("B905.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/abstract_base_class.rs b/crates/ruff/src/rules/flake8_bugbear/rules/abstract_base_class.rs
index f49db94cee7a5..59ea9cc66579a 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/abstract_base_class.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/abstract_base_class.rs
@@ -1,21 +1,17 @@
-use anyhow::{anyhow, Result};
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Constant, Expr, Keyword, Ranged, Stmt};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix, Violation};
+use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::source_code::{Locator, Stylist};
-use ruff_python_ast::whitespace::indentation;
+use ruff_python_ast::helpers::identifier_range;
 use ruff_python_semantic::analyze::visibility::{is_abstract, is_overload};
-use ruff_python_semantic::context::Context;
+use ruff_python_semantic::model::SemanticModel;
 
-use crate::autofix::actions::get_or_import_symbol;
 use crate::checkers::ast::Checker;
-use crate::importer::Importer;
 use crate::registry::Rule;
 
 #[violation]
 pub struct AbstractBaseClassWithoutAbstractMethod {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for AbstractBaseClassWithoutAbstractMethod {
@@ -25,13 +21,12 @@ impl Violation for AbstractBaseClassWithoutAbstractMethod {
         format!("`{name}` is an abstract base class, but it has no abstract methods")
     }
 }
-
 #[violation]
 pub struct EmptyMethodWithoutAbstractDecorator {
-    pub name: String,
+    name: String,
 }
 
-impl AlwaysAutofixableViolation for EmptyMethodWithoutAbstractDecorator {
+impl Violation for EmptyMethodWithoutAbstractDecorator {
     #[derive_message_formats]
     fn message(&self) -> String {
         let EmptyMethodWithoutAbstractDecorator { name } = self;
@@ -39,36 +34,31 @@ impl AlwaysAutofixableViolation for EmptyMethodWithoutAbstractDecorator {
             "`{name}` is an empty method in an abstract base class, but has no abstract decorator"
         )
     }
-
-    fn autofix_title(&self) -> String {
-        "Add the `@abstractmethod` decorator".to_string()
-    }
 }
 
-fn is_abc_class(context: &Context, bases: &[Expr], keywords: &[Keyword]) -> bool {
+fn is_abc_class(model: &SemanticModel, bases: &[Expr], keywords: &[Keyword]) -> bool {
     keywords.iter().any(|keyword| {
-        keyword
-            .node
-            .arg
-            .as_ref()
-            .map_or(false, |arg| arg == "metaclass")
-            && context
-                .resolve_call_path(&keyword.node.value)
+        keyword.arg.as_ref().map_or(false, |arg| arg == "metaclass")
+            && model
+                .resolve_call_path(&keyword.value)
                 .map_or(false, |call_path| {
                     call_path.as_slice() == ["abc", "ABCMeta"]
                 })
     }) || bases.iter().any(|base| {
-        context
+        model
             .resolve_call_path(base)
             .map_or(false, |call_path| call_path.as_slice() == ["abc", "ABC"])
     })
 }
 
 fn is_empty_body(body: &[Stmt]) -> bool {
-    body.iter().all(|stmt| match &stmt.node {
-        StmtKind::Pass => true,
-        StmtKind::Expr { value } => match &value.node {
-            ExprKind::Constant { value, .. } => {
+    body.iter().all(|stmt| match stmt {
+        Stmt::Pass(_) => true,
+        Stmt::Expr(ast::StmtExpr {
+            value,
+            range: _range,
+        }) => match value.as_ref() {
+            Expr::Constant(ast::ExprConstant { value, .. }) => {
                 matches!(value, Constant::Str(..) | Constant::Ellipsis)
             }
             _ => false,
@@ -77,29 +67,9 @@ fn is_empty_body(body: &[Stmt]) -> bool {
     })
 }
 
-fn fix_abstractmethod_missing(
-    context: &Context,
-    importer: &Importer,
-    locator: &Locator,
-    stylist: &Stylist,
-    stmt: &Stmt,
-) -> Result<Fix> {
-    let indent = indentation(locator, stmt).ok_or(anyhow!("Unable to detect indentation"))?;
-    let (import_edit, binding) =
-        get_or_import_symbol("abc", "abstractmethod", context, importer, locator)?;
-    let reference_edit = Edit::insertion(
-        format!(
-            "@{binding}{line_ending}{indent}",
-            line_ending = stylist.line_ending().as_str(),
-        ),
-        stmt.range().start(),
-    );
-    Ok(Fix::from_iter([import_edit, reference_edit]))
-}
-
 /// B024
 /// B027
-pub fn abstract_base_class(
+pub(crate) fn abstract_base_class(
     checker: &mut Checker,
     stmt: &Stmt,
     name: &str,
@@ -110,7 +80,7 @@ pub fn abstract_base_class(
     if bases.len() + keywords.len() != 1 {
         return;
     }
-    if !is_abc_class(&checker.ctx, bases, keywords) {
+    if !is_abc_class(checker.semantic_model(), bases, keywords) {
         return;
     }
 
@@ -118,73 +88,53 @@ pub fn abstract_base_class(
     for stmt in body {
         // https://github.com/PyCQA/flake8-bugbear/issues/293
         // Ignore abc's that declares a class attribute that must be set
-        if let StmtKind::AnnAssign { .. } | StmtKind::Assign { .. } = &stmt.node {
+        if let Stmt::AnnAssign(_) | Stmt::Assign(_) = stmt {
             has_abstract_method = true;
             continue;
         }
 
         let (
-            StmtKind::FunctionDef {
+            Stmt::FunctionDef(ast::StmtFunctionDef {
                 decorator_list,
                 body,
                 name: method_name,
                 ..
-            } | StmtKind::AsyncFunctionDef {
+            }) | Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef {
                 decorator_list,
                 body,
                 name: method_name,
                 ..
-            }
-        ) = &stmt.node else {
+            })
+        ) = stmt else {
             continue;
         };
 
-        let has_abstract_decorator = is_abstract(&checker.ctx, decorator_list);
+        let has_abstract_decorator = is_abstract(checker.semantic_model(), decorator_list);
         has_abstract_method |= has_abstract_decorator;
 
-        if !checker
-            .settings
-            .rules
-            .enabled(Rule::EmptyMethodWithoutAbstractDecorator)
-        {
+        if !checker.enabled(Rule::EmptyMethodWithoutAbstractDecorator) {
             continue;
         }
 
         if !has_abstract_decorator
             && is_empty_body(body)
-            && !is_overload(&checker.ctx, decorator_list)
+            && !is_overload(checker.semantic_model(), decorator_list)
         {
-            let mut diagnostic = Diagnostic::new(
+            checker.diagnostics.push(Diagnostic::new(
                 EmptyMethodWithoutAbstractDecorator {
                     name: format!("{name}.{method_name}"),
                 },
                 stmt.range(),
-            );
-            if checker.patch(Rule::EmptyMethodWithoutAbstractDecorator) {
-                diagnostic.try_set_fix(|| {
-                    fix_abstractmethod_missing(
-                        &checker.ctx,
-                        &checker.importer,
-                        checker.locator,
-                        checker.stylist,
-                        stmt,
-                    )
-                });
-            }
-            checker.diagnostics.push(diagnostic);
+            ));
         }
     }
-    if checker
-        .settings
-        .rules
-        .enabled(Rule::AbstractBaseClassWithoutAbstractMethod)
-    {
+    if checker.enabled(Rule::AbstractBaseClassWithoutAbstractMethod) {
         if !has_abstract_method {
             checker.diagnostics.push(Diagnostic::new(
                 AbstractBaseClassWithoutAbstractMethod {
                     name: name.to_string(),
                 },
-                stmt.range(),
+                identifier_range(stmt, checker.locator),
             ));
         }
     }
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/assert_false.rs b/crates/ruff/src/rules/flake8_bugbear/rules/assert_false.rs
index 801a1fae98615..817483b00eb1b 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/assert_false.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/assert_false.rs
@@ -1,9 +1,8 @@
-use ruff_text_size::TextSize;
-use rustpython_parser::ast::{Constant, Expr, ExprContext, ExprKind, Stmt, StmtKind};
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Constant, Expr, ExprContext, Ranged, Stmt};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::unparse_stmt;
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
@@ -23,50 +22,42 @@ impl AlwaysAutofixableViolation for AssertFalse {
 }
 
 fn assertion_error(msg: Option<&Expr>) -> Stmt {
-    Stmt::new(
-        TextSize::default(),
-        TextSize::default(),
-        StmtKind::Raise {
-            exc: Some(Box::new(Expr::new(
-                TextSize::default(),
-                TextSize::default(),
-                ExprKind::Call {
-                    func: Box::new(Expr::new(
-                        TextSize::default(),
-                        TextSize::default(),
-                        ExprKind::Name {
-                            id: "AssertionError".to_string(),
-                            ctx: ExprContext::Load,
-                        },
-                    )),
-                    args: if let Some(msg) = msg {
-                        vec![msg.clone()]
-                    } else {
-                        vec![]
-                    },
-                    keywords: vec![],
-                },
-            ))),
-            cause: None,
-        },
-    )
+    Stmt::Raise(ast::StmtRaise {
+        range: TextRange::default(),
+        exc: Some(Box::new(Expr::Call(ast::ExprCall {
+            func: Box::new(Expr::Name(ast::ExprName {
+                id: "AssertionError".into(),
+                ctx: ExprContext::Load,
+                range: TextRange::default(),
+            })),
+            args: if let Some(msg) = msg {
+                vec![msg.clone()]
+            } else {
+                vec![]
+            },
+            keywords: vec![],
+            range: TextRange::default(),
+        }))),
+        cause: None,
+    })
 }
 
 /// B011
-pub fn assert_false(checker: &mut Checker, stmt: &Stmt, test: &Expr, msg: Option<&Expr>) {
-    let ExprKind::Constant {
+pub(crate) fn assert_false(checker: &mut Checker, stmt: &Stmt, test: &Expr, msg: Option<&Expr>) {
+    let Expr::Constant(ast::ExprConstant {
         value: Constant::Bool(false),
         ..
-    } = &test.node else {
+    } )= &test else {
         return;
     };
 
     let mut diagnostic = Diagnostic::new(AssertFalse, test.range());
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(
-            unparse_stmt(&assertion_error(msg), checker.stylist),
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
+            checker.generator().stmt(&assertion_error(msg)),
             stmt.range(),
-        ));
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/assert_raises_exception.rs b/crates/ruff/src/rules/flake8_bugbear/rules/assert_raises_exception.rs
index 74ecfb14add51..be7a22f54e7d4 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/assert_raises_exception.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/assert_raises_exception.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{ExprKind, Stmt, Withitem};
+use rustpython_parser::ast::{self, Expr, Ranged, Stmt, Withitem};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -6,7 +6,7 @@ use ruff_macros::{derive_message_formats, violation};
 use crate::checkers::ast::Checker;
 
 #[derive(Debug, PartialEq, Eq)]
-pub enum AssertionKind {
+pub(crate) enum AssertionKind {
     AssertRaises,
     PytestRaises,
 }
@@ -50,12 +50,12 @@ impl Violation for AssertRaisesException {
 }
 
 /// B017
-pub fn assert_raises_exception(checker: &mut Checker, stmt: &Stmt, items: &[Withitem]) {
+pub(crate) fn assert_raises_exception(checker: &mut Checker, stmt: &Stmt, items: &[Withitem]) {
     let Some(item) = items.first() else {
         return;
     };
     let item_context = &item.context_expr;
-    let ExprKind::Call { func, args, keywords } = &item_context.node else {
+    let Expr::Call(ast::ExprCall { func, args, keywords, range: _ }) = &item_context else {
         return;
     };
     if args.len() != 1 {
@@ -66,7 +66,7 @@ pub fn assert_raises_exception(checker: &mut Checker, stmt: &Stmt, items: &[With
     }
 
     if !checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(args.first().unwrap())
         .map_or(false, |call_path| call_path.as_slice() == ["", "Exception"])
     {
@@ -74,21 +74,18 @@ pub fn assert_raises_exception(checker: &mut Checker, stmt: &Stmt, items: &[With
     }
 
     let kind = {
-        if matches!(&func.node, ExprKind::Attribute { attr, .. } if attr == "assertRaises") {
+        if matches!(func.as_ref(), Expr::Attribute(ast::ExprAttribute { attr, .. }) if attr == "assertRaises")
+        {
             AssertionKind::AssertRaises
         } else if checker
-            .ctx
+            .semantic_model()
             .resolve_call_path(func)
             .map_or(false, |call_path| {
                 call_path.as_slice() == ["pytest", "raises"]
             })
-            && !keywords.iter().any(|keyword| {
-                keyword
-                    .node
-                    .arg
-                    .as_ref()
-                    .map_or(false, |arg| arg == "match")
-            })
+            && !keywords
+                .iter()
+                .any(|keyword| keyword.arg.as_ref().map_or(false, |arg| arg == "match"))
         {
             AssertionKind::PytestRaises
         } else {
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/assignment_to_os_environ.rs b/crates/ruff/src/rules/flake8_bugbear/rules/assignment_to_os_environ.rs
index c5aea9ca3d8a6..fcaa3d63739c3 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/assignment_to_os_environ.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/assignment_to_os_environ.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -15,20 +15,20 @@ impl Violation for AssignmentToOsEnviron {
     }
 }
 /// B003
-pub fn assignment_to_os_environ(checker: &mut Checker, targets: &[Expr]) {
+pub(crate) fn assignment_to_os_environ(checker: &mut Checker, targets: &[Expr]) {
     if targets.len() != 1 {
         return;
     }
     let target = &targets[0];
-    let ExprKind::Attribute { value, attr, .. } = &target.node else {
+    let Expr::Attribute(ast::ExprAttribute { value, attr, .. }) = target else {
         return;
     };
     if attr != "environ" {
         return;
     }
-    let ExprKind::Name { id, .. } = &value.node else {
-                    return;
-                };
+    let Expr::Name(ast::ExprName { id, .. } )= value.as_ref() else {
+        return;
+    };
     if id != "os" {
         return;
     }
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/cached_instance_method.rs b/crates/ruff/src/rules/flake8_bugbear/rules/cached_instance_method.rs
index 12cca253550b1..cb19ec0904289 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/cached_instance_method.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/cached_instance_method.rs
@@ -1,8 +1,8 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_semantic::scope::ScopeKind;
+use ruff_python_semantic::model::SemanticModel;
 
 use crate::checkers::ast::Checker;
 
@@ -18,25 +18,22 @@ impl Violation for CachedInstanceMethod {
     }
 }
 
-fn is_cache_func(checker: &Checker, expr: &Expr) -> bool {
-    checker
-        .ctx
-        .resolve_call_path(expr)
-        .map_or(false, |call_path| {
-            call_path.as_slice() == ["functools", "lru_cache"]
-                || call_path.as_slice() == ["functools", "cache"]
-        })
+fn is_cache_func(model: &SemanticModel, expr: &Expr) -> bool {
+    model.resolve_call_path(expr).map_or(false, |call_path| {
+        call_path.as_slice() == ["functools", "lru_cache"]
+            || call_path.as_slice() == ["functools", "cache"]
+    })
 }
 
 /// B019
-pub fn cached_instance_method(checker: &mut Checker, decorator_list: &[Expr]) {
-    if !matches!(checker.ctx.scope().kind, ScopeKind::Class(_)) {
+pub(crate) fn cached_instance_method(checker: &mut Checker, decorator_list: &[Expr]) {
+    if !checker.semantic_model().scope().kind.is_class() {
         return;
     }
     for decorator in decorator_list {
         // TODO(charlie): This should take into account `classmethod-decorators` and
         // `staticmethod-decorators`.
-        if let ExprKind::Name { id, .. } = &decorator.node {
+        if let Expr::Name(ast::ExprName { id, .. }) = decorator {
             if id == "classmethod" || id == "staticmethod" {
                 return;
             }
@@ -44,9 +41,9 @@ pub fn cached_instance_method(checker: &mut Checker, decorator_list: &[Expr]) {
     }
     for decorator in decorator_list {
         if is_cache_func(
-            checker,
-            match &decorator.node {
-                ExprKind::Call { func, .. } => func,
+            checker.semantic_model(),
+            match decorator {
+                Expr::Call(ast::ExprCall { func, .. }) => func,
                 _ => decorator,
             },
         ) {
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/cannot_raise_literal.rs b/crates/ruff/src/rules/flake8_bugbear/rules/cannot_raise_literal.rs
index 9709649cb00e1..6b2df20d5b410 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/cannot_raise_literal.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/cannot_raise_literal.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -16,8 +16,8 @@ impl Violation for CannotRaiseLiteral {
 }
 
 /// B016
-pub fn cannot_raise_literal(checker: &mut Checker, expr: &Expr) {
-    let ExprKind::Constant { .. } = &expr.node else {
+pub(crate) fn cannot_raise_literal(checker: &mut Checker, expr: &Expr) {
+    let Expr::Constant ( _) = expr else {
         return;
     };
     checker
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs b/crates/ruff/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs
index 3c6def1b6bb02..95eed78d56089 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs
@@ -1,21 +1,20 @@
 use itertools::Itertools;
-use ruff_text_size::TextSize;
+use ruff_text_size::TextRange;
 use rustc_hash::{FxHashMap, FxHashSet};
-use rustpython_parser::ast::{Excepthandler, ExcepthandlerKind, Expr, ExprContext, ExprKind};
+use rustpython_parser::ast::{self, Excepthandler, Expr, ExprContext, Ranged};
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Violation};
-use ruff_diagnostics::{Diagnostic, Edit};
+use ruff_diagnostics::{Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::call_path;
 use ruff_python_ast::call_path::CallPath;
-use ruff_python_ast::helpers::unparse_expr;
 
 use crate::checkers::ast::Checker;
 use crate::registry::{AsRule, Rule};
 
 #[violation]
 pub struct DuplicateTryBlockException {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for DuplicateTryBlockException {
@@ -49,14 +48,12 @@ impl AlwaysAutofixableViolation for DuplicateHandlerException {
 }
 
 fn type_pattern(elts: Vec<&Expr>) -> Expr {
-    Expr::new(
-        TextSize::default(),
-        TextSize::default(),
-        ExprKind::Tuple {
-            elts: elts.into_iter().cloned().collect(),
-            ctx: ExprContext::Load,
-        },
-    )
+    ast::ExprTuple {
+        elts: elts.into_iter().cloned().collect(),
+        ctx: ExprContext::Load,
+        range: TextRange::default(),
+    }
+    .into()
 }
 
 fn duplicate_handler_exceptions<'a>(
@@ -78,11 +75,7 @@ fn duplicate_handler_exceptions<'a>(
         }
     }
 
-    if checker
-        .settings
-        .rules
-        .enabled(Rule::DuplicateHandlerException)
-    {
+    if checker.enabled(Rule::DuplicateHandlerException) {
         // TODO(charlie): Handle "BaseException" and redundant exception aliases.
         if !duplicates.is_empty() {
             let mut diagnostic = Diagnostic::new(
@@ -96,14 +89,15 @@ fn duplicate_handler_exceptions<'a>(
                 expr.range(),
             );
             if checker.patch(diagnostic.kind.rule()) {
-                diagnostic.set_fix(Edit::range_replacement(
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
                     if unique_elts.len() == 1 {
-                        unparse_expr(unique_elts[0], checker.stylist)
+                        checker.generator().expr(unique_elts[0])
                     } else {
-                        unparse_expr(&type_pattern(unique_elts), checker.stylist)
+                        checker.generator().expr(&type_pattern(unique_elts))
                     },
                     expr.range(),
-                ));
+                )));
             }
             checker.diagnostics.push(diagnostic);
         }
@@ -112,15 +106,15 @@ fn duplicate_handler_exceptions<'a>(
     seen
 }
 
-pub fn duplicate_exceptions(checker: &mut Checker, handlers: &[Excepthandler]) {
+pub(crate) fn duplicate_exceptions(checker: &mut Checker, handlers: &[Excepthandler]) {
     let mut seen: FxHashSet<CallPath> = FxHashSet::default();
     let mut duplicates: FxHashMap<CallPath, Vec<&Expr>> = FxHashMap::default();
     for handler in handlers {
-        let ExcepthandlerKind::ExceptHandler { type_: Some(type_), .. } = &handler.node else {
+        let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler { type_: Some(type_), .. }) = handler else {
             continue;
         };
-        match &type_.node {
-            ExprKind::Attribute { .. } | ExprKind::Name { .. } => {
+        match type_.as_ref() {
+            Expr::Attribute(_) | Expr::Name(_) => {
                 if let Some(call_path) = call_path::collect_call_path(type_) {
                     if seen.contains(&call_path) {
                         duplicates.entry(call_path).or_default().push(type_);
@@ -129,7 +123,7 @@ pub fn duplicate_exceptions(checker: &mut Checker, handlers: &[Excepthandler]) {
                     }
                 }
             }
-            ExprKind::Tuple { elts, .. } => {
+            Expr::Tuple(ast::ExprTuple { elts, .. }) => {
                 for (name, expr) in duplicate_handler_exceptions(checker, type_, elts) {
                     if seen.contains(&name) {
                         duplicates.entry(name).or_default().push(expr);
@@ -142,11 +136,7 @@ pub fn duplicate_exceptions(checker: &mut Checker, handlers: &[Excepthandler]) {
         }
     }
 
-    if checker
-        .settings
-        .rules
-        .enabled(Rule::DuplicateTryBlockException)
-    {
+    if checker.enabled(Rule::DuplicateTryBlockException) {
         for (name, exprs) in duplicates {
             for expr in exprs {
                 checker.diagnostics.push(Diagnostic::new(
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/duplicate_value.rs b/crates/ruff/src/rules/flake8_bugbear/rules/duplicate_value.rs
new file mode 100644
index 0000000000000..e66da4623c283
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/duplicate_value.rs
@@ -0,0 +1,57 @@
+use rustc_hash::FxHashSet;
+use rustpython_parser::ast::{self, Expr, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::comparable::ComparableExpr;
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for set literals that contain duplicate items.
+///
+/// ## Why is this bad?
+/// In Python, sets are unordered collections of unique elements. Including a
+/// duplicate item in a set literal is redundant, as the duplicate item will be
+/// replaced with a single item at runtime.
+///
+/// ## Example
+/// ```python
+/// {1, 2, 3, 1}
+/// ```
+///
+/// Use instead:
+/// ```python
+/// {1, 2, 3}
+/// ```
+#[violation]
+pub struct DuplicateValue {
+    value: String,
+}
+
+impl Violation for DuplicateValue {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let DuplicateValue { value } = self;
+        format!("Sets should not contain duplicate item `{value}`")
+    }
+}
+
+/// B033
+pub(crate) fn duplicate_value(checker: &mut Checker, elts: &Vec<Expr>) {
+    let mut seen_values: FxHashSet<ComparableExpr> = FxHashSet::default();
+    for elt in elts {
+        if let Expr::Constant(ast::ExprConstant { value, .. }) = elt {
+            let comparable_value: ComparableExpr = elt.into();
+
+            if !seen_values.insert(comparable_value) {
+                checker.diagnostics.push(Diagnostic::new(
+                    DuplicateValue {
+                        value: checker.generator().constant(value),
+                    },
+                    elt.range(),
+                ));
+            }
+        };
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/except_with_empty_tuple.rs b/crates/ruff/src/rules/flake8_bugbear/rules/except_with_empty_tuple.rs
index cf183851ecfe9..9ee4188a46ec2 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/except_with_empty_tuple.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/except_with_empty_tuple.rs
@@ -1,5 +1,5 @@
-use rustpython_parser::ast::Excepthandler;
-use rustpython_parser::ast::{ExcepthandlerKind, ExprKind};
+use rustpython_parser::ast::{self, Ranged};
+use rustpython_parser::ast::{Excepthandler, Expr};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -17,12 +17,12 @@ impl Violation for ExceptWithEmptyTuple {
 }
 
 /// B029
-pub fn except_with_empty_tuple(checker: &mut Checker, excepthandler: &Excepthandler) {
-    let ExcepthandlerKind::ExceptHandler { type_, .. } = &excepthandler.node;
+pub(crate) fn except_with_empty_tuple(checker: &mut Checker, excepthandler: &Excepthandler) {
+    let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler { type_, .. }) = excepthandler;
     let Some(type_) = type_ else {
         return;
     };
-    let ExprKind::Tuple { elts, .. } = &type_.node else {
+    let Expr::Tuple(ast::ExprTuple { elts, .. }) = type_.as_ref() else {
         return;
     };
     if elts.is_empty() {
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/except_with_non_exception_classes.rs b/crates/ruff/src/rules/flake8_bugbear/rules/except_with_non_exception_classes.rs
index dbdce82222720..4bfab07f94220 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/except_with_non_exception_classes.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/except_with_non_exception_classes.rs
@@ -1,6 +1,6 @@
 use std::collections::VecDeque;
 
-use rustpython_parser::ast::{Excepthandler, ExcepthandlerKind, Expr, ExprKind};
+use rustpython_parser::ast::{self, Excepthandler, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -17,19 +17,20 @@ impl Violation for ExceptWithNonExceptionClasses {
     }
 }
 
-/// Given an [`Expr`], flatten any [`ExprKind::Starred`] expressions.
+/// Given an [`Expr`], flatten any [`Expr::Starred`] expressions.
 /// This should leave any unstarred iterables alone (subsequently raising a
 /// warning for B029).
 fn flatten_starred_iterables(expr: &Expr) -> Vec<&Expr> {
-    let ExprKind::Tuple { elts, .. } = &expr.node else {
+    let Expr::Tuple(ast::ExprTuple { elts, .. } )= expr else {
         return vec![expr];
     };
     let mut flattened_exprs: Vec<&Expr> = Vec::with_capacity(elts.len());
     let mut exprs_to_process: VecDeque<&Expr> = elts.iter().collect();
     while let Some(expr) = exprs_to_process.pop_front() {
-        match &expr.node {
-            ExprKind::Starred { value, .. } => match &value.node {
-                ExprKind::Tuple { elts, .. } | ExprKind::List { elts, .. } => {
+        match expr {
+            Expr::Starred(ast::ExprStarred { value, .. }) => match value.as_ref() {
+                Expr::Tuple(ast::ExprTuple { elts, .. })
+                | Expr::List(ast::ExprList { elts, .. }) => {
                     exprs_to_process.append(&mut elts.iter().collect());
                 }
                 _ => flattened_exprs.push(value),
@@ -41,18 +42,18 @@ fn flatten_starred_iterables(expr: &Expr) -> Vec<&Expr> {
 }
 
 /// B030
-pub fn except_with_non_exception_classes(checker: &mut Checker, excepthandler: &Excepthandler) {
-    let ExcepthandlerKind::ExceptHandler { type_, .. } = &excepthandler.node;
+pub(crate) fn except_with_non_exception_classes(
+    checker: &mut Checker,
+    excepthandler: &Excepthandler,
+) {
+    let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler { type_, .. }) = excepthandler;
     let Some(type_) = type_ else {
         return;
     };
     for expr in flatten_starred_iterables(type_) {
         if !matches!(
-            &expr.node,
-            ExprKind::Subscript { .. }
-                | ExprKind::Attribute { .. }
-                | ExprKind::Name { .. }
-                | ExprKind::Call { .. },
+            expr,
+            Expr::Subscript(_) | Expr::Attribute(_) | Expr::Name(_) | Expr::Call(_),
         ) {
             checker
                 .diagnostics
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/f_string_docstring.rs b/crates/ruff/src/rules/flake8_bugbear/rules/f_string_docstring.rs
index 423f7818ad089..5453b71569f7e 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/f_string_docstring.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/f_string_docstring.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Expr, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -13,21 +13,20 @@ impl Violation for FStringDocstring {
     #[derive_message_formats]
     fn message(&self) -> String {
         format!(
-            "f-string used as docstring. This will be interpreted by python as a joined string \
-             rather than a docstring."
+            "f-string used as docstring. Python will interpret this as a joined string, rather than a docstring."
         )
     }
 }
 
 /// B021
-pub fn f_string_docstring(checker: &mut Checker, body: &[Stmt]) {
+pub(crate) fn f_string_docstring(checker: &mut Checker, body: &[Stmt]) {
     let Some(stmt) = body.first() else {
         return;
     };
-    let StmtKind::Expr { value } = &stmt.node else {
+    let Stmt::Expr(ast::StmtExpr { value, range: _ }) = stmt else {
         return;
     };
-    let ExprKind::JoinedStr { .. } = value.node else {
+    let Expr::JoinedStr ( _) = value.as_ref() else {
         return;
     };
     checker.diagnostics.push(Diagnostic::new(
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/function_call_argument_default.rs b/crates/ruff/src/rules/flake8_bugbear/rules/function_call_argument_default.rs
index 4d775e60f247e..a36b571c12fad 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/function_call_argument_default.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/function_call_argument_default.rs
@@ -1,14 +1,14 @@
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::{Arguments, Constant, Expr, ExprKind};
+use rustpython_parser::ast::{self, Arguments, Expr, Ranged};
 
 use ruff_diagnostics::Violation;
 use ruff_diagnostics::{Diagnostic, DiagnosticKind};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::call_path::from_qualified_name;
-use ruff_python_ast::call_path::{compose_call_path, CallPath};
+use ruff_python_ast::call_path::{compose_call_path, from_qualified_name, CallPath};
 use ruff_python_ast::visitor;
 use ruff_python_ast::visitor::Visitor;
 use ruff_python_semantic::analyze::typing::is_immutable_func;
+use ruff_python_semantic::model::SemanticModel;
 
 use crate::checkers::ast::Checker;
 use crate::rules::flake8_bugbear::rules::mutable_argument_default::is_mutable_func;
@@ -16,7 +16,7 @@ use crate::rules::flake8_bugbear::rules::mutable_argument_default::is_mutable_fu
 /// ## What it does
 /// Checks for function calls in default function arguments.
 ///
-/// ## Why is it bad?
+/// ## Why is this bad?
 /// Any function call that's used in a default argument will only be performed
 /// once, at definition time. The returned value will then be reused by all
 /// calls to the function, which can lead to unexpected behaviour.
@@ -29,6 +29,7 @@ use crate::rules::flake8_bugbear::rules::mutable_argument_default::is_mutable_fu
 /// def create_list() -> list[int]:
 ///     return [1, 2, 3]
 ///
+///
 /// def mutable_default(arg: list[int] = create_list()) -> list[int]:
 ///     arg.append(4)
 ///     return arg
@@ -49,6 +50,7 @@ use crate::rules::flake8_bugbear::rules::mutable_argument_default::is_mutable_fu
 /// ```python
 /// I_KNOW_THIS_IS_SHARED_STATE = create_list()
 ///
+///
 /// def mutable_default(arg: list[int] = I_KNOW_THIS_IS_SHARED_STATE) -> list[int]:
 ///     arg.append(4)
 ///     return arg
@@ -71,9 +73,19 @@ impl Violation for FunctionCallInDefaultArgument {
 }
 
 struct ArgumentDefaultVisitor<'a> {
-    checker: &'a Checker<'a>,
-    diagnostics: Vec<(DiagnosticKind, TextRange)>,
+    model: &'a SemanticModel<'a>,
     extend_immutable_calls: Vec<CallPath<'a>>,
+    diagnostics: Vec<(DiagnosticKind, TextRange)>,
+}
+
+impl<'a> ArgumentDefaultVisitor<'a> {
+    fn new(model: &'a SemanticModel<'a>, extend_immutable_calls: Vec<CallPath<'a>>) -> Self {
+        Self {
+            model,
+            extend_immutable_calls,
+            diagnostics: Vec::new(),
+        }
+    }
 }
 
 impl<'a, 'b> Visitor<'b> for ArgumentDefaultVisitor<'b>
@@ -81,11 +93,10 @@ where
     'b: 'a,
 {
     fn visit_expr(&mut self, expr: &'b Expr) {
-        match &expr.node {
-            ExprKind::Call { func, args, .. } => {
-                if !is_mutable_func(self.checker, func)
-                    && !is_immutable_func(&self.checker.ctx, func, &self.extend_immutable_calls)
-                    && !is_nan_or_infinity(func, args)
+        match expr {
+            Expr::Call(ast::ExprCall { func, .. }) => {
+                if !is_mutable_func(self.model, func)
+                    && !is_immutable_func(self.model, func, &self.extend_immutable_calls)
                 {
                     self.diagnostics.push((
                         FunctionCallInDefaultArgument {
@@ -97,37 +108,14 @@ where
                 }
                 visitor::walk_expr(self, expr);
             }
-            ExprKind::Lambda { .. } => {}
+            Expr::Lambda(_) => {}
             _ => visitor::walk_expr(self, expr),
         }
     }
 }
 
-fn is_nan_or_infinity(expr: &Expr, args: &[Expr]) -> bool {
-    let ExprKind::Name { id, .. } = &expr.node else {
-        return false;
-    };
-    if id != "float" {
-        return false;
-    }
-    let Some(arg) = args.first() else {
-        return false;
-    };
-    let ExprKind::Constant {
-        value: Constant::Str(value),
-        ..
-    } = &arg.node else {
-        return false;
-    };
-    let lowercased = value.to_lowercase();
-    matches!(
-        lowercased.as_str(),
-        "nan" | "+nan" | "-nan" | "inf" | "+inf" | "-inf" | "infinity" | "+infinity" | "-infinity"
-    )
-}
-
 /// B008
-pub fn function_call_argument_default(checker: &mut Checker, arguments: &Arguments) {
+pub(crate) fn function_call_argument_default(checker: &mut Checker, arguments: &Arguments) {
     // Map immutable calls to (module, member) format.
     let extend_immutable_calls: Vec<CallPath> = checker
         .settings
@@ -137,11 +125,8 @@ pub fn function_call_argument_default(checker: &mut Checker, arguments: &Argumen
         .map(|target| from_qualified_name(target))
         .collect();
     let diagnostics = {
-        let mut visitor = ArgumentDefaultVisitor {
-            checker,
-            diagnostics: vec![],
-            extend_immutable_calls,
-        };
+        let mut visitor =
+            ArgumentDefaultVisitor::new(checker.semantic_model(), extend_immutable_calls);
         for expr in arguments
             .defaults
             .iter()
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/function_uses_loop_variable.rs b/crates/ruff/src/rules/flake8_bugbear/rules/function_uses_loop_variable.rs
index 1651bf2ab9732..d6d061534fe39 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/function_uses_loop_variable.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/function_uses_loop_variable.rs
@@ -1,6 +1,5 @@
-use ruff_text_size::TextRange;
 use rustc_hash::FxHashSet;
-use rustpython_parser::ast::{Comprehension, Expr, ExprContext, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Comprehension, Expr, ExprContext, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -13,7 +12,7 @@ use crate::checkers::ast::Checker;
 
 #[violation]
 pub struct FunctionUsesLoopVariable {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for FunctionUsesLoopVariable {
@@ -27,18 +26,18 @@ impl Violation for FunctionUsesLoopVariable {
 #[derive(Default)]
 struct LoadedNamesVisitor<'a> {
     // Tuple of: name, defining expression, and defining range.
-    loaded: Vec<(&'a str, &'a Expr, TextRange)>,
+    loaded: Vec<(&'a str, &'a Expr)>,
     // Tuple of: name, defining expression, and defining range.
-    stored: Vec<(&'a str, &'a Expr, TextRange)>,
+    stored: Vec<(&'a str, &'a Expr)>,
 }
 
 /// `Visitor` to collect all used identifiers in a statement.
 impl<'a> Visitor<'a> for LoadedNamesVisitor<'a> {
     fn visit_expr(&mut self, expr: &'a Expr) {
-        match &expr.node {
-            ExprKind::Name { id, ctx } => match ctx {
-                ExprContext::Load => self.loaded.push((id, expr, expr.range())),
-                ExprContext::Store => self.stored.push((id, expr, expr.range())),
+        match expr {
+            Expr::Name(ast::ExprName { id, ctx, range: _ }) => match ctx {
+                ExprContext::Load => self.loaded.push((id, expr)),
+                ExprContext::Store => self.stored.push((id, expr)),
                 ExprContext::Del => {}
             },
             _ => visitor::walk_expr(self, expr),
@@ -48,7 +47,7 @@ impl<'a> Visitor<'a> for LoadedNamesVisitor<'a> {
 
 #[derive(Default)]
 struct SuspiciousVariablesVisitor<'a> {
-    names: Vec<(&'a str, &'a Expr, TextRange)>,
+    names: Vec<(&'a str, &'a Expr)>,
     safe_functions: Vec<&'a Expr>,
 }
 
@@ -56,9 +55,9 @@ struct SuspiciousVariablesVisitor<'a> {
 /// functions, but not bound as arguments).
 impl<'a> Visitor<'a> for SuspiciousVariablesVisitor<'a> {
     fn visit_stmt(&mut self, stmt: &'a Stmt) {
-        match &stmt.node {
-            StmtKind::FunctionDef { args, body, .. }
-            | StmtKind::AsyncFunctionDef { args, body, .. } => {
+        match stmt {
+            Stmt::FunctionDef(ast::StmtFunctionDef { args, body, .. })
+            | Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef { args, body, .. }) => {
                 // Collect all loaded variable names.
                 let mut visitor = LoadedNamesVisitor::default();
                 visitor.visit_body(body);
@@ -76,9 +75,12 @@ impl<'a> Visitor<'a> for SuspiciousVariablesVisitor<'a> {
                 );
                 return;
             }
-            StmtKind::Return { value: Some(value) } => {
+            Stmt::Return(ast::StmtReturn {
+                value: Some(value),
+                range: _,
+            }) => {
                 // Mark `return lambda: x` as safe.
-                if matches!(value.node, ExprKind::Lambda { .. }) {
+                if value.is_lambda_expr() {
                     self.safe_functions.push(value);
                 }
             }
@@ -88,43 +90,53 @@ impl<'a> Visitor<'a> for SuspiciousVariablesVisitor<'a> {
     }
 
     fn visit_expr(&mut self, expr: &'a Expr) {
-        match &expr.node {
-            ExprKind::Call {
+        match expr {
+            Expr::Call(ast::ExprCall {
                 func,
                 args,
                 keywords,
-            } => {
-                if let ExprKind::Name { id, .. } = &func.node {
-                    if id == "filter" || id == "reduce" || id == "map" {
-                        for arg in args {
-                            if matches!(arg.node, ExprKind::Lambda { .. }) {
-                                self.safe_functions.push(arg);
+                range: _,
+            }) => {
+                match func.as_ref() {
+                    Expr::Name(ast::ExprName { id, .. }) => {
+                        let id = id.as_str();
+                        if id == "filter" || id == "reduce" || id == "map" {
+                            for arg in args {
+                                if matches!(arg, Expr::Lambda(_)) {
+                                    self.safe_functions.push(arg);
+                                }
                             }
                         }
                     }
-                }
-                if let ExprKind::Attribute { value, attr, .. } = &func.node {
-                    if attr == "reduce" {
-                        if let ExprKind::Name { id, .. } = &value.node {
-                            if id == "functools" {
-                                for arg in args {
-                                    if matches!(arg.node, ExprKind::Lambda { .. }) {
-                                        self.safe_functions.push(arg);
+                    Expr::Attribute(ast::ExprAttribute { value, attr, .. }) => {
+                        if attr == "reduce" {
+                            if let Expr::Name(ast::ExprName { id, .. }) = value.as_ref() {
+                                if id == "functools" {
+                                    for arg in args {
+                                        if arg.is_lambda_expr() {
+                                            self.safe_functions.push(arg);
+                                        }
                                     }
                                 }
                             }
                         }
                     }
+                    _ => {}
                 }
+
                 for keyword in keywords {
-                    if keyword.node.arg.as_ref().map_or(false, |arg| arg == "key")
-                        && matches!(keyword.node.value.node, ExprKind::Lambda { .. })
+                    if keyword.arg.as_ref().map_or(false, |arg| arg == "key")
+                        && matches!(keyword.value, Expr::Lambda(_))
                     {
-                        self.safe_functions.push(&keyword.node.value);
+                        self.safe_functions.push(&keyword.value);
                     }
                 }
             }
-            ExprKind::Lambda { args, body } => {
+            Expr::Lambda(ast::ExprLambda {
+                args,
+                body,
+                range: _,
+            }) => {
                 if !self.safe_functions.contains(&expr) {
                     // Collect all loaded variable names.
                     let mut visitor = LoadedNamesVisitor::default();
@@ -159,14 +171,14 @@ struct NamesFromAssignmentsVisitor<'a> {
 /// `Visitor` to collect all names used in an assignment expression.
 impl<'a> Visitor<'a> for NamesFromAssignmentsVisitor<'a> {
     fn visit_expr(&mut self, expr: &'a Expr) {
-        match &expr.node {
-            ExprKind::Name { id, .. } => {
+        match expr {
+            Expr::Name(ast::ExprName { id, .. }) => {
                 self.names.insert(id.as_str());
             }
-            ExprKind::Starred { value, .. } => {
+            Expr::Starred(ast::ExprStarred { value, .. }) => {
                 self.visit_expr(value);
             }
-            ExprKind::List { elts, .. } | ExprKind::Tuple { elts, .. } => {
+            Expr::List(ast::ExprList { elts, .. }) | Expr::Tuple(ast::ExprTuple { elts, .. }) => {
                 for expr in elts {
                     self.visit_expr(expr);
                 }
@@ -184,26 +196,23 @@ struct AssignedNamesVisitor<'a> {
 /// `Visitor` to collect all used identifiers in a statement.
 impl<'a> Visitor<'a> for AssignedNamesVisitor<'a> {
     fn visit_stmt(&mut self, stmt: &'a Stmt) {
-        if matches!(
-            &stmt.node,
-            StmtKind::FunctionDef { .. } | StmtKind::AsyncFunctionDef { .. }
-        ) {
+        if matches!(stmt, Stmt::FunctionDef(_) | Stmt::AsyncFunctionDef(_)) {
             // Don't recurse.
             return;
         }
 
-        match &stmt.node {
-            StmtKind::Assign { targets, .. } => {
+        match stmt {
+            Stmt::Assign(ast::StmtAssign { targets, .. }) => {
                 let mut visitor = NamesFromAssignmentsVisitor::default();
                 for expr in targets {
                     visitor.visit_expr(expr);
                 }
                 self.names.extend(visitor.names);
             }
-            StmtKind::AugAssign { target, .. }
-            | StmtKind::AnnAssign { target, .. }
-            | StmtKind::For { target, .. }
-            | StmtKind::AsyncFor { target, .. } => {
+            Stmt::AugAssign(ast::StmtAugAssign { target, .. })
+            | Stmt::AnnAssign(ast::StmtAnnAssign { target, .. })
+            | Stmt::For(ast::StmtFor { target, .. })
+            | Stmt::AsyncFor(ast::StmtAsyncFor { target, .. }) => {
                 let mut visitor = NamesFromAssignmentsVisitor::default();
                 visitor.visit_expr(target);
                 self.names.extend(visitor.names);
@@ -215,7 +224,7 @@ impl<'a> Visitor<'a> for AssignedNamesVisitor<'a> {
     }
 
     fn visit_expr(&mut self, expr: &'a Expr) {
-        if matches!(&expr.node, ExprKind::Lambda { .. }) {
+        if matches!(expr, Expr::Lambda(_)) {
             // Don't recurse.
             return;
         }
@@ -233,7 +242,7 @@ impl<'a> Visitor<'a> for AssignedNamesVisitor<'a> {
 }
 
 /// B023
-pub fn function_uses_loop_variable<'a>(checker: &mut Checker<'a>, node: &Node<'a>) {
+pub(crate) fn function_uses_loop_variable<'a>(checker: &mut Checker<'a>, node: &Node<'a>) {
     // Identify any "suspicious" variables. These are defined as variables that are
     // referenced in a function or lambda body, but aren't bound as arguments.
     let suspicious_variables = {
@@ -258,7 +267,7 @@ pub fn function_uses_loop_variable<'a>(checker: &mut Checker<'a>, node: &Node<'a
 
         // If a variable was used in a function or lambda body, and assigned in the
         // loop, flag it.
-        for (name, expr, range) in suspicious_variables {
+        for (name, expr) in suspicious_variables {
             if reassigned_in_loop.contains(name) {
                 if !checker.flake8_bugbear_seen.contains(&expr) {
                     checker.flake8_bugbear_seen.push(expr);
@@ -266,7 +275,7 @@ pub fn function_uses_loop_variable<'a>(checker: &mut Checker<'a>, node: &Node<'a
                         FunctionUsesLoopVariable {
                             name: name.to_string(),
                         },
-                        range,
+                        expr.range(),
                     ));
                 }
             }
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/getattr_with_constant.rs b/crates/ruff/src/rules/flake8_bugbear/rules/getattr_with_constant.rs
index 22019ae69f0f8..ff57ce600fa3c 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/getattr_with_constant.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/getattr_with_constant.rs
@@ -1,9 +1,8 @@
-use ruff_text_size::TextSize;
-use rustpython_parser::ast::{Constant, Expr, ExprContext, ExprKind};
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Constant, Expr, ExprContext, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::unparse_expr;
 use ruff_python_stdlib::identifiers::{is_identifier, is_mangled_private};
 
 use crate::checkers::ast::Checker;
@@ -26,20 +25,23 @@ impl AlwaysAutofixableViolation for GetAttrWithConstant {
     }
 }
 fn attribute(value: &Expr, attr: &str) -> Expr {
-    Expr::new(
-        TextSize::default(),
-        TextSize::default(),
-        ExprKind::Attribute {
-            value: Box::new(value.clone()),
-            attr: attr.to_string(),
-            ctx: ExprContext::Load,
-        },
-    )
+    ast::ExprAttribute {
+        value: Box::new(value.clone()),
+        attr: attr.into(),
+        ctx: ExprContext::Load,
+        range: TextRange::default(),
+    }
+    .into()
 }
 
 /// B009
-pub fn getattr_with_constant(checker: &mut Checker, expr: &Expr, func: &Expr, args: &[Expr]) {
-    let ExprKind::Name { id, .. } = &func.node else {
+pub(crate) fn getattr_with_constant(
+    checker: &mut Checker,
+    expr: &Expr,
+    func: &Expr,
+    args: &[Expr],
+) {
+    let Expr::Name(ast::ExprName { id, .. } )= func else {
         return;
     };
     if id != "getattr" {
@@ -48,10 +50,10 @@ pub fn getattr_with_constant(checker: &mut Checker, expr: &Expr, func: &Expr, ar
     let [obj, arg] = args else {
         return;
     };
-    let ExprKind::Constant {
+    let Expr::Constant(ast::ExprConstant {
         value: Constant::Str(value),
         ..
-    } = &arg.node else {
+    } )= arg else {
         return;
     };
     if !is_identifier(value) {
@@ -62,12 +64,11 @@ pub fn getattr_with_constant(checker: &mut Checker, expr: &Expr, func: &Expr, ar
     }
 
     let mut diagnostic = Diagnostic::new(GetAttrWithConstant, expr.range());
-
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(
-            unparse_expr(&attribute(obj, value), checker.stylist),
+        diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
+            checker.generator().expr(&attribute(obj, value)),
             expr.range(),
-        ));
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/jump_statement_in_finally.rs b/crates/ruff/src/rules/flake8_bugbear/rules/jump_statement_in_finally.rs
index 1ce2d401cd467..df656cafedf31 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/jump_statement_in_finally.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/jump_statement_in_finally.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Stmt, StmtKind};
+use rustpython_parser::ast::{self, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -7,7 +7,7 @@ use crate::checkers::ast::Checker;
 
 #[violation]
 pub struct JumpStatementInFinally {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for JumpStatementInFinally {
@@ -23,34 +23,31 @@ fn walk_stmt(checker: &mut Checker, body: &[Stmt], f: fn(&Stmt) -> bool) {
         if f(stmt) {
             checker.diagnostics.push(Diagnostic::new(
                 JumpStatementInFinally {
-                    name: match &stmt.node {
-                        StmtKind::Break { .. } => "break".to_string(),
-                        StmtKind::Continue { .. } => "continue".to_string(),
-                        StmtKind::Return { .. } => "return".to_string(),
-                        _ => unreachable!(
-                            "Expected StmtKind::Break | StmtKind::Continue | StmtKind::Return"
-                        ),
-                    },
+                    name: match stmt {
+                        Stmt::Break(_) => "break",
+                        Stmt::Continue(_) => "continue",
+                        Stmt::Return(_) => "return",
+                        _ => unreachable!("Expected Stmt::Break | Stmt::Continue | Stmt::Return"),
+                    }
+                    .to_owned(),
                 },
                 stmt.range(),
             ));
         }
-        match &stmt.node {
-            StmtKind::While { body, .. }
-            | StmtKind::For { body, .. }
-            | StmtKind::AsyncFor { body, .. } => {
-                walk_stmt(checker, body, |stmt| {
-                    matches!(stmt.node, StmtKind::Return { .. })
-                });
+        match stmt {
+            Stmt::While(ast::StmtWhile { body, .. })
+            | Stmt::For(ast::StmtFor { body, .. })
+            | Stmt::AsyncFor(ast::StmtAsyncFor { body, .. }) => {
+                walk_stmt(checker, body, Stmt::is_return_stmt);
             }
-            StmtKind::If { body, .. }
-            | StmtKind::Try { body, .. }
-            | StmtKind::TryStar { body, .. }
-            | StmtKind::With { body, .. }
-            | StmtKind::AsyncWith { body, .. } => {
+            Stmt::If(ast::StmtIf { body, .. })
+            | Stmt::Try(ast::StmtTry { body, .. })
+            | Stmt::TryStar(ast::StmtTryStar { body, .. })
+            | Stmt::With(ast::StmtWith { body, .. })
+            | Stmt::AsyncWith(ast::StmtAsyncWith { body, .. }) => {
                 walk_stmt(checker, body, f);
             }
-            StmtKind::Match { cases, .. } => {
+            Stmt::Match(ast::StmtMatch { cases, .. }) => {
                 for case in cases {
                     walk_stmt(checker, &case.body, f);
                 }
@@ -61,11 +58,8 @@ fn walk_stmt(checker: &mut Checker, body: &[Stmt], f: fn(&Stmt) -> bool) {
 }
 
 /// B012
-pub fn jump_statement_in_finally(checker: &mut Checker, finalbody: &[Stmt]) {
+pub(crate) fn jump_statement_in_finally(checker: &mut Checker, finalbody: &[Stmt]) {
     walk_stmt(checker, finalbody, |stmt| {
-        matches!(
-            stmt.node,
-            StmtKind::Break | StmtKind::Continue | StmtKind::Return { .. }
-        )
+        matches!(stmt, Stmt::Break(_) | Stmt::Continue(_) | Stmt::Return(_))
     });
 }
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/loop_variable_overrides_iterator.rs b/crates/ruff/src/rules/flake8_bugbear/rules/loop_variable_overrides_iterator.rs
index 493b1afb83672..f8d37590dd2ac 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/loop_variable_overrides_iterator.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/loop_variable_overrides_iterator.rs
@@ -1,5 +1,5 @@
 use rustc_hash::FxHashMap;
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -10,7 +10,7 @@ use crate::checkers::ast::Checker;
 
 #[violation]
 pub struct LoopVariableOverridesIterator {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for LoopVariableOverridesIterator {
@@ -31,22 +31,26 @@ where
     'b: 'a,
 {
     fn visit_expr(&mut self, expr: &'b Expr) {
-        match &expr.node {
-            ExprKind::Name { id, .. } => {
+        match expr {
+            Expr::Name(ast::ExprName { id, .. }) => {
                 self.names.insert(id, expr);
             }
-            ExprKind::ListComp { generators, .. }
-            | ExprKind::DictComp { generators, .. }
-            | ExprKind::SetComp { generators, .. }
-            | ExprKind::GeneratorExp { generators, .. } => {
+            Expr::ListComp(ast::ExprListComp { generators, .. })
+            | Expr::DictComp(ast::ExprDictComp { generators, .. })
+            | Expr::SetComp(ast::ExprSetComp { generators, .. })
+            | Expr::GeneratorExp(ast::ExprGeneratorExp { generators, .. }) => {
                 for comp in generators {
                     self.visit_expr(&comp.iter);
                 }
             }
-            ExprKind::Lambda { args, body } => {
+            Expr::Lambda(ast::ExprLambda {
+                args,
+                body,
+                range: _,
+            }) => {
                 visitor::walk_expr(self, body);
                 for arg in &args.args {
-                    self.names.remove(arg.node.arg.as_str());
+                    self.names.remove(arg.arg.as_str());
                 }
             }
             _ => visitor::walk_expr(self, expr),
@@ -55,7 +59,7 @@ where
 }
 
 /// B020
-pub fn loop_variable_overrides_iterator(checker: &mut Checker, target: &Expr, iter: &Expr) {
+pub(crate) fn loop_variable_overrides_iterator(checker: &mut Checker, target: &Expr, iter: &Expr) {
     let target_names = {
         let mut target_finder = NameFinder::default();
         target_finder.visit_expr(target);
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/mod.rs b/crates/ruff/src/rules/flake8_bugbear/rules/mod.rs
index 86684d7e95291..f350160a57944 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/mod.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/mod.rs
@@ -1,53 +1,64 @@
-pub use abstract_base_class::{
+pub(crate) use abstract_base_class::{
     abstract_base_class, AbstractBaseClassWithoutAbstractMethod,
     EmptyMethodWithoutAbstractDecorator,
 };
-pub use assert_false::{assert_false, AssertFalse};
-pub use assert_raises_exception::{assert_raises_exception, AssertRaisesException};
-pub use assignment_to_os_environ::{assignment_to_os_environ, AssignmentToOsEnviron};
-pub use cached_instance_method::{cached_instance_method, CachedInstanceMethod};
-pub use cannot_raise_literal::{cannot_raise_literal, CannotRaiseLiteral};
-pub use duplicate_exceptions::{
+pub(crate) use assert_false::{assert_false, AssertFalse};
+pub(crate) use assert_raises_exception::{assert_raises_exception, AssertRaisesException};
+pub(crate) use assignment_to_os_environ::{assignment_to_os_environ, AssignmentToOsEnviron};
+pub(crate) use cached_instance_method::{cached_instance_method, CachedInstanceMethod};
+pub(crate) use cannot_raise_literal::{cannot_raise_literal, CannotRaiseLiteral};
+pub(crate) use duplicate_exceptions::{
     duplicate_exceptions, DuplicateHandlerException, DuplicateTryBlockException,
 };
-pub use except_with_empty_tuple::{except_with_empty_tuple, ExceptWithEmptyTuple};
-pub use except_with_non_exception_classes::{
+pub(crate) use duplicate_value::{duplicate_value, DuplicateValue};
+pub(crate) use except_with_empty_tuple::{except_with_empty_tuple, ExceptWithEmptyTuple};
+pub(crate) use except_with_non_exception_classes::{
     except_with_non_exception_classes, ExceptWithNonExceptionClasses,
 };
-pub use f_string_docstring::{f_string_docstring, FStringDocstring};
-pub use function_call_argument_default::{
+pub(crate) use f_string_docstring::{f_string_docstring, FStringDocstring};
+pub(crate) use function_call_argument_default::{
     function_call_argument_default, FunctionCallInDefaultArgument,
 };
-pub use function_uses_loop_variable::{function_uses_loop_variable, FunctionUsesLoopVariable};
-pub use getattr_with_constant::{getattr_with_constant, GetAttrWithConstant};
-pub use jump_statement_in_finally::{jump_statement_in_finally, JumpStatementInFinally};
-pub use loop_variable_overrides_iterator::{
+pub(crate) use function_uses_loop_variable::{
+    function_uses_loop_variable, FunctionUsesLoopVariable,
+};
+pub(crate) use getattr_with_constant::{getattr_with_constant, GetAttrWithConstant};
+pub(crate) use jump_statement_in_finally::{jump_statement_in_finally, JumpStatementInFinally};
+pub(crate) use loop_variable_overrides_iterator::{
     loop_variable_overrides_iterator, LoopVariableOverridesIterator,
 };
-pub use mutable_argument_default::{mutable_argument_default, MutableArgumentDefault};
-pub use no_explicit_stacklevel::{no_explicit_stacklevel, NoExplicitStacklevel};
-pub use raise_without_from_inside_except::{
+pub(crate) use mutable_argument_default::{mutable_argument_default, MutableArgumentDefault};
+pub(crate) use no_explicit_stacklevel::{no_explicit_stacklevel, NoExplicitStacklevel};
+pub(crate) use raise_without_from_inside_except::{
     raise_without_from_inside_except, RaiseWithoutFromInsideExcept,
 };
-pub use redundant_tuple_in_exception_handler::{
+pub(crate) use redundant_tuple_in_exception_handler::{
     redundant_tuple_in_exception_handler, RedundantTupleInExceptionHandler,
 };
-pub use reuse_of_groupby_generator::{reuse_of_groupby_generator, ReuseOfGroupbyGenerator};
-pub use setattr_with_constant::{setattr_with_constant, SetAttrWithConstant};
-pub use star_arg_unpacking_after_keyword_arg::{
+pub(crate) use reuse_of_groupby_generator::{reuse_of_groupby_generator, ReuseOfGroupbyGenerator};
+pub(crate) use setattr_with_constant::{setattr_with_constant, SetAttrWithConstant};
+pub(crate) use star_arg_unpacking_after_keyword_arg::{
     star_arg_unpacking_after_keyword_arg, StarArgUnpackingAfterKeywordArg,
 };
-pub use strip_with_multi_characters::{strip_with_multi_characters, StripWithMultiCharacters};
-pub use unary_prefix_increment::{unary_prefix_increment, UnaryPrefixIncrement};
-pub use unintentional_type_annotation::{
+pub(crate) use strip_with_multi_characters::{
+    strip_with_multi_characters, StripWithMultiCharacters,
+};
+pub(crate) use unary_prefix_increment::{unary_prefix_increment, UnaryPrefixIncrement};
+pub(crate) use unintentional_type_annotation::{
     unintentional_type_annotation, UnintentionalTypeAnnotation,
 };
-pub use unreliable_callable_check::{unreliable_callable_check, UnreliableCallableCheck};
-pub use unused_loop_control_variable::{unused_loop_control_variable, UnusedLoopControlVariable};
-pub use useless_comparison::{useless_comparison, UselessComparison};
-pub use useless_contextlib_suppress::{useless_contextlib_suppress, UselessContextlibSuppress};
-pub use useless_expression::{useless_expression, UselessExpression};
-pub use zip_without_explicit_strict::{zip_without_explicit_strict, ZipWithoutExplicitStrict};
+pub(crate) use unreliable_callable_check::{unreliable_callable_check, UnreliableCallableCheck};
+pub(crate) use unused_loop_control_variable::{
+    unused_loop_control_variable, UnusedLoopControlVariable,
+};
+pub(crate) use useless_comparison::{useless_comparison, UselessComparison};
+pub(crate) use useless_contextlib_suppress::{
+    useless_contextlib_suppress, UselessContextlibSuppress,
+};
+pub(crate) use useless_expression::{useless_expression, UselessExpression};
+pub(crate) use zip_without_explicit_strict::{
+    zip_without_explicit_strict, ZipWithoutExplicitStrict,
+};
 
 mod abstract_base_class;
 mod assert_false;
@@ -56,6 +67,7 @@ mod assignment_to_os_environ;
 mod cached_instance_method;
 mod cannot_raise_literal;
 mod duplicate_exceptions;
+mod duplicate_value;
 mod except_with_empty_tuple;
 mod except_with_non_exception_classes;
 mod f_string_docstring;
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/mutable_argument_default.rs b/crates/ruff/src/rules/flake8_bugbear/rules/mutable_argument_default.rs
index 600468c80488d..19698f8120e5e 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/mutable_argument_default.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/mutable_argument_default.rs
@@ -1,8 +1,9 @@
-use rustpython_parser::ast::{Arguments, Expr, ExprKind};
+use rustpython_parser::ast::{self, Arguments, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_semantic::analyze::typing::is_immutable_annotation;
+use ruff_python_semantic::model::SemanticModel;
 
 use crate::checkers::ast::Checker;
 
@@ -25,32 +26,29 @@ const MUTABLE_FUNCS: &[&[&str]] = &[
     &["collections", "deque"],
 ];
 
-pub fn is_mutable_func(checker: &Checker, func: &Expr) -> bool {
-    checker
-        .ctx
-        .resolve_call_path(func)
-        .map_or(false, |call_path| {
-            MUTABLE_FUNCS
-                .iter()
-                .any(|target| call_path.as_slice() == *target)
-        })
+pub(crate) fn is_mutable_func(model: &SemanticModel, func: &Expr) -> bool {
+    model.resolve_call_path(func).map_or(false, |call_path| {
+        MUTABLE_FUNCS
+            .iter()
+            .any(|target| call_path.as_slice() == *target)
+    })
 }
 
-fn is_mutable_expr(checker: &Checker, expr: &Expr) -> bool {
-    match &expr.node {
-        ExprKind::List { .. }
-        | ExprKind::Dict { .. }
-        | ExprKind::Set { .. }
-        | ExprKind::ListComp { .. }
-        | ExprKind::DictComp { .. }
-        | ExprKind::SetComp { .. } => true,
-        ExprKind::Call { func, .. } => is_mutable_func(checker, func),
+fn is_mutable_expr(model: &SemanticModel, expr: &Expr) -> bool {
+    match expr {
+        Expr::List(_)
+        | Expr::Dict(_)
+        | Expr::Set(_)
+        | Expr::ListComp(_)
+        | Expr::DictComp(_)
+        | Expr::SetComp(_) => true,
+        Expr::Call(ast::ExprCall { func, .. }) => is_mutable_func(model, func),
         _ => false,
     }
 }
 
 /// B006
-pub fn mutable_argument_default(checker: &mut Checker, arguments: &Arguments) {
+pub(crate) fn mutable_argument_default(checker: &mut Checker, arguments: &Arguments) {
     // Scan in reverse order to right-align zip().
     for (arg, default) in arguments
         .kwonlyargs
@@ -66,12 +64,10 @@ pub fn mutable_argument_default(checker: &mut Checker, arguments: &Arguments) {
                 .zip(arguments.defaults.iter().rev()),
         )
     {
-        if is_mutable_expr(checker, default)
-            && !arg
-                .node
-                .annotation
-                .as_ref()
-                .map_or(false, |expr| is_immutable_annotation(&checker.ctx, expr))
+        if is_mutable_expr(checker.semantic_model(), default)
+            && !arg.annotation.as_ref().map_or(false, |expr| {
+                is_immutable_annotation(checker.semantic_model(), expr)
+            })
         {
             checker
                 .diagnostics
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/no_explicit_stacklevel.rs b/crates/ruff/src/rules/flake8_bugbear/rules/no_explicit_stacklevel.rs
index 266bb7ef454e0..a7d20c2801f15 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/no_explicit_stacklevel.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/no_explicit_stacklevel.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, Keyword};
+use rustpython_parser::ast::{Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -38,14 +38,14 @@ impl Violation for NoExplicitStacklevel {
 }
 
 /// B028
-pub fn no_explicit_stacklevel(
+pub(crate) fn no_explicit_stacklevel(
     checker: &mut Checker,
     func: &Expr,
     args: &[Expr],
     keywords: &[Keyword],
 ) {
     if !checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(func)
         .map_or(false, |call_path| {
             call_path.as_slice() == ["warnings", "warn"]
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/raise_without_from_inside_except.rs b/crates/ruff/src/rules/flake8_bugbear/rules/raise_without_from_inside_except.rs
index 60ff0b6b99ed4..ccb0d84c553da 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/raise_without_from_inside_except.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/raise_without_from_inside_except.rs
@@ -1,9 +1,9 @@
-use rustpython_parser::ast::{ExprKind, Stmt};
+use rustpython_parser::ast::{self, Expr, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::RaiseStatementVisitor;
-use ruff_python_ast::visitor;
+use ruff_python_ast::statement_visitor::StatementVisitor;
 use ruff_python_stdlib::str::is_lower;
 
 use crate::checkers::ast::Checker;
@@ -22,18 +22,18 @@ impl Violation for RaiseWithoutFromInsideExcept {
 }
 
 /// B904
-pub fn raise_without_from_inside_except(checker: &mut Checker, body: &[Stmt]) {
+pub(crate) fn raise_without_from_inside_except(checker: &mut Checker, body: &[Stmt]) {
     let raises = {
         let mut visitor = RaiseStatementVisitor::default();
-        visitor::walk_body(&mut visitor, body);
+        visitor.visit_body(body);
         visitor.raises
     };
 
     for (range, exc, cause) in raises {
         if cause.is_none() {
             if let Some(exc) = exc {
-                match &exc.node {
-                    ExprKind::Name { id, .. } if is_lower(id) => {}
+                match exc {
+                    Expr::Name(ast::ExprName { id, .. }) if is_lower(id) => {}
                     _ => {
                         checker
                             .diagnostics
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/redundant_tuple_in_exception_handler.rs b/crates/ruff/src/rules/flake8_bugbear/rules/redundant_tuple_in_exception_handler.rs
index 21412249a5f3b..9b0bbe6f29f45 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/redundant_tuple_in_exception_handler.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/redundant_tuple_in_exception_handler.rs
@@ -1,15 +1,14 @@
-use rustpython_parser::ast::{Excepthandler, ExcepthandlerKind, ExprKind};
+use rustpython_parser::ast::{self, Excepthandler, Expr, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::unparse_expr;
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 
 #[violation]
 pub struct RedundantTupleInExceptionHandler {
-    pub name: String,
+    name: String,
 }
 
 impl AlwaysAutofixableViolation for RedundantTupleInExceptionHandler {
@@ -29,12 +28,15 @@ impl AlwaysAutofixableViolation for RedundantTupleInExceptionHandler {
 }
 
 /// B013
-pub fn redundant_tuple_in_exception_handler(checker: &mut Checker, handlers: &[Excepthandler]) {
+pub(crate) fn redundant_tuple_in_exception_handler(
+    checker: &mut Checker,
+    handlers: &[Excepthandler],
+) {
     for handler in handlers {
-        let ExcepthandlerKind::ExceptHandler { type_: Some(type_), .. } = &handler.node else {
+        let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler { type_: Some(type_), .. }) = handler else {
             continue;
         };
-        let ExprKind::Tuple { elts, .. } = &type_.node else {
+        let Expr::Tuple(ast::ExprTuple { elts, .. }) = type_.as_ref() else {
             continue;
         };
         let [elt] = &elts[..] else {
@@ -42,15 +44,16 @@ pub fn redundant_tuple_in_exception_handler(checker: &mut Checker, handlers: &[E
         };
         let mut diagnostic = Diagnostic::new(
             RedundantTupleInExceptionHandler {
-                name: unparse_expr(elt, checker.stylist),
+                name: checker.generator().expr(elt),
             },
             type_.range(),
         );
         if checker.patch(diagnostic.kind.rule()) {
-            diagnostic.set_fix(Edit::range_replacement(
-                unparse_expr(elt, checker.stylist),
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::automatic(Edit::range_replacement(
+                checker.generator().expr(elt),
                 type_.range(),
-            ));
+            )));
         }
         checker.diagnostics.push(diagnostic);
     }
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/reuse_of_groupby_generator.rs b/crates/ruff/src/rules/flake8_bugbear/rules/reuse_of_groupby_generator.rs
index 3e53f7d205978..618af8019568b 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/reuse_of_groupby_generator.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/reuse_of_groupby_generator.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Comprehension, Expr, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Comprehension, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -10,7 +10,7 @@ use crate::checkers::ast::Checker;
 /// Checks for multiple usage of the generator returned from
 /// `itertools.groupby()`.
 ///
-/// ## Why is it bad?
+/// ## Why is this bad?
 /// Using the generator more than once will do nothing on the second usage.
 /// If that data is needed later, it should be stored as a list.
 ///
@@ -84,7 +84,7 @@ impl<'a> GroupNameFinder<'a> {
     }
 
     fn name_matches(&self, expr: &Expr) -> bool {
-        if let ExprKind::Name { id, .. } = &expr.node {
+        if let Expr::Name(ast::ExprName { id, .. }) = expr {
             id == self.group_name
         } else {
             false
@@ -112,10 +112,10 @@ where
         if self.overridden {
             return;
         }
-        match &stmt.node {
-            StmtKind::For {
+        match stmt {
+            Stmt::For(ast::StmtFor {
                 target, iter, body, ..
-            } => {
+            }) => {
                 if self.name_matches(target) {
                     self.overridden = true;
                 } else {
@@ -138,15 +138,20 @@ where
                     self.nested = false;
                 }
             }
-            StmtKind::While { body, .. } => {
+            Stmt::While(ast::StmtWhile { body, .. }) => {
                 self.nested = true;
                 visitor::walk_body(self, body);
                 self.nested = false;
             }
-            StmtKind::If { test, body, orelse } => {
+            Stmt::If(ast::StmtIf {
+                test,
+                body,
+                orelse,
+                range: _,
+            }) => {
                 // Determine whether we're on an `if` arm (as opposed to an `elif`).
                 let is_if_arm = !self.parent_ifs.iter().any(|parent| {
-                    if let StmtKind::If { orelse, .. } = &parent.node {
+                    if let Stmt::If(ast::StmtIf { orelse, .. }) = parent {
                         orelse.len() == 1 && &orelse[0] == stmt
                     } else {
                         false
@@ -166,12 +171,12 @@ where
 
                 let has_else = orelse
                     .first()
-                    .map_or(false, |expr| !matches!(expr.node, StmtKind::If { .. }));
+                    .map_or(false, |expr| !matches!(expr, Stmt::If(_)));
 
                 self.parent_ifs.push(stmt);
                 if has_else {
-                    // There's no `StmtKind::Else`; instead, the `else` contents are directly on
-                    // the `orelse` of the `StmtKind::If` node. We want to add a new counter for
+                    // There's no `Stmt::Else`; instead, the `else` contents are directly on
+                    // the `orelse` of the `Stmt::If` node. We want to add a new counter for
                     // the `orelse` branch, but first, we need to visit the `if` body manually.
                     self.visit_expr(test);
                     self.visit_body(body);
@@ -193,7 +198,11 @@ where
                     }
                 }
             }
-            StmtKind::Match { subject, cases } => {
+            Stmt::Match(ast::StmtMatch {
+                subject,
+                cases,
+                range: _,
+            }) => {
                 self.counter_stack.push(Vec::with_capacity(cases.len()));
                 self.visit_expr(subject);
                 for match_case in cases {
@@ -207,14 +216,14 @@ where
                     self.increment_usage_count(max_count);
                 }
             }
-            StmtKind::Assign { targets, value, .. } => {
+            Stmt::Assign(ast::StmtAssign { targets, value, .. }) => {
                 if targets.iter().any(|target| self.name_matches(target)) {
                     self.overridden = true;
                 } else {
                     self.visit_expr(value);
                 }
             }
-            StmtKind::AnnAssign { target, value, .. } => {
+            Stmt::AnnAssign(ast::StmtAnnAssign { target, value, .. }) => {
                 if self.name_matches(target) {
                     self.overridden = true;
                 } else if let Some(expr) = value {
@@ -241,7 +250,7 @@ where
     }
 
     fn visit_expr(&mut self, expr: &'a Expr) {
-        if let ExprKind::NamedExpr { target, .. } = &expr.node {
+        if let Expr::NamedExpr(ast::ExprNamedExpr { target, .. }) = expr {
             if self.name_matches(target) {
                 self.overridden = true;
             }
@@ -250,8 +259,17 @@ where
             return;
         }
 
-        match &expr.node {
-            ExprKind::ListComp { elt, generators } | ExprKind::SetComp { elt, generators } => {
+        match expr {
+            Expr::ListComp(ast::ExprListComp {
+                elt,
+                generators,
+                range: _,
+            })
+            | Expr::SetComp(ast::ExprSetComp {
+                elt,
+                generators,
+                range: _,
+            }) => {
                 for comprehension in generators {
                     self.visit_comprehension(comprehension);
                 }
@@ -261,11 +279,12 @@ where
                     self.nested = false;
                 }
             }
-            ExprKind::DictComp {
+            Expr::DictComp(ast::ExprDictComp {
                 key,
                 value,
                 generators,
-            } => {
+                range: _,
+            }) => {
                 for comprehension in generators {
                     self.visit_comprehension(comprehension);
                 }
@@ -301,16 +320,16 @@ where
 }
 
 /// B031
-pub fn reuse_of_groupby_generator(
+pub(crate) fn reuse_of_groupby_generator(
     checker: &mut Checker,
     target: &Expr,
     body: &[Stmt],
     iter: &Expr,
 ) {
-    let ExprKind::Call { func, .. } = &iter.node else {
+    let Expr::Call(ast::ExprCall { func, .. }) = &iter else {
         return;
     };
-    let ExprKind::Tuple { elts, .. } = &target.node else {
+    let Expr::Tuple(ast::ExprTuple { elts, .. }) = target else {
         // Ignore any `groupby()` invocation that isn't unpacked
         return;
     };
@@ -318,12 +337,12 @@ pub fn reuse_of_groupby_generator(
         return;
     }
     // We have an invocation of groupby which is a simple unpacking
-    let ExprKind::Name { id: group_name, .. } = &elts[1].node else {
+    let Expr::Name(ast::ExprName { id: group_name, .. }) = &elts[1] else {
         return;
     };
     // Check if the function call is `itertools.groupby`
     if !checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(func)
         .map_or(false, |call_path| {
             call_path.as_slice() == ["itertools", "groupby"]
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/setattr_with_constant.rs b/crates/ruff/src/rules/flake8_bugbear/rules/setattr_with_constant.rs
index 705c1e03a3e72..9229339bf3de0 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/setattr_with_constant.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/setattr_with_constant.rs
@@ -1,10 +1,9 @@
-use ruff_text_size::TextSize;
-use rustpython_parser::ast::{Constant, Expr, ExprContext, ExprKind, Stmt, StmtKind};
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Constant, Expr, ExprContext, Ranged, Stmt};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::unparse_stmt;
-use ruff_python_ast::source_code::Stylist;
+use ruff_python_ast::source_code::Generator;
 use ruff_python_stdlib::identifiers::{is_identifier, is_mangled_private};
 
 use crate::checkers::ast::Checker;
@@ -27,30 +26,29 @@ impl AlwaysAutofixableViolation for SetAttrWithConstant {
     }
 }
 
-fn assignment(obj: &Expr, name: &str, value: &Expr, stylist: &Stylist) -> String {
-    let stmt = Stmt::new(
-        TextSize::default(),
-        TextSize::default(),
-        StmtKind::Assign {
-            targets: vec![Expr::new(
-                TextSize::default(),
-                TextSize::default(),
-                ExprKind::Attribute {
-                    value: Box::new(obj.clone()),
-                    attr: name.to_string(),
-                    ctx: ExprContext::Store,
-                },
-            )],
-            value: Box::new(value.clone()),
-            type_comment: None,
-        },
-    );
-    unparse_stmt(&stmt, stylist)
+fn assignment(obj: &Expr, name: &str, value: &Expr, generator: Generator) -> String {
+    let stmt = Stmt::Assign(ast::StmtAssign {
+        targets: vec![Expr::Attribute(ast::ExprAttribute {
+            value: Box::new(obj.clone()),
+            attr: name.into(),
+            ctx: ExprContext::Store,
+            range: TextRange::default(),
+        })],
+        value: Box::new(value.clone()),
+        type_comment: None,
+        range: TextRange::default(),
+    });
+    generator.stmt(&stmt)
 }
 
 /// B010
-pub fn setattr_with_constant(checker: &mut Checker, expr: &Expr, func: &Expr, args: &[Expr]) {
-    let ExprKind::Name { id, .. } = &func.node else {
+pub(crate) fn setattr_with_constant(
+    checker: &mut Checker,
+    expr: &Expr,
+    func: &Expr,
+    args: &[Expr],
+) {
+    let Expr::Name(ast::ExprName { id, .. }) = func else {
         return;
     };
     if id != "setattr" {
@@ -59,10 +57,10 @@ pub fn setattr_with_constant(checker: &mut Checker, expr: &Expr, func: &Expr, ar
     let [obj, name, value] = args else {
         return;
     };
-    let ExprKind::Constant {
+    let Expr::Constant(ast::ExprConstant {
         value: Constant::Str(name),
         ..
-    } = &name.node else {
+    } )= name else {
         return;
     };
     if !is_identifier(name) {
@@ -73,16 +71,19 @@ pub fn setattr_with_constant(checker: &mut Checker, expr: &Expr, func: &Expr, ar
     }
     // We can only replace a `setattr` call (which is an `Expr`) with an assignment
     // (which is a `Stmt`) if the `Expr` is already being used as a `Stmt`
-    // (i.e., it's directly within an `StmtKind::Expr`).
-    if let StmtKind::Expr { value: child } = &checker.ctx.current_stmt().node {
+    // (i.e., it's directly within an `Stmt::Expr`).
+    if let Stmt::Expr(ast::StmtExpr {
+        value: child,
+        range: _,
+    }) = checker.semantic_model().stmt()
+    {
         if expr == child.as_ref() {
             let mut diagnostic = Diagnostic::new(SetAttrWithConstant, expr.range());
-
             if checker.patch(diagnostic.kind.rule()) {
-                diagnostic.set_fix(Edit::range_replacement(
-                    assignment(obj, name, value, checker.stylist),
+                diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
+                    assignment(obj, name, value, checker.generator()),
                     expr.range(),
-                ));
+                )));
             }
             checker.diagnostics.push(diagnostic);
         }
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/star_arg_unpacking_after_keyword_arg.rs b/crates/ruff/src/rules/flake8_bugbear/rules/star_arg_unpacking_after_keyword_arg.rs
index e4cc0733b7aff..287f67035f6d4 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/star_arg_unpacking_after_keyword_arg.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/star_arg_unpacking_after_keyword_arg.rs
@@ -7,7 +7,7 @@
 //! by the unpacked sequence, and this change of ordering can surprise and
 //! mislead readers.
 
-use rustpython_parser::ast::{Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -25,7 +25,7 @@ impl Violation for StarArgUnpackingAfterKeywordArg {
 }
 
 /// B026
-pub fn star_arg_unpacking_after_keyword_arg(
+pub(crate) fn star_arg_unpacking_after_keyword_arg(
     checker: &mut Checker,
     args: &[Expr],
     keywords: &[Keyword],
@@ -34,7 +34,7 @@ pub fn star_arg_unpacking_after_keyword_arg(
         return;
     };
     for arg in args {
-        let ExprKind::Starred { .. } = arg.node else {
+        let Expr::Starred (_) = arg else {
             continue;
         };
         if arg.start() <= keyword.start() {
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/strip_with_multi_characters.rs b/crates/ruff/src/rules/flake8_bugbear/rules/strip_with_multi_characters.rs
index 551ca2eea2b3d..1fd78729c94a3 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/strip_with_multi_characters.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/strip_with_multi_characters.rs
@@ -1,5 +1,5 @@
 use itertools::Itertools;
-use rustpython_parser::ast::{Constant, Expr, ExprKind};
+use rustpython_parser::ast::{self, Constant, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -17,8 +17,13 @@ impl Violation for StripWithMultiCharacters {
 }
 
 /// B005
-pub fn strip_with_multi_characters(checker: &mut Checker, expr: &Expr, func: &Expr, args: &[Expr]) {
-    let ExprKind::Attribute { attr, .. } = &func.node else {
+pub(crate) fn strip_with_multi_characters(
+    checker: &mut Checker,
+    expr: &Expr,
+    func: &Expr,
+    args: &[Expr],
+) {
+    let Expr::Attribute(ast::ExprAttribute { attr, .. }) = func else {
         return;
     };
     if !matches!(attr.as_str(), "strip" | "lstrip" | "rstrip") {
@@ -28,10 +33,10 @@ pub fn strip_with_multi_characters(checker: &mut Checker, expr: &Expr, func: &Ex
         return;
     }
 
-    let ExprKind::Constant {
+    let Expr::Constant(ast::ExprConstant {
         value: Constant::Str(value),
         ..
-    } = &args[0].node else {
+    } )= &args[0] else {
         return;
     };
 
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/unary_prefix_increment.rs b/crates/ruff/src/rules/flake8_bugbear/rules/unary_prefix_increment.rs
index 066b7cf67753e..12f70b9044775 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/unary_prefix_increment.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/unary_prefix_increment.rs
@@ -17,7 +17,7 @@
 //! n += 1
 //! ```
 
-use rustpython_parser::ast::{Expr, ExprKind, Unaryop};
+use rustpython_parser::ast::{self, Expr, Ranged, Unaryop};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -35,11 +35,16 @@ impl Violation for UnaryPrefixIncrement {
 }
 
 /// B002
-pub fn unary_prefix_increment(checker: &mut Checker, expr: &Expr, op: &Unaryop, operand: &Expr) {
+pub(crate) fn unary_prefix_increment(
+    checker: &mut Checker,
+    expr: &Expr,
+    op: Unaryop,
+    operand: &Expr,
+) {
     if !matches!(op, Unaryop::UAdd) {
         return;
     }
-    let ExprKind::UnaryOp { op, .. } = &operand.node else {
+    let Expr::UnaryOp(ast::ExprUnaryOp { op, .. })= operand else {
             return;
         };
     if !matches!(op, Unaryop::UAdd) {
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/unintentional_type_annotation.rs b/crates/ruff/src/rules/flake8_bugbear/rules/unintentional_type_annotation.rs
index d8b5b8793c164..0c5cad9903b19 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/unintentional_type_annotation.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/unintentional_type_annotation.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind, Stmt};
+use rustpython_parser::ast::{self, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -34,7 +34,7 @@ impl Violation for UnintentionalTypeAnnotation {
 }
 
 /// B032
-pub fn unintentional_type_annotation(
+pub(crate) fn unintentional_type_annotation(
     checker: &mut Checker,
     target: &Expr,
     value: Option<&Expr>,
@@ -43,16 +43,16 @@ pub fn unintentional_type_annotation(
     if value.is_some() {
         return;
     }
-    match &target.node {
-        ExprKind::Subscript { value, .. } => {
-            if matches!(&value.node, ExprKind::Name { .. }) {
+    match target {
+        Expr::Subscript(ast::ExprSubscript { value, .. }) => {
+            if value.is_name_expr() {
                 checker
                     .diagnostics
                     .push(Diagnostic::new(UnintentionalTypeAnnotation, stmt.range()));
             }
         }
-        ExprKind::Attribute { value, .. } => {
-            if let ExprKind::Name { id, .. } = &value.node {
+        Expr::Attribute(ast::ExprAttribute { value, .. }) => {
+            if let Expr::Name(ast::ExprName { id, .. }) = value.as_ref() {
                 if id != "self" {
                     checker
                         .diagnostics
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/unreliable_callable_check.rs b/crates/ruff/src/rules/flake8_bugbear/rules/unreliable_callable_check.rs
index 570b2f1a5a731..ec1cff463538d 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/unreliable_callable_check.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/unreliable_callable_check.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Constant, Expr, ExprKind};
+use rustpython_parser::ast::{self, Constant, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -19,8 +19,13 @@ impl Violation for UnreliableCallableCheck {
 }
 
 /// B004
-pub fn unreliable_callable_check(checker: &mut Checker, expr: &Expr, func: &Expr, args: &[Expr]) {
-    let ExprKind::Name { id, .. } = &func.node else {
+pub(crate) fn unreliable_callable_check(
+    checker: &mut Checker,
+    expr: &Expr,
+    func: &Expr,
+    args: &[Expr],
+) {
+    let Expr::Name(ast::ExprName { id, .. }) = func else {
         return;
     };
     if id != "getattr" && id != "hasattr" {
@@ -29,10 +34,10 @@ pub fn unreliable_callable_check(checker: &mut Checker, expr: &Expr, func: &Expr
     if args.len() < 2 {
         return;
     };
-    let ExprKind::Constant {
+    let Expr::Constant(ast::ExprConstant {
         value: Constant::Str(s),
         ..
-    } = &args[1].node else
+    }) = &args[1] else
     {
         return;
     };
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs b/crates/ruff/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs
index 7e53161e5d4f2..ad64d880b6925 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs
@@ -19,12 +19,11 @@
 //! ```
 
 use rustc_hash::FxHashMap;
-use rustpython_parser::ast::{Expr, ExprKind, Stmt};
+use rustpython_parser::ast::{self, Expr, Ranged, Stmt};
 use serde::{Deserialize, Serialize};
 
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Violation};
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::types::RefEquality;
 use ruff_python_ast::visitor::Visitor;
 use ruff_python_ast::{helpers, visitor};
 
@@ -32,7 +31,7 @@ use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize, result_like::BoolLike)]
-pub enum Certainty {
+enum Certainty {
     Certain,
     Uncertain,
 }
@@ -40,15 +39,15 @@ pub enum Certainty {
 #[violation]
 pub struct UnusedLoopControlVariable {
     /// The name of the loop control variable.
-    pub name: String,
+    name: String,
     /// The name to which the variable should be renamed, if it can be
     /// safely renamed.
-    pub rename: Option<String>,
+    rename: Option<String>,
     /// Whether the variable is certain to be unused in the loop body, or
     /// merely suspect. A variable _may_ be used, but undetectably
     /// so, if the loop incorporates by magic control flow (e.g.,
     /// `locals()`).
-    pub certainty: Certainty,
+    certainty: Certainty,
 }
 
 impl Violation for UnusedLoopControlVariable {
@@ -66,22 +65,16 @@ impl Violation for UnusedLoopControlVariable {
         }
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        let UnusedLoopControlVariable {
-            certainty, rename, ..
-        } = self;
-        if certainty.to_bool() && rename.is_some() {
-            Some(|UnusedLoopControlVariable { name, rename, .. }| {
-                let rename = rename.as_ref().unwrap();
-                format!("Rename unused `{name}` to `{rename}`")
-            })
-        } else {
-            None
-        }
+    fn autofix_title(&self) -> Option<String> {
+        let UnusedLoopControlVariable { rename, name, .. } = self;
+
+        rename
+            .as_ref()
+            .map(|rename| format!("Rename unused `{name}` to `{rename}`"))
     }
 }
 
-/// Identify all `ExprKind::Name` nodes in an AST.
+/// Identify all `Expr::Name` nodes in an AST.
 struct NameFinder<'a> {
     /// A map from identifier to defining expression.
     names: FxHashMap<&'a str, &'a Expr>,
@@ -100,7 +93,7 @@ where
     'b: 'a,
 {
     fn visit_expr(&mut self, expr: &'a Expr) {
-        if let ExprKind::Name { id, .. } = &expr.node {
+        if let Expr::Name(ast::ExprName { id, .. }) = expr {
             self.names.insert(id, expr);
         }
         visitor::walk_expr(self, expr);
@@ -108,12 +101,7 @@ where
 }
 
 /// B007
-pub fn unused_loop_control_variable(
-    checker: &mut Checker,
-    stmt: &Stmt,
-    target: &Expr,
-    body: &[Stmt],
-) {
+pub(crate) fn unused_loop_control_variable(checker: &mut Checker, target: &Expr, body: &[Stmt]) {
     let control_names = {
         let mut finder = NameFinder::new();
         finder.visit_expr(target);
@@ -141,7 +129,7 @@ pub fn unused_loop_control_variable(
 
         // Avoid fixing any variables that _may_ be used, but undetectably so.
         let certainty = Certainty::from(!helpers::uses_magic_variable_access(body, |id| {
-            checker.ctx.is_builtin(id)
+            checker.semantic_model().is_builtin(id)
         }));
 
         // Attempt to rename the variable by prepending an underscore, but avoid
@@ -164,21 +152,18 @@ pub fn unused_loop_control_variable(
         );
         if let Some(rename) = rename {
             if certainty.into() && checker.patch(diagnostic.kind.rule()) {
-                // Find the `BindingKind::LoopVar` corresponding to the name.
-                let scope = checker.ctx.scope();
-                let binding = scope.bindings_for_name(name).find_map(|index| {
-                    let binding = &checker.ctx.bindings[*index];
-                    binding
-                        .source
-                        .as_ref()
-                        .and_then(|source| (source == &RefEquality(stmt)).then_some(binding))
-                });
-                if let Some(binding) = binding {
-                    if binding.kind.is_loop_var() {
-                        if !binding.used() {
-                            diagnostic.set_fix(Edit::range_replacement(rename, expr.range()));
-                        }
-                    }
+                // Avoid fixing if the variable, or any future bindings to the variable, are
+                // used _after_ the loop.
+                let scope = checker.semantic_model().scope();
+                if scope
+                    .bindings_for_name(name)
+                    .map(|binding_id| &checker.semantic_model().bindings[binding_id])
+                    .all(|binding| !binding.is_used())
+                {
+                    diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
+                        rename,
+                        expr.range(),
+                    )));
                 }
             }
         }
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/useless_comparison.rs b/crates/ruff/src/rules/flake8_bugbear/rules/useless_comparison.rs
index 4d4dc2fe6323c..746acc8ec9bef 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/useless_comparison.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/useless_comparison.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -19,8 +19,8 @@ impl Violation for UselessComparison {
 }
 
 /// B015
-pub fn useless_comparison(checker: &mut Checker, expr: &Expr) {
-    if matches!(expr.node, ExprKind::Compare { .. }) {
+pub(crate) fn useless_comparison(checker: &mut Checker, expr: &Expr) {
+    if matches!(expr, Expr::Compare(_)) {
         checker
             .diagnostics
             .push(Diagnostic::new(UselessComparison, expr.range()));
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/useless_contextlib_suppress.rs b/crates/ruff/src/rules/flake8_bugbear/rules/useless_contextlib_suppress.rs
index 7b618caa9a504..456d47af047c2 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/useless_contextlib_suppress.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/useless_contextlib_suppress.rs
@@ -1,9 +1,10 @@
-use rustpython_parser::ast::Expr;
+use rustpython_parser::ast::{Expr, Ranged};
 
-use crate::checkers::ast::Checker;
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
+use crate::checkers::ast::Checker;
+
 #[violation]
 pub struct UselessContextlibSuppress;
 
@@ -18,10 +19,15 @@ impl Violation for UselessContextlibSuppress {
 }
 
 /// B022
-pub fn useless_contextlib_suppress(checker: &mut Checker, expr: &Expr, func: &Expr, args: &[Expr]) {
+pub(crate) fn useless_contextlib_suppress(
+    checker: &mut Checker,
+    expr: &Expr,
+    func: &Expr,
+    args: &[Expr],
+) {
     if args.is_empty()
         && checker
-            .ctx
+            .semantic_model()
             .resolve_call_path(func)
             .map_or(false, |call_path| {
                 call_path.as_slice() == ["contextlib", "suppress"]
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/useless_expression.rs b/crates/ruff/src/rules/flake8_bugbear/rules/useless_expression.rs
index 3ff2acaec7a3f..00376dc8b04db 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/useless_expression.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/useless_expression.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Constant, Expr, ExprKind};
+use rustpython_parser::ast::{self, Constant, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -7,7 +7,7 @@ use ruff_python_ast::helpers::contains_effect;
 use crate::checkers::ast::Checker;
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub enum Kind {
+pub(crate) enum Kind {
     Expression,
     Attribute,
 }
@@ -34,29 +34,29 @@ impl Violation for UselessExpression {
 }
 
 /// B018
-pub fn useless_expression(checker: &mut Checker, value: &Expr) {
+pub(crate) fn useless_expression(checker: &mut Checker, value: &Expr) {
     // Ignore comparisons, as they're handled by `useless_comparison`.
-    if matches!(value.node, ExprKind::Compare { .. }) {
+    if matches!(value, Expr::Compare(_)) {
         return;
     }
 
     // Ignore strings, to avoid false positives with docstrings.
     if matches!(
-        value.node,
-        ExprKind::JoinedStr { .. }
-            | ExprKind::Constant {
+        value,
+        Expr::JoinedStr(_)
+            | Expr::Constant(ast::ExprConstant {
                 value: Constant::Str(..) | Constant::Ellipsis,
                 ..
-            }
+            })
     ) {
         return;
     }
 
     // Ignore statements that have side effects.
-    if contains_effect(value, |id| checker.ctx.is_builtin(id)) {
+    if contains_effect(value, |id| checker.semantic_model().is_builtin(id)) {
         // Flag attributes as useless expressions, even if they're attached to calls or other
         // expressions.
-        if matches!(value.node, ExprKind::Attribute { .. }) {
+        if matches!(value, Expr::Attribute(_)) {
             checker.diagnostics.push(Diagnostic::new(
                 UselessExpression {
                     kind: Kind::Attribute,
diff --git a/crates/ruff/src/rules/flake8_bugbear/rules/zip_without_explicit_strict.rs b/crates/ruff/src/rules/flake8_bugbear/rules/zip_without_explicit_strict.rs
index ec3c3db340046..3bbc2efbaced6 100644
--- a/crates/ruff/src/rules/flake8_bugbear/rules/zip_without_explicit_strict.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/rules/zip_without_explicit_strict.rs
@@ -1,8 +1,11 @@
-use rustpython_parser::ast::{Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Expr, Keyword, Ranged};
 
-use crate::checkers::ast::Checker;
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::helpers::is_const_none;
+use ruff_python_semantic::model::SemanticModel;
+
+use crate::checkers::ast::Checker;
 
 #[violation]
 pub struct ZipWithoutExplicitStrict;
@@ -15,22 +18,22 @@ impl Violation for ZipWithoutExplicitStrict {
 }
 
 /// B905
-pub fn zip_without_explicit_strict(
+pub(crate) fn zip_without_explicit_strict(
     checker: &mut Checker,
     expr: &Expr,
     func: &Expr,
+    args: &[Expr],
     kwargs: &[Keyword],
 ) {
-    if let ExprKind::Name { id, .. } = &func.node {
+    if let Expr::Name(ast::ExprName { id, .. }) = func {
         if id == "zip"
-            && checker.ctx.is_builtin("zip")
-            && !kwargs.iter().any(|keyword| {
-                keyword
-                    .node
-                    .arg
-                    .as_ref()
-                    .map_or(false, |name| name == "strict")
-            })
+            && checker.semantic_model().is_builtin("zip")
+            && !kwargs
+                .iter()
+                .any(|keyword| keyword.arg.as_ref().map_or(false, |name| name == "strict"))
+            && !args
+                .iter()
+                .any(|arg| is_infinite_iterator(arg, checker.semantic_model()))
         {
             checker
                 .diagnostics
@@ -38,3 +41,40 @@ pub fn zip_without_explicit_strict(
         }
     }
 }
+
+/// Return `true` if the [`Expr`] appears to be an infinite iterator (e.g., a call to
+/// `itertools.cycle` or similar).
+fn is_infinite_iterator(arg: &Expr, model: &SemanticModel) -> bool {
+    let Expr::Call(ast::ExprCall { func, args, keywords, .. }) = &arg else {
+        return false;
+    };
+
+    return model
+        .resolve_call_path(func)
+        .map_or(false, |call_path| match call_path.as_slice() {
+            ["itertools", "cycle" | "count"] => true,
+            ["itertools", "repeat"] => {
+                // Ex) `itertools.repeat(1)`
+                if keywords.is_empty() && args.len() == 1 {
+                    return true;
+                }
+
+                // Ex) `itertools.repeat(1, None)`
+                if args.len() == 2 && is_const_none(&args[1]) {
+                    return true;
+                }
+
+                // Ex) `iterools.repeat(1, times=None)`
+                for keyword in keywords {
+                    if keyword.arg.as_ref().map_or(false, |name| name == "times") {
+                        if is_const_none(&keyword.value) {
+                            return true;
+                        }
+                    }
+                }
+
+                false
+            }
+            _ => false,
+        });
+}
diff --git a/crates/ruff/src/rules/flake8_bugbear/settings.rs b/crates/ruff/src/rules/flake8_bugbear/settings.rs
index 566aa1519d2db..4de75f4d782b4 100644
--- a/crates/ruff/src/rules/flake8_bugbear/settings.rs
+++ b/crates/ruff/src/rules/flake8_bugbear/settings.rs
@@ -1,18 +1,18 @@
 //! Settings for the `flake8-bugbear` plugin.
 
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::{CacheKey, ConfigurationOptions};
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
 
 #[derive(
-    Debug, PartialEq, Eq, Default, Serialize, Deserialize, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Default, Serialize, Deserialize, ConfigurationOptions, CombineOptions,
 )]
 #[serde(
     deny_unknown_fields,
     rename_all = "kebab-case",
     rename = "Flake8BugbearOptions"
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = r#"[]"#,
diff --git a/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B006_B006_B008.py.snap b/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B006_B006_B008.py.snap
index 2cb0b33275e85..ff021329cc4bf 100644
--- a/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B006_B006_B008.py.snap
+++ b/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B006_B006_B008.py.snap
@@ -1,113 +1,113 @@
 ---
 source: crates/ruff/src/rules/flake8_bugbear/mod.rs
 ---
-B006_B008.py:62:25: B006 Do not use mutable data structures for argument defaults
+B006_B008.py:63:25: B006 Do not use mutable data structures for argument defaults
    |
-62 | def this_is_wrong(value=[1, 2, 3]):
+63 | def this_is_wrong(value=[1, 2, 3]):
    |                         ^^^^^^^^^ B006
-63 |     ...
+64 |     ...
    |
 
-B006_B008.py:66:30: B006 Do not use mutable data structures for argument defaults
+B006_B008.py:67:30: B006 Do not use mutable data structures for argument defaults
    |
-66 | def this_is_also_wrong(value={}):
+67 | def this_is_also_wrong(value={}):
    |                              ^^ B006
-67 |     ...
+68 |     ...
    |
 
-B006_B008.py:70:20: B006 Do not use mutable data structures for argument defaults
+B006_B008.py:71:20: B006 Do not use mutable data structures for argument defaults
    |
-70 | def and_this(value=set()):
+71 | def and_this(value=set()):
    |                    ^^^^^ B006
-71 |     ...
+72 |     ...
    |
 
-B006_B008.py:74:20: B006 Do not use mutable data structures for argument defaults
+B006_B008.py:75:20: B006 Do not use mutable data structures for argument defaults
    |
-74 | def this_too(value=collections.OrderedDict()):
+75 | def this_too(value=collections.OrderedDict()):
    |                    ^^^^^^^^^^^^^^^^^^^^^^^^^ B006
-75 |     ...
+76 |     ...
    |
 
-B006_B008.py:78:32: B006 Do not use mutable data structures for argument defaults
+B006_B008.py:79:32: B006 Do not use mutable data structures for argument defaults
    |
-78 | async def async_this_too(value=collections.defaultdict()):
+79 | async def async_this_too(value=collections.defaultdict()):
    |                                ^^^^^^^^^^^^^^^^^^^^^^^^^ B006
-79 |     ...
+80 |     ...
    |
 
-B006_B008.py:82:26: B006 Do not use mutable data structures for argument defaults
+B006_B008.py:83:26: B006 Do not use mutable data structures for argument defaults
    |
-82 | def dont_forget_me(value=collections.deque()):
+83 | def dont_forget_me(value=collections.deque()):
    |                          ^^^^^^^^^^^^^^^^^^^ B006
-83 |     ...
+84 |     ...
    |
 
-B006_B008.py:87:46: B006 Do not use mutable data structures for argument defaults
+B006_B008.py:88:46: B006 Do not use mutable data structures for argument defaults
    |
-87 | # N.B. we're also flagging the function call in the comprehension
-88 | def list_comprehension_also_not_okay(default=[i**2 for i in range(3)]):
+88 | # N.B. we're also flagging the function call in the comprehension
+89 | def list_comprehension_also_not_okay(default=[i**2 for i in range(3)]):
    |                                              ^^^^^^^^^^^^^^^^^^^^^^^^ B006
-89 |     pass
+90 |     pass
    |
 
-B006_B008.py:91:46: B006 Do not use mutable data structures for argument defaults
+B006_B008.py:92:46: B006 Do not use mutable data structures for argument defaults
    |
-91 | def dict_comprehension_also_not_okay(default={i: i**2 for i in range(3)}):
+92 | def dict_comprehension_also_not_okay(default={i: i**2 for i in range(3)}):
    |                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^ B006
-92 |     pass
+93 |     pass
    |
 
-B006_B008.py:95:45: B006 Do not use mutable data structures for argument defaults
+B006_B008.py:96:45: B006 Do not use mutable data structures for argument defaults
    |
-95 | def set_comprehension_also_not_okay(default={i**2 for i in range(3)}):
+96 | def set_comprehension_also_not_okay(default={i**2 for i in range(3)}):
    |                                             ^^^^^^^^^^^^^^^^^^^^^^^^ B006
-96 |     pass
+97 |     pass
    |
 
-B006_B008.py:99:33: B006 Do not use mutable data structures for argument defaults
+B006_B008.py:100:33: B006 Do not use mutable data structures for argument defaults
     |
- 99 | def kwonlyargs_mutable(*, value=[]):
+100 | def kwonlyargs_mutable(*, value=[]):
     |                                 ^^ B006
-100 |     ...
+101 |     ...
     |
 
-B006_B008.py:192:20: B006 Do not use mutable data structures for argument defaults
+B006_B008.py:218:20: B006 Do not use mutable data structures for argument defaults
     |
-192 | # B006 and B008
-193 | # We should handle arbitrary nesting of these B008.
-194 | def nested_combo(a=[float(3), dt.datetime.now()]):
+218 | # B006 and B008
+219 | # We should handle arbitrary nesting of these B008.
+220 | def nested_combo(a=[float(3), dt.datetime.now()]):
     |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B006
-195 |     pass
+221 |     pass
     |
 
-B006_B008.py:225:27: B006 Do not use mutable data structures for argument defaults
+B006_B008.py:251:27: B006 Do not use mutable data structures for argument defaults
     |
-225 | def mutable_annotations(
-226 |     a: list[int] | None = [],
+251 | def mutable_annotations(
+252 |     a: list[int] | None = [],
     |                           ^^ B006
-227 |     b: Optional[Dict[int, int]] = {},
-228 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+253 |     b: Optional[Dict[int, int]] = {},
+254 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
     |
 
-B006_B008.py:226:35: B006 Do not use mutable data structures for argument defaults
+B006_B008.py:252:35: B006 Do not use mutable data structures for argument defaults
     |
-226 | def mutable_annotations(
-227 |     a: list[int] | None = [],
-228 |     b: Optional[Dict[int, int]] = {},
+252 | def mutable_annotations(
+253 |     a: list[int] | None = [],
+254 |     b: Optional[Dict[int, int]] = {},
     |                                   ^^ B006
-229 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
-230 | ):
+255 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+256 | ):
     |
 
-B006_B008.py:227:62: B006 Do not use mutable data structures for argument defaults
+B006_B008.py:253:62: B006 Do not use mutable data structures for argument defaults
     |
-227 |     a: list[int] | None = [],
-228 |     b: Optional[Dict[int, int]] = {},
-229 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
+253 |     a: list[int] | None = [],
+254 |     b: Optional[Dict[int, int]] = {},
+255 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
     |                                                              ^^^^^ B006
-230 | ):
-231 |     pass
+256 | ):
+257 |     pass
     |
 
 
diff --git a/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B007_B007.py.snap b/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B007_B007.py.snap
index 3960383665ace..f263105c6083e 100644
--- a/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B007_B007.py.snap
+++ b/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B007_B007.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_bugbear/mod.rs
 ---
-B007.py:6:5: B007 [*] Loop control variable `i` not used within loop body
+B007.py:6:5: B007 Loop control variable `i` not used within loop body
   |
 6 | print(i)  # name no longer defined on Python 3; no warning yet
 7 | 
@@ -31,7 +31,7 @@ B007.py:18:13: B007 [*] Loop control variable `k` not used within loop body
 20 20 | 
 21 21 | 
 
-B007.py:30:5: B007 [*] Loop control variable `i` not used within loop body
+B007.py:30:5: B007 Loop control variable `i` not used within loop body
    |
 30 | for i, (j, (k, l)) in strange_generator():  # i, k not used
    |     ^ B007
@@ -65,6 +65,7 @@ B007.py:34:10: B007 Loop control variable `bar` may not be used within loop body
 36 |     if foo:
 37 |         print(FMT.format(**locals()))
    |
+   = help: Rename unused `bar` to `_bar`
 
 B007.py:38:10: B007 Loop control variable `bar` may not be used within loop body
    |
@@ -75,6 +76,7 @@ B007.py:38:10: B007 Loop control variable `bar` may not be used within loop body
 41 |     if foo:
 42 |         print(FMT.format(**globals()))
    |
+   = help: Rename unused `bar` to `_bar`
 
 B007.py:42:10: B007 Loop control variable `bar` may not be used within loop body
    |
@@ -85,6 +87,7 @@ B007.py:42:10: B007 Loop control variable `bar` may not be used within loop body
 45 |     if foo:
 46 |         print(FMT.format(**vars()))
    |
+   = help: Rename unused `bar` to `_bar`
 
 B007.py:46:10: B007 Loop control variable `bar` may not be used within loop body
    |
@@ -94,6 +97,7 @@ B007.py:46:10: B007 Loop control variable `bar` may not be used within loop body
    |          ^^^ B007
 49 |     print(FMT.format(foo=foo, bar=eval("bar")))
    |
+   = help: Rename unused `bar` to `_bar`
 
 B007.py:52:14: B007 [*] Loop control variable `bar` not used within loop body
    |
@@ -116,7 +120,7 @@ B007.py:52:14: B007 [*] Loop control variable `bar` not used within loop body
 54 54 |             break
 55 55 | 
 
-B007.py:59:14: B007 [*] Loop control variable `bar` not used within loop body
+B007.py:59:14: B007 Loop control variable `bar` not used within loop body
    |
 59 | def f():
 60 |     # Unfixable due to usage of `bar` outside of loop.
@@ -148,10 +152,10 @@ B007.py:68:14: B007 [*] Loop control variable `bar` not used within loop body
 70 70 |             break
 71 71 | 
 
-B007.py:77:14: B007 [*] Loop control variable `bar` not used within loop body
+B007.py:77:14: B007 Loop control variable `bar` not used within loop body
    |
 77 | def f():
-78 |     # Fixable.
+78 |     # Unfixable.
 79 |     for foo, bar, baz in (["1", "2", "3"],):
    |              ^^^ B007
 80 |         if foo or baz:
@@ -159,23 +163,24 @@ B007.py:77:14: B007 [*] Loop control variable `bar` not used within loop body
    |
    = help: Rename unused `bar` to `_bar`
 
-ℹ Suggested fix
-74 74 | 
-75 75 | def f():
-76 76 |     # Fixable.
-77    |-    for foo, bar, baz in (["1", "2", "3"],):
-   77 |+    for foo, _bar, baz in (["1", "2", "3"],):
-78 78 |         if foo or baz:
-79 79 |             break
-80 80 | 
-
-B007.py:87:5: B007 Loop control variable `line_` not used within loop body
-   |
-87 | # Unfixable due to trailing underscore (`_line_` wouldn't be considered an ignorable
-88 | # variable name).
-89 | for line_ in range(self.header_lines):
-   |     ^^^^^ B007
-90 |      fp.readline()
+B007.py:88:14: B007 Loop control variable `bar` not used within loop body
    |
+88 | def f():
+89 |     # Unfixable (false negative) due to usage of `bar` outside of loop.
+90 |     for foo, bar, baz in (["1", "2", "3"],):
+   |              ^^^ B007
+91 |         if foo or baz:
+92 |             break
+   |
+   = help: Rename unused `bar` to `_bar`
+
+B007.py:98:5: B007 Loop control variable `line_` not used within loop body
+    |
+ 98 | # Unfixable due to trailing underscore (`_line_` wouldn't be considered an ignorable
+ 99 | # variable name).
+100 | for line_ in range(self.header_lines):
+    |     ^^^^^ B007
+101 |     fp.readline()
+    |
 
 
diff --git a/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B008_B006_B008.py.snap b/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B008_B006_B008.py.snap
index 7ec11c3ab1900..514e2b2f56f0e 100644
--- a/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B008_B006_B008.py.snap
+++ b/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B008_B006_B008.py.snap
@@ -1,114 +1,83 @@
 ---
 source: crates/ruff/src/rules/flake8_bugbear/mod.rs
 ---
-B006_B008.py:87:61: B008 Do not perform function call `range` in argument defaults
+B006_B008.py:88:61: B008 Do not perform function call `range` in argument defaults
    |
-87 | # N.B. we're also flagging the function call in the comprehension
-88 | def list_comprehension_also_not_okay(default=[i**2 for i in range(3)]):
+88 | # N.B. we're also flagging the function call in the comprehension
+89 | def list_comprehension_also_not_okay(default=[i**2 for i in range(3)]):
    |                                                             ^^^^^^^^ B008
-89 |     pass
+90 |     pass
    |
 
-B006_B008.py:91:64: B008 Do not perform function call `range` in argument defaults
+B006_B008.py:92:64: B008 Do not perform function call `range` in argument defaults
    |
-91 | def dict_comprehension_also_not_okay(default={i: i**2 for i in range(3)}):
+92 | def dict_comprehension_also_not_okay(default={i: i**2 for i in range(3)}):
    |                                                                ^^^^^^^^ B008
-92 |     pass
+93 |     pass
    |
 
-B006_B008.py:95:60: B008 Do not perform function call `range` in argument defaults
+B006_B008.py:96:60: B008 Do not perform function call `range` in argument defaults
    |
-95 | def set_comprehension_also_not_okay(default={i**2 for i in range(3)}):
+96 | def set_comprehension_also_not_okay(default={i**2 for i in range(3)}):
    |                                                            ^^^^^^^^ B008
-96 |     pass
+97 |     pass
    |
 
-B006_B008.py:111:39: B008 Do not perform function call `time.time` in argument defaults
+B006_B008.py:112:39: B008 Do not perform function call `time.time` in argument defaults
     |
-111 | # B008
-112 | # Flag function calls as default args (including if they are part of a sub-expression)
-113 | def in_fact_all_calls_are_wrong(value=time.time()):
+112 | # B008
+113 | # Flag function calls as default args (including if they are part of a sub-expression)
+114 | def in_fact_all_calls_are_wrong(value=time.time()):
     |                                       ^^^^^^^^^^^ B008
-114 |     ...
+115 |     ...
     |
 
-B006_B008.py:115:12: B008 Do not perform function call `dt.datetime.now` in argument defaults
+B006_B008.py:116:12: B008 Do not perform function call `dt.datetime.now` in argument defaults
     |
-115 | def f(when=dt.datetime.now() + dt.timedelta(days=7)):
+116 | def f(when=dt.datetime.now() + dt.timedelta(days=7)):
     |            ^^^^^^^^^^^^^^^^^ B008
-116 |     pass
+117 |     pass
     |
 
-B006_B008.py:119:30: B008 Do not perform function call in argument defaults
+B006_B008.py:120:30: B008 Do not perform function call in argument defaults
     |
-119 | def can_even_catch_lambdas(a=(lambda x: x)()):
+120 | def can_even_catch_lambdas(a=(lambda x: x)()):
     |                              ^^^^^^^^^^^^^^^ B008
-120 |     ...
+121 |     ...
     |
 
-B006_B008.py:157:34: B008 Do not perform function call `float` in argument defaults
+B006_B008.py:218:31: B008 Do not perform function call `dt.datetime.now` in argument defaults
     |
-157 | def float_infinity_literal(value=float("1e999")):
-    |                                  ^^^^^^^^^^^^^^ B008
-158 |     pass
-    |
-
-B006_B008.py:162:30: B008 Do not perform function call `float` in argument defaults
-    |
-162 | # But don't allow standard floats
-163 | def float_int_is_wrong(value=float(3)):
-    |                              ^^^^^^^^ B008
-164 |     pass
-    |
-
-B006_B008.py:166:45: B008 Do not perform function call `float` in argument defaults
-    |
-166 | def float_str_not_inf_or_nan_is_wrong(value=float("3.14")):
-    |                                             ^^^^^^^^^^^^^ B008
-167 |     pass
-    |
-
-B006_B008.py:192:21: B008 Do not perform function call `float` in argument defaults
-    |
-192 | # B006 and B008
-193 | # We should handle arbitrary nesting of these B008.
-194 | def nested_combo(a=[float(3), dt.datetime.now()]):
-    |                     ^^^^^^^^ B008
-195 |     pass
-    |
-
-B006_B008.py:192:31: B008 Do not perform function call `dt.datetime.now` in argument defaults
-    |
-192 | # B006 and B008
-193 | # We should handle arbitrary nesting of these B008.
-194 | def nested_combo(a=[float(3), dt.datetime.now()]):
+218 | # B006 and B008
+219 | # We should handle arbitrary nesting of these B008.
+220 | def nested_combo(a=[float(3), dt.datetime.now()]):
     |                               ^^^^^^^^^^^^^^^^^ B008
-195 |     pass
+221 |     pass
     |
 
-B006_B008.py:198:22: B008 Do not perform function call `map` in argument defaults
+B006_B008.py:224:22: B008 Do not perform function call `map` in argument defaults
     |
-198 | # Don't flag nested B006 since we can't guarantee that
-199 | # it isn't made mutable by the outer operation.
-200 | def no_nested_b006(a=map(lambda s: s.upper(), ["a", "b", "c"])):
+224 | # Don't flag nested B006 since we can't guarantee that
+225 | # it isn't made mutable by the outer operation.
+226 | def no_nested_b006(a=map(lambda s: s.upper(), ["a", "b", "c"])):
     |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B008
-201 |     pass
+227 |     pass
     |
 
-B006_B008.py:203:19: B008 Do not perform function call `random.randint` in argument defaults
+B006_B008.py:229:19: B008 Do not perform function call `random.randint` in argument defaults
     |
-203 | # B008-ception.
-204 | def nested_b008(a=random.randint(0, dt.datetime.now().year)):
+229 | # B008-ception.
+230 | def nested_b008(a=random.randint(0, dt.datetime.now().year)):
     |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B008
-205 |     pass
+231 |     pass
     |
 
-B006_B008.py:203:37: B008 Do not perform function call `dt.datetime.now` in argument defaults
+B006_B008.py:229:37: B008 Do not perform function call `dt.datetime.now` in argument defaults
     |
-203 | # B008-ception.
-204 | def nested_b008(a=random.randint(0, dt.datetime.now().year)):
+229 | # B008-ception.
+230 | def nested_b008(a=random.randint(0, dt.datetime.now().year)):
     |                                     ^^^^^^^^^^^^^^^^^ B008
-205 |     pass
+231 |     pass
     |
 
 
diff --git a/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B013_B013.py.snap b/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B013_B013.py.snap
index da61eecc72a3c..698bf0d0f33dd 100644
--- a/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B013_B013.py.snap
+++ b/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B013_B013.py.snap
@@ -1,5 +1,6 @@
 ---
 source: crates/ruff/src/rules/flake8_bugbear/mod.rs
+assertion_line: 57
 ---
 B013.py:3:8: B013 [*] A length-one tuple literal is redundant. Write `except ValueError` instead of `except (ValueError,)`.
   |
@@ -12,7 +13,7 @@ B013.py:3:8: B013 [*] A length-one tuple literal is redundant. Write `except Val
   |
   = help: Replace with `except ValueError`
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | try:
 2 2 |     pass
 3   |-except (ValueError,):
diff --git a/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B021_B021.py.snap b/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B021_B021.py.snap
index 77d34cb658b53..e313e6d8ae032 100644
--- a/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B021_B021.py.snap
+++ b/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B021_B021.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_bugbear/mod.rs
 ---
-B021.py:1:1: B021 f-string used as docstring. This will be interpreted by python as a joined string rather than a docstring.
+B021.py:1:1: B021 f-string used as docstring. Python will interpret this as a joined string, rather than a docstring.
   |
 1 | / f"""
 2 | | Should emit:
@@ -12,63 +12,63 @@ B021.py:1:1: B021 f-string used as docstring. This will be interpreted by python
 6 |   VARIABLE = "world"
   |
 
-B021.py:14:5: B021 f-string used as docstring. This will be interpreted by python as a joined string rather than a docstring.
+B021.py:14:5: B021 f-string used as docstring. Python will interpret this as a joined string, rather than a docstring.
    |
 14 | def foo2():
 15 |     f"""hello {VARIABLE}!"""
    |     ^^^^^^^^^^^^^^^^^^^^^^^^ B021
    |
 
-B021.py:22:5: B021 f-string used as docstring. This will be interpreted by python as a joined string rather than a docstring.
+B021.py:22:5: B021 f-string used as docstring. Python will interpret this as a joined string, rather than a docstring.
    |
 22 | class bar2:
 23 |     f"""hello {VARIABLE}!"""
    |     ^^^^^^^^^^^^^^^^^^^^^^^^ B021
    |
 
-B021.py:30:5: B021 f-string used as docstring. This will be interpreted by python as a joined string rather than a docstring.
+B021.py:30:5: B021 f-string used as docstring. Python will interpret this as a joined string, rather than a docstring.
    |
 30 | def foo2():
 31 |     f"""hello {VARIABLE}!"""
    |     ^^^^^^^^^^^^^^^^^^^^^^^^ B021
    |
 
-B021.py:38:5: B021 f-string used as docstring. This will be interpreted by python as a joined string rather than a docstring.
+B021.py:38:5: B021 f-string used as docstring. Python will interpret this as a joined string, rather than a docstring.
    |
 38 | class bar2:
 39 |     f"""hello {VARIABLE}!"""
    |     ^^^^^^^^^^^^^^^^^^^^^^^^ B021
    |
 
-B021.py:46:5: B021 f-string used as docstring. This will be interpreted by python as a joined string rather than a docstring.
+B021.py:46:5: B021 f-string used as docstring. Python will interpret this as a joined string, rather than a docstring.
    |
 46 | def foo2():
 47 |     f"hello {VARIABLE}!"
    |     ^^^^^^^^^^^^^^^^^^^^ B021
    |
 
-B021.py:54:5: B021 f-string used as docstring. This will be interpreted by python as a joined string rather than a docstring.
+B021.py:54:5: B021 f-string used as docstring. Python will interpret this as a joined string, rather than a docstring.
    |
 54 | class bar2:
 55 |     f"hello {VARIABLE}!"
    |     ^^^^^^^^^^^^^^^^^^^^ B021
    |
 
-B021.py:62:5: B021 f-string used as docstring. This will be interpreted by python as a joined string rather than a docstring.
+B021.py:62:5: B021 f-string used as docstring. Python will interpret this as a joined string, rather than a docstring.
    |
 62 | def foo2():
 63 |     f"hello {VARIABLE}!"
    |     ^^^^^^^^^^^^^^^^^^^^ B021
    |
 
-B021.py:70:5: B021 f-string used as docstring. This will be interpreted by python as a joined string rather than a docstring.
+B021.py:70:5: B021 f-string used as docstring. Python will interpret this as a joined string, rather than a docstring.
    |
 70 | class bar2:
 71 |     f"hello {VARIABLE}!"
    |     ^^^^^^^^^^^^^^^^^^^^ B021
    |
 
-B021.py:74:5: B021 f-string used as docstring. This will be interpreted by python as a joined string rather than a docstring.
+B021.py:74:5: B021 f-string used as docstring. Python will interpret this as a joined string, rather than a docstring.
    |
 74 | def baz():
 75 |     f"""I'm probably a docstring: {VARIABLE}!"""
diff --git a/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B024_B024.py.snap b/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B024_B024.py.snap
index 72378202ef6ac..35db4324c0396 100644
--- a/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B024_B024.py.snap
+++ b/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B024_B024.py.snap
@@ -1,52 +1,52 @@
 ---
 source: crates/ruff/src/rules/flake8_bugbear/mod.rs
 ---
-B024.py:18:1: B024 `Base_1` is an abstract base class, but it has no abstract methods
+B024.py:18:7: B024 `Base_1` is an abstract base class, but it has no abstract methods
    |
-18 | / class Base_1(ABC):  # error
-19 | |     def method(self):
-20 | |         foo()
-   | |_____________^ B024
+18 | class Base_1(ABC):  # error
+   |       ^^^^^^ B024
+19 |     def method(self):
+20 |         foo()
    |
 
-B024.py:71:1: B024 `MetaBase_1` is an abstract base class, but it has no abstract methods
+B024.py:71:7: B024 `MetaBase_1` is an abstract base class, but it has no abstract methods
    |
-71 | / class MetaBase_1(metaclass=ABCMeta):  # error
-72 | |     def method(self):
-73 | |         foo()
-   | |_____________^ B024
+71 | class MetaBase_1(metaclass=ABCMeta):  # error
+   |       ^^^^^^^^^^ B024
+72 |     def method(self):
+73 |         foo()
    |
 
-B024.py:82:1: B024 `abc_Base_1` is an abstract base class, but it has no abstract methods
+B024.py:82:7: B024 `abc_Base_1` is an abstract base class, but it has no abstract methods
    |
-82 | / class abc_Base_1(abc.ABC):  # error
-83 | |     def method(self):
-84 | |         foo()
-   | |_____________^ B024
+82 | class abc_Base_1(abc.ABC):  # error
+   |       ^^^^^^^^^^ B024
+83 |     def method(self):
+84 |         foo()
    |
 
-B024.py:87:1: B024 `abc_Base_2` is an abstract base class, but it has no abstract methods
+B024.py:87:7: B024 `abc_Base_2` is an abstract base class, but it has no abstract methods
    |
-87 | / class abc_Base_2(metaclass=abc.ABCMeta):  # error
-88 | |     def method(self):
-89 | |         foo()
-   | |_____________^ B024
+87 | class abc_Base_2(metaclass=abc.ABCMeta):  # error
+   |       ^^^^^^^^^^ B024
+88 |     def method(self):
+89 |         foo()
    |
 
-B024.py:92:1: B024 `notabc_Base_1` is an abstract base class, but it has no abstract methods
+B024.py:92:7: B024 `notabc_Base_1` is an abstract base class, but it has no abstract methods
    |
-92 | / class notabc_Base_1(notabc.ABC):  # error
-93 | |     def method(self):
-94 | |         foo()
-   | |_____________^ B024
+92 | class notabc_Base_1(notabc.ABC):  # error
+   |       ^^^^^^^^^^^^^ B024
+93 |     def method(self):
+94 |         foo()
    |
 
-B024.py:141:1: B024 `abc_set_class_variable_4` is an abstract base class, but it has no abstract methods
+B024.py:141:7: B024 `abc_set_class_variable_4` is an abstract base class, but it has no abstract methods
     |
-141 |   # this doesn't actually declare a class variable, it's just an expression
-142 | / class abc_set_class_variable_4(ABC):  # error
-143 | |     foo
-    | |_______^ B024
+141 | # this doesn't actually declare a class variable, it's just an expression
+142 | class abc_set_class_variable_4(ABC):  # error
+    |       ^^^^^^^^^^^^^^^^^^^^^^^^ B024
+143 |     foo
     |
 
 
diff --git a/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B027_B027.py.snap b/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B027_B027.py.snap
index 31830c9e92b34..0cc5957de16a2 100644
--- a/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B027_B027.py.snap
+++ b/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B027_B027.py.snap
@@ -1,96 +1,56 @@
 ---
 source: crates/ruff/src/rules/flake8_bugbear/mod.rs
 ---
-B027.py:13:5: B027 [*] `AbstractClass.empty_1` is an empty method in an abstract base class, but has no abstract decorator
+B027.py:18:5: B027 `AbstractClass.empty_1` is an empty method in an abstract base class, but has no abstract decorator
    |
-13 |   class AbstractClass(ABC):
-14 |       def empty_1(self):  # error
+18 |   class AbstractClass(ABC):
+19 |       def empty_1(self):  # error
    |  _____^
-15 | |         ...
+20 | |         ...
    | |___________^ B027
-16 |   
-17 |       def empty_2(self):  # error
+21 |   
+22 |       def empty_2(self):  # error
    |
-   = help: Add the `@abstractmethod` decorator
 
-ℹ Suggested fix
-10 10 | 
-11 11 | 
-12 12 | class AbstractClass(ABC):
-   13 |+    @notabstract
-13 14 |     def empty_1(self):  # error
-14 15 |         ...
-15 16 | 
-
-B027.py:16:5: B027 [*] `AbstractClass.empty_2` is an empty method in an abstract base class, but has no abstract decorator
+B027.py:21:5: B027 `AbstractClass.empty_2` is an empty method in an abstract base class, but has no abstract decorator
    |
-16 |           ...
-17 |   
-18 |       def empty_2(self):  # error
+21 |           ...
+22 |   
+23 |       def empty_2(self):  # error
    |  _____^
-19 | |         pass
+24 | |         pass
    | |____________^ B027
-20 |   
-21 |       def empty_3(self):  # error
+25 |   
+26 |       def empty_3(self):  # error
    |
-   = help: Add the `@abstractmethod` decorator
-
-ℹ Suggested fix
-13 13 |     def empty_1(self):  # error
-14 14 |         ...
-15 15 | 
-   16 |+    @notabstract
-16 17 |     def empty_2(self):  # error
-17 18 |         pass
-18 19 | 
 
-B027.py:19:5: B027 [*] `AbstractClass.empty_3` is an empty method in an abstract base class, but has no abstract decorator
+B027.py:24:5: B027 `AbstractClass.empty_3` is an empty method in an abstract base class, but has no abstract decorator
    |
-19 |           pass
-20 |   
-21 |       def empty_3(self):  # error
+24 |           pass
+25 |   
+26 |       def empty_3(self):  # error
    |  _____^
-22 | |         """docstring"""
-23 | |         ...
+27 | |         """docstring"""
+28 | |         ...
    | |___________^ B027
-24 |   
-25 |       def empty_4(self):  # error
+29 |   
+30 |       def empty_4(self):  # error
    |
-   = help: Add the `@abstractmethod` decorator
 
-ℹ Suggested fix
-16 16 |     def empty_2(self):  # error
-17 17 |         pass
-18 18 | 
-   19 |+    @notabstract
-19 20 |     def empty_3(self):  # error
-20 21 |         """docstring"""
-21 22 |         ...
-
-B027.py:23:5: B027 [*] `AbstractClass.empty_4` is an empty method in an abstract base class, but has no abstract decorator
+B027.py:28:5: B027 `AbstractClass.empty_4` is an empty method in an abstract base class, but has no abstract decorator
    |
-23 |           ...
-24 |   
-25 |       def empty_4(self):  # error
+28 |           ...
+29 |   
+30 |       def empty_4(self):  # error
    |  _____^
-26 | |         """multiple ellipsis/pass"""
-27 | |         ...
-28 | |         pass
-29 | |         ...
-30 | |         pass
+31 | |         """multiple ellipsis/pass"""
+32 | |         ...
+33 | |         pass
+34 | |         ...
+35 | |         pass
    | |____________^ B027
-31 |   
-32 |       @notabstract
+36 |   
+37 |       @notabstract
    |
-   = help: Add the `@abstractmethod` decorator
-
-ℹ Suggested fix
-20 20 |         """docstring"""
-21 21 |         ...
-22 22 | 
-   23 |+    @notabstract
-23 24 |     def empty_4(self):  # error
-24 25 |         """multiple ellipsis/pass"""
-25 26 |         ...
 
 
diff --git a/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B027_B027_extended.py.snap b/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B027_B027_extended.py.snap
deleted file mode 100644
index 2ee081c6f5c54..0000000000000
--- a/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B027_B027_extended.py.snap
+++ /dev/null
@@ -1,122 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_bugbear/mod.rs
----
-B027_extended.py:9:5: B027 [*] `AbstractClass.empty_1` is an empty method in an abstract base class, but has no abstract decorator
-   |
- 9 |   class AbstractClass(ABC):
-10 |       def empty_1(self):  # error
-   |  _____^
-11 | |         ...
-   | |___________^ B027
-12 |   
-13 |       def empty_2(self):  # error
-   |
-   = help: Add the `@abstractmethod` decorator
-
-ℹ Suggested fix
-2  2  | Should emit:
-3  3  | B027 - on lines 13, 16, 19, 23
-4  4  | """
-5     |-from abc import ABC
-   5  |+from abc import ABC, abstractmethod
-6  6  | 
-7  7  | 
-8  8  | class AbstractClass(ABC):
-   9  |+    @abstractmethod
-9  10 |     def empty_1(self):  # error
-10 11 |         ...
-11 12 | 
-
-B027_extended.py:12:5: B027 [*] `AbstractClass.empty_2` is an empty method in an abstract base class, but has no abstract decorator
-   |
-12 |           ...
-13 |   
-14 |       def empty_2(self):  # error
-   |  _____^
-15 | |         pass
-   | |____________^ B027
-16 |   
-17 |       def body_1(self):
-   |
-   = help: Add the `@abstractmethod` decorator
-
-ℹ Suggested fix
-2  2  | Should emit:
-3  3  | B027 - on lines 13, 16, 19, 23
-4  4  | """
-5     |-from abc import ABC
-   5  |+from abc import ABC, abstractmethod
-6  6  | 
-7  7  | 
-8  8  | class AbstractClass(ABC):
-9  9  |     def empty_1(self):  # error
-10 10 |         ...
-11 11 | 
-   12 |+    @abstractmethod
-12 13 |     def empty_2(self):  # error
-13 14 |         pass
-14 15 | 
-
-B027_extended.py:25:9: B027 [*] `InnerAbstractClass.empty_1` is an empty method in an abstract base class, but has no abstract decorator
-   |
-25 |   def foo():
-26 |       class InnerAbstractClass(ABC):
-27 |           def empty_1(self):  # error
-   |  _________^
-28 | |             ...
-   | |_______________^ B027
-29 |   
-30 |           def empty_2(self):  # error
-   |
-   = help: Add the `@abstractmethod` decorator
-
-ℹ Suggested fix
-2  2  | Should emit:
-3  3  | B027 - on lines 13, 16, 19, 23
-4  4  | """
-5     |-from abc import ABC
-   5  |+from abc import ABC, abstractmethod
-6  6  | 
-7  7  | 
-8  8  | class AbstractClass(ABC):
---------------------------------------------------------------------------------
-22 22 | 
-23 23 | def foo():
-24 24 |     class InnerAbstractClass(ABC):
-   25 |+        @abstractmethod
-25 26 |         def empty_1(self):  # error
-26 27 |             ...
-27 28 | 
-
-B027_extended.py:28:9: B027 [*] `InnerAbstractClass.empty_2` is an empty method in an abstract base class, but has no abstract decorator
-   |
-28 |               ...
-29 |   
-30 |           def empty_2(self):  # error
-   |  _________^
-31 | |             pass
-   | |________________^ B027
-32 |   
-33 |           def body_1(self):
-   |
-   = help: Add the `@abstractmethod` decorator
-
-ℹ Suggested fix
-2  2  | Should emit:
-3  3  | B027 - on lines 13, 16, 19, 23
-4  4  | """
-5     |-from abc import ABC
-   5  |+from abc import ABC, abstractmethod
-6  6  | 
-7  7  | 
-8  8  | class AbstractClass(ABC):
---------------------------------------------------------------------------------
-25 25 |         def empty_1(self):  # error
-26 26 |             ...
-27 27 | 
-   28 |+        @abstractmethod
-28 29 |         def empty_2(self):  # error
-29 30 |             pass
-30 31 | 
-
-
diff --git a/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B033_B033.py.snap b/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B033_B033.py.snap
new file mode 100644
index 0000000000000..a71540f42f781
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B033_B033.py.snap
@@ -0,0 +1,23 @@
+---
+source: crates/ruff/src/rules/flake8_bugbear/mod.rs
+---
+B033.py:4:35: B033 Sets should not contain duplicate item `"value1"`
+  |
+4 | # Errors.
+5 | ###
+6 | incorrect_set = {"value1", 23, 5, "value1"}
+  |                                   ^^^^^^^^ B033
+7 | incorrect_set = {1, 1}
+  |
+
+B033.py:5:21: B033 Sets should not contain duplicate item `1`
+  |
+5 | ###
+6 | incorrect_set = {"value1", 23, 5, "value1"}
+7 | incorrect_set = {1, 1}
+  |                     ^ B033
+8 | 
+9 | ###
+  |
+
+
diff --git a/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B905_B905.py.snap b/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B905_B905.py.snap
index d18f3715463d7..76dcda7de4bb9 100644
--- a/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B905_B905.py.snap
+++ b/crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B905_B905.py.snap
@@ -1,70 +1,88 @@
 ---
 source: crates/ruff/src/rules/flake8_bugbear/mod.rs
 ---
-B905.py:1:1: B905 `zip()` without an explicit `strict=` parameter
+B905.py:4:1: B905 `zip()` without an explicit `strict=` parameter
   |
-1 | zip()
+4 | # Errors
+5 | zip()
   | ^^^^^ B905
-2 | zip(range(3))
-3 | zip("a", "b")
+6 | zip(range(3))
+7 | zip("a", "b")
   |
 
-B905.py:2:1: B905 `zip()` without an explicit `strict=` parameter
+B905.py:5:1: B905 `zip()` without an explicit `strict=` parameter
   |
-2 | zip()
-3 | zip(range(3))
+5 | # Errors
+6 | zip()
+7 | zip(range(3))
   | ^^^^^^^^^^^^^ B905
-4 | zip("a", "b")
-5 | zip("a", "b", *zip("c"))
+8 | zip("a", "b")
+9 | zip("a", "b", *zip("c"))
   |
 
-B905.py:3:1: B905 `zip()` without an explicit `strict=` parameter
-  |
-3 | zip()
-4 | zip(range(3))
-5 | zip("a", "b")
-  | ^^^^^^^^^^^^^ B905
-6 | zip("a", "b", *zip("c"))
-7 | zip(zip("a"), strict=False)
-  |
+B905.py:6:1: B905 `zip()` without an explicit `strict=` parameter
+   |
+ 6 | zip()
+ 7 | zip(range(3))
+ 8 | zip("a", "b")
+   | ^^^^^^^^^^^^^ B905
+ 9 | zip("a", "b", *zip("c"))
+10 | zip(zip("a"), strict=False)
+   |
 
-B905.py:4:1: B905 `zip()` without an explicit `strict=` parameter
-  |
-4 | zip(range(3))
-5 | zip("a", "b")
-6 | zip("a", "b", *zip("c"))
-  | ^^^^^^^^^^^^^^^^^^^^^^^^ B905
-7 | zip(zip("a"), strict=False)
-8 | zip(zip("a", strict=True))
-  |
+B905.py:7:1: B905 `zip()` without an explicit `strict=` parameter
+   |
+ 7 | zip(range(3))
+ 8 | zip("a", "b")
+ 9 | zip("a", "b", *zip("c"))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ B905
+10 | zip(zip("a"), strict=False)
+11 | zip(zip("a", strict=True))
+   |
 
-B905.py:4:16: B905 `zip()` without an explicit `strict=` parameter
-  |
-4 | zip(range(3))
-5 | zip("a", "b")
-6 | zip("a", "b", *zip("c"))
-  |                ^^^^^^^^ B905
-7 | zip(zip("a"), strict=False)
-8 | zip(zip("a", strict=True))
-  |
+B905.py:7:16: B905 `zip()` without an explicit `strict=` parameter
+   |
+ 7 | zip(range(3))
+ 8 | zip("a", "b")
+ 9 | zip("a", "b", *zip("c"))
+   |                ^^^^^^^^ B905
+10 | zip(zip("a"), strict=False)
+11 | zip(zip("a", strict=True))
+   |
 
-B905.py:5:5: B905 `zip()` without an explicit `strict=` parameter
-  |
-5 | zip("a", "b")
-6 | zip("a", "b", *zip("c"))
-7 | zip(zip("a"), strict=False)
-  |     ^^^^^^^^ B905
-8 | zip(zip("a", strict=True))
-  |
+B905.py:8:5: B905 `zip()` without an explicit `strict=` parameter
+   |
+ 8 | zip("a", "b")
+ 9 | zip("a", "b", *zip("c"))
+10 | zip(zip("a"), strict=False)
+   |     ^^^^^^^^ B905
+11 | zip(zip("a", strict=True))
+   |
 
-B905.py:6:1: B905 `zip()` without an explicit `strict=` parameter
+B905.py:9:1: B905 `zip()` without an explicit `strict=` parameter
    |
- 6 | zip("a", "b", *zip("c"))
- 7 | zip(zip("a"), strict=False)
- 8 | zip(zip("a", strict=True))
+ 9 | zip("a", "b", *zip("c"))
+10 | zip(zip("a"), strict=False)
+11 | zip(zip("a", strict=True))
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^ B905
- 9 | 
-10 | zip(range(3), strict=True)
+12 | 
+13 | # OK
+   |
+
+B905.py:24:1: B905 `zip()` without an explicit `strict=` parameter
+   |
+24 | # Errors (limited iterators).
+25 | zip([1, 2, 3], repeat(1, 1))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B905
+26 | zip([1, 2, 3], repeat(1, times=4))
+   |
+
+B905.py:25:1: B905 `zip()` without an explicit `strict=` parameter
+   |
+25 | # Errors (limited iterators).
+26 | zip([1, 2, 3], repeat(1, 1))
+27 | zip([1, 2, 3], repeat(1, times=4))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B905
    |
 
 
diff --git a/crates/ruff/src/rules/flake8_builtins/helpers.rs b/crates/ruff/src/rules/flake8_builtins/helpers.rs
new file mode 100644
index 0000000000000..1f1eb0f3baffd
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_builtins/helpers.rs
@@ -0,0 +1,45 @@
+use rustpython_parser::ast::{Excepthandler, Expr, Ranged, Stmt};
+
+use ruff_python_ast::helpers::identifier_range;
+use ruff_python_ast::source_code::Locator;
+use ruff_python_stdlib::builtins::BUILTINS;
+use ruff_text_size::TextRange;
+
+pub(super) fn shadows_builtin(name: &str, ignorelist: &[String]) -> bool {
+    BUILTINS.contains(&name) && ignorelist.iter().all(|ignore| ignore != name)
+}
+
+#[derive(Debug, Copy, Clone, PartialEq)]
+pub(crate) enum AnyShadowing<'a> {
+    Expression(&'a Expr),
+    Statement(&'a Stmt),
+    ExceptHandler(&'a Excepthandler),
+}
+
+impl AnyShadowing<'_> {
+    pub(crate) fn range(self, locator: &Locator) -> TextRange {
+        match self {
+            AnyShadowing::Expression(expr) => expr.range(),
+            AnyShadowing::Statement(stmt) => identifier_range(stmt, locator),
+            AnyShadowing::ExceptHandler(handler) => handler.range(),
+        }
+    }
+}
+
+impl<'a> From<&'a Stmt> for AnyShadowing<'a> {
+    fn from(value: &'a Stmt) -> Self {
+        AnyShadowing::Statement(value)
+    }
+}
+
+impl<'a> From<&'a Expr> for AnyShadowing<'a> {
+    fn from(value: &'a Expr) -> Self {
+        AnyShadowing::Expression(value)
+    }
+}
+
+impl<'a> From<&'a Excepthandler> for AnyShadowing<'a> {
+    fn from(value: &'a Excepthandler) -> Self {
+        AnyShadowing::ExceptHandler(value)
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_builtins/mod.rs b/crates/ruff/src/rules/flake8_builtins/mod.rs
index c05849db95473..9321db78d7654 100644
--- a/crates/ruff/src/rules/flake8_builtins/mod.rs
+++ b/crates/ruff/src/rules/flake8_builtins/mod.rs
@@ -1,24 +1,23 @@
 //! Rules from [flake8-builtins](https://pypi.org/project/flake8-builtins/).
+pub(crate) mod helpers;
 pub(crate) mod rules;
 pub mod settings;
-pub(crate) mod types;
 
 #[cfg(test)]
 mod tests {
     use std::path::Path;
 
-    use crate::assert_messages;
     use anyhow::Result;
-
     use test_case::test_case;
 
+    use crate::assert_messages;
     use crate::registry::Rule;
     use crate::settings::Settings;
     use crate::test::test_path;
 
-    #[test_case(Rule::BuiltinVariableShadowing, Path::new("A001.py"); "A001")]
-    #[test_case(Rule::BuiltinArgumentShadowing, Path::new("A002.py"); "A002")]
-    #[test_case(Rule::BuiltinAttributeShadowing, Path::new("A003.py"); "A003")]
+    #[test_case(Rule::BuiltinVariableShadowing, Path::new("A001.py"))]
+    #[test_case(Rule::BuiltinArgumentShadowing, Path::new("A002.py"))]
+    #[test_case(Rule::BuiltinAttributeShadowing, Path::new("A003.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
@@ -29,9 +28,9 @@ mod tests {
         Ok(())
     }
 
-    #[test_case(Rule::BuiltinVariableShadowing, Path::new("A001.py"); "A001")]
-    #[test_case(Rule::BuiltinArgumentShadowing, Path::new("A002.py"); "A002")]
-    #[test_case(Rule::BuiltinAttributeShadowing, Path::new("A003.py"); "A003")]
+    #[test_case(Rule::BuiltinVariableShadowing, Path::new("A001.py"))]
+    #[test_case(Rule::BuiltinArgumentShadowing, Path::new("A002.py"))]
+    #[test_case(Rule::BuiltinAttributeShadowing, Path::new("A003.py"))]
     fn builtins_ignorelist(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!(
             "{}_{}_builtins_ignorelist",
diff --git a/crates/ruff/src/rules/flake8_builtins/rules.rs b/crates/ruff/src/rules/flake8_builtins/rules.rs
deleted file mode 100644
index 9c87506e808d5..0000000000000
--- a/crates/ruff/src/rules/flake8_builtins/rules.rs
+++ /dev/null
@@ -1,198 +0,0 @@
-use rustpython_parser::ast::Located;
-
-use ruff_diagnostics::Violation;
-use ruff_diagnostics::{Diagnostic, DiagnosticKind};
-use ruff_macros::{derive_message_formats, violation};
-use ruff_python_stdlib::builtins::BUILTINS;
-
-use super::types::ShadowingType;
-
-/// ## What it does
-/// Checks for variable (and function) assignments that use the same name
-/// as a builtin.
-///
-/// ## Why is this bad?
-/// Reusing a builtin name for the name of a variable increases the
-/// difficulty of reading and maintaining the code, and can cause
-/// non-obvious errors, as readers may mistake the variable for the
-/// builtin and vice versa.
-///
-/// Builtins can be marked as exceptions to this rule via the
-/// [`flake8-builtins.builtins-ignorelist`] configuration option.
-///
-/// ## Options
-///
-/// - `flake8-builtins.builtins-ignorelist`
-///
-/// ## Example
-/// ```python
-/// def find_max(list_of_lists):
-///     max = 0
-///     for flat_list in list_of_lists:
-///         for value in flat_list:
-///             max = max(max, value)  # TypeError: 'int' object is not callable
-///     return max
-/// ```
-///
-/// Use instead:
-/// ```python
-/// def find_max(list_of_lists):
-///     result = 0
-///     for flat_list in list_of_lists:
-///         for value in flat_list:
-///             result = max(result, value)
-///     return result
-/// ```
-///
-/// - [_Why is it a bad idea to name a variable `id` in Python?_](https://stackoverflow.com/questions/77552/id-is-a-bad-variable-name-in-python)
-#[violation]
-pub struct BuiltinVariableShadowing {
-    pub name: String,
-}
-
-impl Violation for BuiltinVariableShadowing {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        let BuiltinVariableShadowing { name } = self;
-        format!("Variable `{name}` is shadowing a python builtin")
-    }
-}
-
-/// ## What it does
-/// Checks for any function arguments that use the same name as a builtin.
-///
-/// ## Why is this bad?
-/// Reusing a builtin name for the name of an argument increases the
-/// difficulty of reading and maintaining the code, and can cause
-/// non-obvious errors, as readers may mistake the argument for the
-/// builtin and vice versa.
-///
-/// Builtins can be marked as exceptions to this rule via the
-/// [`flake8-builtins.builtins-ignorelist`] configuration option.
-///
-/// ## Options
-///
-/// - `flake8-builtins.builtins-ignorelist`
-///
-/// ## Example
-/// ```python
-/// def remove_duplicates(list, list2):
-///     result = set()
-///     for value in list:
-///         result.add(value)
-///     for value in list2:
-///         result.add(value)
-///     return list(result)  # TypeError: 'list' object is not callable
-/// ```
-///
-/// Use instead:
-/// ```python
-/// def remove_duplicates(list1, list2):
-///     result = set()
-///     for value in list1:
-///         result.add(value)
-///     for value in list2:
-///         result.add(value)
-///     return list(result)
-/// ```
-///
-/// ## References
-/// - [_Is it bad practice to use a built-in function name as an attribute or method identifier?_](https://stackoverflow.com/questions/9109333/is-it-bad-practice-to-use-a-built-in-function-name-as-an-attribute-or-method-ide)
-/// - [_Why is it a bad idea to name a variable `id` in Python?_](https://stackoverflow.com/questions/77552/id-is-a-bad-variable-name-in-python)
-#[violation]
-pub struct BuiltinArgumentShadowing {
-    pub name: String,
-}
-
-impl Violation for BuiltinArgumentShadowing {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        let BuiltinArgumentShadowing { name } = self;
-        format!("Argument `{name}` is shadowing a python builtin")
-    }
-}
-
-/// ## What it does
-/// Checks for any class attributes that use the same name as a builtin.
-///
-/// ## Why is this bad?
-/// Reusing a builtin name for the name of an attribute increases the
-/// difficulty of reading and maintaining the code, and can cause
-/// non-obvious errors, as readers may mistake the attribute for the
-/// builtin and vice versa.
-///
-/// Builtins can be marked as exceptions to this rule via the
-/// [`flake8-builtins.builtins-ignorelist`] configuration option, or
-/// converted to the appropriate dunder method.
-///
-/// ## Options
-///
-/// - `flake8-builtins.builtins-ignorelist`
-///
-/// ## Example
-/// ```python
-/// class Shadow:
-///     def int():
-///         return 0
-/// ```
-///
-/// Use instead:
-/// ```python
-/// class Shadow:
-///     def to_int():
-///         return 0
-/// ```
-///
-/// Or:
-/// ```python
-/// class Shadow:
-///     # Callable as `int(shadow)`
-///     def __int__():
-///         return 0
-/// ```
-///
-/// ## References
-/// - [_Is it bad practice to use a built-in function name as an attribute or method identifier?_](https://stackoverflow.com/questions/9109333/is-it-bad-practice-to-use-a-built-in-function-name-as-an-attribute-or-method-ide)
-/// - [_Why is it a bad idea to name a variable `id` in Python?_](https://stackoverflow.com/questions/77552/id-is-a-bad-variable-name-in-python)
-#[violation]
-pub struct BuiltinAttributeShadowing {
-    pub name: String,
-}
-
-impl Violation for BuiltinAttributeShadowing {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        let BuiltinAttributeShadowing { name } = self;
-        format!("Class attribute `{name}` is shadowing a python builtin")
-    }
-}
-
-/// Check builtin name shadowing.
-pub fn builtin_shadowing<T>(
-    name: &str,
-    located: &Located<T>,
-    node_type: ShadowingType,
-    ignorelist: &[String],
-) -> Option<Diagnostic> {
-    if BUILTINS.contains(&name) && !ignorelist.contains(&name.to_string()) {
-        Some(Diagnostic::new::<DiagnosticKind>(
-            match node_type {
-                ShadowingType::Variable => BuiltinVariableShadowing {
-                    name: name.to_string(),
-                }
-                .into(),
-                ShadowingType::Argument => BuiltinArgumentShadowing {
-                    name: name.to_string(),
-                }
-                .into(),
-                ShadowingType::Attribute => BuiltinAttributeShadowing {
-                    name: name.to_string(),
-                }
-                .into(),
-            },
-            located.range(),
-        ))
-    } else {
-        None
-    }
-}
diff --git a/crates/ruff/src/rules/flake8_builtins/rules/builtin_argument_shadowing.rs b/crates/ruff/src/rules/flake8_builtins/rules/builtin_argument_shadowing.rs
new file mode 100644
index 0000000000000..e6aea40d3d1ec
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_builtins/rules/builtin_argument_shadowing.rs
@@ -0,0 +1,78 @@
+use rustpython_parser::ast::{Arg, Ranged};
+
+use ruff_diagnostics::Diagnostic;
+use ruff_diagnostics::Violation;
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+use super::super::helpers::shadows_builtin;
+
+/// ## What it does
+/// Checks for any function arguments that use the same name as a builtin.
+///
+/// ## Why is this bad?
+/// Reusing a builtin name for the name of an argument increases the
+/// difficulty of reading and maintaining the code, and can cause
+/// non-obvious errors, as readers may mistake the argument for the
+/// builtin and vice versa.
+///
+/// Builtins can be marked as exceptions to this rule via the
+/// [`flake8-builtins.builtins-ignorelist`] configuration option.
+///
+/// ## Options
+///
+/// - `flake8-builtins.builtins-ignorelist`
+///
+/// ## Example
+/// ```python
+/// def remove_duplicates(list, list2):
+///     result = set()
+///     for value in list:
+///         result.add(value)
+///     for value in list2:
+///         result.add(value)
+///     return list(result)  # TypeError: 'list' object is not callable
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def remove_duplicates(list1, list2):
+///     result = set()
+///     for value in list1:
+///         result.add(value)
+///     for value in list2:
+///         result.add(value)
+///     return list(result)
+/// ```
+///
+/// ## References
+/// - [_Is it bad practice to use a built-in function name as an attribute or method identifier?_](https://stackoverflow.com/questions/9109333/is-it-bad-practice-to-use-a-built-in-function-name-as-an-attribute-or-method-ide)
+/// - [_Why is it a bad idea to name a variable `id` in Python?_](https://stackoverflow.com/questions/77552/id-is-a-bad-variable-name-in-python)
+#[violation]
+pub struct BuiltinArgumentShadowing {
+    name: String,
+}
+
+impl Violation for BuiltinArgumentShadowing {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let BuiltinArgumentShadowing { name } = self;
+        format!("Argument `{name}` is shadowing a Python builtin")
+    }
+}
+
+/// A002
+pub(crate) fn builtin_argument_shadowing(checker: &mut Checker, argument: &Arg) {
+    if shadows_builtin(
+        argument.arg.as_str(),
+        &checker.settings.flake8_builtins.builtins_ignorelist,
+    ) {
+        checker.diagnostics.push(Diagnostic::new(
+            BuiltinArgumentShadowing {
+                name: argument.arg.to_string(),
+            },
+            argument.range(),
+        ));
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_builtins/rules/builtin_attribute_shadowing.rs b/crates/ruff/src/rules/flake8_builtins/rules/builtin_attribute_shadowing.rs
new file mode 100644
index 0000000000000..701fa4edd3c93
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_builtins/rules/builtin_attribute_shadowing.rs
@@ -0,0 +1,78 @@
+use ruff_diagnostics::Diagnostic;
+use ruff_diagnostics::Violation;
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+use super::super::helpers::{shadows_builtin, AnyShadowing};
+
+/// ## What it does
+/// Checks for any class attributes that use the same name as a builtin.
+///
+/// ## Why is this bad?
+/// Reusing a builtin name for the name of an attribute increases the
+/// difficulty of reading and maintaining the code, and can cause
+/// non-obvious errors, as readers may mistake the attribute for the
+/// builtin and vice versa.
+///
+/// Builtins can be marked as exceptions to this rule via the
+/// [`flake8-builtins.builtins-ignorelist`] configuration option, or
+/// converted to the appropriate dunder method.
+///
+/// ## Options
+///
+/// - `flake8-builtins.builtins-ignorelist`
+///
+/// ## Example
+/// ```python
+/// class Shadow:
+///     def int():
+///         return 0
+/// ```
+///
+/// Use instead:
+/// ```python
+/// class Shadow:
+///     def to_int():
+///         return 0
+/// ```
+///
+/// Or:
+/// ```python
+/// class Shadow:
+///     # Callable as `int(shadow)`
+///     def __int__():
+///         return 0
+/// ```
+///
+/// ## References
+/// - [_Is it bad practice to use a built-in function name as an attribute or method identifier?_](https://stackoverflow.com/questions/9109333/is-it-bad-practice-to-use-a-built-in-function-name-as-an-attribute-or-method-ide)
+/// - [_Why is it a bad idea to name a variable `id` in Python?_](https://stackoverflow.com/questions/77552/id-is-a-bad-variable-name-in-python)
+#[violation]
+pub struct BuiltinAttributeShadowing {
+    name: String,
+}
+
+impl Violation for BuiltinAttributeShadowing {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let BuiltinAttributeShadowing { name } = self;
+        format!("Class attribute `{name}` is shadowing a Python builtin")
+    }
+}
+
+/// A003
+pub(crate) fn builtin_attribute_shadowing(
+    checker: &mut Checker,
+    name: &str,
+    shadowing: AnyShadowing,
+) {
+    if shadows_builtin(name, &checker.settings.flake8_builtins.builtins_ignorelist) {
+        checker.diagnostics.push(Diagnostic::new(
+            BuiltinAttributeShadowing {
+                name: name.to_string(),
+            },
+            shadowing.range(checker.locator),
+        ));
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_builtins/rules/builtin_variable_shadowing.rs b/crates/ruff/src/rules/flake8_builtins/rules/builtin_variable_shadowing.rs
new file mode 100644
index 0000000000000..a965af53cafb1
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_builtins/rules/builtin_variable_shadowing.rs
@@ -0,0 +1,74 @@
+use ruff_diagnostics::Diagnostic;
+use ruff_diagnostics::Violation;
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+use super::super::helpers::{shadows_builtin, AnyShadowing};
+
+/// ## What it does
+/// Checks for variable (and function) assignments that use the same name
+/// as a builtin.
+///
+/// ## Why is this bad?
+/// Reusing a builtin name for the name of a variable increases the
+/// difficulty of reading and maintaining the code, and can cause
+/// non-obvious errors, as readers may mistake the variable for the
+/// builtin and vice versa.
+///
+/// Builtins can be marked as exceptions to this rule via the
+/// [`flake8-builtins.builtins-ignorelist`] configuration option.
+///
+/// ## Options
+///
+/// - `flake8-builtins.builtins-ignorelist`
+///
+/// ## Example
+/// ```python
+/// def find_max(list_of_lists):
+///     max = 0
+///     for flat_list in list_of_lists:
+///         for value in flat_list:
+///             max = max(max, value)  # TypeError: 'int' object is not callable
+///     return max
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def find_max(list_of_lists):
+///     result = 0
+///     for flat_list in list_of_lists:
+///         for value in flat_list:
+///             result = max(result, value)
+///     return result
+/// ```
+///
+/// - [_Why is it a bad idea to name a variable `id` in Python?_](https://stackoverflow.com/questions/77552/id-is-a-bad-variable-name-in-python)
+#[violation]
+pub struct BuiltinVariableShadowing {
+    name: String,
+}
+
+impl Violation for BuiltinVariableShadowing {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let BuiltinVariableShadowing { name } = self;
+        format!("Variable `{name}` is shadowing a Python builtin")
+    }
+}
+
+/// A001
+pub(crate) fn builtin_variable_shadowing(
+    checker: &mut Checker,
+    name: &str,
+    shadowing: AnyShadowing,
+) {
+    if shadows_builtin(name, &checker.settings.flake8_builtins.builtins_ignorelist) {
+        checker.diagnostics.push(Diagnostic::new(
+            BuiltinVariableShadowing {
+                name: name.to_string(),
+            },
+            shadowing.range(checker.locator),
+        ));
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_builtins/rules/mod.rs b/crates/ruff/src/rules/flake8_builtins/rules/mod.rs
new file mode 100644
index 0000000000000..f9b8c3c3d7d48
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_builtins/rules/mod.rs
@@ -0,0 +1,9 @@
+pub(crate) use builtin_argument_shadowing::{builtin_argument_shadowing, BuiltinArgumentShadowing};
+pub(crate) use builtin_attribute_shadowing::{
+    builtin_attribute_shadowing, BuiltinAttributeShadowing,
+};
+pub(crate) use builtin_variable_shadowing::{builtin_variable_shadowing, BuiltinVariableShadowing};
+
+mod builtin_argument_shadowing;
+mod builtin_attribute_shadowing;
+mod builtin_variable_shadowing;
diff --git a/crates/ruff/src/rules/flake8_builtins/rules/rules.rs b/crates/ruff/src/rules/flake8_builtins/rules/rules.rs
new file mode 100644
index 0000000000000..8b137891791fe
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_builtins/rules/rules.rs
@@ -0,0 +1 @@
+
diff --git a/crates/ruff/src/rules/flake8_builtins/settings.rs b/crates/ruff/src/rules/flake8_builtins/settings.rs
index f5d53cbdc8122..2a512626b9d90 100644
--- a/crates/ruff/src/rules/flake8_builtins/settings.rs
+++ b/crates/ruff/src/rules/flake8_builtins/settings.rs
@@ -1,18 +1,18 @@
 //! Settings for the `flake8-builtins` plugin.
 
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::{CacheKey, ConfigurationOptions};
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
 
 #[derive(
-    Debug, PartialEq, Eq, Default, Serialize, Deserialize, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Default, Serialize, Deserialize, ConfigurationOptions, CombineOptions,
 )]
 #[serde(
     deny_unknown_fields,
     rename_all = "kebab-case",
     rename = "Flake8BuiltinsOptions"
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = r#"[]"#,
diff --git a/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A001_A001.py.snap b/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A001_A001.py.snap
index 41016ae017733..d65e5fa47670a 100644
--- a/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A001_A001.py.snap
+++ b/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A001_A001.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_builtins/mod.rs
 ---
-A001.py:1:1: A001 Variable `sum` is shadowing a python builtin
+A001.py:1:1: A001 Variable `sum` is shadowing a Python builtin
   |
 1 | import some as sum
   | ^^^^^^^^^^^^^^^^^^ A001
@@ -9,7 +9,7 @@ A001.py:1:1: A001 Variable `sum` is shadowing a python builtin
 3 | from directory import new as dir
   |
 
-A001.py:2:1: A001 Variable `int` is shadowing a python builtin
+A001.py:2:1: A001 Variable `int` is shadowing a Python builtin
   |
 2 | import some as sum
 3 | from some import other as int
@@ -17,7 +17,7 @@ A001.py:2:1: A001 Variable `int` is shadowing a python builtin
 4 | from directory import new as dir
   |
 
-A001.py:3:1: A001 Variable `dir` is shadowing a python builtin
+A001.py:3:1: A001 Variable `dir` is shadowing a Python builtin
   |
 3 | import some as sum
 4 | from some import other as int
@@ -27,7 +27,7 @@ A001.py:3:1: A001 Variable `dir` is shadowing a python builtin
 7 | print = 1
   |
 
-A001.py:5:1: A001 Variable `print` is shadowing a python builtin
+A001.py:5:1: A001 Variable `print` is shadowing a Python builtin
   |
 5 | from directory import new as dir
 6 | 
@@ -37,7 +37,7 @@ A001.py:5:1: A001 Variable `print` is shadowing a python builtin
 9 | (complex := 3)
   |
 
-A001.py:6:1: A001 Variable `copyright` is shadowing a python builtin
+A001.py:6:1: A001 Variable `copyright` is shadowing a Python builtin
   |
 6 | print = 1
 7 | copyright: 'annotation' = 2
@@ -46,7 +46,7 @@ A001.py:6:1: A001 Variable `copyright` is shadowing a python builtin
 9 | float = object = 4
   |
 
-A001.py:7:2: A001 Variable `complex` is shadowing a python builtin
+A001.py:7:2: A001 Variable `complex` is shadowing a Python builtin
    |
  7 | print = 1
  8 | copyright: 'annotation' = 2
@@ -56,7 +56,7 @@ A001.py:7:2: A001 Variable `complex` is shadowing a python builtin
 11 | min, max = 5, 6
    |
 
-A001.py:8:1: A001 Variable `float` is shadowing a python builtin
+A001.py:8:1: A001 Variable `float` is shadowing a Python builtin
    |
  8 | copyright: 'annotation' = 2
  9 | (complex := 3)
@@ -65,7 +65,7 @@ A001.py:8:1: A001 Variable `float` is shadowing a python builtin
 11 | min, max = 5, 6
    |
 
-A001.py:8:9: A001 Variable `object` is shadowing a python builtin
+A001.py:8:9: A001 Variable `object` is shadowing a Python builtin
    |
  8 | copyright: 'annotation' = 2
  9 | (complex := 3)
@@ -74,7 +74,7 @@ A001.py:8:9: A001 Variable `object` is shadowing a python builtin
 11 | min, max = 5, 6
    |
 
-A001.py:9:1: A001 Variable `min` is shadowing a python builtin
+A001.py:9:1: A001 Variable `min` is shadowing a Python builtin
    |
  9 | (complex := 3)
 10 | float = object = 4
@@ -84,7 +84,7 @@ A001.py:9:1: A001 Variable `min` is shadowing a python builtin
 13 | id = 4
    |
 
-A001.py:9:6: A001 Variable `max` is shadowing a python builtin
+A001.py:9:6: A001 Variable `max` is shadowing a Python builtin
    |
  9 | (complex := 3)
 10 | float = object = 4
@@ -94,7 +94,7 @@ A001.py:9:6: A001 Variable `max` is shadowing a python builtin
 13 | id = 4
    |
 
-A001.py:11:1: A001 Variable `id` is shadowing a python builtin
+A001.py:11:1: A001 Variable `id` is shadowing a Python builtin
    |
 11 | min, max = 5, 6
 12 | 
@@ -104,29 +104,25 @@ A001.py:11:1: A001 Variable `id` is shadowing a python builtin
 15 | def bytes():
    |
 
-A001.py:13:1: A001 Variable `bytes` is shadowing a python builtin
+A001.py:13:5: A001 Variable `bytes` is shadowing a Python builtin
    |
-13 |   id = 4
-14 |   
-15 | / def bytes():
-16 | |     pass
-   | |________^ A001
-17 |   
-18 |   class slice:
+13 | id = 4
+14 | 
+15 | def bytes():
+   |     ^^^^^ A001
+16 |     pass
    |
 
-A001.py:16:1: A001 Variable `slice` is shadowing a python builtin
+A001.py:16:7: A001 Variable `slice` is shadowing a Python builtin
    |
-16 |       pass
-17 |   
-18 | / class slice:
-19 | |     pass
-   | |________^ A001
-20 |   
-21 |   try:
+16 |     pass
+17 | 
+18 | class slice:
+   |       ^^^^^ A001
+19 |     pass
    |
 
-A001.py:21:1: A001 Variable `ValueError` is shadowing a python builtin
+A001.py:21:1: A001 Variable `ValueError` is shadowing a Python builtin
    |
 21 |   try:
 22 |       ...
@@ -137,7 +133,7 @@ A001.py:21:1: A001 Variable `ValueError` is shadowing a python builtin
 26 |   for memoryview, *bytearray in []:
    |
 
-A001.py:24:5: A001 Variable `memoryview` is shadowing a python builtin
+A001.py:24:5: A001 Variable `memoryview` is shadowing a Python builtin
    |
 24 |     ...
 25 | 
@@ -146,7 +142,7 @@ A001.py:24:5: A001 Variable `memoryview` is shadowing a python builtin
 27 |     pass
    |
 
-A001.py:24:18: A001 Variable `bytearray` is shadowing a python builtin
+A001.py:24:18: A001 Variable `bytearray` is shadowing a Python builtin
    |
 24 |     ...
 25 | 
@@ -155,7 +151,7 @@ A001.py:24:18: A001 Variable `bytearray` is shadowing a python builtin
 27 |     pass
    |
 
-A001.py:27:22: A001 Variable `str` is shadowing a python builtin
+A001.py:27:22: A001 Variable `str` is shadowing a Python builtin
    |
 27 |     pass
 28 | 
@@ -164,7 +160,7 @@ A001.py:27:22: A001 Variable `str` is shadowing a python builtin
 30 |     pass
    |
 
-A001.py:27:45: A001 Variable `all` is shadowing a python builtin
+A001.py:27:45: A001 Variable `all` is shadowing a Python builtin
    |
 27 |     pass
 28 | 
@@ -173,7 +169,7 @@ A001.py:27:45: A001 Variable `all` is shadowing a python builtin
 30 |     pass
    |
 
-A001.py:27:50: A001 Variable `any` is shadowing a python builtin
+A001.py:27:50: A001 Variable `any` is shadowing a Python builtin
    |
 27 |     pass
 28 | 
@@ -182,7 +178,7 @@ A001.py:27:50: A001 Variable `any` is shadowing a python builtin
 30 |     pass
    |
 
-A001.py:30:8: A001 Variable `sum` is shadowing a python builtin
+A001.py:30:8: A001 Variable `sum` is shadowing a Python builtin
    |
 30 |     pass
 31 | 
diff --git a/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A001_A001.py_builtins_ignorelist.snap b/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A001_A001.py_builtins_ignorelist.snap
index ad582d411fb52..a709ce3c92a35 100644
--- a/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A001_A001.py_builtins_ignorelist.snap
+++ b/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A001_A001.py_builtins_ignorelist.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_builtins/mod.rs
 ---
-A001.py:1:1: A001 Variable `sum` is shadowing a python builtin
+A001.py:1:1: A001 Variable `sum` is shadowing a Python builtin
   |
 1 | import some as sum
   | ^^^^^^^^^^^^^^^^^^ A001
@@ -9,7 +9,7 @@ A001.py:1:1: A001 Variable `sum` is shadowing a python builtin
 3 | from directory import new as dir
   |
 
-A001.py:2:1: A001 Variable `int` is shadowing a python builtin
+A001.py:2:1: A001 Variable `int` is shadowing a Python builtin
   |
 2 | import some as sum
 3 | from some import other as int
@@ -17,7 +17,7 @@ A001.py:2:1: A001 Variable `int` is shadowing a python builtin
 4 | from directory import new as dir
   |
 
-A001.py:5:1: A001 Variable `print` is shadowing a python builtin
+A001.py:5:1: A001 Variable `print` is shadowing a Python builtin
   |
 5 | from directory import new as dir
 6 | 
@@ -27,7 +27,7 @@ A001.py:5:1: A001 Variable `print` is shadowing a python builtin
 9 | (complex := 3)
   |
 
-A001.py:6:1: A001 Variable `copyright` is shadowing a python builtin
+A001.py:6:1: A001 Variable `copyright` is shadowing a Python builtin
   |
 6 | print = 1
 7 | copyright: 'annotation' = 2
@@ -36,7 +36,7 @@ A001.py:6:1: A001 Variable `copyright` is shadowing a python builtin
 9 | float = object = 4
   |
 
-A001.py:7:2: A001 Variable `complex` is shadowing a python builtin
+A001.py:7:2: A001 Variable `complex` is shadowing a Python builtin
    |
  7 | print = 1
  8 | copyright: 'annotation' = 2
@@ -46,7 +46,7 @@ A001.py:7:2: A001 Variable `complex` is shadowing a python builtin
 11 | min, max = 5, 6
    |
 
-A001.py:8:1: A001 Variable `float` is shadowing a python builtin
+A001.py:8:1: A001 Variable `float` is shadowing a Python builtin
    |
  8 | copyright: 'annotation' = 2
  9 | (complex := 3)
@@ -55,7 +55,7 @@ A001.py:8:1: A001 Variable `float` is shadowing a python builtin
 11 | min, max = 5, 6
    |
 
-A001.py:8:9: A001 Variable `object` is shadowing a python builtin
+A001.py:8:9: A001 Variable `object` is shadowing a Python builtin
    |
  8 | copyright: 'annotation' = 2
  9 | (complex := 3)
@@ -64,7 +64,7 @@ A001.py:8:9: A001 Variable `object` is shadowing a python builtin
 11 | min, max = 5, 6
    |
 
-A001.py:9:1: A001 Variable `min` is shadowing a python builtin
+A001.py:9:1: A001 Variable `min` is shadowing a Python builtin
    |
  9 | (complex := 3)
 10 | float = object = 4
@@ -74,7 +74,7 @@ A001.py:9:1: A001 Variable `min` is shadowing a python builtin
 13 | id = 4
    |
 
-A001.py:9:6: A001 Variable `max` is shadowing a python builtin
+A001.py:9:6: A001 Variable `max` is shadowing a Python builtin
    |
  9 | (complex := 3)
 10 | float = object = 4
@@ -84,29 +84,25 @@ A001.py:9:6: A001 Variable `max` is shadowing a python builtin
 13 | id = 4
    |
 
-A001.py:13:1: A001 Variable `bytes` is shadowing a python builtin
+A001.py:13:5: A001 Variable `bytes` is shadowing a Python builtin
    |
-13 |   id = 4
-14 |   
-15 | / def bytes():
-16 | |     pass
-   | |________^ A001
-17 |   
-18 |   class slice:
+13 | id = 4
+14 | 
+15 | def bytes():
+   |     ^^^^^ A001
+16 |     pass
    |
 
-A001.py:16:1: A001 Variable `slice` is shadowing a python builtin
+A001.py:16:7: A001 Variable `slice` is shadowing a Python builtin
    |
-16 |       pass
-17 |   
-18 | / class slice:
-19 | |     pass
-   | |________^ A001
-20 |   
-21 |   try:
+16 |     pass
+17 | 
+18 | class slice:
+   |       ^^^^^ A001
+19 |     pass
    |
 
-A001.py:21:1: A001 Variable `ValueError` is shadowing a python builtin
+A001.py:21:1: A001 Variable `ValueError` is shadowing a Python builtin
    |
 21 |   try:
 22 |       ...
@@ -117,7 +113,7 @@ A001.py:21:1: A001 Variable `ValueError` is shadowing a python builtin
 26 |   for memoryview, *bytearray in []:
    |
 
-A001.py:24:5: A001 Variable `memoryview` is shadowing a python builtin
+A001.py:24:5: A001 Variable `memoryview` is shadowing a Python builtin
    |
 24 |     ...
 25 | 
@@ -126,7 +122,7 @@ A001.py:24:5: A001 Variable `memoryview` is shadowing a python builtin
 27 |     pass
    |
 
-A001.py:24:18: A001 Variable `bytearray` is shadowing a python builtin
+A001.py:24:18: A001 Variable `bytearray` is shadowing a Python builtin
    |
 24 |     ...
 25 | 
@@ -135,7 +131,7 @@ A001.py:24:18: A001 Variable `bytearray` is shadowing a python builtin
 27 |     pass
    |
 
-A001.py:27:22: A001 Variable `str` is shadowing a python builtin
+A001.py:27:22: A001 Variable `str` is shadowing a Python builtin
    |
 27 |     pass
 28 | 
@@ -144,7 +140,7 @@ A001.py:27:22: A001 Variable `str` is shadowing a python builtin
 30 |     pass
    |
 
-A001.py:27:45: A001 Variable `all` is shadowing a python builtin
+A001.py:27:45: A001 Variable `all` is shadowing a Python builtin
    |
 27 |     pass
 28 | 
@@ -153,7 +149,7 @@ A001.py:27:45: A001 Variable `all` is shadowing a python builtin
 30 |     pass
    |
 
-A001.py:27:50: A001 Variable `any` is shadowing a python builtin
+A001.py:27:50: A001 Variable `any` is shadowing a Python builtin
    |
 27 |     pass
 28 | 
@@ -162,7 +158,7 @@ A001.py:27:50: A001 Variable `any` is shadowing a python builtin
 30 |     pass
    |
 
-A001.py:30:8: A001 Variable `sum` is shadowing a python builtin
+A001.py:30:8: A001 Variable `sum` is shadowing a Python builtin
    |
 30 |     pass
 31 | 
diff --git a/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A002_A002.py.snap b/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A002_A002.py.snap
index b89b75c589128..5d8e3f3883c2f 100644
--- a/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A002_A002.py.snap
+++ b/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A002_A002.py.snap
@@ -1,49 +1,49 @@
 ---
 source: crates/ruff/src/rules/flake8_builtins/mod.rs
 ---
-A002.py:1:11: A002 Argument `str` is shadowing a python builtin
+A002.py:1:11: A002 Argument `str` is shadowing a Python builtin
   |
 1 | def func1(str, /, type, *complex, Exception, **getattr):
   |           ^^^ A002
 2 |     pass
   |
 
-A002.py:1:19: A002 Argument `type` is shadowing a python builtin
+A002.py:1:19: A002 Argument `type` is shadowing a Python builtin
   |
 1 | def func1(str, /, type, *complex, Exception, **getattr):
   |                   ^^^^ A002
 2 |     pass
   |
 
-A002.py:1:26: A002 Argument `complex` is shadowing a python builtin
+A002.py:1:26: A002 Argument `complex` is shadowing a Python builtin
   |
 1 | def func1(str, /, type, *complex, Exception, **getattr):
   |                          ^^^^^^^ A002
 2 |     pass
   |
 
-A002.py:1:35: A002 Argument `Exception` is shadowing a python builtin
+A002.py:1:35: A002 Argument `Exception` is shadowing a Python builtin
   |
 1 | def func1(str, /, type, *complex, Exception, **getattr):
   |                                   ^^^^^^^^^ A002
 2 |     pass
   |
 
-A002.py:1:48: A002 Argument `getattr` is shadowing a python builtin
+A002.py:1:48: A002 Argument `getattr` is shadowing a Python builtin
   |
 1 | def func1(str, /, type, *complex, Exception, **getattr):
   |                                                ^^^^^^^ A002
 2 |     pass
   |
 
-A002.py:5:17: A002 Argument `bytes` is shadowing a python builtin
+A002.py:5:17: A002 Argument `bytes` is shadowing a Python builtin
   |
 5 | async def func2(bytes):
   |                 ^^^^^ A002
 6 |     pass
   |
 
-A002.py:8:17: A002 Argument `id` is shadowing a python builtin
+A002.py:8:17: A002 Argument `id` is shadowing a Python builtin
    |
  8 |     pass
  9 | 
@@ -52,7 +52,7 @@ A002.py:8:17: A002 Argument `id` is shadowing a python builtin
 11 |     pass
    |
 
-A002.py:8:21: A002 Argument `dir` is shadowing a python builtin
+A002.py:8:21: A002 Argument `dir` is shadowing a Python builtin
    |
  8 |     pass
  9 | 
@@ -61,7 +61,7 @@ A002.py:8:21: A002 Argument `dir` is shadowing a python builtin
 11 |     pass
    |
 
-A002.py:11:16: A002 Argument `float` is shadowing a python builtin
+A002.py:11:16: A002 Argument `float` is shadowing a Python builtin
    |
 11 |     pass
 12 | 
diff --git a/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A002_A002.py_builtins_ignorelist.snap b/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A002_A002.py_builtins_ignorelist.snap
index 6b7bfcd61216f..7522c0f937e5d 100644
--- a/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A002_A002.py_builtins_ignorelist.snap
+++ b/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A002_A002.py_builtins_ignorelist.snap
@@ -1,49 +1,49 @@
 ---
 source: crates/ruff/src/rules/flake8_builtins/mod.rs
 ---
-A002.py:1:11: A002 Argument `str` is shadowing a python builtin
+A002.py:1:11: A002 Argument `str` is shadowing a Python builtin
   |
 1 | def func1(str, /, type, *complex, Exception, **getattr):
   |           ^^^ A002
 2 |     pass
   |
 
-A002.py:1:19: A002 Argument `type` is shadowing a python builtin
+A002.py:1:19: A002 Argument `type` is shadowing a Python builtin
   |
 1 | def func1(str, /, type, *complex, Exception, **getattr):
   |                   ^^^^ A002
 2 |     pass
   |
 
-A002.py:1:26: A002 Argument `complex` is shadowing a python builtin
+A002.py:1:26: A002 Argument `complex` is shadowing a Python builtin
   |
 1 | def func1(str, /, type, *complex, Exception, **getattr):
   |                          ^^^^^^^ A002
 2 |     pass
   |
 
-A002.py:1:35: A002 Argument `Exception` is shadowing a python builtin
+A002.py:1:35: A002 Argument `Exception` is shadowing a Python builtin
   |
 1 | def func1(str, /, type, *complex, Exception, **getattr):
   |                                   ^^^^^^^^^ A002
 2 |     pass
   |
 
-A002.py:1:48: A002 Argument `getattr` is shadowing a python builtin
+A002.py:1:48: A002 Argument `getattr` is shadowing a Python builtin
   |
 1 | def func1(str, /, type, *complex, Exception, **getattr):
   |                                                ^^^^^^^ A002
 2 |     pass
   |
 
-A002.py:5:17: A002 Argument `bytes` is shadowing a python builtin
+A002.py:5:17: A002 Argument `bytes` is shadowing a Python builtin
   |
 5 | async def func2(bytes):
   |                 ^^^^^ A002
 6 |     pass
   |
 
-A002.py:11:16: A002 Argument `float` is shadowing a python builtin
+A002.py:11:16: A002 Argument `float` is shadowing a Python builtin
    |
 11 |     pass
 12 | 
diff --git a/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A003_A003.py.snap b/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A003_A003.py.snap
index e5a2304dc03bb..1513b901fd94f 100644
--- a/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A003_A003.py.snap
+++ b/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A003_A003.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_builtins/mod.rs
 ---
-A003.py:2:5: A003 Class attribute `ImportError` is shadowing a python builtin
+A003.py:2:5: A003 Class attribute `ImportError` is shadowing a Python builtin
   |
 2 | class MyClass:
 3 |     ImportError = 4
@@ -10,7 +10,7 @@ A003.py:2:5: A003 Class attribute `ImportError` is shadowing a python builtin
 5 |     dir = "/"
   |
 
-A003.py:3:5: A003 Class attribute `id` is shadowing a python builtin
+A003.py:3:5: A003 Class attribute `id` is shadowing a Python builtin
   |
 3 | class MyClass:
 4 |     ImportError = 4
@@ -19,7 +19,7 @@ A003.py:3:5: A003 Class attribute `id` is shadowing a python builtin
 6 |     dir = "/"
   |
 
-A003.py:4:5: A003 Class attribute `dir` is shadowing a python builtin
+A003.py:4:5: A003 Class attribute `dir` is shadowing a Python builtin
   |
 4 |     ImportError = 4
 5 |     id = 5
@@ -29,14 +29,13 @@ A003.py:4:5: A003 Class attribute `dir` is shadowing a python builtin
 8 |     def __init__(self):
   |
 
-A003.py:11:5: A003 Class attribute `str` is shadowing a python builtin
+A003.py:11:9: A003 Class attribute `str` is shadowing a Python builtin
    |
-11 |           self.dir = "."
-12 |   
-13 |       def str(self):
-   |  _____^
-14 | |         pass
-   | |____________^ A003
+11 |         self.dir = "."
+12 | 
+13 |     def str(self):
+   |         ^^^ A003
+14 |         pass
    |
 
 
diff --git a/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A003_A003.py_builtins_ignorelist.snap b/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A003_A003.py_builtins_ignorelist.snap
index 3b91a75f929fb..82c08824fcbc8 100644
--- a/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A003_A003.py_builtins_ignorelist.snap
+++ b/crates/ruff/src/rules/flake8_builtins/snapshots/ruff__rules__flake8_builtins__tests__A003_A003.py_builtins_ignorelist.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_builtins/mod.rs
 ---
-A003.py:2:5: A003 Class attribute `ImportError` is shadowing a python builtin
+A003.py:2:5: A003 Class attribute `ImportError` is shadowing a Python builtin
   |
 2 | class MyClass:
 3 |     ImportError = 4
@@ -10,14 +10,13 @@ A003.py:2:5: A003 Class attribute `ImportError` is shadowing a python builtin
 5 |     dir = "/"
   |
 
-A003.py:11:5: A003 Class attribute `str` is shadowing a python builtin
+A003.py:11:9: A003 Class attribute `str` is shadowing a Python builtin
    |
-11 |           self.dir = "."
-12 |   
-13 |       def str(self):
-   |  _____^
-14 | |         pass
-   | |____________^ A003
+11 |         self.dir = "."
+12 | 
+13 |     def str(self):
+   |         ^^^ A003
+14 |         pass
    |
 
 
diff --git a/crates/ruff/src/rules/flake8_builtins/types.rs b/crates/ruff/src/rules/flake8_builtins/types.rs
deleted file mode 100644
index c32aa2599394c..0000000000000
--- a/crates/ruff/src/rules/flake8_builtins/types.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#[derive(Clone, Copy)]
-pub enum ShadowingType {
-    Variable,
-    Argument,
-    Attribute,
-}
diff --git a/crates/ruff/src/rules/flake8_commas/mod.rs b/crates/ruff/src/rules/flake8_commas/mod.rs
index 9736b33f84814..d08f8fc8ee049 100644
--- a/crates/ruff/src/rules/flake8_commas/mod.rs
+++ b/crates/ruff/src/rules/flake8_commas/mod.rs
@@ -6,14 +6,13 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Path::new("COM81.py"); "COM81")]
+    #[test_case(Path::new("COM81.py"))]
     fn rules(path: &Path) -> Result<()> {
         let snapshot = path.to_string_lossy().into_owned();
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_commas/rules/mod.rs b/crates/ruff/src/rules/flake8_commas/rules/mod.rs
new file mode 100644
index 0000000000000..0286278d8c7c9
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_commas/rules/mod.rs
@@ -0,0 +1,5 @@
+pub(crate) use trailing_commas::{
+    trailing_commas, MissingTrailingComma, ProhibitedTrailingComma, TrailingCommaOnBareTuple,
+};
+
+mod trailing_commas;
diff --git a/crates/ruff/src/rules/flake8_commas/rules.rs b/crates/ruff/src/rules/flake8_commas/rules/trailing_commas.rs
similarity index 93%
rename from crates/ruff/src/rules/flake8_commas/rules.rs
rename to crates/ruff/src/rules/flake8_commas/rules/trailing_commas.rs
index 64228455af7fc..eaee333c3ca84 100644
--- a/crates/ruff/src/rules/flake8_commas/rules.rs
+++ b/crates/ruff/src/rules/flake8_commas/rules/trailing_commas.rs
@@ -4,12 +4,12 @@ use rustpython_parser::lexer::{LexResult, Spanned};
 use rustpython_parser::Tok;
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Violation};
-use ruff_diagnostics::{Diagnostic, Edit};
+use ruff_diagnostics::{Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::Locator;
 
 use crate::registry::Rule;
-use crate::settings::{flags, Settings};
+use crate::settings::Settings;
 
 /// Simplified token type.
 #[derive(Copy, Clone, PartialEq, Eq)]
@@ -27,6 +27,7 @@ enum TokenType {
     Def,
     Lambda,
     Colon,
+    String,
 }
 
 /// Simplified token specialized for the task.
@@ -55,6 +56,7 @@ impl<'tok> Token<'tok> {
             // Import treated like a function.
             Tok::Import => TokenType::Named,
             Tok::Name { .. } => TokenType::Named,
+            Tok::String { .. } => TokenType::String,
             Tok::Comma => TokenType::Comma,
             Tok::Lpar => TokenType::OpeningBracket,
             Tok::Lsqb => TokenType::OpeningSquareBracket,
@@ -160,9 +162,7 @@ impl AlwaysAutofixableViolation for MissingTrailingComma {
 /// import json
 ///
 ///
-/// foo = json.dumps({
-///     "bar": 1,
-/// }),
+/// foo = json.dumps({"bar": 1}),
 /// ```
 ///
 /// Use instead:
@@ -170,9 +170,7 @@ impl AlwaysAutofixableViolation for MissingTrailingComma {
 /// import json
 ///
 ///
-/// foo = json.dumps({
-///     "bar": 1,
-/// })
+/// foo = json.dumps({"bar": 1})
 /// ```
 ///
 /// In the event that a tuple is intended, then use instead:
@@ -180,11 +178,7 @@ impl AlwaysAutofixableViolation for MissingTrailingComma {
 /// import json
 ///
 ///
-/// foo = (
-///     json.dumps({
-///         "bar": 1,
-///     }),
-/// )
+/// foo = (json.dumps({"bar": 1}),)
 /// ```
 #[violation]
 pub struct TrailingCommaOnBareTuple;
@@ -227,11 +221,10 @@ impl AlwaysAutofixableViolation for ProhibitedTrailingComma {
 }
 
 /// COM812, COM818, COM819
-pub fn trailing_commas(
+pub(crate) fn trailing_commas(
     tokens: &[LexResult],
     locator: &Locator,
     settings: &Settings,
-    autofix: flags::Autofix,
 ) -> Vec<Diagnostic> {
     let mut diagnostics = vec![];
 
@@ -274,7 +267,7 @@ pub fn trailing_commas(
                 }
             },
             TokenType::OpeningSquareBracket => match prev.type_ {
-                TokenType::ClosingBracket | TokenType::Named => {
+                TokenType::ClosingBracket | TokenType::Named | TokenType::String => {
                     stack.push(Context::new(ContextType::Subscript));
                 }
                 _ => {
@@ -332,8 +325,9 @@ pub fn trailing_commas(
         if comma_prohibited {
             let comma = prev.spanned.unwrap();
             let mut diagnostic = Diagnostic::new(ProhibitedTrailingComma, comma.1);
-            if autofix.into() && settings.rules.should_fix(Rule::ProhibitedTrailingComma) {
-                diagnostic.set_fix(Edit::range_deletion(diagnostic.range()));
+            if settings.rules.should_fix(Rule::ProhibitedTrailingComma) {
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_deletion(diagnostic.range())));
             }
             diagnostics.push(diagnostic);
         }
@@ -367,16 +361,17 @@ pub fn trailing_commas(
                 MissingTrailingComma,
                 TextRange::empty(missing_comma.1.end()),
             );
-            if autofix.into() && settings.rules.should_fix(Rule::MissingTrailingComma) {
+            if settings.rules.should_fix(Rule::MissingTrailingComma) {
                 // Create a replacement that includes the final bracket (or other token),
                 // rather than just inserting a comma at the end. This prevents the UP034 autofix
                 // removing any brackets in the same linter pass - doing both at the same time could
                 // lead to a syntax error.
                 let contents = locator.slice(missing_comma.1);
-                diagnostic.set_fix(Edit::range_replacement(
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
                     format!("{contents},"),
                     missing_comma.1,
-                ));
+                )));
             }
             diagnostics.push(diagnostic);
         }
diff --git a/crates/ruff/src/rules/flake8_commas/snapshots/ruff__rules__flake8_commas__tests__COM81.py.snap b/crates/ruff/src/rules/flake8_commas/snapshots/ruff__rules__flake8_commas__tests__COM81.py.snap
index 0089753e67694..e7b889c36d964 100644
--- a/crates/ruff/src/rules/flake8_commas/snapshots/ruff__rules__flake8_commas__tests__COM81.py.snap
+++ b/crates/ruff/src/rules/flake8_commas/snapshots/ruff__rules__flake8_commas__tests__COM81.py.snap
@@ -936,5 +936,7 @@ COM81.py:632:42: COM812 [*] Trailing comma missing
 632     |-    (i for i in range(10) if i // 2 == 0)  # COM812 fix should include the final bracket
     632 |+    (i for i in range(10) if i // 2 == 0),  # COM812 fix should include the final bracket
 633 633 | )
+634 634 | 
+635 635 | foo = namedtuple(
 
 
diff --git a/crates/ruff/src/rules/flake8_comprehensions/fixes.rs b/crates/ruff/src/rules/flake8_comprehensions/fixes.rs
index 57a0a78ee9ed2..b10156a39ae52 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/fixes.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/fixes.rs
@@ -1,53 +1,38 @@
 use anyhow::{bail, Result};
 use itertools::Itertools;
 use libcst_native::{
-    Arg, AssignEqual, AssignTargetExpression, Call, Codegen, CodegenState, CompFor, Dict, DictComp,
-    DictElement, Element, Expr, Expression, GeneratorExp, LeftCurlyBrace, LeftParen,
-    LeftSquareBracket, List, ListComp, Name, ParenthesizableWhitespace, RightCurlyBrace,
-    RightParen, RightSquareBracket, Set, SetComp, SimpleString, SimpleWhitespace, Tuple,
+    Arg, AssignEqual, AssignTargetExpression, Call, Comment, CompFor, Dict, DictComp, DictElement,
+    Element, EmptyLine, Expression, GeneratorExp, LeftCurlyBrace, LeftParen, LeftSquareBracket,
+    List, ListComp, Name, ParenthesizableWhitespace, ParenthesizedWhitespace, RightCurlyBrace,
+    RightParen, RightSquareBracket, Set, SetComp, SimpleString, SimpleWhitespace,
+    TrailingWhitespace, Tuple,
 };
+use rustpython_parser::ast::Ranged;
 
-use ruff_diagnostics::Edit;
+use crate::autofix::codemods::CodegenStylist;
+use ruff_diagnostics::{Edit, Fix};
 use ruff_python_ast::source_code::{Locator, Stylist};
 
-use crate::cst::matchers::{match_expr, match_module};
-
-fn match_call<'a, 'b>(expr: &'a mut Expr<'b>) -> Result<&'a mut Call<'b>> {
-    if let Expression::Call(call) = &mut expr.value {
-        Ok(call)
-    } else {
-        bail!("Expected Expression::Call")
-    }
-}
-
-fn match_arg<'a, 'b>(call: &'a Call<'b>) -> Result<&'a Arg<'b>> {
-    if let Some(arg) = call.args.first() {
-        Ok(arg)
-    } else {
-        bail!("Expected Arg")
-    }
-}
+use crate::cst::matchers::{
+    match_arg, match_call, match_call_mut, match_expression, match_generator_exp, match_lambda,
+    match_list_comp, match_name, match_tuple,
+};
 
 /// (C400) Convert `list(x for x in y)` to `[x for x in y]`.
-pub fn fix_unnecessary_generator_list(
+pub(crate) fn fix_unnecessary_generator_list(
     locator: &Locator,
     stylist: &Stylist,
     expr: &rustpython_parser::ast::Expr,
 ) -> Result<Edit> {
     // Expr(Call(GeneratorExp)))) -> Expr(ListComp)))
     let module_text = locator.slice(expr.range());
-    let mut tree = match_module(module_text)?;
-    let mut body = match_expr(&mut tree)?;
-    let call = match_call(body)?;
+    let mut tree = match_expression(module_text)?;
+    let call = match_call_mut(&mut tree)?;
     let arg = match_arg(call)?;
 
-    let Expression::GeneratorExp(generator_exp) = &arg.value else {
-        bail!(
-            "Expected Expression::GeneratorExp"
-        );
-    };
+    let generator_exp = match_generator_exp(&arg.value)?;
 
-    body.value = Expression::ListComp(Box::new(ListComp {
+    tree = Expression::ListComp(Box::new(ListComp {
         elt: generator_exp.elt.clone(),
         for_in: generator_exp.for_in.clone(),
         lbracket: LeftSquareBracket {
@@ -60,18 +45,14 @@ pub fn fix_unnecessary_generator_list(
         rpar: generator_exp.rpar.clone(),
     }));
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
-
-    Ok(Edit::range_replacement(state.to_string(), expr.range()))
+    Ok(Edit::range_replacement(
+        tree.codegen_stylist(stylist),
+        expr.range(),
+    ))
 }
 
 /// (C401) Convert `set(x for x in y)` to `{x for x in y}`.
-pub fn fix_unnecessary_generator_set(
+pub(crate) fn fix_unnecessary_generator_set(
     locator: &Locator,
     stylist: &Stylist,
     expr: &rustpython_parser::ast::Expr,
@@ -79,18 +60,13 @@ pub fn fix_unnecessary_generator_set(
 ) -> Result<Edit> {
     // Expr(Call(GeneratorExp)))) -> Expr(SetComp)))
     let module_text = locator.slice(expr.range());
-    let mut tree = match_module(module_text)?;
-    let mut body = match_expr(&mut tree)?;
-    let call = match_call(body)?;
+    let mut tree = match_expression(module_text)?;
+    let call = match_call_mut(&mut tree)?;
     let arg = match_arg(call)?;
 
-    let Expression::GeneratorExp(generator_exp) = &arg.value else {
-        bail!(
-            "Expected Expression::GeneratorExp"
-        );
-    };
+    let generator_exp = match_generator_exp(&arg.value)?;
 
-    body.value = Expression::SetComp(Box::new(SetComp {
+    tree = Expression::SetComp(Box::new(SetComp {
         elt: generator_exp.elt.clone(),
         for_in: generator_exp.for_in.clone(),
         lbrace: LeftCurlyBrace {
@@ -103,21 +79,12 @@ pub fn fix_unnecessary_generator_set(
         rpar: generator_exp.rpar.clone(),
     }));
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
-
-    let mut content = state.to_string();
+    let mut content = tree.codegen_stylist(stylist);
 
     // If the expression is embedded in an f-string, surround it with spaces to avoid
     // syntax errors.
-    if let Some(parent_element) = parent {
-        if let &rustpython_parser::ast::ExprKind::FormattedValue { .. } = &parent_element.node {
-            content = format!(" {content} ");
-        }
+    if let Some(rustpython_parser::ast::Expr::FormattedValue(_)) = parent {
+        content = format!(" {content} ");
     }
 
     Ok(Edit::range_replacement(content, expr.range()))
@@ -125,39 +92,25 @@ pub fn fix_unnecessary_generator_set(
 
 /// (C402) Convert `dict((x, x) for x in range(3))` to `{x: x for x in
 /// range(3)}`.
-pub fn fix_unnecessary_generator_dict(
+pub(crate) fn fix_unnecessary_generator_dict(
     locator: &Locator,
     stylist: &Stylist,
     expr: &rustpython_parser::ast::Expr,
     parent: Option<&rustpython_parser::ast::Expr>,
 ) -> Result<Edit> {
     let module_text = locator.slice(expr.range());
-    let mut tree = match_module(module_text)?;
-    let mut body = match_expr(&mut tree)?;
-    let call = match_call(body)?;
+    let mut tree = match_expression(module_text)?;
+    let call = match_call_mut(&mut tree)?;
     let arg = match_arg(call)?;
 
     // Extract the (k, v) from `(k, v) for ...`.
-    let Expression::GeneratorExp(generator_exp) = &arg.value else {
-        bail!(
-            "Expected Expression::GeneratorExp"
-        );
-    };
-    let Expression::Tuple(tuple) = &generator_exp.elt.as_ref() else {
-        bail!("Expected Expression::Tuple");
-    };
-    let Some(Element::Simple { value: key, .. }) = &tuple.elements.get(0) else {
-        bail!(
-            "Expected tuple to contain a key as the first element"
-        );
-    };
-    let Some(Element::Simple { value, .. }) = &tuple.elements.get(1) else {
-        bail!(
-            "Expected tuple to contain a key as the second element"
-        );
+    let generator_exp = match_generator_exp(&arg.value)?;
+    let tuple = match_tuple(&generator_exp.elt)?;
+    let [Element::Simple { value: key, .. }, Element::Simple { value, .. }] = &tuple.elements[..] else {
+        bail!("Expected tuple to contain two elements");
     };
 
-    body.value = Expression::DictComp(Box::new(DictComp {
+    tree = Expression::DictComp(Box::new(DictComp {
         key: Box::new(key.clone()),
         value: Box::new(value.clone()),
         for_in: generator_exp.for_in.clone(),
@@ -173,28 +126,19 @@ pub fn fix_unnecessary_generator_dict(
         whitespace_after_colon: ParenthesizableWhitespace::SimpleWhitespace(SimpleWhitespace(" ")),
     }));
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
-
-    let mut content = state.to_string();
+    let mut content = tree.codegen_stylist(stylist);
 
     // If the expression is embedded in an f-string, surround it with spaces to avoid
     // syntax errors.
-    if let Some(parent_element) = parent {
-        if let &rustpython_parser::ast::ExprKind::FormattedValue { .. } = &parent_element.node {
-            content = format!(" {content} ");
-        }
+    if let Some(rustpython_parser::ast::Expr::FormattedValue(_)) = parent {
+        content = format!(" {content} ");
     }
 
     Ok(Edit::range_replacement(content, expr.range()))
 }
 
 /// (C403) Convert `set([x for x in y])` to `{x for x in y}`.
-pub fn fix_unnecessary_list_comprehension_set(
+pub(crate) fn fix_unnecessary_list_comprehension_set(
     locator: &Locator,
     stylist: &Stylist,
     expr: &rustpython_parser::ast::Expr,
@@ -202,16 +146,13 @@ pub fn fix_unnecessary_list_comprehension_set(
     // Expr(Call(ListComp)))) ->
     // Expr(SetComp)))
     let module_text = locator.slice(expr.range());
-    let mut tree = match_module(module_text)?;
-    let mut body = match_expr(&mut tree)?;
-    let call = match_call(body)?;
+    let mut tree = match_expression(module_text)?;
+    let call = match_call_mut(&mut tree)?;
     let arg = match_arg(call)?;
 
-    let Expression::ListComp(list_comp) = &arg.value else {
-        bail!("Expected Expression::ListComp");
-    };
+    let list_comp = match_list_comp(&arg.value)?;
 
-    body.value = Expression::SetComp(Box::new(SetComp {
+    tree = Expression::SetComp(Box::new(SetComp {
         elt: list_comp.elt.clone(),
         for_in: list_comp.for_in.clone(),
         lbrace: LeftCurlyBrace {
@@ -224,43 +165,34 @@ pub fn fix_unnecessary_list_comprehension_set(
         rpar: list_comp.rpar.clone(),
     }));
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
-
-    Ok(Edit::range_replacement(state.to_string(), expr.range()))
+    Ok(Edit::range_replacement(
+        tree.codegen_stylist(stylist),
+        expr.range(),
+    ))
 }
 
 /// (C404) Convert `dict([(i, i) for i in range(3)])` to `{i: i for i in
 /// range(3)}`.
-pub fn fix_unnecessary_list_comprehension_dict(
+pub(crate) fn fix_unnecessary_list_comprehension_dict(
     locator: &Locator,
     stylist: &Stylist,
     expr: &rustpython_parser::ast::Expr,
 ) -> Result<Edit> {
     let module_text = locator.slice(expr.range());
-    let mut tree = match_module(module_text)?;
-    let mut body = match_expr(&mut tree)?;
-    let call = match_call(body)?;
+    let mut tree = match_expression(module_text)?;
+    let call = match_call_mut(&mut tree)?;
     let arg = match_arg(call)?;
 
-    let Expression::ListComp(list_comp) = &arg.value else {
-        bail!("Expected Expression::ListComp")
-    };
+    let list_comp = match_list_comp(&arg.value)?;
 
-    let Expression::Tuple(tuple) = &*list_comp.elt else {
-        bail!("Expected Expression::Tuple")
-    };
+    let tuple = match_tuple(&list_comp.elt)?;
 
     let [Element::Simple {
             value: key,
             comma: Some(comma),
         }, Element::Simple { value, .. }] = &tuple.elements[..] else { bail!("Expected tuple with two elements"); };
 
-    body.value = Expression::DictComp(Box::new(DictComp {
+    tree = Expression::DictComp(Box::new(DictComp {
         key: Box::new(key.clone()),
         value: Box::new(value.clone()),
         for_in: list_comp.for_in.clone(),
@@ -276,14 +208,10 @@ pub fn fix_unnecessary_list_comprehension_dict(
         rpar: list_comp.rpar.clone(),
     }));
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
-
-    Ok(Edit::range_replacement(state.to_string(), expr.range()))
+    Ok(Edit::range_replacement(
+        tree.codegen_stylist(stylist),
+        expr.range(),
+    ))
 }
 
 /// Drop a trailing comma from a list of tuple elements.
@@ -330,16 +258,15 @@ fn drop_trailing_comma<'a>(
 }
 
 /// (C405) Convert `set((1, 2))` to `{1, 2}`.
-pub fn fix_unnecessary_literal_set(
+pub(crate) fn fix_unnecessary_literal_set(
     locator: &Locator,
     stylist: &Stylist,
     expr: &rustpython_parser::ast::Expr,
 ) -> Result<Edit> {
     // Expr(Call(List|Tuple)))) -> Expr(Set)))
     let module_text = locator.slice(expr.range());
-    let mut tree = match_module(module_text)?;
-    let mut body = match_expr(&mut tree)?;
-    let mut call = match_call(body)?;
+    let mut tree = match_expression(module_text)?;
+    let call = match_call_mut(&mut tree)?;
     let arg = match_arg(call)?;
 
     let (elements, whitespace_after, whitespace_before) = match &arg.value {
@@ -357,7 +284,7 @@ pub fn fix_unnecessary_literal_set(
     if elements.is_empty() {
         call.args = vec![];
     } else {
-        body.value = Expression::Set(Box::new(Set {
+        tree = Expression::Set(Box::new(Set {
             elements,
             lbrace: LeftCurlyBrace { whitespace_after },
             rbrace: RightCurlyBrace { whitespace_before },
@@ -366,27 +293,22 @@ pub fn fix_unnecessary_literal_set(
         }));
     }
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
-
-    Ok(Edit::range_replacement(state.to_string(), expr.range()))
+    Ok(Edit::range_replacement(
+        tree.codegen_stylist(stylist),
+        expr.range(),
+    ))
 }
 
 /// (C406) Convert `dict([(1, 2)])` to `{1: 2}`.
-pub fn fix_unnecessary_literal_dict(
+pub(crate) fn fix_unnecessary_literal_dict(
     locator: &Locator,
     stylist: &Stylist,
     expr: &rustpython_parser::ast::Expr,
 ) -> Result<Edit> {
     // Expr(Call(List|Tuple)))) -> Expr(Dict)))
     let module_text = locator.slice(expr.range());
-    let mut tree = match_module(module_text)?;
-    let mut body = match_expr(&mut tree)?;
-    let call = match_call(body)?;
+    let mut tree = match_expression(module_text)?;
+    let call = match_call_mut(&mut tree)?;
     let arg = match_arg(call)?;
 
     let elements = match &arg.value {
@@ -423,7 +345,7 @@ pub fn fix_unnecessary_literal_dict(
         })
         .collect::<Result<Vec<DictElement>>>()?;
 
-    body.value = Expression::Dict(Box::new(Dict {
+    tree = Expression::Dict(Box::new(Dict {
         elements,
         lbrace: LeftCurlyBrace {
             whitespace_after: call.whitespace_before_args.clone(),
@@ -435,30 +357,23 @@ pub fn fix_unnecessary_literal_dict(
         rpar: vec![],
     }));
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
-
-    Ok(Edit::range_replacement(state.to_string(), expr.range()))
+    Ok(Edit::range_replacement(
+        tree.codegen_stylist(stylist),
+        expr.range(),
+    ))
 }
 
 /// (C408)
-pub fn fix_unnecessary_collection_call(
+pub(crate) fn fix_unnecessary_collection_call(
     locator: &Locator,
     stylist: &Stylist,
     expr: &rustpython_parser::ast::Expr,
 ) -> Result<Edit> {
     // Expr(Call("list" | "tuple" | "dict")))) -> Expr(List|Tuple|Dict)
     let module_text = locator.slice(expr.range());
-    let mut tree = match_module(module_text)?;
-    let mut body = match_expr(&mut tree)?;
-    let call = match_call(body)?;
-    let Expression::Name(name) = &call.func.as_ref() else {
-        bail!("Expected Expression::Name");
-    };
+    let mut tree = match_expression(module_text)?;
+    let call = match_call_mut(&mut tree)?;
+    let name = match_name(&call.func)?;
 
     // Arena allocator used to create formatted strings of sufficient lifetime,
     // below.
@@ -466,14 +381,14 @@ pub fn fix_unnecessary_collection_call(
 
     match name.value {
         "tuple" => {
-            body.value = Expression::Tuple(Box::new(Tuple {
+            tree = Expression::Tuple(Box::new(Tuple {
                 elements: vec![],
                 lpar: vec![LeftParen::default()],
                 rpar: vec![RightParen::default()],
             }));
         }
         "list" => {
-            body.value = Expression::List(Box::new(List {
+            tree = Expression::List(Box::new(List {
                 elements: vec![],
                 lbracket: LeftSquareBracket::default(),
                 rbracket: RightSquareBracket::default(),
@@ -483,7 +398,7 @@ pub fn fix_unnecessary_collection_call(
         }
         "dict" => {
             if call.args.is_empty() {
-                body.value = Expression::Dict(Box::new(Dict {
+                tree = Expression::Dict(Box::new(Dict {
                     elements: vec![],
                     lbrace: LeftCurlyBrace::default(),
                     rbrace: RightCurlyBrace::default(),
@@ -524,7 +439,7 @@ pub fn fix_unnecessary_collection_call(
                     })
                     .collect();
 
-                body.value = Expression::Dict(Box::new(Dict {
+                tree = Expression::Dict(Box::new(Dict {
                     elements,
                     lbrace: LeftCurlyBrace {
                         whitespace_after: call.whitespace_before_args.clone(),
@@ -547,26 +462,21 @@ pub fn fix_unnecessary_collection_call(
         }
     };
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
-
-    Ok(Edit::range_replacement(state.to_string(), expr.range()))
+    Ok(Edit::range_replacement(
+        tree.codegen_stylist(stylist),
+        expr.range(),
+    ))
 }
 
 /// (C409) Convert `tuple([1, 2])` to `tuple(1, 2)`
-pub fn fix_unnecessary_literal_within_tuple_call(
+pub(crate) fn fix_unnecessary_literal_within_tuple_call(
     locator: &Locator,
     stylist: &Stylist,
     expr: &rustpython_parser::ast::Expr,
 ) -> Result<Edit> {
     let module_text = locator.slice(expr.range());
-    let mut tree = match_module(module_text)?;
-    let mut body = match_expr(&mut tree)?;
-    let call = match_call(body)?;
+    let mut tree = match_expression(module_text)?;
+    let call = match_call_mut(&mut tree)?;
     let arg = match_arg(call)?;
     let (elements, whitespace_after, whitespace_before) = match &arg.value {
         Expression::Tuple(inner) => (
@@ -592,7 +502,7 @@ pub fn fix_unnecessary_literal_within_tuple_call(
         }
     };
 
-    body.value = Expression::Tuple(Box::new(Tuple {
+    tree = Expression::Tuple(Box::new(Tuple {
         elements: elements.clone(),
         lpar: vec![LeftParen {
             whitespace_after: whitespace_after.clone(),
@@ -602,26 +512,21 @@ pub fn fix_unnecessary_literal_within_tuple_call(
         }],
     }));
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
-
-    Ok(Edit::range_replacement(state.to_string(), expr.range()))
+    Ok(Edit::range_replacement(
+        tree.codegen_stylist(stylist),
+        expr.range(),
+    ))
 }
 
 /// (C410) Convert `list([1, 2])` to `[1, 2]`
-pub fn fix_unnecessary_literal_within_list_call(
+pub(crate) fn fix_unnecessary_literal_within_list_call(
     locator: &Locator,
     stylist: &Stylist,
     expr: &rustpython_parser::ast::Expr,
 ) -> Result<Edit> {
     let module_text = locator.slice(expr.range());
-    let mut tree = match_module(module_text)?;
-    let mut body = match_expr(&mut tree)?;
-    let call = match_call(body)?;
+    let mut tree = match_expression(module_text)?;
+    let call = match_call_mut(&mut tree)?;
     let arg = match_arg(call)?;
     let (elements, whitespace_after, whitespace_before) = match &arg.value {
         Expression::Tuple(inner) => (
@@ -647,7 +552,7 @@ pub fn fix_unnecessary_literal_within_list_call(
         }
     };
 
-    body.value = Expression::List(Box::new(List {
+    tree = Expression::List(Box::new(List {
         elements: elements.clone(),
         lbracket: LeftSquareBracket {
             whitespace_after: whitespace_after.clone(),
@@ -659,61 +564,45 @@ pub fn fix_unnecessary_literal_within_list_call(
         rpar: vec![],
     }));
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
-
-    Ok(Edit::range_replacement(state.to_string(), expr.range()))
+    Ok(Edit::range_replacement(
+        tree.codegen_stylist(stylist),
+        expr.range(),
+    ))
 }
 
 /// (C411) Convert `list([i * i for i in x])` to `[i * i for i in x]`.
-pub fn fix_unnecessary_list_call(
+pub(crate) fn fix_unnecessary_list_call(
     locator: &Locator,
     stylist: &Stylist,
     expr: &rustpython_parser::ast::Expr,
 ) -> Result<Edit> {
     // Expr(Call(List|Tuple)))) -> Expr(List|Tuple)))
     let module_text = locator.slice(expr.range());
-    let mut tree = match_module(module_text)?;
-    let mut body = match_expr(&mut tree)?;
-    let call = match_call(body)?;
+    let mut tree = match_expression(module_text)?;
+    let call = match_call_mut(&mut tree)?;
     let arg = match_arg(call)?;
 
-    body.value = arg.value.clone();
-
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
+    tree = arg.value.clone();
 
-    Ok(Edit::range_replacement(state.to_string(), expr.range()))
+    Ok(Edit::range_replacement(
+        tree.codegen_stylist(stylist),
+        expr.range(),
+    ))
 }
 
 /// (C413) Convert `list(sorted([2, 3, 1]))` to `sorted([2, 3, 1])`.
 /// (C413) Convert `reversed(sorted([2, 3, 1]))` to `sorted([2, 3, 1],
 /// reverse=True)`.
-pub fn fix_unnecessary_call_around_sorted(
+pub(crate) fn fix_unnecessary_call_around_sorted(
     locator: &Locator,
     stylist: &Stylist,
     expr: &rustpython_parser::ast::Expr,
 ) -> Result<Edit> {
     let module_text = locator.slice(expr.range());
-    let mut tree = match_module(module_text)?;
-    let mut body = match_expr(&mut tree)?;
-    let outer_call = match_call(body)?;
+    let mut tree = match_expression(module_text)?;
+    let outer_call = match_call_mut(&mut tree)?;
     let inner_call = match &outer_call.args[..] {
-        [arg] => {
-            if let Expression::Call(call) = &arg.value {
-                call
-            } else {
-                bail!("Expected Expression::Call ");
-            }
-        }
+        [arg] => match_call(&arg.value)?,
         _ => {
             bail!("Expected one argument in outer function call");
         }
@@ -721,7 +610,7 @@ pub fn fix_unnecessary_call_around_sorted(
 
     if let Expression::Name(outer_name) = &*outer_call.func {
         if outer_name.value == "list" {
-            body.value = Expression::Call(inner_call.clone());
+            tree = Expression::Call(Box::new((*inner_call).clone()));
         } else {
             // If the `reverse` argument is used
             let args = if inner_call.args.iter().any(|arg| {
@@ -798,7 +687,7 @@ pub fn fix_unnecessary_call_around_sorted(
                 args
             };
 
-            body.value = Expression::Call(Box::new(Call {
+            tree = Expression::Call(Box::new(Call {
                 func: inner_call.func.clone(),
                 args,
                 lpar: inner_call.lpar.clone(),
@@ -809,32 +698,25 @@ pub fn fix_unnecessary_call_around_sorted(
         }
     }
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
-
-    Ok(Edit::range_replacement(state.to_string(), expr.range()))
+    Ok(Edit::range_replacement(
+        tree.codegen_stylist(stylist),
+        expr.range(),
+    ))
 }
 
 /// (C414) Convert `sorted(list(foo))` to `sorted(foo)`
-pub fn fix_unnecessary_double_cast_or_process(
+pub(crate) fn fix_unnecessary_double_cast_or_process(
     locator: &Locator,
     stylist: &Stylist,
     expr: &rustpython_parser::ast::Expr,
 ) -> Result<Edit> {
     let module_text = locator.slice(expr.range());
-    let mut tree = match_module(module_text)?;
-    let body = match_expr(&mut tree)?;
-    let mut outer_call = match_call(body)?;
+    let mut tree = match_expression(module_text)?;
+    let outer_call = match_call_mut(&mut tree)?;
 
     outer_call.args = match outer_call.args.split_first() {
         Some((first, rest)) => {
-            let Expression::Call(inner_call) = &first.value else {
-                bail!("Expected Expression::Call ");
-            };
+            let inner_call = match_call(&first.value)?;
             if let Some(iterable) = inner_call.args.first() {
                 let mut args = vec![iterable.clone()];
                 args.extend_from_slice(rest);
@@ -846,29 +728,24 @@ pub fn fix_unnecessary_double_cast_or_process(
         None => bail!("Expected at least one argument in outer function call"),
     };
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
-
-    Ok(Edit::range_replacement(state.to_string(), expr.range()))
+    Ok(Edit::range_replacement(
+        tree.codegen_stylist(stylist),
+        expr.range(),
+    ))
 }
 
 /// (C416) Convert `[i for i in x]` to `list(x)`.
-pub fn fix_unnecessary_comprehension(
+pub(crate) fn fix_unnecessary_comprehension(
     locator: &Locator,
     stylist: &Stylist,
     expr: &rustpython_parser::ast::Expr,
 ) -> Result<Edit> {
     let module_text = locator.slice(expr.range());
-    let mut tree = match_module(module_text)?;
-    let mut body = match_expr(&mut tree)?;
+    let mut tree = match_expression(module_text)?;
 
-    match &body.value {
+    match &tree {
         Expression::ListComp(inner) => {
-            body.value = Expression::Call(Box::new(Call {
+            tree = Expression::Call(Box::new(Call {
                 func: Box::new(Expression::Name(Box::new(Name {
                     value: "list",
                     lpar: vec![],
@@ -890,7 +767,7 @@ pub fn fix_unnecessary_comprehension(
             }));
         }
         Expression::SetComp(inner) => {
-            body.value = Expression::Call(Box::new(Call {
+            tree = Expression::Call(Box::new(Call {
                 func: Box::new(Expression::Name(Box::new(Name {
                     value: "set",
                     lpar: vec![],
@@ -912,7 +789,7 @@ pub fn fix_unnecessary_comprehension(
             }));
         }
         Expression::DictComp(inner) => {
-            body.value = Expression::Call(Box::new(Call {
+            tree = Expression::Call(Box::new(Call {
                 func: Box::new(Expression::Name(Box::new(Name {
                     value: "dict",
                     lpar: vec![],
@@ -938,18 +815,14 @@ pub fn fix_unnecessary_comprehension(
         }
     }
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
-
-    Ok(Edit::range_replacement(state.to_string(), expr.range()))
+    Ok(Edit::range_replacement(
+        tree.codegen_stylist(stylist),
+        expr.range(),
+    ))
 }
 
 /// (C417) Convert `map(lambda x: x * 2, bar)` to `(x * 2 for x in bar)`.
-pub fn fix_unnecessary_map(
+pub(crate) fn fix_unnecessary_map(
     locator: &Locator,
     stylist: &Stylist,
     expr: &rustpython_parser::ast::Expr,
@@ -957,9 +830,8 @@ pub fn fix_unnecessary_map(
     kind: &str,
 ) -> Result<Edit> {
     let module_text = locator.slice(expr.range());
-    let mut tree = match_module(module_text)?;
-    let mut body = match_expr(&mut tree)?;
-    let call = match_call(body)?;
+    let mut tree = match_expression(module_text)?;
+    let call = match_call_mut(&mut tree)?;
     let arg = match_arg(call)?;
 
     let (args, lambda_func) = match &arg.value {
@@ -978,9 +850,7 @@ pub fn fix_unnecessary_map(
         }
     };
 
-    let Expression::Lambda(func_body) = &lambda_func else {
-        bail!("Expected a lambda")
-    };
+    let func_body = match_lambda(&lambda_func)?;
 
     if args.len() == 2 {
         if func_body.params.params.iter().any(|f| f.default.is_some()) {
@@ -1019,7 +889,7 @@ pub fn fix_unnecessary_map(
 
         match kind {
             "generator" => {
-                body.value = Expression::GeneratorExp(Box::new(GeneratorExp {
+                tree = Expression::GeneratorExp(Box::new(GeneratorExp {
                     elt: func_body.body.clone(),
                     for_in: compfor,
                     lpar: vec![LeftParen::default()],
@@ -1027,7 +897,7 @@ pub fn fix_unnecessary_map(
                 }));
             }
             "list" => {
-                body.value = Expression::ListComp(Box::new(ListComp {
+                tree = Expression::ListComp(Box::new(ListComp {
                     elt: func_body.body.clone(),
                     for_in: compfor,
                     lbracket: LeftSquareBracket::default(),
@@ -1037,7 +907,7 @@ pub fn fix_unnecessary_map(
                 }));
             }
             "set" => {
-                body.value = Expression::SetComp(Box::new(SetComp {
+                tree = Expression::SetComp(Box::new(SetComp {
                     elt: func_body.body.clone(),
                     for_in: compfor,
                     lpar: vec![],
@@ -1068,7 +938,7 @@ pub fn fix_unnecessary_map(
                     bail!("Expected tuple for dict comprehension")
                 };
 
-                body.value = Expression::DictComp(Box::new(DictComp {
+                tree = Expression::DictComp(Box::new(DictComp {
                     for_in: compfor,
                     lpar: vec![],
                     rpar: vec![],
@@ -1087,24 +957,13 @@ pub fn fix_unnecessary_map(
             }
         }
 
-        let mut state = CodegenState {
-            default_newline: &stylist.line_ending(),
-            default_indent: stylist.indentation(),
-            ..CodegenState::default()
-        };
-        tree.codegen(&mut state);
-
-        let mut content = state.to_string();
+        let mut content = tree.codegen_stylist(stylist);
 
         // If the expression is embedded in an f-string, surround it with spaces to avoid
         // syntax errors.
         if kind == "set" || kind == "dict" {
-            if let Some(parent_element) = parent {
-                if let &rustpython_parser::ast::ExprKind::FormattedValue { .. } =
-                    &parent_element.node
-                {
-                    content = format!(" {content} ");
-                }
+            if let Some(rustpython_parser::ast::Expr::FormattedValue(_)) = parent {
+                content = format!(" {content} ");
             }
         }
 
@@ -1115,40 +974,34 @@ pub fn fix_unnecessary_map(
 }
 
 /// (C418) Convert `dict({"a": 1})` to `{"a": 1}`
-pub fn fix_unnecessary_literal_within_dict_call(
+pub(crate) fn fix_unnecessary_literal_within_dict_call(
     locator: &Locator,
     stylist: &Stylist,
     expr: &rustpython_parser::ast::Expr,
 ) -> Result<Edit> {
     let module_text = locator.slice(expr.range());
-    let mut tree = match_module(module_text)?;
-    let mut body = match_expr(&mut tree)?;
-    let call = match_call(body)?;
+    let mut tree = match_expression(module_text)?;
+    let call = match_call_mut(&mut tree)?;
     let arg = match_arg(call)?;
 
-    body.value = arg.value.clone();
-
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
+    tree = arg.value.clone();
 
-    Ok(Edit::range_replacement(state.to_string(), expr.range()))
+    Ok(Edit::range_replacement(
+        tree.codegen_stylist(stylist),
+        expr.range(),
+    ))
 }
 
 /// (C419) Convert `[i for i in a]` into `i for i in a`
-pub fn fix_unnecessary_comprehension_any_all(
+pub(crate) fn fix_unnecessary_comprehension_any_all(
     locator: &Locator,
     stylist: &Stylist,
     expr: &rustpython_parser::ast::Expr,
-) -> Result<Edit> {
+) -> Result<Fix> {
     // Expr(ListComp) -> Expr(GeneratorExp)
     let module_text = locator.slice(expr.range());
-    let mut tree = match_module(module_text)?;
-    let body = match_expr(&mut tree)?;
-    let call = match_call(body)?;
+    let mut tree = match_expression(module_text)?;
+    let call = match_call_mut(&mut tree)?;
 
     let Expression::ListComp(list_comp) = &call.args[0].value else {
         bail!(
@@ -1156,6 +1009,108 @@ pub fn fix_unnecessary_comprehension_any_all(
         );
     };
 
+    let mut new_empty_lines = vec![];
+
+    if let ParenthesizableWhitespace::ParenthesizedWhitespace(ParenthesizedWhitespace {
+        first_line,
+        empty_lines,
+        ..
+    }) = &list_comp.lbracket.whitespace_after
+    {
+        // If there's a comment on the line after the opening bracket, we need
+        // to preserve it. The way we do this is by adding a new empty line
+        // with the same comment.
+        //
+        // Example:
+        // ```python
+        // any(
+        //     [  # comment
+        //         ...
+        //     ]
+        // )
+        //
+        // # The above code will be converted to:
+        // any(
+        //     # comment
+        //     ...
+        // )
+        // ```
+        if let TrailingWhitespace {
+            comment: Some(comment),
+            ..
+        } = first_line
+        {
+            // The indentation should be same as that of the opening bracket,
+            // but we don't have that information here. This will be addressed
+            // before adding these new nodes.
+            new_empty_lines.push(EmptyLine {
+                comment: Some(comment.clone()),
+                ..EmptyLine::default()
+            });
+        }
+        if !empty_lines.is_empty() {
+            new_empty_lines.extend(empty_lines.clone());
+        }
+    }
+
+    if !new_empty_lines.is_empty() {
+        call.whitespace_before_args = match &call.whitespace_before_args {
+            ParenthesizableWhitespace::ParenthesizedWhitespace(ParenthesizedWhitespace {
+                first_line,
+                indent,
+                last_line,
+                ..
+            }) => {
+                // Add the indentation of the opening bracket to all the new
+                // empty lines.
+                for empty_line in &mut new_empty_lines {
+                    empty_line.whitespace = last_line.clone();
+                }
+                ParenthesizableWhitespace::ParenthesizedWhitespace(ParenthesizedWhitespace {
+                    first_line: first_line.clone(),
+                    empty_lines: new_empty_lines,
+                    indent: *indent,
+                    last_line: last_line.clone(),
+                })
+            }
+            // This is a rare case, but it can happen if the opening bracket
+            // is on the same line as the function call.
+            //
+            // Example:
+            // ```python
+            // any([
+            //         ...
+            //     ]
+            // )
+            // ```
+            ParenthesizableWhitespace::SimpleWhitespace(whitespace) => {
+                for empty_line in &mut new_empty_lines {
+                    empty_line.whitespace = whitespace.clone();
+                }
+                ParenthesizableWhitespace::ParenthesizedWhitespace(ParenthesizedWhitespace {
+                    empty_lines: new_empty_lines,
+                    ..ParenthesizedWhitespace::default()
+                })
+            }
+        }
+    }
+
+    let rbracket_comment =
+        if let ParenthesizableWhitespace::ParenthesizedWhitespace(ParenthesizedWhitespace {
+            first_line:
+                TrailingWhitespace {
+                    whitespace,
+                    comment: Some(comment),
+                    ..
+                },
+            ..
+        }) = &list_comp.rbracket.whitespace_before
+        {
+            Some(format!("{}{}", whitespace.0, comment.0))
+        } else {
+            None
+        };
+
     call.args[0].value = Expression::GeneratorExp(Box::new(GeneratorExp {
         elt: list_comp.elt.clone(),
         for_in: list_comp.for_in.clone(),
@@ -1163,17 +1118,49 @@ pub fn fix_unnecessary_comprehension_any_all(
         rpar: list_comp.rpar.clone(),
     }));
 
-    if let Some(comma) = &call.args[0].comma {
-        call.args[0].whitespace_after_arg = comma.whitespace_after.clone();
-        call.args[0].comma = None;
-    }
+    let whitespace_after_arg = match &call.args[0].comma {
+        Some(comma) => {
+            let whitespace_after_comma = comma.whitespace_after.clone();
+            call.args[0].comma = None;
+            whitespace_after_comma
+        }
+        _ => call.args[0].whitespace_after_arg.clone(),
+    };
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
+    let new_comment;
+    call.args[0].whitespace_after_arg = match rbracket_comment {
+        Some(existing_comment) => {
+            if let ParenthesizableWhitespace::ParenthesizedWhitespace(ParenthesizedWhitespace {
+                first_line:
+                    TrailingWhitespace {
+                        whitespace: SimpleWhitespace(whitespace),
+                        comment: Some(Comment(comment)),
+                        ..
+                    },
+                empty_lines,
+                indent,
+                last_line,
+            }) = &whitespace_after_arg
+            {
+                new_comment = format!("{existing_comment}{whitespace}{comment}");
+                ParenthesizableWhitespace::ParenthesizedWhitespace(ParenthesizedWhitespace {
+                    first_line: TrailingWhitespace {
+                        comment: Some(Comment(new_comment.as_str())),
+                        ..TrailingWhitespace::default()
+                    },
+                    empty_lines: empty_lines.clone(),
+                    indent: *indent,
+                    last_line: last_line.clone(),
+                })
+            } else {
+                whitespace_after_arg
+            }
+        }
+        _ => whitespace_after_arg,
     };
-    tree.codegen(&mut state);
 
-    Ok(Edit::range_replacement(state.to_string(), expr.range()))
+    Ok(Fix::suggested(Edit::range_replacement(
+        tree.codegen_stylist(stylist),
+        expr.range(),
+    )))
 }
diff --git a/crates/ruff/src/rules/flake8_comprehensions/mod.rs b/crates/ruff/src/rules/flake8_comprehensions/mod.rs
index 02bd63ddb2d89..279b504280426 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/mod.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/mod.rs
@@ -7,33 +7,32 @@ pub mod settings;
 mod tests {
     use std::path::Path;
 
-    use crate::assert_messages;
     use anyhow::Result;
-
     use test_case::test_case;
 
+    use crate::assert_messages;
     use crate::registry::Rule;
     use crate::settings::Settings;
     use crate::test::test_path;
 
-    #[test_case(Rule::UnnecessaryCallAroundSorted, Path::new("C413.py"); "C413")]
-    #[test_case(Rule::UnnecessaryCollectionCall, Path::new("C408.py"); "C408")]
-    #[test_case(Rule::UnnecessaryComprehension, Path::new("C416.py"); "C416")]
-    #[test_case(Rule::UnnecessaryComprehensionAnyAll, Path::new("C419.py"); "C419")]
-    #[test_case(Rule::UnnecessaryDoubleCastOrProcess, Path::new("C414.py"); "C414")]
-    #[test_case(Rule::UnnecessaryGeneratorDict, Path::new("C402.py"); "C402")]
-    #[test_case(Rule::UnnecessaryGeneratorList, Path::new("C400.py"); "C400")]
-    #[test_case(Rule::UnnecessaryGeneratorSet, Path::new("C401.py"); "C401")]
-    #[test_case(Rule::UnnecessaryListCall, Path::new("C411.py"); "C411")]
-    #[test_case(Rule::UnnecessaryListComprehensionDict, Path::new("C404.py"); "C404")]
-    #[test_case(Rule::UnnecessaryListComprehensionSet, Path::new("C403.py"); "C403")]
-    #[test_case(Rule::UnnecessaryLiteralDict, Path::new("C406.py"); "C406")]
-    #[test_case(Rule::UnnecessaryLiteralSet, Path::new("C405.py"); "C405")]
-    #[test_case(Rule::UnnecessaryLiteralWithinDictCall, Path::new("C418.py"); "C418")]
-    #[test_case(Rule::UnnecessaryLiteralWithinListCall, Path::new("C410.py"); "C410")]
-    #[test_case(Rule::UnnecessaryLiteralWithinTupleCall, Path::new("C409.py"); "C409")]
-    #[test_case(Rule::UnnecessaryMap, Path::new("C417.py"); "C417")]
-    #[test_case(Rule::UnnecessarySubscriptReversal, Path::new("C415.py"); "C415")]
+    #[test_case(Rule::UnnecessaryCallAroundSorted, Path::new("C413.py"))]
+    #[test_case(Rule::UnnecessaryCollectionCall, Path::new("C408.py"))]
+    #[test_case(Rule::UnnecessaryComprehension, Path::new("C416.py"))]
+    #[test_case(Rule::UnnecessaryComprehensionAnyAll, Path::new("C419.py"))]
+    #[test_case(Rule::UnnecessaryDoubleCastOrProcess, Path::new("C414.py"))]
+    #[test_case(Rule::UnnecessaryGeneratorDict, Path::new("C402.py"))]
+    #[test_case(Rule::UnnecessaryGeneratorList, Path::new("C400.py"))]
+    #[test_case(Rule::UnnecessaryGeneratorSet, Path::new("C401.py"))]
+    #[test_case(Rule::UnnecessaryListCall, Path::new("C411.py"))]
+    #[test_case(Rule::UnnecessaryListComprehensionDict, Path::new("C404.py"))]
+    #[test_case(Rule::UnnecessaryListComprehensionSet, Path::new("C403.py"))]
+    #[test_case(Rule::UnnecessaryLiteralDict, Path::new("C406.py"))]
+    #[test_case(Rule::UnnecessaryLiteralSet, Path::new("C405.py"))]
+    #[test_case(Rule::UnnecessaryLiteralWithinDictCall, Path::new("C418.py"))]
+    #[test_case(Rule::UnnecessaryLiteralWithinListCall, Path::new("C410.py"))]
+    #[test_case(Rule::UnnecessaryLiteralWithinTupleCall, Path::new("C409.py"))]
+    #[test_case(Rule::UnnecessaryMap, Path::new("C417.py"))]
+    #[test_case(Rule::UnnecessarySubscriptReversal, Path::new("C415.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
@@ -44,7 +43,7 @@ mod tests {
         Ok(())
     }
 
-    #[test_case(Rule::UnnecessaryCollectionCall, Path::new("C408.py"); "C408")]
+    #[test_case(Rule::UnnecessaryCollectionCall, Path::new("C408.py"))]
     fn allow_dict_calls_with_keyword_arguments(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!(
             "{}_{}_allow_dict_calls_with_keyword_arguments",
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/helpers.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/helpers.rs
index 0e5244e04ee1b..27241912ac6f0 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/helpers.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/helpers.rs
@@ -1,19 +1,19 @@
-use rustpython_parser::ast::{Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Expr, Keyword};
 
-pub fn expr_name(func: &Expr) -> Option<&str> {
-    if let ExprKind::Name { id, .. } = &func.node {
+pub(crate) fn expr_name(func: &Expr) -> Option<&str> {
+    if let Expr::Name(ast::ExprName { id, .. }) = func {
         Some(id)
     } else {
         None
     }
 }
 
-pub fn exactly_one_argument_with_matching_function<'a>(
+pub(crate) fn exactly_one_argument_with_matching_function<'a>(
     name: &str,
     func: &Expr,
     args: &'a [Expr],
     keywords: &[Keyword],
-) -> Option<&'a ExprKind> {
+) -> Option<&'a Expr> {
     if !keywords.is_empty() {
         return None;
     }
@@ -23,16 +23,16 @@ pub fn exactly_one_argument_with_matching_function<'a>(
     if expr_name(func)? != name {
         return None;
     }
-    Some(&args[0].node)
+    Some(&args[0])
 }
 
-pub fn first_argument_with_matching_function<'a>(
+pub(crate) fn first_argument_with_matching_function<'a>(
     name: &str,
     func: &Expr,
     args: &'a [Expr],
-) -> Option<&'a ExprKind> {
+) -> Option<&'a Expr> {
     if expr_name(func)? == name {
-        Some(&args.first()?.node)
+        Some(args.first()?)
     } else {
         None
     }
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/mod.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/mod.rs
index d7418e3a66141..0cb1aaacfe9bf 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/mod.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/mod.rs
@@ -1,39 +1,41 @@
-pub use unnecessary_call_around_sorted::{
+pub(crate) use unnecessary_call_around_sorted::{
     unnecessary_call_around_sorted, UnnecessaryCallAroundSorted,
 };
-pub use unnecessary_collection_call::{unnecessary_collection_call, UnnecessaryCollectionCall};
-pub use unnecessary_comprehension::{
+pub(crate) use unnecessary_collection_call::{
+    unnecessary_collection_call, UnnecessaryCollectionCall,
+};
+pub(crate) use unnecessary_comprehension::{
     unnecessary_dict_comprehension, unnecessary_list_set_comprehension, UnnecessaryComprehension,
 };
-pub use unnecessary_comprehension_any_all::{
+pub(crate) use unnecessary_comprehension_any_all::{
     unnecessary_comprehension_any_all, UnnecessaryComprehensionAnyAll,
 };
-pub use unnecessary_double_cast_or_process::{
+pub(crate) use unnecessary_double_cast_or_process::{
     unnecessary_double_cast_or_process, UnnecessaryDoubleCastOrProcess,
 };
-pub use unnecessary_generator_dict::{unnecessary_generator_dict, UnnecessaryGeneratorDict};
-pub use unnecessary_generator_list::{unnecessary_generator_list, UnnecessaryGeneratorList};
-pub use unnecessary_generator_set::{unnecessary_generator_set, UnnecessaryGeneratorSet};
-pub use unnecessary_list_call::{unnecessary_list_call, UnnecessaryListCall};
-pub use unnecessary_list_comprehension_dict::{
+pub(crate) use unnecessary_generator_dict::{unnecessary_generator_dict, UnnecessaryGeneratorDict};
+pub(crate) use unnecessary_generator_list::{unnecessary_generator_list, UnnecessaryGeneratorList};
+pub(crate) use unnecessary_generator_set::{unnecessary_generator_set, UnnecessaryGeneratorSet};
+pub(crate) use unnecessary_list_call::{unnecessary_list_call, UnnecessaryListCall};
+pub(crate) use unnecessary_list_comprehension_dict::{
     unnecessary_list_comprehension_dict, UnnecessaryListComprehensionDict,
 };
-pub use unnecessary_list_comprehension_set::{
+pub(crate) use unnecessary_list_comprehension_set::{
     unnecessary_list_comprehension_set, UnnecessaryListComprehensionSet,
 };
-pub use unnecessary_literal_dict::{unnecessary_literal_dict, UnnecessaryLiteralDict};
-pub use unnecessary_literal_set::{unnecessary_literal_set, UnnecessaryLiteralSet};
-pub use unnecessary_literal_within_dict_call::{
+pub(crate) use unnecessary_literal_dict::{unnecessary_literal_dict, UnnecessaryLiteralDict};
+pub(crate) use unnecessary_literal_set::{unnecessary_literal_set, UnnecessaryLiteralSet};
+pub(crate) use unnecessary_literal_within_dict_call::{
     unnecessary_literal_within_dict_call, UnnecessaryLiteralWithinDictCall,
 };
-pub use unnecessary_literal_within_list_call::{
+pub(crate) use unnecessary_literal_within_list_call::{
     unnecessary_literal_within_list_call, UnnecessaryLiteralWithinListCall,
 };
-pub use unnecessary_literal_within_tuple_call::{
+pub(crate) use unnecessary_literal_within_tuple_call::{
     unnecessary_literal_within_tuple_call, UnnecessaryLiteralWithinTupleCall,
 };
-pub use unnecessary_map::{unnecessary_map, UnnecessaryMap};
-pub use unnecessary_subscript_reversal::{
+pub(crate) use unnecessary_map::{unnecessary_map, UnnecessaryMap};
+pub(crate) use unnecessary_subscript_reversal::{
     unnecessary_subscript_reversal, UnnecessarySubscriptReversal,
 };
 
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_call_around_sorted.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_call_around_sorted.rs
index 784d149587f06..80be40cf4f9bb 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_call_around_sorted.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_call_around_sorted.rs
@@ -1,10 +1,11 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
+
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Fix};
+use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 use crate::rules::flake8_comprehensions::fixes;
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
-use ruff_macros::{derive_message_formats, violation};
 
 use super::helpers;
 
@@ -33,7 +34,7 @@ use super::helpers;
 /// ```
 #[violation]
 pub struct UnnecessaryCallAroundSorted {
-    pub func: String,
+    func: String,
 }
 
 impl AlwaysAutofixableViolation for UnnecessaryCallAroundSorted {
@@ -50,7 +51,7 @@ impl AlwaysAutofixableViolation for UnnecessaryCallAroundSorted {
 }
 
 /// C413
-pub fn unnecessary_call_around_sorted(
+pub(crate) fn unnecessary_call_around_sorted(
     checker: &mut Checker,
     expr: &Expr,
     func: &Expr,
@@ -65,7 +66,7 @@ pub fn unnecessary_call_around_sorted(
     let Some(arg) = args.first() else {
         return;
     };
-    let ExprKind::Call { func, .. } = &arg.node else {
+    let Expr::Call(ast::ExprCall { func, .. }) = arg else {
         return;
     };
     let Some(inner) = helpers::expr_name(func) else {
@@ -74,7 +75,7 @@ pub fn unnecessary_call_around_sorted(
     if inner != "sorted" {
         return;
     }
-    if !checker.ctx.is_builtin(inner) || !checker.ctx.is_builtin(outer) {
+    if !checker.semantic_model().is_builtin(inner) || !checker.semantic_model().is_builtin(outer) {
         return;
     }
     let mut diagnostic = Diagnostic::new(
@@ -85,7 +86,13 @@ pub fn unnecessary_call_around_sorted(
     );
     if checker.patch(diagnostic.kind.rule()) {
         diagnostic.try_set_fix(|| {
-            fixes::fix_unnecessary_call_around_sorted(checker.locator, checker.stylist, expr)
+            let edit =
+                fixes::fix_unnecessary_call_around_sorted(checker.locator, checker.stylist, expr)?;
+            if outer == "reversed" {
+                Ok(Fix::suggested(edit))
+            } else {
+                Ok(Fix::automatic(edit))
+            }
         });
     }
     checker.diagnostics.push(diagnostic);
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_collection_call.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_collection_call.rs
index b1fe2feffd996..e559d50bb3a56 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_collection_call.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_collection_call.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, Keyword};
+use rustpython_parser::ast::{Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
 use ruff_macros::{derive_message_formats, violation};
@@ -36,7 +36,7 @@ use super::helpers;
 /// ```
 #[violation]
 pub struct UnnecessaryCollectionCall {
-    pub obj_type: String,
+    obj_type: String,
 }
 
 impl AlwaysAutofixableViolation for UnnecessaryCollectionCall {
@@ -52,7 +52,7 @@ impl AlwaysAutofixableViolation for UnnecessaryCollectionCall {
 }
 
 /// C408
-pub fn unnecessary_collection_call(
+pub(crate) fn unnecessary_collection_call(
     checker: &mut Checker,
     expr: &Expr,
     func: &Expr,
@@ -70,7 +70,7 @@ pub fn unnecessary_collection_call(
         "dict"
             if keywords.is_empty()
                 || (!settings.allow_dict_calls_with_keyword_arguments
-                    && keywords.iter().all(|kw| kw.node.arg.is_some())) =>
+                    && keywords.iter().all(|kw| kw.arg.is_some())) =>
         {
             // `dict()` or `dict(a=1)` (as opposed to `dict(**a)`)
         }
@@ -79,7 +79,7 @@ pub fn unnecessary_collection_call(
         }
         _ => return,
     };
-    if !checker.ctx.is_builtin(id) {
+    if !checker.semantic_model().is_builtin(id) {
         return;
     }
     let mut diagnostic = Diagnostic::new(
@@ -89,7 +89,8 @@ pub fn unnecessary_collection_call(
         expr.range(),
     );
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.try_set_fix(|| {
+        #[allow(deprecated)]
+        diagnostic.try_set_fix_from_edit(|| {
             fixes::fix_unnecessary_collection_call(checker.locator, checker.stylist, expr)
         });
     }
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_comprehension.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_comprehension.rs
index 07b78e548c935..498e86edc417b 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_comprehension.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_comprehension.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Comprehension, Expr, ExprKind};
+use rustpython_parser::ast::{self, Comprehension, Expr, Ranged};
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
 use ruff_macros::{derive_message_formats, violation};
@@ -32,7 +32,7 @@ use super::helpers;
 /// ```
 #[violation]
 pub struct UnnecessaryComprehension {
-    pub obj_type: String,
+    obj_type: String,
 }
 
 impl AlwaysAutofixableViolation for UnnecessaryComprehension {
@@ -50,13 +50,13 @@ impl AlwaysAutofixableViolation for UnnecessaryComprehension {
 
 /// Add diagnostic for C416 based on the expression node id.
 fn add_diagnostic(checker: &mut Checker, expr: &Expr) {
-    let id = match &expr.node {
-        ExprKind::ListComp { .. } => "list",
-        ExprKind::SetComp { .. } => "set",
-        ExprKind::DictComp { .. } => "dict",
+    let id = match expr {
+        Expr::ListComp(_) => "list",
+        Expr::SetComp(_) => "set",
+        Expr::DictComp(_) => "dict",
         _ => return,
     };
-    if !checker.ctx.is_builtin(id) {
+    if !checker.semantic_model().is_builtin(id) {
         return;
     }
     let mut diagnostic = Diagnostic::new(
@@ -66,7 +66,8 @@ fn add_diagnostic(checker: &mut Checker, expr: &Expr) {
         expr.range(),
     );
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.try_set_fix(|| {
+        #[allow(deprecated)]
+        diagnostic.try_set_fix_from_edit(|| {
             fixes::fix_unnecessary_comprehension(checker.locator, checker.stylist, expr)
         });
     }
@@ -74,7 +75,7 @@ fn add_diagnostic(checker: &mut Checker, expr: &Expr) {
 }
 
 /// C416
-pub fn unnecessary_dict_comprehension(
+pub(crate) fn unnecessary_dict_comprehension(
     checker: &mut Checker,
     expr: &Expr,
     key: &Expr,
@@ -85,7 +86,7 @@ pub fn unnecessary_dict_comprehension(
         return;
     }
     let generator = &generators[0];
-    if !(generator.ifs.is_empty() && generator.is_async == 0) {
+    if !generator.ifs.is_empty() || generator.is_async {
         return;
     }
     let Some(key_id) = helpers::expr_name(key) else {
@@ -94,7 +95,7 @@ pub fn unnecessary_dict_comprehension(
     let Some(value_id) = helpers::expr_name(value) else {
         return;
     };
-    let ExprKind::Tuple { elts, .. } = &generator.target.node else {
+    let Expr::Tuple(ast::ExprTuple { elts, .. }) = &generator.target else {
         return;
     };
     if elts.len() != 2 {
@@ -116,7 +117,7 @@ pub fn unnecessary_dict_comprehension(
 }
 
 /// C416
-pub fn unnecessary_list_set_comprehension(
+pub(crate) fn unnecessary_list_set_comprehension(
     checker: &mut Checker,
     expr: &Expr,
     elt: &Expr,
@@ -126,7 +127,7 @@ pub fn unnecessary_list_set_comprehension(
         return;
     }
     let generator = &generators[0];
-    if !(generator.ifs.is_empty() && generator.is_async == 0) {
+    if !generator.ifs.is_empty() || generator.is_async {
         return;
     }
     let Some(elt_id) = helpers::expr_name(elt) else {
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_comprehension_any_all.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_comprehension_any_all.rs
index 643e409205aec..c3aac344dc3dd 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_comprehension_any_all.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_comprehension_any_all.rs
@@ -1,7 +1,7 @@
-use rustpython_parser::ast::{Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Expr, Keyword, Ranged};
 
-use ruff_diagnostics::AlwaysAutofixableViolation;
-use ruff_diagnostics::Diagnostic;
+use ruff_diagnostics::Violation;
+use ruff_diagnostics::{AutofixKind, Diagnostic};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::any_over_expr;
 
@@ -42,19 +42,21 @@ use crate::rules::flake8_comprehensions::fixes;
 #[violation]
 pub struct UnnecessaryComprehensionAnyAll;
 
-impl AlwaysAutofixableViolation for UnnecessaryComprehensionAnyAll {
+impl Violation for UnnecessaryComprehensionAnyAll {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         format!("Unnecessary list comprehension.")
     }
 
-    fn autofix_title(&self) -> String {
-        "Remove unnecessary list comprehension".to_string()
+    fn autofix_title(&self) -> Option<String> {
+        Some("Remove unnecessary list comprehension".to_string())
     }
 }
 
 /// C419
-pub fn unnecessary_comprehension_any_all(
+pub(crate) fn unnecessary_comprehension_any_all(
     checker: &mut Checker,
     expr: &Expr,
     func: &Expr,
@@ -64,17 +66,17 @@ pub fn unnecessary_comprehension_any_all(
     if !keywords.is_empty() {
         return;
     }
-    let ExprKind::Name { id, .. } = &func.node  else {
+    let Expr::Name(ast::ExprName { id, .. } )= func  else {
         return;
     };
     if (matches!(id.as_str(), "all" | "any")) && args.len() == 1 {
-        let (ExprKind::ListComp { elt, .. } | ExprKind::SetComp { elt, .. }) = &args[0].node else {
+        let (Expr::ListComp(ast::ExprListComp { elt, .. } )| Expr::SetComp(ast::ExprSetComp { elt, .. })) = &args[0] else {
             return;
         };
         if is_async_generator(elt) {
             return;
         }
-        if !checker.ctx.is_builtin(id) {
+        if !checker.semantic_model().is_builtin(id) {
             return;
         }
         let mut diagnostic = Diagnostic::new(UnnecessaryComprehensionAnyAll, args[0].range());
@@ -89,5 +91,5 @@ pub fn unnecessary_comprehension_any_all(
 
 /// Return `true` if the `Expr` contains an `await` expression.
 fn is_async_generator(expr: &Expr) -> bool {
-    any_over_expr(expr, &|expr| matches!(expr.node, ExprKind::Await { .. }))
+    any_over_expr(expr, &|expr| matches!(expr, Expr::Await(_)))
 }
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_double_cast_or_process.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_double_cast_or_process.rs
index 5ff56baa225c4..96cec22cf021a 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_double_cast_or_process.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_double_cast_or_process.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
 use ruff_macros::{derive_message_formats, violation};
@@ -46,8 +46,8 @@ use super::helpers;
 /// - Instead of `sorted(reversed(iterable))`, use `sorted(iterable)`.
 #[violation]
 pub struct UnnecessaryDoubleCastOrProcess {
-    pub inner: String,
-    pub outer: String,
+    inner: String,
+    outer: String,
 }
 
 impl AlwaysAutofixableViolation for UnnecessaryDoubleCastOrProcess {
@@ -64,7 +64,7 @@ impl AlwaysAutofixableViolation for UnnecessaryDoubleCastOrProcess {
 }
 
 /// C414
-pub fn unnecessary_double_cast_or_process(
+pub(crate) fn unnecessary_double_cast_or_process(
     checker: &mut Checker,
     expr: &Expr,
     func: &Expr,
@@ -84,13 +84,13 @@ pub fn unnecessary_double_cast_or_process(
     let Some(arg) = args.first() else {
         return;
     };
-    let ExprKind::Call { func, ..} = &arg.node else {
+    let Expr::Call(ast::ExprCall { func, ..} )= arg else {
         return;
     };
     let Some(inner) = helpers::expr_name(func) else {
         return;
     };
-    if !checker.ctx.is_builtin(inner) || !checker.ctx.is_builtin(outer) {
+    if !checker.semantic_model().is_builtin(inner) || !checker.semantic_model().is_builtin(outer) {
         return;
     }
 
@@ -110,7 +110,8 @@ pub fn unnecessary_double_cast_or_process(
             expr.range(),
         );
         if checker.patch(diagnostic.kind.rule()) {
-            diagnostic.try_set_fix(|| {
+            #[allow(deprecated)]
+            diagnostic.try_set_fix_from_edit(|| {
                 fixes::fix_unnecessary_double_cast_or_process(
                     checker.locator,
                     checker.stylist,
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_dict.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_dict.rs
index 9cc603a25cf41..9b337ea8fd325 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_dict.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_dict.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
 use ruff_macros::{derive_message_formats, violation};
@@ -42,7 +42,7 @@ impl AlwaysAutofixableViolation for UnnecessaryGeneratorDict {
 }
 
 /// C402 (`dict((x, y) for x, y in iterable)`)
-pub fn unnecessary_generator_dict(
+pub(crate) fn unnecessary_generator_dict(
     checker: &mut Checker,
     expr: &Expr,
     parent: Option<&Expr>,
@@ -53,12 +53,13 @@ pub fn unnecessary_generator_dict(
     let Some(argument) = helpers::exactly_one_argument_with_matching_function("dict", func, args, keywords) else {
         return;
     };
-    if let ExprKind::GeneratorExp { elt, .. } = argument {
-        match &elt.node {
-            ExprKind::Tuple { elts, .. } if elts.len() == 2 => {
+    if let Expr::GeneratorExp(ast::ExprGeneratorExp { elt, .. }) = argument {
+        match elt.as_ref() {
+            Expr::Tuple(ast::ExprTuple { elts, .. }) if elts.len() == 2 => {
                 let mut diagnostic = Diagnostic::new(UnnecessaryGeneratorDict, expr.range());
                 if checker.patch(diagnostic.kind.rule()) {
-                    diagnostic.try_set_fix(|| {
+                    #[allow(deprecated)]
+                    diagnostic.try_set_fix_from_edit(|| {
                         fixes::fix_unnecessary_generator_dict(
                             checker.locator,
                             checker.stylist,
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_list.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_list.rs
index d6842674c0b6c..4cdd85512dddc 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_list.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_list.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
 use ruff_macros::{derive_message_formats, violation};
@@ -42,7 +42,7 @@ impl AlwaysAutofixableViolation for UnnecessaryGeneratorList {
 }
 
 /// C400 (`list(generator)`)
-pub fn unnecessary_generator_list(
+pub(crate) fn unnecessary_generator_list(
     checker: &mut Checker,
     expr: &Expr,
     func: &Expr,
@@ -52,13 +52,14 @@ pub fn unnecessary_generator_list(
     let Some(argument) = helpers::exactly_one_argument_with_matching_function("list", func, args, keywords) else {
         return;
     };
-    if !checker.ctx.is_builtin("list") {
+    if !checker.semantic_model().is_builtin("list") {
         return;
     }
-    if let ExprKind::GeneratorExp { .. } = argument {
+    if let Expr::GeneratorExp(_) = argument {
         let mut diagnostic = Diagnostic::new(UnnecessaryGeneratorList, expr.range());
         if checker.patch(diagnostic.kind.rule()) {
-            diagnostic.try_set_fix(|| {
+            #[allow(deprecated)]
+            diagnostic.try_set_fix_from_edit(|| {
                 fixes::fix_unnecessary_generator_list(checker.locator, checker.stylist, expr)
             });
         }
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_set.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_set.rs
index 8d821a73683a7..7f7cf83be2453 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_set.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_set.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
 use ruff_macros::{derive_message_formats, violation};
@@ -42,7 +42,7 @@ impl AlwaysAutofixableViolation for UnnecessaryGeneratorSet {
 }
 
 /// C401 (`set(generator)`)
-pub fn unnecessary_generator_set(
+pub(crate) fn unnecessary_generator_set(
     checker: &mut Checker,
     expr: &Expr,
     parent: Option<&Expr>,
@@ -53,13 +53,14 @@ pub fn unnecessary_generator_set(
     let Some(argument) = helpers::exactly_one_argument_with_matching_function("set", func, args, keywords) else {
         return;
     };
-    if !checker.ctx.is_builtin("set") {
+    if !checker.semantic_model().is_builtin("set") {
         return;
     }
-    if let ExprKind::GeneratorExp { .. } = argument {
+    if let Expr::GeneratorExp(_) = argument {
         let mut diagnostic = Diagnostic::new(UnnecessaryGeneratorSet, expr.range());
         if checker.patch(diagnostic.kind.rule()) {
-            diagnostic.try_set_fix(|| {
+            #[allow(deprecated)]
+            diagnostic.try_set_fix_from_edit(|| {
                 fixes::fix_unnecessary_generator_set(checker.locator, checker.stylist, expr, parent)
             });
         }
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_call.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_call.rs
index cf1730d2404a8..597253875b661 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_call.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_call.rs
@@ -1,17 +1,18 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{Expr, Ranged};
+
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
+use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 use crate::rules::flake8_comprehensions::fixes;
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
-use ruff_macros::{derive_message_formats, violation};
 
 use super::helpers;
 
 /// ## What it does
 /// Checks for unnecessary `list` calls around list comprehensions.
 ///
-/// ## Why is it bad?
+/// ## Why is this bad?
 /// It is redundant to use a `list` call around a list comprehension.
 ///
 /// ## Examples
@@ -38,19 +39,25 @@ impl AlwaysAutofixableViolation for UnnecessaryListCall {
 }
 
 /// C411
-pub fn unnecessary_list_call(checker: &mut Checker, expr: &Expr, func: &Expr, args: &[Expr]) {
+pub(crate) fn unnecessary_list_call(
+    checker: &mut Checker,
+    expr: &Expr,
+    func: &Expr,
+    args: &[Expr],
+) {
     let Some(argument) = helpers::first_argument_with_matching_function("list", func, args) else {
         return;
     };
-    if !checker.ctx.is_builtin("list") {
+    if !checker.semantic_model().is_builtin("list") {
         return;
     }
-    if !matches!(argument, ExprKind::ListComp { .. }) {
+    if !argument.is_list_comp_expr() {
         return;
     }
     let mut diagnostic = Diagnostic::new(UnnecessaryListCall, expr.range());
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.try_set_fix(|| {
+        #[allow(deprecated)]
+        diagnostic.try_set_fix_from_edit(|| {
             fixes::fix_unnecessary_list_call(checker.locator, checker.stylist, expr)
         });
     }
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_dict.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_dict.rs
index 888e99c3273d4..9c6f87873bb4b 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_dict.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_dict.rs
@@ -1,17 +1,18 @@
-use rustpython_parser::ast::{Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Expr, Keyword, Ranged};
+
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
+use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 use crate::rules::flake8_comprehensions::fixes;
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
-use ruff_macros::{derive_message_formats, violation};
 
 use super::helpers;
 
 /// ## What it does
 /// Checks for unnecessary list comprehensions.
 ///
-/// ## Why is it bad?
+/// ## Why is this bad?
 /// It's unnecessary to use a list comprehension inside a call to `dict`,
 /// since there is an equivalent comprehension for this type.
 ///
@@ -39,7 +40,7 @@ impl AlwaysAutofixableViolation for UnnecessaryListComprehensionDict {
 }
 
 /// C404 (`dict([...])`)
-pub fn unnecessary_list_comprehension_dict(
+pub(crate) fn unnecessary_list_comprehension_dict(
     checker: &mut Checker,
     expr: &Expr,
     func: &Expr,
@@ -49,13 +50,13 @@ pub fn unnecessary_list_comprehension_dict(
     let Some(argument) = helpers::exactly_one_argument_with_matching_function("dict", func, args, keywords) else {
         return;
     };
-    if !checker.ctx.is_builtin("dict") {
+    if !checker.semantic_model().is_builtin("dict") {
         return;
     }
-    let ExprKind::ListComp { elt, .. } = &argument else {
+    let Expr::ListComp(ast::ExprListComp { elt, .. }) = argument else {
         return;
     };
-    let ExprKind::Tuple { elts, .. } = &elt.node else {
+    let Expr::Tuple(ast::ExprTuple { elts, .. }) = elt.as_ref() else {
         return;
     };
     if elts.len() != 2 {
@@ -63,7 +64,8 @@ pub fn unnecessary_list_comprehension_dict(
     }
     let mut diagnostic = Diagnostic::new(UnnecessaryListComprehensionDict, expr.range());
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.try_set_fix(|| {
+        #[allow(deprecated)]
+        diagnostic.try_set_fix_from_edit(|| {
             fixes::fix_unnecessary_list_comprehension_dict(checker.locator, checker.stylist, expr)
         });
     }
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_set.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_set.rs
index 61d6739b0db58..b6dc24823ca19 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_set.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_list_comprehension_set.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
 use ruff_macros::{derive_message_formats, violation};
@@ -12,7 +12,7 @@ use super::helpers;
 /// ## What it does
 /// Checks for unnecessary list comprehensions.
 ///
-/// ## Why is it bad?
+/// ## Why is this bad?
 /// It's unnecessary to use a list comprehension inside a call to `set`,
 /// since there is an equivalent comprehension for this type.
 ///
@@ -40,7 +40,7 @@ impl AlwaysAutofixableViolation for UnnecessaryListComprehensionSet {
 }
 
 /// C403 (`set([...])`)
-pub fn unnecessary_list_comprehension_set(
+pub(crate) fn unnecessary_list_comprehension_set(
     checker: &mut Checker,
     expr: &Expr,
     func: &Expr,
@@ -50,13 +50,14 @@ pub fn unnecessary_list_comprehension_set(
     let Some(argument) = helpers::exactly_one_argument_with_matching_function("set", func, args, keywords) else {
         return;
     };
-    if !checker.ctx.is_builtin("set") {
+    if !checker.semantic_model().is_builtin("set") {
         return;
     }
-    if let ExprKind::ListComp { .. } = &argument {
+    if argument.is_list_comp_expr() {
         let mut diagnostic = Diagnostic::new(UnnecessaryListComprehensionSet, expr.range());
         if checker.patch(diagnostic.kind.rule()) {
-            diagnostic.try_set_fix(|| {
+            #[allow(deprecated)]
+            diagnostic.try_set_fix_from_edit(|| {
                 fixes::fix_unnecessary_list_comprehension_set(
                     checker.locator,
                     checker.stylist,
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_dict.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_dict.rs
index 45d6854efd629..5ba588870b423 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_dict.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_dict.rs
@@ -1,17 +1,18 @@
-use rustpython_parser::ast::{Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Expr, Keyword, Ranged};
+
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
+use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 use crate::rules::flake8_comprehensions::fixes;
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
-use ruff_macros::{derive_message_formats, violation};
 
 use super::helpers;
 
 /// ## What it does
 /// Checks for unnecessary `list` or `tuple` literals.
 ///
-/// ## Why is it bad?
+/// ## Why is this bad?
 /// It's unnecessary to use a list or tuple literal within a call to `dict`.
 /// It can be rewritten as a dict literal (`{}`).
 ///
@@ -30,7 +31,7 @@ use super::helpers;
 /// ```
 #[violation]
 pub struct UnnecessaryLiteralDict {
-    pub obj_type: String,
+    obj_type: String,
 }
 
 impl AlwaysAutofixableViolation for UnnecessaryLiteralDict {
@@ -46,7 +47,7 @@ impl AlwaysAutofixableViolation for UnnecessaryLiteralDict {
 }
 
 /// C406 (`dict([(1, 2)])`)
-pub fn unnecessary_literal_dict(
+pub(crate) fn unnecessary_literal_dict(
     checker: &mut Checker,
     expr: &Expr,
     func: &Expr,
@@ -56,18 +57,18 @@ pub fn unnecessary_literal_dict(
     let Some(argument) = helpers::exactly_one_argument_with_matching_function("dict", func, args, keywords) else {
         return;
     };
-    if !checker.ctx.is_builtin("dict") {
+    if !checker.semantic_model().is_builtin("dict") {
         return;
     }
     let (kind, elts) = match argument {
-        ExprKind::Tuple { elts, .. } => ("tuple", elts),
-        ExprKind::List { elts, .. } => ("list", elts),
+        Expr::Tuple(ast::ExprTuple { elts, .. }) => ("tuple", elts),
+        Expr::List(ast::ExprList { elts, .. }) => ("list", elts),
         _ => return,
     };
     // Accept `dict((1, 2), ...))` `dict([(1, 2), ...])`.
     if !elts
         .iter()
-        .all(|elt| matches!(&elt.node, ExprKind::Tuple { elts, .. } if elts.len() == 2))
+        .all(|elt| matches!(&elt, Expr::Tuple(ast::ExprTuple { elts, .. } )if elts.len() == 2))
     {
         return;
     }
@@ -78,7 +79,8 @@ pub fn unnecessary_literal_dict(
         expr.range(),
     );
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.try_set_fix(|| {
+        #[allow(deprecated)]
+        diagnostic.try_set_fix_from_edit(|| {
             fixes::fix_unnecessary_literal_dict(checker.locator, checker.stylist, expr)
         });
     }
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_set.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_set.rs
index 129c26a94e464..86c126dd5a7b2 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_set.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_set.rs
@@ -1,10 +1,11 @@
-use rustpython_parser::ast::{Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{Expr, Keyword, Ranged};
+
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
+use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 use crate::rules::flake8_comprehensions::fixes;
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
-use ruff_macros::{derive_message_formats, violation};
 
 use super::helpers;
 
@@ -12,7 +13,7 @@ use super::helpers;
 /// Checks for `set` calls that take unnecessary `list` or `tuple` literals
 /// as arguments.
 ///
-/// ## Why is it bad?
+/// ## Why is this bad?
 /// It's unnecessary to use a list or tuple literal within a call to `set`.
 /// Instead, the expression can be rewritten as a set literal.
 ///
@@ -31,7 +32,7 @@ use super::helpers;
 /// ```
 #[violation]
 pub struct UnnecessaryLiteralSet {
-    pub obj_type: String,
+    obj_type: String,
 }
 
 impl AlwaysAutofixableViolation for UnnecessaryLiteralSet {
@@ -47,7 +48,7 @@ impl AlwaysAutofixableViolation for UnnecessaryLiteralSet {
 }
 
 /// C405 (`set([1, 2])`)
-pub fn unnecessary_literal_set(
+pub(crate) fn unnecessary_literal_set(
     checker: &mut Checker,
     expr: &Expr,
     func: &Expr,
@@ -57,12 +58,12 @@ pub fn unnecessary_literal_set(
     let Some(argument) = helpers::exactly_one_argument_with_matching_function("set", func, args, keywords) else {
         return;
     };
-    if !checker.ctx.is_builtin("set") {
+    if !checker.semantic_model().is_builtin("set") {
         return;
     }
     let kind = match argument {
-        ExprKind::List { .. } => "list",
-        ExprKind::Tuple { .. } => "tuple",
+        Expr::List(_) => "list",
+        Expr::Tuple(_) => "tuple",
         _ => return,
     };
     let mut diagnostic = Diagnostic::new(
@@ -72,7 +73,8 @@ pub fn unnecessary_literal_set(
         expr.range(),
     );
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.try_set_fix(|| {
+        #[allow(deprecated)]
+        diagnostic.try_set_fix_from_edit(|| {
             fixes::fix_unnecessary_literal_set(checker.locator, checker.stylist, expr)
         });
     }
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_dict_call.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_dict_call.rs
index e4f5520243c5d..cc9ba2d5ce47b 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_dict_call.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_dict_call.rs
@@ -1,6 +1,7 @@
-use rustpython_parser::ast::{Expr, ExprKind, Keyword};
 use std::fmt;
 
+use rustpython_parser::ast::{Expr, Keyword, Ranged};
+
 use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
 use ruff_macros::{derive_message_formats, violation};
 
@@ -11,7 +12,7 @@ use crate::rules::flake8_comprehensions::fixes;
 use super::helpers;
 
 #[derive(Debug, PartialEq, Eq)]
-pub enum DictKind {
+pub(crate) enum DictKind {
     Literal,
     Comprehension,
 }
@@ -29,7 +30,7 @@ impl fmt::Display for DictKind {
 /// Checks for `dict` calls that take unnecessary `dict` literals or `dict`
 /// comprehensions as arguments.
 ///
-/// ## Why is it bad?
+/// ## Why is this bad?
 /// It's unnecessary to wrap a `dict` literal or comprehension within a `dict`
 /// call, since the literal or comprehension syntax already returns a `dict`.
 ///
@@ -46,7 +47,7 @@ impl fmt::Display for DictKind {
 /// ```
 #[violation]
 pub struct UnnecessaryLiteralWithinDictCall {
-    pub kind: DictKind,
+    kind: DictKind,
 }
 
 impl AlwaysAutofixableViolation for UnnecessaryLiteralWithinDictCall {
@@ -62,7 +63,7 @@ impl AlwaysAutofixableViolation for UnnecessaryLiteralWithinDictCall {
 }
 
 /// C418
-pub fn unnecessary_literal_within_dict_call(
+pub(crate) fn unnecessary_literal_within_dict_call(
     checker: &mut Checker,
     expr: &Expr,
     func: &Expr,
@@ -75,12 +76,12 @@ pub fn unnecessary_literal_within_dict_call(
     let Some(argument) = helpers::first_argument_with_matching_function("dict", func, args) else {
         return;
     };
-    if !checker.ctx.is_builtin("dict") {
+    if !checker.semantic_model().is_builtin("dict") {
         return;
     }
     let argument_kind = match argument {
-        ExprKind::DictComp { .. } => DictKind::Comprehension,
-        ExprKind::Dict { .. } => DictKind::Literal,
+        Expr::DictComp(_) => DictKind::Comprehension,
+        Expr::Dict(_) => DictKind::Literal,
         _ => return,
     };
     let mut diagnostic = Diagnostic::new(
@@ -90,7 +91,8 @@ pub fn unnecessary_literal_within_dict_call(
         expr.range(),
     );
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.try_set_fix(|| {
+        #[allow(deprecated)]
+        diagnostic.try_set_fix_from_edit(|| {
             fixes::fix_unnecessary_literal_within_dict_call(checker.locator, checker.stylist, expr)
         });
     }
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_list_call.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_list_call.rs
index 02f8a51052653..d1c240d55fa4e 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_list_call.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_list_call.rs
@@ -1,10 +1,11 @@
-use rustpython_parser::ast::{Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{Expr, Keyword, Ranged};
+
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
+use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 use crate::rules::flake8_comprehensions::fixes;
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
-use ruff_macros::{derive_message_formats, violation};
 
 use super::helpers;
 
@@ -12,7 +13,7 @@ use super::helpers;
 /// Checks for `list` calls that take unnecessary list or tuple literals as
 /// arguments.
 ///
-/// ## Why is it bad?
+/// ## Why is this bad?
 /// It's unnecessary to use a list or tuple literal within a `list()` call,
 /// since there is a literal syntax for these types.
 ///
@@ -33,7 +34,7 @@ use super::helpers;
 /// ```
 #[violation]
 pub struct UnnecessaryLiteralWithinListCall {
-    pub literal: String,
+    literal: String,
 }
 
 impl AlwaysAutofixableViolation for UnnecessaryLiteralWithinListCall {
@@ -65,7 +66,7 @@ impl AlwaysAutofixableViolation for UnnecessaryLiteralWithinListCall {
 }
 
 /// C410
-pub fn unnecessary_literal_within_list_call(
+pub(crate) fn unnecessary_literal_within_list_call(
     checker: &mut Checker,
     expr: &Expr,
     func: &Expr,
@@ -78,12 +79,12 @@ pub fn unnecessary_literal_within_list_call(
     let Some(argument) = helpers::first_argument_with_matching_function("list", func, args) else {
         return;
     };
-    if !checker.ctx.is_builtin("list") {
+    if !checker.semantic_model().is_builtin("list") {
         return;
     }
     let argument_kind = match argument {
-        ExprKind::Tuple { .. } => "tuple",
-        ExprKind::List { .. } => "list",
+        Expr::Tuple(_) => "tuple",
+        Expr::List(_) => "list",
         _ => return,
     };
     let mut diagnostic = Diagnostic::new(
@@ -93,7 +94,8 @@ pub fn unnecessary_literal_within_list_call(
         expr.range(),
     );
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.try_set_fix(|| {
+        #[allow(deprecated)]
+        diagnostic.try_set_fix_from_edit(|| {
             fixes::fix_unnecessary_literal_within_list_call(checker.locator, checker.stylist, expr)
         });
     }
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_tuple_call.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_tuple_call.rs
index 66fe07888ed7e..cd61c1943f97a 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_tuple_call.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_literal_within_tuple_call.rs
@@ -1,10 +1,11 @@
-use rustpython_parser::ast::{Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{Expr, Keyword, Ranged};
+
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
+use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 use crate::rules::flake8_comprehensions::fixes;
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
-use ruff_macros::{derive_message_formats, violation};
 
 use super::helpers;
 
@@ -12,7 +13,7 @@ use super::helpers;
 /// Checks for `tuple` calls that take unnecessary list or tuple literals as
 /// arguments.
 ///
-/// ## Why is it bad?
+/// ## Why is this bad?
 /// It's unnecessary to use a list or tuple literal within a `tuple()` call,
 /// since there is a literal syntax for these types.
 ///
@@ -33,7 +34,7 @@ use super::helpers;
 /// ```
 #[violation]
 pub struct UnnecessaryLiteralWithinTupleCall {
-    pub literal: String,
+    literal: String,
 }
 
 impl AlwaysAutofixableViolation for UnnecessaryLiteralWithinTupleCall {
@@ -66,7 +67,7 @@ impl AlwaysAutofixableViolation for UnnecessaryLiteralWithinTupleCall {
 }
 
 /// C409
-pub fn unnecessary_literal_within_tuple_call(
+pub(crate) fn unnecessary_literal_within_tuple_call(
     checker: &mut Checker,
     expr: &Expr,
     func: &Expr,
@@ -79,12 +80,12 @@ pub fn unnecessary_literal_within_tuple_call(
     let Some(argument) = helpers::first_argument_with_matching_function("tuple", func, args) else {
         return;
     };
-    if !checker.ctx.is_builtin("tuple") {
+    if !checker.semantic_model().is_builtin("tuple") {
         return;
     }
     let argument_kind = match argument {
-        ExprKind::Tuple { .. } => "tuple",
-        ExprKind::List { .. } => "list",
+        Expr::Tuple(_) => "tuple",
+        Expr::List(_) => "list",
         _ => return,
     };
     let mut diagnostic = Diagnostic::new(
@@ -94,7 +95,8 @@ pub fn unnecessary_literal_within_tuple_call(
         expr.range(),
     );
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.try_set_fix(|| {
+        #[allow(deprecated)]
+        diagnostic.try_set_fix_from_edit(|| {
             fixes::fix_unnecessary_literal_within_tuple_call(checker.locator, checker.stylist, expr)
         });
     }
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_map.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_map.rs
index c81adc085e866..086a3137a4a19 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_map.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_map.rs
@@ -1,5 +1,5 @@
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
 use ruff_diagnostics::Diagnostic;
 use ruff_diagnostics::{AutofixKind, Violation};
@@ -40,7 +40,7 @@ use super::helpers;
 ///   `{v: v ** 2 for v in values}`.
 #[violation]
 pub struct UnnecessaryMap {
-    pub obj_type: String,
+    obj_type: String,
 }
 
 impl Violation for UnnecessaryMap {
@@ -56,19 +56,18 @@ impl Violation for UnnecessaryMap {
         }
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        Some(|UnnecessaryMap { obj_type }| {
-            if obj_type == "generator" {
-                format!("Replace `map` using a generator expression")
-            } else {
-                format!("Replace `map` using a `{obj_type}` comprehension")
-            }
+    fn autofix_title(&self) -> Option<String> {
+        let UnnecessaryMap { obj_type } = self;
+        Some(if obj_type == "generator" {
+            format!("Replace `map` using a generator expression")
+        } else {
+            format!("Replace `map` using a `{obj_type}` comprehension")
         })
     }
 }
 
 /// C417
-pub fn unnecessary_map(
+pub(crate) fn unnecessary_map(
     checker: &mut Checker,
     expr: &Expr,
     parent: Option<&Expr>,
@@ -89,25 +88,24 @@ pub fn unnecessary_map(
     };
     match id {
         "map" => {
-            if !checker.ctx.is_builtin(id) {
+            if !checker.semantic_model().is_builtin(id) {
                 return;
             }
 
             // Exclude the parent if already matched by other arms
-            if let Some(parent) = parent {
-                if let ExprKind::Call { func: f, .. } = &parent.node {
-                    if let Some(id_parent) = helpers::expr_name(f) {
-                        if id_parent == "dict" || id_parent == "set" || id_parent == "list" {
-                            return;
-                        }
+            if let Some(Expr::Call(ast::ExprCall { func: f, .. })) = parent {
+                if let Some(id_parent) = helpers::expr_name(f) {
+                    if id_parent == "dict" || id_parent == "set" || id_parent == "list" {
+                        return;
                     }
-                };
+                }
             };
 
-            if args.len() == 2 && matches!(&args[0].node, ExprKind::Lambda { .. }) {
+            if args.len() == 2 && matches!(&args[0], Expr::Lambda(_)) {
                 let mut diagnostic = create_diagnostic("generator", expr.range());
                 if checker.patch(diagnostic.kind.rule()) {
-                    diagnostic.try_set_fix(|| {
+                    #[allow(deprecated)]
+                    diagnostic.try_set_fix_from_edit(|| {
                         fixes::fix_unnecessary_map(
                             checker.locator,
                             checker.stylist,
@@ -121,52 +119,52 @@ pub fn unnecessary_map(
             }
         }
         "list" | "set" => {
-            if !checker.ctx.is_builtin(id) {
+            if !checker.semantic_model().is_builtin(id) {
                 return;
             }
 
-            if let Some(arg) = args.first() {
-                if let ExprKind::Call { func, args, .. } = &arg.node {
-                    if args.len() != 2 {
-                        return;
-                    }
-                    let Some(argument) = helpers::first_argument_with_matching_function("map", func, args) else {
+            if let Some(Expr::Call(ast::ExprCall { func, args, .. })) = args.first() {
+                if args.len() != 2 {
+                    return;
+                }
+                let Some(argument) = helpers::first_argument_with_matching_function("map", func, args) else {
                         return;
                     };
-                    if let ExprKind::Lambda { .. } = argument {
-                        let mut diagnostic = create_diagnostic(id, expr.range());
-                        if checker.patch(diagnostic.kind.rule()) {
-                            diagnostic.try_set_fix(|| {
-                                fixes::fix_unnecessary_map(
-                                    checker.locator,
-                                    checker.stylist,
-                                    expr,
-                                    parent,
-                                    id,
-                                )
-                            });
-                        }
-                        checker.diagnostics.push(diagnostic);
+                if let Expr::Lambda(_) = argument {
+                    let mut diagnostic = create_diagnostic(id, expr.range());
+                    if checker.patch(diagnostic.kind.rule()) {
+                        #[allow(deprecated)]
+                        diagnostic.try_set_fix_from_edit(|| {
+                            fixes::fix_unnecessary_map(
+                                checker.locator,
+                                checker.stylist,
+                                expr,
+                                parent,
+                                id,
+                            )
+                        });
                     }
+                    checker.diagnostics.push(diagnostic);
                 }
             }
         }
         "dict" => {
-            if !checker.ctx.is_builtin(id) {
+            if !checker.semantic_model().is_builtin(id) {
                 return;
             }
 
             if args.len() == 1 {
-                if let ExprKind::Call { func, args, .. } = &args[0].node {
+                if let Expr::Call(ast::ExprCall { func, args, .. }) = &args[0] {
                     let Some(argument) = helpers::first_argument_with_matching_function("map", func, args) else {
                         return;
                     };
-                    if let ExprKind::Lambda { body, .. } = &argument {
-                        if matches!(&body.node, ExprKind::Tuple { elts, .. } | ExprKind::List { elts, .. } if elts.len() == 2)
+                    if let Expr::Lambda(ast::ExprLambda { body, .. }) = argument {
+                        if matches!(body.as_ref(), Expr::Tuple(ast::ExprTuple { elts, .. }) | Expr::List(ast::ExprList { elts, .. } ) if elts.len() == 2)
                         {
                             let mut diagnostic = create_diagnostic(id, expr.range());
                             if checker.patch(diagnostic.kind.rule()) {
-                                diagnostic.try_set_fix(|| {
+                                #[allow(deprecated)]
+                                diagnostic.try_set_fix_from_edit(|| {
                                     fixes::fix_unnecessary_map(
                                         checker.locator,
                                         checker.stylist,
diff --git a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_subscript_reversal.rs b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_subscript_reversal.rs
index 26a66120dd882..8659025978038 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_subscript_reversal.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_subscript_reversal.rs
@@ -1,16 +1,17 @@
 use num_bigint::BigInt;
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Unaryop};
+use rustpython_parser::ast::{self, Constant, Expr, Ranged, Unaryop};
 
-use crate::checkers::ast::Checker;
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
+use crate::checkers::ast::Checker;
+
 use super::helpers;
 
 /// ## What it does
 /// Checks for unnecessary subscript reversal of iterable.
 ///
-/// ## Why is it bad?
+/// ## Why is this bad?
 /// It's unnecessary to reverse the order of an iterable when passing it
 /// into `reversed()`, `set()` or `sorted()` functions as they will change
 /// the order of the elements again.
@@ -30,7 +31,7 @@ use super::helpers;
 /// ```
 #[violation]
 pub struct UnnecessarySubscriptReversal {
-    pub func: String,
+    func: String,
 }
 
 impl Violation for UnnecessarySubscriptReversal {
@@ -42,7 +43,7 @@ impl Violation for UnnecessarySubscriptReversal {
 }
 
 /// C415
-pub fn unnecessary_subscript_reversal(
+pub(crate) fn unnecessary_subscript_reversal(
     checker: &mut Checker,
     expr: &Expr,
     func: &Expr,
@@ -57,13 +58,13 @@ pub fn unnecessary_subscript_reversal(
     if !(id == "set" || id == "sorted" || id == "reversed") {
         return;
     }
-    if !checker.ctx.is_builtin(id) {
+    if !checker.semantic_model().is_builtin(id) {
         return;
     }
-    let ExprKind::Subscript { slice, .. } = &first_arg.node else {
+    let Expr::Subscript(ast::ExprSubscript { slice, .. }) = first_arg else {
         return;
     };
-    let ExprKind::Slice { lower, upper, step } = &slice.node else {
+    let Expr::Slice(ast::ExprSlice { lower, upper, step, range: _ }) = slice.as_ref() else {
             return;
         };
     if lower.is_some() || upper.is_some() {
@@ -72,16 +73,17 @@ pub fn unnecessary_subscript_reversal(
     let Some(step) = step.as_ref() else {
         return;
     };
-    let ExprKind::UnaryOp {
+    let Expr::UnaryOp(ast::ExprUnaryOp {
         op: Unaryop::USub,
         operand,
-    } = &step.node else {
+        range: _,
+    }) = step.as_ref() else {
         return;
     };
-    let ExprKind::Constant {
+    let Expr::Constant(ast::ExprConstant {
         value: Constant::Int(val),
         ..
-    } = &operand.node else {
+    }) = operand.as_ref() else {
         return;
     };
     if *val != BigInt::from(1) {
diff --git a/crates/ruff/src/rules/flake8_comprehensions/settings.rs b/crates/ruff/src/rules/flake8_comprehensions/settings.rs
index 74457e1bc3908..bc063f1922193 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/settings.rs
+++ b/crates/ruff/src/rules/flake8_comprehensions/settings.rs
@@ -1,18 +1,18 @@
 //! Settings for the `flake8-comprehensions` plugin.
 
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::{CacheKey, ConfigurationOptions};
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
 
 #[derive(
-    Debug, PartialEq, Eq, Default, Serialize, Deserialize, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Default, Serialize, Deserialize, ConfigurationOptions, CombineOptions,
 )]
 #[serde(
     deny_unknown_fields,
     rename_all = "kebab-case",
     rename = "Flake8ComprehensionsOptions"
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = "false",
diff --git a/crates/ruff/src/rules/flake8_comprehensions/snapshots/ruff__rules__flake8_comprehensions__tests__C413_C413.py.snap b/crates/ruff/src/rules/flake8_comprehensions/snapshots/ruff__rules__flake8_comprehensions__tests__C413_C413.py.snap
index 84cf1eaf9ab86..73baaa3809273 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/snapshots/ruff__rules__flake8_comprehensions__tests__C413_C413.py.snap
+++ b/crates/ruff/src/rules/flake8_comprehensions/snapshots/ruff__rules__flake8_comprehensions__tests__C413_C413.py.snap
@@ -12,7 +12,7 @@ C413.py:3:1: C413 [*] Unnecessary `list` call around `sorted()`
   |
   = help: Remove unnecessary `list` call
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | x = [2, 3, 1]
 2 2 | list(x)
 3   |-list(sorted(x))
diff --git a/crates/ruff/src/rules/flake8_comprehensions/snapshots/ruff__rules__flake8_comprehensions__tests__C417_C417.py.snap b/crates/ruff/src/rules/flake8_comprehensions/snapshots/ruff__rules__flake8_comprehensions__tests__C417_C417.py.snap
index ac28429f7c19a..2d40163caed9e 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/snapshots/ruff__rules__flake8_comprehensions__tests__C417_C417.py.snap
+++ b/crates/ruff/src/rules/flake8_comprehensions/snapshots/ruff__rules__flake8_comprehensions__tests__C417_C417.py.snap
@@ -249,7 +249,7 @@ C417.py:16:8: C417 [*] Unnecessary `map` usage (rewrite using a `dict` comprehen
 18 18 | # Error, but unfixable.
 19 19 | # For simple expressions, this could be: `(x if x else 1 for x in nums)`.
 
-C417.py:21:1: C417 [*] Unnecessary `map` usage (rewrite using a generator expression)
+C417.py:21:1: C417 Unnecessary `map` usage (rewrite using a generator expression)
    |
 21 | # For simple expressions, this could be: `(x if x else 1 for x in nums)`.
 22 | # For more complex expressions, this would differ: `(x + 2 if x else 3 for x in nums)`.
diff --git a/crates/ruff/src/rules/flake8_comprehensions/snapshots/ruff__rules__flake8_comprehensions__tests__C419_C419.py.snap b/crates/ruff/src/rules/flake8_comprehensions/snapshots/ruff__rules__flake8_comprehensions__tests__C419_C419.py.snap
index 47df13091cd9e..fa52fc24befa5 100644
--- a/crates/ruff/src/rules/flake8_comprehensions/snapshots/ruff__rules__flake8_comprehensions__tests__C419_C419.py.snap
+++ b/crates/ruff/src/rules/flake8_comprehensions/snapshots/ruff__rules__flake8_comprehensions__tests__C419_C419.py.snap
@@ -77,7 +77,7 @@ C419.py:7:5: C419 [*] Unnecessary list comprehension.
 9 9 | any({x.id for x in bar})
 10 10 | 
 
-C419.py:9:5: C419 [*] Unnecessary list comprehension.
+C419.py:9:5: C419 Unnecessary list comprehension.
    |
  9 |     [x.id for x in bar],  # second comment
 10 | )  # third comment
@@ -88,4 +88,67 @@ C419.py:9:5: C419 [*] Unnecessary list comprehension.
    |
    = help: Remove unnecessary list comprehension
 
+C419.py:24:5: C419 [*] Unnecessary list comprehension.
+   |
+24 |   # Special comment handling
+25 |   any(
+26 |       [  # lbracket comment
+   |  _____^
+27 | |         # second line comment
+28 | |         i.bit_count()
+29 | |         # random middle comment
+30 | |         for i in range(5)  # rbracket comment
+31 | |     ]  # rpar comment
+   | |_____^ C419
+32 |       # trailing comment
+33 |   )
+   |
+   = help: Remove unnecessary list comprehension
+
+ℹ Suggested fix
+21 21 | 
+22 22 | # Special comment handling
+23 23 | any(
+24    |-    [  # lbracket comment
+25    |-        # second line comment
+26    |-        i.bit_count()
+   24 |+    # lbracket comment
+   25 |+    # second line comment
+   26 |+    i.bit_count()
+27 27 |         # random middle comment
+28    |-        for i in range(5)  # rbracket comment
+29    |-    ]  # rpar comment
+   28 |+        for i in range(5)  # rbracket comment  # rpar comment
+30 29 |     # trailing comment
+31 30 | )
+32 31 | 
+
+C419.py:35:5: C419 [*] Unnecessary list comprehension.
+   |
+35 |   # Weird case where the function call, opening bracket, and comment are all
+36 |   # on the same line.
+37 |   any([  # lbracket comment
+   |  _____^
+38 | |         # second line comment
+39 | |         i.bit_count() for i in range(5)  # rbracket comment
+40 | |     ]  # rpar comment
+   | |_____^ C419
+41 |   )
+   |
+   = help: Remove unnecessary list comprehension
+
+ℹ Suggested fix
+32 32 | 
+33 33 | # Weird case where the function call, opening bracket, and comment are all
+34 34 | # on the same line.
+35    |-any([  # lbracket comment
+36    |-        # second line comment
+37    |-        i.bit_count() for i in range(5)  # rbracket comment
+38    |-    ]  # rpar comment
+   35 |+any(
+   36 |+# lbracket comment
+   37 |+# second line comment
+   38 |+i.bit_count() for i in range(5)  # rbracket comment  # rpar comment
+39 39 | )
+
 
diff --git a/crates/ruff/src/rules/flake8_datetimez/mod.rs b/crates/ruff/src/rules/flake8_datetimez/mod.rs
index d2d22010eba85..d8af5d3691aa2 100644
--- a/crates/ruff/src/rules/flake8_datetimez/mod.rs
+++ b/crates/ruff/src/rules/flake8_datetimez/mod.rs
@@ -6,22 +6,21 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::CallDatetimeWithoutTzinfo, Path::new("DTZ001.py"); "DTZ001")]
-    #[test_case(Rule::CallDatetimeToday, Path::new("DTZ002.py"); "DTZ002")]
-    #[test_case(Rule::CallDatetimeUtcnow, Path::new("DTZ003.py"); "DTZ003")]
-    #[test_case(Rule::CallDatetimeUtcfromtimestamp, Path::new("DTZ004.py"); "DTZ004")]
-    #[test_case(Rule::CallDatetimeNowWithoutTzinfo, Path::new("DTZ005.py"); "DTZ005")]
-    #[test_case(Rule::CallDatetimeFromtimestamp, Path::new("DTZ006.py"); "DTZ006")]
-    #[test_case(Rule::CallDatetimeStrptimeWithoutZone, Path::new("DTZ007.py"); "DTZ007")]
-    #[test_case(Rule::CallDateToday, Path::new("DTZ011.py"); "DTZ011")]
-    #[test_case(Rule::CallDateFromtimestamp, Path::new("DTZ012.py"); "DTZ012")]
+    #[test_case(Rule::CallDatetimeWithoutTzinfo, Path::new("DTZ001.py"))]
+    #[test_case(Rule::CallDatetimeToday, Path::new("DTZ002.py"))]
+    #[test_case(Rule::CallDatetimeUtcnow, Path::new("DTZ003.py"))]
+    #[test_case(Rule::CallDatetimeUtcfromtimestamp, Path::new("DTZ004.py"))]
+    #[test_case(Rule::CallDatetimeNowWithoutTzinfo, Path::new("DTZ005.py"))]
+    #[test_case(Rule::CallDatetimeFromtimestamp, Path::new("DTZ006.py"))]
+    #[test_case(Rule::CallDatetimeStrptimeWithoutZone, Path::new("DTZ007.py"))]
+    #[test_case(Rule::CallDateToday, Path::new("DTZ011.py"))]
+    #[test_case(Rule::CallDateFromtimestamp, Path::new("DTZ012.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_datetimez/rules.rs b/crates/ruff/src/rules/flake8_datetimez/rules.rs
deleted file mode 100644
index 7cdca81647ee1..0000000000000
--- a/crates/ruff/src/rules/flake8_datetimez/rules.rs
+++ /dev/null
@@ -1,397 +0,0 @@
-use ruff_text_size::TextRange;
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword};
-
-use ruff_diagnostics::{Diagnostic, Violation};
-use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::{has_non_none_keyword, is_const_none};
-
-use crate::checkers::ast::Checker;
-
-#[violation]
-pub struct CallDatetimeWithoutTzinfo;
-
-impl Violation for CallDatetimeWithoutTzinfo {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("The use of `datetime.datetime()` without `tzinfo` argument is not allowed")
-    }
-}
-
-#[violation]
-pub struct CallDatetimeToday;
-
-impl Violation for CallDatetimeToday {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!(
-            "The use of `datetime.datetime.today()` is not allowed, use \
-             `datetime.datetime.now(tz=)` instead"
-        )
-    }
-}
-
-#[violation]
-pub struct CallDatetimeUtcnow;
-
-impl Violation for CallDatetimeUtcnow {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!(
-            "The use of `datetime.datetime.utcnow()` is not allowed, use \
-             `datetime.datetime.now(tz=)` instead"
-        )
-    }
-}
-
-#[violation]
-pub struct CallDatetimeUtcfromtimestamp;
-
-impl Violation for CallDatetimeUtcfromtimestamp {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!(
-            "The use of `datetime.datetime.utcfromtimestamp()` is not allowed, use \
-             `datetime.datetime.fromtimestamp(ts, tz=)` instead"
-        )
-    }
-}
-
-#[violation]
-pub struct CallDatetimeNowWithoutTzinfo;
-
-impl Violation for CallDatetimeNowWithoutTzinfo {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("The use of `datetime.datetime.now()` without `tz` argument is not allowed")
-    }
-}
-
-#[violation]
-pub struct CallDatetimeFromtimestamp;
-
-impl Violation for CallDatetimeFromtimestamp {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!(
-            "The use of `datetime.datetime.fromtimestamp()` without `tz` argument is not allowed"
-        )
-    }
-}
-
-#[violation]
-pub struct CallDatetimeStrptimeWithoutZone;
-
-impl Violation for CallDatetimeStrptimeWithoutZone {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!(
-            "The use of `datetime.datetime.strptime()` without %z must be followed by \
-             `.replace(tzinfo=)` or `.astimezone()`"
-        )
-    }
-}
-
-#[violation]
-pub struct CallDateToday;
-
-impl Violation for CallDateToday {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!(
-            "The use of `datetime.date.today()` is not allowed, use \
-             `datetime.datetime.now(tz=).date()` instead"
-        )
-    }
-}
-
-#[violation]
-pub struct CallDateFromtimestamp;
-
-impl Violation for CallDateFromtimestamp {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!(
-            "The use of `datetime.date.fromtimestamp()` is not allowed, use \
-             `datetime.datetime.fromtimestamp(ts, tz=).date()` instead"
-        )
-    }
-}
-
-pub fn call_datetime_without_tzinfo(
-    checker: &mut Checker,
-    func: &Expr,
-    args: &[Expr],
-    keywords: &[Keyword],
-    location: TextRange,
-) {
-    if !checker
-        .ctx
-        .resolve_call_path(func)
-        .map_or(false, |call_path| {
-            call_path.as_slice() == ["datetime", "datetime"]
-        })
-    {
-        return;
-    }
-
-    // No positional arg: keyword is missing or constant None.
-    if args.len() < 8 && !has_non_none_keyword(keywords, "tzinfo") {
-        checker
-            .diagnostics
-            .push(Diagnostic::new(CallDatetimeWithoutTzinfo, location));
-        return;
-    }
-
-    // Positional arg: is constant None.
-    if args.len() >= 8 && is_const_none(&args[7]) {
-        checker
-            .diagnostics
-            .push(Diagnostic::new(CallDatetimeWithoutTzinfo, location));
-    }
-}
-
-/// Checks for `datetime.datetime.today()`. (DTZ002)
-///
-/// ## Why is this bad?
-///
-/// It uses the system local timezone.
-/// Use `datetime.datetime.now(tz=)` instead.
-pub fn call_datetime_today(checker: &mut Checker, func: &Expr, location: TextRange) {
-    if checker
-        .ctx
-        .resolve_call_path(func)
-        .map_or(false, |call_path| {
-            call_path.as_slice() == ["datetime", "datetime", "today"]
-        })
-    {
-        checker
-            .diagnostics
-            .push(Diagnostic::new(CallDatetimeToday, location));
-    }
-}
-
-/// Checks for `datetime.datetime.today()`. (DTZ003)
-///
-/// ## Why is this bad?
-///
-/// Because naive `datetime` objects are treated by many `datetime` methods as
-/// local times, it is preferred to use aware datetimes to represent times in
-/// UTC. As such, the recommended way to create an object representing the
-/// current time in UTC is by calling `datetime.now(timezone.utc)`.
-pub fn call_datetime_utcnow(checker: &mut Checker, func: &Expr, location: TextRange) {
-    if checker
-        .ctx
-        .resolve_call_path(func)
-        .map_or(false, |call_path| {
-            call_path.as_slice() == ["datetime", "datetime", "utcnow"]
-        })
-    {
-        checker
-            .diagnostics
-            .push(Diagnostic::new(CallDatetimeUtcnow, location));
-    }
-}
-
-/// Checks for `datetime.datetime.utcfromtimestamp()`. (DTZ004)
-///
-/// ## Why is this bad?
-///
-/// Because naive `datetime` objects are treated by many `datetime` methods as
-/// local times, it is preferred to use aware datetimes to represent times in
-/// UTC. As such, the recommended way to create an object representing a
-/// specific timestamp in UTC is by calling `datetime.fromtimestamp(timestamp,
-/// tz=timezone.utc)`.
-pub fn call_datetime_utcfromtimestamp(checker: &mut Checker, func: &Expr, location: TextRange) {
-    if checker
-        .ctx
-        .resolve_call_path(func)
-        .map_or(false, |call_path| {
-            call_path.as_slice() == ["datetime", "datetime", "utcfromtimestamp"]
-        })
-    {
-        checker
-            .diagnostics
-            .push(Diagnostic::new(CallDatetimeUtcfromtimestamp, location));
-    }
-}
-
-/// DTZ005
-pub fn call_datetime_now_without_tzinfo(
-    checker: &mut Checker,
-    func: &Expr,
-    args: &[Expr],
-    keywords: &[Keyword],
-    location: TextRange,
-) {
-    if !checker
-        .ctx
-        .resolve_call_path(func)
-        .map_or(false, |call_path| {
-            call_path.as_slice() == ["datetime", "datetime", "now"]
-        })
-    {
-        return;
-    }
-
-    // no args / no args unqualified
-    if args.is_empty() && keywords.is_empty() {
-        checker
-            .diagnostics
-            .push(Diagnostic::new(CallDatetimeNowWithoutTzinfo, location));
-        return;
-    }
-
-    // none args
-    if !args.is_empty() && is_const_none(&args[0]) {
-        checker
-            .diagnostics
-            .push(Diagnostic::new(CallDatetimeNowWithoutTzinfo, location));
-        return;
-    }
-
-    // wrong keywords / none keyword
-    if !keywords.is_empty() && !has_non_none_keyword(keywords, "tz") {
-        checker
-            .diagnostics
-            .push(Diagnostic::new(CallDatetimeNowWithoutTzinfo, location));
-    }
-}
-
-/// DTZ006
-pub fn call_datetime_fromtimestamp(
-    checker: &mut Checker,
-    func: &Expr,
-    args: &[Expr],
-    keywords: &[Keyword],
-    location: TextRange,
-) {
-    if !checker
-        .ctx
-        .resolve_call_path(func)
-        .map_or(false, |call_path| {
-            call_path.as_slice() == ["datetime", "datetime", "fromtimestamp"]
-        })
-    {
-        return;
-    }
-
-    // no args / no args unqualified
-    if args.len() < 2 && keywords.is_empty() {
-        checker
-            .diagnostics
-            .push(Diagnostic::new(CallDatetimeFromtimestamp, location));
-        return;
-    }
-
-    // none args
-    if args.len() > 1 && is_const_none(&args[1]) {
-        checker
-            .diagnostics
-            .push(Diagnostic::new(CallDatetimeFromtimestamp, location));
-        return;
-    }
-
-    // wrong keywords / none keyword
-    if !keywords.is_empty() && !has_non_none_keyword(keywords, "tz") {
-        checker
-            .diagnostics
-            .push(Diagnostic::new(CallDatetimeFromtimestamp, location));
-    }
-}
-
-/// DTZ007
-pub fn call_datetime_strptime_without_zone(
-    checker: &mut Checker,
-    func: &Expr,
-    args: &[Expr],
-    location: TextRange,
-) {
-    if !checker
-        .ctx
-        .resolve_call_path(func)
-        .map_or(false, |call_path| {
-            call_path.as_slice() == ["datetime", "datetime", "strptime"]
-        })
-    {
-        return;
-    }
-
-    // Does the `strptime` call contain a format string with a timezone specifier?
-    if let Some(ExprKind::Constant {
-        value: Constant::Str(format),
-        kind: None,
-    }) = args.get(1).as_ref().map(|arg| &arg.node)
-    {
-        if format.contains("%z") {
-            return;
-        }
-    };
-
-    let (Some(grandparent), Some(parent)) = (checker.ctx.current_expr_grandparent(), checker.ctx.current_expr_parent()) else {
-        checker.diagnostics.push(Diagnostic::new(
-            CallDatetimeStrptimeWithoutZone,
-            location,
-        ));
-        return;
-    };
-
-    if let ExprKind::Call { keywords, .. } = &grandparent.node {
-        if let ExprKind::Attribute { attr, .. } = &parent.node {
-            // Ex) `datetime.strptime(...).astimezone()`
-            if attr == "astimezone" {
-                return;
-            }
-
-            // Ex) `datetime.strptime(...).replace(tzinfo=UTC)`
-            if attr == "replace" {
-                if has_non_none_keyword(keywords, "tzinfo") {
-                    return;
-                }
-            }
-        }
-    }
-
-    checker
-        .diagnostics
-        .push(Diagnostic::new(CallDatetimeStrptimeWithoutZone, location));
-}
-
-/// Checks for `datetime.date.today()`. (DTZ011)
-///
-/// ## Why is this bad?
-///
-/// It uses the system local timezone.
-/// Use `datetime.datetime.now(tz=).date()` instead.
-pub fn call_date_today(checker: &mut Checker, func: &Expr, location: TextRange) {
-    if checker
-        .ctx
-        .resolve_call_path(func)
-        .map_or(false, |call_path| {
-            call_path.as_slice() == ["datetime", "date", "today"]
-        })
-    {
-        checker
-            .diagnostics
-            .push(Diagnostic::new(CallDateToday, location));
-    }
-}
-
-/// Checks for `datetime.date.fromtimestamp()`. (DTZ012)
-///
-/// ## Why is this bad?
-///
-/// It uses the system local timezone.
-/// Use `datetime.datetime.fromtimestamp(, tz=).date()` instead.
-pub fn call_date_fromtimestamp(checker: &mut Checker, func: &Expr, location: TextRange) {
-    if checker
-        .ctx
-        .resolve_call_path(func)
-        .map_or(false, |call_path| {
-            call_path.as_slice() == ["datetime", "date", "fromtimestamp"]
-        })
-    {
-        checker
-            .diagnostics
-            .push(Diagnostic::new(CallDateFromtimestamp, location));
-    }
-}
diff --git a/crates/ruff/src/rules/flake8_datetimez/rules/call_date_fromtimestamp.rs b/crates/ruff/src/rules/flake8_datetimez/rules/call_date_fromtimestamp.rs
new file mode 100644
index 0000000000000..30298012163f7
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_datetimez/rules/call_date_fromtimestamp.rs
@@ -0,0 +1,40 @@
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::Expr;
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+#[violation]
+pub struct CallDateFromtimestamp;
+
+impl Violation for CallDateFromtimestamp {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!(
+            "The use of `datetime.date.fromtimestamp()` is not allowed, use \
+             `datetime.datetime.fromtimestamp(ts, tz=).date()` instead"
+        )
+    }
+}
+
+/// Checks for `datetime.date.fromtimestamp()`. (DTZ012)
+///
+/// ## Why is this bad?
+///
+/// It uses the system local timezone.
+/// Use `datetime.datetime.fromtimestamp(, tz=).date()` instead.
+pub(crate) fn call_date_fromtimestamp(checker: &mut Checker, func: &Expr, location: TextRange) {
+    if checker
+        .semantic_model()
+        .resolve_call_path(func)
+        .map_or(false, |call_path| {
+            call_path.as_slice() == ["datetime", "date", "fromtimestamp"]
+        })
+    {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(CallDateFromtimestamp, location));
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_datetimez/rules/call_date_today.rs b/crates/ruff/src/rules/flake8_datetimez/rules/call_date_today.rs
new file mode 100644
index 0000000000000..461fa067618f3
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_datetimez/rules/call_date_today.rs
@@ -0,0 +1,40 @@
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::Expr;
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+#[violation]
+pub struct CallDateToday;
+
+impl Violation for CallDateToday {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!(
+            "The use of `datetime.date.today()` is not allowed, use \
+             `datetime.datetime.now(tz=).date()` instead"
+        )
+    }
+}
+
+/// Checks for `datetime.date.today()`. (DTZ011)
+///
+/// ## Why is this bad?
+///
+/// It uses the system local timezone.
+/// Use `datetime.datetime.now(tz=).date()` instead.
+pub(crate) fn call_date_today(checker: &mut Checker, func: &Expr, location: TextRange) {
+    if checker
+        .semantic_model()
+        .resolve_call_path(func)
+        .map_or(false, |call_path| {
+            call_path.as_slice() == ["datetime", "date", "today"]
+        })
+    {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(CallDateToday, location));
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_fromtimestamp.rs b/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_fromtimestamp.rs
new file mode 100644
index 0000000000000..4ff08ba885dee
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_fromtimestamp.rs
@@ -0,0 +1,62 @@
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{Expr, Keyword};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::helpers::{has_non_none_keyword, is_const_none};
+
+use crate::checkers::ast::Checker;
+
+#[violation]
+pub struct CallDatetimeFromtimestamp;
+
+impl Violation for CallDatetimeFromtimestamp {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!(
+            "The use of `datetime.datetime.fromtimestamp()` without `tz` argument is not allowed"
+        )
+    }
+}
+
+/// DTZ006
+pub(crate) fn call_datetime_fromtimestamp(
+    checker: &mut Checker,
+    func: &Expr,
+    args: &[Expr],
+    keywords: &[Keyword],
+    location: TextRange,
+) {
+    if !checker
+        .semantic_model()
+        .resolve_call_path(func)
+        .map_or(false, |call_path| {
+            call_path.as_slice() == ["datetime", "datetime", "fromtimestamp"]
+        })
+    {
+        return;
+    }
+
+    // no args / no args unqualified
+    if args.len() < 2 && keywords.is_empty() {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(CallDatetimeFromtimestamp, location));
+        return;
+    }
+
+    // none args
+    if args.len() > 1 && is_const_none(&args[1]) {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(CallDatetimeFromtimestamp, location));
+        return;
+    }
+
+    // wrong keywords / none keyword
+    if !keywords.is_empty() && !has_non_none_keyword(keywords, "tz") {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(CallDatetimeFromtimestamp, location));
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_now_without_tzinfo.rs b/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_now_without_tzinfo.rs
new file mode 100644
index 0000000000000..46202fb6a2ba6
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_now_without_tzinfo.rs
@@ -0,0 +1,60 @@
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{Expr, Keyword};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::helpers::{has_non_none_keyword, is_const_none};
+
+use crate::checkers::ast::Checker;
+
+#[violation]
+pub struct CallDatetimeNowWithoutTzinfo;
+
+impl Violation for CallDatetimeNowWithoutTzinfo {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("The use of `datetime.datetime.now()` without `tz` argument is not allowed")
+    }
+}
+
+/// DTZ005
+pub(crate) fn call_datetime_now_without_tzinfo(
+    checker: &mut Checker,
+    func: &Expr,
+    args: &[Expr],
+    keywords: &[Keyword],
+    location: TextRange,
+) {
+    if !checker
+        .semantic_model()
+        .resolve_call_path(func)
+        .map_or(false, |call_path| {
+            call_path.as_slice() == ["datetime", "datetime", "now"]
+        })
+    {
+        return;
+    }
+
+    // no args / no args unqualified
+    if args.is_empty() && keywords.is_empty() {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(CallDatetimeNowWithoutTzinfo, location));
+        return;
+    }
+
+    // none args
+    if !args.is_empty() && is_const_none(&args[0]) {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(CallDatetimeNowWithoutTzinfo, location));
+        return;
+    }
+
+    // wrong keywords / none keyword
+    if !keywords.is_empty() && !has_non_none_keyword(keywords, "tz") {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(CallDatetimeNowWithoutTzinfo, location));
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_strptime_without_zone.rs b/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_strptime_without_zone.rs
new file mode 100644
index 0000000000000..2cc4fb0b996a6
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_strptime_without_zone.rs
@@ -0,0 +1,80 @@
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Constant, Expr};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::helpers::has_non_none_keyword;
+
+use crate::checkers::ast::Checker;
+
+#[violation]
+pub struct CallDatetimeStrptimeWithoutZone;
+
+impl Violation for CallDatetimeStrptimeWithoutZone {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!(
+            "The use of `datetime.datetime.strptime()` without %z must be followed by \
+             `.replace(tzinfo=)` or `.astimezone()`"
+        )
+    }
+}
+
+/// DTZ007
+pub(crate) fn call_datetime_strptime_without_zone(
+    checker: &mut Checker,
+    func: &Expr,
+    args: &[Expr],
+    location: TextRange,
+) {
+    if !checker
+        .semantic_model()
+        .resolve_call_path(func)
+        .map_or(false, |call_path| {
+            call_path.as_slice() == ["datetime", "datetime", "strptime"]
+        })
+    {
+        return;
+    }
+
+    // Does the `strptime` call contain a format string with a timezone specifier?
+    if let Some(Expr::Constant(ast::ExprConstant {
+        value: Constant::Str(format),
+        kind: None,
+        range: _,
+    })) = args.get(1).as_ref()
+    {
+        if format.contains("%z") {
+            return;
+        }
+    };
+
+    let (Some(grandparent), Some(parent)) = (checker.semantic_model().expr_grandparent(), checker.semantic_model().expr_parent()) else {
+        checker.diagnostics.push(Diagnostic::new(
+            CallDatetimeStrptimeWithoutZone,
+            location,
+        ));
+        return;
+    };
+
+    if let Expr::Call(ast::ExprCall { keywords, .. }) = grandparent {
+        if let Expr::Attribute(ast::ExprAttribute { attr, .. }) = parent {
+            let attr = attr.as_str();
+            // Ex) `datetime.strptime(...).astimezone()`
+            if attr == "astimezone" {
+                return;
+            }
+
+            // Ex) `datetime.strptime(...).replace(tzinfo=UTC)`
+            if attr == "replace" {
+                if has_non_none_keyword(keywords, "tzinfo") {
+                    return;
+                }
+            }
+        }
+    }
+
+    checker
+        .diagnostics
+        .push(Diagnostic::new(CallDatetimeStrptimeWithoutZone, location));
+}
diff --git a/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_today.rs b/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_today.rs
new file mode 100644
index 0000000000000..5c42c7c176b48
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_today.rs
@@ -0,0 +1,40 @@
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::Expr;
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+#[violation]
+pub struct CallDatetimeToday;
+
+impl Violation for CallDatetimeToday {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!(
+            "The use of `datetime.datetime.today()` is not allowed, use \
+             `datetime.datetime.now(tz=)` instead"
+        )
+    }
+}
+
+/// Checks for `datetime.datetime.today()`. (DTZ002)
+///
+/// ## Why is this bad?
+///
+/// It uses the system local timezone.
+/// Use `datetime.datetime.now(tz=)` instead.
+pub(crate) fn call_datetime_today(checker: &mut Checker, func: &Expr, location: TextRange) {
+    if checker
+        .semantic_model()
+        .resolve_call_path(func)
+        .map_or(false, |call_path| {
+            call_path.as_slice() == ["datetime", "datetime", "today"]
+        })
+    {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(CallDatetimeToday, location));
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_utcfromtimestamp.rs b/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_utcfromtimestamp.rs
new file mode 100644
index 0000000000000..ffa73e5416b4f
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_utcfromtimestamp.rs
@@ -0,0 +1,47 @@
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::Expr;
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+#[violation]
+pub struct CallDatetimeUtcfromtimestamp;
+
+impl Violation for CallDatetimeUtcfromtimestamp {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!(
+            "The use of `datetime.datetime.utcfromtimestamp()` is not allowed, use \
+             `datetime.datetime.fromtimestamp(ts, tz=)` instead"
+        )
+    }
+}
+
+/// Checks for `datetime.datetime.utcfromtimestamp()`. (DTZ004)
+///
+/// ## Why is this bad?
+///
+/// Because naive `datetime` objects are treated by many `datetime` methods as
+/// local times, it is preferred to use aware datetimes to represent times in
+/// UTC. As such, the recommended way to create an object representing a
+/// specific timestamp in UTC is by calling `datetime.fromtimestamp(timestamp,
+/// tz=timezone.utc)`.
+pub(crate) fn call_datetime_utcfromtimestamp(
+    checker: &mut Checker,
+    func: &Expr,
+    location: TextRange,
+) {
+    if checker
+        .semantic_model()
+        .resolve_call_path(func)
+        .map_or(false, |call_path| {
+            call_path.as_slice() == ["datetime", "datetime", "utcfromtimestamp"]
+        })
+    {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(CallDatetimeUtcfromtimestamp, location));
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_utcnow.rs b/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_utcnow.rs
new file mode 100644
index 0000000000000..33d89f867334c
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_utcnow.rs
@@ -0,0 +1,42 @@
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::Expr;
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+#[violation]
+pub struct CallDatetimeUtcnow;
+
+impl Violation for CallDatetimeUtcnow {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!(
+            "The use of `datetime.datetime.utcnow()` is not allowed, use \
+             `datetime.datetime.now(tz=)` instead"
+        )
+    }
+}
+
+/// Checks for `datetime.datetime.today()`. (DTZ003)
+///
+/// ## Why is this bad?
+///
+/// Because naive `datetime` objects are treated by many `datetime` methods as
+/// local times, it is preferred to use aware datetimes to represent times in
+/// UTC. As such, the recommended way to create an object representing the
+/// current time in UTC is by calling `datetime.now(timezone.utc)`.
+pub(crate) fn call_datetime_utcnow(checker: &mut Checker, func: &Expr, location: TextRange) {
+    if checker
+        .semantic_model()
+        .resolve_call_path(func)
+        .map_or(false, |call_path| {
+            call_path.as_slice() == ["datetime", "datetime", "utcnow"]
+        })
+    {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(CallDatetimeUtcnow, location));
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_without_tzinfo.rs b/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_without_tzinfo.rs
new file mode 100644
index 0000000000000..af7eabf837a9c
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_datetimez/rules/call_datetime_without_tzinfo.rs
@@ -0,0 +1,51 @@
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{Expr, Keyword};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::helpers::{has_non_none_keyword, is_const_none};
+
+use crate::checkers::ast::Checker;
+
+#[violation]
+pub struct CallDatetimeWithoutTzinfo;
+
+impl Violation for CallDatetimeWithoutTzinfo {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("The use of `datetime.datetime()` without `tzinfo` argument is not allowed")
+    }
+}
+
+pub(crate) fn call_datetime_without_tzinfo(
+    checker: &mut Checker,
+    func: &Expr,
+    args: &[Expr],
+    keywords: &[Keyword],
+    location: TextRange,
+) {
+    if !checker
+        .semantic_model()
+        .resolve_call_path(func)
+        .map_or(false, |call_path| {
+            call_path.as_slice() == ["datetime", "datetime"]
+        })
+    {
+        return;
+    }
+
+    // No positional arg: keyword is missing or constant None.
+    if args.len() < 8 && !has_non_none_keyword(keywords, "tzinfo") {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(CallDatetimeWithoutTzinfo, location));
+        return;
+    }
+
+    // Positional arg: is constant None.
+    if args.len() >= 8 && is_const_none(&args[7]) {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(CallDatetimeWithoutTzinfo, location));
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_datetimez/rules/mod.rs b/crates/ruff/src/rules/flake8_datetimez/rules/mod.rs
new file mode 100644
index 0000000000000..8cfa09cdccf30
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_datetimez/rules/mod.rs
@@ -0,0 +1,29 @@
+pub(crate) use call_date_fromtimestamp::{call_date_fromtimestamp, CallDateFromtimestamp};
+pub(crate) use call_date_today::{call_date_today, CallDateToday};
+pub(crate) use call_datetime_fromtimestamp::{
+    call_datetime_fromtimestamp, CallDatetimeFromtimestamp,
+};
+pub(crate) use call_datetime_now_without_tzinfo::{
+    call_datetime_now_without_tzinfo, CallDatetimeNowWithoutTzinfo,
+};
+pub(crate) use call_datetime_strptime_without_zone::{
+    call_datetime_strptime_without_zone, CallDatetimeStrptimeWithoutZone,
+};
+pub(crate) use call_datetime_today::{call_datetime_today, CallDatetimeToday};
+pub(crate) use call_datetime_utcfromtimestamp::{
+    call_datetime_utcfromtimestamp, CallDatetimeUtcfromtimestamp,
+};
+pub(crate) use call_datetime_utcnow::{call_datetime_utcnow, CallDatetimeUtcnow};
+pub(crate) use call_datetime_without_tzinfo::{
+    call_datetime_without_tzinfo, CallDatetimeWithoutTzinfo,
+};
+
+mod call_date_fromtimestamp;
+mod call_date_today;
+mod call_datetime_fromtimestamp;
+mod call_datetime_now_without_tzinfo;
+mod call_datetime_strptime_without_zone;
+mod call_datetime_today;
+mod call_datetime_utcfromtimestamp;
+mod call_datetime_utcnow;
+mod call_datetime_without_tzinfo;
diff --git a/crates/ruff/src/rules/flake8_debugger/mod.rs b/crates/ruff/src/rules/flake8_debugger/mod.rs
index 799d434b6c514..51181d43c32a0 100644
--- a/crates/ruff/src/rules/flake8_debugger/mod.rs
+++ b/crates/ruff/src/rules/flake8_debugger/mod.rs
@@ -7,14 +7,13 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::Debugger, Path::new("T100.py"); "T100")]
+    #[test_case(Rule::Debugger, Path::new("T100.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_debugger/rules.rs b/crates/ruff/src/rules/flake8_debugger/rules/debugger.rs
similarity index 83%
rename from crates/ruff/src/rules/flake8_debugger/rules.rs
rename to crates/ruff/src/rules/flake8_debugger/rules/debugger.rs
index 806c8a5d16395..0dfdc9ce83629 100644
--- a/crates/ruff/src/rules/flake8_debugger/rules.rs
+++ b/crates/ruff/src/rules/flake8_debugger/rules/debugger.rs
@@ -1,14 +1,15 @@
-use rustpython_parser::ast::{Expr, Stmt};
+use rustpython_parser::ast::{Expr, Ranged, Stmt};
 
-use crate::checkers::ast::Checker;
-use crate::rules::flake8_debugger::types::DebuggerUsingType;
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::call_path::{format_call_path, from_unqualified_name, CallPath};
 
+use crate::checkers::ast::Checker;
+use crate::rules::flake8_debugger::types::DebuggerUsingType;
+
 #[violation]
 pub struct Debugger {
-    pub using_type: DebuggerUsingType,
+    using_type: DebuggerUsingType,
 }
 
 impl Violation for Debugger {
@@ -41,12 +42,16 @@ const DEBUGGERS: &[&[&str]] = &[
 ];
 
 /// Checks for the presence of a debugger call.
-pub fn debugger_call(checker: &mut Checker, expr: &Expr, func: &Expr) {
-    if let Some(target) = checker.ctx.resolve_call_path(func).and_then(|call_path| {
-        DEBUGGERS
-            .iter()
-            .find(|target| call_path.as_slice() == **target)
-    }) {
+pub(crate) fn debugger_call(checker: &mut Checker, expr: &Expr, func: &Expr) {
+    if let Some(target) = checker
+        .semantic_model()
+        .resolve_call_path(func)
+        .and_then(|call_path| {
+            DEBUGGERS
+                .iter()
+                .find(|target| call_path.as_slice() == **target)
+        })
+    {
         checker.diagnostics.push(Diagnostic::new(
             Debugger {
                 using_type: DebuggerUsingType::Call(format_call_path(target)),
@@ -57,7 +62,7 @@ pub fn debugger_call(checker: &mut Checker, expr: &Expr, func: &Expr) {
 }
 
 /// Checks for the presence of a debugger import.
-pub fn debugger_import(stmt: &Stmt, module: Option<&str>, name: &str) -> Option<Diagnostic> {
+pub(crate) fn debugger_import(stmt: &Stmt, module: Option<&str>, name: &str) -> Option<Diagnostic> {
     // Special-case: allow `import builtins`, which is far more general than (e.g.)
     // `import celery.contrib.rdb`).
     if module.is_none() && name == "builtins" {
diff --git a/crates/ruff/src/rules/flake8_debugger/rules/mod.rs b/crates/ruff/src/rules/flake8_debugger/rules/mod.rs
new file mode 100644
index 0000000000000..1dda738e6a842
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_debugger/rules/mod.rs
@@ -0,0 +1,3 @@
+pub(crate) use debugger::{debugger_call, debugger_import, Debugger};
+
+mod debugger;
diff --git a/crates/ruff/src/rules/flake8_debugger/types.rs b/crates/ruff/src/rules/flake8_debugger/types.rs
index ab3485a3a6064..9652e66960ca0 100644
--- a/crates/ruff/src/rules/flake8_debugger/types.rs
+++ b/crates/ruff/src/rules/flake8_debugger/types.rs
@@ -1,5 +1,5 @@
 #[derive(Debug, PartialEq, Eq, Clone)]
-pub enum DebuggerUsingType {
+pub(crate) enum DebuggerUsingType {
     Call(String),
     Import(String),
 }
diff --git a/crates/ruff/src/rules/flake8_django/mod.rs b/crates/ruff/src/rules/flake8_django/mod.rs
index 321373db80e6f..59173927467a1 100644
--- a/crates/ruff/src/rules/flake8_django/mod.rs
+++ b/crates/ruff/src/rules/flake8_django/mod.rs
@@ -6,20 +6,19 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::DjangoNullableModelStringField, Path::new("DJ001.py"); "DJ001")]
-    #[test_case(Rule::DjangoLocalsInRenderFunction, Path::new("DJ003.py"); "DJ003")]
-    #[test_case(Rule::DjangoExcludeWithModelForm, Path::new("DJ006.py"); "DJ006")]
-    #[test_case(Rule::DjangoAllWithModelForm, Path::new("DJ007.py"); "DJ007")]
-    #[test_case(Rule::DjangoModelWithoutDunderStr, Path::new("DJ008.py"); "DJ008")]
-    #[test_case(Rule::DjangoUnorderedBodyContentInModel, Path::new("DJ012.py"); "DJ012")]
-    #[test_case(Rule::DjangoNonLeadingReceiverDecorator, Path::new("DJ013.py"); "DJ013")]
+    #[test_case(Rule::DjangoNullableModelStringField, Path::new("DJ001.py"))]
+    #[test_case(Rule::DjangoLocalsInRenderFunction, Path::new("DJ003.py"))]
+    #[test_case(Rule::DjangoExcludeWithModelForm, Path::new("DJ006.py"))]
+    #[test_case(Rule::DjangoAllWithModelForm, Path::new("DJ007.py"))]
+    #[test_case(Rule::DjangoModelWithoutDunderStr, Path::new("DJ008.py"))]
+    #[test_case(Rule::DjangoUnorderedBodyContentInModel, Path::new("DJ012.py"))]
+    #[test_case(Rule::DjangoNonLeadingReceiverDecorator, Path::new("DJ013.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_django/rules/all_with_model_form.rs b/crates/ruff/src/rules/flake8_django/rules/all_with_model_form.rs
index 8fbff6667ae22..da019f071aa32 100644
--- a/crates/ruff/src/rules/flake8_django/rules/all_with_model_form.rs
+++ b/crates/ruff/src/rules/flake8_django/rules/all_with_model_form.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Constant, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -47,32 +47,39 @@ impl Violation for DjangoAllWithModelForm {
 }
 
 /// DJ007
-pub fn all_with_model_form(checker: &Checker, bases: &[Expr], body: &[Stmt]) -> Option<Diagnostic> {
-    if !bases.iter().any(|base| is_model_form(&checker.ctx, base)) {
+pub(crate) fn all_with_model_form(
+    checker: &Checker,
+    bases: &[Expr],
+    body: &[Stmt],
+) -> Option<Diagnostic> {
+    if !bases
+        .iter()
+        .any(|base| is_model_form(checker.semantic_model(), base))
+    {
         return None;
     }
     for element in body.iter() {
-        let StmtKind::ClassDef { name, body, .. } = &element.node else {
+        let Stmt::ClassDef(ast::StmtClassDef { name, body, .. }) = element else {
             continue;
         };
         if name != "Meta" {
             continue;
         }
         for element in body.iter() {
-            let StmtKind::Assign { targets, value, .. } = &element.node else {
+            let Stmt::Assign(ast::StmtAssign { targets, value, .. }) = element else {
                 continue;
             };
             for target in targets.iter() {
-                let ExprKind::Name { id, .. } = &target.node else {
+                let Expr::Name(ast::ExprName { id, .. }) = target else {
                     continue;
                 };
                 if id != "fields" {
                     continue;
                 }
-                let ExprKind::Constant { value, .. } = &value.node else {
+                let Expr::Constant(ast::ExprConstant { value, .. }) = value.as_ref() else {
                     continue;
                 };
-                match &value {
+                match value {
                     Constant::Str(s) => {
                         if s == "__all__" {
                             return Some(Diagnostic::new(DjangoAllWithModelForm, element.range()));
diff --git a/crates/ruff/src/rules/flake8_django/rules/exclude_with_model_form.rs b/crates/ruff/src/rules/flake8_django/rules/exclude_with_model_form.rs
index f80e3d1dfd6bd..af229a6a326a0 100644
--- a/crates/ruff/src/rules/flake8_django/rules/exclude_with_model_form.rs
+++ b/crates/ruff/src/rules/flake8_django/rules/exclude_with_model_form.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -17,6 +17,7 @@ use crate::rules::flake8_django::rules::helpers::is_model_form;
 /// ```python
 /// from django.forms import ModelForm
 ///
+///
 /// class PostForm(ModelForm):
 ///     class Meta:
 ///         model = Post
@@ -27,6 +28,7 @@ use crate::rules::flake8_django::rules::helpers::is_model_form;
 /// ```python
 /// from django.forms import ModelForm
 ///
+///
 /// class PostForm(ModelForm):
 ///     class Meta:
 ///         model = Post
@@ -43,27 +45,30 @@ impl Violation for DjangoExcludeWithModelForm {
 }
 
 /// DJ006
-pub fn exclude_with_model_form(
+pub(crate) fn exclude_with_model_form(
     checker: &Checker,
     bases: &[Expr],
     body: &[Stmt],
 ) -> Option<Diagnostic> {
-    if !bases.iter().any(|base| is_model_form(&checker.ctx, base)) {
+    if !bases
+        .iter()
+        .any(|base| is_model_form(checker.semantic_model(), base))
+    {
         return None;
     }
     for element in body.iter() {
-        let StmtKind::ClassDef { name, body, .. } = &element.node else {
+        let Stmt::ClassDef(ast::StmtClassDef { name, body, .. }) = element else {
             continue;
         };
         if name != "Meta" {
             continue;
         }
         for element in body.iter() {
-            let StmtKind::Assign { targets, .. } = &element.node else {
+            let Stmt::Assign(ast::StmtAssign { targets, .. }) = element else {
                 continue;
             };
             for target in targets.iter() {
-                let ExprKind::Name { id, .. } = &target.node else {
+                let Expr::Name(ast::ExprName { id, .. }) = target else {
                     continue;
                 };
                 if id == "exclude" {
diff --git a/crates/ruff/src/rules/flake8_django/rules/helpers.rs b/crates/ruff/src/rules/flake8_django/rules/helpers.rs
index 6d3bc724cc9eb..3d0f72e10eb66 100644
--- a/crates/ruff/src/rules/flake8_django/rules/helpers.rs
+++ b/crates/ruff/src/rules/flake8_django/rules/helpers.rs
@@ -1,25 +1,25 @@
 use rustpython_parser::ast::Expr;
 
-use ruff_python_semantic::context::Context;
+use ruff_python_semantic::model::SemanticModel;
 
 /// Return `true` if a Python class appears to be a Django model, based on its base classes.
-pub fn is_model(context: &Context, base: &Expr) -> bool {
-    context.resolve_call_path(base).map_or(false, |call_path| {
+pub(crate) fn is_model(model: &SemanticModel, base: &Expr) -> bool {
+    model.resolve_call_path(base).map_or(false, |call_path| {
         call_path.as_slice() == ["django", "db", "models", "Model"]
     })
 }
 
 /// Return `true` if a Python class appears to be a Django model form, based on its base classes.
-pub fn is_model_form(context: &Context, base: &Expr) -> bool {
-    context.resolve_call_path(base).map_or(false, |call_path| {
+pub(crate) fn is_model_form(model: &SemanticModel, base: &Expr) -> bool {
+    model.resolve_call_path(base).map_or(false, |call_path| {
         call_path.as_slice() == ["django", "forms", "ModelForm"]
             || call_path.as_slice() == ["django", "forms", "models", "ModelForm"]
     })
 }
 
 /// Return `true` if the expression is constructor for a Django model field.
-pub fn is_model_field(context: &Context, expr: &Expr) -> bool {
-    context.resolve_call_path(expr).map_or(false, |call_path| {
+pub(crate) fn is_model_field(model: &SemanticModel, expr: &Expr) -> bool {
+    model.resolve_call_path(expr).map_or(false, |call_path| {
         call_path
             .as_slice()
             .starts_with(&["django", "db", "models"])
@@ -27,8 +27,11 @@ pub fn is_model_field(context: &Context, expr: &Expr) -> bool {
 }
 
 /// Return the name of the field type, if the expression is constructor for a Django model field.
-pub fn get_model_field_name<'a>(context: &'a Context, expr: &'a Expr) -> Option<&'a str> {
-    context.resolve_call_path(expr).and_then(|call_path| {
+pub(crate) fn get_model_field_name<'a>(
+    model: &'a SemanticModel,
+    expr: &'a Expr,
+) -> Option<&'a str> {
+    model.resolve_call_path(expr).and_then(|call_path| {
         let call_path = call_path.as_slice();
         if !call_path.starts_with(&["django", "db", "models"]) {
             return None;
diff --git a/crates/ruff/src/rules/flake8_django/rules/locals_in_render_function.rs b/crates/ruff/src/rules/flake8_django/rules/locals_in_render_function.rs
index cbbf2745c2e08..469ff81eb61f3 100644
--- a/crates/ruff/src/rules/flake8_django/rules/locals_in_render_function.rs
+++ b/crates/ruff/src/rules/flake8_django/rules/locals_in_render_function.rs
@@ -1,7 +1,8 @@
-use rustpython_parser::ast::{Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
+use ruff_python_semantic::model::SemanticModel;
 
 use crate::checkers::ast::Checker;
 
@@ -16,6 +17,7 @@ use crate::checkers::ast::Checker;
 /// ```python
 /// from django.shortcuts import render
 ///
+///
 /// def index(request):
 ///     posts = Post.objects.all()
 ///     return render(request, "app/index.html", locals())
@@ -25,6 +27,7 @@ use crate::checkers::ast::Checker;
 /// ```python
 /// from django.shortcuts import render
 ///
+///
 /// def index(request):
 ///     posts = Post.objects.all()
 ///     context = {"posts": posts}
@@ -41,14 +44,14 @@ impl Violation for DjangoLocalsInRenderFunction {
 }
 
 /// DJ003
-pub fn locals_in_render_function(
+pub(crate) fn locals_in_render_function(
     checker: &mut Checker,
     func: &Expr,
     args: &[Expr],
     keywords: &[Keyword],
 ) {
     if !checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(func)
         .map_or(false, |call_path| {
             call_path.as_slice() == ["django", "shortcuts", "render"]
@@ -58,21 +61,18 @@ pub fn locals_in_render_function(
     }
 
     let locals = if args.len() >= 3 {
-        if !is_locals_call(checker, &args[2]) {
+        if !is_locals_call(checker.semantic_model(), &args[2]) {
             return;
         }
         &args[2]
-    } else if let Some(keyword) = keywords.iter().find(|keyword| {
-        keyword
-            .node
-            .arg
-            .as_ref()
-            .map_or(false, |arg| arg == "context")
-    }) {
-        if !is_locals_call(checker, &keyword.node.value) {
+    } else if let Some(keyword) = keywords
+        .iter()
+        .find(|keyword| keyword.arg.as_ref().map_or(false, |arg| arg == "context"))
+    {
+        if !is_locals_call(checker.semantic_model(), &keyword.value) {
             return;
         }
-        &keyword.node.value
+        &keyword.value
     } else {
         return;
     };
@@ -83,12 +83,11 @@ pub fn locals_in_render_function(
     ));
 }
 
-fn is_locals_call(checker: &Checker, expr: &Expr) -> bool {
-    let ExprKind::Call { func, .. } = &expr.node else {
+fn is_locals_call(model: &SemanticModel, expr: &Expr) -> bool {
+    let Expr::Call(ast::ExprCall { func, .. }) = expr else {
         return false
     };
-    checker
-        .ctx
+    model
         .resolve_call_path(func)
         .map_or(false, |call_path| call_path.as_slice() == ["", "locals"])
 }
diff --git a/crates/ruff/src/rules/flake8_django/rules/mod.rs b/crates/ruff/src/rules/flake8_django/rules/mod.rs
index 504f9c14afb7e..2b5188d71ac53 100644
--- a/crates/ruff/src/rules/flake8_django/rules/mod.rs
+++ b/crates/ruff/src/rules/flake8_django/rules/mod.rs
@@ -1,14 +1,16 @@
-pub use all_with_model_form::{all_with_model_form, DjangoAllWithModelForm};
-pub use exclude_with_model_form::{exclude_with_model_form, DjangoExcludeWithModelForm};
-pub use locals_in_render_function::{locals_in_render_function, DjangoLocalsInRenderFunction};
-pub use model_without_dunder_str::{model_without_dunder_str, DjangoModelWithoutDunderStr};
-pub use non_leading_receiver_decorator::{
+pub(crate) use all_with_model_form::{all_with_model_form, DjangoAllWithModelForm};
+pub(crate) use exclude_with_model_form::{exclude_with_model_form, DjangoExcludeWithModelForm};
+pub(crate) use locals_in_render_function::{
+    locals_in_render_function, DjangoLocalsInRenderFunction,
+};
+pub(crate) use model_without_dunder_str::{model_without_dunder_str, DjangoModelWithoutDunderStr};
+pub(crate) use non_leading_receiver_decorator::{
     non_leading_receiver_decorator, DjangoNonLeadingReceiverDecorator,
 };
-pub use nullable_model_string_field::{
+pub(crate) use nullable_model_string_field::{
     nullable_model_string_field, DjangoNullableModelStringField,
 };
-pub use unordered_body_content_in_model::{
+pub(crate) use unordered_body_content_in_model::{
     unordered_body_content_in_model, DjangoUnorderedBodyContentInModel,
 };
 
diff --git a/crates/ruff/src/rules/flake8_django/rules/model_without_dunder_str.rs b/crates/ruff/src/rules/flake8_django/rules/model_without_dunder_str.rs
index 6a321ef50af75..5e07cbfa53ccc 100644
--- a/crates/ruff/src/rules/flake8_django/rules/model_without_dunder_str.rs
+++ b/crates/ruff/src/rules/flake8_django/rules/model_without_dunder_str.rs
@@ -1,8 +1,8 @@
-use rustpython_parser::ast::{Constant, Expr, StmtKind};
-use rustpython_parser::ast::{ExprKind, Stmt};
+use rustpython_parser::ast::{self, Constant, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
+use ruff_python_semantic::model::SemanticModel;
 
 use crate::checkers::ast::Checker;
 
@@ -50,13 +50,13 @@ impl Violation for DjangoModelWithoutDunderStr {
 }
 
 /// DJ008
-pub fn model_without_dunder_str(
+pub(crate) fn model_without_dunder_str(
     checker: &Checker,
     bases: &[Expr],
     body: &[Stmt],
     class_location: &Stmt,
 ) -> Option<Diagnostic> {
-    if !checker_applies(checker, bases, body) {
+    if !checker_applies(checker.semantic_model(), bases, body) {
         return None;
     }
     if !has_dunder_method(body) {
@@ -69,8 +69,8 @@ pub fn model_without_dunder_str(
 }
 
 fn has_dunder_method(body: &[Stmt]) -> bool {
-    body.iter().any(|val| match &val.node {
-        StmtKind::FunctionDef { name, .. } => {
+    body.iter().any(|val| match val {
+        Stmt::FunctionDef(ast::StmtFunctionDef { name, .. }) => {
             if name == "__str__" {
                 return true;
             }
@@ -80,12 +80,12 @@ fn has_dunder_method(body: &[Stmt]) -> bool {
     })
 }
 
-fn checker_applies(checker: &Checker, bases: &[Expr], body: &[Stmt]) -> bool {
+fn checker_applies(model: &SemanticModel, bases: &[Expr], body: &[Stmt]) -> bool {
     for base in bases.iter() {
         if is_model_abstract(body) {
             continue;
         }
-        if helpers::is_model(&checker.ctx, base) {
+        if helpers::is_model(model, base) {
             return true;
         }
     }
@@ -95,24 +95,24 @@ fn checker_applies(checker: &Checker, bases: &[Expr], body: &[Stmt]) -> bool {
 /// Check if class is abstract, in terms of Django model inheritance.
 fn is_model_abstract(body: &[Stmt]) -> bool {
     for element in body.iter() {
-        let StmtKind::ClassDef {name, body, ..} = &element.node else {
+        let Stmt::ClassDef(ast::StmtClassDef {name, body, ..}) = element else {
             continue
         };
         if name != "Meta" {
             continue;
         }
         for element in body.iter() {
-            let StmtKind::Assign {targets, value, ..} = &element.node else {
+            let Stmt::Assign(ast::StmtAssign {targets, value, ..}) = element else {
                 continue;
             };
             for target in targets.iter() {
-                let ExprKind::Name {id , ..} = &target.node else {
+                let Expr::Name(ast::ExprName {id , ..}) = target else {
                     continue;
                 };
                 if id != "abstract" {
                     continue;
                 }
-                let ExprKind::Constant{value: Constant::Bool(true), ..} = &value.node else {
+                let Expr::Constant(ast::ExprConstant{value: Constant::Bool(true), ..}) = value.as_ref() else {
                     continue;
                 };
                 return true;
diff --git a/crates/ruff/src/rules/flake8_django/rules/non_leading_receiver_decorator.rs b/crates/ruff/src/rules/flake8_django/rules/non_leading_receiver_decorator.rs
index 189a5ccabc68e..1500926eca7ee 100644
--- a/crates/ruff/src/rules/flake8_django/rules/non_leading_receiver_decorator.rs
+++ b/crates/ruff/src/rules/flake8_django/rules/non_leading_receiver_decorator.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -48,7 +48,7 @@ impl Violation for DjangoNonLeadingReceiverDecorator {
 }
 
 /// DJ013
-pub fn non_leading_receiver_decorator<'a, F>(
+pub(crate) fn non_leading_receiver_decorator<'a, F>(
     decorator_list: &'a [Expr],
     resolve_call_path: F,
 ) -> Vec<Diagnostic>
@@ -58,10 +58,11 @@ where
     let mut diagnostics = vec![];
     let mut seen_receiver = false;
     for (i, decorator) in decorator_list.iter().enumerate() {
-        let is_receiver = match &decorator.node {
-            ExprKind::Call { func, .. } => resolve_call_path(func).map_or(false, |call_path| {
-                call_path.as_slice() == ["django", "dispatch", "receiver"]
-            }),
+        let is_receiver = match decorator {
+            Expr::Call(ast::ExprCall { func, .. }) => resolve_call_path(func)
+                .map_or(false, |call_path| {
+                    call_path.as_slice() == ["django", "dispatch", "receiver"]
+                }),
             _ => false,
         };
         if i > 0 && is_receiver && !seen_receiver {
diff --git a/crates/ruff/src/rules/flake8_django/rules/nullable_model_string_field.rs b/crates/ruff/src/rules/flake8_django/rules/nullable_model_string_field.rs
index 5a218dacd95a0..d8ccedb65b551 100644
--- a/crates/ruff/src/rules/flake8_django/rules/nullable_model_string_field.rs
+++ b/crates/ruff/src/rules/flake8_django/rules/nullable_model_string_field.rs
@@ -1,5 +1,5 @@
 use rustpython_parser::ast::Constant::Bool;
-use rustpython_parser::ast::{Expr, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -40,7 +40,7 @@ use super::helpers;
 /// ```
 #[violation]
 pub struct DjangoNullableModelStringField {
-    pub field_name: String,
+    field_name: String,
 }
 
 impl Violation for DjangoNullableModelStringField {
@@ -61,10 +61,10 @@ const NOT_NULL_TRUE_FIELDS: [&str; 6] = [
 ];
 
 /// DJ001
-pub fn nullable_model_string_field(checker: &Checker, body: &[Stmt]) -> Vec<Diagnostic> {
+pub(crate) fn nullable_model_string_field(checker: &Checker, body: &[Stmt]) -> Vec<Diagnostic> {
     let mut errors = Vec::new();
     for statement in body.iter() {
-        let StmtKind::Assign {value, ..} = &statement.node else {
+        let Stmt::Assign(ast::StmtAssign {value, ..}) = statement else {
             continue
         };
         if let Some(field_name) = is_nullable_field(checker, value) {
@@ -80,11 +80,11 @@ pub fn nullable_model_string_field(checker: &Checker, body: &[Stmt]) -> Vec<Diag
 }
 
 fn is_nullable_field<'a>(checker: &'a Checker, value: &'a Expr) -> Option<&'a str> {
-    let ExprKind::Call {func, keywords, ..} = &value.node else {
+    let Expr::Call(ast::ExprCall {func, keywords, ..}) = value else {
         return None;
     };
 
-    let Some(valid_field_name) = helpers::get_model_field_name(&checker.ctx, func) else {
+    let Some(valid_field_name) = helpers::get_model_field_name(checker.semantic_model(), func) else {
         return None;
     };
 
@@ -96,10 +96,10 @@ fn is_nullable_field<'a>(checker: &'a Checker, value: &'a Expr) -> Option<&'a st
     let mut blank_key = false;
     let mut unique_key = false;
     for keyword in keywords.iter() {
-        let ExprKind::Constant {value: Bool(true), ..} = &keyword.node.value.node else {
+        let Expr::Constant(ast::ExprConstant {value: Bool(true), ..}) = &keyword.value else {
             continue
         };
-        let Some(argument) = &keyword.node.arg else {
+        let Some(argument) = &keyword.arg else {
             continue
         };
         match argument.as_str() {
diff --git a/crates/ruff/src/rules/flake8_django/rules/unordered_body_content_in_model.rs b/crates/ruff/src/rules/flake8_django/rules/unordered_body_content_in_model.rs
index f09996c5e7fb7..857ebc96ee9ff 100644
--- a/crates/ruff/src/rules/flake8_django/rules/unordered_body_content_in_model.rs
+++ b/crates/ruff/src/rules/flake8_django/rules/unordered_body_content_in_model.rs
@@ -1,9 +1,10 @@
 use std::fmt;
 
-use rustpython_parser::ast::{Expr, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
+use ruff_python_semantic::model::SemanticModel;
 
 use crate::checkers::ast::Checker;
 
@@ -13,7 +14,7 @@ use super::helpers;
 /// Checks for the order of Model's inner classes, methods, and fields as per
 /// the [Django Style Guide].
 ///
-/// ## Why is it bad?
+/// ## Why is this bad?
 /// The [Django Style Guide] specifies that the order of Model inner classes,
 /// attributes and methods should be as follows:
 ///
@@ -62,8 +63,8 @@ use super::helpers;
 /// [Django Style Guide]: https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/coding-style/#model-style
 #[violation]
 pub struct DjangoUnorderedBodyContentInModel {
-    pub elem_type: ContentType,
-    pub before: ContentType,
+    elem_type: ContentType,
+    before: ContentType,
 }
 
 impl Violation for DjangoUnorderedBodyContentInModel {
@@ -75,7 +76,7 @@ impl Violation for DjangoUnorderedBodyContentInModel {
 }
 
 #[derive(Debug, Clone, Copy, PartialOrd, Ord, PartialEq, Eq)]
-pub enum ContentType {
+pub(crate) enum ContentType {
     FieldDeclaration,
     ManagerDeclaration,
     MetaClass,
@@ -99,18 +100,18 @@ impl fmt::Display for ContentType {
     }
 }
 
-fn get_element_type(checker: &Checker, element: &StmtKind) -> Option<ContentType> {
+fn get_element_type(model: &SemanticModel, element: &Stmt) -> Option<ContentType> {
     match element {
-        StmtKind::Assign { targets, value, .. } => {
-            if let ExprKind::Call { func, .. } = &value.node {
-                if helpers::is_model_field(&checker.ctx, func) {
+        Stmt::Assign(ast::StmtAssign { targets, value, .. }) => {
+            if let Expr::Call(ast::ExprCall { func, .. }) = value.as_ref() {
+                if helpers::is_model_field(model, func) {
                     return Some(ContentType::FieldDeclaration);
                 }
             }
             let Some(expr) = targets.first() else {
                 return None;
             };
-            let ExprKind::Name { id, .. } = &expr.node else {
+            let Expr::Name(ast::ExprName { id, .. }) = expr else {
                 return None;
             };
             if id == "objects" {
@@ -119,14 +120,14 @@ fn get_element_type(checker: &Checker, element: &StmtKind) -> Option<ContentType
                 None
             }
         }
-        StmtKind::ClassDef { name, .. } => {
+        Stmt::ClassDef(ast::StmtClassDef { name, .. }) => {
             if name == "Meta" {
                 Some(ContentType::MetaClass)
             } else {
                 None
             }
         }
-        StmtKind::FunctionDef { name, .. } => match name.as_str() {
+        Stmt::FunctionDef(ast::StmtFunctionDef { name, .. }) => match name.as_str() {
             "__str__" => Some(ContentType::StrMethod),
             "save" => Some(ContentType::SaveMethod),
             "get_absolute_url" => Some(ContentType::GetAbsoluteUrlMethod),
@@ -137,16 +138,20 @@ fn get_element_type(checker: &Checker, element: &StmtKind) -> Option<ContentType
 }
 
 /// DJ012
-pub fn unordered_body_content_in_model(checker: &mut Checker, bases: &[Expr], body: &[Stmt]) {
+pub(crate) fn unordered_body_content_in_model(
+    checker: &mut Checker,
+    bases: &[Expr],
+    body: &[Stmt],
+) {
     if !bases
         .iter()
-        .any(|base| helpers::is_model(&checker.ctx, base))
+        .any(|base| helpers::is_model(checker.semantic_model(), base))
     {
         return;
     }
     let mut elements_type_found = Vec::new();
     for element in body.iter() {
-        let Some(current_element_type) = get_element_type(checker, &element.node) else {
+        let Some(current_element_type) = get_element_type(checker.semantic_model(), element) else {
             continue;
         };
         let Some(&element_type) = elements_type_found
diff --git a/crates/ruff/src/rules/flake8_errmsg/rules/mod.rs b/crates/ruff/src/rules/flake8_errmsg/rules/mod.rs
new file mode 100644
index 0000000000000..8740e30113256
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_errmsg/rules/mod.rs
@@ -0,0 +1,5 @@
+pub(crate) use string_in_exception::{
+    string_in_exception, DotFormatInException, FStringInException, RawStringInException,
+};
+
+mod string_in_exception;
diff --git a/crates/ruff/src/rules/flake8_errmsg/rules.rs b/crates/ruff/src/rules/flake8_errmsg/rules/string_in_exception.rs
similarity index 70%
rename from crates/ruff/src/rules/flake8_errmsg/rules.rs
rename to crates/ruff/src/rules/flake8_errmsg/rules/string_in_exception.rs
index ac30f0d7c02cf..9078a9dab733d 100644
--- a/crates/ruff/src/rules/flake8_errmsg/rules.rs
+++ b/crates/ruff/src/rules/flake8_errmsg/rules/string_in_exception.rs
@@ -1,9 +1,9 @@
-use rustpython_parser::ast::{Constant, Expr, ExprContext, ExprKind, Stmt, StmtKind};
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Constant, Expr, ExprContext, Ranged, Stmt};
 
 use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::{create_expr, create_stmt, unparse_stmt};
-use ruff_python_ast::source_code::Stylist;
+use ruff_python_ast::source_code::{Generator, Stylist};
 use ruff_python_ast::whitespace;
 
 use crate::checkers::ast::Checker;
@@ -47,9 +47,7 @@ use crate::registry::{AsRule, Rule};
 /// RuntimeError: 'Some value' is incorrect
 /// ```
 #[violation]
-pub struct RawStringInException {
-    pub fixable: bool,
-}
+pub struct RawStringInException;
 
 impl Violation for RawStringInException {
     const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
@@ -59,9 +57,8 @@ impl Violation for RawStringInException {
         format!("Exception must not use a string literal, assign to variable first")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable
-            .then_some(|_| format!("Assign to variable; remove string literal"))
+    fn autofix_title(&self) -> Option<String> {
+        Some("Assign to variable; remove string literal".to_string())
     }
 }
 
@@ -104,9 +101,7 @@ impl Violation for RawStringInException {
 /// RuntimeError: 'Some value' is incorrect
 /// ```
 #[violation]
-pub struct FStringInException {
-    pub fixable: bool,
-}
+pub struct FStringInException;
 
 impl Violation for FStringInException {
     const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
@@ -116,9 +111,8 @@ impl Violation for FStringInException {
         format!("Exception must not use an f-string literal, assign to variable first")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable
-            .then_some(|_| format!("Assign to variable; remove f-string literal"))
+    fn autofix_title(&self) -> Option<String> {
+        Some("Assign to variable; remove f-string literal".to_string())
     }
 }
 
@@ -163,9 +157,7 @@ impl Violation for FStringInException {
 /// RuntimeError: 'Some value' is incorrect
 /// ```
 #[violation]
-pub struct DotFormatInException {
-    pub fixable: bool,
-}
+pub struct DotFormatInException;
 
 impl Violation for DotFormatInException {
     const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
@@ -175,9 +167,8 @@ impl Violation for DotFormatInException {
         format!("Exception must not use a `.format()` string directly, assign to variable first")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable
-            .then_some(|_| format!("Assign to variable; remove `.format()` string"))
+    fn autofix_title(&self) -> Option<String> {
+        Some("Assign to variable; remove `.format()` string".to_string())
     }
 }
 
@@ -191,19 +182,27 @@ impl Violation for DotFormatInException {
 /// 1. Insert the exception argument into a variable assignment before the
 ///   `raise` statement. The variable name is `msg`.
 /// 2. Replace the exception argument with the variable name.
-fn generate_fix(stylist: &Stylist, stmt: &Stmt, exc_arg: &Expr, indentation: &str) -> Fix {
-    let assignment = unparse_stmt(
-        &create_stmt(StmtKind::Assign {
-            targets: vec![create_expr(ExprKind::Name {
-                id: String::from("msg"),
-                ctx: ExprContext::Store,
-            })],
-            value: Box::new(exc_arg.clone()),
-            type_comment: None,
-        }),
-        stylist,
-    );
-    Fix::from_iter([
+fn generate_fix(
+    stmt: &Stmt,
+    exc_arg: &Expr,
+    indentation: &str,
+    stylist: &Stylist,
+    generator: Generator,
+) -> Fix {
+    let node = Expr::Name(ast::ExprName {
+        id: "msg".into(),
+        ctx: ExprContext::Store,
+        range: TextRange::default(),
+    });
+    let node1 = Stmt::Assign(ast::StmtAssign {
+        targets: vec![node],
+        value: Box::new(exc_arg.clone()),
+        type_comment: None,
+        range: TextRange::default(),
+    });
+    let assignment = generator.stmt(&node1);
+    #[allow(deprecated)]
+    Fix::unspecified_edits(
         Edit::insertion(
             format!(
                 "{}{}{}",
@@ -213,43 +212,43 @@ fn generate_fix(stylist: &Stylist, stmt: &Stmt, exc_arg: &Expr, indentation: &st
             ),
             stmt.start(),
         ),
-        Edit::range_replacement(String::from("msg"), exc_arg.range()),
-    ])
+        [Edit::range_replacement(
+            String::from("msg"),
+            exc_arg.range(),
+        )],
+    )
 }
 
 /// EM101, EM102, EM103
-pub fn string_in_exception(checker: &mut Checker, stmt: &Stmt, exc: &Expr) {
-    if let ExprKind::Call { args, .. } = &exc.node {
+pub(crate) fn string_in_exception(checker: &mut Checker, stmt: &Stmt, exc: &Expr) {
+    if let Expr::Call(ast::ExprCall { args, .. }) = exc {
         if let Some(first) = args.first() {
-            match &first.node {
-                // Check for string literals
-                ExprKind::Constant {
+            match first {
+                // Check for string literals.
+                Expr::Constant(ast::ExprConstant {
                     value: Constant::Str(string),
                     ..
-                } => {
-                    if checker.settings.rules.enabled(Rule::RawStringInException) {
-                        if string.len() > checker.settings.flake8_errmsg.max_string_length {
+                }) => {
+                    if checker.enabled(Rule::RawStringInException) {
+                        if string.len() >= checker.settings.flake8_errmsg.max_string_length {
                             let indentation = whitespace::indentation(checker.locator, stmt)
                                 .and_then(|indentation| {
-                                    if checker.ctx.find_binding("msg").is_none() {
+                                    if checker.semantic_model().find_binding("msg").is_none() {
                                         Some(indentation)
                                     } else {
                                         None
                                     }
                                 });
-                            let mut diagnostic = Diagnostic::new(
-                                RawStringInException {
-                                    fixable: indentation.is_some(),
-                                },
-                                first.range(),
-                            );
+                            let mut diagnostic =
+                                Diagnostic::new(RawStringInException, first.range());
                             if let Some(indentation) = indentation {
                                 if checker.patch(diagnostic.kind.rule()) {
                                     diagnostic.set_fix(generate_fix(
-                                        checker.stylist,
                                         stmt,
                                         first,
                                         indentation,
+                                        checker.stylist,
+                                        checker.generator(),
                                     ));
                                 }
                             }
@@ -257,63 +256,58 @@ pub fn string_in_exception(checker: &mut Checker, stmt: &Stmt, exc: &Expr) {
                         }
                     }
                 }
-                // Check for f-strings
-                ExprKind::JoinedStr { .. } => {
-                    if checker.settings.rules.enabled(Rule::FStringInException) {
+                // Check for f-strings.
+                Expr::JoinedStr(_) => {
+                    if checker.enabled(Rule::FStringInException) {
                         let indentation = whitespace::indentation(checker.locator, stmt).and_then(
                             |indentation| {
-                                if checker.ctx.find_binding("msg").is_none() {
+                                if checker.semantic_model().find_binding("msg").is_none() {
                                     Some(indentation)
                                 } else {
                                     None
                                 }
                             },
                         );
-                        let mut diagnostic = Diagnostic::new(
-                            FStringInException {
-                                fixable: indentation.is_some(),
-                            },
-                            first.range(),
-                        );
+                        let mut diagnostic = Diagnostic::new(FStringInException, first.range());
                         if let Some(indentation) = indentation {
                             if checker.patch(diagnostic.kind.rule()) {
                                 diagnostic.set_fix(generate_fix(
-                                    checker.stylist,
                                     stmt,
                                     first,
                                     indentation,
+                                    checker.stylist,
+                                    checker.generator(),
                                 ));
                             }
                         }
                         checker.diagnostics.push(diagnostic);
                     }
                 }
-                // Check for .format() calls
-                ExprKind::Call { func, .. } => {
-                    if checker.settings.rules.enabled(Rule::DotFormatInException) {
-                        if let ExprKind::Attribute { value, attr, .. } = &func.node {
-                            if attr == "format" && matches!(value.node, ExprKind::Constant { .. }) {
+                // Check for .format() calls.
+                Expr::Call(ast::ExprCall { func, .. }) => {
+                    if checker.enabled(Rule::DotFormatInException) {
+                        if let Expr::Attribute(ast::ExprAttribute { value, attr, .. }) =
+                            func.as_ref()
+                        {
+                            if attr == "format" && value.is_constant_expr() {
                                 let indentation = whitespace::indentation(checker.locator, stmt)
                                     .and_then(|indentation| {
-                                        if checker.ctx.find_binding("msg").is_none() {
+                                        if checker.semantic_model().find_binding("msg").is_none() {
                                             Some(indentation)
                                         } else {
                                             None
                                         }
                                     });
-                                let mut diagnostic = Diagnostic::new(
-                                    DotFormatInException {
-                                        fixable: indentation.is_some(),
-                                    },
-                                    first.range(),
-                                );
+                                let mut diagnostic =
+                                    Diagnostic::new(DotFormatInException, first.range());
                                 if let Some(indentation) = indentation {
                                     if checker.patch(diagnostic.kind.rule()) {
                                         diagnostic.set_fix(generate_fix(
-                                            checker.stylist,
                                             stmt,
                                             first,
                                             indentation,
+                                            checker.stylist,
+                                            checker.generator(),
                                         ));
                                     }
                                 }
diff --git a/crates/ruff/src/rules/flake8_errmsg/settings.rs b/crates/ruff/src/rules/flake8_errmsg/settings.rs
index 5a3e6c4f5c02e..b3ea044529465 100644
--- a/crates/ruff/src/rules/flake8_errmsg/settings.rs
+++ b/crates/ruff/src/rules/flake8_errmsg/settings.rs
@@ -1,18 +1,18 @@
 //! Settings for the `flake8-errmsg` plugin.
 
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::{CacheKey, ConfigurationOptions};
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
 
 #[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, CombineOptions,
 )]
 #[serde(
     deny_unknown_fields,
     rename_all = "kebab-case",
     rename = "Flake8ErrMsgOptions"
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(default = "0", value_type = "int", example = "max-string-length = 20")]
     /// Maximum string length for string literals in exception messages.
diff --git a/crates/ruff/src/rules/flake8_errmsg/snapshots/ruff__rules__flake8_errmsg__tests__custom.snap b/crates/ruff/src/rules/flake8_errmsg/snapshots/ruff__rules__flake8_errmsg__tests__custom.snap
index 73074676c1a24..f16f83bf0c26b 100644
--- a/crates/ruff/src/rules/flake8_errmsg/snapshots/ruff__rules__flake8_errmsg__tests__custom.snap
+++ b/crates/ruff/src/rules/flake8_errmsg/snapshots/ruff__rules__flake8_errmsg__tests__custom.snap
@@ -20,157 +20,161 @@ EM.py:5:24: EM101 [*] Exception must not use a string literal, assign to variabl
 7 8 | 
 8 9 | def f_a_short():
 
-EM.py:14:24: EM102 [*] Exception must not use an f-string literal, assign to variable first
+EM.py:18:24: EM102 [*] Exception must not use an f-string literal, assign to variable first
    |
-14 | def f_b():
-15 |     example = "example"
-16 |     raise RuntimeError(f"This is an {example} exception")
+18 | def f_b():
+19 |     example = "example"
+20 |     raise RuntimeError(f"This is an {example} exception")
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM102
    |
    = help: Assign to variable; remove f-string literal
 
-ℹ Suggested fix
-11 11 | 
-12 12 | def f_b():
-13 13 |     example = "example"
-14    |-    raise RuntimeError(f"This is an {example} exception")
-   14 |+    msg = f"This is an {example} exception"
-   15 |+    raise RuntimeError(msg)
-15 16 | 
-16 17 | 
-17 18 | def f_c():
-
-EM.py:18:24: EM103 [*] Exception must not use a `.format()` string directly, assign to variable first
-   |
-18 | def f_c():
-19 |     raise RuntimeError("This is an {example} exception".format(example="example"))
-   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM103
-   |
-   = help: Assign to variable; remove `.format()` string
-
 ℹ Suggested fix
 15 15 | 
-16 16 | 
-17 17 | def f_c():
-18    |-    raise RuntimeError("This is an {example} exception".format(example="example"))
-   18 |+    msg = "This is an {example} exception".format(example="example")
+16 16 | def f_b():
+17 17 |     example = "example"
+18    |-    raise RuntimeError(f"This is an {example} exception")
+   18 |+    msg = f"This is an {example} exception"
    19 |+    raise RuntimeError(msg)
 19 20 | 
 20 21 | 
-21 22 | def f_ok():
+21 22 | def f_c():
 
-EM.py:28:24: EM101 Exception must not use a string literal, assign to variable first
+EM.py:22:24: EM103 [*] Exception must not use a `.format()` string directly, assign to variable first
+   |
+22 | def f_c():
+23 |     raise RuntimeError("This is an {example} exception".format(example="example"))
+   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM103
    |
-28 | def f_unfixable():
-29 |     msg = "hello"
-30 |     raise RuntimeError("This is an example exception")
+   = help: Assign to variable; remove `.format()` string
+
+ℹ Suggested fix
+19 19 | 
+20 20 | 
+21 21 | def f_c():
+22    |-    raise RuntimeError("This is an {example} exception".format(example="example"))
+   22 |+    msg = "This is an {example} exception".format(example="example")
+   23 |+    raise RuntimeError(msg)
+23 24 | 
+24 25 | 
+25 26 | def f_ok():
+
+EM.py:32:24: EM101 Exception must not use a string literal, assign to variable first
+   |
+32 | def f_unfixable():
+33 |     msg = "hello"
+34 |     raise RuntimeError("This is an example exception")
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM101
    |
+   = help: Assign to variable; remove string literal
 
-EM.py:35:24: EM101 [*] Exception must not use a string literal, assign to variable first
+EM.py:39:24: EM101 [*] Exception must not use a string literal, assign to variable first
    |
-35 |         msg = "hello"
-36 | 
-37 |     raise RuntimeError("This is an example exception")
+39 |         msg = "hello"
+40 | 
+41 |     raise RuntimeError("This is an example exception")
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM101
    |
    = help: Assign to variable; remove string literal
 
 ℹ Suggested fix
-32 32 |     def nested():
-33 33 |         msg = "hello"
-34 34 | 
-35    |-    raise RuntimeError("This is an example exception")
-   35 |+    msg = "This is an example exception"
-   36 |+    raise RuntimeError(msg)
-36 37 | 
-37 38 | 
-38 39 | def f_msg_in_parent_scope():
-
-EM.py:42:28: EM101 Exception must not use a string literal, assign to variable first
-   |
-42 |     def nested():
-43 |         raise RuntimeError("This is an example exception")
+36 36 |     def nested():
+37 37 |         msg = "hello"
+38 38 | 
+39    |-    raise RuntimeError("This is an example exception")
+   39 |+    msg = "This is an example exception"
+   40 |+    raise RuntimeError(msg)
+40 41 | 
+41 42 | 
+42 43 | def f_msg_in_parent_scope():
+
+EM.py:46:28: EM101 Exception must not use a string literal, assign to variable first
+   |
+46 |     def nested():
+47 |         raise RuntimeError("This is an example exception")
    |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM101
    |
+   = help: Assign to variable; remove string literal
 
-EM.py:47:28: EM101 [*] Exception must not use a string literal, assign to variable first
+EM.py:51:28: EM101 [*] Exception must not use a string literal, assign to variable first
    |
-47 | def f_fix_indentation_check(foo):
-48 |     if foo:
-49 |         raise RuntimeError("This is an example exception")
+51 | def f_fix_indentation_check(foo):
+52 |     if foo:
+53 |         raise RuntimeError("This is an example exception")
    |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM101
-50 |     else:
-51 |         if foo == "foo":
+54 |     else:
+55 |         if foo == "foo":
    |
    = help: Assign to variable; remove string literal
 
 ℹ Suggested fix
-44 44 | 
-45 45 | def f_fix_indentation_check(foo):
-46 46 |     if foo:
-47    |-        raise RuntimeError("This is an example exception")
-   47 |+        msg = "This is an example exception"
-   48 |+        raise RuntimeError(msg)
-48 49 |     else:
-49 50 |         if foo == "foo":
-50 51 |             raise RuntimeError(f"This is an exception: {foo}")
-
-EM.py:50:32: EM102 [*] Exception must not use an f-string literal, assign to variable first
-   |
-50 |     else:
-51 |         if foo == "foo":
-52 |             raise RuntimeError(f"This is an exception: {foo}")
+48 48 | 
+49 49 | def f_fix_indentation_check(foo):
+50 50 |     if foo:
+51    |-        raise RuntimeError("This is an example exception")
+   51 |+        msg = "This is an example exception"
+   52 |+        raise RuntimeError(msg)
+52 53 |     else:
+53 54 |         if foo == "foo":
+54 55 |             raise RuntimeError(f"This is an exception: {foo}")
+
+EM.py:54:32: EM102 [*] Exception must not use an f-string literal, assign to variable first
+   |
+54 |     else:
+55 |         if foo == "foo":
+56 |             raise RuntimeError(f"This is an exception: {foo}")
    |                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM102
-53 |     raise RuntimeError("This is an exception: {}".format(foo))
+57 |     raise RuntimeError("This is an exception: {}".format(foo))
    |
    = help: Assign to variable; remove f-string literal
 
 ℹ Suggested fix
-47 47 |         raise RuntimeError("This is an example exception")
-48 48 |     else:
-49 49 |         if foo == "foo":
-50    |-            raise RuntimeError(f"This is an exception: {foo}")
-   50 |+            msg = f"This is an exception: {foo}"
-   51 |+            raise RuntimeError(msg)
-51 52 |     raise RuntimeError("This is an exception: {}".format(foo))
-52 53 | 
-53 54 | 
-
-EM.py:51:24: EM103 [*] Exception must not use a `.format()` string directly, assign to variable first
-   |
-51 |         if foo == "foo":
-52 |             raise RuntimeError(f"This is an exception: {foo}")
-53 |     raise RuntimeError("This is an exception: {}".format(foo))
+51 51 |         raise RuntimeError("This is an example exception")
+52 52 |     else:
+53 53 |         if foo == "foo":
+54    |-            raise RuntimeError(f"This is an exception: {foo}")
+   54 |+            msg = f"This is an exception: {foo}"
+   55 |+            raise RuntimeError(msg)
+55 56 |     raise RuntimeError("This is an exception: {}".format(foo))
+56 57 | 
+57 58 | 
+
+EM.py:55:24: EM103 [*] Exception must not use a `.format()` string directly, assign to variable first
+   |
+55 |         if foo == "foo":
+56 |             raise RuntimeError(f"This is an exception: {foo}")
+57 |     raise RuntimeError("This is an exception: {}".format(foo))
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM103
    |
    = help: Assign to variable; remove `.format()` string
 
 ℹ Suggested fix
-48 48 |     else:
-49 49 |         if foo == "foo":
-50 50 |             raise RuntimeError(f"This is an exception: {foo}")
-51    |-    raise RuntimeError("This is an exception: {}".format(foo))
-   51 |+    msg = "This is an exception: {}".format(foo)
-   52 |+    raise RuntimeError(msg)
-52 53 | 
-53 54 | 
-54 55 | # Report these, but don't fix them
-
-EM.py:55:28: EM101 Exception must not use a string literal, assign to variable first
-   |
-55 | # Report these, but don't fix them
-56 | if foo: raise RuntimeError("This is an example exception")
+52 52 |     else:
+53 53 |         if foo == "foo":
+54 54 |             raise RuntimeError(f"This is an exception: {foo}")
+55    |-    raise RuntimeError("This is an exception: {}".format(foo))
+   55 |+    msg = "This is an exception: {}".format(foo)
+   56 |+    raise RuntimeError(msg)
+56 57 | 
+57 58 | 
+58 59 | # Report these, but don't fix them
+
+EM.py:59:28: EM101 Exception must not use a string literal, assign to variable first
+   |
+59 | # Report these, but don't fix them
+60 | if foo: raise RuntimeError("This is an example exception")
    |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM101
-57 | if foo: x = 1; raise RuntimeError("This is an example exception")
+61 | if foo: x = 1; raise RuntimeError("This is an example exception")
    |
+   = help: Assign to variable; remove string literal
 
-EM.py:56:35: EM101 Exception must not use a string literal, assign to variable first
+EM.py:60:35: EM101 Exception must not use a string literal, assign to variable first
    |
-56 | # Report these, but don't fix them
-57 | if foo: raise RuntimeError("This is an example exception")
-58 | if foo: x = 1; raise RuntimeError("This is an example exception")
+60 | # Report these, but don't fix them
+61 | if foo: raise RuntimeError("This is an example exception")
+62 | if foo: x = 1; raise RuntimeError("This is an example exception")
    |                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM101
    |
+   = help: Assign to variable; remove string literal
 
 
diff --git a/crates/ruff/src/rules/flake8_errmsg/snapshots/ruff__rules__flake8_errmsg__tests__defaults.snap b/crates/ruff/src/rules/flake8_errmsg/snapshots/ruff__rules__flake8_errmsg__tests__defaults.snap
index 87af51141d3eb..5293139a3a60f 100644
--- a/crates/ruff/src/rules/flake8_errmsg/snapshots/ruff__rules__flake8_errmsg__tests__defaults.snap
+++ b/crates/ruff/src/rules/flake8_errmsg/snapshots/ruff__rules__flake8_errmsg__tests__defaults.snap
@@ -37,159 +37,182 @@ EM.py:9:24: EM101 [*] Exception must not use a string literal, assign to variabl
    10 |+    raise RuntimeError(msg)
 10 11 | 
 11 12 | 
-12 13 | def f_b():
+12 13 | def f_a_empty():
 
-EM.py:14:24: EM102 [*] Exception must not use an f-string literal, assign to variable first
+EM.py:13:24: EM101 [*] Exception must not use a string literal, assign to variable first
    |
-14 | def f_b():
-15 |     example = "example"
-16 |     raise RuntimeError(f"This is an {example} exception")
-   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM102
+13 | def f_a_empty():
+14 |     raise RuntimeError("")
+   |                        ^^ EM101
    |
-   = help: Assign to variable; remove f-string literal
+   = help: Assign to variable; remove string literal
 
 ℹ Suggested fix
+10 10 | 
 11 11 | 
-12 12 | def f_b():
-13 13 |     example = "example"
-14    |-    raise RuntimeError(f"This is an {example} exception")
-   14 |+    msg = f"This is an {example} exception"
-   15 |+    raise RuntimeError(msg)
+12 12 | def f_a_empty():
+13    |-    raise RuntimeError("")
+   13 |+    msg = ""
+   14 |+    raise RuntimeError(msg)
+14 15 | 
 15 16 | 
-16 17 | 
-17 18 | def f_c():
+16 17 | def f_b():
 
-EM.py:18:24: EM103 [*] Exception must not use a `.format()` string directly, assign to variable first
+EM.py:18:24: EM102 [*] Exception must not use an f-string literal, assign to variable first
    |
-18 | def f_c():
-19 |     raise RuntimeError("This is an {example} exception".format(example="example"))
-   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM103
+18 | def f_b():
+19 |     example = "example"
+20 |     raise RuntimeError(f"This is an {example} exception")
+   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM102
    |
-   = help: Assign to variable; remove `.format()` string
+   = help: Assign to variable; remove f-string literal
 
 ℹ Suggested fix
 15 15 | 
-16 16 | 
-17 17 | def f_c():
-18    |-    raise RuntimeError("This is an {example} exception".format(example="example"))
-   18 |+    msg = "This is an {example} exception".format(example="example")
+16 16 | def f_b():
+17 17 |     example = "example"
+18    |-    raise RuntimeError(f"This is an {example} exception")
+   18 |+    msg = f"This is an {example} exception"
    19 |+    raise RuntimeError(msg)
 19 20 | 
 20 21 | 
-21 22 | def f_ok():
+21 22 | def f_c():
 
-EM.py:28:24: EM101 Exception must not use a string literal, assign to variable first
+EM.py:22:24: EM103 [*] Exception must not use a `.format()` string directly, assign to variable first
+   |
+22 | def f_c():
+23 |     raise RuntimeError("This is an {example} exception".format(example="example"))
+   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM103
    |
-28 | def f_unfixable():
-29 |     msg = "hello"
-30 |     raise RuntimeError("This is an example exception")
+   = help: Assign to variable; remove `.format()` string
+
+ℹ Suggested fix
+19 19 | 
+20 20 | 
+21 21 | def f_c():
+22    |-    raise RuntimeError("This is an {example} exception".format(example="example"))
+   22 |+    msg = "This is an {example} exception".format(example="example")
+   23 |+    raise RuntimeError(msg)
+23 24 | 
+24 25 | 
+25 26 | def f_ok():
+
+EM.py:32:24: EM101 Exception must not use a string literal, assign to variable first
+   |
+32 | def f_unfixable():
+33 |     msg = "hello"
+34 |     raise RuntimeError("This is an example exception")
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM101
    |
+   = help: Assign to variable; remove string literal
 
-EM.py:35:24: EM101 [*] Exception must not use a string literal, assign to variable first
+EM.py:39:24: EM101 [*] Exception must not use a string literal, assign to variable first
    |
-35 |         msg = "hello"
-36 | 
-37 |     raise RuntimeError("This is an example exception")
+39 |         msg = "hello"
+40 | 
+41 |     raise RuntimeError("This is an example exception")
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM101
    |
    = help: Assign to variable; remove string literal
 
 ℹ Suggested fix
-32 32 |     def nested():
-33 33 |         msg = "hello"
-34 34 | 
-35    |-    raise RuntimeError("This is an example exception")
-   35 |+    msg = "This is an example exception"
-   36 |+    raise RuntimeError(msg)
-36 37 | 
-37 38 | 
-38 39 | def f_msg_in_parent_scope():
-
-EM.py:42:28: EM101 Exception must not use a string literal, assign to variable first
-   |
-42 |     def nested():
-43 |         raise RuntimeError("This is an example exception")
+36 36 |     def nested():
+37 37 |         msg = "hello"
+38 38 | 
+39    |-    raise RuntimeError("This is an example exception")
+   39 |+    msg = "This is an example exception"
+   40 |+    raise RuntimeError(msg)
+40 41 | 
+41 42 | 
+42 43 | def f_msg_in_parent_scope():
+
+EM.py:46:28: EM101 Exception must not use a string literal, assign to variable first
+   |
+46 |     def nested():
+47 |         raise RuntimeError("This is an example exception")
    |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM101
    |
+   = help: Assign to variable; remove string literal
 
-EM.py:47:28: EM101 [*] Exception must not use a string literal, assign to variable first
+EM.py:51:28: EM101 [*] Exception must not use a string literal, assign to variable first
    |
-47 | def f_fix_indentation_check(foo):
-48 |     if foo:
-49 |         raise RuntimeError("This is an example exception")
+51 | def f_fix_indentation_check(foo):
+52 |     if foo:
+53 |         raise RuntimeError("This is an example exception")
    |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM101
-50 |     else:
-51 |         if foo == "foo":
+54 |     else:
+55 |         if foo == "foo":
    |
    = help: Assign to variable; remove string literal
 
 ℹ Suggested fix
-44 44 | 
-45 45 | def f_fix_indentation_check(foo):
-46 46 |     if foo:
-47    |-        raise RuntimeError("This is an example exception")
-   47 |+        msg = "This is an example exception"
-   48 |+        raise RuntimeError(msg)
-48 49 |     else:
-49 50 |         if foo == "foo":
-50 51 |             raise RuntimeError(f"This is an exception: {foo}")
-
-EM.py:50:32: EM102 [*] Exception must not use an f-string literal, assign to variable first
-   |
-50 |     else:
-51 |         if foo == "foo":
-52 |             raise RuntimeError(f"This is an exception: {foo}")
+48 48 | 
+49 49 | def f_fix_indentation_check(foo):
+50 50 |     if foo:
+51    |-        raise RuntimeError("This is an example exception")
+   51 |+        msg = "This is an example exception"
+   52 |+        raise RuntimeError(msg)
+52 53 |     else:
+53 54 |         if foo == "foo":
+54 55 |             raise RuntimeError(f"This is an exception: {foo}")
+
+EM.py:54:32: EM102 [*] Exception must not use an f-string literal, assign to variable first
+   |
+54 |     else:
+55 |         if foo == "foo":
+56 |             raise RuntimeError(f"This is an exception: {foo}")
    |                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM102
-53 |     raise RuntimeError("This is an exception: {}".format(foo))
+57 |     raise RuntimeError("This is an exception: {}".format(foo))
    |
    = help: Assign to variable; remove f-string literal
 
 ℹ Suggested fix
-47 47 |         raise RuntimeError("This is an example exception")
-48 48 |     else:
-49 49 |         if foo == "foo":
-50    |-            raise RuntimeError(f"This is an exception: {foo}")
-   50 |+            msg = f"This is an exception: {foo}"
-   51 |+            raise RuntimeError(msg)
-51 52 |     raise RuntimeError("This is an exception: {}".format(foo))
-52 53 | 
-53 54 | 
-
-EM.py:51:24: EM103 [*] Exception must not use a `.format()` string directly, assign to variable first
-   |
-51 |         if foo == "foo":
-52 |             raise RuntimeError(f"This is an exception: {foo}")
-53 |     raise RuntimeError("This is an exception: {}".format(foo))
+51 51 |         raise RuntimeError("This is an example exception")
+52 52 |     else:
+53 53 |         if foo == "foo":
+54    |-            raise RuntimeError(f"This is an exception: {foo}")
+   54 |+            msg = f"This is an exception: {foo}"
+   55 |+            raise RuntimeError(msg)
+55 56 |     raise RuntimeError("This is an exception: {}".format(foo))
+56 57 | 
+57 58 | 
+
+EM.py:55:24: EM103 [*] Exception must not use a `.format()` string directly, assign to variable first
+   |
+55 |         if foo == "foo":
+56 |             raise RuntimeError(f"This is an exception: {foo}")
+57 |     raise RuntimeError("This is an exception: {}".format(foo))
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM103
    |
    = help: Assign to variable; remove `.format()` string
 
 ℹ Suggested fix
-48 48 |     else:
-49 49 |         if foo == "foo":
-50 50 |             raise RuntimeError(f"This is an exception: {foo}")
-51    |-    raise RuntimeError("This is an exception: {}".format(foo))
-   51 |+    msg = "This is an exception: {}".format(foo)
-   52 |+    raise RuntimeError(msg)
-52 53 | 
-53 54 | 
-54 55 | # Report these, but don't fix them
-
-EM.py:55:28: EM101 Exception must not use a string literal, assign to variable first
-   |
-55 | # Report these, but don't fix them
-56 | if foo: raise RuntimeError("This is an example exception")
+52 52 |     else:
+53 53 |         if foo == "foo":
+54 54 |             raise RuntimeError(f"This is an exception: {foo}")
+55    |-    raise RuntimeError("This is an exception: {}".format(foo))
+   55 |+    msg = "This is an exception: {}".format(foo)
+   56 |+    raise RuntimeError(msg)
+56 57 | 
+57 58 | 
+58 59 | # Report these, but don't fix them
+
+EM.py:59:28: EM101 Exception must not use a string literal, assign to variable first
+   |
+59 | # Report these, but don't fix them
+60 | if foo: raise RuntimeError("This is an example exception")
    |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM101
-57 | if foo: x = 1; raise RuntimeError("This is an example exception")
+61 | if foo: x = 1; raise RuntimeError("This is an example exception")
    |
+   = help: Assign to variable; remove string literal
 
-EM.py:56:35: EM101 Exception must not use a string literal, assign to variable first
+EM.py:60:35: EM101 Exception must not use a string literal, assign to variable first
    |
-56 | # Report these, but don't fix them
-57 | if foo: raise RuntimeError("This is an example exception")
-58 | if foo: x = 1; raise RuntimeError("This is an example exception")
+60 | # Report these, but don't fix them
+61 | if foo: raise RuntimeError("This is an example exception")
+62 | if foo: x = 1; raise RuntimeError("This is an example exception")
    |                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM101
    |
+   = help: Assign to variable; remove string literal
 
 
diff --git a/crates/ruff/src/rules/flake8_executable/helpers.rs b/crates/ruff/src/rules/flake8_executable/helpers.rs
index 6dcf5f1a79e70..f52e746bd0e61 100644
--- a/crates/ruff/src/rules/flake8_executable/helpers.rs
+++ b/crates/ruff/src/rules/flake8_executable/helpers.rs
@@ -13,13 +13,13 @@ static SHEBANG_REGEX: Lazy<Regex> =
     Lazy::new(|| Regex::new(r"^(?P<spaces>\s*)#!(?P<directive>.*)").unwrap());
 
 #[derive(Debug, PartialEq, Eq)]
-pub enum ShebangDirective<'a> {
+pub(crate) enum ShebangDirective<'a> {
     None,
     // whitespace length, start of the shebang, contents
     Match(TextSize, TextSize, &'a str),
 }
 
-pub fn extract_shebang(line: &str) -> ShebangDirective {
+pub(crate) fn extract_shebang(line: &str) -> ShebangDirective {
     // Minor optimization to avoid matches in the common case.
     if !line.contains('!') {
         return ShebangDirective::None;
@@ -41,7 +41,7 @@ pub fn extract_shebang(line: &str) -> ShebangDirective {
 }
 
 #[cfg(target_family = "unix")]
-pub fn is_executable(filepath: &Path) -> Result<bool> {
+pub(crate) fn is_executable(filepath: &Path) -> Result<bool> {
     {
         let metadata = filepath.metadata()?;
         let permissions = metadata.permissions();
@@ -51,12 +51,12 @@ pub fn is_executable(filepath: &Path) -> Result<bool> {
 
 #[cfg(test)]
 mod tests {
+    use ruff_text_size::TextSize;
+
     use crate::rules::flake8_executable::helpers::{
         extract_shebang, ShebangDirective, SHEBANG_REGEX,
     };
 
-    use ruff_text_size::TextSize;
-
     #[test]
     fn shebang_regex() {
         // Positive cases
diff --git a/crates/ruff/src/rules/flake8_executable/mod.rs b/crates/ruff/src/rules/flake8_executable/mod.rs
index f37d8f799349e..a1bab8efe2ec5 100644
--- a/crates/ruff/src/rules/flake8_executable/mod.rs
+++ b/crates/ruff/src/rules/flake8_executable/mod.rs
@@ -8,26 +8,25 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Path::new("EXE001_1.py"); "EXE001_1")]
-    #[test_case(Path::new("EXE001_2.py"); "EXE001_2")]
-    #[test_case(Path::new("EXE001_3.py"); "EXE001_3")]
-    #[test_case(Path::new("EXE002_1.py"); "EXE002_1")]
-    #[test_case(Path::new("EXE002_2.py"); "EXE002_2")]
-    #[test_case(Path::new("EXE002_3.py"); "EXE002_3")]
-    #[test_case(Path::new("EXE003.py"); "EXE003")]
-    #[test_case(Path::new("EXE004_1.py"); "EXE004_1")]
-    #[test_case(Path::new("EXE004_2.py"); "EXE004_2")]
-    #[test_case(Path::new("EXE004_3.py"); "EXE004_3")]
-    #[test_case(Path::new("EXE005_1.py"); "EXE005_1")]
-    #[test_case(Path::new("EXE005_2.py"); "EXE005_2")]
-    #[test_case(Path::new("EXE005_3.py"); "EXE005_3")]
+    #[test_case(Path::new("EXE001_1.py"))]
+    #[test_case(Path::new("EXE001_2.py"))]
+    #[test_case(Path::new("EXE001_3.py"))]
+    #[test_case(Path::new("EXE002_1.py"))]
+    #[test_case(Path::new("EXE002_2.py"))]
+    #[test_case(Path::new("EXE002_3.py"))]
+    #[test_case(Path::new("EXE003.py"))]
+    #[test_case(Path::new("EXE004_1.py"))]
+    #[test_case(Path::new("EXE004_2.py"))]
+    #[test_case(Path::new("EXE004_3.py"))]
+    #[test_case(Path::new("EXE005_1.py"))]
+    #[test_case(Path::new("EXE005_2.py"))]
+    #[test_case(Path::new("EXE005_3.py"))]
     fn rules(path: &Path) -> Result<()> {
         let snapshot = path.to_string_lossy().into_owned();
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_executable/rules/mod.rs b/crates/ruff/src/rules/flake8_executable/rules/mod.rs
index 382952bbb8ca9..4e300fae4482f 100644
--- a/crates/ruff/src/rules/flake8_executable/rules/mod.rs
+++ b/crates/ruff/src/rules/flake8_executable/rules/mod.rs
@@ -1,8 +1,8 @@
-pub use shebang_missing::{shebang_missing, ShebangMissingExecutableFile};
-pub use shebang_newline::{shebang_newline, ShebangNotFirstLine};
-pub use shebang_not_executable::{shebang_not_executable, ShebangNotExecutable};
-pub use shebang_python::{shebang_python, ShebangMissingPython};
-pub use shebang_whitespace::{shebang_whitespace, ShebangLeadingWhitespace};
+pub(crate) use shebang_missing::{shebang_missing, ShebangMissingExecutableFile};
+pub(crate) use shebang_newline::{shebang_newline, ShebangNotFirstLine};
+pub(crate) use shebang_not_executable::{shebang_not_executable, ShebangNotExecutable};
+pub(crate) use shebang_python::{shebang_python, ShebangMissingPython};
+pub(crate) use shebang_whitespace::{shebang_whitespace, ShebangLeadingWhitespace};
 
 mod shebang_missing;
 mod shebang_newline;
diff --git a/crates/ruff/src/rules/flake8_executable/rules/shebang_missing.rs b/crates/ruff/src/rules/flake8_executable/rules/shebang_missing.rs
index dc3c02d2e449a..ea33e57d0c9cc 100644
--- a/crates/ruff/src/rules/flake8_executable/rules/shebang_missing.rs
+++ b/crates/ruff/src/rules/flake8_executable/rules/shebang_missing.rs
@@ -1,8 +1,9 @@
 #![allow(unused_imports)]
 
-use ruff_text_size::TextRange;
 use std::path::Path;
 
+use ruff_text_size::TextRange;
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
@@ -22,7 +23,7 @@ impl Violation for ShebangMissingExecutableFile {
 
 /// EXE002
 #[cfg(target_family = "unix")]
-pub fn shebang_missing(filepath: &Path) -> Option<Diagnostic> {
+pub(crate) fn shebang_missing(filepath: &Path) -> Option<Diagnostic> {
     if let Ok(true) = is_executable(filepath) {
         let diagnostic = Diagnostic::new(ShebangMissingExecutableFile, TextRange::default());
         return Some(diagnostic);
@@ -31,6 +32,6 @@ pub fn shebang_missing(filepath: &Path) -> Option<Diagnostic> {
 }
 
 #[cfg(not(target_family = "unix"))]
-pub fn shebang_missing(_filepath: &Path) -> Option<Diagnostic> {
+pub(crate) fn shebang_missing(_filepath: &Path) -> Option<Diagnostic> {
     None
 }
diff --git a/crates/ruff/src/rules/flake8_executable/rules/shebang_newline.rs b/crates/ruff/src/rules/flake8_executable/rules/shebang_newline.rs
index ad5e2cc1d38b4..9c605ba9408ac 100644
--- a/crates/ruff/src/rules/flake8_executable/rules/shebang_newline.rs
+++ b/crates/ruff/src/rules/flake8_executable/rules/shebang_newline.rs
@@ -16,7 +16,7 @@ impl Violation for ShebangNotFirstLine {
 }
 
 /// EXE005
-pub fn shebang_newline(
+pub(crate) fn shebang_newline(
     range: TextRange,
     shebang: &ShebangDirective,
     first_line: bool,
diff --git a/crates/ruff/src/rules/flake8_executable/rules/shebang_not_executable.rs b/crates/ruff/src/rules/flake8_executable/rules/shebang_not_executable.rs
index 72e284f895d2e..6cfcc13887e70 100644
--- a/crates/ruff/src/rules/flake8_executable/rules/shebang_not_executable.rs
+++ b/crates/ruff/src/rules/flake8_executable/rules/shebang_not_executable.rs
@@ -1,8 +1,9 @@
 #![allow(unused_imports)]
 
-use ruff_text_size::{TextLen, TextRange, TextSize};
 use std::path::Path;
 
+use ruff_text_size::{TextLen, TextRange, TextSize};
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
@@ -23,7 +24,7 @@ impl Violation for ShebangNotExecutable {
 
 /// EXE001
 #[cfg(target_family = "unix")]
-pub fn shebang_not_executable(
+pub(crate) fn shebang_not_executable(
     filepath: &Path,
     range: TextRange,
     shebang: &ShebangDirective,
@@ -41,7 +42,7 @@ pub fn shebang_not_executable(
 }
 
 #[cfg(not(target_family = "unix"))]
-pub fn shebang_not_executable(
+pub(crate) fn shebang_not_executable(
     _filepath: &Path,
     _range: TextRange,
     _shebang: &ShebangDirective,
diff --git a/crates/ruff/src/rules/flake8_executable/rules/shebang_python.rs b/crates/ruff/src/rules/flake8_executable/rules/shebang_python.rs
index ded384a05b4cc..73f3d1f333390 100644
--- a/crates/ruff/src/rules/flake8_executable/rules/shebang_python.rs
+++ b/crates/ruff/src/rules/flake8_executable/rules/shebang_python.rs
@@ -16,7 +16,7 @@ impl Violation for ShebangMissingPython {
 }
 
 /// EXE003
-pub fn shebang_python(range: TextRange, shebang: &ShebangDirective) -> Option<Diagnostic> {
+pub(crate) fn shebang_python(range: TextRange, shebang: &ShebangDirective) -> Option<Diagnostic> {
     if let ShebangDirective::Match(_, start, content) = shebang {
         if content.contains("python") || content.contains("pytest") {
             None
diff --git a/crates/ruff/src/rules/flake8_executable/rules/shebang_whitespace.rs b/crates/ruff/src/rules/flake8_executable/rules/shebang_whitespace.rs
index a50105cadcabb..0458d6143255c 100644
--- a/crates/ruff/src/rules/flake8_executable/rules/shebang_whitespace.rs
+++ b/crates/ruff/src/rules/flake8_executable/rules/shebang_whitespace.rs
@@ -1,6 +1,6 @@
 use ruff_text_size::{TextRange, TextSize};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::rules::flake8_executable::helpers::ShebangDirective;
@@ -20,7 +20,7 @@ impl AlwaysAutofixableViolation for ShebangLeadingWhitespace {
 }
 
 /// EXE004
-pub fn shebang_whitespace(
+pub(crate) fn shebang_whitespace(
     range: TextRange,
     shebang: &ShebangDirective,
     autofix: bool,
@@ -32,10 +32,11 @@ pub fn shebang_whitespace(
                 TextRange::at(range.start(), *n_spaces),
             );
             if autofix {
-                diagnostic.set_fix(Edit::range_deletion(TextRange::at(
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_deletion(TextRange::at(
                     range.start(),
                     *n_spaces,
-                )));
+                ))));
             }
             Some(diagnostic)
         } else {
diff --git a/crates/ruff/src/rules/flake8_fixme/mod.rs b/crates/ruff/src/rules/flake8_fixme/mod.rs
new file mode 100644
index 0000000000000..735e61c72e6d4
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_fixme/mod.rs
@@ -0,0 +1,27 @@
+pub mod rules;
+
+#[cfg(test)]
+mod tests {
+    use std::path::Path;
+
+    use anyhow::Result;
+    use test_case::test_case;
+
+    use crate::registry::Rule;
+    use crate::test::test_path;
+    use crate::{assert_messages, settings};
+
+    #[test_case(Rule::LineContainsFixme; "T001")]
+    #[test_case(Rule::LineContainsHack; "T002")]
+    #[test_case(Rule::LineContainsTodo; "T003")]
+    #[test_case(Rule::LineContainsXxx; "T004")]
+    fn rules(rule_code: Rule) -> Result<()> {
+        let snapshot = format!("{}_T00.py", rule_code.as_ref());
+        let diagnostics = test_path(
+            Path::new("flake8_fixme/T00.py"),
+            &settings::Settings::for_rule(rule_code),
+        )?;
+        assert_messages!(snapshot, diagnostics);
+        Ok(())
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_fixme/rules/mod.rs b/crates/ruff/src/rules/flake8_fixme/rules/mod.rs
new file mode 100644
index 0000000000000..92e8eae87d1d2
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_fixme/rules/mod.rs
@@ -0,0 +1,5 @@
+pub(crate) use todos::{
+    todos, LineContainsFixme, LineContainsHack, LineContainsTodo, LineContainsXxx,
+};
+
+mod todos;
diff --git a/crates/ruff/src/rules/flake8_fixme/rules/todos.rs b/crates/ruff/src/rules/flake8_fixme/rules/todos.rs
new file mode 100644
index 0000000000000..495fccc030f59
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_fixme/rules/todos.rs
@@ -0,0 +1,56 @@
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::directives::{TodoComment, TodoDirectiveKind};
+
+#[violation]
+pub struct LineContainsTodo;
+impl Violation for LineContainsTodo {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Line contains TODO")
+    }
+}
+
+#[violation]
+pub struct LineContainsFixme;
+impl Violation for LineContainsFixme {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Line contains FIXME")
+    }
+}
+
+#[violation]
+pub struct LineContainsXxx;
+impl Violation for LineContainsXxx {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Line contains XXX")
+    }
+}
+
+#[violation]
+pub struct LineContainsHack;
+impl Violation for LineContainsHack {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Line contains HACK")
+    }
+}
+
+pub(crate) fn todos(directive_ranges: &[TodoComment]) -> Vec<Diagnostic> {
+    directive_ranges
+        .iter()
+        .map(|TodoComment { directive, .. }| match directive.kind {
+            // FIX001
+            TodoDirectiveKind::Fixme => Diagnostic::new(LineContainsFixme, directive.range),
+            // FIX002
+            TodoDirectiveKind::Hack => Diagnostic::new(LineContainsHack, directive.range),
+            // FIX003
+            TodoDirectiveKind::Todo => Diagnostic::new(LineContainsTodo, directive.range),
+            // FIX004
+            TodoDirectiveKind::Xxx => Diagnostic::new(LineContainsXxx, directive.range),
+        })
+        .collect::<Vec<Diagnostic>>()
+}
diff --git a/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-fixme_T00.py.snap b/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-fixme_T00.py.snap
new file mode 100644
index 0000000000000..51153377ed4c1
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-fixme_T00.py.snap
@@ -0,0 +1,21 @@
+---
+source: crates/ruff/src/rules/flake8_fixme/mod.rs
+---
+T00.py:7:3: FIX001 Line contains FIXME
+   |
+ 7 | # HACK: hack
+ 8 | # hack: hack
+ 9 | # FIXME: fixme
+   |   ^^^^^ FIX001
+10 | # fixme: fixme
+   |
+
+T00.py:8:3: FIX001 Line contains FIXME
+   |
+ 8 | # hack: hack
+ 9 | # FIXME: fixme
+10 | # fixme: fixme
+   |   ^^^^^ FIX001
+   |
+
+
diff --git a/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-hack_T00.py.snap b/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-hack_T00.py.snap
new file mode 100644
index 0000000000000..8a06eed829f27
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-hack_T00.py.snap
@@ -0,0 +1,24 @@
+---
+source: crates/ruff/src/rules/flake8_fixme/mod.rs
+---
+T00.py:5:3: FIX004 Line contains HACK
+  |
+5 | # XXX: xxx
+6 | # xxx: xxx
+7 | # HACK: hack
+  |   ^^^^ FIX004
+8 | # hack: hack
+9 | # FIXME: fixme
+  |
+
+T00.py:6:3: FIX004 Line contains HACK
+   |
+ 6 | # xxx: xxx
+ 7 | # HACK: hack
+ 8 | # hack: hack
+   |   ^^^^ FIX004
+ 9 | # FIXME: fixme
+10 | # fixme: fixme
+   |
+
+
diff --git a/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-todo_T00.py.snap b/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-todo_T00.py.snap
new file mode 100644
index 0000000000000..9abe705e8a41b
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-todo_T00.py.snap
@@ -0,0 +1,21 @@
+---
+source: crates/ruff/src/rules/flake8_fixme/mod.rs
+---
+T00.py:1:3: FIX002 Line contains TODO
+  |
+1 | # TODO: todo
+  |   ^^^^ FIX002
+2 | # todo: todo
+3 | # XXX: xxx
+  |
+
+T00.py:2:3: FIX002 Line contains TODO
+  |
+2 | # TODO: todo
+3 | # todo: todo
+  |   ^^^^ FIX002
+4 | # XXX: xxx
+5 | # xxx: xxx
+  |
+
+
diff --git a/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-xxx_T00.py.snap b/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-xxx_T00.py.snap
new file mode 100644
index 0000000000000..a72d1e51b668f
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-xxx_T00.py.snap
@@ -0,0 +1,24 @@
+---
+source: crates/ruff/src/rules/flake8_fixme/mod.rs
+---
+T00.py:3:3: FIX003 Line contains XXX
+  |
+3 | # TODO: todo
+4 | # todo: todo
+5 | # XXX: xxx
+  |   ^^^ FIX003
+6 | # xxx: xxx
+7 | # HACK: hack
+  |
+
+T00.py:4:3: FIX003 Line contains XXX
+  |
+4 | # todo: todo
+5 | # XXX: xxx
+6 | # xxx: xxx
+  |   ^^^ FIX003
+7 | # HACK: hack
+8 | # hack: hack
+  |
+
+
diff --git a/crates/ruff/src/rules/flake8_future_annotations/mod.rs b/crates/ruff/src/rules/flake8_future_annotations/mod.rs
new file mode 100644
index 0000000000000..c6e994bd429b8
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/mod.rs
@@ -0,0 +1,58 @@
+//! Rules from [flake8-future-annotations](https://pypi.org/project/flake8-future-annotations/).
+pub(crate) mod rules;
+
+#[cfg(test)]
+mod tests {
+    use std::path::Path;
+
+    use anyhow::Result;
+    use test_case::test_case;
+
+    use crate::registry::Rule;
+    use crate::settings::types::PythonVersion;
+    use crate::test::test_path;
+    use crate::{assert_messages, settings};
+
+    #[test_case(Path::new("edge_case.py"))]
+    #[test_case(Path::new("from_typing_import.py"))]
+    #[test_case(Path::new("from_typing_import_many.py"))]
+    #[test_case(Path::new("import_typing.py"))]
+    #[test_case(Path::new("import_typing_as.py"))]
+    #[test_case(Path::new("no_future_import_uses_lowercase.py"))]
+    #[test_case(Path::new("no_future_import_uses_union.py"))]
+    #[test_case(Path::new("no_future_import_uses_union_inner.py"))]
+    #[test_case(Path::new("ok_no_types.py"))]
+    #[test_case(Path::new("ok_non_simplifiable_types.py"))]
+    #[test_case(Path::new("ok_uses_future.py"))]
+    #[test_case(Path::new("ok_variable_name.py"))]
+    fn fa100(path: &Path) -> Result<()> {
+        let snapshot = path.to_string_lossy().into_owned();
+        let diagnostics = test_path(
+            Path::new("flake8_future_annotations").join(path).as_path(),
+            &settings::Settings {
+                target_version: PythonVersion::Py37,
+                ..settings::Settings::for_rule(Rule::FutureRewritableTypeAnnotation)
+            },
+        )?;
+        assert_messages!(snapshot, diagnostics);
+        Ok(())
+    }
+
+    #[test_case(Path::new("no_future_import_uses_lowercase.py"))]
+    #[test_case(Path::new("no_future_import_uses_union.py"))]
+    #[test_case(Path::new("no_future_import_uses_union_inner.py"))]
+    #[test_case(Path::new("ok_no_types.py"))]
+    #[test_case(Path::new("ok_uses_future.py"))]
+    fn fa102(path: &Path) -> Result<()> {
+        let snapshot = format!("fa102_{}", path.to_string_lossy());
+        let diagnostics = test_path(
+            Path::new("flake8_future_annotations").join(path).as_path(),
+            &settings::Settings {
+                target_version: PythonVersion::Py37,
+                ..settings::Settings::for_rule(Rule::FutureRequiredTypeAnnotation)
+            },
+        )?;
+        assert_messages!(snapshot, diagnostics);
+        Ok(())
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_future_annotations/rules/future_required_type_annotation.rs b/crates/ruff/src/rules/flake8_future_annotations/rules/future_required_type_annotation.rs
new file mode 100644
index 0000000000000..b82e8d5cb82f8
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/rules/future_required_type_annotation.rs
@@ -0,0 +1,73 @@
+use rustpython_parser::ast::{Expr, Ranged};
+use std::fmt;
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for uses of PEP 585- and PEP 604-style type annotations in Python
+/// modules that lack the required `from __future__ import annotations` import
+/// for compatibility with older Python versions.
+///
+/// ## Why is this bad?
+/// Using PEP 585 and PEP 604 style annotations without a `from __future__ import
+/// annotations` import will cause runtime errors on Python versions prior to
+/// 3.9 and 3.10, respectively.
+///
+/// By adding the `__future__` import, the interpreter will no longer interpret
+/// annotations at evaluation time, making the code compatible with both past
+/// and future Python versions.
+///
+/// ## Example
+/// ```python
+/// def func(obj: dict[str, int | None]) -> None:
+///     ...
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from __future__ import annotations
+///
+///
+/// def func(obj: dict[str, int | None]) -> None:
+///     ...
+/// ```
+#[violation]
+pub struct FutureRequiredTypeAnnotation {
+    reason: Reason,
+}
+
+#[derive(Debug, PartialEq, Eq)]
+pub(crate) enum Reason {
+    /// The type annotation is written in PEP 585 style (e.g., `list[int]`).
+    PEP585,
+    /// The type annotation is written in PEP 604 style (e.g., `int | None`).
+    PEP604,
+}
+
+impl fmt::Display for Reason {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Reason::PEP585 => fmt.write_str("PEP 585 collection"),
+            Reason::PEP604 => fmt.write_str("PEP 604 union"),
+        }
+    }
+}
+
+impl Violation for FutureRequiredTypeAnnotation {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let FutureRequiredTypeAnnotation { reason } = self;
+        format!("Missing `from __future__ import annotations`, but uses {reason}")
+    }
+}
+
+/// FA102
+pub(crate) fn future_required_type_annotation(checker: &mut Checker, expr: &Expr, reason: Reason) {
+    checker.diagnostics.push(Diagnostic::new(
+        FutureRequiredTypeAnnotation { reason },
+        expr.range(),
+    ));
+}
diff --git a/crates/ruff/src/rules/flake8_future_annotations/rules/future_rewritable_type_annotation.rs b/crates/ruff/src/rules/flake8_future_annotations/rules/future_rewritable_type_annotation.rs
new file mode 100644
index 0000000000000..1594938feccc3
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/rules/future_rewritable_type_annotation.rs
@@ -0,0 +1,78 @@
+use rustpython_parser::ast::{Expr, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::call_path::format_call_path;
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for missing `from __future__ import annotations` imports upon
+/// detecting type annotations that can be written more succinctly under
+/// PEP 563.
+///
+/// ## Why is this bad?
+/// PEP 563 enabled the use of a number of convenient type annotations, such as
+/// `list[str]` instead of `List[str]`, or `str | None` instead of
+/// `Optional[str]`. However, these annotations are only available on Python
+/// 3.9 and higher, _unless_ the `from __future__ import annotations` import is present.
+///
+/// By adding the `__future__` import, the pyupgrade rules can automatically
+/// migrate existing code to use the new syntax, even for older Python versions.
+/// This rule thus pairs well with pyupgrade and with Ruff's pyupgrade rules.
+///
+/// ## Example
+/// ```python
+/// from typing import List, Dict, Optional
+///
+///
+/// def func(obj: Dict[str, Optional[int]]) -> None:
+///     ...
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from __future__ import annotations
+///
+/// from typing import List, Dict, Optional
+///
+///
+/// def func(obj: Dict[str, Optional[int]]) -> None:
+///     ...
+/// ```
+///
+/// After running the additional pyupgrade rules:
+/// ```python
+/// from __future__ import annotations
+///
+///
+/// def func(obj: dict[str, int | None]) -> None:
+///     ...
+/// ```
+#[violation]
+pub struct FutureRewritableTypeAnnotation {
+    name: String,
+}
+
+impl Violation for FutureRewritableTypeAnnotation {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let FutureRewritableTypeAnnotation { name } = self;
+        format!("Missing `from __future__ import annotations`, but uses `{name}`")
+    }
+}
+
+/// FA100
+pub(crate) fn future_rewritable_type_annotation(checker: &mut Checker, expr: &Expr) {
+    let name = checker
+        .semantic_model()
+        .resolve_call_path(expr)
+        .map(|binding| format_call_path(&binding));
+
+    if let Some(name) = name {
+        checker.diagnostics.push(Diagnostic::new(
+            FutureRewritableTypeAnnotation { name },
+            expr.range(),
+        ));
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_future_annotations/rules/mod.rs b/crates/ruff/src/rules/flake8_future_annotations/rules/mod.rs
new file mode 100644
index 0000000000000..e5e674a5c893c
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/rules/mod.rs
@@ -0,0 +1,9 @@
+pub(crate) use future_required_type_annotation::{
+    future_required_type_annotation, FutureRequiredTypeAnnotation, Reason,
+};
+pub(crate) use future_rewritable_type_annotation::{
+    future_rewritable_type_annotation, FutureRewritableTypeAnnotation,
+};
+
+mod future_required_type_annotation;
+mod future_rewritable_type_annotation;
diff --git a/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__edge_case.py.snap b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__edge_case.py.snap
new file mode 100644
index 0000000000000..9cde96fc8eccf
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__edge_case.py.snap
@@ -0,0 +1,12 @@
+---
+source: crates/ruff/src/rules/flake8_future_annotations/mod.rs
+---
+edge_case.py:6:13: FA100 Missing `from __future__ import annotations`, but uses `typing.List`
+  |
+6 | def main(_: List[int]) -> None:
+7 |     a_list: t.List[str] = []
+  |             ^^^^^^ FA100
+8 |     a_list.append("hello")
+  |
+
+
diff --git a/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_lowercase.py.snap b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_lowercase.py.snap
new file mode 100644
index 0000000000000..4cf41d1f0cea7
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_lowercase.py.snap
@@ -0,0 +1,12 @@
+---
+source: crates/ruff/src/rules/flake8_future_annotations/mod.rs
+---
+no_future_import_uses_lowercase.py:2:13: FA102 Missing `from __future__ import annotations`, but uses PEP 585 collection
+  |
+2 | def main() -> None:
+3 |     a_list: list[str] = []
+  |             ^^^^^^^^^ FA102
+4 |     a_list.append("hello")
+  |
+
+
diff --git a/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union.py.snap b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union.py.snap
new file mode 100644
index 0000000000000..64749b8034251
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union.py.snap
@@ -0,0 +1,20 @@
+---
+source: crates/ruff/src/rules/flake8_future_annotations/mod.rs
+---
+no_future_import_uses_union.py:2:13: FA102 Missing `from __future__ import annotations`, but uses PEP 604 union
+  |
+2 | def main() -> None:
+3 |     a_list: list[str] | None = []
+  |             ^^^^^^^^^^^^^^^^ FA102
+4 |     a_list.append("hello")
+  |
+
+no_future_import_uses_union.py:2:13: FA102 Missing `from __future__ import annotations`, but uses PEP 585 collection
+  |
+2 | def main() -> None:
+3 |     a_list: list[str] | None = []
+  |             ^^^^^^^^^ FA102
+4 |     a_list.append("hello")
+  |
+
+
diff --git a/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union_inner.py.snap b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union_inner.py.snap
new file mode 100644
index 0000000000000..3f0d26fc63d55
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union_inner.py.snap
@@ -0,0 +1,36 @@
+---
+source: crates/ruff/src/rules/flake8_future_annotations/mod.rs
+---
+no_future_import_uses_union_inner.py:2:13: FA102 Missing `from __future__ import annotations`, but uses PEP 585 collection
+  |
+2 | def main() -> None:
+3 |     a_list: list[str | None] = []
+  |             ^^^^^^^^^^^^^^^^ FA102
+4 |     a_list.append("hello")
+  |
+
+no_future_import_uses_union_inner.py:2:18: FA102 Missing `from __future__ import annotations`, but uses PEP 604 union
+  |
+2 | def main() -> None:
+3 |     a_list: list[str | None] = []
+  |                  ^^^^^^^^^^ FA102
+4 |     a_list.append("hello")
+  |
+
+no_future_import_uses_union_inner.py:7:8: FA102 Missing `from __future__ import annotations`, but uses PEP 585 collection
+  |
+7 | def hello(y: dict[str | None, int]) -> None:
+8 |     z: tuple[str, str | None, str] = tuple(y)
+  |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^ FA102
+9 |     del z
+  |
+
+no_future_import_uses_union_inner.py:7:19: FA102 Missing `from __future__ import annotations`, but uses PEP 604 union
+  |
+7 | def hello(y: dict[str | None, int]) -> None:
+8 |     z: tuple[str, str | None, str] = tuple(y)
+  |                   ^^^^^^^^^^ FA102
+9 |     del z
+  |
+
+
diff --git a/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__fa102_ok_no_types.py.snap b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__fa102_ok_no_types.py.snap
new file mode 100644
index 0000000000000..681d4be5e5338
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__fa102_ok_no_types.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_future_annotations/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__fa102_ok_uses_future.py.snap b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__fa102_ok_uses_future.py.snap
new file mode 100644
index 0000000000000..681d4be5e5338
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__fa102_ok_uses_future.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_future_annotations/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__from_typing_import.py.snap b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__from_typing_import.py.snap
new file mode 100644
index 0000000000000..0f4171346cd71
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__from_typing_import.py.snap
@@ -0,0 +1,12 @@
+---
+source: crates/ruff/src/rules/flake8_future_annotations/mod.rs
+---
+from_typing_import.py:5:13: FA100 Missing `from __future__ import annotations`, but uses `typing.List`
+  |
+5 | def main() -> None:
+6 |     a_list: List[str] = []
+  |             ^^^^ FA100
+7 |     a_list.append("hello")
+  |
+
+
diff --git a/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__from_typing_import_many.py.snap b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__from_typing_import_many.py.snap
new file mode 100644
index 0000000000000..ca9f715c131df
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__from_typing_import_many.py.snap
@@ -0,0 +1,22 @@
+---
+source: crates/ruff/src/rules/flake8_future_annotations/mod.rs
+---
+from_typing_import_many.py:5:13: FA100 Missing `from __future__ import annotations`, but uses `typing.List`
+  |
+5 | def main() -> None:
+6 |     a_list: List[Optional[str]] = []
+  |             ^^^^ FA100
+7 |     a_list.append("hello")
+8 |     a_dict = cast(Dict[int | None, Union[int, Set[bool]]], {})
+  |
+
+from_typing_import_many.py:5:18: FA100 Missing `from __future__ import annotations`, but uses `typing.Optional`
+  |
+5 | def main() -> None:
+6 |     a_list: List[Optional[str]] = []
+  |                  ^^^^^^^^ FA100
+7 |     a_list.append("hello")
+8 |     a_dict = cast(Dict[int | None, Union[int, Set[bool]]], {})
+  |
+
+
diff --git a/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__import_typing.py.snap b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__import_typing.py.snap
new file mode 100644
index 0000000000000..de648de0f5450
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__import_typing.py.snap
@@ -0,0 +1,12 @@
+---
+source: crates/ruff/src/rules/flake8_future_annotations/mod.rs
+---
+import_typing.py:5:13: FA100 Missing `from __future__ import annotations`, but uses `typing.List`
+  |
+5 | def main() -> None:
+6 |     a_list: typing.List[str] = []
+  |             ^^^^^^^^^^^ FA100
+7 |     a_list.append("hello")
+  |
+
+
diff --git a/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__import_typing_as.py.snap b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__import_typing_as.py.snap
new file mode 100644
index 0000000000000..4241b2e94031b
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__import_typing_as.py.snap
@@ -0,0 +1,12 @@
+---
+source: crates/ruff/src/rules/flake8_future_annotations/mod.rs
+---
+import_typing_as.py:5:13: FA100 Missing `from __future__ import annotations`, but uses `typing.List`
+  |
+5 | def main() -> None:
+6 |     a_list: t.List[str] = []
+  |             ^^^^^^ FA100
+7 |     a_list.append("hello")
+  |
+
+
diff --git a/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__no_future_import_uses_lowercase.py.snap b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__no_future_import_uses_lowercase.py.snap
new file mode 100644
index 0000000000000..681d4be5e5338
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__no_future_import_uses_lowercase.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_future_annotations/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__no_future_import_uses_union.py.snap b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__no_future_import_uses_union.py.snap
new file mode 100644
index 0000000000000..681d4be5e5338
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__no_future_import_uses_union.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_future_annotations/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__no_future_import_uses_union_inner.py.snap b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__no_future_import_uses_union_inner.py.snap
new file mode 100644
index 0000000000000..681d4be5e5338
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__no_future_import_uses_union_inner.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_future_annotations/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__ok_no_types.py.snap b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__ok_no_types.py.snap
new file mode 100644
index 0000000000000..681d4be5e5338
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__ok_no_types.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_future_annotations/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__ok_non_simplifiable_types.py.snap b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__ok_non_simplifiable_types.py.snap
new file mode 100644
index 0000000000000..681d4be5e5338
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__ok_non_simplifiable_types.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_future_annotations/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__ok_uses_future.py.snap b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__ok_uses_future.py.snap
new file mode 100644
index 0000000000000..681d4be5e5338
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__ok_uses_future.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_future_annotations/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__ok_variable_name.py.snap b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__ok_variable_name.py.snap
new file mode 100644
index 0000000000000..681d4be5e5338
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_future_annotations/snapshots/ruff__rules__flake8_future_annotations__tests__ok_variable_name.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_future_annotations/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_gettext/mod.rs b/crates/ruff/src/rules/flake8_gettext/mod.rs
index bc150742908b8..d9da7fad86898 100644
--- a/crates/ruff/src/rules/flake8_gettext/mod.rs
+++ b/crates/ruff/src/rules/flake8_gettext/mod.rs
@@ -7,16 +7,15 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::FStringInGetTextFuncCall,Path::new("INT001.py"); "INT001")]
-    #[test_case(Rule::FormatInGetTextFuncCall, Path::new("INT002.py"); "INT002")]
-    #[test_case(Rule::PrintfInGetTextFuncCall, Path::new("INT003.py"); "INT003")]
+    #[test_case(Rule::FStringInGetTextFuncCall, Path::new("INT001.py"))]
+    #[test_case(Rule::FormatInGetTextFuncCall, Path::new("INT002.py"))]
+    #[test_case(Rule::PrintfInGetTextFuncCall, Path::new("INT003.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.as_ref(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_gettext/rules.rs b/crates/ruff/src/rules/flake8_gettext/rules.rs
deleted file mode 100644
index 36f9cfca0901e..0000000000000
--- a/crates/ruff/src/rules/flake8_gettext/rules.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Operator};
-
-use ruff_diagnostics::{Diagnostic, Violation};
-use ruff_macros::{derive_message_formats, violation};
-
-#[violation]
-pub struct FStringInGetTextFuncCall;
-
-impl Violation for FStringInGetTextFuncCall {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("f-string is resolved before function call; consider `_(\"string %s\") % arg`")
-    }
-}
-
-#[violation]
-pub struct FormatInGetTextFuncCall;
-
-impl Violation for FormatInGetTextFuncCall {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("`format` method argument is resolved before function call; consider `_(\"string %s\") % arg`")
-    }
-}
-#[violation]
-pub struct PrintfInGetTextFuncCall;
-
-impl Violation for PrintfInGetTextFuncCall {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("printf-style format is resolved before function call; consider `_(\"string %s\") % arg`")
-    }
-}
-
-/// Returns true if the [`Expr`] is an internationalization function call.
-pub fn is_gettext_func_call(func: &Expr, functions_names: &[String]) -> bool {
-    if let ExprKind::Name { id, .. } = &func.node {
-        functions_names.contains(id)
-    } else {
-        false
-    }
-}
-
-/// INT001
-pub fn f_string_in_gettext_func_call(args: &[Expr]) -> Option<Diagnostic> {
-    if let Some(first) = args.first() {
-        if matches!(first.node, ExprKind::JoinedStr { .. }) {
-            return Some(Diagnostic::new(FStringInGetTextFuncCall {}, first.range()));
-        }
-    }
-    None
-}
-
-/// INT002
-pub fn format_in_gettext_func_call(args: &[Expr]) -> Option<Diagnostic> {
-    if let Some(first) = args.first() {
-        if let ExprKind::Call { func, .. } = &first.node {
-            if let ExprKind::Attribute { attr, .. } = &func.node {
-                if attr == "format" {
-                    return Some(Diagnostic::new(FormatInGetTextFuncCall {}, first.range()));
-                }
-            }
-        }
-    }
-    None
-}
-
-/// INT003
-pub fn printf_in_gettext_func_call(args: &[Expr]) -> Option<Diagnostic> {
-    if let Some(first) = args.first() {
-        if let ExprKind::BinOp {
-            op: Operator::Mod { .. },
-            left,
-            ..
-        } = &first.node
-        {
-            if let ExprKind::Constant {
-                value: Constant::Str(_),
-                ..
-            } = left.node
-            {
-                return Some(Diagnostic::new(PrintfInGetTextFuncCall {}, first.range()));
-            }
-        }
-    }
-    None
-}
diff --git a/crates/ruff/src/rules/flake8_gettext/rules/f_string_in_gettext_func_call.rs b/crates/ruff/src/rules/flake8_gettext/rules/f_string_in_gettext_func_call.rs
new file mode 100644
index 0000000000000..0f6b8c6a6021f
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_gettext/rules/f_string_in_gettext_func_call.rs
@@ -0,0 +1,24 @@
+use rustpython_parser::ast::{Expr, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+#[violation]
+pub struct FStringInGetTextFuncCall;
+
+impl Violation for FStringInGetTextFuncCall {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("f-string is resolved before function call; consider `_(\"string %s\") % arg`")
+    }
+}
+
+/// INT001
+pub(crate) fn f_string_in_gettext_func_call(args: &[Expr]) -> Option<Diagnostic> {
+    if let Some(first) = args.first() {
+        if first.is_joined_str_expr() {
+            return Some(Diagnostic::new(FStringInGetTextFuncCall {}, first.range()));
+        }
+    }
+    None
+}
diff --git a/crates/ruff/src/rules/flake8_gettext/rules/format_in_gettext_func_call.rs b/crates/ruff/src/rules/flake8_gettext/rules/format_in_gettext_func_call.rs
new file mode 100644
index 0000000000000..ec159d03373a1
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_gettext/rules/format_in_gettext_func_call.rs
@@ -0,0 +1,28 @@
+use rustpython_parser::ast::{self, Expr, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+#[violation]
+pub struct FormatInGetTextFuncCall;
+
+impl Violation for FormatInGetTextFuncCall {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("`format` method argument is resolved before function call; consider `_(\"string %s\") % arg`")
+    }
+}
+
+/// INT002
+pub(crate) fn format_in_gettext_func_call(args: &[Expr]) -> Option<Diagnostic> {
+    if let Some(first) = args.first() {
+        if let Expr::Call(ast::ExprCall { func, .. }) = &first {
+            if let Expr::Attribute(ast::ExprAttribute { attr, .. }) = func.as_ref() {
+                if attr == "format" {
+                    return Some(Diagnostic::new(FormatInGetTextFuncCall {}, first.range()));
+                }
+            }
+        }
+    }
+    None
+}
diff --git a/crates/ruff/src/rules/flake8_gettext/rules/is_gettext_func_call.rs b/crates/ruff/src/rules/flake8_gettext/rules/is_gettext_func_call.rs
new file mode 100644
index 0000000000000..0e539ead9a4dd
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_gettext/rules/is_gettext_func_call.rs
@@ -0,0 +1,10 @@
+use rustpython_parser::ast::{self, Expr};
+
+/// Returns true if the [`Expr`] is an internationalization function call.
+pub(crate) fn is_gettext_func_call(func: &Expr, functions_names: &[String]) -> bool {
+    if let Expr::Name(ast::ExprName { id, .. }) = func {
+        functions_names.contains(id.as_ref())
+    } else {
+        false
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_gettext/rules/mod.rs b/crates/ruff/src/rules/flake8_gettext/rules/mod.rs
new file mode 100644
index 0000000000000..1a80938fd12a1
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_gettext/rules/mod.rs
@@ -0,0 +1,15 @@
+pub(crate) use f_string_in_gettext_func_call::{
+    f_string_in_gettext_func_call, FStringInGetTextFuncCall,
+};
+pub(crate) use format_in_gettext_func_call::{
+    format_in_gettext_func_call, FormatInGetTextFuncCall,
+};
+pub(crate) use is_gettext_func_call::is_gettext_func_call;
+pub(crate) use printf_in_gettext_func_call::{
+    printf_in_gettext_func_call, PrintfInGetTextFuncCall,
+};
+
+mod f_string_in_gettext_func_call;
+mod format_in_gettext_func_call;
+mod is_gettext_func_call;
+mod printf_in_gettext_func_call;
diff --git a/crates/ruff/src/rules/flake8_gettext/rules/printf_in_gettext_func_call.rs b/crates/ruff/src/rules/flake8_gettext/rules/printf_in_gettext_func_call.rs
new file mode 100644
index 0000000000000..088eaa60f83f9
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_gettext/rules/printf_in_gettext_func_call.rs
@@ -0,0 +1,35 @@
+use rustpython_parser::ast::{self, Constant, Expr, Operator, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+#[violation]
+pub struct PrintfInGetTextFuncCall;
+
+impl Violation for PrintfInGetTextFuncCall {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("printf-style format is resolved before function call; consider `_(\"string %s\") % arg`")
+    }
+}
+
+/// INT003
+pub(crate) fn printf_in_gettext_func_call(args: &[Expr]) -> Option<Diagnostic> {
+    if let Some(first) = args.first() {
+        if let Expr::BinOp(ast::ExprBinOp {
+            op: Operator::Mod { .. },
+            left,
+            ..
+        }) = &first
+        {
+            if let Expr::Constant(ast::ExprConstant {
+                value: Constant::Str(_),
+                ..
+            }) = left.as_ref()
+            {
+                return Some(Diagnostic::new(PrintfInGetTextFuncCall {}, first.range()));
+            }
+        }
+    }
+    None
+}
diff --git a/crates/ruff/src/rules/flake8_gettext/settings.rs b/crates/ruff/src/rules/flake8_gettext/settings.rs
index 4cf5b7856ff9c..a16d61e15c881 100644
--- a/crates/ruff/src/rules/flake8_gettext/settings.rs
+++ b/crates/ruff/src/rules/flake8_gettext/settings.rs
@@ -1,16 +1,16 @@
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::{CacheKey, ConfigurationOptions};
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
 
 #[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, CombineOptions,
 )]
 #[serde(
     deny_unknown_fields,
     rename_all = "kebab-case",
     rename = "Flake8GetTextOptions"
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = r#"["_", "gettext", "ngettext"]"#,
@@ -24,10 +24,9 @@ pub struct Options {
         value_type = "list[str]",
         example = r#"extend-function-names = ["ugettetxt"]"#
     )]
-    #[serde(default)]
     /// Additional function names to consider as internationalization calls, in addition to those
     /// included in `function-names`.
-    pub extend_function_names: Vec<String>,
+    pub extend_function_names: Option<Vec<String>>,
 }
 
 #[derive(Debug, CacheKey)]
@@ -36,10 +35,11 @@ pub struct Settings {
 }
 
 fn default_func_names() -> Vec<String> {
-    ["_", "gettext", "ngettext"]
-        .iter()
-        .map(std::string::ToString::to_string)
-        .collect()
+    vec![
+        "_".to_string(),
+        "gettext".to_string(),
+        "ngettext".to_string(),
+    ]
 }
 
 impl Default for Settings {
@@ -57,7 +57,12 @@ impl From<Options> for Settings {
                 .function_names
                 .unwrap_or_else(default_func_names)
                 .into_iter()
-                .chain(options.extend_function_names)
+                .chain(
+                    options
+                        .extend_function_names
+                        .unwrap_or_default()
+                        .into_iter(),
+                )
                 .collect(),
         }
     }
@@ -67,7 +72,7 @@ impl From<Settings> for Options {
     fn from(settings: Settings) -> Self {
         Self {
             function_names: Some(settings.functions_names),
-            extend_function_names: vec![],
+            extend_function_names: Some(Vec::new()),
         }
     }
 }
diff --git a/crates/ruff/src/rules/flake8_implicit_str_concat/mod.rs b/crates/ruff/src/rules/flake8_implicit_str_concat/mod.rs
index 4dd5497135611..898b3689af73c 100644
--- a/crates/ruff/src/rules/flake8_implicit_str_concat/mod.rs
+++ b/crates/ruff/src/rules/flake8_implicit_str_concat/mod.rs
@@ -7,16 +7,15 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::SingleLineImplicitStringConcatenation, Path::new("ISC.py"); "ISC001")]
-    #[test_case(Rule::MultiLineImplicitStringConcatenation, Path::new("ISC.py"); "ISC002")]
-    #[test_case(Rule::ExplicitStringConcatenation, Path::new("ISC.py"); "ISC003")]
+    #[test_case(Rule::SingleLineImplicitStringConcatenation, Path::new("ISC.py"))]
+    #[test_case(Rule::MultiLineImplicitStringConcatenation, Path::new("ISC.py"))]
+    #[test_case(Rule::ExplicitStringConcatenation, Path::new("ISC.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
@@ -27,9 +26,9 @@ mod tests {
         Ok(())
     }
 
-    #[test_case(Rule::SingleLineImplicitStringConcatenation, Path::new("ISC.py"); "ISC001")]
-    #[test_case(Rule::MultiLineImplicitStringConcatenation, Path::new("ISC.py"); "ISC002")]
-    #[test_case(Rule::ExplicitStringConcatenation, Path::new("ISC.py"); "ISC003")]
+    #[test_case(Rule::SingleLineImplicitStringConcatenation, Path::new("ISC.py"))]
+    #[test_case(Rule::MultiLineImplicitStringConcatenation, Path::new("ISC.py"))]
+    #[test_case(Rule::ExplicitStringConcatenation, Path::new("ISC.py"))]
     fn multiline(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!(
             "multiline_{}_{}",
diff --git a/crates/ruff/src/rules/flake8_implicit_str_concat/rules/explicit.rs b/crates/ruff/src/rules/flake8_implicit_str_concat/rules/explicit.rs
new file mode 100644
index 0000000000000..e6b706519ef7a
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_implicit_str_concat/rules/explicit.rs
@@ -0,0 +1,70 @@
+use rustpython_parser::ast::{self, Constant, Expr, Operator, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+/// ## What it does
+/// Checks for string literals that are explicitly concatenated (using the
+/// `+` operator).
+///
+/// ## Why is this bad?
+/// For string literals that wrap across multiple lines, implicit string
+/// concatenation within parentheses is preferred over explicit
+/// concatenation using the `+` operator, as the former is more readable.
+///
+/// ## Example
+/// ```python
+/// z = (
+///     "The quick brown fox jumps over the lazy "
+///     + "dog"
+/// )
+/// ```
+///
+/// Use instead:
+/// ```python
+/// z = (
+///     "The quick brown fox jumps over the lazy "
+///     "dog"
+/// )
+/// ```
+#[violation]
+pub struct ExplicitStringConcatenation;
+
+impl Violation for ExplicitStringConcatenation {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Explicitly concatenated string should be implicitly concatenated")
+    }
+}
+
+/// ISC003
+pub(crate) fn explicit(expr: &Expr) -> Option<Diagnostic> {
+    if let Expr::BinOp(ast::ExprBinOp {
+        left,
+        op,
+        right,
+        range: _,
+    }) = expr
+    {
+        if matches!(op, Operator::Add) {
+            if matches!(
+                left.as_ref(),
+                Expr::JoinedStr(_)
+                    | Expr::Constant(ast::ExprConstant {
+                        value: Constant::Str(..) | Constant::Bytes(..),
+                        ..
+                    })
+            ) && matches!(
+                right.as_ref(),
+                Expr::JoinedStr(_)
+                    | Expr::Constant(ast::ExprConstant {
+                        value: Constant::Str(..) | Constant::Bytes(..),
+                        ..
+                    })
+            ) {
+                return Some(Diagnostic::new(ExplicitStringConcatenation, expr.range()));
+            }
+        }
+    }
+    None
+}
diff --git a/crates/ruff/src/rules/flake8_implicit_str_concat/rules.rs b/crates/ruff/src/rules/flake8_implicit_str_concat/rules/implicit.rs
similarity index 65%
rename from crates/ruff/src/rules/flake8_implicit_str_concat/rules.rs
rename to crates/ruff/src/rules/flake8_implicit_str_concat/rules/implicit.rs
index 6ce93c3121071..43dac7b3e59f7 100644
--- a/crates/ruff/src/rules/flake8_implicit_str_concat/rules.rs
+++ b/crates/ruff/src/rules/flake8_implicit_str_concat/rules/implicit.rs
@@ -1,6 +1,5 @@
 use itertools::Itertools;
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Operator};
 use rustpython_parser::lexer::LexResult;
 use rustpython_parser::Tok;
 
@@ -84,42 +83,12 @@ impl Violation for MultiLineImplicitStringConcatenation {
     }
 }
 
-/// ## What it does
-/// Checks for string literals that are explicitly concatenated (using the
-/// `+` operator).
-///
-/// ## Why is this bad?
-/// For string literals that wrap across multiple lines, implicit string
-/// concatenation within parentheses is preferred over explicit
-/// concatenation using the `+` operator, as the former is more readable.
-///
-/// ## Example
-/// ```python
-/// z = (
-///     "The quick brown fox jumps over the lazy "
-///     + "dog"
-/// )
-/// ```
-///
-/// Use instead:
-/// ```python
-/// z = (
-///     "The quick brown fox jumps over the lazy "
-///     "dog"
-/// )
-/// ```
-#[violation]
-pub struct ExplicitStringConcatenation;
-
-impl Violation for ExplicitStringConcatenation {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("Explicitly concatenated string should be implicitly concatenated")
-    }
-}
-
 /// ISC001, ISC002
-pub fn implicit(tokens: &[LexResult], settings: &Settings, locator: &Locator) -> Vec<Diagnostic> {
+pub(crate) fn implicit(
+    tokens: &[LexResult],
+    settings: &Settings,
+    locator: &Locator,
+) -> Vec<Diagnostic> {
     let mut diagnostics = vec![];
     for ((a_tok, a_range), (b_tok, b_range)) in tokens
         .iter()
@@ -146,29 +115,3 @@ pub fn implicit(tokens: &[LexResult], settings: &Settings, locator: &Locator) ->
     }
     diagnostics
 }
-
-/// ISC003
-pub fn explicit(expr: &Expr) -> Option<Diagnostic> {
-    if let ExprKind::BinOp { left, op, right } = &expr.node {
-        if matches!(op, Operator::Add) {
-            if matches!(
-                left.node,
-                ExprKind::JoinedStr { .. }
-                    | ExprKind::Constant {
-                        value: Constant::Str(..) | Constant::Bytes(..),
-                        ..
-                    }
-            ) && matches!(
-                right.node,
-                ExprKind::JoinedStr { .. }
-                    | ExprKind::Constant {
-                        value: Constant::Str(..) | Constant::Bytes(..),
-                        ..
-                    }
-            ) {
-                return Some(Diagnostic::new(ExplicitStringConcatenation, expr.range()));
-            }
-        }
-    }
-    None
-}
diff --git a/crates/ruff/src/rules/flake8_implicit_str_concat/rules/mod.rs b/crates/ruff/src/rules/flake8_implicit_str_concat/rules/mod.rs
new file mode 100644
index 0000000000000..605341dc27cb8
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_implicit_str_concat/rules/mod.rs
@@ -0,0 +1,7 @@
+pub(crate) use explicit::{explicit, ExplicitStringConcatenation};
+pub(crate) use implicit::{
+    implicit, MultiLineImplicitStringConcatenation, SingleLineImplicitStringConcatenation,
+};
+
+mod explicit;
+mod implicit;
diff --git a/crates/ruff/src/rules/flake8_implicit_str_concat/settings.rs b/crates/ruff/src/rules/flake8_implicit_str_concat/settings.rs
index d3d2595d9699e..4a14f15396d19 100644
--- a/crates/ruff/src/rules/flake8_implicit_str_concat/settings.rs
+++ b/crates/ruff/src/rules/flake8_implicit_str_concat/settings.rs
@@ -1,18 +1,18 @@
 //! Settings for the `flake8-implicit-str-concat` plugin.
 
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::{CacheKey, ConfigurationOptions};
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
 
 #[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, CombineOptions,
 )]
 #[serde(
     deny_unknown_fields,
     rename_all = "kebab-case",
     rename = "Flake8ImplicitStrConcatOptions"
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = r#"true"#,
diff --git a/crates/ruff/src/rules/flake8_import_conventions/mod.rs b/crates/ruff/src/rules/flake8_import_conventions/mod.rs
index bd07037e43cd4..3df13cbea42ef 100644
--- a/crates/ruff/src/rules/flake8_import_conventions/mod.rs
+++ b/crates/ruff/src/rules/flake8_import_conventions/mod.rs
@@ -6,11 +6,10 @@ pub mod settings;
 mod tests {
     use std::path::Path;
 
-    use crate::assert_messages;
     use anyhow::Result;
-
     use rustc_hash::{FxHashMap, FxHashSet};
 
+    use crate::assert_messages;
     use crate::registry::Rule;
     use crate::settings::Settings;
     use crate::test::test_path;
diff --git a/crates/ruff/src/rules/flake8_import_conventions/rules/banned_import_alias.rs b/crates/ruff/src/rules/flake8_import_conventions/rules/banned_import_alias.rs
index 7c0619565e57b..c22b9db2ec39d 100644
--- a/crates/ruff/src/rules/flake8_import_conventions/rules/banned_import_alias.rs
+++ b/crates/ruff/src/rules/flake8_import_conventions/rules/banned_import_alias.rs
@@ -1,5 +1,5 @@
 use rustc_hash::FxHashMap;
-use rustpython_parser::ast::Stmt;
+use rustpython_parser::ast::{Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -28,8 +28,8 @@ use ruff_macros::{derive_message_formats, violation};
 /// ```
 #[violation]
 pub struct BannedImportAlias {
-    pub name: String,
-    pub asname: String,
+    name: String,
+    asname: String,
 }
 
 impl Violation for BannedImportAlias {
@@ -41,7 +41,7 @@ impl Violation for BannedImportAlias {
 }
 
 /// ICN002
-pub fn banned_import_alias(
+pub(crate) fn banned_import_alias(
     stmt: &Stmt,
     name: &str,
     asname: &str,
diff --git a/crates/ruff/src/rules/flake8_import_conventions/rules/banned_import_from.rs b/crates/ruff/src/rules/flake8_import_conventions/rules/banned_import_from.rs
index 93268497b5b56..f410f3b029649 100644
--- a/crates/ruff/src/rules/flake8_import_conventions/rules/banned_import_from.rs
+++ b/crates/ruff/src/rules/flake8_import_conventions/rules/banned_import_from.rs
@@ -1,5 +1,5 @@
 use rustc_hash::FxHashSet;
-use rustpython_parser::ast::Stmt;
+use rustpython_parser::ast::{Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -29,7 +29,7 @@ use ruff_macros::{derive_message_formats, violation};
 /// ```
 #[violation]
 pub struct BannedImportFrom {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for BannedImportFrom {
@@ -41,7 +41,7 @@ impl Violation for BannedImportFrom {
 }
 
 /// ICN003
-pub fn banned_import_from(
+pub(crate) fn banned_import_from(
     stmt: &Stmt,
     name: &str,
     banned_conventions: &FxHashSet<String>,
diff --git a/crates/ruff/src/rules/flake8_import_conventions/rules/conventional_import_alias.rs b/crates/ruff/src/rules/flake8_import_conventions/rules/conventional_import_alias.rs
index 184c76e351ffb..58ee94eca0076 100644
--- a/crates/ruff/src/rules/flake8_import_conventions/rules/conventional_import_alias.rs
+++ b/crates/ruff/src/rules/flake8_import_conventions/rules/conventional_import_alias.rs
@@ -1,5 +1,5 @@
 use rustc_hash::FxHashMap;
-use rustpython_parser::ast::Stmt;
+use rustpython_parser::ast::{Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -27,8 +27,8 @@ use ruff_macros::{derive_message_formats, violation};
 /// ```
 #[violation]
 pub struct UnconventionalImportAlias {
-    pub name: String,
-    pub asname: String,
+    name: String,
+    asname: String,
 }
 
 impl Violation for UnconventionalImportAlias {
@@ -40,7 +40,7 @@ impl Violation for UnconventionalImportAlias {
 }
 
 /// ICN001
-pub fn conventional_import_alias(
+pub(crate) fn conventional_import_alias(
     stmt: &Stmt,
     name: &str,
     asname: Option<&str>,
diff --git a/crates/ruff/src/rules/flake8_import_conventions/rules/mod.rs b/crates/ruff/src/rules/flake8_import_conventions/rules/mod.rs
index d8dbbbfe1b696..63f88d0f9ae44 100644
--- a/crates/ruff/src/rules/flake8_import_conventions/rules/mod.rs
+++ b/crates/ruff/src/rules/flake8_import_conventions/rules/mod.rs
@@ -1,6 +1,6 @@
-pub use banned_import_alias::{banned_import_alias, BannedImportAlias};
-pub use banned_import_from::{banned_import_from, BannedImportFrom};
-pub use conventional_import_alias::{conventional_import_alias, UnconventionalImportAlias};
+pub(crate) use banned_import_alias::{banned_import_alias, BannedImportAlias};
+pub(crate) use banned_import_from::{banned_import_from, BannedImportFrom};
+pub(crate) use conventional_import_alias::{conventional_import_alias, UnconventionalImportAlias};
 
 mod banned_import_alias;
 mod banned_import_from;
diff --git a/crates/ruff/src/rules/flake8_import_conventions/settings.rs b/crates/ruff/src/rules/flake8_import_conventions/settings.rs
index 61bda42657d16..95a0fb7e2e168 100644
--- a/crates/ruff/src/rules/flake8_import_conventions/settings.rs
+++ b/crates/ruff/src/rules/flake8_import_conventions/settings.rs
@@ -1,10 +1,9 @@
 //! Settings for import conventions.
 
 use rustc_hash::{FxHashMap, FxHashSet};
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::{CacheKey, ConfigurationOptions};
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
 
 const CONVENTIONAL_ALIASES: &[(&str, &str)] = &[
     ("altair", "alt"),
@@ -22,13 +21,14 @@ const CONVENTIONAL_ALIASES: &[(&str, &str)] = &[
 ];
 
 #[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, CombineOptions,
 )]
 #[serde(
     deny_unknown_fields,
     rename_all = "kebab-case",
     rename = "Flake8ImportConventionsOptions"
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = r#"{"altair": "alt", "matplotlib": "mpl", "matplotlib.pyplot": "plt", "numpy": "np", "pandas": "pd", "seaborn": "sns", "tensorflow": "tf", "holoviews": "hv", "panel": "pn", "plotly.express": "px", "polars": "pl", "pyarrow": "pa"}"#,
diff --git a/crates/ruff/src/rules/flake8_logging_format/mod.rs b/crates/ruff/src/rules/flake8_logging_format/mod.rs
index 653b8377a5494..c76235febe01b 100644
--- a/crates/ruff/src/rules/flake8_logging_format/mod.rs
+++ b/crates/ruff/src/rules/flake8_logging_format/mod.rs
@@ -13,20 +13,20 @@ mod tests {
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Path::new("G_argparse_parser_error_ok.py"); "G_argparse_parser_error_ok")]
-    #[test_case(Path::new("G_extra_ok.py"); "G_extra_ok")]
-    #[test_case(Path::new("G_extra_str_format_ok.py"); "G_extra_str_format_ok")]
-    #[test_case(Path::new("G_simple_ok.py"); "G_simple_ok")]
-    #[test_case(Path::new("G_warnings_ok.py"); "G_warnings_ok")]
-    #[test_case(Path::new("G001.py"); "G001")]
-    #[test_case(Path::new("G002.py"); "G002")]
-    #[test_case(Path::new("G003.py"); "G003")]
-    #[test_case(Path::new("G004.py"); "G004")]
-    #[test_case(Path::new("G010.py"); "G010")]
-    #[test_case(Path::new("G101_1.py"); "G101_1")]
-    #[test_case(Path::new("G101_2.py"); "G101_2")]
-    #[test_case(Path::new("G201.py"); "G201")]
-    #[test_case(Path::new("G202.py"); "G202")]
+    #[test_case(Path::new("G_argparse_parser_error_ok.py"))]
+    #[test_case(Path::new("G_extra_ok.py"))]
+    #[test_case(Path::new("G_extra_str_format_ok.py"))]
+    #[test_case(Path::new("G_simple_ok.py"))]
+    #[test_case(Path::new("G_warnings_ok.py"))]
+    #[test_case(Path::new("G001.py"))]
+    #[test_case(Path::new("G002.py"))]
+    #[test_case(Path::new("G003.py"))]
+    #[test_case(Path::new("G004.py"))]
+    #[test_case(Path::new("G010.py"))]
+    #[test_case(Path::new("G101_1.py"))]
+    #[test_case(Path::new("G101_2.py"))]
+    #[test_case(Path::new("G201.py"))]
+    #[test_case(Path::new("G202.py"))]
     fn rules(path: &Path) -> Result<()> {
         let snapshot = path.to_string_lossy().into_owned();
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_logging_format/rules.rs b/crates/ruff/src/rules/flake8_logging_format/rules/logging_call.rs
similarity index 56%
rename from crates/ruff/src/rules/flake8_logging_format/rules.rs
rename to crates/ruff/src/rules/flake8_logging_format/rules/logging_call.rs
index 0f09459327e36..dceee291b99fb 100644
--- a/crates/ruff/src/rules/flake8_logging_format/rules.rs
+++ b/crates/ruff/src/rules/flake8_logging_format/rules/logging_call.rs
@@ -1,10 +1,10 @@
 use ruff_text_size::{TextRange, TextSize};
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword, Operator};
-use std::ops::Add;
+use rustpython_parser::ast::{self, Constant, Expr, Keyword, Operator, Ranged};
 
-use ruff_diagnostics::{Diagnostic, Edit};
+use ruff_diagnostics::{Diagnostic, Edit, Fix};
 use ruff_python_ast::helpers::{find_keyword, SimpleCallArgs};
 use ruff_python_semantic::analyze::logging;
+use ruff_python_semantic::analyze::logging::exc_info;
 use ruff_python_stdlib::logging::LoggingLevel;
 
 use crate::checkers::ast::Checker;
@@ -41,18 +41,18 @@ const RESERVED_ATTRS: &[&str; 22] = &[
 
 /// Check logging messages for violations.
 fn check_msg(checker: &mut Checker, msg: &Expr) {
-    match &msg.node {
+    match msg {
         // Check for string concatenation and percent format.
-        ExprKind::BinOp { op, .. } => match op {
+        Expr::BinOp(ast::ExprBinOp { op, .. }) => match op {
             Operator::Add => {
-                if checker.settings.rules.enabled(Rule::LoggingStringConcat) {
+                if checker.enabled(Rule::LoggingStringConcat) {
                     checker
                         .diagnostics
                         .push(Diagnostic::new(LoggingStringConcat, msg.range()));
                 }
             }
             Operator::Mod => {
-                if checker.settings.rules.enabled(Rule::LoggingPercentFormat) {
+                if checker.enabled(Rule::LoggingPercentFormat) {
                     checker
                         .diagnostics
                         .push(Diagnostic::new(LoggingPercentFormat, msg.range()));
@@ -61,18 +61,18 @@ fn check_msg(checker: &mut Checker, msg: &Expr) {
             _ => {}
         },
         // Check for f-strings.
-        ExprKind::JoinedStr { .. } => {
-            if checker.settings.rules.enabled(Rule::LoggingFString) {
+        Expr::JoinedStr(_) => {
+            if checker.enabled(Rule::LoggingFString) {
                 checker
                     .diagnostics
                     .push(Diagnostic::new(LoggingFString, msg.range()));
             }
         }
         // Check for .format() calls.
-        ExprKind::Call { func, .. } => {
-            if checker.settings.rules.enabled(Rule::LoggingStringFormat) {
-                if let ExprKind::Attribute { value, attr, .. } = &func.node {
-                    if attr == "format" && matches!(value.node, ExprKind::Constant { .. }) {
+        Expr::Call(ast::ExprCall { func, .. }) => {
+            if checker.enabled(Rule::LoggingStringFormat) {
+                if let Expr::Attribute(ast::ExprAttribute { value, attr, .. }) = func.as_ref() {
+                    if attr == "format" && value.is_constant_expr() {
                         checker
                             .diagnostics
                             .push(Diagnostic::new(LoggingStringFormat, msg.range()));
@@ -86,14 +86,14 @@ fn check_msg(checker: &mut Checker, msg: &Expr) {
 
 /// Check contents of the `extra` argument to logging calls.
 fn check_log_record_attr_clash(checker: &mut Checker, extra: &Keyword) {
-    match &extra.node.value.node {
-        ExprKind::Dict { keys, .. } => {
+    match &extra.value {
+        Expr::Dict(ast::ExprDict { keys, .. }) => {
             for key in keys {
                 if let Some(key) = &key {
-                    if let ExprKind::Constant {
+                    if let Expr::Constant(ast::ExprConstant {
                         value: Constant::Str(string),
                         ..
-                    } = &key.node
+                    }) = key
                     {
                         if RESERVED_ATTRS.contains(&string.as_str()) {
                             checker.diagnostics.push(Diagnostic::new(
@@ -105,14 +105,14 @@ fn check_log_record_attr_clash(checker: &mut Checker, extra: &Keyword) {
                 }
             }
         }
-        ExprKind::Call { func, keywords, .. } => {
+        Expr::Call(ast::ExprCall { func, keywords, .. }) => {
             if checker
-                .ctx
+                .semantic_model()
                 .resolve_call_path(func)
                 .map_or(false, |call_path| call_path.as_slice() == ["", "dict"])
             {
                 for keyword in keywords {
-                    if let Some(key) = &keyword.node.arg {
+                    if let Some(key) = &keyword.arg {
                         if RESERVED_ATTRS.contains(&key.as_str()) {
                             checker.diagnostics.push(Diagnostic::new(
                                 LoggingExtraAttrClash(key.to_string()),
@@ -146,15 +146,20 @@ impl LoggingCallType {
 }
 
 /// Check logging calls for violations.
-pub fn logging_call(checker: &mut Checker, func: &Expr, args: &[Expr], keywords: &[Keyword]) {
-    if !logging::is_logger_candidate(&checker.ctx, func) {
+pub(crate) fn logging_call(
+    checker: &mut Checker,
+    func: &Expr,
+    args: &[Expr],
+    keywords: &[Keyword],
+) {
+    if !logging::is_logger_candidate(func, checker.semantic_model()) {
         return;
     }
 
-    if let ExprKind::Attribute { value, attr, .. } = &func.node {
+    if let Expr::Attribute(ast::ExprAttribute { value, attr, .. }) = func {
         if let Some(logging_call_type) = LoggingCallType::from_attribute(attr.as_str()) {
             let call_args = SimpleCallArgs::new(args, keywords);
-            let level_call_range = TextRange::new(value.end().add(TextSize::from(1)), func.end());
+            let level_call_range = TextRange::new(value.end() + TextSize::from(1), func.end());
 
             // G001 - G004
             let msg_pos = usize::from(matches!(logging_call_type, LoggingCallType::LogCall));
@@ -163,7 +168,7 @@ pub fn logging_call(checker: &mut Checker, func: &Expr, args: &[Expr], keywords:
             }
 
             // G010
-            if checker.settings.rules.enabled(Rule::LoggingWarn)
+            if checker.enabled(Rule::LoggingWarn)
                 && matches!(
                     logging_call_type,
                     LoggingCallType::LevelCall(LoggingLevel::Warn)
@@ -171,76 +176,48 @@ pub fn logging_call(checker: &mut Checker, func: &Expr, args: &[Expr], keywords:
             {
                 let mut diagnostic = Diagnostic::new(LoggingWarn, level_call_range);
                 if checker.patch(diagnostic.kind.rule()) {
-                    diagnostic.set_fix(Edit::range_replacement(
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
                         "warning".to_string(),
                         level_call_range,
-                    ));
+                    )));
                 }
                 checker.diagnostics.push(diagnostic);
             }
 
             // G101
-            if checker.settings.rules.enabled(Rule::LoggingExtraAttrClash) {
+            if checker.enabled(Rule::LoggingExtraAttrClash) {
                 if let Some(extra) = find_keyword(keywords, "extra") {
                     check_log_record_attr_clash(checker, extra);
                 }
             }
 
             // G201, G202
-            if checker.settings.rules.enabled(Rule::LoggingExcInfo)
-                || checker
-                    .settings
-                    .rules
-                    .enabled(Rule::LoggingRedundantExcInfo)
-            {
-                if !checker.ctx.in_exception_handler() {
+            if checker.any_enabled(&[Rule::LoggingExcInfo, Rule::LoggingRedundantExcInfo]) {
+                if !checker.semantic_model().in_exception_handler() {
                     return;
                 }
-                if let Some(exc_info) = find_keyword(keywords, "exc_info") {
-                    // If `exc_info` is `True` or `sys.exc_info()`, it's redundant; but otherwise,
-                    // return.
-                    if !(matches!(
-                        exc_info.node.value.node,
-                        ExprKind::Constant {
-                            value: Constant::Bool(true),
-                            ..
-                        }
-                    ) || if let ExprKind::Call { func, .. } = &exc_info.node.value.node {
-                        checker
-                            .ctx
-                            .resolve_call_path(func)
-                            .map_or(false, |call_path| {
-                                call_path.as_slice() == ["sys", "exc_info"]
-                            })
-                    } else {
-                        false
-                    }) {
-                        return;
-                    }
-
-                    if let LoggingCallType::LevelCall(logging_level) = logging_call_type {
-                        match logging_level {
-                            LoggingLevel::Error => {
-                                if checker.settings.rules.enabled(Rule::LoggingExcInfo) {
-                                    checker
-                                        .diagnostics
-                                        .push(Diagnostic::new(LoggingExcInfo, level_call_range));
-                                }
+                let Some(exc_info) = exc_info(keywords, checker.semantic_model()) else {
+                    return;
+                };
+                if let LoggingCallType::LevelCall(logging_level) = logging_call_type {
+                    match logging_level {
+                        LoggingLevel::Error => {
+                            if checker.enabled(Rule::LoggingExcInfo) {
+                                checker
+                                    .diagnostics
+                                    .push(Diagnostic::new(LoggingExcInfo, level_call_range));
                             }
-                            LoggingLevel::Exception => {
-                                if checker
-                                    .settings
-                                    .rules
-                                    .enabled(Rule::LoggingRedundantExcInfo)
-                                {
-                                    checker.diagnostics.push(Diagnostic::new(
-                                        LoggingRedundantExcInfo,
-                                        exc_info.range(),
-                                    ));
-                                }
+                        }
+                        LoggingLevel::Exception => {
+                            if checker.enabled(Rule::LoggingRedundantExcInfo) {
+                                checker.diagnostics.push(Diagnostic::new(
+                                    LoggingRedundantExcInfo,
+                                    exc_info.range(),
+                                ));
                             }
-                            _ => {}
                         }
+                        _ => {}
                     }
                 }
             }
diff --git a/crates/ruff/src/rules/flake8_logging_format/rules/mod.rs b/crates/ruff/src/rules/flake8_logging_format/rules/mod.rs
new file mode 100644
index 0000000000000..c0cce2dd57d8c
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_logging_format/rules/mod.rs
@@ -0,0 +1,3 @@
+pub(crate) use logging_call::logging_call;
+
+mod logging_call;
diff --git a/crates/ruff/src/rules/flake8_logging_format/snapshots/ruff__rules__flake8_logging_format__tests__G001.py.snap b/crates/ruff/src/rules/flake8_logging_format/snapshots/ruff__rules__flake8_logging_format__tests__G001.py.snap
index 1658613337eb3..5182cbcd8ccfc 100644
--- a/crates/ruff/src/rules/flake8_logging_format/snapshots/ruff__rules__flake8_logging_format__tests__G001.py.snap
+++ b/crates/ruff/src/rules/flake8_logging_format/snapshots/ruff__rules__flake8_logging_format__tests__G001.py.snap
@@ -55,6 +55,34 @@ G001.py:9:17: G001 Logging statement uses `string.format()`
 10 | logging.log(level=logging.INFO, msg="Hello {}".format("World!"))
 11 | logging.log(msg="Hello {}".format("World!"), level=logging.INFO)
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^ G001
+12 | 
+13 | # Flask support
+   |
+
+G001.py:16:31: G001 Logging statement uses `string.format()`
+   |
+16 | from flask import current_app as app
+17 | 
+18 | flask.current_app.logger.info("Hello {}".format("World!"))
+   |                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^ G001
+19 | current_app.logger.info("Hello {}".format("World!"))
+20 | app.logger.log(logging.INFO, "Hello {}".format("World!"))
+   |
+
+G001.py:17:25: G001 Logging statement uses `string.format()`
+   |
+17 | flask.current_app.logger.info("Hello {}".format("World!"))
+18 | current_app.logger.info("Hello {}".format("World!"))
+   |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ G001
+19 | app.logger.log(logging.INFO, "Hello {}".format("World!"))
+   |
+
+G001.py:18:30: G001 Logging statement uses `string.format()`
+   |
+18 | flask.current_app.logger.info("Hello {}".format("World!"))
+19 | current_app.logger.info("Hello {}".format("World!"))
+20 | app.logger.log(logging.INFO, "Hello {}".format("World!"))
+   |                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^ G001
    |
 
 
diff --git a/crates/ruff/src/rules/flake8_no_pep420/mod.rs b/crates/ruff/src/rules/flake8_no_pep420/mod.rs
index 623cf89c69d35..afb27c3615e94 100644
--- a/crates/ruff/src/rules/flake8_no_pep420/mod.rs
+++ b/crates/ruff/src/rules/flake8_no_pep420/mod.rs
@@ -5,23 +5,22 @@ pub(crate) mod rules;
 mod tests {
     use std::path::{Path, PathBuf};
 
-    use crate::assert_messages;
     use anyhow::Result;
-
     use test_case::test_case;
 
+    use crate::assert_messages;
     use crate::registry::Rule;
     use crate::settings::Settings;
     use crate::test::{test_path, test_resource_path};
 
-    #[test_case(Path::new("test_pass_init"), Path::new("example.py"); "INP001_0")]
-    #[test_case(Path::new("test_fail_empty"), Path::new("example.py"); "INP001_1")]
-    #[test_case(Path::new("test_fail_nonempty"), Path::new("example.py"); "INP001_2")]
-    #[test_case(Path::new("test_fail_shebang"), Path::new("example.py"); "INP001_3")]
-    #[test_case(Path::new("test_ignored"), Path::new("example.py"); "INP001_4")]
-    #[test_case(Path::new("test_pass_namespace_package"), Path::new("example.py"); "INP001_5")]
-    #[test_case(Path::new("test_pass_pyi"), Path::new("example.pyi"); "INP001_6")]
-    #[test_case(Path::new("test_pass_script"), Path::new("script"); "INP001_7")]
+    #[test_case(Path::new("test_pass_init"), Path::new("example.py"))]
+    #[test_case(Path::new("test_fail_empty"), Path::new("example.py"))]
+    #[test_case(Path::new("test_fail_nonempty"), Path::new("example.py"))]
+    #[test_case(Path::new("test_fail_shebang"), Path::new("example.py"))]
+    #[test_case(Path::new("test_ignored"), Path::new("example.py"))]
+    #[test_case(Path::new("test_pass_namespace_package"), Path::new("example.py"))]
+    #[test_case(Path::new("test_pass_pyi"), Path::new("example.pyi"))]
+    #[test_case(Path::new("test_pass_script"), Path::new("script"))]
     fn test_flake8_no_pep420(path: &Path, filename: &Path) -> Result<()> {
         let snapshot = format!("{}", path.to_string_lossy());
         let p = PathBuf::from(format!(
diff --git a/crates/ruff/src/rules/flake8_no_pep420/rules.rs b/crates/ruff/src/rules/flake8_no_pep420/rules/implicit_namespace_package.rs
similarity index 97%
rename from crates/ruff/src/rules/flake8_no_pep420/rules.rs
rename to crates/ruff/src/rules/flake8_no_pep420/rules/implicit_namespace_package.rs
index 6973ce7e41920..5c2a8ae4f8580 100644
--- a/crates/ruff/src/rules/flake8_no_pep420/rules.rs
+++ b/crates/ruff/src/rules/flake8_no_pep420/rules/implicit_namespace_package.rs
@@ -1,6 +1,7 @@
-use ruff_text_size::TextRange;
 use std::path::{Path, PathBuf};
 
+use ruff_text_size::TextRange;
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
@@ -26,7 +27,7 @@ use crate::fs;
 /// - `namespace-packages`
 #[violation]
 pub struct ImplicitNamespacePackage {
-    pub filename: String,
+    filename: String,
 }
 
 impl Violation for ImplicitNamespacePackage {
@@ -38,7 +39,7 @@ impl Violation for ImplicitNamespacePackage {
 }
 
 /// INP001
-pub fn implicit_namespace_package(
+pub(crate) fn implicit_namespace_package(
     path: &Path,
     package: Option<&Path>,
     project_root: &Path,
diff --git a/crates/ruff/src/rules/flake8_no_pep420/rules/mod.rs b/crates/ruff/src/rules/flake8_no_pep420/rules/mod.rs
new file mode 100644
index 0000000000000..6b3762cae36a1
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_no_pep420/rules/mod.rs
@@ -0,0 +1,3 @@
+pub(crate) use implicit_namespace_package::{implicit_namespace_package, ImplicitNamespacePackage};
+
+mod implicit_namespace_package;
diff --git a/crates/ruff/src/rules/flake8_pie/mod.rs b/crates/ruff/src/rules/flake8_pie/mod.rs
index 67925fca2d907..a1cfb8349c99a 100644
--- a/crates/ruff/src/rules/flake8_pie/mod.rs
+++ b/crates/ruff/src/rules/flake8_pie/mod.rs
@@ -6,20 +6,19 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::DuplicateClassFieldDefinition, Path::new("PIE794.py"); "PIE794")]
-    #[test_case(Rule::UnnecessaryDictKwargs, Path::new("PIE804.py"); "PIE804")]
-    #[test_case(Rule::MultipleStartsEndsWith, Path::new("PIE810.py"); "PIE810")]
-    #[test_case(Rule::UnnecessaryPass, Path::new("PIE790.py"); "PIE790")]
-    #[test_case(Rule::UnnecessarySpread, Path::new("PIE800.py"); "PIE800")]
-    #[test_case(Rule::ReimplementedListBuiltin, Path::new("PIE807.py"); "PIE807")]
-    #[test_case(Rule::NonUniqueEnums, Path::new("PIE796.py"); "PIE796")]
+    #[test_case(Rule::DuplicateClassFieldDefinition, Path::new("PIE794.py"))]
+    #[test_case(Rule::UnnecessaryDictKwargs, Path::new("PIE804.py"))]
+    #[test_case(Rule::MultipleStartsEndsWith, Path::new("PIE810.py"))]
+    #[test_case(Rule::UnnecessaryPass, Path::new("PIE790.py"))]
+    #[test_case(Rule::UnnecessarySpread, Path::new("PIE800.py"))]
+    #[test_case(Rule::ReimplementedListBuiltin, Path::new("PIE807.py"))]
+    #[test_case(Rule::NonUniqueEnums, Path::new("PIE796.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_pie/rules.rs b/crates/ruff/src/rules/flake8_pie/rules.rs
deleted file mode 100644
index 48f4acb4d4c2d..0000000000000
--- a/crates/ruff/src/rules/flake8_pie/rules.rs
+++ /dev/null
@@ -1,448 +0,0 @@
-use std::collections::BTreeMap;
-use std::iter;
-
-use itertools::Either::{Left, Right};
-use log::error;
-use rustc_hash::FxHashSet;
-use rustpython_parser::ast::{
-    Boolop, Constant, Expr, ExprContext, ExprKind, Keyword, Stmt, StmtKind,
-};
-
-use ruff_diagnostics::{AlwaysAutofixableViolation, Violation};
-use ruff_diagnostics::{Diagnostic, Edit};
-use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::comparable::ComparableExpr;
-use ruff_python_ast::helpers::{create_expr, trailing_comment_start_offset, unparse_expr};
-use ruff_python_ast::types::RefEquality;
-use ruff_python_stdlib::identifiers::is_identifier;
-
-use crate::autofix::actions::delete_stmt;
-use crate::checkers::ast::Checker;
-use crate::registry::AsRule;
-
-#[violation]
-pub struct UnnecessaryPass;
-
-impl AlwaysAutofixableViolation for UnnecessaryPass {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("Unnecessary `pass` statement")
-    }
-
-    fn autofix_title(&self) -> String {
-        "Remove unnecessary `pass`".to_string()
-    }
-}
-
-#[violation]
-pub struct DuplicateClassFieldDefinition(pub String);
-
-impl AlwaysAutofixableViolation for DuplicateClassFieldDefinition {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        let DuplicateClassFieldDefinition(name) = self;
-        format!("Class field `{name}` is defined multiple times")
-    }
-
-    fn autofix_title(&self) -> String {
-        let DuplicateClassFieldDefinition(name) = self;
-        format!("Remove duplicate field definition for `{name}`")
-    }
-}
-
-#[violation]
-pub struct NonUniqueEnums {
-    pub value: String,
-}
-
-impl Violation for NonUniqueEnums {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        let NonUniqueEnums { value } = self;
-        format!("Enum contains duplicate value: `{value}`")
-    }
-}
-
-#[violation]
-pub struct UnnecessarySpread;
-
-impl Violation for UnnecessarySpread {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("Unnecessary spread `**`")
-    }
-}
-
-#[violation]
-pub struct MultipleStartsEndsWith {
-    pub attr: String,
-}
-
-impl AlwaysAutofixableViolation for MultipleStartsEndsWith {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        let MultipleStartsEndsWith { attr } = self;
-        format!("Call `{attr}` once with a `tuple`")
-    }
-
-    fn autofix_title(&self) -> String {
-        let MultipleStartsEndsWith { attr } = self;
-        format!("Merge into a single `{attr}` call")
-    }
-}
-
-#[violation]
-pub struct UnnecessaryDictKwargs;
-
-impl Violation for UnnecessaryDictKwargs {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("Unnecessary `dict` kwargs")
-    }
-}
-
-#[violation]
-pub struct ReimplementedListBuiltin;
-
-impl AlwaysAutofixableViolation for ReimplementedListBuiltin {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("Prefer `list` over useless lambda")
-    }
-
-    fn autofix_title(&self) -> String {
-        "Replace with `list`".to_string()
-    }
-}
-
-/// PIE790
-pub fn no_unnecessary_pass(checker: &mut Checker, body: &[Stmt]) {
-    if body.len() > 1 {
-        // This only catches the case in which a docstring makes a `pass` statement
-        // redundant. Consider removing all `pass` statements instead.
-        let docstring_stmt = &body[0];
-        let pass_stmt = &body[1];
-        let StmtKind::Expr { value } = &docstring_stmt.node else {
-            return;
-        };
-        if matches!(
-            value.node,
-            ExprKind::Constant {
-                value: Constant::Str(..),
-                ..
-            }
-        ) {
-            if matches!(pass_stmt.node, StmtKind::Pass) {
-                let mut diagnostic = Diagnostic::new(UnnecessaryPass, pass_stmt.range());
-                if checker.patch(diagnostic.kind.rule()) {
-                    if let Some(index) = trailing_comment_start_offset(pass_stmt, checker.locator) {
-                        diagnostic.set_fix(Edit::range_deletion(pass_stmt.range().add_end(index)));
-                    } else {
-                        diagnostic.try_set_fix(|| {
-                            delete_stmt(
-                                pass_stmt,
-                                None,
-                                &[],
-                                checker.locator,
-                                checker.indexer,
-                                checker.stylist,
-                            )
-                        });
-                    }
-                }
-                checker.diagnostics.push(diagnostic);
-            }
-        }
-    }
-}
-
-/// PIE794
-pub fn duplicate_class_field_definition<'a, 'b>(
-    checker: &mut Checker<'a>,
-    parent: &'b Stmt,
-    body: &'b [Stmt],
-) where
-    'b: 'a,
-{
-    let mut seen_targets: FxHashSet<&str> = FxHashSet::default();
-    for stmt in body {
-        // Extract the property name from the assignment statement.
-        let target = match &stmt.node {
-            StmtKind::Assign { targets, .. } => {
-                if targets.len() != 1 {
-                    continue;
-                }
-                if let ExprKind::Name { id, .. } = &targets[0].node {
-                    id
-                } else {
-                    continue;
-                }
-            }
-            StmtKind::AnnAssign { target, .. } => {
-                if let ExprKind::Name { id, .. } = &target.node {
-                    id
-                } else {
-                    continue;
-                }
-            }
-            _ => continue,
-        };
-
-        if !seen_targets.insert(target) {
-            let mut diagnostic = Diagnostic::new(
-                DuplicateClassFieldDefinition(target.to_string()),
-                stmt.range(),
-            );
-            if checker.patch(diagnostic.kind.rule()) {
-                let deleted: Vec<&Stmt> = checker.deletions.iter().map(Into::into).collect();
-                let locator = checker.locator;
-                match delete_stmt(
-                    stmt,
-                    Some(parent),
-                    &deleted,
-                    locator,
-                    checker.indexer,
-                    checker.stylist,
-                ) {
-                    Ok(fix) => {
-                        checker.deletions.insert(RefEquality(stmt));
-                        diagnostic.set_fix(fix);
-                    }
-                    Err(err) => {
-                        error!("Failed to remove duplicate class definition: {}", err);
-                    }
-                }
-            }
-            checker.diagnostics.push(diagnostic);
-        }
-    }
-}
-
-/// PIE796
-pub fn non_unique_enums<'a, 'b>(checker: &mut Checker<'a>, parent: &'b Stmt, body: &'b [Stmt])
-where
-    'b: 'a,
-{
-    let StmtKind::ClassDef { bases, .. } = &parent.node else {
-        return;
-    };
-
-    if !bases.iter().any(|expr| {
-        checker
-            .ctx
-            .resolve_call_path(expr)
-            .map_or(false, |call_path| call_path.as_slice() == ["enum", "Enum"])
-    }) {
-        return;
-    }
-
-    let mut seen_targets: FxHashSet<ComparableExpr> = FxHashSet::default();
-    for stmt in body {
-        let StmtKind::Assign { value, .. } = &stmt.node else {
-            continue;
-        };
-
-        if let ExprKind::Call { func, .. } = &value.node {
-            if checker
-                .ctx
-                .resolve_call_path(func)
-                .map_or(false, |call_path| call_path.as_slice() == ["enum", "auto"])
-            {
-                continue;
-            }
-        }
-
-        if !seen_targets.insert(ComparableExpr::from(value)) {
-            let diagnostic = Diagnostic::new(
-                NonUniqueEnums {
-                    value: unparse_expr(value, checker.stylist),
-                },
-                stmt.range(),
-            );
-            checker.diagnostics.push(diagnostic);
-        }
-    }
-}
-
-/// PIE800
-pub fn unnecessary_spread(checker: &mut Checker, keys: &[Option<Expr>], values: &[Expr]) {
-    for item in keys.iter().zip(values.iter()) {
-        if let (None, value) = item {
-            // We only care about when the key is None which indicates a spread `**`
-            // inside a dict.
-            if let ExprKind::Dict { .. } = value.node {
-                let diagnostic = Diagnostic::new(UnnecessarySpread, value.range());
-                checker.diagnostics.push(diagnostic);
-            }
-        }
-    }
-}
-
-/// Return `true` if a key is a valid keyword argument name.
-fn is_valid_kwarg_name(key: &Expr) -> bool {
-    if let ExprKind::Constant {
-        value: Constant::Str(value),
-        ..
-    } = &key.node
-    {
-        is_identifier(value)
-    } else {
-        false
-    }
-}
-
-/// PIE804
-pub fn unnecessary_dict_kwargs(checker: &mut Checker, expr: &Expr, kwargs: &[Keyword]) {
-    for kw in kwargs {
-        // keyword is a spread operator (indicated by None)
-        if kw.node.arg.is_none() {
-            if let ExprKind::Dict { keys, .. } = &kw.node.value.node {
-                // ensure foo(**{"bar-bar": 1}) doesn't error
-                if keys.iter().all(|expr| expr.as_ref().map_or(false, is_valid_kwarg_name)) ||
-                    // handle case of foo(**{**bar})
-                    (keys.len() == 1 && keys[0].is_none())
-                {
-                    let diagnostic = Diagnostic::new(UnnecessaryDictKwargs, expr.range());
-                    checker.diagnostics.push(diagnostic);
-                }
-            }
-        }
-    }
-}
-
-/// PIE810
-pub fn multiple_starts_ends_with(checker: &mut Checker, expr: &Expr) {
-    let ExprKind::BoolOp { op: Boolop::Or, values } = &expr.node else {
-        return;
-    };
-
-    let mut duplicates = BTreeMap::new();
-    for (index, call) in values.iter().enumerate() {
-        let ExprKind::Call {
-            func,
-            args,
-            keywords,
-            ..
-        } = &call.node else {
-            continue
-        };
-
-        if !(args.len() == 1 && keywords.is_empty()) {
-            continue;
-        }
-
-        let ExprKind::Attribute { value, attr, .. } = &func.node else {
-            continue
-        };
-
-        if attr != "startswith" && attr != "endswith" {
-            continue;
-        }
-
-        let ExprKind::Name { id: arg_name, .. } = &value.node else {
-            continue
-        };
-
-        duplicates
-            .entry((attr.as_str(), arg_name.as_str()))
-            .or_insert_with(Vec::new)
-            .push(index);
-    }
-
-    // Generate a `Diagnostic` for each duplicate.
-    for ((attr_name, arg_name), indices) in duplicates {
-        if indices.len() > 1 {
-            let mut diagnostic = Diagnostic::new(
-                MultipleStartsEndsWith {
-                    attr: attr_name.to_string(),
-                },
-                expr.range(),
-            );
-            if checker.patch(diagnostic.kind.rule()) {
-                let words: Vec<&Expr> = indices
-                    .iter()
-                    .map(|index| &values[*index])
-                    .map(|expr| {
-                        let ExprKind::Call { func: _, args, keywords: _} = &expr.node else {
-                            unreachable!("{}", format!("Indices should only contain `{attr_name}` calls"))
-                        };
-                        args.get(0)
-                            .unwrap_or_else(|| panic!("`{attr_name}` should have one argument"))
-                    })
-                    .collect();
-
-                let call = create_expr(ExprKind::Call {
-                    func: Box::new(create_expr(ExprKind::Attribute {
-                        value: Box::new(create_expr(ExprKind::Name {
-                            id: arg_name.to_string(),
-                            ctx: ExprContext::Load,
-                        })),
-                        attr: attr_name.to_string(),
-                        ctx: ExprContext::Load,
-                    })),
-                    args: vec![create_expr(ExprKind::Tuple {
-                        elts: words
-                            .iter()
-                            .flat_map(|value| {
-                                if let ExprKind::Tuple { elts, .. } = &value.node {
-                                    Left(elts.iter())
-                                } else {
-                                    Right(iter::once(*value))
-                                }
-                            })
-                            .map(Clone::clone)
-                            .collect(),
-                        ctx: ExprContext::Load,
-                    })],
-                    keywords: vec![],
-                });
-
-                // Generate the combined `BoolOp`.
-                let mut call = Some(call);
-                let bool_op = create_expr(ExprKind::BoolOp {
-                    op: Boolop::Or,
-                    values: values
-                        .iter()
-                        .enumerate()
-                        .filter_map(|(index, elt)| {
-                            if indices.contains(&index) {
-                                std::mem::take(&mut call)
-                            } else {
-                                Some(elt.clone())
-                            }
-                        })
-                        .collect(),
-                });
-
-                diagnostic.set_fix(Edit::range_replacement(
-                    unparse_expr(&bool_op, checker.stylist),
-                    expr.range(),
-                ));
-            }
-            checker.diagnostics.push(diagnostic);
-        }
-    }
-}
-
-/// PIE807
-pub fn reimplemented_list_builtin(checker: &mut Checker, expr: &Expr) {
-    let ExprKind::Lambda { args, body } = &expr.node else {
-        panic!("Expected ExprKind::Lambda");
-    };
-    if args.args.is_empty()
-        && args.kwonlyargs.is_empty()
-        && args.posonlyargs.is_empty()
-        && args.vararg.is_none()
-        && args.kwarg.is_none()
-    {
-        if let ExprKind::List { elts, .. } = &body.node {
-            if elts.is_empty() {
-                let mut diagnostic = Diagnostic::new(ReimplementedListBuiltin, expr.range());
-                if checker.patch(diagnostic.kind.rule()) {
-                    diagnostic.set_fix(Edit::range_replacement("list".to_string(), expr.range()));
-                }
-                checker.diagnostics.push(diagnostic);
-            }
-        }
-    }
-}
diff --git a/crates/ruff/src/rules/flake8_pie/rules/duplicate_class_field_definition.rs b/crates/ruff/src/rules/flake8_pie/rules/duplicate_class_field_definition.rs
new file mode 100644
index 0000000000000..ce0991ac9867f
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pie/rules/duplicate_class_field_definition.rs
@@ -0,0 +1,103 @@
+use rustc_hash::FxHashSet;
+use rustpython_parser::ast::{self, Expr, Ranged, Stmt};
+
+use ruff_diagnostics::Diagnostic;
+use ruff_diagnostics::{AlwaysAutofixableViolation, Fix};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::autofix;
+use crate::checkers::ast::Checker;
+use crate::registry::AsRule;
+
+/// ## What it does
+/// Checks for duplicate field definitions in classes.
+///
+/// ## Why is this bad?
+/// Defining a field multiple times in a class body is redundant and likely a
+/// mistake.
+///
+/// ## Example
+/// ```python
+/// class Person:
+///     name = Tom
+///     ...
+///     name = Ben
+/// ```
+///
+/// Use instead:
+/// ```python
+/// class Person:
+///     name = Tom
+///     ...
+/// ```
+#[violation]
+pub struct DuplicateClassFieldDefinition {
+    name: String,
+}
+
+impl AlwaysAutofixableViolation for DuplicateClassFieldDefinition {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let DuplicateClassFieldDefinition { name } = self;
+        format!("Class field `{name}` is defined multiple times")
+    }
+
+    fn autofix_title(&self) -> String {
+        let DuplicateClassFieldDefinition { name } = self;
+        format!("Remove duplicate field definition for `{name}`")
+    }
+}
+
+/// PIE794
+pub(crate) fn duplicate_class_field_definition<'a, 'b>(
+    checker: &mut Checker<'a>,
+    parent: &'b Stmt,
+    body: &'b [Stmt],
+) where
+    'b: 'a,
+{
+    let mut seen_targets: FxHashSet<&str> = FxHashSet::default();
+    for stmt in body {
+        // Extract the property name from the assignment statement.
+        let target = match stmt {
+            Stmt::Assign(ast::StmtAssign { targets, .. }) => {
+                if targets.len() != 1 {
+                    continue;
+                }
+                if let Expr::Name(ast::ExprName { id, .. }) = &targets[0] {
+                    id
+                } else {
+                    continue;
+                }
+            }
+            Stmt::AnnAssign(ast::StmtAnnAssign { target, .. }) => {
+                if let Expr::Name(ast::ExprName { id, .. }) = target.as_ref() {
+                    id
+                } else {
+                    continue;
+                }
+            }
+            _ => continue,
+        };
+
+        if !seen_targets.insert(target) {
+            let mut diagnostic = Diagnostic::new(
+                DuplicateClassFieldDefinition {
+                    name: target.to_string(),
+                },
+                stmt.range(),
+            );
+            if checker.patch(diagnostic.kind.rule()) {
+                let edit = autofix::edits::delete_stmt(
+                    stmt,
+                    Some(parent),
+                    checker.locator,
+                    checker.indexer,
+                    checker.stylist,
+                );
+                diagnostic.set_fix(Fix::suggested(edit).isolate(checker.isolation(Some(parent))));
+            }
+            checker.diagnostics.push(diagnostic);
+        }
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_pie/rules/mod.rs b/crates/ruff/src/rules/flake8_pie/rules/mod.rs
new file mode 100644
index 0000000000000..75a94605eedbd
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pie/rules/mod.rs
@@ -0,0 +1,17 @@
+pub(crate) use duplicate_class_field_definition::{
+    duplicate_class_field_definition, DuplicateClassFieldDefinition,
+};
+pub(crate) use multiple_starts_ends_with::{multiple_starts_ends_with, MultipleStartsEndsWith};
+pub(crate) use no_unnecessary_pass::{no_unnecessary_pass, UnnecessaryPass};
+pub(crate) use non_unique_enums::{non_unique_enums, NonUniqueEnums};
+pub(crate) use reimplemented_list_builtin::{reimplemented_list_builtin, ReimplementedListBuiltin};
+pub(crate) use unnecessary_dict_kwargs::{unnecessary_dict_kwargs, UnnecessaryDictKwargs};
+pub(crate) use unnecessary_spread::{unnecessary_spread, UnnecessarySpread};
+
+mod duplicate_class_field_definition;
+mod multiple_starts_ends_with;
+mod no_unnecessary_pass;
+mod non_unique_enums;
+mod reimplemented_list_builtin;
+mod unnecessary_dict_kwargs;
+mod unnecessary_spread;
diff --git a/crates/ruff/src/rules/flake8_pie/rules/multiple_starts_ends_with.rs b/crates/ruff/src/rules/flake8_pie/rules/multiple_starts_ends_with.rs
new file mode 100644
index 0000000000000..f00986155f083
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pie/rules/multiple_starts_ends_with.rs
@@ -0,0 +1,181 @@
+use std::collections::BTreeMap;
+use std::iter;
+
+use itertools::Either::{Left, Right};
+
+use ruff_text_size::TextRange;
+
+use rustpython_parser::ast::{self, Boolop, Expr, ExprContext, Ranged};
+
+use ruff_diagnostics::AlwaysAutofixableViolation;
+use ruff_diagnostics::{Diagnostic, Edit, Fix};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+use crate::registry::AsRule;
+
+/// ## What it does
+/// Checks for `startswith` or `endswith` calls on the same value with
+/// different prefixes or suffixes.
+///
+/// ## Why is this bad?
+/// The `startswith` and `endswith` methods accept tuples of prefixes or
+/// suffixes respectively. Passing a tuple of prefixes or suffixes is more
+/// more efficient and readable than calling the method multiple times.
+///
+/// ## Example
+/// ```python
+/// msg = "Hello, world!"
+/// if msg.startswith("Hello") or msg.startswith("Hi"):
+///     print("Greetings!")
+/// ```
+///
+/// Use instead:
+/// ```python
+/// msg = "Hello, world!"
+/// if msg.startswith(("Hello", "Hi")):
+///     print("Greetings!")
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/stdtypes.html#str.startswith)
+/// - [Python documentation](https://docs.python.org/3/library/stdtypes.html#str.endswith)
+#[violation]
+pub struct MultipleStartsEndsWith {
+    attr: String,
+}
+
+impl AlwaysAutofixableViolation for MultipleStartsEndsWith {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let MultipleStartsEndsWith { attr } = self;
+        format!("Call `{attr}` once with a `tuple`")
+    }
+
+    fn autofix_title(&self) -> String {
+        let MultipleStartsEndsWith { attr } = self;
+        format!("Merge into a single `{attr}` call")
+    }
+}
+
+/// PIE810
+pub(crate) fn multiple_starts_ends_with(checker: &mut Checker, expr: &Expr) {
+    let Expr::BoolOp(ast::ExprBoolOp { op: Boolop::Or, values, range: _ }) = expr else {
+        return;
+    };
+
+    let mut duplicates = BTreeMap::new();
+    for (index, call) in values.iter().enumerate() {
+        let Expr::Call(ast::ExprCall {
+            func,
+            args,
+            keywords,
+            range: _
+        }) = &call else {
+            continue
+        };
+
+        if !(args.len() == 1 && keywords.is_empty()) {
+            continue;
+        }
+
+        let Expr::Attribute(ast::ExprAttribute { value, attr, .. } )= func.as_ref() else {
+            continue
+        };
+        if attr != "startswith" && attr != "endswith" {
+            continue;
+        }
+
+        let Expr::Name(ast::ExprName { id: arg_name, .. } )= value.as_ref() else {
+            continue
+        };
+
+        duplicates
+            .entry((attr.as_str(), arg_name.as_str()))
+            .or_insert_with(Vec::new)
+            .push(index);
+    }
+
+    // Generate a `Diagnostic` for each duplicate.
+    for ((attr_name, arg_name), indices) in duplicates {
+        if indices.len() > 1 {
+            let mut diagnostic = Diagnostic::new(
+                MultipleStartsEndsWith {
+                    attr: attr_name.to_string(),
+                },
+                expr.range(),
+            );
+            if checker.patch(diagnostic.kind.rule()) {
+                let words: Vec<&Expr> = indices
+                    .iter()
+                    .map(|index| &values[*index])
+                    .map(|expr| {
+                        let Expr::Call(ast::ExprCall { func: _, args, keywords: _, range: _}) = expr else {
+                            unreachable!("{}", format!("Indices should only contain `{attr_name}` calls"))
+                        };
+                        args.get(0)
+                            .unwrap_or_else(|| panic!("`{attr_name}` should have one argument"))
+                    })
+                    .collect();
+
+                let node = Expr::Tuple(ast::ExprTuple {
+                    elts: words
+                        .iter()
+                        .flat_map(|value| {
+                            if let Expr::Tuple(ast::ExprTuple { elts, .. }) = value {
+                                Left(elts.iter())
+                            } else {
+                                Right(iter::once(*value))
+                            }
+                        })
+                        .map(Clone::clone)
+                        .collect(),
+                    ctx: ExprContext::Load,
+                    range: TextRange::default(),
+                });
+                let node1 = Expr::Name(ast::ExprName {
+                    id: arg_name.into(),
+                    ctx: ExprContext::Load,
+                    range: TextRange::default(),
+                });
+                let node2 = Expr::Attribute(ast::ExprAttribute {
+                    value: Box::new(node1),
+                    attr: attr_name.into(),
+                    ctx: ExprContext::Load,
+                    range: TextRange::default(),
+                });
+                let node3 = Expr::Call(ast::ExprCall {
+                    func: Box::new(node2),
+                    args: vec![node],
+                    keywords: vec![],
+                    range: TextRange::default(),
+                });
+                let call = node3;
+
+                // Generate the combined `BoolOp`.
+                let mut call = Some(call);
+                let node = Expr::BoolOp(ast::ExprBoolOp {
+                    op: Boolop::Or,
+                    values: values
+                        .iter()
+                        .enumerate()
+                        .filter_map(|(index, elt)| {
+                            if indices.contains(&index) {
+                                std::mem::take(&mut call)
+                            } else {
+                                Some(elt.clone())
+                            }
+                        })
+                        .collect(),
+                    range: TextRange::default(),
+                });
+                let bool_op = node;
+                diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
+                    checker.generator().expr(&bool_op),
+                    expr.range(),
+                )));
+            }
+            checker.diagnostics.push(diagnostic);
+        }
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_pie/rules/no_unnecessary_pass.rs b/crates/ruff/src/rules/flake8_pie/rules/no_unnecessary_pass.rs
new file mode 100644
index 0000000000000..c688376d7faa1
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pie/rules/no_unnecessary_pass.rs
@@ -0,0 +1,82 @@
+use rustpython_parser::ast::{Ranged, Stmt};
+
+use ruff_diagnostics::AlwaysAutofixableViolation;
+use ruff_diagnostics::{Diagnostic, Edit, Fix};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::helpers::{is_docstring_stmt, trailing_comment_start_offset};
+
+use crate::autofix;
+use crate::checkers::ast::Checker;
+use crate::registry::AsRule;
+
+/// ## What it does
+/// Checks for unnecessary `pass` statements in class and function bodies.
+/// where it is not needed syntactically (e.g., when an indented docstring is
+/// present).
+///
+/// ## Why is this bad?
+/// When a function or class definition contains a docstring, an additional
+/// `pass` statement is redundant.
+///
+/// ## Example
+/// ```python
+/// def foo():
+///     """Placeholder docstring."""
+///     pass
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def foo():
+///     """Placeholder docstring."""
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/simple_stmts.html#the-pass-statement)
+#[violation]
+pub struct UnnecessaryPass;
+
+impl AlwaysAutofixableViolation for UnnecessaryPass {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Unnecessary `pass` statement")
+    }
+
+    fn autofix_title(&self) -> String {
+        "Remove unnecessary `pass`".to_string()
+    }
+}
+
+/// PIE790
+pub(crate) fn no_unnecessary_pass(checker: &mut Checker, body: &[Stmt]) {
+    if body.len() > 1 {
+        // This only catches the case in which a docstring makes a `pass` statement
+        // redundant. Consider removing all `pass` statements instead.
+        if !is_docstring_stmt(&body[0]) {
+            return;
+        }
+
+        // The second statement must be a `pass` statement.
+        let stmt = &body[1];
+        if !stmt.is_pass_stmt() {
+            return;
+        }
+
+        let mut diagnostic = Diagnostic::new(UnnecessaryPass, stmt.range());
+        if checker.patch(diagnostic.kind.rule()) {
+            let edit = if let Some(index) = trailing_comment_start_offset(stmt, checker.locator) {
+                Edit::range_deletion(stmt.range().add_end(index))
+            } else {
+                autofix::edits::delete_stmt(
+                    stmt,
+                    None,
+                    checker.locator,
+                    checker.indexer,
+                    checker.stylist,
+                )
+            };
+            diagnostic.set_fix(Fix::automatic(edit));
+        }
+        checker.diagnostics.push(diagnostic);
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_pie/rules/non_unique_enums.rs b/crates/ruff/src/rules/flake8_pie/rules/non_unique_enums.rs
new file mode 100644
index 0000000000000..47e1a427a55a5
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pie/rules/non_unique_enums.rs
@@ -0,0 +1,102 @@
+use rustc_hash::FxHashSet;
+use rustpython_parser::ast::{self, Expr, Ranged, Stmt};
+
+use ruff_diagnostics::Diagnostic;
+use ruff_diagnostics::Violation;
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::comparable::ComparableExpr;
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for enums that contain duplicate values.
+///
+/// ## Why is this bad?
+/// Enum values should be unique. Non-unique values are redundant and likely a
+/// mistake.
+///
+/// ## Example
+/// ```python
+/// from enum import Enum
+///
+///
+/// class Foo(Enum):
+///     A = 1
+///     B = 2
+///     C = 1
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from enum import Enum
+///
+///
+/// class Foo(Enum):
+///     A = 1
+///     B = 2
+///     C = 3
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/enum.html#enum.Enum)
+#[violation]
+pub struct NonUniqueEnums {
+    value: String,
+}
+
+impl Violation for NonUniqueEnums {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let NonUniqueEnums { value } = self;
+        format!("Enum contains duplicate value: `{value}`")
+    }
+}
+
+/// PIE796
+pub(crate) fn non_unique_enums<'a, 'b>(
+    checker: &mut Checker<'a>,
+    parent: &'b Stmt,
+    body: &'b [Stmt],
+) where
+    'b: 'a,
+{
+    let Stmt::ClassDef(ast::StmtClassDef { bases, .. }) = parent else {
+        return;
+    };
+
+    if !bases.iter().any(|expr| {
+        checker
+            .semantic_model()
+            .resolve_call_path(expr)
+            .map_or(false, |call_path| call_path.as_slice() == ["enum", "Enum"])
+    }) {
+        return;
+    }
+
+    let mut seen_targets: FxHashSet<ComparableExpr> = FxHashSet::default();
+    for stmt in body {
+        let Stmt::Assign(ast::StmtAssign { value, .. }) = stmt else {
+            continue;
+        };
+
+        if let Expr::Call(ast::ExprCall { func, .. }) = value.as_ref() {
+            if checker
+                .semantic_model()
+                .resolve_call_path(func)
+                .map_or(false, |call_path| call_path.as_slice() == ["enum", "auto"])
+            {
+                continue;
+            }
+        }
+
+        if !seen_targets.insert(ComparableExpr::from(value)) {
+            let diagnostic = Diagnostic::new(
+                NonUniqueEnums {
+                    value: checker.generator().expr(value),
+                },
+                stmt.range(),
+            );
+            checker.diagnostics.push(diagnostic);
+        }
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_pie/rules/reimplemented_list_builtin.rs b/crates/ruff/src/rules/flake8_pie/rules/reimplemented_list_builtin.rs
new file mode 100644
index 0000000000000..c7e562a36a548
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pie/rules/reimplemented_list_builtin.rs
@@ -0,0 +1,83 @@
+use rustpython_parser::ast::{self, Expr, ExprLambda, Ranged};
+
+use ruff_diagnostics::{AutofixKind, Violation};
+use ruff_diagnostics::{Diagnostic, Edit, Fix};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+use crate::registry::AsRule;
+
+/// ## What it does
+/// Checks for lambdas that can be replaced with the `list` builtin.
+///
+/// ## Why is this bad?
+/// Using `list` builtin is more readable.
+///
+/// ## Example
+/// ```python
+/// from dataclasses import dataclass, field
+///
+///
+/// @dataclass
+/// class Foo:
+///     bar: list[int] = field(default_factory=lambda: [])
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from dataclasses import dataclass, field
+///
+///
+/// @dataclass
+/// class Foo:
+///     bar: list[int] = field(default_factory=list)
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/functions.html#func-list)
+#[violation]
+pub struct ReimplementedListBuiltin;
+
+impl Violation for ReimplementedListBuiltin {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Prefer `list` over useless lambda")
+    }
+
+    fn autofix_title(&self) -> Option<String> {
+        Some("Replace with `list`".to_string())
+    }
+}
+
+/// PIE807
+pub(crate) fn reimplemented_list_builtin(checker: &mut Checker, expr: &ExprLambda) {
+    let ExprLambda {
+        args,
+        body,
+        range: _,
+    } = expr;
+
+    if args.args.is_empty()
+        && args.kwonlyargs.is_empty()
+        && args.posonlyargs.is_empty()
+        && args.vararg.is_none()
+        && args.kwarg.is_none()
+    {
+        if let Expr::List(ast::ExprList { elts, .. }) = body.as_ref() {
+            if elts.is_empty() {
+                let mut diagnostic = Diagnostic::new(ReimplementedListBuiltin, expr.range());
+                if checker.patch(diagnostic.kind.rule()) {
+                    if checker.semantic_model().is_builtin("list") {
+                        diagnostic.set_fix(Fix::automatic(Edit::range_replacement(
+                            "list".to_string(),
+                            expr.range(),
+                        )));
+                    }
+                }
+                checker.diagnostics.push(diagnostic);
+            }
+        }
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_pie/rules/unnecessary_dict_kwargs.rs b/crates/ruff/src/rules/flake8_pie/rules/unnecessary_dict_kwargs.rs
new file mode 100644
index 0000000000000..b621d1ff5fbc3
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pie/rules/unnecessary_dict_kwargs.rs
@@ -0,0 +1,79 @@
+use rustpython_parser::ast::{self, Constant, Expr, Keyword, Ranged};
+
+use ruff_diagnostics::Diagnostic;
+use ruff_diagnostics::Violation;
+use ruff_macros::{derive_message_formats, violation};
+
+use ruff_python_stdlib::identifiers::is_identifier;
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for unnecessary `dict` kwargs.
+///
+/// ## Why is this bad?
+/// If the `dict` keys are valid identifiers, they can be passed as keyword
+/// arguments directly.
+///
+/// ## Example
+/// ```python
+/// def foo(bar):
+///     return bar + 1
+///
+///
+/// print(foo(**{"bar": 2}))  # prints 3
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def foo(bar):
+///     return bar + 1
+///
+///
+/// print(foo(bar=2))  # prints 3
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/expressions.html#dictionary-displays)
+/// - [Python documentation](https://docs.python.org/3/reference/expressions.html#calls)
+#[violation]
+pub struct UnnecessaryDictKwargs;
+
+impl Violation for UnnecessaryDictKwargs {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Unnecessary `dict` kwargs")
+    }
+}
+
+/// PIE804
+pub(crate) fn unnecessary_dict_kwargs(checker: &mut Checker, expr: &Expr, kwargs: &[Keyword]) {
+    for kw in kwargs {
+        // keyword is a spread operator (indicated by None)
+        if kw.arg.is_none() {
+            if let Expr::Dict(ast::ExprDict { keys, .. }) = &kw.value {
+                // ensure foo(**{"bar-bar": 1}) doesn't error
+                if keys.iter().all(|expr| expr.as_ref().map_or(false, is_valid_kwarg_name)) ||
+                    // handle case of foo(**{**bar})
+                    (keys.len() == 1 && keys[0].is_none())
+                {
+                    let diagnostic = Diagnostic::new(UnnecessaryDictKwargs, expr.range());
+                    checker.diagnostics.push(diagnostic);
+                }
+            }
+        }
+    }
+}
+
+/// Return `true` if a key is a valid keyword argument name.
+fn is_valid_kwarg_name(key: &Expr) -> bool {
+    if let Expr::Constant(ast::ExprConstant {
+        value: Constant::Str(value),
+        ..
+    }) = key
+    {
+        is_identifier(value)
+    } else {
+        false
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_pie/rules/unnecessary_spread.rs b/crates/ruff/src/rules/flake8_pie/rules/unnecessary_spread.rs
new file mode 100644
index 0000000000000..855d4ea26d3c3
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pie/rules/unnecessary_spread.rs
@@ -0,0 +1,52 @@
+use rustpython_parser::ast::{Expr, Ranged};
+
+use ruff_diagnostics::Diagnostic;
+use ruff_diagnostics::Violation;
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for unnecessary dictionary unpacking operators (`**`).
+///
+/// ## Why is this bad?
+/// Unpacking a dictionary into another dictionary is redundant. The unpacking
+/// operator can be removed, making the code more readable.
+///
+/// ## Example
+/// ```python
+/// foo = {"A": 1, "B": 2}
+/// bar = {**foo, **{"C": 3}}
+/// ```
+///
+/// Use instead:
+/// ```python
+/// foo = {"A": 1, "B": 2}
+/// bar = {**foo, "C": 3}
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/expressions.html#dictionary-displays)
+#[violation]
+pub struct UnnecessarySpread;
+
+impl Violation for UnnecessarySpread {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Unnecessary spread `**`")
+    }
+}
+
+/// PIE800
+pub(crate) fn unnecessary_spread(checker: &mut Checker, keys: &[Option<Expr>], values: &[Expr]) {
+    for item in keys.iter().zip(values.iter()) {
+        if let (None, value) = item {
+            // We only care about when the key is None which indicates a spread `**`
+            // inside a dict.
+            if let Expr::Dict(_) = value {
+                let diagnostic = Diagnostic::new(UnnecessarySpread, value.range());
+                checker.diagnostics.push(diagnostic);
+            }
+        }
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_pie/snapshots/ruff__rules__flake8_pie__tests__PIE790_PIE790.py.snap b/crates/ruff/src/rules/flake8_pie/snapshots/ruff__rules__flake8_pie__tests__PIE790_PIE790.py.snap
index 1d8eb9f4d8d82..7b35dbe165800 100644
--- a/crates/ruff/src/rules/flake8_pie/snapshots/ruff__rules__flake8_pie__tests__PIE790_PIE790.py.snap
+++ b/crates/ruff/src/rules/flake8_pie/snapshots/ruff__rules__flake8_pie__tests__PIE790_PIE790.py.snap
@@ -10,7 +10,7 @@ PIE790.py:4:5: PIE790 [*] Unnecessary `pass` statement
   |
   = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | class Foo:
 2 2 |     """buzz"""
 3 3 | 
@@ -28,7 +28,7 @@ PIE790.py:9:5: PIE790 [*] Unnecessary `pass` statement
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 6  6  | 
 7  7  | if foo:
 8  8  |     """foo"""
@@ -46,7 +46,7 @@ PIE790.py:14:5: PIE790 [*] Unnecessary `pass` statement
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 11 11 | 
 12 12 | def multi_statement() -> None:
 13 13 |     """This is a function."""
@@ -65,7 +65,7 @@ PIE790.py:21:5: PIE790 [*] Unnecessary `pass` statement
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 18 18 |     pass
 19 19 | else:
 20 20 |     """bar"""
@@ -83,7 +83,7 @@ PIE790.py:28:5: PIE790 [*] Unnecessary `pass` statement
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 25 25 |     pass
 26 26 | else:
 27 27 |     """bar"""
@@ -101,7 +101,7 @@ PIE790.py:35:5: PIE790 [*] Unnecessary `pass` statement
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 32 32 |     pass
 33 33 | else:
 34 34 |     """bar"""
@@ -119,7 +119,7 @@ PIE790.py:42:5: PIE790 [*] Unnecessary `pass` statement
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 39 39 |     pass
 40 40 | else:
 41 41 |     """bar"""
@@ -137,7 +137,7 @@ PIE790.py:50:5: PIE790 [*] Unnecessary `pass` statement
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 47 47 |     buzz
 48 48 |     """
 49 49 | 
@@ -155,7 +155,7 @@ PIE790.py:58:5: PIE790 [*] Unnecessary `pass` statement
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 55 55 |     buzz
 56 56 |     """
 57 57 | 
@@ -175,7 +175,7 @@ PIE790.py:65:5: PIE790 [*] Unnecessary `pass` statement
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 62 62 |     """
 63 63 |     buzz
 64 64 |     """
@@ -193,7 +193,7 @@ PIE790.py:74:5: PIE790 [*] Unnecessary `pass` statement
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 71 71 |     bar()
 72 72 | except ValueError:
 73 73 |     """bar"""
@@ -213,7 +213,7 @@ PIE790.py:79:5: PIE790 [*] Unnecessary `pass` statement
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 76 76 | 
 77 77 | for _ in range(10):
 78 78 |     """buzz"""
@@ -233,7 +233,7 @@ PIE790.py:83:5: PIE790 [*] Unnecessary `pass` statement
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 80 80 | 
 81 81 | async for _ in range(10):
 82 82 |     """buzz"""
@@ -251,7 +251,7 @@ PIE790.py:87:5: PIE790 [*] Unnecessary `pass` statement
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 84 84 | 
 85 85 | while cond:
 86 86 |     """buzz"""
@@ -271,7 +271,7 @@ PIE790.py:92:5: PIE790 [*] Unnecessary `pass` statement
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 89 89 | 
 90 90 | with bar:
 91 91 |     """buzz"""
@@ -289,7 +289,7 @@ PIE790.py:96:5: PIE790 [*] Unnecessary `pass` statement
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 93 93 | 
 94 94 | async with bar:
 95 95 |     """buzz"""
@@ -307,7 +307,7 @@ PIE790.py:101:5: PIE790 [*] Unnecessary `pass` statement
     |
     = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 98  98  | 
 99  99  | def foo() -> None:
 100 100 |     """buzz"""
diff --git a/crates/ruff/src/rules/flake8_pie/snapshots/ruff__rules__flake8_pie__tests__PIE807_PIE807.py.snap b/crates/ruff/src/rules/flake8_pie/snapshots/ruff__rules__flake8_pie__tests__PIE807_PIE807.py.snap
index 82bc88464a418..dcd6048509daf 100644
--- a/crates/ruff/src/rules/flake8_pie/snapshots/ruff__rules__flake8_pie__tests__PIE807_PIE807.py.snap
+++ b/crates/ruff/src/rules/flake8_pie/snapshots/ruff__rules__flake8_pie__tests__PIE807_PIE807.py.snap
@@ -10,7 +10,7 @@ PIE807.py:3:44: PIE807 [*] Prefer `list` over useless lambda
   |
   = help: Replace with `list`
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | @dataclass
 2 2 | class Foo:
 3   |-    foo: List[str] = field(default_factory=lambda: [])  # PIE807
@@ -27,7 +27,7 @@ PIE807.py:7:36: PIE807 [*] Prefer `list` over useless lambda
   |
   = help: Replace with `list`
 
-ℹ Suggested fix
+ℹ Fix
 4 4 | 
 5 5 | 
 6 6 | class FooTable(BaseTable):
@@ -45,7 +45,7 @@ PIE807.py:11:28: PIE807 [*] Prefer `list` over useless lambda
    |
    = help: Replace with `list`
 
-ℹ Suggested fix
+ℹ Fix
 8  8  | 
 9  9  | 
 10 10 | class FooTable(BaseTable):
diff --git a/crates/ruff/src/rules/flake8_print/mod.rs b/crates/ruff/src/rules/flake8_print/mod.rs
index bb0e532615c43..3d5179b3e0c01 100644
--- a/crates/ruff/src/rules/flake8_print/mod.rs
+++ b/crates/ruff/src/rules/flake8_print/mod.rs
@@ -6,15 +6,14 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::Print, Path::new("T201.py"); "T201")]
-    #[test_case(Rule::PPrint, Path::new("T203.py"); "T203")]
+    #[test_case(Rule::Print, Path::new("T201.py"))]
+    #[test_case(Rule::PPrint, Path::new("T203.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_print/rules/mod.rs b/crates/ruff/src/rules/flake8_print/rules/mod.rs
index 505d8967dc4e0..e044fe39e9870 100644
--- a/crates/ruff/src/rules/flake8_print/rules/mod.rs
+++ b/crates/ruff/src/rules/flake8_print/rules/mod.rs
@@ -1,3 +1,3 @@
-pub use print_call::{print_call, PPrint, Print};
+pub(crate) use print_call::{print_call, PPrint, Print};
 
 mod print_call;
diff --git a/crates/ruff/src/rules/flake8_print/rules/print_call.rs b/crates/ruff/src/rules/flake8_print/rules/print_call.rs
index 80d5046318e2c..13993a202cc46 100644
--- a/crates/ruff/src/rules/flake8_print/rules/print_call.rs
+++ b/crates/ruff/src/rules/flake8_print/rules/print_call.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, Keyword};
+use rustpython_parser::ast::{Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -76,9 +76,9 @@ impl Violation for PPrint {
 }
 
 /// T201, T203
-pub fn print_call(checker: &mut Checker, func: &Expr, keywords: &[Keyword]) {
+pub(crate) fn print_call(checker: &mut Checker, func: &Expr, keywords: &[Keyword]) {
     let diagnostic = {
-        let call_path = checker.ctx.resolve_call_path(func);
+        let call_path = checker.semantic_model().resolve_call_path(func);
         if call_path
             .as_ref()
             .map_or(false, |call_path| *call_path.as_slice() == ["", "print"])
@@ -87,16 +87,17 @@ pub fn print_call(checker: &mut Checker, func: &Expr, keywords: &[Keyword]) {
             // or `"sys.stderr"`), don't trigger T201.
             if let Some(keyword) = keywords
                 .iter()
-                .find(|keyword| keyword.node.arg.as_ref().map_or(false, |arg| arg == "file"))
+                .find(|keyword| keyword.arg.as_ref().map_or(false, |arg| arg == "file"))
             {
-                if !is_const_none(&keyword.node.value) {
-                    if checker.ctx.resolve_call_path(&keyword.node.value).map_or(
-                        true,
-                        |call_path| {
+                if !is_const_none(&keyword.value) {
+                    if checker
+                        .semantic_model()
+                        .resolve_call_path(&keyword.value)
+                        .map_or(true, |call_path| {
                             call_path.as_slice() != ["sys", "stdout"]
                                 && call_path.as_slice() != ["sys", "stderr"]
-                        },
-                    ) {
+                        })
+                    {
                         return;
                     }
                 }
@@ -111,7 +112,7 @@ pub fn print_call(checker: &mut Checker, func: &Expr, keywords: &[Keyword]) {
         }
     };
 
-    if !checker.settings.rules.enabled(diagnostic.kind.rule()) {
+    if !checker.enabled(diagnostic.kind.rule()) {
         return;
     }
 
diff --git a/crates/ruff/src/rules/flake8_pyi/mod.rs b/crates/ruff/src/rules/flake8_pyi/mod.rs
index fd800a2db9acb..783018fba867f 100644
--- a/crates/ruff/src/rules/flake8_pyi/mod.rs
+++ b/crates/ruff/src/rules/flake8_pyi/mod.rs
@@ -6,45 +6,70 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::UnprefixedTypeParam, Path::new("PYI001.py"))]
-    #[test_case(Rule::UnprefixedTypeParam, Path::new("PYI001.pyi"))]
-    #[test_case(Rule::BadVersionInfoComparison, Path::new("PYI006.py"))]
-    #[test_case(Rule::BadVersionInfoComparison, Path::new("PYI006.pyi"))]
-    #[test_case(Rule::UnrecognizedPlatformCheck, Path::new("PYI007.py"))]
-    #[test_case(Rule::UnrecognizedPlatformCheck, Path::new("PYI007.pyi"))]
-    #[test_case(Rule::UnrecognizedPlatformName, Path::new("PYI008.py"))]
-    #[test_case(Rule::UnrecognizedPlatformName, Path::new("PYI008.pyi"))]
-    #[test_case(Rule::PassStatementStubBody, Path::new("PYI009.py"))]
-    #[test_case(Rule::PassStatementStubBody, Path::new("PYI009.pyi"))]
-    #[test_case(Rule::NonEmptyStubBody, Path::new("PYI010.py"))]
-    #[test_case(Rule::NonEmptyStubBody, Path::new("PYI010.pyi"))]
-    #[test_case(Rule::TypedArgumentDefaultInStub, Path::new("PYI011.py"))]
-    #[test_case(Rule::TypedArgumentDefaultInStub, Path::new("PYI011.pyi"))]
-    #[test_case(Rule::PassInClassBody, Path::new("PYI012.py"))]
-    #[test_case(Rule::PassInClassBody, Path::new("PYI012.pyi"))]
+    #[test_case(Rule::AnyEqNeAnnotation, Path::new("PYI032.py"))]
+    #[test_case(Rule::AnyEqNeAnnotation, Path::new("PYI032.pyi"))]
     #[test_case(Rule::ArgumentDefaultInStub, Path::new("PYI014.py"))]
     #[test_case(Rule::ArgumentDefaultInStub, Path::new("PYI014.pyi"))]
     #[test_case(Rule::AssignmentDefaultInStub, Path::new("PYI015.py"))]
     #[test_case(Rule::AssignmentDefaultInStub, Path::new("PYI015.pyi"))]
+    #[test_case(Rule::BadVersionInfoComparison, Path::new("PYI006.py"))]
+    #[test_case(Rule::BadVersionInfoComparison, Path::new("PYI006.pyi"))]
+    #[test_case(Rule::CollectionsNamedTuple, Path::new("PYI024.py"))]
+    #[test_case(Rule::CollectionsNamedTuple, Path::new("PYI024.pyi"))]
+    #[test_case(Rule::DocstringInStub, Path::new("PYI021.py"))]
+    #[test_case(Rule::DocstringInStub, Path::new("PYI021.pyi"))]
     #[test_case(Rule::DuplicateUnionMember, Path::new("PYI016.py"))]
     #[test_case(Rule::DuplicateUnionMember, Path::new("PYI016.pyi"))]
+    #[test_case(Rule::EllipsisInNonEmptyClassBody, Path::new("PYI013.py"))]
+    #[test_case(Rule::EllipsisInNonEmptyClassBody, Path::new("PYI013.pyi"))]
+    #[test_case(Rule::NonSelfReturnType, Path::new("PYI034.py"))]
+    #[test_case(Rule::NonSelfReturnType, Path::new("PYI034.pyi"))]
+    #[test_case(Rule::IterMethodReturnIterable, Path::new("PYI045.py"))]
+    #[test_case(Rule::IterMethodReturnIterable, Path::new("PYI045.pyi"))]
+    #[test_case(Rule::NoReturnArgumentAnnotationInStub, Path::new("PYI050.py"))]
+    #[test_case(Rule::NoReturnArgumentAnnotationInStub, Path::new("PYI050.pyi"))]
+    #[test_case(Rule::NumericLiteralTooLong, Path::new("PYI054.py"))]
+    #[test_case(Rule::NumericLiteralTooLong, Path::new("PYI054.pyi"))]
+    #[test_case(Rule::NonEmptyStubBody, Path::new("PYI010.py"))]
+    #[test_case(Rule::NonEmptyStubBody, Path::new("PYI010.pyi"))]
+    #[test_case(Rule::PassInClassBody, Path::new("PYI012.py"))]
+    #[test_case(Rule::PassInClassBody, Path::new("PYI012.pyi"))]
+    #[test_case(Rule::PassStatementStubBody, Path::new("PYI009.py"))]
+    #[test_case(Rule::PassStatementStubBody, Path::new("PYI009.pyi"))]
     #[test_case(Rule::QuotedAnnotationInStub, Path::new("PYI020.py"))]
     #[test_case(Rule::QuotedAnnotationInStub, Path::new("PYI020.pyi"))]
-    #[test_case(Rule::DocstringInStub, Path::new("PYI021.py"))]
-    #[test_case(Rule::DocstringInStub, Path::new("PYI021.pyi"))]
-    #[test_case(Rule::TypeCommentInStub, Path::new("PYI033.py"))]
-    #[test_case(Rule::TypeCommentInStub, Path::new("PYI033.pyi"))]
     #[test_case(Rule::SnakeCaseTypeAlias, Path::new("PYI042.py"))]
     #[test_case(Rule::SnakeCaseTypeAlias, Path::new("PYI042.pyi"))]
+    #[test_case(Rule::UnassignedSpecialVariableInStub, Path::new("PYI035.py"))]
+    #[test_case(Rule::UnassignedSpecialVariableInStub, Path::new("PYI035.pyi"))]
+    #[test_case(Rule::StrOrReprDefinedInStub, Path::new("PYI029.py"))]
+    #[test_case(Rule::StrOrReprDefinedInStub, Path::new("PYI029.pyi"))]
+    #[test_case(Rule::StubBodyMultipleStatements, Path::new("PYI048.py"))]
+    #[test_case(Rule::StubBodyMultipleStatements, Path::new("PYI048.pyi"))]
     #[test_case(Rule::TSuffixedTypeAlias, Path::new("PYI043.py"))]
     #[test_case(Rule::TSuffixedTypeAlias, Path::new("PYI043.pyi"))]
+    #[test_case(Rule::TypeCommentInStub, Path::new("PYI033.py"))]
+    #[test_case(Rule::TypeCommentInStub, Path::new("PYI033.pyi"))]
+    #[test_case(Rule::TypedArgumentDefaultInStub, Path::new("PYI011.py"))]
+    #[test_case(Rule::TypedArgumentDefaultInStub, Path::new("PYI011.pyi"))]
+    #[test_case(Rule::UnaliasedCollectionsAbcSetImport, Path::new("PYI025.py"))]
+    #[test_case(Rule::UnaliasedCollectionsAbcSetImport, Path::new("PYI025.pyi"))]
+    #[test_case(Rule::UnannotatedAssignmentInStub, Path::new("PYI052.py"))]
+    #[test_case(Rule::UnannotatedAssignmentInStub, Path::new("PYI052.pyi"))]
+    #[test_case(Rule::StringOrBytesTooLong, Path::new("PYI053.py"))]
+    #[test_case(Rule::StringOrBytesTooLong, Path::new("PYI053.pyi"))]
+    #[test_case(Rule::UnprefixedTypeParam, Path::new("PYI001.py"))]
+    #[test_case(Rule::UnprefixedTypeParam, Path::new("PYI001.pyi"))]
+    #[test_case(Rule::UnrecognizedPlatformCheck, Path::new("PYI007.py"))]
+    #[test_case(Rule::UnrecognizedPlatformCheck, Path::new("PYI007.pyi"))]
+    #[test_case(Rule::UnrecognizedPlatformName, Path::new("PYI008.py"))]
+    #[test_case(Rule::UnrecognizedPlatformName, Path::new("PYI008.pyi"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/any_eq_ne_annotation.rs b/crates/ruff/src/rules/flake8_pyi/rules/any_eq_ne_annotation.rs
new file mode 100644
index 0000000000000..03235b31bee8c
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/rules/any_eq_ne_annotation.rs
@@ -0,0 +1,94 @@
+use rustpython_parser::ast::{Arguments, Ranged};
+
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+use crate::registry::AsRule;
+
+/// ## What it does
+/// Checks for `__eq__` and `__ne__` implementations that use `typing.Any` as
+/// the type annotation for the `obj` parameter.
+///
+/// ## Why is this bad?
+/// The Python documentation recommends the use of `object` to "indicate that a
+/// value could be any type in a typesafe manner", while `Any` should be used to
+/// "indicate that a value is dynamically typed."
+///
+/// The semantics of `__eq__` and `__ne__` are such that the `obj` parameter
+/// should be any type, as opposed to a dynamically typed value. Therefore, the
+/// `object` type annotation is more appropriate.
+///
+/// ## Example
+/// ```python
+/// class Foo:
+///     def __eq__(self, obj: typing.Any):
+///         ...
+/// ```
+///
+/// Use instead:
+/// ```python
+/// class Foo:
+///     def __eq__(self, obj: object):
+///         ...
+/// ```
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/typing.html#the-any-type)
+/// - [Mypy documentation](https://mypy.readthedocs.io/en/latest/dynamic_typing.html#any-vs-object)
+#[violation]
+pub struct AnyEqNeAnnotation {
+    method_name: String,
+}
+
+impl AlwaysAutofixableViolation for AnyEqNeAnnotation {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let AnyEqNeAnnotation { method_name } = self;
+        format!("Prefer `object` to `Any` for the second parameter to `{method_name}`")
+    }
+
+    fn autofix_title(&self) -> String {
+        format!("Replace with `object`")
+    }
+}
+
+/// PYI032
+pub(crate) fn any_eq_ne_annotation(checker: &mut Checker, name: &str, args: &Arguments) {
+    if !matches!(name, "__eq__" | "__ne__") {
+        return;
+    }
+
+    if args.args.len() != 2 {
+        return;
+    }
+
+    let Some(annotation) = &args.args[1].annotation else {
+        return;
+    };
+
+    if !checker.semantic_model().scope().kind.is_class() {
+        return;
+    }
+
+    if checker
+        .semantic_model()
+        .match_typing_expr(annotation, "Any")
+    {
+        let mut diagnostic = Diagnostic::new(
+            AnyEqNeAnnotation {
+                method_name: name.to_string(),
+            },
+            annotation.range(),
+        );
+        if checker.patch(diagnostic.kind.rule()) {
+            // Ex) `def __eq__(self, obj: Any): ...`
+            if checker.semantic_model().is_builtin("object") {
+                diagnostic.set_fix(Fix::automatic(Edit::range_replacement(
+                    "object".to_string(),
+                    annotation.range(),
+                )));
+            }
+        }
+        checker.diagnostics.push(diagnostic);
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/bad_version_info_comparison.rs b/crates/ruff/src/rules/flake8_pyi/rules/bad_version_info_comparison.rs
index 94bbc61f337e3..8d923d1cfad93 100644
--- a/crates/ruff/src/rules/flake8_pyi/rules/bad_version_info_comparison.rs
+++ b/crates/ruff/src/rules/flake8_pyi/rules/bad_version_info_comparison.rs
@@ -1,9 +1,10 @@
-use rustpython_parser::ast::{Cmpop, Expr};
+use rustpython_parser::ast::{Cmpop, Expr, Ranged};
 
-use crate::checkers::ast::Checker;
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
+use crate::checkers::ast::Checker;
+
 /// ## What it does
 /// Checks for usages of comparators other than `<` and `>=` for
 /// `sys.version_info` checks in `.pyi` files. All other comparators, such
@@ -56,7 +57,7 @@ impl Violation for BadVersionInfoComparison {
 }
 
 /// PYI006
-pub fn bad_version_info_comparison(
+pub(crate) fn bad_version_info_comparison(
     checker: &mut Checker,
     expr: &Expr,
     left: &Expr,
@@ -68,7 +69,7 @@ pub fn bad_version_info_comparison(
     };
 
     if !checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(left)
         .map_or(false, |call_path| {
             call_path.as_slice() == ["sys", "version_info"]
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/collections_named_tuple.rs b/crates/ruff/src/rules/flake8_pyi/rules/collections_named_tuple.rs
new file mode 100644
index 0000000000000..7f171b755873b
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/rules/collections_named_tuple.rs
@@ -0,0 +1,64 @@
+use rustpython_parser::ast::Expr;
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::prelude::Ranged;
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for uses of `collections.namedtuple` in stub files.
+///
+/// ## Why is this bad?
+/// `typing.NamedTuple` is the "typed version" of `collections.namedtuple`.
+///
+/// The class generated by subclassing `typing.NamedTuple` is equivalent to
+/// `collections.namedtuple`, with the exception that `typing.NamedTuple`
+/// includes an `__annotations__` attribute, which allows type checkers to
+/// infer the types of the fields.
+///
+/// ## Example
+/// ```python
+/// from collections import namedtuple
+///
+///
+/// person = namedtuple("Person", ["name", "age"])
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from typing import NamedTuple
+///
+///
+/// class Person(NamedTuple):
+///     name: str
+///     age: int
+/// ```
+#[violation]
+pub struct CollectionsNamedTuple;
+
+impl Violation for CollectionsNamedTuple {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Use `typing.NamedTuple` instead of `collections.namedtuple`")
+    }
+
+    fn autofix_title(&self) -> Option<String> {
+        Some(format!("Replace with `typing.NamedTuple`"))
+    }
+}
+
+/// PYI024
+pub(crate) fn collections_named_tuple(checker: &mut Checker, expr: &Expr) {
+    if checker
+        .semantic_model()
+        .resolve_call_path(expr)
+        .map_or(false, |call_path| {
+            matches!(call_path.as_slice(), ["collections", "namedtuple"])
+        })
+    {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(CollectionsNamedTuple, expr.range()));
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/docstring_in_stubs.rs b/crates/ruff/src/rules/flake8_pyi/rules/docstring_in_stubs.rs
index 10aa9bee409bc..924baa9c2bef6 100644
--- a/crates/ruff/src/rules/flake8_pyi/rules/docstring_in_stubs.rs
+++ b/crates/ruff/src/rules/flake8_pyi/rules/docstring_in_stubs.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::Expr;
+use rustpython_parser::ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -16,7 +16,7 @@ impl Violation for DocstringInStub {
 }
 
 /// PYI021
-pub fn docstring_in_stubs(checker: &mut Checker, docstring: Option<&Expr>) {
+pub(crate) fn docstring_in_stubs(checker: &mut Checker, docstring: Option<&Expr>) {
     if let Some(docstr) = &docstring {
         checker
             .diagnostics
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/duplicate_union_member.rs b/crates/ruff/src/rules/flake8_pyi/rules/duplicate_union_member.rs
index 8af4c510051d7..cdf2987c19321 100644
--- a/crates/ruff/src/rules/flake8_pyi/rules/duplicate_union_member.rs
+++ b/crates/ruff/src/rules/flake8_pyi/rules/duplicate_union_member.rs
@@ -1,17 +1,16 @@
 use rustc_hash::FxHashSet;
-use rustpython_parser::ast::{Expr, ExprKind, Operator};
+use rustpython_parser::ast::{self, Expr, Operator, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::comparable::ComparableExpr;
-use ruff_python_ast::helpers::unparse_expr;
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 
 #[violation]
 pub struct DuplicateUnionMember {
-    pub duplicate_name: String,
+    duplicate_name: String,
 }
 
 impl AlwaysAutofixableViolation for DuplicateUnionMember {
@@ -26,7 +25,7 @@ impl AlwaysAutofixableViolation for DuplicateUnionMember {
 }
 
 /// PYI016
-pub fn duplicate_union_member(checker: &mut Checker, expr: &Expr) {
+pub(crate) fn duplicate_union_member(checker: &mut Checker, expr: &Expr) {
     let mut seen_nodes = FxHashSet::default();
     traverse_union(&mut seen_nodes, checker, expr, None);
 }
@@ -45,11 +44,12 @@ fn traverse_union<'a>(
     //
     // So we have to traverse both branches in order (left, then right), to report duplicates
     // in the order they appear in the source code.
-    if let ExprKind::BinOp {
+    if let Expr::BinOp(ast::ExprBinOp {
         op: Operator::BitOr,
         left,
         right,
-    } = &expr.node
+        range: _,
+    }) = expr
     {
         // Traverse left subtree, then the right subtree, propagating the previous node.
         traverse_union(seen_nodes, checker, left, Some(expr));
@@ -60,7 +60,7 @@ fn traverse_union<'a>(
     if !seen_nodes.insert(expr.into()) {
         let mut diagnostic = Diagnostic::new(
             DuplicateUnionMember {
-                duplicate_name: unparse_expr(expr, checker.stylist),
+                duplicate_name: checker.generator().expr(expr),
             },
             expr.range(),
         );
@@ -72,18 +72,18 @@ fn traverse_union<'a>(
             let parent = parent.expect("Parent node must exist");
 
             // SAFETY: Parent node must have been a `BinOp` in order for us to have traversed it.
-            let ExprKind::BinOp { left, right, .. } = &parent.node else {
+            let Expr::BinOp(ast::ExprBinOp { left, right, .. }) = parent else {
                 panic!("Parent node must be a BinOp");
             };
 
             // Replace the parent with its non-duplicate child.
-            diagnostic.set_fix(Edit::range_replacement(
-                unparse_expr(
-                    if expr.node == left.node { right } else { left },
-                    checker.stylist,
-                ),
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                checker
+                    .generator()
+                    .expr(if expr == left.as_ref() { right } else { left }),
                 parent.range(),
-            ));
+            )));
         }
         checker.diagnostics.push(diagnostic);
     }
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/ellipsis_in_non_empty_class_body.rs b/crates/ruff/src/rules/flake8_pyi/rules/ellipsis_in_non_empty_class_body.rs
new file mode 100644
index 0000000000000..3648d273457e5
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/rules/ellipsis_in_non_empty_class_body.rs
@@ -0,0 +1,83 @@
+use rustpython_parser::ast::{Expr, ExprConstant, Ranged, Stmt, StmtExpr};
+
+use ruff_diagnostics::{AutofixKind, Diagnostic, Fix, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::autofix;
+use crate::checkers::ast::Checker;
+use crate::registry::AsRule;
+
+/// ## What it does
+/// Removes ellipses (`...`) in otherwise non-empty class bodies.
+///
+/// ## Why is this bad?
+/// An ellipsis in a class body is only necessary if the class body is
+/// otherwise empty. If the class body is non-empty, then the ellipsis
+/// is redundant.
+///
+/// ## Example
+/// ```python
+/// class Foo:
+///     ...
+///     value: int
+/// ```
+///
+/// Use instead:
+/// ```python
+/// class Foo:
+///     value: int
+/// ```
+#[violation]
+pub struct EllipsisInNonEmptyClassBody;
+
+impl Violation for EllipsisInNonEmptyClassBody {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Non-empty class body must not contain `...`")
+    }
+
+    fn autofix_title(&self) -> Option<String> {
+        Some("Remove unnecessary `...`".to_string())
+    }
+}
+
+/// PYI013
+pub(crate) fn ellipsis_in_non_empty_class_body<'a>(
+    checker: &mut Checker<'a>,
+    parent: &'a Stmt,
+    body: &'a [Stmt],
+) {
+    // If the class body contains a single statement, then it's fine for it to be an ellipsis.
+    if body.len() == 1 {
+        return;
+    }
+
+    for stmt in body {
+        let Stmt::Expr(StmtExpr { value, .. }) = &stmt else {
+            continue;
+        };
+
+        let Expr::Constant(ExprConstant { value, .. }) = value.as_ref() else {
+            continue;
+        };
+
+        if !value.is_ellipsis() {
+            continue;
+        }
+
+        let mut diagnostic = Diagnostic::new(EllipsisInNonEmptyClassBody, stmt.range());
+        if checker.patch(diagnostic.kind.rule()) {
+            let edit = autofix::edits::delete_stmt(
+                stmt,
+                Some(parent),
+                checker.locator,
+                checker.indexer,
+                checker.stylist,
+            );
+            diagnostic.set_fix(Fix::automatic(edit).isolate(checker.isolation(Some(parent))));
+        }
+        checker.diagnostics.push(diagnostic);
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/iter_method_return_iterable.rs b/crates/ruff/src/rules/flake8_pyi/rules/iter_method_return_iterable.rs
new file mode 100644
index 0000000000000..ce9b587379a9c
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/rules/iter_method_return_iterable.rs
@@ -0,0 +1,125 @@
+use rustpython_parser::ast;
+use rustpython_parser::ast::{Ranged, Stmt};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::prelude::Expr;
+use ruff_python_semantic::definition::{Definition, Member, MemberKind};
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for `__iter__` methods in stubs that return `Iterable[T]` instead
+/// of an `Iterator[T]`.
+///
+/// ## Why is this bad?
+/// `__iter__` methods should always should return an `Iterator` of some kind,
+/// not an `Iterable`.
+///
+/// In Python, an `Iterator` is an object that has a `__next__` method, which
+/// provides a consistent interface for sequentially processing elements from
+/// a sequence or other iterable object. Meanwhile, an `Iterable` is an object
+/// with an `__iter__` method, which itself returns an `Iterator`.
+///
+/// Every `Iterator` is an `Iterable`, but not every `Iterable` is an `Iterator`.
+/// By returning an `Iterable` from `__iter__`, you may end up returning an
+/// object that doesn't implement `__next__`, which will cause a `TypeError`
+/// at runtime. For example, returning a `list` from `__iter__` will cause
+/// a `TypeError` when you call `__next__` on it, as a `list` is an `Iterable`,
+/// but not an `Iterator`.
+///
+/// ## Example
+/// ```python
+/// import collections.abc
+///
+///
+/// class Class:
+///     def __iter__(self) -> collections.abc.Iterable[str]:
+///         ...
+/// ```
+///
+/// Use instead:
+/// ```python
+/// import collections.abc
+///
+///
+/// class Class:
+///     def __iter__(self) -> collections.abc.Iterator[str]:
+///         ...
+/// ```
+#[violation]
+pub struct IterMethodReturnIterable {
+    async_: bool,
+}
+
+impl Violation for IterMethodReturnIterable {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let IterMethodReturnIterable { async_ } = self;
+        if *async_ {
+            format!("`__aiter__` methods should return an `AsyncIterator`, not an `AsyncIterable`")
+        } else {
+            format!("`__iter__` methods should return an `Iterator`, not an `Iterable`")
+        }
+    }
+}
+
+/// PYI045
+pub(crate) fn iter_method_return_iterable(checker: &mut Checker, definition: &Definition) {
+    let Definition::Member(Member {
+        kind: MemberKind::Method,
+        stmt,
+        ..
+    }) = definition else {
+        return;
+    };
+
+    let Stmt::FunctionDef(ast::StmtFunctionDef {
+        name,
+        returns,
+        ..
+    }) = stmt else {
+        return;
+    };
+
+    let Some(returns) = returns else {
+        return;
+    };
+
+    let annotation = if let Expr::Subscript(ast::ExprSubscript { value, .. }) = returns.as_ref() {
+        // Ex) `Iterable[T]`
+        value
+    } else {
+        // Ex) `Iterable`, `typing.Iterable`
+        returns
+    };
+
+    let async_ = match name.as_str() {
+        "__iter__" => false,
+        "__aiter__" => true,
+        _ => return,
+    };
+
+    if checker
+        .semantic_model()
+        .resolve_call_path(annotation)
+        .map_or(false, |call_path| {
+            if async_ {
+                matches!(
+                    call_path.as_slice(),
+                    ["typing", "AsyncIterable"] | ["collections", "abc", "AsyncIterable"]
+                )
+            } else {
+                matches!(
+                    call_path.as_slice(),
+                    ["typing", "Iterable"] | ["collections", "abc", "Iterable"]
+                )
+            }
+        })
+    {
+        checker.diagnostics.push(Diagnostic::new(
+            IterMethodReturnIterable { async_ },
+            returns.range(),
+        ));
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/mod.rs b/crates/ruff/src/rules/flake8_pyi/rules/mod.rs
index 56019ab999c39..a754a518d2e09 100644
--- a/crates/ruff/src/rules/flake8_pyi/rules/mod.rs
+++ b/crates/ruff/src/rules/flake8_pyi/rules/mod.rs
@@ -1,33 +1,68 @@
-pub use bad_version_info_comparison::{bad_version_info_comparison, BadVersionInfoComparison};
-pub use docstring_in_stubs::{docstring_in_stubs, DocstringInStub};
-pub use duplicate_union_member::{duplicate_union_member, DuplicateUnionMember};
-pub use non_empty_stub_body::{non_empty_stub_body, NonEmptyStubBody};
-pub use pass_in_class_body::{pass_in_class_body, PassInClassBody};
-pub use pass_statement_stub_body::{pass_statement_stub_body, PassStatementStubBody};
-pub use prefix_type_params::{prefix_type_params, UnprefixedTypeParam};
-pub use quoted_annotation_in_stub::{quoted_annotation_in_stub, QuotedAnnotationInStub};
-pub use simple_defaults::{
+pub(crate) use any_eq_ne_annotation::{any_eq_ne_annotation, AnyEqNeAnnotation};
+pub(crate) use bad_version_info_comparison::{
+    bad_version_info_comparison, BadVersionInfoComparison,
+};
+pub(crate) use collections_named_tuple::{collections_named_tuple, CollectionsNamedTuple};
+pub(crate) use docstring_in_stubs::{docstring_in_stubs, DocstringInStub};
+pub(crate) use duplicate_union_member::{duplicate_union_member, DuplicateUnionMember};
+pub(crate) use ellipsis_in_non_empty_class_body::{
+    ellipsis_in_non_empty_class_body, EllipsisInNonEmptyClassBody,
+};
+pub(crate) use iter_method_return_iterable::{
+    iter_method_return_iterable, IterMethodReturnIterable,
+};
+pub(crate) use no_return_argument_annotation::{
+    no_return_argument_annotation, NoReturnArgumentAnnotationInStub,
+};
+pub(crate) use non_empty_stub_body::{non_empty_stub_body, NonEmptyStubBody};
+pub(crate) use non_self_return_type::{non_self_return_type, NonSelfReturnType};
+pub(crate) use numeric_literal_too_long::{numeric_literal_too_long, NumericLiteralTooLong};
+pub(crate) use pass_in_class_body::{pass_in_class_body, PassInClassBody};
+pub(crate) use pass_statement_stub_body::{pass_statement_stub_body, PassStatementStubBody};
+pub(crate) use prefix_type_params::{prefix_type_params, UnprefixedTypeParam};
+pub(crate) use quoted_annotation_in_stub::{quoted_annotation_in_stub, QuotedAnnotationInStub};
+pub(crate) use simple_defaults::{
     annotated_assignment_default_in_stub, argument_simple_defaults, assignment_default_in_stub,
-    typed_argument_simple_defaults, ArgumentDefaultInStub, AssignmentDefaultInStub,
-    TypedArgumentDefaultInStub,
+    typed_argument_simple_defaults, unannotated_assignment_in_stub,
+    unassigned_special_variable_in_stub, ArgumentDefaultInStub, AssignmentDefaultInStub,
+    TypedArgumentDefaultInStub, UnannotatedAssignmentInStub, UnassignedSpecialVariableInStub,
+};
+pub(crate) use str_or_repr_defined_in_stub::{str_or_repr_defined_in_stub, StrOrReprDefinedInStub};
+pub(crate) use string_or_bytes_too_long::{string_or_bytes_too_long, StringOrBytesTooLong};
+pub(crate) use stub_body_multiple_statements::{
+    stub_body_multiple_statements, StubBodyMultipleStatements,
 };
-pub use type_alias_naming::{
+pub(crate) use type_alias_naming::{
     snake_case_type_alias, t_suffixed_type_alias, SnakeCaseTypeAlias, TSuffixedTypeAlias,
 };
-pub use type_comment_in_stub::{type_comment_in_stub, TypeCommentInStub};
-pub use unrecognized_platform::{
+pub(crate) use type_comment_in_stub::{type_comment_in_stub, TypeCommentInStub};
+pub(crate) use unaliased_collections_abc_set_import::{
+    unaliased_collections_abc_set_import, UnaliasedCollectionsAbcSetImport,
+};
+pub(crate) use unrecognized_platform::{
     unrecognized_platform, UnrecognizedPlatformCheck, UnrecognizedPlatformName,
 };
 
+mod any_eq_ne_annotation;
 mod bad_version_info_comparison;
+mod collections_named_tuple;
 mod docstring_in_stubs;
 mod duplicate_union_member;
+mod ellipsis_in_non_empty_class_body;
+mod iter_method_return_iterable;
+mod no_return_argument_annotation;
 mod non_empty_stub_body;
+mod non_self_return_type;
+mod numeric_literal_too_long;
 mod pass_in_class_body;
 mod pass_statement_stub_body;
 mod prefix_type_params;
 mod quoted_annotation_in_stub;
 mod simple_defaults;
+mod str_or_repr_defined_in_stub;
+mod string_or_bytes_too_long;
+mod stub_body_multiple_statements;
 mod type_alias_naming;
 mod type_comment_in_stub;
+mod unaliased_collections_abc_set_import;
 mod unrecognized_platform;
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/no_return_argument_annotation.rs b/crates/ruff/src/rules/flake8_pyi/rules/no_return_argument_annotation.rs
new file mode 100644
index 0000000000000..8fcb45d4034c6
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/rules/no_return_argument_annotation.rs
@@ -0,0 +1,90 @@
+use std::fmt;
+
+use itertools::chain;
+use rustpython_parser::ast::Ranged;
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::prelude::Arguments;
+
+use crate::checkers::ast::Checker;
+use crate::settings::types::PythonVersion::Py311;
+
+#[violation]
+pub struct NoReturnArgumentAnnotationInStub {
+    module: TypingModule,
+}
+
+/// ## What it does
+/// Checks for uses of `typing.NoReturn` (and `typing_extensions.NoReturn`) in
+/// stubs.
+///
+/// ## Why is this bad?
+/// Prefer `typing.Never` (or `typing_extensions.Never`) over `typing.NoReturn`,
+/// as the former is more explicit about the intent of the annotation. This is
+/// a purely stylistic choice, as the two are semantically equivalent.
+///
+/// ## Example
+/// ```python
+/// from typing import NoReturn
+///
+///
+/// def foo(x: NoReturn): ...
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from typing import Never
+///
+///
+/// def foo(x: Never): ...
+/// ```
+impl Violation for NoReturnArgumentAnnotationInStub {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let NoReturnArgumentAnnotationInStub { module } = self;
+        format!("Prefer `{module}.Never` over `NoReturn` for argument annotations")
+    }
+}
+
+/// PYI050
+pub(crate) fn no_return_argument_annotation(checker: &mut Checker, args: &Arguments) {
+    for annotation in chain!(
+        args.args.iter(),
+        args.posonlyargs.iter(),
+        args.kwonlyargs.iter()
+    )
+    .filter_map(|arg| arg.annotation.as_ref())
+    {
+        if checker
+            .semantic_model()
+            .match_typing_expr(annotation, "NoReturn")
+        {
+            checker.diagnostics.push(Diagnostic::new(
+                NoReturnArgumentAnnotationInStub {
+                    module: if checker.settings.target_version >= Py311 {
+                        TypingModule::Typing
+                    } else {
+                        TypingModule::TypingExtensions
+                    },
+                },
+                annotation.range(),
+            ));
+        }
+    }
+}
+
+#[derive(Debug, PartialEq, Eq)]
+enum TypingModule {
+    Typing,
+    TypingExtensions,
+}
+
+impl fmt::Display for TypingModule {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            TypingModule::Typing => fmt.write_str("typing"),
+            TypingModule::TypingExtensions => fmt.write_str("typing_extensions"),
+        }
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/non_empty_stub_body.rs b/crates/ruff/src/rules/flake8_pyi/rules/non_empty_stub_body.rs
index 5467df5780085..0b4642b28ccf8 100644
--- a/crates/ruff/src/rules/flake8_pyi/rules/non_empty_stub_body.rs
+++ b/crates/ruff/src/rules/flake8_pyi/rules/non_empty_stub_body.rs
@@ -1,33 +1,43 @@
-use rustpython_parser::ast::{Constant, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Constant, Expr, Ranged, Stmt};
 
-use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
+use crate::registry::Rule;
 
 #[violation]
 pub struct NonEmptyStubBody;
 
-impl Violation for NonEmptyStubBody {
+impl AlwaysAutofixableViolation for NonEmptyStubBody {
     #[derive_message_formats]
     fn message(&self) -> String {
         format!("Function body must contain only `...`")
     }
+
+    fn autofix_title(&self) -> String {
+        format!("Replace function body with `...`")
+    }
 }
 
 /// PYI010
-pub fn non_empty_stub_body(checker: &mut Checker, body: &[Stmt]) {
+pub(crate) fn non_empty_stub_body(checker: &mut Checker, body: &[Stmt]) {
     if body.len() != 1 {
         return;
     }
-    if let StmtKind::Expr { value } = &body[0].node {
-        if let ExprKind::Constant { value, .. } = &value.node {
+    if let Stmt::Expr(ast::StmtExpr { value, range: _ }) = &body[0] {
+        if let Expr::Constant(ast::ExprConstant { value, .. }) = value.as_ref() {
             if matches!(value, Constant::Ellipsis | Constant::Str(_)) {
                 return;
             }
         }
     }
-    checker
-        .diagnostics
-        .push(Diagnostic::new(NonEmptyStubBody, body[0].range()));
+    let mut diagnostic = Diagnostic::new(NonEmptyStubBody, body[0].range());
+    if checker.patch(Rule::NonEmptyStubBody) {
+        diagnostic.set_fix(Fix::automatic(Edit::range_replacement(
+            format!("..."),
+            body[0].range(),
+        )));
+    };
+    checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/non_self_return_type.rs b/crates/ruff/src/rules/flake8_pyi/rules/non_self_return_type.rs
new file mode 100644
index 0000000000000..52a01ef709239
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/rules/non_self_return_type.rs
@@ -0,0 +1,298 @@
+use rustpython_parser::ast::{self, Arguments, Expr, Stmt};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::helpers::{identifier_range, map_subscript};
+use ruff_python_semantic::analyze::visibility::{is_abstract, is_final, is_overload};
+use ruff_python_semantic::model::SemanticModel;
+use ruff_python_semantic::scope::ScopeKind;
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for methods that are annotated with a fixed return type, which
+/// should instead be returning `self`.
+///
+/// ## Why is this bad?
+/// If methods like `__new__` or `__enter__` are annotated with a fixed return
+/// type, and the class is subclassed, type checkers will not be able to infer
+/// the correct return type.
+///
+/// For example:
+/// ```python
+/// class Shape:
+///     def set_scale(self, scale: float) -> Shape:
+///         self.scale = scale
+///         return self
+///
+/// class Circle(Shape):
+///     def set_radius(self, radius: float) -> Circle:
+///         self.radius = radius
+///         return self
+///
+/// # This returns `Shape`, not `Circle`.
+/// Circle().set_scale(0.5)
+///
+/// # Thus, this expression is invalid, as `Shape` has no attribute `set_radius`.
+/// Circle().set_scale(0.5).set_radius(2.7)
+/// ```
+///
+/// Specifically, this check enforces that the return type of the following
+/// methods is `Self`:
+///
+/// 1. In-place binary operations, like `__iadd__`, `__imul__`, etc.
+/// 1. `__new__`, `__enter__`, and `__aenter__`, if those methods return the
+///    class name.
+/// 1. `__iter__` methods that return `Iterator`, despite the class inheriting
+///    directly from `Iterator`.
+/// 1. `__aiter__` methods that return `AsyncIterator`, despite the class
+///    inheriting directly from `AsyncIterator`.
+///
+/// ## Example
+/// ```python
+/// class Foo:
+///     def __new__(cls, *args: Any, **kwargs: Any) -> Bad:
+///         ...
+///
+///     def __enter__(self) -> Bad:
+///         ...
+///
+///     async def __aenter__(self) -> Bad:
+///         ...
+///
+///     def __iadd__(self, other: Bad) -> Bad:
+///         ...
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from typing_extensions import Self
+///
+///
+/// class Foo:
+///     def __new__(cls, *args: Any, **kwargs: Any) -> Self:
+///         ...
+///
+///     def __enter__(self) -> Self:
+///         ...
+///
+///     async def __aenter__(self) -> Self:
+///         ...
+///
+///     def __iadd__(self, other: Bad) -> Self:
+///         ...
+/// ```
+/// ## References
+/// - [PEP 673](https://peps.python.org/pep-0673/)
+#[violation]
+pub struct NonSelfReturnType {
+    class_name: String,
+    method_name: String,
+}
+
+impl Violation for NonSelfReturnType {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let NonSelfReturnType {
+            class_name,
+            method_name,
+        } = self;
+        if matches!(class_name.as_str(), "__new__") {
+            format!("`__new__` methods usually return `self` at runtime")
+        } else {
+            format!("`{method_name}` methods in classes like `{class_name}` usually return `self` at runtime")
+        }
+    }
+
+    fn autofix_title(&self) -> Option<String> {
+        Some("Consider using `typing_extensions.Self` as return type".to_string())
+    }
+}
+
+/// PYI034
+pub(crate) fn non_self_return_type(
+    checker: &mut Checker,
+    stmt: &Stmt,
+    name: &str,
+    decorator_list: &[Expr],
+    returns: Option<&Expr>,
+    args: &Arguments,
+    async_: bool,
+) {
+    let ScopeKind::Class(class_def) = checker.semantic_model().scope().kind else {
+        return;
+    };
+
+    if args.args.is_empty() && args.posonlyargs.is_empty() {
+        return;
+    }
+
+    let Some(returns) = returns else {
+        return;
+    };
+
+    // Skip any abstract or overloaded methods.
+    if is_abstract(checker.semantic_model(), decorator_list)
+        || is_overload(checker.semantic_model(), decorator_list)
+    {
+        return;
+    }
+
+    if async_ {
+        if name == "__aenter__"
+            && is_name(returns, &class_def.name)
+            && !is_final(checker.semantic_model(), &class_def.decorator_list)
+        {
+            checker.diagnostics.push(Diagnostic::new(
+                NonSelfReturnType {
+                    class_name: class_def.name.to_string(),
+                    method_name: name.to_string(),
+                },
+                identifier_range(stmt, checker.locator),
+            ));
+        }
+        return;
+    }
+
+    // In-place methods that are expected to return `Self`.
+    if INPLACE_BINOP_METHODS.contains(&name) {
+        if !is_self(returns, checker.semantic_model()) {
+            checker.diagnostics.push(Diagnostic::new(
+                NonSelfReturnType {
+                    class_name: class_def.name.to_string(),
+                    method_name: name.to_string(),
+                },
+                identifier_range(stmt, checker.locator),
+            ));
+        }
+        return;
+    }
+
+    if is_name(returns, &class_def.name) {
+        if matches!(name, "__enter__" | "__new__")
+            && !is_final(checker.semantic_model(), &class_def.decorator_list)
+        {
+            checker.diagnostics.push(Diagnostic::new(
+                NonSelfReturnType {
+                    class_name: class_def.name.to_string(),
+                    method_name: name.to_string(),
+                },
+                identifier_range(stmt, checker.locator),
+            ));
+        }
+        return;
+    }
+
+    match name {
+        "__iter__" => {
+            if is_iterable(returns, checker.semantic_model())
+                && is_iterator(&class_def.bases, checker.semantic_model())
+            {
+                checker.diagnostics.push(Diagnostic::new(
+                    NonSelfReturnType {
+                        class_name: class_def.name.to_string(),
+                        method_name: name.to_string(),
+                    },
+                    identifier_range(stmt, checker.locator),
+                ));
+            }
+        }
+        "__aiter__" => {
+            if is_async_iterable(returns, checker.semantic_model())
+                && is_async_iterator(&class_def.bases, checker.semantic_model())
+            {
+                checker.diagnostics.push(Diagnostic::new(
+                    NonSelfReturnType {
+                        class_name: class_def.name.to_string(),
+                        method_name: name.to_string(),
+                    },
+                    identifier_range(stmt, checker.locator),
+                ));
+            }
+        }
+        _ => {}
+    }
+}
+
+const INPLACE_BINOP_METHODS: &[&str] = &[
+    "__iadd__",
+    "__isub__",
+    "__imul__",
+    "__imatmul__",
+    "__itruediv__",
+    "__ifloordiv__",
+    "__imod__",
+    "__ipow__",
+    "__ilshift__",
+    "__irshift__",
+    "__iand__",
+    "__ixor__",
+    "__ior__",
+];
+
+/// Return `true` if the given expression resolves to the given name.
+fn is_name(expr: &Expr, name: &str) -> bool {
+    let Expr::Name(ast::ExprName { id, .. }) = expr else {
+        return false;
+    };
+    id.as_str() == name
+}
+
+/// Return `true` if the given expression resolves to `typing.Self`.
+fn is_self(expr: &Expr, model: &SemanticModel) -> bool {
+    model.match_typing_expr(expr, "Self")
+}
+
+/// Return `true` if the given class extends `collections.abc.Iterator`.
+fn is_iterator(bases: &[Expr], model: &SemanticModel) -> bool {
+    bases.iter().any(|expr| {
+        model
+            .resolve_call_path(map_subscript(expr))
+            .map_or(false, |call_path| {
+                matches!(
+                    call_path.as_slice(),
+                    ["typing", "Iterator"] | ["collections", "abc", "Iterator"]
+                )
+            })
+    })
+}
+
+/// Return `true` if the given expression resolves to `collections.abc.Iterable`.
+fn is_iterable(expr: &Expr, model: &SemanticModel) -> bool {
+    model
+        .resolve_call_path(map_subscript(expr))
+        .map_or(false, |call_path| {
+            matches!(
+                call_path.as_slice(),
+                ["typing", "Iterable" | "Iterator"]
+                    | ["collections", "abc", "Iterable" | "Iterator"]
+            )
+        })
+}
+
+/// Return `true` if the given class extends `collections.abc.AsyncIterator`.
+fn is_async_iterator(bases: &[Expr], model: &SemanticModel) -> bool {
+    bases.iter().any(|expr| {
+        model
+            .resolve_call_path(map_subscript(expr))
+            .map_or(false, |call_path| {
+                matches!(
+                    call_path.as_slice(),
+                    ["typing", "AsyncIterator"] | ["collections", "abc", "AsyncIterator"]
+                )
+            })
+    })
+}
+
+/// Return `true` if the given expression resolves to `collections.abc.AsyncIterable`.
+fn is_async_iterable(expr: &Expr, model: &SemanticModel) -> bool {
+    model
+        .resolve_call_path(map_subscript(expr))
+        .map_or(false, |call_path| {
+            matches!(
+                call_path.as_slice(),
+                ["typing", "AsyncIterable" | "AsyncIterator"]
+                    | ["collections", "abc", "AsyncIterable" | "AsyncIterator"]
+            )
+        })
+}
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/numeric_literal_too_long.rs b/crates/ruff/src/rules/flake8_pyi/rules/numeric_literal_too_long.rs
new file mode 100644
index 0000000000000..28a49c0547fbc
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/rules/numeric_literal_too_long.rs
@@ -0,0 +1,58 @@
+use ruff_text_size::TextSize;
+use rustpython_parser::ast::{Expr, Ranged};
+
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+use crate::registry::AsRule;
+
+#[violation]
+pub struct NumericLiteralTooLong;
+
+/// ## What it does
+/// Checks for numeric literals with a string representation longer than ten
+/// characters.
+///
+/// ## Why is this bad?
+/// If a function has a default value where the literal representation is
+/// greater than 50 characters, it is likely to be an implementation detail or
+/// a constant that varies depending on the system you're running on.
+///
+/// Consider replacing such constants with ellipses (`...`).
+///
+/// ## Example
+/// ```python
+/// def foo(arg: int = 12345678901) -> None: ...
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def foo(arg: int = ...) -> None: ...
+/// ```
+impl AlwaysAutofixableViolation for NumericLiteralTooLong {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Numeric literals with a string representation longer than ten characters are not permitted")
+    }
+
+    fn autofix_title(&self) -> String {
+        "Replace with `...`".to_string()
+    }
+}
+
+/// PYI054
+pub(crate) fn numeric_literal_too_long(checker: &mut Checker, expr: &Expr) {
+    if expr.range().len() <= TextSize::new(10) {
+        return;
+    }
+
+    let mut diagnostic = Diagnostic::new(NumericLiteralTooLong, expr.range());
+    if checker.patch(diagnostic.kind.rule()) {
+        diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
+            "...".to_string(),
+            expr.range(),
+        )));
+    }
+    checker.diagnostics.push(diagnostic);
+}
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/pass_in_class_body.rs b/crates/ruff/src/rules/flake8_pyi/rules/pass_in_class_body.rs
index 8e6355e3ada3c..43f1829e27747 100644
--- a/crates/ruff/src/rules/flake8_pyi/rules/pass_in_class_body.rs
+++ b/crates/ruff/src/rules/flake8_pyi/rules/pass_in_class_body.rs
@@ -1,13 +1,11 @@
-use crate::autofix::actions::delete_stmt;
-use log::error;
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
+use rustpython_parser::ast::{Ranged, Stmt};
+
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::types::RefEquality;
 
+use crate::autofix;
 use crate::checkers::ast::Checker;
-
 use crate::registry::AsRule;
-use rustpython_parser::ast::{Stmt, StmtKind};
 
 #[violation]
 pub struct PassInClassBody;
@@ -24,39 +22,32 @@ impl AlwaysAutofixableViolation for PassInClassBody {
 }
 
 /// PYI012
-pub fn pass_in_class_body<'a>(checker: &mut Checker<'a>, parent: &'a Stmt, body: &'a [Stmt]) {
+pub(crate) fn pass_in_class_body<'a>(
+    checker: &mut Checker<'a>,
+    parent: &'a Stmt,
+    body: &'a [Stmt],
+) {
     // `pass` is required in these situations (or handled by `pass_statement_stub_body`).
     if body.len() < 2 {
         return;
     }
 
     for stmt in body {
-        if matches!(stmt.node, StmtKind::Pass) {
-            let mut diagnostic = Diagnostic::new(PassInClassBody, stmt.range());
-
-            if checker.patch(diagnostic.kind.rule()) {
-                let deleted: Vec<&Stmt> = checker.deletions.iter().map(Into::into).collect();
-                match delete_stmt(
-                    stmt,
-                    Some(parent),
-                    &deleted,
-                    checker.locator,
-                    checker.indexer,
-                    checker.stylist,
-                ) {
-                    Ok(fix) => {
-                        if fix.is_deletion() || fix.content() == Some("pass") {
-                            checker.deletions.insert(RefEquality(stmt));
-                        }
-                        diagnostic.set_fix(fix);
-                    }
-                    Err(e) => {
-                        error!("Failed to delete `pass` statement: {}", e);
-                    }
-                };
-            };
-
-            checker.diagnostics.push(diagnostic);
+        if !stmt.is_pass_stmt() {
+            continue;
+        }
+
+        let mut diagnostic = Diagnostic::new(PassInClassBody, stmt.range());
+        if checker.patch(diagnostic.kind.rule()) {
+            let edit = autofix::edits::delete_stmt(
+                stmt,
+                Some(parent),
+                checker.locator,
+                checker.indexer,
+                checker.stylist,
+            );
+            diagnostic.set_fix(Fix::automatic(edit).isolate(checker.isolation(Some(parent))));
         }
+        checker.diagnostics.push(diagnostic);
     }
 }
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/pass_statement_stub_body.rs b/crates/ruff/src/rules/flake8_pyi/rules/pass_statement_stub_body.rs
index 4223262548617..54f747985bb8f 100644
--- a/crates/ruff/src/rules/flake8_pyi/rules/pass_statement_stub_body.rs
+++ b/crates/ruff/src/rules/flake8_pyi/rules/pass_statement_stub_body.rs
@@ -1,28 +1,38 @@
-use rustpython_parser::ast::{Stmt, StmtKind};
+use rustpython_parser::ast::{Ranged, Stmt};
 
-use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
+use crate::registry::Rule;
 
 #[violation]
 pub struct PassStatementStubBody;
 
-impl Violation for PassStatementStubBody {
+impl AlwaysAutofixableViolation for PassStatementStubBody {
     #[derive_message_formats]
     fn message(&self) -> String {
         format!("Empty body should contain `...`, not `pass`")
     }
+
+    fn autofix_title(&self) -> String {
+        format!("Replace `pass` with `...`")
+    }
 }
 
 /// PYI009
-pub fn pass_statement_stub_body(checker: &mut Checker, body: &[Stmt]) {
+pub(crate) fn pass_statement_stub_body(checker: &mut Checker, body: &[Stmt]) {
     if body.len() != 1 {
         return;
     }
-    if matches!(body[0].node, StmtKind::Pass) {
-        checker
-            .diagnostics
-            .push(Diagnostic::new(PassStatementStubBody, body[0].range()));
+    if body[0].is_pass_stmt() {
+        let mut diagnostic = Diagnostic::new(PassStatementStubBody, body[0].range());
+        if checker.patch(Rule::PassStatementStubBody) {
+            diagnostic.set_fix(Fix::automatic(Edit::range_replacement(
+                format!("..."),
+                body[0].range(),
+            )));
+        };
+        checker.diagnostics.push(diagnostic);
     }
 }
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/prefix_type_params.rs b/crates/ruff/src/rules/flake8_pyi/rules/prefix_type_params.rs
index 272f312017c1b..e6c561191ea0d 100644
--- a/crates/ruff/src/rules/flake8_pyi/rules/prefix_type_params.rs
+++ b/crates/ruff/src/rules/flake8_pyi/rules/prefix_type_params.rs
@@ -1,6 +1,6 @@
 use std::fmt;
 
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -8,7 +8,7 @@ use ruff_macros::{derive_message_formats, violation};
 use crate::checkers::ast::Checker;
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub enum VarKind {
+pub(crate) enum VarKind {
     TypeVar,
     ParamSpec,
     TypeVarTuple,
@@ -47,7 +47,7 @@ impl fmt::Display for VarKind {
 /// ```
 #[violation]
 pub struct UnprefixedTypeParam {
-    pub kind: VarKind,
+    kind: VarKind,
 }
 
 impl Violation for UnprefixedTypeParam {
@@ -59,23 +59,23 @@ impl Violation for UnprefixedTypeParam {
 }
 
 /// PYI001
-pub fn prefix_type_params(checker: &mut Checker, value: &Expr, targets: &[Expr]) {
+pub(crate) fn prefix_type_params(checker: &mut Checker, value: &Expr, targets: &[Expr]) {
     if targets.len() != 1 {
         return;
     }
-    if let ExprKind::Name { id, .. } = &targets[0].node {
+    if let Expr::Name(ast::ExprName { id, .. }) = &targets[0] {
         if id.starts_with('_') {
             return;
         }
     };
 
-    if let ExprKind::Call { func, .. } = &value.node {
-        let Some(kind) = checker.ctx.resolve_call_path(func).and_then(|call_path| {
-            if checker.ctx.match_typing_call_path(&call_path, "ParamSpec") {
+    if let Expr::Call(ast::ExprCall { func, .. }) = value {
+        let Some(kind) = checker.semantic_model().resolve_call_path(func).and_then(|call_path| {
+            if checker.semantic_model().match_typing_call_path(&call_path, "ParamSpec") {
                 Some(VarKind::ParamSpec)
-            } else if checker.ctx.match_typing_call_path(&call_path, "TypeVar") {
+            } else if checker.semantic_model().match_typing_call_path(&call_path, "TypeVar") {
                 Some(VarKind::TypeVar)
-            } else if checker.ctx.match_typing_call_path(&call_path, "TypeVarTuple") {
+            } else if checker.semantic_model().match_typing_call_path(&call_path, "TypeVarTuple") {
                 Some(VarKind::TypeVarTuple)
             } else {
                 None
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/quoted_annotation_in_stub.rs b/crates/ruff/src/rules/flake8_pyi/rules/quoted_annotation_in_stub.rs
index adde48e27a0ce..6041af59d2ee6 100644
--- a/crates/ruff/src/rules/flake8_pyi/rules/quoted_annotation_in_stub.rs
+++ b/crates/ruff/src/rules/flake8_pyi/rules/quoted_annotation_in_stub.rs
@@ -1,7 +1,8 @@
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
-use ruff_macros::{derive_message_formats, violation};
 use ruff_text_size::TextRange;
 
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
+use ruff_macros::{derive_message_formats, violation};
+
 use crate::checkers::ast::Checker;
 use crate::registry::Rule;
 
@@ -20,10 +21,14 @@ impl AlwaysAutofixableViolation for QuotedAnnotationInStub {
 }
 
 /// PYI020
-pub fn quoted_annotation_in_stub(checker: &mut Checker, annotation: &str, range: TextRange) {
+pub(crate) fn quoted_annotation_in_stub(checker: &mut Checker, annotation: &str, range: TextRange) {
     let mut diagnostic = Diagnostic::new(QuotedAnnotationInStub, range);
     if checker.patch(Rule::QuotedAnnotationInStub) {
-        diagnostic.set_fix(Edit::range_replacement(annotation.to_string(), range));
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+            annotation.to_string(),
+            range,
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/simple_defaults.rs b/crates/ruff/src/rules/flake8_pyi/rules/simple_defaults.rs
index 5313b68af4efb..609602beab98f 100644
--- a/crates/ruff/src/rules/flake8_pyi/rules/simple_defaults.rs
+++ b/crates/ruff/src/rules/flake8_pyi/rules/simple_defaults.rs
@@ -1,8 +1,10 @@
-use rustpython_parser::ast::{Arguments, Constant, Expr, ExprKind, Operator, Unaryop};
+use rustpython_parser::ast::{self, Arguments, Constant, Expr, Operator, Ranged, Stmt, Unaryop};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_semantic::context::Context;
+use ruff_python_ast::source_code::Locator;
+use ruff_python_semantic::model::SemanticModel;
+use ruff_python_semantic::scope::ScopeKind;
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
@@ -49,6 +51,50 @@ impl AlwaysAutofixableViolation for AssignmentDefaultInStub {
     }
 }
 
+#[violation]
+pub struct UnannotatedAssignmentInStub {
+    name: String,
+}
+
+impl Violation for UnannotatedAssignmentInStub {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let UnannotatedAssignmentInStub { name } = self;
+        format!("Need type annotation for `{name}`")
+    }
+}
+
+#[violation]
+pub struct UnassignedSpecialVariableInStub {
+    name: String,
+}
+
+/// ## What it does
+/// Checks that `__all__`, `__match_args__`, and `__slots__` variables are
+/// assigned to values when defined in stub files.
+///
+/// ## Why is this bad?
+/// Special variables like `__all__` have the same semantics in stub files
+/// as they do in Python modules, and so should be consistent with their
+/// runtime counterparts.
+///
+/// ## Example
+/// ```python
+/// __all__: list[str]
+/// ```
+///
+/// Use instead:
+/// ```python
+/// __all__: list[str] = ["foo", "bar"]
+/// ```
+impl Violation for UnassignedSpecialVariableInStub {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let UnassignedSpecialVariableInStub { name } = self;
+        format!("`{name}` in a stub file must have a value, as it has the same semantics as `{name}` at runtime")
+    }
+}
+
 const ALLOWED_MATH_ATTRIBUTES_IN_DEFAULTS: &[&[&str]] = &[
     &["math", "inf"],
     &["math", "nan"],
@@ -76,140 +122,105 @@ const ALLOWED_ATTRIBUTES_IN_DEFAULTS: &[&[&str]] = &[
 
 fn is_valid_default_value_with_annotation(
     default: &Expr,
-    checker: &Checker,
     allow_container: bool,
+    locator: &Locator,
+    model: &SemanticModel,
 ) -> bool {
-    match &default.node {
-        ExprKind::List { elts, .. } | ExprKind::Tuple { elts, .. } | ExprKind::Set { elts, .. } => {
+    match default {
+        Expr::Constant(_) => {
+            return true;
+        }
+        Expr::List(ast::ExprList { elts, .. })
+        | Expr::Tuple(ast::ExprTuple { elts, .. })
+        | Expr::Set(ast::ExprSet { elts, range: _ }) => {
             return allow_container
                 && elts.len() <= 10
                 && elts
                     .iter()
-                    .all(|e| is_valid_default_value_with_annotation(e, checker, false));
+                    .all(|e| is_valid_default_value_with_annotation(e, false, locator, model));
         }
-        ExprKind::Dict { keys, values, .. } => {
+        Expr::Dict(ast::ExprDict {
+            keys,
+            values,
+            range: _,
+        }) => {
             return allow_container
                 && keys.len() <= 10
                 && keys.iter().zip(values).all(|(k, v)| {
                     k.as_ref().map_or(false, |k| {
-                        is_valid_default_value_with_annotation(k, checker, false)
-                    }) && is_valid_default_value_with_annotation(v, checker, false)
+                        is_valid_default_value_with_annotation(k, false, locator, model)
+                    }) && is_valid_default_value_with_annotation(v, false, locator, model)
                 });
         }
-        ExprKind::Constant {
-            value: Constant::Ellipsis | Constant::None,
-            ..
-        } => {
-            return true;
-        }
-        ExprKind::Constant {
-            value: Constant::Str(..),
-            ..
-        } => return checker.locator.slice(default.range()).len() <= 50,
-        ExprKind::Constant {
-            value: Constant::Bytes(..),
-            ..
-        } => return checker.locator.slice(default.range()).len() <= 50,
-        // Ex) `123`, `True`, `False`, `3.14`
-        ExprKind::Constant {
-            value: Constant::Int(..) | Constant::Bool(..) | Constant::Float(..),
-            ..
-        } => {
-            return checker.locator.slice(default.range()).len() <= 10;
-        }
-        // Ex) `2j`
-        ExprKind::Constant {
-            value: Constant::Complex { real, .. },
-            ..
-        } => {
-            if *real == 0.0 {
-                return checker.locator.slice(default.range()).len() <= 10;
-            }
-        }
-        ExprKind::UnaryOp {
+        Expr::UnaryOp(ast::ExprUnaryOp {
             op: Unaryop::USub,
             operand,
-        } => {
-            // Ex) `-1`, `-3.14`
-            if let ExprKind::Constant {
-                value: Constant::Int(..) | Constant::Float(..),
-                ..
-            } = &operand.node
-            {
-                return checker.locator.slice(operand.range()).len() <= 10;
-            }
-            // Ex) `-2j`
-            if let ExprKind::Constant {
-                value: Constant::Complex { real, .. },
-                ..
-            } = &operand.node
-            {
-                if *real == 0.0 {
-                    return checker.locator.slice(operand.range()).len() <= 10;
-                }
-            }
-            // Ex) `-math.inf`, `-math.pi`, etc.
-            if let ExprKind::Attribute { .. } = &operand.node {
-                if checker
-                    .ctx
-                    .resolve_call_path(operand)
-                    .map_or(false, |call_path| {
+            range: _,
+        }) => {
+            match operand.as_ref() {
+                // Ex) `-1`, `-3.14`, `2j`
+                Expr::Constant(ast::ExprConstant {
+                    value: Constant::Int(..) | Constant::Float(..) | Constant::Complex { .. },
+                    ..
+                }) => return true,
+                // Ex) `-math.inf`, `-math.pi`, etc.
+                Expr::Attribute(_) => {
+                    if model.resolve_call_path(operand).map_or(false, |call_path| {
                         ALLOWED_MATH_ATTRIBUTES_IN_DEFAULTS.iter().any(|target| {
                             // reject `-math.nan`
                             call_path.as_slice() == *target && *target != ["math", "nan"]
                         })
-                    })
-                {
-                    return true;
+                    }) {
+                        return true;
+                    }
                 }
+                _ => {}
             }
         }
-        ExprKind::BinOp {
+        Expr::BinOp(ast::ExprBinOp {
             left,
             op: Operator::Add | Operator::Sub,
             right,
-        } => {
+            range: _,
+        }) => {
             // Ex) `1 + 2j`, `1 - 2j`, `-1 - 2j`, `-1 + 2j`
-            if let ExprKind::Constant {
+            if let Expr::Constant(ast::ExprConstant {
                 value: Constant::Complex { .. },
                 ..
-            } = right.node
+            }) = right.as_ref()
             {
                 // Ex) `1 + 2j`, `1 - 2j`
-                if let ExprKind::Constant {
+                if let Expr::Constant(ast::ExprConstant {
                     value: Constant::Int(..) | Constant::Float(..),
                     ..
-                } = &left.node
+                }) = left.as_ref()
                 {
-                    return checker.locator.slice(left.range()).len() <= 10;
-                } else if let ExprKind::UnaryOp {
+                    return locator.slice(left.range()).len() <= 10;
+                } else if let Expr::UnaryOp(ast::ExprUnaryOp {
                     op: Unaryop::USub,
                     operand,
-                } = &left.node
+                    range: _,
+                }) = left.as_ref()
                 {
                     // Ex) `-1 + 2j`, `-1 - 2j`
-                    if let ExprKind::Constant {
+                    if let Expr::Constant(ast::ExprConstant {
                         value: Constant::Int(..) | Constant::Float(..),
                         ..
-                    } = &operand.node
+                    }) = operand.as_ref()
                     {
-                        return checker.locator.slice(operand.range()).len() <= 10;
+                        return locator.slice(operand.range()).len() <= 10;
                     }
                 }
             }
         }
         // Ex) `math.inf`, `sys.stdin`, etc.
-        ExprKind::Attribute { .. } => {
-            if checker
-                .ctx
-                .resolve_call_path(default)
-                .map_or(false, |call_path| {
-                    ALLOWED_MATH_ATTRIBUTES_IN_DEFAULTS
-                        .iter()
-                        .chain(ALLOWED_ATTRIBUTES_IN_DEFAULTS.iter())
-                        .any(|target| call_path.as_slice() == *target)
-                })
-            {
+        Expr::Attribute(_) => {
+            if model.resolve_call_path(default).map_or(false, |call_path| {
+                ALLOWED_MATH_ATTRIBUTES_IN_DEFAULTS
+                    .iter()
+                    .chain(ALLOWED_ATTRIBUTES_IN_DEFAULTS.iter())
+                    .any(|target| call_path.as_slice() == *target)
+            }) {
                 return true;
             }
         }
@@ -220,19 +231,20 @@ fn is_valid_default_value_with_annotation(
 
 /// Returns `true` if an [`Expr`] appears to be a valid PEP 604 union. (e.g. `int | None`)
 fn is_valid_pep_604_union(annotation: &Expr) -> bool {
-    match &annotation.node {
-        ExprKind::BinOp {
+    match annotation {
+        Expr::BinOp(ast::ExprBinOp {
             left,
             op: Operator::BitOr,
             right,
-        } => is_valid_pep_604_union(left) && is_valid_pep_604_union(right),
-        ExprKind::Name { .. }
-        | ExprKind::Subscript { .. }
-        | ExprKind::Attribute { .. }
-        | ExprKind::Constant {
+            range: _,
+        }) => is_valid_pep_604_union(left) && is_valid_pep_604_union(right),
+        Expr::Name(_)
+        | Expr::Subscript(_)
+        | Expr::Attribute(_)
+        | Expr::Constant(ast::ExprConstant {
             value: Constant::None,
             ..
-        } => true,
+        }) => true,
         _ => false,
     }
 }
@@ -240,25 +252,25 @@ fn is_valid_pep_604_union(annotation: &Expr) -> bool {
 /// Returns `true` if an [`Expr`] appears to be a valid default value without an annotation.
 fn is_valid_default_value_without_annotation(default: &Expr) -> bool {
     matches!(
-        &default.node,
-        ExprKind::Call { .. }
-            | ExprKind::Name { .. }
-            | ExprKind::Attribute { .. }
-            | ExprKind::Subscript { .. }
-            | ExprKind::Constant {
+        default,
+        Expr::Call(_)
+            | Expr::Name(_)
+            | Expr::Attribute(_)
+            | Expr::Subscript(_)
+            | Expr::Constant(ast::ExprConstant {
                 value: Constant::Ellipsis | Constant::None,
                 ..
-            }
+            })
     ) || is_valid_pep_604_union(default)
 }
 
 /// Returns `true` if an [`Expr`] appears to be `TypeVar`, `TypeVarTuple`, `NewType`, or `ParamSpec`
 /// call.
-fn is_type_var_like_call(context: &Context, expr: &Expr) -> bool {
-    let ExprKind::Call { func, .. } = &expr.node else {
+fn is_type_var_like_call(model: &SemanticModel, expr: &Expr) -> bool {
+    let Expr::Call(ast::ExprCall { func, .. } )= expr else {
         return false;
     };
-    context.resolve_call_path(func).map_or(false, |call_path| {
+    model.resolve_call_path(func).map_or(false, |call_path| {
         matches!(
             call_path.as_slice(),
             [
@@ -271,11 +283,11 @@ fn is_type_var_like_call(context: &Context, expr: &Expr) -> bool {
 
 /// Returns `true` if this is a "special" assignment which must have a value (e.g., an assignment to
 /// `__all__`).
-fn is_special_assignment(context: &Context, target: &Expr) -> bool {
-    if let ExprKind::Name { id, .. } = &target.node {
+fn is_special_assignment(model: &SemanticModel, target: &Expr) -> bool {
+    if let Expr::Name(ast::ExprName { id, .. }) = target {
         match id.as_str() {
-            "__all__" => context.scope().kind.is_module(),
-            "__match_args__" | "__slots__" => context.scope().kind.is_class(),
+            "__all__" => model.scope().kind.is_module(),
+            "__match_args__" | "__slots__" => model.scope().kind.is_class(),
             _ => false,
         }
     } else {
@@ -283,8 +295,23 @@ fn is_special_assignment(context: &Context, target: &Expr) -> bool {
     }
 }
 
+/// Returns `true` if the a class is an enum, based on its base classes.
+fn is_enum(model: &SemanticModel, bases: &[Expr]) -> bool {
+    return bases.iter().any(|expr| {
+        model.resolve_call_path(expr).map_or(false, |call_path| {
+            matches!(
+                call_path.as_slice(),
+                [
+                    "enum",
+                    "Enum" | "Flag" | "IntEnum" | "IntFlag" | "StrEnum" | "ReprEnum"
+                ]
+            )
+        })
+    });
+}
+
 /// PYI011
-pub fn typed_argument_simple_defaults(checker: &mut Checker, args: &Arguments) {
+pub(crate) fn typed_argument_simple_defaults(checker: &mut Checker, args: &Arguments) {
     if !args.defaults.is_empty() {
         let defaults_start = args.posonlyargs.len() + args.args.len() - args.defaults.len();
         for (i, arg) in args.posonlyargs.iter().chain(&args.args).enumerate() {
@@ -292,16 +319,21 @@ pub fn typed_argument_simple_defaults(checker: &mut Checker, args: &Arguments) {
                 .checked_sub(defaults_start)
                 .and_then(|i| args.defaults.get(i))
             {
-                if arg.node.annotation.is_some() {
-                    if !is_valid_default_value_with_annotation(default, checker, true) {
+                if arg.annotation.is_some() {
+                    if !is_valid_default_value_with_annotation(
+                        default,
+                        true,
+                        checker.locator,
+                        checker.semantic_model(),
+                    ) {
                         let mut diagnostic =
                             Diagnostic::new(TypedArgumentDefaultInStub, default.range());
 
                         if checker.patch(diagnostic.kind.rule()) {
-                            diagnostic.set_fix(Edit::range_replacement(
+                            diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
                                 "...".to_string(),
                                 default.range(),
-                            ));
+                            )));
                         }
 
                         checker.diagnostics.push(diagnostic);
@@ -318,16 +350,21 @@ pub fn typed_argument_simple_defaults(checker: &mut Checker, args: &Arguments) {
                 .checked_sub(defaults_start)
                 .and_then(|i| args.kw_defaults.get(i))
             {
-                if kwarg.node.annotation.is_some() {
-                    if !is_valid_default_value_with_annotation(default, checker, true) {
+                if kwarg.annotation.is_some() {
+                    if !is_valid_default_value_with_annotation(
+                        default,
+                        true,
+                        checker.locator,
+                        checker.semantic_model(),
+                    ) {
                         let mut diagnostic =
                             Diagnostic::new(TypedArgumentDefaultInStub, default.range());
 
                         if checker.patch(diagnostic.kind.rule()) {
-                            diagnostic.set_fix(Edit::range_replacement(
+                            diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
                                 "...".to_string(),
                                 default.range(),
-                            ));
+                            )));
                         }
 
                         checker.diagnostics.push(diagnostic);
@@ -339,7 +376,7 @@ pub fn typed_argument_simple_defaults(checker: &mut Checker, args: &Arguments) {
 }
 
 /// PYI014
-pub fn argument_simple_defaults(checker: &mut Checker, args: &Arguments) {
+pub(crate) fn argument_simple_defaults(checker: &mut Checker, args: &Arguments) {
     if !args.defaults.is_empty() {
         let defaults_start = args.posonlyargs.len() + args.args.len() - args.defaults.len();
         for (i, arg) in args.posonlyargs.iter().chain(&args.args).enumerate() {
@@ -347,16 +384,21 @@ pub fn argument_simple_defaults(checker: &mut Checker, args: &Arguments) {
                 .checked_sub(defaults_start)
                 .and_then(|i| args.defaults.get(i))
             {
-                if arg.node.annotation.is_none() {
-                    if !is_valid_default_value_with_annotation(default, checker, true) {
+                if arg.annotation.is_none() {
+                    if !is_valid_default_value_with_annotation(
+                        default,
+                        true,
+                        checker.locator,
+                        checker.semantic_model(),
+                    ) {
                         let mut diagnostic =
                             Diagnostic::new(ArgumentDefaultInStub, default.range());
 
                         if checker.patch(diagnostic.kind.rule()) {
-                            diagnostic.set_fix(Edit::range_replacement(
+                            diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
                                 "...".to_string(),
                                 default.range(),
-                            ));
+                            )));
                         }
 
                         checker.diagnostics.push(diagnostic);
@@ -373,16 +415,21 @@ pub fn argument_simple_defaults(checker: &mut Checker, args: &Arguments) {
                 .checked_sub(defaults_start)
                 .and_then(|i| args.kw_defaults.get(i))
             {
-                if kwarg.node.annotation.is_none() {
-                    if !is_valid_default_value_with_annotation(default, checker, true) {
+                if kwarg.annotation.is_none() {
+                    if !is_valid_default_value_with_annotation(
+                        default,
+                        true,
+                        checker.locator,
+                        checker.semantic_model(),
+                    ) {
                         let mut diagnostic =
                             Diagnostic::new(ArgumentDefaultInStub, default.range());
 
                         if checker.patch(diagnostic.kind.rule()) {
-                            diagnostic.set_fix(Edit::range_replacement(
+                            diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
                                 "...".to_string(),
                                 default.range(),
-                            ));
+                            )));
                         }
 
                         checker.diagnostics.push(diagnostic);
@@ -394,50 +441,143 @@ pub fn argument_simple_defaults(checker: &mut Checker, args: &Arguments) {
 }
 
 /// PYI015
-pub fn assignment_default_in_stub(checker: &mut Checker, targets: &[Expr], value: &Expr) {
-    if targets.len() == 1 && is_special_assignment(&checker.ctx, &targets[0]) {
+pub(crate) fn assignment_default_in_stub(checker: &mut Checker, targets: &[Expr], value: &Expr) {
+    if targets.len() != 1 {
+        return;
+    }
+    let target = &targets[0];
+    if !target.is_name_expr() {
         return;
     }
-    if is_type_var_like_call(&checker.ctx, value) {
+    if is_special_assignment(checker.semantic_model(), target) {
+        return;
+    }
+    if is_type_var_like_call(checker.semantic_model(), value) {
         return;
     }
     if is_valid_default_value_without_annotation(value) {
         return;
     }
-    if is_valid_default_value_with_annotation(value, checker, true) {
+    if is_valid_default_value_with_annotation(
+        value,
+        true,
+        checker.locator,
+        checker.semantic_model(),
+    ) {
         return;
     }
 
     let mut diagnostic = Diagnostic::new(AssignmentDefaultInStub, value.range());
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement("...".to_string(), value.range()));
+        diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
+            "...".to_string(),
+            value.range(),
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
 
 /// PYI015
-pub fn annotated_assignment_default_in_stub(
+pub(crate) fn annotated_assignment_default_in_stub(
     checker: &mut Checker,
     target: &Expr,
     value: &Expr,
     annotation: &Expr,
 ) {
-    if checker.ctx.match_typing_expr(annotation, "TypeAlias") {
+    if checker
+        .semantic_model()
+        .match_typing_expr(annotation, "TypeAlias")
+    {
         return;
     }
-    if is_special_assignment(&checker.ctx, target) {
+    if is_special_assignment(checker.semantic_model(), target) {
         return;
     }
-    if is_type_var_like_call(&checker.ctx, value) {
+    if is_type_var_like_call(checker.semantic_model(), value) {
         return;
     }
-    if is_valid_default_value_with_annotation(value, checker, true) {
+    if is_valid_default_value_with_annotation(
+        value,
+        true,
+        checker.locator,
+        checker.semantic_model(),
+    ) {
         return;
     }
 
     let mut diagnostic = Diagnostic::new(AssignmentDefaultInStub, value.range());
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement("...".to_string(), value.range()));
+        diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
+            "...".to_string(),
+            value.range(),
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
+
+/// PYI052
+pub(crate) fn unannotated_assignment_in_stub(
+    checker: &mut Checker,
+    targets: &[Expr],
+    value: &Expr,
+) {
+    if targets.len() != 1 {
+        return;
+    }
+    let target = &targets[0];
+    let Expr::Name(ast::ExprName { id, .. }) = target else {
+        return;
+    };
+    if is_special_assignment(checker.semantic_model(), target) {
+        return;
+    }
+    if is_type_var_like_call(checker.semantic_model(), value) {
+        return;
+    }
+    if is_valid_default_value_without_annotation(value) {
+        return;
+    }
+    if !is_valid_default_value_with_annotation(
+        value,
+        true,
+        checker.locator,
+        checker.semantic_model(),
+    ) {
+        return;
+    }
+
+    if let ScopeKind::Class(ast::StmtClassDef { bases, .. }) = checker.semantic_model().scope().kind
+    {
+        if is_enum(checker.semantic_model(), bases) {
+            return;
+        }
+    }
+    checker.diagnostics.push(Diagnostic::new(
+        UnannotatedAssignmentInStub {
+            name: id.to_string(),
+        },
+        value.range(),
+    ));
+}
+
+/// PYI035
+pub(crate) fn unassigned_special_variable_in_stub(
+    checker: &mut Checker,
+    target: &Expr,
+    stmt: &Stmt,
+) {
+    let Expr::Name(ast::ExprName { id, .. }) = target else {
+        return;
+    };
+
+    if !is_special_assignment(checker.semantic_model(), target) {
+        return;
+    }
+
+    checker.diagnostics.push(Diagnostic::new(
+        UnassignedSpecialVariableInStub {
+            name: id.to_string(),
+        },
+        stmt.range(),
+    ));
+}
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/str_or_repr_defined_in_stub.rs b/crates/ruff/src/rules/flake8_pyi/rules/str_or_repr_defined_in_stub.rs
new file mode 100644
index 0000000000000..88f204fcc3e4b
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/rules/str_or_repr_defined_in_stub.rs
@@ -0,0 +1,110 @@
+use rustpython_parser::ast;
+use rustpython_parser::ast::Stmt;
+
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Fix};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::helpers::identifier_range;
+use ruff_python_semantic::analyze::visibility::is_abstract;
+
+use crate::autofix::edits::delete_stmt;
+use crate::checkers::ast::Checker;
+use crate::registry::AsRule;
+
+/// ## What it does
+/// Checks for redundant definitions of `__str__` or `__repr__` in stubs.
+///
+/// ## Why is this bad?
+/// Defining `__str__` or `__repr__` in a stub is almost always redundant,
+/// as the signatures are almost always identical to those of the default
+/// equivalent, `object.__str__` and `object.__repr__`, respectively.
+///
+/// ## Example
+/// ```python
+/// class Foo:
+///     def __repr__(self) -> str:
+///         ...
+/// ```
+#[violation]
+pub struct StrOrReprDefinedInStub {
+    name: String,
+}
+
+impl AlwaysAutofixableViolation for StrOrReprDefinedInStub {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let StrOrReprDefinedInStub { name } = self;
+        format!("Defining `{name}` in a stub is almost always redundant")
+    }
+
+    fn autofix_title(&self) -> String {
+        let StrOrReprDefinedInStub { name } = self;
+        format!("Remove definition of `{name}`")
+    }
+}
+
+/// PYI029
+pub(crate) fn str_or_repr_defined_in_stub(checker: &mut Checker, stmt: &Stmt) {
+    let Stmt::FunctionDef(ast::StmtFunctionDef {
+        name,
+        decorator_list,
+        returns,
+        args,
+        ..
+    }) = stmt else {
+        return
+    };
+
+    let Some(returns) = returns else {
+        return;
+    };
+
+    if !matches!(name.as_str(), "__str__" | "__repr__") {
+        return;
+    }
+
+    if !checker.semantic_model().scope().kind.is_class() {
+        return;
+    }
+
+    // It is a violation only if the method signature matches that of `object.__str__`
+    // or `object.__repr__` exactly and the method is not decorated as abstract.
+    if !args.kwonlyargs.is_empty() || (args.args.len() + args.posonlyargs.len()) > 1 {
+        return;
+    }
+
+    if is_abstract(checker.semantic_model(), decorator_list) {
+        return;
+    }
+
+    if checker
+        .semantic_model()
+        .resolve_call_path(returns)
+        .map_or(true, |call_path| {
+            !matches!(call_path.as_slice(), ["" | "builtins", "str"])
+        })
+    {
+        return;
+    }
+
+    let mut diagnostic = Diagnostic::new(
+        StrOrReprDefinedInStub {
+            name: name.to_string(),
+        },
+        identifier_range(stmt, checker.locator),
+    );
+    if checker.patch(diagnostic.kind.rule()) {
+        let stmt = checker.semantic_model().stmt();
+        let parent = checker.semantic_model().stmt_parent();
+        let edit = delete_stmt(
+            stmt,
+            parent,
+            checker.locator,
+            checker.indexer,
+            checker.stylist,
+        );
+        diagnostic.set_fix(
+            Fix::automatic(edit).isolate(checker.isolation(checker.semantic_model().stmt_parent())),
+        );
+    }
+    checker.diagnostics.push(diagnostic);
+}
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/string_or_bytes_too_long.rs b/crates/ruff/src/rules/flake8_pyi/rules/string_or_bytes_too_long.rs
new file mode 100644
index 0000000000000..cecaed2685707
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/rules/string_or_bytes_too_long.rs
@@ -0,0 +1,67 @@
+use rustpython_parser::ast::{self, Constant, Expr, Ranged};
+
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+use crate::registry::AsRule;
+
+#[violation]
+pub struct StringOrBytesTooLong;
+
+/// ## What it does
+/// Checks for the use of string and bytes literals longer than 50 characters.
+///
+/// ## Why is this bad?
+/// If a function has a default value where the string or bytes representation
+/// is greater than 50 characters, it is likely to be an implementation detail
+/// or a constant that varies depending on the system you're running on.
+///
+/// Consider replacing such constants with ellipses (`...`).
+///
+/// ## Example
+/// ```python
+/// def foo(arg: str = "51 character stringgggggggggggggggggggggggggggggggg") -> None: ...
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def foo(arg: str = ...) -> None: ...
+/// ```
+impl AlwaysAutofixableViolation for StringOrBytesTooLong {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("String and bytes literals longer than 50 characters are not permitted")
+    }
+
+    fn autofix_title(&self) -> String {
+        "Replace with `...`".to_string()
+    }
+}
+
+/// PYI053
+pub(crate) fn string_or_bytes_too_long(checker: &mut Checker, expr: &Expr) {
+    let length = match expr {
+        Expr::Constant(ast::ExprConstant {
+            value: Constant::Str(s),
+            ..
+        }) => s.chars().count(),
+        Expr::Constant(ast::ExprConstant {
+            value: Constant::Bytes(bytes),
+            ..
+        }) => bytes.len(),
+        _ => return,
+    };
+    if length <= 50 {
+        return;
+    }
+
+    let mut diagnostic = Diagnostic::new(StringOrBytesTooLong, expr.range());
+    if checker.patch(diagnostic.kind.rule()) {
+        diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
+            "...".to_string(),
+            expr.range(),
+        )));
+    }
+    checker.diagnostics.push(diagnostic);
+}
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/stub_body_multiple_statements.rs b/crates/ruff/src/rules/flake8_pyi/rules/stub_body_multiple_statements.rs
new file mode 100644
index 0000000000000..3ab3613237e26
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/rules/stub_body_multiple_statements.rs
@@ -0,0 +1,37 @@
+use rustpython_parser::ast::Stmt;
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::helpers;
+use ruff_python_ast::helpers::is_docstring_stmt;
+
+use crate::checkers::ast::Checker;
+
+#[violation]
+pub struct StubBodyMultipleStatements;
+
+impl Violation for StubBodyMultipleStatements {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Function body must contain exactly one statement")
+    }
+}
+
+/// PYI010
+pub(crate) fn stub_body_multiple_statements(checker: &mut Checker, stmt: &Stmt, body: &[Stmt]) {
+    // If the function body consists of exactly one statement, abort.
+    if body.len() == 1 {
+        return;
+    }
+
+    // If the function body consists of exactly two statements, and the first is a
+    // docstring, abort (this is covered by PYI021).
+    if body.len() == 2 && is_docstring_stmt(&body[0]) {
+        return;
+    }
+
+    checker.diagnostics.push(Diagnostic::new(
+        StubBodyMultipleStatements,
+        helpers::identifier_range(stmt, checker.locator),
+    ));
+}
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/type_alias_naming.rs b/crates/ruff/src/rules/flake8_pyi/rules/type_alias_naming.rs
index 5ce2e1c7313f7..3bd57edfc408f 100644
--- a/crates/ruff/src/rules/flake8_pyi/rules/type_alias_naming.rs
+++ b/crates/ruff/src/rules/flake8_pyi/rules/type_alias_naming.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -7,7 +7,7 @@ use crate::checkers::ast::Checker;
 
 #[violation]
 pub struct SnakeCaseTypeAlias {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for SnakeCaseTypeAlias {
@@ -20,7 +20,7 @@ impl Violation for SnakeCaseTypeAlias {
 
 #[violation]
 pub struct TSuffixedTypeAlias {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for TSuffixedTypeAlias {
@@ -59,8 +59,8 @@ fn is_t_suffixed_type_alias(name: &str) -> bool {
 }
 
 /// PYI042
-pub fn snake_case_type_alias(checker: &mut Checker, target: &Expr) {
-    if let ExprKind::Name { id, .. } = target.node() {
+pub(crate) fn snake_case_type_alias(checker: &mut Checker, target: &Expr) {
+    if let Expr::Name(ast::ExprName { id, range, .. }) = target {
         if !is_snake_case_type_alias(id) {
             return;
         }
@@ -69,14 +69,14 @@ pub fn snake_case_type_alias(checker: &mut Checker, target: &Expr) {
             SnakeCaseTypeAlias {
                 name: id.to_string(),
             },
-            target.range(),
+            *range,
         ));
     }
 }
 
 /// PYI043
-pub fn t_suffixed_type_alias(checker: &mut Checker, target: &Expr) {
-    if let ExprKind::Name { id, .. } = target.node() {
+pub(crate) fn t_suffixed_type_alias(checker: &mut Checker, target: &Expr) {
+    if let Expr::Name(ast::ExprName { id, range, .. }) = target {
         if !is_t_suffixed_type_alias(id) {
             return;
         }
@@ -85,7 +85,7 @@ pub fn t_suffixed_type_alias(checker: &mut Checker, target: &Expr) {
             TSuffixedTypeAlias {
                 name: id.to_string(),
             },
-            target.range(),
+            *range,
         ));
     }
 }
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/type_comment_in_stub.rs b/crates/ruff/src/rules/flake8_pyi/rules/type_comment_in_stub.rs
index f2bc89699f199..a4ca3bbc14ad9 100644
--- a/crates/ruff/src/rules/flake8_pyi/rules/type_comment_in_stub.rs
+++ b/crates/ruff/src/rules/flake8_pyi/rules/type_comment_in_stub.rs
@@ -1,7 +1,6 @@
 use once_cell::sync::Lazy;
 use regex::Regex;
-use rustpython_parser::lexer::LexResult;
-use rustpython_parser::Tok;
+use ruff_python_ast::source_code::{Indexer, Locator};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -17,7 +16,7 @@ use ruff_macros::{derive_message_formats, violation};
 ///
 /// ## Example
 /// ```python
-/// x = 1 # type: int
+/// x = 1  # type: int
 /// ```
 ///
 /// Use instead:
@@ -35,14 +34,14 @@ impl Violation for TypeCommentInStub {
 }
 
 /// PYI033
-pub fn type_comment_in_stub(tokens: &[LexResult]) -> Vec<Diagnostic> {
+pub(crate) fn type_comment_in_stub(indexer: &Indexer, locator: &Locator) -> Vec<Diagnostic> {
     let mut diagnostics = vec![];
 
-    for token in tokens.iter().flatten() {
-        if let (Tok::Comment(comment), range) = token {
-            if TYPE_COMMENT_REGEX.is_match(comment) && !TYPE_IGNORE_REGEX.is_match(comment) {
-                diagnostics.push(Diagnostic::new(TypeCommentInStub, *range));
-            }
+    for range in indexer.comment_ranges() {
+        let comment = locator.slice(*range);
+
+        if TYPE_COMMENT_REGEX.is_match(comment) && !TYPE_IGNORE_REGEX.is_match(comment) {
+            diagnostics.push(Diagnostic::new(TypeCommentInStub, *range));
         }
     }
 
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/unaliased_collections_abc_set_import.rs b/crates/ruff/src/rules/flake8_pyi/rules/unaliased_collections_abc_set_import.rs
new file mode 100644
index 0000000000000..db17d9c2728c5
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/rules/unaliased_collections_abc_set_import.rs
@@ -0,0 +1,62 @@
+use rustpython_parser::ast::StmtImportFrom;
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for `from collections.abc import Set` imports that do not alias
+/// `Set` to `AbstractSet`.
+///
+/// ## Why is this bad?
+/// The `Set` type in `collections.abc` is an abstract base class for set-like types.
+/// It is easily confused with, and not equivalent to, the `set` builtin.
+///
+/// To avoid confusion, `Set` should be aliased to `AbstractSet` when imported. This
+/// makes it clear that the imported type is an abstract base class, and not the
+/// `set` builtin.
+///
+/// ## Example
+/// ```python
+/// from collections.abc import Set
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from collections.abc import Set as AbstractSet
+/// ```
+#[violation]
+pub struct UnaliasedCollectionsAbcSetImport;
+
+impl Violation for UnaliasedCollectionsAbcSetImport {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!(
+            "Use `from collections.abc import Set as AbstractSet` to avoid confusion with the `set` builtin"
+        )
+    }
+
+    fn autofix_title(&self) -> Option<String> {
+        Some(format!("Alias `Set` to `AbstractSet`"))
+    }
+}
+
+/// PYI025
+pub(crate) fn unaliased_collections_abc_set_import(checker: &mut Checker, stmt: &StmtImportFrom) {
+    let Some(module_id) = &stmt.module else {
+        return;
+    };
+    if module_id.as_str() != "collections.abc" {
+        return;
+    }
+
+    for name in &stmt.names {
+        if name.name.as_str() == "Set" && name.asname.is_none() {
+            checker.diagnostics.push(Diagnostic::new(
+                UnaliasedCollectionsAbcSetImport,
+                name.range,
+            ));
+        }
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_pyi/rules/unrecognized_platform.rs b/crates/ruff/src/rules/flake8_pyi/rules/unrecognized_platform.rs
index d1e43ea4046f1..1efb416a0ae03 100644
--- a/crates/ruff/src/rules/flake8_pyi/rules/unrecognized_platform.rs
+++ b/crates/ruff/src/rules/flake8_pyi/rules/unrecognized_platform.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Cmpop, Constant, Expr, ExprKind};
+use rustpython_parser::ast::{self, Cmpop, Constant, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -77,7 +77,7 @@ impl Violation for UnrecognizedPlatformCheck {
 /// - [PEP 484](https://peps.python.org/pep-0484/#version-and-platform-checking)
 #[violation]
 pub struct UnrecognizedPlatformName {
-    pub platform: String,
+    platform: String,
 }
 
 impl Violation for UnrecognizedPlatformName {
@@ -89,7 +89,7 @@ impl Violation for UnrecognizedPlatformName {
 }
 
 /// PYI007, PYI008
-pub fn unrecognized_platform(
+pub(crate) fn unrecognized_platform(
     checker: &mut Checker,
     expr: &Expr,
     left: &Expr,
@@ -103,7 +103,7 @@ pub fn unrecognized_platform(
     let diagnostic_unrecognized_platform_check =
         Diagnostic::new(UnrecognizedPlatformCheck, expr.range());
     if !checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(left)
         .map_or(false, |call_path| {
             call_path.as_slice() == ["sys", "platform"]
@@ -113,30 +113,22 @@ pub fn unrecognized_platform(
     }
 
     // "in" might also make sense but we don't currently have one.
-    if !matches!(op, Cmpop::Eq | Cmpop::NotEq)
-        && checker
-            .settings
-            .rules
-            .enabled(Rule::UnrecognizedPlatformCheck)
-    {
+    if !matches!(op, Cmpop::Eq | Cmpop::NotEq) && checker.enabled(Rule::UnrecognizedPlatformCheck) {
         checker
             .diagnostics
             .push(diagnostic_unrecognized_platform_check);
         return;
     }
 
-    match &right.node {
-        ExprKind::Constant {
+    match right {
+        Expr::Constant(ast::ExprConstant {
             value: Constant::Str(value),
             ..
-        } => {
+        }) => {
             // Other values are possible but we don't need them right now.
             // This protects against typos.
             if !["linux", "win32", "cygwin", "darwin"].contains(&value.as_str())
-                && checker
-                    .settings
-                    .rules
-                    .enabled(Rule::UnrecognizedPlatformName)
+                && checker.enabled(Rule::UnrecognizedPlatformName)
             {
                 checker.diagnostics.push(Diagnostic::new(
                     UnrecognizedPlatformName {
@@ -147,11 +139,7 @@ pub fn unrecognized_platform(
             }
         }
         _ => {
-            if checker
-                .settings
-                .rules
-                .enabled(Rule::UnrecognizedPlatformCheck)
-            {
+            if checker.enabled(Rule::UnrecognizedPlatformCheck) {
                 checker
                     .diagnostics
                     .push(diagnostic_unrecognized_platform_check);
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI009_PYI009.pyi.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI009_PYI009.pyi.snap
index edabe9cf803ea..f5e18fe99ea3b 100644
--- a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI009_PYI009.pyi.snap
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI009_PYI009.pyi.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_pyi/mod.rs
 ---
-PYI009.pyi:3:5: PYI009 Empty body should contain `...`, not `pass`
+PYI009.pyi:3:5: PYI009 [*] Empty body should contain `...`, not `pass`
   |
 3 | def bar(): ...  # OK
 4 | def foo():
@@ -10,12 +10,30 @@ PYI009.pyi:3:5: PYI009 Empty body should contain `...`, not `pass`
 6 | 
 7 | class Bar: ...  # OK
   |
+  = help: Replace `pass` with `...`
 
-PYI009.pyi:8:5: PYI009 Empty body should contain `...`, not `pass`
+ℹ Fix
+1 1 | def bar(): ...  # OK
+2 2 | def foo():
+3   |-    pass  # ERROR PYI009, since we're in a stub file
+  3 |+    ...  # ERROR PYI009, since we're in a stub file
+4 4 | 
+5 5 | class Bar: ...  # OK
+6 6 | 
+
+PYI009.pyi:8:5: PYI009 [*] Empty body should contain `...`, not `pass`
   |
 8 | class Foo:
 9 |     pass  # ERROR PYI009, since we're in a stub file
   |     ^^^^ PYI009
   |
+  = help: Replace `pass` with `...`
+
+ℹ Fix
+5 5 | class Bar: ...  # OK
+6 6 | 
+7 7 | class Foo:
+8   |-    pass  # ERROR PYI009, since we're in a stub file
+  8 |+    ...  # ERROR PYI009, since we're in a stub file
 
 
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI010_PYI010.pyi.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI010_PYI010.pyi.snap
index 965f11e0812ae..3d103886ac591 100644
--- a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI010_PYI010.pyi.snap
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI010_PYI010.pyi.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_pyi/mod.rs
 ---
-PYI010.pyi:6:5: PYI010 Function body must contain only `...`
+PYI010.pyi:6:5: PYI010 [*] Function body must contain only `...`
   |
 6 | def buzz():
 7 |     print("buzz")  # ERROR PYI010
@@ -9,8 +9,19 @@ PYI010.pyi:6:5: PYI010 Function body must contain only `...`
 8 | 
 9 | def foo2():
   |
+  = help: Replace function body with `...`
 
-PYI010.pyi:9:5: PYI010 Function body must contain only `...`
+ℹ Fix
+3 3 |     """foo"""  # OK, strings are handled by another rule
+4 4 | 
+5 5 | def buzz():
+6   |-    print("buzz")  # ERROR PYI010
+  6 |+    ...  # ERROR PYI010
+7 7 | 
+8 8 | def foo2():
+9 9 |     123  # ERROR PYI010
+
+PYI010.pyi:9:5: PYI010 [*] Function body must contain only `...`
    |
  9 | def foo2():
 10 |     123  # ERROR PYI010
@@ -18,12 +29,31 @@ PYI010.pyi:9:5: PYI010 Function body must contain only `...`
 11 | 
 12 | def bizz():
    |
+   = help: Replace function body with `...`
+
+ℹ Fix
+6  6  |     print("buzz")  # ERROR PYI010
+7  7  | 
+8  8  | def foo2():
+9     |-    123  # ERROR PYI010
+   9  |+    ...  # ERROR PYI010
+10 10 | 
+11 11 | def bizz():
+12 12 |     x = 123  # ERROR PYI010
 
-PYI010.pyi:12:5: PYI010 Function body must contain only `...`
+PYI010.pyi:12:5: PYI010 [*] Function body must contain only `...`
    |
 12 | def bizz():
 13 |     x = 123  # ERROR PYI010
    |     ^^^^^^^ PYI010
    |
+   = help: Replace function body with `...`
+
+ℹ Fix
+9  9  |     123  # ERROR PYI010
+10 10 | 
+11 11 | def bizz():
+12    |-    x = 123  # ERROR PYI010
+   12 |+    ...  # ERROR PYI010
 
 
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI012_PYI012.pyi.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI012_PYI012.pyi.snap
index b73c948b90a3e..f147122f7f206 100644
--- a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI012_PYI012.pyi.snap
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI012_PYI012.pyi.snap
@@ -12,7 +12,7 @@ PYI012.pyi:5:5: PYI012 [*] Class body must not contain `pass`
   |
   = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 2 2 | 
 3 3 | class OneAttributeClass:
 4 4 |     value: int
@@ -30,7 +30,7 @@ PYI012.pyi:8:5: PYI012 [*] Class body must not contain `pass`
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 5 5 |     pass  # PYI012 Class body must not contain `pass`
 6 6 | 
 7 7 | class OneAttributeClassRev:
@@ -50,7 +50,7 @@ PYI012.pyi:16:5: PYI012 [*] Class body must not contain `pass`
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 13 13 |     My body only contains pass.
 14 14 |     """
 15 15 | 
@@ -70,7 +70,7 @@ PYI012.pyi:20:5: PYI012 [*] Class body must not contain `pass`
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 17 17 | 
 18 18 | class NonEmptyChild(Exception):
 19 19 |     value: int
@@ -88,7 +88,7 @@ PYI012.pyi:23:5: PYI012 [*] Class body must not contain `pass`
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 20 20 |     pass  # PYI012 Class body must not contain `pass`
 21 21 | 
 22 22 | class NonEmptyChild2(Exception):
@@ -108,7 +108,7 @@ PYI012.pyi:28:5: PYI012 [*] Class body must not contain `pass`
    |
    = help: Remove unnecessary `pass`
 
-ℹ Suggested fix
+ℹ Fix
 25 25 | 
 26 26 | class NonEmptyWithInit:
 27 27 |     value: int
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI013_PYI013.py.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI013_PYI013.py.snap
new file mode 100644
index 0000000000000..d1aa2e9116558
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI013_PYI013.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI013_PYI013.pyi.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI013_PYI013.pyi.snap
new file mode 100644
index 0000000000000..ddcac78bad9df
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI013_PYI013.pyi.snap
@@ -0,0 +1,176 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+PYI013.pyi:5:5: PYI013 [*] Non-empty class body must not contain `...`
+  |
+5 | class OneAttributeClass:
+6 |     value: int
+7 |     ...  # Error
+  |     ^^^ PYI013
+8 | 
+9 | class OneAttributeClass2:
+  |
+  = help: Remove unnecessary `...`
+
+ℹ Fix
+2 2 | 
+3 3 | class OneAttributeClass:
+4 4 |     value: int
+5   |-    ...  # Error
+6 5 | 
+7 6 | class OneAttributeClass2:
+8 7 |     ...  # Error
+
+PYI013.pyi:8:5: PYI013 [*] Non-empty class body must not contain `...`
+   |
+ 8 | class OneAttributeClass2:
+ 9 |     ...  # Error
+   |     ^^^ PYI013
+10 |     value: int
+   |
+   = help: Remove unnecessary `...`
+
+ℹ Fix
+5 5 |     ...  # Error
+6 6 | 
+7 7 | class OneAttributeClass2:
+8   |-    ...  # Error
+9 8 |     value: int
+10 9 | 
+11 10 | class MyClass:
+
+PYI013.pyi:12:5: PYI013 [*] Non-empty class body must not contain `...`
+   |
+12 | class MyClass:
+13 |     ...
+   |     ^^^ PYI013
+14 |     value: int
+   |
+   = help: Remove unnecessary `...`
+
+ℹ Fix
+9  9  |     value: int
+10 10 | 
+11 11 | class MyClass:
+12    |-    ...
+13 12 |     value: int
+14 13 | 
+15 14 | class TwoEllipsesClass:
+
+PYI013.pyi:16:5: PYI013 [*] Non-empty class body must not contain `...`
+   |
+16 | class TwoEllipsesClass:
+17 |     ...
+   |     ^^^ PYI013
+18 |     ...  # Error
+   |
+   = help: Remove unnecessary `...`
+
+ℹ Fix
+13 13 |     value: int
+14 14 | 
+15 15 | class TwoEllipsesClass:
+16    |-    ...
+17 16 |     ...  # Error
+18 17 | 
+19 18 | class DocstringClass:
+
+PYI013.pyi:17:5: PYI013 [*] Non-empty class body must not contain `...`
+   |
+17 | class TwoEllipsesClass:
+18 |     ...
+19 |     ...  # Error
+   |     ^^^ PYI013
+20 | 
+21 | class DocstringClass:
+   |
+   = help: Remove unnecessary `...`
+
+ℹ Fix
+14 14 | 
+15 15 | class TwoEllipsesClass:
+16 16 |     ...
+17    |-    ...  # Error
+18 17 | 
+19 18 | class DocstringClass:
+20 19 |     """
+
+PYI013.pyi:24:5: PYI013 [*] Non-empty class body must not contain `...`
+   |
+24 |     """
+25 | 
+26 |     ...  # Error
+   |     ^^^ PYI013
+27 | 
+28 | class NonEmptyChild(Exception):
+   |
+   = help: Remove unnecessary `...`
+
+ℹ Fix
+21 21 |     My body only contains an ellipsis.
+22 22 |     """
+23 23 | 
+24    |-    ...  # Error
+25 24 | 
+26 25 | class NonEmptyChild(Exception):
+27 26 |     value: int
+
+PYI013.pyi:28:5: PYI013 [*] Non-empty class body must not contain `...`
+   |
+28 | class NonEmptyChild(Exception):
+29 |     value: int
+30 |     ...  # Error
+   |     ^^^ PYI013
+31 | 
+32 | class NonEmptyChild2(Exception):
+   |
+   = help: Remove unnecessary `...`
+
+ℹ Fix
+25 25 | 
+26 26 | class NonEmptyChild(Exception):
+27 27 |     value: int
+28    |-    ...  # Error
+29 28 | 
+30 29 | class NonEmptyChild2(Exception):
+31 30 |     ...  # Error
+
+PYI013.pyi:31:5: PYI013 [*] Non-empty class body must not contain `...`
+   |
+31 | class NonEmptyChild2(Exception):
+32 |     ...  # Error
+   |     ^^^ PYI013
+33 |     value: int
+   |
+   = help: Remove unnecessary `...`
+
+ℹ Fix
+28 28 |     ...  # Error
+29 29 | 
+30 30 | class NonEmptyChild2(Exception):
+31    |-    ...  # Error
+32 31 |     value: int
+33 32 | 
+34 33 | class NonEmptyWithInit:
+
+PYI013.pyi:36:5: PYI013 [*] Non-empty class body must not contain `...`
+   |
+36 | class NonEmptyWithInit:
+37 |     value: int
+38 |     ...  # Error
+   |     ^^^ PYI013
+39 | 
+40 |     def __init__():
+   |
+   = help: Remove unnecessary `...`
+
+ℹ Fix
+33 33 | 
+34 34 | class NonEmptyWithInit:
+35 35 |     value: int
+36    |-    ...  # Error
+37 36 | 
+38 37 |     def __init__():
+39 38 |         pass
+
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI024_PYI024.py.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI024_PYI024.py.snap
new file mode 100644
index 0000000000000..d1aa2e9116558
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI024_PYI024.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI024_PYI024.pyi.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI024_PYI024.pyi.snap
new file mode 100644
index 0000000000000..1b8153dda2511
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI024_PYI024.pyi.snap
@@ -0,0 +1,37 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+PYI024.pyi:3:9: PYI024 Use `typing.NamedTuple` instead of `collections.namedtuple`
+  |
+3 | import collections
+4 | 
+5 | person: collections.namedtuple  # Y024 Use "typing.NamedTuple" instead of "collections.namedtuple"
+  |         ^^^^^^^^^^^^^^^^^^^^^^ PYI024
+6 | 
+7 | from collections import namedtuple
+  |
+  = help: Replace with `typing.NamedTuple`
+
+PYI024.pyi:7:9: PYI024 Use `typing.NamedTuple` instead of `collections.namedtuple`
+   |
+ 7 | from collections import namedtuple
+ 8 | 
+ 9 | person: namedtuple  # Y024 Use "typing.NamedTuple" instead of "collections.namedtuple"
+   |         ^^^^^^^^^^ PYI024
+10 | 
+11 | person = namedtuple(
+   |
+   = help: Replace with `typing.NamedTuple`
+
+PYI024.pyi:9:10: PYI024 Use `typing.NamedTuple` instead of `collections.namedtuple`
+   |
+ 9 | person: namedtuple  # Y024 Use "typing.NamedTuple" instead of "collections.namedtuple"
+10 | 
+11 | person = namedtuple(
+   |          ^^^^^^^^^^ PYI024
+12 |     "Person", ["name", "age"]
+13 | )  # Y024 Use "typing.NamedTuple" instead of "collections.namedtuple"
+   |
+   = help: Replace with `typing.NamedTuple`
+
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI025_PYI025.py.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI025_PYI025.py.snap
new file mode 100644
index 0000000000000..d1aa2e9116558
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI025_PYI025.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI025_PYI025.pyi.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI025_PYI025.pyi.snap
new file mode 100644
index 0000000000000..bcba8d1bf59b7
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI025_PYI025.pyi.snap
@@ -0,0 +1,22 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+PYI025.pyi:4:29: PYI025 Use `from collections.abc import Set as AbstractSet` to avoid confusion with the `set` builtin
+  |
+4 | from collections.abc import Set  # PYI025
+  |                             ^^^ PYI025
+  |
+  = help: Alias `Set` to `AbstractSet`
+
+PYI025.pyi:10:5: PYI025 Use `from collections.abc import Set as AbstractSet` to avoid confusion with the `set` builtin
+   |
+10 |     Container,
+11 |     Sized,
+12 |     Set,  # PYI025
+   |     ^^^ PYI025
+13 |     ValuesView
+14 | )
+   |
+   = help: Alias `Set` to `AbstractSet`
+
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI029_PYI029.py.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI029_PYI029.py.snap
new file mode 100644
index 0000000000000..d1aa2e9116558
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI029_PYI029.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI029_PYI029.pyi.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI029_PYI029.pyi.snap
new file mode 100644
index 0000000000000..b1c616ccb4795
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI029_PYI029.pyi.snap
@@ -0,0 +1,62 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+PYI029.pyi:10:9: PYI029 [*] Defining `__str__` in a stub is almost always redundant
+   |
+10 | class ShouldRemoveSingle:
+11 |     def __str__(self) -> builtins.str: ...  # Error: PYI029
+   |         ^^^^^^^ PYI029
+12 | 
+13 | class ShouldRemove:
+   |
+   = help: Remove definition of `str`
+
+ℹ Fix
+7  7  | def __repr__(self, *, foo) -> str: ...
+8  8  | 
+9  9  | class ShouldRemoveSingle:
+10    |-    def __str__(self) -> builtins.str: ...  # Error: PYI029
+   10 |+    pass  # Error: PYI029
+11 11 | 
+12 12 | class ShouldRemove:
+13 13 |     def __repr__(self) -> str: ...  # Error: PYI029
+
+PYI029.pyi:13:9: PYI029 [*] Defining `__repr__` in a stub is almost always redundant
+   |
+13 | class ShouldRemove:
+14 |     def __repr__(self) -> str: ...  # Error: PYI029
+   |         ^^^^^^^^ PYI029
+15 |     def __str__(self) -> builtins.str: ...  # Error: PYI029
+   |
+   = help: Remove definition of `repr`
+
+ℹ Fix
+10 10 |     def __str__(self) -> builtins.str: ...  # Error: PYI029
+11 11 | 
+12 12 | class ShouldRemove:
+13    |-    def __repr__(self) -> str: ...  # Error: PYI029
+14 13 |     def __str__(self) -> builtins.str: ...  # Error: PYI029
+15 14 | 
+16 15 | class NoReturnSpecified:
+
+PYI029.pyi:14:9: PYI029 [*] Defining `__str__` in a stub is almost always redundant
+   |
+14 | class ShouldRemove:
+15 |     def __repr__(self) -> str: ...  # Error: PYI029
+16 |     def __str__(self) -> builtins.str: ...  # Error: PYI029
+   |         ^^^^^^^ PYI029
+17 | 
+18 | class NoReturnSpecified:
+   |
+   = help: Remove definition of `str`
+
+ℹ Fix
+11 11 | 
+12 12 | class ShouldRemove:
+13 13 |     def __repr__(self) -> str: ...  # Error: PYI029
+14    |-    def __str__(self) -> builtins.str: ...  # Error: PYI029
+15 14 | 
+16 15 | class NoReturnSpecified:
+17 16 |     def __str__(self): ...
+
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI032_PYI032.py.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI032_PYI032.py.snap
new file mode 100644
index 0000000000000..d1aa2e9116558
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI032_PYI032.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI032_PYI032.pyi.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI032_PYI032.pyi.snap
new file mode 100644
index 0000000000000..9f4ffac084ec3
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI032_PYI032.pyi.snap
@@ -0,0 +1,42 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+PYI032.pyi:6:29: PYI032 [*] Prefer `object` to `Any` for the second parameter to `__eq__`
+  |
+6 | class Bad:
+7 |     def __eq__(self, other: Any) -> bool: ...  # Y032
+  |                             ^^^ PYI032
+8 |     def __ne__(self, other: typing.Any) -> typing.Any: ...  # Y032
+  |
+  = help: Replace with `object`
+
+ℹ Fix
+3 3 | 
+4 4 | 
+5 5 | class Bad:
+6   |-    def __eq__(self, other: Any) -> bool: ...  # Y032
+  6 |+    def __eq__(self, other: object) -> bool: ...  # Y032
+7 7 |     def __ne__(self, other: typing.Any) -> typing.Any: ...  # Y032
+8 8 | 
+9 9 | 
+
+PYI032.pyi:7:29: PYI032 [*] Prefer `object` to `Any` for the second parameter to `__ne__`
+  |
+7 | class Bad:
+8 |     def __eq__(self, other: Any) -> bool: ...  # Y032
+9 |     def __ne__(self, other: typing.Any) -> typing.Any: ...  # Y032
+  |                             ^^^^^^^^^^ PYI032
+  |
+  = help: Replace with `object`
+
+ℹ Fix
+4 4 | 
+5 5 | class Bad:
+6 6 |     def __eq__(self, other: Any) -> bool: ...  # Y032
+7   |-    def __ne__(self, other: typing.Any) -> typing.Any: ...  # Y032
+  7 |+    def __ne__(self, other: object) -> typing.Any: ...  # Y032
+8 8 | 
+9 9 | 
+10 10 | class Good:
+
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI034_PYI034.py.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI034_PYI034.py.snap
new file mode 100644
index 0000000000000..d1aa2e9116558
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI034_PYI034.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI034_PYI034.pyi.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI034_PYI034.pyi.snap
new file mode 100644
index 0000000000000..dad1a69c83989
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI034_PYI034.pyi.snap
@@ -0,0 +1,101 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+PYI034.pyi:18:9: PYI034 `__new__` methods in classes like `Bad` usually return `self` at runtime
+   |
+18 |     object
+19 | ):  # Y040 Do not inherit from "object" explicitly, as it is redundant in Python 3
+20 |     def __new__(
+   |         ^^^^^^^ PYI034
+21 |         cls, *args: Any, **kwargs: Any
+22 |     ) -> Bad: ...  # Y034 "__new__" methods usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__new__", e.g. "def __new__(cls, *args: Any, **kwargs: Any) -> Self: ..."
+   |
+   = help: Consider using `typing_extensions.Self` as return type
+
+PYI034.pyi:33:9: PYI034 `__enter__` methods in classes like `Bad` usually return `self` at runtime
+   |
+33 |         self, other: typing.Any
+34 |     ) -> typing.Any: ...  # Y032 Prefer "object" to "Any" for the second parameter in "__ne__" methods
+35 |     def __enter__(
+   |         ^^^^^^^^^ PYI034
+36 |         self,
+37 |     ) -> Bad: ...  # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__enter__", e.g. "def __enter__(self) -> Self: ..."
+   |
+   = help: Consider using `typing_extensions.Self` as return type
+
+PYI034.pyi:36:15: PYI034 `__aenter__` methods in classes like `Bad` usually return `self` at runtime
+   |
+36 |         self,
+37 |     ) -> Bad: ...  # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__enter__", e.g. "def __enter__(self) -> Self: ..."
+38 |     async def __aenter__(
+   |               ^^^^^^^^^^ PYI034
+39 |         self,
+40 |     ) -> Bad: ...  # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__aenter__", e.g. "async def __aenter__(self) -> Self: ..."
+   |
+   = help: Consider using `typing_extensions.Self` as return type
+
+PYI034.pyi:39:9: PYI034 `__iadd__` methods in classes like `Bad` usually return `self` at runtime
+   |
+39 |         self,
+40 |     ) -> Bad: ...  # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__aenter__", e.g. "async def __aenter__(self) -> Self: ..."
+41 |     def __iadd__(
+   |         ^^^^^^^^ PYI034
+42 |         self, other: Bad
+43 |     ) -> Bad: ...  # Y034 "__iadd__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__iadd__", e.g. "def __iadd__(self, other: Bad) -> Self: ..."
+   |
+   = help: Consider using `typing_extensions.Self` as return type
+
+PYI034.pyi:102:9: PYI034 `__iter__` methods in classes like `BadIterator1` usually return `self` at runtime
+    |
+102 | class BadIterator1(Iterator[int]):
+103 |     def __iter__(
+    |         ^^^^^^^^ PYI034
+104 |         self,
+105 |     ) -> Iterator[
+    |
+    = help: Consider using `typing_extensions.Self` as return type
+
+PYI034.pyi:111:9: PYI034 `__iter__` methods in classes like `BadIterator2` usually return `self` at runtime
+    |
+111 |     typing.Iterator[int]
+112 | ):  # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax)
+113 |     def __iter__(
+    |         ^^^^^^^^ PYI034
+114 |         self,
+115 |     ) -> Iterator[
+    |
+    = help: Consider using `typing_extensions.Self` as return type
+
+PYI034.pyi:120:9: PYI034 `__iter__` methods in classes like `BadIterator3` usually return `self` at runtime
+    |
+120 |     typing.Iterator[int]
+121 | ):  # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax)
+122 |     def __iter__(
+    |         ^^^^^^^^ PYI034
+123 |         self,
+124 |     ) -> collections.abc.Iterator[
+    |
+    = help: Consider using `typing_extensions.Self` as return type
+
+PYI034.pyi:128:9: PYI034 `__iter__` methods in classes like `BadIterator4` usually return `self` at runtime
+    |
+128 | class BadIterator4(Iterator[int]):
+129 |     # Note: *Iterable*, not *Iterator*, returned!
+130 |     def __iter__(
+    |         ^^^^^^^^ PYI034
+131 |         self,
+132 |     ) -> Iterable[
+    |
+    = help: Consider using `typing_extensions.Self` as return type
+
+PYI034.pyi:142:9: PYI034 `__aiter__` methods in classes like `BadAsyncIterator` usually return `self` at runtime
+    |
+142 | class BadAsyncIterator(collections.abc.AsyncIterator[str]):
+143 |     def __aiter__(
+    |         ^^^^^^^^^ PYI034
+144 |         self,
+145 |     ) -> typing.AsyncIterator[
+    |
+    = help: Consider using `typing_extensions.Self` as return type
+
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI035_PYI035.py.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI035_PYI035.py.snap
new file mode 100644
index 0000000000000..d1aa2e9116558
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI035_PYI035.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI035_PYI035.pyi.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI035_PYI035.pyi.snap
new file mode 100644
index 0000000000000..7df25531e0bb4
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI035_PYI035.pyi.snap
@@ -0,0 +1,31 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+PYI035.pyi:1:1: PYI035 `__all__` in a stub file must have a value, as it has the same semantics as `__all__` at runtime
+  |
+1 | __all__: list[str]  # Error: PYI035
+  | ^^^^^^^^^^^^^^^^^^ PYI035
+2 | 
+3 | __all__: list[str] = ["foo"]
+  |
+
+PYI035.pyi:7:5: PYI035 `__match_args__` in a stub file must have a value, as it has the same semantics as `__match_args__` at runtime
+   |
+ 7 | class Foo:
+ 8 |     __all__: list[str]
+ 9 |     __match_args__: tuple[str, ...]  # Error: PYI035
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PYI035
+10 |     __slots__: tuple[str, ...]  # Error: PYI035
+   |
+
+PYI035.pyi:8:5: PYI035 `__slots__` in a stub file must have a value, as it has the same semantics as `__slots__` at runtime
+   |
+ 8 |     __all__: list[str]
+ 9 |     __match_args__: tuple[str, ...]  # Error: PYI035
+10 |     __slots__: tuple[str, ...]  # Error: PYI035
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^ PYI035
+11 | 
+12 | class Bar:
+   |
+
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI045_PYI045.py.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI045_PYI045.py.snap
new file mode 100644
index 0000000000000..d1aa2e9116558
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI045_PYI045.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI045_PYI045.pyi.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI045_PYI045.pyi.snap
new file mode 100644
index 0000000000000..54b29a0823cb0
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI045_PYI045.pyi.snap
@@ -0,0 +1,61 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+PYI045.pyi:9:27: PYI045 `__iter__` methods should return an `Iterator`, not an `Iterable`
+   |
+ 9 | class TypingIterableTReturn:
+10 |     def __iter__(self) -> typing.Iterable[int]: ...  # Error: PYI045
+   |                           ^^^^^^^^^^^^^^^^^^^^ PYI045
+11 |     def not_iter(self) -> typing.Iterable[int]: ...
+   |
+
+PYI045.pyi:13:27: PYI045 `__iter__` methods should return an `Iterator`, not an `Iterable`
+   |
+13 | class TypingIterableReturn:
+14 |     def __iter__(self) -> typing.Iterable: ...  # Error: PYI045
+   |                           ^^^^^^^^^^^^^^^ PYI045
+15 |     def not_iter(self) -> typing.Iterable: ...
+   |
+
+PYI045.pyi:17:27: PYI045 `__iter__` methods should return an `Iterator`, not an `Iterable`
+   |
+17 | class CollectionsIterableTReturn:
+18 |     def __iter__(self) -> collections.abc.Iterable[int]: ...  # Error: PYI045
+   |                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PYI045
+19 |     def not_iter(self) -> collections.abc.Iterable[int]: ...
+   |
+
+PYI045.pyi:21:27: PYI045 `__iter__` methods should return an `Iterator`, not an `Iterable`
+   |
+21 | class CollectionsIterableReturn:
+22 |     def __iter__(self) -> collections.abc.Iterable: ...  # Error: PYI045
+   |                           ^^^^^^^^^^^^^^^^^^^^^^^^ PYI045
+23 |     def not_iter(self) -> collections.abc.Iterable: ...
+   |
+
+PYI045.pyi:25:27: PYI045 `__iter__` methods should return an `Iterator`, not an `Iterable`
+   |
+25 | class IterableReturn:
+26 |     def __iter__(self) -> Iterable: ...  # Error: PYI045
+   |                           ^^^^^^^^ PYI045
+27 | 
+28 | class IteratorReturn:
+   |
+
+PYI045.pyi:46:28: PYI045 `__aiter__` methods should return an `AsyncIterator`, not an `AsyncIterable`
+   |
+46 | class TypingAsyncIterableTReturn:
+47 |     def __aiter__(self) -> typing.AsyncIterable[int]: ...  # Error: PYI045
+   |                            ^^^^^^^^^^^^^^^^^^^^^^^^^ PYI045
+48 | 
+49 | class TypingAsyncIterableReturn:
+   |
+
+PYI045.pyi:49:28: PYI045 `__aiter__` methods should return an `AsyncIterator`, not an `AsyncIterable`
+   |
+49 | class TypingAsyncIterableReturn:
+50 |     def __aiter__(self) -> typing.AsyncIterable: ...  # Error: PYI045
+   |                            ^^^^^^^^^^^^^^^^^^^^ PYI045
+   |
+
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI048_PYI048.py.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI048_PYI048.py.snap
new file mode 100644
index 0000000000000..d1aa2e9116558
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI048_PYI048.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI048_PYI048.pyi.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI048_PYI048.pyi.snap
new file mode 100644
index 0000000000000..725d9b7b4d068
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI048_PYI048.pyi.snap
@@ -0,0 +1,20 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+PYI048.pyi:11:5: PYI048 Function body must contain exactly one statement
+   |
+11 | def foo():   # ERROR PYI048
+   |     ^^^ PYI048
+12 |     """foo"""
+13 |     print("foo")
+   |
+
+PYI048.pyi:17:5: PYI048 Function body must contain exactly one statement
+   |
+17 | def buzz():   # ERROR PYI048
+   |     ^^^^ PYI048
+18 |     print("fizz")
+19 |     print("buzz")
+   |
+
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI050_PYI050.py.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI050_PYI050.py.snap
new file mode 100644
index 0000000000000..d1aa2e9116558
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI050_PYI050.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI050_PYI050.pyi.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI050_PYI050.pyi.snap
new file mode 100644
index 0000000000000..f4f7de2503b8f
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI050_PYI050.pyi.snap
@@ -0,0 +1,33 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+PYI050.pyi:6:24: PYI050 Prefer `typing_extensions.Never` over `NoReturn` for argument annotations
+   |
+ 6 | def foo(arg): ...
+ 7 | def foo_int(arg: int): ...
+ 8 | def foo_no_return(arg: NoReturn): ...  # Error: PYI050
+   |                        ^^^^^^^^ PYI050
+ 9 | def foo_no_return_typing_extensions(
+10 |     arg: typing_extensions.NoReturn,
+   |
+
+PYI050.pyi:10:44: PYI050 Prefer `typing_extensions.Never` over `NoReturn` for argument annotations
+   |
+10 |     arg: typing_extensions.NoReturn,
+11 | ): ...  # Error: PYI050
+12 | def foo_no_return_kwarg(arg: int, *, arg2: NoReturn): ...  # Error: PYI050
+   |                                            ^^^^^^^^ PYI050
+13 | def foo_no_return_pos_only(arg: int, /, arg2: NoReturn): ...  # Error: PYI050
+14 | def foo_never(arg: Never): ...
+   |
+
+PYI050.pyi:11:47: PYI050 Prefer `typing_extensions.Never` over `NoReturn` for argument annotations
+   |
+11 | ): ...  # Error: PYI050
+12 | def foo_no_return_kwarg(arg: int, *, arg2: NoReturn): ...  # Error: PYI050
+13 | def foo_no_return_pos_only(arg: int, /, arg2: NoReturn): ...  # Error: PYI050
+   |                                               ^^^^^^^^ PYI050
+14 | def foo_never(arg: Never): ...
+   |
+
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI052_PYI052.py.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI052_PYI052.py.snap
new file mode 100644
index 0000000000000..d1aa2e9116558
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI052_PYI052.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI052_PYI052.pyi.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI052_PYI052.pyi.snap
new file mode 100644
index 0000000000000..cda8ebb101e2a
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI052_PYI052.pyi.snap
@@ -0,0 +1,134 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+PYI052.pyi:14:10: PYI052 Need type annotation for `field5`
+   |
+14 | field43: int = -0xFFFFFFFF
+15 | field44: int = -1234567890
+16 | field5 = 0  # type: int  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")  # Y052 Need type annotation for "field5"
+   |          ^ PYI052
+17 | field6 = 0  # Y052 Need type annotation for "field6"
+18 | field7 = b""  # Y052 Need type annotation for "field7"
+   |
+
+PYI052.pyi:15:10: PYI052 Need type annotation for `field6`
+   |
+15 | field44: int = -1234567890
+16 | field5 = 0  # type: int  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")  # Y052 Need type annotation for "field5"
+17 | field6 = 0  # Y052 Need type annotation for "field6"
+   |          ^ PYI052
+18 | field7 = b""  # Y052 Need type annotation for "field7"
+19 | field71 = "foo"  # Y052 Need type annotation for "field71"
+   |
+
+PYI052.pyi:16:10: PYI052 Need type annotation for `field7`
+   |
+16 | field5 = 0  # type: int  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")  # Y052 Need type annotation for "field5"
+17 | field6 = 0  # Y052 Need type annotation for "field6"
+18 | field7 = b""  # Y052 Need type annotation for "field7"
+   |          ^^^ PYI052
+19 | field71 = "foo"  # Y052 Need type annotation for "field71"
+20 | field72: str = "foo"
+   |
+
+PYI052.pyi:17:11: PYI052 Need type annotation for `field71`
+   |
+17 | field6 = 0  # Y052 Need type annotation for "field6"
+18 | field7 = b""  # Y052 Need type annotation for "field7"
+19 | field71 = "foo"  # Y052 Need type annotation for "field71"
+   |           ^^^^^ PYI052
+20 | field72: str = "foo"
+21 | field8 = False  # Y052 Need type annotation for "field8"
+   |
+
+PYI052.pyi:19:10: PYI052 Need type annotation for `field8`
+   |
+19 | field71 = "foo"  # Y052 Need type annotation for "field71"
+20 | field72: str = "foo"
+21 | field8 = False  # Y052 Need type annotation for "field8"
+   |          ^^^^^ PYI052
+22 | field81 = -1  # Y052 Need type annotation for "field81"
+23 | field82: float = -98.43
+   |
+
+PYI052.pyi:20:11: PYI052 Need type annotation for `field81`
+   |
+20 | field72: str = "foo"
+21 | field8 = False  # Y052 Need type annotation for "field8"
+22 | field81 = -1  # Y052 Need type annotation for "field81"
+   |           ^^ PYI052
+23 | field82: float = -98.43
+24 | field83 = -42j  # Y052 Need type annotation for "field83"
+   |
+
+PYI052.pyi:22:11: PYI052 Need type annotation for `field83`
+   |
+22 | field81 = -1  # Y052 Need type annotation for "field81"
+23 | field82: float = -98.43
+24 | field83 = -42j  # Y052 Need type annotation for "field83"
+   |           ^^^^ PYI052
+25 | field84 = 5 + 42j  # Y052 Need type annotation for "field84"
+26 | field85 = -5 - 42j  # Y052 Need type annotation for "field85"
+   |
+
+PYI052.pyi:23:11: PYI052 Need type annotation for `field84`
+   |
+23 | field82: float = -98.43
+24 | field83 = -42j  # Y052 Need type annotation for "field83"
+25 | field84 = 5 + 42j  # Y052 Need type annotation for "field84"
+   |           ^^^^^^^ PYI052
+26 | field85 = -5 - 42j  # Y052 Need type annotation for "field85"
+27 | field9 = None  # Y026 Use typing_extensions.TypeAlias for type aliases, e.g. "field9: TypeAlias = None"
+   |
+
+PYI052.pyi:24:11: PYI052 Need type annotation for `field85`
+   |
+24 | field83 = -42j  # Y052 Need type annotation for "field83"
+25 | field84 = 5 + 42j  # Y052 Need type annotation for "field84"
+26 | field85 = -5 - 42j  # Y052 Need type annotation for "field85"
+   |           ^^^^^^^^ PYI052
+27 | field9 = None  # Y026 Use typing_extensions.TypeAlias for type aliases, e.g. "field9: TypeAlias = None"
+28 | Field95: TypeAlias = None
+   |
+
+PYI052.pyi:33:11: PYI052 Need type annotation for `field19`
+   |
+33 | Field100 = TypeVarTuple('Field100')
+34 | Field101 = ParamSpec('Field101')
+35 | field19 = [1, 2, 3]  # Y052 Need type annotation for "field19"
+   |           ^^^^^^^^^ PYI052
+36 | field191: list[int] = [1, 2, 3]
+37 | field20 = (1, 2, 3)  # Y052 Need type annotation for "field20"
+   |
+
+PYI052.pyi:35:11: PYI052 Need type annotation for `field20`
+   |
+35 | field19 = [1, 2, 3]  # Y052 Need type annotation for "field19"
+36 | field191: list[int] = [1, 2, 3]
+37 | field20 = (1, 2, 3)  # Y052 Need type annotation for "field20"
+   |           ^^^^^^^^^ PYI052
+38 | field201: tuple[int, ...] = (1, 2, 3)
+39 | field21 = {1, 2, 3}  # Y052 Need type annotation for "field21"
+   |
+
+PYI052.pyi:37:11: PYI052 Need type annotation for `field21`
+   |
+37 | field20 = (1, 2, 3)  # Y052 Need type annotation for "field20"
+38 | field201: tuple[int, ...] = (1, 2, 3)
+39 | field21 = {1, 2, 3}  # Y052 Need type annotation for "field21"
+   |           ^^^^^^^^^ PYI052
+40 | field211: set[int] = {1, 2, 3}
+41 | field212 = {"foo": "bar"}  # Y052 Need type annotation for "field212"
+   |
+
+PYI052.pyi:39:12: PYI052 Need type annotation for `field212`
+   |
+39 | field21 = {1, 2, 3}  # Y052 Need type annotation for "field21"
+40 | field211: set[int] = {1, 2, 3}
+41 | field212 = {"foo": "bar"}  # Y052 Need type annotation for "field212"
+   |            ^^^^^^^^^^^^^^ PYI052
+42 | field213: dict[str, str] = {"foo": "bar"}
+43 | field22: Final = {"foo": 5}
+   |
+
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI053_PYI053.py.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI053_PYI053.py.snap
new file mode 100644
index 0000000000000..d1aa2e9116558
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI053_PYI053.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI053_PYI053.pyi.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI053_PYI053.pyi.snap
new file mode 100644
index 0000000000000..8c3fa6898c535
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI053_PYI053.pyi.snap
@@ -0,0 +1,102 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+PYI053.pyi:3:14: PYI053 [*] String and bytes literals longer than 50 characters are not permitted
+  |
+3 | def f1(x: str = "50 character stringggggggggggggggggggggggggggggggg") -> None: ...  # OK
+4 | def f2(
+5 |     x: str = "51 character stringgggggggggggggggggggggggggggggggg",  # Error: PYI053
+  |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PYI053
+6 | ) -> None: ...
+7 | def f3(
+  |
+  = help: Replace with `...`
+
+ℹ Suggested fix
+1 1 | def f1(x: str = "50 character stringggggggggggggggggggggggggggggggg") -> None: ...  # OK
+2 2 | def f2(
+3   |-    x: str = "51 character stringgggggggggggggggggggggggggggggggg",  # Error: PYI053
+  3 |+    x: str = ...,  # Error: PYI053
+4 4 | ) -> None: ...
+5 5 | def f3(
+6 6 |     x: str = "50 character stringgggggggggggggggggggggggggggggg\U0001f600",  # OK
+
+PYI053.pyi:9:14: PYI053 [*] String and bytes literals longer than 50 characters are not permitted
+   |
+ 9 | ) -> None: ...
+10 | def f4(
+11 |     x: str = "51 character stringggggggggggggggggggggggggggggggg\U0001f600",  # Error: PYI053
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PYI053
+12 | ) -> None: ...
+13 | def f5(
+   |
+   = help: Replace with `...`
+
+ℹ Suggested fix
+6  6  |     x: str = "50 character stringgggggggggggggggggggggggggggggg\U0001f600",  # OK
+7  7  | ) -> None: ...
+8  8  | def f4(
+9     |-    x: str = "51 character stringggggggggggggggggggggggggggggggg\U0001f600",  # Error: PYI053
+   9  |+    x: str = ...,  # Error: PYI053
+10 10 | ) -> None: ...
+11 11 | def f5(
+12 12 |     x: bytes = b"50 character byte stringgggggggggggggggggggggggggg",  # OK
+
+PYI053.pyi:21:16: PYI053 [*] String and bytes literals longer than 50 characters are not permitted
+   |
+21 | ) -> None: ...
+22 | def f8(
+23 |     x: bytes = b"51 character byte stringgggggggggggggggggggggggggg\xff",  # Error: PYI053
+   |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PYI053
+24 | ) -> None: ...
+   |
+   = help: Replace with `...`
+
+ℹ Suggested fix
+18 18 |     x: bytes = b"50 character byte stringggggggggggggggggggggggggg\xff",  # OK
+19 19 | ) -> None: ...
+20 20 | def f8(
+21    |-    x: bytes = b"51 character byte stringgggggggggggggggggggggggggg\xff",  # Error: PYI053
+   21 |+    x: bytes = ...,  # Error: PYI053
+22 22 | ) -> None: ...
+23 23 | 
+24 24 | foo: str = "50 character stringggggggggggggggggggggggggggggggg"  # OK
+
+PYI053.pyi:26:12: PYI053 [*] String and bytes literals longer than 50 characters are not permitted
+   |
+26 | foo: str = "50 character stringggggggggggggggggggggggggggggggg"  # OK
+27 | 
+28 | bar: str = "51 character stringgggggggggggggggggggggggggggggggg"  # Error: PYI053
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PYI053
+29 | 
+30 | baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg"  # OK
+   |
+   = help: Replace with `...`
+
+ℹ Suggested fix
+23 23 | 
+24 24 | foo: str = "50 character stringggggggggggggggggggggggggggggggg"  # OK
+25 25 | 
+26    |-bar: str = "51 character stringgggggggggggggggggggggggggggggggg"  # Error: PYI053
+   26 |+bar: str = ...  # Error: PYI053
+27 27 | 
+28 28 | baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg"  # OK
+29 29 | 
+
+PYI053.pyi:30:14: PYI053 [*] String and bytes literals longer than 50 characters are not permitted
+   |
+30 | baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg"  # OK
+31 | 
+32 | qux: bytes = b"51 character byte stringggggggggggggggggggggggggggg\xff"  # Error: PYI053
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PYI053
+   |
+   = help: Replace with `...`
+
+ℹ Suggested fix
+27 27 | 
+28 28 | baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg"  # OK
+29 29 | 
+30    |-qux: bytes = b"51 character byte stringggggggggggggggggggggggggggg\xff"  # Error: PYI053
+   30 |+qux: bytes = ...  # Error: PYI053
+
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI054_PYI054.py.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI054_PYI054.py.snap
new file mode 100644
index 0000000000000..d1aa2e9116558
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI054_PYI054.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI054_PYI054.pyi.snap b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI054_PYI054.pyi.snap
new file mode 100644
index 0000000000000..b31422cdda1f8
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_pyi/snapshots/ruff__rules__flake8_pyi__tests__PYI054_PYI054.pyi.snap
@@ -0,0 +1,161 @@
+---
+source: crates/ruff/src/rules/flake8_pyi/mod.rs
+---
+PYI054.pyi:2:16: PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted
+  |
+2 | field01: int = 0xFFFFFFFF
+3 | field02: int = 0xFFFFFFFFF  # Error: PYI054
+  |                ^^^^^^^^^^^ PYI054
+4 | field03: int = -0xFFFFFFFF
+5 | field04: int = -0xFFFFFFFFF  # Error: PYI054
+  |
+  = help: Replace with `...`
+
+ℹ Suggested fix
+1 1 | field01: int = 0xFFFFFFFF
+2   |-field02: int = 0xFFFFFFFFF  # Error: PYI054
+  2 |+field02: int = ...  # Error: PYI054
+3 3 | field03: int = -0xFFFFFFFF
+4 4 | field04: int = -0xFFFFFFFFF  # Error: PYI054
+5 5 | 
+
+PYI054.pyi:4:17: PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted
+  |
+4 | field02: int = 0xFFFFFFFFF  # Error: PYI054
+5 | field03: int = -0xFFFFFFFF
+6 | field04: int = -0xFFFFFFFFF  # Error: PYI054
+  |                 ^^^^^^^^^^^ PYI054
+7 | 
+8 | field05: int = 1234567890
+  |
+  = help: Replace with `...`
+
+ℹ Suggested fix
+1 1 | field01: int = 0xFFFFFFFF
+2 2 | field02: int = 0xFFFFFFFFF  # Error: PYI054
+3 3 | field03: int = -0xFFFFFFFF
+4   |-field04: int = -0xFFFFFFFFF  # Error: PYI054
+  4 |+field04: int = -...  # Error: PYI054
+5 5 | 
+6 6 | field05: int = 1234567890
+7 7 | field06: int = 12_456_890
+
+PYI054.pyi:8:16: PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted
+   |
+ 8 | field05: int = 1234567890
+ 9 | field06: int = 12_456_890
+10 | field07: int = 12345678901  # Error: PYI054
+   |                ^^^^^^^^^^^ PYI054
+11 | field08: int = -1234567801
+12 | field09: int = -234_567_890  # Error: PYI054
+   |
+   = help: Replace with `...`
+
+ℹ Suggested fix
+5 5 | 
+6 6 | field05: int = 1234567890
+7 7 | field06: int = 12_456_890
+8   |-field07: int = 12345678901  # Error: PYI054
+  8 |+field07: int = ...  # Error: PYI054
+9 9 | field08: int = -1234567801
+10 10 | field09: int = -234_567_890  # Error: PYI054
+11 11 | 
+
+PYI054.pyi:10:17: PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted
+   |
+10 | field07: int = 12345678901  # Error: PYI054
+11 | field08: int = -1234567801
+12 | field09: int = -234_567_890  # Error: PYI054
+   |                 ^^^^^^^^^^^ PYI054
+13 | 
+14 | field10: float = 123.456789
+   |
+   = help: Replace with `...`
+
+ℹ Suggested fix
+7  7  | field06: int = 12_456_890
+8  8  | field07: int = 12345678901  # Error: PYI054
+9  9  | field08: int = -1234567801
+10    |-field09: int = -234_567_890  # Error: PYI054
+   10 |+field09: int = -...  # Error: PYI054
+11 11 | 
+12 12 | field10: float = 123.456789
+13 13 | field11: float = 123.4567890  # Error: PYI054
+
+PYI054.pyi:13:18: PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted
+   |
+13 | field10: float = 123.456789
+14 | field11: float = 123.4567890  # Error: PYI054
+   |                  ^^^^^^^^^^^ PYI054
+15 | field12: float = -123.456789
+16 | field13: float = -123.567_890  # Error: PYI054
+   |
+   = help: Replace with `...`
+
+ℹ Suggested fix
+10 10 | field09: int = -234_567_890  # Error: PYI054
+11 11 | 
+12 12 | field10: float = 123.456789
+13    |-field11: float = 123.4567890  # Error: PYI054
+   13 |+field11: float = ...  # Error: PYI054
+14 14 | field12: float = -123.456789
+15 15 | field13: float = -123.567_890  # Error: PYI054
+16 16 | 
+
+PYI054.pyi:15:19: PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted
+   |
+15 | field11: float = 123.4567890  # Error: PYI054
+16 | field12: float = -123.456789
+17 | field13: float = -123.567_890  # Error: PYI054
+   |                   ^^^^^^^^^^^ PYI054
+18 | 
+19 | field14: complex = 1e1234567j
+   |
+   = help: Replace with `...`
+
+ℹ Suggested fix
+12 12 | field10: float = 123.456789
+13 13 | field11: float = 123.4567890  # Error: PYI054
+14 14 | field12: float = -123.456789
+15    |-field13: float = -123.567_890  # Error: PYI054
+   15 |+field13: float = -...  # Error: PYI054
+16 16 | 
+17 17 | field14: complex = 1e1234567j
+18 18 | field15: complex = 1e12345678j  # Error: PYI054
+
+PYI054.pyi:18:20: PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted
+   |
+18 | field14: complex = 1e1234567j
+19 | field15: complex = 1e12345678j  # Error: PYI054
+   |                    ^^^^^^^^^^^ PYI054
+20 | field16: complex = -1e1234567j
+21 | field17: complex = 1e123456789j  # Error: PYI054
+   |
+   = help: Replace with `...`
+
+ℹ Suggested fix
+15 15 | field13: float = -123.567_890  # Error: PYI054
+16 16 | 
+17 17 | field14: complex = 1e1234567j
+18    |-field15: complex = 1e12345678j  # Error: PYI054
+   18 |+field15: complex = ...  # Error: PYI054
+19 19 | field16: complex = -1e1234567j
+20 20 | field17: complex = 1e123456789j  # Error: PYI054
+
+PYI054.pyi:20:20: PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted
+   |
+20 | field15: complex = 1e12345678j  # Error: PYI054
+21 | field16: complex = -1e1234567j
+22 | field17: complex = 1e123456789j  # Error: PYI054
+   |                    ^^^^^^^^^^^^ PYI054
+   |
+   = help: Replace with `...`
+
+ℹ Suggested fix
+17 17 | field14: complex = 1e1234567j
+18 18 | field15: complex = 1e12345678j  # Error: PYI054
+19 19 | field16: complex = -1e1234567j
+20    |-field17: complex = 1e123456789j  # Error: PYI054
+   20 |+field17: complex = ...  # Error: PYI054
+
+
diff --git a/crates/ruff/src/rules/flake8_pytest_style/mod.rs b/crates/ruff/src/rules/flake8_pytest_style/mod.rs
index 1ef7da6cf0020..c36222950e15c 100644
--- a/crates/ruff/src/rules/flake8_pytest_style/mod.rs
+++ b/crates/ruff/src/rules/flake8_pytest_style/mod.rs
@@ -8,7 +8,6 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
@@ -18,7 +17,12 @@ mod tests {
     use super::settings::Settings;
     use super::types;
 
-    #[test_case(Rule::PytestFixtureIncorrectParenthesesStyle, Path::new("PT001.py"), Settings::default(), "PT001_default"; "PT001_0")]
+    #[test_case(
+        Rule::PytestFixtureIncorrectParenthesesStyle,
+        Path::new("PT001.py"),
+        Settings::default(),
+        "PT001_default"
+    )]
     #[test_case(
         Rule::PytestFixtureIncorrectParenthesesStyle,
         Path::new("PT001.py"),
@@ -26,14 +30,38 @@ mod tests {
             fixture_parentheses: false,
             ..Settings::default()
         },
-        "PT001_no_parentheses";
-        "PT001_1"
+        "PT001_no_parentheses"
+    )]
+    #[test_case(
+        Rule::PytestFixturePositionalArgs,
+        Path::new("PT002.py"),
+        Settings::default(),
+        "PT002"
+    )]
+    #[test_case(
+        Rule::PytestExtraneousScopeFunction,
+        Path::new("PT003.py"),
+        Settings::default(),
+        "PT003"
+    )]
+    #[test_case(
+        Rule::PytestMissingFixtureNameUnderscore,
+        Path::new("PT004.py"),
+        Settings::default(),
+        "PT004"
+    )]
+    #[test_case(
+        Rule::PytestIncorrectFixtureNameUnderscore,
+        Path::new("PT005.py"),
+        Settings::default(),
+        "PT005"
+    )]
+    #[test_case(
+        Rule::PytestParametrizeNamesWrongType,
+        Path::new("PT006.py"),
+        Settings::default(),
+        "PT006_default"
     )]
-    #[test_case(Rule::PytestFixturePositionalArgs, Path::new("PT002.py"), Settings::default(), "PT002"; "PT002")]
-    #[test_case(Rule::PytestExtraneousScopeFunction, Path::new("PT003.py"), Settings::default(), "PT003"; "PT003")]
-    #[test_case(Rule::PytestMissingFixtureNameUnderscore, Path::new("PT004.py"), Settings::default(), "PT004"; "PT004")]
-    #[test_case(Rule::PytestIncorrectFixtureNameUnderscore, Path::new("PT005.py"), Settings::default(), "PT005"; "PT005")]
-    #[test_case(Rule::PytestParametrizeNamesWrongType, Path::new("PT006.py"), Settings::default(), "PT006_default"; "PT006_0")]
     #[test_case(
         Rule::PytestParametrizeNamesWrongType,
         Path::new("PT006.py"),
@@ -41,8 +69,7 @@ mod tests {
             parametrize_names_type: types::ParametrizeNameType::Csv,
             ..Settings::default()
         },
-        "PT006_csv";
-        "PT006_1"
+        "PT006_csv"
     )]
     #[test_case(
         Rule::PytestParametrizeNamesWrongType,
@@ -51,15 +78,13 @@ mod tests {
             parametrize_names_type: types::ParametrizeNameType::List,
             ..Settings::default()
         },
-        "PT006_list";
-        "PT006_2"
+        "PT006_list"
     )]
     #[test_case(
         Rule::PytestParametrizeValuesWrongType,
         Path::new("PT007.py"),
         Settings::default(),
-        "PT007_list_of_tuples";
-        "PT007_0"
+        "PT007_list_of_tuples"
     )]
     #[test_case(
         Rule::PytestParametrizeValuesWrongType,
@@ -68,8 +93,7 @@ mod tests {
             parametrize_values_type: types::ParametrizeValuesType::Tuple,
             ..Settings::default()
         },
-        "PT007_tuple_of_tuples";
-        "PT007_1"
+        "PT007_tuple_of_tuples"
     )]
     #[test_case(
         Rule::PytestParametrizeValuesWrongType,
@@ -79,8 +103,7 @@ mod tests {
             parametrize_values_row_type: types::ParametrizeValuesRowType::List,
             ..Settings::default()
         },
-        "PT007_tuple_of_lists";
-        "PT007_2"
+        "PT007_tuple_of_lists"
     )]
     #[test_case(
         Rule::PytestParametrizeValuesWrongType,
@@ -89,14 +112,12 @@ mod tests {
             parametrize_values_row_type: types::ParametrizeValuesRowType::List,
             ..Settings::default()
         },
-        "PT007_list_of_lists";
-        "PT007_3"
+        "PT007_list_of_lists"
     )]
     #[test_case(
         Rule::PytestPatchWithLambda,
         Path::new("PT008.py"),
         Settings::default(),
-        "PT008";
         "PT008"
     )]
     #[test_case(
@@ -106,13 +127,17 @@ mod tests {
         "PT009";
         "PT009"
     )]
-    #[test_case(Rule::PytestRaisesWithoutException, Path::new("PT010.py"), Settings::default(), "PT010"; "PT0010")]
+    #[test_case(
+        Rule::PytestRaisesWithoutException,
+        Path::new("PT010.py"),
+        Settings::default(),
+        "PT010"
+    )]
     #[test_case(
         Rule::PytestRaisesTooBroad,
         Path::new("PT011.py"),
         Settings::default(),
-        "PT011_default";
-        "PT011_0"
+        "PT011_default"
     )]
     #[test_case(
         Rule::PytestRaisesTooBroad,
@@ -121,8 +146,7 @@ mod tests {
             raises_extend_require_match_for: vec!["ZeroDivisionError".to_string()],
             ..Settings::default()
         },
-        "PT011_extend_broad_exceptions";
-        "PT011_1"
+        "PT011_extend_broad_exceptions"
     )]
     #[test_case(
         Rule::PytestRaisesTooBroad,
@@ -131,85 +155,73 @@ mod tests {
             raises_require_match_for: vec!["ZeroDivisionError".to_string()],
             ..Settings::default()
         },
-        "PT011_replace_broad_exceptions";
-        "PT011_2"
+        "PT011_replace_broad_exceptions"
     )]
     #[test_case(
         Rule::PytestRaisesWithMultipleStatements,
         Path::new("PT012.py"),
         Settings::default(),
-        "PT012";
         "PT012"
     )]
     #[test_case(
         Rule::PytestIncorrectPytestImport,
         Path::new("PT013.py"),
         Settings::default(),
-        "PT013";
         "PT013"
     )]
     #[test_case(
         Rule::PytestAssertAlwaysFalse,
         Path::new("PT015.py"),
         Settings::default(),
-        "PT015";
         "PT015"
     )]
     #[test_case(
         Rule::PytestFailWithoutMessage,
         Path::new("PT016.py"),
         Settings::default(),
-        "PT016";
         "PT016"
     )]
     #[test_case(
         Rule::PytestAssertInExcept,
         Path::new("PT017.py"),
         Settings::default(),
-        "PT017";
         "PT017"
     )]
     #[test_case(
         Rule::PytestCompositeAssertion,
         Path::new("PT018.py"),
         Settings::default(),
-        "PT018";
         "PT018"
     )]
     #[test_case(
         Rule::PytestFixtureParamWithoutValue,
         Path::new("PT019.py"),
         Settings::default(),
-        "PT019";
         "PT019"
     )]
     #[test_case(
         Rule::PytestDeprecatedYieldFixture,
         Path::new("PT020.py"),
         Settings::default(),
-        "PT020";
         "PT020"
     )]
     #[test_case(
         Rule::PytestFixtureFinalizerCallback,
         Path::new("PT021.py"),
         Settings::default(),
-        "PT021";
         "PT021"
     )]
     #[test_case(
         Rule::PytestUselessYieldFixture,
         Path::new("PT022.py"),
         Settings::default(),
-        "PT022";
         "PT022"
     )]
     #[test_case(
         Rule::PytestIncorrectMarkParenthesesStyle,
         Path::new("PT023.py"),
         Settings::default(),
-        "PT023_default";
-        "PT023_0"
+        "PT023_default"
     )]
     #[test_case(
         Rule::PytestIncorrectMarkParenthesesStyle,
@@ -218,28 +230,24 @@ mod tests {
             mark_parentheses: false,
             ..Settings::default()
         },
-        "PT023_no_parentheses";
-        "PT023_1"
+        "PT023_no_parentheses"
     )]
     #[test_case(
         Rule::PytestUnnecessaryAsyncioMarkOnFixture,
         Path::new("PT024.py"),
         Settings::default(),
-        "PT024";
         "PT024"
     )]
     #[test_case(
         Rule::PytestErroneousUseFixturesOnFixture,
         Path::new("PT025.py"),
         Settings::default(),
-        "PT025";
         "PT025"
     )]
     #[test_case(
         Rule::PytestUseFixturesWithoutParameters,
         Path::new("PT026.py"),
         Settings::default(),
-        "PT026";
         "PT026"
     )]
     fn test_pytest_style(
diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/assertion.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/assertion.rs
index df6ef9c688192..ee2f4f7c1033c 100644
--- a/crates/ruff/src/rules/flake8_pytest_style/rules/assertion.rs
+++ b/crates/ruff/src/rules/flake8_pytest_style/rules/assertion.rs
@@ -1,22 +1,24 @@
+use std::borrow::Cow;
+
 use anyhow::bail;
 use anyhow::Result;
 use libcst_native::{
-    Assert, BooleanOp, Codegen, CodegenState, CompoundStatement, Expression,
-    ParenthesizableWhitespace, ParenthesizedNode, SimpleStatementLine, SimpleWhitespace,
-    SmallStatement, Statement, Suite, TrailingWhitespace, UnaryOp, UnaryOperation,
-};
-use rustpython_parser::ast::{
-    Boolop, Excepthandler, ExcepthandlerKind, Expr, ExprKind, Keyword, Stmt, StmtKind, Unaryop,
+    Assert, BooleanOp, CompoundStatement, Expression, ParenthesizableWhitespace, ParenthesizedNode,
+    SimpleStatementLine, SimpleWhitespace, SmallStatement, Statement, TrailingWhitespace, UnaryOp,
+    UnaryOperation,
 };
+use rustpython_parser::ast::{self, Boolop, Excepthandler, Expr, Keyword, Ranged, Stmt, Unaryop};
 
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Violation};
+use crate::autofix::codemods::CodegenStylist;
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::{has_comments_in, unparse_stmt, Truthiness};
+use ruff_python_ast::helpers::{has_comments_in, Truthiness};
 use ruff_python_ast::source_code::{Locator, Stylist};
 use ruff_python_ast::visitor::Visitor;
 use ruff_python_ast::{visitor, whitespace};
 
 use crate::checkers::ast::Checker;
+use crate::cst::matchers::match_indented_block;
 use crate::cst::matchers::match_module;
 use crate::registry::AsRule;
 
@@ -51,9 +53,7 @@ use super::unittest_assert::UnittestAssert;
 ///     assert not something_else
 /// ```
 #[violation]
-pub struct PytestCompositeAssertion {
-    pub fixable: bool,
-}
+pub struct PytestCompositeAssertion;
 
 impl Violation for PytestCompositeAssertion {
     const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
@@ -63,15 +63,14 @@ impl Violation for PytestCompositeAssertion {
         format!("Assertion should be broken down into multiple parts")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable
-            .then_some(|_| format!("Break down assertion into multiple parts"))
+    fn autofix_title(&self) -> Option<String> {
+        Some("Break down assertion into multiple parts".to_string())
     }
 }
 
 #[violation]
 pub struct PytestAssertInExcept {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for PytestAssertInExcept {
@@ -96,8 +95,7 @@ impl Violation for PytestAssertAlwaysFalse {
 
 #[violation]
 pub struct PytestUnittestAssertion {
-    pub assertion: String,
-    pub fixable: bool,
+    assertion: String,
 }
 
 impl Violation for PytestUnittestAssertion {
@@ -105,15 +103,13 @@ impl Violation for PytestUnittestAssertion {
 
     #[derive_message_formats]
     fn message(&self) -> String {
-        let PytestUnittestAssertion { assertion, .. } = self;
+        let PytestUnittestAssertion { assertion } = self;
         format!("Use a regular `assert` instead of unittest-style `{assertion}`")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable
-            .then_some(|PytestUnittestAssertion { assertion, .. }| {
-                format!("Replace `{assertion}(...)` with `assert ...`")
-            })
+    fn autofix_title(&self) -> Option<String> {
+        let PytestUnittestAssertion { assertion } = self;
+        Some(format!("Replace `{assertion}(...)` with `assert ...`"))
     }
 }
 
@@ -140,8 +136,8 @@ where
     'b: 'a,
 {
     fn visit_stmt(&mut self, stmt: &'a Stmt) {
-        match &stmt.node {
-            StmtKind::Assert { .. } => {
+        match stmt {
+            Stmt::Assert(_) => {
                 self.current_assert = Some(stmt);
                 visitor::walk_stmt(self, stmt);
                 self.current_assert = None;
@@ -151,8 +147,8 @@ where
     }
 
     fn visit_expr(&mut self, expr: &'a Expr) {
-        match &expr.node {
-            ExprKind::Name { id, .. } => {
+        match expr {
+            Expr::Name(ast::ExprName { id, .. }) => {
                 if let Some(current_assert) = self.current_assert {
                     if id.as_str() == self.exception_name {
                         self.errors.push(Diagnostic::new(
@@ -179,34 +175,37 @@ fn check_assert_in_except(name: &str, body: &[Stmt]) -> Vec<Diagnostic> {
 }
 
 /// PT009
-pub fn unittest_assertion(
+pub(crate) fn unittest_assertion(
     checker: &Checker,
     expr: &Expr,
     func: &Expr,
     args: &[Expr],
     keywords: &[Keyword],
 ) -> Option<Diagnostic> {
-    match &func.node {
-        ExprKind::Attribute { attr, .. } => {
+    match func {
+        Expr::Attribute(ast::ExprAttribute { attr, .. }) => {
             if let Ok(unittest_assert) = UnittestAssert::try_from(attr.as_str()) {
-                // We're converting an expression to a statement, so avoid applying the fix if
-                // the assertion is part of a larger expression.
-                let fixable = checker.ctx.current_expr_parent().is_none()
-                    && matches!(checker.ctx.current_stmt().node, StmtKind::Expr { .. })
-                    && !has_comments_in(expr.range(), checker.locator);
                 let mut diagnostic = Diagnostic::new(
                     PytestUnittestAssertion {
                         assertion: unittest_assert.to_string(),
-                        fixable,
                     },
                     func.range(),
                 );
-                if fixable && checker.patch(diagnostic.kind.rule()) {
-                    if let Ok(stmt) = unittest_assert.generate_assert(args, keywords) {
-                        diagnostic.set_fix(Edit::range_replacement(
-                            unparse_stmt(&stmt, checker.stylist),
-                            expr.range(),
-                        ));
+                if checker.patch(diagnostic.kind.rule()) {
+                    // We're converting an expression to a statement, so avoid applying the fix if
+                    // the assertion is part of a larger expression.
+                    if checker.semantic_model().stmt().is_expr_stmt()
+                        && checker.semantic_model().expr_parent().is_none()
+                        && !checker.semantic_model().scope().kind.is_lambda()
+                        && !has_comments_in(expr.range(), checker.locator)
+                    {
+                        if let Ok(stmt) = unittest_assert.generate_assert(args, keywords) {
+                            #[allow(deprecated)]
+                            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                                checker.generator().stmt(&stmt),
+                                expr.range(),
+                            )));
+                        }
                     }
                 }
                 Some(diagnostic)
@@ -219,8 +218,8 @@ pub fn unittest_assertion(
 }
 
 /// PT015
-pub fn assert_falsy(checker: &mut Checker, stmt: &Stmt, test: &Expr) {
-    if Truthiness::from_expr(test, |id| checker.ctx.is_builtin(id)).is_falsey() {
+pub(crate) fn assert_falsy(checker: &mut Checker, stmt: &Stmt, test: &Expr) {
+    if Truthiness::from_expr(test, |id| checker.semantic_model().is_builtin(id)).is_falsey() {
         checker
             .diagnostics
             .push(Diagnostic::new(PytestAssertAlwaysFalse, stmt.range()));
@@ -228,11 +227,13 @@ pub fn assert_falsy(checker: &mut Checker, stmt: &Stmt, test: &Expr) {
 }
 
 /// PT017
-pub fn assert_in_exception_handler(handlers: &[Excepthandler]) -> Vec<Diagnostic> {
+pub(crate) fn assert_in_exception_handler(handlers: &[Excepthandler]) -> Vec<Diagnostic> {
     handlers
         .iter()
-        .flat_map(|handler| match &handler.node {
-            ExcepthandlerKind::ExceptHandler { name, body, .. } => {
+        .flat_map(|handler| match handler {
+            Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler {
+                name, body, ..
+            }) => {
                 if let Some(name) = name {
                     check_assert_in_except(name, body)
                 } else {
@@ -259,29 +260,31 @@ enum CompositionKind {
 /// For example, `a and b` or `not (a or b)`. The latter is equivalent to
 /// `not a and not b` by De Morgan's laws.
 fn is_composite_condition(test: &Expr) -> CompositionKind {
-    match &test.node {
-        ExprKind::BoolOp {
+    match test {
+        Expr::BoolOp(ast::ExprBoolOp {
             op: Boolop::And, ..
-        } => {
+        }) => {
             return CompositionKind::Simple;
         }
-        ExprKind::UnaryOp {
+        Expr::UnaryOp(ast::ExprUnaryOp {
             op: Unaryop::Not,
             operand,
-        } => {
-            if let ExprKind::BoolOp {
+            range: _,
+        }) => {
+            if let Expr::BoolOp(ast::ExprBoolOp {
                 op: Boolop::Or,
                 values,
-            } = &operand.node
+                range: _,
+            }) = operand.as_ref()
             {
                 // Only split cases without mixed `and` and `or`.
                 return if values.iter().all(|expr| {
                     !matches!(
-                        expr.node,
-                        ExprKind::BoolOp {
+                        expr,
+                        Expr::BoolOp(ast::ExprBoolOp {
                             op: Boolop::And,
                             ..
-                        }
+                        })
                     )
                 }) {
                     CompositionKind::Simple
@@ -323,30 +326,40 @@ fn fix_composite_condition(stmt: &Stmt, locator: &Locator, stylist: &Stylist) ->
     // Extract the module text.
     let contents = locator.lines(stmt.range());
 
-    // "Embed" it in a function definition, to preserve indentation while retaining valid source
-    // code. (We'll strip the prefix later on.)
-    let module_text = format!("def f():{}{contents}", stylist.line_ending().as_str());
+    // If the block is indented, "embed" it in a function definition, to preserve
+    // indentation while retaining valid source code. (We'll strip the prefix later
+    // on.)
+    let module_text = if outer_indent.is_empty() {
+        Cow::Borrowed(contents)
+    } else {
+        Cow::Owned(format!(
+            "def f():{}{contents}",
+            stylist.line_ending().as_str()
+        ))
+    };
 
     // Parse the CST.
     let mut tree = match_module(&module_text)?;
 
     // Extract the assert statement.
-    let statements: &mut Vec<Statement> = {
+    let statements = if outer_indent.is_empty() {
+        &mut tree.body
+    } else {
         let [Statement::Compound(CompoundStatement::FunctionDef(embedding))] = &mut *tree.body else {
             bail!("Expected statement to be embedded in a function definition")
         };
 
-        let Suite::IndentedBlock(indented_block) = &mut embedding.body else {
-            bail!("Expected indented block")
-        };
+        let indented_block = match_indented_block(&mut embedding.body)?;
         indented_block.indent = Some(outer_indent);
 
         &mut indented_block.body
     };
-    let [Statement::Simple(simple_statement_line)] = statements.as_mut_slice() else {
+
+    let [Statement::Simple(simple_statement_line)] = &statements[..] else {
         bail!("Expected one simple statement")
     };
-    let [SmallStatement::Assert(assert_statement)] = &mut *simple_statement_line.body else {
+
+    let [SmallStatement::Assert(assert_statement)] = &simple_statement_line.body[..] else {
         bail!("Expected simple statement to be an assert")
     };
 
@@ -398,19 +411,16 @@ fn fix_composite_condition(stmt: &Stmt, locator: &Locator, stylist: &Stylist) ->
         }));
     }
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
-
     // Reconstruct and reformat the code.
-    let module_text = state.to_string();
-    let contents = module_text
-        .strip_prefix(&format!("def f():{}", stylist.line_ending().as_str()))
-        .unwrap()
-        .to_string();
+    let module_text = tree.codegen_stylist(stylist);
+    let contents = if outer_indent.is_empty() {
+        module_text
+    } else {
+        module_text
+            .strip_prefix(&format!("def f():{}", stylist.line_ending().as_str()))
+            .unwrap()
+            .to_string()
+    };
 
     let range = locator.full_lines_range(stmt.range());
 
@@ -418,16 +428,25 @@ fn fix_composite_condition(stmt: &Stmt, locator: &Locator, stylist: &Stylist) ->
 }
 
 /// PT018
-pub fn composite_condition(checker: &mut Checker, stmt: &Stmt, test: &Expr, msg: Option<&Expr>) {
+pub(crate) fn composite_condition(
+    checker: &mut Checker,
+    stmt: &Stmt,
+    test: &Expr,
+    msg: Option<&Expr>,
+) {
     let composite = is_composite_condition(test);
     if matches!(composite, CompositionKind::Simple | CompositionKind::Mixed) {
-        let fixable = matches!(composite, CompositionKind::Simple)
-            && msg.is_none()
-            && !has_comments_in(stmt.range(), checker.locator);
-        let mut diagnostic = Diagnostic::new(PytestCompositeAssertion { fixable }, stmt.range());
-        if fixable && checker.patch(diagnostic.kind.rule()) {
-            diagnostic
-                .try_set_fix(|| fix_composite_condition(stmt, checker.locator, checker.stylist));
+        let mut diagnostic = Diagnostic::new(PytestCompositeAssertion, stmt.range());
+        if checker.patch(diagnostic.kind.rule()) {
+            if matches!(composite, CompositionKind::Simple)
+                && msg.is_none()
+                && !has_comments_in(stmt.range(), checker.locator)
+            {
+                #[allow(deprecated)]
+                diagnostic.try_set_fix_from_edit(|| {
+                    fix_composite_condition(stmt, checker.locator, checker.stylist)
+                });
+            }
         }
         checker.diagnostics.push(diagnostic);
     }
diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/fail.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/fail.rs
index 842092ee13bcc..6faa0915f4397 100644
--- a/crates/ruff/src/rules/flake8_pytest_style/rules/fail.rs
+++ b/crates/ruff/src/rules/flake8_pytest_style/rules/fail.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, Keyword};
+use rustpython_parser::ast::{Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -18,8 +18,8 @@ impl Violation for PytestFailWithoutMessage {
     }
 }
 
-pub fn fail_call(checker: &mut Checker, func: &Expr, args: &[Expr], keywords: &[Keyword]) {
-    if is_pytest_fail(func, checker) {
+pub(crate) fn fail_call(checker: &mut Checker, func: &Expr, args: &[Expr], keywords: &[Keyword]) {
+    if is_pytest_fail(checker.semantic_model(), func) {
         let call_args = SimpleCallArgs::new(args, keywords);
         let msg = call_args.argument("msg", 0);
 
diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/fixture.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/fixture.rs
index f98ace22b240e..6d019d9000913 100644
--- a/crates/ruff/src/rules/flake8_pytest_style/rules/fixture.rs
+++ b/crates/ruff/src/rules/flake8_pytest_style/rules/fixture.rs
@@ -1,49 +1,68 @@
+use std::fmt;
+
 use anyhow::Result;
 use ruff_text_size::{TextLen, TextRange, TextSize};
-use rustpython_parser::ast::{Arguments, Expr, ExprKind, Keyword, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Arguments, Expr, Keyword, Ranged, Stmt};
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Violation};
-use ruff_diagnostics::{Diagnostic, Edit};
+use ruff_diagnostics::{Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::call_path::collect_call_path;
 use ruff_python_ast::helpers::collect_arg_names;
 use ruff_python_ast::source_code::Locator;
 use ruff_python_ast::visitor::Visitor;
 use ruff_python_ast::{helpers, visitor};
+use ruff_python_semantic::analyze::visibility::is_abstract;
+use ruff_python_semantic::model::SemanticModel;
 
-use crate::autofix::actions::remove_argument;
+use crate::autofix::edits::remove_argument;
 use crate::checkers::ast::Checker;
 use crate::registry::{AsRule, Rule};
 
 use super::helpers::{
-    get_mark_decorators, is_abstractmethod_decorator, is_pytest_fixture, is_pytest_yield_fixture,
-    keyword_is_literal,
+    get_mark_decorators, is_pytest_fixture, is_pytest_yield_fixture, keyword_is_literal,
 };
 
+#[derive(Debug, PartialEq, Eq)]
+pub(crate) enum Parentheses {
+    None,
+    Empty,
+}
+
+impl fmt::Display for Parentheses {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Parentheses::None => fmt.write_str(""),
+            Parentheses::Empty => fmt.write_str("()"),
+        }
+    }
+}
+
 #[violation]
 pub struct PytestFixtureIncorrectParenthesesStyle {
-    pub expected_parens: String,
-    pub actual_parens: String,
+    expected: Parentheses,
+    actual: Parentheses,
 }
 
 impl AlwaysAutofixableViolation for PytestFixtureIncorrectParenthesesStyle {
     #[derive_message_formats]
     fn message(&self) -> String {
-        let PytestFixtureIncorrectParenthesesStyle {
-            expected_parens,
-            actual_parens,
-        } = self;
-        format!("Use `@pytest.fixture{expected_parens}` over `@pytest.fixture{actual_parens}`")
+        let PytestFixtureIncorrectParenthesesStyle { expected, actual } = self;
+        format!("Use `@pytest.fixture{expected}` over `@pytest.fixture{actual}`")
     }
 
     fn autofix_title(&self) -> String {
-        "Add/remove parentheses".to_string()
+        let PytestFixtureIncorrectParenthesesStyle { expected, .. } = self;
+        match expected {
+            Parentheses::None => "Remove parentheses".to_string(),
+            Parentheses::Empty => "Add parentheses".to_string(),
+        }
     }
 }
 
 #[violation]
 pub struct PytestFixturePositionalArgs {
-    pub function: String,
+    function: String,
 }
 
 impl Violation for PytestFixturePositionalArgs {
@@ -70,7 +89,7 @@ impl AlwaysAutofixableViolation for PytestExtraneousScopeFunction {
 
 #[violation]
 pub struct PytestMissingFixtureNameUnderscore {
-    pub function: String,
+    function: String,
 }
 
 impl Violation for PytestMissingFixtureNameUnderscore {
@@ -83,7 +102,7 @@ impl Violation for PytestMissingFixtureNameUnderscore {
 
 #[violation]
 pub struct PytestIncorrectFixtureNameUnderscore {
-    pub function: String,
+    function: String,
 }
 
 impl Violation for PytestIncorrectFixtureNameUnderscore {
@@ -96,7 +115,7 @@ impl Violation for PytestIncorrectFixtureNameUnderscore {
 
 #[violation]
 pub struct PytestFixtureParamWithoutValue {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for PytestFixtureParamWithoutValue {
@@ -132,7 +151,7 @@ impl Violation for PytestFixtureFinalizerCallback {
 
 #[violation]
 pub struct PytestUselessYieldFixture {
-    pub name: String,
+    name: String,
 }
 
 impl AlwaysAutofixableViolation for PytestUselessYieldFixture {
@@ -189,29 +208,29 @@ where
     'b: 'a,
 {
     fn visit_stmt(&mut self, stmt: &'b Stmt) {
-        match &stmt.node {
-            StmtKind::Return { value, .. } => {
+        match stmt {
+            Stmt::Return(ast::StmtReturn { value, range: _ }) => {
                 if value.is_some() {
                     self.has_return_with_value = true;
                 }
             }
-            StmtKind::FunctionDef { .. } | StmtKind::AsyncFunctionDef { .. } => {}
+            Stmt::FunctionDef(_) | Stmt::AsyncFunctionDef(_) => {}
             _ => visitor::walk_stmt(self, stmt),
         }
     }
 
     fn visit_expr(&mut self, expr: &'b Expr) {
-        match &expr.node {
-            ExprKind::YieldFrom { .. } => {
+        match expr {
+            Expr::YieldFrom(_) => {
                 self.has_yield_from = true;
             }
-            ExprKind::Yield { value, .. } => {
+            Expr::Yield(ast::ExprYield { value, range: _ }) => {
                 self.yield_statements.push(expr);
                 if value.is_some() {
                     self.has_return_with_value = true;
                 }
             }
-            ExprKind::Call { func, .. } => {
+            Expr::Call(ast::ExprCall { func, .. }) => {
                 if collect_call_path(func).map_or(false, |call_path| {
                     call_path.as_slice() == ["request", "addfinalizer"]
                 }) {
@@ -224,30 +243,21 @@ where
     }
 }
 
-fn get_fixture_decorator<'a>(checker: &Checker, decorators: &'a [Expr]) -> Option<&'a Expr> {
+fn get_fixture_decorator<'a>(model: &SemanticModel, decorators: &'a [Expr]) -> Option<&'a Expr> {
     decorators.iter().find(|decorator| {
-        is_pytest_fixture(decorator, checker) || is_pytest_yield_fixture(decorator, checker)
+        is_pytest_fixture(model, decorator) || is_pytest_yield_fixture(model, decorator)
     })
 }
 
-fn has_abstractmethod_decorator(decorators: &[Expr], checker: &Checker) -> bool {
-    decorators
-        .iter()
-        .any(|decorator| is_abstractmethod_decorator(decorator, checker))
-}
-
 fn pytest_fixture_parentheses(
     checker: &mut Checker,
     decorator: &Expr,
-    fix: Edit,
-    preferred: &str,
-    actual: &str,
+    fix: Fix,
+    expected: Parentheses,
+    actual: Parentheses,
 ) {
     let mut diagnostic = Diagnostic::new(
-        PytestFixtureIncorrectParenthesesStyle {
-            expected_parens: preferred.to_string(),
-            actual_parens: actual.to_string(),
-        },
+        PytestFixtureIncorrectParenthesesStyle { expected, actual },
         decorator.range(),
     );
     if checker.patch(diagnostic.kind.rule()) {
@@ -256,7 +266,7 @@ fn pytest_fixture_parentheses(
     checker.diagnostics.push(diagnostic);
 }
 
-pub fn fix_extraneous_scope_function(
+pub(crate) fn fix_extraneous_scope_function(
     locator: &Locator,
     stmt_at: TextSize,
     expr_range: TextRange,
@@ -268,31 +278,30 @@ pub fn fix_extraneous_scope_function(
 
 /// PT001, PT002, PT003
 fn check_fixture_decorator(checker: &mut Checker, func_name: &str, decorator: &Expr) {
-    match &decorator.node {
-        ExprKind::Call {
+    match decorator {
+        Expr::Call(ast::ExprCall {
             func,
             args,
             keywords,
-            ..
-        } => {
-            if checker
-                .settings
-                .rules
-                .enabled(Rule::PytestFixtureIncorrectParenthesesStyle)
+            range: _,
+        }) => {
+            if checker.enabled(Rule::PytestFixtureIncorrectParenthesesStyle)
                 && !checker.settings.flake8_pytest_style.fixture_parentheses
                 && args.is_empty()
                 && keywords.is_empty()
             {
-                let fix = Edit::deletion(func.end(), decorator.end());
-                pytest_fixture_parentheses(checker, decorator, fix, "", "()");
+                #[allow(deprecated)]
+                let fix = Fix::unspecified(Edit::deletion(func.end(), decorator.end()));
+                pytest_fixture_parentheses(
+                    checker,
+                    decorator,
+                    fix,
+                    Parentheses::None,
+                    Parentheses::Empty,
+                );
             }
 
-            if checker
-                .settings
-                .rules
-                .enabled(Rule::PytestFixturePositionalArgs)
-                && !args.is_empty()
-            {
+            if checker.enabled(Rule::PytestFixturePositionalArgs) && !args.is_empty() {
                 checker.diagnostics.push(Diagnostic::new(
                     PytestFixturePositionalArgs {
                         function: func_name.to_string(),
@@ -301,14 +310,10 @@ fn check_fixture_decorator(checker: &mut Checker, func_name: &str, decorator: &E
                 ));
             }
 
-            if checker
-                .settings
-                .rules
-                .enabled(Rule::PytestExtraneousScopeFunction)
-            {
+            if checker.enabled(Rule::PytestExtraneousScopeFunction) {
                 let scope_keyword = keywords
                     .iter()
-                    .find(|kw| kw.node.arg.as_ref().map_or(false, |arg| arg == "scope"));
+                    .find(|kw| kw.arg.as_ref().map_or(false, |arg| arg == "scope"));
 
                 if let Some(scope_keyword) = scope_keyword {
                     if keyword_is_literal(scope_keyword, "function") {
@@ -316,7 +321,8 @@ fn check_fixture_decorator(checker: &mut Checker, func_name: &str, decorator: &E
                             Diagnostic::new(PytestExtraneousScopeFunction, scope_keyword.range());
                         if checker.patch(diagnostic.kind.rule()) {
                             let expr_range = diagnostic.range();
-                            diagnostic.try_set_fix(|| {
+                            #[allow(deprecated)]
+                            diagnostic.try_set_fix_from_edit(|| {
                                 fix_extraneous_scope_function(
                                     checker.locator,
                                     decorator.start(),
@@ -332,14 +338,21 @@ fn check_fixture_decorator(checker: &mut Checker, func_name: &str, decorator: &E
             }
         }
         _ => {
-            if checker
-                .settings
-                .rules
-                .enabled(Rule::PytestFixtureIncorrectParenthesesStyle)
+            if checker.enabled(Rule::PytestFixtureIncorrectParenthesesStyle)
                 && checker.settings.flake8_pytest_style.fixture_parentheses
             {
-                let fix = Edit::insertion("()".to_string(), decorator.end());
-                pytest_fixture_parentheses(checker, decorator, fix, "()", "");
+                #[allow(deprecated)]
+                let fix = Fix::unspecified(Edit::insertion(
+                    Parentheses::Empty.to_string(),
+                    decorator.end(),
+                ));
+                pytest_fixture_parentheses(
+                    checker,
+                    decorator,
+                    fix,
+                    Parentheses::Empty,
+                    Parentheses::None,
+                );
             }
         }
     }
@@ -353,10 +366,7 @@ fn check_fixture_returns(checker: &mut Checker, stmt: &Stmt, name: &str, body: &
         visitor.visit_stmt(stmt);
     }
 
-    if checker
-        .settings
-        .rules
-        .enabled(Rule::PytestIncorrectFixtureNameUnderscore)
+    if checker.enabled(Rule::PytestIncorrectFixtureNameUnderscore)
         && visitor.has_return_with_value
         && name.starts_with('_')
     {
@@ -366,10 +376,7 @@ fn check_fixture_returns(checker: &mut Checker, stmt: &Stmt, name: &str, body: &
             },
             helpers::identifier_range(stmt, checker.locator),
         ));
-    } else if checker
-        .settings
-        .rules
-        .enabled(Rule::PytestMissingFixtureNameUnderscore)
+    } else if checker.enabled(Rule::PytestMissingFixtureNameUnderscore)
         && !visitor.has_return_with_value
         && !visitor.has_yield_from
         && !name.starts_with('_')
@@ -382,14 +389,10 @@ fn check_fixture_returns(checker: &mut Checker, stmt: &Stmt, name: &str, body: &
         ));
     }
 
-    if checker
-        .settings
-        .rules
-        .enabled(Rule::PytestUselessYieldFixture)
-    {
+    if checker.enabled(Rule::PytestUselessYieldFixture) {
         if let Some(stmt) = body.last() {
-            if let StmtKind::Expr { value, .. } = &stmt.node {
-                if let ExprKind::Yield { .. } = value.node {
+            if let Stmt::Expr(ast::StmtExpr { value, range: _ }) = stmt {
+                if value.is_yield_expr() {
                     if visitor.yield_statements.len() == 1 {
                         let mut diagnostic = Diagnostic::new(
                             PytestUselessYieldFixture {
@@ -398,10 +401,11 @@ fn check_fixture_returns(checker: &mut Checker, stmt: &Stmt, name: &str, body: &
                             stmt.range(),
                         );
                         if checker.patch(diagnostic.kind.rule()) {
-                            diagnostic.set_fix(Edit::range_replacement(
+                            #[allow(deprecated)]
+                            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
                                 "return".to_string(),
                                 TextRange::at(stmt.start(), "yield".text_len()),
-                            ));
+                            )));
                         }
                         checker.diagnostics.push(diagnostic);
                     }
@@ -414,7 +418,7 @@ fn check_fixture_returns(checker: &mut Checker, stmt: &Stmt, name: &str, body: &
 /// PT019
 fn check_test_function_args(checker: &mut Checker, args: &Arguments) {
     args.args.iter().chain(&args.kwonlyargs).for_each(|arg| {
-        let name = &arg.node.arg;
+        let name = &arg.arg;
         if name.starts_with('_') {
             checker.diagnostics.push(Diagnostic::new(
                 PytestFixtureParamWithoutValue {
@@ -428,7 +432,7 @@ fn check_test_function_args(checker: &mut Checker, args: &Arguments) {
 
 /// PT020
 fn check_fixture_decorator_name(checker: &mut Checker, decorator: &Expr) {
-    if is_pytest_yield_fixture(decorator, checker) {
+    if is_pytest_yield_fixture(checker.semantic_model(), decorator) {
         checker.diagnostics.push(Diagnostic::new(
             PytestDeprecatedYieldFixture,
             decorator.range(),
@@ -460,33 +464,27 @@ fn check_fixture_addfinalizer(checker: &mut Checker, args: &Arguments, body: &[S
 fn check_fixture_marks(checker: &mut Checker, decorators: &[Expr]) {
     for (expr, call_path) in get_mark_decorators(decorators) {
         let name = call_path.last().expect("Expected a mark name");
-        if checker
-            .settings
-            .rules
-            .enabled(Rule::PytestUnnecessaryAsyncioMarkOnFixture)
-        {
+        if checker.enabled(Rule::PytestUnnecessaryAsyncioMarkOnFixture) {
             if *name == "asyncio" {
                 let mut diagnostic =
                     Diagnostic::new(PytestUnnecessaryAsyncioMarkOnFixture, expr.range());
                 if checker.patch(diagnostic.kind.rule()) {
                     let range = checker.locator.full_lines_range(expr.range());
-                    diagnostic.set_fix(Edit::range_deletion(range));
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::range_deletion(range)));
                 }
                 checker.diagnostics.push(diagnostic);
             }
         }
 
-        if checker
-            .settings
-            .rules
-            .enabled(Rule::PytestErroneousUseFixturesOnFixture)
-        {
+        if checker.enabled(Rule::PytestErroneousUseFixturesOnFixture) {
             if *name == "usefixtures" {
                 let mut diagnostic =
                     Diagnostic::new(PytestErroneousUseFixturesOnFixture, expr.range());
                 if checker.patch(diagnostic.kind.rule()) {
                     let line_range = checker.locator.full_lines_range(expr.range());
-                    diagnostic.set_fix(Edit::range_deletion(line_range));
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::range_deletion(line_range)));
                 }
                 checker.diagnostics.push(diagnostic);
             }
@@ -494,7 +492,7 @@ fn check_fixture_marks(checker: &mut Checker, decorators: &[Expr]) {
     }
 }
 
-pub fn fixture(
+pub(crate) fn fixture(
     checker: &mut Checker,
     stmt: &Stmt,
     name: &str,
@@ -502,77 +500,41 @@ pub fn fixture(
     decorators: &[Expr],
     body: &[Stmt],
 ) {
-    let decorator = get_fixture_decorator(checker, decorators);
+    let decorator = get_fixture_decorator(checker.semantic_model(), decorators);
     if let Some(decorator) = decorator {
-        if checker
-            .settings
-            .rules
-            .enabled(Rule::PytestFixtureIncorrectParenthesesStyle)
-            || checker
-                .settings
-                .rules
-                .enabled(Rule::PytestFixturePositionalArgs)
-            || checker
-                .settings
-                .rules
-                .enabled(Rule::PytestExtraneousScopeFunction)
+        if checker.enabled(Rule::PytestFixtureIncorrectParenthesesStyle)
+            || checker.enabled(Rule::PytestFixturePositionalArgs)
+            || checker.enabled(Rule::PytestExtraneousScopeFunction)
         {
             check_fixture_decorator(checker, name, decorator);
         }
 
-        if checker
-            .settings
-            .rules
-            .enabled(Rule::PytestDeprecatedYieldFixture)
+        if checker.enabled(Rule::PytestDeprecatedYieldFixture)
             && checker.settings.flake8_pytest_style.fixture_parentheses
         {
             check_fixture_decorator_name(checker, decorator);
         }
 
-        if (checker
-            .settings
-            .rules
-            .enabled(Rule::PytestMissingFixtureNameUnderscore)
-            || checker
-                .settings
-                .rules
-                .enabled(Rule::PytestIncorrectFixtureNameUnderscore)
-            || checker
-                .settings
-                .rules
-                .enabled(Rule::PytestUselessYieldFixture))
-            && !has_abstractmethod_decorator(decorators, checker)
+        if (checker.enabled(Rule::PytestMissingFixtureNameUnderscore)
+            || checker.enabled(Rule::PytestIncorrectFixtureNameUnderscore)
+            || checker.enabled(Rule::PytestUselessYieldFixture))
+            && !is_abstract(checker.semantic_model(), decorators)
         {
             check_fixture_returns(checker, stmt, name, body);
         }
 
-        if checker
-            .settings
-            .rules
-            .enabled(Rule::PytestFixtureFinalizerCallback)
-        {
+        if checker.enabled(Rule::PytestFixtureFinalizerCallback) {
             check_fixture_addfinalizer(checker, args, body);
         }
 
-        if checker
-            .settings
-            .rules
-            .enabled(Rule::PytestUnnecessaryAsyncioMarkOnFixture)
-            || checker
-                .settings
-                .rules
-                .enabled(Rule::PytestErroneousUseFixturesOnFixture)
+        if checker.enabled(Rule::PytestUnnecessaryAsyncioMarkOnFixture)
+            || checker.enabled(Rule::PytestErroneousUseFixturesOnFixture)
         {
             check_fixture_marks(checker, decorators);
         }
     }
 
-    if checker
-        .settings
-        .rules
-        .enabled(Rule::PytestFixtureParamWithoutValue)
-        && name.starts_with("test_")
-    {
+    if checker.enabled(Rule::PytestFixtureParamWithoutValue) && name.starts_with("test_") {
         check_test_function_args(checker, args);
     }
 }
diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/helpers.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/helpers.rs
index 92c8ff55e0da5..36beb36f79b35 100644
--- a/crates/ruff/src/rules/flake8_pytest_style/rules/helpers.rs
+++ b/crates/ruff/src/rules/flake8_pytest_style/rules/helpers.rs
@@ -1,9 +1,8 @@
-use ruff_python_ast::call_path::{collect_call_path, CallPath};
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Constant, Expr, Keyword};
 
+use ruff_python_ast::call_path::{collect_call_path, CallPath};
 use ruff_python_ast::helpers::map_callable;
-
-use crate::checkers::ast::Checker;
+use ruff_python_semantic::model::SemanticModel;
 
 pub(super) fn get_mark_decorators(decorators: &[Expr]) -> impl Iterator<Item = (&Expr, CallPath)> {
     decorators.iter().filter_map(|decorator| {
@@ -18,49 +17,30 @@ pub(super) fn get_mark_decorators(decorators: &[Expr]) -> impl Iterator<Item = (
     })
 }
 
-pub(super) fn is_pytest_fail(call: &Expr, checker: &Checker) -> bool {
-    checker
-        .ctx
-        .resolve_call_path(call)
-        .map_or(false, |call_path| {
-            call_path.as_slice() == ["pytest", "fail"]
-        })
+pub(super) fn is_pytest_fail(model: &SemanticModel, call: &Expr) -> bool {
+    model.resolve_call_path(call).map_or(false, |call_path| {
+        call_path.as_slice() == ["pytest", "fail"]
+    })
 }
 
-pub(super) fn is_pytest_fixture(decorator: &Expr, checker: &Checker) -> bool {
-    checker
-        .ctx
-        .resolve_call_path(if let ExprKind::Call { func, .. } = &decorator.node {
-            func
-        } else {
-            decorator
-        })
+pub(super) fn is_pytest_fixture(model: &SemanticModel, decorator: &Expr) -> bool {
+    model
+        .resolve_call_path(map_callable(decorator))
         .map_or(false, |call_path| {
             call_path.as_slice() == ["pytest", "fixture"]
         })
 }
 
-pub(super) fn is_pytest_yield_fixture(decorator: &Expr, checker: &Checker) -> bool {
-    checker
-        .ctx
+pub(super) fn is_pytest_yield_fixture(model: &SemanticModel, decorator: &Expr) -> bool {
+    model
         .resolve_call_path(map_callable(decorator))
         .map_or(false, |call_path| {
             call_path.as_slice() == ["pytest", "yield_fixture"]
         })
 }
 
-pub(super) fn is_abstractmethod_decorator(decorator: &Expr, checker: &Checker) -> bool {
-    checker
-        .ctx
-        .resolve_call_path(decorator)
-        .map_or(false, |call_path| {
-            call_path.as_slice() == ["abc", "abstractmethod"]
-        })
-}
-
-pub(super) fn is_pytest_parametrize(decorator: &Expr, checker: &Checker) -> bool {
-    checker
-        .ctx
+pub(super) fn is_pytest_parametrize(model: &SemanticModel, decorator: &Expr) -> bool {
+    model
         .resolve_call_path(map_callable(decorator))
         .map_or(false, |call_path| {
             call_path.as_slice() == ["pytest", "mark", "parametrize"]
@@ -68,10 +48,10 @@ pub(super) fn is_pytest_parametrize(decorator: &Expr, checker: &Checker) -> bool
 }
 
 pub(super) fn keyword_is_literal(kw: &Keyword, literal: &str) -> bool {
-    if let ExprKind::Constant {
+    if let Expr::Constant(ast::ExprConstant {
         value: Constant::Str(string),
         ..
-    } = &kw.node.value.node
+    }) = &kw.value
     {
         string == literal
     } else {
@@ -80,16 +60,15 @@ pub(super) fn keyword_is_literal(kw: &Keyword, literal: &str) -> bool {
 }
 
 pub(super) fn is_empty_or_null_string(expr: &Expr) -> bool {
-    match &expr.node {
-        ExprKind::Constant {
+    match expr {
+        Expr::Constant(ast::ExprConstant {
             value: Constant::Str(string),
             ..
-        } => string.is_empty(),
-        ExprKind::Constant {
-            value: Constant::None,
-            ..
-        } => true,
-        ExprKind::JoinedStr { values } => values.iter().all(is_empty_or_null_string),
+        }) => string.is_empty(),
+        Expr::Constant(constant) if constant.value.is_none() => true,
+        Expr::JoinedStr(ast::ExprJoinedStr { values, range: _ }) => {
+            values.iter().all(is_empty_or_null_string)
+        }
         _ => false,
     }
 }
diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/imports.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/imports.rs
index 50154ed0e39f9..e710b9a15c64d 100644
--- a/crates/ruff/src/rules/flake8_pytest_style/rules/imports.rs
+++ b/crates/ruff/src/rules/flake8_pytest_style/rules/imports.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::Stmt;
+use rustpython_parser::ast::{Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -18,7 +18,7 @@ fn is_pytest_or_subpackage(imported_name: &str) -> bool {
 }
 
 /// PT013
-pub fn import(import_from: &Stmt, name: &str, asname: Option<&str>) -> Option<Diagnostic> {
+pub(crate) fn import(import_from: &Stmt, name: &str, asname: Option<&str>) -> Option<Diagnostic> {
     if is_pytest_or_subpackage(name) {
         if let Some(alias) = asname {
             if alias != name {
@@ -33,10 +33,10 @@ pub fn import(import_from: &Stmt, name: &str, asname: Option<&str>) -> Option<Di
 }
 
 /// PT013
-pub fn import_from(
+pub(crate) fn import_from(
     import_from: &Stmt,
     module: Option<&str>,
-    level: Option<usize>,
+    level: Option<u32>,
 ) -> Option<Diagnostic> {
     // If level is not zero or module is none, return
     if let Some(level) = level {
diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/marks.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/marks.rs
index e8375fb42fa18..6c2e178a7670e 100644
--- a/crates/ruff/src/rules/flake8_pytest_style/rules/marks.rs
+++ b/crates/ruff/src/rules/flake8_pytest_style/rules/marks.rs
@@ -1,7 +1,7 @@
 use ruff_text_size::TextSize;
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::call_path::CallPath;
 
@@ -12,9 +12,9 @@ use super::helpers::get_mark_decorators;
 
 #[violation]
 pub struct PytestIncorrectMarkParenthesesStyle {
-    pub mark_name: String,
-    pub expected_parens: String,
-    pub actual_parens: String,
+    mark_name: String,
+    expected_parens: String,
+    actual_parens: String,
 }
 
 impl AlwaysAutofixableViolation for PytestIncorrectMarkParenthesesStyle {
@@ -54,7 +54,7 @@ fn pytest_mark_parentheses(
     checker: &mut Checker,
     decorator: &Expr,
     call_path: &CallPath,
-    fix: Edit,
+    fix: Fix,
     preferred: &str,
     actual: &str,
 ) {
@@ -73,24 +73,26 @@ fn pytest_mark_parentheses(
 }
 
 fn check_mark_parentheses(checker: &mut Checker, decorator: &Expr, call_path: &CallPath) {
-    match &decorator.node {
-        ExprKind::Call {
+    match decorator {
+        Expr::Call(ast::ExprCall {
             func,
             args,
             keywords,
-            ..
-        } => {
+            range: _,
+        }) => {
             if !checker.settings.flake8_pytest_style.mark_parentheses
                 && args.is_empty()
                 && keywords.is_empty()
             {
-                let fix = Edit::deletion(func.end(), decorator.end());
+                #[allow(deprecated)]
+                let fix = Fix::unspecified(Edit::deletion(func.end(), decorator.end()));
                 pytest_mark_parentheses(checker, decorator, call_path, fix, "", "()");
             }
         }
         _ => {
             if checker.settings.flake8_pytest_style.mark_parentheses {
-                let fix = Edit::insertion("()".to_string(), decorator.end());
+                #[allow(deprecated)]
+                let fix = Fix::unspecified(Edit::insertion("()".to_string(), decorator.end()));
                 pytest_mark_parentheses(checker, decorator, call_path, fix, "()", "");
             }
         }
@@ -104,7 +106,7 @@ fn check_useless_usefixtures(checker: &mut Checker, decorator: &Expr, call_path:
 
     let mut has_parameters = false;
 
-    if let ExprKind::Call { args, keywords, .. } = &decorator.node {
+    if let Expr::Call(ast::ExprCall { args, keywords, .. }) = decorator {
         if !args.is_empty() || !keywords.is_empty() {
             has_parameters = true;
         }
@@ -113,23 +115,18 @@ fn check_useless_usefixtures(checker: &mut Checker, decorator: &Expr, call_path:
     if !has_parameters {
         let mut diagnostic = Diagnostic::new(PytestUseFixturesWithoutParameters, decorator.range());
         if checker.patch(diagnostic.kind.rule()) {
-            diagnostic.set_fix(Edit::range_deletion(
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_deletion(
                 decorator.range().sub_start(TextSize::from(1)),
-            ));
+            )));
         }
         checker.diagnostics.push(diagnostic);
     }
 }
 
-pub fn marks(checker: &mut Checker, decorators: &[Expr]) {
-    let enforce_parentheses = checker
-        .settings
-        .rules
-        .enabled(Rule::PytestIncorrectMarkParenthesesStyle);
-    let enforce_useless_usefixtures = checker
-        .settings
-        .rules
-        .enabled(Rule::PytestUseFixturesWithoutParameters);
+pub(crate) fn marks(checker: &mut Checker, decorators: &[Expr]) {
+    let enforce_parentheses = checker.enabled(Rule::PytestIncorrectMarkParenthesesStyle);
+    let enforce_useless_usefixtures = checker.enabled(Rule::PytestUseFixturesWithoutParameters);
 
     for (expr, call_path) in get_mark_decorators(decorators) {
         if enforce_parentheses {
diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/mod.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/mod.rs
index 6a8e227f35481..dcf1277056a4b 100644
--- a/crates/ruff/src/rules/flake8_pytest_style/rules/mod.rs
+++ b/crates/ruff/src/rules/flake8_pytest_style/rules/mod.rs
@@ -1,10 +1,10 @@
-pub use assertion::{
+pub(crate) use assertion::{
     assert_falsy, assert_in_exception_handler, composite_condition, unittest_assertion,
     PytestAssertAlwaysFalse, PytestAssertInExcept, PytestCompositeAssertion,
     PytestUnittestAssertion,
 };
-pub use fail::{fail_call, PytestFailWithoutMessage};
-pub use fixture::{
+pub(crate) use fail::{fail_call, PytestFailWithoutMessage};
+pub(crate) use fixture::{
     fixture, PytestDeprecatedYieldFixture, PytestErroneousUseFixturesOnFixture,
     PytestExtraneousScopeFunction, PytestFixtureFinalizerCallback,
     PytestFixtureIncorrectParenthesesStyle, PytestFixtureParamWithoutValue,
@@ -12,13 +12,15 @@ pub use fixture::{
     PytestMissingFixtureNameUnderscore, PytestUnnecessaryAsyncioMarkOnFixture,
     PytestUselessYieldFixture,
 };
-pub use imports::{import, import_from, PytestIncorrectPytestImport};
-pub use marks::{marks, PytestIncorrectMarkParenthesesStyle, PytestUseFixturesWithoutParameters};
-pub use parametrize::{
+pub(crate) use imports::{import, import_from, PytestIncorrectPytestImport};
+pub(crate) use marks::{
+    marks, PytestIncorrectMarkParenthesesStyle, PytestUseFixturesWithoutParameters,
+};
+pub(crate) use parametrize::{
     parametrize, PytestParametrizeNamesWrongType, PytestParametrizeValuesWrongType,
 };
-pub use patch::{patch_with_lambda, PytestPatchWithLambda};
-pub use raises::{
+pub(crate) use patch::{patch_with_lambda, PytestPatchWithLambda};
+pub(crate) use raises::{
     complex_raises, raises_call, PytestRaisesTooBroad, PytestRaisesWithMultipleStatements,
     PytestRaisesWithoutException,
 };
diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/parametrize.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/parametrize.rs
index e72b3b11cbaa8..51e8f0a1fe2b6 100644
--- a/crates/ruff/src/rules/flake8_pytest_style/rules/parametrize.rs
+++ b/crates/ruff/src/rules/flake8_pytest_style/rules/parametrize.rs
@@ -1,11 +1,10 @@
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::{Constant, Expr, ExprContext, ExprKind};
+use rustpython_parser::ast::{self, Constant, Expr, ExprContext, Ranged};
 use rustpython_parser::{lexer, Mode, Tok};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Violation};
-use ruff_diagnostics::{Diagnostic, Edit};
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::{create_expr, unparse_expr};
+use ruff_python_ast::source_code::{Generator, Locator};
 
 use crate::checkers::ast::Checker;
 use crate::registry::{AsRule, Rule};
@@ -18,16 +17,18 @@ pub struct PytestParametrizeNamesWrongType {
     pub expected: types::ParametrizeNameType,
 }
 
-impl AlwaysAutofixableViolation for PytestParametrizeNamesWrongType {
+impl Violation for PytestParametrizeNamesWrongType {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         let PytestParametrizeNamesWrongType { expected } = self;
         format!("Wrong name(s) type in `@pytest.mark.parametrize`, expected `{expected}`")
     }
 
-    fn autofix_title(&self) -> String {
+    fn autofix_title(&self) -> Option<String> {
         let PytestParametrizeNamesWrongType { expected } = self;
-        format!("Use a `{expected}` for parameter names")
+        Some(format!("Use a `{expected}` for parameter names"))
     }
 }
 
@@ -45,14 +46,14 @@ impl Violation for PytestParametrizeValuesWrongType {
     }
 }
 
-fn elts_to_csv(elts: &[Expr], checker: &Checker) -> Option<String> {
+fn elts_to_csv(elts: &[Expr], generator: Generator) -> Option<String> {
     let all_literals = elts.iter().all(|e| {
         matches!(
-            e.node,
-            ExprKind::Constant {
+            e,
+            Expr::Constant(ast::ExprConstant {
                 value: Constant::Str(_),
                 ..
-            }
+            })
         )
     });
 
@@ -60,25 +61,24 @@ fn elts_to_csv(elts: &[Expr], checker: &Checker) -> Option<String> {
         return None;
     }
 
-    Some(unparse_expr(
-        &create_expr(ExprKind::Constant {
-            value: Constant::Str(elts.iter().fold(String::new(), |mut acc, elt| {
-                if let ExprKind::Constant {
-                    value: Constant::Str(ref s),
-                    ..
-                } = elt.node
-                {
-                    if !acc.is_empty() {
-                        acc.push(',');
-                    }
-                    acc.push_str(s);
+    let node = Expr::Constant(ast::ExprConstant {
+        value: Constant::Str(elts.iter().fold(String::new(), |mut acc, elt| {
+            if let Expr::Constant(ast::ExprConstant {
+                value: Constant::Str(ref s),
+                ..
+            }) = elt
+            {
+                if !acc.is_empty() {
+                    acc.push(',');
                 }
-                acc
-            })),
-            kind: None,
-        }),
-        checker.stylist,
-    ))
+                acc.push_str(s);
+            }
+            acc
+        })),
+        kind: None,
+        range: TextRange::default(),
+    });
+    Some(generator.expr(&node))
 }
 
 /// Returns the range of the `name` argument of `@pytest.mark.parametrize`.
@@ -94,14 +94,14 @@ fn elts_to_csv(elts: &[Expr], checker: &Checker) -> Option<String> {
 /// ```
 ///
 /// This method assumes that the first argument is a string.
-fn get_parametrize_name_range(checker: &Checker, decorator: &Expr, expr: &Expr) -> TextRange {
+fn get_parametrize_name_range(decorator: &Expr, expr: &Expr, locator: &Locator) -> TextRange {
     let mut locations = Vec::new();
     let mut implicit_concat = None;
 
     // The parenthesis are not part of the AST, so we need to tokenize the
     // decorator to find them.
-    for (tok, range) in lexer::lex_located(
-        checker.locator.slice(decorator.range()),
+    for (tok, range) in lexer::lex_starts_at(
+        locator.slice(decorator.range()),
         Mode::Module,
         decorator.start(),
     )
@@ -131,16 +131,17 @@ fn get_parametrize_name_range(checker: &Checker, decorator: &Expr, expr: &Expr)
 fn check_names(checker: &mut Checker, decorator: &Expr, expr: &Expr) {
     let names_type = checker.settings.flake8_pytest_style.parametrize_names_type;
 
-    match &expr.node {
-        ExprKind::Constant {
+    match expr {
+        Expr::Constant(ast::ExprConstant {
             value: Constant::Str(string),
             ..
-        } => {
+        }) => {
             let names = split_names(string);
             if names.len() > 1 {
                 match names_type {
                     types::ParametrizeNameType::Tuple => {
-                        let name_range = get_parametrize_name_range(checker, decorator, expr);
+                        let name_range =
+                            get_parametrize_name_range(decorator, expr, checker.locator);
                         let mut diagnostic = Diagnostic::new(
                             PytestParametrizeNamesWrongType {
                                 expected: names_type,
@@ -148,32 +149,31 @@ fn check_names(checker: &mut Checker, decorator: &Expr, expr: &Expr) {
                             name_range,
                         );
                         if checker.patch(diagnostic.kind.rule()) {
-                            diagnostic.set_fix(Edit::range_replacement(
-                                format!(
-                                    "({})",
-                                    unparse_expr(
-                                        &create_expr(ExprKind::Tuple {
-                                            elts: names
-                                                .iter()
-                                                .map(|&name| {
-                                                    create_expr(ExprKind::Constant {
-                                                        value: Constant::Str(name.to_string()),
-                                                        kind: None,
-                                                    })
-                                                })
-                                                .collect(),
-                                            ctx: ExprContext::Load,
-                                        }),
-                                        checker.stylist,
-                                    )
-                                ),
+                            let node = Expr::Tuple(ast::ExprTuple {
+                                elts: names
+                                    .iter()
+                                    .map(|name| {
+                                        Expr::Constant(ast::ExprConstant {
+                                            value: Constant::Str((*name).to_string()),
+                                            kind: None,
+                                            range: TextRange::default(),
+                                        })
+                                    })
+                                    .collect(),
+                                ctx: ExprContext::Load,
+                                range: TextRange::default(),
+                            });
+                            #[allow(deprecated)]
+                            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                                format!("({})", checker.generator().expr(&node)),
                                 name_range,
-                            ));
+                            )));
                         }
                         checker.diagnostics.push(diagnostic);
                     }
                     types::ParametrizeNameType::List => {
-                        let name_range = get_parametrize_name_range(checker, decorator, expr);
+                        let name_range =
+                            get_parametrize_name_range(decorator, expr, checker.locator);
                         let mut diagnostic = Diagnostic::new(
                             PytestParametrizeNamesWrongType {
                                 expected: names_type,
@@ -181,24 +181,25 @@ fn check_names(checker: &mut Checker, decorator: &Expr, expr: &Expr) {
                             name_range,
                         );
                         if checker.patch(diagnostic.kind.rule()) {
-                            diagnostic.set_fix(Edit::range_replacement(
-                                unparse_expr(
-                                    &create_expr(ExprKind::List {
-                                        elts: names
-                                            .iter()
-                                            .map(|&name| {
-                                                create_expr(ExprKind::Constant {
-                                                    value: Constant::Str(name.to_string()),
-                                                    kind: None,
-                                                })
-                                            })
-                                            .collect(),
-                                        ctx: ExprContext::Load,
-                                    }),
-                                    checker.stylist,
-                                ),
+                            let node = Expr::List(ast::ExprList {
+                                elts: names
+                                    .iter()
+                                    .map(|name| {
+                                        Expr::Constant(ast::ExprConstant {
+                                            value: Constant::Str((*name).to_string()),
+                                            kind: None,
+                                            range: TextRange::default(),
+                                        })
+                                    })
+                                    .collect(),
+                                ctx: ExprContext::Load,
+                                range: TextRange::default(),
+                            });
+                            #[allow(deprecated)]
+                            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                                checker.generator().expr(&node),
                                 name_range,
-                            ));
+                            )));
                         }
                         checker.diagnostics.push(diagnostic);
                     }
@@ -206,7 +207,7 @@ fn check_names(checker: &mut Checker, decorator: &Expr, expr: &Expr) {
                 }
             }
         }
-        ExprKind::Tuple { elts, .. } => {
+        Expr::Tuple(ast::ExprTuple { elts, .. }) => {
             if elts.len() == 1 {
                 if let Some(first) = elts.first() {
                     handle_single_name(checker, expr, first);
@@ -222,16 +223,16 @@ fn check_names(checker: &mut Checker, decorator: &Expr, expr: &Expr) {
                             expr.range(),
                         );
                         if checker.patch(diagnostic.kind.rule()) {
-                            diagnostic.set_fix(Edit::range_replacement(
-                                unparse_expr(
-                                    &create_expr(ExprKind::List {
-                                        elts: elts.clone(),
-                                        ctx: ExprContext::Load,
-                                    }),
-                                    checker.stylist,
-                                ),
+                            let node = Expr::List(ast::ExprList {
+                                elts: elts.clone(),
+                                ctx: ExprContext::Load,
+                                range: TextRange::default(),
+                            });
+                            #[allow(deprecated)]
+                            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                                checker.generator().expr(&node),
                                 expr.range(),
-                            ));
+                            )));
                         }
                         checker.diagnostics.push(diagnostic);
                     }
@@ -243,8 +244,12 @@ fn check_names(checker: &mut Checker, decorator: &Expr, expr: &Expr) {
                             expr.range(),
                         );
                         if checker.patch(diagnostic.kind.rule()) {
-                            if let Some(content) = elts_to_csv(elts, checker) {
-                                diagnostic.set_fix(Edit::range_replacement(content, expr.range()));
+                            if let Some(content) = elts_to_csv(elts, checker.generator()) {
+                                #[allow(deprecated)]
+                                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                                    content,
+                                    expr.range(),
+                                )));
                             }
                         }
                         checker.diagnostics.push(diagnostic);
@@ -252,7 +257,7 @@ fn check_names(checker: &mut Checker, decorator: &Expr, expr: &Expr) {
                 }
             };
         }
-        ExprKind::List { elts, .. } => {
+        Expr::List(ast::ExprList { elts, .. }) => {
             if elts.len() == 1 {
                 if let Some(first) = elts.first() {
                     handle_single_name(checker, expr, first);
@@ -268,19 +273,16 @@ fn check_names(checker: &mut Checker, decorator: &Expr, expr: &Expr) {
                             expr.range(),
                         );
                         if checker.patch(diagnostic.kind.rule()) {
-                            diagnostic.set_fix(Edit::range_replacement(
-                                format!(
-                                    "({})",
-                                    unparse_expr(
-                                        &create_expr(ExprKind::Tuple {
-                                            elts: elts.clone(),
-                                            ctx: ExprContext::Load,
-                                        }),
-                                        checker.stylist,
-                                    )
-                                ),
+                            let node = Expr::Tuple(ast::ExprTuple {
+                                elts: elts.clone(),
+                                ctx: ExprContext::Load,
+                                range: TextRange::default(),
+                            });
+                            #[allow(deprecated)]
+                            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                                format!("({})", checker.generator().expr(&node)),
                                 expr.range(),
-                            ));
+                            )));
                         }
                         checker.diagnostics.push(diagnostic);
                     }
@@ -292,8 +294,12 @@ fn check_names(checker: &mut Checker, decorator: &Expr, expr: &Expr) {
                             expr.range(),
                         );
                         if checker.patch(diagnostic.kind.rule()) {
-                            if let Some(content) = elts_to_csv(elts, checker) {
-                                diagnostic.set_fix(Edit::range_replacement(content, expr.range()));
+                            if let Some(content) = elts_to_csv(elts, checker.generator()) {
+                                #[allow(deprecated)]
+                                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                                    content,
+                                    expr.range(),
+                                )));
                             }
                         }
                         checker.diagnostics.push(diagnostic);
@@ -314,18 +320,18 @@ fn check_values(checker: &mut Checker, names: &Expr, values: &Expr) {
         .flake8_pytest_style
         .parametrize_values_row_type;
 
-    let is_multi_named = if let ExprKind::Constant {
+    let is_multi_named = if let Expr::Constant(ast::ExprConstant {
         value: Constant::Str(string),
         ..
-    } = &names.node
+    }) = &names
     {
         split_names(string).len() > 1
     } else {
         true
     };
 
-    match &values.node {
-        ExprKind::List { elts, .. } => {
+    match values {
+        Expr::List(ast::ExprList { elts, .. }) => {
             if values_type != types::ParametrizeValuesType::List {
                 checker.diagnostics.push(Diagnostic::new(
                     PytestParametrizeValuesWrongType {
@@ -339,7 +345,7 @@ fn check_values(checker: &mut Checker, names: &Expr, values: &Expr) {
                 handle_value_rows(checker, elts, values_type, values_row_type);
             }
         }
-        ExprKind::Tuple { elts, .. } => {
+        Expr::Tuple(ast::ExprTuple { elts, .. }) => {
             if values_type != types::ParametrizeValuesType::Tuple {
                 checker.diagnostics.push(Diagnostic::new(
                     PytestParametrizeValuesWrongType {
@@ -366,10 +372,12 @@ fn handle_single_name(checker: &mut Checker, expr: &Expr, value: &Expr) {
     );
 
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(
-            unparse_expr(&create_expr(value.node.clone()), checker.stylist),
+        let node = value.clone();
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+            checker.generator().expr(&node),
             expr.range(),
-        ));
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
@@ -381,8 +389,8 @@ fn handle_value_rows(
     values_row_type: types::ParametrizeValuesRowType,
 ) {
     for elt in elts {
-        match &elt.node {
-            ExprKind::Tuple { .. } => {
+        match elt {
+            Expr::Tuple(_) => {
                 if values_row_type != types::ParametrizeValuesRowType::Tuple {
                     checker.diagnostics.push(Diagnostic::new(
                         PytestParametrizeValuesWrongType {
@@ -393,7 +401,7 @@ fn handle_value_rows(
                     ));
                 }
             }
-            ExprKind::List { .. } => {
+            Expr::List(_) => {
                 if values_row_type != types::ParametrizeValuesRowType::List {
                     checker.diagnostics.push(Diagnostic::new(
                         PytestParametrizeValuesWrongType {
@@ -409,24 +417,16 @@ fn handle_value_rows(
     }
 }
 
-pub fn parametrize(checker: &mut Checker, decorators: &[Expr]) {
+pub(crate) fn parametrize(checker: &mut Checker, decorators: &[Expr]) {
     for decorator in decorators {
-        if is_pytest_parametrize(decorator, checker) {
-            if let ExprKind::Call { args, .. } = &decorator.node {
-                if checker
-                    .settings
-                    .rules
-                    .enabled(Rule::PytestParametrizeNamesWrongType)
-                {
+        if is_pytest_parametrize(checker.semantic_model(), decorator) {
+            if let Expr::Call(ast::ExprCall { args, .. }) = decorator {
+                if checker.enabled(Rule::PytestParametrizeNamesWrongType) {
                     if let Some(names) = args.get(0) {
                         check_names(checker, decorator, names);
                     }
                 }
-                if checker
-                    .settings
-                    .rules
-                    .enabled(Rule::PytestParametrizeValuesWrongType)
-                {
+                if checker.enabled(Rule::PytestParametrizeValuesWrongType) {
                     if let Some(names) = args.get(0) {
                         if let Some(values) = args.get(1) {
                             check_values(checker, names, values);
diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/patch.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/patch.rs
index 4363a8fb808a0..2bc47f69523c1 100644
--- a/crates/ruff/src/rules/flake8_pytest_style/rules/patch.rs
+++ b/crates/ruff/src/rules/flake8_pytest_style/rules/patch.rs
@@ -1,5 +1,5 @@
 use rustc_hash::FxHashSet;
-use rustpython_parser::ast::{Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -50,8 +50,8 @@ where
     'b: 'a,
 {
     fn visit_expr(&mut self, expr: &'b Expr) {
-        match &expr.node {
-            ExprKind::Name { id, .. } => {
+        match expr {
+            Expr::Name(ast::ExprName { id, .. }) => {
                 if self.names.contains(&id.as_str()) {
                     self.uses_args = true;
                 }
@@ -72,24 +72,32 @@ fn check_patch_call(
         return None;
     }
 
-    if let Some(new_arg) = simple_args.argument("new", new_arg_number) {
-        if let ExprKind::Lambda { args, body } = &new_arg.node {
-            // Walk the lambda body.
-            let mut visitor = LambdaBodyVisitor {
-                names: collect_arg_names(args),
-                uses_args: false,
-            };
-            visitor.visit_expr(body);
+    if let Some(Expr::Lambda(ast::ExprLambda {
+        args,
+        body,
+        range: _,
+    })) = simple_args.argument("new", new_arg_number)
+    {
+        // Walk the lambda body.
+        let mut visitor = LambdaBodyVisitor {
+            names: collect_arg_names(args),
+            uses_args: false,
+        };
+        visitor.visit_expr(body);
 
-            if !visitor.uses_args {
-                return Some(Diagnostic::new(PytestPatchWithLambda, call.range()));
-            }
+        if !visitor.uses_args {
+            return Some(Diagnostic::new(PytestPatchWithLambda, call.range()));
         }
     }
+
     None
 }
 
-pub fn patch_with_lambda(call: &Expr, args: &[Expr], keywords: &[Keyword]) -> Option<Diagnostic> {
+pub(crate) fn patch_with_lambda(
+    call: &Expr,
+    args: &[Expr],
+    keywords: &[Keyword],
+) -> Option<Diagnostic> {
     if let Some(call_path) = compose_call_path(call) {
         if PATCH_NAMES.contains(&call_path.as_str()) {
             check_patch_call(call, args, keywords, 1)
diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/raises.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/raises.rs
index d8b5b03784ee0..dc79b828399e5 100644
--- a/crates/ruff/src/rules/flake8_pytest_style/rules/raises.rs
+++ b/crates/ruff/src/rules/flake8_pytest_style/rules/raises.rs
@@ -1,9 +1,10 @@
-use rustpython_parser::ast::{Expr, ExprKind, Keyword, Stmt, StmtKind, Withitem};
+use rustpython_parser::ast::{self, Expr, Identifier, Keyword, Ranged, Stmt, Withitem};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::call_path::format_call_path;
 use ruff_python_ast::call_path::from_qualified_name;
+use ruff_python_semantic::model::SemanticModel;
 
 use crate::checkers::ast::Checker;
 use crate::registry::Rule;
@@ -22,7 +23,7 @@ impl Violation for PytestRaisesWithMultipleStatements {
 
 #[violation]
 pub struct PytestRaisesTooBroad {
-    pub exception: String,
+    exception: String,
 }
 
 impl Violation for PytestRaisesTooBroad {
@@ -46,32 +47,25 @@ impl Violation for PytestRaisesWithoutException {
     }
 }
 
-fn is_pytest_raises(checker: &Checker, func: &Expr) -> bool {
-    checker
-        .ctx
-        .resolve_call_path(func)
-        .map_or(false, |call_path| {
-            call_path.as_slice() == ["pytest", "raises"]
-        })
+fn is_pytest_raises(func: &Expr, model: &SemanticModel) -> bool {
+    model.resolve_call_path(func).map_or(false, |call_path| {
+        call_path.as_slice() == ["pytest", "raises"]
+    })
 }
 
 const fn is_non_trivial_with_body(body: &[Stmt]) -> bool {
     if body.len() > 1 {
         true
     } else if let Some(first_body_stmt) = body.first() {
-        !matches!(first_body_stmt.node, StmtKind::Pass)
+        !first_body_stmt.is_pass_stmt()
     } else {
         false
     }
 }
 
-pub fn raises_call(checker: &mut Checker, func: &Expr, args: &[Expr], keywords: &[Keyword]) {
-    if is_pytest_raises(checker, func) {
-        if checker
-            .settings
-            .rules
-            .enabled(Rule::PytestRaisesWithoutException)
-        {
+pub(crate) fn raises_call(checker: &mut Checker, func: &Expr, args: &[Expr], keywords: &[Keyword]) {
+    if is_pytest_raises(func, checker.semantic_model()) {
+        if checker.enabled(Rule::PytestRaisesWithoutException) {
             if args.is_empty() && keywords.is_empty() {
                 checker
                     .diagnostics
@@ -79,14 +73,14 @@ pub fn raises_call(checker: &mut Checker, func: &Expr, args: &[Expr], keywords:
             }
         }
 
-        if checker.settings.rules.enabled(Rule::PytestRaisesTooBroad) {
+        if checker.enabled(Rule::PytestRaisesTooBroad) {
             let match_keyword = keywords
                 .iter()
-                .find(|kw| kw.node.arg == Some("match".to_string()));
+                .find(|kw| kw.arg == Some(Identifier::new("match")));
 
             if let Some(exception) = args.first() {
                 if let Some(match_keyword) = match_keyword {
-                    if is_empty_or_null_string(&match_keyword.node.value) {
+                    if is_empty_or_null_string(&match_keyword.value) {
                         exception_needs_match(checker, exception);
                     }
                 } else {
@@ -97,11 +91,16 @@ pub fn raises_call(checker: &mut Checker, func: &Expr, args: &[Expr], keywords:
     }
 }
 
-pub fn complex_raises(checker: &mut Checker, stmt: &Stmt, items: &[Withitem], body: &[Stmt]) {
+pub(crate) fn complex_raises(
+    checker: &mut Checker,
+    stmt: &Stmt,
+    items: &[Withitem],
+    body: &[Stmt],
+) {
     let mut is_too_complex = false;
 
-    let raises_called = items.iter().any(|item| match &item.context_expr.node {
-        ExprKind::Call { func, .. } => is_pytest_raises(checker, func),
+    let raises_called = items.iter().any(|item| match &item.context_expr {
+        Expr::Call(ast::ExprCall { func, .. }) => is_pytest_raises(func, checker.semantic_model()),
         _ => false,
     });
 
@@ -110,19 +109,20 @@ pub fn complex_raises(checker: &mut Checker, stmt: &Stmt, items: &[Withitem], bo
         if body.len() > 1 {
             is_too_complex = true;
         } else if let Some(first_stmt) = body.first() {
-            match &first_stmt.node {
-                StmtKind::With { body, .. } | StmtKind::AsyncWith { body, .. } => {
+            match first_stmt {
+                Stmt::With(ast::StmtWith { body, .. })
+                | Stmt::AsyncWith(ast::StmtAsyncWith { body, .. }) => {
                     if is_non_trivial_with_body(body) {
                         is_too_complex = true;
                     }
                 }
-                StmtKind::If { .. }
-                | StmtKind::For { .. }
-                | StmtKind::Match { .. }
-                | StmtKind::AsyncFor { .. }
-                | StmtKind::While { .. }
-                | StmtKind::Try { .. }
-                | StmtKind::TryStar { .. } => {
+                Stmt::If(_)
+                | Stmt::For(_)
+                | Stmt::Match(_)
+                | Stmt::AsyncFor(_)
+                | Stmt::While(_)
+                | Stmt::Try(_)
+                | Stmt::TryStar(_) => {
                     is_too_complex = true;
                 }
                 _ => {}
@@ -141,7 +141,7 @@ pub fn complex_raises(checker: &mut Checker, stmt: &Stmt, items: &[Withitem], bo
 /// PT011
 fn exception_needs_match(checker: &mut Checker, exception: &Expr) {
     if let Some(call_path) = checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(exception)
         .and_then(|call_path| {
             let is_broad_exception = checker
diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/unittest_assert.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/unittest_assert.rs
index 9ce60532c7fc7..81b07d166a87b 100644
--- a/crates/ruff/src/rules/flake8_pytest_style/rules/unittest_assert.rs
+++ b/crates/ruff/src/rules/flake8_pytest_style/rules/unittest_assert.rs
@@ -1,18 +1,15 @@
 use std::hash::BuildHasherDefault;
 
 use anyhow::{anyhow, bail, Result};
+use ruff_text_size::TextRange;
 use rustc_hash::FxHashMap;
-use rustpython_parser::ast::{
-    Cmpop, Constant, Expr, ExprContext, ExprKind, Keyword, Stmt, StmtKind, Unaryop,
-};
-
-use ruff_python_ast::helpers::{create_expr, create_stmt};
+use rustpython_parser::ast::{self, Cmpop, Constant, Expr, ExprContext, Keyword, Stmt, Unaryop};
 
 /// An enum to represent the different types of assertions present in the
 /// `unittest` module. Note: any variants that can't be replaced with plain
 /// `assert` statements are commented out.
 #[derive(Copy, Clone)]
-pub enum UnittestAssert {
+pub(crate) enum UnittestAssert {
     AlmostEqual,
     AlmostEquals,
     CountEqual,
@@ -145,17 +142,19 @@ impl TryFrom<&str> for UnittestAssert {
 }
 
 fn assert(expr: &Expr, msg: Option<&Expr>) -> Stmt {
-    create_stmt(StmtKind::Assert {
+    Stmt::Assert(ast::StmtAssert {
         test: Box::new(expr.clone()),
         msg: msg.map(|msg| Box::new(msg.clone())),
+        range: TextRange::default(),
     })
 }
 
 fn compare(left: &Expr, cmpop: Cmpop, right: &Expr) -> Expr {
-    create_expr(ExprKind::Compare {
+    Expr::Compare(ast::ExprCompare {
         left: Box::new(left.clone()),
         ops: vec![cmpop],
         comparators: vec![right.clone()],
+        range: TextRange::default(),
     })
 }
 
@@ -201,16 +200,14 @@ impl UnittestAssert {
     }
 
     /// Create a map from argument name to value.
-    pub fn args_map<'a>(
+    pub(crate) fn args_map<'a>(
         &'a self,
         args: &'a [Expr],
         keywords: &'a [Keyword],
     ) -> Result<FxHashMap<&'a str, &'a Expr>> {
         // If we have variable-length arguments, abort.
-        if args
-            .iter()
-            .any(|arg| matches!(arg.node, ExprKind::Starred { .. }))
-            || keywords.iter().any(|kw| kw.node.arg.is_none())
+        if args.iter().any(|arg| matches!(arg, Expr::Starred(_)))
+            || keywords.iter().any(|kw| kw.arg.is_none())
         {
             bail!("Variable-length arguments are not supported");
         }
@@ -219,8 +216,7 @@ impl UnittestAssert {
 
         // If any of the keyword arguments are not in the argument spec, abort.
         if keywords.iter().any(|kw| {
-            kw.node
-                .arg
+            kw.arg
                 .as_ref()
                 .map_or(false, |kwarg_name| !arg_spec.contains(&kwarg_name.as_str()))
         }) {
@@ -242,12 +238,11 @@ impl UnittestAssert {
         for arg_name in arg_spec.iter().skip(args.len()) {
             if let Some(value) = keywords.iter().find_map(|keyword| {
                 if keyword
-                    .node
                     .arg
                     .as_ref()
-                    .map_or(false, |kwarg_name| kwarg_name == arg_name)
+                    .map_or(false, |kwarg_name| &kwarg_name == arg_name)
                 {
-                    Some(&keyword.node.value)
+                    Some(&keyword.value)
                 } else {
                     None
                 }
@@ -259,19 +254,22 @@ impl UnittestAssert {
         Ok(args_map)
     }
 
-    pub fn generate_assert(self, args: &[Expr], keywords: &[Keyword]) -> Result<Stmt> {
+    pub(crate) fn generate_assert(self, args: &[Expr], keywords: &[Keyword]) -> Result<Stmt> {
         let args = self.args_map(args, keywords)?;
         match self {
             UnittestAssert::True | UnittestAssert::False => {
-                let expr = args
+                let expr = *args
                     .get("expr")
                     .ok_or_else(|| anyhow!("Missing argument `expr`"))?;
                 let msg = args.get("msg").copied();
                 Ok(if matches!(self, UnittestAssert::False) {
-                    let unary_expr = create_expr(ExprKind::UnaryOp {
+                    let node = expr.clone();
+                    let node1 = Expr::UnaryOp(ast::ExprUnaryOp {
                         op: Unaryop::Not,
-                        operand: Box::new(create_expr(expr.node.clone())),
+                        operand: Box::new(node),
+                        range: TextRange::default(),
                     });
+                    let unary_expr = node1;
                     assert(&unary_expr, msg)
                 } else {
                     assert(expr, msg)
@@ -334,14 +332,12 @@ impl UnittestAssert {
                 } else {
                     Cmpop::IsNot
                 };
-                let expr = compare(
-                    expr,
-                    cmpop,
-                    &create_expr(ExprKind::Constant {
-                        value: Constant::None,
-                        kind: None,
-                    }),
-                );
+                let node = Expr::Constant(ast::ExprConstant {
+                    value: Constant::None,
+                    kind: None,
+                    range: TextRange::default(),
+                });
+                let expr = compare(expr, cmpop, &node);
                 Ok(assert(&expr, msg))
             }
             UnittestAssert::IsInstance | UnittestAssert::NotIsInstance => {
@@ -352,21 +348,27 @@ impl UnittestAssert {
                     .get("cls")
                     .ok_or_else(|| anyhow!("Missing argument `cls`"))?;
                 let msg = args.get("msg").copied();
-                let isinstance = create_expr(ExprKind::Call {
-                    func: Box::new(create_expr(ExprKind::Name {
-                        id: "isinstance".to_string(),
-                        ctx: ExprContext::Load,
-                    })),
+                let node = ast::ExprName {
+                    id: "isinstance".into(),
+                    ctx: ExprContext::Load,
+                    range: TextRange::default(),
+                };
+                let node1 = ast::ExprCall {
+                    func: Box::new(node.into()),
                     args: vec![(**obj).clone(), (**cls).clone()],
                     keywords: vec![],
-                });
+                    range: TextRange::default(),
+                };
+                let isinstance = node1.into();
                 if matches!(self, UnittestAssert::IsInstance) {
                     Ok(assert(&isinstance, msg))
                 } else {
-                    let expr = create_expr(ExprKind::UnaryOp {
+                    let node = ast::ExprUnaryOp {
                         op: Unaryop::Not,
                         operand: Box::new(isinstance),
-                    });
+                        range: TextRange::default(),
+                    };
+                    let expr = node.into();
                     Ok(assert(&expr, msg))
                 }
             }
@@ -381,28 +383,33 @@ impl UnittestAssert {
                     .get("regex")
                     .ok_or_else(|| anyhow!("Missing argument `regex`"))?;
                 let msg = args.get("msg").copied();
-                let re_search = create_expr(ExprKind::Call {
-                    func: Box::new(create_expr(ExprKind::Attribute {
-                        value: Box::new(create_expr(ExprKind::Name {
-                            id: "re".to_string(),
-                            ctx: ExprContext::Load,
-                        })),
-                        attr: "search".to_string(),
-                        ctx: ExprContext::Load,
-                    })),
+                let node = ast::ExprName {
+                    id: "re".into(),
+                    ctx: ExprContext::Load,
+                    range: TextRange::default(),
+                };
+                let node1 = ast::ExprAttribute {
+                    value: Box::new(node.into()),
+                    attr: "search".into(),
+                    ctx: ExprContext::Load,
+                    range: TextRange::default(),
+                };
+                let node2 = ast::ExprCall {
+                    func: Box::new(node1.into()),
                     args: vec![(**regex).clone(), (**text).clone()],
                     keywords: vec![],
-                });
+                    range: TextRange::default(),
+                };
+                let re_search = node2.into();
                 if matches!(self, UnittestAssert::Regex | UnittestAssert::RegexpMatches) {
                     Ok(assert(&re_search, msg))
                 } else {
-                    Ok(assert(
-                        &create_expr(ExprKind::UnaryOp {
-                            op: Unaryop::Not,
-                            operand: Box::new(re_search),
-                        }),
-                        msg,
-                    ))
+                    let node = ast::ExprUnaryOp {
+                        op: Unaryop::Not,
+                        operand: Box::new(re_search),
+                        range: TextRange::default(),
+                    };
+                    Ok(assert(&node.into(), msg))
                 }
             }
             _ => bail!("Cannot autofix `{self}`"),
diff --git a/crates/ruff/src/rules/flake8_pytest_style/settings.rs b/crates/ruff/src/rules/flake8_pytest_style/settings.rs
index 5409a7682b829..d00a3d8ebcb1f 100644
--- a/crates/ruff/src/rules/flake8_pytest_style/settings.rs
+++ b/crates/ruff/src/rules/flake8_pytest_style/settings.rs
@@ -1,9 +1,8 @@
 //! Settings for the `flake8-pytest-style` plugin.
 
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::{CacheKey, ConfigurationOptions};
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
 
 use super::types;
 
@@ -17,18 +16,19 @@ fn default_broad_exceptions() -> Vec<String> {
         "EnvironmentError",
         "socket.error",
     ]
-    .map(std::string::ToString::to_string)
+    .map(ToString::to_string)
     .to_vec()
 }
 
 #[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, CombineOptions,
 )]
 #[serde(
     deny_unknown_fields,
     rename_all = "kebab-case",
     rename = "Flake8PytestStyleOptions"
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = "true",
diff --git a/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT001_default.snap b/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT001_default.snap
index 434880490eabf..c17efd2cf3675 100644
--- a/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT001_default.snap
+++ b/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT001_default.snap
@@ -8,7 +8,7 @@ PT001.py:9:2: PT001 [*] Use `@pytest.fixture()` over `@pytest.fixture`
 10 | def no_parentheses():
 11 |     return 42
    |
-   = help: Add/remove parentheses
+   = help: Add parentheses
 
 ℹ Suggested fix
 6  6  | # `import pytest`
@@ -27,7 +27,7 @@ PT001.py:34:2: PT001 [*] Use `@pytest.fixture()` over `@pytest.fixture`
 35 | def imported_from_no_parentheses():
 36 |     return 42
    |
-   = help: Add/remove parentheses
+   = help: Add parentheses
 
 ℹ Suggested fix
 31 31 | # `from pytest import fixture`
@@ -46,7 +46,7 @@ PT001.py:59:2: PT001 [*] Use `@pytest.fixture()` over `@pytest.fixture`
 60 | def aliased_no_parentheses():
 61 |     return 42
    |
-   = help: Add/remove parentheses
+   = help: Add parentheses
 
 ℹ Suggested fix
 56 56 | # `from pytest import fixture as aliased`
diff --git a/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT001_no_parentheses.snap b/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT001_no_parentheses.snap
index 7732c59b2fc43..3dc9a14d435e5 100644
--- a/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT001_no_parentheses.snap
+++ b/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT001_no_parentheses.snap
@@ -8,7 +8,7 @@ PT001.py:14:2: PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
 15 | def parentheses_no_params():
 16 |     return 42
    |
-   = help: Add/remove parentheses
+   = help: Remove parentheses
 
 ℹ Suggested fix
 11 11 |     return 42
@@ -30,7 +30,7 @@ PT001.py:24:2: PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
 27 |   def parentheses_no_params_multiline():
 28 |       return 42
    |
-   = help: Add/remove parentheses
+   = help: Remove parentheses
 
 ℹ Suggested fix
 21 21 |     return 42
@@ -51,7 +51,7 @@ PT001.py:39:2: PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
 40 | def imported_from_parentheses_no_params():
 41 |     return 42
    |
-   = help: Add/remove parentheses
+   = help: Remove parentheses
 
 ℹ Suggested fix
 36 36 |     return 42
@@ -73,7 +73,7 @@ PT001.py:49:2: PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
 52 |   def imported_from_parentheses_no_params_multiline():
 53 |       return 42
    |
-   = help: Add/remove parentheses
+   = help: Remove parentheses
 
 ℹ Suggested fix
 46 46 |     return 42
@@ -94,7 +94,7 @@ PT001.py:64:2: PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
 65 | def aliased_parentheses_no_params():
 66 |     return 42
    |
-   = help: Add/remove parentheses
+   = help: Remove parentheses
 
 ℹ Suggested fix
 61 61 |     return 42
@@ -116,7 +116,7 @@ PT001.py:74:2: PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
 77 |   def aliased_parentheses_no_params_multiline():
 78 |       return 42
    |
-   = help: Add/remove parentheses
+   = help: Remove parentheses
 
 ℹ Suggested fix
 71 71 |     return 42
diff --git a/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT006_csv.snap b/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT006_csv.snap
index 06c50e4718e26..33f628f212c38 100644
--- a/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT006_csv.snap
+++ b/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT006_csv.snap
@@ -77,7 +77,7 @@ PT006.py:39:26: PT006 [*] Wrong name(s) type in `@pytest.mark.parametrize`, expe
 41 41 |     ...
 42 42 | 
 
-PT006.py:44:26: PT006 [*] Wrong name(s) type in `@pytest.mark.parametrize`, expected `csv`
+PT006.py:44:26: PT006 Wrong name(s) type in `@pytest.mark.parametrize`, expected `csv`
    |
 44 | @pytest.mark.parametrize([some_expr, another_expr], [1, 2, 3])
    |                          ^^^^^^^^^^^^^^^^^^^^^^^^^ PT006
@@ -86,7 +86,7 @@ PT006.py:44:26: PT006 [*] Wrong name(s) type in `@pytest.mark.parametrize`, expe
    |
    = help: Use a `csv` for parameter names
 
-PT006.py:49:26: PT006 [*] Wrong name(s) type in `@pytest.mark.parametrize`, expected `csv`
+PT006.py:49:26: PT006 Wrong name(s) type in `@pytest.mark.parametrize`, expected `csv`
    |
 49 | @pytest.mark.parametrize([some_expr, "param2"], [1, 2, 3])
    |                          ^^^^^^^^^^^^^^^^^^^^^ PT006
diff --git a/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT009.snap b/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT009.snap
index 4a9468d292ba8..7e6b1d43ce198 100644
--- a/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT009.snap
+++ b/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT009.snap
@@ -106,7 +106,7 @@ PT009.py:15:9: PT009 [*] Use a regular `assert` instead of unittest-style `asser
 17 17 |         self.assertTrue(**{"expr": expr, "msg": msg})  # Error, unfixable
 18 18 |         self.assertTrue(msg=msg, expr=expr, unexpected_arg=False)  # Error, unfixable
 
-PT009.py:16:9: PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue`
+PT009.py:16:9: PT009 Use a regular `assert` instead of unittest-style `assertTrue`
    |
 16 |         self.assertTrue(expr=expr, msg=msg)  # Error
 17 |         self.assertTrue(msg=msg, expr=expr)  # Error
@@ -117,7 +117,7 @@ PT009.py:16:9: PT009 [*] Use a regular `assert` instead of unittest-style `asser
    |
    = help: Replace `assertTrue(...)` with `assert ...`
 
-PT009.py:17:9: PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue`
+PT009.py:17:9: PT009 Use a regular `assert` instead of unittest-style `assertTrue`
    |
 17 |         self.assertTrue(msg=msg, expr=expr)  # Error
 18 |         self.assertTrue(*(expr, msg))  # Error, unfixable
@@ -128,7 +128,7 @@ PT009.py:17:9: PT009 [*] Use a regular `assert` instead of unittest-style `asser
    |
    = help: Replace `assertTrue(...)` with `assert ...`
 
-PT009.py:18:9: PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue`
+PT009.py:18:9: PT009 Use a regular `assert` instead of unittest-style `assertTrue`
    |
 18 |         self.assertTrue(*(expr, msg))  # Error, unfixable
 19 |         self.assertTrue(**{"expr": expr, "msg": msg})  # Error, unfixable
@@ -139,7 +139,7 @@ PT009.py:18:9: PT009 [*] Use a regular `assert` instead of unittest-style `asser
    |
    = help: Replace `assertTrue(...)` with `assert ...`
 
-PT009.py:19:9: PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue`
+PT009.py:19:9: PT009 Use a regular `assert` instead of unittest-style `assertTrue`
    |
 19 |         self.assertTrue(**{"expr": expr, "msg": msg})  # Error, unfixable
 20 |         self.assertTrue(msg=msg, expr=expr, unexpected_arg=False)  # Error, unfixable
@@ -159,6 +159,7 @@ PT009.py:21:13: PT009 Use a regular `assert` instead of unittest-style `assertIs
 24 |             if expect_condition
 25 |             else self.assertIsNone(value)  # Error, unfixable
    |
+   = help: Replace `assertIsNotNone(...)` with `assert ...`
 
 PT009.py:23:18: PT009 Use a regular `assert` instead of unittest-style `assertIsNone`
    |
@@ -169,6 +170,7 @@ PT009.py:23:18: PT009 Use a regular `assert` instead of unittest-style `assertIs
 26 |         )
 27 |         return self.assertEqual(True,  False)  # Error, unfixable
    |
+   = help: Replace `assertIsNone(...)` with `assert ...`
 
 PT009.py:25:16: PT009 Use a regular `assert` instead of unittest-style `assertEqual`
    |
@@ -179,6 +181,7 @@ PT009.py:25:16: PT009 Use a regular `assert` instead of unittest-style `assertEq
 28 | 
 29 |     def test_assert_false(self):
    |
+   = help: Replace `assertEqual(...)` with `assert ...`
 
 PT009.py:28:9: PT009 [*] Use a regular `assert` instead of unittest-style `assertFalse`
    |
diff --git a/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT018.snap b/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT018.snap
index 203e83fe9dc09..4605b3f8b104f 100644
--- a/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT018.snap
+++ b/crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT018.snap
@@ -229,6 +229,7 @@ PT018.py:30:5: PT018 Assertion should be broken down into multiple parts
 32 |     assert not (something or something_else and something_third), "with message"
 33 |     # detected, but no autofix for mixed conditions (e.g. `a or b and c`)
    |
+   = help: Break down assertion into multiple parts
 
 PT018.py:31:5: PT018 Assertion should be broken down into multiple parts
    |
@@ -239,6 +240,7 @@ PT018.py:31:5: PT018 Assertion should be broken down into multiple parts
 34 |     # detected, but no autofix for mixed conditions (e.g. `a or b and c`)
 35 |     assert not (something or something_else and something_third)
    |
+   = help: Break down assertion into multiple parts
 
 PT018.py:33:5: PT018 Assertion should be broken down into multiple parts
    |
@@ -249,8 +251,9 @@ PT018.py:33:5: PT018 Assertion should be broken down into multiple parts
 36 |     # detected, but no autofix for parenthesized conditions
 37 |     assert (
    |
+   = help: Break down assertion into multiple parts
 
-PT018.py:35:5: PT018 [*] Assertion should be broken down into multiple parts
+PT018.py:35:5: PT018 Assertion should be broken down into multiple parts
    |
 35 |       assert not (something or something_else and something_third)
 36 |       # detected, but no autofix for parenthesized conditions
@@ -266,4 +269,39 @@ PT018.py:35:5: PT018 [*] Assertion should be broken down into multiple parts
    |
    = help: Break down assertion into multiple parts
 
+PT018.py:45:1: PT018 [*] Assertion should be broken down into multiple parts
+   |
+45 | assert something  # OK
+46 | assert something and something_else  # Error
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PT018
+47 | assert something and something_else and something_third  # Error
+   |
+   = help: Break down assertion into multiple parts
+
+ℹ Suggested fix
+42 42 | 
+43 43 | 
+44 44 | assert something  # OK
+45    |-assert something and something_else  # Error
+   45 |+assert something
+   46 |+assert something_else
+46 47 | assert something and something_else and something_third  # Error
+
+PT018.py:46:1: PT018 [*] Assertion should be broken down into multiple parts
+   |
+46 | assert something  # OK
+47 | assert something and something_else  # Error
+48 | assert something and something_else and something_third  # Error
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PT018
+   |
+   = help: Break down assertion into multiple parts
+
+ℹ Suggested fix
+43 43 | 
+44 44 | assert something  # OK
+45 45 | assert something and something_else  # Error
+46    |-assert something and something_else and something_third  # Error
+   46 |+assert something and something_else
+   47 |+assert something_third
+
 
diff --git a/crates/ruff/src/rules/flake8_pytest_style/types.rs b/crates/ruff/src/rules/flake8_pytest_style/types.rs
index b52c539fb6da5..f666a8a909e6f 100644
--- a/crates/ruff/src/rules/flake8_pytest_style/types.rs
+++ b/crates/ruff/src/rules/flake8_pytest_style/types.rs
@@ -1,11 +1,11 @@
 use std::fmt::{Display, Formatter};
 
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 use ruff_macros::CacheKey;
 
-#[derive(Clone, Copy, Debug, CacheKey, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Copy, Debug, CacheKey, PartialEq, Eq, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum ParametrizeNameType {
     #[serde(rename = "csv")]
     Csv,
@@ -31,7 +31,8 @@ impl Display for ParametrizeNameType {
     }
 }
 
-#[derive(Clone, Copy, Debug, CacheKey, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Copy, Debug, CacheKey, PartialEq, Eq, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum ParametrizeValuesType {
     #[serde(rename = "tuple")]
     Tuple,
@@ -54,7 +55,8 @@ impl Display for ParametrizeValuesType {
     }
 }
 
-#[derive(Clone, Copy, Debug, CacheKey, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Copy, Debug, CacheKey, PartialEq, Eq, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum ParametrizeValuesRowType {
     #[serde(rename = "tuple")]
     Tuple,
diff --git a/crates/ruff/src/rules/flake8_quotes/mod.rs b/crates/ruff/src/rules/flake8_quotes/mod.rs
index e542478e93219..ee9648bcb3c70 100644
--- a/crates/ruff/src/rules/flake8_quotes/mod.rs
+++ b/crates/ruff/src/rules/flake8_quotes/mod.rs
@@ -6,11 +6,10 @@ pub mod settings;
 mod tests {
     use std::path::Path;
 
-    use crate::assert_messages;
     use anyhow::Result;
-
     use test_case::test_case;
 
+    use crate::assert_messages;
     use crate::registry::Rule;
     use crate::settings::Settings;
     use crate::test::test_path;
diff --git a/crates/ruff/src/rules/flake8_quotes/rules.rs b/crates/ruff/src/rules/flake8_quotes/rules/from_tokens.rs
similarity index 90%
rename from crates/ruff/src/rules/flake8_quotes/rules.rs
rename to crates/ruff/src/rules/flake8_quotes/rules/from_tokens.rs
index b706126755752..7c6f990dd334f 100644
--- a/crates/ruff/src/rules/flake8_quotes/rules.rs
+++ b/crates/ruff/src/rules/flake8_quotes/rules/from_tokens.rs
@@ -2,15 +2,15 @@ use ruff_text_size::TextRange;
 use rustpython_parser::lexer::LexResult;
 use rustpython_parser::Tok;
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::Locator;
 
 use crate::lex::docstring_detection::StateMachine;
 use crate::registry::Rule;
-use crate::settings::{flags, Settings};
+use crate::settings::Settings;
 
-use super::settings::Quote;
+use super::super::settings::Quote;
 
 /// ## What it does
 /// Checks for inline strings that use single quotes or double quotes,
@@ -34,7 +34,7 @@ use super::settings::Quote;
 /// ```
 #[violation]
 pub struct BadQuotesInlineString {
-    pub quote: Quote,
+    quote: Quote,
 }
 
 impl AlwaysAutofixableViolation for BadQuotesInlineString {
@@ -83,7 +83,7 @@ impl AlwaysAutofixableViolation for BadQuotesInlineString {
 /// ```
 #[violation]
 pub struct BadQuotesMultilineString {
-    pub quote: Quote,
+    quote: Quote,
 }
 
 impl AlwaysAutofixableViolation for BadQuotesMultilineString {
@@ -131,7 +131,7 @@ impl AlwaysAutofixableViolation for BadQuotesMultilineString {
 /// ```
 #[violation]
 pub struct BadQuotesDocstring {
-    pub quote: Quote,
+    quote: Quote,
 }
 
 impl AlwaysAutofixableViolation for BadQuotesDocstring {
@@ -255,12 +255,7 @@ impl<'a> From<&'a str> for Trivia<'a> {
 }
 
 /// Q003
-fn docstring(
-    locator: &Locator,
-    range: TextRange,
-    settings: &Settings,
-    autofix: flags::Autofix,
-) -> Option<Diagnostic> {
+fn docstring(locator: &Locator, range: TextRange, settings: &Settings) -> Option<Diagnostic> {
     let quotes_settings = &settings.flake8_quotes;
 
     let text = locator.slice(range);
@@ -279,7 +274,7 @@ fn docstring(
         },
         range,
     );
-    if autofix.into() && settings.rules.should_fix(Rule::BadQuotesDocstring) {
+    if settings.rules.should_fix(Rule::BadQuotesDocstring) {
         let quote_count = if trivia.is_multiline { 3 } else { 1 };
         let string_contents = &trivia.raw_text[quote_count..trivia.raw_text.len() - quote_count];
         let quote = good_docstring(quotes_settings.docstring_quotes).repeat(quote_count);
@@ -289,18 +284,17 @@ fn docstring(
         fixed_contents.push_str(&quote);
         fixed_contents.push_str(string_contents);
         fixed_contents.push_str(&quote);
-        diagnostic.set_fix(Edit::range_replacement(fixed_contents, range));
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+            fixed_contents,
+            range,
+        )));
     }
     Some(diagnostic)
 }
 
 /// Q001, Q002
-fn strings(
-    locator: &Locator,
-    sequence: &[TextRange],
-    settings: &Settings,
-    autofix: flags::Autofix,
-) -> Vec<Diagnostic> {
+fn strings(locator: &Locator, sequence: &[TextRange], settings: &Settings) -> Vec<Diagnostic> {
     let mut diagnostics = vec![];
 
     let quotes_settings = &settings.flake8_quotes;
@@ -354,7 +348,7 @@ fn strings(
                 *range,
             );
 
-            if autofix.into() && settings.rules.should_fix(Rule::BadQuotesMultilineString) {
+            if settings.rules.should_fix(Rule::BadQuotesMultilineString) {
                 let string_contents = &trivia.raw_text[3..trivia.raw_text.len() - 3];
                 let quote = good_multiline(quotes_settings.multiline_quotes);
                 let mut fixed_contents = String::with_capacity(
@@ -364,7 +358,11 @@ fn strings(
                 fixed_contents.push_str(quote);
                 fixed_contents.push_str(string_contents);
                 fixed_contents.push_str(quote);
-                diagnostic.set_fix(Edit::range_replacement(fixed_contents, *range));
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                    fixed_contents,
+                    *range,
+                )));
             }
             diagnostics.push(diagnostic);
         } else {
@@ -383,7 +381,7 @@ fn strings(
                     && !string_contents.contains(bad_single(quotes_settings.inline_quotes))
                 {
                     let mut diagnostic = Diagnostic::new(AvoidableEscapedQuote, *range);
-                    if autofix.into() && settings.rules.should_fix(Rule::AvoidableEscapedQuote) {
+                    if settings.rules.should_fix(Rule::AvoidableEscapedQuote) {
                         let quote = bad_single(quotes_settings.inline_quotes);
 
                         let mut fixed_contents =
@@ -427,7 +425,11 @@ fn strings(
 
                         fixed_contents.push(quote);
 
-                        diagnostic.set_fix(Edit::range_replacement(fixed_contents, *range));
+                        #[allow(deprecated)]
+                        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                            fixed_contents,
+                            *range,
+                        )));
                     }
                     diagnostics.push(diagnostic);
                 }
@@ -442,7 +444,7 @@ fn strings(
                     },
                     *range,
                 );
-                if autofix.into() && settings.rules.should_fix(Rule::BadQuotesInlineString) {
+                if settings.rules.should_fix(Rule::BadQuotesInlineString) {
                     let quote = good_single(quotes_settings.inline_quotes);
                     let mut fixed_contents =
                         String::with_capacity(trivia.prefix.len() + string_contents.len() + 2);
@@ -450,7 +452,11 @@ fn strings(
                     fixed_contents.push(quote);
                     fixed_contents.push_str(string_contents);
                     fixed_contents.push(quote);
-                    diagnostic.set_fix(Edit::range_replacement(fixed_contents, *range));
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                        fixed_contents,
+                        *range,
+                    )));
                 }
                 diagnostics.push(diagnostic);
             }
@@ -461,11 +467,10 @@ fn strings(
 }
 
 /// Generate `flake8-quote` diagnostics from a token stream.
-pub fn from_tokens(
+pub(crate) fn from_tokens(
     lxr: &[LexResult],
     locator: &Locator,
     settings: &Settings,
-    autofix: flags::Autofix,
 ) -> Vec<Diagnostic> {
     let mut diagnostics = vec![];
 
@@ -480,10 +485,10 @@ pub fn from_tokens(
         // docstring, then move on.
         if is_docstring {
             if !sequence.is_empty() {
-                diagnostics.extend(strings(locator, &sequence, settings, autofix));
+                diagnostics.extend(strings(locator, &sequence, settings));
                 sequence.clear();
             }
-            if let Some(diagnostic) = docstring(locator, range, settings, autofix) {
+            if let Some(diagnostic) = docstring(locator, range, settings) {
                 diagnostics.push(diagnostic);
             }
         } else {
@@ -493,7 +498,7 @@ pub fn from_tokens(
             } else if !matches!(tok, Tok::Comment(..) | Tok::NonLogicalNewline) {
                 // Otherwise, consume the sequence.
                 if !sequence.is_empty() {
-                    diagnostics.extend(strings(locator, &sequence, settings, autofix));
+                    diagnostics.extend(strings(locator, &sequence, settings));
                     sequence.clear();
                 }
             }
@@ -502,7 +507,7 @@ pub fn from_tokens(
 
     // If we have an unterminated sequence, consume it.
     if !sequence.is_empty() {
-        diagnostics.extend(strings(locator, &sequence, settings, autofix));
+        diagnostics.extend(strings(locator, &sequence, settings));
         sequence.clear();
     }
 
diff --git a/crates/ruff/src/rules/flake8_quotes/rules/mod.rs b/crates/ruff/src/rules/flake8_quotes/rules/mod.rs
new file mode 100644
index 0000000000000..7f04e8908fdaf
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_quotes/rules/mod.rs
@@ -0,0 +1,6 @@
+pub(crate) use from_tokens::{
+    from_tokens, AvoidableEscapedQuote, BadQuotesDocstring, BadQuotesInlineString,
+    BadQuotesMultilineString,
+};
+
+mod from_tokens;
diff --git a/crates/ruff/src/rules/flake8_quotes/settings.rs b/crates/ruff/src/rules/flake8_quotes/settings.rs
index b77fde3b44023..121501065e90b 100644
--- a/crates/ruff/src/rules/flake8_quotes/settings.rs
+++ b/crates/ruff/src/rules/flake8_quotes/settings.rs
@@ -1,12 +1,12 @@
 //! Settings for the `flake8-quotes` plugin.
 
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::{CacheKey, ConfigurationOptions};
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize, CacheKey, JsonSchema)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize, CacheKey)]
 #[serde(deny_unknown_fields, rename_all = "kebab-case")]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum Quote {
     /// Use single quotes.
     Single,
@@ -21,13 +21,14 @@ impl Default for Quote {
 }
 
 #[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, CombineOptions,
 )]
 #[serde(
     deny_unknown_fields,
     rename_all = "kebab-case",
     rename = "Flake8QuotesOptions"
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = r#""double""#,
diff --git a/crates/ruff/src/rules/flake8_raise/mod.rs b/crates/ruff/src/rules/flake8_raise/mod.rs
index 8ab2d26a740e4..c6591b3a15251 100644
--- a/crates/ruff/src/rules/flake8_raise/mod.rs
+++ b/crates/ruff/src/rules/flake8_raise/mod.rs
@@ -7,14 +7,13 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::UnnecessaryParenOnRaiseException, Path::new("RSE102.py"); "RSE102")]
+    #[test_case(Rule::UnnecessaryParenOnRaiseException, Path::new("RSE102.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.as_ref(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_raise/rules/mod.rs b/crates/ruff/src/rules/flake8_raise/rules/mod.rs
index 7177469472841..12efaed6ba0b0 100644
--- a/crates/ruff/src/rules/flake8_raise/rules/mod.rs
+++ b/crates/ruff/src/rules/flake8_raise/rules/mod.rs
@@ -1,4 +1,4 @@
-pub use unnecessary_paren_on_raise_exception::{
+pub(crate) use unnecessary_paren_on_raise_exception::{
     unnecessary_paren_on_raise_exception, UnnecessaryParenOnRaiseException,
 };
 
diff --git a/crates/ruff/src/rules/flake8_raise/rules/unnecessary_paren_on_raise_exception.rs b/crates/ruff/src/rules/flake8_raise/rules/unnecessary_paren_on_raise_exception.rs
index 6d6564af70699..a37c60da20a81 100644
--- a/crates/ruff/src/rules/flake8_raise/rules/unnecessary_paren_on_raise_exception.rs
+++ b/crates/ruff/src/rules/flake8_raise/rules/unnecessary_paren_on_raise_exception.rs
@@ -1,6 +1,6 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::match_parens;
 
@@ -22,19 +22,21 @@ impl AlwaysAutofixableViolation for UnnecessaryParenOnRaiseException {
 }
 
 /// RSE102
-pub fn unnecessary_paren_on_raise_exception(checker: &mut Checker, expr: &Expr) {
-    if let ExprKind::Call {
+pub(crate) fn unnecessary_paren_on_raise_exception(checker: &mut Checker, expr: &Expr) {
+    if let Expr::Call(ast::ExprCall {
         func,
         args,
         keywords,
-    } = &expr.node
+        range: _,
+    }) = expr
     {
         if args.is_empty() && keywords.is_empty() {
             let range = match_parens(func.end(), checker.locator)
                 .expect("Expected call to include parentheses");
             let mut diagnostic = Diagnostic::new(UnnecessaryParenOnRaiseException, range);
             if checker.patch(diagnostic.kind.rule()) {
-                diagnostic.set_fix(Edit::deletion(func.end(), range.end()));
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::deletion(func.end(), range.end())));
             }
             checker.diagnostics.push(diagnostic);
         }
diff --git a/crates/ruff/src/rules/flake8_return/branch.rs b/crates/ruff/src/rules/flake8_return/branch.rs
index b1aa9e86bf304..998d6da129f7b 100644
--- a/crates/ruff/src/rules/flake8_return/branch.rs
+++ b/crates/ruff/src/rules/flake8_return/branch.rs
@@ -1,7 +1,7 @@
 use std::fmt;
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub enum Branch {
+pub(crate) enum Branch {
     Elif,
     Else,
 }
diff --git a/crates/ruff/src/rules/flake8_return/helpers.rs b/crates/ruff/src/rules/flake8_return/helpers.rs
index 5352fe9587ae1..652ac72050f5c 100644
--- a/crates/ruff/src/rules/flake8_return/helpers.rs
+++ b/crates/ruff/src/rules/flake8_return/helpers.rs
@@ -1,20 +1,17 @@
 use ruff_text_size::TextSize;
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Stmt};
+use rustpython_parser::ast::{Expr, Ranged, Stmt};
 
-use ruff_python_ast::newlines::StrExt;
+use ruff_newlines::StrExt;
 use ruff_python_ast::source_code::Locator;
 
 /// Return `true` if a function's return statement include at least one
 /// non-`None` value.
-pub fn result_exists(returns: &[(&Stmt, Option<&Expr>)]) -> bool {
+pub(crate) fn result_exists(returns: &[(&Stmt, Option<&Expr>)]) -> bool {
     returns.iter().any(|(_, expr)| {
         expr.map(|expr| {
             !matches!(
-                expr.node,
-                ExprKind::Constant {
-                    value: Constant::None,
-                    ..
-                }
+                expr,
+                Expr::Constant(ref constant) if constant.value.is_none()
             )
         })
         .unwrap_or(false)
@@ -28,7 +25,7 @@ pub fn result_exists(returns: &[(&Stmt, Option<&Expr>)]) -> bool {
 ///
 /// This method assumes that the statement is the last statement in its body; specifically, that
 /// the statement isn't followed by a semicolon, followed by a multi-line statement.
-pub fn end_of_last_statement(stmt: &Stmt, locator: &Locator) -> TextSize {
+pub(crate) fn end_of_last_statement(stmt: &Stmt, locator: &Locator) -> TextSize {
     // End-of-file, so just return the end of the statement.
     if stmt.end() == locator.text_len() {
         stmt.end()
diff --git a/crates/ruff/src/rules/flake8_return/mod.rs b/crates/ruff/src/rules/flake8_return/mod.rs
index 21763cb57099b..d07613029a820 100644
--- a/crates/ruff/src/rules/flake8_return/mod.rs
+++ b/crates/ruff/src/rules/flake8_return/mod.rs
@@ -8,23 +8,22 @@ mod visitor;
 mod tests {
     use std::path::Path;
 
-    use crate::assert_messages;
     use anyhow::Result;
-
     use test_case::test_case;
 
+    use crate::assert_messages;
     use crate::registry::Rule;
     use crate::settings::Settings;
     use crate::test::test_path;
 
-    #[test_case(Rule::UnnecessaryReturnNone, Path::new("RET501.py"); "RET501")]
-    #[test_case(Rule::ImplicitReturnValue, Path::new("RET502.py"); "RET502")]
-    #[test_case(Rule::ImplicitReturn, Path::new("RET503.py"); "RET503")]
-    #[test_case(Rule::UnnecessaryAssign, Path::new("RET504.py"); "RET504")]
-    #[test_case(Rule::SuperfluousElseReturn, Path::new("RET505.py"); "RET505")]
-    #[test_case(Rule::SuperfluousElseRaise, Path::new("RET506.py"); "RET506")]
-    #[test_case(Rule::SuperfluousElseContinue, Path::new("RET507.py"); "RET507")]
-    #[test_case(Rule::SuperfluousElseBreak, Path::new("RET508.py"); "RET508")]
+    #[test_case(Rule::UnnecessaryReturnNone, Path::new("RET501.py"))]
+    #[test_case(Rule::ImplicitReturnValue, Path::new("RET502.py"))]
+    #[test_case(Rule::ImplicitReturn, Path::new("RET503.py"))]
+    #[test_case(Rule::UnnecessaryAssign, Path::new("RET504.py"))]
+    #[test_case(Rule::SuperfluousElseReturn, Path::new("RET505.py"))]
+    #[test_case(Rule::SuperfluousElseRaise, Path::new("RET506.py"))]
+    #[test_case(Rule::SuperfluousElseContinue, Path::new("RET507.py"))]
+    #[test_case(Rule::SuperfluousElseBreak, Path::new("RET508.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_return/rules.rs b/crates/ruff/src/rules/flake8_return/rules/function.rs
similarity index 78%
rename from crates/ruff/src/rules/flake8_return/rules.rs
rename to crates/ruff/src/rules/flake8_return/rules/function.rs
index 88e8e6694c54a..9bfb85ade3b4b 100644
--- a/crates/ruff/src/rules/flake8_return/rules.rs
+++ b/crates/ruff/src/rules/flake8_return/rules/function.rs
@@ -1,23 +1,23 @@
 use itertools::Itertools;
 use ruff_text_size::{TextRange, TextSize};
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Constant, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Violation};
-use ruff_diagnostics::{Diagnostic, Edit};
+use ruff_diagnostics::{Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::elif_else_range;
 use ruff_python_ast::helpers::is_const_none;
 use ruff_python_ast::visitor::Visitor;
 use ruff_python_ast::whitespace::indentation;
-use ruff_python_semantic::context::Context;
+use ruff_python_semantic::model::SemanticModel;
 
 use crate::checkers::ast::Checker;
 use crate::registry::{AsRule, Rule};
 use crate::rules::flake8_return::helpers::end_of_last_statement;
 
-use super::branch::Branch;
-use super::helpers::result_exists;
-use super::visitor::{ReturnVisitor, Stack};
+use super::super::branch::Branch;
+use super::super::helpers::result_exists;
+use super::super::visitor::{ReturnVisitor, Stack};
 
 /// ## What it does
 /// Checks for the presence of a `return None` statement when `None` is the only
@@ -150,16 +150,12 @@ impl AlwaysAutofixableViolation for ImplicitReturn {
 /// ```python
 /// def foo():
 ///     bar = 1
-///     # some code that not using `bar`
-///     print('test')
 ///     return bar
 /// ```
 ///
 /// Use instead:
 /// ```python
 /// def foo():
-///     # some code that not using `bar`
-///     print('test')
 ///     return 1
 /// ```
 #[violation]
@@ -199,7 +195,7 @@ impl Violation for UnnecessaryAssign {
 /// ```
 #[violation]
 pub struct SuperfluousElseReturn {
-    pub branch: Branch,
+    branch: Branch,
 }
 
 impl Violation for SuperfluousElseReturn {
@@ -237,7 +233,7 @@ impl Violation for SuperfluousElseReturn {
 /// ```
 #[violation]
 pub struct SuperfluousElseRaise {
-    pub branch: Branch,
+    branch: Branch,
 }
 
 impl Violation for SuperfluousElseRaise {
@@ -259,12 +255,12 @@ impl Violation for SuperfluousElseRaise {
 ///
 /// ## Example
 /// ```python
-///def foo(bar, baz):
-///    for i in bar:
-///        if i < baz:
-///            continue
-///        else:
-///            x = 0
+/// def foo(bar, baz):
+///     for i in bar:
+///         if i < baz:
+///             continue
+///         else:
+///             x = 0
 /// ```
 ///
 /// Use instead:
@@ -277,7 +273,7 @@ impl Violation for SuperfluousElseRaise {
 /// ```
 #[violation]
 pub struct SuperfluousElseContinue {
-    pub branch: Branch,
+    branch: Branch,
 }
 
 impl Violation for SuperfluousElseContinue {
@@ -317,7 +313,7 @@ impl Violation for SuperfluousElseContinue {
 /// ```
 #[violation]
 pub struct SuperfluousElseBreak {
-    pub branch: Branch,
+    branch: Branch,
 }
 
 impl Violation for SuperfluousElseBreak {
@@ -335,17 +331,21 @@ fn unnecessary_return_none(checker: &mut Checker, stack: &Stack) {
             continue;
         };
         if !matches!(
-            expr.node,
-            ExprKind::Constant {
+            expr,
+            Expr::Constant(ast::ExprConstant {
                 value: Constant::None,
                 ..
-            }
+            })
         ) {
             continue;
         }
         let mut diagnostic = Diagnostic::new(UnnecessaryReturnNone, stmt.range());
         if checker.patch(diagnostic.kind.rule()) {
-            diagnostic.set_fix(Edit::range_replacement("return".to_string(), stmt.range()));
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                "return".to_string(),
+                stmt.range(),
+            )));
         }
         checker.diagnostics.push(diagnostic);
     }
@@ -359,10 +359,11 @@ fn implicit_return_value(checker: &mut Checker, stack: &Stack) {
         }
         let mut diagnostic = Diagnostic::new(ImplicitReturnValue, stmt.range());
         if checker.patch(diagnostic.kind.rule()) {
-            diagnostic.set_fix(Edit::range_replacement(
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
                 "return None".to_string(),
                 stmt.range(),
-            ));
+            )));
         }
         checker.diagnostics.push(diagnostic);
     }
@@ -390,19 +391,19 @@ const NORETURN_FUNCS: &[&[&str]] = &[
 ];
 
 /// Return `true` if the `func` is a known function that never returns.
-fn is_noreturn_func(context: &Context, func: &Expr) -> bool {
-    context.resolve_call_path(func).map_or(false, |call_path| {
+fn is_noreturn_func(model: &SemanticModel, func: &Expr) -> bool {
+    model.resolve_call_path(func).map_or(false, |call_path| {
         NORETURN_FUNCS
             .iter()
             .any(|target| call_path.as_slice() == *target)
-            || context.match_typing_call_path(&call_path, "assert_never")
+            || model.match_typing_call_path(&call_path, "assert_never")
     })
 }
 
 /// RET503
 fn implicit_return(checker: &mut Checker, stmt: &Stmt) {
-    match &stmt.node {
-        StmtKind::If { body, orelse, .. } => {
+    match stmt {
+        Stmt::If(ast::StmtIf { body, orelse, .. }) => {
             if let Some(last_stmt) = body.last() {
                 implicit_return(checker, last_stmt);
             }
@@ -416,34 +417,35 @@ fn implicit_return(checker: &mut Checker, stmt: &Stmt) {
                         content.push_str(checker.stylist.line_ending().as_str());
                         content.push_str(indent);
                         content.push_str("return None");
-                        diagnostic.set_fix(Edit::insertion(
+                        #[allow(deprecated)]
+                        diagnostic.set_fix(Fix::unspecified(Edit::insertion(
                             content,
                             end_of_last_statement(stmt, checker.locator),
-                        ));
+                        )));
                     }
                 }
                 checker.diagnostics.push(diagnostic);
             }
         }
-        StmtKind::Assert { test, .. }
+        Stmt::Assert(ast::StmtAssert { test, .. })
             if matches!(
-                test.node,
-                ExprKind::Constant {
+                test.as_ref(),
+                Expr::Constant(ast::ExprConstant {
                     value: Constant::Bool(false),
                     ..
-                }
+                })
             ) => {}
-        StmtKind::While { test, .. }
+        Stmt::While(ast::StmtWhile { test, .. })
             if matches!(
-                test.node,
-                ExprKind::Constant {
+                test.as_ref(),
+                Expr::Constant(ast::ExprConstant {
                     value: Constant::Bool(true),
                     ..
-                }
+                })
             ) => {}
-        StmtKind::For { orelse, .. }
-        | StmtKind::AsyncFor { orelse, .. }
-        | StmtKind::While { orelse, .. } => {
+        Stmt::For(ast::StmtFor { orelse, .. })
+        | Stmt::AsyncFor(ast::StmtAsyncFor { orelse, .. })
+        | Stmt::While(ast::StmtWhile { orelse, .. }) => {
             if let Some(last_stmt) = orelse.last() {
                 implicit_return(checker, last_stmt);
             } else {
@@ -454,36 +456,35 @@ fn implicit_return(checker: &mut Checker, stmt: &Stmt) {
                         content.push_str(checker.stylist.line_ending().as_str());
                         content.push_str(indent);
                         content.push_str("return None");
-                        diagnostic.set_fix(Edit::insertion(
+                        #[allow(deprecated)]
+                        diagnostic.set_fix(Fix::unspecified(Edit::insertion(
                             content,
                             end_of_last_statement(stmt, checker.locator),
-                        ));
+                        )));
                     }
                 }
                 checker.diagnostics.push(diagnostic);
             }
         }
-        StmtKind::Match { cases, .. } => {
+        Stmt::Match(ast::StmtMatch { cases, .. }) => {
             for case in cases {
                 if let Some(last_stmt) = case.body.last() {
                     implicit_return(checker, last_stmt);
                 }
             }
         }
-        StmtKind::With { body, .. } | StmtKind::AsyncWith { body, .. } => {
+        Stmt::With(ast::StmtWith { body, .. })
+        | Stmt::AsyncWith(ast::StmtAsyncWith { body, .. }) => {
             if let Some(last_stmt) = body.last() {
                 implicit_return(checker, last_stmt);
             }
         }
-        StmtKind::Return { .. }
-        | StmtKind::Raise { .. }
-        | StmtKind::Try { .. }
-        | StmtKind::TryStar { .. } => {}
-        StmtKind::Expr { value, .. }
+        Stmt::Return(_) | Stmt::Raise(_) | Stmt::Try(_) | Stmt::TryStar(_) => {}
+        Stmt::Expr(ast::StmtExpr { value, .. })
             if matches!(
-                &value.node,
-                ExprKind::Call { func, ..  }
-                    if is_noreturn_func(&checker.ctx, func)
+                value.as_ref(),
+                Expr::Call(ast::ExprCall { func, ..  })
+                    if is_noreturn_func(checker.semantic_model(), func)
             ) => {}
         _ => {
             let mut diagnostic = Diagnostic::new(ImplicitReturn, stmt.range());
@@ -493,10 +494,11 @@ fn implicit_return(checker: &mut Checker, stmt: &Stmt) {
                     content.push_str(checker.stylist.line_ending().as_str());
                     content.push_str(indent);
                     content.push_str("return None");
-                    diagnostic.set_fix(Edit::insertion(
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::insertion(
                         content,
                         end_of_last_statement(stmt, checker.locator),
-                    ));
+                    )));
                 }
             }
             checker.diagnostics.push(diagnostic);
@@ -504,34 +506,36 @@ fn implicit_return(checker: &mut Checker, stmt: &Stmt) {
     }
 }
 
-/// Return `true` if the `id` has multiple assignments within the function.
-fn has_multiple_assigns(id: &str, stack: &Stack) -> bool {
-    if let Some(assigns) = stack.assignments.get(&id) {
-        if assigns.len() > 1 {
-            return true;
-        }
-    }
-    false
+/// Return `true` if the `id` has multiple declarations within the function.
+fn has_multiple_declarations(id: &str, stack: &Stack) -> bool {
+    stack
+        .declarations
+        .get(&id)
+        .map_or(false, |declarations| declarations.len() > 1)
 }
 
 /// Return `true` if the `id` has a (read) reference between the `return_location` and its
-/// preceding assignment.
-fn has_refs_before_next_assign(id: &str, return_range: TextRange, stack: &Stack) -> bool {
-    let mut assignment_before_return: Option<TextSize> = None;
-    let mut assignment_after_return: Option<TextSize> = None;
-    if let Some(assignments) = stack.assignments.get(&id) {
+/// preceding declaration.
+fn has_references_before_next_declaration(
+    id: &str,
+    return_range: TextRange,
+    stack: &Stack,
+) -> bool {
+    let mut declaration_before_return: Option<TextSize> = None;
+    let mut declaration_after_return: Option<TextSize> = None;
+    if let Some(assignments) = stack.declarations.get(&id) {
         for location in assignments.iter().sorted() {
             if *location > return_range.start() {
-                assignment_after_return = Some(*location);
+                declaration_after_return = Some(*location);
                 break;
             }
-            assignment_before_return = Some(*location);
+            declaration_before_return = Some(*location);
         }
     }
 
-    // If there is no assignment before the return, then the variable must be defined in
+    // If there is no declaration before the return, then the variable must be declared in
     // some other way (e.g., a function argument). No need to check for references.
-    let Some(assignment_before_return) = assignment_before_return else {
+    let Some(declaration_before_return) = declaration_before_return else {
         return true;
     };
 
@@ -541,9 +545,9 @@ fn has_refs_before_next_assign(id: &str, return_range: TextRange, stack: &Stack)
                 continue;
             }
 
-            if assignment_before_return < *location {
-                if let Some(assignment_after_return) = assignment_after_return {
-                    if *location <= assignment_after_return {
+            if declaration_before_return < *location {
+                if let Some(declaration_after_return) = declaration_after_return {
+                    if *location <= declaration_after_return {
                         return true;
                     }
                 } else {
@@ -557,7 +561,7 @@ fn has_refs_before_next_assign(id: &str, return_range: TextRange, stack: &Stack)
 }
 
 /// Return `true` if the `id` has a read or write reference within a `try` or loop body.
-fn has_refs_or_assigns_within_try_or_loop(id: &str, stack: &Stack) -> bool {
+fn has_references_or_declarations_within_try_or_loop(id: &str, stack: &Stack) -> bool {
     if let Some(references) = stack.references.get(&id) {
         for location in references {
             for try_range in &stack.tries {
@@ -572,7 +576,7 @@ fn has_refs_or_assigns_within_try_or_loop(id: &str, stack: &Stack) -> bool {
             }
         }
     }
-    if let Some(references) = stack.assignments.get(&id) {
+    if let Some(references) = stack.declarations.get(&id) {
         for location in references {
             for try_range in &stack.tries {
                 if try_range.contains(*location) {
@@ -591,8 +595,8 @@ fn has_refs_or_assigns_within_try_or_loop(id: &str, stack: &Stack) -> bool {
 
 /// RET504
 fn unnecessary_assign(checker: &mut Checker, stack: &Stack, expr: &Expr) {
-    if let ExprKind::Name { id, .. } = &expr.node {
-        if !stack.assignments.contains_key(id.as_str()) {
+    if let Expr::Name(ast::ExprName { id, .. }) = expr {
+        if !stack.assigned_names.contains(id.as_str()) {
             return;
         }
 
@@ -603,9 +607,9 @@ fn unnecessary_assign(checker: &mut Checker, stack: &Stack, expr: &Expr) {
             return;
         }
 
-        if has_multiple_assigns(id, stack)
-            || has_refs_before_next_assign(id, expr.range(), stack)
-            || has_refs_or_assigns_within_try_or_loop(id, stack)
+        if has_multiple_declarations(id, stack)
+            || has_references_before_next_declaration(id, expr.range(), stack)
+            || has_references_or_declarations_within_try_or_loop(id, stack)
         {
             return;
         }
@@ -622,46 +626,43 @@ fn unnecessary_assign(checker: &mut Checker, stack: &Stack, expr: &Expr) {
 
 /// RET505, RET506, RET507, RET508
 fn superfluous_else_node(checker: &mut Checker, stmt: &Stmt, branch: Branch) -> bool {
-    let StmtKind::If { body, .. } = &stmt.node else {
+    let Stmt::If(ast::StmtIf { body, .. }) = stmt else {
         return false;
     };
     for child in body {
-        if matches!(child.node, StmtKind::Return { .. }) {
+        if child.is_return_stmt() {
             let diagnostic = Diagnostic::new(
                 SuperfluousElseReturn { branch },
                 elif_else_range(stmt, checker.locator).unwrap_or_else(|| stmt.range()),
             );
-            if checker.settings.rules.enabled(diagnostic.kind.rule()) {
+            if checker.enabled(diagnostic.kind.rule()) {
                 checker.diagnostics.push(diagnostic);
             }
             return true;
-        }
-        if matches!(child.node, StmtKind::Break) {
+        } else if child.is_break_stmt() {
             let diagnostic = Diagnostic::new(
                 SuperfluousElseBreak { branch },
                 elif_else_range(stmt, checker.locator).unwrap_or_else(|| stmt.range()),
             );
-            if checker.settings.rules.enabled(diagnostic.kind.rule()) {
+            if checker.enabled(diagnostic.kind.rule()) {
                 checker.diagnostics.push(diagnostic);
             }
             return true;
-        }
-        if matches!(child.node, StmtKind::Raise { .. }) {
+        } else if child.is_raise_stmt() {
             let diagnostic = Diagnostic::new(
                 SuperfluousElseRaise { branch },
                 elif_else_range(stmt, checker.locator).unwrap_or_else(|| stmt.range()),
             );
-            if checker.settings.rules.enabled(diagnostic.kind.rule()) {
+            if checker.enabled(diagnostic.kind.rule()) {
                 checker.diagnostics.push(diagnostic);
             }
             return true;
-        }
-        if matches!(child.node, StmtKind::Continue) {
+        } else if child.is_continue_stmt() {
             let diagnostic = Diagnostic::new(
                 SuperfluousElseContinue { branch },
                 elif_else_range(stmt, checker.locator).unwrap_or_else(|| stmt.range()),
             );
-            if checker.settings.rules.enabled(diagnostic.kind.rule()) {
+            if checker.enabled(diagnostic.kind.rule()) {
                 checker.diagnostics.push(diagnostic);
             }
             return true;
@@ -685,7 +686,7 @@ fn superfluous_else(checker: &mut Checker, stack: &Stack) {
 }
 
 /// Run all checks from the `flake8-return` plugin.
-pub fn function(checker: &mut Checker, body: &[Stmt], returns: Option<&Expr>) {
+pub(crate) fn function(checker: &mut Checker, body: &[Stmt], returns: Option<&Expr>) {
     // Find the last statement in the function.
     let Some(last_stmt) = body.last() else {
         // Skip empty functions.
@@ -693,7 +694,7 @@ pub fn function(checker: &mut Checker, body: &[Stmt], returns: Option<&Expr>) {
     };
 
     // Skip functions that consist of a single return statement.
-    if body.len() == 1 && matches!(last_stmt.node, StmtKind::Return { .. }) {
+    if body.len() == 1 && matches!(last_stmt, Stmt::Return(_)) {
         return;
     }
 
@@ -711,7 +712,7 @@ pub fn function(checker: &mut Checker, body: &[Stmt], returns: Option<&Expr>) {
         return;
     }
 
-    if checker.settings.rules.any_enabled(&[
+    if checker.any_enabled(&[
         Rule::SuperfluousElseReturn,
         Rule::SuperfluousElseRaise,
         Rule::SuperfluousElseContinue,
@@ -728,14 +729,14 @@ pub fn function(checker: &mut Checker, body: &[Stmt], returns: Option<&Expr>) {
 
     // If we have at least one non-`None` return...
     if result_exists(&stack.returns) {
-        if checker.settings.rules.enabled(Rule::ImplicitReturnValue) {
+        if checker.enabled(Rule::ImplicitReturnValue) {
             implicit_return_value(checker, &stack);
         }
-        if checker.settings.rules.enabled(Rule::ImplicitReturn) {
+        if checker.enabled(Rule::ImplicitReturn) {
             implicit_return(checker, last_stmt);
         }
 
-        if checker.settings.rules.enabled(Rule::UnnecessaryAssign) {
+        if checker.enabled(Rule::UnnecessaryAssign) {
             for (_, expr) in &stack.returns {
                 if let Some(expr) = expr {
                     unnecessary_assign(checker, &stack, expr);
@@ -743,7 +744,7 @@ pub fn function(checker: &mut Checker, body: &[Stmt], returns: Option<&Expr>) {
             }
         }
     } else {
-        if checker.settings.rules.enabled(Rule::UnnecessaryReturnNone) {
+        if checker.enabled(Rule::UnnecessaryReturnNone) {
             // Skip functions that have a return annotation that is not `None`.
             if returns.map_or(true, is_const_none) {
                 unnecessary_return_none(checker, &stack);
diff --git a/crates/ruff/src/rules/flake8_return/rules/mod.rs b/crates/ruff/src/rules/flake8_return/rules/mod.rs
new file mode 100644
index 0000000000000..7e6a3fbcf7448
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_return/rules/mod.rs
@@ -0,0 +1,6 @@
+pub(crate) use function::{
+    function, ImplicitReturn, ImplicitReturnValue, SuperfluousElseBreak, SuperfluousElseContinue,
+    SuperfluousElseRaise, SuperfluousElseReturn, UnnecessaryAssign, UnnecessaryReturnNone,
+};
+
+mod function;
diff --git a/crates/ruff/src/rules/flake8_return/visitor.rs b/crates/ruff/src/rules/flake8_return/visitor.rs
index a1b0d018e928c..f0d419c7bc487 100644
--- a/crates/ruff/src/rules/flake8_return/visitor.rs
+++ b/crates/ruff/src/rules/flake8_return/visitor.rs
@@ -1,51 +1,57 @@
 use ruff_text_size::{TextRange, TextSize};
 use rustc_hash::{FxHashMap, FxHashSet};
-use rustpython_parser::ast::{Expr, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Expr, Identifier, Ranged, Stmt};
 
 use ruff_python_ast::visitor;
 use ruff_python_ast::visitor::Visitor;
 
 #[derive(Default)]
-pub struct Stack<'a> {
-    pub returns: Vec<(&'a Stmt, Option<&'a Expr>)>,
-    pub yields: Vec<&'a Expr>,
-    pub elses: Vec<&'a Stmt>,
-    pub elifs: Vec<&'a Stmt>,
-    pub references: FxHashMap<&'a str, Vec<TextSize>>,
-    pub non_locals: FxHashSet<&'a str>,
-    pub assignments: FxHashMap<&'a str, Vec<TextSize>>,
-    pub loops: Vec<TextRange>,
-    pub tries: Vec<TextRange>,
+pub(crate) struct Stack<'a> {
+    pub(crate) returns: Vec<(&'a Stmt, Option<&'a Expr>)>,
+    pub(crate) yields: Vec<&'a Expr>,
+    pub(crate) elses: Vec<&'a Stmt>,
+    pub(crate) elifs: Vec<&'a Stmt>,
+    /// The names that are assigned to in the current scope (e.g., anything on the left-hand side of
+    /// an assignment).
+    pub(crate) assigned_names: FxHashSet<&'a str>,
+    /// The names that are declared in the current scope, and the ranges of those declarations
+    /// (e.g., assignments, but also function and class definitions).
+    pub(crate) declarations: FxHashMap<&'a str, Vec<TextSize>>,
+    pub(crate) references: FxHashMap<&'a str, Vec<TextSize>>,
+    pub(crate) non_locals: FxHashSet<&'a str>,
+    pub(crate) loops: Vec<TextRange>,
+    pub(crate) tries: Vec<TextRange>,
 }
 
 #[derive(Default)]
-pub struct ReturnVisitor<'a> {
-    pub stack: Stack<'a>,
+pub(crate) struct ReturnVisitor<'a> {
+    pub(crate) stack: Stack<'a>,
     parents: Vec<&'a Stmt>,
 }
 
 impl<'a> ReturnVisitor<'a> {
     fn visit_assign_target(&mut self, expr: &'a Expr) {
-        match &expr.node {
-            ExprKind::Tuple { elts, .. } => {
+        match expr {
+            Expr::Tuple(ast::ExprTuple { elts, .. }) => {
                 for elt in elts {
                     self.visit_assign_target(elt);
                 }
                 return;
             }
-            ExprKind::Name { id, .. } => {
+            Expr::Name(ast::ExprName { id, .. }) => {
+                self.stack.assigned_names.insert(id.as_str());
                 self.stack
-                    .assignments
+                    .declarations
                     .entry(id)
                     .or_insert_with(Vec::new)
                     .push(expr.start());
                 return;
             }
-            ExprKind::Attribute { .. } => {
+            Expr::Attribute(_) => {
                 // Attribute assignments are often side-effects (e.g., `self.property = value`),
                 // so we conservatively treat them as references to every known
                 // variable.
-                for name in self.stack.assignments.keys() {
+                for name in self.stack.declarations.keys() {
                     self.stack
                         .references
                         .entry(name)
@@ -61,24 +67,51 @@ impl<'a> ReturnVisitor<'a> {
 
 impl<'a> Visitor<'a> for ReturnVisitor<'a> {
     fn visit_stmt(&mut self, stmt: &'a Stmt) {
-        match &stmt.node {
-            StmtKind::Global { names } | StmtKind::Nonlocal { names } => {
+        match stmt {
+            Stmt::Global(ast::StmtGlobal { names, range: _ })
+            | Stmt::Nonlocal(ast::StmtNonlocal { names, range: _ }) => {
                 self.stack
                     .non_locals
-                    .extend(names.iter().map(String::as_str));
+                    .extend(names.iter().map(Identifier::as_str));
             }
-            StmtKind::FunctionDef {
+            Stmt::ClassDef(ast::StmtClassDef {
                 decorator_list,
-                args,
-                returns,
+                name,
                 ..
+            }) => {
+                // Mark a declaration.
+                self.stack
+                    .declarations
+                    .entry(name.as_str())
+                    .or_insert_with(Vec::new)
+                    .push(stmt.start());
+
+                // Don't recurse into the body, but visit the decorators, etc.
+                for expr in decorator_list {
+                    visitor::walk_expr(self, expr);
+                }
             }
-            | StmtKind::AsyncFunctionDef {
+            Stmt::FunctionDef(ast::StmtFunctionDef {
+                name,
+                args,
                 decorator_list,
+                returns,
+                ..
+            })
+            | Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef {
+                name,
                 args,
+                decorator_list,
                 returns,
                 ..
-            } => {
+            }) => {
+                // Mark a declaration.
+                self.stack
+                    .declarations
+                    .entry(name.as_str())
+                    .or_insert_with(Vec::new)
+                    .push(stmt.start());
+
                 // Don't recurse into the body, but visit the decorators, etc.
                 for expr in decorator_list {
                     visitor::walk_expr(self, expr);
@@ -88,7 +121,7 @@ impl<'a> Visitor<'a> for ReturnVisitor<'a> {
                 }
                 visitor::walk_arguments(self, args);
             }
-            StmtKind::Return { value } => {
+            Stmt::Return(ast::StmtReturn { value, range: _ }) => {
                 self.stack
                     .returns
                     .push((stmt, value.as_ref().map(|expr| &**expr)));
@@ -97,9 +130,9 @@ impl<'a> Visitor<'a> for ReturnVisitor<'a> {
                 visitor::walk_stmt(self, stmt);
                 self.parents.pop();
             }
-            StmtKind::If { orelse, .. } => {
+            Stmt::If(ast::StmtIf { orelse, .. }) => {
                 let is_elif_arm = self.parents.iter().any(|parent| {
-                    if let StmtKind::If { orelse, .. } = &parent.node {
+                    if let Stmt::If(ast::StmtIf { orelse, .. }) = parent {
                         orelse.len() == 1 && &orelse[0] == stmt
                     } else {
                         false
@@ -107,8 +140,8 @@ impl<'a> Visitor<'a> for ReturnVisitor<'a> {
                 });
 
                 if !is_elif_arm {
-                    let has_elif = orelse.len() == 1
-                        && matches!(orelse.first().unwrap().node, StmtKind::If { .. });
+                    let has_elif =
+                        orelse.len() == 1 && matches!(orelse.first().unwrap(), Stmt::If(_));
                     let has_else = !orelse.is_empty();
 
                     if has_elif {
@@ -124,8 +157,8 @@ impl<'a> Visitor<'a> for ReturnVisitor<'a> {
                 visitor::walk_stmt(self, stmt);
                 self.parents.pop();
             }
-            StmtKind::Assign { targets, value, .. } => {
-                if let ExprKind::Name { id, .. } = &value.node {
+            Stmt::Assign(ast::StmtAssign { targets, value, .. }) => {
+                if let Expr::Name(ast::ExprName { id, .. }) = value.as_ref() {
                     self.stack
                         .references
                         .entry(id)
@@ -137,23 +170,21 @@ impl<'a> Visitor<'a> for ReturnVisitor<'a> {
 
                 if let Some(target) = targets.first() {
                     // Skip unpacking assignments, like `x, y = my_object`.
-                    if matches!(target.node, ExprKind::Tuple { .. })
-                        && !matches!(value.node, ExprKind::Tuple { .. })
-                    {
+                    if target.is_tuple_expr() && !value.is_tuple_expr() {
                         return;
                     }
 
                     self.visit_assign_target(target);
                 }
             }
-            StmtKind::For { .. } | StmtKind::AsyncFor { .. } | StmtKind::While { .. } => {
+            Stmt::For(_) | Stmt::AsyncFor(_) | Stmt::While(_) => {
                 self.stack.loops.push(stmt.range());
 
                 self.parents.push(stmt);
                 visitor::walk_stmt(self, stmt);
                 self.parents.pop();
             }
-            StmtKind::Try { .. } | StmtKind::TryStar { .. } => {
+            Stmt::Try(_) | Stmt::TryStar(_) => {
                 self.stack.tries.push(stmt.range());
 
                 self.parents.push(stmt);
@@ -169,11 +200,11 @@ impl<'a> Visitor<'a> for ReturnVisitor<'a> {
     }
 
     fn visit_expr(&mut self, expr: &'a Expr) {
-        match &expr.node {
-            ExprKind::Call { .. } => {
+        match expr {
+            Expr::Call(_) => {
                 // Arbitrary function calls can have side effects, so we conservatively treat
                 // every function call as a reference to every known variable.
-                for name in self.stack.assignments.keys() {
+                for name in self.stack.declarations.keys() {
                     self.stack
                         .references
                         .entry(name)
@@ -181,14 +212,14 @@ impl<'a> Visitor<'a> for ReturnVisitor<'a> {
                         .push(expr.start());
                 }
             }
-            ExprKind::Name { id, .. } => {
+            Expr::Name(ast::ExprName { id, .. }) => {
                 self.stack
                     .references
                     .entry(id)
                     .or_insert_with(Vec::new)
                     .push(expr.start());
             }
-            ExprKind::YieldFrom { .. } | ExprKind::Yield { .. } => {
+            Expr::YieldFrom(_) | Expr::Yield(_) => {
                 self.stack.yields.push(expr);
             }
             _ => visitor::walk_expr(self, expr),
diff --git a/crates/ruff/src/rules/flake8_self/mod.rs b/crates/ruff/src/rules/flake8_self/mod.rs
index 1d75aeef6364b..3866aa49c4b78 100644
--- a/crates/ruff/src/rules/flake8_self/mod.rs
+++ b/crates/ruff/src/rules/flake8_self/mod.rs
@@ -8,14 +8,13 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::PrivateMemberAccess, Path::new("SLF001.py"); "SLF001")]
+    #[test_case(Rule::PrivateMemberAccess, Path::new("SLF001.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.as_ref(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_self/rules/mod.rs b/crates/ruff/src/rules/flake8_self/rules/mod.rs
index 6eca540bf2b8d..edd1f1a2f70f9 100644
--- a/crates/ruff/src/rules/flake8_self/rules/mod.rs
+++ b/crates/ruff/src/rules/flake8_self/rules/mod.rs
@@ -1,3 +1,3 @@
-pub use private_member_access::{private_member_access, PrivateMemberAccess};
+pub(crate) use private_member_access::{private_member_access, PrivateMemberAccess};
 
 mod private_member_access;
diff --git a/crates/ruff/src/rules/flake8_self/rules/private_member_access.rs b/crates/ruff/src/rules/flake8_self/rules/private_member_access.rs
index be25d11ca3cc3..a74bb2768f7a0 100644
--- a/crates/ruff/src/rules/flake8_self/rules/private_member_access.rs
+++ b/crates/ruff/src/rules/flake8_self/rules/private_member_access.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -49,7 +49,7 @@ use crate::checkers::ast::Checker;
 /// - [_What is the meaning of single or double underscores before an object name?_](https://stackoverflow.com/questions/1301346/what-is-the-meaning-of-single-and-double-underscore-before-an-object-name)
 #[violation]
 pub struct PrivateMemberAccess {
-    pub access: String,
+    access: String,
 }
 
 impl Violation for PrivateMemberAccess {
@@ -61,16 +61,21 @@ impl Violation for PrivateMemberAccess {
 }
 
 /// SLF001
-pub fn private_member_access(checker: &mut Checker, expr: &Expr) {
-    if let ExprKind::Attribute { value, attr, .. } = &expr.node {
+pub(crate) fn private_member_access(checker: &mut Checker, expr: &Expr) {
+    if let Expr::Attribute(ast::ExprAttribute { value, attr, .. }) = expr {
         if (attr.starts_with("__") && !attr.ends_with("__"))
             || (attr.starts_with('_') && !attr.starts_with("__"))
         {
-            if checker.settings.flake8_self.ignore_names.contains(attr) {
+            if checker
+                .settings
+                .flake8_self
+                .ignore_names
+                .contains(attr.as_ref())
+            {
                 return;
             }
 
-            if let ExprKind::Call { func, .. } = &value.node {
+            if let Expr::Call(ast::ExprCall { func, .. }) = value.as_ref() {
                 // Ignore `super()` calls.
                 if let Some(call_path) = collect_call_path(func) {
                     if call_path.as_slice() == ["super"] {
@@ -89,24 +94,24 @@ pub fn private_member_access(checker: &mut Checker, expr: &Expr) {
 
                     // Ignore accesses on class members from _within_ the class.
                     if checker
-                        .ctx
+                        .semantic_model()
                         .scopes
                         .iter()
                         .rev()
                         .find_map(|scope| match &scope.kind {
-                            ScopeKind::Class(class_def) => Some(class_def),
+                            ScopeKind::Class(ast::StmtClassDef { name, .. }) => Some(name),
                             _ => None,
                         })
-                        .map_or(false, |class_def| {
-                            if call_path.as_slice() == [class_def.name] {
-                                checker
-                                    .ctx
-                                    .find_binding(class_def.name)
-                                    .map_or(false, |binding| {
+                        .map_or(false, |name| {
+                            if call_path.as_slice() == [name.as_str()] {
+                                checker.semantic_model().find_binding(name).map_or(
+                                    false,
+                                    |binding| {
                                         // TODO(charlie): Could the name ever be bound to a
                                         // _different_ class here?
                                         binding.kind.is_class_definition()
-                                    })
+                                    },
+                                )
                             } else {
                                 false
                             }
diff --git a/crates/ruff/src/rules/flake8_self/settings.rs b/crates/ruff/src/rules/flake8_self/settings.rs
index 73cd56191163d..728b64c97c286 100644
--- a/crates/ruff/src/rules/flake8_self/settings.rs
+++ b/crates/ruff/src/rules/flake8_self/settings.rs
@@ -1,22 +1,22 @@
 //! Settings for the `flake8-self` plugin.
 
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::{CacheKey, ConfigurationOptions};
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
 
 // By default, ignore the `namedtuple` methods and attributes, which are underscore-prefixed to
 // prevent conflicts with field names.
 const IGNORE_NAMES: [&str; 5] = ["_make", "_asdict", "_replace", "_fields", "_field_defaults"];
 
 #[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, CombineOptions,
 )]
 #[serde(
     deny_unknown_fields,
     rename_all = "kebab-case",
     rename = "Flake8SelfOptions"
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = r#"["_make", "_asdict", "_replace", "_fields", "_field_defaults"]"#,
diff --git a/crates/ruff/src/rules/flake8_simplify/mod.rs b/crates/ruff/src/rules/flake8_simplify/mod.rs
index abec6560e91b3..a942a265aca0d 100644
--- a/crates/ruff/src/rules/flake8_simplify/mod.rs
+++ b/crates/ruff/src/rules/flake8_simplify/mod.rs
@@ -6,43 +6,43 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::DuplicateIsinstanceCall, Path::new("SIM101.py"); "SIM101")]
-    #[test_case(Rule::CollapsibleIf, Path::new("SIM102.py"); "SIM102")]
-    #[test_case(Rule::NeedlessBool, Path::new("SIM103.py"); "SIM103")]
-    #[test_case(Rule::SuppressibleException, Path::new("SIM105.py"); "SIM105")]
-    #[test_case(Rule::SuppressibleException, Path::new("SIM105_1.py"); "SIM105_1")]
-    #[test_case(Rule::SuppressibleException, Path::new("SIM105_2.py"); "SIM105_2")]
-    #[test_case(Rule::ReturnInTryExceptFinally, Path::new("SIM107.py"); "SIM107")]
-    #[test_case(Rule::IfElseBlockInsteadOfIfExp, Path::new("SIM108.py"); "SIM108")]
-    #[test_case(Rule::CompareWithTuple, Path::new("SIM109.py"); "SIM109")]
-    #[test_case(Rule::ReimplementedBuiltin, Path::new("SIM110.py"); "SIM110")]
-    #[test_case(Rule::ReimplementedBuiltin, Path::new("SIM111.py"); "SIM111")]
-    #[test_case(Rule::UncapitalizedEnvironmentVariables, Path::new("SIM112.py"); "SIM112")]
-    #[test_case(Rule::OpenFileWithContextHandler, Path::new("SIM115.py"); "SIM115")]
-    #[test_case(Rule::MultipleWithStatements, Path::new("SIM117.py"); "SIM117")]
-    #[test_case(Rule::InDictKeys, Path::new("SIM118.py"); "SIM118")]
-    #[test_case(Rule::NegateEqualOp, Path::new("SIM201.py"); "SIM201")]
-    #[test_case(Rule::NegateNotEqualOp, Path::new("SIM202.py"); "SIM202")]
-    #[test_case(Rule::DoubleNegation, Path::new("SIM208.py"); "SIM208")]
-    #[test_case(Rule::IfExprWithTrueFalse, Path::new("SIM210.py"); "SIM210")]
-    #[test_case(Rule::IfExprWithFalseTrue, Path::new("SIM211.py"); "SIM211")]
-    #[test_case(Rule::IfExprWithTwistedArms, Path::new("SIM212.py"); "SIM212")]
-    #[test_case(Rule::ExprAndNotExpr, Path::new("SIM220.py"); "SIM220")]
-    #[test_case(Rule::ExprOrNotExpr, Path::new("SIM221.py"); "SIM221")]
-    #[test_case(Rule::ExprOrTrue, Path::new("SIM222.py"); "SIM222")]
-    #[test_case(Rule::ExprAndFalse, Path::new("SIM223.py"); "SIM223")]
-    #[test_case(Rule::YodaConditions, Path::new("SIM300.py"); "SIM300")]
-    #[test_case(Rule::IfElseBlockInsteadOfDictGet, Path::new("SIM401.py"); "SIM401")]
-    #[test_case(Rule::DictGetWithNoneDefault, Path::new("SIM910.py"); "SIM910")]
-    #[test_case(Rule::IfElseBlockInsteadOfDictLookup, Path::new("SIM116.py"); "SIM116")]
-    #[test_case(Rule::IfWithSameArms, Path::new("SIM114.py"); "SIM114")]
+    #[test_case(Rule::DuplicateIsinstanceCall, Path::new("SIM101.py"))]
+    #[test_case(Rule::CollapsibleIf, Path::new("SIM102.py"))]
+    #[test_case(Rule::NeedlessBool, Path::new("SIM103.py"))]
+    #[test_case(Rule::SuppressibleException, Path::new("SIM105_0.py"))]
+    #[test_case(Rule::SuppressibleException, Path::new("SIM105_1.py"))]
+    #[test_case(Rule::SuppressibleException, Path::new("SIM105_2.py"))]
+    #[test_case(Rule::SuppressibleException, Path::new("SIM105_3.py"))]
+    #[test_case(Rule::ReturnInTryExceptFinally, Path::new("SIM107.py"))]
+    #[test_case(Rule::IfElseBlockInsteadOfIfExp, Path::new("SIM108.py"))]
+    #[test_case(Rule::CompareWithTuple, Path::new("SIM109.py"))]
+    #[test_case(Rule::ReimplementedBuiltin, Path::new("SIM110.py"))]
+    #[test_case(Rule::ReimplementedBuiltin, Path::new("SIM111.py"))]
+    #[test_case(Rule::UncapitalizedEnvironmentVariables, Path::new("SIM112.py"))]
+    #[test_case(Rule::OpenFileWithContextHandler, Path::new("SIM115.py"))]
+    #[test_case(Rule::MultipleWithStatements, Path::new("SIM117.py"))]
+    #[test_case(Rule::InDictKeys, Path::new("SIM118.py"))]
+    #[test_case(Rule::NegateEqualOp, Path::new("SIM201.py"))]
+    #[test_case(Rule::NegateNotEqualOp, Path::new("SIM202.py"))]
+    #[test_case(Rule::DoubleNegation, Path::new("SIM208.py"))]
+    #[test_case(Rule::IfExprWithTrueFalse, Path::new("SIM210.py"))]
+    #[test_case(Rule::IfExprWithFalseTrue, Path::new("SIM211.py"))]
+    #[test_case(Rule::IfExprWithTwistedArms, Path::new("SIM212.py"))]
+    #[test_case(Rule::ExprAndNotExpr, Path::new("SIM220.py"))]
+    #[test_case(Rule::ExprOrNotExpr, Path::new("SIM221.py"))]
+    #[test_case(Rule::ExprOrTrue, Path::new("SIM222.py"))]
+    #[test_case(Rule::ExprAndFalse, Path::new("SIM223.py"))]
+    #[test_case(Rule::YodaConditions, Path::new("SIM300.py"))]
+    #[test_case(Rule::IfElseBlockInsteadOfDictGet, Path::new("SIM401.py"))]
+    #[test_case(Rule::DictGetWithNoneDefault, Path::new("SIM910.py"))]
+    #[test_case(Rule::IfElseBlockInsteadOfDictLookup, Path::new("SIM116.py"))]
+    #[test_case(Rule::IfWithSameArms, Path::new("SIM114.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_simplify/rules/ast_bool_op.rs b/crates/ruff/src/rules/flake8_simplify/rules/ast_bool_op.rs
index 5c2d571d6c729..f69d31abeb9a9 100644
--- a/crates/ruff/src/rules/flake8_simplify/rules/ast_bool_op.rs
+++ b/crates/ruff/src/rules/flake8_simplify/rules/ast_bool_op.rs
@@ -5,16 +5,12 @@ use itertools::Either::{Left, Right};
 use itertools::Itertools;
 use ruff_text_size::TextRange;
 use rustc_hash::FxHashMap;
-use rustpython_parser::ast::{Boolop, Cmpop, Expr, ExprContext, ExprKind, Unaryop};
+use rustpython_parser::ast::{self, Boolop, Cmpop, Expr, ExprContext, Ranged, Unaryop};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, AutofixKind, Diagnostic, Edit, Violation};
+use ruff_diagnostics::{AlwaysAutofixableViolation, AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::comparable::ComparableExpr;
-use ruff_python_ast::helpers::{
-    contains_effect, create_expr, has_comments, unparse_expr, Truthiness,
-};
-use ruff_python_ast::source_code::Stylist;
-use ruff_python_semantic::context::Context;
+use ruff_python_ast::helpers::{contains_effect, has_comments, Truthiness};
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
@@ -47,8 +43,7 @@ use crate::registry::AsRule;
 /// - [Python: "isinstance"](https://docs.python.org/3/library/functions.html#isinstance)
 #[violation]
 pub struct DuplicateIsinstanceCall {
-    pub name: Option<String>,
-    pub fixable: bool,
+    name: Option<String>,
 }
 
 impl Violation for DuplicateIsinstanceCall {
@@ -56,7 +51,7 @@ impl Violation for DuplicateIsinstanceCall {
 
     #[derive_message_formats]
     fn message(&self) -> String {
-        let DuplicateIsinstanceCall { name, .. } = self;
+        let DuplicateIsinstanceCall { name } = self;
         if let Some(name) = name {
             format!("Multiple `isinstance` calls for `{name}`, merge into a single call")
         } else {
@@ -64,21 +59,20 @@ impl Violation for DuplicateIsinstanceCall {
         }
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable
-            .then_some(|DuplicateIsinstanceCall { name, .. }| {
-                if let Some(name) = name {
-                    format!("Merge `isinstance` calls for `{name}`")
-                } else {
-                    format!("Merge `isinstance` calls")
-                }
-            })
+    fn autofix_title(&self) -> Option<String> {
+        let DuplicateIsinstanceCall { name } = self;
+
+        Some(if let Some(name) = name {
+            format!("Merge `isinstance` calls for `{name}`")
+        } else {
+            "Merge `isinstance` calls".to_string()
+        })
     }
 }
 
 #[violation]
 pub struct CompareWithTuple {
-    pub replacement: String,
+    replacement: String,
 }
 
 impl AlwaysAutofixableViolation for CompareWithTuple {
@@ -96,7 +90,7 @@ impl AlwaysAutofixableViolation for CompareWithTuple {
 
 #[violation]
 pub struct ExprAndNotExpr {
-    pub name: String,
+    name: String,
 }
 
 impl AlwaysAutofixableViolation for ExprAndNotExpr {
@@ -113,7 +107,7 @@ impl AlwaysAutofixableViolation for ExprAndNotExpr {
 
 #[violation]
 pub struct ExprOrNotExpr {
-    pub name: String,
+    name: String,
 }
 
 impl AlwaysAutofixableViolation for ExprOrNotExpr {
@@ -129,7 +123,7 @@ impl AlwaysAutofixableViolation for ExprOrNotExpr {
 }
 
 #[derive(Debug, PartialEq, Eq)]
-pub enum ContentAround {
+pub(crate) enum ContentAround {
     Before,
     After,
     Both,
@@ -165,8 +159,8 @@ pub enum ContentAround {
 /// ```
 #[violation]
 pub struct ExprOrTrue {
-    pub expr: String,
-    pub remove: ContentAround,
+    expr: String,
+    remove: ContentAround,
 }
 
 impl AlwaysAutofixableViolation for ExprOrTrue {
@@ -217,8 +211,8 @@ impl AlwaysAutofixableViolation for ExprOrTrue {
 /// ```
 #[violation]
 pub struct ExprAndFalse {
-    pub expr: String,
-    pub remove: ContentAround,
+    expr: String,
+    remove: ContentAround,
 }
 
 impl AlwaysAutofixableViolation for ExprAndFalse {
@@ -241,7 +235,9 @@ impl AlwaysAutofixableViolation for ExprAndFalse {
 
 /// Return `true` if two `Expr` instances are equivalent names.
 fn is_same_expr<'a>(a: &'a Expr, b: &'a Expr) -> Option<&'a str> {
-    if let (ExprKind::Name { id: a, .. }, ExprKind::Name { id: b, .. }) = (&a.node, &b.node) {
+    if let (Expr::Name(ast::ExprName { id: a, .. }), Expr::Name(ast::ExprName { id: b, .. })) =
+        (&a, &b)
+    {
         if a == b {
             return Some(a);
         }
@@ -250,8 +246,8 @@ fn is_same_expr<'a>(a: &'a Expr, b: &'a Expr) -> Option<&'a str> {
 }
 
 /// SIM101
-pub fn duplicate_isinstance_call(checker: &mut Checker, expr: &Expr) {
-    let ExprKind::BoolOp { op: Boolop::Or, values } = &expr.node else {
+pub(crate) fn duplicate_isinstance_call(checker: &mut Checker, expr: &Expr) {
+    let Expr::BoolOp(ast::ExprBoolOp { op: Boolop::Or, values, range: _ } )= expr else {
         return;
     };
 
@@ -260,7 +256,7 @@ pub fn duplicate_isinstance_call(checker: &mut Checker, expr: &Expr) {
     let mut duplicates: FxHashMap<ComparableExpr, Vec<usize>> = FxHashMap::default();
     for (index, call) in values.iter().enumerate() {
         // Verify that this is an `isinstance` call.
-        let ExprKind::Call { func, args, keywords } = &call.node else {
+        let Expr::Call(ast::ExprCall { func, args, keywords, range: _ }) = &call else {
             continue;
         };
         if args.len() != 2 {
@@ -269,13 +265,13 @@ pub fn duplicate_isinstance_call(checker: &mut Checker, expr: &Expr) {
         if !keywords.is_empty() {
             continue;
         }
-        let ExprKind::Name { id: func_name, .. } = &func.node else {
+        let Expr::Name(ast::ExprName { id: func_name, .. }) = func.as_ref() else {
             continue;
         };
         if func_name != "isinstance" {
             continue;
         }
-        if !checker.ctx.is_builtin("isinstance") {
+        if !checker.semantic_model().is_builtin("isinstance") {
             continue;
         }
 
@@ -292,84 +288,90 @@ pub fn duplicate_isinstance_call(checker: &mut Checker, expr: &Expr) {
         if indices.len() > 1 {
             // Grab the target used in each duplicate `isinstance` call (e.g., `obj` in
             // `isinstance(obj, int)`).
-            let target = if let ExprKind::Call { args, .. } = &values[indices[0]].node {
+            let target = if let Expr::Call(ast::ExprCall { args, .. }) = &values[indices[0]] {
                 args.get(0).expect("`isinstance` should have two arguments")
             } else {
                 unreachable!("Indices should only contain `isinstance` calls")
             };
-            let fixable = !contains_effect(target, |id| checker.ctx.is_builtin(id));
             let mut diagnostic = Diagnostic::new(
                 DuplicateIsinstanceCall {
-                    name: if let ExprKind::Name { id, .. } = &target.node {
+                    name: if let Expr::Name(ast::ExprName { id, .. }) = target {
                         Some(id.to_string())
                     } else {
                         None
                     },
-                    fixable,
                 },
                 expr.range(),
             );
-            if fixable && checker.patch(diagnostic.kind.rule()) {
-                // Grab the types used in each duplicate `isinstance` call (e.g., `int` and `str`
-                // in `isinstance(obj, int) or isinstance(obj, str)`).
-                let types: Vec<&Expr> = indices
-                    .iter()
-                    .map(|index| &values[*index])
-                    .map(|expr| {
-                        let ExprKind::Call { args, ..} = &expr.node else {
-                            unreachable!("Indices should only contain `isinstance` calls")
-                        };
-                        args.get(1).expect("`isinstance` should have two arguments")
-                    })
-                    .collect();
-
-                // Generate a single `isinstance` call.
-                let call = create_expr(ExprKind::Call {
-                    func: Box::new(create_expr(ExprKind::Name {
-                        id: "isinstance".to_string(),
+            if checker.patch(diagnostic.kind.rule()) {
+                if !contains_effect(target, |id| checker.semantic_model().is_builtin(id)) {
+                    // Grab the types used in each duplicate `isinstance` call (e.g., `int` and `str`
+                    // in `isinstance(obj, int) or isinstance(obj, str)`).
+                    let types: Vec<&Expr> = indices
+                        .iter()
+                        .map(|index| &values[*index])
+                        .map(|expr| {
+                            let Expr::Call(ast::ExprCall { args, .. }) = expr else {
+                                unreachable!("Indices should only contain `isinstance` calls")
+                            };
+                            args.get(1).expect("`isinstance` should have two arguments")
+                        })
+                        .collect();
+
+                    // Generate a single `isinstance` call.
+                    let node = ast::ExprTuple {
+                        // Flatten all the types used across the `isinstance` calls.
+                        elts: types
+                            .iter()
+                            .flat_map(|value| {
+                                if let Expr::Tuple(ast::ExprTuple { elts, .. }) = value {
+                                    Left(elts.iter())
+                                } else {
+                                    Right(iter::once(*value))
+                                }
+                            })
+                            .map(Clone::clone)
+                            .collect(),
                         ctx: ExprContext::Load,
-                    })),
-                    args: vec![
-                        target.clone(),
-                        create_expr(ExprKind::Tuple {
-                            // Flatten all the types used across the `isinstance` calls.
-                            elts: types
-                                .iter()
-                                .flat_map(|value| {
-                                    if let ExprKind::Tuple { elts, .. } = &value.node {
-                                        Left(elts.iter())
-                                    } else {
-                                        Right(iter::once(*value))
-                                    }
-                                })
-                                .map(Clone::clone)
-                                .collect(),
-                            ctx: ExprContext::Load,
-                        }),
-                    ],
-                    keywords: vec![],
-                });
-
-                // Generate the combined `BoolOp`.
-                let bool_op = create_expr(ExprKind::BoolOp {
-                    op: Boolop::Or,
-                    values: iter::once(call)
-                        .chain(
-                            values
-                                .iter()
-                                .enumerate()
-                                .filter(|(index, _)| !indices.contains(index))
-                                .map(|(_, elt)| elt.clone()),
-                        )
-                        .collect(),
-                });
-
-                // Populate the `Fix`. Replace the _entire_ `BoolOp`. Note that if we have
-                // multiple duplicates, the fixes will conflict.
-                diagnostic.set_fix(Edit::range_replacement(
-                    unparse_expr(&bool_op, checker.stylist),
-                    expr.range(),
-                ));
+                        range: TextRange::default(),
+                    };
+                    let node1 = ast::ExprName {
+                        id: "isinstance".into(),
+                        ctx: ExprContext::Load,
+                        range: TextRange::default(),
+                    };
+                    let node2 = ast::ExprCall {
+                        func: Box::new(node1.into()),
+                        args: vec![target.clone(), node.into()],
+                        keywords: vec![],
+                        range: TextRange::default(),
+                    };
+                    let call = node2.into();
+
+                    // Generate the combined `BoolOp`.
+                    let node = ast::ExprBoolOp {
+                        op: Boolop::Or,
+                        values: iter::once(call)
+                            .chain(
+                                values
+                                    .iter()
+                                    .enumerate()
+                                    .filter(|(index, _)| !indices.contains(index))
+                                    .map(|(_, elt)| elt.clone()),
+                            )
+                            .collect(),
+                        range: TextRange::default(),
+                    };
+                    let bool_op = node.into();
+
+                    // Populate the `Fix`. Replace the _entire_ `BoolOp`. Note that if we have
+                    // multiple duplicates, the fixes will conflict.
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                        checker.generator().expr(&bool_op),
+                        expr.range(),
+                    )));
+                }
             }
             checker.diagnostics.push(diagnostic);
         }
@@ -377,7 +379,7 @@ pub fn duplicate_isinstance_call(checker: &mut Checker, expr: &Expr) {
 }
 
 fn match_eq_target(expr: &Expr) -> Option<(&str, &Expr)> {
-    let ExprKind::Compare { left, ops, comparators } = &expr.node else {
+    let Expr::Compare(ast::ExprCompare { left, ops, comparators, range: _ } )= expr else {
         return None;
     };
     if ops.len() != 1 || comparators.len() != 1 {
@@ -386,19 +388,19 @@ fn match_eq_target(expr: &Expr) -> Option<(&str, &Expr)> {
     if !matches!(&ops[0], Cmpop::Eq) {
         return None;
     }
-    let ExprKind::Name { id, .. } = &left.node else {
+    let Expr::Name(ast::ExprName { id, .. }) = left.as_ref() else {
         return None;
     };
     let comparator = &comparators[0];
-    if !matches!(&comparator.node, ExprKind::Name { .. }) {
+    if !matches!(&comparator, Expr::Name(_)) {
         return None;
     }
     Some((id, comparator))
 }
 
 /// SIM109
-pub fn compare_with_tuple(checker: &mut Checker, expr: &Expr) {
-    let ExprKind::BoolOp { op: Boolop::Or, values } = &expr.node else {
+pub(crate) fn compare_with_tuple(checker: &mut Checker, expr: &Expr) {
+    let Expr::BoolOp(ast::ExprBoolOp { op: Boolop::Or, values, range: _ }) = expr else {
         return;
     };
 
@@ -424,7 +426,7 @@ pub fn compare_with_tuple(checker: &mut Checker, expr: &Expr) {
         // Avoid rewriting (e.g.) `a == "foo" or a == f()`.
         if comparators
             .iter()
-            .any(|expr| contains_effect(expr, |id| checker.ctx.is_builtin(id)))
+            .any(|expr| contains_effect(expr, |id| checker.semantic_model().is_builtin(id)))
         {
             continue;
         }
@@ -435,20 +437,26 @@ pub fn compare_with_tuple(checker: &mut Checker, expr: &Expr) {
         }
 
         // Create a `x in (a, b)` expression.
-        let in_expr = create_expr(ExprKind::Compare {
-            left: Box::new(create_expr(ExprKind::Name {
-                id: id.to_string(),
-                ctx: ExprContext::Load,
-            })),
+        let node = ast::ExprTuple {
+            elts: comparators.into_iter().map(Clone::clone).collect(),
+            ctx: ExprContext::Load,
+            range: TextRange::default(),
+        };
+        let node1 = ast::ExprName {
+            id: id.into(),
+            ctx: ExprContext::Load,
+            range: TextRange::default(),
+        };
+        let node2 = ast::ExprCompare {
+            left: Box::new(node1.into()),
             ops: vec![Cmpop::In],
-            comparators: vec![create_expr(ExprKind::Tuple {
-                elts: comparators.into_iter().map(Clone::clone).collect(),
-                ctx: ExprContext::Load,
-            })],
-        });
+            comparators: vec![node.into()],
+            range: TextRange::default(),
+        };
+        let in_expr = node2.into();
         let mut diagnostic = Diagnostic::new(
             CompareWithTuple {
-                replacement: unparse_expr(&in_expr, checker.stylist),
+                replacement: checker.generator().expr(&in_expr),
             },
             expr.range(),
         );
@@ -463,23 +471,26 @@ pub fn compare_with_tuple(checker: &mut Checker, expr: &Expr) {
                 in_expr
             } else {
                 // Wrap in a `x in (a, b) or ...` boolean operation.
-                create_expr(ExprKind::BoolOp {
+                let node = ast::ExprBoolOp {
                     op: Boolop::Or,
                     values: iter::once(in_expr).chain(unmatched).collect(),
-                })
+                    range: TextRange::default(),
+                };
+                node.into()
             };
-            diagnostic.set_fix(Edit::range_replacement(
-                unparse_expr(&in_expr, checker.stylist),
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                checker.generator().expr(&in_expr),
                 expr.range(),
-            ));
+            )));
         }
         checker.diagnostics.push(diagnostic);
     }
 }
 
 /// SIM220
-pub fn expr_and_not_expr(checker: &mut Checker, expr: &Expr) {
-    let ExprKind::BoolOp { op: Boolop::And, values, } = &expr.node else {
+pub(crate) fn expr_and_not_expr(checker: &mut Checker, expr: &Expr) {
+    let Expr::BoolOp(ast::ExprBoolOp { op: Boolop::And, values, range: _, }) = expr else {
         return;
     };
     if values.len() < 2 {
@@ -490,10 +501,11 @@ pub fn expr_and_not_expr(checker: &mut Checker, expr: &Expr) {
     let mut negated_expr = vec![];
     let mut non_negated_expr = vec![];
     for expr in values {
-        if let ExprKind::UnaryOp {
+        if let Expr::UnaryOp(ast::ExprUnaryOp {
             op: Unaryop::Not,
             operand,
-        } = &expr.node
+            range: _,
+        }) = expr
         {
             negated_expr.push(operand);
         } else {
@@ -505,7 +517,7 @@ pub fn expr_and_not_expr(checker: &mut Checker, expr: &Expr) {
         return;
     }
 
-    if contains_effect(expr, |id| checker.ctx.is_builtin(id)) {
+    if contains_effect(expr, |id| checker.semantic_model().is_builtin(id)) {
         return;
     }
 
@@ -519,7 +531,11 @@ pub fn expr_and_not_expr(checker: &mut Checker, expr: &Expr) {
                     expr.range(),
                 );
                 if checker.patch(diagnostic.kind.rule()) {
-                    diagnostic.set_fix(Edit::range_replacement("False".to_string(), expr.range()));
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                        "False".to_string(),
+                        expr.range(),
+                    )));
                 }
                 checker.diagnostics.push(diagnostic);
             }
@@ -528,8 +544,8 @@ pub fn expr_and_not_expr(checker: &mut Checker, expr: &Expr) {
 }
 
 /// SIM221
-pub fn expr_or_not_expr(checker: &mut Checker, expr: &Expr) {
-    let ExprKind::BoolOp { op: Boolop::Or, values, } = &expr.node else {
+pub(crate) fn expr_or_not_expr(checker: &mut Checker, expr: &Expr) {
+    let Expr::BoolOp(ast::ExprBoolOp { op: Boolop::Or, values, range: _, }) = expr else {
         return;
     };
     if values.len() < 2 {
@@ -540,10 +556,11 @@ pub fn expr_or_not_expr(checker: &mut Checker, expr: &Expr) {
     let mut negated_expr = vec![];
     let mut non_negated_expr = vec![];
     for expr in values {
-        if let ExprKind::UnaryOp {
+        if let Expr::UnaryOp(ast::ExprUnaryOp {
             op: Unaryop::Not,
             operand,
-        } = &expr.node
+            range: _,
+        }) = expr
         {
             negated_expr.push(operand);
         } else {
@@ -555,7 +572,7 @@ pub fn expr_or_not_expr(checker: &mut Checker, expr: &Expr) {
         return;
     }
 
-    if contains_effect(expr, |id| checker.ctx.is_builtin(id)) {
+    if contains_effect(expr, |id| checker.semantic_model().is_builtin(id)) {
         return;
     }
 
@@ -569,7 +586,11 @@ pub fn expr_or_not_expr(checker: &mut Checker, expr: &Expr) {
                     expr.range(),
                 );
                 if checker.patch(diagnostic.kind.rule()) {
-                    diagnostic.set_fix(Edit::range_replacement("True".to_string(), expr.range()));
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                        "True".to_string(),
+                        expr.range(),
+                    )));
                 }
                 checker.diagnostics.push(diagnostic);
             }
@@ -577,12 +598,12 @@ pub fn expr_or_not_expr(checker: &mut Checker, expr: &Expr) {
     }
 }
 
-pub fn get_short_circuit_edit(
+pub(crate) fn get_short_circuit_edit(
     expr: &Expr,
     range: TextRange,
     truthiness: Truthiness,
     in_boolean_test: bool,
-    stylist: &Stylist,
+    checker: &Checker,
 ) -> Edit {
     let content = if in_boolean_test {
         match truthiness {
@@ -593,21 +614,20 @@ pub fn get_short_circuit_edit(
             }
         }
     } else {
-        unparse_expr(expr, stylist)
+        checker.generator().expr(expr)
     };
     Edit::range_replacement(content, range)
 }
 
 fn is_short_circuit(
     expr: &Expr,
-    expected_op: &Boolop,
-    context: &Context,
-    stylist: &Stylist,
+    expected_op: Boolop,
+    checker: &Checker,
 ) -> Option<(Edit, ContentAround)> {
-    let ExprKind::BoolOp { op, values, } = &expr.node else {
+    let Expr::BoolOp(ast::ExprBoolOp { op, values, range: _, }) = expr else {
         return None;
     };
-    if op != expected_op {
+    if *op != expected_op {
         return None;
     }
     let short_circuit_truthiness = match op {
@@ -621,12 +641,15 @@ fn is_short_circuit(
 
     for (index, (value, next_value)) in values.iter().tuple_windows().enumerate() {
         // Keep track of the location of the furthest-right, truthy or falsey expression.
-        let value_truthiness = Truthiness::from_expr(value, |id| context.is_builtin(id));
-        let next_value_truthiness = Truthiness::from_expr(next_value, |id| context.is_builtin(id));
+        let value_truthiness =
+            Truthiness::from_expr(value, |id| checker.semantic_model().is_builtin(id));
+        let next_value_truthiness =
+            Truthiness::from_expr(next_value, |id| checker.semantic_model().is_builtin(id));
 
         // Keep track of the location of the furthest-right, non-effectful expression.
         if value_truthiness.is_unknown()
-            && (!context.in_boolean_test || contains_effect(value, |id| context.is_builtin(id)))
+            && (!checker.semantic_model().in_boolean_test()
+                || contains_effect(value, |id| checker.semantic_model().is_builtin(id)))
         {
             location = next_value.start();
             continue;
@@ -646,8 +669,8 @@ fn is_short_circuit(
                 value,
                 TextRange::new(location, expr.end()),
                 short_circuit_truthiness,
-                context.in_boolean_test,
-                stylist,
+                checker.semantic_model().in_boolean_test(),
+                checker,
             ));
             break;
         }
@@ -664,8 +687,8 @@ fn is_short_circuit(
                 next_value,
                 TextRange::new(location, expr.end()),
                 short_circuit_truthiness,
-                context.in_boolean_test,
-                stylist,
+                checker.semantic_model().in_boolean_test(),
+                checker,
             ));
             break;
         }
@@ -678,9 +701,8 @@ fn is_short_circuit(
 }
 
 /// SIM222
-pub fn expr_or_true(checker: &mut Checker, expr: &Expr) {
-    if let Some((edit, remove)) = is_short_circuit(expr, &Boolop::Or, &checker.ctx, checker.stylist)
-    {
+pub(crate) fn expr_or_true(checker: &mut Checker, expr: &Expr) {
+    if let Some((edit, remove)) = is_short_circuit(expr, Boolop::Or, checker) {
         let mut diagnostic = Diagnostic::new(
             ExprOrTrue {
                 expr: edit.content().unwrap_or_default().to_string(),
@@ -689,17 +711,16 @@ pub fn expr_or_true(checker: &mut Checker, expr: &Expr) {
             edit.range(),
         );
         if checker.patch(diagnostic.kind.rule()) {
-            diagnostic.set_fix(edit);
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(edit));
         }
         checker.diagnostics.push(diagnostic);
     }
 }
 
 /// SIM223
-pub fn expr_and_false(checker: &mut Checker, expr: &Expr) {
-    if let Some((edit, remove)) =
-        is_short_circuit(expr, &Boolop::And, &checker.ctx, checker.stylist)
-    {
+pub(crate) fn expr_and_false(checker: &mut Checker, expr: &Expr) {
+    if let Some((edit, remove)) = is_short_circuit(expr, Boolop::And, checker) {
         let mut diagnostic = Diagnostic::new(
             ExprAndFalse {
                 expr: edit.content().unwrap_or_default().to_string(),
@@ -708,7 +729,8 @@ pub fn expr_and_false(checker: &mut Checker, expr: &Expr) {
             edit.range(),
         );
         if checker.patch(diagnostic.kind.rule()) {
-            diagnostic.set_fix(edit);
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(edit));
         }
         checker.diagnostics.push(diagnostic);
     }
diff --git a/crates/ruff/src/rules/flake8_simplify/rules/ast_expr.rs b/crates/ruff/src/rules/flake8_simplify/rules/ast_expr.rs
index d010dd109c08b..83006f6f8dcc8 100644
--- a/crates/ruff/src/rules/flake8_simplify/rules/ast_expr.rs
+++ b/crates/ruff/src/rules/flake8_simplify/rules/ast_expr.rs
@@ -1,65 +1,93 @@
-use rustpython_parser::ast::{Constant, Expr, ExprKind};
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Constant, Expr, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Violation};
+use ruff_diagnostics::{AlwaysAutofixableViolation, AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::{create_expr, unparse_expr};
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 
 #[violation]
 pub struct UncapitalizedEnvironmentVariables {
-    pub expected: String,
-    pub original: String,
+    expected: String,
+    original: String,
 }
 
-impl AlwaysAutofixableViolation for UncapitalizedEnvironmentVariables {
+impl Violation for UncapitalizedEnvironmentVariables {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         let UncapitalizedEnvironmentVariables { expected, original } = self;
         format!("Use capitalized environment variable `{expected}` instead of `{original}`")
     }
 
-    fn autofix_title(&self) -> String {
+    fn autofix_title(&self) -> Option<String> {
         let UncapitalizedEnvironmentVariables { expected, original } = self;
-        format!("Replace `{original}` with `{expected}`")
+        Some(format!("Replace `{original}` with `{expected}`"))
     }
 }
 
+/// ## What it does
+/// Check for `dict.get()` calls that pass `None` as the default value.
+///
+/// ## Why is this bad?
+/// `None` is the default value for `dict.get()`, so it is redundant to pass it
+/// explicitly.
+///
+/// ## Example
+/// ```python
+/// ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+/// age = ages.get("Cat", None)  # None
+/// ```
+///
+/// Use instead:
+/// ```python
+/// ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+/// age = ages.get("Cat")  # None
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/stdtypes.html#dict.get)
 #[violation]
 pub struct DictGetWithNoneDefault {
-    pub expected: String,
-    pub original: String,
+    expected: String,
+    original: String,
 }
 
-impl Violation for DictGetWithNoneDefault {
+impl AlwaysAutofixableViolation for DictGetWithNoneDefault {
     #[derive_message_formats]
     fn message(&self) -> String {
         let DictGetWithNoneDefault { expected, original } = self;
         format!("Use `{expected}` instead of `{original}`")
     }
+
+    fn autofix_title(&self) -> String {
+        let DictGetWithNoneDefault { expected, original } = self;
+        format!("Replace `{original}` with `{expected}`")
+    }
 }
 
 /// SIM112
-pub fn use_capital_environment_variables(checker: &mut Checker, expr: &Expr) {
+pub(crate) fn use_capital_environment_variables(checker: &mut Checker, expr: &Expr) {
     // Ex) `os.environ['foo']`
-    if let ExprKind::Subscript { .. } = &expr.node {
+    if let Expr::Subscript(_) = expr {
         check_os_environ_subscript(checker, expr);
         return;
     }
 
     // Ex) `os.environ.get('foo')`, `os.getenv('foo')`
-    let ExprKind::Call { func, args, .. } = &expr.node else {
+    let Expr::Call(ast::ExprCall { func, args, .. }) = expr else {
         return;
     };
     let Some(arg) = args.get(0) else {
         return;
     };
-    let ExprKind::Constant { value: Constant::Str(env_var), .. } = &arg.node else {
+    let Expr::Constant(ast::ExprConstant { value: Constant::Str(env_var), .. }) = arg else {
         return;
     };
     if !checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(func)
         .map_or(false, |call_path| {
             call_path.as_slice() == ["os", "environ", "get"]
@@ -84,19 +112,19 @@ pub fn use_capital_environment_variables(checker: &mut Checker, expr: &Expr) {
 }
 
 fn check_os_environ_subscript(checker: &mut Checker, expr: &Expr) {
-    let ExprKind::Subscript { value, slice, .. } = &expr.node else {
+    let Expr::Subscript(ast::ExprSubscript { value, slice, .. }) = expr else {
         return;
     };
-    let ExprKind::Attribute { value: attr_value, attr, .. } = &value.node else {
+    let Expr::Attribute(ast::ExprAttribute { value: attr_value, attr, .. }) = value.as_ref() else {
         return;
     };
-    let ExprKind::Name { id, .. } = &attr_value.node else {
+    let Expr::Name(ast::ExprName { id, .. }) = attr_value.as_ref() else {
         return;
     };
     if id != "os" || attr != "environ" {
         return;
     }
-    let ExprKind::Constant { value: Constant::Str(env_var), kind } = &slice.node else {
+    let Expr::Constant(ast::ExprConstant { value: Constant::Str(env_var), kind, range: _ }) = slice.as_ref() else {
         return;
     };
     let capital_env_var = env_var.to_ascii_uppercase();
@@ -112,30 +140,33 @@ fn check_os_environ_subscript(checker: &mut Checker, expr: &Expr) {
         slice.range(),
     );
     if checker.patch(diagnostic.kind.rule()) {
-        let new_env_var = create_expr(ExprKind::Constant {
+        let node = ast::ExprConstant {
             value: capital_env_var.into(),
             kind: kind.clone(),
-        });
-        diagnostic.set_fix(Edit::range_replacement(
-            unparse_expr(&new_env_var, checker.stylist),
+            range: TextRange::default(),
+        };
+        let new_env_var = node.into();
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+            checker.generator().expr(&new_env_var),
             slice.range(),
-        ));
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
 
 /// SIM910
-pub fn dict_get_with_none_default(checker: &mut Checker, expr: &Expr) {
-    let ExprKind::Call { func, args, keywords } = &expr.node else {
+pub(crate) fn dict_get_with_none_default(checker: &mut Checker, expr: &Expr) {
+    let Expr::Call(ast::ExprCall { func, args, keywords, range: _ }) = expr else {
         return;
     };
     if !keywords.is_empty() {
         return;
     }
-    let ExprKind::Attribute { value, attr, .. } = &func.node else {
+    let Expr::Attribute(ast::ExprAttribute { value, attr, .. } )= func.as_ref() else {
         return;
     };
-    if !matches!(value.node, ExprKind::Dict { .. }) {
+    if !value.is_dict_expr() {
         return;
     }
     if attr != "get" {
@@ -144,18 +175,18 @@ pub fn dict_get_with_none_default(checker: &mut Checker, expr: &Expr) {
     let Some(key) = args.get(0) else {
         return;
     };
-    if !matches!(key.node, ExprKind::Constant { .. } | ExprKind::Name { .. }) {
+    if !matches!(key, Expr::Constant(_) | Expr::Name(_)) {
         return;
     }
     let Some(default) = args.get(1) else {
         return;
     };
     if !matches!(
-        default.node,
-        ExprKind::Constant {
+        default,
+        Expr::Constant(ast::ExprConstant {
             value: Constant::None,
             ..
-        }
+        })
     ) {
         return;
     };
@@ -176,7 +207,11 @@ pub fn dict_get_with_none_default(checker: &mut Checker, expr: &Expr) {
     );
 
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(expected, expr.range()));
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+            expected,
+            expr.range(),
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/flake8_simplify/rules/ast_if.rs b/crates/ruff/src/rules/flake8_simplify/rules/ast_if.rs
index 1a33073175f3e..6fd981f52142e 100644
--- a/crates/ruff/src/rules/flake8_simplify/rules/ast_if.rs
+++ b/crates/ruff/src/rules/flake8_simplify/rules/ast_if.rs
@@ -1,20 +1,19 @@
 use log::error;
 use ruff_text_size::TextRange;
 use rustc_hash::FxHashSet;
-use rustpython_parser::ast::{Cmpop, Constant, Expr, ExprContext, ExprKind, Stmt, StmtKind};
-use unicode_width::UnicodeWidthStr;
+use rustpython_parser::ast::{self, Cmpop, Constant, Expr, ExprContext, Ranged, Stmt};
 
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Violation};
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
+use ruff_newlines::StrExt;
 use ruff_python_ast::comparable::{ComparableConstant, ComparableExpr, ComparableStmt};
 use ruff_python_ast::helpers::{
-    any_over_expr, contains_effect, create_expr, create_stmt, first_colon_range, has_comments,
-    has_comments_in, unparse_expr, unparse_stmt,
+    any_over_expr, contains_effect, first_colon_range, has_comments, has_comments_in,
 };
-use ruff_python_ast::newlines::StrExt;
-use ruff_python_semantic::context::Context;
+use ruff_python_semantic::model::SemanticModel;
 
 use crate::checkers::ast::Checker;
+use crate::line_width::LineWidth;
 use crate::registry::AsRule;
 use crate::rules::flake8_simplify::rules::fix_if;
 
@@ -37,9 +36,7 @@ fn compare_body(body1: &[Stmt], body2: &[Stmt]) -> bool {
 }
 
 #[violation]
-pub struct CollapsibleIf {
-    pub fixable: bool,
-}
+pub struct CollapsibleIf;
 
 impl Violation for CollapsibleIf {
     const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
@@ -49,16 +46,14 @@ impl Violation for CollapsibleIf {
         format!("Use a single `if` statement instead of nested `if` statements")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable
-            .then_some(|_| format!("Combine `if` statements using `and`"))
+    fn autofix_title(&self) -> Option<String> {
+        Some("Combine `if` statements using `and`".to_string())
     }
 }
 
 #[violation]
 pub struct NeedlessBool {
-    pub condition: String,
-    pub fixable: bool,
+    condition: String,
 }
 
 impl Violation for NeedlessBool {
@@ -66,14 +61,13 @@ impl Violation for NeedlessBool {
 
     #[derive_message_formats]
     fn message(&self) -> String {
-        let NeedlessBool { condition, .. } = self;
+        let NeedlessBool { condition } = self;
         format!("Return the condition `{condition}` directly")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable.then_some(|NeedlessBool { condition, .. }| {
-            format!("Replace with `return {condition}`")
-        })
+    fn autofix_title(&self) -> Option<String> {
+        let NeedlessBool { condition } = self;
+        Some(format!("Replace with `return {condition}`"))
     }
 }
 
@@ -109,8 +103,7 @@ impl Violation for IfElseBlockInsteadOfDictLookup {
 
 #[violation]
 pub struct IfElseBlockInsteadOfIfExp {
-    pub contents: String,
-    pub fixable: bool,
+    contents: String,
 }
 
 impl Violation for IfElseBlockInsteadOfIfExp {
@@ -118,15 +111,13 @@ impl Violation for IfElseBlockInsteadOfIfExp {
 
     #[derive_message_formats]
     fn message(&self) -> String {
-        let IfElseBlockInsteadOfIfExp { contents, .. } = self;
+        let IfElseBlockInsteadOfIfExp { contents } = self;
         format!("Use ternary operator `{contents}` instead of `if`-`else`-block")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable
-            .then_some(|IfElseBlockInsteadOfIfExp { contents, .. }| {
-                format!("Replace `if`-`else`-block with `{contents}`")
-            })
+    fn autofix_title(&self) -> Option<String> {
+        let IfElseBlockInsteadOfIfExp { contents } = self;
+        Some(format!("Replace `if`-`else`-block with `{contents}`"))
     }
 }
 
@@ -162,8 +153,7 @@ impl Violation for IfWithSameArms {
 
 #[violation]
 pub struct IfElseBlockInsteadOfDictGet {
-    pub contents: String,
-    pub fixable: bool,
+    contents: String,
 }
 
 impl Violation for IfElseBlockInsteadOfDictGet {
@@ -171,30 +161,28 @@ impl Violation for IfElseBlockInsteadOfDictGet {
 
     #[derive_message_formats]
     fn message(&self) -> String {
-        let IfElseBlockInsteadOfDictGet { contents, .. } = self;
+        let IfElseBlockInsteadOfDictGet { contents } = self;
         format!("Use `{contents}` instead of an `if` block")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable
-            .then_some(|IfElseBlockInsteadOfDictGet { contents, .. }| {
-                format!("Replace with `{contents}`")
-            })
+    fn autofix_title(&self) -> Option<String> {
+        let IfElseBlockInsteadOfDictGet { contents } = self;
+        Some(format!("Replace with `{contents}`"))
     }
 }
 
 fn is_main_check(expr: &Expr) -> bool {
-    if let ExprKind::Compare {
+    if let Expr::Compare(ast::ExprCompare {
         left, comparators, ..
-    } = &expr.node
+    }) = expr
     {
-        if let ExprKind::Name { id, .. } = &left.node {
+        if let Expr::Name(ast::ExprName { id, .. }) = left.as_ref() {
             if id == "__name__" {
                 if comparators.len() == 1 {
-                    if let ExprKind::Constant {
+                    if let Expr::Constant(ast::ExprConstant {
                         value: Constant::Str(value),
                         ..
-                    } = &comparators[0].node
+                    }) = &comparators[0]
                     {
                         if value == "__main__" {
                             return true;
@@ -219,7 +207,7 @@ fn is_main_check(expr: &Expr) -> bool {
 ///         ...
 /// ```
 fn find_last_nested_if(body: &[Stmt]) -> Option<(&Expr, &Stmt)> {
-    let [Stmt { node: StmtKind::If { test, body: inner_body, orelse }, ..}] = body else { return None };
+    let [Stmt::If(ast::StmtIf { test, body: inner_body, orelse, .. })] = body else { return None };
     if !orelse.is_empty() {
         return None;
     }
@@ -232,7 +220,7 @@ fn find_last_nested_if(body: &[Stmt]) -> Option<(&Expr, &Stmt)> {
 }
 
 /// SIM102
-pub fn nested_if_statements(
+pub(crate) fn nested_if_statements(
     checker: &mut Checker,
     stmt: &Stmt,
     test: &Expr,
@@ -241,11 +229,9 @@ pub fn nested_if_statements(
     parent: Option<&Stmt>,
 ) {
     // If the parent could contain a nested if-statement, abort.
-    if let Some(parent) = parent {
-        if let StmtKind::If { body, orelse, .. } = &parent.node {
-            if orelse.is_empty() && body.len() == 1 {
-                return;
-            }
+    if let Some(Stmt::If(ast::StmtIf { body, orelse, .. })) = parent {
+        if orelse.is_empty() && body.len() == 1 {
+            return;
         }
     }
 
@@ -261,11 +247,11 @@ pub fn nested_if_statements(
 
     // Allow `if True:` and `if False:` statements.
     if matches!(
-        test.node,
-        ExprKind::Constant {
+        test,
+        Expr::Constant(ast::ExprConstant {
             value: Constant::Bool(..),
             ..
-        }
+        })
     ) {
         return;
     }
@@ -280,34 +266,38 @@ pub fn nested_if_statements(
         checker.locator,
     );
 
-    // The fixer preserves comments in the nested body, but removes comments between
-    // the outer and inner if statements.
-    let nested_if = &body[0];
-    let fixable = !has_comments_in(
-        TextRange::new(stmt.start(), nested_if.start()),
-        checker.locator,
-    );
-
     let mut diagnostic = Diagnostic::new(
-        CollapsibleIf { fixable },
+        CollapsibleIf,
         colon.map_or_else(
             || stmt.range(),
             |colon| TextRange::new(stmt.start(), colon.end()),
         ),
     );
-    if fixable && checker.patch(diagnostic.kind.rule()) {
-        match fix_if::fix_nested_if_statements(checker.locator, checker.stylist, stmt) {
-            Ok(fix) => {
-                if fix
-                    .content()
-                    .unwrap_or_default()
-                    .universal_newlines()
-                    .all(|line| line.width() <= checker.settings.line_length)
-                {
-                    diagnostic.set_fix(fix);
+    if checker.patch(diagnostic.kind.rule()) {
+        // The fixer preserves comments in the nested body, but removes comments between
+        // the outer and inner if statements.
+        let nested_if = &body[0];
+        if !has_comments_in(
+            TextRange::new(stmt.start(), nested_if.start()),
+            checker.locator,
+        ) {
+            match fix_if::fix_nested_if_statements(checker.locator, checker.stylist, stmt) {
+                Ok(edit) => {
+                    if edit
+                        .content()
+                        .unwrap_or_default()
+                        .universal_newlines()
+                        .all(|line| {
+                            LineWidth::new(checker.settings.tab_size).add_str(&line)
+                                <= checker.settings.line_length
+                        })
+                    {
+                        #[allow(deprecated)]
+                        diagnostic.set_fix(Fix::unspecified(edit));
+                    }
                 }
+                Err(err) => error!("Failed to fix nested if: {err}"),
             }
-            Err(err) => error!("Failed to fix nested if: {err}"),
         }
     }
     checker.diagnostics.push(diagnostic);
@@ -333,10 +323,10 @@ fn is_one_line_return_bool(stmts: &[Stmt]) -> Option<Bool> {
     if stmts.len() != 1 {
         return None;
     }
-    let StmtKind::Return { value } = &stmts[0].node else {
+    let Stmt::Return(ast::StmtReturn { value, range: _ }) = &stmts[0] else {
         return None;
     };
-    let Some(ExprKind::Constant { value, .. }) = value.as_ref().map(|value| &value.node) else {
+    let Some(Expr::Constant(ast::ExprConstant { value, .. })) = value.as_deref() else {
         return None;
     };
     let Constant::Bool(value) = value else {
@@ -346,8 +336,8 @@ fn is_one_line_return_bool(stmts: &[Stmt]) -> Option<Bool> {
 }
 
 /// SIM103
-pub fn needless_bool(checker: &mut Checker, stmt: &Stmt) {
-    let StmtKind::If { test, body, orelse } = &stmt.node else {
+pub(crate) fn needless_bool(checker: &mut Checker, stmt: &Stmt) {
+    let Stmt::If(ast::StmtIf { test, body, orelse, range: _ }) = stmt else {
         return;
     };
     let (Some(if_return), Some(else_return)) = (is_one_line_return_bool(body), is_one_line_return_bool(orelse)) else {
@@ -360,90 +350,100 @@ pub fn needless_bool(checker: &mut Checker, stmt: &Stmt) {
         return;
     }
 
-    let condition = unparse_expr(test, checker.stylist);
-    let fixable = matches!(if_return, Bool::True)
-        && matches!(else_return, Bool::False)
-        && !has_comments(stmt, checker.locator)
-        && (matches!(test.node, ExprKind::Compare { .. }) || checker.ctx.is_builtin("bool"));
-
-    let mut diagnostic = Diagnostic::new(NeedlessBool { condition, fixable }, stmt.range());
-    if fixable && checker.patch(diagnostic.kind.rule()) {
-        if matches!(test.node, ExprKind::Compare { .. }) {
-            // If the condition is a comparison, we can replace it with the condition.
-            diagnostic.set_fix(Edit::range_replacement(
-                unparse_stmt(
-                    &create_stmt(StmtKind::Return {
-                        value: Some(test.clone()),
-                    }),
-                    checker.stylist,
-                ),
-                stmt.range(),
-            ));
-        } else {
-            // Otherwise, we need to wrap the condition in a call to `bool`. (We've already
-            // verified, above, that `bool` is a builtin.)
-            diagnostic.set_fix(Edit::range_replacement(
-                unparse_stmt(
-                    &create_stmt(StmtKind::Return {
-                        value: Some(Box::new(create_expr(ExprKind::Call {
-                            func: Box::new(create_expr(ExprKind::Name {
-                                id: "bool".to_string(),
-                                ctx: ExprContext::Load,
-                            })),
-                            args: vec![(**test).clone()],
-                            keywords: vec![],
-                        }))),
-                    }),
-                    checker.stylist,
-                ),
-                stmt.range(),
-            ));
-        };
+    let condition = checker.generator().expr(test);
+    let mut diagnostic = Diagnostic::new(NeedlessBool { condition }, stmt.range());
+    if checker.patch(diagnostic.kind.rule()) {
+        if matches!(if_return, Bool::True)
+            && matches!(else_return, Bool::False)
+            && !has_comments(stmt, checker.locator)
+            && (test.is_compare_expr() || checker.semantic_model().is_builtin("bool"))
+        {
+            if test.is_compare_expr() {
+                // If the condition is a comparison, we can replace it with the condition.
+                let node = ast::StmtReturn {
+                    value: Some(test.clone()),
+                    range: TextRange::default(),
+                };
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                    checker.generator().stmt(&node.into()),
+                    stmt.range(),
+                )));
+            } else {
+                // Otherwise, we need to wrap the condition in a call to `bool`. (We've already
+                // verified, above, that `bool` is a builtin.)
+                let node = ast::ExprName {
+                    id: "bool".into(),
+                    ctx: ExprContext::Load,
+                    range: TextRange::default(),
+                };
+                let node1 = ast::ExprCall {
+                    func: Box::new(node.into()),
+                    args: vec![(**test).clone()],
+                    keywords: vec![],
+                    range: TextRange::default(),
+                };
+                let node2 = ast::StmtReturn {
+                    value: Some(Box::new(node1.into())),
+                    range: TextRange::default(),
+                };
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                    checker.generator().stmt(&node2.into()),
+                    stmt.range(),
+                )));
+            };
+        }
     }
     checker.diagnostics.push(diagnostic);
 }
 
 fn ternary(target_var: &Expr, body_value: &Expr, test: &Expr, orelse_value: &Expr) -> Stmt {
-    create_stmt(StmtKind::Assign {
+    let node = ast::ExprIfExp {
+        test: Box::new(test.clone()),
+        body: Box::new(body_value.clone()),
+        orelse: Box::new(orelse_value.clone()),
+        range: TextRange::default(),
+    };
+    let node1 = ast::StmtAssign {
         targets: vec![target_var.clone()],
-        value: Box::new(create_expr(ExprKind::IfExp {
-            test: Box::new(test.clone()),
-            body: Box::new(body_value.clone()),
-            orelse: Box::new(orelse_value.clone()),
-        })),
+        value: Box::new(node.into()),
         type_comment: None,
-    })
+        range: TextRange::default(),
+    };
+    node1.into()
 }
 
 /// Return `true` if the `Expr` contains a reference to `${module}.${target}`.
-fn contains_call_path(ctx: &Context, expr: &Expr, target: &[&str]) -> bool {
+fn contains_call_path(model: &SemanticModel, expr: &Expr, target: &[&str]) -> bool {
     any_over_expr(expr, &|expr| {
-        ctx.resolve_call_path(expr)
+        model
+            .resolve_call_path(expr)
             .map_or(false, |call_path| call_path.as_slice() == target)
     })
 }
 
 /// SIM108
-pub fn use_ternary_operator(checker: &mut Checker, stmt: &Stmt, parent: Option<&Stmt>) {
-    let StmtKind::If { test, body, orelse } = &stmt.node else {
+pub(crate) fn use_ternary_operator(checker: &mut Checker, stmt: &Stmt, parent: Option<&Stmt>) {
+    let Stmt::If(ast::StmtIf { test, body, orelse, range: _ } )= stmt else {
         return;
     };
     if body.len() != 1 || orelse.len() != 1 {
         return;
     }
-    let StmtKind::Assign { targets: body_targets, value: body_value, .. } = &body[0].node else {
+    let Stmt::Assign(ast::StmtAssign { targets: body_targets, value: body_value, .. } )= &body[0] else {
         return;
     };
-    let StmtKind::Assign { targets: orelse_targets, value: orelse_value, .. } = &orelse[0].node else {
+    let Stmt::Assign(ast::StmtAssign { targets: orelse_targets, value: orelse_value, .. } )= &orelse[0] else {
         return;
     };
     if body_targets.len() != 1 || orelse_targets.len() != 1 {
         return;
     }
-    let ExprKind::Name { id: body_id, .. } = &body_targets[0].node else {
+    let Expr::Name(ast::ExprName { id: body_id, .. } )= &body_targets[0] else {
         return;
     };
-    let ExprKind::Name { id: orelse_id, .. } = &orelse_targets[0].node else {
+    let Expr::Name(ast::ExprName { id: orelse_id, .. } )= &orelse_targets[0] else {
         return;
     };
     if body_id != orelse_id {
@@ -451,22 +451,22 @@ pub fn use_ternary_operator(checker: &mut Checker, stmt: &Stmt, parent: Option<&
     }
 
     // Avoid suggesting ternary for `if sys.version_info >= ...`-style checks.
-    if contains_call_path(&checker.ctx, test, &["sys", "version_info"]) {
+    if contains_call_path(checker.semantic_model(), test, &["sys", "version_info"]) {
         return;
     }
 
     // Avoid suggesting ternary for `if sys.platform.startswith("...")`-style
     // checks.
-    if contains_call_path(&checker.ctx, test, &["sys", "platform"]) {
+    if contains_call_path(checker.semantic_model(), test, &["sys", "platform"]) {
         return;
     }
 
     // It's part of a bigger if-elif block:
     // https://github.com/MartinThoma/flake8-simplify/issues/115
-    if let Some(StmtKind::If {
+    if let Some(Stmt::If(ast::StmtIf {
         orelse: parent_orelse,
         ..
-    }) = parent.map(|parent| &parent.node)
+    })) = parent
     {
         if parent_orelse.len() == 1 && stmt == &parent_orelse[0] {
             // TODO(charlie): These two cases have the same AST:
@@ -494,41 +494,46 @@ pub fn use_ternary_operator(checker: &mut Checker, stmt: &Stmt, parent: Option<&
     // Avoid suggesting ternary for `if (yield ...)`-style checks.
     // TODO(charlie): Fix precedence handling for yields in generator.
     if matches!(
-        body_value.node,
-        ExprKind::Yield { .. } | ExprKind::YieldFrom { .. } | ExprKind::Await { .. }
+        body_value.as_ref(),
+        Expr::Yield(_) | Expr::YieldFrom(_) | Expr::Await(_)
     ) {
         return;
     }
     if matches!(
-        orelse_value.node,
-        ExprKind::Yield { .. } | ExprKind::YieldFrom { .. } | ExprKind::Await { .. }
+        orelse_value.as_ref(),
+        Expr::Yield(_) | Expr::YieldFrom(_) | Expr::Await(_)
     ) {
         return;
     }
 
     let target_var = &body_targets[0];
     let ternary = ternary(target_var, body_value, test, orelse_value);
-    let contents = unparse_stmt(&ternary, checker.stylist);
+    let contents = checker.generator().stmt(&ternary);
 
     // Don't flag if the resulting expression would exceed the maximum line length.
     let line_start = checker.locator.line_start(stmt.start());
-    if checker.locator.contents()[TextRange::new(line_start, stmt.start())].width()
-        + contents.width()
+    if LineWidth::new(checker.settings.tab_size)
+        .add_str(&checker.locator.contents()[TextRange::new(line_start, stmt.start())])
+        .add_str(&contents)
         > checker.settings.line_length
     {
         return;
     }
 
-    let fixable = !has_comments(stmt, checker.locator);
     let mut diagnostic = Diagnostic::new(
         IfElseBlockInsteadOfIfExp {
             contents: contents.clone(),
-            fixable,
         },
         stmt.range(),
     );
-    if fixable && checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(contents, stmt.range()));
+    if checker.patch(diagnostic.kind.rule()) {
+        if !has_comments(stmt, checker.locator) {
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                contents,
+                stmt.range(),
+            )));
+        }
     }
     checker.diagnostics.push(diagnostic);
 }
@@ -544,7 +549,7 @@ fn get_if_body_pairs<'a>(
         if orelse.len() != 1 {
             break;
         }
-        let StmtKind::If { test, body, orelse: orelse_orelse, .. } = &orelse[0].node else {
+        let Stmt::If(ast::StmtIf { test, body, orelse: orelse_orelse, range: _ }) = &orelse[0] else {
             break;
         };
         pairs.push((test, body));
@@ -554,17 +559,17 @@ fn get_if_body_pairs<'a>(
 }
 
 /// SIM114
-pub fn if_with_same_arms(checker: &mut Checker, stmt: &Stmt, parent: Option<&Stmt>) {
-    let StmtKind::If { test, body, orelse } = &stmt.node else {
+pub(crate) fn if_with_same_arms(checker: &mut Checker, stmt: &Stmt, parent: Option<&Stmt>) {
+    let Stmt::If(ast::StmtIf { test, body, orelse, range: _ }) = stmt else {
         return;
     };
 
     // It's part of a bigger if-elif block:
     // https://github.com/MartinThoma/flake8-simplify/issues/115
-    if let Some(StmtKind::If {
+    if let Some(Stmt::If(ast::StmtIf {
         orelse: parent_orelse,
         ..
-    }) = parent.map(|parent| &parent.node)
+    })) = parent
     {
         if parent_orelse.len() == 1 && stmt == &parent_orelse[0] {
             // TODO(charlie): These two cases have the same AST:
@@ -606,7 +611,7 @@ pub fn if_with_same_arms(checker: &mut Checker, stmt: &Stmt, parent: Option<&Stm
 }
 
 /// SIM116
-pub fn manual_dict_lookup(
+pub(crate) fn manual_dict_lookup(
     checker: &mut Checker,
     stmt: &Stmt,
     test: &Expr,
@@ -619,14 +624,15 @@ pub fn manual_dict_lookup(
     // * Each if-statement's body must consist of a single `return`.
     // * Each if-statement's orelse must be either another if-statement or empty.
     // * The final if-statement's orelse must be empty, or a single `return`.
-    let ExprKind::Compare {
+    let Expr::Compare(ast::ExprCompare {
         left,
         ops,
         comparators,
-    } = &test.node else {
+        range: _,
+    })= &test else {
         return;
     };
-    let ExprKind::Name { id: target, .. } = &left.node else {
+    let Expr::Name(ast::ExprName { id: target, .. }) = left.as_ref() else {
         return;
     };
     if body.len() != 1 {
@@ -641,24 +647,24 @@ pub fn manual_dict_lookup(
     if comparators.len() != 1 {
         return;
     }
-    let ExprKind::Constant { value: constant, .. } = &comparators[0].node else {
+    let Expr::Constant(ast::ExprConstant { value: constant, .. }) = &comparators[0] else {
         return;
     };
-    let StmtKind::Return { value, .. } = &body[0].node else {
+    let Stmt::Return(ast::StmtReturn { value, range: _ }) = &body[0] else {
         return;
     };
     if value.as_ref().map_or(false, |value| {
-        contains_effect(value, |id| checker.ctx.is_builtin(id))
+        contains_effect(value, |id| checker.semantic_model().is_builtin(id))
     }) {
         return;
     }
 
     // It's part of a bigger if-elif block:
     // https://github.com/MartinThoma/flake8-simplify/issues/115
-    if let Some(StmtKind::If {
+    if let Some(Stmt::If(ast::StmtIf {
         orelse: parent_orelse,
         ..
-    }) = parent.map(|parent| &parent.node)
+    })) = parent
     {
         if parent_orelse.len() == 1 && stmt == &parent_orelse[0] {
             // TODO(charlie): These two cases have the same AST:
@@ -688,7 +694,7 @@ pub fn manual_dict_lookup(
 
     let mut child: Option<&Stmt> = orelse.get(0);
     while let Some(current) = child.take() {
-        let StmtKind::If { test, body, orelse } = &current.node else {
+        let Stmt::If(ast::StmtIf { test, body, orelse, range: _ }) = &current else {
             return;
         };
         if body.len() != 1 {
@@ -697,14 +703,15 @@ pub fn manual_dict_lookup(
         if orelse.len() > 1 {
             return;
         }
-        let ExprKind::Compare {
+        let Expr::Compare(ast::ExprCompare {
             left,
             ops,
             comparators,
-        } = &test.node else {
+            range: _
+        } )= test.as_ref() else {
             return;
         };
-        let ExprKind::Name { id, .. } = &left.node else {
+        let Expr::Name(ast::ExprName { id, .. }) = left.as_ref() else {
             return;
         };
         if !(id == target && ops.len() == 1 && ops[0] == Cmpop::Eq) {
@@ -713,25 +720,25 @@ pub fn manual_dict_lookup(
         if comparators.len() != 1 {
             return;
         }
-        let ExprKind::Constant { value: constant, .. } = &comparators[0].node else {
+        let Expr::Constant(ast::ExprConstant { value: constant, .. } )= &comparators[0] else {
             return;
         };
-        let StmtKind::Return { value, .. } = &body[0].node else {
+        let Stmt::Return(ast::StmtReturn { value, range: _ } )= &body[0] else {
             return;
         };
         if value.as_ref().map_or(false, |value| {
-            contains_effect(value, |id| checker.ctx.is_builtin(id))
+            contains_effect(value, |id| checker.semantic_model().is_builtin(id))
         }) {
             return;
         };
 
         constants.insert(constant.into());
         if let Some(orelse) = orelse.first() {
-            match &orelse.node {
-                StmtKind::If { .. } => {
+            match orelse {
+                Stmt::If(_) => {
                     child = Some(orelse);
                 }
-                StmtKind::Return { .. } => {
+                Stmt::Return(_) => {
                     child = None;
                 }
                 _ => return,
@@ -752,30 +759,30 @@ pub fn manual_dict_lookup(
 }
 
 /// SIM401
-pub fn use_dict_get_with_default(
+pub(crate) fn use_dict_get_with_default(
     checker: &mut Checker,
     stmt: &Stmt,
     test: &Expr,
-    body: &Vec<Stmt>,
-    orelse: &Vec<Stmt>,
+    body: &[Stmt],
+    orelse: &[Stmt],
     parent: Option<&Stmt>,
 ) {
     if body.len() != 1 || orelse.len() != 1 {
         return;
     }
-    let StmtKind::Assign { targets: body_var, value: body_value, ..} = &body[0].node else {
+    let Stmt::Assign(ast::StmtAssign { targets: body_var, value: body_value, ..}) = &body[0] else {
         return;
     };
     if body_var.len() != 1 {
         return;
     };
-    let StmtKind::Assign { targets: orelse_var, value: orelse_value, .. } = &orelse[0].node else {
+    let Stmt::Assign(ast::StmtAssign { targets: orelse_var, value: orelse_value, .. }) = &orelse[0] else {
         return;
     };
     if orelse_var.len() != 1 {
         return;
     };
-    let ExprKind::Compare { left: test_key, ops , comparators: test_dict } = &test.node else {
+    let Expr::Compare(ast::ExprCompare { left: test_key, ops , comparators: test_dict, range: _ }) = &test else {
         return;
     };
     if test_dict.len() != 1 {
@@ -789,7 +796,7 @@ pub fn use_dict_get_with_default(
         }
     };
     let test_dict = &test_dict[0];
-    let ExprKind::Subscript { value: expected_subscript, slice: expected_slice, .. }  =  &expected_value.node else {
+    let Expr::Subscript(ast::ExprSubscript { value: expected_subscript, slice: expected_slice, .. } ) =  expected_value.as_ref() else {
         return;
     };
 
@@ -803,16 +810,16 @@ pub fn use_dict_get_with_default(
     }
 
     // Check that the default value is not "complex".
-    if contains_effect(default_value, |id| checker.ctx.is_builtin(id)) {
+    if contains_effect(default_value, |id| checker.semantic_model().is_builtin(id)) {
         return;
     }
 
     // It's part of a bigger if-elif block:
     // https://github.com/MartinThoma/flake8-simplify/issues/115
-    if let Some(StmtKind::If {
+    if let Some(Stmt::If(ast::StmtIf {
         orelse: parent_orelse,
         ..
-    }) = parent.map(|parent| &parent.node)
+    })) = parent
     {
         if parent_orelse.len() == 1 && stmt == &parent_orelse[0] {
             // TODO(charlie): These two cases have the same AST:
@@ -837,45 +844,53 @@ pub fn use_dict_get_with_default(
         }
     }
 
-    let contents = unparse_stmt(
-        &create_stmt(StmtKind::Assign {
-            targets: vec![create_expr(expected_var.node.clone())],
-            value: Box::new(create_expr(ExprKind::Call {
-                func: Box::new(create_expr(ExprKind::Attribute {
-                    value: expected_subscript.clone(),
-                    attr: "get".to_string(),
-                    ctx: ExprContext::Load,
-                })),
-                args: vec![
-                    create_expr(test_key.node.clone()),
-                    create_expr(default_value.node.clone()),
-                ],
-                keywords: vec![],
-            })),
-            type_comment: None,
-        }),
-        checker.stylist,
-    );
+    let node = *default_value.clone();
+    let node1 = *test_key.clone();
+    let node2 = ast::ExprAttribute {
+        value: expected_subscript.clone(),
+        attr: "get".into(),
+        ctx: ExprContext::Load,
+        range: TextRange::default(),
+    };
+    let node3 = ast::ExprCall {
+        func: Box::new(node2.into()),
+        args: vec![node1, node],
+        keywords: vec![],
+        range: TextRange::default(),
+    };
+    let node4 = expected_var.clone();
+    let node5 = ast::StmtAssign {
+        targets: vec![node4],
+        value: Box::new(node3.into()),
+        type_comment: None,
+        range: TextRange::default(),
+    };
+    let contents = checker.generator().stmt(&node5.into());
 
     // Don't flag if the resulting expression would exceed the maximum line length.
     let line_start = checker.locator.line_start(stmt.start());
-    if checker.locator.contents()[TextRange::new(line_start, stmt.start())].width()
-        + contents.width()
+    if LineWidth::new(checker.settings.tab_size)
+        .add_str(&checker.locator.contents()[TextRange::new(line_start, stmt.start())])
+        .add_str(&contents)
         > checker.settings.line_length
     {
         return;
     }
 
-    let fixable = !has_comments(stmt, checker.locator);
     let mut diagnostic = Diagnostic::new(
         IfElseBlockInsteadOfDictGet {
             contents: contents.clone(),
-            fixable,
         },
         stmt.range(),
     );
-    if fixable && checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(contents, stmt.range()));
+    if checker.patch(diagnostic.kind.rule()) {
+        if !has_comments(stmt, checker.locator) {
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                contents,
+                stmt.range(),
+            )));
+        }
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/flake8_simplify/rules/ast_ifexp.rs b/crates/ruff/src/rules/flake8_simplify/rules/ast_ifexp.rs
index 0d9ccc6f7d750..cbbac3b6a9c59 100644
--- a/crates/ruff/src/rules/flake8_simplify/rules/ast_ifexp.rs
+++ b/crates/ruff/src/rules/flake8_simplify/rules/ast_ifexp.rs
@@ -1,33 +1,35 @@
-use rustpython_parser::ast::{Constant, Expr, ExprContext, ExprKind, Unaryop};
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Constant, Expr, ExprContext, Ranged, Unaryop};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::{create_expr, unparse_expr};
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 
 #[violation]
 pub struct IfExprWithTrueFalse {
-    pub expr: String,
+    expr: String,
 }
 
-impl AlwaysAutofixableViolation for IfExprWithTrueFalse {
+impl Violation for IfExprWithTrueFalse {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         let IfExprWithTrueFalse { expr } = self;
         format!("Use `bool({expr})` instead of `True if {expr} else False`")
     }
 
-    fn autofix_title(&self) -> String {
+    fn autofix_title(&self) -> Option<String> {
         let IfExprWithTrueFalse { expr } = self;
-        format!("Replace with `not {expr}")
+        Some(format!("Replace with `not {expr}"))
     }
 }
 
 #[violation]
 pub struct IfExprWithFalseTrue {
-    pub expr: String,
+    expr: String,
 }
 
 impl AlwaysAutofixableViolation for IfExprWithFalseTrue {
@@ -45,8 +47,8 @@ impl AlwaysAutofixableViolation for IfExprWithFalseTrue {
 
 #[violation]
 pub struct IfExprWithTwistedArms {
-    pub expr_body: String,
-    pub expr_else: String,
+    expr_body: String,
+    expr_else: String,
 }
 
 impl AlwaysAutofixableViolation for IfExprWithTwistedArms {
@@ -72,20 +74,20 @@ impl AlwaysAutofixableViolation for IfExprWithTwistedArms {
 }
 
 /// SIM210
-pub fn explicit_true_false_in_ifexpr(
+pub(crate) fn explicit_true_false_in_ifexpr(
     checker: &mut Checker,
     expr: &Expr,
     test: &Expr,
     body: &Expr,
     orelse: &Expr,
 ) {
-    let ExprKind::Constant { value, .. } = &body.node else {
+    let Expr::Constant(ast::ExprConstant { value, .. } )= &body else {
         return;
     };
     if !matches!(value, Constant::Bool(true)) {
         return;
     }
-    let ExprKind::Constant { value, .. } = &orelse.node else {
+    let Expr::Constant(ast::ExprConstant { value, .. } )= &orelse else {
         return;
     };
     if !matches!(value, Constant::Bool(false)) {
@@ -94,51 +96,54 @@ pub fn explicit_true_false_in_ifexpr(
 
     let mut diagnostic = Diagnostic::new(
         IfExprWithTrueFalse {
-            expr: unparse_expr(test, checker.stylist),
+            expr: checker.generator().expr(test),
         },
         expr.range(),
     );
     if checker.patch(diagnostic.kind.rule()) {
-        if matches!(test.node, ExprKind::Compare { .. }) {
-            diagnostic.set_fix(Edit::range_replacement(
-                unparse_expr(&test.clone(), checker.stylist),
+        if matches!(test, Expr::Compare(_)) {
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                checker.generator().expr(&test.clone()),
                 expr.range(),
-            ));
-        } else if checker.ctx.is_builtin("bool") {
-            diagnostic.set_fix(Edit::range_replacement(
-                unparse_expr(
-                    &create_expr(ExprKind::Call {
-                        func: Box::new(create_expr(ExprKind::Name {
-                            id: "bool".to_string(),
-                            ctx: ExprContext::Load,
-                        })),
-                        args: vec![test.clone()],
-                        keywords: vec![],
-                    }),
-                    checker.stylist,
-                ),
+            )));
+        } else if checker.semantic_model().is_builtin("bool") {
+            let node = ast::ExprName {
+                id: "bool".into(),
+                ctx: ExprContext::Load,
+                range: TextRange::default(),
+            };
+            let node1 = ast::ExprCall {
+                func: Box::new(node.into()),
+                args: vec![test.clone()],
+                keywords: vec![],
+                range: TextRange::default(),
+            };
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                checker.generator().expr(&node1.into()),
                 expr.range(),
-            ));
+            )));
         };
     }
     checker.diagnostics.push(diagnostic);
 }
 
 /// SIM211
-pub fn explicit_false_true_in_ifexpr(
+pub(crate) fn explicit_false_true_in_ifexpr(
     checker: &mut Checker,
     expr: &Expr,
     test: &Expr,
     body: &Expr,
     orelse: &Expr,
 ) {
-    let ExprKind::Constant { value, .. } = &body.node else {
+    let Expr::Constant(ast::ExprConstant { value, .. }) = &body else {
         return;
     };
     if !matches!(value, Constant::Bool(false)) {
         return;
     }
-    let ExprKind::Constant { value, .. } = &orelse.node else {
+    let Expr::Constant(ast::ExprConstant { value, .. }) = &orelse else {
         return;
     };
     if !matches!(value, Constant::Bool(true)) {
@@ -147,45 +152,46 @@ pub fn explicit_false_true_in_ifexpr(
 
     let mut diagnostic = Diagnostic::new(
         IfExprWithFalseTrue {
-            expr: unparse_expr(test, checker.stylist),
+            expr: checker.generator().expr(test),
         },
         expr.range(),
     );
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(
-            unparse_expr(
-                &create_expr(ExprKind::UnaryOp {
-                    op: Unaryop::Not,
-                    operand: Box::new(create_expr(test.node.clone())),
-                }),
-                checker.stylist,
-            ),
+        let node = test.clone();
+        let node1 = ast::ExprUnaryOp {
+            op: Unaryop::Not,
+            operand: Box::new(node),
+            range: TextRange::default(),
+        };
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+            checker.generator().expr(&node1.into()),
             expr.range(),
-        ));
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
 
 /// SIM212
-pub fn twisted_arms_in_ifexpr(
+pub(crate) fn twisted_arms_in_ifexpr(
     checker: &mut Checker,
     expr: &Expr,
     test: &Expr,
     body: &Expr,
     orelse: &Expr,
 ) {
-    let ExprKind::UnaryOp { op, operand: test_operand } = &test.node else {
+    let Expr::UnaryOp(ast::ExprUnaryOp { op, operand: test_operand, range: _ } )= &test else {
         return;
     };
-    if !matches!(op, Unaryop::Not) {
+    if !op.is_not() {
         return;
     }
 
     // Check if the test operand and else branch use the same variable.
-    let ExprKind::Name { id: test_id, .. } = &test_operand.node else {
+    let Expr::Name(ast::ExprName { id: test_id, .. } )= test_operand.as_ref() else {
         return;
     };
-    let ExprKind::Name {id: orelse_id, ..} = &orelse.node else {
+    let Expr::Name(ast::ExprName {id: orelse_id, ..}) = orelse else {
         return;
     };
     if !test_id.eq(orelse_id) {
@@ -194,23 +200,26 @@ pub fn twisted_arms_in_ifexpr(
 
     let mut diagnostic = Diagnostic::new(
         IfExprWithTwistedArms {
-            expr_body: unparse_expr(body, checker.stylist),
-            expr_else: unparse_expr(orelse, checker.stylist),
+            expr_body: checker.generator().expr(body),
+            expr_else: checker.generator().expr(orelse),
         },
         expr.range(),
     );
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(
-            unparse_expr(
-                &create_expr(ExprKind::IfExp {
-                    test: Box::new(create_expr(orelse.node.clone())),
-                    body: Box::new(create_expr(orelse.node.clone())),
-                    orelse: Box::new(create_expr(body.node.clone())),
-                }),
-                checker.stylist,
-            ),
+        let node = body.clone();
+        let node1 = orelse.clone();
+        let node2 = orelse.clone();
+        let node3 = ast::ExprIfExp {
+            test: Box::new(node2),
+            body: Box::new(node1),
+            orelse: Box::new(node),
+            range: TextRange::default(),
+        };
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+            checker.generator().expr(&node3.into()),
             expr.range(),
-        ));
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/flake8_simplify/rules/ast_unary_op.rs b/crates/ruff/src/rules/flake8_simplify/rules/ast_unary_op.rs
index 1b978989cfb18..8f2972b492fec 100644
--- a/crates/ruff/src/rules/flake8_simplify/rules/ast_unary_op.rs
+++ b/crates/ruff/src/rules/flake8_simplify/rules/ast_unary_op.rs
@@ -1,8 +1,8 @@
-use rustpython_parser::ast::{Cmpop, Expr, ExprKind, Stmt, StmtKind, Unaryop};
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Cmpop, Expr, ExprContext, Ranged, Stmt, Unaryop};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::{create_expr, unparse_expr};
 use ruff_python_semantic::scope::ScopeKind;
 
 use crate::checkers::ast::Checker;
@@ -10,8 +10,8 @@ use crate::registry::AsRule;
 
 #[violation]
 pub struct NegateEqualOp {
-    pub left: String,
-    pub right: String,
+    left: String,
+    right: String,
 }
 
 impl AlwaysAutofixableViolation for NegateEqualOp {
@@ -28,8 +28,8 @@ impl AlwaysAutofixableViolation for NegateEqualOp {
 
 #[violation]
 pub struct NegateNotEqualOp {
-    pub left: String,
-    pub right: String,
+    left: String,
+    right: String,
 }
 
 impl AlwaysAutofixableViolation for NegateNotEqualOp {
@@ -46,7 +46,7 @@ impl AlwaysAutofixableViolation for NegateNotEqualOp {
 
 #[violation]
 pub struct DoubleNegation {
-    pub expr: String,
+    expr: String,
 }
 
 impl AlwaysAutofixableViolation for DoubleNegation {
@@ -65,119 +65,130 @@ impl AlwaysAutofixableViolation for DoubleNegation {
 const DUNDER_METHODS: &[&str] = &["__eq__", "__ne__", "__lt__", "__le__", "__gt__", "__ge__"];
 
 fn is_exception_check(stmt: &Stmt) -> bool {
-    let StmtKind::If {test: _, body, orelse: _} = &stmt.node else {
+    let Stmt::If(ast::StmtIf {test: _, body, orelse: _, range: _ })= stmt else {
         return false;
     };
     if body.len() != 1 {
         return false;
     }
-    if matches!(body[0].node, StmtKind::Raise { .. }) {
+    if matches!(body[0], Stmt::Raise(_)) {
         return true;
     }
     false
 }
 
 /// SIM201
-pub fn negation_with_equal_op(checker: &mut Checker, expr: &Expr, op: &Unaryop, operand: &Expr) {
+pub(crate) fn negation_with_equal_op(
+    checker: &mut Checker,
+    expr: &Expr,
+    op: Unaryop,
+    operand: &Expr,
+) {
     if !matches!(op, Unaryop::Not) {
         return;
     }
-    let ExprKind::Compare{ left, ops, comparators} = &operand.node else {
+    let Expr::Compare(ast::ExprCompare { left, ops, comparators, range: _}) = operand else {
         return;
     };
     if !matches!(&ops[..], [Cmpop::Eq]) {
         return;
     }
-    if is_exception_check(checker.ctx.current_stmt()) {
+    if is_exception_check(checker.semantic_model().stmt()) {
         return;
     }
 
     // Avoid flagging issues in dunder implementations.
-    if let ScopeKind::Function(def) = &checker.ctx.scope().kind {
-        if DUNDER_METHODS.contains(&def.name) {
+    if let ScopeKind::Function(ast::StmtFunctionDef { name, .. })
+    | ScopeKind::AsyncFunction(ast::StmtAsyncFunctionDef { name, .. }) =
+        &checker.semantic_model().scope().kind
+    {
+        if DUNDER_METHODS.contains(&name.as_str()) {
             return;
         }
     }
 
     let mut diagnostic = Diagnostic::new(
         NegateEqualOp {
-            left: unparse_expr(left, checker.stylist),
-            right: unparse_expr(&comparators[0], checker.stylist),
+            left: checker.generator().expr(left),
+            right: checker.generator().expr(&comparators[0]),
         },
         expr.range(),
     );
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(
-            unparse_expr(
-                &create_expr(ExprKind::Compare {
-                    left: left.clone(),
-                    ops: vec![Cmpop::NotEq],
-                    comparators: comparators.clone(),
-                }),
-                checker.stylist,
-            ),
+        let node = ast::ExprCompare {
+            left: left.clone(),
+            ops: vec![Cmpop::NotEq],
+            comparators: comparators.clone(),
+            range: TextRange::default(),
+        };
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+            checker.generator().expr(&node.into()),
             expr.range(),
-        ));
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
 
 /// SIM202
-pub fn negation_with_not_equal_op(
+pub(crate) fn negation_with_not_equal_op(
     checker: &mut Checker,
     expr: &Expr,
-    op: &Unaryop,
+    op: Unaryop,
     operand: &Expr,
 ) {
     if !matches!(op, Unaryop::Not) {
         return;
     }
-    let ExprKind::Compare{ left, ops, comparators} = &operand.node else {
+    let Expr::Compare(ast::ExprCompare { left, ops, comparators, range: _}) = operand else {
         return;
     };
     if !matches!(&ops[..], [Cmpop::NotEq]) {
         return;
     }
-    if is_exception_check(checker.ctx.current_stmt()) {
+    if is_exception_check(checker.semantic_model().stmt()) {
         return;
     }
 
     // Avoid flagging issues in dunder implementations.
-    if let ScopeKind::Function(def) = &checker.ctx.scope().kind {
-        if DUNDER_METHODS.contains(&def.name) {
+    if let ScopeKind::Function(ast::StmtFunctionDef { name, .. })
+    | ScopeKind::AsyncFunction(ast::StmtAsyncFunctionDef { name, .. }) =
+        &checker.semantic_model().scope().kind
+    {
+        if DUNDER_METHODS.contains(&name.as_str()) {
             return;
         }
     }
 
     let mut diagnostic = Diagnostic::new(
         NegateNotEqualOp {
-            left: unparse_expr(left, checker.stylist),
-            right: unparse_expr(&comparators[0], checker.stylist),
+            left: checker.generator().expr(left),
+            right: checker.generator().expr(&comparators[0]),
         },
         expr.range(),
     );
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(
-            unparse_expr(
-                &create_expr(ExprKind::Compare {
-                    left: left.clone(),
-                    ops: vec![Cmpop::Eq],
-                    comparators: comparators.clone(),
-                }),
-                checker.stylist,
-            ),
+        let node = ast::ExprCompare {
+            left: left.clone(),
+            ops: vec![Cmpop::Eq],
+            comparators: comparators.clone(),
+            range: TextRange::default(),
+        };
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+            checker.generator().expr(&node.into()),
             expr.range(),
-        ));
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
 
 /// SIM208
-pub fn double_negation(checker: &mut Checker, expr: &Expr, op: &Unaryop, operand: &Expr) {
+pub(crate) fn double_negation(checker: &mut Checker, expr: &Expr, op: Unaryop, operand: &Expr) {
     if !matches!(op, Unaryop::Not) {
         return;
     }
-    let ExprKind::UnaryOp { op: operand_op, operand } = &operand.node else {
+    let Expr::UnaryOp(ast::ExprUnaryOp { op: operand_op, operand, range: _ }) = operand else {
         return;
     };
     if !matches!(operand_op, Unaryop::Not) {
@@ -186,15 +197,35 @@ pub fn double_negation(checker: &mut Checker, expr: &Expr, op: &Unaryop, operand
 
     let mut diagnostic = Diagnostic::new(
         DoubleNegation {
-            expr: unparse_expr(operand, checker.stylist),
+            expr: checker.generator().expr(operand),
         },
         expr.range(),
     );
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(
-            unparse_expr(operand, checker.stylist),
-            expr.range(),
-        ));
+        if checker.semantic_model().in_boolean_test() {
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                checker.generator().expr(operand),
+                expr.range(),
+            )));
+        } else if checker.semantic_model().is_builtin("bool") {
+            let node = ast::ExprName {
+                id: "bool".into(),
+                ctx: ExprContext::Load,
+                range: TextRange::default(),
+            };
+            let node1 = ast::ExprCall {
+                func: Box::new(node.into()),
+                args: vec![*operand.clone()],
+                keywords: vec![],
+                range: TextRange::default(),
+            };
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                checker.generator().expr(&node1.into()),
+                expr.range(),
+            )));
+        };
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/flake8_simplify/rules/ast_with.rs b/crates/ruff/src/rules/flake8_simplify/rules/ast_with.rs
index 00fb633d2f35d..84c041d0f8716 100644
--- a/crates/ruff/src/rules/flake8_simplify/rules/ast_with.rs
+++ b/crates/ruff/src/rules/flake8_simplify/rules/ast_with.rs
@@ -1,15 +1,15 @@
 use log::error;
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::{Located, Stmt, StmtKind, Withitem};
-use unicode_width::UnicodeWidthStr;
+use rustpython_parser::ast::{self, Ranged, Stmt, Withitem};
 
-use ruff_diagnostics::Diagnostic;
 use ruff_diagnostics::{AutofixKind, Violation};
+use ruff_diagnostics::{Diagnostic, Fix};
 use ruff_macros::{derive_message_formats, violation};
+use ruff_newlines::StrExt;
 use ruff_python_ast::helpers::{first_colon_range, has_comments_in};
-use ruff_python_ast::newlines::StrExt;
 
 use crate::checkers::ast::Checker;
+use crate::line_width::LineWidth;
 use crate::registry::AsRule;
 
 use super::fix_with;
@@ -42,9 +42,7 @@ use super::fix_with;
 /// ## References
 /// - [Python: "The with statement"](https://docs.python.org/3/reference/compound_stmts.html#the-with-statement)
 #[violation]
-pub struct MultipleWithStatements {
-    pub fixable: bool,
-}
+pub struct MultipleWithStatements;
 
 impl Violation for MultipleWithStatements {
     const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
@@ -57,29 +55,26 @@ impl Violation for MultipleWithStatements {
         )
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable
-            .then_some(|_| format!("Combine `with` statements"))
+    fn autofix_title(&self) -> Option<String> {
+        Some("Combine `with` statements".to_string())
     }
 }
 
-fn find_last_with(body: &[Stmt]) -> Option<(&Vec<Withitem>, &Vec<Stmt>)> {
-    let [Located { node: StmtKind::With { items, body, .. }, ..}] = body else { return None };
+fn find_last_with(body: &[Stmt]) -> Option<(&[Withitem], &[Stmt])> {
+    let [Stmt::With(ast::StmtWith { items, body, .. })] = body else { return None };
     find_last_with(body).or(Some((items, body)))
 }
 
 /// SIM117
-pub fn multiple_with_statements(
+pub(crate) fn multiple_with_statements(
     checker: &mut Checker,
     with_stmt: &Stmt,
     with_body: &[Stmt],
     with_parent: Option<&Stmt>,
 ) {
-    if let Some(parent) = with_parent {
-        if let StmtKind::With { body, .. } = &parent.node {
-            if body.len() == 1 {
-                return;
-            }
+    if let Some(Stmt::With(ast::StmtWith { body, .. })) = with_parent {
+        if body.len() == 1 {
+            return;
         }
     }
     if let Some((items, body)) = find_last_with(with_body) {
@@ -94,34 +89,40 @@ pub fn multiple_with_statements(
             ),
             checker.locator,
         );
-        let fixable = !has_comments_in(
-            TextRange::new(with_stmt.start(), with_body[0].start()),
-            checker.locator,
-        );
+
         let mut diagnostic = Diagnostic::new(
-            MultipleWithStatements { fixable },
+            MultipleWithStatements,
             colon.map_or_else(
                 || with_stmt.range(),
                 |colon| TextRange::new(with_stmt.start(), colon.end()),
             ),
         );
-        if fixable && checker.patch(diagnostic.kind.rule()) {
-            match fix_with::fix_multiple_with_statements(
+        if checker.patch(diagnostic.kind.rule()) {
+            if !has_comments_in(
+                TextRange::new(with_stmt.start(), with_body[0].start()),
                 checker.locator,
-                checker.stylist,
-                with_stmt,
             ) {
-                Ok(fix) => {
-                    if fix
-                        .content()
-                        .unwrap_or_default()
-                        .universal_newlines()
-                        .all(|line| line.width() <= checker.settings.line_length)
-                    {
-                        diagnostic.set_fix(fix);
+                match fix_with::fix_multiple_with_statements(
+                    checker.locator,
+                    checker.stylist,
+                    with_stmt,
+                ) {
+                    Ok(edit) => {
+                        if edit
+                            .content()
+                            .unwrap_or_default()
+                            .universal_newlines()
+                            .all(|line| {
+                                LineWidth::new(checker.settings.tab_size).add_str(&line)
+                                    <= checker.settings.line_length
+                            })
+                        {
+                            #[allow(deprecated)]
+                            diagnostic.set_fix(Fix::unspecified(edit));
+                        }
                     }
+                    Err(err) => error!("Failed to fix nested with: {err}"),
                 }
-                Err(err) => error!("Failed to fix nested with: {err}"),
             }
         }
         checker.diagnostics.push(diagnostic);
diff --git a/crates/ruff/src/rules/flake8_simplify/rules/fix_if.rs b/crates/ruff/src/rules/flake8_simplify/rules/fix_if.rs
index 14a808c8eacec..a36364dedf766 100644
--- a/crates/ruff/src/rules/flake8_simplify/rules/fix_if.rs
+++ b/crates/ruff/src/rules/flake8_simplify/rules/fix_if.rs
@@ -1,16 +1,18 @@
+use std::borrow::Cow;
+
 use anyhow::{bail, Result};
 use libcst_native::{
-    BooleanOp, BooleanOperation, Codegen, CodegenState, CompoundStatement, Expression, If,
-    LeftParen, ParenthesizableWhitespace, ParenthesizedNode, RightParen, SimpleWhitespace,
-    Statement, Suite,
+    BooleanOp, BooleanOperation, CompoundStatement, Expression, If, LeftParen,
+    ParenthesizableWhitespace, ParenthesizedNode, RightParen, SimpleWhitespace, Statement, Suite,
 };
-use std::borrow::Cow;
+use rustpython_parser::ast::Ranged;
 
+use crate::autofix::codemods::CodegenStylist;
 use ruff_diagnostics::Edit;
 use ruff_python_ast::source_code::{Locator, Stylist};
 use ruff_python_ast::whitespace;
 
-use crate::cst::matchers::match_module;
+use crate::cst::matchers::{match_function_def, match_if, match_indented_block, match_statement};
 
 fn parenthesize_and_operand(expr: Expression) -> Expression {
     match &expr {
@@ -65,26 +67,23 @@ pub(crate) fn fix_nested_if_statements(
     };
 
     // Parse the CST.
-    let mut tree = match_module(&module_text)?;
+    let mut tree = match_statement(&module_text)?;
 
-    let statements = if outer_indent.is_empty() {
-        &mut *tree.body
+    let statement = if outer_indent.is_empty() {
+        &mut tree
     } else {
-        let [Statement::Compound(CompoundStatement::FunctionDef(embedding))] = &mut *tree.body else {
-            bail!("Expected statement to be embedded in a function definition")
-        };
+        let embedding = match_function_def(&mut tree)?;
 
-        let Suite::IndentedBlock(indented_block) = &mut embedding.body else {
-            bail!("Expected indented block")
-        };
+        let indented_block = match_indented_block(&mut embedding.body)?;
         indented_block.indent = Some(outer_indent);
 
-        &mut *indented_block.body
+        let Some(statement) = indented_block.body.first_mut() else {
+            bail!("Expected indented block to have at least one statement")
+        };
+        statement
     };
 
-    let [Statement::Compound(CompoundStatement::If(outer_if))] = statements else {
-        bail!("Expected one outer if statement")
-    };
+    let outer_if = match_if(statement)?;
 
     let If {
         body: Suite::IndentedBlock(ref mut outer_body),
@@ -112,15 +111,8 @@ pub(crate) fn fix_nested_if_statements(
     }));
     outer_if.body = inner_if.body.clone();
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..Default::default()
-    };
-    tree.codegen(&mut state);
-
     // Reconstruct and reformat the code.
-    let module_text = state.to_string();
+    let module_text = tree.codegen_stylist(stylist);
     let module_text = if outer_indent.is_empty() {
         &module_text
     } else {
diff --git a/crates/ruff/src/rules/flake8_simplify/rules/fix_with.rs b/crates/ruff/src/rules/flake8_simplify/rules/fix_with.rs
index b81232881df93..b3636cabbc9fc 100644
--- a/crates/ruff/src/rules/flake8_simplify/rules/fix_with.rs
+++ b/crates/ruff/src/rules/flake8_simplify/rules/fix_with.rs
@@ -1,11 +1,13 @@
 use anyhow::{bail, Result};
-use libcst_native::{Codegen, CodegenState, CompoundStatement, Statement, Suite, With};
+use libcst_native::{CompoundStatement, Statement, Suite, With};
+use rustpython_parser::ast::Ranged;
 
+use crate::autofix::codemods::CodegenStylist;
 use ruff_diagnostics::Edit;
 use ruff_python_ast::source_code::{Locator, Stylist};
 use ruff_python_ast::whitespace;
 
-use crate::cst::matchers::match_module;
+use crate::cst::matchers::{match_function_def, match_indented_block, match_statement, match_with};
 
 /// (SIM117) Convert `with a: with b:` to `with a, b:`.
 pub(crate) fn fix_multiple_with_statements(
@@ -31,26 +33,23 @@ pub(crate) fn fix_multiple_with_statements(
     };
 
     // Parse the CST.
-    let mut tree = match_module(&module_text)?;
+    let mut tree = match_statement(&module_text)?;
 
-    let statements = if outer_indent.is_empty() {
-        &mut *tree.body
+    let statement = if outer_indent.is_empty() {
+        &mut tree
     } else {
-        let [Statement::Compound(CompoundStatement::FunctionDef(embedding))] = &mut *tree.body else {
-            bail!("Expected statement to be embedded in a function definition")
-        };
+        let embedding = match_function_def(&mut tree)?;
 
-        let Suite::IndentedBlock(indented_block) = &mut embedding.body else {
-            bail!("Expected indented block")
-        };
+        let indented_block = match_indented_block(&mut embedding.body)?;
         indented_block.indent = Some(outer_indent);
 
-        &mut *indented_block.body
+        let Some(statement) = indented_block.body.first_mut() else {
+            bail!("Expected indented block to have at least one statement")
+        };
+        statement
     };
 
-    let [Statement::Compound(CompoundStatement::With(outer_with))] = statements else {
-        bail!("Expected one outer with statement")
-    };
+    let outer_with = match_with(statement)?;
 
     let With {
         body: Suite::IndentedBlock(ref mut outer_body),
@@ -72,15 +71,8 @@ pub(crate) fn fix_multiple_with_statements(
     }
     outer_with.body = inner_with.body.clone();
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
-
     // Reconstruct and reformat the code.
-    let module_text = state.to_string();
+    let module_text = tree.codegen_stylist(stylist);
     let contents = if outer_indent.is_empty() {
         module_text
     } else {
diff --git a/crates/ruff/src/rules/flake8_simplify/rules/key_in_dict.rs b/crates/ruff/src/rules/flake8_simplify/rules/key_in_dict.rs
index eebd1131f06b4..8463476e960ba 100644
--- a/crates/ruff/src/rules/flake8_simplify/rules/key_in_dict.rs
+++ b/crates/ruff/src/rules/flake8_simplify/rules/key_in_dict.rs
@@ -1,22 +1,23 @@
 use anyhow::Result;
-use libcst_native::{Codegen, CodegenState};
+
 use log::error;
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::{Cmpop, Expr, ExprKind};
+use rustpython_parser::ast::{self, Cmpop, Expr, Ranged};
 
+use crate::autofix::codemods::CodegenStylist;
 use ruff_diagnostics::Edit;
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::{Locator, Stylist};
 
 use crate::checkers::ast::Checker;
-use crate::cst::matchers::{match_attribute, match_call, match_expression};
+use crate::cst::matchers::{match_attribute, match_call_mut, match_expression};
 use crate::registry::AsRule;
 
 #[violation]
 pub struct InDictKeys {
-    pub key: String,
-    pub dict: String,
+    key: String,
+    dict: String,
 }
 
 impl AlwaysAutofixableViolation for InDictKeys {
@@ -35,37 +36,31 @@ impl AlwaysAutofixableViolation for InDictKeys {
 fn get_value_content_for_key_in_dict(
     locator: &Locator,
     stylist: &Stylist,
-    expr: &rustpython_parser::ast::Expr,
+    expr: &Expr,
 ) -> Result<String> {
     let content = locator.slice(expr.range());
     let mut expression = match_expression(content)?;
-    let call = match_call(&mut expression)?;
+    let call = match_call_mut(&mut expression)?;
     let attribute = match_attribute(&mut call.func)?;
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    attribute.value.codegen(&mut state);
-
-    Ok(state.to_string())
+    Ok(attribute.value.codegen_stylist(stylist))
 }
 
 /// SIM118
 fn key_in_dict(checker: &mut Checker, left: &Expr, right: &Expr, range: TextRange) {
-    let ExprKind::Call {
+    let Expr::Call(ast::ExprCall {
         func,
         args,
         keywords,
-    } = &right.node else {
+        range: _
+    }) = &right else {
         return;
     };
     if !(args.is_empty() && keywords.is_empty()) {
         return;
     }
 
-    let ExprKind::Attribute { attr, .. } = &func.node else {
+    let Expr::Attribute(ast::ExprAttribute { attr, .. }) = func.as_ref() else {
         return;
     };
     if attr != "keys" {
@@ -91,13 +86,17 @@ fn key_in_dict(checker: &mut Checker, left: &Expr, right: &Expr, range: TextRang
         range,
     );
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(value_content, right.range()));
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+            value_content,
+            right.range(),
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
 
 /// SIM118 in a for loop
-pub fn key_in_dict_for(checker: &mut Checker, target: &Expr, iter: &Expr) {
+pub(crate) fn key_in_dict_for(checker: &mut Checker, target: &Expr, iter: &Expr) {
     key_in_dict(
         checker,
         target,
@@ -107,7 +106,7 @@ pub fn key_in_dict_for(checker: &mut Checker, target: &Expr, iter: &Expr) {
 }
 
 /// SIM118 in a comparison
-pub fn key_in_dict_compare(
+pub(crate) fn key_in_dict_compare(
     checker: &mut Checker,
     expr: &Expr,
     left: &Expr,
diff --git a/crates/ruff/src/rules/flake8_simplify/rules/mod.rs b/crates/ruff/src/rules/flake8_simplify/rules/mod.rs
index 5cd84245363c8..80a9ad752de89 100644
--- a/crates/ruff/src/rules/flake8_simplify/rules/mod.rs
+++ b/crates/ruff/src/rules/flake8_simplify/rules/mod.rs
@@ -1,34 +1,36 @@
-pub use ast_bool_op::{
+pub(crate) use ast_bool_op::{
     compare_with_tuple, duplicate_isinstance_call, expr_and_false, expr_and_not_expr,
     expr_or_not_expr, expr_or_true, CompareWithTuple, DuplicateIsinstanceCall, ExprAndFalse,
     ExprAndNotExpr, ExprOrNotExpr, ExprOrTrue,
 };
-pub use ast_expr::{
+pub(crate) use ast_expr::{
     dict_get_with_none_default, use_capital_environment_variables, DictGetWithNoneDefault,
     UncapitalizedEnvironmentVariables,
 };
-pub use ast_if::{
+pub(crate) use ast_if::{
     if_with_same_arms, manual_dict_lookup, needless_bool, nested_if_statements,
     use_dict_get_with_default, use_ternary_operator, CollapsibleIf, IfElseBlockInsteadOfDictGet,
     IfElseBlockInsteadOfDictLookup, IfElseBlockInsteadOfIfExp, IfWithSameArms, NeedlessBool,
 };
-pub use ast_ifexp::{
+pub(crate) use ast_ifexp::{
     explicit_false_true_in_ifexpr, explicit_true_false_in_ifexpr, twisted_arms_in_ifexpr,
     IfExprWithFalseTrue, IfExprWithTrueFalse, IfExprWithTwistedArms,
 };
-pub use ast_unary_op::{
+pub(crate) use ast_unary_op::{
     double_negation, negation_with_equal_op, negation_with_not_equal_op, DoubleNegation,
     NegateEqualOp, NegateNotEqualOp,
 };
-pub use ast_with::{multiple_with_statements, MultipleWithStatements};
-pub use key_in_dict::{key_in_dict_compare, key_in_dict_for, InDictKeys};
-pub use open_file_with_context_handler::{
+pub(crate) use ast_with::{multiple_with_statements, MultipleWithStatements};
+pub(crate) use key_in_dict::{key_in_dict_compare, key_in_dict_for, InDictKeys};
+pub(crate) use open_file_with_context_handler::{
     open_file_with_context_handler, OpenFileWithContextHandler,
 };
-pub use reimplemented_builtin::{convert_for_loop_to_any_all, ReimplementedBuiltin};
-pub use return_in_try_except_finally::{return_in_try_except_finally, ReturnInTryExceptFinally};
-pub use suppressible_exception::{suppressible_exception, SuppressibleException};
-pub use yoda_conditions::{yoda_conditions, YodaConditions};
+pub(crate) use reimplemented_builtin::{convert_for_loop_to_any_all, ReimplementedBuiltin};
+pub(crate) use return_in_try_except_finally::{
+    return_in_try_except_finally, ReturnInTryExceptFinally,
+};
+pub(crate) use suppressible_exception::{suppressible_exception, SuppressibleException};
+pub(crate) use yoda_conditions::{yoda_conditions, YodaConditions};
 
 mod ast_bool_op;
 mod ast_expr;
diff --git a/crates/ruff/src/rules/flake8_simplify/rules/open_file_with_context_handler.rs b/crates/ruff/src/rules/flake8_simplify/rules/open_file_with_context_handler.rs
index cc315cffe4ead..8d10ddb4242a6 100644
--- a/crates/ruff/src/rules/flake8_simplify/rules/open_file_with_context_handler.rs
+++ b/crates/ruff/src/rules/flake8_simplify/rules/open_file_with_context_handler.rs
@@ -1,10 +1,35 @@
-use rustpython_parser::ast::{Expr, ExprKind, StmtKind};
+use rustpython_parser::ast::{self, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
+use ruff_python_semantic::model::SemanticModel;
 
 use crate::checkers::ast::Checker;
 
+/// ## What it does
+/// Checks for usages of the builtin `open()` function without an associated context
+/// manager.
+///
+/// ## Why is this bad?
+/// If a file is opened without a context manager, it is not guaranteed that
+/// the file will be closed (e.g., if an exception is raised), which can cause
+/// resource leaks.
+///
+/// ## Example
+/// ```python
+/// file = open("foo.txt")
+/// ...
+/// file.close()
+/// ```
+///
+/// Use instead:
+/// ```python
+/// with open("foo.txt") as file:
+///     ...
+/// ```
+///
+/// # References
+/// - [Python documentation](https://docs.python.org/3/library/functions.html#open)
 #[violation]
 pub struct OpenFileWithContextHandler;
 
@@ -17,33 +42,29 @@ impl Violation for OpenFileWithContextHandler {
 
 /// Return `true` if the current expression is nested in an `await
 /// exit_stack.enter_async_context` call.
-fn match_async_exit_stack(checker: &Checker) -> bool {
-    let Some(expr) = checker.ctx.current_expr_grandparent() else {
+fn match_async_exit_stack(model: &SemanticModel) -> bool {
+    let Some(expr) = model.expr_grandparent() else {
         return false;
     };
-    let ExprKind::Await { value } = &expr.node else {
+    let Expr::Await(ast::ExprAwait { value, range: _ }) = expr else {
         return false;
     };
-    let ExprKind::Call { func,  .. } = &value.node else {
+    let Expr::Call(ast::ExprCall { func,  .. }) = value.as_ref() else {
          return false;
      };
-    let ExprKind::Attribute { attr, .. } = &func.node else {
+    let Expr::Attribute(ast::ExprAttribute { attr, .. }) = func.as_ref() else {
         return false;
     };
     if attr != "enter_async_context" {
         return false;
     }
-    for parent in &checker.ctx.parents {
-        if let StmtKind::With { items, .. } = &parent.node {
+    for parent in model.parents() {
+        if let Stmt::With(ast::StmtWith { items, .. }) = parent {
             for item in items {
-                if let ExprKind::Call { func, .. } = &item.context_expr.node {
-                    if checker
-                        .ctx
-                        .resolve_call_path(func)
-                        .map_or(false, |call_path| {
-                            call_path.as_slice() == ["contextlib", "AsyncExitStack"]
-                        })
-                    {
+                if let Expr::Call(ast::ExprCall { func, .. }) = &item.context_expr {
+                    if model.resolve_call_path(func).map_or(false, |call_path| {
+                        call_path.as_slice() == ["contextlib", "AsyncExitStack"]
+                    }) {
                         return true;
                     }
                 }
@@ -55,30 +76,26 @@ fn match_async_exit_stack(checker: &Checker) -> bool {
 
 /// Return `true` if the current expression is nested in an
 /// `exit_stack.enter_context` call.
-fn match_exit_stack(checker: &Checker) -> bool {
-    let Some(expr) = checker.ctx.current_expr_parent() else {
+fn match_exit_stack(model: &SemanticModel) -> bool {
+    let Some(expr) = model.expr_parent() else {
         return false;
     };
-    let ExprKind::Call { func,  .. } = &expr.node else {
+    let Expr::Call(ast::ExprCall { func,  .. }) = expr else {
          return false;
      };
-    let ExprKind::Attribute { attr, .. } = &func.node else {
+    let Expr::Attribute(ast::ExprAttribute { attr, .. }) = func.as_ref() else {
         return false;
     };
     if attr != "enter_context" {
         return false;
     }
-    for parent in &checker.ctx.parents {
-        if let StmtKind::With { items, .. } = &parent.node {
+    for parent in model.parents() {
+        if let Stmt::With(ast::StmtWith { items, .. }) = parent {
             for item in items {
-                if let ExprKind::Call { func, .. } = &item.context_expr.node {
-                    if checker
-                        .ctx
-                        .resolve_call_path(func)
-                        .map_or(false, |call_path| {
-                            call_path.as_slice() == ["contextlib", "ExitStack"]
-                        })
-                    {
+                if let Expr::Call(ast::ExprCall { func, .. }) = &item.context_expr {
+                    if model.resolve_call_path(func).map_or(false, |call_path| {
+                        call_path.as_slice() == ["contextlib", "ExitStack"]
+                    }) {
                         return true;
                     }
                 }
@@ -89,25 +106,25 @@ fn match_exit_stack(checker: &Checker) -> bool {
 }
 
 /// SIM115
-pub fn open_file_with_context_handler(checker: &mut Checker, func: &Expr) {
+pub(crate) fn open_file_with_context_handler(checker: &mut Checker, func: &Expr) {
     if checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(func)
         .map_or(false, |call_path| call_path.as_slice() == ["", "open"])
     {
-        if checker.ctx.is_builtin("open") {
+        if checker.semantic_model().is_builtin("open") {
             // Ex) `with open("foo.txt") as f: ...`
-            if matches!(checker.ctx.current_stmt().node, StmtKind::With { .. }) {
+            if matches!(checker.semantic_model().stmt(), Stmt::With(_)) {
                 return;
             }
 
             // Ex) `with contextlib.ExitStack() as exit_stack: ...`
-            if match_exit_stack(checker) {
+            if match_exit_stack(checker.semantic_model()) {
                 return;
             }
 
             // Ex) `with contextlib.AsyncExitStack() as exit_stack: ...`
-            if match_async_exit_stack(checker) {
+            if match_async_exit_stack(checker.semantic_model()) {
                 return;
             }
 
diff --git a/crates/ruff/src/rules/flake8_simplify/rules/reimplemented_builtin.rs b/crates/ruff/src/rules/flake8_simplify/rules/reimplemented_builtin.rs
index ab31839c26ab1..9b847fa91d60e 100644
--- a/crates/ruff/src/rules/flake8_simplify/rules/reimplemented_builtin.rs
+++ b/crates/ruff/src/rules/flake8_simplify/rules/reimplemented_builtin.rs
@@ -1,32 +1,33 @@
 use ruff_text_size::{TextRange, TextSize};
 use rustpython_parser::ast::{
-    Cmpop, Comprehension, Constant, Expr, ExprContext, ExprKind, Stmt, StmtKind, Unaryop,
+    self, Cmpop, Comprehension, Constant, Expr, ExprContext, Ranged, Stmt, Unaryop,
 };
-use unicode_width::UnicodeWidthStr;
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::{create_expr, create_stmt, unparse_stmt};
-use ruff_python_ast::source_code::Stylist;
+use ruff_python_ast::source_code::Generator;
 
 use crate::checkers::ast::Checker;
+use crate::line_width::LineWidth;
 use crate::registry::{AsRule, Rule};
 
 #[violation]
 pub struct ReimplementedBuiltin {
-    pub repl: String,
+    repl: String,
 }
 
-impl AlwaysAutofixableViolation for ReimplementedBuiltin {
+impl Violation for ReimplementedBuiltin {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         let ReimplementedBuiltin { repl } = self;
         format!("Use `{repl}` instead of `for` loop")
     }
 
-    fn autofix_title(&self) -> String {
+    fn autofix_title(&self) -> Option<String> {
         let ReimplementedBuiltin { repl } = self;
-        format!("Replace with `{repl}`")
+        Some(format!("Replace with `{repl}`"))
     }
 }
 
@@ -39,15 +40,15 @@ struct Loop<'a> {
     terminal: TextSize,
 }
 
-/// Extract the returned boolean values a `StmtKind::For` with an `else` body.
+/// Extract the returned boolean values a `Stmt::For` with an `else` body.
 fn return_values_for_else(stmt: &Stmt) -> Option<Loop> {
-    let StmtKind::For {
+    let Stmt::For(ast::StmtFor {
         body,
         target,
         iter,
         orelse,
         ..
-    } = &stmt.node else {
+    }) = stmt else {
         return None;
     };
 
@@ -59,11 +60,11 @@ fn return_values_for_else(stmt: &Stmt) -> Option<Loop> {
     if orelse.len() != 1 {
         return None;
     }
-    let StmtKind::If {
+    let Stmt::If(ast::StmtIf {
         body: nested_body,
         test: nested_test,
-        orelse: nested_orelse,
-    } = &body[0].node else {
+        orelse: nested_orelse, range: _,
+    }) = &body[0] else {
         return None;
     };
     if nested_body.len() != 1 {
@@ -72,24 +73,24 @@ fn return_values_for_else(stmt: &Stmt) -> Option<Loop> {
     if !nested_orelse.is_empty() {
         return None;
     }
-    let StmtKind::Return { value } = &nested_body[0].node else {
+    let Stmt::Return(ast::StmtReturn { value, range: _ }) = &nested_body[0] else {
         return None;
     };
     let Some(value) = value else {
         return None;
     };
-    let ExprKind::Constant { value: Constant::Bool(value), .. } = &value.node else {
+    let Expr::Constant(ast::ExprConstant { value: Constant::Bool(value), .. }) = value.as_ref() else {
         return None;
     };
 
     // The `else` block has to contain a single `return True` or `return False`.
-    let StmtKind::Return { value: next_value } = &orelse[0].node else {
+    let Stmt::Return(ast::StmtReturn { value: next_value, range: _ }) = &orelse[0] else {
         return None;
     };
     let Some(next_value) = next_value else {
         return None;
     };
-    let ExprKind::Constant { value: Constant::Bool(next_value), .. } = &next_value.node else {
+    let Expr::Constant(ast::ExprConstant { value: Constant::Bool(next_value), .. }) = next_value.as_ref() else {
         return None;
     };
 
@@ -103,16 +104,16 @@ fn return_values_for_else(stmt: &Stmt) -> Option<Loop> {
     })
 }
 
-/// Extract the returned boolean values from subsequent `StmtKind::For` and
-/// `StmtKind::Return` statements, or `None`.
+/// Extract the returned boolean values from subsequent `Stmt::For` and
+/// `Stmt::Return` statements, or `None`.
 fn return_values_for_siblings<'a>(stmt: &'a Stmt, sibling: &'a Stmt) -> Option<Loop<'a>> {
-    let StmtKind::For {
+    let Stmt::For(ast::StmtFor {
         body,
         target,
         iter,
         orelse,
         ..
-    } = &stmt.node else {
+    }) = stmt else {
         return None;
     };
 
@@ -124,11 +125,11 @@ fn return_values_for_siblings<'a>(stmt: &'a Stmt, sibling: &'a Stmt) -> Option<L
     if !orelse.is_empty() {
         return None;
     }
-    let StmtKind::If {
+    let Stmt::If(ast::StmtIf {
         body: nested_body,
         test: nested_test,
-        orelse: nested_orelse,
-    } = &body[0].node else {
+        orelse: nested_orelse, range: _,
+    }) = &body[0] else {
         return None;
     };
     if nested_body.len() != 1 {
@@ -137,24 +138,24 @@ fn return_values_for_siblings<'a>(stmt: &'a Stmt, sibling: &'a Stmt) -> Option<L
     if !nested_orelse.is_empty() {
         return None;
     }
-    let StmtKind::Return { value } = &nested_body[0].node else {
+    let Stmt::Return(ast::StmtReturn { value, range: _ }) = &nested_body[0] else {
         return None;
     };
     let Some(value) = value else {
         return None;
     };
-    let ExprKind::Constant { value: Constant::Bool(value), .. } = &value.node else {
+    let Expr::Constant(ast::ExprConstant { value: Constant::Bool(value), .. }) = value.as_ref() else {
         return None;
     };
 
     // The next statement has to be a `return True` or `return False`.
-    let StmtKind::Return { value: next_value } = &sibling.node else {
+    let Stmt::Return(ast::StmtReturn { value: next_value, range: _ }) = &sibling else {
         return None;
     };
     let Some(next_value) = next_value else {
         return None;
     };
-    let ExprKind::Constant { value: Constant::Bool(next_value), .. } = &next_value.node else {
+    let Expr::Constant(ast::ExprConstant { value: Constant::Bool(next_value), .. }) = next_value.as_ref() else {
         return None;
     };
 
@@ -169,32 +170,42 @@ fn return_values_for_siblings<'a>(stmt: &'a Stmt, sibling: &'a Stmt) -> Option<L
 }
 
 /// Generate a return statement for an `any` or `all` builtin comprehension.
-fn return_stmt(id: &str, test: &Expr, target: &Expr, iter: &Expr, stylist: &Stylist) -> String {
-    unparse_stmt(
-        &create_stmt(StmtKind::Return {
-            value: Some(Box::new(create_expr(ExprKind::Call {
-                func: Box::new(create_expr(ExprKind::Name {
-                    id: id.to_string(),
-                    ctx: ExprContext::Load,
-                })),
-                args: vec![create_expr(ExprKind::GeneratorExp {
-                    elt: Box::new(test.clone()),
-                    generators: vec![Comprehension {
-                        target: target.clone(),
-                        iter: iter.clone(),
-                        ifs: vec![],
-                        is_async: 0,
-                    }],
-                })],
-                keywords: vec![],
-            }))),
-        }),
-        stylist,
-    )
+fn return_stmt(id: &str, test: &Expr, target: &Expr, iter: &Expr, generator: Generator) -> String {
+    let node = ast::ExprGeneratorExp {
+        elt: Box::new(test.clone()),
+        generators: vec![Comprehension {
+            target: target.clone(),
+            iter: iter.clone(),
+            ifs: vec![],
+            is_async: false,
+            range: TextRange::default(),
+        }],
+        range: TextRange::default(),
+    };
+    let node1 = ast::ExprName {
+        id: id.into(),
+        ctx: ExprContext::Load,
+        range: TextRange::default(),
+    };
+    let node2 = ast::ExprCall {
+        func: Box::new(node1.into()),
+        args: vec![node.into()],
+        keywords: vec![],
+        range: TextRange::default(),
+    };
+    let node3 = ast::StmtReturn {
+        value: Some(Box::new(node2.into())),
+        range: TextRange::default(),
+    };
+    generator.stmt(&node3.into())
 }
 
 /// SIM110, SIM111
-pub fn convert_for_loop_to_any_all(checker: &mut Checker, stmt: &Stmt, sibling: Option<&Stmt>) {
+pub(crate) fn convert_for_loop_to_any_all(
+    checker: &mut Checker,
+    stmt: &Stmt,
+    sibling: Option<&Stmt>,
+) {
     // There are two cases to consider:
     // - `for` loop with an `else: return True` or `else: return False`.
     // - `for` loop followed by `return True` or `return False`
@@ -202,19 +213,20 @@ pub fn convert_for_loop_to_any_all(checker: &mut Checker, stmt: &Stmt, sibling:
         .or_else(|| sibling.and_then(|sibling| return_values_for_siblings(stmt, sibling)))
     {
         if loop_info.return_value && !loop_info.next_return_value {
-            if checker.settings.rules.enabled(Rule::ReimplementedBuiltin) {
+            if checker.enabled(Rule::ReimplementedBuiltin) {
                 let contents = return_stmt(
                     "any",
                     loop_info.test,
                     loop_info.target,
                     loop_info.iter,
-                    checker.stylist,
+                    checker.generator(),
                 );
 
                 // Don't flag if the resulting expression would exceed the maximum line length.
                 let line_start = checker.locator.line_start(stmt.start());
-                if checker.locator.contents()[TextRange::new(line_start, stmt.start())].width()
-                    + contents.width()
+                if LineWidth::new(checker.settings.tab_size)
+                    .add_str(&checker.locator.contents()[TextRange::new(line_start, stmt.start())])
+                    .add_str(&contents)
                     > checker.settings.line_length
                 {
                     return;
@@ -224,37 +236,42 @@ pub fn convert_for_loop_to_any_all(checker: &mut Checker, stmt: &Stmt, sibling:
                     ReimplementedBuiltin {
                         repl: contents.clone(),
                     },
-                    stmt.range(),
+                    TextRange::new(stmt.start(), loop_info.terminal),
                 );
-                if checker.patch(diagnostic.kind.rule()) && checker.ctx.is_builtin("any") {
-                    diagnostic.set_fix(Edit::replacement(
+                if checker.patch(diagnostic.kind.rule())
+                    && checker.semantic_model().is_builtin("any")
+                {
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::replacement(
                         contents,
                         stmt.start(),
                         loop_info.terminal,
-                    ));
+                    )));
                 }
                 checker.diagnostics.push(diagnostic);
             }
         }
 
         if !loop_info.return_value && loop_info.next_return_value {
-            if checker.settings.rules.enabled(Rule::ReimplementedBuiltin) {
+            if checker.enabled(Rule::ReimplementedBuiltin) {
                 // Invert the condition.
                 let test = {
-                    if let ExprKind::UnaryOp {
+                    if let Expr::UnaryOp(ast::ExprUnaryOp {
                         op: Unaryop::Not,
                         operand,
-                    } = &loop_info.test.node
+                        range: _,
+                    }) = &loop_info.test
                     {
                         *operand.clone()
-                    } else if let ExprKind::Compare {
+                    } else if let Expr::Compare(ast::ExprCompare {
                         left,
                         ops,
                         comparators,
-                    } = &loop_info.test.node
+                        range: _,
+                    }) = &loop_info.test
                     {
-                        if ops.len() == 1 && comparators.len() == 1 {
-                            let op = match &ops[0] {
+                        if let ([op], [comparator]) = (ops.as_slice(), comparators.as_slice()) {
+                            let op = match op {
                                 Cmpop::Eq => Cmpop::NotEq,
                                 Cmpop::NotEq => Cmpop::Eq,
                                 Cmpop::Lt => Cmpop::GtE,
@@ -266,22 +283,28 @@ pub fn convert_for_loop_to_any_all(checker: &mut Checker, stmt: &Stmt, sibling:
                                 Cmpop::In => Cmpop::NotIn,
                                 Cmpop::NotIn => Cmpop::In,
                             };
-                            create_expr(ExprKind::Compare {
+                            let node = ast::ExprCompare {
                                 left: left.clone(),
                                 ops: vec![op],
-                                comparators: vec![comparators[0].clone()],
-                            })
+                                comparators: vec![comparator.clone()],
+                                range: TextRange::default(),
+                            };
+                            node.into()
                         } else {
-                            create_expr(ExprKind::UnaryOp {
+                            let node = ast::ExprUnaryOp {
                                 op: Unaryop::Not,
                                 operand: Box::new(loop_info.test.clone()),
-                            })
+                                range: TextRange::default(),
+                            };
+                            node.into()
                         }
                     } else {
-                        create_expr(ExprKind::UnaryOp {
+                        let node = ast::ExprUnaryOp {
                             op: Unaryop::Not,
                             operand: Box::new(loop_info.test.clone()),
-                        })
+                            range: TextRange::default(),
+                        };
+                        node.into()
                     }
                 };
                 let contents = return_stmt(
@@ -289,13 +312,14 @@ pub fn convert_for_loop_to_any_all(checker: &mut Checker, stmt: &Stmt, sibling:
                     &test,
                     loop_info.target,
                     loop_info.iter,
-                    checker.stylist,
+                    checker.generator(),
                 );
 
                 // Don't flag if the resulting expression would exceed the maximum line length.
                 let line_start = checker.locator.line_start(stmt.start());
-                if checker.locator.contents()[TextRange::new(line_start, stmt.start())].width()
-                    + contents.width()
+                if LineWidth::new(checker.settings.tab_size)
+                    .add_str(&checker.locator.contents()[TextRange::new(line_start, stmt.start())])
+                    .add_str(&contents)
                     > checker.settings.line_length
                 {
                     return;
@@ -305,14 +329,17 @@ pub fn convert_for_loop_to_any_all(checker: &mut Checker, stmt: &Stmt, sibling:
                     ReimplementedBuiltin {
                         repl: contents.clone(),
                     },
-                    stmt.range(),
+                    TextRange::new(stmt.start(), loop_info.terminal),
                 );
-                if checker.patch(diagnostic.kind.rule()) && checker.ctx.is_builtin("all") {
-                    diagnostic.set_fix(Edit::replacement(
+                if checker.patch(diagnostic.kind.rule())
+                    && checker.semantic_model().is_builtin("all")
+                {
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::replacement(
                         contents,
                         stmt.start(),
                         loop_info.terminal,
-                    ));
+                    )));
                 }
                 checker.diagnostics.push(diagnostic);
             }
diff --git a/crates/ruff/src/rules/flake8_simplify/rules/return_in_try_except_finally.rs b/crates/ruff/src/rules/flake8_simplify/rules/return_in_try_except_finally.rs
index 159c104cd3e70..f966d4ab8ded1 100644
--- a/crates/ruff/src/rules/flake8_simplify/rules/return_in_try_except_finally.rs
+++ b/crates/ruff/src/rules/flake8_simplify/rules/return_in_try_except_finally.rs
@@ -1,28 +1,60 @@
-use rustpython_parser::ast::{Excepthandler, ExcepthandlerKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Excepthandler, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
 
+/// ## What it does
+/// Checks for `return` statements in `try`-`except` and `finally` blocks.
+///
+/// ## Why is this bad?
+/// The `return` statement in a `finally` block will always be executed, even if
+/// an exception is raised in the `try` or `except` block. This can lead to
+/// unexpected behavior.
+///
+/// ## Example
+/// ```python
+/// def squared(n):
+///     try:
+///         sqr = n**2
+///         return sqr
+///     except Exception:
+///         return "An exception occurred"
+///     finally:
+///         return -1  # Always returns -1.
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def squared(n):
+///     try:
+///         return_value = n**2
+///     except Exception:
+///         return_value = "An exception occurred"
+///     finally:
+///         return_value = -1
+///     return return_value
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/tutorial/errors.html#defining-clean-up-actions)
 #[violation]
 pub struct ReturnInTryExceptFinally;
 
 impl Violation for ReturnInTryExceptFinally {
     #[derive_message_formats]
     fn message(&self) -> String {
-        format!("Don't use `return` in `try`/`except` and `finally`")
+        format!("Don't use `return` in `try`-`except` and `finally`")
     }
 }
 
-fn find_return(stmts: &[rustpython_parser::ast::Stmt]) -> Option<&Stmt> {
-    stmts
-        .iter()
-        .find(|stmt| matches!(stmt.node, StmtKind::Return { .. }))
+fn find_return(stmts: &[Stmt]) -> Option<&Stmt> {
+    stmts.iter().find(|stmt| stmt.is_return_stmt())
 }
 
 /// SIM107
-pub fn return_in_try_except_finally(
+pub(crate) fn return_in_try_except_finally(
     checker: &mut Checker,
     body: &[Stmt],
     handlers: &[Excepthandler],
@@ -30,12 +62,12 @@ pub fn return_in_try_except_finally(
 ) {
     let try_has_return = find_return(body).is_some();
     let except_has_return = handlers.iter().any(|handler| {
-        let ExcepthandlerKind::ExceptHandler { body, .. } = &handler.node;
+        let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler { body, .. }) = handler;
         find_return(body).is_some()
     });
 
-    if let Some(finally_return) = find_return(finalbody) {
-        if try_has_return || except_has_return {
+    if try_has_return || except_has_return {
+        if let Some(finally_return) = find_return(finalbody) {
             checker.diagnostics.push(Diagnostic::new(
                 ReturnInTryExceptFinally,
                 finally_return.range(),
diff --git a/crates/ruff/src/rules/flake8_simplify/rules/suppressible_exception.rs b/crates/ruff/src/rules/flake8_simplify/rules/suppressible_exception.rs
index faea06b192386..78bfd983dae29 100644
--- a/crates/ruff/src/rules/flake8_simplify/rules/suppressible_exception.rs
+++ b/crates/ruff/src/rules/flake8_simplify/rules/suppressible_exception.rs
@@ -1,37 +1,38 @@
 use ruff_text_size::{TextLen, TextRange};
-use rustpython_parser::ast::{
-    Constant, Excepthandler, ExcepthandlerKind, ExprKind, Located, Stmt, StmtKind,
-};
+use rustpython_parser::ast::{self, Constant, Excepthandler, Expr, Ranged, Stmt};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::call_path::compose_call_path;
 use ruff_python_ast::helpers;
+use ruff_python_ast::helpers::has_comments;
 
-use crate::autofix::actions::get_or_import_symbol;
 use crate::checkers::ast::Checker;
+use crate::importer::ImportRequest;
 use crate::registry::AsRule;
 
 #[violation]
 pub struct SuppressibleException {
-    pub exception: String,
+    exception: String,
 }
 
-impl AlwaysAutofixableViolation for SuppressibleException {
+impl Violation for SuppressibleException {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         let SuppressibleException { exception } = self;
         format!("Use `contextlib.suppress({exception})` instead of `try`-`except`-`pass`")
     }
 
-    fn autofix_title(&self) -> String {
+    fn autofix_title(&self) -> Option<String> {
         let SuppressibleException { exception } = self;
-        format!("Replace with `contextlib.suppress({exception})`")
+        Some(format!("Replace with `contextlib.suppress({exception})`"))
     }
 }
 
 /// SIM105
-pub fn suppressible_exception(
+pub(crate) fn suppressible_exception(
     checker: &mut Checker,
     stmt: &Stmt,
     try_body: &[Stmt],
@@ -41,18 +42,15 @@ pub fn suppressible_exception(
 ) {
     if !matches!(
         try_body,
-        [Located {
-            node: StmtKind::Delete { .. }
-                | StmtKind::Assign { .. }
-                | StmtKind::AugAssign { .. }
-                | StmtKind::AnnAssign { .. }
-                | StmtKind::Assert { .. }
-                | StmtKind::Import { .. }
-                | StmtKind::ImportFrom { .. }
-                | StmtKind::Expr { .. }
-                | StmtKind::Pass,
-            ..
-        }]
+        [Stmt::Delete(_)
+            | Stmt::Assign(_)
+            | Stmt::AugAssign(_)
+            | Stmt::AnnAssign(_)
+            | Stmt::Assert(_)
+            | Stmt::Import(_)
+            | Stmt::ImportFrom(_)
+            | Stmt::Expr(_)
+            | Stmt::Pass(_)]
     ) || handlers.len() != 1
         || !orelse.is_empty()
         || !finalbody.is_empty()
@@ -60,17 +58,14 @@ pub fn suppressible_exception(
         return;
     }
     let handler = &handlers[0];
-    let ExcepthandlerKind::ExceptHandler { body, .. } = &handler.node;
+    let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler { body, .. }) = handler;
     if body.len() == 1 {
-        let node = &body[0].node;
-        if matches!(node, StmtKind::Pass)
+        let node = &body[0];
+        if node.is_pass_stmt()
             || (matches!(
             node,
-            StmtKind::Expr {
-                value,
-                    ..
-                }
-            if matches!(**value, Located { node: ExprKind::Constant { value: Constant::Ellipsis, .. }, ..})
+            Stmt::Expr(ast::StmtExpr { value, range: _ })
+            if matches!(**value, Expr::Constant(ast::ExprConstant { value: Constant::Ellipsis, .. }))
             ))
         {
             let handler_names: Vec<String> = helpers::extract_handled_exceptions(handlers)
@@ -82,32 +77,35 @@ pub fn suppressible_exception(
             } else {
                 handler_names.join(", ")
             };
+
             let mut diagnostic = Diagnostic::new(
                 SuppressibleException {
                     exception: exception.clone(),
                 },
                 stmt.range(),
             );
-
             if checker.patch(diagnostic.kind.rule()) {
-                diagnostic.try_set_fix(|| {
-                    let (import_edit, binding) = get_or_import_symbol(
-                        "contextlib",
-                        "suppress",
-                        &checker.ctx,
-                        &checker.importer,
-                        checker.locator,
-                    )?;
-                    let replace_try = Edit::range_replacement(
-                        format!("with {binding}({exception})"),
-                        TextRange::at(stmt.start(), "try".text_len()),
-                    );
-                    let handler_line_begin = checker.locator.line_start(handler.start());
-                    let remove_handler = Edit::deletion(handler_line_begin, handler.end());
-                    Ok(Fix::from_iter([import_edit, replace_try, remove_handler]))
-                });
+                if !has_comments(stmt, checker.locator) {
+                    diagnostic.try_set_fix(|| {
+                        let (import_edit, binding) = checker.importer.get_or_import_symbol(
+                            &ImportRequest::import("contextlib", "suppress"),
+                            stmt.start(),
+                            checker.semantic_model(),
+                        )?;
+                        let replace_try = Edit::range_replacement(
+                            format!("with {binding}({exception})"),
+                            TextRange::at(stmt.start(), "try".text_len()),
+                        );
+                        let handler_line_begin = checker.locator.line_start(handler.start());
+                        let remove_handler = Edit::deletion(handler_line_begin, handler.end());
+                        #[allow(deprecated)]
+                        Ok(Fix::unspecified_edits(
+                            import_edit,
+                            [replace_try, remove_handler],
+                        ))
+                    });
+                }
             }
-
             checker.diagnostics.push(diagnostic);
         }
     }
diff --git a/crates/ruff/src/rules/flake8_simplify/rules/yoda_conditions.rs b/crates/ruff/src/rules/flake8_simplify/rules/yoda_conditions.rs
index f475588905011..b790019576499 100644
--- a/crates/ruff/src/rules/flake8_simplify/rules/yoda_conditions.rs
+++ b/crates/ruff/src/rules/flake8_simplify/rules/yoda_conditions.rs
@@ -1,8 +1,9 @@
 use anyhow::Result;
-use libcst_native::{Codegen, CodegenState, CompOp};
-use rustpython_parser::ast::{Cmpop, Expr, ExprKind, Unaryop};
+use libcst_native::CompOp;
+use rustpython_parser::ast::{self, Cmpop, Expr, Ranged, Unaryop};
 
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Violation};
+use crate::autofix::codemods::CodegenStylist;
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::{Locator, Stylist};
 use ruff_python_stdlib::str::{self};
@@ -29,30 +30,26 @@ impl Violation for YodaConditions {
         }
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
+    fn autofix_title(&self) -> Option<String> {
         let YodaConditions { suggestion } = self;
-        if suggestion.is_some() {
-            Some(|YodaConditions { suggestion }| {
-                let suggestion = suggestion.as_ref().unwrap();
-                format!("Replace Yoda condition with `{suggestion}`")
-            })
-        } else {
-            None
-        }
+        suggestion
+            .as_ref()
+            .map(|suggestion| format!("Replace Yoda condition with `{suggestion}`"))
     }
 }
 
 /// Return `true` if an [`Expr`] is a constant or a constant-like name.
 fn is_constant_like(expr: &Expr) -> bool {
-    match &expr.node {
-        ExprKind::Attribute { attr, .. } => str::is_upper(attr),
-        ExprKind::Constant { .. } => true,
-        ExprKind::Tuple { elts, .. } => elts.iter().all(is_constant_like),
-        ExprKind::Name { id, .. } => str::is_upper(id),
-        ExprKind::UnaryOp {
+    match expr {
+        Expr::Attribute(ast::ExprAttribute { attr, .. }) => str::is_upper(attr),
+        Expr::Constant(_) => true,
+        Expr::Tuple(ast::ExprTuple { elts, .. }) => elts.iter().all(is_constant_like),
+        Expr::Name(ast::ExprName { id, .. }) => str::is_upper(id),
+        Expr::UnaryOp(ast::ExprUnaryOp {
             op: Unaryop::UAdd | Unaryop::USub | Unaryop::Invert,
             operand,
-        } => matches!(operand.node, ExprKind::Constant { .. }),
+            range: _,
+        }) => operand.is_constant_expr(),
         _ => false,
     }
 }
@@ -63,7 +60,7 @@ fn reverse_comparison(expr: &Expr, locator: &Locator, stylist: &Stylist) -> Resu
     let contents = locator.slice(range);
 
     let mut expression = match_expression(contents)?;
-    let mut comparison = match_comparison(&mut expression)?;
+    let comparison = match_comparison(&mut expression)?;
 
     let left = (*comparison.left).clone();
 
@@ -121,17 +118,11 @@ fn reverse_comparison(expr: &Expr, locator: &Locator, stylist: &Stylist) -> Resu
         _ => panic!("Expected comparison operator"),
     };
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    expression.codegen(&mut state);
-    Ok(state.to_string())
+    Ok(expression.codegen_stylist(stylist))
 }
 
 /// SIM300
-pub fn yoda_conditions(
+pub(crate) fn yoda_conditions(
     checker: &mut Checker,
     expr: &Expr,
     left: &Expr,
@@ -161,7 +152,11 @@ pub fn yoda_conditions(
             expr.range(),
         );
         if checker.patch(diagnostic.kind.rule()) {
-            diagnostic.set_fix(Edit::range_replacement(suggestion, expr.range()));
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                suggestion,
+                expr.range(),
+            )));
         }
         checker.diagnostics.push(diagnostic);
     } else {
diff --git a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM101_SIM101.py.snap b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM101_SIM101.py.snap
index 64414aa6ffcc0..94b53c1d3260a 100644
--- a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM101_SIM101.py.snap
+++ b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM101_SIM101.py.snap
@@ -144,5 +144,6 @@ SIM101.py:22:4: SIM101 Multiple `isinstance` calls for expression, merge into a
    |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SIM101
 25 |     pass
    |
+   = help: Merge `isinstance` calls
 
 
diff --git a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM102_SIM102.py.snap b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM102_SIM102.py.snap
index 4842f290f6cba..89c1a56862fdc 100644
--- a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM102_SIM102.py.snap
+++ b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM102_SIM102.py.snap
@@ -81,6 +81,7 @@ SIM102.py:20:1: SIM102 Use a single `if` statement instead of nested `if` statem
    | |_________^ SIM102
 24 |           c
    |
+   = help: Combine `if` statements using `and`
 
 SIM102.py:26:1: SIM102 [*] Use a single `if` statement instead of nested `if` statements
    |
@@ -210,14 +211,14 @@ SIM102.py:83:5: SIM102 [*] Use a single `if` statement instead of nested `if` st
    85 |+    )):
    86 |+        print("Bad module!")
 88 87 | 
-89 88 | # SIM102
-90 89 | if node.module:
+89 88 | # SIM102 (auto-fixable)
+90 89 | if node.module012345678:
 
 SIM102.py:90:1: SIM102 [*] Use a single `if` statement instead of nested `if` statements
    |
-90 |   # SIM102
-91 | / if node.module:
-92 | |     if node.module == "multiprocessing" or node.module.startswith(
+90 |   # SIM102 (auto-fixable)
+91 | / if node.module012345678:
+92 | |     if node.module == "multiprocß9💣2ℝ" or node.module.startswith(
 93 | |         "multiprocessing."
 94 | |     ):
    | |______^ SIM102
@@ -228,44 +229,56 @@ SIM102.py:90:1: SIM102 [*] Use a single `if` statement instead of nested `if` st
 ℹ Suggested fix
 87 87 |             print("Bad module!")
 88 88 | 
-89 89 | # SIM102
-90    |-if node.module:
-91    |-    if node.module == "multiprocessing" or node.module.startswith(
+89 89 | # SIM102 (auto-fixable)
+90    |-if node.module012345678:
+91    |-    if node.module == "multiprocß9💣2ℝ" or node.module.startswith(
 92    |-        "multiprocessing."
 93    |-    ):
 94    |-        print("Bad module!")
-   90 |+if node.module and (node.module == "multiprocessing" or node.module.startswith(
+   90 |+if node.module012345678 and (node.module == "multiprocß9💣2ℝ" or node.module.startswith(
    91 |+    "multiprocessing."
    92 |+)):
    93 |+    print("Bad module!")
 95 94 | 
-96 95 | 
-97 96 | # OK
+96 95 | # SIM102 (not auto-fixable)
+97 96 | if node.module0123456789:
+
+SIM102.py:97:1: SIM102 Use a single `if` statement instead of nested `if` statements
+    |
+ 97 |   # SIM102 (not auto-fixable)
+ 98 | / if node.module0123456789:
+ 99 | |     if node.module == "multiprocß9💣2ℝ" or node.module.startswith(
+100 | |         "multiprocessing."
+101 | |     ):
+    | |______^ SIM102
+102 |           print("Bad module!")
+    |
+    = help: Combine `if` statements using `and`
 
-SIM102.py:117:5: SIM102 [*] Use a single `if` statement instead of nested `if` statements
+SIM102.py:124:5: SIM102 [*] Use a single `if` statement instead of nested `if` statements
     |
-117 |   if a:
-118 |       # SIM 102
-119 |       if b:
+124 |   if a:
+125 |       # SIM 102
+126 |       if b:
     |  _____^
-120 | |         if c:
+127 | |         if c:
     | |_____________^ SIM102
-121 |               print("foo")
-122 |   else:
+128 |               print("foo")
+129 |   else:
     |
     = help: Combine `if` statements using `and`
 
 ℹ Suggested fix
-114 114 | # OK
-115 115 | if a:
-116 116 |     # SIM 102
-117     |-    if b:
-118     |-        if c:
-119     |-            print("foo")
-    117 |+    if b and c:
-    118 |+        print("foo")
-120 119 | else:
-121 120 |     print("bar")
-122 121 | 
+121 121 | # OK
+122 122 | if a:
+123 123 |     # SIM 102
+124     |-    if b:
+125     |-        if c:
+126     |-            print("foo")
+    124 |+    if b and c:
+    125 |+        print("foo")
+127 126 | else:
+128 127 |     print("bar")
+129 128 | 
 
 
diff --git a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM103_SIM103.py.snap b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM103_SIM103.py.snap
index b05d2fb6f780f..0ca6d59b5ab40 100644
--- a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM103_SIM103.py.snap
+++ b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM103_SIM103.py.snap
@@ -115,6 +115,7 @@ SIM103.py:57:5: SIM103 Return the condition `a` directly
 62 | |         return True
    | |___________________^ SIM103
    |
+   = help: Replace with `return a`
 
 SIM103.py:83:5: SIM103 Return the condition `a` directly
    |
@@ -127,5 +128,6 @@ SIM103.py:83:5: SIM103 Return the condition `a` directly
 88 | |         return False
    | |____________________^ SIM103
    |
+   = help: Replace with `return a`
 
 
diff --git a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM105_SIM105.py.snap b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM105_SIM105.py.snap
deleted file mode 100644
index a04e2176a6d46..0000000000000
--- a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM105_SIM105.py.snap
+++ /dev/null
@@ -1,170 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_simplify/mod.rs
----
-SIM105.py:4:1: SIM105 [*] Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass`
-   |
- 4 |       pass
- 5 |   
- 6 | / try:
- 7 | |     foo()
- 8 | | except ValueError:  # SIM105
- 9 | |     pass
-   | |________^ SIM105
-10 |   
-11 |   try:
-   |
-   = help: Replace with `contextlib.suppress(ValueError)`
-
-ℹ Suggested fix
-  1 |+import contextlib
-1 2 | def foo():
-2 3 |     pass
-3 4 | 
-4   |-try:
-  5 |+with contextlib.suppress(ValueError):
-5 6 |     foo()
-6   |-except ValueError:  # SIM105
-7   |-    pass
-8 7 | 
-  8 |+
-9 9 | try:
-10 10 |     foo()
-11 11 | except (ValueError, OSError):  # SIM105
-
-SIM105.py:9:1: SIM105 [*] Use `contextlib.suppress(ValueError, OSError)` instead of `try`-`except`-`pass`
-   |
- 9 |       pass
-10 |   
-11 | / try:
-12 | |     foo()
-13 | | except (ValueError, OSError):  # SIM105
-14 | |     pass
-   | |________^ SIM105
-15 |   
-16 |   try:
-   |
-   = help: Replace with `contextlib.suppress(ValueError, OSError)`
-
-ℹ Suggested fix
-   1  |+import contextlib
-1  2  | def foo():
-2  3  |     pass
-3  4  | 
---------------------------------------------------------------------------------
-6  7  | except ValueError:  # SIM105
-7  8  |     pass
-8  9  | 
-9     |-try:
-   10 |+with contextlib.suppress(ValueError, OSError):
-10 11 |     foo()
-11    |-except (ValueError, OSError):  # SIM105
-12    |-    pass
-13 12 | 
-   13 |+
-14 14 | try:
-15 15 |     foo()
-16 16 | except:  # SIM105
-
-SIM105.py:14:1: SIM105 [*] Use `contextlib.suppress(Exception)` instead of `try`-`except`-`pass`
-   |
-14 |       pass
-15 |   
-16 | / try:
-17 | |     foo()
-18 | | except:  # SIM105
-19 | |     pass
-   | |________^ SIM105
-20 |   
-21 |   try:
-   |
-   = help: Replace with `contextlib.suppress(Exception)`
-
-ℹ Suggested fix
-   1  |+import contextlib
-1  2  | def foo():
-2  3  |     pass
-3  4  | 
---------------------------------------------------------------------------------
-11 12 | except (ValueError, OSError):  # SIM105
-12 13 |     pass
-13 14 | 
-14    |-try:
-   15 |+with contextlib.suppress(Exception):
-15 16 |     foo()
-16    |-except:  # SIM105
-17    |-    pass
-18 17 | 
-   18 |+
-19 19 | try:
-20 20 |     foo()
-21 21 | except (a.Error, b.Error):  # SIM105
-
-SIM105.py:19:1: SIM105 [*] Use `contextlib.suppress(a.Error, b.Error)` instead of `try`-`except`-`pass`
-   |
-19 |       pass
-20 |   
-21 | / try:
-22 | |     foo()
-23 | | except (a.Error, b.Error):  # SIM105
-24 | |     pass
-   | |________^ SIM105
-25 |   
-26 |   try:
-   |
-   = help: Replace with `contextlib.suppress(a.Error, b.Error)`
-
-ℹ Suggested fix
-   1  |+import contextlib
-1  2  | def foo():
-2  3  |     pass
-3  4  | 
---------------------------------------------------------------------------------
-16 17 | except:  # SIM105
-17 18 |     pass
-18 19 | 
-19    |-try:
-   20 |+with contextlib.suppress(a.Error, b.Error):
-20 21 |     foo()
-21    |-except (a.Error, b.Error):  # SIM105
-22    |-    pass
-23 22 | 
-   23 |+
-24 24 | try:
-25 25 |     foo()
-26 26 | except ValueError:
-
-SIM105.py:64:5: SIM105 [*] Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass`
-   |
-64 |   def with_ellipsis():
-65 |       try:
-   |  _____^
-66 | |         foo()
-67 | |     except ValueError:
-68 | |         ...
-   | |___________^ SIM105
-69 |   
-70 |   def with_ellipsis_and_return():
-   |
-   = help: Replace with `contextlib.suppress(ValueError)`
-
-ℹ Suggested fix
-   1  |+import contextlib
-1  2  | def foo():
-2  3  |     pass
-3  4  | 
---------------------------------------------------------------------------------
-61 62 |         pass
-62 63 | 
-63 64 | def with_ellipsis():
-64    |-    try:
-   65 |+    with contextlib.suppress(ValueError):
-65 66 |         foo()
-66    |-    except ValueError:
-67    |-        ...
-68 67 | 
-   68 |+
-69 69 | def with_ellipsis_and_return():
-70 70 |     try:
-71 71 |         return foo()
-
-
diff --git a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM105_SIM105_0.py.snap b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM105_SIM105_0.py.snap
new file mode 100644
index 0000000000000..4ea22d880517b
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM105_SIM105_0.py.snap
@@ -0,0 +1,180 @@
+---
+source: crates/ruff/src/rules/flake8_simplify/mod.rs
+---
+SIM105_0.py:6:1: SIM105 [*] Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass`
+   |
+ 6 |   # SIM105
+ 7 | / try:
+ 8 | |     foo()
+ 9 | | except ValueError:
+10 | |     pass
+   | |________^ SIM105
+11 |   
+12 |   # SIM105
+   |
+   = help: Replace with `contextlib.suppress(ValueError)`
+
+ℹ Suggested fix
+   1  |+import contextlib
+1  2  | def foo():
+2  3  |     pass
+3  4  | 
+4  5  | 
+5  6  | # SIM105
+6     |-try:
+   7  |+with contextlib.suppress(ValueError):
+7  8  |     foo()
+8     |-except ValueError:
+9     |-    pass
+10 9  | 
+   10 |+
+11 11 | # SIM105
+12 12 | try:
+13 13 |     foo()
+
+SIM105_0.py:12:1: SIM105 [*] Use `contextlib.suppress(ValueError, OSError)` instead of `try`-`except`-`pass`
+   |
+12 |   # SIM105
+13 | / try:
+14 | |     foo()
+15 | | except (ValueError, OSError):
+16 | |     pass
+   | |________^ SIM105
+17 |   
+18 |   # SIM105
+   |
+   = help: Replace with `contextlib.suppress(ValueError, OSError)`
+
+ℹ Suggested fix
+   1  |+import contextlib
+1  2  | def foo():
+2  3  |     pass
+3  4  | 
+--------------------------------------------------------------------------------
+9  10 |     pass
+10 11 | 
+11 12 | # SIM105
+12    |-try:
+   13 |+with contextlib.suppress(ValueError, OSError):
+13 14 |     foo()
+14    |-except (ValueError, OSError):
+15    |-    pass
+16 15 | 
+   16 |+
+17 17 | # SIM105
+18 18 | try:
+19 19 |     foo()
+
+SIM105_0.py:18:1: SIM105 [*] Use `contextlib.suppress(Exception)` instead of `try`-`except`-`pass`
+   |
+18 |   # SIM105
+19 | / try:
+20 | |     foo()
+21 | | except:
+22 | |     pass
+   | |________^ SIM105
+23 |   
+24 |   # SIM105
+   |
+   = help: Replace with `contextlib.suppress(Exception)`
+
+ℹ Suggested fix
+   1  |+import contextlib
+1  2  | def foo():
+2  3  |     pass
+3  4  | 
+--------------------------------------------------------------------------------
+15 16 |     pass
+16 17 | 
+17 18 | # SIM105
+18    |-try:
+   19 |+with contextlib.suppress(Exception):
+19 20 |     foo()
+20    |-except:
+21    |-    pass
+22 21 | 
+   22 |+
+23 23 | # SIM105
+24 24 | try:
+25 25 |     foo()
+
+SIM105_0.py:24:1: SIM105 [*] Use `contextlib.suppress(a.Error, b.Error)` instead of `try`-`except`-`pass`
+   |
+24 |   # SIM105
+25 | / try:
+26 | |     foo()
+27 | | except (a.Error, b.Error):
+28 | |     pass
+   | |________^ SIM105
+29 |   
+30 |   # OK
+   |
+   = help: Replace with `contextlib.suppress(a.Error, b.Error)`
+
+ℹ Suggested fix
+   1  |+import contextlib
+1  2  | def foo():
+2  3  |     pass
+3  4  | 
+--------------------------------------------------------------------------------
+21 22 |     pass
+22 23 | 
+23 24 | # SIM105
+24    |-try:
+   25 |+with contextlib.suppress(a.Error, b.Error):
+25 26 |     foo()
+26    |-except (a.Error, b.Error):
+27    |-    pass
+28 27 | 
+   28 |+
+29 29 | # OK
+30 30 | try:
+31 31 |     foo()
+
+SIM105_0.py:78:5: SIM105 [*] Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass`
+   |
+78 |   def with_ellipsis():
+79 |       # OK
+80 |       try:
+   |  _____^
+81 | |         foo()
+82 | |     except ValueError:
+83 | |         ...
+   | |___________^ SIM105
+   |
+   = help: Replace with `contextlib.suppress(ValueError)`
+
+ℹ Suggested fix
+   1  |+import contextlib
+1  2  | def foo():
+2  3  |     pass
+3  4  | 
+--------------------------------------------------------------------------------
+75 76 | 
+76 77 | def with_ellipsis():
+77 78 |     # OK
+78    |-    try:
+   79 |+    with contextlib.suppress(ValueError):
+79 80 |         foo()
+80    |-    except ValueError:
+81    |-        ...
+82 81 | 
+83 82 | 
+   83 |+
+84 84 | def with_ellipsis_and_return():
+85 85 |     # OK
+86 86 |     try:
+
+SIM105_0.py:93:5: SIM105 Use `contextlib.suppress(ValueError, OSError)` instead of `try`-`except`-`pass`
+   |
+93 |   def with_comment():
+94 |       try:
+   |  _____^
+95 | |         foo()
+96 | |     except (ValueError, OSError):
+97 | |         pass  # Trailing comment.
+   | |____________^ SIM105
+   |
+   = help: Replace with `contextlib.suppress(ValueError, OSError)`
+
+
diff --git a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM105_SIM105_1.py.snap b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM105_SIM105_1.py.snap
index fd36496c68afe..47ee41befb58d 100644
--- a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM105_SIM105_1.py.snap
+++ b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM105_SIM105_1.py.snap
@@ -1,13 +1,12 @@
 ---
 source: crates/ruff/src/rules/flake8_simplify/mod.rs
 ---
-SIM105_1.py:4:1: SIM105 [*] Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass`
+SIM105_1.py:5:1: SIM105 [*] Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass`
   |
-4 |   import math
-5 |   
+5 |   # SIM105
 6 | / try:
 7 | |     math.sqrt(-1)
-8 | | except ValueError:  # SIM105
+8 | | except ValueError:
 9 | |     pass
   | |________^ SIM105
   |
@@ -18,11 +17,12 @@ SIM105_1.py:4:1: SIM105 [*] Use `contextlib.suppress(ValueError)` instead of `tr
 2 2 | import math
   3 |+import contextlib
 3 4 | 
-4   |-try:
-  5 |+with contextlib.suppress(ValueError):
-5 6 |     math.sqrt(-1)
-6   |-except ValueError:  # SIM105
-7   |-    pass
-  7 |+
+4 5 | # SIM105
+5   |-try:
+  6 |+with contextlib.suppress(ValueError):
+6 7 |     math.sqrt(-1)
+7   |-except ValueError:
+8   |-    pass
+  8 |+
 
 
diff --git a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM105_SIM105_2.py.snap b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM105_SIM105_2.py.snap
index 0648bce4683f4..62664a5a3c984 100644
--- a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM105_SIM105_2.py.snap
+++ b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM105_SIM105_2.py.snap
@@ -1,25 +1,26 @@
 ---
 source: crates/ruff/src/rules/flake8_simplify/mod.rs
 ---
-SIM105_2.py:9:1: SIM105 [*] Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass`
+SIM105_2.py:10:1: SIM105 [*] Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass`
    |
- 9 | / try:
-10 | |     foo()
-11 | | except ValueError:
-12 | |     pass
+10 |   # SIM105
+11 | / try:
+12 | |     foo()
+13 | | except ValueError:
+14 | |     pass
    | |________^ SIM105
    |
    = help: Replace with `contextlib.suppress(ValueError)`
 
 ℹ Suggested fix
-6  6  |     pass
 7  7  | 
 8  8  | 
-9     |-try:
-   9  |+with contextlib.suppress(ValueError):
-10 10 |     foo()
-11    |-except ValueError:
-12    |-    pass
-   11 |+
+9  9  | # SIM105
+10    |-try:
+   10 |+with contextlib.suppress(ValueError):
+11 11 |     foo()
+12    |-except ValueError:
+13    |-    pass
+   12 |+
 
 
diff --git a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM105_SIM105_3.py.snap b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM105_SIM105_3.py.snap
new file mode 100644
index 0000000000000..bdf99587df2d1
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM105_SIM105_3.py.snap
@@ -0,0 +1,17 @@
+---
+source: crates/ruff/src/rules/flake8_simplify/mod.rs
+---
+SIM105_3.py:10:5: SIM105 Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass`
+   |
+10 |   def bar():
+11 |       # SIM105
+12 |       try:
+   |  _____^
+13 | |         foo()
+14 | |     except ValueError:
+15 | |         pass
+   | |____________^ SIM105
+   |
+   = help: Replace with `contextlib.suppress(ValueError)`
+
+
diff --git a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM107_SIM107.py.snap b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM107_SIM107.py.snap
index 8b56f2eda861a..2592854591c17 100644
--- a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM107_SIM107.py.snap
+++ b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM107_SIM107.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_simplify/mod.rs
 ---
-SIM107.py:9:9: SIM107 Don't use `return` in `try`/`except` and `finally`
+SIM107.py:9:9: SIM107 Don't use `return` in `try`-`except` and `finally`
    |
  9 |         return "2"
 10 |     finally:
diff --git a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM108_SIM108.py.snap b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM108_SIM108.py.snap
index f5880f24ad637..91a83a03c6394 100644
--- a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM108_SIM108.py.snap
+++ b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM108_SIM108.py.snap
@@ -36,57 +36,61 @@ SIM108.py:58:1: SIM108 Use ternary operator `abc = x if x > 0 else -x` instead o
 64 | |     abc = -x
    | |____________^ SIM108
    |
+   = help: Replace `if`-`else`-block with `abc = x if x > 0 else -x`
 
-SIM108.py:82:1: SIM108 [*] Use ternary operator `b = cccccccccccccccccccccccccccccccccccc if a else ddddddddddddddddddddddddddddddddddddd` instead of `if`-`else`-block
+SIM108.py:82:1: SIM108 [*] Use ternary operator `b = "cccccccccccccccccccccccccccccccccß" if a else "ddddddddddddddddddddddddddddddddd💣"` instead of `if`-`else`-block
    |
 82 |   # SIM108
 83 | / if a:
-84 | |     b = cccccccccccccccccccccccccccccccccccc
+84 | |     b = "cccccccccccccccccccccccccccccccccß"
 85 | | else:
-86 | |     b = ddddddddddddddddddddddddddddddddddddd
+86 | |     b = "ddddddddddddddddddddddddddddddddd💣"
    | |_____________________________________________^ SIM108
    |
-   = help: Replace `if`-`else`-block with `b = cccccccccccccccccccccccccccccccccccc if a else ddddddddddddddddddddddddddddddddddddd`
+   = help: Replace `if`-`else`-block with `b = "cccccccccccccccccccccccccccccccccß" if a else "ddddddddddddddddddddddddddddddddd💣"`
 
 ℹ Suggested fix
 79 79 | 
 80 80 | 
 81 81 | # SIM108
 82    |-if a:
-83    |-    b = cccccccccccccccccccccccccccccccccccc
+83    |-    b = "cccccccccccccccccccccccccccccccccß"
 84    |-else:
-85    |-    b = ddddddddddddddddddddddddddddddddddddd
-   82 |+b = cccccccccccccccccccccccccccccccccccc if a else ddddddddddddddddddddddddddddddddddddd
+85    |-    b = "ddddddddddddddddddddddddddddddddd💣"
+   82 |+b = "cccccccccccccccccccccccccccccccccß" if a else "ddddddddddddddddddddddddddddddddd💣"
 86 83 | 
 87 84 | 
 88 85 | # OK (too long)
 
-SIM108.py:97:1: SIM108 Use ternary operator `exitcode = 0 if True else 1` instead of `if`-`else`-block
+SIM108.py:105:1: SIM108 Use ternary operator `exitcode = 0 if True else 1` instead of `if`-`else`-block
     |
- 97 |   # SIM108 (without fix due to trailing comment)
- 98 | / if True:
- 99 | |     exitcode = 0
-100 | | else:
-101 | |     exitcode = 1  # Trailing comment
+105 |   # SIM108 (without fix due to trailing comment)
+106 | / if True:
+107 | |     exitcode = 0
+108 | | else:
+109 | |     exitcode = 1  # Trailing comment
     | |________________^ SIM108
     |
+    = help: Replace `if`-`else`-block with `exitcode = 0 if True else 1`
 
-SIM108.py:104:1: SIM108 Use ternary operator `x = 3 if True else 5` instead of `if`-`else`-block
+SIM108.py:112:1: SIM108 Use ternary operator `x = 3 if True else 5` instead of `if`-`else`-block
     |
-104 |   # SIM108
-105 | / if True: x = 3  # Foo
-106 | | else: x = 5
+112 |   # SIM108
+113 | / if True: x = 3  # Foo
+114 | | else: x = 5
     | |___________^ SIM108
     |
+    = help: Replace `if`-`else`-block with `x = 3 if True else 5`
 
-SIM108.py:109:1: SIM108 Use ternary operator `x = 3 if True else 5` instead of `if`-`else`-block
+SIM108.py:117:1: SIM108 Use ternary operator `x = 3 if True else 5` instead of `if`-`else`-block
     |
-109 |   # SIM108
-110 | / if True:  # Foo
-111 | |     x = 3
-112 | | else:
-113 | |     x = 5
+117 |   # SIM108
+118 | / if True:  # Foo
+119 | |     x = 3
+120 | | else:
+121 | |     x = 5
     | |_________^ SIM108
     |
+    = help: Replace `if`-`else`-block with `x = 3 if True else 5`
 
 
diff --git a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM110_SIM110.py.snap b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM110_SIM110.py.snap
index 08c0ee517ad95..c23a745c0d3d8 100644
--- a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM110_SIM110.py.snap
+++ b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM110_SIM110.py.snap
@@ -9,8 +9,8 @@ SIM110.py:3:5: SIM110 [*] Use `return any(check(x) for x in iterable)` instead o
   |  _____^
 6 | |         if check(x):
 7 | |             return True
-  | |_______________________^ SIM110
-8 |       return False
+8 | |     return False
+  | |________________^ SIM110
   |
   = help: Replace with `return any(check(x) for x in iterable)`
 
@@ -34,8 +34,8 @@ SIM110.py:25:5: SIM110 [*] Use `return all(not check(x) for x in iterable)` inst
    |  _____^
 28 | |         if check(x):
 29 | |             return False
-   | |________________________^ SIM110
-30 |       return True
+30 | |     return True
+   | |_______________^ SIM110
    |
    = help: Replace with `return all(not check(x) for x in iterable)`
 
@@ -60,8 +60,8 @@ SIM110.py:33:5: SIM110 [*] Use `return all(x.is_empty() for x in iterable)` inst
    |  _____^
 36 | |         if not x.is_empty():
 37 | |             return False
-   | |________________________^ SIM110
-38 |       return True
+38 | |     return True
+   | |_______________^ SIM110
    |
    = help: Replace with `return all(x.is_empty() for x in iterable)`
 
@@ -192,7 +192,7 @@ SIM110.py:83:5: SIM110 [*] Use `return all(not check(x) for x in iterable)` inst
 89 85 | 
 90 86 | 
 
-SIM110.py:124:5: SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop
+SIM110.py:124:5: SIM110 Use `return any(check(x) for x in iterable)` instead of `for` loop
     |
 124 |           pass
 125 |   
@@ -200,12 +200,12 @@ SIM110.py:124:5: SIM110 [*] Use `return any(check(x) for x in iterable)` instead
     |  _____^
 127 | |         if check(x):
 128 | |             return True
-    | |_______________________^ SIM110
-129 |       return False
+129 | |     return False
+    | |________________^ SIM110
     |
     = help: Replace with `return any(check(x) for x in iterable)`
 
-SIM110.py:134:5: SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loop
+SIM110.py:134:5: SIM110 Use `return all(not check(x) for x in iterable)` instead of `for` loop
     |
 134 |           pass
 135 |   
@@ -213,8 +213,8 @@ SIM110.py:134:5: SIM110 [*] Use `return all(not check(x) for x in iterable)` ins
     |  _____^
 137 | |         if check(x):
 138 | |             return False
-    | |________________________^ SIM110
-139 |       return True
+139 | |     return True
+    | |_______________^ SIM110
     |
     = help: Replace with `return all(not check(x) for x in iterable)`
 
@@ -225,8 +225,8 @@ SIM110.py:144:5: SIM110 [*] Use `return any(check(x) for x in iterable)` instead
     |  _____^
 146 | |         if check(x):
 147 | |             return True
-    | |_______________________^ SIM110
-148 |       return False
+148 | |     return False
+    | |________________^ SIM110
     |
     = help: Replace with `return any(check(x) for x in iterable)`
 
@@ -250,8 +250,8 @@ SIM110.py:154:5: SIM110 [*] Use `return all(not check(x) for x in iterable)` ins
     |  _____^
 156 | |         if check(x):
 157 | |             return False
-    | |________________________^ SIM110
-158 |       return True
+158 | |     return True
+    | |_______________^ SIM110
     |
     = help: Replace with `return all(not check(x) for x in iterable)`
 
@@ -264,5 +264,34 @@ SIM110.py:154:5: SIM110 [*] Use `return all(not check(x) for x in iterable)` ins
 156     |-            return False
 157     |-    return True
     154 |+    return all(not check(x) for x in iterable)
+158 155 | 
+159 156 | 
+160 157 | def f():
+
+SIM110.py:162:5: SIM110 [*] Use `return any(x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ")` instead of `for` loop
+    |
+162 |   def f():
+163 |       # SIM110
+164 |       for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ":
+    |  _____^
+165 | |         if x.isdigit():
+166 | |             return True
+167 | |     return False
+    | |________________^ SIM110
+    |
+    = help: Replace with `return any(x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ")`
+
+ℹ Suggested fix
+159 159 | 
+160 160 | def f():
+161 161 |     # SIM110
+162     |-    for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ":
+163     |-        if x.isdigit():
+164     |-            return True
+165     |-    return False
+    162 |+    return any(x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ")
+166 163 | 
+167 164 | 
+168 165 | def f():
 
 
diff --git a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM110_SIM111.py.snap b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM110_SIM111.py.snap
index 82ce8fd6b31e8..c4e2e48998b93 100644
--- a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM110_SIM111.py.snap
+++ b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM110_SIM111.py.snap
@@ -9,8 +9,8 @@ SIM111.py:3:5: SIM110 [*] Use `return any(check(x) for x in iterable)` instead o
   |  _____^
 6 | |         if check(x):
 7 | |             return True
-  | |_______________________^ SIM110
-8 |       return False
+8 | |     return False
+  | |________________^ SIM110
   |
   = help: Replace with `return any(check(x) for x in iterable)`
 
@@ -34,8 +34,8 @@ SIM111.py:25:5: SIM110 [*] Use `return all(not check(x) for x in iterable)` inst
    |  _____^
 28 | |         if check(x):
 29 | |             return False
-   | |________________________^ SIM110
-30 |       return True
+30 | |     return True
+   | |_______________^ SIM110
    |
    = help: Replace with `return all(not check(x) for x in iterable)`
 
@@ -60,8 +60,8 @@ SIM111.py:33:5: SIM110 [*] Use `return all(x.is_empty() for x in iterable)` inst
    |  _____^
 36 | |         if not x.is_empty():
 37 | |             return False
-   | |________________________^ SIM110
-38 |       return True
+38 | |     return True
+   | |_______________^ SIM110
    |
    = help: Replace with `return all(x.is_empty() for x in iterable)`
 
@@ -192,7 +192,7 @@ SIM111.py:83:5: SIM110 [*] Use `return all(not check(x) for x in iterable)` inst
 89 85 | 
 90 86 | 
 
-SIM111.py:124:5: SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop
+SIM111.py:124:5: SIM110 Use `return any(check(x) for x in iterable)` instead of `for` loop
     |
 124 |           pass
 125 |   
@@ -200,12 +200,12 @@ SIM111.py:124:5: SIM110 [*] Use `return any(check(x) for x in iterable)` instead
     |  _____^
 127 | |         if check(x):
 128 | |             return True
-    | |_______________________^ SIM110
-129 |       return False
+129 | |     return False
+    | |________________^ SIM110
     |
     = help: Replace with `return any(check(x) for x in iterable)`
 
-SIM111.py:134:5: SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loop
+SIM111.py:134:5: SIM110 Use `return all(not check(x) for x in iterable)` instead of `for` loop
     |
 134 |           pass
 135 |   
@@ -213,8 +213,8 @@ SIM111.py:134:5: SIM110 [*] Use `return all(not check(x) for x in iterable)` ins
     |  _____^
 137 | |         if check(x):
 138 | |             return False
-    | |________________________^ SIM110
-139 |       return True
+139 | |     return True
+    | |_______________^ SIM110
     |
     = help: Replace with `return all(not check(x) for x in iterable)`
 
@@ -225,8 +225,8 @@ SIM111.py:144:5: SIM110 [*] Use `return any(check(x) for x in iterable)` instead
     |  _____^
 146 | |         if check(x):
 147 | |             return True
-    | |_______________________^ SIM110
-148 |       return False
+148 | |     return False
+    | |________________^ SIM110
     |
     = help: Replace with `return any(check(x) for x in iterable)`
 
@@ -250,8 +250,8 @@ SIM111.py:154:5: SIM110 [*] Use `return all(not check(x) for x in iterable)` ins
     |  _____^
 156 | |         if check(x):
 157 | |             return False
-    | |________________________^ SIM110
-158 |       return True
+158 | |     return True
+    | |_______________^ SIM110
     |
     = help: Replace with `return all(not check(x) for x in iterable)`
 
@@ -276,8 +276,8 @@ SIM111.py:162:5: SIM110 [*] Use `return all(x in y for x in iterable)` instead o
     |  _____^
 165 | |         if x not in y:
 166 | |             return False
-    | |________________________^ SIM110
-167 |       return True
+167 | |     return True
+    | |_______________^ SIM110
     |
     = help: Replace with `return all(x in y for x in iterable)`
 
@@ -302,8 +302,8 @@ SIM111.py:170:5: SIM110 [*] Use `return all(x <= y for x in iterable)` instead o
     |  _____^
 173 | |         if x > y:
 174 | |             return False
-    | |________________________^ SIM110
-175 |       return True
+175 | |     return True
+    | |_______________^ SIM110
     |
     = help: Replace with `return all(x <= y for x in iterable)`
 
@@ -316,5 +316,34 @@ SIM111.py:170:5: SIM110 [*] Use `return all(x <= y for x in iterable)` instead o
 172     |-            return False
 173     |-    return True
     170 |+    return all(x <= y for x in iterable)
+174 171 | 
+175 172 | 
+176 173 | def f():
+
+SIM111.py:178:5: SIM110 [*] Use `return all(not x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9")` instead of `for` loop
+    |
+178 |   def f():
+179 |       # SIM111
+180 |       for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9":
+    |  _____^
+181 | |         if x.isdigit():
+182 | |             return False
+183 | |     return True
+    | |_______________^ SIM110
+    |
+    = help: Replace with `return all(not x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9")`
+
+ℹ Suggested fix
+175 175 | 
+176 176 | def f():
+177 177 |     # SIM111
+178     |-    for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9":
+179     |-        if x.isdigit():
+180     |-            return False
+181     |-    return True
+    178 |+    return all(not x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9")
+182 179 | 
+183 180 | 
+184 181 | def f():
 
 
diff --git a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM112_SIM112.py.snap b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM112_SIM112.py.snap
index f2a8898459559..31e3c220a4b08 100644
--- a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM112_SIM112.py.snap
+++ b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM112_SIM112.py.snap
@@ -21,7 +21,7 @@ SIM112.py:4:12: SIM112 [*] Use capitalized environment variable `FOO` instead of
 6 6 | os.environ.get('foo')
 7 7 | 
 
-SIM112.py:6:16: SIM112 [*] Use capitalized environment variable `FOO` instead of `foo`
+SIM112.py:6:16: SIM112 Use capitalized environment variable `FOO` instead of `foo`
    |
  6 | os.environ['foo']
  7 | 
@@ -32,7 +32,7 @@ SIM112.py:6:16: SIM112 [*] Use capitalized environment variable `FOO` instead of
    |
    = help: Replace `foo` with `FOO`
 
-SIM112.py:8:16: SIM112 [*] Use capitalized environment variable `FOO` instead of `foo`
+SIM112.py:8:16: SIM112 Use capitalized environment variable `FOO` instead of `foo`
    |
  8 | os.environ.get('foo')
  9 | 
@@ -43,7 +43,7 @@ SIM112.py:8:16: SIM112 [*] Use capitalized environment variable `FOO` instead of
    |
    = help: Replace `foo` with `FOO`
 
-SIM112.py:10:11: SIM112 [*] Use capitalized environment variable `FOO` instead of `foo`
+SIM112.py:10:11: SIM112 Use capitalized environment variable `FOO` instead of `foo`
    |
 10 | os.environ.get('foo', 'bar')
 11 | 
@@ -54,7 +54,7 @@ SIM112.py:10:11: SIM112 [*] Use capitalized environment variable `FOO` instead o
    |
    = help: Replace `foo` with `FOO`
 
-SIM112.py:12:22: SIM112 [*] Use capitalized environment variable `FOO` instead of `foo`
+SIM112.py:12:22: SIM112 Use capitalized environment variable `FOO` instead of `foo`
    |
 12 | os.getenv('foo')
 13 | 
@@ -86,7 +86,7 @@ SIM112.py:14:18: SIM112 [*] Use capitalized environment variable `FOO` instead o
 16 16 | if env := os.environ.get('foo'):
 17 17 |     pass
 
-SIM112.py:16:26: SIM112 [*] Use capitalized environment variable `FOO` instead of `foo`
+SIM112.py:16:26: SIM112 Use capitalized environment variable `FOO` instead of `foo`
    |
 16 | env = os.environ['foo']
 17 | 
diff --git a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM117_SIM117.py.snap b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM117_SIM117.py.snap
index 452b0c5b7a729..94ddb2c3261af 100644
--- a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM117_SIM117.py.snap
+++ b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM117_SIM117.py.snap
@@ -57,6 +57,7 @@ SIM117.py:13:1: SIM117 Use a single `with` statement with multiple contexts inst
    | |__________________^ SIM117
 17 |           print("hello")
    |
+   = help: Combine `with` statements
 
 SIM117.py:19:1: SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
    |
@@ -211,5 +212,41 @@ SIM117.py:84:1: SIM117 [*] Use a single `with` statement with multiple contexts
 91    |-    ):
 92    |-        print("hello")
    89 |+    print("hello")
+93 90 | 
+94 91 | # SIM117 (auto-fixable)
+95 92 | with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as a:
+
+SIM117.py:95:1: SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements
+   |
+95 |   # SIM117 (auto-fixable)
+96 | / with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as a:
+97 | |     with B("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as b:
+   | |__________________________________________________^ SIM117
+98 |           print("hello")
+   |
+   = help: Combine `with` statements
+
+ℹ Suggested fix
+92 92 |         print("hello")
+93 93 | 
+94 94 | # SIM117 (auto-fixable)
+95    |-with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as a:
+96    |-    with B("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as b:
+97    |-        print("hello")
+   95 |+with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as a, B("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as b:
+   96 |+    print("hello")
+98 97 | 
+99 98 | # SIM117 (not auto-fixable too long)
+100 99 | with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ890") as a:
+
+SIM117.py:100:1: SIM117 Use a single `with` statement with multiple contexts instead of nested `with` statements
+    |
+100 |   # SIM117 (not auto-fixable too long)
+101 | / with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ890") as a:
+102 | |     with B("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as b:
+    | |__________________________________________________^ SIM117
+103 |           print("hello")
+    |
+    = help: Combine `with` statements
 
 
diff --git a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM208_SIM208.py.snap b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM208_SIM208.py.snap
index f728d12c3a612..a75ee6eb103d4 100644
--- a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM208_SIM208.py.snap
+++ b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM208_SIM208.py.snap
@@ -36,4 +36,64 @@ SIM208.py:4:4: SIM208 [*] Use `a == b` instead of `not (not a == b)`
 6 6 | 
 7 7 | if not a:  # OK
 
+SIM208.py:16:5: SIM208 [*] Use `b` instead of `not (not b)`
+   |
+16 |     pass
+17 | 
+18 | a = not not b  # SIM208
+   |     ^^^^^^^^^ SIM208
+19 | 
+20 | f(not not a)  # SIM208
+   |
+   = help: Replace with `b`
+
+ℹ Suggested fix
+13 13 | if not a != b:  # OK
+14 14 |     pass
+15 15 | 
+16    |-a = not not b  # SIM208
+   16 |+a = bool(b)  # SIM208
+17 17 | 
+18 18 | f(not not a)  # SIM208
+19 19 | 
+
+SIM208.py:18:3: SIM208 [*] Use `a` instead of `not (not a)`
+   |
+18 | a = not not b  # SIM208
+19 | 
+20 | f(not not a)  # SIM208
+   |   ^^^^^^^^^ SIM208
+21 | 
+22 | if 1 + (not (not a)):  # SIM208
+   |
+   = help: Replace with `a`
+
+ℹ Suggested fix
+15 15 | 
+16 16 | a = not not b  # SIM208
+17 17 | 
+18    |-f(not not a)  # SIM208
+   18 |+f(bool(a))  # SIM208
+19 19 | 
+20 20 | if 1 + (not (not a)):  # SIM208
+21 21 |     pass
+
+SIM208.py:20:9: SIM208 [*] Use `a` instead of `not (not a)`
+   |
+20 | f(not not a)  # SIM208
+21 | 
+22 | if 1 + (not (not a)):  # SIM208
+   |         ^^^^^^^^^^^ SIM208
+23 |     pass
+   |
+   = help: Replace with `a`
+
+ℹ Suggested fix
+17 17 | 
+18 18 | f(not not a)  # SIM208
+19 19 | 
+20    |-if 1 + (not (not a)):  # SIM208
+   20 |+if 1 + (bool(a)):  # SIM208
+21 21 |     pass
+
 
diff --git a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM210_SIM210.py.snap b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM210_SIM210.py.snap
index f8c226d035da9..88d08c9d77968 100644
--- a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM210_SIM210.py.snap
+++ b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM210_SIM210.py.snap
@@ -58,11 +58,11 @@ SIM210.py:5:5: SIM210 [*] Use `bool(b + c)` instead of `True if b + c else False
 7 7 | a = False if b else True  # OK
 8 8 | 
 
-SIM210.py:14:9: SIM210 [*] Use `bool(b)` instead of `True if b else False`
+SIM210.py:15:9: SIM210 Use `bool(b)` instead of `True if b else False`
    |
-14 |         return False
-15 | 
-16 |     a = True if b else False
+15 |         return False
+16 | 
+17 |     a = True if b else False
    |         ^^^^^^^^^^^^^^^^^^^^ SIM210
    |
    = help: Replace with `not b
diff --git a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM401_SIM401.py.snap b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM401_SIM401.py.snap
index 2c0b10f03d564..830ba3a2e7517 100644
--- a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM401_SIM401.py.snap
+++ b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM401_SIM401.py.snap
@@ -36,7 +36,7 @@ SIM401.py:12:1: SIM401 [*] Use `var = a_dict.get(key, "default2")` instead of an
 16 | |     var = a_dict[key]
    | |_____________________^ SIM401
 17 |   
-18 |   # SIM401 (default with a complex expression)
+18 |   # OK (default contains effect)
    |
    = help: Replace with `var = a_dict.get(key, "default2")`
 
@@ -50,7 +50,7 @@ SIM401.py:12:1: SIM401 [*] Use `var = a_dict.get(key, "default2")` instead of an
 15    |-    var = a_dict[key]
    12 |+var = a_dict.get(key, "default2")
 16 13 | 
-17 14 | # SIM401 (default with a complex expression)
+17 14 | # OK (default contains effect)
 18 15 | if key in a_dict:
 
 SIM401.py:24:1: SIM401 [*] Use `var = a_dict.get(keys[idx], "default")` instead of an `if` block
@@ -105,18 +105,18 @@ SIM401.py:30:1: SIM401 [*] Use `var = dicts[idx].get(key, "default")` instead of
 35 32 | # SIM401 (complex expression in var)
 36 33 | if key in a_dict:
 
-SIM401.py:36:1: SIM401 [*] Use `vars[idx] = a_dict.get(key, "default")` instead of an `if` block
+SIM401.py:36:1: SIM401 [*] Use `vars[idx] = a_dict.get(key, "defaultß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789")` instead of an `if` block
    |
 36 |   # SIM401 (complex expression in var)
 37 | / if key in a_dict:
 38 | |     vars[idx] = a_dict[key]
 39 | | else:
-40 | |     vars[idx] = "default"
-   | |_________________________^ SIM401
+40 | |     vars[idx] = "defaultß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789"
+   | |___________________________________________________________________________^ SIM401
 41 |   
 42 |   ###
    |
-   = help: Replace with `vars[idx] = a_dict.get(key, "default")`
+   = help: Replace with `vars[idx] = a_dict.get(key, "defaultß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789")`
 
 ℹ Suggested fix
 33 33 |     var = "default"
@@ -125,8 +125,8 @@ SIM401.py:36:1: SIM401 [*] Use `vars[idx] = a_dict.get(key, "default")` instead
 36    |-if key in a_dict:
 37    |-    vars[idx] = a_dict[key]
 38    |-else:
-39    |-    vars[idx] = "default"
-   36 |+vars[idx] = a_dict.get(key, "default")
+39    |-    vars[idx] = "defaultß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789"
+   36 |+vars[idx] = a_dict.get(key, "defaultß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789")
 40 37 | 
 41 38 | ###
 42 39 | # Negative cases
diff --git a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM910_SIM910.py.snap b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM910_SIM910.py.snap
index 7fe56c86b85bc..353c0a547076f 100644
--- a/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM910_SIM910.py.snap
+++ b/crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM910_SIM910.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_simplify/mod.rs
 ---
-SIM910.py:2:1: SIM910 Use `{}.get(key)` instead of `{}.get(key, None)`
+SIM910.py:2:1: SIM910 [*] Use `{}.get(key)` instead of `{}.get(key, None)`
   |
 2 | # SIM910
 3 | {}.get(key, None)
@@ -9,6 +9,7 @@ SIM910.py:2:1: SIM910 Use `{}.get(key)` instead of `{}.get(key, None)`
 4 | 
 5 | # SIM910
   |
+  = help: Replace `{}.get(key, None)` with `{}.get(key)`
 
 ℹ Suggested fix
 1 1 | # SIM910
@@ -18,7 +19,7 @@ SIM910.py:2:1: SIM910 Use `{}.get(key)` instead of `{}.get(key, None)`
 4 4 | # SIM910
 5 5 | {}.get("key", None)
 
-SIM910.py:5:1: SIM910 Use `{}.get("key")` instead of `{}.get("key", None)`
+SIM910.py:5:1: SIM910 [*] Use `{}.get("key")` instead of `{}.get("key", None)`
   |
 5 | # SIM910
 6 | {}.get("key", None)
@@ -26,6 +27,7 @@ SIM910.py:5:1: SIM910 Use `{}.get("key")` instead of `{}.get("key", None)`
 7 | 
 8 | # OK
   |
+  = help: Replace `{}.get("key", None)` with `{}.get("key")`
 
 ℹ Suggested fix
 2 2 | {}.get(key, None)
@@ -37,13 +39,14 @@ SIM910.py:5:1: SIM910 Use `{}.get("key")` instead of `{}.get("key", None)`
 7 7 | # OK
 8 8 | {}.get(key)
 
-SIM910.py:20:9: SIM910 Use `{}.get(key)` instead of `{}.get(key, None)`
+SIM910.py:20:9: SIM910 [*] Use `{}.get(key)` instead of `{}.get(key, None)`
    |
 20 | # SIM910
 21 | if a := {}.get(key, None):
    |         ^^^^^^^^^^^^^^^^^ SIM910
 22 |     pass
    |
+   = help: Replace `{}.get(key, None)` with `{}.get(key)`
 
 ℹ Suggested fix
 17 17 | {}.get("key", False)
@@ -55,7 +58,7 @@ SIM910.py:20:9: SIM910 Use `{}.get(key)` instead of `{}.get(key, None)`
 22 22 | 
 23 23 | # SIM910
 
-SIM910.py:24:5: SIM910 Use `{}.get(key)` instead of `{}.get(key, None)`
+SIM910.py:24:5: SIM910 [*] Use `{}.get(key)` instead of `{}.get(key, None)`
    |
 24 | # SIM910
 25 | a = {}.get(key, None)
@@ -63,6 +66,7 @@ SIM910.py:24:5: SIM910 Use `{}.get(key)` instead of `{}.get(key, None)`
 26 | 
 27 | # SIM910
    |
+   = help: Replace `{}.get(key, None)` with `{}.get(key)`
 
 ℹ Suggested fix
 21 21 |     pass
@@ -74,12 +78,13 @@ SIM910.py:24:5: SIM910 Use `{}.get(key)` instead of `{}.get(key, None)`
 26 26 | # SIM910
 27 27 | ({}).get(key, None)
 
-SIM910.py:27:1: SIM910 Use `({}).get(key)` instead of `({}).get(key, None)`
+SIM910.py:27:1: SIM910 [*] Use `({}).get(key)` instead of `({}).get(key, None)`
    |
 27 | # SIM910
 28 | ({}).get(key, None)
    | ^^^^^^^^^^^^^^^^^^^ SIM910
    |
+   = help: Replace `({}).get(key, None)` with `({}).get(key)`
 
 ℹ Suggested fix
 24 24 | a = {}.get(key, None)
diff --git a/crates/ruff/src/rules/flake8_tidy_imports/banned_api.rs b/crates/ruff/src/rules/flake8_tidy_imports/banned_api.rs
deleted file mode 100644
index 0e01b03932f76..0000000000000
--- a/crates/ruff/src/rules/flake8_tidy_imports/banned_api.rs
+++ /dev/null
@@ -1,179 +0,0 @@
-use rustc_hash::FxHashMap;
-use rustpython_parser::ast::{Expr, Located};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-use crate::checkers::ast::Checker;
-use ruff_diagnostics::{Diagnostic, Violation};
-use ruff_macros::{derive_message_formats, violation, CacheKey};
-use ruff_python_ast::call_path::from_qualified_name;
-
-pub type Settings = FxHashMap<String, ApiBan>;
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, CacheKey, JsonSchema)]
-#[serde(deny_unknown_fields, rename_all = "kebab-case")]
-pub struct ApiBan {
-    /// The message to display when the API is used.
-    pub msg: String,
-}
-
-/// ## What it does
-/// Checks for banned imports.
-///
-/// ## Why is this bad?
-/// Projects may want to ensure that specific modules or module members are
-/// not be imported or accessed.
-///
-/// Security or other company policies may be a reason to impose
-/// restrictions on importing external Python libraries. In some cases,
-/// projects may adopt conventions around the use of certain modules or
-/// module members that are not enforceable by the language itself.
-///
-/// This rule enforces certain import conventions project-wide in an
-/// automatic way.
-///
-/// ## Options
-/// - `flake8-tidy-imports.banned-api`
-#[violation]
-pub struct BannedApi {
-    pub name: String,
-    pub message: String,
-}
-
-impl Violation for BannedApi {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        let BannedApi { name, message } = self;
-        format!("`{name}` is banned: {message}")
-    }
-}
-
-/// TID251
-pub fn name_is_banned<T>(checker: &mut Checker, name: String, located: &Located<T>) {
-    let banned_api = &checker.settings.flake8_tidy_imports.banned_api;
-    if let Some(ban) = banned_api.get(&name) {
-        checker.diagnostics.push(Diagnostic::new(
-            BannedApi {
-                name,
-                message: ban.msg.to_string(),
-            },
-            located.range(),
-        ));
-    }
-}
-
-/// TID251
-pub fn name_or_parent_is_banned<T>(checker: &mut Checker, name: &str, located: &Located<T>) {
-    let banned_api = &checker.settings.flake8_tidy_imports.banned_api;
-    let mut name = name;
-    loop {
-        if let Some(ban) = banned_api.get(name) {
-            checker.diagnostics.push(Diagnostic::new(
-                BannedApi {
-                    name: name.to_string(),
-                    message: ban.msg.to_string(),
-                },
-                located.range(),
-            ));
-            return;
-        }
-        match name.rfind('.') {
-            Some(idx) => {
-                name = &name[..idx];
-            }
-            None => return,
-        }
-    }
-}
-
-/// TID251
-pub fn banned_attribute_access(checker: &mut Checker, expr: &Expr) {
-    let banned_api = &checker.settings.flake8_tidy_imports.banned_api;
-    if let Some((banned_path, ban)) = checker.ctx.resolve_call_path(expr).and_then(|call_path| {
-        banned_api
-            .iter()
-            .find(|(banned_path, ..)| call_path == from_qualified_name(banned_path))
-    }) {
-        checker.diagnostics.push(Diagnostic::new(
-            BannedApi {
-                name: banned_path.to_string(),
-                message: ban.msg.to_string(),
-            },
-            expr.range(),
-        ));
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::path::Path;
-
-    use anyhow::Result;
-    use rustc_hash::FxHashMap;
-
-    use crate::assert_messages;
-    use crate::registry::Rule;
-    use crate::settings::Settings;
-    use crate::test::test_path;
-
-    use super::ApiBan;
-
-    #[test]
-    fn banned_api() -> Result<()> {
-        let diagnostics = test_path(
-            Path::new("flake8_tidy_imports/TID251.py"),
-            &Settings {
-                flake8_tidy_imports: super::super::Settings {
-                    banned_api: FxHashMap::from_iter([
-                        (
-                            "cgi".to_string(),
-                            ApiBan {
-                                msg: "The cgi module is deprecated.".to_string(),
-                            },
-                        ),
-                        (
-                            "typing.TypedDict".to_string(),
-                            ApiBan {
-                                msg: "Use typing_extensions.TypedDict instead.".to_string(),
-                            },
-                        ),
-                    ]),
-                    ..Default::default()
-                },
-                ..Settings::for_rules(vec![Rule::BannedApi])
-            },
-        )?;
-        assert_messages!(diagnostics);
-        Ok(())
-    }
-
-    #[test]
-    fn banned_api_package() -> Result<()> {
-        let diagnostics = test_path(
-            Path::new("flake8_tidy_imports/TID/my_package/sublib/api/application.py"),
-            &Settings {
-                flake8_tidy_imports: super::super::Settings {
-                    banned_api: FxHashMap::from_iter([
-                        (
-                            "attrs".to_string(),
-                            ApiBan {
-                                msg: "The attrs module is deprecated.".to_string(),
-                            },
-                        ),
-                        (
-                            "my_package.sublib.protocol".to_string(),
-                            ApiBan {
-                                msg: "The protocol module is deprecated.".to_string(),
-                            },
-                        ),
-                    ]),
-                    ..Default::default()
-                },
-                namespace_packages: vec![Path::new("my_package").to_path_buf()],
-                ..Settings::for_rules(vec![Rule::BannedApi])
-            },
-        )?;
-        assert_messages!(diagnostics);
-        Ok(())
-    }
-}
diff --git a/crates/ruff/src/rules/flake8_tidy_imports/mod.rs b/crates/ruff/src/rules/flake8_tidy_imports/mod.rs
index f9dc34868e1af..8686f3971c06c 100644
--- a/crates/ruff/src/rules/flake8_tidy_imports/mod.rs
+++ b/crates/ruff/src/rules/flake8_tidy_imports/mod.rs
@@ -1,13 +1,127 @@
 //! Rules from [flake8-tidy-imports](https://pypi.org/project/flake8-tidy-imports/).
-use ruff_macros::CacheKey;
-
 pub mod options;
+pub(crate) mod rules;
+pub mod settings;
+
+#[cfg(test)]
+mod tests {
+    use std::path::Path;
+
+    use anyhow::Result;
+    use rustc_hash::FxHashMap;
+
+    use crate::assert_messages;
+    use crate::registry::Rule;
+    use crate::rules::flake8_tidy_imports;
+    use crate::rules::flake8_tidy_imports::settings::{ApiBan, Strictness};
+    use crate::settings::Settings;
+    use crate::test::test_path;
+
+    #[test]
+    fn banned_api() -> Result<()> {
+        let diagnostics = test_path(
+            Path::new("flake8_tidy_imports/TID251.py"),
+            &Settings {
+                flake8_tidy_imports: flake8_tidy_imports::settings::Settings {
+                    banned_api: FxHashMap::from_iter([
+                        (
+                            "cgi".to_string(),
+                            ApiBan {
+                                msg: "The cgi module is deprecated.".to_string(),
+                            },
+                        ),
+                        (
+                            "typing.TypedDict".to_string(),
+                            ApiBan {
+                                msg: "Use typing_extensions.TypedDict instead.".to_string(),
+                            },
+                        ),
+                    ]),
+                    ..Default::default()
+                },
+                ..Settings::for_rules(vec![Rule::BannedApi])
+            },
+        )?;
+        assert_messages!(diagnostics);
+        Ok(())
+    }
+
+    #[test]
+    fn banned_api_package() -> Result<()> {
+        let diagnostics = test_path(
+            Path::new("flake8_tidy_imports/TID/my_package/sublib/api/application.py"),
+            &Settings {
+                flake8_tidy_imports: flake8_tidy_imports::settings::Settings {
+                    banned_api: FxHashMap::from_iter([
+                        (
+                            "attrs".to_string(),
+                            ApiBan {
+                                msg: "The attrs module is deprecated.".to_string(),
+                            },
+                        ),
+                        (
+                            "my_package.sublib.protocol".to_string(),
+                            ApiBan {
+                                msg: "The protocol module is deprecated.".to_string(),
+                            },
+                        ),
+                    ]),
+                    ..Default::default()
+                },
+                namespace_packages: vec![Path::new("my_package").to_path_buf()],
+                ..Settings::for_rules(vec![Rule::BannedApi])
+            },
+        )?;
+        assert_messages!(diagnostics);
+        Ok(())
+    }
+
+    #[test]
+    fn ban_parent_imports() -> Result<()> {
+        let diagnostics = test_path(
+            Path::new("flake8_tidy_imports/TID252.py"),
+            &Settings {
+                flake8_tidy_imports: flake8_tidy_imports::settings::Settings {
+                    ban_relative_imports: Strictness::Parents,
+                    ..Default::default()
+                },
+                ..Settings::for_rules(vec![Rule::RelativeImports])
+            },
+        )?;
+        assert_messages!(diagnostics);
+        Ok(())
+    }
 
-pub mod banned_api;
-pub mod relative_imports;
+    #[test]
+    fn ban_all_imports() -> Result<()> {
+        let diagnostics = test_path(
+            Path::new("flake8_tidy_imports/TID252.py"),
+            &Settings {
+                flake8_tidy_imports: flake8_tidy_imports::settings::Settings {
+                    ban_relative_imports: Strictness::All,
+                    ..Default::default()
+                },
+                ..Settings::for_rules(vec![Rule::RelativeImports])
+            },
+        )?;
+        assert_messages!(diagnostics);
+        Ok(())
+    }
 
-#[derive(Debug, CacheKey, Default)]
-pub struct Settings {
-    pub ban_relative_imports: relative_imports::Settings,
-    pub banned_api: banned_api::Settings,
+    #[test]
+    fn ban_parent_imports_package() -> Result<()> {
+        let diagnostics = test_path(
+            Path::new("flake8_tidy_imports/TID/my_package/sublib/api/application.py"),
+            &Settings {
+                flake8_tidy_imports: flake8_tidy_imports::settings::Settings {
+                    ban_relative_imports: Strictness::Parents,
+                    ..Default::default()
+                },
+                namespace_packages: vec![Path::new("my_package").to_path_buf()],
+                ..Settings::for_rules(vec![Rule::RelativeImports])
+            },
+        )?;
+        assert_messages!(diagnostics);
+        Ok(())
+    }
 }
diff --git a/crates/ruff/src/rules/flake8_tidy_imports/options.rs b/crates/ruff/src/rules/flake8_tidy_imports/options.rs
index ac8a0896876ed..6f3eb99fcb631 100644
--- a/crates/ruff/src/rules/flake8_tidy_imports/options.rs
+++ b/crates/ruff/src/rules/flake8_tidy_imports/options.rs
@@ -1,23 +1,21 @@
 //! Settings for the `flake8-tidy-imports` plugin.
 
 use rustc_hash::FxHashMap;
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::ConfigurationOptions;
+use ruff_macros::{CombineOptions, ConfigurationOptions};
 
-use super::banned_api::ApiBan;
-use super::relative_imports::Strictness;
-use super::Settings;
+use super::settings::{ApiBan, Settings, Strictness};
 
 #[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, CombineOptions,
 )]
 #[serde(
     deny_unknown_fields,
     rename_all = "kebab-case",
     rename = "Flake8TidyImportsOptions"
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = r#""parents""#,
diff --git a/crates/ruff/src/rules/flake8_tidy_imports/relative_imports.rs b/crates/ruff/src/rules/flake8_tidy_imports/relative_imports.rs
deleted file mode 100644
index bdc706e777b3a..0000000000000
--- a/crates/ruff/src/rules/flake8_tidy_imports/relative_imports.rs
+++ /dev/null
@@ -1,215 +0,0 @@
-use rustpython_parser::ast::{Stmt, StmtKind};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Violation};
-use ruff_macros::{derive_message_formats, violation, CacheKey};
-use ruff_python_ast::helpers::{create_stmt, resolve_imported_module_path, unparse_stmt};
-use ruff_python_ast::source_code::Stylist;
-use ruff_python_stdlib::identifiers::is_identifier;
-
-use crate::checkers::ast::Checker;
-use crate::registry::AsRule;
-
-pub type Settings = Strictness;
-
-#[derive(
-    Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize, CacheKey, JsonSchema, Default,
-)]
-#[serde(deny_unknown_fields, rename_all = "kebab-case")]
-pub enum Strictness {
-    /// Ban imports that extend into the parent module or beyond.
-    #[default]
-    Parents,
-    /// Ban all relative imports.
-    All,
-}
-
-/// ## What it does
-/// Checks for relative imports.
-///
-/// ## Why is this bad?
-/// Absolute imports, or relative imports from siblings, are recommended by [PEP 8]:
-///
-/// > Absolute imports are recommended, as they are usually more readable and tend to be better behaved...
-/// > ```python
-/// > import mypkg.sibling
-/// > from mypkg import sibling
-/// > from mypkg.sibling import example
-/// > ```
-/// > However, explicit relative imports are an acceptable alternative to absolute imports,
-/// > especially when dealing with complex package layouts where using absolute imports would be
-/// > unnecessarily verbose:
-/// > ```python
-/// > from . import sibling
-/// > from .sibling import example
-/// > ```
-///
-/// ## Options
-/// - `flake8-tidy-imports.ban-relative-imports`
-///
-/// ## Example
-/// ```python
-/// from .. import foo
-/// ```
-///
-/// Use instead:
-/// ```python
-/// from mypkg import foo
-/// ```
-///
-/// [PEP 8]: https://peps.python.org/pep-0008/#imports
-#[violation]
-pub struct RelativeImports {
-    pub strictness: Strictness,
-}
-
-impl Violation for RelativeImports {
-    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
-
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        match self.strictness {
-            Strictness::Parents => format!("Relative imports from parent modules are banned"),
-            Strictness::All => format!("Relative imports are banned"),
-        }
-    }
-
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        Some(|RelativeImports { strictness }| match strictness {
-            Strictness::Parents => {
-                format!("Replace relative imports from parent modules with absolute imports")
-            }
-            Strictness::All => format!("Replace relative imports with absolute imports"),
-        })
-    }
-}
-
-fn fix_banned_relative_import(
-    stmt: &Stmt,
-    level: Option<usize>,
-    module: Option<&str>,
-    module_path: Option<&[String]>,
-    stylist: &Stylist,
-) -> Option<Edit> {
-    // Only fix is the module path is known.
-    let Some(module_path) = resolve_imported_module_path(level, module, module_path) else {
-        return None;
-    };
-
-    // Require import to be a valid module:
-    // https://python.org/dev/peps/pep-0008/#package-and-module-names
-    if !module_path.split('.').all(is_identifier) {
-        return None;
-    }
-
-    let StmtKind::ImportFrom { names, .. } = &stmt.node else {
-        panic!("Expected StmtKind::ImportFrom");
-    };
-    let content = unparse_stmt(
-        &create_stmt(StmtKind::ImportFrom {
-            module: Some(module_path.to_string()),
-            names: names.clone(),
-            level: Some(0),
-        }),
-        stylist,
-    );
-
-    Some(Edit::range_replacement(content, stmt.range()))
-}
-
-/// TID252
-pub fn banned_relative_import(
-    checker: &Checker,
-    stmt: &Stmt,
-    level: Option<usize>,
-    module: Option<&str>,
-    module_path: Option<&[String]>,
-    strictness: &Strictness,
-) -> Option<Diagnostic> {
-    let strictness_level = match strictness {
-        Strictness::All => 0,
-        Strictness::Parents => 1,
-    };
-    if level? > strictness_level {
-        let mut diagnostic = Diagnostic::new(
-            RelativeImports {
-                strictness: *strictness,
-            },
-            stmt.range(),
-        );
-        if checker.patch(diagnostic.kind.rule()) {
-            if let Some(fix) =
-                fix_banned_relative_import(stmt, level, module, module_path, checker.stylist)
-            {
-                diagnostic.set_fix(fix);
-            };
-        }
-        Some(diagnostic)
-    } else {
-        None
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::path::Path;
-
-    use anyhow::Result;
-
-    use crate::assert_messages;
-    use crate::registry::Rule;
-    use crate::settings::Settings;
-    use crate::test::test_path;
-
-    use super::Strictness;
-
-    #[test]
-    fn ban_parent_imports() -> Result<()> {
-        let diagnostics = test_path(
-            Path::new("flake8_tidy_imports/TID252.py"),
-            &Settings {
-                flake8_tidy_imports: super::super::Settings {
-                    ban_relative_imports: Strictness::Parents,
-                    ..Default::default()
-                },
-                ..Settings::for_rules(vec![Rule::RelativeImports])
-            },
-        )?;
-        assert_messages!(diagnostics);
-        Ok(())
-    }
-
-    #[test]
-    fn ban_all_imports() -> Result<()> {
-        let diagnostics = test_path(
-            Path::new("flake8_tidy_imports/TID252.py"),
-            &Settings {
-                flake8_tidy_imports: super::super::Settings {
-                    ban_relative_imports: Strictness::All,
-                    ..Default::default()
-                },
-                ..Settings::for_rules(vec![Rule::RelativeImports])
-            },
-        )?;
-        assert_messages!(diagnostics);
-        Ok(())
-    }
-
-    #[test]
-    fn ban_parent_imports_package() -> Result<()> {
-        let diagnostics = test_path(
-            Path::new("flake8_tidy_imports/TID/my_package/sublib/api/application.py"),
-            &Settings {
-                flake8_tidy_imports: super::super::Settings {
-                    ban_relative_imports: Strictness::Parents,
-                    ..Default::default()
-                },
-                namespace_packages: vec![Path::new("my_package").to_path_buf()],
-                ..Settings::for_rules(vec![Rule::RelativeImports])
-            },
-        )?;
-        assert_messages!(diagnostics);
-        Ok(())
-    }
-}
diff --git a/crates/ruff/src/rules/flake8_tidy_imports/rules/banned_api.rs b/crates/ruff/src/rules/flake8_tidy_imports/rules/banned_api.rs
new file mode 100644
index 0000000000000..668f764354de5
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_tidy_imports/rules/banned_api.rs
@@ -0,0 +1,105 @@
+use rustpython_parser::ast::{Expr, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::call_path::from_qualified_name;
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for banned imports.
+///
+/// ## Why is this bad?
+/// Projects may want to ensure that specific modules or module members are
+/// not be imported or accessed.
+///
+/// Security or other company policies may be a reason to impose
+/// restrictions on importing external Python libraries. In some cases,
+/// projects may adopt conventions around the use of certain modules or
+/// module members that are not enforceable by the language itself.
+///
+/// This rule enforces certain import conventions project-wide in an
+/// automatic way.
+///
+/// ## Options
+/// - `flake8-tidy-imports.banned-api`
+#[violation]
+pub struct BannedApi {
+    name: String,
+    message: String,
+}
+
+impl Violation for BannedApi {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let BannedApi { name, message } = self;
+        format!("`{name}` is banned: {message}")
+    }
+}
+
+/// TID251
+pub(crate) fn name_is_banned<T>(checker: &mut Checker, name: String, located: &T)
+where
+    T: Ranged,
+{
+    let banned_api = &checker.settings.flake8_tidy_imports.banned_api;
+    if let Some(ban) = banned_api.get(&name) {
+        checker.diagnostics.push(Diagnostic::new(
+            BannedApi {
+                name,
+                message: ban.msg.to_string(),
+            },
+            located.range(),
+        ));
+    }
+}
+
+/// TID251
+pub(crate) fn name_or_parent_is_banned<T>(checker: &mut Checker, name: &str, located: &T)
+where
+    T: Ranged,
+{
+    let banned_api = &checker.settings.flake8_tidy_imports.banned_api;
+    let mut name = name;
+    loop {
+        if let Some(ban) = banned_api.get(name) {
+            checker.diagnostics.push(Diagnostic::new(
+                BannedApi {
+                    name: name.to_string(),
+                    message: ban.msg.to_string(),
+                },
+                located.range(),
+            ));
+            return;
+        }
+        match name.rfind('.') {
+            Some(idx) => {
+                name = &name[..idx];
+            }
+            None => return,
+        }
+    }
+}
+
+/// TID251
+pub(crate) fn banned_attribute_access(checker: &mut Checker, expr: &Expr) {
+    let banned_api = &checker.settings.flake8_tidy_imports.banned_api;
+    if let Some((banned_path, ban)) =
+        checker
+            .semantic_model()
+            .resolve_call_path(expr)
+            .and_then(|call_path| {
+                banned_api
+                    .iter()
+                    .find(|(banned_path, ..)| call_path == from_qualified_name(banned_path))
+            })
+    {
+        checker.diagnostics.push(Diagnostic::new(
+            BannedApi {
+                name: banned_path.to_string(),
+                message: ban.msg.to_string(),
+            },
+            expr.range(),
+        ));
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_tidy_imports/rules/mod.rs b/crates/ruff/src/rules/flake8_tidy_imports/rules/mod.rs
new file mode 100644
index 0000000000000..8efbdfd6aed9c
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_tidy_imports/rules/mod.rs
@@ -0,0 +1,7 @@
+pub(crate) use banned_api::{
+    banned_attribute_access, name_is_banned, name_or_parent_is_banned, BannedApi,
+};
+pub(crate) use relative_imports::{banned_relative_import, RelativeImports};
+
+mod banned_api;
+mod relative_imports;
diff --git a/crates/ruff/src/rules/flake8_tidy_imports/rules/relative_imports.rs b/crates/ruff/src/rules/flake8_tidy_imports/rules/relative_imports.rs
new file mode 100644
index 0000000000000..9bf9bc41a8448
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_tidy_imports/rules/relative_imports.rs
@@ -0,0 +1,136 @@
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Int, Ranged, Stmt};
+
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::helpers::resolve_imported_module_path;
+use ruff_python_ast::source_code::Generator;
+use ruff_python_stdlib::identifiers::is_identifier;
+
+use crate::checkers::ast::Checker;
+use crate::registry::AsRule;
+use crate::rules::flake8_tidy_imports::settings::Strictness;
+
+/// ## What it does
+/// Checks for relative imports.
+///
+/// ## Why is this bad?
+/// Absolute imports, or relative imports from siblings, are recommended by [PEP 8]:
+///
+/// > Absolute imports are recommended, as they are usually more readable and tend to be better behaved...
+/// > ```python
+/// > import mypkg.sibling
+/// > from mypkg import sibling
+/// > from mypkg.sibling import example
+/// > ```
+/// > However, explicit relative imports are an acceptable alternative to absolute imports,
+/// > especially when dealing with complex package layouts where using absolute imports would be
+/// > unnecessarily verbose:
+/// > ```python
+/// > from . import sibling
+/// > from .sibling import example
+/// > ```
+///
+/// ## Options
+/// - `flake8-tidy-imports.ban-relative-imports`
+///
+/// ## Example
+/// ```python
+/// from .. import foo
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from mypkg import foo
+/// ```
+///
+/// [PEP 8]: https://peps.python.org/pep-0008/#imports
+#[violation]
+pub struct RelativeImports {
+    strictness: Strictness,
+}
+
+impl Violation for RelativeImports {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        match self.strictness {
+            Strictness::Parents => format!("Relative imports from parent modules are banned"),
+            Strictness::All => format!("Relative imports are banned"),
+        }
+    }
+
+    fn autofix_title(&self) -> Option<String> {
+        let RelativeImports { strictness } = self;
+        Some(match strictness {
+            Strictness::Parents => {
+                "Replace relative imports from parent modules with absolute imports".to_string()
+            }
+            Strictness::All => "Replace relative imports with absolute imports".to_string(),
+        })
+    }
+}
+
+fn fix_banned_relative_import(
+    stmt: &Stmt,
+    level: Option<u32>,
+    module: Option<&str>,
+    module_path: Option<&[String]>,
+    generator: Generator,
+) -> Option<Fix> {
+    // Only fix is the module path is known.
+    let Some(module_path) = resolve_imported_module_path(level, module, module_path) else {
+        return None;
+    };
+
+    // Require import to be a valid module:
+    // https://python.org/dev/peps/pep-0008/#package-and-module-names
+    if !module_path.split('.').all(is_identifier) {
+        return None;
+    }
+
+    let Stmt::ImportFrom(ast::StmtImportFrom { names, .. }) = stmt else {
+        panic!("Expected Stmt::ImportFrom");
+    };
+    let node = ast::StmtImportFrom {
+        module: Some(module_path.to_string().into()),
+        names: names.clone(),
+        level: Some(Int::new(0)),
+        range: TextRange::default(),
+    };
+    let content = generator.stmt(&node.into());
+    #[allow(deprecated)]
+    Some(Fix::unspecified(Edit::range_replacement(
+        content,
+        stmt.range(),
+    )))
+}
+
+/// TID252
+pub(crate) fn banned_relative_import(
+    checker: &Checker,
+    stmt: &Stmt,
+    level: Option<u32>,
+    module: Option<&str>,
+    module_path: Option<&[String]>,
+    strictness: Strictness,
+) -> Option<Diagnostic> {
+    let strictness_level = match strictness {
+        Strictness::All => 0,
+        Strictness::Parents => 1,
+    };
+    if level? > strictness_level {
+        let mut diagnostic = Diagnostic::new(RelativeImports { strictness }, stmt.range());
+        if checker.patch(diagnostic.kind.rule()) {
+            if let Some(fix) =
+                fix_banned_relative_import(stmt, level, module, module_path, checker.generator())
+            {
+                diagnostic.set_fix(fix);
+            };
+        }
+        Some(diagnostic)
+    } else {
+        None
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_tidy_imports/settings.rs b/crates/ruff/src/rules/flake8_tidy_imports/settings.rs
new file mode 100644
index 0000000000000..90b2843280f27
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_tidy_imports/settings.rs
@@ -0,0 +1,29 @@
+use rustc_hash::FxHashMap;
+use serde::{Deserialize, Serialize};
+
+use ruff_macros::CacheKey;
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, CacheKey)]
+#[serde(deny_unknown_fields, rename_all = "kebab-case")]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+pub struct ApiBan {
+    /// The message to display when the API is used.
+    pub msg: String,
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize, CacheKey, Default)]
+#[serde(deny_unknown_fields, rename_all = "kebab-case")]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+pub enum Strictness {
+    /// Ban imports that extend into the parent module or beyond.
+    #[default]
+    Parents,
+    /// Ban all relative imports.
+    All,
+}
+
+#[derive(Debug, CacheKey, Default)]
+pub struct Settings {
+    pub ban_relative_imports: Strictness,
+    pub banned_api: FxHashMap<String, ApiBan>,
+}
diff --git a/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__relative_imports__tests__ban_all_imports.snap b/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__tests__ban_all_imports.snap
similarity index 83%
rename from crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__relative_imports__tests__ban_all_imports.snap
rename to crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__tests__ban_all_imports.snap
index 7671d1cb6a7f6..d3b952fa33274 100644
--- a/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__relative_imports__tests__ban_all_imports.snap
+++ b/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__tests__ban_all_imports.snap
@@ -1,7 +1,7 @@
 ---
-source: crates/ruff/src/rules/flake8_tidy_imports/relative_imports.rs
+source: crates/ruff/src/rules/flake8_tidy_imports/mod.rs
 ---
-TID252.py:7:1: TID252 [*] Relative imports are banned
+TID252.py:7:1: TID252 Relative imports are banned
    |
  7 | # TID252
  8 | from . import sibling
@@ -11,7 +11,7 @@ TID252.py:7:1: TID252 [*] Relative imports are banned
    |
    = help: Replace relative imports with absolute imports
 
-TID252.py:8:1: TID252 [*] Relative imports are banned
+TID252.py:8:1: TID252 Relative imports are banned
    |
  8 | # TID252
  9 | from . import sibling
@@ -22,7 +22,7 @@ TID252.py:8:1: TID252 [*] Relative imports are banned
    |
    = help: Replace relative imports with absolute imports
 
-TID252.py:9:1: TID252 [*] Relative imports are banned
+TID252.py:9:1: TID252 Relative imports are banned
    |
  9 | from . import sibling
 10 | from .sibling import example
@@ -33,7 +33,7 @@ TID252.py:9:1: TID252 [*] Relative imports are banned
    |
    = help: Replace relative imports with absolute imports
 
-TID252.py:10:1: TID252 [*] Relative imports are banned
+TID252.py:10:1: TID252 Relative imports are banned
    |
 10 | from .sibling import example
 11 | from .. import parent
@@ -44,7 +44,7 @@ TID252.py:10:1: TID252 [*] Relative imports are banned
    |
    = help: Replace relative imports with absolute imports
 
-TID252.py:11:1: TID252 [*] Relative imports are banned
+TID252.py:11:1: TID252 Relative imports are banned
    |
 11 | from .. import parent
 12 | from ..parent import example
@@ -55,7 +55,7 @@ TID252.py:11:1: TID252 [*] Relative imports are banned
    |
    = help: Replace relative imports with absolute imports
 
-TID252.py:12:1: TID252 [*] Relative imports are banned
+TID252.py:12:1: TID252 Relative imports are banned
    |
 12 | from ..parent import example
 13 | from ... import grandparent
@@ -66,7 +66,7 @@ TID252.py:12:1: TID252 [*] Relative imports are banned
    |
    = help: Replace relative imports with absolute imports
 
-TID252.py:13:1: TID252 [*] Relative imports are banned
+TID252.py:13:1: TID252 Relative imports are banned
    |
 13 | from ... import grandparent
 14 | from ...grandparent import example
@@ -77,7 +77,7 @@ TID252.py:13:1: TID252 [*] Relative imports are banned
    |
    = help: Replace relative imports with absolute imports
 
-TID252.py:14:1: TID252 [*] Relative imports are banned
+TID252.py:14:1: TID252 Relative imports are banned
    |
 14 |   from ...grandparent import example
 15 |   from  .parent import hello
@@ -90,7 +90,7 @@ TID252.py:14:1: TID252 [*] Relative imports are banned
    |
    = help: Replace relative imports with absolute imports
 
-TID252.py:17:1: TID252 [*] Relative imports are banned
+TID252.py:17:1: TID252 Relative imports are banned
    |
 17 |       parent import \
 18 |           hello_world
@@ -104,7 +104,7 @@ TID252.py:17:1: TID252 [*] Relative imports are banned
    |
    = help: Replace relative imports with absolute imports
 
-TID252.py:21:1: TID252 [*] Relative imports are banned
+TID252.py:21:1: TID252 Relative imports are banned
    |
 21 |     import \
 22 |     world_hello
@@ -115,7 +115,7 @@ TID252.py:21:1: TID252 [*] Relative imports are banned
    |
    = help: Replace relative imports with absolute imports
 
-TID252.py:22:1: TID252 [*] Relative imports are banned
+TID252.py:22:1: TID252 Relative imports are banned
    |
 22 |     world_hello
 23 | from ..... import ultragrantparent
@@ -126,7 +126,7 @@ TID252.py:22:1: TID252 [*] Relative imports are banned
    |
    = help: Replace relative imports with absolute imports
 
-TID252.py:23:1: TID252 [*] Relative imports are banned
+TID252.py:23:1: TID252 Relative imports are banned
    |
 23 | from ..... import ultragrantparent
 24 | from ...... import ultragrantparent
@@ -137,7 +137,7 @@ TID252.py:23:1: TID252 [*] Relative imports are banned
    |
    = help: Replace relative imports with absolute imports
 
-TID252.py:24:1: TID252 [*] Relative imports are banned
+TID252.py:24:1: TID252 Relative imports are banned
    |
 24 | from ...... import ultragrantparent
 25 | from ....... import ultragrantparent
@@ -148,7 +148,7 @@ TID252.py:24:1: TID252 [*] Relative imports are banned
    |
    = help: Replace relative imports with absolute imports
 
-TID252.py:25:1: TID252 [*] Relative imports are banned
+TID252.py:25:1: TID252 Relative imports are banned
    |
 25 | from ....... import ultragrantparent
 26 | from ......... import ultragrantparent
@@ -159,7 +159,7 @@ TID252.py:25:1: TID252 [*] Relative imports are banned
    |
    = help: Replace relative imports with absolute imports
 
-TID252.py:26:1: TID252 [*] Relative imports are banned
+TID252.py:26:1: TID252 Relative imports are banned
    |
 26 | from ......... import ultragrantparent
 27 | from ........................... import ultragrantparent
@@ -170,7 +170,7 @@ TID252.py:26:1: TID252 [*] Relative imports are banned
    |
    = help: Replace relative imports with absolute imports
 
-TID252.py:27:1: TID252 [*] Relative imports are banned
+TID252.py:27:1: TID252 Relative imports are banned
    |
 27 | from ........................... import ultragrantparent
 28 | from .....parent import ultragrantparent
@@ -180,7 +180,7 @@ TID252.py:27:1: TID252 [*] Relative imports are banned
    |
    = help: Replace relative imports with absolute imports
 
-TID252.py:28:1: TID252 [*] Relative imports are banned
+TID252.py:28:1: TID252 Relative imports are banned
    |
 28 | from .....parent import ultragrantparent
 29 | from .........parent import ultragrantparent
diff --git a/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__relative_imports__tests__ban_parent_imports.snap b/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__tests__ban_parent_imports.snap
similarity index 80%
rename from crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__relative_imports__tests__ban_parent_imports.snap
rename to crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__tests__ban_parent_imports.snap
index 0710e06140d2e..39c572fb0f31b 100644
--- a/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__relative_imports__tests__ban_parent_imports.snap
+++ b/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__tests__ban_parent_imports.snap
@@ -1,7 +1,7 @@
 ---
-source: crates/ruff/src/rules/flake8_tidy_imports/relative_imports.rs
+source: crates/ruff/src/rules/flake8_tidy_imports/mod.rs
 ---
-TID252.py:9:1: TID252 [*] Relative imports from parent modules are banned
+TID252.py:9:1: TID252 Relative imports from parent modules are banned
    |
  9 | from . import sibling
 10 | from .sibling import example
@@ -12,7 +12,7 @@ TID252.py:9:1: TID252 [*] Relative imports from parent modules are banned
    |
    = help: Replace relative imports from parent modules with absolute imports
 
-TID252.py:10:1: TID252 [*] Relative imports from parent modules are banned
+TID252.py:10:1: TID252 Relative imports from parent modules are banned
    |
 10 | from .sibling import example
 11 | from .. import parent
@@ -23,7 +23,7 @@ TID252.py:10:1: TID252 [*] Relative imports from parent modules are banned
    |
    = help: Replace relative imports from parent modules with absolute imports
 
-TID252.py:11:1: TID252 [*] Relative imports from parent modules are banned
+TID252.py:11:1: TID252 Relative imports from parent modules are banned
    |
 11 | from .. import parent
 12 | from ..parent import example
@@ -34,7 +34,7 @@ TID252.py:11:1: TID252 [*] Relative imports from parent modules are banned
    |
    = help: Replace relative imports from parent modules with absolute imports
 
-TID252.py:12:1: TID252 [*] Relative imports from parent modules are banned
+TID252.py:12:1: TID252 Relative imports from parent modules are banned
    |
 12 | from ..parent import example
 13 | from ... import grandparent
@@ -45,7 +45,7 @@ TID252.py:12:1: TID252 [*] Relative imports from parent modules are banned
    |
    = help: Replace relative imports from parent modules with absolute imports
 
-TID252.py:17:1: TID252 [*] Relative imports from parent modules are banned
+TID252.py:17:1: TID252 Relative imports from parent modules are banned
    |
 17 |       parent import \
 18 |           hello_world
@@ -59,7 +59,7 @@ TID252.py:17:1: TID252 [*] Relative imports from parent modules are banned
    |
    = help: Replace relative imports from parent modules with absolute imports
 
-TID252.py:21:1: TID252 [*] Relative imports from parent modules are banned
+TID252.py:21:1: TID252 Relative imports from parent modules are banned
    |
 21 |     import \
 22 |     world_hello
@@ -70,7 +70,7 @@ TID252.py:21:1: TID252 [*] Relative imports from parent modules are banned
    |
    = help: Replace relative imports from parent modules with absolute imports
 
-TID252.py:22:1: TID252 [*] Relative imports from parent modules are banned
+TID252.py:22:1: TID252 Relative imports from parent modules are banned
    |
 22 |     world_hello
 23 | from ..... import ultragrantparent
@@ -81,7 +81,7 @@ TID252.py:22:1: TID252 [*] Relative imports from parent modules are banned
    |
    = help: Replace relative imports from parent modules with absolute imports
 
-TID252.py:23:1: TID252 [*] Relative imports from parent modules are banned
+TID252.py:23:1: TID252 Relative imports from parent modules are banned
    |
 23 | from ..... import ultragrantparent
 24 | from ...... import ultragrantparent
@@ -92,7 +92,7 @@ TID252.py:23:1: TID252 [*] Relative imports from parent modules are banned
    |
    = help: Replace relative imports from parent modules with absolute imports
 
-TID252.py:24:1: TID252 [*] Relative imports from parent modules are banned
+TID252.py:24:1: TID252 Relative imports from parent modules are banned
    |
 24 | from ...... import ultragrantparent
 25 | from ....... import ultragrantparent
@@ -103,7 +103,7 @@ TID252.py:24:1: TID252 [*] Relative imports from parent modules are banned
    |
    = help: Replace relative imports from parent modules with absolute imports
 
-TID252.py:25:1: TID252 [*] Relative imports from parent modules are banned
+TID252.py:25:1: TID252 Relative imports from parent modules are banned
    |
 25 | from ....... import ultragrantparent
 26 | from ......... import ultragrantparent
@@ -114,7 +114,7 @@ TID252.py:25:1: TID252 [*] Relative imports from parent modules are banned
    |
    = help: Replace relative imports from parent modules with absolute imports
 
-TID252.py:26:1: TID252 [*] Relative imports from parent modules are banned
+TID252.py:26:1: TID252 Relative imports from parent modules are banned
    |
 26 | from ......... import ultragrantparent
 27 | from ........................... import ultragrantparent
@@ -125,7 +125,7 @@ TID252.py:26:1: TID252 [*] Relative imports from parent modules are banned
    |
    = help: Replace relative imports from parent modules with absolute imports
 
-TID252.py:27:1: TID252 [*] Relative imports from parent modules are banned
+TID252.py:27:1: TID252 Relative imports from parent modules are banned
    |
 27 | from ........................... import ultragrantparent
 28 | from .....parent import ultragrantparent
@@ -135,7 +135,7 @@ TID252.py:27:1: TID252 [*] Relative imports from parent modules are banned
    |
    = help: Replace relative imports from parent modules with absolute imports
 
-TID252.py:28:1: TID252 [*] Relative imports from parent modules are banned
+TID252.py:28:1: TID252 Relative imports from parent modules are banned
    |
 28 | from .....parent import ultragrantparent
 29 | from .........parent import ultragrantparent
diff --git a/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__relative_imports__tests__ban_parent_imports_package.snap b/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__tests__ban_parent_imports_package.snap
similarity index 96%
rename from crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__relative_imports__tests__ban_parent_imports_package.snap
rename to crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__tests__ban_parent_imports_package.snap
index 4540a39530898..d3c132753c67f 100644
--- a/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__relative_imports__tests__ban_parent_imports_package.snap
+++ b/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__tests__ban_parent_imports_package.snap
@@ -1,7 +1,7 @@
 ---
-source: crates/ruff/src/rules/flake8_tidy_imports/relative_imports.rs
+source: crates/ruff/src/rules/flake8_tidy_imports/mod.rs
 ---
-application.py:5:1: TID252 [*] Relative imports from parent modules are banned
+application.py:5:1: TID252 Relative imports from parent modules are banned
   |
 5 | import attrs
 6 | 
diff --git a/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__banned_api__tests__banned_api.snap b/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__tests__banned_api.snap
similarity index 97%
rename from crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__banned_api__tests__banned_api.snap
rename to crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__tests__banned_api.snap
index 0fcbbaf94d1ea..442a0838f976e 100644
--- a/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__banned_api__tests__banned_api.snap
+++ b/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__tests__banned_api.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/src/rules/flake8_tidy_imports/banned_api.rs
+source: crates/ruff/src/rules/flake8_tidy_imports/mod.rs
 ---
 TID251.py:2:8: TID251 `cgi` is banned: The cgi module is deprecated.
   |
diff --git a/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__banned_api__tests__banned_api_package.snap b/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__tests__banned_api_package.snap
similarity index 92%
rename from crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__banned_api__tests__banned_api_package.snap
rename to crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__tests__banned_api_package.snap
index d11d98610f288..bceabe72a2d2b 100644
--- a/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__banned_api__tests__banned_api_package.snap
+++ b/crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__tests__banned_api_package.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/src/rules/flake8_tidy_imports/banned_api.rs
+source: crates/ruff/src/rules/flake8_tidy_imports/mod.rs
 ---
 application.py:3:8: TID251 `attrs` is banned: The attrs module is deprecated.
   |
diff --git a/crates/ruff/src/rules/flake8_todos/mod.rs b/crates/ruff/src/rules/flake8_todos/mod.rs
new file mode 100644
index 0000000000000..3c305275996bb
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_todos/mod.rs
@@ -0,0 +1,31 @@
+pub(crate) mod rules;
+
+#[cfg(test)]
+mod tests {
+    use std::convert::AsRef;
+    use std::path::Path;
+
+    use anyhow::Result;
+    use test_case::test_case;
+
+    use crate::registry::Rule;
+    use crate::test::test_path;
+    use crate::{assert_messages, settings};
+
+    #[test_case(Rule::InvalidTodoTag, Path::new("TD001.py"))]
+    #[test_case(Rule::MissingTodoAuthor, Path::new("TD002.py"))]
+    #[test_case(Rule::MissingTodoLink, Path::new("TD003.py"))]
+    #[test_case(Rule::MissingTodoColon, Path::new("TD004.py"))]
+    #[test_case(Rule::MissingTodoDescription, Path::new("TD005.py"))]
+    #[test_case(Rule::InvalidTodoCapitalization, Path::new("TD006.py"))]
+    #[test_case(Rule::MissingSpaceAfterTodoColon, Path::new("TD007.py"))]
+    fn rules(rule_code: Rule, path: &Path) -> Result<()> {
+        let snapshot = format!("{}_{}", rule_code.as_ref(), path.to_string_lossy());
+        let diagnostics = test_path(
+            Path::new("flake8_todos").join(path).as_path(),
+            &settings::Settings::for_rule(rule_code),
+        )?;
+        assert_messages!(snapshot, diagnostics);
+        Ok(())
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_todos/rules/mod.rs b/crates/ruff/src/rules/flake8_todos/rules/mod.rs
new file mode 100644
index 0000000000000..dd10c6bc3ba80
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_todos/rules/mod.rs
@@ -0,0 +1,6 @@
+pub(crate) use todos::{
+    todos, InvalidTodoCapitalization, InvalidTodoTag, MissingSpaceAfterTodoColon,
+    MissingTodoAuthor, MissingTodoColon, MissingTodoDescription, MissingTodoLink,
+};
+
+mod todos;
diff --git a/crates/ruff/src/rules/flake8_todos/rules/todos.rs b/crates/ruff/src/rules/flake8_todos/rules/todos.rs
new file mode 100644
index 0000000000000..07fc25b2cf877
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_todos/rules/todos.rs
@@ -0,0 +1,386 @@
+use once_cell::sync::Lazy;
+use regex::RegexSet;
+use ruff_python_ast::source_code::{Indexer, Locator};
+use ruff_text_size::{TextLen, TextRange, TextSize};
+
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::{
+    directives::{TodoComment, TodoDirective, TodoDirectiveKind},
+    registry::Rule,
+    settings::Settings,
+};
+
+/// ## What it does
+/// Checks that a TODO comment is labelled with "TODO".
+///
+/// ## Why is this bad?
+/// Ambiguous tags reduce code visibility and can lead to dangling TODOs.
+/// For example, if a comment is tagged with "FIXME" rather than "TODO", it may
+/// be overlooked by future readers.
+///
+/// Note that this rule will only flag "FIXME" and "XXX" tags as incorrect.
+///
+/// ## Example
+/// ```python
+/// # FIXME(ruff): this should get fixed!
+/// ```
+///
+/// Use instead:
+/// ```python
+/// # TODO(ruff): this is now fixed!
+/// ```
+#[violation]
+pub struct InvalidTodoTag {
+    pub tag: String,
+}
+
+impl Violation for InvalidTodoTag {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let InvalidTodoTag { tag } = self;
+        format!("Invalid TODO tag: `{tag}`")
+    }
+}
+
+/// ## What it does
+/// Checks that a TODO comment includes an author.
+///
+/// ## Why is this bad?
+/// Including an author on a TODO provides future readers with context around
+/// the issue. While the TODO author is not always considered responsible for
+/// fixing the issue, they are typically the individual with the most context.
+///
+/// ## Example
+/// ```python
+/// # TODO: should assign an author here
+/// ```
+///
+/// Use instead
+/// ```python
+/// # TODO(charlie): now an author is assigned
+/// ```
+#[violation]
+pub struct MissingTodoAuthor;
+
+impl Violation for MissingTodoAuthor {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Missing author in TODO; try: `# TODO(<author_name>): ...`")
+    }
+}
+
+/// ## What it does
+/// Checks that a TODO comment is associated with a link to a relevant issue
+/// or ticket.
+///
+/// ## Why is this bad?
+/// Including an issue link near a TODO makes it easier for resolvers
+/// to get context around the issue.
+///
+/// ## Example
+/// ```python
+/// # TODO: this link has no issue
+/// ```
+///
+/// Use one of these instead:
+/// ```python
+/// # TODO(charlie): this comment has an issue link
+/// # https://github.com/charliermarsh/ruff/issues/3870
+///
+/// # TODO(charlie): this comment has a 3-digit issue code
+/// # 003
+///
+/// # TODO(charlie): this comment has an issue code of (up to) 6 characters, then digits
+/// # SIXCHR-003
+/// ```
+#[violation]
+pub struct MissingTodoLink;
+
+impl Violation for MissingTodoLink {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Missing issue link on the line following this TODO")
+    }
+}
+
+/// ## What it does
+/// Checks that a "TODO" tag is followed by a colon.
+///
+/// ## Why is this bad?
+/// "TODO" tags are typically followed by a parenthesized author name, a colon,
+/// a space, and a description of the issue, in that order.
+///
+/// Deviating from this pattern can lead to inconsistent and non-idiomatic
+/// comments.
+///
+/// ## Example
+/// ```python
+/// # TODO(charlie) fix this colon
+/// ```
+///
+/// Used instead:
+/// ```python
+/// # TODO(charlie): colon fixed
+/// ```
+#[violation]
+pub struct MissingTodoColon;
+
+impl Violation for MissingTodoColon {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Missing colon in TODO")
+    }
+}
+
+/// ## What it does
+/// Checks that a "TODO" tag contains a description of the issue following the
+/// tag itself.
+///
+/// ## Why is this bad?
+/// TODO comments should include a description of the issue to provide context
+/// for future readers.
+///
+/// ## Example
+/// ```python
+/// # TODO(charlie)
+/// ```
+///
+/// Use instead:
+/// ```python
+/// # TODO(charlie): fix some issue
+/// ```
+#[violation]
+pub struct MissingTodoDescription;
+
+impl Violation for MissingTodoDescription {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Missing issue description after `TODO`")
+    }
+}
+
+/// ## What it does
+/// Checks that a "TODO" tag is properly capitalized (i.e., that the tag is
+/// uppercase).
+///
+/// ## Why is this bad?
+/// Capitalizing the "TODO" in a TODO comment is a convention that makes it
+/// easier for future readers to identify TODOs.
+///
+/// ## Example
+/// ```python
+/// # todo(charlie): capitalize this
+/// ```
+///
+/// Use instead:
+/// ```python
+/// # TODO(charlie): this is capitalized
+/// ```
+#[violation]
+pub struct InvalidTodoCapitalization {
+    tag: String,
+}
+
+impl AlwaysAutofixableViolation for InvalidTodoCapitalization {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let InvalidTodoCapitalization { tag } = self;
+        format!("Invalid TODO capitalization: `{tag}` should be `TODO`")
+    }
+
+    fn autofix_title(&self) -> String {
+        let InvalidTodoCapitalization { tag } = self;
+        format!("Replace `{tag}` with `TODO`")
+    }
+}
+
+/// ## What it does
+/// Checks that the colon after a "TODO" tag is followed by a space.
+///
+/// ## Why is this bad?
+/// "TODO" tags are typically followed by a parenthesized author name, a colon,
+/// a space, and a description of the issue, in that order.
+///
+/// Deviating from this pattern can lead to inconsistent and non-idiomatic
+/// comments.
+///
+/// ## Example
+/// ```python
+/// # TODO(charlie):fix this
+/// ```
+///
+/// Use instead:
+/// ```python
+/// # TODO(charlie): fix this
+/// ```
+#[violation]
+pub struct MissingSpaceAfterTodoColon;
+
+impl Violation for MissingSpaceAfterTodoColon {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Missing space after colon in TODO")
+    }
+}
+
+static ISSUE_LINK_REGEX_SET: Lazy<RegexSet> = Lazy::new(|| {
+    RegexSet::new([
+        r#"^#\s*(http|https)://.*"#, // issue link
+        r#"^#\s*\d+$"#,              // issue code - like "003"
+        r#"^#\s*[A-Z]{1,6}\-?\d+$"#, // issue code - like "TD003" or "TD-003"
+    ])
+    .unwrap()
+});
+
+pub(crate) fn todos(
+    todo_comments: &[TodoComment],
+    indexer: &Indexer,
+    locator: &Locator,
+    settings: &Settings,
+) -> Vec<Diagnostic> {
+    let mut diagnostics: Vec<Diagnostic> = vec![];
+
+    for todo_comment in todo_comments {
+        let TodoComment {
+            directive,
+            content,
+            range_index,
+            ..
+        } = todo_comment;
+        let range = todo_comment.range;
+
+        // flake8-todos doesn't support HACK directives.
+        if matches!(directive.kind, TodoDirectiveKind::Hack) {
+            continue;
+        }
+
+        directive_errors(directive, &mut diagnostics, settings);
+        static_errors(&mut diagnostics, content, range, directive);
+
+        let mut has_issue_link = false;
+        let mut curr_range = range;
+        for next_range in indexer
+            .comment_ranges()
+            .iter()
+            .skip(range_index + 1)
+            .copied()
+        {
+            // Ensure that next_comment_range is in the same multiline comment "block" as
+            // comment_range.
+            if !locator
+                .slice(TextRange::new(curr_range.end(), next_range.start()))
+                .chars()
+                .all(char::is_whitespace)
+            {
+                break;
+            }
+
+            let next_comment = locator.slice(next_range);
+            if TodoDirective::from_comment(next_comment, next_range).is_some() {
+                break;
+            }
+
+            if ISSUE_LINK_REGEX_SET.is_match(next_comment) {
+                has_issue_link = true;
+            }
+
+            // If the next_comment isn't a tag or an issue, it's worthles in the context of this
+            // linter. We can increment here instead of waiting for the next iteration of the outer
+            // loop.
+            curr_range = next_range;
+        }
+
+        if !has_issue_link {
+            // TD003
+            diagnostics.push(Diagnostic::new(MissingTodoLink, directive.range));
+        }
+    }
+
+    diagnostics
+}
+
+/// Check that the directive itself is valid. This function modifies `diagnostics` in-place.
+fn directive_errors(
+    directive: &TodoDirective,
+    diagnostics: &mut Vec<Diagnostic>,
+    settings: &Settings,
+) {
+    if directive.content == "TODO" {
+        return;
+    }
+
+    if directive.content.to_uppercase() == "TODO" {
+        // TD006
+        let mut diagnostic = Diagnostic::new(
+            InvalidTodoCapitalization {
+                tag: directive.content.to_string(),
+            },
+            directive.range,
+        );
+
+        if settings.rules.should_fix(Rule::InvalidTodoCapitalization) {
+            diagnostic.set_fix(Fix::automatic(Edit::range_replacement(
+                "TODO".to_string(),
+                directive.range,
+            )));
+        }
+
+        diagnostics.push(diagnostic);
+    } else {
+        // TD001
+        diagnostics.push(Diagnostic::new(
+            InvalidTodoTag {
+                tag: directive.content.to_string(),
+            },
+            directive.range,
+        ));
+    }
+}
+
+/// Checks for "static" errors in the comment: missing colon, missing author, etc. This function
+/// modifies `diagnostics` in-place.
+fn static_errors(
+    diagnostics: &mut Vec<Diagnostic>,
+    comment: &str,
+    comment_range: TextRange,
+    directive: &TodoDirective,
+) {
+    let post_directive = &comment[usize::from(directive.range.end() - comment_range.start())..];
+    let trimmed = post_directive.trim_start();
+    let content_offset = post_directive.text_len() - trimmed.text_len();
+
+    let author_end = content_offset
+        + if trimmed.starts_with('(') {
+            if let Some(end_index) = trimmed.find(')') {
+                TextSize::try_from(end_index + 1).unwrap()
+            } else {
+                trimmed.text_len()
+            }
+        } else {
+            // TD002
+            diagnostics.push(Diagnostic::new(MissingTodoAuthor, directive.range));
+
+            TextSize::new(0)
+        };
+
+    let after_author = &post_directive[usize::from(author_end)..];
+    if let Some(after_colon) = after_author.strip_prefix(':') {
+        if after_colon.is_empty() {
+            // TD005
+            diagnostics.push(Diagnostic::new(MissingTodoDescription, directive.range));
+        } else if !after_colon.starts_with(char::is_whitespace) {
+            // TD007
+            diagnostics.push(Diagnostic::new(MissingSpaceAfterTodoColon, directive.range));
+        }
+    } else {
+        // TD004
+        diagnostics.push(Diagnostic::new(MissingTodoColon, directive.range));
+
+        if after_author.is_empty() {
+            // TD005
+            diagnostics.push(Diagnostic::new(MissingTodoDescription, directive.range));
+        }
+    }
+}
diff --git a/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__invalid-todo-capitalization_TD006.py.snap b/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__invalid-todo-capitalization_TD006.py.snap
new file mode 100644
index 0000000000000..1806934b04b46
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__invalid-todo-capitalization_TD006.py.snap
@@ -0,0 +1,58 @@
+---
+source: crates/ruff/src/rules/flake8_todos/mod.rs
+---
+TD006.py:4:3: TD006 [*] Invalid TODO capitalization: `ToDo` should be `TODO`
+  |
+4 | # TODO (evanrittenhouse): this is a valid TODO
+5 | # TDO006 - error
+6 | # ToDo (evanrittenhouse): invalid capitalization
+  |   ^^^^ TD006
+7 | # todo (evanrittenhouse): another invalid capitalization
+8 | # foo # todo: invalid capitalization
+  |
+  = help: Replace `ToDo` with `TODO`
+
+ℹ Fix
+1 1 | # TDO006 - accepted
+2 2 | # TODO (evanrittenhouse): this is a valid TODO
+3 3 | # TDO006 - error
+4   |-# ToDo (evanrittenhouse): invalid capitalization
+  4 |+# TODO (evanrittenhouse): invalid capitalization
+5 5 | # todo (evanrittenhouse): another invalid capitalization
+6 6 | # foo # todo: invalid capitalization
+
+TD006.py:5:3: TD006 [*] Invalid TODO capitalization: `todo` should be `TODO`
+  |
+5 | # TDO006 - error
+6 | # ToDo (evanrittenhouse): invalid capitalization
+7 | # todo (evanrittenhouse): another invalid capitalization
+  |   ^^^^ TD006
+8 | # foo # todo: invalid capitalization
+  |
+  = help: Replace `todo` with `TODO`
+
+ℹ Fix
+2 2 | # TODO (evanrittenhouse): this is a valid TODO
+3 3 | # TDO006 - error
+4 4 | # ToDo (evanrittenhouse): invalid capitalization
+5   |-# todo (evanrittenhouse): another invalid capitalization
+  5 |+# TODO (evanrittenhouse): another invalid capitalization
+6 6 | # foo # todo: invalid capitalization
+
+TD006.py:6:9: TD006 [*] Invalid TODO capitalization: `todo` should be `TODO`
+  |
+6 | # ToDo (evanrittenhouse): invalid capitalization
+7 | # todo (evanrittenhouse): another invalid capitalization
+8 | # foo # todo: invalid capitalization
+  |         ^^^^ TD006
+  |
+  = help: Replace `todo` with `TODO`
+
+ℹ Fix
+3 3 | # TDO006 - error
+4 4 | # ToDo (evanrittenhouse): invalid capitalization
+5 5 | # todo (evanrittenhouse): another invalid capitalization
+6   |-# foo # todo: invalid capitalization
+  6 |+# foo # TODO: invalid capitalization
+
+
diff --git a/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__invalid-todo-tag_TD001.py.snap b/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__invalid-todo-tag_TD001.py.snap
new file mode 100644
index 0000000000000..b0f31abd45429
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__invalid-todo-tag_TD001.py.snap
@@ -0,0 +1,30 @@
+---
+source: crates/ruff/src/rules/flake8_todos/mod.rs
+---
+TD001.py:7:3: TD001 Invalid TODO tag: `XXX`
+   |
+ 7 | # T001 - errors
+ 8 | # XXX (evanrittenhouse): this is not fine
+   |   ^^^ TD001
+ 9 | # FIXME (evanrittenhouse): this is not fine
+10 | # foo # XXX: this isn't fine either
+   |
+
+TD001.py:8:3: TD001 Invalid TODO tag: `FIXME`
+   |
+ 8 | # T001 - errors
+ 9 | # XXX (evanrittenhouse): this is not fine
+10 | # FIXME (evanrittenhouse): this is not fine
+   |   ^^^^^ TD001
+11 | # foo # XXX: this isn't fine either
+   |
+
+TD001.py:9:9: TD001 Invalid TODO tag: `XXX`
+   |
+ 9 | # XXX (evanrittenhouse): this is not fine
+10 | # FIXME (evanrittenhouse): this is not fine
+11 | # foo # XXX: this isn't fine either
+   |         ^^^ TD001
+   |
+
+
diff --git a/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__missing-space-after-todo-colon_TD007.py.snap b/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__missing-space-after-todo-colon_TD007.py.snap
new file mode 100644
index 0000000000000..ae1fd2d79b136
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__missing-space-after-todo-colon_TD007.py.snap
@@ -0,0 +1,53 @@
+---
+source: crates/ruff/src/rules/flake8_todos/mod.rs
+---
+TD007.py:5:3: TD007 Missing space after colon in TODO
+  |
+5 | # TODO: so does this
+6 | # T007 - errors
+7 | # TODO(evanrittenhouse):this has no space after a colon
+  |   ^^^^ TD007
+8 | # TODO (evanrittenhouse):this doesn't either
+9 | # TODO:neither does this
+  |
+
+TD007.py:6:3: TD007 Missing space after colon in TODO
+   |
+ 6 | # T007 - errors
+ 7 | # TODO(evanrittenhouse):this has no space after a colon
+ 8 | # TODO (evanrittenhouse):this doesn't either
+   |   ^^^^ TD007
+ 9 | # TODO:neither does this
+10 | # FIXME:and lastly neither does this
+   |
+
+TD007.py:7:3: TD007 Missing space after colon in TODO
+   |
+ 7 | # TODO(evanrittenhouse):this has no space after a colon
+ 8 | # TODO (evanrittenhouse):this doesn't either
+ 9 | # TODO:neither does this
+   |   ^^^^ TD007
+10 | # FIXME:and lastly neither does this
+11 | # foo # TODO:this is really the last one
+   |
+
+TD007.py:8:3: TD007 Missing space after colon in TODO
+   |
+ 8 | # TODO (evanrittenhouse):this doesn't either
+ 9 | # TODO:neither does this
+10 | # FIXME:and lastly neither does this
+   |   ^^^^^ TD007
+11 | # foo # TODO:this is really the last one
+12 | # TODO this colon doesn't terminate the tag, so don't check it. https://www.google.com
+   |
+
+TD007.py:9:9: TD007 Missing space after colon in TODO
+   |
+ 9 | # TODO:neither does this
+10 | # FIXME:and lastly neither does this
+11 | # foo # TODO:this is really the last one
+   |         ^^^^ TD007
+12 | # TODO this colon doesn't terminate the tag, so don't check it. https://www.google.com
+   |
+
+
diff --git a/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__missing-todo-author_TD002.py.snap b/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__missing-todo-author_TD002.py.snap
new file mode 100644
index 0000000000000..1d1f80abceb91
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__missing-todo-author_TD002.py.snap
@@ -0,0 +1,41 @@
+---
+source: crates/ruff/src/rules/flake8_todos/mod.rs
+---
+TD002.py:5:3: TD002 Missing author in TODO; try: `# TODO(<author_name>): ...`
+  |
+5 | # TODO(evanrittenhouse): this also has an author
+6 | # T002 - errors
+7 | # TODO: this has no author
+  |   ^^^^ TD002
+8 | # FIXME: neither does this
+9 | # TODO : and neither does this
+  |
+
+TD002.py:6:3: TD002 Missing author in TODO; try: `# TODO(<author_name>): ...`
+   |
+ 6 | # T002 - errors
+ 7 | # TODO: this has no author
+ 8 | # FIXME: neither does this
+   |   ^^^^^ TD002
+ 9 | # TODO : and neither does this
+10 | # foo # TODO: this doesn't either
+   |
+
+TD002.py:7:3: TD002 Missing author in TODO; try: `# TODO(<author_name>): ...`
+   |
+ 7 | # TODO: this has no author
+ 8 | # FIXME: neither does this
+ 9 | # TODO : and neither does this
+   |   ^^^^ TD002
+10 | # foo # TODO: this doesn't either
+   |
+
+TD002.py:8:9: TD002 Missing author in TODO; try: `# TODO(<author_name>): ...`
+   |
+ 8 | # FIXME: neither does this
+ 9 | # TODO : and neither does this
+10 | # foo # TODO: this doesn't either
+   |         ^^^^ TD002
+   |
+
+
diff --git a/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__missing-todo-colon_TD004.py.snap b/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__missing-todo-colon_TD004.py.snap
new file mode 100644
index 0000000000000..136cc3e46c881
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__missing-todo-colon_TD004.py.snap
@@ -0,0 +1,51 @@
+---
+source: crates/ruff/src/rules/flake8_todos/mod.rs
+---
+TD004.py:4:3: TD004 Missing colon in TODO
+  |
+4 | # TODO(evanrittenhouse): this has a colon
+5 | # T004 - errors
+6 | # TODO this has no colon
+  |   ^^^^ TD004
+7 | # TODO(evanrittenhouse 😀) this has no colon
+8 | # FIXME add a colon
+  |
+
+TD004.py:5:3: TD004 Missing colon in TODO
+  |
+5 | # T004 - errors
+6 | # TODO this has no colon
+7 | # TODO(evanrittenhouse 😀) this has no colon
+  |   ^^^^ TD004
+8 | # FIXME add a colon
+9 | # foo # TODO add a colon
+  |
+
+TD004.py:6:3: TD004 Missing colon in TODO
+   |
+ 6 | # TODO this has no colon
+ 7 | # TODO(evanrittenhouse 😀) this has no colon
+ 8 | # FIXME add a colon
+   |   ^^^^^ TD004
+ 9 | # foo # TODO add a colon
+10 | # TODO this has a colon but it doesn't terminate the tag, so this should throw. https://www.google.com
+   |
+
+TD004.py:7:9: TD004 Missing colon in TODO
+   |
+ 7 | # TODO(evanrittenhouse 😀) this has no colon
+ 8 | # FIXME add a colon
+ 9 | # foo # TODO add a colon
+   |         ^^^^ TD004
+10 | # TODO this has a colon but it doesn't terminate the tag, so this should throw. https://www.google.com
+   |
+
+TD004.py:8:3: TD004 Missing colon in TODO
+   |
+ 8 | # FIXME add a colon
+ 9 | # foo # TODO add a colon
+10 | # TODO this has a colon but it doesn't terminate the tag, so this should throw. https://www.google.com
+   |   ^^^^ TD004
+   |
+
+
diff --git a/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__missing-todo-description_TD005.py.snap b/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__missing-todo-description_TD005.py.snap
new file mode 100644
index 0000000000000..42d4b11d99703
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__missing-todo-description_TD005.py.snap
@@ -0,0 +1,41 @@
+---
+source: crates/ruff/src/rules/flake8_todos/mod.rs
+---
+TD005.py:4:3: TD005 Missing issue description after `TODO`
+  |
+4 | # TODO(evanrittenhouse): this has text, while the errors do not
+5 | # T005 - errors
+6 | # TODO(evanrittenhouse):
+  |   ^^^^ TD005
+7 | # TODO(evanrittenhouse)
+8 | # FIXME
+  |
+
+TD005.py:5:3: TD005 Missing issue description after `TODO`
+  |
+5 | # T005 - errors
+6 | # TODO(evanrittenhouse):
+7 | # TODO(evanrittenhouse)
+  |   ^^^^ TD005
+8 | # FIXME
+9 | # foo # TODO
+  |
+
+TD005.py:6:3: TD005 Missing issue description after `TODO`
+  |
+6 | # TODO(evanrittenhouse):
+7 | # TODO(evanrittenhouse)
+8 | # FIXME
+  |   ^^^^^ TD005
+9 | # foo # TODO
+  |
+
+TD005.py:7:9: TD005 Missing issue description after `TODO`
+  |
+7 | # TODO(evanrittenhouse)
+8 | # FIXME
+9 | # foo # TODO
+  |         ^^^^ TD005
+  |
+
+
diff --git a/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__missing-todo-link_TD003.py.snap b/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__missing-todo-link_TD003.py.snap
new file mode 100644
index 0000000000000..4558235455146
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_todos/snapshots/ruff__rules__flake8_todos__tests__missing-todo-link_TD003.py.snap
@@ -0,0 +1,50 @@
+---
+source: crates/ruff/src/rules/flake8_todos/mod.rs
+---
+TD003.py:9:3: TD003 Missing issue link on the line following this TODO
+   |
+ 9 | # TDO003 - errors
+10 | # TODO: this comment has no
+   |   ^^^^ TD003
+11 | # link after it
+   |
+
+TD003.py:12:3: TD003 Missing issue link on the line following this TODO
+   |
+12 | # link after it
+13 | 
+14 | # TODO: here's a TODO with no link after it
+   |   ^^^^ TD003
+15 | def foo(x):
+16 |     return x
+   |
+
+TD003.py:25:3: TD003 Missing issue link on the line following this TODO
+   |
+25 | # TDO-3870
+26 | 
+27 | # TODO: here's a TODO without an issue link
+   |   ^^^^ TD003
+28 | # TODO: followed by a new TODO with an issue link
+29 | # TDO-3870
+   |
+
+TD003.py:29:9: TD003 Missing issue link on the line following this TODO
+   |
+29 | # TDO-3870
+30 | 
+31 | # foo # TODO: no link!
+   |         ^^^^ TD003
+32 | 
+33 | # TODO: here's a TODO on the last line with no link
+   |
+
+TD003.py:31:3: TD003 Missing issue link on the line following this TODO
+   |
+31 | # foo # TODO: no link!
+32 | 
+33 | # TODO: here's a TODO on the last line with no link
+   |   ^^^^ TD003
+   |
+
+
diff --git a/crates/ruff/src/rules/flake8_type_checking/helpers.rs b/crates/ruff/src/rules/flake8_type_checking/helpers.rs
index 86e851e7d9fc3..6b509f058e27e 100644
--- a/crates/ruff/src/rules/flake8_type_checking/helpers.rs
+++ b/crates/ruff/src/rules/flake8_type_checking/helpers.rs
@@ -1,81 +1,52 @@
-use num_traits::Zero;
-use rustpython_parser::ast::{Constant, Expr, ExprKind};
-
 use ruff_python_ast::call_path::from_qualified_name;
 use ruff_python_ast::helpers::map_callable;
-use ruff_python_semantic::binding::{Binding, BindingKind, ExecutionContext};
-use ruff_python_semantic::context::Context;
+use ruff_python_semantic::binding::{Binding, BindingKind};
+use ruff_python_semantic::model::SemanticModel;
 use ruff_python_semantic::scope::ScopeKind;
+use rustpython_parser::ast;
 
-/// Return `true` if [`Expr`] is a guard for a type-checking block.
-pub fn is_type_checking_block(context: &Context, test: &Expr) -> bool {
-    // Ex) `if False:`
-    if matches!(
-        test.node,
-        ExprKind::Constant {
-            value: Constant::Bool(false),
-            ..
-        }
-    ) {
-        return true;
-    }
-
-    // Ex) `if 0:`
-    if let ExprKind::Constant {
-        value: Constant::Int(value),
-        ..
-    } = &test.node
-    {
-        if value.is_zero() {
-            return true;
-        }
-    }
-
-    // Ex) `if typing.TYPE_CHECKING:`
-    if context.resolve_call_path(test).map_or(false, |call_path| {
-        call_path.as_slice() == ["typing", "TYPE_CHECKING"]
-    }) {
-        return true;
-    }
-
-    false
-}
-
-pub const fn is_valid_runtime_import(binding: &Binding) -> bool {
+pub(crate) fn is_valid_runtime_import(semantic_model: &SemanticModel, binding: &Binding) -> bool {
     if matches!(
         binding.kind,
         BindingKind::Importation(..)
             | BindingKind::FromImportation(..)
             | BindingKind::SubmoduleImportation(..)
     ) {
-        binding.runtime_usage.is_some() && matches!(binding.context, ExecutionContext::Runtime)
+        binding.context.is_runtime()
+            && binding.references().any(|reference_id| {
+                semantic_model
+                    .references
+                    .resolve(reference_id)
+                    .context()
+                    .is_runtime()
+            })
     } else {
         false
     }
 }
 
-pub fn runtime_evaluated(
-    context: &Context,
+pub(crate) fn runtime_evaluated(
+    semantic_model: &SemanticModel,
     base_classes: &[String],
     decorators: &[String],
 ) -> bool {
     if !base_classes.is_empty() {
-        if runtime_evaluated_base_class(context, base_classes) {
+        if runtime_evaluated_base_class(semantic_model, base_classes) {
             return true;
         }
     }
     if !decorators.is_empty() {
-        if runtime_evaluated_decorators(context, decorators) {
+        if runtime_evaluated_decorators(semantic_model, decorators) {
             return true;
         }
     }
     false
 }
 
-fn runtime_evaluated_base_class(context: &Context, base_classes: &[String]) -> bool {
-    if let ScopeKind::Class(class_def) = &context.scope().kind {
-        for base in class_def.bases.iter() {
-            if let Some(call_path) = context.resolve_call_path(base) {
+fn runtime_evaluated_base_class(semantic_model: &SemanticModel, base_classes: &[String]) -> bool {
+    if let ScopeKind::Class(ast::StmtClassDef { bases, .. }) = &semantic_model.scope().kind {
+        for base in bases.iter() {
+            if let Some(call_path) = semantic_model.resolve_call_path(base) {
                 if base_classes
                     .iter()
                     .any(|base_class| from_qualified_name(base_class) == call_path)
@@ -88,10 +59,11 @@ fn runtime_evaluated_base_class(context: &Context, base_classes: &[String]) -> b
     false
 }
 
-fn runtime_evaluated_decorators(context: &Context, decorators: &[String]) -> bool {
-    if let ScopeKind::Class(class_def) = &context.scope().kind {
-        for decorator in class_def.decorator_list.iter() {
-            if let Some(call_path) = context.resolve_call_path(map_callable(decorator)) {
+fn runtime_evaluated_decorators(semantic_model: &SemanticModel, decorators: &[String]) -> bool {
+    if let ScopeKind::Class(ast::StmtClassDef { decorator_list, .. }) = &semantic_model.scope().kind
+    {
+        for decorator in decorator_list.iter() {
+            if let Some(call_path) = semantic_model.resolve_call_path(map_callable(decorator)) {
                 if decorators
                     .iter()
                     .any(|decorator| from_qualified_name(decorator) == call_path)
diff --git a/crates/ruff/src/rules/flake8_type_checking/mod.rs b/crates/ruff/src/rules/flake8_type_checking/mod.rs
index cec52d2f45d9c..06ea6ab839a0c 100644
--- a/crates/ruff/src/rules/flake8_type_checking/mod.rs
+++ b/crates/ruff/src/rules/flake8_type_checking/mod.rs
@@ -9,32 +9,31 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
-    use crate::registry::Rule;
-    use crate::test::test_path;
+    use crate::registry::{Linter, Rule};
+    use crate::test::{test_path, test_snippet};
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::TypingOnlyFirstPartyImport, Path::new("TCH001.py"); "TCH001")]
-    #[test_case(Rule::TypingOnlyThirdPartyImport, Path::new("TCH002.py"); "TCH002")]
-    #[test_case(Rule::TypingOnlyStandardLibraryImport, Path::new("TCH003.py"); "TCH003")]
-    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_1.py"); "TCH004_1")]
-    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_2.py"); "TCH004_2")]
-    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_3.py"); "TCH004_3")]
-    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_4.py"); "TCH004_4")]
-    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_5.py"); "TCH004_5")]
-    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_6.py"); "TCH004_6")]
-    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_7.py"); "TCH004_7")]
-    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_8.py"); "TCH004_8")]
-    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_9.py"); "TCH004_9")]
-    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_10.py"); "TCH004_10")]
-    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_11.py"); "TCH004_11")]
-    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_12.py"); "TCH004_12")]
-    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_13.py"); "TCH004_13")]
-    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_14.pyi"); "TCH004_14")]
-    #[test_case(Rule::EmptyTypeCheckingBlock, Path::new("TCH005.py"); "TCH005")]
-    #[test_case(Rule::TypingOnlyThirdPartyImport, Path::new("strict.py"); "strict")]
+    #[test_case(Rule::TypingOnlyFirstPartyImport, Path::new("TCH001.py"))]
+    #[test_case(Rule::TypingOnlyThirdPartyImport, Path::new("TCH002.py"))]
+    #[test_case(Rule::TypingOnlyStandardLibraryImport, Path::new("TCH003.py"))]
+    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_1.py"))]
+    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_2.py"))]
+    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_3.py"))]
+    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_4.py"))]
+    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_5.py"))]
+    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_6.py"))]
+    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_7.py"))]
+    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_8.py"))]
+    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_9.py"))]
+    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_10.py"))]
+    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_11.py"))]
+    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_12.py"))]
+    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_13.py"))]
+    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_14.pyi"))]
+    #[test_case(Rule::EmptyTypeCheckingBlock, Path::new("TCH005.py"))]
+    #[test_case(Rule::TypingOnlyThirdPartyImport, Path::new("strict.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.as_ref(), path.to_string_lossy());
         let diagnostics = test_path(
@@ -45,7 +44,7 @@ mod tests {
         Ok(())
     }
 
-    #[test_case(Rule::TypingOnlyThirdPartyImport, Path::new("strict.py"); "strict")]
+    #[test_case(Rule::TypingOnlyThirdPartyImport, Path::new("strict.py"))]
     fn strict(rule_code: Rule, path: &Path) -> Result<()> {
         let diagnostics = test_path(
             Path::new("flake8_type_checking").join(path).as_path(),
@@ -61,7 +60,7 @@ mod tests {
         Ok(())
     }
 
-    #[test_case(Rule::TypingOnlyThirdPartyImport, Path::new("exempt_modules.py"); "exempt_modules")]
+    #[test_case(Rule::TypingOnlyThirdPartyImport, Path::new("exempt_modules.py"))]
     fn exempt_modules(rule_code: Rule, path: &Path) -> Result<()> {
         let diagnostics = test_path(
             Path::new("flake8_type_checking").join(path).as_path(),
@@ -77,9 +76,18 @@ mod tests {
         Ok(())
     }
 
-    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("runtime_evaluated_base_classes_1.py"); "runtime_evaluated_base_classes_1")]
-    #[test_case(Rule::TypingOnlyThirdPartyImport, Path::new("runtime_evaluated_base_classes_2.py"); "runtime_evaluated_base_classes_2")]
-    #[test_case(Rule::TypingOnlyStandardLibraryImport, Path::new("runtime_evaluated_base_classes_3.py"); "runtime_evaluated_base_classes_3")]
+    #[test_case(
+        Rule::RuntimeImportInTypeCheckingBlock,
+        Path::new("runtime_evaluated_base_classes_1.py")
+    )]
+    #[test_case(
+        Rule::TypingOnlyThirdPartyImport,
+        Path::new("runtime_evaluated_base_classes_2.py")
+    )]
+    #[test_case(
+        Rule::TypingOnlyStandardLibraryImport,
+        Path::new("runtime_evaluated_base_classes_3.py")
+    )]
     fn runtime_evaluated_base_classes(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.as_ref(), path.to_string_lossy());
         let diagnostics = test_path(
@@ -96,9 +104,18 @@ mod tests {
         Ok(())
     }
 
-    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("runtime_evaluated_decorators_1.py"); "runtime_evaluated_decorators_1")]
-    #[test_case(Rule::TypingOnlyThirdPartyImport, Path::new("runtime_evaluated_decorators_2.py"); "runtime_evaluated_decorators_2")]
-    #[test_case(Rule::TypingOnlyStandardLibraryImport, Path::new("runtime_evaluated_decorators_3.py"); "runtime_evaluated_decorators_3")]
+    #[test_case(
+        Rule::RuntimeImportInTypeCheckingBlock,
+        Path::new("runtime_evaluated_decorators_1.py")
+    )]
+    #[test_case(
+        Rule::TypingOnlyThirdPartyImport,
+        Path::new("runtime_evaluated_decorators_2.py")
+    )]
+    #[test_case(
+        Rule::TypingOnlyStandardLibraryImport,
+        Path::new("runtime_evaluated_decorators_3.py")
+    )]
     fn runtime_evaluated_decorators(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.as_ref(), path.to_string_lossy());
         let diagnostics = test_path(
@@ -117,4 +134,201 @@ mod tests {
         assert_messages!(snapshot, diagnostics);
         Ok(())
     }
+
+    #[test_case(
+        r#"
+        from __future__ import annotations
+
+        import pandas as pd
+
+        def f(x: pd.DataFrame):
+            pass
+    "#,
+        "no_typing_import"
+    )]
+    #[test_case(
+        r#"
+        from __future__ import annotations
+
+        from typing import TYPE_CHECKING
+
+        import pandas as pd
+
+        def f(x: pd.DataFrame):
+            pass
+    "#,
+        "typing_import_before_package_import"
+    )]
+    #[test_case(
+        r#"
+        from __future__ import annotations
+
+        import pandas as pd
+
+        from typing import TYPE_CHECKING
+
+        def f(x: pd.DataFrame):
+            pass
+    "#,
+        "typing_import_after_package_import"
+    )]
+    #[test_case(
+        r#"
+        from __future__ import annotations
+
+        import pandas as pd
+
+        def f(x: pd.DataFrame):
+            pass
+
+        from typing import TYPE_CHECKING
+    "#,
+        "typing_import_after_usage"
+    )]
+    #[test_case(
+        r#"
+        from __future__ import annotations
+
+        from typing import TYPE_CHECKING
+
+        import pandas as pd
+
+        if TYPE_CHECKING:
+            import os
+
+        def f(x: pd.DataFrame):
+            pass
+    "#,
+        "type_checking_block_own_line"
+    )]
+    #[test_case(
+        r#"
+        from __future__ import annotations
+
+        from typing import TYPE_CHECKING
+
+        import pandas as pd
+
+        if TYPE_CHECKING: import os
+
+        def f(x: pd.DataFrame):
+            pass
+    "#,
+        "type_checking_block_inline"
+    )]
+    #[test_case(
+        r#"
+        from __future__ import annotations
+
+        from typing import TYPE_CHECKING
+
+        import pandas as pd
+
+        if TYPE_CHECKING:
+            # This is a comment.
+            import os
+
+        def f(x: pd.DataFrame):
+            pass
+    "#,
+        "type_checking_block_comment"
+    )]
+    #[test_case(
+        r#"
+        from __future__ import annotations
+
+        from typing import TYPE_CHECKING
+
+        import pandas as pd
+
+        def f(x: pd.DataFrame):
+            pass
+
+        if TYPE_CHECKING:
+            import os
+    "#,
+        "type_checking_block_after_usage"
+    )]
+    #[test_case(
+        r#"
+        from __future__ import annotations
+
+        from pandas import (
+            DataFrame,  # DataFrame
+            Series,  # Series
+        )
+
+        def f(x: DataFrame):
+            pass
+    "#,
+        "import_from"
+    )]
+    #[test_case(
+        r#"
+        from __future__ import annotations
+
+        from typing import TYPE_CHECKING
+
+        from pandas import (
+            DataFrame,  # DataFrame
+            Series,  # Series
+        )
+
+        if TYPE_CHECKING:
+            import os
+
+        def f(x: DataFrame):
+            pass
+    "#,
+        "import_from_type_checking_block"
+    )]
+    #[test_case(
+        r#"
+        from __future__ import annotations
+
+        from typing import TYPE_CHECKING
+
+        from pandas import (
+            DataFrame,  # DataFrame
+            Series,  # Series
+        )
+
+        def f(x: DataFrame, y: Series):
+            pass
+    "#,
+        "multiple_members"
+    )]
+    #[test_case(
+        r#"
+        from __future__ import annotations
+
+        from typing import TYPE_CHECKING
+
+        import os, sys
+
+        def f(x: os, y: sys):
+            pass
+    "#,
+        "multiple_modules_same_type"
+    )]
+    #[test_case(
+        r#"
+        from __future__ import annotations
+
+        from typing import TYPE_CHECKING
+
+        import os, pandas
+
+        def f(x: os, y: pandas):
+            pass
+    "#,
+        "multiple_modules_different_types"
+    )]
+    fn contents(contents: &str, snapshot: &str) {
+        let diagnostics = test_snippet(
+            contents,
+            &settings::Settings::for_rules(&Linter::Flake8TypeChecking),
+        );
+        assert_messages!(snapshot, diagnostics);
+    }
 }
diff --git a/crates/ruff/src/rules/flake8_type_checking/rules/empty_type_checking_block.rs b/crates/ruff/src/rules/flake8_type_checking/rules/empty_type_checking_block.rs
index 35d1d0aa4571c..2e90e5028474b 100644
--- a/crates/ruff/src/rules/flake8_type_checking/rules/empty_type_checking_block.rs
+++ b/crates/ruff/src/rules/flake8_type_checking/rules/empty_type_checking_block.rs
@@ -1,11 +1,10 @@
-use log::error;
-use rustpython_parser::ast::{Stmt, StmtKind};
+use rustpython_parser::ast;
+use rustpython_parser::ast::Ranged;
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::types::RefEquality;
 
-use crate::autofix::actions::delete_stmt;
+use crate::autofix;
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 
@@ -21,7 +20,7 @@ use crate::registry::AsRule;
 /// from typing import TYPE_CHECKING
 ///
 /// if TYPE_CHECKING:
-///    pass
+///     pass
 ///
 /// print("Hello, world!")
 /// ```
@@ -48,42 +47,29 @@ impl AlwaysAutofixableViolation for EmptyTypeCheckingBlock {
 }
 
 /// TCH005
-pub fn empty_type_checking_block<'a, 'b>(
-    checker: &mut Checker<'a>,
-    stmt: &'a Stmt,
-    body: &'a [Stmt],
-) where
-    'b: 'a,
-{
-    if body.len() == 1 && matches!(body[0].node, StmtKind::Pass) {
-        let mut diagnostic = Diagnostic::new(EmptyTypeCheckingBlock, body[0].range());
+pub(crate) fn empty_type_checking_block(checker: &mut Checker, stmt: &ast::StmtIf) {
+    if stmt.body.len() != 1 {
+        return;
+    }
 
-        // Delete the entire type-checking block.
-        if checker.patch(diagnostic.kind.rule()) {
-            let parent = checker
-                .ctx
-                .child_to_parent
-                .get(&RefEquality(stmt))
-                .map(Into::into);
-            let deleted: Vec<&Stmt> = checker.deletions.iter().map(Into::into).collect();
-            match delete_stmt(
-                stmt,
-                parent,
-                &deleted,
-                checker.locator,
-                checker.indexer,
-                checker.stylist,
-            ) {
-                Ok(fix) => {
-                    if fix.is_deletion() || fix.content() == Some("pass") {
-                        checker.deletions.insert(RefEquality(stmt));
-                    }
-                    diagnostic.set_fix(fix);
-                }
-                Err(e) => error!("Failed to remove empty type-checking block: {e}"),
-            }
-        }
+    let stmt = &stmt.body[0];
+    if !stmt.is_pass_stmt() {
+        return;
+    }
 
-        checker.diagnostics.push(diagnostic);
+    let mut diagnostic = Diagnostic::new(EmptyTypeCheckingBlock, stmt.range());
+    if checker.patch(diagnostic.kind.rule()) {
+        // Delete the entire type-checking block.
+        let stmt = checker.semantic_model().stmt();
+        let parent = checker.semantic_model().stmt_parent();
+        let edit = autofix::edits::delete_stmt(
+            stmt,
+            parent,
+            checker.locator,
+            checker.indexer,
+            checker.stylist,
+        );
+        diagnostic.set_fix(Fix::automatic(edit).isolate(checker.isolation(parent)));
     }
+    checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/flake8_type_checking/rules/mod.rs b/crates/ruff/src/rules/flake8_type_checking/rules/mod.rs
index 2b610f9833e8f..3873ebd1e7678 100644
--- a/crates/ruff/src/rules/flake8_type_checking/rules/mod.rs
+++ b/crates/ruff/src/rules/flake8_type_checking/rules/mod.rs
@@ -1,8 +1,8 @@
-pub use empty_type_checking_block::{empty_type_checking_block, EmptyTypeCheckingBlock};
-pub use runtime_import_in_type_checking_block::{
+pub(crate) use empty_type_checking_block::{empty_type_checking_block, EmptyTypeCheckingBlock};
+pub(crate) use runtime_import_in_type_checking_block::{
     runtime_import_in_type_checking_block, RuntimeImportInTypeCheckingBlock,
 };
-pub use typing_only_runtime_import::{
+pub(crate) use typing_only_runtime_import::{
     typing_only_runtime_import, TypingOnlyFirstPartyImport, TypingOnlyStandardLibraryImport,
     TypingOnlyThirdPartyImport,
 };
diff --git a/crates/ruff/src/rules/flake8_type_checking/rules/runtime_import_in_type_checking_block.rs b/crates/ruff/src/rules/flake8_type_checking/rules/runtime_import_in_type_checking_block.rs
index 3349e19aad534..a9e0e322efdb3 100644
--- a/crates/ruff/src/rules/flake8_type_checking/rules/runtime_import_in_type_checking_block.rs
+++ b/crates/ruff/src/rules/flake8_type_checking/rules/runtime_import_in_type_checking_block.rs
@@ -1,8 +1,17 @@
-use ruff_diagnostics::{Diagnostic, Violation};
+use anyhow::Result;
+use ruff_text_size::TextRange;
+use rustc_hash::FxHashMap;
+
+use ruff_diagnostics::{AutofixKind, Diagnostic, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_semantic::binding::{
-    Binding, BindingKind, ExecutionContext, FromImportation, Importation, SubmoduleImportation,
-};
+use ruff_python_semantic::node::NodeId;
+use ruff_python_semantic::reference::ReferenceId;
+use ruff_python_semantic::scope::Scope;
+
+use crate::autofix;
+use crate::checkers::ast::Checker;
+use crate::codes::Rule;
+use crate::importer::StmtImports;
 
 /// ## What it does
 /// Checks for runtime imports defined in a type-checking block.
@@ -16,7 +25,8 @@ use ruff_python_semantic::binding::{
 /// from typing import TYPE_CHECKING
 ///
 /// if TYPE_CHECKING:
-///    import foo
+///     import foo
+///
 ///
 /// def bar() -> None:
 ///     foo.bar()  # raises NameError: name 'foo' is not defined
@@ -26,45 +36,203 @@ use ruff_python_semantic::binding::{
 /// ```python
 /// import foo
 ///
+///
 /// def bar() -> None:
-///    foo.bar()
+///     foo.bar()
 /// ```
 ///
 /// ## References
 /// - [PEP 535](https://peps.python.org/pep-0563/#runtime-annotation-resolution-and-type-checking)
 #[violation]
 pub struct RuntimeImportInTypeCheckingBlock {
-    pub full_name: String,
+    qualified_name: String,
 }
 
 impl Violation for RuntimeImportInTypeCheckingBlock {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
+        let RuntimeImportInTypeCheckingBlock { qualified_name } = self;
         format!(
-            "Move import `{}` out of type-checking block. Import is used for more than type \
-             hinting.",
-            self.full_name
+            "Move import `{qualified_name}` out of type-checking block. Import is used for more than type hinting."
         )
     }
+
+    fn autofix_title(&self) -> Option<String> {
+        Some("Move out of type-checking block".to_string())
+    }
 }
 
 /// TCH004
-pub fn runtime_import_in_type_checking_block(binding: &Binding) -> Option<Diagnostic> {
-    let full_name = match &binding.kind {
-        BindingKind::Importation(Importation { full_name, .. }) => full_name,
-        BindingKind::FromImportation(FromImportation { full_name, .. }) => full_name.as_str(),
-        BindingKind::SubmoduleImportation(SubmoduleImportation { full_name, .. }) => full_name,
-        _ => return None,
-    };
-
-    if matches!(binding.context, ExecutionContext::Typing) && binding.runtime_usage.is_some() {
-        Some(Diagnostic::new(
+pub(crate) fn runtime_import_in_type_checking_block(
+    checker: &Checker,
+    scope: &Scope,
+    diagnostics: &mut Vec<Diagnostic>,
+) {
+    // Collect all runtime imports by statement.
+    let mut errors_by_statement: FxHashMap<NodeId, Vec<Import>> = FxHashMap::default();
+    let mut ignores_by_statement: FxHashMap<NodeId, Vec<Import>> = FxHashMap::default();
+
+    for binding_id in scope.binding_ids() {
+        let binding = &checker.semantic_model().bindings[binding_id];
+
+        let Some(qualified_name) = binding.qualified_name() else {
+            continue;
+        };
+
+        let Some(reference_id) = binding.references.first().copied() else {
+            continue;
+        };
+
+        if binding.context.is_typing()
+            && binding.references().any(|reference_id| {
+                checker
+                    .semantic_model()
+                    .references
+                    .resolve(reference_id)
+                    .context()
+                    .is_runtime()
+            })
+        {
+            let Some(stmt_id) = binding.source else {
+                continue;
+            };
+
+            let import = Import {
+                qualified_name,
+                reference_id,
+                trimmed_range: binding.trimmed_range(checker.semantic_model(), checker.locator),
+                parent_range: binding.parent_range(checker.semantic_model()),
+            };
+
+            if checker.rule_is_ignored(
+                Rule::RuntimeImportInTypeCheckingBlock,
+                import.trimmed_range.start(),
+            ) || import.parent_range.map_or(false, |parent_range| {
+                checker
+                    .rule_is_ignored(Rule::RuntimeImportInTypeCheckingBlock, parent_range.start())
+            }) {
+                ignores_by_statement
+                    .entry(stmt_id)
+                    .or_default()
+                    .push(import);
+            } else {
+                errors_by_statement.entry(stmt_id).or_default().push(import);
+            }
+        }
+    }
+
+    // Generate a diagnostic for every import, but share a fix across all imports within the same
+    // statement (excluding those that are ignored).
+    for (stmt_id, imports) in errors_by_statement {
+        let fix = if checker.patch(Rule::RuntimeImportInTypeCheckingBlock) {
+            fix_imports(checker, stmt_id, &imports).ok()
+        } else {
+            None
+        };
+
+        for Import {
+            qualified_name,
+            trimmed_range,
+            parent_range,
+            ..
+        } in imports
+        {
+            let mut diagnostic = Diagnostic::new(
+                RuntimeImportInTypeCheckingBlock {
+                    qualified_name: qualified_name.to_string(),
+                },
+                trimmed_range,
+            );
+            if let Some(range) = parent_range {
+                diagnostic.set_parent(range.start());
+            }
+            if let Some(fix) = fix.as_ref() {
+                diagnostic.set_fix(fix.clone());
+            }
+            diagnostics.push(diagnostic);
+        }
+    }
+
+    // Separately, generate a diagnostic for every _ignored_ import, to ensure that the
+    // suppression comments aren't marked as unused.
+    for Import {
+        qualified_name,
+        trimmed_range,
+        parent_range,
+        ..
+    } in ignores_by_statement.into_values().flatten()
+    {
+        let mut diagnostic = Diagnostic::new(
             RuntimeImportInTypeCheckingBlock {
-                full_name: full_name.to_string(),
+                qualified_name: qualified_name.to_string(),
             },
-            binding.range,
-        ))
-    } else {
-        None
+            trimmed_range,
+        );
+        if let Some(range) = parent_range {
+            diagnostic.set_parent(range.start());
+        }
+        diagnostics.push(diagnostic);
     }
 }
+
+/// A runtime-required import with its surrounding context.
+struct Import<'a> {
+    /// The qualified name of the import (e.g., `typing.List` for `from typing import List`).
+    qualified_name: &'a str,
+    /// The first reference to the imported symbol.
+    reference_id: ReferenceId,
+    /// The trimmed range of the import (e.g., `List` in `from typing import List`).
+    trimmed_range: TextRange,
+    /// The range of the import's parent statement.
+    parent_range: Option<TextRange>,
+}
+
+/// Generate a [`Fix`] to remove runtime imports from a type-checking block.
+fn fix_imports(checker: &Checker, stmt_id: NodeId, imports: &[Import]) -> Result<Fix> {
+    let stmt = checker.semantic_model().stmts[stmt_id];
+    let parent = checker.semantic_model().stmts.parent(stmt);
+    let qualified_names: Vec<&str> = imports
+        .iter()
+        .map(|Import { qualified_name, .. }| *qualified_name)
+        .collect();
+
+    // Find the first reference across all imports.
+    let at = imports
+        .iter()
+        .map(|Import { reference_id, .. }| {
+            checker
+                .semantic_model()
+                .references
+                .resolve(*reference_id)
+                .range()
+                .start()
+        })
+        .min()
+        .expect("Expected at least one import");
+
+    // Step 1) Remove the import.
+    let remove_import_edit = autofix::edits::remove_unused_imports(
+        qualified_names.iter().copied(),
+        stmt,
+        parent,
+        checker.locator,
+        checker.indexer,
+        checker.stylist,
+    )?;
+
+    // Step 2) Add the import to the top-level.
+    let add_import_edit = checker.importer.runtime_import_edit(
+        &StmtImports {
+            stmt,
+            qualified_names,
+        },
+        at,
+    )?;
+
+    Ok(
+        Fix::suggested_edits(remove_import_edit, add_import_edit.into_edits())
+            .isolate(checker.isolation(parent)),
+    )
+}
diff --git a/crates/ruff/src/rules/flake8_type_checking/rules/typing_only_runtime_import.rs b/crates/ruff/src/rules/flake8_type_checking/rules/typing_only_runtime_import.rs
index 8af8156563a9f..c5c1d142692dc 100644
--- a/crates/ruff/src/rules/flake8_type_checking/rules/typing_only_runtime_import.rs
+++ b/crates/ruff/src/rules/flake8_type_checking/rules/typing_only_runtime_import.rs
@@ -1,13 +1,19 @@
-use std::path::Path;
+use anyhow::Result;
+use ruff_text_size::TextRange;
+use rustc_hash::FxHashMap;
 
-use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_diagnostics::{AutofixKind, Diagnostic, DiagnosticKind, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_semantic::binding::{
-    Binding, BindingKind, ExecutionContext, FromImportation, Importation, SubmoduleImportation,
-};
+use ruff_python_semantic::binding::Binding;
+use ruff_python_semantic::node::NodeId;
+use ruff_python_semantic::reference::ReferenceId;
+use ruff_python_semantic::scope::Scope;
 
+use crate::autofix;
+use crate::checkers::ast::Checker;
+use crate::codes::Rule;
+use crate::importer::StmtImports;
 use crate::rules::isort::{categorize, ImportSection, ImportType};
-use crate::settings::Settings;
 
 /// ## What it does
 /// Checks for first-party imports that are only used for type annotations, but
@@ -46,17 +52,23 @@ use crate::settings::Settings;
 /// - [PEP 536](https://peps.python.org/pep-0563/#runtime-annotation-resolution-and-type-checking)
 #[violation]
 pub struct TypingOnlyFirstPartyImport {
-    pub full_name: String,
+    qualified_name: String,
 }
 
 impl Violation for TypingOnlyFirstPartyImport {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         format!(
             "Move application import `{}` into a type-checking block",
-            self.full_name
+            self.qualified_name
         )
     }
+
+    fn autofix_title(&self) -> Option<String> {
+        Some("Move into type-checking block".to_string())
+    }
 }
 
 /// ## What it does
@@ -96,17 +108,23 @@ impl Violation for TypingOnlyFirstPartyImport {
 /// - [PEP 536](https://peps.python.org/pep-0563/#runtime-annotation-resolution-and-type-checking)
 #[violation]
 pub struct TypingOnlyThirdPartyImport {
-    pub full_name: String,
+    qualified_name: String,
 }
 
 impl Violation for TypingOnlyThirdPartyImport {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         format!(
             "Move third-party import `{}` into a type-checking block",
-            self.full_name
+            self.qualified_name
         )
     }
+
+    fn autofix_title(&self) -> Option<String> {
+        Some("Move into type-checking block".to_string())
+    }
 }
 
 /// ## What it does
@@ -130,7 +148,7 @@ impl Violation for TypingOnlyThirdPartyImport {
 ///
 /// Use instead:
 /// ```python
-/// /// from __future__ import annotations
+/// from __future__ import annotations
 ///
 /// from typing import TYPE_CHECKING
 ///
@@ -146,83 +164,241 @@ impl Violation for TypingOnlyThirdPartyImport {
 /// - [PEP 536](https://peps.python.org/pep-0563/#runtime-annotation-resolution-and-type-checking)
 #[violation]
 pub struct TypingOnlyStandardLibraryImport {
-    pub full_name: String,
+    qualified_name: String,
 }
 
 impl Violation for TypingOnlyStandardLibraryImport {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         format!(
             "Move standard library import `{}` into a type-checking block",
-            self.full_name
+            self.qualified_name
         )
     }
+
+    fn autofix_title(&self) -> Option<String> {
+        Some("Move into type-checking block".to_string())
+    }
 }
 
-/// Return `true` if `this` is implicitly loaded via importing `that`.
-fn is_implicit_import(this: &Binding, that: &Binding) -> bool {
-    match &this.kind {
-        BindingKind::Importation(Importation {
-            full_name: this_name,
-            ..
-        })
-        | BindingKind::SubmoduleImportation(SubmoduleImportation {
-            name: this_name, ..
-        }) => match &that.kind {
-            BindingKind::FromImportation(FromImportation {
-                full_name: that_name,
-                ..
-            }) => {
-                // Ex) `pkg.A` vs. `pkg`
-                this_name
-                    .rfind('.')
-                    .map_or(false, |i| this_name[..i] == *that_name)
-            }
-            BindingKind::Importation(Importation {
-                full_name: that_name,
-                ..
+/// TCH001, TCH002, TCH003
+pub(crate) fn typing_only_runtime_import(
+    checker: &Checker,
+    scope: &Scope,
+    runtime_imports: &[&Binding],
+    diagnostics: &mut Vec<Diagnostic>,
+) {
+    // Collect all typing-only imports by statement and import type.
+    let mut errors_by_statement: FxHashMap<(NodeId, ImportType), Vec<Import>> =
+        FxHashMap::default();
+    let mut ignores_by_statement: FxHashMap<(NodeId, ImportType), Vec<Import>> =
+        FxHashMap::default();
+
+    for binding_id in scope.binding_ids() {
+        let binding = &checker.semantic_model().bindings[binding_id];
+
+        // If we're in un-strict mode, don't flag typing-only imports that are
+        // implicitly loaded by way of a valid runtime import.
+        if !checker.settings.flake8_type_checking.strict
+            && runtime_imports
+                .iter()
+                .any(|import| is_implicit_import(binding, import))
+        {
+            continue;
+        }
+
+        let Some(qualified_name) = binding.qualified_name() else {
+            continue;
+        };
+
+        if is_exempt(
+            qualified_name,
+            &checker
+                .settings
+                .flake8_type_checking
+                .exempt_modules
+                .iter()
+                .map(String::as_str)
+                .collect::<Vec<_>>(),
+        ) {
+            continue;
+        }
+
+        let Some(reference_id) = binding.references.first().copied() else {
+            continue;
+        };
+
+        if binding.context.is_runtime()
+            && binding.references().all(|reference_id| {
+                checker
+                    .semantic_model()
+                    .references
+                    .resolve(reference_id)
+                    .context()
+                    .is_typing()
             })
-            | BindingKind::SubmoduleImportation(SubmoduleImportation {
-                name: that_name, ..
-            }) => {
-                // Ex) `pkg.A` vs. `pkg.B`
-                this_name == that_name
+        {
+            // Extract the module base and level from the full name.
+            // Ex) `foo.bar.baz` -> `foo`, `0`
+            // Ex) `.foo.bar.baz` -> `foo`, `1`
+            let level = qualified_name
+                .chars()
+                .take_while(|c| *c == '.')
+                .count()
+                .try_into()
+                .unwrap();
+
+            // Categorize the import, using coarse-grained categorization.
+            let import_type = match categorize(
+                qualified_name,
+                Some(level),
+                &checker.settings.src,
+                checker.package(),
+                &checker.settings.isort.known_modules,
+                checker.settings.target_version,
+            ) {
+                ImportSection::Known(ImportType::LocalFolder | ImportType::FirstParty) => {
+                    ImportType::FirstParty
+                }
+                ImportSection::Known(ImportType::ThirdParty) | ImportSection::UserDefined(_) => {
+                    ImportType::ThirdParty
+                }
+                ImportSection::Known(ImportType::StandardLibrary) => ImportType::StandardLibrary,
+                ImportSection::Known(ImportType::Future) => {
+                    continue;
+                }
+            };
+
+            if !checker.enabled(rule_for(import_type)) {
+                continue;
             }
-            _ => false,
-        },
-        BindingKind::FromImportation(FromImportation {
-            full_name: this_name,
+
+            let Some(stmt_id) = binding.source else {
+                continue;
+            };
+
+            let import = Import {
+                qualified_name,
+                reference_id,
+                trimmed_range: binding.trimmed_range(checker.semantic_model(), checker.locator),
+                parent_range: binding.parent_range(checker.semantic_model()),
+            };
+
+            if checker.rule_is_ignored(rule_for(import_type), import.trimmed_range.start())
+                || import.parent_range.map_or(false, |parent_range| {
+                    checker.rule_is_ignored(rule_for(import_type), parent_range.start())
+                })
+            {
+                ignores_by_statement
+                    .entry((stmt_id, import_type))
+                    .or_default()
+                    .push(import);
+            } else {
+                errors_by_statement
+                    .entry((stmt_id, import_type))
+                    .or_default()
+                    .push(import);
+            }
+        }
+    }
+
+    // Generate a diagnostic for every import, but share a fix across all imports within the same
+    // statement (excluding those that are ignored).
+    for ((stmt_id, import_type), imports) in errors_by_statement {
+        let fix = if checker.patch(rule_for(import_type)) {
+            fix_imports(checker, stmt_id, &imports).ok()
+        } else {
+            None
+        };
+
+        for Import {
+            qualified_name,
+            trimmed_range,
+            parent_range,
             ..
-        }) => match &that.kind {
-            BindingKind::Importation(Importation {
-                full_name: that_name,
-                ..
-            })
-            | BindingKind::SubmoduleImportation(SubmoduleImportation {
-                name: that_name, ..
-            }) => {
-                // Ex) `pkg.A` vs. `pkg`
-                this_name
-                    .rfind('.')
-                    .map_or(false, |i| &this_name[..i] == *that_name)
+        } in imports
+        {
+            let mut diagnostic = Diagnostic::new(
+                diagnostic_for(import_type, qualified_name.to_string()),
+                trimmed_range,
+            );
+            if let Some(range) = parent_range {
+                diagnostic.set_parent(range.start());
             }
-            BindingKind::FromImportation(FromImportation {
-                full_name: that_name,
-                ..
-            }) => {
-                // Ex) `pkg.A` vs. `pkg.B`
-                this_name.rfind('.').map_or(false, |i| {
-                    that_name
-                        .rfind('.')
-                        .map_or(false, |j| this_name[..i] == that_name[..j])
-                })
+            if let Some(fix) = fix.as_ref() {
+                diagnostic.set_fix(fix.clone());
             }
-            _ => false,
-        },
-        _ => false,
+            diagnostics.push(diagnostic);
+        }
+    }
+
+    // Separately, generate a diagnostic for every _ignored_ import, to ensure that the
+    // suppression comments aren't marked as unused.
+    for ((_, import_type), imports) in ignores_by_statement {
+        for Import {
+            qualified_name,
+            trimmed_range,
+            parent_range,
+            ..
+        } in imports
+        {
+            let mut diagnostic = Diagnostic::new(
+                diagnostic_for(import_type, qualified_name.to_string()),
+                trimmed_range,
+            );
+            if let Some(range) = parent_range {
+                diagnostic.set_parent(range.start());
+            }
+            diagnostics.push(diagnostic);
+        }
     }
 }
 
+/// A runtime-required import with its surrounding context.
+struct Import<'a> {
+    /// The qualified name of the import (e.g., `typing.List` for `from typing import List`).
+    qualified_name: &'a str,
+    /// The first reference to the imported symbol.
+    reference_id: ReferenceId,
+    /// The trimmed range of the import (e.g., `List` in `from typing import List`).
+    trimmed_range: TextRange,
+    /// The range of the import's parent statement.
+    parent_range: Option<TextRange>,
+}
+
+/// Return the [`Rule`] for the given import type.
+fn rule_for(import_type: ImportType) -> Rule {
+    match import_type {
+        ImportType::StandardLibrary => Rule::TypingOnlyStandardLibraryImport,
+        ImportType::ThirdParty => Rule::TypingOnlyThirdPartyImport,
+        ImportType::FirstParty => Rule::TypingOnlyFirstPartyImport,
+        _ => unreachable!("Unexpected import type"),
+    }
+}
+
+/// Return the [`Diagnostic`] for the given import type.
+fn diagnostic_for(import_type: ImportType, qualified_name: String) -> DiagnosticKind {
+    match import_type {
+        ImportType::StandardLibrary => TypingOnlyStandardLibraryImport { qualified_name }.into(),
+        ImportType::ThirdParty => TypingOnlyThirdPartyImport { qualified_name }.into(),
+        ImportType::FirstParty => TypingOnlyFirstPartyImport { qualified_name }.into(),
+        _ => unreachable!("Unexpected import type"),
+    }
+}
+
+/// Return `true` if `this` is implicitly loaded via importing `that`.
+fn is_implicit_import(this: &Binding, that: &Binding) -> bool {
+    let Some(this_module) = this.module_name() else {
+        return false;
+    };
+    let Some(that_module) = that.module_name() else {
+        return false;
+    };
+    this_module == that_module
+}
+
 /// Return `true` if `name` is exempt from typing-only enforcement.
 fn is_exempt(name: &str, exempt_modules: &[&str]) -> bool {
     let mut name = name;
@@ -239,88 +415,51 @@ fn is_exempt(name: &str, exempt_modules: &[&str]) -> bool {
     }
 }
 
-/// TCH001
-pub fn typing_only_runtime_import(
-    binding: &Binding,
-    runtime_imports: &[&Binding],
-    package: Option<&Path>,
-    settings: &Settings,
-) -> Option<Diagnostic> {
-    // If we're in un-strict mode, don't flag typing-only imports that are
-    // implicitly loaded by way of a valid runtime import.
-    if !settings.flake8_type_checking.strict
-        && runtime_imports
-            .iter()
-            .any(|import| is_implicit_import(binding, import))
-    {
-        return None;
-    }
+/// Generate a [`Fix`] to remove typing-only imports from a runtime context.
+fn fix_imports(checker: &Checker, stmt_id: NodeId, imports: &[Import]) -> Result<Fix> {
+    let stmt = checker.semantic_model().stmts[stmt_id];
+    let parent = checker.semantic_model().stmts.parent(stmt);
+    let qualified_names: Vec<&str> = imports
+        .iter()
+        .map(|Import { qualified_name, .. }| *qualified_name)
+        .collect();
 
-    let full_name = match &binding.kind {
-        BindingKind::Importation(Importation { full_name, .. }) => full_name,
-        BindingKind::FromImportation(FromImportation { full_name, .. }) => full_name.as_str(),
-        BindingKind::SubmoduleImportation(SubmoduleImportation { full_name, .. }) => full_name,
-        _ => return None,
-    };
+    // Find the first reference across all imports.
+    let at = imports
+        .iter()
+        .map(|Import { reference_id, .. }| {
+            checker
+                .semantic_model()
+                .references
+                .resolve(*reference_id)
+                .range()
+                .start()
+        })
+        .min()
+        .expect("Expected at least one import");
 
-    if is_exempt(
-        full_name,
-        &settings
-            .flake8_type_checking
-            .exempt_modules
-            .iter()
-            .map(String::as_str)
-            .collect::<Vec<_>>(),
-    ) {
-        return None;
-    }
+    // Step 1) Remove the import.
+    let remove_import_edit = autofix::edits::remove_unused_imports(
+        qualified_names.iter().copied(),
+        stmt,
+        parent,
+        checker.locator,
+        checker.indexer,
+        checker.stylist,
+    )?;
 
-    if matches!(binding.context, ExecutionContext::Runtime)
-        && binding.typing_usage.is_some()
-        && binding.runtime_usage.is_none()
-        && binding.synthetic_usage.is_none()
-    {
-        // Extract the module base and level from the full name.
-        // Ex) `foo.bar.baz` -> `foo`, `0`
-        // Ex) `.foo.bar.baz` -> `foo`, `1`
-        let level = full_name.chars().take_while(|c| *c == '.').count();
-
-        // Categorize the import.
-        match categorize(
-            full_name,
-            Some(level),
-            &settings.src,
-            package,
-            &settings.isort.known_modules,
-            settings.target_version,
-        ) {
-            ImportSection::Known(ImportType::LocalFolder | ImportType::FirstParty) => {
-                Some(Diagnostic::new(
-                    TypingOnlyFirstPartyImport {
-                        full_name: full_name.to_string(),
-                    },
-                    binding.range,
-                ))
-            }
-            ImportSection::Known(ImportType::ThirdParty) | ImportSection::UserDefined(_) => {
-                Some(Diagnostic::new(
-                    TypingOnlyThirdPartyImport {
-                        full_name: full_name.to_string(),
-                    },
-                    binding.range,
-                ))
-            }
-            ImportSection::Known(ImportType::StandardLibrary) => Some(Diagnostic::new(
-                TypingOnlyStandardLibraryImport {
-                    full_name: full_name.to_string(),
-                },
-                binding.range,
-            )),
-            ImportSection::Known(ImportType::Future) => {
-                unreachable!("`__future__` imports should be marked as used")
-            }
-        }
-    } else {
-        None
-    }
+    // Step 2) Add the import to a `TYPE_CHECKING` block.
+    let add_import_edit = checker.importer.typing_import_edit(
+        &StmtImports {
+            stmt,
+            qualified_names,
+        },
+        at,
+        checker.semantic_model(),
+    )?;
+
+    Ok(
+        Fix::suggested_edits(remove_import_edit, add_import_edit.into_edits())
+            .isolate(checker.isolation(parent)),
+    )
 }
diff --git a/crates/ruff/src/rules/flake8_type_checking/settings.rs b/crates/ruff/src/rules/flake8_type_checking/settings.rs
index 6c1300751fe12..69cd913dae913 100644
--- a/crates/ruff/src/rules/flake8_type_checking/settings.rs
+++ b/crates/ruff/src/rules/flake8_type_checking/settings.rs
@@ -1,18 +1,18 @@
 //! Settings for the `flake8-type-checking` plugin.
 
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::{CacheKey, ConfigurationOptions};
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
 
 #[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, CombineOptions,
 )]
 #[serde(
     deny_unknown_fields,
     rename_all = "kebab-case",
     rename = "Flake8TypeCheckingOptions"
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = "false",
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__empty-type-checking-block_TCH005.py.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__empty-type-checking-block_TCH005.py.snap
index fb611710e2d74..e9d726d95993b 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__empty-type-checking-block_TCH005.py.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__empty-type-checking-block_TCH005.py.snap
@@ -9,7 +9,7 @@ TCH005.py:4:5: TCH005 [*] Found empty type-checking block
   |
   = help: Delete empty type-checking block
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | from typing import TYPE_CHECKING, List
 2 2 | 
 3   |-if TYPE_CHECKING:
@@ -28,7 +28,7 @@ TCH005.py:8:5: TCH005 [*] Found empty type-checking block
    |
    = help: Delete empty type-checking block
 
-ℹ Suggested fix
+ℹ Fix
 4 4 |     pass  # TCH005
 5 5 | 
 6 6 | 
@@ -46,7 +46,7 @@ TCH005.py:11:5: TCH005 [*] Found empty type-checking block
    |
    = help: Delete empty type-checking block
 
-ℹ Suggested fix
+ℹ Fix
 7  7  | if False:
 8  8  |     pass  # TCH005
 9  9  | 
@@ -66,7 +66,7 @@ TCH005.py:16:9: TCH005 [*] Found empty type-checking block
    |
    = help: Delete empty type-checking block
 
-ℹ Suggested fix
+ℹ Fix
 12 12 | 
 13 13 | 
 14 14 | def example():
@@ -86,7 +86,7 @@ TCH005.py:22:9: TCH005 [*] Found empty type-checking block
    |
    = help: Delete empty type-checking block
 
-ℹ Suggested fix
+ℹ Fix
 18 18 | 
 19 19 | 
 20 20 | class Test:
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__exempt_modules.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__exempt_modules.snap
index 3e0bf5d7a0c3d..4bdba29840a7e 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__exempt_modules.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__exempt_modules.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_type_checking/mod.rs
 ---
-exempt_modules.py:14:12: TCH002 Move third-party import `flask` into a type-checking block
+exempt_modules.py:14:12: TCH002 [*] Move third-party import `flask` into a type-checking block
    |
 14 | def f():
 15 |     import flask
@@ -9,5 +9,22 @@ exempt_modules.py:14:12: TCH002 Move third-party import `flask` into a type-chec
 16 | 
 17 |     x: flask
    |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+   1  |+from typing import TYPE_CHECKING
+   2  |+
+   3  |+if TYPE_CHECKING:
+   4  |+    import flask
+1  5  | def f():
+2  6  |     import pandas as pd
+3  7  | 
+--------------------------------------------------------------------------------
+11 15 | 
+12 16 | 
+13 17 | def f():
+14    |-    import flask
+15 18 | 
+16 19 |     x: flask
 
 
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__import_from.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__import_from.snap
new file mode 100644
index 0000000000000..a1765eb8ebf94
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__import_from.snap
@@ -0,0 +1,31 @@
+---
+source: crates/ruff/src/rules/flake8_type_checking/mod.rs
+---
+<filename>:5:5: TCH002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
+  |
+5 | from pandas import (
+6 |     DataFrame,  # DataFrame
+  |     ^^^^^^^^^ TCH002
+7 |     Series,  # Series
+8 | )
+  |
+  = help: Move into type-checking block
+
+ℹ Suggested fix
+2  2  | from __future__ import annotations
+3  3  | 
+4  4  | from pandas import (
+5     |-    DataFrame,  # DataFrame
+6  5  |     Series,  # Series
+7  6  | )
+   7  |+from typing import TYPE_CHECKING
+   8  |+
+   9  |+if TYPE_CHECKING:
+   10 |+    from pandas import (
+   11 |+        DataFrame,  # DataFrame
+   12 |+        )
+8  13 | 
+9  14 | def f(x: DataFrame):
+10 15 |     pass
+
+
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__import_from_type_checking_block.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__import_from_type_checking_block.snap
new file mode 100644
index 0000000000000..d5771d58e79b8
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__import_from_type_checking_block.snap
@@ -0,0 +1,30 @@
+---
+source: crates/ruff/src/rules/flake8_type_checking/mod.rs
+---
+<filename>:7:5: TCH002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
+   |
+ 7 | from pandas import (
+ 8 |     DataFrame,  # DataFrame
+   |     ^^^^^^^^^ TCH002
+ 9 |     Series,  # Series
+10 | )
+   |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+4  4  | from typing import TYPE_CHECKING
+5  5  | 
+6  6  | from pandas import (
+7     |-    DataFrame,  # DataFrame
+8  7  |     Series,  # Series
+9  8  | )
+10 9  | 
+11 10 | if TYPE_CHECKING:
+   11 |+    from pandas import (
+   12 |+        DataFrame,  # DataFrame
+   13 |+        )
+12 14 |     import os
+13 15 | 
+14 16 | def f(x: DataFrame):
+
+
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__multiple_members.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__multiple_members.snap
new file mode 100644
index 0000000000000..08a13a21f56bd
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__multiple_members.snap
@@ -0,0 +1,60 @@
+---
+source: crates/ruff/src/rules/flake8_type_checking/mod.rs
+---
+<filename>:7:5: TCH002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
+   |
+ 7 | from pandas import (
+ 8 |     DataFrame,  # DataFrame
+   |     ^^^^^^^^^ TCH002
+ 9 |     Series,  # Series
+10 | )
+   |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+3  3  | 
+4  4  | from typing import TYPE_CHECKING
+5  5  | 
+6     |-from pandas import (
+7     |-    DataFrame,  # DataFrame
+8     |-    Series,  # Series
+9     |-)
+10 6  | 
+   7  |+if TYPE_CHECKING:
+   8  |+    from pandas import (
+   9  |+        DataFrame,  # DataFrame
+   10 |+        Series,  # Series
+   11 |+    )
+   12 |+
+11 13 | def f(x: DataFrame, y: Series):
+12 14 |     pass
+
+<filename>:8:5: TCH002 [*] Move third-party import `pandas.Series` into a type-checking block
+   |
+ 8 | from pandas import (
+ 9 |     DataFrame,  # DataFrame
+10 |     Series,  # Series
+   |     ^^^^^^ TCH002
+11 | )
+   |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+3  3  | 
+4  4  | from typing import TYPE_CHECKING
+5  5  | 
+6     |-from pandas import (
+7     |-    DataFrame,  # DataFrame
+8     |-    Series,  # Series
+9     |-)
+10 6  | 
+   7  |+if TYPE_CHECKING:
+   8  |+    from pandas import (
+   9  |+        DataFrame,  # DataFrame
+   10 |+        Series,  # Series
+   11 |+    )
+   12 |+
+11 13 | def f(x: DataFrame, y: Series):
+12 14 |     pass
+
+
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__multiple_modules_different_types.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__multiple_modules_different_types.snap
new file mode 100644
index 0000000000000..916df04b90a76
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__multiple_modules_different_types.snap
@@ -0,0 +1,52 @@
+---
+source: crates/ruff/src/rules/flake8_type_checking/mod.rs
+---
+<filename>:6:8: TCH003 [*] Move standard library import `os` into a type-checking block
+   |
+ 6 | from typing import TYPE_CHECKING
+ 7 | 
+ 8 | import os, pandas
+   |        ^^ TCH003
+ 9 | 
+10 | def f(x: os, y: pandas):
+   |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+3  3  | 
+4  4  | from typing import TYPE_CHECKING
+5  5  | 
+6     |-import os, pandas
+   6  |+import pandas
+   7  |+
+   8  |+if TYPE_CHECKING:
+   9  |+    import os
+7  10 | 
+8  11 | def f(x: os, y: pandas):
+9  12 |     pass
+
+<filename>:6:12: TCH002 [*] Move third-party import `pandas` into a type-checking block
+   |
+ 6 | from typing import TYPE_CHECKING
+ 7 | 
+ 8 | import os, pandas
+   |            ^^^^^^ TCH002
+ 9 | 
+10 | def f(x: os, y: pandas):
+   |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+3  3  | 
+4  4  | from typing import TYPE_CHECKING
+5  5  | 
+6     |-import os, pandas
+   6  |+import os
+   7  |+
+   8  |+if TYPE_CHECKING:
+   9  |+    import pandas
+7  10 | 
+8  11 | def f(x: os, y: pandas):
+9  12 |     pass
+
+
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__multiple_modules_same_type.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__multiple_modules_same_type.snap
new file mode 100644
index 0000000000000..8c792b8dd66cf
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__multiple_modules_same_type.snap
@@ -0,0 +1,50 @@
+---
+source: crates/ruff/src/rules/flake8_type_checking/mod.rs
+---
+<filename>:6:8: TCH003 [*] Move standard library import `os` into a type-checking block
+   |
+ 6 | from typing import TYPE_CHECKING
+ 7 | 
+ 8 | import os, sys
+   |        ^^ TCH003
+ 9 | 
+10 | def f(x: os, y: sys):
+   |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+3  3  | 
+4  4  | from typing import TYPE_CHECKING
+5  5  | 
+6     |-import os, sys
+7  6  | 
+   7  |+if TYPE_CHECKING:
+   8  |+    import os, sys
+   9  |+
+8  10 | def f(x: os, y: sys):
+9  11 |     pass
+
+<filename>:6:12: TCH003 [*] Move standard library import `sys` into a type-checking block
+   |
+ 6 | from typing import TYPE_CHECKING
+ 7 | 
+ 8 | import os, sys
+   |            ^^^ TCH003
+ 9 | 
+10 | def f(x: os, y: sys):
+   |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+3  3  | 
+4  4  | from typing import TYPE_CHECKING
+5  5  | 
+6     |-import os, sys
+7  6  | 
+   7  |+if TYPE_CHECKING:
+   8  |+    import os, sys
+   9  |+
+8  10 | def f(x: os, y: sys):
+9  11 |     pass
+
+
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__no_typing_import.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__no_typing_import.snap
new file mode 100644
index 0000000000000..06da4721e3e36
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__no_typing_import.snap
@@ -0,0 +1,28 @@
+---
+source: crates/ruff/src/rules/flake8_type_checking/mod.rs
+---
+<filename>:4:8: TCH002 [*] Move third-party import `pandas` into a type-checking block
+  |
+4 | from __future__ import annotations
+5 | 
+6 | import pandas as pd
+  |        ^^^^^^^^^^^^ TCH002
+7 | 
+8 | def f(x: pd.DataFrame):
+  |
+  = help: Move into type-checking block
+
+ℹ Suggested fix
+1 1 | 
+2 2 | from __future__ import annotations
+3 3 | 
+4   |-import pandas as pd
+  4 |+from typing import TYPE_CHECKING
+  5 |+
+  6 |+if TYPE_CHECKING:
+  7 |+    import pandas as pd
+5 8 | 
+6 9 | def f(x: pd.DataFrame):
+7 10 |     pass
+
+
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_1.py.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_1.py.snap
index ce326792f77e0..ac2c06db21fc2 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_1.py.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_1.py.snap
@@ -1,12 +1,22 @@
 ---
 source: crates/ruff/src/rules/flake8_type_checking/mod.rs
 ---
-TCH004_1.py:4:26: TCH004 Move import `datetime.datetime` out of type-checking block. Import is used for more than type hinting.
+TCH004_1.py:4:26: TCH004 [*] Move import `datetime.datetime` out of type-checking block. Import is used for more than type hinting.
   |
 4 | if TYPE_CHECKING:
 5 |     from datetime import datetime
   |                          ^^^^^^^^ TCH004
 6 | x = datetime
   |
+  = help: Move out of type-checking block
+
+ℹ Suggested fix
+1 1 | from typing import TYPE_CHECKING
+  2 |+from datetime import datetime
+2 3 | 
+3 4 | if TYPE_CHECKING:
+4   |-    from datetime import datetime
+  5 |+    pass
+5 6 | x = datetime
 
 
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_11.py.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_11.py.snap
index 8ae699da43128..1ca919e9f4b55 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_11.py.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_11.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_type_checking/mod.rs
 ---
-TCH004_11.py:4:24: TCH004 Move import `typing.List` out of type-checking block. Import is used for more than type hinting.
+TCH004_11.py:4:24: TCH004 [*] Move import `typing.List` out of type-checking block. Import is used for more than type hinting.
   |
 4 | if TYPE_CHECKING:
 5 |     from typing import List
@@ -9,5 +9,16 @@ TCH004_11.py:4:24: TCH004 Move import `typing.List` out of type-checking block.
 6 | 
 7 | __all__ = ("List",)
   |
+  = help: Move out of type-checking block
+
+ℹ Suggested fix
+1 1 | from typing import TYPE_CHECKING
+  2 |+from typing import List
+2 3 | 
+3 4 | if TYPE_CHECKING:
+4   |-    from typing import List
+  5 |+    pass
+5 6 | 
+6 7 | __all__ = ("List",)
 
 
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_12.py.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_12.py.snap
index 7d784c1927e1f..3844c55a06ab7 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_12.py.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_12.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_type_checking/mod.rs
 ---
-TCH004_12.py:6:33: TCH004 Move import `collections.abc.Callable` out of type-checking block. Import is used for more than type hinting.
+TCH004_12.py:6:33: TCH004 [*] Move import `collections.abc.Callable` out of type-checking block. Import is used for more than type hinting.
   |
 6 | if TYPE_CHECKING:
 7 |     from collections.abc import Callable
@@ -9,5 +9,18 @@ TCH004_12.py:6:33: TCH004 Move import `collections.abc.Callable` out of type-che
 8 | 
 9 | AnyCallable: TypeAlias = Callable[..., Any]
   |
+  = help: Move out of type-checking block
+
+ℹ Suggested fix
+1 1 | from __future__ import annotations
+2 2 | 
+3 3 | from typing import Any, TYPE_CHECKING, TypeAlias
+  4 |+from collections.abc import Callable
+4 5 | 
+5 6 | if TYPE_CHECKING:
+6   |-    from collections.abc import Callable
+  7 |+    pass
+7 8 | 
+8 9 | AnyCallable: TypeAlias = Callable[..., Any]
 
 
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_2.py.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_2.py.snap
index 93cebe6122f30..cd8023dff5c92 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_2.py.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_2.py.snap
@@ -1,11 +1,23 @@
 ---
 source: crates/ruff/src/rules/flake8_type_checking/mod.rs
 ---
-TCH004_2.py:4:26: TCH004 Move import `datetime.date` out of type-checking block. Import is used for more than type hinting.
+TCH004_2.py:4:26: TCH004 [*] Move import `datetime.date` out of type-checking block. Import is used for more than type hinting.
   |
 4 | if TYPE_CHECKING:
 5 |     from datetime import date
   |                          ^^^^ TCH004
   |
+  = help: Move out of type-checking block
+
+ℹ Suggested fix
+1 1 | from typing import TYPE_CHECKING
+  2 |+from datetime import date
+2 3 | 
+3 4 | if TYPE_CHECKING:
+4   |-    from datetime import date
+  5 |+    pass
+5 6 | 
+6 7 | 
+7 8 | def example():
 
 
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_4.py.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_4.py.snap
index e7e14cc4a760e..a1049f7eebc1e 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_4.py.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_4.py.snap
@@ -1,11 +1,23 @@
 ---
 source: crates/ruff/src/rules/flake8_type_checking/mod.rs
 ---
-TCH004_4.py:4:24: TCH004 Move import `typing.Any` out of type-checking block. Import is used for more than type hinting.
+TCH004_4.py:4:24: TCH004 [*] Move import `typing.Any` out of type-checking block. Import is used for more than type hinting.
   |
 4 | if TYPE_CHECKING:
 5 |     from typing import Any
   |                        ^^^ TCH004
   |
+  = help: Move out of type-checking block
+
+ℹ Suggested fix
+1 1 | from typing import TYPE_CHECKING, Type
+  2 |+from typing import Any
+2 3 | 
+3 4 | if TYPE_CHECKING:
+4   |-    from typing import Any
+  5 |+    pass
+5 6 | 
+6 7 | 
+7 8 | def example(*args: Any, **kwargs: Any):
 
 
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_5.py.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_5.py.snap
index d3962cb445c7b..454256ed7fc47 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_5.py.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_5.py.snap
@@ -1,25 +1,61 @@
 ---
 source: crates/ruff/src/rules/flake8_type_checking/mod.rs
 ---
-TCH004_5.py:4:24: TCH004 Move import `typing.List` out of type-checking block. Import is used for more than type hinting.
+TCH004_5.py:4:24: TCH004 [*] Move import `typing.List` out of type-checking block. Import is used for more than type hinting.
   |
 4 | if TYPE_CHECKING:
 5 |     from typing import List, Sequence, Set
   |                        ^^^^ TCH004
   |
+  = help: Move out of type-checking block
 
-TCH004_5.py:4:30: TCH004 Move import `typing.Sequence` out of type-checking block. Import is used for more than type hinting.
+ℹ Suggested fix
+1 1 | from typing import TYPE_CHECKING
+  2 |+from typing import List, Sequence, Set
+2 3 | 
+3 4 | if TYPE_CHECKING:
+4   |-    from typing import List, Sequence, Set
+  5 |+    pass
+5 6 | 
+6 7 | 
+7 8 | def example(a: List[int], /, b: Sequence[int], *, c: Set[int]):
+
+TCH004_5.py:4:30: TCH004 [*] Move import `typing.Sequence` out of type-checking block. Import is used for more than type hinting.
   |
 4 | if TYPE_CHECKING:
 5 |     from typing import List, Sequence, Set
   |                              ^^^^^^^^ TCH004
   |
+  = help: Move out of type-checking block
+
+ℹ Suggested fix
+1 1 | from typing import TYPE_CHECKING
+  2 |+from typing import List, Sequence, Set
+2 3 | 
+3 4 | if TYPE_CHECKING:
+4   |-    from typing import List, Sequence, Set
+  5 |+    pass
+5 6 | 
+6 7 | 
+7 8 | def example(a: List[int], /, b: Sequence[int], *, c: Set[int]):
 
-TCH004_5.py:4:40: TCH004 Move import `typing.Set` out of type-checking block. Import is used for more than type hinting.
+TCH004_5.py:4:40: TCH004 [*] Move import `typing.Set` out of type-checking block. Import is used for more than type hinting.
   |
 4 | if TYPE_CHECKING:
 5 |     from typing import List, Sequence, Set
   |                                        ^^^ TCH004
   |
+  = help: Move out of type-checking block
+
+ℹ Suggested fix
+1 1 | from typing import TYPE_CHECKING
+  2 |+from typing import List, Sequence, Set
+2 3 | 
+3 4 | if TYPE_CHECKING:
+4   |-    from typing import List, Sequence, Set
+  5 |+    pass
+5 6 | 
+6 7 | 
+7 8 | def example(a: List[int], /, b: Sequence[int], *, c: Set[int]):
 
 
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_9.py.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_9.py.snap
index d9d5ab2241fc9..a55aacd56f377 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_9.py.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TCH004_9.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_type_checking/mod.rs
 ---
-TCH004_9.py:4:24: TCH004 Move import `typing.Tuple` out of type-checking block. Import is used for more than type hinting.
+TCH004_9.py:4:24: TCH004 [*] Move import `typing.Tuple` out of type-checking block. Import is used for more than type hinting.
   |
 4 | if TYPE_CHECKING:
 5 |     from typing import Tuple, List, Dict
@@ -9,8 +9,20 @@ TCH004_9.py:4:24: TCH004 Move import `typing.Tuple` out of type-checking block.
 6 | 
 7 | x: Tuple
   |
+  = help: Move out of type-checking block
 
-TCH004_9.py:4:31: TCH004 Move import `typing.List` out of type-checking block. Import is used for more than type hinting.
+ℹ Suggested fix
+1 1 | from typing import TYPE_CHECKING
+  2 |+from typing import Tuple, List
+2 3 | 
+3 4 | if TYPE_CHECKING:
+4   |-    from typing import Tuple, List, Dict
+  5 |+    from typing import Dict
+5 6 | 
+6 7 | x: Tuple
+7 8 | 
+
+TCH004_9.py:4:31: TCH004 [*] Move import `typing.List` out of type-checking block. Import is used for more than type hinting.
   |
 4 | if TYPE_CHECKING:
 5 |     from typing import Tuple, List, Dict
@@ -18,5 +30,17 @@ TCH004_9.py:4:31: TCH004 Move import `typing.List` out of type-checking block. I
 6 | 
 7 | x: Tuple
   |
+  = help: Move out of type-checking block
+
+ℹ Suggested fix
+1 1 | from typing import TYPE_CHECKING
+  2 |+from typing import Tuple, List
+2 3 | 
+3 4 | if TYPE_CHECKING:
+4   |-    from typing import Tuple, List, Dict
+  5 |+    from typing import Dict
+5 6 | 
+6 7 | x: Tuple
+7 8 | 
 
 
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_base_classes_1.py.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_base_classes_1.py.snap
index fbef3cea8eaff..271a3cb252a90 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_base_classes_1.py.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_base_classes_1.py.snap
@@ -1,15 +1,28 @@
 ---
 source: crates/ruff/src/rules/flake8_type_checking/mod.rs
 ---
-runtime_evaluated_base_classes_1.py:10:12: TCH004 Move import `datetime` out of type-checking block. Import is used for more than type hinting.
+runtime_evaluated_base_classes_1.py:10:12: TCH004 [*] Move import `datetime` out of type-checking block. Import is used for more than type hinting.
    |
 10 | if TYPE_CHECKING:
 11 |     import datetime  # TCH004
    |            ^^^^^^^^ TCH004
 12 |     from array import array  # TCH004
    |
+   = help: Move out of type-checking block
 
-runtime_evaluated_base_classes_1.py:11:23: TCH004 Move import `array.array` out of type-checking block. Import is used for more than type hinting.
+ℹ Suggested fix
+5  5  | 
+6  6  | import pydantic
+7  7  | from pydantic import BaseModel
+   8  |+import datetime
+8  9  | 
+9  10 | if TYPE_CHECKING:
+10    |-    import datetime  # TCH004
+11 11 |     from array import array  # TCH004
+12 12 | 
+13 13 |     import pandas  # TCH004
+
+runtime_evaluated_base_classes_1.py:11:23: TCH004 [*] Move import `array.array` out of type-checking block. Import is used for more than type hinting.
    |
 11 | if TYPE_CHECKING:
 12 |     import datetime  # TCH004
@@ -18,8 +31,22 @@ runtime_evaluated_base_classes_1.py:11:23: TCH004 Move import `array.array` out
 14 | 
 15 |     import pandas  # TCH004
    |
+   = help: Move out of type-checking block
+
+ℹ Suggested fix
+5  5  | 
+6  6  | import pydantic
+7  7  | from pydantic import BaseModel
+   8  |+from array import array
+8  9  | 
+9  10 | if TYPE_CHECKING:
+10 11 |     import datetime  # TCH004
+11    |-    from array import array  # TCH004
+12 12 | 
+13 13 |     import pandas  # TCH004
+14 14 |     import pyproj
 
-runtime_evaluated_base_classes_1.py:13:12: TCH004 Move import `pandas` out of type-checking block. Import is used for more than type hinting.
+runtime_evaluated_base_classes_1.py:13:12: TCH004 [*] Move import `pandas` out of type-checking block. Import is used for more than type hinting.
    |
 13 |     from array import array  # TCH004
 14 | 
@@ -27,5 +54,21 @@ runtime_evaluated_base_classes_1.py:13:12: TCH004 Move import `pandas` out of ty
    |            ^^^^^^ TCH004
 16 |     import pyproj
    |
+   = help: Move out of type-checking block
+
+ℹ Suggested fix
+5  5  | 
+6  6  | import pydantic
+7  7  | from pydantic import BaseModel
+   8  |+import pandas
+8  9  | 
+9  10 | if TYPE_CHECKING:
+10 11 |     import datetime  # TCH004
+11 12 |     from array import array  # TCH004
+12 13 | 
+13    |-    import pandas  # TCH004
+14 14 |     import pyproj
+15 15 | 
+16 16 | 
 
 
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_decorators_1.py.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_decorators_1.py.snap
index 02f28eb4e3e89..085d05d0222b9 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_decorators_1.py.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_decorators_1.py.snap
@@ -1,15 +1,28 @@
 ---
 source: crates/ruff/src/rules/flake8_type_checking/mod.rs
 ---
-runtime_evaluated_decorators_1.py:12:12: TCH004 Move import `datetime` out of type-checking block. Import is used for more than type hinting.
+runtime_evaluated_decorators_1.py:12:12: TCH004 [*] Move import `datetime` out of type-checking block. Import is used for more than type hinting.
    |
 12 | if TYPE_CHECKING:
 13 |     import datetime  # TCH004
    |            ^^^^^^^^ TCH004
 14 |     from array import array  # TCH004
    |
+   = help: Move out of type-checking block
 
-runtime_evaluated_decorators_1.py:13:23: TCH004 Move import `array.array` out of type-checking block. Import is used for more than type hinting.
+ℹ Suggested fix
+7  7  | from attrs import frozen
+8  8  | 
+9  9  | import numpy
+   10 |+import datetime
+10 11 | 
+11 12 | if TYPE_CHECKING:
+12    |-    import datetime  # TCH004
+13 13 |     from array import array  # TCH004
+14 14 | 
+15 15 |     import pandas  # TCH004
+
+runtime_evaluated_decorators_1.py:13:23: TCH004 [*] Move import `array.array` out of type-checking block. Import is used for more than type hinting.
    |
 13 | if TYPE_CHECKING:
 14 |     import datetime  # TCH004
@@ -18,8 +31,22 @@ runtime_evaluated_decorators_1.py:13:23: TCH004 Move import `array.array` out of
 16 | 
 17 |     import pandas  # TCH004
    |
+   = help: Move out of type-checking block
+
+ℹ Suggested fix
+7  7  | from attrs import frozen
+8  8  | 
+9  9  | import numpy
+   10 |+from array import array
+10 11 | 
+11 12 | if TYPE_CHECKING:
+12 13 |     import datetime  # TCH004
+13    |-    from array import array  # TCH004
+14 14 | 
+15 15 |     import pandas  # TCH004
+16 16 |     import pyproj
 
-runtime_evaluated_decorators_1.py:15:12: TCH004 Move import `pandas` out of type-checking block. Import is used for more than type hinting.
+runtime_evaluated_decorators_1.py:15:12: TCH004 [*] Move import `pandas` out of type-checking block. Import is used for more than type hinting.
    |
 15 |     from array import array  # TCH004
 16 | 
@@ -27,5 +54,21 @@ runtime_evaluated_decorators_1.py:15:12: TCH004 Move import `pandas` out of type
    |            ^^^^^^ TCH004
 18 |     import pyproj
    |
+   = help: Move out of type-checking block
+
+ℹ Suggested fix
+7  7  | from attrs import frozen
+8  8  | 
+9  9  | import numpy
+   10 |+import pandas
+10 11 | 
+11 12 | if TYPE_CHECKING:
+12 13 |     import datetime  # TCH004
+13 14 |     from array import array  # TCH004
+14 15 | 
+15    |-    import pandas  # TCH004
+16 16 |     import pyproj
+17 17 | 
+18 18 | 
 
 
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__strict.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__strict.snap
index 4ee56e39e1152..1e6a497223173 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__strict.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__strict.snap
@@ -1,34 +1,233 @@
 ---
 source: crates/ruff/src/rules/flake8_type_checking/mod.rs
 ---
-strict.py:27:21: TCH002 Move third-party import `pkg.A` into a type-checking block
+strict.py:27:21: TCH002 [*] Move third-party import `pkg.A` into a type-checking block
    |
-27 |     # In un-strict mode, this shouldn't rase an error, since `pkg` is used at runtime.
+27 |     # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime.
 28 |     import pkg
 29 |     from pkg import A
    |                     ^ TCH002
 30 | 
 31 |     def test(value: A):
    |
+   = help: Move into type-checking block
 
-strict.py:35:21: TCH002 Move third-party import `pkg.A` into a type-checking block
+ℹ Suggested fix
+1  1  | from __future__ import annotations
+   2  |+from typing import TYPE_CHECKING
+   3  |+
+   4  |+if TYPE_CHECKING:
+   5  |+    from pkg import A
+2  6  | 
+3  7  | 
+4  8  | def f():
+--------------------------------------------------------------------------------
+24 28 | def f():
+25 29 |     # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime.
+26 30 |     import pkg
+27    |-    from pkg import A
+28 31 | 
+29 32 |     def test(value: A):
+30 33 |         return pkg.B()
+
+strict.py:35:21: TCH002 [*] Move third-party import `pkg.A` into a type-checking block
    |
 35 | def f():
-36 |     # In un-strict mode, this shouldn't rase an error, since `pkg` is used at runtime.
+36 |     # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime.
 37 |     from pkg import A, B
    |                     ^ TCH002
 38 | 
 39 |     def test(value: A):
    |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+1  1  | from __future__ import annotations
+   2  |+from typing import TYPE_CHECKING
+   3  |+
+   4  |+if TYPE_CHECKING:
+   5  |+    from pkg import A
+2  6  | 
+3  7  | 
+4  8  | def f():
+--------------------------------------------------------------------------------
+32 36 | 
+33 37 | def f():
+34 38 |     # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime.
+35    |-    from pkg import A, B
+   39 |+    from pkg import B
+36 40 | 
+37 41 |     def test(value: A):
+38 42 |         return B()
 
-strict.py:54:25: TCH002 Move third-party import `pkg.bar.A` into a type-checking block
+strict.py:54:25: TCH002 [*] Move third-party import `pkg.bar.A` into a type-checking block
    |
-54 |     # In un-strict mode, this _should_ rase an error, since `pkg` is used at runtime.
+54 |     # In un-strict mode, this _should_ raise an error, since `pkg.bar` isn't used at runtime
 55 |     import pkg
 56 |     from pkg.bar import A
    |                         ^ TCH002
 57 | 
 58 |     def test(value: A):
    |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+1  1  | from __future__ import annotations
+   2  |+from typing import TYPE_CHECKING
+   3  |+
+   4  |+if TYPE_CHECKING:
+   5  |+    from pkg.bar import A
+2  6  | 
+3  7  | 
+4  8  | def f():
+--------------------------------------------------------------------------------
+51 55 | def f():
+52 56 |     # In un-strict mode, this _should_ raise an error, since `pkg.bar` isn't used at runtime
+53 57 |     import pkg
+54    |-    from pkg.bar import A
+55 58 | 
+56 59 |     def test(value: A):
+57 60 |         return pkg.B()
+
+strict.py:62:12: TCH002 [*] Move third-party import `pkg` into a type-checking block
+   |
+62 | def f():
+63 |     # In un-strict mode, this shouldn't raise an error, since `pkg.bar` is used at runtime.
+64 |     import pkg
+   |            ^^^ TCH002
+65 |     import pkg.bar as B
+   |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+1  1  | from __future__ import annotations
+   2  |+from typing import TYPE_CHECKING
+   3  |+
+   4  |+if TYPE_CHECKING:
+   5  |+    import pkg
+2  6  | 
+3  7  | 
+4  8  | def f():
+--------------------------------------------------------------------------------
+59 63 | 
+60 64 | def f():
+61 65 |     # In un-strict mode, this shouldn't raise an error, since `pkg.bar` is used at runtime.
+62    |-    import pkg
+63 66 |     import pkg.bar as B
+64 67 | 
+65 68 |     def test(value: pkg.A):
+
+strict.py:71:12: TCH002 [*] Move third-party import `pkg.foo` into a type-checking block
+   |
+71 | def f():
+72 |     # In un-strict mode, this shouldn't raise an error, since `pkg.foo.bar` is used at runtime.
+73 |     import pkg.foo as F
+   |            ^^^^^^^^^^^^ TCH002
+74 |     import pkg.foo.bar as B
+   |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+1  1  | from __future__ import annotations
+   2  |+from typing import TYPE_CHECKING
+   3  |+
+   4  |+if TYPE_CHECKING:
+   5  |+    import pkg.foo as F
+2  6  | 
+3  7  | 
+4  8  | def f():
+--------------------------------------------------------------------------------
+68 72 | 
+69 73 | def f():
+70 74 |     # In un-strict mode, this shouldn't raise an error, since `pkg.foo.bar` is used at runtime.
+71    |-    import pkg.foo as F
+72 75 |     import pkg.foo.bar as B
+73 76 | 
+74 77 |     def test(value: F.Foo):
+
+strict.py:80:12: TCH002 [*] Move third-party import `pkg` into a type-checking block
+   |
+80 | def f():
+81 |     # In un-strict mode, this shouldn't raise an error, since `pkg.foo.bar` is used at runtime.
+82 |     import pkg
+   |            ^^^ TCH002
+83 |     import pkg.foo.bar as B
+   |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+1  1  | from __future__ import annotations
+   2  |+from typing import TYPE_CHECKING
+   3  |+
+   4  |+if TYPE_CHECKING:
+   5  |+    import pkg
+2  6  | 
+3  7  | 
+4  8  | def f():
+--------------------------------------------------------------------------------
+77 81 | 
+78 82 | def f():
+79 83 |     # In un-strict mode, this shouldn't raise an error, since `pkg.foo.bar` is used at runtime.
+80    |-    import pkg
+81 84 |     import pkg.foo.bar as B
+82 85 | 
+83 86 |     def test(value: pkg.A):
+
+strict.py:91:12: TCH002 [*] Move third-party import `pkg` into a type-checking block
+   |
+91 |     # Note that `pkg` is a prefix of `pkgfoo` which are both different modules. This is
+92 |     # testing the implementation.
+93 |     import pkg
+   |            ^^^ TCH002
+94 |     import pkgfoo.bar as B
+   |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+1  1  | from __future__ import annotations
+   2  |+from typing import TYPE_CHECKING
+   3  |+
+   4  |+if TYPE_CHECKING:
+   5  |+    import pkg
+2  6  | 
+3  7  | 
+4  8  | def f():
+--------------------------------------------------------------------------------
+88 92 |     # In un-strict mode, this _should_ raise an error, since `pkg` isn't used at runtime.
+89 93 |     # Note that `pkg` is a prefix of `pkgfoo` which are both different modules. This is
+90 94 |     # testing the implementation.
+91    |-    import pkg
+92 95 |     import pkgfoo.bar as B
+93 96 | 
+94 97 |     def test(value: pkg.A):
+
+strict.py:101:12: TCH002 [*] Move third-party import `pkg.foo` into a type-checking block
+    |
+101 |     # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime.
+102 |     import pkg.bar as B
+103 |     import pkg.foo as F
+    |            ^^^^^^^^^^^^ TCH002
+104 | 
+105 |     def test(value: F.Foo):
+    |
+    = help: Move into type-checking block
+
+ℹ Suggested fix
+1   1   | from __future__ import annotations
+    2   |+from typing import TYPE_CHECKING
+    3   |+
+    4   |+if TYPE_CHECKING:
+    5   |+    import pkg.foo as F
+2   6   | 
+3   7   | 
+4   8   | def f():
+--------------------------------------------------------------------------------
+98  102 | def f():
+99  103 |     # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime.
+100 104 |     import pkg.bar as B
+101     |-    import pkg.foo as F
+102 105 | 
+103 106 |     def test(value: F.Foo):
+104 107 |         return B.Bar()
 
 
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__type_checking_block_after_usage.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__type_checking_block_after_usage.snap
new file mode 100644
index 0000000000000..a929edf675899
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__type_checking_block_after_usage.snap
@@ -0,0 +1,28 @@
+---
+source: crates/ruff/src/rules/flake8_type_checking/mod.rs
+---
+<filename>:6:8: TCH002 [*] Move third-party import `pandas` into a type-checking block
+   |
+ 6 | from typing import TYPE_CHECKING
+ 7 | 
+ 8 | import pandas as pd
+   |        ^^^^^^^^^^^^ TCH002
+ 9 | 
+10 | def f(x: pd.DataFrame):
+   |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+3  3  | 
+4  4  | from typing import TYPE_CHECKING
+5  5  | 
+6     |-import pandas as pd
+7  6  | 
+   7  |+if TYPE_CHECKING:
+   8  |+    import pandas as pd
+   9  |+
+8  10 | def f(x: pd.DataFrame):
+9  11 |     pass
+10 12 | 
+
+
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__type_checking_block_comment.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__type_checking_block_comment.snap
new file mode 100644
index 0000000000000..2aa0974f72f60
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__type_checking_block_comment.snap
@@ -0,0 +1,28 @@
+---
+source: crates/ruff/src/rules/flake8_type_checking/mod.rs
+---
+<filename>:6:8: TCH002 [*] Move third-party import `pandas` into a type-checking block
+   |
+ 6 | from typing import TYPE_CHECKING
+ 7 | 
+ 8 | import pandas as pd
+   |        ^^^^^^^^^^^^ TCH002
+ 9 | 
+10 | if TYPE_CHECKING:
+   |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+3  3  | 
+4  4  | from typing import TYPE_CHECKING
+5  5  | 
+6     |-import pandas as pd
+7  6  | 
+8  7  | if TYPE_CHECKING:
+9  8  |     # This is a comment.
+   9  |+    import pandas as pd
+10 10 |     import os
+11 11 | 
+12 12 | def f(x: pd.DataFrame):
+
+
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__type_checking_block_inline.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__type_checking_block_inline.snap
new file mode 100644
index 0000000000000..28788c18e5296
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__type_checking_block_inline.snap
@@ -0,0 +1,27 @@
+---
+source: crates/ruff/src/rules/flake8_type_checking/mod.rs
+---
+<filename>:6:8: TCH002 [*] Move third-party import `pandas` into a type-checking block
+   |
+ 6 | from typing import TYPE_CHECKING
+ 7 | 
+ 8 | import pandas as pd
+   |        ^^^^^^^^^^^^ TCH002
+ 9 | 
+10 | if TYPE_CHECKING: import os
+   |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+3 3 | 
+4 4 | from typing import TYPE_CHECKING
+5 5 | 
+6   |-import pandas as pd
+7 6 | 
+8   |-if TYPE_CHECKING: import os
+  7 |+if TYPE_CHECKING: import pandas as pd; import os
+9 8 | 
+10 9 | def f(x: pd.DataFrame):
+11 10 |     pass
+
+
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__type_checking_block_own_line.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__type_checking_block_own_line.snap
new file mode 100644
index 0000000000000..28ca5ee6eeae8
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__type_checking_block_own_line.snap
@@ -0,0 +1,27 @@
+---
+source: crates/ruff/src/rules/flake8_type_checking/mod.rs
+---
+<filename>:6:8: TCH002 [*] Move third-party import `pandas` into a type-checking block
+   |
+ 6 | from typing import TYPE_CHECKING
+ 7 | 
+ 8 | import pandas as pd
+   |        ^^^^^^^^^^^^ TCH002
+ 9 | 
+10 | if TYPE_CHECKING:
+   |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+3 3 | 
+4 4 | from typing import TYPE_CHECKING
+5 5 | 
+6   |-import pandas as pd
+7 6 | 
+8 7 | if TYPE_CHECKING:
+  8 |+    import pandas as pd
+9 9 |     import os
+10 10 | 
+11 11 | def f(x: pd.DataFrame):
+
+
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-first-party-import_TCH001.py.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-first-party-import_TCH001.py.snap
index de908746441a2..ac302297dccd9 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-first-party-import_TCH001.py.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-first-party-import_TCH001.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_type_checking/mod.rs
 ---
-TCH001.py:20:19: TCH001 Move application import `.TYP001` into a type-checking block
+TCH001.py:20:19: TCH001 [*] Move application import `.TYP001` into a type-checking block
    |
 20 | def f():
 21 |     from . import TYP001
@@ -9,5 +9,26 @@ TCH001.py:20:19: TCH001 Move application import `.TYP001` into a type-checking b
 22 | 
 23 |     x: TYP001
    |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+2  2  | 
+3  3  | For typing-only import detection tests, see `TCH002.py`.
+4  4  | """
+   5  |+from typing import TYPE_CHECKING
+   6  |+
+   7  |+if TYPE_CHECKING:
+   8  |+    from . import TYP001
+5  9  | 
+6  10 | 
+7  11 | def f():
+--------------------------------------------------------------------------------
+17 21 | 
+18 22 | 
+19 23 | def f():
+20    |-    from . import TYP001
+21 24 | 
+22 25 |     x: TYP001
+23 26 | 
 
 
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-standard-library-import_TCH003.py.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-standard-library-import_TCH003.py.snap
index 2c3b8bcb488f0..5e850bff867eb 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-standard-library-import_TCH003.py.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-standard-library-import_TCH003.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_type_checking/mod.rs
 ---
-TCH003.py:8:12: TCH003 Move standard library import `os` into a type-checking block
+TCH003.py:8:12: TCH003 [*] Move standard library import `os` into a type-checking block
    |
  8 | def f():
  9 |     import os
@@ -9,5 +9,22 @@ TCH003.py:8:12: TCH003 Move standard library import `os` into a type-checking bl
 10 | 
 11 |     x: os
    |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+2  2  | 
+3  3  | For typing-only import detection tests, see `TCH002.py`.
+4  4  | """
+   5  |+from typing import TYPE_CHECKING
+   6  |+
+   7  |+if TYPE_CHECKING:
+   8  |+    import os
+5  9  | 
+6  10 | 
+7  11 | def f():
+8     |-    import os
+9  12 | 
+10 13 |     x: os
+11 14 | 
 
 
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_base_classes_3.py.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_base_classes_3.py.snap
index 6cc9df1b97f02..cb75d42cbf7e5 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_base_classes_3.py.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_base_classes_3.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_type_checking/mod.rs
 ---
-runtime_evaluated_base_classes_3.py:5:18: TCH003 Move standard library import `uuid.UUID` into a type-checking block
+runtime_evaluated_base_classes_3.py:5:18: TCH003 [*] Move standard library import `uuid.UUID` into a type-checking block
   |
 5 | import datetime
 6 | import pathlib
@@ -10,5 +10,22 @@ runtime_evaluated_base_classes_3.py:5:18: TCH003 Move standard library import `u
 8 | 
 9 | import pydantic
   |
+  = help: Move into type-checking block
+
+ℹ Suggested fix
+2  2  | 
+3  3  | import datetime
+4  4  | import pathlib
+5     |-from uuid import UUID  # TCH003
+6  5  | 
+7  6  | import pydantic
+8  7  | from pydantic import BaseModel
+   8  |+from typing import TYPE_CHECKING
+   9  |+
+   10 |+if TYPE_CHECKING:
+   11 |+    from uuid import UUID
+9  12 | 
+10 13 | 
+11 14 | class A(pydantic.BaseModel):
 
 
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_decorators_3.py.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_decorators_3.py.snap
index 865cacc0379f9..46574c3418ed3 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_decorators_3.py.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_decorators_3.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_type_checking/mod.rs
 ---
-runtime_evaluated_decorators_3.py:6:18: TCH003 Move standard library import `uuid.UUID` into a type-checking block
+runtime_evaluated_decorators_3.py:6:18: TCH003 [*] Move standard library import `uuid.UUID` into a type-checking block
    |
  6 | from array import array
  7 | from dataclasses import dataclass
@@ -10,5 +10,22 @@ runtime_evaluated_decorators_3.py:6:18: TCH003 Move standard library import `uui
  9 | 
 10 | import attrs
    |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+3  3  | import datetime
+4  4  | from array import array
+5  5  | from dataclasses import dataclass
+6     |-from uuid import UUID  # TCH003
+7  6  | 
+8  7  | import attrs
+9  8  | from attrs import frozen
+   9  |+from typing import TYPE_CHECKING
+   10 |+
+   11 |+if TYPE_CHECKING:
+   12 |+    from uuid import UUID
+10 13 | 
+11 14 | 
+12 15 | @attrs.define(auto_attribs=True)
 
 
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-third-party-import_TCH002.py.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-third-party-import_TCH002.py.snap
index 3d2701eec4ac4..26ce364ee1e04 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-third-party-import_TCH002.py.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-third-party-import_TCH002.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_type_checking/mod.rs
 ---
-TCH002.py:5:12: TCH002 Move third-party import `pandas` into a type-checking block
+TCH002.py:5:12: TCH002 [*] Move third-party import `pandas` into a type-checking block
   |
 5 | def f():
 6 |     import pandas as pd  # TCH002
@@ -9,8 +9,23 @@ TCH002.py:5:12: TCH002 Move third-party import `pandas` into a type-checking blo
 7 | 
 8 |     x: pd.DataFrame
   |
+  = help: Move into type-checking block
 
-TCH002.py:11:24: TCH002 Move third-party import `pandas.DataFrame` into a type-checking block
+ℹ Suggested fix
+1 1 | """Tests to determine accurate detection of typing-only imports."""
+  2 |+from typing import TYPE_CHECKING
+  3 |+
+  4 |+if TYPE_CHECKING:
+  5 |+    import pandas as pd
+2 6 | 
+3 7 | 
+4 8 | def f():
+5   |-    import pandas as pd  # TCH002
+6 9 | 
+7 10 |     x: pd.DataFrame
+8 11 | 
+
+TCH002.py:11:24: TCH002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
    |
 11 | def f():
 12 |     from pandas import DataFrame  # TCH002
@@ -18,8 +33,27 @@ TCH002.py:11:24: TCH002 Move third-party import `pandas.DataFrame` into a type-c
 13 | 
 14 |     x: DataFrame
    |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+1  1  | """Tests to determine accurate detection of typing-only imports."""
+   2  |+from typing import TYPE_CHECKING
+   3  |+
+   4  |+if TYPE_CHECKING:
+   5  |+    from pandas import DataFrame
+2  6  | 
+3  7  | 
+4  8  | def f():
+--------------------------------------------------------------------------------
+8  12 | 
+9  13 | 
+10 14 | def f():
+11    |-    from pandas import DataFrame  # TCH002
+12 15 | 
+13 16 |     x: DataFrame
+14 17 | 
 
-TCH002.py:17:24: TCH002 Move third-party import `pandas.DataFrame` into a type-checking block
+TCH002.py:17:24: TCH002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
    |
 17 | def f():
 18 |     from pandas import DataFrame as df  # TCH002
@@ -27,8 +61,27 @@ TCH002.py:17:24: TCH002 Move third-party import `pandas.DataFrame` into a type-c
 19 | 
 20 |     x: df
    |
+   = help: Move into type-checking block
 
-TCH002.py:23:12: TCH002 Move third-party import `pandas` into a type-checking block
+ℹ Suggested fix
+1  1  | """Tests to determine accurate detection of typing-only imports."""
+   2  |+from typing import TYPE_CHECKING
+   3  |+
+   4  |+if TYPE_CHECKING:
+   5  |+    from pandas import DataFrame as df
+2  6  | 
+3  7  | 
+4  8  | def f():
+--------------------------------------------------------------------------------
+14 18 | 
+15 19 | 
+16 20 | def f():
+17    |-    from pandas import DataFrame as df  # TCH002
+18 21 | 
+19 22 |     x: df
+20 23 | 
+
+TCH002.py:23:12: TCH002 [*] Move third-party import `pandas` into a type-checking block
    |
 23 | def f():
 24 |     import pandas as pd  # TCH002
@@ -36,8 +89,27 @@ TCH002.py:23:12: TCH002 Move third-party import `pandas` into a type-checking bl
 25 | 
 26 |     x: pd.DataFrame = 1
    |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+1  1  | """Tests to determine accurate detection of typing-only imports."""
+   2  |+from typing import TYPE_CHECKING
+   3  |+
+   4  |+if TYPE_CHECKING:
+   5  |+    import pandas as pd
+2  6  | 
+3  7  | 
+4  8  | def f():
+--------------------------------------------------------------------------------
+20 24 | 
+21 25 | 
+22 26 | def f():
+23    |-    import pandas as pd  # TCH002
+24 27 | 
+25 28 |     x: pd.DataFrame = 1
+26 29 | 
 
-TCH002.py:29:24: TCH002 Move third-party import `pandas.DataFrame` into a type-checking block
+TCH002.py:29:24: TCH002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
    |
 29 | def f():
 30 |     from pandas import DataFrame  # TCH002
@@ -45,8 +117,27 @@ TCH002.py:29:24: TCH002 Move third-party import `pandas.DataFrame` into a type-c
 31 | 
 32 |     x: DataFrame = 2
    |
+   = help: Move into type-checking block
 
-TCH002.py:35:24: TCH002 Move third-party import `pandas.DataFrame` into a type-checking block
+ℹ Suggested fix
+1  1  | """Tests to determine accurate detection of typing-only imports."""
+   2  |+from typing import TYPE_CHECKING
+   3  |+
+   4  |+if TYPE_CHECKING:
+   5  |+    from pandas import DataFrame
+2  6  | 
+3  7  | 
+4  8  | def f():
+--------------------------------------------------------------------------------
+26 30 | 
+27 31 | 
+28 32 | def f():
+29    |-    from pandas import DataFrame  # TCH002
+30 33 | 
+31 34 |     x: DataFrame = 2
+32 35 | 
+
+TCH002.py:35:24: TCH002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
    |
 35 | def f():
 36 |     from pandas import DataFrame as df  # TCH002
@@ -54,8 +145,27 @@ TCH002.py:35:24: TCH002 Move third-party import `pandas.DataFrame` into a type-c
 37 | 
 38 |     x: df = 3
    |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+1  1  | """Tests to determine accurate detection of typing-only imports."""
+   2  |+from typing import TYPE_CHECKING
+   3  |+
+   4  |+if TYPE_CHECKING:
+   5  |+    from pandas import DataFrame as df
+2  6  | 
+3  7  | 
+4  8  | def f():
+--------------------------------------------------------------------------------
+32 36 | 
+33 37 | 
+34 38 | def f():
+35    |-    from pandas import DataFrame as df  # TCH002
+36 39 | 
+37 40 |     x: df = 3
+38 41 | 
 
-TCH002.py:41:12: TCH002 Move third-party import `pandas` into a type-checking block
+TCH002.py:41:12: TCH002 [*] Move third-party import `pandas` into a type-checking block
    |
 41 | def f():
 42 |     import pandas as pd  # TCH002
@@ -63,8 +173,27 @@ TCH002.py:41:12: TCH002 Move third-party import `pandas` into a type-checking bl
 43 | 
 44 |     x: "pd.DataFrame" = 1
    |
+   = help: Move into type-checking block
 
-TCH002.py:47:12: TCH002 Move third-party import `pandas` into a type-checking block
+ℹ Suggested fix
+1  1  | """Tests to determine accurate detection of typing-only imports."""
+   2  |+from typing import TYPE_CHECKING
+   3  |+
+   4  |+if TYPE_CHECKING:
+   5  |+    import pandas as pd
+2  6  | 
+3  7  | 
+4  8  | def f():
+--------------------------------------------------------------------------------
+38 42 | 
+39 43 | 
+40 44 | def f():
+41    |-    import pandas as pd  # TCH002
+42 45 | 
+43 46 |     x: "pd.DataFrame" = 1
+44 47 | 
+
+TCH002.py:47:12: TCH002 [*] Move third-party import `pandas` into a type-checking block
    |
 47 | def f():
 48 |     import pandas as pd  # TCH002
@@ -72,5 +201,24 @@ TCH002.py:47:12: TCH002 Move third-party import `pandas` into a type-checking bl
 49 | 
 50 |     x = dict["pd.DataFrame", "pd.DataFrame"]
    |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+1  1  | """Tests to determine accurate detection of typing-only imports."""
+   2  |+from typing import TYPE_CHECKING
+   3  |+
+   4  |+if TYPE_CHECKING:
+   5  |+    import pandas as pd
+2  6  | 
+3  7  | 
+4  8  | def f():
+--------------------------------------------------------------------------------
+44 48 | 
+45 49 | 
+46 50 | def f():
+47    |-    import pandas as pd  # TCH002
+48 51 | 
+49 52 |     x = dict["pd.DataFrame", "pd.DataFrame"]
+50 53 | 
 
 
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_base_classes_2.py.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_base_classes_2.py.snap
index 247674c3fef51..9c1052549cf8e 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_base_classes_2.py.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_base_classes_2.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/flake8_type_checking/mod.rs
 ---
-runtime_evaluated_base_classes_2.py:3:8: TCH002 Move third-party import `geopandas` into a type-checking block
+runtime_evaluated_base_classes_2.py:3:8: TCH002 [*] Move third-party import `geopandas` into a type-checking block
   |
 3 | from __future__ import annotations
 4 | 
@@ -10,8 +10,26 @@ runtime_evaluated_base_classes_2.py:3:8: TCH002 Move third-party import `geopand
 6 | import pydantic
 7 | import pyproj  # TCH002
   |
+  = help: Move into type-checking block
 
-runtime_evaluated_base_classes_2.py:5:8: TCH002 Move third-party import `pyproj` into a type-checking block
+ℹ Suggested fix
+1  1  | from __future__ import annotations
+2  2  | 
+3     |-import geopandas as gpd  # TCH002
+4  3  | import pydantic
+5  4  | import pyproj  # TCH002
+6  5  | from pydantic import BaseModel
+7  6  | 
+8  7  | import numpy
+   8  |+from typing import TYPE_CHECKING
+   9  |+
+   10 |+if TYPE_CHECKING:
+   11 |+    import geopandas as gpd
+9  12 | 
+10 13 | 
+11 14 | class A(BaseModel):
+
+runtime_evaluated_base_classes_2.py:5:8: TCH002 [*] Move third-party import `pyproj` into a type-checking block
   |
 5 | import geopandas as gpd  # TCH002
 6 | import pydantic
@@ -19,5 +37,22 @@ runtime_evaluated_base_classes_2.py:5:8: TCH002 Move third-party import `pyproj`
   |        ^^^^^^ TCH002
 8 | from pydantic import BaseModel
   |
+  = help: Move into type-checking block
+
+ℹ Suggested fix
+2  2  | 
+3  3  | import geopandas as gpd  # TCH002
+4  4  | import pydantic
+5     |-import pyproj  # TCH002
+6  5  | from pydantic import BaseModel
+7  6  | 
+8  7  | import numpy
+   8  |+from typing import TYPE_CHECKING
+   9  |+
+   10 |+if TYPE_CHECKING:
+   11 |+    import pyproj
+9  12 | 
+10 13 | 
+11 14 | class A(BaseModel):
 
 
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_decorators_2.py.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_decorators_2.py.snap
index 00cf182eaf7a7..c5f29c943de40 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_decorators_2.py.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_decorators_2.py.snap
@@ -1,12 +1,26 @@
 ---
 source: crates/ruff/src/rules/flake8_type_checking/mod.rs
 ---
-runtime_evaluated_decorators_2.py:10:8: TCH002 Move third-party import `numpy` into a type-checking block
+runtime_evaluated_decorators_2.py:10:8: TCH002 [*] Move third-party import `numpy` into a type-checking block
    |
 10 | from attrs import frozen
 11 | 
 12 | import numpy  # TCH002
    |        ^^^^^ TCH002
    |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+7  7  | import pyproj
+8  8  | from attrs import frozen
+9  9  | 
+10    |-import numpy  # TCH002
+   10 |+from typing import TYPE_CHECKING
+   11 |+
+   12 |+if TYPE_CHECKING:
+   13 |+    import numpy
+11 14 | 
+12 15 | 
+13 16 | @attrs.define(auto_attribs=True)
 
 
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-third-party-import_strict.py.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-third-party-import_strict.py.snap
index a26d1222d3d2b..00cc9830d0cc1 100644
--- a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-third-party-import_strict.py.snap
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing-only-third-party-import_strict.py.snap
@@ -1,14 +1,61 @@
 ---
 source: crates/ruff/src/rules/flake8_type_checking/mod.rs
 ---
-strict.py:54:25: TCH002 Move third-party import `pkg.bar.A` into a type-checking block
+strict.py:54:25: TCH002 [*] Move third-party import `pkg.bar.A` into a type-checking block
    |
-54 |     # In un-strict mode, this _should_ rase an error, since `pkg` is used at runtime.
+54 |     # In un-strict mode, this _should_ raise an error, since `pkg.bar` isn't used at runtime
 55 |     import pkg
 56 |     from pkg.bar import A
    |                         ^ TCH002
 57 | 
 58 |     def test(value: A):
    |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+1  1  | from __future__ import annotations
+   2  |+from typing import TYPE_CHECKING
+   3  |+
+   4  |+if TYPE_CHECKING:
+   5  |+    from pkg.bar import A
+2  6  | 
+3  7  | 
+4  8  | def f():
+--------------------------------------------------------------------------------
+51 55 | def f():
+52 56 |     # In un-strict mode, this _should_ raise an error, since `pkg.bar` isn't used at runtime
+53 57 |     import pkg
+54    |-    from pkg.bar import A
+55 58 | 
+56 59 |     def test(value: A):
+57 60 |         return pkg.B()
+
+strict.py:91:12: TCH002 [*] Move third-party import `pkg` into a type-checking block
+   |
+91 |     # Note that `pkg` is a prefix of `pkgfoo` which are both different modules. This is
+92 |     # testing the implementation.
+93 |     import pkg
+   |            ^^^ TCH002
+94 |     import pkgfoo.bar as B
+   |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+1  1  | from __future__ import annotations
+   2  |+from typing import TYPE_CHECKING
+   3  |+
+   4  |+if TYPE_CHECKING:
+   5  |+    import pkg
+2  6  | 
+3  7  | 
+4  8  | def f():
+--------------------------------------------------------------------------------
+88 92 |     # In un-strict mode, this _should_ raise an error, since `pkg` isn't used at runtime.
+89 93 |     # Note that `pkg` is a prefix of `pkgfoo` which are both different modules. This is
+90 94 |     # testing the implementation.
+91    |-    import pkg
+92 95 |     import pkgfoo.bar as B
+93 96 | 
+94 97 |     def test(value: pkg.A):
 
 
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing_import_after_package_import.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing_import_after_package_import.snap
new file mode 100644
index 0000000000000..8c430594c2855
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing_import_after_package_import.snap
@@ -0,0 +1,29 @@
+---
+source: crates/ruff/src/rules/flake8_type_checking/mod.rs
+---
+<filename>:4:8: TCH002 [*] Move third-party import `pandas` into a type-checking block
+  |
+4 | from __future__ import annotations
+5 | 
+6 | import pandas as pd
+  |        ^^^^^^^^^^^^ TCH002
+7 | 
+8 | from typing import TYPE_CHECKING
+  |
+  = help: Move into type-checking block
+
+ℹ Suggested fix
+1  1  | 
+2  2  | from __future__ import annotations
+3  3  | 
+4     |-import pandas as pd
+5  4  | 
+6  5  | from typing import TYPE_CHECKING
+7  6  | 
+   7  |+if TYPE_CHECKING:
+   8  |+    import pandas as pd
+   9  |+
+8  10 | def f(x: pd.DataFrame):
+9  11 |     pass
+
+
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing_import_after_usage.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing_import_after_usage.snap
new file mode 100644
index 0000000000000..683b75f97929c
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing_import_after_usage.snap
@@ -0,0 +1,15 @@
+---
+source: crates/ruff/src/rules/flake8_type_checking/mod.rs
+---
+<filename>:4:8: TCH002 Move third-party import `pandas` into a type-checking block
+  |
+4 | from __future__ import annotations
+5 | 
+6 | import pandas as pd
+  |        ^^^^^^^^^^^^ TCH002
+7 | 
+8 | def f(x: pd.DataFrame):
+  |
+  = help: Move into type-checking block
+
+
diff --git a/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing_import_before_package_import.snap b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing_import_before_package_import.snap
new file mode 100644
index 0000000000000..edc33e0366a6b
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_type_checking/snapshots/ruff__rules__flake8_type_checking__tests__typing_import_before_package_import.snap
@@ -0,0 +1,27 @@
+---
+source: crates/ruff/src/rules/flake8_type_checking/mod.rs
+---
+<filename>:6:8: TCH002 [*] Move third-party import `pandas` into a type-checking block
+   |
+ 6 | from typing import TYPE_CHECKING
+ 7 | 
+ 8 | import pandas as pd
+   |        ^^^^^^^^^^^^ TCH002
+ 9 | 
+10 | def f(x: pd.DataFrame):
+   |
+   = help: Move into type-checking block
+
+ℹ Suggested fix
+3  3  | 
+4  4  | from typing import TYPE_CHECKING
+5  5  | 
+6     |-import pandas as pd
+7  6  | 
+   7  |+if TYPE_CHECKING:
+   8  |+    import pandas as pd
+   9  |+
+8  10 | def f(x: pd.DataFrame):
+9  11 |     pass
+
+
diff --git a/crates/ruff/src/rules/flake8_unused_arguments/helpers.rs b/crates/ruff/src/rules/flake8_unused_arguments/helpers.rs
index 9b76c2eccd01d..06699640159ef 100644
--- a/crates/ruff/src/rules/flake8_unused_arguments/helpers.rs
+++ b/crates/ruff/src/rules/flake8_unused_arguments/helpers.rs
@@ -1,33 +1,31 @@
-use rustpython_parser::ast::{Constant, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Constant, Expr, Stmt};
 
 use ruff_python_ast::helpers::is_docstring_stmt;
 
 /// Return `true` if a `Stmt` is a "empty": a `pass`, `...`, `raise
 /// NotImplementedError`, or `raise NotImplemented` (with or without arguments).
 fn is_empty_stmt(stmt: &Stmt) -> bool {
-    match &stmt.node {
-        StmtKind::Pass => return true,
-        StmtKind::Expr { value } => {
+    match stmt {
+        Stmt::Pass(_) => return true,
+        Stmt::Expr(ast::StmtExpr { value, range: _ }) => {
             return matches!(
-                value.node,
-                ExprKind::Constant {
+                value.as_ref(),
+                Expr::Constant(ast::ExprConstant {
                     value: Constant::Ellipsis,
                     ..
-                }
+                })
             )
         }
-        StmtKind::Raise { exc, cause } => {
+        Stmt::Raise(ast::StmtRaise { exc, cause, .. }) => {
             if cause.is_none() {
                 if let Some(exc) = exc {
-                    match &exc.node {
-                        ExprKind::Name { id, .. } => {
-                            return id.as_str() == "NotImplementedError"
-                                || id.as_str() == "NotImplemented";
+                    match exc.as_ref() {
+                        Expr::Name(ast::ExprName { id, .. }) => {
+                            return id == "NotImplementedError" || id == "NotImplemented";
                         }
-                        ExprKind::Call { func, .. } => {
-                            if let ExprKind::Name { id, .. } = &func.node {
-                                return id.as_str() == "NotImplementedError"
-                                    || id.as_str() == "NotImplemented";
+                        Expr::Call(ast::ExprCall { func, .. }) => {
+                            if let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() {
+                                return id == "NotImplementedError" || id == "NotImplemented";
                             }
                         }
                         _ => {}
@@ -40,8 +38,8 @@ fn is_empty_stmt(stmt: &Stmt) -> bool {
     false
 }
 
-pub fn is_empty(body: &[Stmt]) -> bool {
-    match &body {
+pub(crate) fn is_empty(body: &[Stmt]) -> bool {
+    match body {
         [] => true,
         [stmt] => is_docstring_stmt(stmt) || is_empty_stmt(stmt),
         [docstring, stmt] => is_docstring_stmt(docstring) && is_empty_stmt(stmt),
diff --git a/crates/ruff/src/rules/flake8_unused_arguments/mod.rs b/crates/ruff/src/rules/flake8_unused_arguments/mod.rs
index 1739430a9ab96..4875916f5a5c8 100644
--- a/crates/ruff/src/rules/flake8_unused_arguments/mod.rs
+++ b/crates/ruff/src/rules/flake8_unused_arguments/mod.rs
@@ -2,25 +2,23 @@
 mod helpers;
 pub(crate) mod rules;
 pub mod settings;
-mod types;
 
 #[cfg(test)]
 mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::UnusedFunctionArgument, Path::new("ARG.py"); "ARG001")]
-    #[test_case(Rule::UnusedMethodArgument, Path::new("ARG.py"); "ARG002")]
-    #[test_case(Rule::UnusedClassMethodArgument, Path::new("ARG.py"); "ARG003")]
-    #[test_case(Rule::UnusedStaticMethodArgument, Path::new("ARG.py"); "ARG004")]
-    #[test_case(Rule::UnusedLambdaArgument, Path::new("ARG.py"); "ARG005")]
+    #[test_case(Rule::UnusedFunctionArgument, Path::new("ARG.py"))]
+    #[test_case(Rule::UnusedMethodArgument, Path::new("ARG.py"))]
+    #[test_case(Rule::UnusedClassMethodArgument, Path::new("ARG.py"))]
+    #[test_case(Rule::UnusedStaticMethodArgument, Path::new("ARG.py"))]
+    #[test_case(Rule::UnusedLambdaArgument, Path::new("ARG.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/flake8_unused_arguments/rules/mod.rs b/crates/ruff/src/rules/flake8_unused_arguments/rules/mod.rs
new file mode 100644
index 0000000000000..5cf115d8bf1f1
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_unused_arguments/rules/mod.rs
@@ -0,0 +1,6 @@
+pub(crate) use unused_arguments::{
+    unused_arguments, UnusedClassMethodArgument, UnusedFunctionArgument, UnusedLambdaArgument,
+    UnusedMethodArgument, UnusedStaticMethodArgument,
+};
+
+mod unused_arguments;
diff --git a/crates/ruff/src/rules/flake8_unused_arguments/rules.rs b/crates/ruff/src/rules/flake8_unused_arguments/rules/unused_arguments.rs
similarity index 74%
rename from crates/ruff/src/rules/flake8_unused_arguments/rules.rs
rename to crates/ruff/src/rules/flake8_unused_arguments/rules/unused_arguments.rs
index ae2f505a2d86e..f410b822cc2ee 100644
--- a/crates/ruff/src/rules/flake8_unused_arguments/rules.rs
+++ b/crates/ruff/src/rules/flake8_unused_arguments/rules/unused_arguments.rs
@@ -1,20 +1,54 @@
 use std::iter;
 
 use regex::Regex;
+use rustpython_parser::ast;
 use rustpython_parser::ast::{Arg, Arguments};
 
+use ruff_diagnostics::DiagnosticKind;
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_semantic::analyze::function_type;
 use ruff_python_semantic::analyze::function_type::FunctionType;
 use ruff_python_semantic::analyze::visibility;
 use ruff_python_semantic::binding::Bindings;
-use ruff_python_semantic::scope::{FunctionDef, Lambda, Scope, ScopeKind};
+use ruff_python_semantic::scope::{Scope, ScopeKind};
 
 use crate::checkers::ast::Checker;
+use crate::registry::Rule;
 
-use super::helpers;
-use super::types::Argumentable;
+use super::super::helpers;
+
+/// An AST node that can contain arguments.
+#[derive(Debug, Copy, Clone)]
+enum Argumentable {
+    Function,
+    Method,
+    ClassMethod,
+    StaticMethod,
+    Lambda,
+}
+
+impl Argumentable {
+    fn check_for(self, name: String) -> DiagnosticKind {
+        match self {
+            Self::Function => UnusedFunctionArgument { name }.into(),
+            Self::Method => UnusedMethodArgument { name }.into(),
+            Self::ClassMethod => UnusedClassMethodArgument { name }.into(),
+            Self::StaticMethod => UnusedStaticMethodArgument { name }.into(),
+            Self::Lambda => UnusedLambdaArgument { name }.into(),
+        }
+    }
+
+    const fn rule_code(self) -> Rule {
+        match self {
+            Self::Function => Rule::UnusedFunctionArgument,
+            Self::Method => Rule::UnusedMethodArgument,
+            Self::ClassMethod => Rule::UnusedClassMethodArgument,
+            Self::StaticMethod => Rule::UnusedStaticMethodArgument,
+            Self::Lambda => Rule::UnusedLambdaArgument,
+        }
+    }
+}
 
 /// ## What it does
 /// Checks for the presence of unused arguments in function definitions.
@@ -36,7 +70,7 @@ use super::types::Argumentable;
 /// ```
 #[violation]
 pub struct UnusedFunctionArgument {
-    pub name: String,
+    pub(super) name: String,
 }
 
 impl Violation for UnusedFunctionArgument {
@@ -56,19 +90,20 @@ impl Violation for UnusedFunctionArgument {
 ///
 /// ## Example
 /// ```python
-/// class MyClass:
-///     def my_method(self, arg1, arg2):
+/// class Class:
+///     def foo(self, arg1, arg2):
 ///         print(arg1)
 /// ```
 ///
 /// Use instead:
 /// ```python
-/// class MyClass:
-///     def my_method(self, arg1):
+/// class Class:
+///     def foo(self, arg1):
+///         print(arg1)
 /// ```
 #[violation]
 pub struct UnusedMethodArgument {
-    pub name: String,
+    pub(super) name: String,
 }
 
 impl Violation for UnusedMethodArgument {
@@ -88,28 +123,22 @@ impl Violation for UnusedMethodArgument {
 ///
 /// ## Example
 /// ```python
-/// class MyClass:
+/// class Class:
 ///     @classmethod
-///     def my_method(self, arg1, arg2):
+///     def foo(cls, arg1, arg2):
 ///         print(arg1)
-///
-///     def other_method(self):
-///         self.my_method("foo", "bar")
 /// ```
 ///
 /// Use instead:
 /// ```python
-/// class MyClass:
+/// class Class:
 ///     @classmethod
-///     def my_method(self, arg1):
+///     def foo(cls, arg1):
 ///         print(arg1)
-///
-///     def other_method(self):
-///         self.my_method("foo", "bar")
 /// ```
 #[violation]
 pub struct UnusedClassMethodArgument {
-    pub name: String,
+    pub(super) name: String,
 }
 
 impl Violation for UnusedClassMethodArgument {
@@ -129,28 +158,22 @@ impl Violation for UnusedClassMethodArgument {
 ///
 /// ## Example
 /// ```python
-/// class MyClass:
+/// class Class:
 ///     @staticmethod
-///     def my_static_method(self, arg1, arg2):
+///     def foo(arg1, arg2):
 ///         print(arg1)
-///
-///     def other_method(self):
-///         self.my_static_method("foo", "bar")
 /// ```
 ///
 /// Use instead:
 /// ```python
-/// class MyClass:
+/// class Class:
 ///     @static
-///     def my_static_method(self, arg1):
+///     def foo(arg1):
 ///         print(arg1)
-///
-///     def other_method(self):
-///         self.my_static_method("foo", "bar")
 /// ```
 #[violation]
 pub struct UnusedStaticMethodArgument {
-    pub name: String,
+    pub(super) name: String,
 }
 
 impl Violation for UnusedStaticMethodArgument {
@@ -182,7 +205,7 @@ impl Violation for UnusedStaticMethodArgument {
 /// ```
 #[violation]
 pub struct UnusedLambdaArgument {
-    pub name: String,
+    pub(super) name: String,
 }
 
 impl Violation for UnusedLambdaArgument {
@@ -258,15 +281,15 @@ fn call<'a>(
     let mut diagnostics: Vec<Diagnostic> = vec![];
     for arg in args {
         if let Some(binding) = values
-            .get(arg.node.arg.as_str())
-            .map(|index| &bindings[*index])
+            .get(arg.arg.as_str())
+            .map(|binding_id| &bindings[binding_id])
         {
-            if !binding.used()
-                && binding.kind.is_argument()
-                && !dummy_variable_rgx.is_match(arg.node.arg.as_str())
+            if binding.kind.is_argument()
+                && !binding.is_used()
+                && !dummy_variable_rgx.is_match(arg.arg.as_str())
             {
                 diagnostics.push(Diagnostic::new(
-                    argumentable.check_for(arg.node.arg.to_string()),
+                    argumentable.check_for(arg.arg.to_string()),
                     binding.range,
                 ));
             }
@@ -276,14 +299,21 @@ fn call<'a>(
 }
 
 /// ARG001, ARG002, ARG003, ARG004, ARG005
-pub fn unused_arguments(
+pub(crate) fn unused_arguments(
     checker: &Checker,
     parent: &Scope,
     scope: &Scope,
     bindings: &Bindings,
 ) -> Vec<Diagnostic> {
     match &scope.kind {
-        ScopeKind::Function(FunctionDef {
+        ScopeKind::Function(ast::StmtFunctionDef {
+            name,
+            args,
+            body,
+            decorator_list,
+            ..
+        })
+        | ScopeKind::AsyncFunction(ast::StmtAsyncFunctionDef {
             name,
             args,
             body,
@@ -291,7 +321,7 @@ pub fn unused_arguments(
             ..
         }) => {
             match function_type::classify(
-                &checker.ctx,
+                checker.semantic_model(),
                 parent,
                 name,
                 decorator_list,
@@ -299,11 +329,8 @@ pub fn unused_arguments(
                 &checker.settings.pep8_naming.staticmethod_decorators,
             ) {
                 FunctionType::Function => {
-                    if checker
-                        .settings
-                        .rules
-                        .enabled(Argumentable::Function.rule_code())
-                        && !visibility::is_overload(&checker.ctx, decorator_list)
+                    if checker.enabled(Argumentable::Function.rule_code())
+                        && !visibility::is_overload(checker.semantic_model(), decorator_list)
                     {
                         function(
                             Argumentable::Function,
@@ -321,18 +348,15 @@ pub fn unused_arguments(
                     }
                 }
                 FunctionType::Method => {
-                    if checker
-                        .settings
-                        .rules
-                        .enabled(Argumentable::Method.rule_code())
+                    if checker.enabled(Argumentable::Method.rule_code())
                         && !helpers::is_empty(body)
                         && (!visibility::is_magic(name)
                             || visibility::is_init(name)
                             || visibility::is_new(name)
                             || visibility::is_call(name))
-                        && !visibility::is_abstract(&checker.ctx, decorator_list)
-                        && !visibility::is_override(&checker.ctx, decorator_list)
-                        && !visibility::is_overload(&checker.ctx, decorator_list)
+                        && !visibility::is_abstract(checker.semantic_model(), decorator_list)
+                        && !visibility::is_override(checker.semantic_model(), decorator_list)
+                        && !visibility::is_overload(checker.semantic_model(), decorator_list)
                     {
                         method(
                             Argumentable::Method,
@@ -350,18 +374,15 @@ pub fn unused_arguments(
                     }
                 }
                 FunctionType::ClassMethod => {
-                    if checker
-                        .settings
-                        .rules
-                        .enabled(Argumentable::ClassMethod.rule_code())
+                    if checker.enabled(Argumentable::ClassMethod.rule_code())
                         && !helpers::is_empty(body)
                         && (!visibility::is_magic(name)
                             || visibility::is_init(name)
                             || visibility::is_new(name)
                             || visibility::is_call(name))
-                        && !visibility::is_abstract(&checker.ctx, decorator_list)
-                        && !visibility::is_override(&checker.ctx, decorator_list)
-                        && !visibility::is_overload(&checker.ctx, decorator_list)
+                        && !visibility::is_abstract(checker.semantic_model(), decorator_list)
+                        && !visibility::is_override(checker.semantic_model(), decorator_list)
+                        && !visibility::is_overload(checker.semantic_model(), decorator_list)
                     {
                         method(
                             Argumentable::ClassMethod,
@@ -379,18 +400,15 @@ pub fn unused_arguments(
                     }
                 }
                 FunctionType::StaticMethod => {
-                    if checker
-                        .settings
-                        .rules
-                        .enabled(Argumentable::StaticMethod.rule_code())
+                    if checker.enabled(Argumentable::StaticMethod.rule_code())
                         && !helpers::is_empty(body)
                         && (!visibility::is_magic(name)
                             || visibility::is_init(name)
                             || visibility::is_new(name)
                             || visibility::is_call(name))
-                        && !visibility::is_abstract(&checker.ctx, decorator_list)
-                        && !visibility::is_override(&checker.ctx, decorator_list)
-                        && !visibility::is_overload(&checker.ctx, decorator_list)
+                        && !visibility::is_abstract(checker.semantic_model(), decorator_list)
+                        && !visibility::is_override(checker.semantic_model(), decorator_list)
+                        && !visibility::is_overload(checker.semantic_model(), decorator_list)
                     {
                         function(
                             Argumentable::StaticMethod,
@@ -409,12 +427,8 @@ pub fn unused_arguments(
                 }
             }
         }
-        ScopeKind::Lambda(Lambda { args, .. }) => {
-            if checker
-                .settings
-                .rules
-                .enabled(Argumentable::Lambda.rule_code())
-            {
+        ScopeKind::Lambda(ast::ExprLambda { args, .. }) => {
+            if checker.enabled(Argumentable::Lambda.rule_code()) {
                 function(
                     Argumentable::Lambda,
                     args,
diff --git a/crates/ruff/src/rules/flake8_unused_arguments/settings.rs b/crates/ruff/src/rules/flake8_unused_arguments/settings.rs
index 753bbb9a45091..f8853ddab47be 100644
--- a/crates/ruff/src/rules/flake8_unused_arguments/settings.rs
+++ b/crates/ruff/src/rules/flake8_unused_arguments/settings.rs
@@ -1,18 +1,18 @@
 //! Settings for the `flake8-unused-arguments` plugin.
 
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::{CacheKey, ConfigurationOptions};
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
 
 #[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, CombineOptions,
 )]
 #[serde(
     deny_unknown_fields,
     rename_all = "kebab-case",
     rename = "Flake8UnusedArgumentsOptions"
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = "false",
diff --git a/crates/ruff/src/rules/flake8_unused_arguments/types.rs b/crates/ruff/src/rules/flake8_unused_arguments/types.rs
deleted file mode 100644
index b4a8c6d871026..0000000000000
--- a/crates/ruff/src/rules/flake8_unused_arguments/types.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use ruff_diagnostics::DiagnosticKind;
-
-use crate::registry::Rule;
-
-use super::rules;
-
-/// An AST node that can contain arguments.
-#[derive(Copy, Clone)]
-pub enum Argumentable {
-    Function,
-    Method,
-    ClassMethod,
-    StaticMethod,
-    Lambda,
-}
-
-impl Argumentable {
-    pub fn check_for(self, name: String) -> DiagnosticKind {
-        match self {
-            Self::Function => rules::UnusedFunctionArgument { name }.into(),
-            Self::Method => rules::UnusedMethodArgument { name }.into(),
-            Self::ClassMethod => rules::UnusedClassMethodArgument { name }.into(),
-            Self::StaticMethod => rules::UnusedStaticMethodArgument { name }.into(),
-            Self::Lambda => rules::UnusedLambdaArgument { name }.into(),
-        }
-    }
-
-    pub const fn rule_code(self) -> Rule {
-        match self {
-            Self::Function => Rule::UnusedFunctionArgument,
-            Self::Method => Rule::UnusedMethodArgument,
-            Self::ClassMethod => Rule::UnusedClassMethodArgument,
-            Self::StaticMethod => Rule::UnusedStaticMethodArgument,
-            Self::Lambda => Rule::UnusedLambdaArgument,
-        }
-    }
-}
diff --git a/crates/ruff/src/rules/flake8_use_pathlib/mod.rs b/crates/ruff/src/rules/flake8_use_pathlib/mod.rs
index dc2f6ba566668..6e72e583edffe 100644
--- a/crates/ruff/src/rules/flake8_use_pathlib/mod.rs
+++ b/crates/ruff/src/rules/flake8_use_pathlib/mod.rs
@@ -1,5 +1,5 @@
 //! Rules from [flake8-use-pathlib](https://pypi.org/project/flake8-use-pathlib/).
-pub(crate) mod helpers;
+pub(crate) mod rules;
 pub(crate) mod violations;
 
 #[cfg(test)]
@@ -9,15 +9,16 @@ mod tests {
     use anyhow::Result;
     use test_case::test_case;
 
+    use crate::assert_messages;
     use crate::registry::Rule;
     use crate::settings;
     use crate::test::test_path;
 
-    #[test_case(Path::new("full_name.py"); "PTH1_1")]
-    #[test_case(Path::new("import_as.py"); "PTH1_2")]
-    #[test_case(Path::new("import_from_as.py"); "PTH1_3")]
-    #[test_case(Path::new("import_from.py"); "PTH1_4")]
-    #[test_case(Path::new("use_pathlib.py"); "PTH1_5")]
+    #[test_case(Path::new("full_name.py"))]
+    #[test_case(Path::new("import_as.py"))]
+    #[test_case(Path::new("import_from_as.py"))]
+    #[test_case(Path::new("import_from.py"))]
+    #[test_case(Path::new("use_pathlib.py"))]
     fn rules(path: &Path) -> Result<()> {
         let snapshot = format!("{}", path.to_string_lossy());
         let diagnostics = test_path(
@@ -28,7 +29,7 @@ mod tests {
                 Rule::OsMkdir,
                 Rule::OsMakedirs,
                 Rule::OsRename,
-                Rule::PathlibReplace,
+                Rule::OsReplace,
                 Rule::OsRmdir,
                 Rule::OsRemove,
                 Rule::OsUnlink,
@@ -49,19 +50,19 @@ mod tests {
                 Rule::BuiltinOpen,
             ]),
         )?;
-        crate::assert_messages!(snapshot, diagnostics);
+        assert_messages!(snapshot, diagnostics);
         Ok(())
     }
 
-    #[test_case(Rule::PyPath, Path::new("py_path_1.py"); "PTH024_1")]
-    #[test_case(Rule::PyPath, Path::new("py_path_2.py"); "PTH024_2")]
+    #[test_case(Rule::PyPath, Path::new("py_path_1.py"))]
+    #[test_case(Rule::PyPath, Path::new("py_path_2.py"))]
     fn rules_pypath(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
             Path::new("flake8_use_pathlib").join(path).as_path(),
             &settings::Settings::for_rule(rule_code),
         )?;
-        crate::assert_messages!(snapshot, diagnostics);
+        assert_messages!(snapshot, diagnostics);
         Ok(())
     }
 }
diff --git a/crates/ruff/src/rules/flake8_use_pathlib/rules/mod.rs b/crates/ruff/src/rules/flake8_use_pathlib/rules/mod.rs
new file mode 100644
index 0000000000000..33eac782e4601
--- /dev/null
+++ b/crates/ruff/src/rules/flake8_use_pathlib/rules/mod.rs
@@ -0,0 +1,3 @@
+pub(crate) use replaceable_by_pathlib::replaceable_by_pathlib;
+
+mod replaceable_by_pathlib;
diff --git a/crates/ruff/src/rules/flake8_use_pathlib/helpers.rs b/crates/ruff/src/rules/flake8_use_pathlib/rules/replaceable_by_pathlib.rs
similarity index 89%
rename from crates/ruff/src/rules/flake8_use_pathlib/helpers.rs
rename to crates/ruff/src/rules/flake8_use_pathlib/rules/replaceable_by_pathlib.rs
index 4a9378db09bb3..5862bd427ca57 100644
--- a/crates/ruff/src/rules/flake8_use_pathlib/helpers.rs
+++ b/crates/ruff/src/rules/flake8_use_pathlib/rules/replaceable_by_pathlib.rs
@@ -1,4 +1,6 @@
-use rustpython_parser::ast::Expr;
+use rustpython_parser::ast::{Expr, Ranged};
+
+use ruff_diagnostics::{Diagnostic, DiagnosticKind};
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
@@ -6,15 +8,14 @@ use crate::rules::flake8_use_pathlib::violations::{
     BuiltinOpen, OsChmod, OsGetcwd, OsMakedirs, OsMkdir, OsPathAbspath, OsPathBasename,
     OsPathDirname, OsPathExists, OsPathExpanduser, OsPathIsabs, OsPathIsdir, OsPathIsfile,
     OsPathIslink, OsPathJoin, OsPathSamefile, OsPathSplitext, OsReadlink, OsRemove, OsRename,
-    OsRmdir, OsStat, OsUnlink, PathlibReplace, PyPath,
+    OsReplace, OsRmdir, OsStat, OsUnlink, PyPath,
 };
 use crate::settings::types::PythonVersion;
-use ruff_diagnostics::{Diagnostic, DiagnosticKind};
 
-pub fn replaceable_by_pathlib(checker: &mut Checker, expr: &Expr) {
+pub(crate) fn replaceable_by_pathlib(checker: &mut Checker, expr: &Expr) {
     if let Some(diagnostic_kind) =
         checker
-            .ctx
+            .semantic_model()
             .resolve_call_path(expr)
             .and_then(|call_path| match call_path.as_slice() {
                 ["os", "path", "abspath"] => Some(OsPathAbspath.into()),
@@ -22,7 +23,7 @@ pub fn replaceable_by_pathlib(checker: &mut Checker, expr: &Expr) {
                 ["os", "mkdir"] => Some(OsMkdir.into()),
                 ["os", "makedirs"] => Some(OsMakedirs.into()),
                 ["os", "rename"] => Some(OsRename.into()),
-                ["os", "replace"] => Some(PathlibReplace.into()),
+                ["os", "replace"] => Some(OsReplace.into()),
                 ["os", "rmdir"] => Some(OsRmdir.into()),
                 ["os", "remove"] => Some(OsRemove.into()),
                 ["os", "unlink"] => Some(OsUnlink.into()),
@@ -51,7 +52,7 @@ pub fn replaceable_by_pathlib(checker: &mut Checker, expr: &Expr) {
     {
         let diagnostic = Diagnostic::new::<DiagnosticKind>(diagnostic_kind, expr.range());
 
-        if checker.settings.rules.enabled(diagnostic.kind.rule()) {
+        if checker.enabled(diagnostic.kind.rule()) {
             checker.diagnostics.push(diagnostic);
         }
     }
diff --git a/crates/ruff/src/rules/flake8_use_pathlib/violations.rs b/crates/ruff/src/rules/flake8_use_pathlib/violations.rs
index d80fc99308c21..738bffb76d77d 100644
--- a/crates/ruff/src/rules/flake8_use_pathlib/violations.rs
+++ b/crates/ruff/src/rules/flake8_use_pathlib/violations.rs
@@ -58,9 +58,9 @@ impl Violation for OsRename {
 
 // PTH105
 #[violation]
-pub struct PathlibReplace;
+pub struct OsReplace;
 
-impl Violation for PathlibReplace {
+impl Violation for OsReplace {
     #[derive_message_formats]
     fn message(&self) -> String {
         format!("`os.replace()` should be replaced by `Path.replace()`")
diff --git a/crates/ruff/src/rules/flynt/helpers.rs b/crates/ruff/src/rules/flynt/helpers.rs
new file mode 100644
index 0000000000000..2530740a63d5e
--- /dev/null
+++ b/crates/ruff/src/rules/flynt/helpers.rs
@@ -0,0 +1,70 @@
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Constant, ConversionFlag, Expr};
+
+/// Wrap an expression in a `FormattedValue` with no special formatting.
+fn to_formatted_value_expr(inner: &Expr) -> Expr {
+    let node = ast::ExprFormattedValue {
+        value: Box::new(inner.clone()),
+        conversion: ConversionFlag::None,
+        format_spec: None,
+        range: TextRange::default(),
+    };
+    node.into()
+}
+
+/// Convert a string to a constant string expression.
+pub(crate) fn to_constant_string(s: &str) -> Expr {
+    let node = ast::ExprConstant {
+        value: Constant::Str(s.to_owned()),
+        kind: None,
+        range: TextRange::default(),
+    };
+    node.into()
+}
+
+/// Figure out if `expr` represents a "simple" call
+/// (i.e. one that can be safely converted to a formatted value).
+fn is_simple_call(expr: &Expr) -> bool {
+    match expr {
+        Expr::Call(ast::ExprCall {
+            func,
+            args,
+            keywords,
+            range: _,
+        }) => args.is_empty() && keywords.is_empty() && is_simple_callee(func),
+        _ => false,
+    }
+}
+
+/// Figure out if `func` represents a "simple" callee (a bare name, or a chain of simple
+/// attribute accesses).
+fn is_simple_callee(func: &Expr) -> bool {
+    match func {
+        Expr::Name(_) => true,
+        Expr::Attribute(ast::ExprAttribute { value, .. }) => is_simple_callee(value),
+        _ => false,
+    }
+}
+
+/// Convert an expression to a f-string element (if it looks like a good idea).
+pub(crate) fn to_fstring_elem(expr: &Expr) -> Option<Expr> {
+    match expr {
+        // These are directly handled by `unparse_fstring_elem`:
+        Expr::Constant(ast::ExprConstant {
+            value: Constant::Str(_),
+            ..
+        })
+        | Expr::JoinedStr(_)
+        | Expr::FormattedValue(_) => Some(expr.clone()),
+        // These should be pretty safe to wrap in a formatted value.
+        Expr::Constant(ast::ExprConstant {
+            value:
+                Constant::Int(_) | Constant::Float(_) | Constant::Bool(_) | Constant::Complex { .. },
+            ..
+        })
+        | Expr::Name(_)
+        | Expr::Attribute(_) => Some(to_formatted_value_expr(expr)),
+        Expr::Call(_) if is_simple_call(expr) => Some(to_formatted_value_expr(expr)),
+        _ => None,
+    }
+}
diff --git a/crates/ruff/src/rules/flynt/mod.rs b/crates/ruff/src/rules/flynt/mod.rs
new file mode 100644
index 0000000000000..96bc568cbe041
--- /dev/null
+++ b/crates/ruff/src/rules/flynt/mod.rs
@@ -0,0 +1,26 @@
+//! Rules from [flynt](https://pypi.org/project/flynt/).
+mod helpers;
+pub(crate) mod rules;
+
+#[cfg(test)]
+mod tests {
+    use std::path::Path;
+
+    use anyhow::Result;
+    use test_case::test_case;
+
+    use crate::registry::Rule;
+    use crate::test::test_path;
+    use crate::{assert_messages, settings};
+
+    #[test_case(Rule::StaticJoinToFString, Path::new("FLY002.py"))]
+    fn rules(rule_code: Rule, path: &Path) -> Result<()> {
+        let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
+        let diagnostics = test_path(
+            Path::new("flynt").join(path).as_path(),
+            &settings::Settings::for_rule(rule_code),
+        )?;
+        assert_messages!(snapshot, diagnostics);
+        Ok(())
+    }
+}
diff --git a/crates/ruff/src/rules/flynt/rules/mod.rs b/crates/ruff/src/rules/flynt/rules/mod.rs
new file mode 100644
index 0000000000000..ce0b9462d81fc
--- /dev/null
+++ b/crates/ruff/src/rules/flynt/rules/mod.rs
@@ -0,0 +1,3 @@
+pub(crate) use static_join_to_fstring::{static_join_to_fstring, StaticJoinToFString};
+
+mod static_join_to_fstring;
diff --git a/crates/ruff/src/rules/flynt/rules/static_join_to_fstring.rs b/crates/ruff/src/rules/flynt/rules/static_join_to_fstring.rs
new file mode 100644
index 0000000000000..2faab59911a9b
--- /dev/null
+++ b/crates/ruff/src/rules/flynt/rules/static_join_to_fstring.rs
@@ -0,0 +1,132 @@
+use itertools::Itertools;
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Constant, Expr, Ranged};
+
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+use crate::registry::AsRule;
+use crate::rules::flynt::helpers;
+
+#[violation]
+pub struct StaticJoinToFString {
+    expr: String,
+}
+
+impl AlwaysAutofixableViolation for StaticJoinToFString {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let StaticJoinToFString { expr } = self;
+        format!("Consider `{expr}` instead of string join")
+    }
+
+    fn autofix_title(&self) -> String {
+        let StaticJoinToFString { expr } = self;
+        format!("Replace with `{expr}`")
+    }
+}
+
+fn is_static_length(elts: &[Expr]) -> bool {
+    elts.iter().all(|e| !e.is_starred_expr())
+}
+
+fn build_fstring(joiner: &str, joinees: &[Expr]) -> Option<Expr> {
+    // If all elements are string constants, join them into a single string.
+    if joinees.iter().all(|expr| {
+        matches!(
+            expr,
+            Expr::Constant(ast::ExprConstant {
+                value: Constant::Str(_),
+                ..
+            })
+        )
+    }) {
+        let node = ast::ExprConstant {
+            value: Constant::Str(
+                joinees
+                    .iter()
+                    .filter_map(|expr| {
+                        if let Expr::Constant(ast::ExprConstant {
+                            value: Constant::Str(string),
+                            ..
+                        }) = expr
+                        {
+                            Some(string.as_str())
+                        } else {
+                            None
+                        }
+                    })
+                    .join(joiner),
+            ),
+            range: TextRange::default(),
+            kind: None,
+        };
+        return Some(node.into());
+    }
+
+    let mut fstring_elems = Vec::with_capacity(joinees.len() * 2);
+    let mut first = true;
+
+    for expr in joinees {
+        if expr.is_joined_str_expr() {
+            // Oops, already an f-string. We don't know how to handle those
+            // gracefully right now.
+            return None;
+        }
+        if !std::mem::take(&mut first) {
+            fstring_elems.push(helpers::to_constant_string(joiner));
+        }
+        fstring_elems.push(helpers::to_fstring_elem(expr)?);
+    }
+
+    let node = ast::ExprJoinedStr {
+        values: fstring_elems,
+        range: TextRange::default(),
+    };
+    Some(node.into())
+}
+
+pub(crate) fn static_join_to_fstring(checker: &mut Checker, expr: &Expr, joiner: &str) {
+    let Expr::Call(ast::ExprCall {
+        args,
+        keywords,
+        ..
+    }) = expr else {
+        return;
+    };
+
+    if !keywords.is_empty() || args.len() != 1 {
+        // If there are kwargs or more than one argument, this is some non-standard
+        // string join call.
+        return;
+    }
+
+    // Get the elements to join; skip (e.g.) generators, sets, etc.
+    let joinees = match &args[0] {
+        Expr::List(ast::ExprList { elts, .. }) if is_static_length(elts) => elts,
+        Expr::Tuple(ast::ExprTuple { elts, .. }) if is_static_length(elts) => elts,
+        _ => return,
+    };
+
+    // Try to build the fstring (internally checks whether e.g. the elements are
+    // convertible to f-string parts).
+    let Some(new_expr) = build_fstring(joiner, joinees) else { return };
+
+    let contents = checker.generator().expr(&new_expr);
+
+    let mut diagnostic = Diagnostic::new(
+        StaticJoinToFString {
+            expr: contents.clone(),
+        },
+        expr.range(),
+    );
+    if checker.patch(diagnostic.kind.rule()) {
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+            contents,
+            expr.range(),
+        )));
+    }
+    checker.diagnostics.push(diagnostic);
+}
diff --git a/crates/ruff/src/rules/flynt/snapshots/ruff__rules__flynt__tests__FLY002_FLY002.py.snap b/crates/ruff/src/rules/flynt/snapshots/ruff__rules__flynt__tests__FLY002_FLY002.py.snap
new file mode 100644
index 0000000000000..e987f86206f84
--- /dev/null
+++ b/crates/ruff/src/rules/flynt/snapshots/ruff__rules__flynt__tests__FLY002_FLY002.py.snap
@@ -0,0 +1,128 @@
+---
+source: crates/ruff/src/rules/flynt/mod.rs
+---
+FLY002.py:5:7: FLY002 [*] Consider `f"{a}  World"` instead of string join
+  |
+5 | a = "Hello"
+6 | ok1 = " ".join([a, " World"])  # OK
+  |       ^^^^^^^^^^^^^^^^^^^^^^^ FLY002
+7 | ok2 = "".join(["Finally, ", a, " World"])  # OK
+8 | ok3 = "x".join(("1", "2", "3"))  # OK
+  |
+  = help: Replace with `f"{a}  World"`
+
+ℹ Suggested fix
+2 2 | from random import random, choice
+3 3 | 
+4 4 | a = "Hello"
+5   |-ok1 = " ".join([a, " World"])  # OK
+  5 |+ok1 = f"{a}  World"  # OK
+6 6 | ok2 = "".join(["Finally, ", a, " World"])  # OK
+7 7 | ok3 = "x".join(("1", "2", "3"))  # OK
+8 8 | ok4 = "y".join([1, 2, 3])  # Technically OK, though would've been an error originally
+
+FLY002.py:6:7: FLY002 [*] Consider `f"Finally, {a} World"` instead of string join
+   |
+ 6 | a = "Hello"
+ 7 | ok1 = " ".join([a, " World"])  # OK
+ 8 | ok2 = "".join(["Finally, ", a, " World"])  # OK
+   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ FLY002
+ 9 | ok3 = "x".join(("1", "2", "3"))  # OK
+10 | ok4 = "y".join([1, 2, 3])  # Technically OK, though would've been an error originally
+   |
+   = help: Replace with `f"Finally, {a} World"`
+
+ℹ Suggested fix
+3 3 | 
+4 4 | a = "Hello"
+5 5 | ok1 = " ".join([a, " World"])  # OK
+6   |-ok2 = "".join(["Finally, ", a, " World"])  # OK
+  6 |+ok2 = f"Finally, {a} World"  # OK
+7 7 | ok3 = "x".join(("1", "2", "3"))  # OK
+8 8 | ok4 = "y".join([1, 2, 3])  # Technically OK, though would've been an error originally
+9 9 | ok5 = "a".join([random(), random()])  # OK (simple calls)
+
+FLY002.py:7:7: FLY002 [*] Consider `"1x2x3"` instead of string join
+   |
+ 7 | ok1 = " ".join([a, " World"])  # OK
+ 8 | ok2 = "".join(["Finally, ", a, " World"])  # OK
+ 9 | ok3 = "x".join(("1", "2", "3"))  # OK
+   |       ^^^^^^^^^^^^^^^^^^^^^^^^^ FLY002
+10 | ok4 = "y".join([1, 2, 3])  # Technically OK, though would've been an error originally
+11 | ok5 = "a".join([random(), random()])  # OK (simple calls)
+   |
+   = help: Replace with `"1x2x3"`
+
+ℹ Suggested fix
+4 4 | a = "Hello"
+5 5 | ok1 = " ".join([a, " World"])  # OK
+6 6 | ok2 = "".join(["Finally, ", a, " World"])  # OK
+7   |-ok3 = "x".join(("1", "2", "3"))  # OK
+  7 |+ok3 = "1x2x3"  # OK
+8 8 | ok4 = "y".join([1, 2, 3])  # Technically OK, though would've been an error originally
+9 9 | ok5 = "a".join([random(), random()])  # OK (simple calls)
+10 10 | ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()])  # OK (attr calls)
+
+FLY002.py:8:7: FLY002 [*] Consider `f"{1}y{2}y{3}"` instead of string join
+   |
+ 8 | ok2 = "".join(["Finally, ", a, " World"])  # OK
+ 9 | ok3 = "x".join(("1", "2", "3"))  # OK
+10 | ok4 = "y".join([1, 2, 3])  # Technically OK, though would've been an error originally
+   |       ^^^^^^^^^^^^^^^^^^^ FLY002
+11 | ok5 = "a".join([random(), random()])  # OK (simple calls)
+12 | ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()])  # OK (attr calls)
+   |
+   = help: Replace with `f"{1}y{2}y{3}"`
+
+ℹ Suggested fix
+5 5 | ok1 = " ".join([a, " World"])  # OK
+6 6 | ok2 = "".join(["Finally, ", a, " World"])  # OK
+7 7 | ok3 = "x".join(("1", "2", "3"))  # OK
+8   |-ok4 = "y".join([1, 2, 3])  # Technically OK, though would've been an error originally
+  8 |+ok4 = f"{1}y{2}y{3}"  # Technically OK, though would've been an error originally
+9 9 | ok5 = "a".join([random(), random()])  # OK (simple calls)
+10 10 | ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()])  # OK (attr calls)
+11 11 | 
+
+FLY002.py:9:7: FLY002 [*] Consider `f"{random()}a{random()}"` instead of string join
+   |
+ 9 | ok3 = "x".join(("1", "2", "3"))  # OK
+10 | ok4 = "y".join([1, 2, 3])  # Technically OK, though would've been an error originally
+11 | ok5 = "a".join([random(), random()])  # OK (simple calls)
+   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ FLY002
+12 | ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()])  # OK (attr calls)
+   |
+   = help: Replace with `f"{random()}a{random()}"`
+
+ℹ Suggested fix
+6  6  | ok2 = "".join(["Finally, ", a, " World"])  # OK
+7  7  | ok3 = "x".join(("1", "2", "3"))  # OK
+8  8  | ok4 = "y".join([1, 2, 3])  # Technically OK, though would've been an error originally
+9     |-ok5 = "a".join([random(), random()])  # OK (simple calls)
+   9  |+ok5 = f"{random()}a{random()}"  # OK (simple calls)
+10 10 | ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()])  # OK (attr calls)
+11 11 | 
+12 12 | nok1 = "x".join({"4", "5", "yee"})  # Not OK (set)
+
+FLY002.py:10:7: FLY002 [*] Consider `f"{secrets.token_urlsafe()}a{secrets.token_hex()}"` instead of string join
+   |
+10 | ok4 = "y".join([1, 2, 3])  # Technically OK, though would've been an error originally
+11 | ok5 = "a".join([random(), random()])  # OK (simple calls)
+12 | ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()])  # OK (attr calls)
+   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ FLY002
+13 | 
+14 | nok1 = "x".join({"4", "5", "yee"})  # Not OK (set)
+   |
+   = help: Replace with `f"{secrets.token_urlsafe()}a{secrets.token_hex()}"`
+
+ℹ Suggested fix
+7  7  | ok3 = "x".join(("1", "2", "3"))  # OK
+8  8  | ok4 = "y".join([1, 2, 3])  # Technically OK, though would've been an error originally
+9  9  | ok5 = "a".join([random(), random()])  # OK (simple calls)
+10    |-ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()])  # OK (attr calls)
+   10 |+ok6 = f"{secrets.token_urlsafe()}a{secrets.token_hex()}"  # OK (attr calls)
+11 11 | 
+12 12 | nok1 = "x".join({"4", "5", "yee"})  # Not OK (set)
+13 13 | nok2 = a.join(["1", "2", "3"])  # Not OK (not a static joiner)
+
+
diff --git a/crates/ruff/src/rules/isort/annotate.rs b/crates/ruff/src/rules/isort/annotate.rs
index a2d0866f1323a..71168e512191c 100644
--- a/crates/ruff/src/rules/isort/annotate.rs
+++ b/crates/ruff/src/rules/isort/annotate.rs
@@ -1,5 +1,5 @@
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::{Stmt, StmtKind};
+use rustpython_parser::ast::{self, Ranged, Stmt};
 
 use ruff_python_ast::source_code::Locator;
 
@@ -8,7 +8,7 @@ use super::helpers::trailing_comma;
 use super::types::{AliasData, TrailingComma};
 use super::{AnnotatedAliasData, AnnotatedImport};
 
-pub fn annotate_imports<'a>(
+pub(crate) fn annotate_imports<'a>(
     imports: &'a [&'a Stmt],
     comments: Vec<Comment<'a>>,
     locator: &Locator,
@@ -19,19 +19,19 @@ pub fn annotate_imports<'a>(
     imports
         .iter()
         .map(|import| {
-            match &import.node {
-                StmtKind::Import { names } => {
+            match import {
+                Stmt::Import(ast::StmtImport { names, range }) => {
                     // Find comments above.
                     let mut atop = vec![];
                     while let Some(comment) =
-                        comments_iter.next_if(|comment| comment.start() < import.start())
+                        comments_iter.next_if(|comment| comment.start() < range.start())
                     {
                         atop.push(comment);
                     }
 
                     // Find comments inline.
                     let mut inline = vec![];
-                    let import_line_end = locator.line_end(import.end());
+                    let import_line_end = locator.line_end(range.end());
 
                     while let Some(comment) =
                         comments_iter.next_if(|comment| comment.end() <= import_line_end)
@@ -43,19 +43,20 @@ pub fn annotate_imports<'a>(
                         names: names
                             .iter()
                             .map(|alias| AliasData {
-                                name: &alias.node.name,
-                                asname: alias.node.asname.as_deref(),
+                                name: &alias.name,
+                                asname: alias.asname.as_deref(),
                             })
                             .collect(),
                         atop,
                         inline,
                     }
                 }
-                StmtKind::ImportFrom {
+                Stmt::ImportFrom(ast::StmtImportFrom {
                     module,
                     names,
                     level,
-                } => {
+                    range: _,
+                }) => {
                     // Find comments above.
                     let mut atop = vec![];
                     while let Some(comment) =
@@ -105,8 +106,8 @@ pub fn annotate_imports<'a>(
                             }
 
                             AnnotatedAliasData {
-                                name: &alias.node.name,
-                                asname: alias.node.asname.as_deref(),
+                                name: &alias.name,
+                                asname: alias.asname.as_deref(),
                                 atop: alias_atop,
                                 inline: alias_inline,
                             }
@@ -116,7 +117,7 @@ pub fn annotate_imports<'a>(
                     AnnotatedImport::ImportFrom {
                         module: module.as_deref(),
                         names: aliases,
-                        level: *level,
+                        level: level.map(|level| level.to_u32()),
                         trailing_comma: if split_on_trailing_comma {
                             trailing_comma(import, locator)
                         } else {
@@ -126,7 +127,7 @@ pub fn annotate_imports<'a>(
                         inline,
                     }
                 }
-                _ => panic!("Expected StmtKind::Import | StmtKind::ImportFrom"),
+                _ => panic!("Expected Stmt::Import | Stmt::ImportFrom"),
             }
         })
         .collect()
diff --git a/crates/ruff/src/rules/isort/track.rs b/crates/ruff/src/rules/isort/block.rs
similarity index 73%
rename from crates/ruff/src/rules/isort/track.rs
rename to crates/ruff/src/rules/isort/block.rs
index cb590ef5c62a1..f01511a154bec 100644
--- a/crates/ruff/src/rules/isort/track.rs
+++ b/crates/ruff/src/rules/isort/block.rs
@@ -1,31 +1,30 @@
 use ruff_text_size::{TextRange, TextSize};
-use rustpython_parser::ast::{
-    Alias, Arg, Arguments, Boolop, Cmpop, Comprehension, Constant, Excepthandler,
-    ExcepthandlerKind, Expr, ExprContext, Keyword, MatchCase, Operator, Pattern, Stmt, StmtKind,
-    Unaryop, Withitem,
-};
+use rustpython_parser::ast::{self, Excepthandler, MatchCase, Ranged, Stmt};
 
 use ruff_python_ast::source_code::Locator;
-use ruff_python_ast::visitor::Visitor;
+use ruff_python_ast::statement_visitor::StatementVisitor;
 
 use crate::directives::IsortDirectives;
 use crate::rules::isort::helpers;
 
+/// A block of imports within a Python module.
+#[derive(Debug, Default)]
+pub(crate) struct Block<'a> {
+    pub(crate) nested: bool,
+    pub(crate) imports: Vec<&'a Stmt>,
+    pub(crate) trailer: Option<Trailer>,
+}
+
+/// The type of trailer that should follow an import block.
 #[derive(Debug, Copy, Clone)]
-pub enum Trailer {
+pub(crate) enum Trailer {
     Sibling,
     ClassDef,
     FunctionDef,
 }
 
-#[derive(Debug, Default)]
-pub struct Block<'a> {
-    pub nested: bool,
-    pub imports: Vec<&'a Stmt>,
-    pub trailer: Option<Trailer>,
-}
-
-pub struct ImportTracker<'a> {
+/// A builder for identifying and constructing import blocks within a Python module.
+pub(crate) struct BlockBuilder<'a> {
     locator: &'a Locator<'a>,
     is_stub: bool,
     blocks: Vec<Block<'a>>,
@@ -34,8 +33,12 @@ pub struct ImportTracker<'a> {
     nested: bool,
 }
 
-impl<'a> ImportTracker<'a> {
-    pub fn new(locator: &'a Locator<'a>, directives: &'a IsortDirectives, is_stub: bool) -> Self {
+impl<'a> BlockBuilder<'a> {
+    pub(crate) fn new(
+        locator: &'a Locator<'a>,
+        directives: &'a IsortDirectives,
+        is_stub: bool,
+    ) -> Self {
         Self {
             locator,
             is_stub,
@@ -75,15 +78,15 @@ impl<'a> ImportTracker<'a> {
             // least one blank line. In that case, we treat it as a regular
             // sibling (i.e., as if the comment is the next statement, as
             // opposed to the class or function).
-            match &stmt.node {
-                StmtKind::FunctionDef { .. } | StmtKind::AsyncFunctionDef { .. } => {
+            match stmt {
+                Stmt::FunctionDef(_) | Stmt::AsyncFunctionDef(_) => {
                     if helpers::has_comment_break(stmt, self.locator) {
                         Trailer::Sibling
                     } else {
                         Trailer::FunctionDef
                     }
                 }
-                StmtKind::ClassDef { .. } => {
+                Stmt::ClassDef(_) => {
                     if helpers::has_comment_break(stmt, self.locator) {
                         Trailer::Sibling
                     } else {
@@ -103,7 +106,7 @@ impl<'a> ImportTracker<'a> {
         }
     }
 
-    pub fn iter<'b>(&'a self) -> impl Iterator<Item = &'b Block<'a>>
+    pub(crate) fn iter<'b>(&'a self) -> impl Iterator<Item = &'b Block<'a>>
     where
         'a: 'b,
     {
@@ -111,14 +114,14 @@ impl<'a> ImportTracker<'a> {
     }
 }
 
-impl<'a, 'b> Visitor<'b> for ImportTracker<'a>
+impl<'a, 'b> StatementVisitor<'b> for BlockBuilder<'a>
 where
     'b: 'a,
 {
     fn visit_stmt(&mut self, stmt: &'b Stmt) {
         // Track manual splits.
         for (index, split) in self.splits.iter().enumerate() {
-            if stmt.end() >= *split {
+            if stmt.start() >= *split {
                 self.finalize(self.trailer_for(stmt));
                 self.splits = &self.splits[index + 1..];
             } else {
@@ -138,11 +141,7 @@ where
         }
 
         // Track imports.
-        if matches!(
-            stmt.node,
-            StmtKind::Import { .. } | StmtKind::ImportFrom { .. }
-        ) && !is_excluded
-        {
+        if matches!(stmt, Stmt::Import(_) | Stmt::ImportFrom(_)) && !is_excluded {
             self.track_import(stmt);
         } else {
             self.finalize(self.trailer_for(stmt));
@@ -151,26 +150,26 @@ where
         // Track scope.
         let prev_nested = self.nested;
         self.nested = true;
-        match &stmt.node {
-            StmtKind::FunctionDef { body, .. } => {
+        match stmt {
+            Stmt::FunctionDef(ast::StmtFunctionDef { body, .. }) => {
                 for stmt in body {
                     self.visit_stmt(stmt);
                 }
                 self.finalize(None);
             }
-            StmtKind::AsyncFunctionDef { body, .. } => {
+            Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef { body, .. }) => {
                 for stmt in body {
                     self.visit_stmt(stmt);
                 }
                 self.finalize(None);
             }
-            StmtKind::ClassDef { body, .. } => {
+            Stmt::ClassDef(ast::StmtClassDef { body, .. }) => {
                 for stmt in body {
                     self.visit_stmt(stmt);
                 }
                 self.finalize(None);
             }
-            StmtKind::For { body, orelse, .. } => {
+            Stmt::For(ast::StmtFor { body, orelse, .. }) => {
                 for stmt in body {
                     self.visit_stmt(stmt);
                 }
@@ -181,7 +180,7 @@ where
                 }
                 self.finalize(None);
             }
-            StmtKind::AsyncFor { body, orelse, .. } => {
+            Stmt::AsyncFor(ast::StmtAsyncFor { body, orelse, .. }) => {
                 for stmt in body {
                     self.visit_stmt(stmt);
                 }
@@ -192,7 +191,7 @@ where
                 }
                 self.finalize(None);
             }
-            StmtKind::While { body, orelse, .. } => {
+            Stmt::While(ast::StmtWhile { body, orelse, .. }) => {
                 for stmt in body {
                     self.visit_stmt(stmt);
                 }
@@ -203,7 +202,7 @@ where
                 }
                 self.finalize(None);
             }
-            StmtKind::If { body, orelse, .. } => {
+            Stmt::If(ast::StmtIf { body, orelse, .. }) => {
                 for stmt in body {
                     self.visit_stmt(stmt);
                 }
@@ -214,36 +213,37 @@ where
                 }
                 self.finalize(None);
             }
-            StmtKind::With { body, .. } => {
+            Stmt::With(ast::StmtWith { body, .. }) => {
                 for stmt in body {
                     self.visit_stmt(stmt);
                 }
                 self.finalize(None);
             }
-            StmtKind::AsyncWith { body, .. } => {
+            Stmt::AsyncWith(ast::StmtAsyncWith { body, .. }) => {
                 for stmt in body {
                     self.visit_stmt(stmt);
                 }
                 self.finalize(None);
             }
-            StmtKind::Match { subject, cases } => {
-                self.visit_expr(subject);
+            Stmt::Match(ast::StmtMatch { cases, .. }) => {
                 for match_case in cases {
                     self.visit_match_case(match_case);
                 }
             }
-            StmtKind::Try {
+            Stmt::Try(ast::StmtTry {
                 body,
                 handlers,
                 orelse,
                 finalbody,
-            }
-            | StmtKind::TryStar {
+                range: _,
+            })
+            | Stmt::TryStar(ast::StmtTryStar {
                 body,
                 handlers,
                 orelse,
                 finalbody,
-            } => {
+                range: _,
+            }) => {
                 for excepthandler in handlers {
                     self.visit_excepthandler(excepthandler);
                 }
@@ -268,29 +268,12 @@ where
         self.nested = prev_nested;
     }
 
-    fn visit_annotation(&mut self, _: &'b Expr) {}
-
-    fn visit_expr(&mut self, _: &'b Expr) {}
-
-    fn visit_constant(&mut self, _: &'b Constant) {}
-
-    fn visit_expr_context(&mut self, _: &'b ExprContext) {}
-
-    fn visit_boolop(&mut self, _: &'b Boolop) {}
-
-    fn visit_operator(&mut self, _: &'b Operator) {}
-
-    fn visit_unaryop(&mut self, _: &'b Unaryop) {}
-
-    fn visit_cmpop(&mut self, _: &'b Cmpop) {}
-
-    fn visit_comprehension(&mut self, _: &'b Comprehension) {}
-
     fn visit_excepthandler(&mut self, excepthandler: &'b Excepthandler) {
         let prev_nested = self.nested;
         self.nested = true;
 
-        let ExcepthandlerKind::ExceptHandler { body, .. } = &excepthandler.node;
+        let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler { body, .. }) =
+            excepthandler;
         for stmt in body {
             self.visit_stmt(stmt);
         }
@@ -299,22 +282,10 @@ where
         self.nested = prev_nested;
     }
 
-    fn visit_arguments(&mut self, _: &'b Arguments) {}
-
-    fn visit_arg(&mut self, _: &'b Arg) {}
-
-    fn visit_keyword(&mut self, _: &'b Keyword) {}
-
-    fn visit_alias(&mut self, _: &'b Alias) {}
-
-    fn visit_withitem(&mut self, _: &'b Withitem) {}
-
     fn visit_match_case(&mut self, match_case: &'b MatchCase) {
         for stmt in &match_case.body {
             self.visit_stmt(stmt);
         }
         self.finalize(None);
     }
-
-    fn visit_pattern(&mut self, _: &'b Pattern) {}
 }
diff --git a/crates/ruff/src/rules/isort/categorize.rs b/crates/ruff/src/rules/isort/categorize.rs
index 6bc301edb680e..ac6348476d860 100644
--- a/crates/ruff/src/rules/isort/categorize.rs
+++ b/crates/ruff/src/rules/isort/categorize.rs
@@ -4,7 +4,6 @@ use std::{fs, iter};
 
 use log::debug;
 use rustc_hash::FxHashMap;
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use strum_macros::EnumIter;
 
@@ -27,11 +26,11 @@ use super::types::{ImportBlock, Importable};
     Hash,
     Serialize,
     Deserialize,
-    JsonSchema,
     CacheKey,
     EnumIter,
 )]
 #[serde(deny_unknown_fields, rename_all = "kebab-case")]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum ImportType {
     Future,
     StandardLibrary,
@@ -40,10 +39,9 @@ pub enum ImportType {
     LocalFolder,
 }
 
-#[derive(
-    Debug, PartialOrd, Ord, PartialEq, Eq, Clone, Hash, Serialize, Deserialize, JsonSchema, CacheKey,
-)]
+#[derive(Debug, PartialOrd, Ord, PartialEq, Eq, Clone, Hash, Serialize, Deserialize, CacheKey)]
 #[serde(untagged)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum ImportSection {
     Known(ImportType),
     UserDefined(String),
@@ -65,9 +63,9 @@ enum Reason<'a> {
 }
 
 #[allow(clippy::too_many_arguments)]
-pub fn categorize<'a>(
+pub(crate) fn categorize<'a>(
     module_name: &str,
-    level: Option<usize>,
+    level: Option<u32>,
     src: &[PathBuf],
     package: Option<&Path>,
     known_modules: &'a KnownModules,
@@ -138,7 +136,7 @@ fn match_sources<'a>(paths: &'a [PathBuf], base: &str) -> Option<&'a Path> {
 }
 
 #[allow(clippy::too_many_arguments)]
-pub fn categorize_imports<'a>(
+pub(crate) fn categorize_imports<'a>(
     block: ImportBlock<'a>,
     src: &[PathBuf],
     package: Option<&Path>,
@@ -146,7 +144,7 @@ pub fn categorize_imports<'a>(
     target_version: PythonVersion,
 ) -> BTreeMap<&'a ImportSection, ImportBlock<'a>> {
     let mut block_by_type: BTreeMap<&ImportSection, ImportBlock> = BTreeMap::default();
-    // Categorize `StmtKind::Import`.
+    // Categorize `Stmt::Import`.
     for (alias, comments) in block.import {
         let import_type = categorize(
             &alias.module_name(),
@@ -162,7 +160,7 @@ pub fn categorize_imports<'a>(
             .import
             .insert(alias, comments);
     }
-    // Categorize `StmtKind::ImportFrom` (without re-export).
+    // Categorize `Stmt::ImportFrom` (without re-export).
     for (import_from, aliases) in block.import_from {
         let classification = categorize(
             &import_from.module_name(),
@@ -178,7 +176,7 @@ pub fn categorize_imports<'a>(
             .import_from
             .insert(import_from, aliases);
     }
-    // Categorize `StmtKind::ImportFrom` (with re-export).
+    // Categorize `Stmt::ImportFrom` (with re-export).
     for ((import_from, alias), aliases) in block.import_from_as {
         let classification = categorize(
             &import_from.module_name(),
@@ -194,7 +192,7 @@ pub fn categorize_imports<'a>(
             .import_from_as
             .insert((import_from, alias), aliases);
     }
-    // Categorize `StmtKind::ImportFrom` (with star).
+    // Categorize `Stmt::ImportFrom` (with star).
     for (import_from, comments) in block.import_from_star {
         let classification = categorize(
             &import_from.module_name(),
@@ -222,7 +220,7 @@ pub struct KnownModules {
 }
 
 impl KnownModules {
-    pub fn new(
+    pub(crate) fn new(
         first_party: Vec<String>,
         third_party: Vec<String>,
         local_folder: Vec<String>,
@@ -320,7 +318,7 @@ impl KnownModules {
     }
 
     /// Return the list of modules that are known to be of a given type.
-    pub fn modules_for_known_type(&self, import_type: ImportType) -> Vec<String> {
+    pub(crate) fn modules_for_known_type(&self, import_type: ImportType) -> Vec<String> {
         self.known
             .iter()
             .filter_map(|(module, known_section)| {
@@ -338,7 +336,7 @@ impl KnownModules {
     }
 
     /// Return the list of user-defined modules, indexed by section.
-    pub fn user_defined(&self) -> FxHashMap<String, Vec<String>> {
+    pub(crate) fn user_defined(&self) -> FxHashMap<String, Vec<String>> {
         let mut user_defined: FxHashMap<String, Vec<String>> = FxHashMap::default();
         for (module, section) in &self.known {
             if let ImportSection::UserDefined(section_name) = section {
diff --git a/crates/ruff/src/rules/isort/comments.rs b/crates/ruff/src/rules/isort/comments.rs
index 3bc02d2f4204d..ee1c4d9f7ffa3 100644
--- a/crates/ruff/src/rules/isort/comments.rs
+++ b/crates/ruff/src/rules/isort/comments.rs
@@ -1,34 +1,30 @@
-use ruff_text_size::{TextRange, TextSize};
 use std::borrow::Cow;
 
+use ruff_text_size::{TextRange, TextSize};
 use rustpython_parser::{lexer, Mode, Tok};
 
 use ruff_python_ast::source_code::Locator;
 
 #[derive(Debug)]
-pub struct Comment<'a> {
-    pub value: Cow<'a, str>,
-    pub range: TextRange,
+pub(crate) struct Comment<'a> {
+    pub(crate) value: Cow<'a, str>,
+    pub(crate) range: TextRange,
 }
 
 impl Comment<'_> {
-    pub const fn start(&self) -> TextSize {
+    pub(crate) const fn start(&self) -> TextSize {
         self.range.start()
     }
 
-    pub const fn end(&self) -> TextSize {
+    pub(crate) const fn end(&self) -> TextSize {
         self.range.end()
     }
-
-    pub const fn range(&self) -> TextRange {
-        self.range
-    }
 }
 
 /// Collect all comments in an import block.
-pub fn collect_comments<'a>(range: TextRange, locator: &'a Locator) -> Vec<Comment<'a>> {
+pub(crate) fn collect_comments<'a>(range: TextRange, locator: &'a Locator) -> Vec<Comment<'a>> {
     let contents = locator.slice(range);
-    lexer::lex_located(contents, Mode::Module, range.start())
+    lexer::lex_starts_at(contents, Mode::Module, range.start())
         .flatten()
         .filter_map(|(tok, range)| {
             if let Tok::Comment(value) = tok {
diff --git a/crates/ruff/src/rules/isort/format.rs b/crates/ruff/src/rules/isort/format.rs
index da06c1b818d52..ece938b2ac9cc 100644
--- a/crates/ruff/src/rules/isort/format.rs
+++ b/crates/ruff/src/rules/isort/format.rs
@@ -1,5 +1,6 @@
 use ruff_python_ast::source_code::Stylist;
-use unicode_width::UnicodeWidthStr;
+
+use crate::line_width::{LineLength, LineWidth};
 
 use super::types::{AliasData, CommentSet, ImportFromData, Importable};
 
@@ -7,7 +8,7 @@ use super::types::{AliasData, CommentSet, ImportFromData, Importable};
 const CAPACITY: usize = 200;
 
 /// Add a plain import statement to the [`RopeBuilder`].
-pub fn format_import(
+pub(crate) fn format_import(
     alias: &AliasData,
     comments: &CommentSet,
     is_first: bool,
@@ -40,11 +41,12 @@ pub fn format_import(
 
 /// Add an import-from statement to the [`RopeBuilder`].
 #[allow(clippy::too_many_arguments)]
-pub fn format_import_from(
+pub(crate) fn format_import_from(
     import_from: &ImportFromData,
     comments: &CommentSet,
     aliases: &[(AliasData, CommentSet)],
-    line_length: usize,
+    line_length: LineLength,
+    indentation_width: LineWidth,
     stylist: &Stylist,
     force_wrap_aliases: bool,
     is_first: bool,
@@ -55,8 +57,14 @@ pub fn format_import_from(
             .iter()
             .all(|(alias, _)| alias.name == "*" && alias.asname.is_none())
     {
-        let (single_line, ..) =
-            format_single_line(import_from, comments, aliases, is_first, stylist);
+        let (single_line, ..) = format_single_line(
+            import_from,
+            comments,
+            aliases,
+            is_first,
+            stylist,
+            indentation_width,
+        );
         return single_line;
     }
 
@@ -70,8 +78,14 @@ pub fn format_import_from(
             || aliases.len() == 1
             || aliases.iter().all(|(alias, _)| alias.asname.is_none()))
     {
-        let (single_line, import_width) =
-            format_single_line(import_from, comments, aliases, is_first, stylist);
+        let (single_line, import_width) = format_single_line(
+            import_from,
+            comments,
+            aliases,
+            is_first,
+            stylist,
+            indentation_width,
+        );
         if import_width <= line_length || aliases.iter().any(|(alias, _)| alias.name == "*") {
             return single_line;
         }
@@ -89,9 +103,10 @@ fn format_single_line(
     aliases: &[(AliasData, CommentSet)],
     is_first: bool,
     stylist: &Stylist,
-) -> (String, usize) {
+    indentation_width: LineWidth,
+) -> (String, LineWidth) {
     let mut output = String::with_capacity(CAPACITY);
-    let mut line_width = 0;
+    let mut line_width = indentation_width;
 
     if !is_first && !comments.atop.is_empty() {
         output.push_str(&stylist.line_ending());
@@ -105,28 +120,28 @@ fn format_single_line(
     output.push_str("from ");
     output.push_str(&module_name);
     output.push_str(" import ");
-    line_width += 5 + module_name.width() + 8;
+    line_width = line_width.add_width(5).add_str(&module_name).add_width(8);
 
     for (index, (AliasData { name, asname }, comments)) in aliases.iter().enumerate() {
         if let Some(asname) = asname {
             output.push_str(name);
             output.push_str(" as ");
             output.push_str(asname);
-            line_width += name.width() + 4 + asname.width();
+            line_width = line_width.add_str(name).add_width(4).add_str(asname);
         } else {
             output.push_str(name);
-            line_width += name.width();
+            line_width = line_width.add_str(name);
         }
         if index < aliases.len() - 1 {
             output.push_str(", ");
-            line_width += 2;
+            line_width = line_width.add_width(2);
         }
 
         for comment in &comments.inline {
             output.push(' ');
             output.push(' ');
             output.push_str(comment);
-            line_width += 2 + comment.width();
+            line_width = line_width.add_width(2).add_str(comment);
         }
     }
 
@@ -134,7 +149,7 @@ fn format_single_line(
         output.push(' ');
         output.push(' ');
         output.push_str(comment);
-        line_width += 2 + comment.width();
+        line_width = line_width.add_width(2).add_str(comment);
     }
 
     output.push_str(&stylist.line_ending());
diff --git a/crates/ruff/src/rules/isort/helpers.rs b/crates/ruff/src/rules/isort/helpers.rs
index ef25643a00cc6..0f520d2dce0a2 100644
--- a/crates/ruff/src/rules/isort/helpers.rs
+++ b/crates/ruff/src/rules/isort/helpers.rs
@@ -1,23 +1,23 @@
-use rustpython_parser::ast::Stmt;
+use rustpython_parser::ast::{Ranged, Stmt};
 use rustpython_parser::{lexer, Mode, Tok};
 
-use ruff_python_ast::newlines::StrExt;
+use ruff_newlines::StrExt;
 use ruff_python_ast::source_code::Locator;
 
 use crate::rules::isort::types::TrailingComma;
 
-/// Return `true` if a `StmtKind::ImportFrom` statement ends with a magic
+/// Return `true` if a `Stmt::ImportFrom` statement ends with a magic
 /// trailing comma.
-pub fn trailing_comma(stmt: &Stmt, locator: &Locator) -> TrailingComma {
+pub(crate) fn trailing_comma(stmt: &Stmt, locator: &Locator) -> TrailingComma {
     let contents = locator.slice(stmt.range());
-    let mut count: usize = 0;
+    let mut count = 0u32;
     let mut trailing_comma = TrailingComma::Absent;
-    for (tok, _) in lexer::lex_located(contents, Mode::Module, stmt.start()).flatten() {
+    for (tok, _) in lexer::lex_starts_at(contents, Mode::Module, stmt.start()).flatten() {
         if matches!(tok, Tok::Lpar) {
-            count += 1;
+            count = count.saturating_add(1);
         }
         if matches!(tok, Tok::Rpar) {
-            count -= 1;
+            count = count.saturating_sub(1);
         }
         if count == 1 {
             if matches!(
@@ -36,7 +36,7 @@ pub fn trailing_comma(stmt: &Stmt, locator: &Locator) -> TrailingComma {
 }
 
 /// Return `true` if a [`Stmt`] is preceded by a "comment break"
-pub fn has_comment_break(stmt: &Stmt, locator: &Locator) -> bool {
+pub(crate) fn has_comment_break(stmt: &Stmt, locator: &Locator) -> bool {
     // Starting from the `Stmt` (`def f(): pass`), we want to detect patterns like
     // this:
     //
diff --git a/crates/ruff/src/rules/isort/mod.rs b/crates/ruff/src/rules/isort/mod.rs
index 5fa1c2ce12b07..251b69f6e48dd 100644
--- a/crates/ruff/src/rules/isort/mod.rs
+++ b/crates/ruff/src/rules/isort/mod.rs
@@ -4,23 +4,26 @@ use std::collections::BTreeSet;
 use std::path::{Path, PathBuf};
 
 use annotate::annotate_imports;
+use block::{Block, Trailer};
+pub(crate) use categorize::categorize;
 use categorize::categorize_imports;
-pub use categorize::{categorize, ImportSection, ImportType};
+pub use categorize::{ImportSection, ImportType};
 use comments::Comment;
 use normalize::normalize_imports;
 use order::order_imports;
 use ruff_python_ast::source_code::{Locator, Stylist};
 use settings::RelativeImportsOrder;
 use sorting::cmp_either_import;
-use track::{Block, Trailer};
 use types::EitherImport::{Import, ImportFrom};
 use types::{AliasData, EitherImport, TrailingComma};
 
+use crate::line_width::{LineLength, LineWidth};
 use crate::rules::isort::categorize::KnownModules;
 use crate::rules::isort::types::ImportBlock;
 use crate::settings::types::PythonVersion;
 
 mod annotate;
+pub(crate) mod block;
 mod categorize;
 mod comments;
 mod format;
@@ -31,19 +34,18 @@ pub(crate) mod rules;
 pub mod settings;
 mod sorting;
 mod split;
-pub(crate) mod track;
 mod types;
 
 #[derive(Debug)]
-pub struct AnnotatedAliasData<'a> {
-    pub name: &'a str,
-    pub asname: Option<&'a str>,
-    pub atop: Vec<Comment<'a>>,
-    pub inline: Vec<Comment<'a>>,
+pub(crate) struct AnnotatedAliasData<'a> {
+    pub(crate) name: &'a str,
+    pub(crate) asname: Option<&'a str>,
+    pub(crate) atop: Vec<Comment<'a>>,
+    pub(crate) inline: Vec<Comment<'a>>,
 }
 
 #[derive(Debug)]
-pub enum AnnotatedImport<'a> {
+pub(crate) enum AnnotatedImport<'a> {
     Import {
         names: Vec<AliasData<'a>>,
         atop: Vec<Comment<'a>>,
@@ -52,7 +54,7 @@ pub enum AnnotatedImport<'a> {
     ImportFrom {
         module: Option<&'a str>,
         names: Vec<AnnotatedAliasData<'a>>,
-        level: Option<usize>,
+        level: Option<u32>,
         atop: Vec<Comment<'a>>,
         inline: Vec<Comment<'a>>,
         trailing_comma: TrailingComma,
@@ -60,11 +62,12 @@ pub enum AnnotatedImport<'a> {
 }
 
 #[allow(clippy::too_many_arguments, clippy::fn_params_excessive_bools)]
-pub fn format_imports(
+pub(crate) fn format_imports(
     block: &Block,
     comments: Vec<Comment>,
     locator: &Locator,
-    line_length: usize,
+    line_length: LineLength,
+    indentation_width: LineWidth,
     stylist: &Stylist,
     src: &[PathBuf],
     package: Option<&Path>,
@@ -106,6 +109,7 @@ pub fn format_imports(
         let block_output = format_import_block(
             block,
             line_length,
+            indentation_width,
             stylist,
             src,
             package,
@@ -161,7 +165,8 @@ pub fn format_imports(
 #[allow(clippy::too_many_arguments, clippy::fn_params_excessive_bools)]
 fn format_import_block(
     block: ImportBlock,
-    line_length: usize,
+    line_length: LineLength,
+    indentation_width: LineWidth,
     stylist: &Stylist,
     src: &[PathBuf],
     package: Option<&Path>,
@@ -263,6 +268,7 @@ fn format_import_block(
                         &comments,
                         &aliases,
                         line_length,
+                        indentation_width,
                         stylist,
                         force_wrap_aliases,
                         is_first_statement,
@@ -282,12 +288,11 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
-    use crate::message::Message;
     use rustc_hash::FxHashMap;
     use test_case::test_case;
 
     use crate::assert_messages;
+    use crate::message::Message;
     use crate::registry::Rule;
     use crate::rules::isort::categorize::{ImportSection, KnownModules};
     use crate::settings::Settings;
@@ -687,11 +692,16 @@ mod tests {
         Ok(())
     }
 
+    #[test_case(Path::new("comment.py"))]
     #[test_case(Path::new("docstring.py"))]
     #[test_case(Path::new("docstring.pyi"))]
     #[test_case(Path::new("docstring_only.py"))]
-    #[test_case(Path::new("multiline_docstring.py"))]
+    #[test_case(Path::new("docstring_with_continuation.py"))]
+    #[test_case(Path::new("docstring_with_semicolon.py"))]
     #[test_case(Path::new("empty.py"))]
+    #[test_case(Path::new("existing_import.py"))]
+    #[test_case(Path::new("multiline_docstring.py"))]
+    #[test_case(Path::new("off.py"))]
     fn required_import(path: &Path) -> Result<()> {
         let snapshot = format!("required_import_{}", path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/isort/normalize.rs b/crates/ruff/src/rules/isort/normalize.rs
index bce474247a9b6..1c0e4312edfdd 100644
--- a/crates/ruff/src/rules/isort/normalize.rs
+++ b/crates/ruff/src/rules/isort/normalize.rs
@@ -1,10 +1,11 @@
-use crate::rules::isort::types::TrailingComma;
 use std::collections::BTreeSet;
 
+use crate::rules::isort::types::TrailingComma;
+
 use super::types::{AliasData, ImportBlock, ImportFromData};
 use super::AnnotatedImport;
 
-pub fn normalize_imports<'a>(
+pub(crate) fn normalize_imports<'a>(
     imports: Vec<AnnotatedImport<'a>>,
     combine_as_imports: bool,
     force_single_line: bool,
diff --git a/crates/ruff/src/rules/isort/order.rs b/crates/ruff/src/rules/isort/order.rs
index 58c1c9174073c..1867ebf0dea72 100644
--- a/crates/ruff/src/rules/isort/order.rs
+++ b/crates/ruff/src/rules/isort/order.rs
@@ -9,7 +9,7 @@ use super::settings::RelativeImportsOrder;
 use super::sorting::{cmp_import_from, cmp_members, cmp_modules};
 use super::types::{AliasData, CommentSet, ImportBlock, OrderedImportBlock};
 
-pub fn order_imports<'a>(
+pub(crate) fn order_imports<'a>(
     block: ImportBlock<'a>,
     order_by_type: bool,
     relative_imports_order: RelativeImportsOrder,
@@ -20,7 +20,7 @@ pub fn order_imports<'a>(
 ) -> OrderedImportBlock<'a> {
     let mut ordered = OrderedImportBlock::default();
 
-    // Sort `StmtKind::Import`.
+    // Sort `Stmt::Import`.
     ordered.import.extend(
         block
             .import
@@ -28,7 +28,7 @@ pub fn order_imports<'a>(
             .sorted_by(|(alias1, _), (alias2, _)| cmp_modules(alias1, alias2, force_to_top)),
     );
 
-    // Sort `StmtKind::ImportFrom`.
+    // Sort `Stmt::ImportFrom`.
     ordered.import_from.extend(
         // Include all non-re-exports.
         block
@@ -54,7 +54,7 @@ pub fn order_imports<'a>(
                         trailing_comma,
                     },
                 )| {
-                    // Within each `StmtKind::ImportFrom`, sort the members.
+                    // Within each `Stmt::ImportFrom`, sort the members.
                     (
                         import_from,
                         comments,
diff --git a/crates/ruff/src/rules/isort/rules/add_required_imports.rs b/crates/ruff/src/rules/isort/rules/add_required_imports.rs
index 2696e05f65be1..1d05832f1ffc5 100644
--- a/crates/ruff/src/rules/isort/rules/add_required_imports.rs
+++ b/crates/ruff/src/rules/isort/rules/add_required_imports.rs
@@ -1,9 +1,9 @@
 use log::error;
-use ruff_text_size::TextRange;
-use rustpython_parser as parser;
-use rustpython_parser::ast::{StmtKind, Suite};
+use ruff_text_size::{TextRange, TextSize};
+use rustpython_parser::ast::{self, Stmt, Suite};
+use rustpython_parser::Parse;
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::is_docstring_stmt;
 use ruff_python_ast::imports::{Alias, AnyImport, FutureImport, Import, ImportFrom};
@@ -11,8 +11,7 @@ use ruff_python_ast::source_code::{Locator, Stylist};
 
 use crate::importer::Importer;
 use crate::registry::Rule;
-use crate::rules::isort::track::Block;
-use crate::settings::{flags, Settings};
+use crate::settings::Settings;
 
 /// ## What it does
 /// Adds any required imports, as specified by the user, to the top of the
@@ -53,57 +52,48 @@ impl AlwaysAutofixableViolation for MissingRequiredImport {
     }
 }
 
-fn contains(block: &Block, required_import: &AnyImport) -> bool {
-    block.imports.iter().any(|import| match required_import {
-        AnyImport::Import(required_import) => {
-            let StmtKind::Import {
+/// Return `true` if the [`Stmt`] includes the given [`AnyImport`].
+fn includes_import(stmt: &Stmt, target: &AnyImport) -> bool {
+    match target {
+        AnyImport::Import(target) => {
+            let Stmt::Import(ast::StmtImport {
                 names,
-            } = &import.node else {
+                 range: _,
+            }) = &stmt else {
                 return false;
             };
             names.iter().any(|alias| {
-                alias.node.name == required_import.name.name
-                    && alias.node.asname.as_deref() == required_import.name.as_name
+                &alias.name == target.name.name && alias.asname.as_deref() == target.name.as_name
             })
         }
-        AnyImport::ImportFrom(required_import) => {
-            let StmtKind::ImportFrom {
+        AnyImport::ImportFrom(target) => {
+            let Stmt::ImportFrom(ast::StmtImportFrom {
                 module,
                 names,
                 level,
-            } = &import.node else {
+                 range: _,
+            }) = &stmt else {
                 return false;
             };
-            module.as_deref() == required_import.module
-                && *level == required_import.level
+            module.as_deref() == target.module
+                && level.map(|level| level.to_u32()) == target.level
                 && names.iter().any(|alias| {
-                    alias.node.name == required_import.name.name
-                        && alias.node.asname.as_deref() == required_import.name.as_name
+                    &alias.name == target.name.name
+                        && alias.asname.as_deref() == target.name.as_name
                 })
         }
-    })
+    }
 }
 
 #[allow(clippy::too_many_arguments)]
 fn add_required_import(
     required_import: &AnyImport,
-    blocks: &[&Block],
     python_ast: &Suite,
     locator: &Locator,
     stylist: &Stylist,
     settings: &Settings,
-    autofix: flags::Autofix,
     is_stub: bool,
 ) -> Option<Diagnostic> {
-    // If the import is already present in a top-level block, don't add it.
-    if blocks
-        .iter()
-        .filter(|block| !block.nested)
-        .any(|block| contains(block, required_import))
-    {
-        return None;
-    }
-
     // Don't add imports to semantically-empty files.
     if python_ast.iter().all(is_docstring_stmt) {
         return None;
@@ -114,25 +104,35 @@ fn add_required_import(
         return None;
     }
 
+    // If the import is already present in a top-level block, don't add it.
+    if python_ast
+        .iter()
+        .any(|stmt| includes_import(stmt, required_import))
+    {
+        return None;
+    }
+
     // Always insert the diagnostic at top-of-file.
     let mut diagnostic = Diagnostic::new(
         MissingRequiredImport(required_import.to_string()),
         TextRange::default(),
     );
-    if autofix.into() && settings.rules.should_fix(Rule::MissingRequiredImport) {
-        diagnostic.set_fix(Importer::new(python_ast, locator, stylist).add_import(required_import));
+    if settings.rules.should_fix(Rule::MissingRequiredImport) {
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(
+            Importer::new(python_ast, locator, stylist)
+                .add_import(required_import, TextSize::default()),
+        ));
     }
     Some(diagnostic)
 }
 
 /// I002
-pub fn add_required_imports(
-    blocks: &[&Block],
+pub(crate) fn add_required_imports(
     python_ast: &Suite,
     locator: &Locator,
     stylist: &Stylist,
     settings: &Settings,
-    autofix: flags::Autofix,
     is_stub: bool,
 ) -> Vec<Diagnostic> {
     settings
@@ -140,7 +140,7 @@ pub fn add_required_imports(
         .required_imports
         .iter()
         .flat_map(|required_import| {
-            let Ok(body) = parser::parse_program(required_import, "<filename>") else {
+            let Ok(body) = Suite::parse(required_import, "<filename>") else {
                 error!("Failed to parse required import: `{}`", required_import);
                 return vec![];
             };
@@ -152,49 +152,46 @@ pub fn add_required_imports(
                 return vec![];
             }
             let stmt = &body[0];
-            match &stmt.node {
-                StmtKind::ImportFrom {
+            match stmt {
+                Stmt::ImportFrom(ast::StmtImportFrom {
                     module,
                     names,
                     level,
-                } => names
+                    range: _,
+                }) => names
                     .iter()
                     .filter_map(|name| {
                         add_required_import(
                             &AnyImport::ImportFrom(ImportFrom {
-                                module: module.as_ref().map(String::as_str),
+                                module: module.as_deref(),
                                 name: Alias {
-                                    name: name.node.name.as_str(),
-                                    as_name: name.node.asname.as_deref(),
+                                    name: name.name.as_str(),
+                                    as_name: name.asname.as_deref(),
                                 },
-                                level: *level,
+                                level: level.map(|level| level.to_u32()),
                             }),
-                            blocks,
                             python_ast,
                             locator,
                             stylist,
                             settings,
-                            autofix,
                             is_stub,
                         )
                     })
                     .collect(),
-                StmtKind::Import { names } => names
+                Stmt::Import(ast::StmtImport { names, range: _ }) => names
                     .iter()
                     .filter_map(|name| {
                         add_required_import(
                             &AnyImport::Import(Import {
                                 name: Alias {
-                                    name: name.node.name.as_str(),
-                                    as_name: name.node.asname.as_deref(),
+                                    name: name.name.as_str(),
+                                    as_name: name.asname.as_deref(),
                                 },
                             }),
-                            blocks,
                             python_ast,
                             locator,
                             stylist,
                             settings,
-                            autofix,
                             is_stub,
                         )
                     })
diff --git a/crates/ruff/src/rules/isort/rules/mod.rs b/crates/ruff/src/rules/isort/rules/mod.rs
index a6aded22ffa2c..0184926441391 100644
--- a/crates/ruff/src/rules/isort/rules/mod.rs
+++ b/crates/ruff/src/rules/isort/rules/mod.rs
@@ -1,5 +1,5 @@
-pub use add_required_imports::{add_required_imports, MissingRequiredImport};
-pub use organize_imports::{organize_imports, UnsortedImports};
+pub(crate) use add_required_imports::{add_required_imports, MissingRequiredImport};
+pub(crate) use organize_imports::{organize_imports, UnsortedImports};
 
-pub mod add_required_imports;
-pub mod organize_imports;
+pub(crate) mod add_required_imports;
+pub(crate) mod organize_imports;
diff --git a/crates/ruff/src/rules/isort/rules/organize_imports.rs b/crates/ruff/src/rules/isort/rules/organize_imports.rs
index 46bcba3d8e3c4..9b8140d610384 100644
--- a/crates/ruff/src/rules/isort/rules/organize_imports.rs
+++ b/crates/ruff/src/rules/isort/rules/organize_imports.rs
@@ -2,21 +2,23 @@ use std::path::Path;
 
 use itertools::{EitherOrBoth, Itertools};
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::Stmt;
-use textwrap::indent;
+use rustpython_parser::ast::{Ranged, Stmt};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
+use ruff_newlines::StrExt;
 use ruff_python_ast::helpers::{
     followed_by_multi_statement_line, preceded_by_multi_statement_line, trailing_lines_end,
 };
 use ruff_python_ast::source_code::{Indexer, Locator, Stylist};
 use ruff_python_ast::whitespace::leading_space;
+use ruff_textwrap::indent;
 
+use crate::line_width::LineWidth;
 use crate::registry::AsRule;
-use crate::settings::{flags, Settings};
+use crate::settings::Settings;
 
-use super::super::track::Block;
+use super::super::block::Block;
 use super::super::{comments, format_imports};
 
 /// ## What it does
@@ -40,14 +42,16 @@ use super::super::{comments, format_imports};
 #[violation]
 pub struct UnsortedImports;
 
-impl AlwaysAutofixableViolation for UnsortedImports {
+impl Violation for UnsortedImports {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         format!("Import block is un-sorted or un-formatted")
     }
 
-    fn autofix_title(&self) -> String {
-        "Organize imports".to_string()
+    fn autofix_title(&self) -> Option<String> {
+        Some("Organize imports".to_string())
     }
 }
 
@@ -66,8 +70,8 @@ fn extract_indentation_range(body: &[&Stmt], locator: &Locator) -> TextRange {
 /// Compares two strings, returning true if they are equal modulo whitespace
 /// at the start of each line.
 fn matches_ignoring_indentation(val1: &str, val2: &str) -> bool {
-    val1.lines()
-        .zip_longest(val2.lines())
+    val1.universal_newlines()
+        .zip_longest(val2.universal_newlines())
         .all(|pair| match pair {
             EitherOrBoth::Both(line1, line2) => line1.trim_start() == line2.trim_start(),
             _ => false,
@@ -76,13 +80,12 @@ fn matches_ignoring_indentation(val1: &str, val2: &str) -> bool {
 
 #[allow(clippy::cast_sign_loss)]
 /// I001
-pub fn organize_imports(
+pub(crate) fn organize_imports(
     block: &Block,
     locator: &Locator,
     stylist: &Stylist,
     indexer: &Indexer,
     settings: &Settings,
-    autofix: flags::Autofix,
     package: Option<&Path>,
 ) -> Option<Diagnostic> {
     let indentation = locator.slice(extract_indentation_range(&block.imports, locator));
@@ -115,7 +118,8 @@ pub fn organize_imports(
         block,
         comments,
         locator,
-        settings.line_length - indentation.len(),
+        settings.line_length,
+        LineWidth::new(settings.tab_size).add_str(indentation),
         stylist,
         &settings.src,
         package,
@@ -144,15 +148,15 @@ pub fn organize_imports(
     let range = TextRange::new(locator.line_start(range.start()), trailing_line_end);
     let actual = locator.slice(range);
     if matches_ignoring_indentation(actual, &expected) {
-        None
-    } else {
-        let mut diagnostic = Diagnostic::new(UnsortedImports, range);
-        if autofix.into() && settings.rules.should_fix(diagnostic.kind.rule()) {
-            diagnostic.set_fix(Edit::range_replacement(
-                indent(&expected, indentation),
-                range,
-            ));
-        }
-        Some(diagnostic)
+        return None;
+    }
+
+    let mut diagnostic = Diagnostic::new(UnsortedImports, range);
+    if settings.rules.should_fix(diagnostic.kind.rule()) {
+        diagnostic.set_fix(Fix::automatic(Edit::range_replacement(
+            indent(&expected, indentation).to_string(),
+            range,
+        )));
     }
+    Some(diagnostic)
 }
diff --git a/crates/ruff/src/rules/isort/settings.rs b/crates/ruff/src/rules/isort/settings.rs
index b9b1f5cdb507e..262829b73d425 100644
--- a/crates/ruff/src/rules/isort/settings.rs
+++ b/crates/ruff/src/rules/isort/settings.rs
@@ -4,11 +4,10 @@ use std::collections::BTreeSet;
 use std::hash::BuildHasherDefault;
 
 use rustc_hash::{FxHashMap, FxHashSet};
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use strum::IntoEnumIterator;
 
-use ruff_macros::{CacheKey, ConfigurationOptions};
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
 
 use crate::rules::isort::categorize::KnownModules;
 use crate::rules::isort::ImportType;
@@ -16,8 +15,9 @@ use crate::warn_user_once;
 
 use super::categorize::ImportSection;
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize, CacheKey, JsonSchema)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize, CacheKey)]
 #[serde(deny_unknown_fields, rename_all = "kebab-case")]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum RelativeImportsOrder {
     /// Place "closer" imports (fewer `.` characters, most local) before
     /// "further" imports (more `.` characters, least local).
@@ -34,13 +34,14 @@ impl Default for RelativeImportsOrder {
 }
 
 #[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, CombineOptions,
 )]
 #[serde(
     deny_unknown_fields,
     rename_all = "kebab-case",
     rename = "IsortOptions"
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = r#"false"#,
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__1_separate_subpackage_first_and_third_party_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__1_separate_subpackage_first_and_third_party_imports.py.snap
index 4f17260e63d14..41e6eb47f6bd7 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__1_separate_subpackage_first_and_third_party_imports.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__1_separate_subpackage_first_and_third_party_imports.py.snap
@@ -14,7 +14,7 @@ separate_subpackage_first_and_third_party_imports.py:1:1: I001 [*] Import block
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1  1  | import sys
    2  |+
    3  |+import foo
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__2_separate_subpackage_first_and_third_party_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__2_separate_subpackage_first_and_third_party_imports.py.snap
index 0173d5e76ca72..fbf2a1df8d3cb 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__2_separate_subpackage_first_and_third_party_imports.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__2_separate_subpackage_first_and_third_party_imports.py.snap
@@ -14,7 +14,7 @@ separate_subpackage_first_and_third_party_imports.py:1:1: I001 [*] Import block
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1  1  | import sys
    2  |+
 2  3  | import baz
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__add_newline_before_comments.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__add_newline_before_comments.py.snap
index 1b87be91b5731..8089cce5f552e 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__add_newline_before_comments.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__add_newline_before_comments.py.snap
@@ -13,7 +13,7 @@ add_newline_before_comments.py:1:1: I001 [*] Import block is un-sorted or un-for
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | import os
   2 |+
 2 3 | # This is a comment in the same section, so we need to add one newline.
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__as_imports_comments.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__as_imports_comments.py.snap
index cd4923d5dc678..572fada48a6db 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__as_imports_comments.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__as_imports_comments.py.snap
@@ -21,7 +21,7 @@ as_imports_comments.py:1:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1     |-from foo import (  # Comment on `foo`
 2     |-    Member as Alias,  # Comment on `Alias`
 3     |-)
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__closest_to_furthest_relative_imports_order.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__closest_to_furthest_relative_imports_order.py.snap
index 69903f179155e..920a8da11a9ca 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__closest_to_furthest_relative_imports_order.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__closest_to_furthest_relative_imports_order.py.snap
@@ -9,7 +9,7 @@ relative_imports_order.py:1:1: I001 [*] Import block is un-sorted or un-formatte
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
   1 |+from . import c
   2 |+from .. import b
 1 3 | from ... import a
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_as_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_as_imports.py.snap
index 38148d302fcc9..ae83cbda3822a 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_as_imports.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_as_imports.py.snap
@@ -10,7 +10,7 @@ combine_as_imports.py:1:1: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
   1 |+from module import CONSTANT, function
 1 2 | from module import Class as C
 2   |-from module import CONSTANT
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_as_imports_combine_as_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_as_imports_combine_as_imports.py.snap
index 5c2c3f89d242b..7460bca867171 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_as_imports_combine_as_imports.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_as_imports_combine_as_imports.py.snap
@@ -10,7 +10,7 @@ combine_as_imports.py:1:1: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1   |-from module import Class as C
 2   |-from module import CONSTANT
 3   |-from module import function
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_import_from.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_import_from.py.snap
index 6a325c2dc63a8..998a4bb3d8e1a 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_import_from.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__combine_import_from.py.snap
@@ -11,7 +11,7 @@ combine_import_from.py:1:1: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1   |-from collections import Awaitable
 2   |-from collections import AsyncIterable
 3   |-from collections import Collection
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__comments.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__comments.py.snap
index b639dd59cbf67..73b07a1de86e5 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__comments.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__comments.py.snap
@@ -39,7 +39,7 @@ comments.py:3:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1  1  | # Comment 1
 2  2  | # Comment 2
 3     |-import D
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__deduplicate_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__deduplicate_imports.py.snap
index eb896ed975639..04805215be14a 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__deduplicate_imports.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__deduplicate_imports.py.snap
@@ -10,7 +10,7 @@ deduplicate_imports.py:1:1: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | import os
 2   |-import os
 3 2 | import os as os1
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__fit_line_length.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__fit_line_length.py.snap
index ae9b9934b8275..d6355c64d99b8 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__fit_line_length.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__fit_line_length.py.snap
@@ -15,7 +15,7 @@ fit_line_length.py:7:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 5  5  | 
 6  6  | if indented:
 7  7  |     from line_with_88 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__fit_line_length_comment.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__fit_line_length_comment.py.snap
index 2dfbed797846c..9b4bae938a879 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__fit_line_length_comment.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__fit_line_length_comment.py.snap
@@ -7,17 +7,30 @@ fit_line_length_comment.py:1:1: I001 [*] Import block is un-sorted or un-formatt
 2 | | # Don't take this comment into account when determining whether the next import can fit on one line.
 3 | | from b import c
 4 | | from d import e  # Do take this comment into account when determining whether the next import can fit on one line.
+5 | | # The next import fits on one line.
+6 | | from f import g  # 012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ
+7 | | # The next import doesn't fit on one line.
+8 | | from h import i  # 012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9
   |
   = help: Organize imports
 
-ℹ Suggested fix
-1 1 | import a
-  2 |+
-2 3 | # Don't take this comment into account when determining whether the next import can fit on one line.
-3 4 | from b import c
-4   |-from d import e  # Do take this comment into account when determining whether the next import can fit on one line.
-  5 |+from d import (
-  6 |+    e,  # Do take this comment into account when determining whether the next import can fit on one line.
-  7 |+)
+ℹ Fix
+1  1  | import a
+   2  |+
+2  3  | # Don't take this comment into account when determining whether the next import can fit on one line.
+3  4  | from b import c
+4     |-from d import e  # Do take this comment into account when determining whether the next import can fit on one line.
+   5  |+from d import (
+   6  |+    e,  # Do take this comment into account when determining whether the next import can fit on one line.
+   7  |+)
+   8  |+
+5  9  | # The next import fits on one line.
+6  10 | from f import g  # 012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ
+   11 |+
+7  12 | # The next import doesn't fit on one line.
+8     |-from h import i  # 012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9
+   13 |+from h import (
+   14 |+    i,  # 012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9
+   15 |+)
 
 
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_single_line_force_single_line.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_single_line_force_single_line.py.snap
index 1d042dfcf84f8..c7247981b9386 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_single_line_force_single_line.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_single_line_force_single_line.py.snap
@@ -33,7 +33,7 @@ force_single_line.py:1:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1     |-import sys, math
 2     |-from os import path, uname
    1  |+import math
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_sort_within_sections.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_sort_within_sections.py.snap
index 5d66208de7ce6..6d018eb2e3168 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_sort_within_sections.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_sort_within_sections.py.snap
@@ -19,7 +19,7 @@ force_sort_within_sections.py:1:1: I001 [*] Import block is un-sorted or un-form
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1     |-from a import a1  # import_from
 2     |-from c import * # import_from_star
 3  1  | import a  # import
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_sort_within_sections_force_sort_within_sections.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_sort_within_sections_force_sort_within_sections.py.snap
index cb9acf0d4ebee..a306bd2cf2605 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_sort_within_sections_force_sort_within_sections.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_sort_within_sections_force_sort_within_sections.py.snap
@@ -19,7 +19,7 @@ force_sort_within_sections.py:1:1: I001 [*] Import block is un-sorted or un-form
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1     |-from a import a1  # import_from
 2     |-from c import * # import_from_star
    1  |+import z
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_to_top.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_to_top.py.snap
index 96167fd8d61e8..26418b34ad374 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_to_top.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_to_top.py.snap
@@ -29,7 +29,7 @@ force_to_top.py:1:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1     |-import lib6
    1  |+import foo
    2  |+import lib1
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_to_top_force_to_top.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_to_top_force_to_top.py.snap
index cfc5a7fc8bfb5..229aef46ee77a 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_to_top_force_to_top.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_to_top_force_to_top.py.snap
@@ -29,7 +29,7 @@ force_to_top.py:1:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1     |-import lib6
 2     |-import lib2
 3     |-import lib5
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_wrap_aliases.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_wrap_aliases.py.snap
index 0c6448490a615..7c1ab3dfdf257 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_wrap_aliases.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_wrap_aliases.py.snap
@@ -9,7 +9,7 @@ force_wrap_aliases.py:1:1: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1   |-from .a import a1 as a1, a2 as a2
   1 |+from .a import a1 as a1
   2 |+from .a import a2 as a2
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_wrap_aliases_force_wrap_aliases.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_wrap_aliases_force_wrap_aliases.py.snap
index eb0b782623299..e2bef255ceb53 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_wrap_aliases_force_wrap_aliases.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__force_wrap_aliases_force_wrap_aliases.py.snap
@@ -9,7 +9,7 @@ force_wrap_aliases.py:1:1: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1   |-from .a import a1 as a1, a2 as a2
   1 |+from .a import (
   2 |+    a1 as a1,
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__forced_separate.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__forced_separate.py.snap
index 0af334c23902e..58a69f38ac07e 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__forced_separate.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__forced_separate.py.snap
@@ -14,7 +14,7 @@ forced_separate.py:3:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1  1  | # office_helper and tests are both first-party,
 2  2  | # but we want tests and experiments to be separated, in that order
    3  |+from office_helper.assistants import entity_registry as er
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__import_from_after_import.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__import_from_after_import.py.snap
index cbcf20291cb29..53a884c3e5fdd 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__import_from_after_import.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__import_from_after_import.py.snap
@@ -8,7 +8,7 @@ import_from_after_import.py:1:1: I001 [*] Import block is un-sorted or un-format
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
   1 |+import os
 1 2 | from collections import Collection
 2   |-import os
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__inline_comments.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__inline_comments.py.snap
index 905c7decec6a3..5e7526984bad8 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__inline_comments.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__inline_comments.py.snap
@@ -17,7 +17,7 @@ inline_comments.py:1:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | from a.prometheus.metrics import (  # type:ignore[attr-defined]
 2 2 |     TERMINAL_CURRENTLY_RUNNING_TOTAL,
 3 3 | )
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__insert_empty_lines.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__insert_empty_lines.py.snap
index da9d97ef549b3..737b1c8af3281 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__insert_empty_lines.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__insert_empty_lines.py.snap
@@ -12,7 +12,7 @@ insert_empty_lines.py:1:1: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | import a
 2 2 | import b
   3 |+
@@ -33,7 +33,7 @@ insert_empty_lines.py:4:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 3 3 | x = 1
 4 4 | import os
 5 5 | import sys
@@ -56,7 +56,7 @@ insert_empty_lines.py:14:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 13 13 | y = 1
 14 14 | import os
 15 15 | import sys
@@ -76,7 +76,7 @@ insert_empty_lines.py:52:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 51 51 | 
 52 52 | import os
 53 53 | 
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__insert_empty_lines.pyi.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__insert_empty_lines.pyi.snap
index f78845939703a..94b08d048d1da 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__insert_empty_lines.pyi.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__insert_empty_lines.pyi.snap
@@ -12,7 +12,7 @@ insert_empty_lines.pyi:1:1: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | import a
 2 2 | import b
   3 |+
@@ -33,7 +33,7 @@ insert_empty_lines.pyi:4:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 3 3 | x = 1
 4 4 | import os
 5 5 | import sys
@@ -55,7 +55,7 @@ insert_empty_lines.pyi:14:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 13 13 | y = 1
 14 14 | import os
 15 15 | import sys
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__known_local_folder_separate_local_folder_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__known_local_folder_separate_local_folder_imports.py.snap
index 1af3a0949fe10..c46c4efd56c22 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__known_local_folder_separate_local_folder_imports.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__known_local_folder_separate_local_folder_imports.py.snap
@@ -11,7 +11,7 @@ separate_local_folder_imports.py:1:1: I001 [*] Import block is un-sorted or un-f
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
   1 |+import os
 1 2 | import sys
   3 |+
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__leading_prefix.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__leading_prefix.py.snap
index 6539ba11258f9..3c5f5e2a38619 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__leading_prefix.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__leading_prefix.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/isort/mod.rs
 ---
-leading_prefix.py:1:8: I001 [*] Import block is un-sorted or un-formatted
+leading_prefix.py:1:8: I001 Import block is un-sorted or un-formatted
   |
 1 |   x = 1; import sys
   |  ________^
@@ -12,7 +12,7 @@ leading_prefix.py:1:8: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-leading_prefix.py:5:12: I001 [*] Import block is un-sorted or un-formatted
+leading_prefix.py:5:12: I001 Import block is un-sorted or un-formatted
   |
 5 |   if True:
 6 |       x = 1; import sys
@@ -24,7 +24,7 @@ leading_prefix.py:5:12: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-leading_prefix.py:10:9: I001 [*] Import block is un-sorted or un-formatted
+leading_prefix.py:10:9: I001 Import block is un-sorted or un-formatted
    |
 10 | if True:
 11 |     x = 1; \
@@ -35,7 +35,7 @@ leading_prefix.py:10:9: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-leading_prefix.py:13:1: I001 [*] Import block is un-sorted or un-formatted
+leading_prefix.py:13:1: I001 Import block is un-sorted or un-formatted
    |
 13 | x = 1; \
 14 | import os
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_class_after.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_class_after.py.snap
index a28d7c0d9d35a..d49496d35a4fa 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_class_after.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_class_after.py.snap
@@ -19,7 +19,7 @@ lines_after_imports_class_after.py:1:1: I001 [*] Import block is un-sorted or un
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 2  2  | 
 3  3  | from typing import Any
 4  4  | 
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_func_after.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_func_after.py.snap
index 106ea36452685..dc6bc6c11fa5f 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_func_after.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_func_after.py.snap
@@ -29,7 +29,7 @@ lines_after_imports_func_after.py:1:1: I001 [*] Import block is un-sorted or un-
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 2  2  | 
 3  3  | from typing import Any
 4  4  | 
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_nothing_after.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_nothing_after.py.snap
index 0f28da7ed43b0..aa2fbb6995134 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_nothing_after.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_after_imports_lines_after_imports_nothing_after.py.snap
@@ -15,7 +15,7 @@ lines_after_imports_nothing_after.py:1:1: I001 [*] Import block is un-sorted or
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 2 2 | 
 3 3 | from typing import Any
 4 4 | 
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_between_typeslines_between_types.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_between_typeslines_between_types.py.snap
index 730779d08ab1d..500a265589208 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_between_typeslines_between_types.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__lines_between_typeslines_between_types.py.snap
@@ -22,7 +22,7 @@ lines_between_types.py:1:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 9  9  | import requests
 10 10 | 
 11 11 | 
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__magic_trailing_comma.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__magic_trailing_comma.py.snap
index 43209c1082732..c43bfa3b76757 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__magic_trailing_comma.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__magic_trailing_comma.py.snap
@@ -44,7 +44,7 @@ magic_trailing_comma.py:2:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1  1  | # This has a magic trailing comma, will be sorted, but not rolled into one line
 2     |-from sys import (
 3     |-    stderr,
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__natural_order.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__natural_order.py.snap
index d001d7922a071..b7d3150fa12c0 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__natural_order.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__natural_order.py.snap
@@ -22,7 +22,7 @@ natural_order.py:1:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1  1  | import numpy1
    2  |+import numpy2
 2  3  | import numpy10
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before.py.snap
index ab81767a3324e..f7ff0486df60a 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before.py.snap
@@ -15,7 +15,7 @@ no_lines_before.py:1:1: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 2 2 | 
 3 3 | from typing import Any
 4 4 | 
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before.py_no_lines_before.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before.py_no_lines_before.py.snap
index ef9df0128456b..635fcda159b5a 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before.py_no_lines_before.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before.py_no_lines_before.py.snap
@@ -15,7 +15,7 @@ no_lines_before.py:1:1: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | from __future__ import annotations
 2   |-
 3 2 | from typing import Any
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before_with_empty_sections.py_no_lines_before_with_empty_sections.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before_with_empty_sections.py_no_lines_before_with_empty_sections.py.snap
index 481c39c1e2f67..bcc68488eef16 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before_with_empty_sections.py_no_lines_before_with_empty_sections.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_lines_before_with_empty_sections.py_no_lines_before_with_empty_sections.py.snap
@@ -9,7 +9,7 @@ no_lines_before_with_empty_sections.py:1:1: I001 [*] Import block is un-sorted o
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | from __future__ import annotations
 2 2 | from typing import Any
   3 |+
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_wrap_star.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_wrap_star.py.snap
index 456bde70ffc77..2eb7630eb8cd4 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_wrap_star.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__no_wrap_star.py.snap
@@ -7,7 +7,7 @@ no_wrap_star.py:1:1: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1   |-from .subscription import * # type: ignore  # some very long comment explaining why this needs a type ignore
   1 |+from .subscription import *  # type: ignore  # some very long comment explaining why this needs a type ignore
 
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type.py.snap
index c3bec94c1a799..76e6484c721a1 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type.py.snap
@@ -18,7 +18,7 @@ order_by_type.py:1:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1     |-import StringIO
 2  1  | import glob
 3  2  | import os
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_false_order_by_type.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_false_order_by_type.py.snap
index 1068a1c6d454f..4f2c1738988e4 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_false_order_by_type.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_false_order_by_type.py.snap
@@ -18,7 +18,7 @@ order_by_type.py:1:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1     |-import StringIO
 2  1  | import glob
 3  2  | import os
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_classes.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_classes.py.snap
index 4593956447bfd..902db7014bf20 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_classes.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_classes.py.snap
@@ -10,7 +10,7 @@ order_by_type_with_custom_classes.py:1:1: I001 [*] Import block is un-sorted or
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1   |-from sklearn.svm import func, SVC, CONST, Klass
 2   |-from subprocess import N_CLASS, PIPE, Popen, STDOUT
 3   |-from module import CLASS, Class, CONSTANT, function, BASIC, Apple
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_classes_order_by_type_with_custom_classes.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_classes_order_by_type_with_custom_classes.py.snap
index 7956cfb36594b..7147189148338 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_classes_order_by_type_with_custom_classes.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_classes_order_by_type_with_custom_classes.py.snap
@@ -10,7 +10,7 @@ order_by_type_with_custom_classes.py:1:1: I001 [*] Import block is un-sorted or
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1   |-from sklearn.svm import func, SVC, CONST, Klass
 2   |-from subprocess import N_CLASS, PIPE, Popen, STDOUT
 3   |-from module import CLASS, Class, CONSTANT, function, BASIC, Apple
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_constants.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_constants.py.snap
index e3e6a757727d5..0a616fa8a141b 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_constants.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_constants.py.snap
@@ -8,7 +8,7 @@ order_by_type_with_custom_constants.py:1:1: I001 [*] Import block is un-sorted o
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1   |-from sklearn.svm import XYZ, func, variable, Const, Klass, constant
 2   |-from subprocess import First, var, func, Class, konst, A_constant, Last, STDOUT
   1 |+from subprocess import STDOUT, A_constant, Class, First, Last, func, konst, var
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_constants_order_by_type_with_custom_constants.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_constants_order_by_type_with_custom_constants.py.snap
index eca6e9541c5ee..aade3e18a2d86 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_constants_order_by_type_with_custom_constants.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_constants_order_by_type_with_custom_constants.py.snap
@@ -8,7 +8,7 @@ order_by_type_with_custom_constants.py:1:1: I001 [*] Import block is un-sorted o
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1   |-from sklearn.svm import XYZ, func, variable, Const, Klass, constant
 2   |-from subprocess import First, var, func, Class, konst, A_constant, Last, STDOUT
   1 |+from subprocess import A_constant, First, konst, Last, STDOUT, Class, func, var
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_variables.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_variables.py.snap
index 80f41f0b1b201..4ac3df49ca51b 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_variables.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_variables.py.snap
@@ -8,7 +8,7 @@ order_by_type_with_custom_variables.py:1:1: I001 [*] Import block is un-sorted o
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1   |-from sklearn.svm import VAR, Class, MyVar, CONST, abc
 2   |-from subprocess import utils, var_ABC, Variable, Klass, CONSTANT, exe
   1 |+from subprocess import CONSTANT, Klass, Variable, exe, utils, var_ABC
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_variables_order_by_type_with_custom_variables.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_variables_order_by_type_with_custom_variables.py.snap
index 885e9af2bb3b9..002a187b45c66 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_variables_order_by_type_with_custom_variables.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_by_type_with_custom_variables_order_by_type_with_custom_variables.py.snap
@@ -8,7 +8,7 @@ order_by_type_with_custom_variables.py:1:1: I001 [*] Import block is un-sorted o
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1   |-from sklearn.svm import VAR, Class, MyVar, CONST, abc
 2   |-from subprocess import utils, var_ABC, Variable, Klass, CONSTANT, exe
   1 |+from subprocess import CONSTANT, Klass, exe, utils, var_ABC, Variable
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_relative_imports_by_level.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_relative_imports_by_level.py.snap
index 1880d3acf2528..75940c7d49c45 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_relative_imports_by_level.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__order_relative_imports_by_level.py.snap
@@ -10,7 +10,7 @@ order_relative_imports_by_level.py:1:1: I001 [*] Import block is un-sorted or un
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1   |-from .a import a
 2 1 | from ..a import a
 3 2 | from ..b import a
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_comment_order.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_comment_order.py.snap
index ad469236e6d19..0a8c62f4b3028 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_comment_order.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_comment_order.py.snap
@@ -17,7 +17,7 @@ preserve_comment_order.py:1:1: I001 [*] Import block is un-sorted or un-formatte
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
    1  |+import abc
 1  2  | import io
    3  |+
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_import_star.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_import_star.py.snap
index fd4e61e73a5cd..d640a69905469 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_import_star.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_import_star.py.snap
@@ -12,7 +12,7 @@ preserve_import_star.py:1:1: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1   |-from some_other_module import some_class
 2   |-from some_other_module import *
 3 1 | # Above
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_indentation.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_indentation.py.snap
index fe4aa19b252fb..ed2de4324c951 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_indentation.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__preserve_indentation.py.snap
@@ -13,7 +13,7 @@ preserve_indentation.py:2:1: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | if True:
   2 |+    import os
 2 3 |     import sys
@@ -31,7 +31,7 @@ preserve_indentation.py:5:1: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 2 2 |     import sys
 3 3 |     import os
 4 4 | else:
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__propagate_inline_comments_propagate_inline_comments.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__propagate_inline_comments_propagate_inline_comments.py.snap
index 829d46b80b1f0..154e06dbc9d67 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__propagate_inline_comments_propagate_inline_comments.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__propagate_inline_comments_propagate_inline_comments.py.snap
@@ -10,7 +10,7 @@ propagate_inline_comments.py:1:1: I001 [*] Import block is un-sorted or un-forma
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | from mypackage.subpackage import (  # long comment that seems to be a problem
 2 2 |     a_long_variable_name_that_causes_problems,
 3   |-    items,
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__reorder_within_section.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__reorder_within_section.py.snap
index 4c595add0ceef..c8b39c3378a30 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__reorder_within_section.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__reorder_within_section.py.snap
@@ -8,7 +8,7 @@ reorder_within_section.py:1:1: I001 [*] Import block is un-sorted or un-formatte
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
   1 |+import os
 1 2 | import sys
 2   |-import os
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__required_import_comment.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__required_import_comment.py.snap
new file mode 100644
index 0000000000000..9606d7a44e867
--- /dev/null
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__required_import_comment.py.snap
@@ -0,0 +1,19 @@
+---
+source: crates/ruff/src/rules/isort/mod.rs
+---
+comment.py:1:1: I002 [*] Missing required import: `from __future__ import annotations`
+  |
+1 | #!/usr/bin/env python3
+  |  I002
+2 | 
+3 | x = 1
+  |
+  = help: Insert required import: `from future import annotations`
+
+ℹ Suggested fix
+1 1 | #!/usr/bin/env python3
+  2 |+from __future__ import annotations
+2 3 | 
+3 4 | x = 1
+
+
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__required_import_docstring_with_continuation.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__required_import_docstring_with_continuation.py.snap
new file mode 100644
index 0000000000000..2e4dfc38c9300
--- /dev/null
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__required_import_docstring_with_continuation.py.snap
@@ -0,0 +1,17 @@
+---
+source: crates/ruff/src/rules/isort/mod.rs
+---
+docstring_with_continuation.py:1:1: I002 [*] Missing required import: `from __future__ import annotations`
+  |
+1 | """Hello, world!"""; x = \
+  |  I002
+2 |     1; y = 2
+  |
+  = help: Insert required import: `from future import annotations`
+
+ℹ Suggested fix
+1   |-"""Hello, world!"""; x = \
+  1 |+"""Hello, world!"""; from __future__ import annotations; x = \
+2 2 |     1; y = 2
+
+
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__required_import_docstring_with_semicolon.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__required_import_docstring_with_semicolon.py.snap
new file mode 100644
index 0000000000000..0a084316d8009
--- /dev/null
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__required_import_docstring_with_semicolon.py.snap
@@ -0,0 +1,15 @@
+---
+source: crates/ruff/src/rules/isort/mod.rs
+---
+docstring_with_semicolon.py:1:1: I002 [*] Missing required import: `from __future__ import annotations`
+  |
+1 | """Hello, world!"""; x = 1
+  |  I002
+  |
+  = help: Insert required import: `from future import annotations`
+
+ℹ Suggested fix
+1   |-"""Hello, world!"""; x = 1
+  1 |+"""Hello, world!"""; from __future__ import annotations; x = 1
+
+
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__required_import_existing_import.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__required_import_existing_import.py.snap
new file mode 100644
index 0000000000000..d094c96a6cd9c
--- /dev/null
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__required_import_existing_import.py.snap
@@ -0,0 +1,17 @@
+---
+source: crates/ruff/src/rules/isort/mod.rs
+---
+existing_import.py:1:1: I002 [*] Missing required import: `from __future__ import annotations`
+  |
+1 | from __future__ import generator_stop
+  |  I002
+2 | import os
+  |
+  = help: Insert required import: `from future import annotations`
+
+ℹ Suggested fix
+  1 |+from __future__ import annotations
+1 2 | from __future__ import generator_stop
+2 3 | import os
+
+
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__required_import_off.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__required_import_off.py.snap
new file mode 100644
index 0000000000000..0d506cdcab4b7
--- /dev/null
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__required_import_off.py.snap
@@ -0,0 +1,20 @@
+---
+source: crates/ruff/src/rules/isort/mod.rs
+---
+off.py:1:1: I002 [*] Missing required import: `from __future__ import annotations`
+  |
+1 | # isort: off
+  |  I002
+2 | 
+3 | x = 1
+  |
+  = help: Insert required import: `from future import annotations`
+
+ℹ Suggested fix
+1 1 | # isort: off
+  2 |+from __future__ import annotations
+2 3 | 
+3 4 | x = 1
+4 5 | # isort: on
+
+
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__section_order_sections.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__section_order_sections.py.snap
index 9c56da22496da..accc2bec47d8d 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__section_order_sections.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__section_order_sections.py.snap
@@ -13,7 +13,7 @@ sections.py:1:1: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1  1  | from __future__ import annotations
    2  |+
 2  3  | import os
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__sections_sections.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__sections_sections.py.snap
index e594cb563db0a..44a174f26b645 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__sections_sections.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__sections_sections.py.snap
@@ -13,7 +13,7 @@ sections.py:1:1: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1  1  | from __future__ import annotations
    2  |+
 2  3  | import os
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_first_party_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_first_party_imports.py.snap
index 1d79b820f0d98..4152577a2beca 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_first_party_imports.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_first_party_imports.py.snap
@@ -11,7 +11,7 @@ separate_first_party_imports.py:1:1: I001 [*] Import block is un-sorted or un-fo
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
   1 |+import os
 1 2 | import sys
   3 |+
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_future_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_future_imports.py.snap
index c80e025a20358..35071c595f071 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_future_imports.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_future_imports.py.snap
@@ -9,7 +9,7 @@ separate_future_imports.py:1:1: I001 [*] Import block is un-sorted or un-formatt
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1   |-import sys
 2   |-import os
 3 1 | from __future__ import annotations
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_local_folder_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_local_folder_imports.py.snap
index 512687da97f1d..50a99dc995f33 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_local_folder_imports.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_local_folder_imports.py.snap
@@ -11,7 +11,7 @@ separate_local_folder_imports.py:1:1: I001 [*] Import block is un-sorted or un-f
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
   1 |+import os
 1 2 | import sys
   3 |+
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_third_party_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_third_party_imports.py.snap
index f4bbd525d4c76..93364da9d2b11 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_third_party_imports.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__separate_third_party_imports.py.snap
@@ -10,7 +10,7 @@ separate_third_party_imports.py:1:1: I001 [*] Import block is un-sorted or un-fo
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1   |-import pandas as pd
   1 |+import os
 2 2 | import sys
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__skip.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__skip.py.snap
index ec609bca135aa..02bea0868e969 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__skip.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__skip.py.snap
@@ -14,7 +14,7 @@ skip.py:20:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 17 17 | def f():
 18 18 |     import sys
 19 19 |     import os  # isort: skip
@@ -34,7 +34,7 @@ skip.py:27:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 24 24 | def f():
 25 25 |     import sys
 26 26 |     import os  # isort:skip
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__sort_similar_imports.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__sort_similar_imports.py.snap
index 3cd427ec13eee..7de30d7bc55e7 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__sort_similar_imports.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__sort_similar_imports.py.snap
@@ -32,7 +32,7 @@ sort_similar_imports.py:1:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1     |-from a import b
    1  |+import A
    2  |+import a
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__split.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__split.py.snap
index 94aa1559b8bb6..080e5b7bc0700 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__split.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__split.py.snap
@@ -1,4 +1,43 @@
 ---
 source: crates/ruff/src/rules/isort/mod.rs
 ---
+split.py:15:1: I001 [*] Import block is un-sorted or un-formatted
+   |
+15 |   if True:
+16 | /     import C
+17 | |     import A
+18 | | 
+   | |_^ I001
+19 |       # isort: split
+   |
+   = help: Organize imports
+
+ℹ Fix
+12 12 | import b
+13 13 | 
+14 14 | if True:
+   15 |+    import A
+15 16 |     import C
+16    |-    import A
+17 17 | 
+18 18 |     # isort: split
+19 19 | 
+
+split.py:20:1: I001 [*] Import block is un-sorted or un-formatted
+   |
+20 |       # isort: split
+21 |   
+22 | /     import D
+23 | |     import B
+   |
+   = help: Organize imports
+
+ℹ Fix
+17 17 | 
+18 18 |     # isort: split
+19 19 | 
+   20 |+    import B
+20 21 |     import D
+21    |-    import B
+
 
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__split_on_trailing_comma_magic_trailing_comma.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__split_on_trailing_comma_magic_trailing_comma.py.snap
index 820b50e85ed99..8a49442fb06b9 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__split_on_trailing_comma_magic_trailing_comma.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__split_on_trailing_comma_magic_trailing_comma.py.snap
@@ -44,7 +44,7 @@ magic_trailing_comma.py:2:1: I001 [*] Import block is un-sorted or un-formatted
    |
    = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1  1  | # This has a magic trailing comma, will be sorted, but not rolled into one line
 2     |-from sys import (
 3     |-    stderr,
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__star_before_others.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__star_before_others.py.snap
index 716293803ced8..fc46ab5b8d68e 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__star_before_others.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__star_before_others.py.snap
@@ -9,7 +9,7 @@ star_before_others.py:1:1: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | from .logging import config_logging
   2 |+from .settings import *
 2 3 | from .settings import ENV
diff --git a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__trailing_suffix.py.snap b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__trailing_suffix.py.snap
index 494ac8762900a..1b0d3ed6f905f 100644
--- a/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__trailing_suffix.py.snap
+++ b/crates/ruff/src/rules/isort/snapshots/ruff__rules__isort__tests__trailing_suffix.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/isort/mod.rs
 ---
-trailing_suffix.py:1:1: I001 [*] Import block is un-sorted or un-formatted
+trailing_suffix.py:1:1: I001 Import block is un-sorted or un-formatted
   |
 1 | / import sys
 2 | | import os; x = 1
@@ -11,7 +11,7 @@ trailing_suffix.py:1:1: I001 [*] Import block is un-sorted or un-formatted
   |
   = help: Organize imports
 
-trailing_suffix.py:5:5: I001 [*] Import block is un-sorted or un-formatted
+trailing_suffix.py:5:5: I001 Import block is un-sorted or un-formatted
   |
 5 |   if True:
 6 |       import sys
diff --git a/crates/ruff/src/rules/isort/sorting.rs b/crates/ruff/src/rules/isort/sorting.rs
index 7d68a0602ba7c..9ce7d63bb3e9f 100644
--- a/crates/ruff/src/rules/isort/sorting.rs
+++ b/crates/ruff/src/rules/isort/sorting.rs
@@ -11,7 +11,7 @@ use super::types::EitherImport::{Import, ImportFrom};
 use super::types::{AliasData, EitherImport, ImportFromData};
 
 #[derive(PartialOrd, Ord, PartialEq, Eq, Copy, Clone)]
-pub enum Prefix {
+pub(crate) enum Prefix {
     Constants,
     Classes,
     Variables,
@@ -52,7 +52,7 @@ fn cmp_force_to_top(name1: &str, name2: &str, force_to_top: &BTreeSet<String>) -
 }
 
 /// Compare two top-level modules.
-pub fn cmp_modules(
+pub(crate) fn cmp_modules(
     alias1: &AliasData,
     alias2: &AliasData,
     force_to_top: &BTreeSet<String>,
@@ -68,8 +68,8 @@ pub fn cmp_modules(
         })
 }
 
-/// Compare two member imports within `StmtKind::ImportFrom` blocks.
-pub fn cmp_members(
+/// Compare two member imports within `Stmt::ImportFrom` blocks.
+pub(crate) fn cmp_members(
     alias1: &AliasData,
     alias2: &AliasData,
     order_by_type: bool,
@@ -94,9 +94,9 @@ pub fn cmp_members(
 }
 
 /// Compare two relative import levels.
-pub fn cmp_levels(
-    level1: Option<usize>,
-    level2: Option<usize>,
+pub(crate) fn cmp_levels(
+    level1: Option<u32>,
+    level2: Option<u32>,
     relative_imports_order: RelativeImportsOrder,
 ) -> Ordering {
     match (level1, level2) {
@@ -110,8 +110,8 @@ pub fn cmp_levels(
     }
 }
 
-/// Compare two `StmtKind::ImportFrom` blocks.
-pub fn cmp_import_from(
+/// Compare two `Stmt::ImportFrom` blocks.
+pub(crate) fn cmp_import_from(
     import_from1: &ImportFromData,
     import_from2: &ImportFromData,
     relative_imports_order: RelativeImportsOrder,
@@ -151,7 +151,7 @@ fn cmp_import_import_from(
 
 /// Compare two [`EitherImport`] enums which may be [`Import`] or [`ImportFrom`]
 /// structs.
-pub fn cmp_either_import(
+pub(crate) fn cmp_either_import(
     a: &EitherImport,
     b: &EitherImport,
     relative_imports_order: RelativeImportsOrder,
diff --git a/crates/ruff/src/rules/isort/split.rs b/crates/ruff/src/rules/isort/split.rs
index 70fd474e34a48..c2059bada0040 100644
--- a/crates/ruff/src/rules/isort/split.rs
+++ b/crates/ruff/src/rules/isort/split.rs
@@ -17,7 +17,7 @@ fn find_block_index(forced_separate: &[String], imp: &dyn Importable) -> usize {
 /// patterns in `forced_separate`, in the order they appear in the
 /// `forced_separate` set. Empty blocks are retained for patterns that do not
 /// match any imports.
-pub fn split_by_forced_separate<'a>(
+pub(crate) fn split_by_forced_separate<'a>(
     block: ImportBlock<'a>,
     forced_separate: &[String],
 ) -> Vec<ImportBlock<'a>> {
diff --git a/crates/ruff/src/rules/isort/types.rs b/crates/ruff/src/rules/isort/types.rs
index 2eb5c7e82a4c1..a6e6247ff3831 100644
--- a/crates/ruff/src/rules/isort/types.rs
+++ b/crates/ruff/src/rules/isort/types.rs
@@ -5,31 +5,31 @@ use rustc_hash::FxHashMap;
 use ruff_python_ast::helpers::format_import_from;
 
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
-pub enum TrailingComma {
+pub(crate) enum TrailingComma {
     Present,
     #[default]
     Absent,
 }
 
 #[derive(Debug, Hash, Ord, PartialOrd, Eq, PartialEq, Clone)]
-pub struct ImportFromData<'a> {
-    pub module: Option<&'a str>,
-    pub level: Option<usize>,
+pub(crate) struct ImportFromData<'a> {
+    pub(crate) module: Option<&'a str>,
+    pub(crate) level: Option<u32>,
 }
 
 #[derive(Debug, Hash, Ord, PartialOrd, Eq, PartialEq)]
-pub struct AliasData<'a> {
-    pub name: &'a str,
-    pub asname: Option<&'a str>,
+pub(crate) struct AliasData<'a> {
+    pub(crate) name: &'a str,
+    pub(crate) asname: Option<&'a str>,
 }
 
 #[derive(Debug, Default, Clone)]
-pub struct CommentSet<'a> {
-    pub atop: Vec<Cow<'a, str>>,
-    pub inline: Vec<Cow<'a, str>>,
+pub(crate) struct CommentSet<'a> {
+    pub(crate) atop: Vec<Cow<'a, str>>,
+    pub(crate) inline: Vec<Cow<'a, str>>,
 }
 
-pub trait Importable {
+pub(crate) trait Importable {
     fn module_name(&self) -> String;
     fn module_base(&self) -> String;
 }
@@ -55,26 +55,27 @@ impl Importable for ImportFromData<'_> {
 }
 
 #[derive(Debug, Default)]
-pub struct ImportFromStatement<'a> {
-    pub comments: CommentSet<'a>,
-    pub aliases: FxHashMap<AliasData<'a>, CommentSet<'a>>,
-    pub trailing_comma: TrailingComma,
+pub(crate) struct ImportFromStatement<'a> {
+    pub(crate) comments: CommentSet<'a>,
+    pub(crate) aliases: FxHashMap<AliasData<'a>, CommentSet<'a>>,
+    pub(crate) trailing_comma: TrailingComma,
 }
 
 #[derive(Debug, Default)]
-pub struct ImportBlock<'a> {
+pub(crate) struct ImportBlock<'a> {
     // Set of (name, asname), used to track regular imports.
     // Ex) `import module`
-    pub import: FxHashMap<AliasData<'a>, CommentSet<'a>>,
+    pub(crate) import: FxHashMap<AliasData<'a>, CommentSet<'a>>,
     // Map from (module, level) to `AliasData`, used to track 'from' imports.
     // Ex) `from module import member`
-    pub import_from: FxHashMap<ImportFromData<'a>, ImportFromStatement<'a>>,
+    pub(crate) import_from: FxHashMap<ImportFromData<'a>, ImportFromStatement<'a>>,
     // Set of (module, level, name, asname), used to track re-exported 'from' imports.
     // Ex) `from module import member as member`
-    pub import_from_as: FxHashMap<(ImportFromData<'a>, AliasData<'a>), ImportFromStatement<'a>>,
+    pub(crate) import_from_as:
+        FxHashMap<(ImportFromData<'a>, AliasData<'a>), ImportFromStatement<'a>>,
     // Map from (module, level) to `AliasData`, used to track star imports.
     // Ex) `from module import *`
-    pub import_from_star: FxHashMap<ImportFromData<'a>, ImportFromStatement<'a>>,
+    pub(crate) import_from_star: FxHashMap<ImportFromData<'a>, ImportFromStatement<'a>>,
 }
 
 type AliasDataWithComments<'a> = (AliasData<'a>, CommentSet<'a>);
@@ -88,13 +89,13 @@ type ImportFrom<'a> = (
     Vec<AliasDataWithComments<'a>>,
 );
 
-pub enum EitherImport<'a> {
+pub(crate) enum EitherImport<'a> {
     Import(Import<'a>),
     ImportFrom(ImportFrom<'a>),
 }
 
 #[derive(Debug, Default)]
-pub struct OrderedImportBlock<'a> {
-    pub import: Vec<Import<'a>>,
-    pub import_from: Vec<ImportFrom<'a>>,
+pub(crate) struct OrderedImportBlock<'a> {
+    pub(crate) import: Vec<Import<'a>>,
+    pub(crate) import_from: Vec<ImportFrom<'a>>,
 }
diff --git a/crates/ruff/src/rules/mccabe/mod.rs b/crates/ruff/src/rules/mccabe/mod.rs
index ad21d2e16c5fd..697859e26a52b 100644
--- a/crates/ruff/src/rules/mccabe/mod.rs
+++ b/crates/ruff/src/rules/mccabe/mod.rs
@@ -6,11 +6,10 @@ pub mod settings;
 mod tests {
     use std::path::Path;
 
-    use crate::assert_messages;
     use anyhow::Result;
-
     use test_case::test_case;
 
+    use crate::assert_messages;
     use crate::registry::Rule;
     use crate::settings::Settings;
     use crate::test::test_path;
diff --git a/crates/ruff/src/rules/mccabe/rules.rs b/crates/ruff/src/rules/mccabe/rules/function_is_too_complex.rs
similarity index 79%
rename from crates/ruff/src/rules/mccabe/rules.rs
rename to crates/ruff/src/rules/mccabe/rules/function_is_too_complex.rs
index db0e8a3f03415..0311470ac7a03 100644
--- a/crates/ruff/src/rules/mccabe/rules.rs
+++ b/crates/ruff/src/rules/mccabe/rules/function_is_too_complex.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{ExcepthandlerKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Excepthandler, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -48,9 +48,9 @@ use ruff_python_ast::source_code::Locator;
 /// ```
 #[violation]
 pub struct ComplexStructure {
-    pub name: String,
-    pub complexity: usize,
-    pub max_complexity: usize,
+    name: String,
+    complexity: usize,
+    max_complexity: usize,
 }
 
 impl Violation for ComplexStructure {
@@ -68,43 +68,47 @@ impl Violation for ComplexStructure {
 fn get_complexity_number(stmts: &[Stmt]) -> usize {
     let mut complexity = 0;
     for stmt in stmts {
-        match &stmt.node {
-            StmtKind::If { body, orelse, .. } => {
+        match stmt {
+            Stmt::If(ast::StmtIf { body, orelse, .. }) => {
                 complexity += 1;
                 complexity += get_complexity_number(body);
                 complexity += get_complexity_number(orelse);
             }
-            StmtKind::For { body, orelse, .. } | StmtKind::AsyncFor { body, orelse, .. } => {
+            Stmt::For(ast::StmtFor { body, orelse, .. })
+            | Stmt::AsyncFor(ast::StmtAsyncFor { body, orelse, .. }) => {
                 complexity += 1;
                 complexity += get_complexity_number(body);
                 complexity += get_complexity_number(orelse);
             }
-            StmtKind::With { body, .. } | StmtKind::AsyncWith { body, .. } => {
+            Stmt::With(ast::StmtWith { body, .. })
+            | Stmt::AsyncWith(ast::StmtAsyncWith { body, .. }) => {
                 complexity += get_complexity_number(body);
             }
-            StmtKind::While { body, orelse, .. } => {
+            Stmt::While(ast::StmtWhile { body, orelse, .. }) => {
                 complexity += 1;
                 complexity += get_complexity_number(body);
                 complexity += get_complexity_number(orelse);
             }
-            StmtKind::Match { cases, .. } => {
+            Stmt::Match(ast::StmtMatch { cases, .. }) => {
                 complexity += 1;
                 for case in cases {
                     complexity += get_complexity_number(&case.body);
                 }
             }
-            StmtKind::Try {
+            Stmt::Try(ast::StmtTry {
                 body,
                 handlers,
                 orelse,
                 finalbody,
-            }
-            | StmtKind::TryStar {
+                range: _,
+            })
+            | Stmt::TryStar(ast::StmtTryStar {
                 body,
                 handlers,
                 orelse,
                 finalbody,
-            } => {
+                range: _,
+            }) => {
                 complexity += get_complexity_number(body);
                 if !orelse.is_empty() {
                     complexity += 1;
@@ -113,15 +117,18 @@ fn get_complexity_number(stmts: &[Stmt]) -> usize {
                 complexity += get_complexity_number(finalbody);
                 for handler in handlers {
                     complexity += 1;
-                    let ExcepthandlerKind::ExceptHandler { body, .. } = &handler.node;
+                    let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler {
+                        body, ..
+                    }) = handler;
                     complexity += get_complexity_number(body);
                 }
             }
-            StmtKind::FunctionDef { body, .. } | StmtKind::AsyncFunctionDef { body, .. } => {
+            Stmt::FunctionDef(ast::StmtFunctionDef { body, .. })
+            | Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef { body, .. }) => {
                 complexity += 1;
                 complexity += get_complexity_number(body);
             }
-            StmtKind::ClassDef { body, .. } => {
+            Stmt::ClassDef(ast::StmtClassDef { body, .. }) => {
                 complexity += get_complexity_number(body);
             }
             _ => {}
@@ -130,7 +137,7 @@ fn get_complexity_number(stmts: &[Stmt]) -> usize {
     complexity
 }
 
-pub fn function_is_too_complex(
+pub(crate) fn function_is_too_complex(
     stmt: &Stmt,
     name: &str,
     body: &[Stmt],
@@ -155,7 +162,8 @@ pub fn function_is_too_complex(
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use rustpython_parser as parser;
+    use rustpython_parser::ast::Suite;
+    use rustpython_parser::Parse;
 
     use super::get_complexity_number;
 
@@ -165,7 +173,7 @@ mod tests {
 def trivial():
     pass
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(get_complexity_number(&stmts), 1);
         Ok(())
     }
@@ -176,7 +184,7 @@ def trivial():
 def expr_as_statement():
     0xF00D
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(get_complexity_number(&stmts), 1);
         Ok(())
     }
@@ -189,7 +197,7 @@ def sequential(n):
     s = k + n
     return s
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(get_complexity_number(&stmts), 1);
         Ok(())
     }
@@ -205,7 +213,7 @@ def if_elif_else_dead_path(n):
     else:
         return "smaller than or equal to three"
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(get_complexity_number(&stmts), 3);
         Ok(())
     }
@@ -222,7 +230,7 @@ def nested_ifs():
     else:
         return "smaller than or equal to three"
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(get_complexity_number(&stmts), 3);
         Ok(())
     }
@@ -234,7 +242,7 @@ def for_loop():
     for i in range(10):
         print(i)
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(get_complexity_number(&stmts), 2);
         Ok(())
     }
@@ -248,7 +256,7 @@ def for_else(mylist):
     else:
         print(None)
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(get_complexity_number(&stmts), 2);
         Ok(())
     }
@@ -262,7 +270,7 @@ def recursive(n):
     else:
         return n
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(get_complexity_number(&stmts), 2);
         Ok(())
     }
@@ -279,7 +287,7 @@ def nested_functions():
 
     a()
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(get_complexity_number(&stmts), 3);
         Ok(())
     }
@@ -297,7 +305,7 @@ def try_else():
     else:
         print(4)
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(get_complexity_number(&stmts), 4);
         Ok(())
     }
@@ -314,7 +322,7 @@ def nested_try_finally():
     finally:
         print(3)
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(get_complexity_number(&stmts), 1);
         Ok(())
     }
@@ -331,7 +339,7 @@ async def foobar(a, b, c):
     async for x in a:
         pass
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(get_complexity_number(&stmts), 3);
         Ok(())
     }
@@ -342,7 +350,7 @@ async def foobar(a, b, c):
 def annotated_assign():
     x: Any = None
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(get_complexity_number(&stmts), 1);
         Ok(())
     }
@@ -378,7 +386,7 @@ class Class:
 
         return ServiceProvider(Logger())
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(get_complexity_number(&stmts), 9);
         Ok(())
     }
@@ -392,7 +400,7 @@ def process_detect_lines():
     finally:
         pass
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(get_complexity_number(&stmts), 1);
         Ok(())
     }
@@ -407,7 +415,7 @@ def process_detect_lines():
         if res:
             errors.append(f"Non-zero exit code {res}")
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(get_complexity_number(&stmts), 2);
         Ok(())
     }
@@ -420,7 +428,7 @@ def with_lock():
         if foo:
             print('bar')
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(get_complexity_number(&stmts), 2);
         Ok(())
     }
diff --git a/crates/ruff/src/rules/mccabe/rules/mod.rs b/crates/ruff/src/rules/mccabe/rules/mod.rs
new file mode 100644
index 0000000000000..b6898b7da22a8
--- /dev/null
+++ b/crates/ruff/src/rules/mccabe/rules/mod.rs
@@ -0,0 +1,3 @@
+pub(crate) use function_is_too_complex::{function_is_too_complex, ComplexStructure};
+
+mod function_is_too_complex;
diff --git a/crates/ruff/src/rules/mccabe/settings.rs b/crates/ruff/src/rules/mccabe/settings.rs
index a35dc26be74a4..eb8daa8dccc56 100644
--- a/crates/ruff/src/rules/mccabe/settings.rs
+++ b/crates/ruff/src/rules/mccabe/settings.rs
@@ -1,18 +1,18 @@
 //! Settings for the `mccabe` plugin.
 
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::{CacheKey, ConfigurationOptions};
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
 
 #[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, CombineOptions,
 )]
 #[serde(
     deny_unknown_fields,
     rename_all = "kebab-case",
     rename = "McCabeOptions"
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = "10",
diff --git a/crates/ruff/src/rules/mod.rs b/crates/ruff/src/rules/mod.rs
index 418693c883687..172631145cce7 100644
--- a/crates/ruff/src/rules/mod.rs
+++ b/crates/ruff/src/rules/mod.rs
@@ -1,7 +1,9 @@
 #![allow(clippy::useless_format)]
+pub mod airflow;
 pub mod eradicate;
 pub mod flake8_2020;
 pub mod flake8_annotations;
+pub mod flake8_async;
 pub mod flake8_bandit;
 pub mod flake8_blind_except;
 pub mod flake8_boolean_trap;
@@ -14,6 +16,8 @@ pub mod flake8_debugger;
 pub mod flake8_django;
 pub mod flake8_errmsg;
 pub mod flake8_executable;
+pub mod flake8_fixme;
+pub mod flake8_future_annotations;
 pub mod flake8_gettext;
 pub mod flake8_implicit_str_concat;
 pub mod flake8_import_conventions;
@@ -29,9 +33,11 @@ pub mod flake8_return;
 pub mod flake8_self;
 pub mod flake8_simplify;
 pub mod flake8_tidy_imports;
+pub mod flake8_todos;
 pub mod flake8_type_checking;
 pub mod flake8_unused_arguments;
 pub mod flake8_use_pathlib;
+pub mod flynt;
 pub mod isort;
 pub mod mccabe;
 pub mod numpy;
diff --git a/crates/ruff/src/rules/numpy/mod.rs b/crates/ruff/src/rules/numpy/mod.rs
index 865b116cd9d95..37ddc17ffb7f2 100644
--- a/crates/ruff/src/rules/numpy/mod.rs
+++ b/crates/ruff/src/rules/numpy/mod.rs
@@ -7,15 +7,14 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::NumpyDeprecatedTypeAlias, Path::new("NPY001.py"); "NPY001")]
-    #[test_case(Rule::NumpyLegacyRandom, Path::new("NPY002.py"); "NPY002")]
+    #[test_case(Rule::NumpyDeprecatedTypeAlias, Path::new("NPY001.py"))]
+    #[test_case(Rule::NumpyLegacyRandom, Path::new("NPY002.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.as_ref(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/numpy/rules/deprecated_type_alias.rs b/crates/ruff/src/rules/numpy/rules/deprecated_type_alias.rs
index b4b59df98a06d..834400e5eb79f 100644
--- a/crates/ruff/src/rules/numpy/rules/deprecated_type_alias.rs
+++ b/crates/ruff/src/rules/numpy/rules/deprecated_type_alias.rs
@@ -1,6 +1,6 @@
-use rustpython_parser::ast::Expr;
+use rustpython_parser::ast::{Expr, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
@@ -30,7 +30,7 @@ use crate::registry::AsRule;
 /// ```
 #[violation]
 pub struct NumpyDeprecatedTypeAlias {
-    pub type_name: String,
+    type_name: String,
 }
 
 impl AlwaysAutofixableViolation for NumpyDeprecatedTypeAlias {
@@ -47,22 +47,27 @@ impl AlwaysAutofixableViolation for NumpyDeprecatedTypeAlias {
 }
 
 /// NPY001
-pub fn deprecated_type_alias(checker: &mut Checker, expr: &Expr) {
-    if let Some(type_name) = checker.ctx.resolve_call_path(expr).and_then(|call_path| {
-        if call_path.as_slice() == ["numpy", "bool"]
-            || call_path.as_slice() == ["numpy", "int"]
-            || call_path.as_slice() == ["numpy", "float"]
-            || call_path.as_slice() == ["numpy", "complex"]
-            || call_path.as_slice() == ["numpy", "object"]
-            || call_path.as_slice() == ["numpy", "str"]
-            || call_path.as_slice() == ["numpy", "long"]
-            || call_path.as_slice() == ["numpy", "unicode"]
-        {
-            Some(call_path[1])
-        } else {
-            None
-        }
-    }) {
+pub(crate) fn deprecated_type_alias(checker: &mut Checker, expr: &Expr) {
+    if let Some(type_name) =
+        checker
+            .semantic_model()
+            .resolve_call_path(expr)
+            .and_then(|call_path| {
+                if call_path.as_slice() == ["numpy", "bool"]
+                    || call_path.as_slice() == ["numpy", "int"]
+                    || call_path.as_slice() == ["numpy", "float"]
+                    || call_path.as_slice() == ["numpy", "complex"]
+                    || call_path.as_slice() == ["numpy", "object"]
+                    || call_path.as_slice() == ["numpy", "str"]
+                    || call_path.as_slice() == ["numpy", "long"]
+                    || call_path.as_slice() == ["numpy", "unicode"]
+                {
+                    Some(call_path[1])
+                } else {
+                    None
+                }
+            })
+    {
         let mut diagnostic = Diagnostic::new(
             NumpyDeprecatedTypeAlias {
                 type_name: type_name.to_string(),
@@ -70,7 +75,8 @@ pub fn deprecated_type_alias(checker: &mut Checker, expr: &Expr) {
             expr.range(),
         );
         if checker.patch(diagnostic.kind.rule()) {
-            diagnostic.set_fix(Edit::range_replacement(
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
                 match type_name {
                     "unicode" => "str",
                     "long" => "int",
@@ -78,7 +84,7 @@ pub fn deprecated_type_alias(checker: &mut Checker, expr: &Expr) {
                 }
                 .to_string(),
                 expr.range(),
-            ));
+            )));
         }
         checker.diagnostics.push(diagnostic);
     }
diff --git a/crates/ruff/src/rules/numpy/rules/mod.rs b/crates/ruff/src/rules/numpy/rules/mod.rs
index 2b1a2eea9a45b..c82e79bc1c9f2 100644
--- a/crates/ruff/src/rules/numpy/rules/mod.rs
+++ b/crates/ruff/src/rules/numpy/rules/mod.rs
@@ -1,5 +1,5 @@
-pub use deprecated_type_alias::{deprecated_type_alias, NumpyDeprecatedTypeAlias};
-pub use numpy_legacy_random::{numpy_legacy_random, NumpyLegacyRandom};
+pub(crate) use deprecated_type_alias::{deprecated_type_alias, NumpyDeprecatedTypeAlias};
+pub(crate) use numpy_legacy_random::{numpy_legacy_random, NumpyLegacyRandom};
 
 mod deprecated_type_alias;
 mod numpy_legacy_random;
diff --git a/crates/ruff/src/rules/numpy/rules/numpy_legacy_random.rs b/crates/ruff/src/rules/numpy/rules/numpy_legacy_random.rs
index f08405aea83a3..0e52c3917625a 100644
--- a/crates/ruff/src/rules/numpy/rules/numpy_legacy_random.rs
+++ b/crates/ruff/src/rules/numpy/rules/numpy_legacy_random.rs
@@ -1,9 +1,10 @@
-use rustpython_parser::ast::Expr;
+use rustpython_parser::ast::{Expr, Ranged};
 
-use crate::checkers::ast::Checker;
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
+use crate::checkers::ast::Checker;
+
 /// ## What it does
 /// Checks for the use of legacy `np.random` function calls.
 ///
@@ -44,7 +45,7 @@ use ruff_macros::{derive_message_formats, violation};
 /// [NEP 19]: https://numpy.org/neps/nep-0019-rng-policy.html
 #[violation]
 pub struct NumpyLegacyRandom {
-    pub method_name: String,
+    method_name: String,
 }
 
 impl Violation for NumpyLegacyRandom {
@@ -56,10 +57,14 @@ impl Violation for NumpyLegacyRandom {
 }
 
 /// NPY002
-pub fn numpy_legacy_random(checker: &mut Checker, expr: &Expr) {
-    if let Some(method_name) = checker.ctx.resolve_call_path(expr).and_then(|call_path| {
-        // seeding state
-        if call_path.as_slice() == ["numpy", "random", "seed"]
+pub(crate) fn numpy_legacy_random(checker: &mut Checker, expr: &Expr) {
+    if let Some(method_name) =
+        checker
+            .semantic_model()
+            .resolve_call_path(expr)
+            .and_then(|call_path| {
+                // seeding state
+                if call_path.as_slice() == ["numpy", "random", "seed"]
             || call_path.as_slice() == ["numpy", "random", "get_state"]
             || call_path.as_slice() == ["numpy", "random", "set_state"]
             // simple random data
@@ -110,12 +115,13 @@ pub fn numpy_legacy_random(checker: &mut Checker, expr: &Expr) {
             || call_path.as_slice() == ["numpy", "random", "wald"]
             || call_path.as_slice() == ["numpy", "random", "weibull"]
             || call_path.as_slice() == ["numpy", "random", "zipf"]
-        {
-            Some(call_path[2])
-        } else {
-            None
-        }
-    }) {
+                {
+                    Some(call_path[2])
+                } else {
+                    None
+                }
+            })
+    {
         checker.diagnostics.push(Diagnostic::new(
             NumpyLegacyRandom {
                 method_name: method_name.to_string(),
diff --git a/crates/ruff/src/rules/pandas_vet/fixes.rs b/crates/ruff/src/rules/pandas_vet/fixes.rs
index 360d9ef7a6c51..23ac1a5c3ea91 100644
--- a/crates/ruff/src/rules/pandas_vet/fixes.rs
+++ b/crates/ruff/src/rules/pandas_vet/fixes.rs
@@ -1,15 +1,15 @@
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::{Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Edit, Fix};
 use ruff_python_ast::source_code::Locator;
 
-use crate::autofix::actions::remove_argument;
+use crate::autofix::edits::remove_argument;
 
 fn match_name(expr: &Expr) -> Option<&str> {
-    if let ExprKind::Call { func, .. } = &expr.node {
-        if let ExprKind::Attribute { value, .. } = &func.node {
-            if let ExprKind::Name { id, .. } = &value.node {
+    if let Expr::Call(ast::ExprCall { func, .. }) = expr {
+        if let Expr::Attribute(ast::ExprAttribute { value, .. }) = func.as_ref() {
+            if let Expr::Name(ast::ExprName { id, .. }) = value.as_ref() {
                 return Some(id);
             }
         }
@@ -40,6 +40,6 @@ pub(super) fn convert_inplace_argument_to_assignment(
         false,
     )
     .ok()?;
-
-    Some(Fix::from_iter([insert_assignment, remove_argument]))
+    #[allow(deprecated)]
+    Some(Fix::unspecified_edits(insert_assignment, [remove_argument]))
 }
diff --git a/crates/ruff/src/rules/pandas_vet/helpers.rs b/crates/ruff/src/rules/pandas_vet/helpers.rs
index d9e72ce72b647..9622571434607 100644
--- a/crates/ruff/src/rules/pandas_vet/helpers.rs
+++ b/crates/ruff/src/rules/pandas_vet/helpers.rs
@@ -1,18 +1,52 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast;
+use rustpython_parser::ast::Expr;
 
-/// Return `true` if an `Expr` _could_ be a `DataFrame`. This rules out
-/// obviously-wrong cases, like constants and literals.
-pub const fn is_dataframe_candidate(expr: &Expr) -> bool {
-    !matches!(
-        expr.node,
-        ExprKind::Constant { .. }
-            | ExprKind::Tuple { .. }
-            | ExprKind::List { .. }
-            | ExprKind::Set { .. }
-            | ExprKind::Dict { .. }
-            | ExprKind::SetComp { .. }
-            | ExprKind::ListComp { .. }
-            | ExprKind::DictComp { .. }
-            | ExprKind::GeneratorExp { .. }
-    )
+use ruff_python_semantic::binding::{BindingKind, Importation};
+use ruff_python_semantic::model::SemanticModel;
+
+pub(crate) enum Resolution {
+    /// The expression resolves to an irrelevant expression type (e.g., a constant).
+    IrrelevantExpression,
+    /// The expression resolves to an irrelevant binding (e.g., a function definition).
+    IrrelevantBinding,
+    /// The expression resolves to a relevant local binding (e.g., a variable).
+    RelevantLocal,
+    /// The expression resolves to the `pandas` module itself.
+    PandasModule,
+}
+
+/// Test an [`Expr`] for relevance to Pandas-related operations.
+pub(crate) fn test_expression(expr: &Expr, model: &SemanticModel) -> Resolution {
+    match expr {
+        Expr::Constant(_)
+        | Expr::Tuple(_)
+        | Expr::List(_)
+        | Expr::Set(_)
+        | Expr::Dict(_)
+        | Expr::SetComp(_)
+        | Expr::ListComp(_)
+        | Expr::DictComp(_)
+        | Expr::GeneratorExp(_) => Resolution::IrrelevantExpression,
+        Expr::Name(ast::ExprName { id, .. }) => {
+            model
+                .find_binding(id)
+                .map_or(Resolution::IrrelevantBinding, |binding| {
+                    match binding.kind {
+                        BindingKind::Annotation
+                        | BindingKind::Argument
+                        | BindingKind::Assignment
+                        | BindingKind::NamedExprAssignment
+                        | BindingKind::Binding
+                        | BindingKind::LoopVar
+                        | BindingKind::Global
+                        | BindingKind::Nonlocal => Resolution::RelevantLocal,
+                        BindingKind::Importation(Importation {
+                            qualified_name: module,
+                        }) if module == "pandas" => Resolution::PandasModule,
+                        _ => Resolution::IrrelevantBinding,
+                    }
+                })
+        }
+        _ => Resolution::RelevantLocal,
+    }
 }
diff --git a/crates/ruff/src/rules/pandas_vet/mod.rs b/crates/ruff/src/rules/pandas_vet/mod.rs
index f3fc615ada268..d3ac303cbc640 100644
--- a/crates/ruff/src/rules/pandas_vet/mod.rs
+++ b/crates/ruff/src/rules/pandas_vet/mod.rs
@@ -8,255 +8,359 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
-    use rustpython_parser::lexer::LexResult;
     use test_case::test_case;
-    use textwrap::dedent;
-
-    use ruff_python_ast::source_code::{Indexer, Locator, Stylist};
-
-    use crate::linter::{check_path, LinterResult};
-    use crate::registry::{AsRule, Linter, Rule};
-    use crate::settings::flags;
-    use crate::test::test_path;
-    use crate::{assert_messages, directives, settings};
 
-    fn rule_code(contents: &str, expected: &[Rule]) {
-        let contents = dedent(contents);
-        let settings = settings::Settings::for_rules(&Linter::PandasVet);
-        let tokens: Vec<LexResult> = ruff_rustpython::tokenize(&contents);
-        let locator = Locator::new(&contents);
-        let stylist = Stylist::from_tokens(&tokens, &locator);
-        let indexer = Indexer::from_tokens(&tokens, &locator);
-        let directives = directives::extract_directives(
-            &tokens,
-            directives::Flags::from_settings(&settings),
-            &locator,
-            &indexer,
-        );
-        let LinterResult {
-            data: (diagnostics, _imports),
-            ..
-        } = check_path(
-            Path::new("<filename>"),
-            None,
-            tokens,
-            &locator,
-            &stylist,
-            &indexer,
-            &directives,
-            &settings,
-            flags::Noqa::Enabled,
-            flags::Autofix::Enabled,
-        );
-        let actual: Vec<Rule> = diagnostics
-            .into_iter()
-            .map(|diagnostic| diagnostic.kind.rule())
-            .collect();
-        assert_eq!(actual, expected);
-    }
+    use crate::registry::{Linter, Rule};
+    use crate::test::{test_path, test_snippet};
+    use crate::{assert_messages, settings};
 
-    #[test_case(r#"
+    #[test_case(
+        r#"
         import pandas as pd
         x = pd.DataFrame()
-        x.drop(['a'], axis=1, inplace=False)
-    "#, &[]; "PD002_pass")]
-    #[test_case(r#"
+        x.drop(["a"], axis=1, inplace=False)
+    "#,
+        "PD002_pass"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         x = pd.DataFrame()
-        x.drop(['a'], axis=1, inplace=True)
-    "#, &[Rule::PandasUseOfInplaceArgument]; "PD002_fail")]
-    #[test_case(r#"
+        x.drop(["a"], axis=1, inplace=True)
+    "#,
+        "PD002_fail"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         nas = pd.isna(val)
-    "#, &[]; "PD003_pass")]
-    #[test_case(r#"
+    "#,
+        "PD003_pass"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         nulls = pd.isnull(val)
-    "#, &[Rule::PandasUseOfDotIsNull]; "PD003_fail")]
-    #[test_case(r#"
+    "#,
+        "PD003_fail"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
-        print('bah humbug')
-    "#, &[]; "PD003_allows_other_calls")]
-    #[test_case(r#"
+        print("bah humbug")
+    "#,
+        "PD003_allows_other_calls"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         not_nas = pd.notna(val)
-    "#, &[]; "PD004_pass")]
-    #[test_case(r#"
+    "#,
+        "PD004_pass"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         not_nulls = pd.notnull(val)
-    "#, &[Rule::PandasUseOfDotNotNull]; "PD004_fail")]
-    #[test_case(r#"
+    "#,
+        "PD004_fail"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         x = pd.DataFrame()
-        new_x = x.loc['d':, 'A':'C']
-    "#, &[]; "PD007_pass_loc")]
-    #[test_case(r#"
+        new_x = x.loc["d":, "A":"C"]
+    "#,
+        "PD007_pass_loc"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         x = pd.DataFrame()
         new_x = x.iloc[[1, 3, 5], [1, 3]]
-    "#, &[]; "PD007_pass_iloc")]
-    #[test_case(r#"
+    "#,
+        "PD007_pass_iloc"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         x = pd.DataFrame()
-        y = x.ix[[0, 2], 'A']
-    "#, &[Rule::PandasUseOfDotIx]; "PD007_fail")]
-    #[test_case(r#"
+        y = x.ix[[0, 2], "A"]
+    "#,
+        "PD007_fail"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         x = pd.DataFrame()
-        index = x.loc[:, ['B', 'A']]
-    "#, &[]; "PD008_pass")]
-    #[test_case(r#"
+        index = x.loc[:, ["B", "A"]]
+    "#,
+        "PD008_pass"
+    )]
+    #[test_case(
+        r#"
+        import io
+        import zipfile
+
+
+        class MockBinaryFile(io.BytesIO):
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+
+            def close(self):
+                pass  # Don"t allow closing the file, it would clear the buffer
+
+
+        zip_buffer = MockBinaryFile()
+
+        with zipfile.ZipFile(zip_buffer, "w") as zf:
+            zf.writestr("dir/file.txt", "This is a test")
+
+        # Reset the BytesIO object"s cursor to the start.
+        zip_buffer.seek(0)
+
+        with zipfile.ZipFile(zip_buffer, "r") as zf:
+            zpath = zipfile.Path(zf, "/")
+
+        dir_name, file_name = zpath.at.split("/")
+    "#,
+        "PD008_pass_on_attr"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         x = pd.DataFrame()
-        index = x.at[:, ['B', 'A']]
-    "#, &[Rule::PandasUseOfDotAt]; "PD008_fail")]
-    #[test_case(r#"
+        index = x.at[:, ["B", "A"]]
+    "#,
+        "PD008_fail"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         x = pd.DataFrame()
         index = x.iloc[:, 1:3]
-    "#, &[]; "PD009_pass")]
-    #[test_case(r#"
+    "#,
+        "PD009_pass"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         x = pd.DataFrame()
         index = x.iat[:, 1:3]
-    "#, &[Rule::PandasUseOfDotIat]; "PD009_fail")]
-    #[test_case(r#"
+    "#,
+        "PD009_fail"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         x = pd.DataFrame()
         table = x.pivot_table(
             x,
-            values='D',
-            index=['A', 'B'],
-            columns=['C'],
+            values="D",
+            index=["A", "B"],
+            columns=["C"],
             aggfunc=np.sum,
             fill_value=0
         )
-    "#, &[]; "PD010_pass")]
-    #[test_case(r#"
+    "#,
+        "PD010_pass"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         x = pd.DataFrame()
         table = pd.pivot(
             x,
-            index='foo',
-            columns='bar',
-            values='baz'
+            index="foo",
+            columns="bar",
+            values="baz"
         )
-    "#, &[Rule::PandasUseOfDotPivotOrUnstack]; "PD010_fail_pivot")]
-    #[test_case(r#"
+    "#,
+        "PD010_fail_pivot"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         x = pd.DataFrame()
         result = x.to_array()
-    "#, &[]; "PD011_pass_to_array")]
-    #[test_case(r#"
+    "#,
+        "PD011_pass_to_array"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         x = pd.DataFrame()
         result = x.array
-    "#, &[]; "PD011_pass_array")]
-    #[test_case(r#"
+    "#,
+        "PD011_pass_array"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         x = pd.DataFrame()
         result = x.values
-    "#, &[Rule::PandasUseOfDotValues]; "PD011_fail_values")]
-    #[test_case(r#"
+    "#,
+        "PD011_fail_values"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         x = pd.DataFrame()
         result = x.values()
-    "#, &[]; "PD011_pass_values_call")]
-    #[test_case(r#"
+    "#,
+        "PD011_pass_values_call"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         result = {}.values
-    "#, &[]; "PD011_pass_values_dict")]
-    #[test_case(r#"
+    "#,
+        "PD011_pass_values_dict"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         result = pd.values
-    "#, &[]; "PD011_pass_values_import")]
-    #[test_case(r#"
+    "#,
+        "PD011_pass_values_import"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         result = x.values
-    "#, &[]; "PD011_pass_values_unbound")]
-    #[test_case(r#"
+    "#,
+        "PD011_pass_values_unbound"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         result = values
-    "#, &[]; "PD011_pass_node_name")]
-    #[test_case(r#"
+    "#,
+        "PD011_pass_node_name"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         employees = pd.read_csv(input_file)
-    "#, &[]; "PD012_pass_read_csv")]
-    #[test_case(r#"
+    "#,
+        "PD012_pass_read_csv"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         employees = pd.read_table(input_file)
-    "#, &[Rule::PandasUseOfDotReadTable]; "PD012_fail_read_table")]
-    #[test_case(r#"
+    "#,
+        "PD012_fail_read_table"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         employees = read_table
-    "#, &[]; "PD012_node_Name_pass")]
-    #[test_case(r#"
+    "#,
+        "PD012_node_Name_pass"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         x = pd.DataFrame()
         y = x.melt(
-            id_vars='airline',
-            value_vars=['ATL', 'DEN', 'DFW'],
-            value_name='airline delay'
+            id_vars="airline",
+            value_vars=["ATL", "DEN", "DFW"],
+            value_name="airline delay"
         )
-    "#, &[]; "PD013_pass")]
-    #[test_case(r#"
+    "#,
+        "PD013_pass"
+    )]
+    #[test_case(
+        r#"
         import numpy as np
         arrays = [np.random.randn(3, 4) for _ in range(10)]
         np.stack(arrays, axis=0).shape
-    "#, &[]; "PD013_pass_numpy")]
-    #[test_case(r#"
+    "#,
+        "PD013_pass_numpy"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         y = x.stack(level=-1, dropna=True)
-    "#, &[]; "PD013_pass_unbound")]
-    #[test_case(r#"
+    "#,
+        "PD013_pass_unbound"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         x = pd.DataFrame()
         y = x.stack(level=-1, dropna=True)
-    "#, &[Rule::PandasUseOfDotStack]; "PD013_fail_stack")]
-    #[test_case(r#"
+    "#,
+        "PD013_fail_stack"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         pd.stack(
-    "#, &[]; "PD015_pass_merge_on_dataframe")]
-    #[test_case(r#"
+    "#,
+        "PD015_pass_merge_on_dataframe"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         x = pd.DataFrame()
         y = pd.DataFrame()
-        x.merge(y, 'inner')
-    "#, &[]; "PD015_pass_merge_on_dataframe_with_multiple_args")]
-    #[test_case(r#"
+        x.merge(y, "inner")
+    "#,
+        "PD015_pass_merge_on_dataframe_with_multiple_args"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         x = pd.DataFrame()
         y = pd.DataFrame()
         pd.merge(x, y)
-    "#, &[Rule::PandasUseOfPdMerge]; "PD015_fail_merge_on_pandas_object")]
+    "#,
+        "PD015_fail_merge_on_pandas_object"
+    )]
     #[test_case(
-        "pd.to_datetime(timestamp * 10 ** 9).strftime('%Y-%m-%d %H:%M:%S.%f')",
-        &[];
+        r#"
+        pd.to_datetime(timestamp * 10 ** 9).strftime("%Y-%m-%d %H:%M:%S.%f")
+    "#,
         "PD015_pass_other_pd_function"
     )]
-    #[test_case(r#"
+    #[test_case(
+        r#"
         import pandas as pd
         employees = pd.DataFrame(employee_dict)
-    "#, &[]; "PD901_pass_non_df")]
-    #[test_case(r#"
+    "#,
+        "PD901_pass_non_df"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         employees_df = pd.DataFrame(employee_dict)
-    "#, &[]; "PD901_pass_part_df")]
-    #[test_case(r#"
+    "#,
+        "PD901_pass_part_df"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         my_function(df=data)
-    "#, &[]; "PD901_pass_df_param")]
-    #[test_case(r#"
+    "#,
+        "PD901_pass_df_param"
+    )]
+    #[test_case(
+        r#"
         import pandas as pd
         df = pd.DataFrame()
-    "#, &[Rule::PandasDfVariableName]; "PD901_fail_df_var")]
-    fn test_pandas_vet(code: &str, expected: &[Rule]) {
-        rule_code(code, expected);
+    "#,
+        "PD901_fail_df_var"
+    )]
+    fn contents(contents: &str, snapshot: &str) {
+        let diagnostics =
+            test_snippet(contents, &settings::Settings::for_rules(&Linter::PandasVet));
+        assert_messages!(snapshot, diagnostics);
     }
 
-    #[test_case(Rule::PandasUseOfInplaceArgument, Path::new("PD002.py"); "PD002")]
-    fn rules(rule_code: Rule, path: &Path) -> Result<()> {
+    #[test_case(Rule::PandasUseOfInplaceArgument, Path::new("PD002.py"))]
+    fn paths(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
             Path::new("pandas_vet").join(path).as_path(),
diff --git a/crates/ruff/src/rules/pandas_vet/rules/assignment_to_df.rs b/crates/ruff/src/rules/pandas_vet/rules/assignment_to_df.rs
index 3aca25eb52d07..6473d4a7a9616 100644
--- a/crates/ruff/src/rules/pandas_vet/rules/assignment_to_df.rs
+++ b/crates/ruff/src/rules/pandas_vet/rules/assignment_to_df.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -14,12 +14,12 @@ impl Violation for PandasDfVariableName {
 }
 
 /// PD901
-pub fn assignment_to_df(targets: &[Expr]) -> Option<Diagnostic> {
+pub(crate) fn assignment_to_df(targets: &[Expr]) -> Option<Diagnostic> {
     if targets.len() != 1 {
         return None;
     }
     let target = &targets[0];
-    let ExprKind::Name { id, .. } = &target.node else {
+    let Expr::Name(ast::ExprName { id, .. }) = target else {
         return None;
     };
     if id != "df" {
diff --git a/crates/ruff/src/rules/pandas_vet/rules/attr.rs b/crates/ruff/src/rules/pandas_vet/rules/attr.rs
new file mode 100644
index 0000000000000..ccdb5616b159c
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/rules/attr.rs
@@ -0,0 +1,47 @@
+use rustpython_parser::ast::{Expr, Ranged};
+
+use ruff_diagnostics::Violation;
+use ruff_diagnostics::{Diagnostic, DiagnosticKind};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+use crate::registry::Rule;
+use crate::rules::pandas_vet::helpers::{test_expression, Resolution};
+
+#[violation]
+pub struct PandasUseOfDotValues;
+
+impl Violation for PandasUseOfDotValues {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Use `.to_numpy()` instead of `.values`")
+    }
+}
+
+pub(crate) fn attr(checker: &mut Checker, attr: &str, value: &Expr, attr_expr: &Expr) {
+    let rules = &checker.settings.rules;
+    let violation: DiagnosticKind = match attr {
+        "values" if rules.enabled(Rule::PandasUseOfDotValues) => PandasUseOfDotValues.into(),
+        _ => return,
+    };
+
+    // Avoid flagging on function calls (e.g., `df.values()`).
+    if let Some(parent) = checker.semantic_model().expr_parent() {
+        if matches!(parent, Expr::Call(_)) {
+            return;
+        }
+    }
+
+    // Avoid flagging on non-DataFrames (e.g., `{"a": 1}.values`), and on irrelevant bindings
+    // (like imports).
+    if !matches!(
+        test_expression(value, checker.semantic_model()),
+        Resolution::RelevantLocal
+    ) {
+        return;
+    }
+
+    checker
+        .diagnostics
+        .push(Diagnostic::new(violation, attr_expr.range()));
+}
diff --git a/crates/ruff/src/rules/pandas_vet/rules/check_call.rs b/crates/ruff/src/rules/pandas_vet/rules/call.rs
similarity index 62%
rename from crates/ruff/src/rules/pandas_vet/rules/check_call.rs
rename to crates/ruff/src/rules/pandas_vet/rules/call.rs
index 494e33909e0b1..ecea41b6f87f5 100644
--- a/crates/ruff/src/rules/pandas_vet/rules/check_call.rs
+++ b/crates/ruff/src/rules/pandas_vet/rules/call.rs
@@ -1,13 +1,12 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
 use ruff_diagnostics::Violation;
 use ruff_diagnostics::{Diagnostic, DiagnosticKind};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_semantic::binding::{BindingKind, Importation};
 
 use crate::checkers::ast::Checker;
 use crate::registry::Rule;
-use crate::rules::pandas_vet::helpers::is_dataframe_candidate;
+use crate::rules::pandas_vet::helpers::{test_expression, Resolution};
 
 #[violation]
 pub struct PandasUseOfDotIsNull;
@@ -61,9 +60,11 @@ impl Violation for PandasUseOfDotStack {
     }
 }
 
-pub fn check_call(checker: &mut Checker, func: &Expr) {
+pub(crate) fn call(checker: &mut Checker, func: &Expr) {
     let rules = &checker.settings.rules;
-    let ExprKind::Attribute { value, attr, .. } = &func.node else {return};
+    let Expr::Attribute(ast::ExprAttribute { value, attr, .. } )= func else {
+        return;
+    };
     let violation: DiagnosticKind = match attr.as_str() {
         "isnull" if rules.enabled(Rule::PandasUseOfDotIsNull) => PandasUseOfDotIsNull.into(),
         "notnull" if rules.enabled(Rule::PandasUseOfDotNotNull) => PandasUseOfDotNotNull.into(),
@@ -77,37 +78,14 @@ pub fn check_call(checker: &mut Checker, func: &Expr) {
         _ => return,
     };
 
-    if !is_dataframe_candidate(value) {
+    // Ignore irrelevant bindings (like imports).
+    if !matches!(
+        test_expression(value, checker.semantic_model()),
+        Resolution::RelevantLocal | Resolution::PandasModule
+    ) {
         return;
     }
 
-    // If the target is a named variable, avoid triggering on
-    // irrelevant bindings (like non-Pandas imports).
-    if let ExprKind::Name { id, .. } = &value.node {
-        if checker.ctx.find_binding(id).map_or(true, |binding| {
-            if let BindingKind::Importation(Importation {
-                full_name: module, ..
-            }) = &binding.kind
-            {
-                module != &"pandas"
-            } else {
-                matches!(
-                    binding.kind,
-                    BindingKind::Builtin
-                        | BindingKind::ClassDefinition
-                        | BindingKind::FunctionDefinition
-                        | BindingKind::Export(..)
-                        | BindingKind::FutureImportation
-                        | BindingKind::Importation(..)
-                        | BindingKind::FromImportation(..)
-                        | BindingKind::SubmoduleImportation(..)
-                )
-            }
-        }) {
-            return;
-        }
-    }
-
     checker
         .diagnostics
         .push(Diagnostic::new(violation, func.range()));
diff --git a/crates/ruff/src/rules/pandas_vet/rules/check_attr.rs b/crates/ruff/src/rules/pandas_vet/rules/check_attr.rs
deleted file mode 100644
index 0f4f11e47b566..0000000000000
--- a/crates/ruff/src/rules/pandas_vet/rules/check_attr.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use rustpython_parser::ast::{Expr, ExprKind};
-
-use ruff_diagnostics::Violation;
-use ruff_diagnostics::{Diagnostic, DiagnosticKind};
-use ruff_macros::{derive_message_formats, violation};
-use ruff_python_semantic::binding::BindingKind;
-
-use crate::checkers::ast::Checker;
-use crate::registry::Rule;
-use crate::rules::pandas_vet::helpers::is_dataframe_candidate;
-
-#[violation]
-pub struct PandasUseOfDotIx;
-
-impl Violation for PandasUseOfDotIx {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("`.ix` is deprecated; use more explicit `.loc` or `.iloc`")
-    }
-}
-
-#[violation]
-pub struct PandasUseOfDotAt;
-
-impl Violation for PandasUseOfDotAt {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("Use `.loc` instead of `.at`.  If speed is important, use numpy.")
-    }
-}
-
-#[violation]
-pub struct PandasUseOfDotIat;
-
-impl Violation for PandasUseOfDotIat {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("Use `.iloc` instead of `.iat`.  If speed is important, use numpy.")
-    }
-}
-
-#[violation]
-pub struct PandasUseOfDotValues;
-
-impl Violation for PandasUseOfDotValues {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("Use `.to_numpy()` instead of `.values`")
-    }
-}
-
-pub fn check_attr(checker: &mut Checker, attr: &str, value: &Expr, attr_expr: &Expr) {
-    let rules = &checker.settings.rules;
-    let violation: DiagnosticKind = match attr {
-        "ix" if rules.enabled(Rule::PandasUseOfDotIx) => PandasUseOfDotIx.into(),
-        "at" if rules.enabled(Rule::PandasUseOfDotAt) => PandasUseOfDotAt.into(),
-        "iat" if rules.enabled(Rule::PandasUseOfDotIat) => PandasUseOfDotIat.into(),
-        "values" if rules.enabled(Rule::PandasUseOfDotValues) => PandasUseOfDotValues.into(),
-        _ => return,
-    };
-
-    // Avoid flagging on function calls (e.g., `df.values()`).
-    if let Some(parent) = checker.ctx.current_expr_parent() {
-        if matches!(parent.node, ExprKind::Call { .. }) {
-            return;
-        }
-    }
-    // Avoid flagging on non-DataFrames (e.g., `{"a": 1}.values`).
-    if !is_dataframe_candidate(value) {
-        return;
-    }
-
-    // If the target is a named variable, avoid triggering on
-    // irrelevant bindings (like imports).
-    if let ExprKind::Name { id, .. } = &value.node {
-        if checker.ctx.find_binding(id).map_or(true, |binding| {
-            matches!(
-                binding.kind,
-                BindingKind::Builtin
-                    | BindingKind::ClassDefinition
-                    | BindingKind::FunctionDefinition
-                    | BindingKind::Export(..)
-                    | BindingKind::FutureImportation
-                    | BindingKind::Importation(..)
-                    | BindingKind::FromImportation(..)
-                    | BindingKind::SubmoduleImportation(..)
-            )
-        }) {
-            return;
-        }
-    }
-
-    checker
-        .diagnostics
-        .push(Diagnostic::new(violation, attr_expr.range()));
-}
diff --git a/crates/ruff/src/rules/pandas_vet/rules/inplace_argument.rs b/crates/ruff/src/rules/pandas_vet/rules/inplace_argument.rs
index bac28367e7902..ebb56710ce2d8 100644
--- a/crates/ruff/src/rules/pandas_vet/rules/inplace_argument.rs
+++ b/crates/ruff/src/rules/pandas_vet/rules/inplace_argument.rs
@@ -1,7 +1,8 @@
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword, StmtKind};
+use rustpython_parser::ast::{self, Constant, Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{AutofixKind, Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
+use ruff_python_semantic::binding::{BindingKind, Importation};
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
@@ -32,9 +33,7 @@ use crate::rules::pandas_vet::fixes::convert_inplace_argument_to_assignment;
 /// ## References
 /// - [_Why You Should Probably Never Use pandas inplace=True_](https://towardsdatascience.com/why-you-should-probably-never-use-pandas-inplace-true-9f9f211849e4)
 #[violation]
-pub struct PandasUseOfInplaceArgument {
-    pub fixable: bool,
-}
+pub struct PandasUseOfInplaceArgument;
 
 impl Violation for PandasUseOfInplaceArgument {
     const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
@@ -44,55 +43,88 @@ impl Violation for PandasUseOfInplaceArgument {
         format!("`inplace=True` should be avoided; it has inconsistent behavior")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable
-            .then_some(|_| format!("Assign to variable; remove `inplace` arg"))
+    fn autofix_title(&self) -> Option<String> {
+        Some("Assign to variable; remove `inplace` arg".to_string())
     }
 }
 
 /// PD002
-pub fn inplace_argument(
+pub(crate) fn inplace_argument(
     checker: &Checker,
     expr: &Expr,
+    func: &Expr,
     args: &[Expr],
     keywords: &[Keyword],
 ) -> Option<Diagnostic> {
     let mut seen_star = false;
+    let mut is_checkable = false;
+    let mut is_pandas = false;
+
+    if let Some(call_path) = checker.semantic_model().resolve_call_path(func) {
+        is_checkable = true;
+
+        let module = call_path[0];
+        is_pandas = checker
+            .semantic_model()
+            .find_binding(module)
+            .map_or(false, |binding| {
+                matches!(
+                    binding.kind,
+                    BindingKind::Importation(Importation {
+                        qualified_name: "pandas"
+                    })
+                )
+            });
+    }
+
     for keyword in keywords.iter().rev() {
-        let Some(arg) = &keyword.node.arg else {
+        let Some(arg) = &keyword.arg else {
             seen_star = true;
             continue;
         };
         if arg == "inplace" {
-            let is_true_literal = match &keyword.node.value.node {
-                ExprKind::Constant {
+            let is_true_literal = match &keyword.value {
+                Expr::Constant(ast::ExprConstant {
                     value: Constant::Bool(boolean),
                     ..
-                } => *boolean,
+                }) => *boolean,
                 _ => false,
             };
             if is_true_literal {
-                // Avoid applying the fix if:
-                // 1. The keyword argument is followed by a star argument (we can't be certain that
-                //    the star argument _doesn't_ contain an override).
-                // 2. The call is part of a larger expression (we're converting an expression to a
-                //    statement, and expressions can't contain statements).
-                let fixable = !seen_star
-                    && matches!(checker.ctx.current_stmt().node, StmtKind::Expr { .. })
-                    && checker.ctx.current_expr_parent().is_none();
-                let mut diagnostic =
-                    Diagnostic::new(PandasUseOfInplaceArgument { fixable }, keyword.range());
-                if fixable && checker.patch(diagnostic.kind.rule()) {
-                    if let Some(fix) = convert_inplace_argument_to_assignment(
-                        checker.locator,
-                        expr,
-                        diagnostic.range(),
-                        args,
-                        keywords,
-                    ) {
-                        diagnostic.set_fix(fix);
+                let mut diagnostic = Diagnostic::new(PandasUseOfInplaceArgument, keyword.range());
+                if checker.patch(diagnostic.kind.rule()) {
+                    // Avoid applying the fix if:
+                    // 1. The keyword argument is followed by a star argument (we can't be certain that
+                    //    the star argument _doesn't_ contain an override).
+                    // 2. The call is part of a larger expression (we're converting an expression to a
+                    //    statement, and expressions can't contain statements).
+                    // 3. The call is in a lambda (we can't assign to a variable in a lambda). This
+                    //    should be unnecessary, as lambdas are expressions, and so (2) should apply,
+                    //    but we don't currently restore expression stacks when parsing deferred nodes,
+                    //    and so the parent is lost.
+                    if !seen_star
+                        && checker.semantic_model().stmt().is_expr_stmt()
+                        && checker.semantic_model().expr_parent().is_none()
+                        && !checker.semantic_model().scope().kind.is_lambda()
+                    {
+                        if let Some(fix) = convert_inplace_argument_to_assignment(
+                            checker.locator,
+                            expr,
+                            diagnostic.range(),
+                            args,
+                            keywords,
+                        ) {
+                            diagnostic.set_fix(fix);
+                        }
                     }
                 }
+
+                // Without a static type system, only module-level functions could potentially be
+                // non-pandas calls. If they're not, `inplace` should be considered safe.
+                if is_checkable && !is_pandas {
+                    return None;
+                }
+
                 return Some(diagnostic);
             }
 
diff --git a/crates/ruff/src/rules/pandas_vet/rules/mod.rs b/crates/ruff/src/rules/pandas_vet/rules/mod.rs
index 975d13b0acff2..917c9a2efab6d 100644
--- a/crates/ruff/src/rules/pandas_vet/rules/mod.rs
+++ b/crates/ruff/src/rules/pandas_vet/rules/mod.rs
@@ -1,16 +1,16 @@
-pub use assignment_to_df::{assignment_to_df, PandasDfVariableName};
-pub use check_attr::{
-    check_attr, PandasUseOfDotAt, PandasUseOfDotIat, PandasUseOfDotIx, PandasUseOfDotValues,
-};
-pub use check_call::{
-    check_call, PandasUseOfDotIsNull, PandasUseOfDotNotNull, PandasUseOfDotPivotOrUnstack,
+pub(crate) use assignment_to_df::{assignment_to_df, PandasDfVariableName};
+pub(crate) use attr::{attr, PandasUseOfDotValues};
+pub(crate) use call::{
+    call, PandasUseOfDotIsNull, PandasUseOfDotNotNull, PandasUseOfDotPivotOrUnstack,
     PandasUseOfDotReadTable, PandasUseOfDotStack,
 };
-pub use inplace_argument::{inplace_argument, PandasUseOfInplaceArgument};
-pub use pd_merge::{use_of_pd_merge, PandasUseOfPdMerge};
+pub(crate) use inplace_argument::{inplace_argument, PandasUseOfInplaceArgument};
+pub(crate) use pd_merge::{use_of_pd_merge, PandasUseOfPdMerge};
+pub(crate) use subscript::{subscript, PandasUseOfDotAt, PandasUseOfDotIat, PandasUseOfDotIx};
 
-pub mod assignment_to_df;
-pub mod check_attr;
-pub mod check_call;
-pub mod inplace_argument;
-pub mod pd_merge;
+pub(crate) mod assignment_to_df;
+pub(crate) mod attr;
+pub(crate) mod call;
+pub(crate) mod inplace_argument;
+pub(crate) mod pd_merge;
+pub(crate) mod subscript;
diff --git a/crates/ruff/src/rules/pandas_vet/rules/pd_merge.rs b/crates/ruff/src/rules/pandas_vet/rules/pd_merge.rs
index acd6cee0a6dda..b6c4120d7d544 100644
--- a/crates/ruff/src/rules/pandas_vet/rules/pd_merge.rs
+++ b/crates/ruff/src/rules/pandas_vet/rules/pd_merge.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -17,9 +17,9 @@ impl Violation for PandasUseOfPdMerge {
 }
 
 /// PD015
-pub fn use_of_pd_merge(func: &Expr) -> Option<Diagnostic> {
-    if let ExprKind::Attribute { attr, value, .. } = &func.node {
-        if let ExprKind::Name { id, .. } = &value.node {
+pub(crate) fn use_of_pd_merge(func: &Expr) -> Option<Diagnostic> {
+    if let Expr::Attribute(ast::ExprAttribute { attr, value, .. }) = func {
+        if let Expr::Name(ast::ExprName { id, .. }) = value.as_ref() {
             if id == "pd" && attr == "merge" {
                 return Some(Diagnostic::new(PandasUseOfPdMerge, func.range()));
             }
diff --git a/crates/ruff/src/rules/pandas_vet/rules/subscript.rs b/crates/ruff/src/rules/pandas_vet/rules/subscript.rs
new file mode 100644
index 0000000000000..96430e0151573
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/rules/subscript.rs
@@ -0,0 +1,66 @@
+use rustpython_parser::ast::{self, Expr, Ranged};
+
+use ruff_diagnostics::Violation;
+use ruff_diagnostics::{Diagnostic, DiagnosticKind};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+use crate::registry::Rule;
+use crate::rules::pandas_vet::helpers::{test_expression, Resolution};
+
+#[violation]
+pub struct PandasUseOfDotIx;
+
+impl Violation for PandasUseOfDotIx {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("`.ix` is deprecated; use more explicit `.loc` or `.iloc`")
+    }
+}
+
+#[violation]
+pub struct PandasUseOfDotAt;
+
+impl Violation for PandasUseOfDotAt {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Use `.loc` instead of `.at`. If speed is important, use NumPy.")
+    }
+}
+
+#[violation]
+pub struct PandasUseOfDotIat;
+
+impl Violation for PandasUseOfDotIat {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Use `.iloc` instead of `.iat`. If speed is important, use NumPy.")
+    }
+}
+
+pub(crate) fn subscript(checker: &mut Checker, value: &Expr, expr: &Expr) {
+    let Expr::Attribute(ast::ExprAttribute { attr, value, .. }) = value else {
+        return;
+    };
+
+    let rules = &checker.settings.rules;
+    let violation: DiagnosticKind = match attr.as_str() {
+        "ix" if rules.enabled(Rule::PandasUseOfDotIx) => PandasUseOfDotIx.into(),
+        "at" if rules.enabled(Rule::PandasUseOfDotAt) => PandasUseOfDotAt.into(),
+        "iat" if rules.enabled(Rule::PandasUseOfDotIat) => PandasUseOfDotIat.into(),
+        _ => return,
+    };
+
+    // Avoid flagging on non-DataFrames (e.g., `{"a": 1}.at[0]`), and on irrelevant bindings
+    // (like imports).
+    if !matches!(
+        test_expression(value, checker.semantic_model()),
+        Resolution::RelevantLocal
+    ) {
+        return;
+    }
+
+    checker
+        .diagnostics
+        .push(Diagnostic::new(violation, expr.range()));
+}
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD002_PD002.py.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD002_PD002.py.snap
index 25851f81dcde1..22c5665930ca3 100644
--- a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD002_PD002.py.snap
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD002_PD002.py.snap
@@ -105,6 +105,7 @@ PD002.py:22:33: PD002 [*] `inplace=True` should be avoided; it has inconsistent
    22 |+x = x.drop(["a"], axis=1, **kwargs)
 23 23 | x.drop(["a"], axis=1, inplace=True, **kwargs)
 24 24 | f(x.drop(["a"], axis=1, inplace=True))
+25 25 | 
 
 PD002.py:23:23: PD002 `inplace=True` should be avoided; it has inconsistent behavior
    |
@@ -113,6 +114,7 @@ PD002.py:23:23: PD002 `inplace=True` should be avoided; it has inconsistent beha
    |                       ^^^^^^^^^^^^ PD002
 25 | f(x.drop(["a"], axis=1, inplace=True))
    |
+   = help: Assign to variable; remove `inplace` arg
 
 PD002.py:24:25: PD002 `inplace=True` should be avoided; it has inconsistent behavior
    |
@@ -120,6 +122,20 @@ PD002.py:24:25: PD002 `inplace=True` should be avoided; it has inconsistent beha
 25 | x.drop(["a"], axis=1, inplace=True, **kwargs)
 26 | f(x.drop(["a"], axis=1, inplace=True))
    |                         ^^^^^^^^^^^^ PD002
+27 | 
+28 | x.apply(lambda x: x.sort_values('a', inplace=True))
+   |
+   = help: Assign to variable; remove `inplace` arg
+
+PD002.py:26:38: PD002 `inplace=True` should be avoided; it has inconsistent behavior
    |
+26 | f(x.drop(["a"], axis=1, inplace=True))
+27 | 
+28 | x.apply(lambda x: x.sort_values('a', inplace=True))
+   |                                      ^^^^^^^^^^^^ PD002
+29 | import torch
+30 | torch.m.ReLU(inplace=True) # safe because this isn't a pandas call
+   |
+   = help: Assign to variable; remove `inplace` arg
 
 
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD002_fail.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD002_fail.snap
new file mode 100644
index 0000000000000..39bef86bc9b8d
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD002_fail.snap
@@ -0,0 +1,20 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+<filename>:4:23: PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior
+  |
+4 | import pandas as pd
+5 | x = pd.DataFrame()
+6 | x.drop(["a"], axis=1, inplace=True)
+  |                       ^^^^^^^^^^^^ PD002
+  |
+  = help: Assign to variable; remove `inplace` arg
+
+ℹ Suggested fix
+1 1 | 
+2 2 | import pandas as pd
+3 3 | x = pd.DataFrame()
+4   |-x.drop(["a"], axis=1, inplace=True)
+  4 |+x = x.drop(["a"], axis=1)
+
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD002_pass.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD002_pass.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD002_pass.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD003_allows_other_calls.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD003_allows_other_calls.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD003_allows_other_calls.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD003_fail.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD003_fail.snap
new file mode 100644
index 0000000000000..992e684f63b9a
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD003_fail.snap
@@ -0,0 +1,11 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+<filename>:3:9: PD003 `.isna` is preferred to `.isnull`; functionality is equivalent
+  |
+3 | import pandas as pd
+4 | nulls = pd.isnull(val)
+  |         ^^^^^^^^^ PD003
+  |
+
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD003_pass.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD003_pass.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD003_pass.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD004_fail.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD004_fail.snap
new file mode 100644
index 0000000000000..3002abc8520f7
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD004_fail.snap
@@ -0,0 +1,11 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+<filename>:3:13: PD004 `.notna` is preferred to `.notnull`; functionality is equivalent
+  |
+3 | import pandas as pd
+4 | not_nulls = pd.notnull(val)
+  |             ^^^^^^^^^^ PD004
+  |
+
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD004_pass.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD004_pass.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD004_pass.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD007_fail.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD007_fail.snap
new file mode 100644
index 0000000000000..f8618c478bdd6
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD007_fail.snap
@@ -0,0 +1,12 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+<filename>:4:5: PD007 `.ix` is deprecated; use more explicit `.loc` or `.iloc`
+  |
+4 | import pandas as pd
+5 | x = pd.DataFrame()
+6 | y = x.ix[[0, 2], "A"]
+  |     ^^^^^^^^^^^^^^^^^ PD007
+  |
+
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD007_pass_iloc.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD007_pass_iloc.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD007_pass_iloc.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD007_pass_loc.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD007_pass_loc.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD007_pass_loc.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD008_fail.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD008_fail.snap
new file mode 100644
index 0000000000000..6f5a43a145a93
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD008_fail.snap
@@ -0,0 +1,12 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+<filename>:4:9: PD008 Use `.loc` instead of `.at`. If speed is important, use NumPy.
+  |
+4 | import pandas as pd
+5 | x = pd.DataFrame()
+6 | index = x.at[:, ["B", "A"]]
+  |         ^^^^^^^^^^^^^^^^^^^ PD008
+  |
+
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD008_pass.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD008_pass.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD008_pass.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD008_pass_on_attr.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD008_pass_on_attr.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD008_pass_on_attr.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD009_fail.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD009_fail.snap
new file mode 100644
index 0000000000000..1501acd16f110
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD009_fail.snap
@@ -0,0 +1,12 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+<filename>:4:9: PD009 Use `.iloc` instead of `.iat`. If speed is important, use NumPy.
+  |
+4 | import pandas as pd
+5 | x = pd.DataFrame()
+6 | index = x.iat[:, 1:3]
+  |         ^^^^^^^^^^^^^ PD009
+  |
+
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD009_pass.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD009_pass.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD009_pass.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD010_fail_pivot.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD010_fail_pivot.snap
new file mode 100644
index 0000000000000..8eb973d000442
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD010_fail_pivot.snap
@@ -0,0 +1,14 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+<filename>:4:9: PD010 `.pivot_table` is preferred to `.pivot` or `.unstack`; provides same functionality
+  |
+4 | import pandas as pd
+5 | x = pd.DataFrame()
+6 | table = pd.pivot(
+  |         ^^^^^^^^ PD010
+7 |     x,
+8 |     index="foo",
+  |
+
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD010_pass.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD010_pass.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD010_pass.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_fail_values.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_fail_values.snap
new file mode 100644
index 0000000000000..967092a72d10d
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_fail_values.snap
@@ -0,0 +1,12 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+<filename>:4:10: PD011 Use `.to_numpy()` instead of `.values`
+  |
+4 | import pandas as pd
+5 | x = pd.DataFrame()
+6 | result = x.values
+  |          ^^^^^^^^ PD011
+  |
+
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_array.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_array.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_array.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_node_name.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_node_name.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_node_name.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_to_array.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_to_array.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_to_array.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_values_call.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_values_call.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_values_call.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_values_dict.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_values_dict.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_values_dict.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_values_import.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_values_import.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_values_import.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_values_unbound.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_values_unbound.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD011_pass_values_unbound.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD012_fail_read_table.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD012_fail_read_table.snap
new file mode 100644
index 0000000000000..9adf89172d624
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD012_fail_read_table.snap
@@ -0,0 +1,11 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+<filename>:3:13: PD012 `.read_csv` is preferred to `.read_table`; provides same functionality
+  |
+3 | import pandas as pd
+4 | employees = pd.read_table(input_file)
+  |             ^^^^^^^^^^^^^ PD012
+  |
+
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD012_node_Name_pass.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD012_node_Name_pass.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD012_node_Name_pass.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD012_pass_read_csv.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD012_pass_read_csv.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD012_pass_read_csv.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD013_fail_stack.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD013_fail_stack.snap
new file mode 100644
index 0000000000000..34f832171a0b3
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD013_fail_stack.snap
@@ -0,0 +1,12 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+<filename>:4:5: PD013 `.melt` is preferred to `.stack`; provides same functionality
+  |
+4 | import pandas as pd
+5 | x = pd.DataFrame()
+6 | y = x.stack(level=-1, dropna=True)
+  |     ^^^^^^^ PD013
+  |
+
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD013_pass.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD013_pass.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD013_pass.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD013_pass_numpy.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD013_pass_numpy.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD013_pass_numpy.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD013_pass_unbound.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD013_pass_unbound.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD013_pass_unbound.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD015_fail_merge_on_pandas_object.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD015_fail_merge_on_pandas_object.snap
new file mode 100644
index 0000000000000..20a7062679305
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD015_fail_merge_on_pandas_object.snap
@@ -0,0 +1,12 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+<filename>:5:1: PD015 Use `.merge` method instead of `pd.merge` function. They have equivalent functionality.
+  |
+5 | x = pd.DataFrame()
+6 | y = pd.DataFrame()
+7 | pd.merge(x, y)
+  | ^^^^^^^^ PD015
+  |
+
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD015_pass_merge_on_dataframe.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD015_pass_merge_on_dataframe.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD015_pass_merge_on_dataframe.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD015_pass_merge_on_dataframe_with_multiple_args.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD015_pass_merge_on_dataframe_with_multiple_args.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD015_pass_merge_on_dataframe_with_multiple_args.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD015_pass_other_pd_function.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD015_pass_other_pd_function.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD015_pass_other_pd_function.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD901_fail_df_var.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD901_fail_df_var.snap
new file mode 100644
index 0000000000000..0cde486fe8af4
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD901_fail_df_var.snap
@@ -0,0 +1,11 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+<filename>:3:1: PD901 `df` is a bad variable name. Be kinder to your future self.
+  |
+3 | import pandas as pd
+4 | df = pd.DataFrame()
+  | ^^ PD901
+  |
+
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD901_pass_df_param.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD901_pass_df_param.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD901_pass_df_param.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD901_pass_non_df.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD901_pass_non_df.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD901_pass_non_df.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD901_pass_part_df.snap b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD901_pass_part_df.snap
new file mode 100644
index 0000000000000..cee5b2f842656
--- /dev/null
+++ b/crates/ruff/src/rules/pandas_vet/snapshots/ruff__rules__pandas_vet__tests__PD901_pass_part_df.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pandas_vet/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pep8_naming/helpers.rs b/crates/ruff/src/rules/pep8_naming/helpers.rs
index 7345c645b39a7..11e96981ca5a2 100644
--- a/crates/ruff/src/rules/pep8_naming/helpers.rs
+++ b/crates/ruff/src/rules/pep8_naming/helpers.rs
@@ -1,7 +1,7 @@
 use itertools::Itertools;
-use ruff_python_semantic::context::Context;
-use rustpython_parser::ast::{Expr, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Expr, Stmt};
 
+use ruff_python_semantic::model::SemanticModel;
 use ruff_python_stdlib::str::{is_lower, is_upper};
 
 pub(crate) fn is_camelcase(name: &str) -> bool {
@@ -22,14 +22,14 @@ pub(crate) fn is_acronym(name: &str, asname: &str) -> bool {
     name.chars().filter(|c| c.is_uppercase()).join("") == asname
 }
 
-pub(crate) fn is_named_tuple_assignment(context: &Context, stmt: &Stmt) -> bool {
-    let StmtKind::Assign { value, .. } = &stmt.node else {
+pub(crate) fn is_named_tuple_assignment(model: &SemanticModel, stmt: &Stmt) -> bool {
+    let Stmt::Assign(ast::StmtAssign { value, .. }) = stmt else {
         return false;
     };
-    let ExprKind::Call {func, ..} = &value.node else {
+    let Expr::Call(ast::ExprCall {func, ..}) = value.as_ref() else {
         return false;
     };
-    context.resolve_call_path(func).map_or(false, |call_path| {
+    model.resolve_call_path(func).map_or(false, |call_path| {
         matches!(
             call_path.as_slice(),
             ["collections", "namedtuple"] | ["typing", "NamedTuple"]
@@ -37,35 +37,35 @@ pub(crate) fn is_named_tuple_assignment(context: &Context, stmt: &Stmt) -> bool
     })
 }
 
-pub(crate) fn is_typed_dict_assignment(context: &Context, stmt: &Stmt) -> bool {
-    let StmtKind::Assign { value, .. } = &stmt.node else {
+pub(crate) fn is_typed_dict_assignment(model: &SemanticModel, stmt: &Stmt) -> bool {
+    let Stmt::Assign(ast::StmtAssign { value, .. }) = stmt else {
         return false;
     };
-    let ExprKind::Call {func, ..} = &value.node else {
+    let Expr::Call(ast::ExprCall {func, ..}) = value.as_ref() else {
         return false;
     };
-    context.resolve_call_path(func).map_or(false, |call_path| {
+    model.resolve_call_path(func).map_or(false, |call_path| {
         call_path.as_slice() == ["typing", "TypedDict"]
     })
 }
 
-pub(crate) fn is_type_var_assignment(context: &Context, stmt: &Stmt) -> bool {
-    let StmtKind::Assign { value, .. } = &stmt.node else {
+pub(crate) fn is_type_var_assignment(model: &SemanticModel, stmt: &Stmt) -> bool {
+    let Stmt::Assign(ast::StmtAssign { value, .. }) = stmt else {
         return false;
     };
-    let ExprKind::Call {func, ..} = &value.node else {
+    let Expr::Call(ast::ExprCall {func, ..}) = value.as_ref() else {
         return false;
     };
-    context.resolve_call_path(func).map_or(false, |call_path| {
+    model.resolve_call_path(func).map_or(false, |call_path| {
         call_path.as_slice() == ["typing", "TypeVar"]
             || call_path.as_slice() == ["typing", "NewType"]
     })
 }
 
-pub(crate) fn is_typed_dict_class(context: &Context, bases: &[Expr]) -> bool {
+pub(crate) fn is_typed_dict_class(model: &SemanticModel, bases: &[Expr]) -> bool {
     bases
         .iter()
-        .any(|base| context.match_typing_expr(base, "TypedDict"))
+        .any(|base| model.match_typing_expr(base, "TypedDict"))
 }
 
 #[cfg(test)]
diff --git a/crates/ruff/src/rules/pep8_naming/mod.rs b/crates/ruff/src/rules/pep8_naming/mod.rs
index 989376efd067b..98f58c1e12f61 100644
--- a/crates/ruff/src/rules/pep8_naming/mod.rs
+++ b/crates/ruff/src/rules/pep8_naming/mod.rs
@@ -8,7 +8,6 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
@@ -16,35 +15,65 @@ mod tests {
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::InvalidClassName, Path::new("N801.py"); "N801")]
-    #[test_case(Rule::InvalidFunctionName, Path::new("N802.py"); "N802")]
-    #[test_case(Rule::InvalidArgumentName, Path::new("N803.py"); "N803")]
-    #[test_case(Rule::InvalidFirstArgumentNameForClassMethod, Path::new("N804.py"); "N804")]
-    #[test_case(Rule::InvalidFirstArgumentNameForMethod, Path::new("N805.py"); "N805")]
-    #[test_case(Rule::NonLowercaseVariableInFunction, Path::new("N806.py"); "N806")]
-    #[test_case(Rule::DunderFunctionName, Path::new("N807.py"); "N807")]
-    #[test_case(Rule::ConstantImportedAsNonConstant, Path::new("N811.py"); "N811")]
-    #[test_case(Rule::LowercaseImportedAsNonLowercase, Path::new("N812.py"); "N812")]
-    #[test_case(Rule::CamelcaseImportedAsLowercase, Path::new("N813.py"); "N813")]
-    #[test_case(Rule::CamelcaseImportedAsConstant, Path::new("N814.py"); "N814")]
-    #[test_case(Rule::MixedCaseVariableInClassScope, Path::new("N815.py"); "N815")]
-    #[test_case(Rule::MixedCaseVariableInGlobalScope, Path::new("N816.py"); "N816")]
-    #[test_case(Rule::CamelcaseImportedAsAcronym, Path::new("N817.py"); "N817")]
-    #[test_case(Rule::ErrorSuffixOnExceptionName, Path::new("N818.py"); "N818")]
-    #[test_case(Rule::InvalidModuleName, Path::new("N999/module/mod with spaces/__init__.py"); "N999_1")]
-    #[test_case(Rule::InvalidModuleName, Path::new("N999/module/mod with spaces/file.py"); "N999_2")]
-    #[test_case(Rule::InvalidModuleName, Path::new("N999/module/flake9/__init__.py"); "N999_3")]
-    #[test_case(Rule::InvalidModuleName, Path::new("N999/module/MODULE/__init__.py"); "N999_4")]
-    #[test_case(Rule::InvalidModuleName, Path::new("N999/module/MODULE/file.py"); "N999_5")]
-    #[test_case(Rule::InvalidModuleName, Path::new("N999/module/mod-with-dashes/__init__.py"); "N999_6")]
-    #[test_case(Rule::InvalidModuleName, Path::new("N999/module/valid_name/__init__.py"); "N999_7")]
-    #[test_case(Rule::InvalidModuleName, Path::new("N999/module/no_module/test.txt"); "N999_8")]
-    #[test_case(Rule::InvalidModuleName, Path::new("N999/module/valid_name/file-with-dashes.py"); "N999_9")]
-    #[test_case(Rule::InvalidModuleName, Path::new("N999/module/valid_name/__main__.py"); "N999_10")]
-    #[test_case(Rule::InvalidModuleName, Path::new("N999/module/invalid_name/0001_initial.py"); "N999_11")]
-    #[test_case(Rule::InvalidModuleName, Path::new("N999/module/valid_name/__setup__.py"); "N999_12")]
-    #[test_case(Rule::InvalidModuleName, Path::new("N999/module/valid_name/file-with-dashes"); "N999_13")]
-    #[test_case(Rule::InvalidModuleName, Path::new("N999/module/invalid_name/import.py"); "N999_14")]
+    #[test_case(Rule::InvalidClassName, Path::new("N801.py"))]
+    #[test_case(Rule::InvalidFunctionName, Path::new("N802.py"))]
+    #[test_case(Rule::InvalidArgumentName, Path::new("N803.py"))]
+    #[test_case(Rule::InvalidFirstArgumentNameForClassMethod, Path::new("N804.py"))]
+    #[test_case(Rule::InvalidFirstArgumentNameForMethod, Path::new("N805.py"))]
+    #[test_case(Rule::NonLowercaseVariableInFunction, Path::new("N806.py"))]
+    #[test_case(Rule::DunderFunctionName, Path::new("N807.py"))]
+    #[test_case(Rule::ConstantImportedAsNonConstant, Path::new("N811.py"))]
+    #[test_case(Rule::LowercaseImportedAsNonLowercase, Path::new("N812.py"))]
+    #[test_case(Rule::CamelcaseImportedAsLowercase, Path::new("N813.py"))]
+    #[test_case(Rule::CamelcaseImportedAsConstant, Path::new("N814.py"))]
+    #[test_case(Rule::MixedCaseVariableInClassScope, Path::new("N815.py"))]
+    #[test_case(Rule::MixedCaseVariableInGlobalScope, Path::new("N816.py"))]
+    #[test_case(Rule::CamelcaseImportedAsAcronym, Path::new("N817.py"))]
+    #[test_case(Rule::ErrorSuffixOnExceptionName, Path::new("N818.py"))]
+    #[test_case(
+        Rule::InvalidModuleName,
+        Path::new("N999/module/mod with spaces/__init__.py")
+    )]
+    #[test_case(
+        Rule::InvalidModuleName,
+        Path::new("N999/module/mod with spaces/file.py")
+    )]
+    #[test_case(Rule::InvalidModuleName, Path::new("N999/module/flake9/__init__.py"))]
+    #[test_case(Rule::InvalidModuleName, Path::new("N999/module/MODULE/__init__.py"))]
+    #[test_case(Rule::InvalidModuleName, Path::new("N999/module/MODULE/file.py"))]
+    #[test_case(
+        Rule::InvalidModuleName,
+        Path::new("N999/module/mod-with-dashes/__init__.py")
+    )]
+    #[test_case(
+        Rule::InvalidModuleName,
+        Path::new("N999/module/valid_name/__init__.py")
+    )]
+    #[test_case(Rule::InvalidModuleName, Path::new("N999/module/no_module/test.txt"))]
+    #[test_case(
+        Rule::InvalidModuleName,
+        Path::new("N999/module/valid_name/file-with-dashes.py")
+    )]
+    #[test_case(
+        Rule::InvalidModuleName,
+        Path::new("N999/module/valid_name/__main__.py")
+    )]
+    #[test_case(
+        Rule::InvalidModuleName,
+        Path::new("N999/module/invalid_name/0001_initial.py")
+    )]
+    #[test_case(
+        Rule::InvalidModuleName,
+        Path::new("N999/module/valid_name/__setup__.py")
+    )]
+    #[test_case(
+        Rule::InvalidModuleName,
+        Path::new("N999/module/valid_name/file-with-dashes")
+    )]
+    #[test_case(
+        Rule::InvalidModuleName,
+        Path::new("N999/module/invalid_name/import.py")
+    )]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/pep8_naming/rules/camelcase_imported_as_acronym.rs b/crates/ruff/src/rules/pep8_naming/rules/camelcase_imported_as_acronym.rs
index a86fe30e990ad..a4ceec8d8d236 100644
--- a/crates/ruff/src/rules/pep8_naming/rules/camelcase_imported_as_acronym.rs
+++ b/crates/ruff/src/rules/pep8_naming/rules/camelcase_imported_as_acronym.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Alias, Stmt};
+use rustpython_parser::ast::{Alias, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -34,8 +34,8 @@ use crate::rules::pep8_naming::helpers;
 /// [PEP 8]: https://peps.python.org/pep-0008/
 #[violation]
 pub struct CamelcaseImportedAsAcronym {
-    pub name: String,
-    pub asname: String,
+    name: String,
+    asname: String,
 }
 
 impl Violation for CamelcaseImportedAsAcronym {
@@ -47,7 +47,7 @@ impl Violation for CamelcaseImportedAsAcronym {
 }
 
 /// N817
-pub fn camelcase_imported_as_acronym(
+pub(crate) fn camelcase_imported_as_acronym(
     name: &str,
     asname: &str,
     alias: &Alias,
diff --git a/crates/ruff/src/rules/pep8_naming/rules/camelcase_imported_as_constant.rs b/crates/ruff/src/rules/pep8_naming/rules/camelcase_imported_as_constant.rs
index e8aa0cf5bdfaa..355be2092317a 100644
--- a/crates/ruff/src/rules/pep8_naming/rules/camelcase_imported_as_constant.rs
+++ b/crates/ruff/src/rules/pep8_naming/rules/camelcase_imported_as_constant.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Alias, Stmt};
+use rustpython_parser::ast::{Alias, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -31,8 +31,8 @@ use crate::rules::pep8_naming::helpers;
 /// [PEP 8]: https://peps.python.org/pep-0008/
 #[violation]
 pub struct CamelcaseImportedAsConstant {
-    pub name: String,
-    pub asname: String,
+    name: String,
+    asname: String,
 }
 
 impl Violation for CamelcaseImportedAsConstant {
@@ -44,7 +44,7 @@ impl Violation for CamelcaseImportedAsConstant {
 }
 
 /// N814
-pub fn camelcase_imported_as_constant(
+pub(crate) fn camelcase_imported_as_constant(
     name: &str,
     asname: &str,
     alias: &Alias,
diff --git a/crates/ruff/src/rules/pep8_naming/rules/camelcase_imported_as_lowercase.rs b/crates/ruff/src/rules/pep8_naming/rules/camelcase_imported_as_lowercase.rs
index 4e6100728aee7..c427e879a5a34 100644
--- a/crates/ruff/src/rules/pep8_naming/rules/camelcase_imported_as_lowercase.rs
+++ b/crates/ruff/src/rules/pep8_naming/rules/camelcase_imported_as_lowercase.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Alias, Stmt};
+use rustpython_parser::ast::{Alias, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -30,8 +30,8 @@ use crate::rules::pep8_naming::helpers;
 /// [PEP 8]: https://peps.python.org/pep-0008/
 #[violation]
 pub struct CamelcaseImportedAsLowercase {
-    pub name: String,
-    pub asname: String,
+    name: String,
+    asname: String,
 }
 
 impl Violation for CamelcaseImportedAsLowercase {
@@ -43,7 +43,7 @@ impl Violation for CamelcaseImportedAsLowercase {
 }
 
 /// N813
-pub fn camelcase_imported_as_lowercase(
+pub(crate) fn camelcase_imported_as_lowercase(
     name: &str,
     asname: &str,
     alias: &Alias,
diff --git a/crates/ruff/src/rules/pep8_naming/rules/constant_imported_as_non_constant.rs b/crates/ruff/src/rules/pep8_naming/rules/constant_imported_as_non_constant.rs
index f6a7cadfc7df2..79cf3b32af1b2 100644
--- a/crates/ruff/src/rules/pep8_naming/rules/constant_imported_as_non_constant.rs
+++ b/crates/ruff/src/rules/pep8_naming/rules/constant_imported_as_non_constant.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Alias, Stmt};
+use rustpython_parser::ast::{Alias, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -30,8 +30,8 @@ use ruff_python_stdlib::str;
 /// [PEP 8]: https://peps.python.org/pep-0008/
 #[violation]
 pub struct ConstantImportedAsNonConstant {
-    pub name: String,
-    pub asname: String,
+    name: String,
+    asname: String,
 }
 
 impl Violation for ConstantImportedAsNonConstant {
@@ -43,7 +43,7 @@ impl Violation for ConstantImportedAsNonConstant {
 }
 
 /// N811
-pub fn constant_imported_as_non_constant(
+pub(crate) fn constant_imported_as_non_constant(
     name: &str,
     asname: &str,
     alias: &Alias,
diff --git a/crates/ruff/src/rules/pep8_naming/rules/dunder_function_name.rs b/crates/ruff/src/rules/pep8_naming/rules/dunder_function_name.rs
index 43b3f5827b039..143576f057dd4 100644
--- a/crates/ruff/src/rules/pep8_naming/rules/dunder_function_name.rs
+++ b/crates/ruff/src/rules/pep8_naming/rules/dunder_function_name.rs
@@ -41,7 +41,7 @@ impl Violation for DunderFunctionName {
 }
 
 /// N807
-pub fn dunder_function_name(
+pub(crate) fn dunder_function_name(
     scope: &Scope,
     stmt: &Stmt,
     name: &str,
diff --git a/crates/ruff/src/rules/pep8_naming/rules/error_suffix_on_exception_name.rs b/crates/ruff/src/rules/pep8_naming/rules/error_suffix_on_exception_name.rs
index c588a9f2d3365..c75678682cc06 100644
--- a/crates/ruff/src/rules/pep8_naming/rules/error_suffix_on_exception_name.rs
+++ b/crates/ruff/src/rules/pep8_naming/rules/error_suffix_on_exception_name.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind, Stmt};
+use rustpython_parser::ast::{self, Expr, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -30,7 +30,7 @@ use ruff_python_ast::source_code::Locator;
 /// [PEP 8]: https://peps.python.org/pep-0008/#exception-names
 #[violation]
 pub struct ErrorSuffixOnExceptionName {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for ErrorSuffixOnExceptionName {
@@ -42,14 +42,14 @@ impl Violation for ErrorSuffixOnExceptionName {
 }
 
 /// N818
-pub fn error_suffix_on_exception_name(
+pub(crate) fn error_suffix_on_exception_name(
     class_def: &Stmt,
     bases: &[Expr],
     name: &str,
     locator: &Locator,
 ) -> Option<Diagnostic> {
     if !bases.iter().any(|base| {
-        if let ExprKind::Name { id, .. } = &base.node {
+        if let Expr::Name(ast::ExprName { id, .. }) = &base {
             id == "Exception" || id.ends_with("Error")
         } else {
             false
diff --git a/crates/ruff/src/rules/pep8_naming/rules/invalid_argument_name.rs b/crates/ruff/src/rules/pep8_naming/rules/invalid_argument_name.rs
index 58b9ebf971d1a..c2c8fe8d08f59 100644
--- a/crates/ruff/src/rules/pep8_naming/rules/invalid_argument_name.rs
+++ b/crates/ruff/src/rules/pep8_naming/rules/invalid_argument_name.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::Arg;
+use rustpython_parser::ast::{Arg, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -21,19 +21,19 @@ use ruff_macros::{derive_message_formats, violation};
 /// ## Example
 /// ```python
 /// def MY_FUNCTION():
-///    pass
+///     pass
 /// ```
 ///
 /// Use instead:
 /// ```python
 /// def my_function():
-///    pass
+///     pass
 /// ```
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#function-and-method-arguments
 #[violation]
 pub struct InvalidArgumentName {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for InvalidArgumentName {
@@ -45,7 +45,11 @@ impl Violation for InvalidArgumentName {
 }
 
 /// N803
-pub fn invalid_argument_name(name: &str, arg: &Arg, ignore_names: &[String]) -> Option<Diagnostic> {
+pub(crate) fn invalid_argument_name(
+    name: &str,
+    arg: &Arg,
+    ignore_names: &[String],
+) -> Option<Diagnostic> {
     if ignore_names.iter().any(|ignore_name| ignore_name == name) {
         return None;
     }
diff --git a/crates/ruff/src/rules/pep8_naming/rules/invalid_class_name.rs b/crates/ruff/src/rules/pep8_naming/rules/invalid_class_name.rs
index 2fdd36624923c..d4f8462a55497 100644
--- a/crates/ruff/src/rules/pep8_naming/rules/invalid_class_name.rs
+++ b/crates/ruff/src/rules/pep8_naming/rules/invalid_class_name.rs
@@ -36,7 +36,7 @@ use ruff_python_ast::source_code::Locator;
 /// [PEP 8]: https://peps.python.org/pep-0008/#class-names
 #[violation]
 pub struct InvalidClassName {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for InvalidClassName {
@@ -48,7 +48,11 @@ impl Violation for InvalidClassName {
 }
 
 /// N801
-pub fn invalid_class_name(class_def: &Stmt, name: &str, locator: &Locator) -> Option<Diagnostic> {
+pub(crate) fn invalid_class_name(
+    class_def: &Stmt,
+    name: &str,
+    locator: &Locator,
+) -> Option<Diagnostic> {
     let stripped = name.strip_prefix('_').unwrap_or(name);
     if !stripped.chars().next().map_or(false, char::is_uppercase) || stripped.contains('_') {
         return Some(Diagnostic::new(
diff --git a/crates/ruff/src/rules/pep8_naming/rules/invalid_first_argument_name_for_class_method.rs b/crates/ruff/src/rules/pep8_naming/rules/invalid_first_argument_name_for_class_method.rs
index 76296104a1a69..df5e7c64bc07c 100644
--- a/crates/ruff/src/rules/pep8_naming/rules/invalid_first_argument_name_for_class_method.rs
+++ b/crates/ruff/src/rules/pep8_naming/rules/invalid_first_argument_name_for_class_method.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Arguments, Expr};
+use rustpython_parser::ast::{Arguments, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -55,7 +55,7 @@ impl Violation for InvalidFirstArgumentNameForClassMethod {
 }
 
 /// N804
-pub fn invalid_first_argument_name_for_class_method(
+pub(crate) fn invalid_first_argument_name_for_class_method(
     checker: &Checker,
     scope: &Scope,
     name: &str,
@@ -64,7 +64,7 @@ pub fn invalid_first_argument_name_for_class_method(
 ) -> Option<Diagnostic> {
     if !matches!(
         function_type::classify(
-            &checker.ctx,
+            checker.semantic_model(),
             scope,
             name,
             decorator_list,
@@ -76,7 +76,7 @@ pub fn invalid_first_argument_name_for_class_method(
         return None;
     }
     if let Some(arg) = args.posonlyargs.first().or_else(|| args.args.first()) {
-        if arg.node.arg != "cls" {
+        if &arg.arg != "cls" {
             if checker
                 .settings
                 .pep8_naming
diff --git a/crates/ruff/src/rules/pep8_naming/rules/invalid_first_argument_name_for_method.rs b/crates/ruff/src/rules/pep8_naming/rules/invalid_first_argument_name_for_method.rs
index 148b565712424..c0e0cb3895e3f 100644
--- a/crates/ruff/src/rules/pep8_naming/rules/invalid_first_argument_name_for_method.rs
+++ b/crates/ruff/src/rules/pep8_naming/rules/invalid_first_argument_name_for_method.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Arguments, Expr};
+use rustpython_parser::ast::{Arguments, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -52,7 +52,7 @@ impl Violation for InvalidFirstArgumentNameForMethod {
 }
 
 /// N805
-pub fn invalid_first_argument_name_for_method(
+pub(crate) fn invalid_first_argument_name_for_method(
     checker: &Checker,
     scope: &Scope,
     name: &str,
@@ -61,7 +61,7 @@ pub fn invalid_first_argument_name_for_method(
 ) -> Option<Diagnostic> {
     if !matches!(
         function_type::classify(
-            &checker.ctx,
+            checker.semantic_model(),
             scope,
             name,
             decorator_list,
@@ -73,7 +73,7 @@ pub fn invalid_first_argument_name_for_method(
         return None;
     }
     let arg = args.posonlyargs.first().or_else(|| args.args.first())?;
-    if arg.node.arg == "self" {
+    if &arg.arg == "self" {
         return None;
     }
     if checker
diff --git a/crates/ruff/src/rules/pep8_naming/rules/invalid_function_name.rs b/crates/ruff/src/rules/pep8_naming/rules/invalid_function_name.rs
index f6bb4e48fc046..1b908c225626b 100644
--- a/crates/ruff/src/rules/pep8_naming/rules/invalid_function_name.rs
+++ b/crates/ruff/src/rules/pep8_naming/rules/invalid_function_name.rs
@@ -5,7 +5,7 @@ use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::identifier_range;
 use ruff_python_ast::source_code::Locator;
 use ruff_python_semantic::analyze::visibility;
-use ruff_python_semantic::context::Context;
+use ruff_python_semantic::model::SemanticModel;
 
 /// ## What it does
 /// Checks for functions names that do not follow the `snake_case` naming
@@ -36,7 +36,7 @@ use ruff_python_semantic::context::Context;
 /// [PEP 8]: https://peps.python.org/pep-0008/#function-and-variable-names
 #[violation]
 pub struct InvalidFunctionName {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for InvalidFunctionName {
@@ -48,12 +48,12 @@ impl Violation for InvalidFunctionName {
 }
 
 /// N802
-pub fn invalid_function_name(
+pub(crate) fn invalid_function_name(
     stmt: &Stmt,
     name: &str,
     decorator_list: &[Expr],
     ignore_names: &[String],
-    ctx: &Context,
+    model: &SemanticModel,
     locator: &Locator,
 ) -> Option<Diagnostic> {
     // Ignore any explicitly-ignored function names.
@@ -68,7 +68,7 @@ pub fn invalid_function_name(
 
     // Ignore any functions that are explicitly `@override`. These are defined elsewhere,
     // so if they're first-party, we'll flag them at the definition site.
-    if visibility::is_override(ctx, decorator_list) {
+    if visibility::is_override(model, decorator_list) {
         return None;
     }
 
diff --git a/crates/ruff/src/rules/pep8_naming/rules/invalid_module_name.rs b/crates/ruff/src/rules/pep8_naming/rules/invalid_module_name.rs
index 1fc44be2a6f1b..aa42ba8a89af8 100644
--- a/crates/ruff/src/rules/pep8_naming/rules/invalid_module_name.rs
+++ b/crates/ruff/src/rules/pep8_naming/rules/invalid_module_name.rs
@@ -1,7 +1,8 @@
-use ruff_text_size::TextRange;
 use std::ffi::OsStr;
 use std::path::Path;
 
+use ruff_text_size::TextRange;
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_stdlib::identifiers::{is_migration_name, is_module_name};
@@ -33,7 +34,7 @@ use ruff_python_stdlib::identifiers::{is_migration_name, is_module_name};
 /// [PEP 8]: https://peps.python.org/pep-0008/#package-and-module-names
 #[violation]
 pub struct InvalidModuleName {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for InvalidModuleName {
@@ -45,7 +46,7 @@ impl Violation for InvalidModuleName {
 }
 
 /// N999
-pub fn invalid_module_name(path: &Path, package: Option<&Path>) -> Option<Diagnostic> {
+pub(crate) fn invalid_module_name(path: &Path, package: Option<&Path>) -> Option<Diagnostic> {
     if !path
         .extension()
         .map_or(false, |ext| ext == "py" || ext == "pyi")
diff --git a/crates/ruff/src/rules/pep8_naming/rules/lowercase_imported_as_non_lowercase.rs b/crates/ruff/src/rules/pep8_naming/rules/lowercase_imported_as_non_lowercase.rs
index 17666a03f9fda..5d347f1f9d3e4 100644
--- a/crates/ruff/src/rules/pep8_naming/rules/lowercase_imported_as_non_lowercase.rs
+++ b/crates/ruff/src/rules/pep8_naming/rules/lowercase_imported_as_non_lowercase.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Alias, Stmt};
+use rustpython_parser::ast::{Alias, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -29,8 +29,8 @@ use ruff_python_stdlib::str;
 /// [PEP 8]: https://peps.python.org/pep-0008/
 #[violation]
 pub struct LowercaseImportedAsNonLowercase {
-    pub name: String,
-    pub asname: String,
+    name: String,
+    asname: String,
 }
 
 impl Violation for LowercaseImportedAsNonLowercase {
@@ -42,7 +42,7 @@ impl Violation for LowercaseImportedAsNonLowercase {
 }
 
 /// N812
-pub fn lowercase_imported_as_non_lowercase(
+pub(crate) fn lowercase_imported_as_non_lowercase(
     name: &str,
     asname: &str,
     alias: &Alias,
diff --git a/crates/ruff/src/rules/pep8_naming/rules/mixed_case_variable_in_class_scope.rs b/crates/ruff/src/rules/pep8_naming/rules/mixed_case_variable_in_class_scope.rs
index 52cc00ce950e8..2cb07937896e3 100644
--- a/crates/ruff/src/rules/pep8_naming/rules/mixed_case_variable_in_class_scope.rs
+++ b/crates/ruff/src/rules/pep8_naming/rules/mixed_case_variable_in_class_scope.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, Stmt};
+use rustpython_parser::ast::{Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -38,7 +38,7 @@ use crate::rules::pep8_naming::helpers;
 /// [PEP 8]: https://peps.python.org/pep-0008/#function-and-method-arguments
 #[violation]
 pub struct MixedCaseVariableInClassScope {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for MixedCaseVariableInClassScope {
@@ -50,7 +50,7 @@ impl Violation for MixedCaseVariableInClassScope {
 }
 
 /// N815
-pub fn mixed_case_variable_in_class_scope(
+pub(crate) fn mixed_case_variable_in_class_scope(
     checker: &mut Checker,
     expr: &Expr,
     stmt: &Stmt,
@@ -67,8 +67,8 @@ pub fn mixed_case_variable_in_class_scope(
         return;
     }
     if helpers::is_mixed_case(name)
-        && !helpers::is_named_tuple_assignment(&checker.ctx, stmt)
-        && !helpers::is_typed_dict_class(&checker.ctx, bases)
+        && !helpers::is_named_tuple_assignment(checker.semantic_model(), stmt)
+        && !helpers::is_typed_dict_class(checker.semantic_model(), bases)
     {
         checker.diagnostics.push(Diagnostic::new(
             MixedCaseVariableInClassScope {
diff --git a/crates/ruff/src/rules/pep8_naming/rules/mixed_case_variable_in_global_scope.rs b/crates/ruff/src/rules/pep8_naming/rules/mixed_case_variable_in_global_scope.rs
index f5b5f7d54eabd..b0312c50d6e66 100644
--- a/crates/ruff/src/rules/pep8_naming/rules/mixed_case_variable_in_global_scope.rs
+++ b/crates/ruff/src/rules/pep8_naming/rules/mixed_case_variable_in_global_scope.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, Stmt};
+use rustpython_parser::ast::{Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -48,7 +48,7 @@ use crate::rules::pep8_naming::helpers;
 /// [PEP 8]: https://peps.python.org/pep-0008/#global-variable-names
 #[violation]
 pub struct MixedCaseVariableInGlobalScope {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for MixedCaseVariableInGlobalScope {
@@ -60,7 +60,7 @@ impl Violation for MixedCaseVariableInGlobalScope {
 }
 
 /// N816
-pub fn mixed_case_variable_in_global_scope(
+pub(crate) fn mixed_case_variable_in_global_scope(
     checker: &mut Checker,
     expr: &Expr,
     stmt: &Stmt,
@@ -75,7 +75,9 @@ pub fn mixed_case_variable_in_global_scope(
     {
         return;
     }
-    if helpers::is_mixed_case(name) && !helpers::is_named_tuple_assignment(&checker.ctx, stmt) {
+    if helpers::is_mixed_case(name)
+        && !helpers::is_named_tuple_assignment(checker.semantic_model(), stmt)
+    {
         checker.diagnostics.push(Diagnostic::new(
             MixedCaseVariableInGlobalScope {
                 name: name.to_string(),
diff --git a/crates/ruff/src/rules/pep8_naming/rules/mod.rs b/crates/ruff/src/rules/pep8_naming/rules/mod.rs
index 52072cd7c0099..f842ca40ea845 100644
--- a/crates/ruff/src/rules/pep8_naming/rules/mod.rs
+++ b/crates/ruff/src/rules/pep8_naming/rules/mod.rs
@@ -1,39 +1,39 @@
-pub use camelcase_imported_as_acronym::{
+pub(crate) use camelcase_imported_as_acronym::{
     camelcase_imported_as_acronym, CamelcaseImportedAsAcronym,
 };
-pub use camelcase_imported_as_constant::{
+pub(crate) use camelcase_imported_as_constant::{
     camelcase_imported_as_constant, CamelcaseImportedAsConstant,
 };
-pub use camelcase_imported_as_lowercase::{
+pub(crate) use camelcase_imported_as_lowercase::{
     camelcase_imported_as_lowercase, CamelcaseImportedAsLowercase,
 };
-pub use constant_imported_as_non_constant::{
+pub(crate) use constant_imported_as_non_constant::{
     constant_imported_as_non_constant, ConstantImportedAsNonConstant,
 };
-pub use dunder_function_name::{dunder_function_name, DunderFunctionName};
-pub use error_suffix_on_exception_name::{
+pub(crate) use dunder_function_name::{dunder_function_name, DunderFunctionName};
+pub(crate) use error_suffix_on_exception_name::{
     error_suffix_on_exception_name, ErrorSuffixOnExceptionName,
 };
-pub use invalid_argument_name::{invalid_argument_name, InvalidArgumentName};
-pub use invalid_class_name::{invalid_class_name, InvalidClassName};
-pub use invalid_first_argument_name_for_class_method::{
+pub(crate) use invalid_argument_name::{invalid_argument_name, InvalidArgumentName};
+pub(crate) use invalid_class_name::{invalid_class_name, InvalidClassName};
+pub(crate) use invalid_first_argument_name_for_class_method::{
     invalid_first_argument_name_for_class_method, InvalidFirstArgumentNameForClassMethod,
 };
-pub use invalid_first_argument_name_for_method::{
+pub(crate) use invalid_first_argument_name_for_method::{
     invalid_first_argument_name_for_method, InvalidFirstArgumentNameForMethod,
 };
-pub use invalid_function_name::{invalid_function_name, InvalidFunctionName};
-pub use invalid_module_name::{invalid_module_name, InvalidModuleName};
-pub use lowercase_imported_as_non_lowercase::{
+pub(crate) use invalid_function_name::{invalid_function_name, InvalidFunctionName};
+pub(crate) use invalid_module_name::{invalid_module_name, InvalidModuleName};
+pub(crate) use lowercase_imported_as_non_lowercase::{
     lowercase_imported_as_non_lowercase, LowercaseImportedAsNonLowercase,
 };
-pub use mixed_case_variable_in_class_scope::{
+pub(crate) use mixed_case_variable_in_class_scope::{
     mixed_case_variable_in_class_scope, MixedCaseVariableInClassScope,
 };
-pub use mixed_case_variable_in_global_scope::{
+pub(crate) use mixed_case_variable_in_global_scope::{
     mixed_case_variable_in_global_scope, MixedCaseVariableInGlobalScope,
 };
-pub use non_lowercase_variable_in_function::{
+pub(crate) use non_lowercase_variable_in_function::{
     non_lowercase_variable_in_function, NonLowercaseVariableInFunction,
 };
 
diff --git a/crates/ruff/src/rules/pep8_naming/rules/non_lowercase_variable_in_function.rs b/crates/ruff/src/rules/pep8_naming/rules/non_lowercase_variable_in_function.rs
index 56576594fcb01..ed7648fb34891 100644
--- a/crates/ruff/src/rules/pep8_naming/rules/non_lowercase_variable_in_function.rs
+++ b/crates/ruff/src/rules/pep8_naming/rules/non_lowercase_variable_in_function.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, Stmt};
+use rustpython_parser::ast::{Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -37,7 +37,7 @@ use crate::rules::pep8_naming::helpers;
 /// [PEP 8]: https://peps.python.org/pep-0008/#function-and-variable-names
 #[violation]
 pub struct NonLowercaseVariableInFunction {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for NonLowercaseVariableInFunction {
@@ -49,7 +49,7 @@ impl Violation for NonLowercaseVariableInFunction {
 }
 
 /// N806
-pub fn non_lowercase_variable_in_function(
+pub(crate) fn non_lowercase_variable_in_function(
     checker: &mut Checker,
     expr: &Expr,
     stmt: &Stmt,
@@ -66,9 +66,9 @@ pub fn non_lowercase_variable_in_function(
     }
 
     if name.to_lowercase() != name
-        && !helpers::is_named_tuple_assignment(&checker.ctx, stmt)
-        && !helpers::is_typed_dict_assignment(&checker.ctx, stmt)
-        && !helpers::is_type_var_assignment(&checker.ctx, stmt)
+        && !helpers::is_named_tuple_assignment(checker.semantic_model(), stmt)
+        && !helpers::is_typed_dict_assignment(checker.semantic_model(), stmt)
+        && !helpers::is_type_var_assignment(checker.semantic_model(), stmt)
     {
         checker.diagnostics.push(Diagnostic::new(
             NonLowercaseVariableInFunction {
diff --git a/crates/ruff/src/rules/pep8_naming/settings.rs b/crates/ruff/src/rules/pep8_naming/settings.rs
index 4ee1de57119ff..cfacb63632ff1 100644
--- a/crates/ruff/src/rules/pep8_naming/settings.rs
+++ b/crates/ruff/src/rules/pep8_naming/settings.rs
@@ -1,9 +1,8 @@
 //! Settings for the `pep8-naming` plugin.
 
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::{CacheKey, ConfigurationOptions};
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
 
 const IGNORE_NAMES: [&str; 12] = [
     "setUp",
@@ -21,13 +20,14 @@ const IGNORE_NAMES: [&str; 12] = [
 ];
 
 #[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, CombineOptions,
 )]
 #[serde(
     deny_unknown_fields,
     rename_all = "kebab-case",
     rename = "Pep8NamingOptions"
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = r#"["setUp", "tearDown", "setUpClass", "tearDownClass", "setUpModule", "tearDownModule", "asyncSetUp", "asyncTearDown", "setUpTestData", "failureException", "longMessage", "maxDiff"]"#,
diff --git a/crates/ruff/src/rules/pycodestyle/helpers.rs b/crates/ruff/src/rules/pycodestyle/helpers.rs
index 70be4dcfe0f96..830eed6694c04 100644
--- a/crates/ruff/src/rules/pycodestyle/helpers.rs
+++ b/crates/ruff/src/rules/pycodestyle/helpers.rs
@@ -1,40 +1,46 @@
-use ruff_python_ast::helpers::{create_expr, unparse_expr};
-use ruff_python_ast::newlines::Line;
-use ruff_python_ast::source_code::Stylist;
 use ruff_text_size::{TextLen, TextRange};
-use rustpython_parser::ast::{Cmpop, Expr, ExprKind};
-use unicode_width::{UnicodeWidthChar, UnicodeWidthStr};
+use rustpython_parser::ast::{self, Cmpop, Expr};
+use unicode_width::UnicodeWidthStr;
 
-pub fn is_ambiguous_name(name: &str) -> bool {
+use ruff_newlines::Line;
+use ruff_python_ast::source_code::Generator;
+
+use crate::line_width::{LineLength, LineWidth, TabSize};
+
+pub(crate) fn is_ambiguous_name(name: &str) -> bool {
     name == "l" || name == "I" || name == "O"
 }
 
-pub fn compare(left: &Expr, ops: &[Cmpop], comparators: &[Expr], stylist: &Stylist) -> String {
-    unparse_expr(
-        &create_expr(ExprKind::Compare {
-            left: Box::new(left.clone()),
-            ops: ops.to_vec(),
-            comparators: comparators.to_vec(),
-        }),
-        stylist,
-    )
+pub(crate) fn compare(
+    left: &Expr,
+    ops: &[Cmpop],
+    comparators: &[Expr],
+    generator: Generator,
+) -> String {
+    let node = ast::ExprCompare {
+        left: Box::new(left.clone()),
+        ops: ops.to_vec(),
+        comparators: comparators.to_vec(),
+        range: TextRange::default(),
+    };
+    generator.expr(&node.into())
 }
 
 pub(super) fn is_overlong(
     line: &Line,
-    limit: usize,
+    limit: LineLength,
     ignore_overlong_task_comments: bool,
     task_tags: &[String],
+    tab_size: TabSize,
 ) -> Option<Overlong> {
     let mut start_offset = line.start();
-    let mut width = 0;
+    let mut width = LineWidth::new(tab_size);
 
     for c in line.chars() {
         if width < limit {
             start_offset += c.text_len();
         }
-
-        width += c.width().unwrap_or(0);
+        width = width.add_char(c);
     }
 
     if width <= limit {
@@ -60,14 +66,14 @@ pub(super) fn is_overlong(
     // begins before the limit.
     let last_chunk = chunks.last().unwrap_or(second_chunk);
     if last_chunk.contains("://") {
-        if width - last_chunk.width() <= limit {
+        if width.get() - last_chunk.width() <= limit.get() {
             return None;
         }
     }
 
     Some(Overlong {
         range: TextRange::new(start_offset, line.end()),
-        width,
+        width: width.get(),
     })
 }
 
diff --git a/crates/ruff/src/rules/pycodestyle/mod.rs b/crates/ruff/src/rules/pycodestyle/mod.rs
index 43f1d9162af60..cc2570824631e 100644
--- a/crates/ruff/src/rules/pycodestyle/mod.rs
+++ b/crates/ruff/src/rules/pycodestyle/mod.rs
@@ -9,9 +9,9 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
+    use crate::line_width::LineLength;
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
@@ -67,7 +67,6 @@ mod tests {
         Ok(())
     }
 
-    #[cfg(feature = "logical_lines")]
     #[test_case(Rule::IndentationWithInvalidMultiple, Path::new("E11.py"))]
     #[test_case(Rule::IndentationWithInvalidMultipleComment, Path::new("E11.py"))]
     #[test_case(Rule::MultipleLeadingHashesForBlockComment, Path::new("E26.py"))]
@@ -129,6 +128,21 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn shebang() -> Result<()> {
+        let diagnostics = test_path(
+            Path::new("pycodestyle/shebang.py"),
+            &settings::Settings::for_rules(vec![
+                Rule::TooFewSpacesBeforeInlineComment,
+                Rule::NoSpaceAfterInlineComment,
+                Rule::NoSpaceAfterBlockComment,
+                Rule::MultipleLeadingHashesForBlockComment,
+            ]),
+        )?;
+        assert_messages!(diagnostics);
+        Ok(())
+    }
+
     #[test_case(false)]
     #[test_case(true)]
     fn task_tags(ignore_overlong_task_comments: bool) -> Result<()> {
@@ -153,7 +167,23 @@ mod tests {
             Path::new("pycodestyle/W505.py"),
             &settings::Settings {
                 pycodestyle: Settings {
-                    max_doc_length: Some(50),
+                    max_doc_length: Some(LineLength::from(50)),
+                    ..Settings::default()
+                },
+                ..settings::Settings::for_rule(Rule::DocLineTooLong)
+            },
+        )?;
+        assert_messages!(diagnostics);
+        Ok(())
+    }
+
+    #[test]
+    fn max_doc_length_with_utf_8() -> Result<()> {
+        let diagnostics = test_path(
+            Path::new("pycodestyle/W505_utf_8.py"),
+            &settings::Settings {
+                pycodestyle: Settings {
+                    max_doc_length: Some(LineLength::from(50)),
                     ..Settings::default()
                 },
                 ..settings::Settings::for_rule(Rule::DocLineTooLong)
@@ -162,4 +192,21 @@ mod tests {
         assert_messages!(diagnostics);
         Ok(())
     }
+
+    #[test_case(1)]
+    #[test_case(2)]
+    #[test_case(4)]
+    #[test_case(8)]
+    fn tab_size(tab_size: u8) -> Result<()> {
+        let snapshot = format!("tab_size_{tab_size}");
+        let diagnostics = test_path(
+            Path::new("pycodestyle/E501_2.py"),
+            &settings::Settings {
+                tab_size: tab_size.into(),
+                ..settings::Settings::for_rule(Rule::LineTooLong)
+            },
+        )?;
+        assert_messages!(snapshot, diagnostics);
+        Ok(())
+    }
 }
diff --git a/crates/ruff/src/rules/pycodestyle/rules/ambiguous_class_name.rs b/crates/ruff/src/rules/pycodestyle/rules/ambiguous_class_name.rs
index 0967b969303b6..c5159f0119119 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/ambiguous_class_name.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/ambiguous_class_name.rs
@@ -1,6 +1,7 @@
+use ruff_text_size::TextRange;
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_text_size::TextRange;
 
 use crate::rules::pycodestyle::helpers::is_ambiguous_name;
 
@@ -34,7 +35,7 @@ impl Violation for AmbiguousClassName {
 }
 
 /// E742
-pub fn ambiguous_class_name<F>(name: &str, locate: F) -> Option<Diagnostic>
+pub(crate) fn ambiguous_class_name<F>(name: &str, locate: F) -> Option<Diagnostic>
 where
     F: FnOnce() -> TextRange,
 {
diff --git a/crates/ruff/src/rules/pycodestyle/rules/ambiguous_function_name.rs b/crates/ruff/src/rules/pycodestyle/rules/ambiguous_function_name.rs
index df1f5e052e1ff..653814af77ed6 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/ambiguous_function_name.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/ambiguous_function_name.rs
@@ -1,6 +1,7 @@
+use ruff_text_size::TextRange;
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_text_size::TextRange;
 
 use crate::rules::pycodestyle::helpers::is_ambiguous_name;
 
@@ -34,7 +35,7 @@ impl Violation for AmbiguousFunctionName {
 }
 
 /// E743
-pub fn ambiguous_function_name<F>(name: &str, locate: F) -> Option<Diagnostic>
+pub(crate) fn ambiguous_function_name<F>(name: &str, locate: F) -> Option<Diagnostic>
 where
     F: FnOnce() -> TextRange,
 {
diff --git a/crates/ruff/src/rules/pycodestyle/rules/ambiguous_variable_name.rs b/crates/ruff/src/rules/pycodestyle/rules/ambiguous_variable_name.rs
index fb80afbbce22d..4abeb9444ea2f 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/ambiguous_variable_name.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/ambiguous_variable_name.rs
@@ -1,6 +1,7 @@
+use ruff_text_size::TextRange;
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_text_size::TextRange;
 
 use crate::rules::pycodestyle::helpers::is_ambiguous_name;
 
@@ -37,7 +38,7 @@ impl Violation for AmbiguousVariableName {
 }
 
 /// E741
-pub fn ambiguous_variable_name(name: &str, range: TextRange) -> Option<Diagnostic> {
+pub(crate) fn ambiguous_variable_name(name: &str, range: TextRange) -> Option<Diagnostic> {
     if is_ambiguous_name(name) {
         Some(Diagnostic::new(
             AmbiguousVariableName(name.to_string()),
diff --git a/crates/ruff/src/rules/pycodestyle/rules/bare_except.rs b/crates/ruff/src/rules/pycodestyle/rules/bare_except.rs
index d9ea3adf03f3c..f2d591e061f60 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/bare_except.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/bare_except.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Excepthandler, Expr, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Excepthandler, Expr, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -45,7 +45,7 @@ impl Violation for BareExcept {
 }
 
 /// E722
-pub fn bare_except(
+pub(crate) fn bare_except(
     type_: Option<&Expr>,
     body: &[Stmt],
     handler: &Excepthandler,
@@ -54,7 +54,7 @@ pub fn bare_except(
     if type_.is_none()
         && !body
             .iter()
-            .any(|stmt| matches!(stmt.node, StmtKind::Raise { exc: None, .. }))
+            .any(|stmt| matches!(stmt, Stmt::Raise(ast::StmtRaise { exc: None, .. })))
     {
         Some(Diagnostic::new(BareExcept, except_range(handler, locator)))
     } else {
diff --git a/crates/ruff/src/rules/pycodestyle/rules/compound_statements.rs b/crates/ruff/src/rules/pycodestyle/rules/compound_statements.rs
index 2446984993581..908e1c07f9877 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/compound_statements.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/compound_statements.rs
@@ -3,11 +3,11 @@ use rustpython_parser::lexer::LexResult;
 use rustpython_parser::Tok;
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Violation};
-use ruff_diagnostics::{Diagnostic, Edit};
+use ruff_diagnostics::{Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::registry::Rule;
-use crate::settings::{flags, Settings};
+use crate::settings::Settings;
 
 /// ## What it does
 /// Checks for compound statements (multiple statements on the same line).
@@ -17,12 +17,12 @@ use crate::settings::{flags, Settings};
 ///
 /// ## Example
 /// ```python
-/// if foo == 'blah': do_blah_thing()
+/// if foo == "blah": do_blah_thing()
 /// ```
 ///
 /// Use instead:
 /// ```python
-/// if foo == 'blah':
+/// if foo == "blah":
 ///     do_blah_thing()
 /// ```
 ///
@@ -99,11 +99,7 @@ impl AlwaysAutofixableViolation for UselessSemicolon {
 }
 
 /// E701, E702, E703
-pub fn compound_statements(
-    lxr: &[LexResult],
-    settings: &Settings,
-    autofix: flags::Autofix,
-) -> Vec<Diagnostic> {
+pub(crate) fn compound_statements(lxr: &[LexResult], settings: &Settings) -> Vec<Diagnostic> {
     let mut diagnostics = vec![];
 
     // Track the last seen instance of a variety of tokens.
@@ -127,29 +123,29 @@ pub fn compound_statements(
     let mut allow_ellipsis = false;
 
     // Track the bracket depth.
-    let mut par_count = 0;
-    let mut sqb_count = 0;
-    let mut brace_count = 0;
+    let mut par_count = 0u32;
+    let mut sqb_count = 0u32;
+    let mut brace_count = 0u32;
 
     for &(ref tok, range) in lxr.iter().flatten() {
         match tok {
             Tok::Lpar => {
-                par_count += 1;
+                par_count = par_count.saturating_add(1);
             }
             Tok::Rpar => {
-                par_count -= 1;
+                par_count = par_count.saturating_sub(1);
             }
             Tok::Lsqb => {
-                sqb_count += 1;
+                sqb_count = sqb_count.saturating_add(1);
             }
             Tok::Rsqb => {
-                sqb_count -= 1;
+                sqb_count = sqb_count.saturating_sub(1);
             }
             Tok::Lbrace => {
-                brace_count += 1;
+                brace_count = brace_count.saturating_add(1);
             }
             Tok::Rbrace => {
-                brace_count -= 1;
+                brace_count = brace_count.saturating_sub(1);
             }
             _ => {}
         }
@@ -163,8 +159,9 @@ pub fn compound_statements(
                 if let Some((start, end)) = semi {
                     let mut diagnostic =
                         Diagnostic::new(UselessSemicolon, TextRange::new(start, end));
-                    if autofix.into() && settings.rules.should_fix(Rule::UselessSemicolon) {
-                        diagnostic.set_fix(Edit::deletion(start, end));
+                    if settings.rules.should_fix(Rule::UselessSemicolon) {
+                        #[allow(deprecated)]
+                        diagnostic.set_fix(Fix::unspecified(Edit::deletion(start, end)));
                     };
                     diagnostics.push(diagnostic);
                 }
diff --git a/crates/ruff/src/rules/pycodestyle/rules/doc_line_too_long.rs b/crates/ruff/src/rules/pycodestyle/rules/doc_line_too_long.rs
index 99b663a733650..efca0844b24a6 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/doc_line_too_long.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/doc_line_too_long.rs
@@ -1,6 +1,6 @@
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::Line;
+use ruff_newlines::Line;
 
 use crate::rules::pycodestyle::helpers::is_overlong;
 use crate::settings::Settings;
@@ -48,6 +48,12 @@ pub(crate) fn doc_line_too_long(line: &Line, settings: &Settings) -> Option<Diag
         limit,
         settings.pycodestyle.ignore_overlong_task_comments,
         &settings.task_tags,
+        settings.tab_size,
     )
-    .map(|overlong| Diagnostic::new(DocLineTooLong(overlong.width(), limit), overlong.range()))
+    .map(|overlong| {
+        Diagnostic::new(
+            DocLineTooLong(overlong.width(), limit.get()),
+            overlong.range(),
+        )
+    })
 }
diff --git a/crates/ruff/src/rules/pycodestyle/rules/errors.rs b/crates/ruff/src/rules/pycodestyle/rules/errors.rs
index 7816752162e2c..4b81bf466c2b7 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/errors.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/errors.rs
@@ -5,6 +5,8 @@ use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::Locator;
 
+use crate::logging::DisplayParseErrorType;
+
 #[violation]
 pub struct IOError {
     pub message: String,
@@ -33,12 +35,12 @@ impl Violation for SyntaxError {
 }
 
 /// E901
-pub fn syntax_error(
+pub(crate) fn syntax_error(
     diagnostics: &mut Vec<Diagnostic>,
     parse_error: &ParseError,
     locator: &Locator,
 ) {
-    let rest = locator.after(parse_error.location);
+    let rest = locator.after(parse_error.offset);
 
     // Try to create a non-empty range so that the diagnostic can print a caret at the
     // right position. This requires that we retrieve the next character, if any, and take its length
@@ -50,8 +52,8 @@ pub fn syntax_error(
 
     diagnostics.push(Diagnostic::new(
         SyntaxError {
-            message: parse_error.error.to_string(),
+            message: format!("{}", DisplayParseErrorType::new(&parse_error.error)),
         },
-        TextRange::at(parse_error.location, len),
+        TextRange::at(parse_error.offset, len),
     ));
 }
diff --git a/crates/ruff/src/rules/pycodestyle/rules/imports.rs b/crates/ruff/src/rules/pycodestyle/rules/imports.rs
index 5a368a3feda5b..b5b724329eac8 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/imports.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/imports.rs
@@ -1,10 +1,11 @@
-use rustpython_parser::ast::{Alias, Stmt};
+use rustpython_parser::ast::{Alias, Ranged, Stmt};
 
-use crate::checkers::ast::Checker;
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::Locator;
 
+use crate::checkers::ast::Checker;
+
 /// ## What it does
 /// Check for multiple imports on one line.
 ///
@@ -43,7 +44,7 @@ impl Violation for MultipleImportsOnOneLine {
 ///
 /// ## Example
 /// ```python
-/// 'One string'
+/// "One string"
 /// "Two string"
 /// a = 1
 /// import os
@@ -54,7 +55,8 @@ impl Violation for MultipleImportsOnOneLine {
 /// ```python
 /// import os
 /// from sys import x
-/// 'One string'
+///
+/// "One string"
 /// "Two string"
 /// a = 1
 /// ```
@@ -72,7 +74,7 @@ impl Violation for ModuleImportNotAtTopOfFile {
 }
 
 /// E401
-pub fn multiple_imports_on_one_line(checker: &mut Checker, stmt: &Stmt, names: &[Alias]) {
+pub(crate) fn multiple_imports_on_one_line(checker: &mut Checker, stmt: &Stmt, names: &[Alias]) {
     if names.len() > 1 {
         checker
             .diagnostics
@@ -81,8 +83,13 @@ pub fn multiple_imports_on_one_line(checker: &mut Checker, stmt: &Stmt, names: &
 }
 
 /// E402
-pub fn module_import_not_at_top_of_file(checker: &mut Checker, stmt: &Stmt, locator: &Locator) {
-    if checker.ctx.seen_import_boundary && locator.is_at_start_of_line(stmt.start()) {
+pub(crate) fn module_import_not_at_top_of_file(
+    checker: &mut Checker,
+    stmt: &Stmt,
+    locator: &Locator,
+) {
+    if checker.semantic_model().seen_import_boundary() && locator.is_at_start_of_line(stmt.start())
+    {
         checker
             .diagnostics
             .push(Diagnostic::new(ModuleImportNotAtTopOfFile, stmt.range()));
diff --git a/crates/ruff/src/rules/pycodestyle/rules/invalid_escape_sequence.rs b/crates/ruff/src/rules/pycodestyle/rules/invalid_escape_sequence.rs
index 2a1bd7620feb0..ceef5cd796eef 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/invalid_escape_sequence.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/invalid_escape_sequence.rs
@@ -2,7 +2,7 @@ use anyhow::{bail, Result};
 use log::error;
 use ruff_text_size::{TextLen, TextRange, TextSize};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::Locator;
 
@@ -14,12 +14,12 @@ use ruff_python_ast::source_code::Locator;
 ///
 /// ## Example
 /// ```python
-/// regex = '\.png$'
+/// regex = "\.png$"
 /// ```
 ///
 /// Use instead:
 /// ```python
-/// regex = r'\.png$'
+/// regex = r"\.png$"
 /// ```
 #[violation]
 pub struct InvalidEscapeSequence(pub char);
@@ -55,7 +55,7 @@ fn extract_quote(text: &str) -> Result<&str> {
 }
 
 /// W605
-pub fn invalid_escape_sequence(
+pub(crate) fn invalid_escape_sequence(
     locator: &Locator,
     range: TextRange,
     autofix: bool,
@@ -108,10 +108,11 @@ pub fn invalid_escape_sequence(
             let range = TextRange::at(location, next_char.text_len() + TextSize::from(1));
             let mut diagnostic = Diagnostic::new(InvalidEscapeSequence(*next_char), range);
             if autofix {
-                diagnostic.set_fix(Edit::insertion(
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::insertion(
                     r"\".to_string(),
                     range.start() + TextSize::from(1),
-                ));
+                )));
             }
             diagnostics.push(diagnostic);
         }
diff --git a/crates/ruff/src/rules/pycodestyle/rules/lambda_assignment.rs b/crates/ruff/src/rules/pycodestyle/rules/lambda_assignment.rs
index 0ecd28b187278..43651820aedf4 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/lambda_assignment.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/lambda_assignment.rs
@@ -1,13 +1,13 @@
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Violation};
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Arg, Arguments, Constant, Expr, Ranged, Stmt};
+
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::{has_leading_content, has_trailing_content, unparse_stmt};
-use ruff_python_ast::newlines::StrExt;
-use ruff_python_ast::source_code::Stylist;
+use ruff_newlines::StrExt;
+use ruff_python_ast::helpers::{has_leading_content, has_trailing_content};
+use ruff_python_ast::source_code::Generator;
 use ruff_python_ast::whitespace::leading_space;
-use ruff_python_semantic::context::Context;
-use ruff_python_semantic::scope::ScopeKind;
-use ruff_text_size::{TextRange, TextSize};
-use rustpython_parser::ast::{Arg, ArgData, Arguments, Constant, Expr, ExprKind, Stmt, StmtKind};
+use ruff_python_semantic::model::SemanticModel;
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
@@ -25,21 +25,20 @@ use crate::registry::AsRule;
 ///
 /// ## Example
 /// ```python
-/// f = lambda x: 2*x
+/// f = lambda x: 2 * x
 /// ```
 ///
 /// Use instead:
 /// ```python
 /// def f(x):
-///    return 2 * x
+///     return 2 * x
 /// ```
 ///
 /// ## References
 /// - [PEP 8](https://peps.python.org/pep-0008/#programming-recommendations)
 #[violation]
 pub struct LambdaAssignment {
-    pub name: String,
-    pub fixable: bool,
+    name: String,
 }
 
 impl Violation for LambdaAssignment {
@@ -50,50 +49,53 @@ impl Violation for LambdaAssignment {
         format!("Do not assign a `lambda` expression, use a `def`")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable
-            .then_some(|LambdaAssignment { name, .. }| format!("Rewrite `{name}` as a `def`"))
+    fn autofix_title(&self) -> Option<String> {
+        let LambdaAssignment { name } = self;
+        Some(format!("Rewrite `{name}` as a `def`"))
     }
 }
 
 /// E731
-pub fn lambda_assignment(
+pub(crate) fn lambda_assignment(
     checker: &mut Checker,
     target: &Expr,
     value: &Expr,
     annotation: Option<&Expr>,
     stmt: &Stmt,
 ) {
-    if let ExprKind::Name { id, .. } = &target.node {
-        if let ExprKind::Lambda { args, body } = &value.node {
-            // If the assignment is in a class body, it might not be safe
-            // to replace it because the assignment might be
-            // carrying a type annotation that will be used by some
-            // package like dataclasses, which wouldn't consider the
-            // rewritten function definition to be equivalent.
-            // See https://github.com/charliermarsh/ruff/issues/3046
-            let fixable = !matches!(checker.ctx.scope().kind, ScopeKind::Class(_));
-
+    if let Expr::Name(ast::ExprName { id, .. }) = target {
+        if let Expr::Lambda(ast::ExprLambda { args, body, .. }) = value {
             let mut diagnostic = Diagnostic::new(
                 LambdaAssignment {
                     name: id.to_string(),
-                    fixable,
                 },
                 stmt.range(),
             );
 
+            // If the assignment is in a class body, it might not be safe
+            // to replace it because the assignment might be
+            // carrying a type annotation that will be used by some
+            // package like dataclasses, which wouldn't consider the
+            // rewritten function definition to be equivalent.
+            // See https://github.com/charliermarsh/ruff/issues/3046
             if checker.patch(diagnostic.kind.rule())
-                && fixable
+                && !checker.semantic_model().scope().kind.is_class()
                 && !has_leading_content(stmt, checker.locator)
                 && !has_trailing_content(stmt, checker.locator)
             {
                 let first_line = checker.locator.line(stmt.start());
                 let indentation = &leading_space(first_line);
                 let mut indented = String::new();
-                for (idx, line) in
-                    function(&checker.ctx, id, args, body, annotation, checker.stylist)
-                        .universal_newlines()
-                        .enumerate()
+                for (idx, line) in function(
+                    checker.semantic_model(),
+                    id,
+                    args,
+                    body,
+                    annotation,
+                    checker.generator(),
+                )
+                .universal_newlines()
+                .enumerate()
                 {
                     if idx == 0 {
                         indented.push_str(&line);
@@ -103,7 +105,11 @@ pub fn lambda_assignment(
                         indented.push_str(&line);
                     }
                 }
-                diagnostic.set_fix(Edit::range_replacement(indented, stmt.range()));
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                    indented,
+                    stmt.range(),
+                )));
             }
 
             checker.diagnostics.push(diagnostic);
@@ -115,32 +121,32 @@ pub fn lambda_assignment(
 /// The `Callable` import can be from either `collections.abc` or `typing`.
 /// If an ellipsis is used for the argument types, an empty list is returned.
 /// The returned values are cloned, so they can be used as-is.
-fn extract_types(ctx: &Context, annotation: &Expr) -> Option<(Vec<Expr>, Expr)> {
-    let ExprKind::Subscript { value, slice, .. } = &annotation.node else {
+fn extract_types(model: &SemanticModel, annotation: &Expr) -> Option<(Vec<Expr>, Expr)> {
+    let Expr::Subscript(ast::ExprSubscript { value, slice, .. }) = &annotation else {
         return None;
     };
-    let ExprKind::Tuple { elts, .. } = &slice.node else {
+    let Expr::Tuple(ast::ExprTuple { elts, .. }) = slice.as_ref() else {
         return None;
     };
     if elts.len() != 2 {
         return None;
     }
 
-    if !ctx.resolve_call_path(value).map_or(false, |call_path| {
+    if !model.resolve_call_path(value).map_or(false, |call_path| {
         call_path.as_slice() == ["collections", "abc", "Callable"]
-            || ctx.match_typing_call_path(&call_path, "Callable")
+            || model.match_typing_call_path(&call_path, "Callable")
     }) {
         return None;
     }
 
     // The first argument to `Callable` must be a list of types, parameter
     // specification, or ellipsis.
-    let args = match &elts[0].node {
-        ExprKind::List { elts, .. } => elts.clone(),
-        ExprKind::Constant {
+    let args = match &elts[0] {
+        Expr::List(ast::ExprList { elts, .. }) => elts.clone(),
+        Expr::Constant(ast::ExprConstant {
             value: Constant::Ellipsis,
             ..
-        } => vec![],
+        }) => vec![],
         _ => return None,
     };
 
@@ -151,85 +157,67 @@ fn extract_types(ctx: &Context, annotation: &Expr) -> Option<(Vec<Expr>, Expr)>
 }
 
 fn function(
-    ctx: &Context,
+    model: &SemanticModel,
     name: &str,
     args: &Arguments,
     body: &Expr,
     annotation: Option<&Expr>,
-    stylist: &Stylist,
+    generator: Generator,
 ) -> String {
-    let body = Stmt::new(
-        TextSize::default(),
-        TextSize::default(),
-        StmtKind::Return {
-            value: Some(Box::new(body.clone())),
-        },
-    );
+    let body = Stmt::Return(ast::StmtReturn {
+        value: Some(Box::new(body.clone())),
+        range: TextRange::default(),
+    });
     if let Some(annotation) = annotation {
-        if let Some((arg_types, return_type)) = extract_types(ctx, annotation) {
+        if let Some((arg_types, return_type)) = extract_types(model, annotation) {
             // A `lambda` expression can only have positional and positional-only
             // arguments. The order is always positional-only first, then positional.
             let new_posonlyargs = args
                 .posonlyargs
                 .iter()
                 .enumerate()
-                .map(|(idx, arg)| {
-                    Arg::with_range(
-                        ArgData {
-                            annotation: arg_types
-                                .get(idx)
-                                .map(|arg_type| Box::new(arg_type.clone())),
-                            ..arg.node.clone()
-                        },
-                        TextRange::default(),
-                    )
+                .map(|(idx, arg)| Arg {
+                    annotation: arg_types
+                        .get(idx)
+                        .map(|arg_type| Box::new(arg_type.clone())),
+                    ..arg.clone()
                 })
                 .collect::<Vec<_>>();
             let new_args = args
                 .args
                 .iter()
                 .enumerate()
-                .map(|(idx, arg)| {
-                    Arg::with_range(
-                        ArgData {
-                            annotation: arg_types
-                                .get(idx + new_posonlyargs.len())
-                                .map(|arg_type| Box::new(arg_type.clone())),
-                            ..arg.node.clone()
-                        },
-                        TextRange::default(),
-                    )
+                .map(|(idx, arg)| Arg {
+                    annotation: arg_types
+                        .get(idx + new_posonlyargs.len())
+                        .map(|arg_type| Box::new(arg_type.clone())),
+                    ..arg.clone()
                 })
                 .collect::<Vec<_>>();
-            let func = Stmt::with_range(
-                StmtKind::FunctionDef {
-                    name: name.to_string(),
-                    args: Box::new(Arguments {
-                        posonlyargs: new_posonlyargs,
-                        args: new_args,
-                        ..args.clone()
-                    }),
-                    body: vec![body],
-                    decorator_list: vec![],
-                    returns: Some(Box::new(return_type)),
-                    type_comment: None,
-                },
-                TextRange::default(),
-            );
-            return unparse_stmt(&func, stylist);
+            let func = Stmt::FunctionDef(ast::StmtFunctionDef {
+                name: name.into(),
+                args: Box::new(Arguments {
+                    posonlyargs: new_posonlyargs,
+                    args: new_args,
+                    ..args.clone()
+                }),
+                body: vec![body],
+                decorator_list: vec![],
+                returns: Some(Box::new(return_type)),
+                type_comment: None,
+                range: TextRange::default(),
+            });
+            return generator.stmt(&func);
         }
     }
-    let func = Stmt::new(
-        TextSize::default(),
-        TextSize::default(),
-        StmtKind::FunctionDef {
-            name: name.to_string(),
-            args: Box::new(args.clone()),
-            body: vec![body],
-            decorator_list: vec![],
-            returns: None,
-            type_comment: None,
-        },
-    );
-    unparse_stmt(&func, stylist)
+    let func = Stmt::FunctionDef(ast::StmtFunctionDef {
+        name: name.into(),
+        args: Box::new(args.clone()),
+        body: vec![body],
+        decorator_list: vec![],
+        returns: None,
+        type_comment: None,
+        range: TextRange::default(),
+    });
+    generator.stmt(&func)
 }
diff --git a/crates/ruff/src/rules/pycodestyle/rules/line_too_long.rs b/crates/ruff/src/rules/pycodestyle/rules/line_too_long.rs
index 4e34d25059c7e..3eb1e2b1e587d 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/line_too_long.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/line_too_long.rs
@@ -1,6 +1,6 @@
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::Line;
+use ruff_newlines::Line;
 
 use crate::rules::pycodestyle::helpers::is_overlong;
 use crate::settings::Settings;
@@ -11,6 +11,9 @@ use crate::settings::Settings;
 /// ## Why is this bad?
 /// Overlong lines can hurt readability.
 ///
+/// ## Options
+/// - `task-tags`
+///
 /// ## Example
 /// ```python
 /// my_function(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10)
@@ -43,6 +46,7 @@ pub(crate) fn line_too_long(line: &Line, settings: &Settings) -> Option<Diagnost
         limit,
         settings.pycodestyle.ignore_overlong_task_comments,
         &settings.task_tags,
+        settings.tab_size,
     )
-    .map(|overlong| Diagnostic::new(LineTooLong(overlong.width(), limit), overlong.range()))
+    .map(|overlong| Diagnostic::new(LineTooLong(overlong.width(), limit.get()), overlong.range()))
 }
diff --git a/crates/ruff/src/rules/pycodestyle/rules/literal_comparisons.rs b/crates/ruff/src/rules/pycodestyle/rules/literal_comparisons.rs
index 7b8713d0e3e13..37f33a7bf60eb 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/literal_comparisons.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/literal_comparisons.rs
@@ -1,8 +1,8 @@
 use itertools::izip;
 use rustc_hash::FxHashMap;
-use rustpython_parser::ast::{Cmpop, Constant, Expr, ExprKind};
+use rustpython_parser::ast::{self, Cmpop, Constant, Expr, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers;
 
@@ -11,7 +11,7 @@ use crate::registry::AsRule;
 use crate::rules::pycodestyle::helpers::compare;
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub enum EqCmpop {
+enum EqCmpop {
     Eq,
     NotEq,
 }
@@ -36,18 +36,21 @@ impl From<&Cmpop> for EqCmpop {
 /// ## Example
 /// ```python
 /// if arg != None:
+///     pass
 /// if None == arg:
+///     pass
 /// ```
 ///
 /// Use instead:
 /// ```python
 /// if arg is not None:
+///     pass
 /// ```
 ///
 /// ## References
 /// - [PEP 8](https://peps.python.org/pep-0008/#programming-recommendations)
 #[violation]
-pub struct NoneComparison(pub EqCmpop);
+pub struct NoneComparison(EqCmpop);
 
 impl AlwaysAutofixableViolation for NoneComparison {
     #[derive_message_formats]
@@ -78,19 +81,23 @@ impl AlwaysAutofixableViolation for NoneComparison {
 /// ## Example
 /// ```python
 /// if arg == True:
+///     pass
 /// if False == arg:
+///     pass
 /// ```
 ///
 /// Use instead:
 /// ```python
 /// if arg is True:
+///     pass
 /// if arg is False:
+///     pass
 /// ```
 ///
 /// ## References
 /// - [PEP 8](https://peps.python.org/pep-0008/#programming-recommendations)
 #[violation]
-pub struct TrueFalseComparison(pub bool, pub EqCmpop);
+pub struct TrueFalseComparison(bool, EqCmpop);
 
 impl AlwaysAutofixableViolation for TrueFalseComparison {
     #[derive_message_formats]
@@ -124,7 +131,7 @@ impl AlwaysAutofixableViolation for TrueFalseComparison {
 }
 
 /// E711, E712
-pub fn literal_comparisons(
+pub(crate) fn literal_comparisons(
     checker: &mut Checker,
     expr: &Expr,
     left: &Expr,
@@ -149,11 +156,12 @@ pub fn literal_comparisons(
     if !helpers::is_constant_non_singleton(next) {
         if check_none_comparisons
             && matches!(
-                comparator.node,
-                ExprKind::Constant {
+                comparator,
+                Expr::Constant(ast::ExprConstant {
                     value: Constant::None,
-                    kind: None
-                }
+                    kind: None,
+                    range: _
+                })
             )
         {
             if matches!(op, Cmpop::Eq) {
@@ -173,14 +181,15 @@ pub fn literal_comparisons(
         }
 
         if check_true_false_comparisons {
-            if let ExprKind::Constant {
+            if let Expr::Constant(ast::ExprConstant {
                 value: Constant::Bool(value),
                 kind: None,
-            } = comparator.node
+                range: _,
+            }) = comparator
             {
                 if matches!(op, Cmpop::Eq) {
                     let diagnostic =
-                        Diagnostic::new(TrueFalseComparison(value, op.into()), comparator.range());
+                        Diagnostic::new(TrueFalseComparison(*value, op.into()), comparator.range());
                     if checker.patch(diagnostic.kind.rule()) {
                         bad_ops.insert(0, Cmpop::Is);
                     }
@@ -188,7 +197,7 @@ pub fn literal_comparisons(
                 }
                 if matches!(op, Cmpop::NotEq) {
                     let diagnostic =
-                        Diagnostic::new(TrueFalseComparison(value, op.into()), comparator.range());
+                        Diagnostic::new(TrueFalseComparison(*value, op.into()), comparator.range());
                     if checker.patch(diagnostic.kind.rule()) {
                         bad_ops.insert(0, Cmpop::IsNot);
                     }
@@ -207,11 +216,12 @@ pub fn literal_comparisons(
 
         if check_none_comparisons
             && matches!(
-                next.node,
-                ExprKind::Constant {
+                next,
+                Expr::Constant(ast::ExprConstant {
                     value: Constant::None,
-                    kind: None
-                }
+                    kind: None,
+                    range: _
+                })
             )
         {
             if matches!(op, Cmpop::Eq) {
@@ -231,22 +241,22 @@ pub fn literal_comparisons(
         }
 
         if check_true_false_comparisons {
-            if let ExprKind::Constant {
+            if let Expr::Constant(ast::ExprConstant {
                 value: Constant::Bool(value),
                 kind: None,
-            } = next.node
+                range: _,
+            }) = next
             {
-                if matches!(op, Cmpop::Eq) {
+                if op.is_eq() {
                     let diagnostic =
-                        Diagnostic::new(TrueFalseComparison(value, op.into()), next.range());
+                        Diagnostic::new(TrueFalseComparison(*value, op.into()), next.range());
                     if checker.patch(diagnostic.kind.rule()) {
                         bad_ops.insert(idx, Cmpop::Is);
                     }
                     diagnostics.push(diagnostic);
-                }
-                if matches!(op, Cmpop::NotEq) {
+                } else if op.is_not_eq() {
                     let diagnostic =
-                        Diagnostic::new(TrueFalseComparison(value, op.into()), next.range());
+                        Diagnostic::new(TrueFalseComparison(*value, op.into()), next.range());
                     if checker.patch(diagnostic.kind.rule()) {
                         bad_ops.insert(idx, Cmpop::IsNot);
                     }
@@ -266,11 +276,15 @@ pub fn literal_comparisons(
             .iter()
             .enumerate()
             .map(|(idx, op)| bad_ops.get(&idx).unwrap_or(op))
-            .cloned()
+            .copied()
             .collect::<Vec<_>>();
-        let content = compare(left, &ops, comparators, checker.stylist);
+        let content = compare(left, &ops, comparators, checker.generator());
         for diagnostic in &mut diagnostics {
-            diagnostic.set_fix(Edit::range_replacement(content.to_string(), expr.range()));
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                content.to_string(),
+                expr.range(),
+            )));
         }
     }
 
diff --git a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/extraneous_whitespace.rs b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/extraneous_whitespace.rs
index 96e5a2a580fb6..d8a3512cf73ec 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/extraneous_whitespace.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/extraneous_whitespace.rs
@@ -1,11 +1,14 @@
+use ruff_diagnostics::AlwaysAutofixableViolation;
+use ruff_diagnostics::Diagnostic;
+use ruff_diagnostics::Edit;
+use ruff_diagnostics::Fix;
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::token_kind::TokenKind;
 use ruff_text_size::TextRange;
 
-use super::{LogicalLine, Whitespace};
 use crate::checkers::logical_lines::LogicalLinesContext;
-use ruff_diagnostics::DiagnosticKind;
-use ruff_diagnostics::Violation;
-use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::token_kind::TokenKind;
+
+use super::{LogicalLine, Whitespace};
 
 /// ## What it does
 /// Checks for the use of extraneous whitespace after "(".
@@ -30,12 +33,20 @@ use ruff_python_ast::token_kind::TokenKind;
 /// ## References
 /// - [PEP 8](https://peps.python.org/pep-0008/#pet-peeves)
 #[violation]
-pub struct WhitespaceAfterOpenBracket;
+pub struct WhitespaceAfterOpenBracket {
+    symbol: char,
+}
 
-impl Violation for WhitespaceAfterOpenBracket {
+impl AlwaysAutofixableViolation for WhitespaceAfterOpenBracket {
     #[derive_message_formats]
     fn message(&self) -> String {
-        format!("Whitespace after '('")
+        let WhitespaceAfterOpenBracket { symbol } = self;
+        format!("Whitespace after '{symbol}'")
+    }
+
+    fn autofix_title(&self) -> String {
+        let WhitespaceAfterOpenBracket { symbol } = self;
+        format!("Remove whitespace before '{symbol}'")
     }
 }
 
@@ -62,12 +73,20 @@ impl Violation for WhitespaceAfterOpenBracket {
 /// ## References
 /// - [PEP 8](https://peps.python.org/pep-0008/#pet-peeves)
 #[violation]
-pub struct WhitespaceBeforeCloseBracket;
+pub struct WhitespaceBeforeCloseBracket {
+    symbol: char,
+}
 
-impl Violation for WhitespaceBeforeCloseBracket {
+impl AlwaysAutofixableViolation for WhitespaceBeforeCloseBracket {
     #[derive_message_formats]
     fn message(&self) -> String {
-        format!("Whitespace before ')'")
+        let WhitespaceBeforeCloseBracket { symbol } = self;
+        format!("Whitespace before '{symbol}'")
+    }
+
+    fn autofix_title(&self) -> String {
+        let WhitespaceBeforeCloseBracket { symbol } = self;
+        format!("Remove whitespace before '{symbol}'")
     }
 }
 
@@ -92,54 +111,114 @@ impl Violation for WhitespaceBeforeCloseBracket {
 /// ## References
 /// - [PEP 8](https://peps.python.org/pep-0008/#pet-peeves)
 #[violation]
-pub struct WhitespaceBeforePunctuation;
+pub struct WhitespaceBeforePunctuation {
+    symbol: char,
+}
 
-impl Violation for WhitespaceBeforePunctuation {
+impl AlwaysAutofixableViolation for WhitespaceBeforePunctuation {
     #[derive_message_formats]
     fn message(&self) -> String {
-        format!("Whitespace before ',', ';', or ':'")
+        let WhitespaceBeforePunctuation { symbol } = self;
+        format!("Whitespace before '{symbol}'")
+    }
+
+    fn autofix_title(&self) -> String {
+        let WhitespaceBeforePunctuation { symbol } = self;
+        format!("Remove whitespace before '{symbol}'")
     }
 }
 
 /// E201, E202, E203
-pub(crate) fn extraneous_whitespace(line: &LogicalLine, context: &mut LogicalLinesContext) {
-    let mut last_token = TokenKind::EndOfFile;
+pub(crate) fn extraneous_whitespace(
+    line: &LogicalLine,
+    context: &mut LogicalLinesContext,
+    autofix_after_open_bracket: bool,
+    autofix_before_close_bracket: bool,
+    autofix_before_punctuation: bool,
+) {
+    let mut prev_token = None;
 
     for token in line.tokens() {
         let kind = token.kind();
-        match kind {
-            TokenKind::Lbrace | TokenKind::Lpar | TokenKind::Lsqb => {
-                if !matches!(line.trailing_whitespace(token), Whitespace::None) {
-                    context.push(WhitespaceAfterOpenBracket, TextRange::empty(token.end()));
+        if let Some(symbol) = BracketOrPunctuation::from_kind(kind) {
+            match symbol {
+                BracketOrPunctuation::OpenBracket(symbol) => {
+                    let (trailing, trailing_len) = line.trailing_whitespace(token);
+                    if !matches!(trailing, Whitespace::None) {
+                        let mut diagnostic = Diagnostic::new(
+                            WhitespaceAfterOpenBracket { symbol },
+                            TextRange::at(token.end(), trailing_len),
+                        );
+                        if autofix_after_open_bracket {
+                            diagnostic
+                                .set_fix(Fix::automatic(Edit::range_deletion(diagnostic.range())));
+                        }
+                        context.push_diagnostic(diagnostic);
+                    }
                 }
-            }
-            TokenKind::Rbrace
-            | TokenKind::Rpar
-            | TokenKind::Rsqb
-            | TokenKind::Comma
-            | TokenKind::Semi
-            | TokenKind::Colon => {
-                if let (Whitespace::Single | Whitespace::Many | Whitespace::Tab, offset) =
-                    line.leading_whitespace(token)
-                {
-                    if !matches!(last_token, TokenKind::Comma | TokenKind::EndOfFile) {
-                        let diagnostic_kind = if matches!(
-                            kind,
-                            TokenKind::Comma | TokenKind::Semi | TokenKind::Colon
-                        ) {
-                            DiagnosticKind::from(WhitespaceBeforePunctuation)
-                        } else {
-                            DiagnosticKind::from(WhitespaceBeforeCloseBracket)
-                        };
-
-                        context.push(diagnostic_kind, TextRange::empty(token.start() - offset));
+                BracketOrPunctuation::CloseBracket(symbol) => {
+                    if !matches!(prev_token, Some(TokenKind::Comma)) {
+                        if let (Whitespace::Single | Whitespace::Many | Whitespace::Tab, offset) =
+                            line.leading_whitespace(token)
+                        {
+                            let mut diagnostic = Diagnostic::new(
+                                WhitespaceBeforeCloseBracket { symbol },
+                                TextRange::at(token.start() - offset, offset),
+                            );
+                            if autofix_before_close_bracket {
+                                diagnostic.set_fix(Fix::automatic(Edit::range_deletion(
+                                    diagnostic.range(),
+                                )));
+                            }
+                            context.push_diagnostic(diagnostic);
+                        }
+                    }
+                }
+                BracketOrPunctuation::Punctuation(symbol) => {
+                    if !matches!(prev_token, Some(TokenKind::Comma)) {
+                        if let (Whitespace::Single | Whitespace::Many | Whitespace::Tab, offset) =
+                            line.leading_whitespace(token)
+                        {
+                            let mut diagnostic = Diagnostic::new(
+                                WhitespaceBeforePunctuation { symbol },
+                                TextRange::at(token.start() - offset, offset),
+                            );
+                            if autofix_before_punctuation {
+                                diagnostic.set_fix(Fix::automatic(Edit::range_deletion(
+                                    diagnostic.range(),
+                                )));
+                            }
+                            context.push_diagnostic(diagnostic);
+                        }
                     }
                 }
             }
-
-            _ => {}
         }
 
-        last_token = kind;
+        prev_token = Some(kind);
+    }
+}
+
+#[derive(Debug)]
+enum BracketOrPunctuation {
+    OpenBracket(char),
+    CloseBracket(char),
+    Punctuation(char),
+}
+
+impl BracketOrPunctuation {
+    fn from_kind(kind: TokenKind) -> Option<BracketOrPunctuation> {
+        match kind {
+            TokenKind::Lbrace => Some(BracketOrPunctuation::OpenBracket('{')),
+            TokenKind::Lpar => Some(BracketOrPunctuation::OpenBracket('(')),
+            TokenKind::Lsqb => Some(BracketOrPunctuation::OpenBracket('[')),
+            TokenKind::Rbrace => Some(BracketOrPunctuation::CloseBracket('}')),
+            TokenKind::Rpar => Some(BracketOrPunctuation::CloseBracket(')')),
+            TokenKind::Rsqb => Some(BracketOrPunctuation::CloseBracket(']')),
+            TokenKind::Comma => Some(BracketOrPunctuation::Punctuation(',')),
+            TokenKind::Colon => Some(BracketOrPunctuation::Punctuation(':')),
+            TokenKind::Semi => Some(BracketOrPunctuation::Punctuation(';')),
+            _ => None,
+        }
     }
 }
diff --git a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/indentation.rs b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/indentation.rs
index df4b8a454087f..a059ee9b6c306 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/indentation.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/indentation.rs
@@ -27,7 +27,7 @@ use super::LogicalLine;
 /// - [PEP 8](https://peps.python.org/pep-0008/#indentation)
 #[violation]
 pub struct IndentationWithInvalidMultiple {
-    pub indent_size: usize,
+    indent_size: usize,
 }
 
 impl Violation for IndentationWithInvalidMultiple {
@@ -60,7 +60,7 @@ impl Violation for IndentationWithInvalidMultiple {
 /// - [PEP 8](https://peps.python.org/pep-0008/#indentation)
 #[violation]
 pub struct IndentationWithInvalidMultipleComment {
-    pub indent_size: usize,
+    indent_size: usize,
 }
 
 impl Violation for IndentationWithInvalidMultipleComment {
@@ -219,12 +219,19 @@ impl Violation for UnexpectedIndentationComment {
 /// ## References
 /// - [PEP 8](https://peps.python.org/pep-0008/#indentation)
 #[violation]
-pub struct OverIndented;
+pub struct OverIndented {
+    is_comment: bool,
+}
 
 impl Violation for OverIndented {
     #[derive_message_formats]
     fn message(&self) -> String {
-        format!("Over-indented")
+        let OverIndented { is_comment } = self;
+        if *is_comment {
+            format!("Over-indented (comment)")
+        } else {
+            format!("Over-indented")
+        }
     }
 }
 
@@ -269,7 +276,12 @@ pub(crate) fn indentation(
         let expected_indent_amount = if indent_char == '\t' { 8 } else { 4 };
         let expected_indent_level = prev_indent_level.unwrap_or(0) + expected_indent_amount;
         if indent_level > expected_indent_level {
-            diagnostics.push(OverIndented.into());
+            diagnostics.push(
+                OverIndented {
+                    is_comment: logical_line.is_comment_only(),
+                }
+                .into(),
+            );
         }
     }
 
diff --git a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/missing_whitespace.rs b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/missing_whitespace.rs
index 56125881046c8..385ea9efe0917 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/missing_whitespace.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/missing_whitespace.rs
@@ -1,14 +1,17 @@
-use super::LogicalLine;
-use crate::checkers::logical_lines::LogicalLinesContext;
+use ruff_text_size::TextSize;
+
 use ruff_diagnostics::Edit;
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::token_kind::TokenKind;
-use ruff_text_size::{TextRange, TextSize};
+
+use crate::checkers::logical_lines::LogicalLinesContext;
+
+use super::LogicalLine;
 
 #[violation]
 pub struct MissingWhitespace {
-    pub token: TokenKind,
+    token: TokenKind,
 }
 
 impl MissingWhitespace {
@@ -50,11 +53,11 @@ pub(crate) fn missing_whitespace(
         let kind = token.kind();
         match kind {
             TokenKind::Lsqb => {
-                open_parentheses += 1;
+                open_parentheses = open_parentheses.saturating_add(1);
                 prev_lsqb = token.start();
             }
             TokenKind::Rsqb => {
-                open_parentheses += 1;
+                open_parentheses = open_parentheses.saturating_sub(1);
             }
             TokenKind::Lbrace => {
                 prev_lbrace = token.start();
@@ -63,7 +66,11 @@ pub(crate) fn missing_whitespace(
             TokenKind::Comma | TokenKind::Semi | TokenKind::Colon => {
                 let after = line.text_after(token);
 
-                if !after.chars().next().map_or(false, char::is_whitespace) {
+                if !after
+                    .chars()
+                    .next()
+                    .map_or(false, |c| char::is_whitespace(c) || c == '\\')
+                {
                     if let Some(next_token) = iter.peek() {
                         match (kind, next_token.kind()) {
                             (TokenKind::Colon, _)
@@ -82,11 +89,14 @@ pub(crate) fn missing_whitespace(
                     }
 
                     let kind = MissingWhitespace { token: kind };
-
-                    let mut diagnostic = Diagnostic::new(kind, TextRange::empty(token.start()));
+                    let mut diagnostic = Diagnostic::new(kind, token.range());
 
                     if autofix {
-                        diagnostic.set_fix(Edit::insertion(" ".to_string(), token.end()));
+                        #[allow(deprecated)]
+                        diagnostic.set_fix(Fix::unspecified(Edit::insertion(
+                            " ".to_string(),
+                            token.end(),
+                        )));
                     }
                     context.push_diagnostic(diagnostic);
                 }
diff --git a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/missing_whitespace_after_keyword.rs b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/missing_whitespace_after_keyword.rs
index 6460713f55960..19ee6a1e4e201 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/missing_whitespace_after_keyword.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/missing_whitespace_after_keyword.rs
@@ -1,9 +1,9 @@
-use crate::checkers::logical_lines::LogicalLinesContext;
-use crate::rules::pycodestyle::rules::logical_lines::LogicalLine;
 use ruff_diagnostics::Violation;
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::token_kind::TokenKind;
-use ruff_text_size::TextRange;
+
+use crate::checkers::logical_lines::LogicalLinesContext;
+use crate::rules::pycodestyle::rules::logical_lines::LogicalLine;
 
 #[violation]
 pub struct MissingWhitespaceAfterKeyword;
@@ -32,10 +32,13 @@ pub(crate) fn missing_whitespace_after_keyword(
                 || matches!(tok0_kind, TokenKind::Async | TokenKind::Await)
                 || tok0_kind == TokenKind::Except && tok1_kind == TokenKind::Star
                 || tok0_kind == TokenKind::Yield && tok1_kind == TokenKind::Rpar
-                || matches!(tok1_kind, TokenKind::Colon | TokenKind::Newline))
+                || matches!(
+                    tok1_kind,
+                    TokenKind::Colon | TokenKind::Newline | TokenKind::NonLogicalNewline
+                ))
             && tok0.end() == tok1.start()
         {
-            context.push(MissingWhitespaceAfterKeyword, TextRange::empty(tok0.end()));
+            context.push(MissingWhitespaceAfterKeyword, tok0.range());
         }
     }
 }
diff --git a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/missing_whitespace_around_operator.rs b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/missing_whitespace_around_operator.rs
index 5200a8bdf55fd..5ba42b712f777 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/missing_whitespace_around_operator.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/missing_whitespace_around_operator.rs
@@ -1,9 +1,9 @@
-use crate::checkers::logical_lines::LogicalLinesContext;
-use crate::rules::pycodestyle::rules::logical_lines::{LogicalLine, LogicalLineToken};
 use ruff_diagnostics::{DiagnosticKind, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::token_kind::TokenKind;
-use ruff_text_size::TextRange;
+
+use crate::checkers::logical_lines::LogicalLinesContext;
+use crate::rules::pycodestyle::rules::logical_lines::LogicalLine;
 
 // E225
 #[violation]
@@ -50,14 +50,22 @@ impl Violation for MissingWhitespaceAroundModuloOperator {
 }
 
 /// E225, E226, E227, E228
-#[allow(clippy::if_same_then_else)]
 pub(crate) fn missing_whitespace_around_operator(
     line: &LogicalLine,
     context: &mut LogicalLinesContext,
 ) {
-    let mut parens = 0u32;
-    let mut prev_token: Option<&LogicalLineToken> = None;
     let mut tokens = line.tokens().iter().peekable();
+    let first_token = tokens.by_ref().find_map(|token| {
+        let kind = token.kind();
+        (!kind.is_trivia()).then_some(token)
+    });
+    let Some(mut prev_token) = first_token else {
+        return;
+    };
+    let mut parens = u32::from(matches!(
+        prev_token.kind(),
+        TokenKind::Lpar | TokenKind::Lambda
+    ));
 
     while let Some(token) = tokens.next() {
         let kind = token.kind();
@@ -87,8 +95,8 @@ pub(crate) fn missing_whitespace_around_operator(
             );
 
             NeedsSpace::from(!slash_in_func)
-        } else if kind.is_unary() || kind == TokenKind::DoubleStar {
-            let is_binary = prev_token.map_or(false, |prev_token| {
+        } else if kind.is_unary() || matches!(kind, TokenKind::Star | TokenKind::DoubleStar) {
+            let is_binary = {
                 let prev_kind = prev_token.kind();
 
                 // Check if the operator is used as a binary operator.
@@ -100,7 +108,7 @@ pub(crate) fn missing_whitespace_around_operator(
                 ) || !(prev_kind.is_operator()
                     || prev_kind.is_keyword()
                     || prev_kind.is_soft_keyword())
-            });
+            };
 
             if is_binary {
                 if kind == TokenKind::DoubleStar {
@@ -119,45 +127,33 @@ pub(crate) fn missing_whitespace_around_operator(
         };
 
         if needs_space != NeedsSpace::No {
-            let has_leading_trivia = prev_token.map_or(true, |prev| {
-                prev.end() < token.start() || prev.kind().is_trivia()
-            });
+            let has_leading_trivia =
+                prev_token.end() < token.start() || prev_token.kind().is_trivia();
 
             let has_trailing_trivia = tokens.peek().map_or(true, |next| {
                 token.end() < next.start() || next.kind().is_trivia()
             });
 
             match (has_leading_trivia, has_trailing_trivia) {
-                // Operator with trailing but no leading space, enforce consistent spacing
-                (false, true) => {
-                    context.push(
-                        MissingWhitespaceAroundOperator,
-                        TextRange::empty(token.start()),
-                    );
-                }
+                // Operator with trailing but no leading space, enforce consistent spacing.
+                (false, true) |
                 // Operator with leading but no trailing space, enforce consistent spacing.
                 (true, false) => {
-                    context.push(
-                        MissingWhitespaceAroundOperator,
-                        TextRange::empty(token.end()),
-                    );
+                    context.push(MissingWhitespaceAroundOperator, token.range());
                 }
                 // Operator with no space, require spaces if it is required by the operator.
                 (false, false) => {
                     if needs_space == NeedsSpace::Yes {
-                        context.push(
-                            diagnostic_kind_for_operator(kind),
-                            TextRange::empty(token.start()),
-                        );
+                        context.push(diagnostic_kind_for_operator(kind), token.range());
                     }
                 }
                 (true, true) => {
-                    // Operator has leading and trailing space, all good
+                    // Operator has leading and trailing spaces, all good.
                 }
             }
         }
 
-        prev_token = Some(token);
+        prev_token = token;
     }
 }
 
@@ -229,5 +225,7 @@ fn is_whitespace_needed(kind: TokenKind) -> bool {
             | TokenKind::Slash
             | TokenKind::Percent
     ) || kind.is_arithmetic()
-        || kind.is_bitwise_or_shift()
+        || (kind.is_bitwise_or_shift() &&
+            // As a special-case, pycodestyle seems to ignore whitespace around the tilde.
+            !matches!(kind, TokenKind::Tilde))
 }
diff --git a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/mod.rs b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/mod.rs
index b98aeceaf24d1..27086f77a894c 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/mod.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/mod.rs
@@ -83,11 +83,11 @@ pub(crate) struct LogicalLines<'a> {
 }
 
 impl<'a> LogicalLines<'a> {
-    pub fn from_tokens(tokens: &'a [LexResult], locator: &'a Locator<'a>) -> Self {
+    pub(crate) fn from_tokens(tokens: &'a [LexResult], locator: &'a Locator<'a>) -> Self {
         assert!(u32::try_from(tokens.len()).is_ok());
 
         let mut builder = LogicalLinesBuilder::with_capacity(tokens.len());
-        let mut parens: u32 = 0;
+        let mut parens = 0u32;
 
         for (token, range) in tokens.iter().flatten() {
             let token_kind = TokenKind::from_token(token);
@@ -95,14 +95,12 @@ impl<'a> LogicalLines<'a> {
 
             match token_kind {
                 TokenKind::Lbrace | TokenKind::Lpar | TokenKind::Lsqb => {
-                    parens += 1;
+                    parens = parens.saturating_add(1);
                 }
                 TokenKind::Rbrace | TokenKind::Rpar | TokenKind::Rsqb => {
-                    parens -= 1;
+                    parens = parens.saturating_sub(1);
                 }
-                TokenKind::Newline | TokenKind::NonLogicalNewline | TokenKind::Comment
-                    if parens == 0 =>
-                {
+                TokenKind::Newline | TokenKind::NonLogicalNewline if parens == 0 => {
                     builder.finish_line();
                 }
                 _ => {}
@@ -153,13 +151,18 @@ pub(crate) struct LogicalLine<'a> {
 }
 
 impl<'a> LogicalLine<'a> {
+    /// Returns `true` if this line is positioned at the start of the file.
+    pub(crate) const fn is_start_of_file(&self) -> bool {
+        self.line.tokens_start == 0
+    }
+
     /// Returns `true` if this is a comment only line
-    pub fn is_comment_only(&self) -> bool {
+    pub(crate) fn is_comment_only(&self) -> bool {
         self.flags() == TokenFlags::COMMENT
     }
 
     /// Returns logical line's text including comments, indents, dedent and trailing new lines.
-    pub fn text(&self) -> &'a str {
+    pub(crate) fn text(&self) -> &'a str {
         let tokens = self.tokens();
         match (tokens.first(), tokens.last()) {
             (Some(first), Some(last)) => self
@@ -172,7 +175,7 @@ impl<'a> LogicalLine<'a> {
 
     /// Returns the text without any leading or trailing newline, comment, indent, or dedent of this line
     #[cfg(test)]
-    pub fn text_trimmed(&self) -> &'a str {
+    pub(crate) fn text_trimmed(&self) -> &'a str {
         let tokens = self.tokens_trimmed();
 
         match (tokens.first(), tokens.last()) {
@@ -184,7 +187,7 @@ impl<'a> LogicalLine<'a> {
         }
     }
 
-    pub fn tokens_trimmed(&self) -> &'a [LogicalLineToken] {
+    pub(crate) fn tokens_trimmed(&self) -> &'a [LogicalLineToken] {
         let tokens = self.tokens();
 
         let start = tokens
@@ -222,7 +225,7 @@ impl<'a> LogicalLine<'a> {
 
     /// Returns the text after `token`
     #[inline]
-    pub fn text_after(&self, token: &'a LogicalLineToken) -> &str {
+    pub(crate) fn text_after(&self, token: &'a LogicalLineToken) -> &str {
         // SAFETY: The line must have at least one token or `token` would not belong to this line.
         let last_token = self.tokens().last().unwrap();
         self.lines
@@ -232,7 +235,7 @@ impl<'a> LogicalLine<'a> {
 
     /// Returns the text before `token`
     #[inline]
-    pub fn text_before(&self, token: &'a LogicalLineToken) -> &str {
+    pub(crate) fn text_before(&self, token: &'a LogicalLineToken) -> &str {
         // SAFETY: The line must have at least one token or `token` would not belong to this line.
         let first_token = self.tokens().first().unwrap();
         self.lines
@@ -240,27 +243,30 @@ impl<'a> LogicalLine<'a> {
             .slice(TextRange::new(first_token.start(), token.start()))
     }
 
-    /// Returns the whitespace *after* the `token`
-    pub fn trailing_whitespace(&self, token: &'a LogicalLineToken) -> Whitespace {
+    /// Returns the whitespace *after* the `token` with the byte length
+    pub(crate) fn trailing_whitespace(
+        &self,
+        token: &'a LogicalLineToken,
+    ) -> (Whitespace, TextSize) {
         Whitespace::leading(self.text_after(token))
     }
 
     /// Returns the whitespace and whitespace byte-length *before* the `token`
-    pub fn leading_whitespace(&self, token: &'a LogicalLineToken) -> (Whitespace, TextSize) {
+    pub(crate) fn leading_whitespace(&self, token: &'a LogicalLineToken) -> (Whitespace, TextSize) {
         Whitespace::trailing(self.text_before(token))
     }
 
     /// Returns all tokens of the line, including comments and trailing new lines.
-    pub fn tokens(&self) -> &'a [LogicalLineToken] {
+    pub(crate) fn tokens(&self) -> &'a [LogicalLineToken] {
         &self.lines.tokens[self.line.tokens_start as usize..self.line.tokens_end as usize]
     }
 
-    pub fn first_token(&self) -> Option<&'a LogicalLineToken> {
+    pub(crate) fn first_token(&self) -> Option<&'a LogicalLineToken> {
         self.tokens().first()
     }
 
     /// Returns the line's flags
-    pub const fn flags(&self) -> TokenFlags {
+    pub(crate) const fn flags(&self) -> TokenFlags {
         self.line.flags
     }
 }
@@ -326,30 +332,30 @@ pub(crate) struct LogicalLineToken {
 impl LogicalLineToken {
     /// Returns the token's kind
     #[inline]
-    pub const fn kind(&self) -> TokenKind {
+    pub(crate) const fn kind(&self) -> TokenKind {
         self.kind
     }
 
     /// Returns the token's start location
     #[inline]
-    pub const fn start(&self) -> TextSize {
+    pub(crate) const fn start(&self) -> TextSize {
         self.range.start()
     }
 
     /// Returns the token's end location
     #[inline]
-    pub const fn end(&self) -> TextSize {
+    pub(crate) const fn end(&self) -> TextSize {
         self.range.end()
     }
 
     /// Returns a tuple with the token's `(start, end)` locations
     #[inline]
-    pub const fn range(&self) -> TextRange {
+    pub(crate) const fn range(&self) -> TextRange {
         self.range
     }
 }
 
-#[derive(Copy, Clone, Eq, PartialEq)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
 pub(crate) enum Whitespace {
     None,
     Single,
@@ -358,35 +364,48 @@ pub(crate) enum Whitespace {
 }
 
 impl Whitespace {
-    fn leading(content: &str) -> Self {
+    fn leading(content: &str) -> (Self, TextSize) {
         let mut count = 0u32;
+        let mut len = TextSize::default();
+        let mut has_tabs = false;
 
         for c in content.chars() {
-            if c == '\t' {
-                return Self::Tab;
+            if c == '#' {
+                // Ignore leading whitespace between a token and an end-of-line comment
+                return (Whitespace::None, TextSize::default());
+            } else if c == '\t' {
+                has_tabs = true;
+                len += c.text_len();
             } else if matches!(c, '\n' | '\r') {
                 break;
             } else if c.is_whitespace() {
                 count += 1;
+                len += c.text_len();
             } else {
                 break;
             }
         }
 
-        match count {
-            0 => Whitespace::None,
-            1 => Whitespace::Single,
-            _ => Whitespace::Many,
+        if has_tabs {
+            (Whitespace::Tab, len)
+        } else {
+            match count {
+                0 => (Whitespace::None, len),
+                1 => (Whitespace::Single, len),
+                _ => (Whitespace::Many, len),
+            }
         }
     }
 
     fn trailing(content: &str) -> (Self, TextSize) {
         let mut len = TextSize::default();
         let mut count = 0usize;
+        let mut has_tabs = false;
 
         for c in content.chars().rev() {
             if c == '\t' {
-                return (Self::Tab, len + c.text_len());
+                has_tabs = true;
+                len += c.text_len();
             } else if matches!(c, '\n' | '\r') {
                 // Indent
                 return (Self::None, TextSize::default());
@@ -398,15 +417,19 @@ impl Whitespace {
             }
         }
 
-        match count {
-            0 => (Self::None, TextSize::default()),
-            1 => (Self::Single, len),
-            _ => {
-                if len == content.text_len() {
-                    // All whitespace up to the start of the line -> Indent
-                    (Self::None, TextSize::default())
-                } else {
-                    (Self::Many, len)
+        if has_tabs {
+            (Self::Tab, len)
+        } else {
+            match count {
+                0 => (Self::None, TextSize::default()),
+                1 => (Self::Single, len),
+                _ => {
+                    if len == content.text_len() {
+                        // All whitespace up to the start of the line -> Indent
+                        (Self::None, TextSize::default())
+                    } else {
+                        (Self::Many, len)
+                    }
                 }
             }
         }
@@ -485,11 +508,16 @@ impl LogicalLinesBuilder {
     fn finish_line(&mut self) {
         let end = self.tokens.len() as u32;
         if self.current_line.tokens_start < end {
-            self.lines.push(Line {
-                flags: self.current_line.flags,
-                tokens_start: self.current_line.tokens_start,
-                tokens_end: end,
-            });
+            let is_empty = self.tokens[self.current_line.tokens_start as usize..end as usize]
+                .iter()
+                .all(|token| token.kind.is_newline());
+            if !is_empty {
+                self.lines.push(Line {
+                    flags: self.current_line.flags,
+                    tokens_start: self.current_line.tokens_start,
+                    tokens_end: end,
+                });
+            }
 
             self.current_line = CurrentLine {
                 flags: TokenFlags::default(),
@@ -515,3 +543,103 @@ struct Line {
     tokens_start: u32,
     tokens_end: u32,
 }
+
+#[cfg(test)]
+mod tests {
+    use rustpython_parser::lexer::LexResult;
+    use rustpython_parser::{lexer, Mode};
+
+    use ruff_python_ast::source_code::Locator;
+
+    use super::LogicalLines;
+
+    #[test]
+    fn multi_line() {
+        assert_logical_lines(
+            r#"
+x = 1
+y = 2
+z = x + 1"#
+                .trim(),
+            &["x = 1", "y = 2", "z = x + 1"],
+        );
+    }
+
+    #[test]
+    fn indented() {
+        assert_logical_lines(
+            r#"
+x = [
+  1,
+  2,
+  3,
+]
+y = 2
+z = x + 1"#
+                .trim(),
+            &["x = [\n  1,\n  2,\n  3,\n]", "y = 2", "z = x + 1"],
+        );
+    }
+
+    #[test]
+    fn string_assignment() {
+        assert_logical_lines("x = 'abc'".trim(), &["x = 'abc'"]);
+    }
+
+    #[test]
+    fn function_definition() {
+        assert_logical_lines(
+            r#"
+def f():
+  x = 1
+f()"#
+                .trim(),
+            &["def f():", "x = 1", "f()"],
+        );
+    }
+
+    #[test]
+    fn trivia() {
+        assert_logical_lines(
+            r#"
+def f():
+  """Docstring goes here."""
+  # Comment goes here.
+  x = 1
+f()"#
+                .trim(),
+            &[
+                "def f():",
+                "\"\"\"Docstring goes here.\"\"\"",
+                "",
+                "x = 1",
+                "f()",
+            ],
+        );
+    }
+
+    #[test]
+    fn empty_line() {
+        assert_logical_lines(
+            r#"
+if False:
+
+    print()
+"#
+            .trim(),
+            &["if False:", "print()", ""],
+        );
+    }
+
+    fn assert_logical_lines(contents: &str, expected: &[&str]) {
+        let lxr: Vec<LexResult> = lexer::lex(contents, Mode::Module).collect();
+        let locator = Locator::new(contents);
+        let actual: Vec<String> = LogicalLines::from_tokens(&lxr, &locator)
+            .into_iter()
+            .map(|line| line.text_trimmed())
+            .map(ToString::to_string)
+            .collect();
+        let expected: Vec<String> = expected.iter().map(ToString::to_string).collect();
+        assert_eq!(actual, expected);
+    }
+}
diff --git a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/space_around_operator.rs b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/space_around_operator.rs
index e3cba4c894bd9..5c111773def67 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/space_around_operator.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/space_around_operator.rs
@@ -1,11 +1,13 @@
 use ruff_text_size::TextRange;
 
-use super::{LogicalLine, Whitespace};
-use crate::checkers::logical_lines::LogicalLinesContext;
 use ruff_diagnostics::Violation;
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::token_kind::TokenKind;
 
+use crate::checkers::logical_lines::LogicalLinesContext;
+
+use super::{LogicalLine, Whitespace};
+
 /// ## What it does
 /// Checks for extraneous tabs before an operator.
 ///
@@ -133,14 +135,15 @@ pub(crate) fn space_around_operator(line: &LogicalLine, context: &mut LogicalLin
             if !after_operator {
                 match line.leading_whitespace(token) {
                     (Whitespace::Tab, offset) => {
-                        let start = token.start();
-                        context.push(TabBeforeOperator, TextRange::empty(start - offset));
+                        context.push(
+                            TabBeforeOperator,
+                            TextRange::at(token.start() - offset, offset),
+                        );
                     }
                     (Whitespace::Many, offset) => {
-                        let start = token.start();
                         context.push(
                             MultipleSpacesBeforeOperator,
-                            TextRange::empty(start - offset),
+                            TextRange::at(token.start() - offset, offset),
                         );
                     }
                     _ => {}
@@ -148,13 +151,11 @@ pub(crate) fn space_around_operator(line: &LogicalLine, context: &mut LogicalLin
             }
 
             match line.trailing_whitespace(token) {
-                Whitespace::Tab => {
-                    let end = token.end();
-                    context.push(TabAfterOperator, TextRange::empty(end));
+                (Whitespace::Tab, len) => {
+                    context.push(TabAfterOperator, TextRange::at(token.end(), len));
                 }
-                Whitespace::Many => {
-                    let end = token.end();
-                    context.push(MultipleSpacesAfterOperator, TextRange::empty(end));
+                (Whitespace::Many, len) => {
+                    context.push(MultipleSpacesAfterOperator, TextRange::at(token.end(), len));
                 }
                 _ => {}
             }
diff --git a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/whitespace_around_keywords.rs b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/whitespace_around_keywords.rs
index 121fee2659544..d65d1a169328c 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/whitespace_around_keywords.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/whitespace_around_keywords.rs
@@ -1,8 +1,11 @@
-use super::{LogicalLine, Whitespace};
-use crate::checkers::logical_lines::LogicalLinesContext;
+use ruff_text_size::TextRange;
+
 use ruff_diagnostics::Violation;
 use ruff_macros::{derive_message_formats, violation};
-use ruff_text_size::TextRange;
+
+use crate::checkers::logical_lines::LogicalLinesContext;
+
+use super::{LogicalLine, Whitespace};
 
 /// ## What it does
 /// Checks for extraneous whitespace after keywords.
@@ -118,13 +121,13 @@ pub(crate) fn whitespace_around_keywords(line: &LogicalLine, context: &mut Logic
                 match line.leading_whitespace(token) {
                     (Whitespace::Tab, offset) => {
                         let start = token.start();
-                        context.push(TabBeforeKeyword, TextRange::empty(start - offset));
+                        context.push(TabBeforeKeyword, TextRange::at(start - offset, offset));
                     }
                     (Whitespace::Many, offset) => {
                         let start = token.start();
                         context.push(
                             MultipleSpacesBeforeKeyword,
-                            TextRange::empty(start - offset),
+                            TextRange::at(start - offset, offset),
                         );
                     }
                     _ => {}
@@ -132,13 +135,11 @@ pub(crate) fn whitespace_around_keywords(line: &LogicalLine, context: &mut Logic
             }
 
             match line.trailing_whitespace(token) {
-                Whitespace::Tab => {
-                    let end = token.end();
-                    context.push(TabAfterKeyword, TextRange::empty(end));
+                (Whitespace::Tab, len) => {
+                    context.push(TabAfterKeyword, TextRange::at(token.end(), len));
                 }
-                Whitespace::Many => {
-                    let end = token.end();
-                    context.push(MultipleSpacesAfterKeyword, TextRange::empty(end));
+                (Whitespace::Many, len) => {
+                    context.push(MultipleSpacesAfterKeyword, TextRange::at(token.end(), len));
                 }
                 _ => {}
             }
diff --git a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/whitespace_around_named_parameter_equals.rs b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/whitespace_around_named_parameter_equals.rs
index bf104e71799d0..3390d099e068e 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/whitespace_around_named_parameter_equals.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/whitespace_around_named_parameter_equals.rs
@@ -1,9 +1,11 @@
-use crate::checkers::logical_lines::LogicalLinesContext;
-use crate::rules::pycodestyle::rules::logical_lines::{LogicalLine, LogicalLineToken};
+use ruff_text_size::{TextRange, TextSize};
+
 use ruff_diagnostics::Violation;
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::token_kind::TokenKind;
-use ruff_text_size::{TextRange, TextSize};
+
+use crate::checkers::logical_lines::LogicalLinesContext;
+use crate::rules::pycodestyle::rules::logical_lines::{LogicalLine, LogicalLineToken};
 
 #[violation]
 pub struct UnexpectedSpacesAroundKeywordParameterEquals;
@@ -58,11 +60,10 @@ pub(crate) fn whitespace_around_named_parameter_equals(
 
         match kind {
             TokenKind::Lpar | TokenKind::Lsqb => {
-                parens += 1;
+                parens = parens.saturating_add(1);
             }
             TokenKind::Rpar | TokenKind::Rsqb => {
-                parens -= 1;
-
+                parens = parens.saturating_sub(1);
                 if parens == 0 {
                     annotated_func_arg = false;
                 }
@@ -78,10 +79,7 @@ pub(crate) fn whitespace_around_named_parameter_equals(
                 if annotated_func_arg && parens == 1 {
                     let start = token.start();
                     if start == prev_end && prev_end != TextSize::new(0) {
-                        context.push(
-                            MissingWhitespaceAroundParameterEquals,
-                            TextRange::empty(start),
-                        );
+                        context.push(MissingWhitespaceAroundParameterEquals, token.range());
                     }
 
                     while let Some(next) = iter.peek() {
@@ -91,10 +89,7 @@ pub(crate) fn whitespace_around_named_parameter_equals(
                             let next_start = next.start();
 
                             if next_start == token.end() {
-                                context.push(
-                                    MissingWhitespaceAroundParameterEquals,
-                                    TextRange::empty(next_start),
-                                );
+                                context.push(MissingWhitespaceAroundParameterEquals, token.range());
                             }
                             break;
                         }
@@ -103,7 +98,7 @@ pub(crate) fn whitespace_around_named_parameter_equals(
                     if token.start() != prev_end {
                         context.push(
                             UnexpectedSpacesAroundKeywordParameterEquals,
-                            TextRange::empty(prev_end),
+                            TextRange::new(prev_end, token.start()),
                         );
                     }
 
@@ -114,7 +109,7 @@ pub(crate) fn whitespace_around_named_parameter_equals(
                             if next.start() != token.end() {
                                 context.push(
                                     UnexpectedSpacesAroundKeywordParameterEquals,
-                                    TextRange::empty(token.end()),
+                                    TextRange::new(token.end(), next.start()),
                                 );
                             }
                             break;
diff --git a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/whitespace_before_comment.rs b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/whitespace_before_comment.rs
index 5ba261116ec51..455bd5f0f34d9 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/whitespace_before_comment.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/whitespace_before_comment.rs
@@ -1,10 +1,12 @@
-use crate::checkers::logical_lines::LogicalLinesContext;
-use crate::rules::pycodestyle::rules::logical_lines::LogicalLine;
+use ruff_text_size::{TextLen, TextRange, TextSize};
+
 use ruff_diagnostics::Violation;
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::Locator;
 use ruff_python_ast::token_kind::TokenKind;
-use ruff_text_size::{TextLen, TextRange, TextSize};
+
+use crate::checkers::logical_lines::LogicalLinesContext;
+use crate::rules::pycodestyle::rules::logical_lines::LogicalLine;
 
 /// ## What it does
 /// Checks if inline comments are separated by at least two spaces.
@@ -139,7 +141,6 @@ impl Violation for MultipleLeadingHashesForBlockComment {
 pub(crate) fn whitespace_before_comment(
     line: &LogicalLine,
     locator: &Locator,
-    is_first_row: bool,
     context: &mut LogicalLinesContext,
 ) {
     let mut prev_end = TextSize::default();
@@ -149,13 +150,13 @@ pub(crate) fn whitespace_before_comment(
         if let TokenKind::Comment = kind {
             let range = token.range();
 
-            let line = locator.slice(TextRange::new(
+            let line_text = locator.slice(TextRange::new(
                 locator.line_start(range.start()),
                 range.start(),
             ));
-            let text = locator.slice(range);
+            let token_text = locator.slice(range);
 
-            let is_inline_comment = !line.trim().is_empty();
+            let is_inline_comment = !line_text.trim().is_empty();
             if is_inline_comment {
                 if range.start() - prev_end < "  ".text_len() {
                     context.push(
@@ -166,7 +167,7 @@ pub(crate) fn whitespace_before_comment(
             }
 
             // Split into the portion before and after the first space.
-            let mut parts = text.splitn(2, ' ');
+            let mut parts = token_text.splitn(2, ' ');
             let symbol = parts.next().unwrap_or("");
             let comment = parts.next().unwrap_or("");
 
@@ -182,7 +183,7 @@ pub(crate) fn whitespace_before_comment(
                     context.push(NoSpaceAfterInlineComment, range);
                 }
             } else if let Some(bad_prefix) = bad_prefix {
-                if bad_prefix != '!' || !is_first_row {
+                if bad_prefix != '!' || !line.is_start_of_file() {
                     if bad_prefix != '#' {
                         context.push(NoSpaceAfterBlockComment, range);
                     } else if !comment.is_empty() {
diff --git a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/whitespace_before_parameters.rs b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/whitespace_before_parameters.rs
index 1007a3515194e..a65220fa74db5 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/whitespace_before_parameters.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/whitespace_before_parameters.rs
@@ -1,13 +1,15 @@
-use crate::checkers::logical_lines::LogicalLinesContext;
-use crate::rules::pycodestyle::rules::logical_lines::LogicalLine;
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_text_size::{TextRange, TextSize};
+
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::token_kind::TokenKind;
-use ruff_text_size::{TextRange, TextSize};
+
+use crate::checkers::logical_lines::LogicalLinesContext;
+use crate::rules::pycodestyle::rules::logical_lines::LogicalLine;
 
 #[violation]
 pub struct WhitespaceBeforeParameters {
-    pub bracket: TokenKind,
+    bracket: TokenKind,
 }
 
 impl WhitespaceBeforeParameters {
@@ -63,7 +65,8 @@ pub(crate) fn whitespace_before_parameters(
             let mut diagnostic = Diagnostic::new(kind, TextRange::new(start, end));
 
             if autofix {
-                diagnostic.set_fix(Edit::deletion(start, end));
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::deletion(start, end)));
             }
             context.push_diagnostic(diagnostic);
         }
diff --git a/crates/ruff/src/rules/pycodestyle/rules/missing_newline_at_end_of_file.rs b/crates/ruff/src/rules/pycodestyle/rules/missing_newline_at_end_of_file.rs
index 94aed8b41d694..58bb6d12c7261 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/missing_newline_at_end_of_file.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/missing_newline_at_end_of_file.rs
@@ -1,6 +1,6 @@
 use ruff_text_size::{TextLen, TextRange};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::{Locator, Stylist};
 
@@ -35,7 +35,7 @@ impl AlwaysAutofixableViolation for MissingNewlineAtEndOfFile {
 }
 
 /// W292
-pub fn no_newline_at_end_of_file(
+pub(crate) fn no_newline_at_end_of_file(
     locator: &Locator,
     stylist: &Stylist,
     autofix: bool,
@@ -55,10 +55,11 @@ pub fn no_newline_at_end_of_file(
 
         let mut diagnostic = Diagnostic::new(MissingNewlineAtEndOfFile, range);
         if autofix {
-            diagnostic.set_fix(Edit::insertion(
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::insertion(
                 stylist.line_ending().to_string(),
                 range.start(),
-            ));
+            )));
         }
         return Some(diagnostic);
     }
diff --git a/crates/ruff/src/rules/pycodestyle/rules/mixed_spaces_and_tabs.rs b/crates/ruff/src/rules/pycodestyle/rules/mixed_spaces_and_tabs.rs
index c296adeb89bef..cd85e1ed3e7b2 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/mixed_spaces_and_tabs.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/mixed_spaces_and_tabs.rs
@@ -1,8 +1,9 @@
+use ruff_text_size::{TextLen, TextRange};
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::Line;
+use ruff_newlines::Line;
 use ruff_python_ast::whitespace::leading_space;
-use ruff_text_size::{TextLen, TextRange};
 
 /// ## What it does
 /// Checks for mixed tabs and spaces in indentation.
diff --git a/crates/ruff/src/rules/pycodestyle/rules/mod.rs b/crates/ruff/src/rules/pycodestyle/rules/mod.rs
index 4a5c3a1ba0804..2d43de0186898 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/mod.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/mod.rs
@@ -1,30 +1,33 @@
-pub use ambiguous_class_name::{ambiguous_class_name, AmbiguousClassName};
-pub use ambiguous_function_name::{ambiguous_function_name, AmbiguousFunctionName};
-pub use ambiguous_variable_name::{ambiguous_variable_name, AmbiguousVariableName};
-pub use bare_except::{bare_except, BareExcept};
-pub use compound_statements::{
+pub(crate) use ambiguous_class_name::{ambiguous_class_name, AmbiguousClassName};
+pub(crate) use ambiguous_function_name::{ambiguous_function_name, AmbiguousFunctionName};
+pub(crate) use ambiguous_variable_name::{ambiguous_variable_name, AmbiguousVariableName};
+pub(crate) use bare_except::{bare_except, BareExcept};
+pub(crate) use compound_statements::{
     compound_statements, MultipleStatementsOnOneLineColon, MultipleStatementsOnOneLineSemicolon,
     UselessSemicolon,
 };
 pub(crate) use doc_line_too_long::{doc_line_too_long, DocLineTooLong};
-pub use errors::{syntax_error, IOError, SyntaxError};
-pub use imports::{
+pub use errors::IOError;
+pub(crate) use errors::{syntax_error, SyntaxError};
+pub(crate) use imports::{
     module_import_not_at_top_of_file, multiple_imports_on_one_line, ModuleImportNotAtTopOfFile,
     MultipleImportsOnOneLine,
 };
 
-pub use invalid_escape_sequence::{invalid_escape_sequence, InvalidEscapeSequence};
-pub use lambda_assignment::{lambda_assignment, LambdaAssignment};
+pub(crate) use invalid_escape_sequence::{invalid_escape_sequence, InvalidEscapeSequence};
+pub(crate) use lambda_assignment::{lambda_assignment, LambdaAssignment};
 pub(crate) use line_too_long::{line_too_long, LineTooLong};
-pub use literal_comparisons::{literal_comparisons, NoneComparison, TrueFalseComparison};
-pub use missing_newline_at_end_of_file::{no_newline_at_end_of_file, MissingNewlineAtEndOfFile};
+pub(crate) use literal_comparisons::{literal_comparisons, NoneComparison, TrueFalseComparison};
+pub(crate) use missing_newline_at_end_of_file::{
+    no_newline_at_end_of_file, MissingNewlineAtEndOfFile,
+};
 pub(crate) use mixed_spaces_and_tabs::{mixed_spaces_and_tabs, MixedSpacesAndTabs};
-pub use not_tests::{not_tests, NotInTest, NotIsTest};
+pub(crate) use not_tests::{not_tests, NotInTest, NotIsTest};
 pub(crate) use tab_indentation::{tab_indentation, TabIndentation};
 pub(crate) use trailing_whitespace::{
     trailing_whitespace, BlankLineWithWhitespace, TrailingWhitespace,
 };
-pub use type_comparison::{type_comparison, TypeComparison};
+pub(crate) use type_comparison::{type_comparison, TypeComparison};
 
 mod ambiguous_class_name;
 mod ambiguous_function_name;
@@ -38,7 +41,6 @@ mod invalid_escape_sequence;
 mod lambda_assignment;
 mod line_too_long;
 mod literal_comparisons;
-#[cfg(feature = "logical_lines")]
 pub(crate) mod logical_lines;
 mod missing_newline_at_end_of_file;
 mod mixed_spaces_and_tabs;
diff --git a/crates/ruff/src/rules/pycodestyle/rules/not_tests.rs b/crates/ruff/src/rules/pycodestyle/rules/not_tests.rs
index 8dd82ce08d6df..3c975789b8d30 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/not_tests.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/not_tests.rs
@@ -1,6 +1,6 @@
-use rustpython_parser::ast::{Cmpop, Expr, ExprKind, Unaryop};
+use rustpython_parser::ast::{self, Cmpop, Expr, Ranged, Unaryop};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
@@ -16,15 +16,15 @@ use crate::rules::pycodestyle::helpers::compare;
 /// ## Example
 /// ```python
 /// Z = not X in Y
-/// if not X.B in Y:\n    pass
-///
+/// if not X.B in Y:
+///     pass
 /// ```
 ///
 /// Use instead:
 /// ```python
-/// if x not in y:\n    pass
-/// assert (X in Y or X is Z)
-///
+/// Z = X not in Y
+/// if X.B not in Y:
+///     pass
 /// ```
 #[violation]
 pub struct NotInTest;
@@ -55,9 +55,9 @@ impl AlwaysAutofixableViolation for NotInTest {
 ///
 /// Use instead:
 /// ```python
-/// if not (X in Y):
+/// if X is not Y:
 ///     pass
-/// zz = x is not y
+/// Z = X.B is not Y
 /// ```
 #[violation]
 pub struct NotIsTest;
@@ -74,21 +74,21 @@ impl AlwaysAutofixableViolation for NotIsTest {
 }
 
 /// E713, E714
-pub fn not_tests(
+pub(crate) fn not_tests(
     checker: &mut Checker,
     expr: &Expr,
-    op: &Unaryop,
+    op: Unaryop,
     operand: &Expr,
     check_not_in: bool,
     check_not_is: bool,
 ) {
     if matches!(op, Unaryop::Not) {
-        if let ExprKind::Compare {
+        if let Expr::Compare(ast::ExprCompare {
             left,
             ops,
             comparators,
-            ..
-        } = &operand.node
+            range: _,
+        }) = operand
         {
             if !matches!(&ops[..], [Cmpop::In | Cmpop::Is]) {
                 return;
@@ -99,10 +99,16 @@ pub fn not_tests(
                         if check_not_in {
                             let mut diagnostic = Diagnostic::new(NotInTest, operand.range());
                             if checker.patch(diagnostic.kind.rule()) {
-                                diagnostic.set_fix(Edit::range_replacement(
-                                    compare(left, &[Cmpop::NotIn], comparators, checker.stylist),
+                                #[allow(deprecated)]
+                                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                                    compare(
+                                        left,
+                                        &[Cmpop::NotIn],
+                                        comparators,
+                                        checker.generator(),
+                                    ),
                                     expr.range(),
-                                ));
+                                )));
                             }
                             checker.diagnostics.push(diagnostic);
                         }
@@ -111,10 +117,16 @@ pub fn not_tests(
                         if check_not_is {
                             let mut diagnostic = Diagnostic::new(NotIsTest, operand.range());
                             if checker.patch(diagnostic.kind.rule()) {
-                                diagnostic.set_fix(Edit::range_replacement(
-                                    compare(left, &[Cmpop::IsNot], comparators, checker.stylist),
+                                #[allow(deprecated)]
+                                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                                    compare(
+                                        left,
+                                        &[Cmpop::IsNot],
+                                        comparators,
+                                        checker.generator(),
+                                    ),
                                     expr.range(),
-                                ));
+                                )));
                             }
                             checker.diagnostics.push(diagnostic);
                         }
diff --git a/crates/ruff/src/rules/pycodestyle/rules/tab_indentation.rs b/crates/ruff/src/rules/pycodestyle/rules/tab_indentation.rs
index 90c727b7eea05..2fa18315b698c 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/tab_indentation.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/tab_indentation.rs
@@ -2,7 +2,8 @@ use ruff_text_size::{TextLen, TextRange, TextSize};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::Line;
+use ruff_newlines::Line;
+use ruff_python_ast::source_code::Indexer;
 use ruff_python_ast::whitespace::leading_space;
 
 #[violation]
@@ -16,31 +17,17 @@ impl Violation for TabIndentation {
 }
 
 /// W191
-pub(crate) fn tab_indentation(line: &Line, string_ranges: &[TextRange]) -> Option<Diagnostic> {
+pub(crate) fn tab_indentation(line: &Line, indexer: &Indexer) -> Option<Diagnostic> {
     let indent = leading_space(line);
     if let Some(tab_index) = indent.find('\t') {
-        let tab_offset = line.start() + TextSize::try_from(tab_index).unwrap();
-
-        let string_range_index = string_ranges.binary_search_by(|range| {
-            if tab_offset < range.start() {
-                std::cmp::Ordering::Greater
-            } else if range.contains(tab_offset) {
-                std::cmp::Ordering::Equal
-            } else {
-                std::cmp::Ordering::Less
-            }
-        });
-
         // If the tab character is within a multi-line string, abort.
-        if string_range_index.is_ok() {
-            None
-        } else {
-            Some(Diagnostic::new(
+        let tab_offset = line.start() + TextSize::try_from(tab_index).unwrap();
+        if indexer.triple_quoted_string_range(tab_offset).is_none() {
+            return Some(Diagnostic::new(
                 TabIndentation,
                 TextRange::at(line.start(), indent.text_len()),
-            ))
+            ));
         }
-    } else {
-        None
     }
+    None
 }
diff --git a/crates/ruff/src/rules/pycodestyle/rules/trailing_whitespace.rs b/crates/ruff/src/rules/pycodestyle/rules/trailing_whitespace.rs
index da6074c65d839..d79b238efc63c 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/trailing_whitespace.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/trailing_whitespace.rs
@@ -1,11 +1,11 @@
 use ruff_text_size::{TextLen, TextRange, TextSize};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::Line;
+use ruff_newlines::Line;
 
 use crate::registry::Rule;
-use crate::settings::{flags, Settings};
+use crate::settings::Settings;
 
 /// ## What it does
 /// Checks for superfluous trailing whitespace.
@@ -75,11 +75,7 @@ impl AlwaysAutofixableViolation for BlankLineWithWhitespace {
 }
 
 /// W291, W293
-pub(crate) fn trailing_whitespace(
-    line: &Line,
-    settings: &Settings,
-    autofix: flags::Autofix,
-) -> Option<Diagnostic> {
+pub(crate) fn trailing_whitespace(line: &Line, settings: &Settings) -> Option<Diagnostic> {
     let whitespace_len: TextSize = line
         .chars()
         .rev()
@@ -92,19 +88,17 @@ pub(crate) fn trailing_whitespace(
         if range == line.range() {
             if settings.rules.enabled(Rule::BlankLineWithWhitespace) {
                 let mut diagnostic = Diagnostic::new(BlankLineWithWhitespace, range);
-                if matches!(autofix, flags::Autofix::Enabled)
-                    && settings.rules.should_fix(Rule::BlankLineWithWhitespace)
-                {
-                    diagnostic.set_fix(Edit::range_deletion(range));
+                if settings.rules.should_fix(Rule::BlankLineWithWhitespace) {
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::range_deletion(range)));
                 }
                 return Some(diagnostic);
             }
         } else if settings.rules.enabled(Rule::TrailingWhitespace) {
             let mut diagnostic = Diagnostic::new(TrailingWhitespace, range);
-            if matches!(autofix, flags::Autofix::Enabled)
-                && settings.rules.should_fix(Rule::TrailingWhitespace)
-            {
-                diagnostic.set_fix(Edit::range_deletion(range));
+            if settings.rules.should_fix(Rule::TrailingWhitespace) {
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_deletion(range)));
             }
             return Some(diagnostic);
         }
diff --git a/crates/ruff/src/rules/pycodestyle/rules/type_comparison.rs b/crates/ruff/src/rules/pycodestyle/rules/type_comparison.rs
index ad8b2aaf14d12..7cec3e0cb4670 100644
--- a/crates/ruff/src/rules/pycodestyle/rules/type_comparison.rs
+++ b/crates/ruff/src/rules/pycodestyle/rules/type_comparison.rs
@@ -1,10 +1,11 @@
 use itertools::izip;
-use rustpython_parser::ast::{Cmpop, Constant, Expr, ExprKind};
+use rustpython_parser::ast::{self, Cmpop, Constant, Expr, Ranged};
 
-use crate::checkers::ast::Checker;
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
+use crate::checkers::ast::Checker;
+
 /// ## What it does
 /// Checks for object type comparisons without using isinstance().
 ///
@@ -16,12 +17,15 @@ use ruff_macros::{derive_message_formats, violation};
 /// ## Example
 /// ```python
 /// if type(obj) is type(1):
+///     pass
 /// ```
 ///
 /// Use instead:
 /// ```python
 /// if isinstance(obj, int):
+///     pass
 /// if type(a1) is type(b1):
+///     pass
 /// ```
 #[violation]
 pub struct TypeComparison;
@@ -34,25 +38,31 @@ impl Violation for TypeComparison {
 }
 
 /// E721
-pub fn type_comparison(checker: &mut Checker, expr: &Expr, ops: &[Cmpop], comparators: &[Expr]) {
+pub(crate) fn type_comparison(
+    checker: &mut Checker,
+    expr: &Expr,
+    ops: &[Cmpop],
+    comparators: &[Expr],
+) {
     for (op, right) in izip!(ops, comparators) {
         if !matches!(op, Cmpop::Is | Cmpop::IsNot | Cmpop::Eq | Cmpop::NotEq) {
             continue;
         }
-        match &right.node {
-            ExprKind::Call { func, args, .. } => {
-                if let ExprKind::Name { id, .. } = &func.node {
+        match right {
+            Expr::Call(ast::ExprCall { func, args, .. }) => {
+                if let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() {
                     // Ex) `type(False)`
-                    if id == "type" && checker.ctx.is_builtin("type") {
+                    if id == "type" && checker.semantic_model().is_builtin("type") {
                         if let Some(arg) = args.first() {
                             // Allow comparison for types which are not obvious.
                             if !matches!(
-                                arg.node,
-                                ExprKind::Name { .. }
-                                    | ExprKind::Constant {
+                                arg,
+                                Expr::Name(_)
+                                    | Expr::Constant(ast::ExprConstant {
                                         value: Constant::None,
-                                        kind: None
-                                    }
+                                        kind: None,
+                                        range: _
+                                    })
                             ) {
                                 checker
                                     .diagnostics
@@ -62,16 +72,16 @@ pub fn type_comparison(checker: &mut Checker, expr: &Expr, ops: &[Cmpop], compar
                     }
                 }
             }
-            ExprKind::Attribute { value, .. } => {
-                if let ExprKind::Name { id, .. } = &value.node {
+            Expr::Attribute(ast::ExprAttribute { value, .. }) => {
+                if let Expr::Name(ast::ExprName { id, .. }) = value.as_ref() {
                     // Ex) `types.NoneType`
                     if id == "types"
-                        && checker
-                            .ctx
-                            .resolve_call_path(value)
-                            .map_or(false, |call_path| {
+                        && checker.semantic_model().resolve_call_path(value).map_or(
+                            false,
+                            |call_path| {
                                 call_path.first().map_or(false, |module| *module == "types")
-                            })
+                            },
+                        )
                     {
                         checker
                             .diagnostics
diff --git a/crates/ruff/src/rules/pycodestyle/settings.rs b/crates/ruff/src/rules/pycodestyle/settings.rs
index 30550f9c89d09..7366930d109e4 100644
--- a/crates/ruff/src/rules/pycodestyle/settings.rs
+++ b/crates/ruff/src/rules/pycodestyle/settings.rs
@@ -1,14 +1,16 @@
 //! Settings for the `pycodestyle` plugin.
 
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::{CacheKey, ConfigurationOptions};
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
+
+use crate::line_width::LineLength;
 
 #[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, CombineOptions,
 )]
 #[serde(deny_unknown_fields, rename_all = "kebab-case", rename = "Pycodestyle")]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = "None",
@@ -19,7 +21,7 @@ pub struct Options {
     )]
     /// The maximum line length to allow for line-length violations within
     /// documentation (`W505`), including standalone comments.
-    pub max_doc_length: Option<usize>,
+    pub max_doc_length: Option<LineLength>,
     #[option(
         default = "false",
         value_type = "bool",
@@ -35,7 +37,7 @@ pub struct Options {
 
 #[derive(Debug, Default, CacheKey)]
 pub struct Settings {
-    pub max_doc_length: Option<usize>,
+    pub max_doc_length: Option<LineLength>,
     pub ignore_overlong_task_comments: bool,
 }
 
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E101_E101.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E101_E101.py.snap
index d1b7d11aee8f3..1333b7fae39d5 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E101_E101.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E101_E101.py.snap
@@ -15,8 +15,8 @@ E101.py:15:1: E101 Indentation contains mixed spaces and tabs
    |
 15 | def func_mixed_start_with_space():
 16 |     # E101
-17 |                     print("mixed starts with space")
-   | ^^^^^^^^^^^^^^^^^^^^ E101
+17 |                print("mixed starts with space")
+   | ^^^^^^^^^^^^^^^ E101
 18 | 
 19 | def xyz():
    |
@@ -25,8 +25,8 @@ E101.py:19:1: E101 Indentation contains mixed spaces and tabs
    |
 19 | def xyz():
 20 |     # E101
-21 |        print("xyz");
-   | ^^^^^^^ E101
+21 |     print("xyz");
+   | ^^^^ E101
    |
 
 
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E112_E11.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E112_E11.py.snap
index 71c8fb92eb7cf..b74ea06a338ec 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E112_E11.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E112_E11.py.snap
@@ -11,4 +11,14 @@ E11.py:9:1: E112 Expected an indented block
 13 | print()
    |
 
+E11.py:45:1: E112 Expected an indented block
+   |
+45 | #: E112
+46 | if False:  #
+47 | print()
+   |  E112
+48 | #:
+49 | if False:
+   |
+
 
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E117_E11.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E117_E11.py.snap
index c3b25d40f40f6..6183b2d4f8984 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E117_E11.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E117_E11.py.snap
@@ -27,6 +27,8 @@ E11.py:42:1: E117 Over-indented
 43 | def start():
 44 |         print()
    | ^^^^^^^^ E117
+45 | #: E112
+46 | if False:  #
    |
 
 
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E201_E20.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E201_E20.py.snap
index 198479926f3aa..ae56ec6e68d31 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E201_E20.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E201_E20.py.snap
@@ -1,63 +1,147 @@
 ---
 source: crates/ruff/src/rules/pycodestyle/mod.rs
 ---
-E20.py:2:6: E201 Whitespace after '('
+E20.py:2:6: E201 [*] Whitespace after '('
   |
 2 | #: E201:1:6
 3 | spam( ham[1], {eggs: 2})
-  |       E201
+  |      ^ E201
 4 | #: E201:1:10
 5 | spam(ham[ 1], {eggs: 2})
   |
+  = help: Remove whitespace before '('
 
-E20.py:4:10: E201 Whitespace after '('
+ℹ Fix
+1 1 | #: E201:1:6
+2   |-spam( ham[1], {eggs: 2})
+  2 |+spam(ham[1], {eggs: 2})
+3 3 | #: E201:1:10
+4 4 | spam(ham[ 1], {eggs: 2})
+5 5 | #: E201:1:15
+
+E20.py:4:10: E201 [*] Whitespace after '['
   |
 4 | spam( ham[1], {eggs: 2})
 5 | #: E201:1:10
 6 | spam(ham[ 1], {eggs: 2})
-  |           E201
+  |          ^ E201
 7 | #: E201:1:15
 8 | spam(ham[1], { eggs: 2})
   |
+  = help: Remove whitespace before '['
+
+ℹ Fix
+1 1 | #: E201:1:6
+2 2 | spam( ham[1], {eggs: 2})
+3 3 | #: E201:1:10
+4   |-spam(ham[ 1], {eggs: 2})
+  4 |+spam(ham[1], {eggs: 2})
+5 5 | #: E201:1:15
+6 6 | spam(ham[1], { eggs: 2})
+7 7 | #: E201:1:6
 
-E20.py:6:15: E201 Whitespace after '('
+E20.py:6:15: E201 [*] Whitespace after '{'
    |
  6 | spam(ham[ 1], {eggs: 2})
  7 | #: E201:1:15
  8 | spam(ham[1], { eggs: 2})
-   |                E201
+   |               ^ E201
  9 | #: E201:1:6
-10 | spam(    ham[1], {eggs: 2})
+10 | spam(   ham[1], {eggs: 2})
    |
+   = help: Remove whitespace before '{'
+
+ℹ Fix
+3 3 | #: E201:1:10
+4 4 | spam(ham[ 1], {eggs: 2})
+5 5 | #: E201:1:15
+6   |-spam(ham[1], { eggs: 2})
+  6 |+spam(ham[1], {eggs: 2})
+7 7 | #: E201:1:6
+8 8 | spam(	ham[1], {eggs: 2})
+9 9 | #: E201:1:10
 
-E20.py:8:6: E201 Whitespace after '('
+E20.py:8:6: E201 [*] Whitespace after '('
    |
  8 | spam(ham[1], { eggs: 2})
  9 | #: E201:1:6
-10 | spam(    ham[1], {eggs: 2})
-   |       E201
+10 | spam(   ham[1], {eggs: 2})
+   |      ^^^ E201
 11 | #: E201:1:10
-12 | spam(ham[    1], {eggs: 2})
+12 | spam(ham[   1], {eggs: 2})
    |
+   = help: Remove whitespace before '('
 
-E20.py:10:10: E201 Whitespace after '('
+ℹ Fix
+5 5 | #: E201:1:15
+6 6 | spam(ham[1], { eggs: 2})
+7 7 | #: E201:1:6
+8   |-spam(	ham[1], {eggs: 2})
+  8 |+spam(ham[1], {eggs: 2})
+9 9 | #: E201:1:10
+10 10 | spam(ham[	1], {eggs: 2})
+11 11 | #: E201:1:15
+
+E20.py:10:10: E201 [*] Whitespace after '['
    |
-10 | spam(    ham[1], {eggs: 2})
+10 | spam(   ham[1], {eggs: 2})
 11 | #: E201:1:10
-12 | spam(ham[    1], {eggs: 2})
-   |           E201
+12 | spam(ham[   1], {eggs: 2})
+   |          ^^^ E201
 13 | #: E201:1:15
-14 | spam(ham[1], {    eggs: 2})
+14 | spam(ham[1], {  eggs: 2})
    |
+   = help: Remove whitespace before '['
+
+ℹ Fix
+7  7  | #: E201:1:6
+8  8  | spam(	ham[1], {eggs: 2})
+9  9  | #: E201:1:10
+10    |-spam(ham[	1], {eggs: 2})
+   10 |+spam(ham[1], {eggs: 2})
+11 11 | #: E201:1:15
+12 12 | spam(ham[1], {	eggs: 2})
+13 13 | #: Okay
 
-E20.py:12:15: E201 Whitespace after '('
+E20.py:12:15: E201 [*] Whitespace after '{'
    |
-12 | spam(ham[    1], {eggs: 2})
+12 | spam(ham[   1], {eggs: 2})
 13 | #: E201:1:15
-14 | spam(ham[1], {    eggs: 2})
-   |                E201
+14 | spam(ham[1], {  eggs: 2})
+   |               ^^ E201
 15 | #: Okay
 16 | spam(ham[1], {eggs: 2})
    |
+   = help: Remove whitespace before '{'
+
+ℹ Fix
+9  9  | #: E201:1:10
+10 10 | spam(ham[	1], {eggs: 2})
+11 11 | #: E201:1:15
+12    |-spam(ham[1], {	eggs: 2})
+   12 |+spam(ham[1], {eggs: 2})
+13 13 | #: Okay
+14 14 | spam(ham[1], {eggs: 2})
+15 15 | #:
+
+E20.py:81:6: E201 [*] Whitespace after '['
+   |
+81 | #: E201:1:6
+82 | spam[ ~ham]
+   |      ^ E201
+83 | 
+84 | #: Okay
+   |
+   = help: Remove whitespace before '['
+
+ℹ Fix
+78 78 | #:
+79 79 | 
+80 80 | #: E201:1:6
+81    |-spam[ ~ham]
+   81 |+spam[~ham]
+82 82 | 
+83 83 | #: Okay
+84 84 | x = [  #
 
 
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E202_E20.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E202_E20.py.snap
index 1215dbb53bb98..5218395566d32 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E202_E20.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E202_E20.py.snap
@@ -1,63 +1,129 @@
 ---
 source: crates/ruff/src/rules/pycodestyle/mod.rs
 ---
-E20.py:19:23: E202 Whitespace before ')'
+E20.py:19:23: E202 [*] Whitespace before ')'
    |
 19 | #: E202:1:23
 20 | spam(ham[1], {eggs: 2} )
-   |                        E202
+   |                       ^ E202
 21 | #: E202:1:22
 22 | spam(ham[1], {eggs: 2 })
    |
+   = help: Remove whitespace before ')'
 
-E20.py:21:22: E202 Whitespace before ')'
+ℹ Fix
+16 16 | 
+17 17 | 
+18 18 | #: E202:1:23
+19    |-spam(ham[1], {eggs: 2} )
+   19 |+spam(ham[1], {eggs: 2})
+20 20 | #: E202:1:22
+21 21 | spam(ham[1], {eggs: 2 })
+22 22 | #: E202:1:11
+
+E20.py:21:22: E202 [*] Whitespace before '}'
    |
 21 | spam(ham[1], {eggs: 2} )
 22 | #: E202:1:22
 23 | spam(ham[1], {eggs: 2 })
-   |                       E202
+   |                      ^ E202
 24 | #: E202:1:11
 25 | spam(ham[1 ], {eggs: 2})
    |
+   = help: Remove whitespace before '}'
+
+ℹ Fix
+18 18 | #: E202:1:23
+19 19 | spam(ham[1], {eggs: 2} )
+20 20 | #: E202:1:22
+21    |-spam(ham[1], {eggs: 2 })
+   21 |+spam(ham[1], {eggs: 2})
+22 22 | #: E202:1:11
+23 23 | spam(ham[1 ], {eggs: 2})
+24 24 | #: E202:1:23
 
-E20.py:23:11: E202 Whitespace before ')'
+E20.py:23:11: E202 [*] Whitespace before ']'
    |
 23 | spam(ham[1], {eggs: 2 })
 24 | #: E202:1:11
 25 | spam(ham[1 ], {eggs: 2})
-   |            E202
+   |           ^ E202
 26 | #: E202:1:23
-27 | spam(ham[1], {eggs: 2}    )
+27 | spam(ham[1], {eggs: 2}  )
    |
+   = help: Remove whitespace before ']'
+
+ℹ Fix
+20 20 | #: E202:1:22
+21 21 | spam(ham[1], {eggs: 2 })
+22 22 | #: E202:1:11
+23    |-spam(ham[1 ], {eggs: 2})
+   23 |+spam(ham[1], {eggs: 2})
+24 24 | #: E202:1:23
+25 25 | spam(ham[1], {eggs: 2}	)
+26 26 | #: E202:1:22
 
-E20.py:25:23: E202 Whitespace before ')'
+E20.py:25:23: E202 [*] Whitespace before ')'
    |
 25 | spam(ham[1 ], {eggs: 2})
 26 | #: E202:1:23
-27 | spam(ham[1], {eggs: 2}    )
-   |                        E202
+27 | spam(ham[1], {eggs: 2}  )
+   |                       ^^ E202
 28 | #: E202:1:22
-29 | spam(ham[1], {eggs: 2    })
+29 | spam(ham[1], {eggs: 2   })
    |
+   = help: Remove whitespace before ')'
 
-E20.py:27:22: E202 Whitespace before ')'
+ℹ Fix
+22 22 | #: E202:1:11
+23 23 | spam(ham[1 ], {eggs: 2})
+24 24 | #: E202:1:23
+25    |-spam(ham[1], {eggs: 2}	)
+   25 |+spam(ham[1], {eggs: 2})
+26 26 | #: E202:1:22
+27 27 | spam(ham[1], {eggs: 2	})
+28 28 | #: E202:1:11
+
+E20.py:27:22: E202 [*] Whitespace before '}'
    |
-27 | spam(ham[1], {eggs: 2}    )
+27 | spam(ham[1], {eggs: 2}  )
 28 | #: E202:1:22
-29 | spam(ham[1], {eggs: 2    })
-   |                       E202
+29 | spam(ham[1], {eggs: 2   })
+   |                      ^^^ E202
 30 | #: E202:1:11
-31 | spam(ham[1    ], {eggs: 2})
+31 | spam(ham[1  ], {eggs: 2})
    |
+   = help: Remove whitespace before '}'
+
+ℹ Fix
+24 24 | #: E202:1:23
+25 25 | spam(ham[1], {eggs: 2}	)
+26 26 | #: E202:1:22
+27    |-spam(ham[1], {eggs: 2	})
+   27 |+spam(ham[1], {eggs: 2})
+28 28 | #: E202:1:11
+29 29 | spam(ham[1	], {eggs: 2})
+30 30 | #: Okay
 
-E20.py:29:11: E202 Whitespace before ')'
+E20.py:29:11: E202 [*] Whitespace before ']'
    |
-29 | spam(ham[1], {eggs: 2    })
+29 | spam(ham[1], {eggs: 2   })
 30 | #: E202:1:11
-31 | spam(ham[1    ], {eggs: 2})
-   |            E202
+31 | spam(ham[1  ], {eggs: 2})
+   |           ^^ E202
 32 | #: Okay
 33 | spam(ham[1], {eggs: 2})
    |
+   = help: Remove whitespace before ']'
+
+ℹ Fix
+26 26 | #: E202:1:22
+27 27 | spam(ham[1], {eggs: 2	})
+28 28 | #: E202:1:11
+29    |-spam(ham[1	], {eggs: 2})
+   29 |+spam(ham[1], {eggs: 2})
+30 30 | #: Okay
+31 31 | spam(ham[1], {eggs: 2})
+32 32 | 
 
 
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E203_E20.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E203_E20.py.snap
index b59e240bd7f46..8a1524c2e76bc 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E203_E20.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E203_E20.py.snap
@@ -1,63 +1,129 @@
 ---
 source: crates/ruff/src/rules/pycodestyle/mod.rs
 ---
-E20.py:51:10: E203 Whitespace before ',', ';', or ':'
+E20.py:51:10: E203 [*] Whitespace before ':'
    |
 51 | #: E203:1:10
 52 | if x == 4 :
-   |           E203
+   |          ^ E203
 53 |     print x, y
 54 |     x, y = y, x
    |
+   = help: Remove whitespace before ':'
 
-E20.py:55:10: E203 Whitespace before ',', ';', or ':'
+ℹ Fix
+48 48 | 
+49 49 | 
+50 50 | #: E203:1:10
+51    |-if x == 4 :
+   51 |+if x == 4:
+52 52 |     print x, y
+53 53 |     x, y = y, x
+54 54 | #: E203:1:10
+
+E20.py:55:10: E203 [*] Whitespace before ':'
    |
 55 |     x, y = y, x
 56 | #: E203:1:10
-57 | if x == 4    :
-   |           E203
+57 | if x == 4   :
+   |          ^^^ E203
 58 |     print x, y
 59 |     x, y = y, x
    |
+   = help: Remove whitespace before ':'
+
+ℹ Fix
+52 52 |     print x, y
+53 53 |     x, y = y, x
+54 54 | #: E203:1:10
+55    |-if x == 4	:
+   55 |+if x == 4:
+56 56 |     print x, y
+57 57 |     x, y = y, x
+58 58 | #: E203:2:15 E702:2:16
 
-E20.py:60:15: E203 Whitespace before ',', ';', or ':'
+E20.py:60:15: E203 [*] Whitespace before ';'
    |
 60 | #: E203:2:15 E702:2:16
 61 | if x == 4:
 62 |     print x, y ; x, y = y, x
-   |                E203
+   |               ^ E203
 63 | #: E203:2:15 E702:2:16
 64 | if x == 4:
    |
+   = help: Remove whitespace before ';'
+
+ℹ Fix
+57 57 |     x, y = y, x
+58 58 | #: E203:2:15 E702:2:16
+59 59 | if x == 4:
+60    |-    print x, y ; x, y = y, x
+   60 |+    print x, y; x, y = y, x
+61 61 | #: E203:2:15 E702:2:16
+62 62 | if x == 4:
+63 63 |     print x, y	; x, y = y, x
 
-E20.py:63:15: E203 Whitespace before ',', ';', or ':'
+E20.py:63:15: E203 [*] Whitespace before ';'
    |
 63 | #: E203:2:15 E702:2:16
 64 | if x == 4:
-65 |     print x, y    ; x, y = y, x
-   |                E203
+65 |     print x, y  ; x, y = y, x
+   |               ^^ E203
 66 | #: E203:3:13
 67 | if x == 4:
    |
+   = help: Remove whitespace before ';'
 
-E20.py:67:13: E203 Whitespace before ',', ';', or ':'
+ℹ Fix
+60 60 |     print x, y ; x, y = y, x
+61 61 | #: E203:2:15 E702:2:16
+62 62 | if x == 4:
+63    |-    print x, y	; x, y = y, x
+   63 |+    print x, y; x, y = y, x
+64 64 | #: E203:3:13
+65 65 | if x == 4:
+66 66 |     print x, y
+
+E20.py:67:13: E203 [*] Whitespace before ','
    |
 67 | if x == 4:
 68 |     print x, y
 69 |     x, y = y , x
-   |              E203
+   |             ^ E203
 70 | #: E203:3:13
 71 | if x == 4:
    |
+   = help: Remove whitespace before ','
+
+ℹ Fix
+64 64 | #: E203:3:13
+65 65 | if x == 4:
+66 66 |     print x, y
+67    |-    x, y = y , x
+   67 |+    x, y = y, x
+68 68 | #: E203:3:13
+69 69 | if x == 4:
+70 70 |     print x, y
 
-E20.py:71:13: E203 Whitespace before ',', ';', or ':'
+E20.py:71:13: E203 [*] Whitespace before ','
    |
 71 | if x == 4:
 72 |     print x, y
 73 |     x, y = y    , x
-   |              E203
+   |             ^^^^ E203
 74 | #: Okay
 75 | if x == 4:
    |
+   = help: Remove whitespace before ','
+
+ℹ Fix
+68 68 | #: E203:3:13
+69 69 | if x == 4:
+70 70 |     print x, y
+71    |-    x, y = y	, x
+   71 |+    x, y = y, x
+72 72 | #: Okay
+73 73 | if x == 4:
+74 74 |     print x, y
 
 
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E221_E22.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E221_E22.py.snap
index 2dd5e63fd6e2e..29c9bad92e079 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E221_E22.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E221_E22.py.snap
@@ -6,7 +6,7 @@ E22.py:3:6: E221 Multiple spaces before operator
 3 | #: E221
 4 | a = 12 + 3
 5 | b = 4  + 5
-  |       E221
+  |      ^^ E221
 6 | #: E221 E221
 7 | x             = 1
   |
@@ -16,7 +16,7 @@ E22.py:5:2: E221 Multiple spaces before operator
 5 | b = 4  + 5
 6 | #: E221 E221
 7 | x             = 1
-  |   E221
+  |  ^^^^^^^^^^^^^ E221
 8 | y             = 2
 9 | long_variable = 3
   |
@@ -26,7 +26,7 @@ E22.py:6:2: E221 Multiple spaces before operator
  6 | #: E221 E221
  7 | x             = 1
  8 | y             = 2
-   |   E221
+   |  ^^^^^^^^^^^^^ E221
  9 | long_variable = 3
 10 | #: E221 E221
    |
@@ -36,7 +36,7 @@ E22.py:9:5: E221 Multiple spaces before operator
  9 | long_variable = 3
 10 | #: E221 E221
 11 | x[0]          = 1
-   |      E221
+   |     ^^^^^^^^^^ E221
 12 | x[1]          = 2
 13 | long_variable = 3
    |
@@ -46,7 +46,7 @@ E22.py:10:5: E221 Multiple spaces before operator
 10 | #: E221 E221
 11 | x[0]          = 1
 12 | x[1]          = 2
-   |      E221
+   |     ^^^^^^^^^^ E221
 13 | long_variable = 3
 14 | #: E221 E221
    |
@@ -56,7 +56,7 @@ E22.py:13:9: E221 Multiple spaces before operator
 13 | long_variable = 3
 14 | #: E221 E221
 15 | x = f(x)          + 1
-   |          E221
+   |         ^^^^^^^^^^ E221
 16 | y = long_variable + 2
 17 | z = x[0]          + 3
    |
@@ -66,7 +66,7 @@ E22.py:15:9: E221 Multiple spaces before operator
 15 | x = f(x)          + 1
 16 | y = long_variable + 2
 17 | z = x[0]          + 3
-   |          E221
+   |         ^^^^^^^^^^ E221
 18 | #: E221:3:14
 19 | text = """
    |
@@ -76,7 +76,7 @@ E22.py:19:14: E221 Multiple spaces before operator
 19 | text = """
 20 |     bar
 21 |     foo %s"""  % rofl
-   |               E221
+   |              ^^ E221
 22 | #: Okay
 23 | x = 1
    |
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E222_E22.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E222_E22.py.snap
index e3e4d8d9aebe5..0f4ded92a73f1 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E222_E22.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E222_E22.py.snap
@@ -5,7 +5,7 @@ E22.py:28:8: E222 Multiple spaces after operator
    |
 28 | #: E222
 29 | a = a +  1
-   |         E222
+   |        ^^ E222
 30 | b = b + 10
 31 | #: E222 E222
    |
@@ -15,7 +15,7 @@ E22.py:31:4: E222 Multiple spaces after operator
 31 | b = b + 10
 32 | #: E222 E222
 33 | x =            -1
-   |     E222
+   |    ^^^^^^^^^^^^ E222
 34 | y =            -2
 35 | long_variable = 3
    |
@@ -25,7 +25,7 @@ E22.py:32:4: E222 Multiple spaces after operator
 32 | #: E222 E222
 33 | x =            -1
 34 | y =            -2
-   |     E222
+   |    ^^^^^^^^^^^^ E222
 35 | long_variable = 3
 36 | #: E222 E222
    |
@@ -35,7 +35,7 @@ E22.py:35:7: E222 Multiple spaces after operator
 35 | long_variable = 3
 36 | #: E222 E222
 37 | x[0] =          1
-   |        E222
+   |       ^^^^^^^^^^ E222
 38 | x[1] =          2
 39 | long_variable = 3
    |
@@ -45,7 +45,7 @@ E22.py:36:7: E222 Multiple spaces after operator
 36 | #: E222 E222
 37 | x[0] =          1
 38 | x[1] =          2
-   |        E222
+   |       ^^^^^^^^^^ E222
 39 | long_variable = 3
 40 | #:
    |
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E223_E22.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E223_E22.py.snap
index 0e7405603f814..9fa7c5bfa3b12 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E223_E22.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E223_E22.py.snap
@@ -5,8 +5,8 @@ E22.py:43:2: E223 Tab before operator
    |
 43 | #: E223
 44 | foobart = 4
-45 | a    = 3  # aligned with tab
-   |   E223
+45 | a   = 3  # aligned with tab
+   |  ^^^ E223
 46 | #:
    |
 
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E224_E22.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E224_E22.py.snap
index a8344802ea318..a6a0b44367381 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E224_E22.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E224_E22.py.snap
@@ -5,7 +5,7 @@ E22.py:48:5: E224 Tab after operator
    |
 48 | #: E224
 49 | a +=    1
-   |      E224
+   |     ^^^^ E224
 50 | b += 1000
 51 | #:
    |
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E225_E22.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E225_E22.py.snap
index 61728196aacf6..9d84cd4431713 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E225_E22.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E225_E22.py.snap
@@ -1,11 +1,11 @@
 ---
 source: crates/ruff/src/rules/pycodestyle/mod.rs
 ---
-E22.py:54:13: E225 Missing whitespace around operator
+E22.py:54:11: E225 Missing whitespace around operator
    |
 54 | #: E225
 55 | submitted +=1
-   |              E225
+   |           ^^ E225
 56 | #: E225
 57 | submitted+= 1
    |
@@ -15,37 +15,37 @@ E22.py:56:10: E225 Missing whitespace around operator
 56 | submitted +=1
 57 | #: E225
 58 | submitted+= 1
-   |           E225
+   |          ^^ E225
 59 | #: E225
 60 | c =-1
    |
 
-E22.py:58:4: E225 Missing whitespace around operator
+E22.py:58:3: E225 Missing whitespace around operator
    |
 58 | submitted+= 1
 59 | #: E225
 60 | c =-1
-   |     E225
+   |   ^ E225
 61 | #: E225
 62 | x = x /2 - 1
    |
 
-E22.py:60:8: E225 Missing whitespace around operator
+E22.py:60:7: E225 Missing whitespace around operator
    |
 60 | c =-1
 61 | #: E225
 62 | x = x /2 - 1
-   |         E225
+   |       ^ E225
 63 | #: E225
 64 | c = alpha -4
    |
 
-E22.py:62:12: E225 Missing whitespace around operator
+E22.py:62:11: E225 Missing whitespace around operator
    |
 62 | x = x /2 - 1
 63 | #: E225
 64 | c = alpha -4
-   |             E225
+   |           ^ E225
 65 | #: E225
 66 | c = alpha- 4
    |
@@ -55,27 +55,27 @@ E22.py:64:10: E225 Missing whitespace around operator
 64 | c = alpha -4
 65 | #: E225
 66 | c = alpha- 4
-   |           E225
+   |          ^ E225
 67 | #: E225
 68 | z = x **y
    |
 
-E22.py:66:9: E225 Missing whitespace around operator
+E22.py:66:7: E225 Missing whitespace around operator
    |
 66 | c = alpha- 4
 67 | #: E225
 68 | z = x **y
-   |          E225
+   |       ^^ E225
 69 | #: E225
 70 | z = (x + 1) **y
    |
 
-E22.py:68:15: E225 Missing whitespace around operator
+E22.py:68:13: E225 Missing whitespace around operator
    |
 68 | z = x **y
 69 | #: E225
 70 | z = (x + 1) **y
-   |                E225
+   |             ^^ E225
 71 | #: E225
 72 | z = (x + 1)** y
    |
@@ -85,17 +85,17 @@ E22.py:70:12: E225 Missing whitespace around operator
 70 | z = (x + 1) **y
 71 | #: E225
 72 | z = (x + 1)** y
-   |             E225
+   |            ^^ E225
 73 | #: E225
 74 | _1kB = _1MB >>10
    |
 
-E22.py:72:15: E225 Missing whitespace around operator
+E22.py:72:13: E225 Missing whitespace around operator
    |
 72 | z = (x + 1)** y
 73 | #: E225
 74 | _1kB = _1MB >>10
-   |                E225
+   |             ^^ E225
 75 | #: E225
 76 | _1kB = _1MB>> 10
    |
@@ -105,7 +105,7 @@ E22.py:74:12: E225 Missing whitespace around operator
 74 | _1kB = _1MB >>10
 75 | #: E225
 76 | _1kB = _1MB>> 10
-   |             E225
+   |            ^^ E225
 77 | #: E225 E225
 78 | i=i+ 1
    |
@@ -115,7 +115,7 @@ E22.py:76:2: E225 Missing whitespace around operator
 76 | _1kB = _1MB>> 10
 77 | #: E225 E225
 78 | i=i+ 1
-   |   E225
+   |  ^ E225
 79 | #: E225 E225
 80 | i=i +1
    |
@@ -125,7 +125,7 @@ E22.py:76:4: E225 Missing whitespace around operator
 76 | _1kB = _1MB>> 10
 77 | #: E225 E225
 78 | i=i+ 1
-   |     E225
+   |    ^ E225
 79 | #: E225 E225
 80 | i=i +1
    |
@@ -135,17 +135,17 @@ E22.py:78:2: E225 Missing whitespace around operator
 78 | i=i+ 1
 79 | #: E225 E225
 80 | i=i +1
-   |   E225
+   |  ^ E225
 81 | #: E225
 82 | i = 1and 1
    |
 
-E22.py:78:6: E225 Missing whitespace around operator
+E22.py:78:5: E225 Missing whitespace around operator
    |
 78 | i=i+ 1
 79 | #: E225 E225
 80 | i=i +1
-   |       E225
+   |     ^ E225
 81 | #: E225
 82 | i = 1and 1
    |
@@ -155,7 +155,7 @@ E22.py:80:6: E225 Missing whitespace around operator
 80 | i=i +1
 81 | #: E225
 82 | i = 1and 1
-   |       E225
+   |      ^^^ E225
 83 | #: E225
 84 | i = 1or 0
    |
@@ -165,7 +165,7 @@ E22.py:82:6: E225 Missing whitespace around operator
 82 | i = 1and 1
 83 | #: E225
 84 | i = 1or 0
-   |       E225
+   |      ^^ E225
 85 | #: E225
 86 | 1is 1
    |
@@ -175,7 +175,7 @@ E22.py:84:2: E225 Missing whitespace around operator
 84 | i = 1or 0
 85 | #: E225
 86 | 1is 1
-   |   E225
+   |  ^^ E225
 87 | #: E225
 88 | 1in []
    |
@@ -185,17 +185,17 @@ E22.py:86:2: E225 Missing whitespace around operator
 86 | 1is 1
 87 | #: E225
 88 | 1in []
-   |   E225
+   |  ^^ E225
 89 | #: E225
 90 | i = 1 @2
    |
 
-E22.py:88:8: E225 Missing whitespace around operator
+E22.py:88:7: E225 Missing whitespace around operator
    |
 88 | 1in []
 89 | #: E225
 90 | i = 1 @2
-   |         E225
+   |       ^ E225
 91 | #: E225
 92 | i = 1@ 2
    |
@@ -205,7 +205,7 @@ E22.py:90:6: E225 Missing whitespace around operator
 90 | i = 1 @2
 91 | #: E225
 92 | i = 1@ 2
-   |       E225
+   |      ^ E225
 93 | #: E225 E226
 94 | i=i+1
    |
@@ -215,17 +215,17 @@ E22.py:92:2: E225 Missing whitespace around operator
 92 | i = 1@ 2
 93 | #: E225 E226
 94 | i=i+1
-   |   E225
+   |  ^ E225
 95 | #: E225 E226
 96 | i =i+1
    |
 
-E22.py:94:4: E225 Missing whitespace around operator
+E22.py:94:3: E225 Missing whitespace around operator
    |
 94 | i=i+1
 95 | #: E225 E226
 96 | i =i+1
-   |     E225
+   |   ^ E225
 97 | #: E225 E226
 98 | i= i+1
    |
@@ -235,17 +235,17 @@ E22.py:96:2: E225 Missing whitespace around operator
  96 | i =i+1
  97 | #: E225 E226
  98 | i= i+1
-    |   E225
+    |  ^ E225
  99 | #: E225 E226
 100 | c = (a +b)*(a - b)
     |
 
-E22.py:98:9: E225 Missing whitespace around operator
+E22.py:98:8: E225 Missing whitespace around operator
     |
  98 | i= i+1
  99 | #: E225 E226
 100 | c = (a +b)*(a - b)
-    |          E225
+    |        ^ E225
 101 | #: E225 E226
 102 | c = (a+ b)*(a - b)
     |
@@ -255,16 +255,16 @@ E22.py:100:7: E225 Missing whitespace around operator
 100 | c = (a +b)*(a - b)
 101 | #: E225 E226
 102 | c = (a+ b)*(a - b)
-    |        E225
+    |       ^ E225
 103 | #:
     |
 
-E22.py:154:13: E225 Missing whitespace around operator
+E22.py:154:11: E225 Missing whitespace around operator
     |
 154 | func2(lambda a, b=h[:], c=0: (a, b, c))
 155 | if not -5 < x < +5:
 156 |     print >>sys.stderr, "x is out of range."
-    |              E225
+    |           ^^ E225
 157 | print >> sys.stdout, "x is an integer."
 158 | x = x / 2 - 1
     |
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E226_E22.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E226_E22.py.snap
index 769264c53d61a..4a9c4abc9c112 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E226_E22.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E226_E22.py.snap
@@ -6,7 +6,7 @@ E22.py:92:4: E226 Missing whitespace around arithmetic operator
 92 | i = 1@ 2
 93 | #: E225 E226
 94 | i=i+1
-   |     E226
+   |    ^ E226
 95 | #: E225 E226
 96 | i =i+1
    |
@@ -16,7 +16,7 @@ E22.py:94:5: E226 Missing whitespace around arithmetic operator
 94 | i=i+1
 95 | #: E225 E226
 96 | i =i+1
-   |      E226
+   |     ^ E226
 97 | #: E225 E226
 98 | i= i+1
    |
@@ -26,7 +26,7 @@ E22.py:96:5: E226 Missing whitespace around arithmetic operator
  96 | i =i+1
  97 | #: E225 E226
  98 | i= i+1
-    |      E226
+    |     ^ E226
  99 | #: E225 E226
 100 | c = (a +b)*(a - b)
     |
@@ -36,7 +36,7 @@ E22.py:98:11: E226 Missing whitespace around arithmetic operator
  98 | i= i+1
  99 | #: E225 E226
 100 | c = (a +b)*(a - b)
-    |            E226
+    |           ^ E226
 101 | #: E225 E226
 102 | c = (a+ b)*(a - b)
     |
@@ -46,7 +46,7 @@ E22.py:100:11: E226 Missing whitespace around arithmetic operator
 100 | c = (a +b)*(a - b)
 101 | #: E225 E226
 102 | c = (a+ b)*(a - b)
-    |            E226
+    |           ^ E226
 103 | #:
     |
 
@@ -54,7 +54,7 @@ E22.py:104:6: E226 Missing whitespace around arithmetic operator
     |
 104 | #: E226
 105 | z = 2//30
-    |       E226
+    |      ^^ E226
 106 | #: E226 E226
 107 | c = (a+b) * (a-b)
     |
@@ -64,7 +64,7 @@ E22.py:106:7: E226 Missing whitespace around arithmetic operator
 106 | z = 2//30
 107 | #: E226 E226
 108 | c = (a+b) * (a-b)
-    |        E226
+    |       ^ E226
 109 | #: E226
 110 | norman = True+False
     |
@@ -74,7 +74,7 @@ E22.py:106:15: E226 Missing whitespace around arithmetic operator
 106 | z = 2//30
 107 | #: E226 E226
 108 | c = (a+b) * (a-b)
-    |                E226
+    |               ^ E226
 109 | #: E226
 110 | norman = True+False
     |
@@ -84,7 +84,7 @@ E22.py:110:6: E226 Missing whitespace around arithmetic operator
 110 | norman = True+False
 111 | #: E226
 112 | x = x*2 - 1
-    |       E226
+    |      ^ E226
 113 | #: E226
 114 | x = x/2 - 1
     |
@@ -94,7 +94,7 @@ E22.py:112:6: E226 Missing whitespace around arithmetic operator
 112 | x = x*2 - 1
 113 | #: E226
 114 | x = x/2 - 1
-    |       E226
+    |      ^ E226
 115 | #: E226 E226
 116 | hypot2 = x*x + y*y
     |
@@ -104,7 +104,7 @@ E22.py:114:11: E226 Missing whitespace around arithmetic operator
 114 | x = x/2 - 1
 115 | #: E226 E226
 116 | hypot2 = x*x + y*y
-    |            E226
+    |           ^ E226
 117 | #: E226
 118 | c = (a + b)*(a - b)
     |
@@ -114,7 +114,7 @@ E22.py:114:17: E226 Missing whitespace around arithmetic operator
 114 | x = x/2 - 1
 115 | #: E226 E226
 116 | hypot2 = x*x + y*y
-    |                  E226
+    |                 ^ E226
 117 | #: E226
 118 | c = (a + b)*(a - b)
     |
@@ -124,7 +124,7 @@ E22.py:116:12: E226 Missing whitespace around arithmetic operator
 116 | hypot2 = x*x + y*y
 117 | #: E226
 118 | c = (a + b)*(a - b)
-    |             E226
+    |            ^ E226
 119 | #: E226
 120 | def halves(n):
     |
@@ -134,7 +134,7 @@ E22.py:119:14: E226 Missing whitespace around arithmetic operator
 119 | #: E226
 120 | def halves(n):
 121 |     return (i//2 for i in range(n))
-    |               E226
+    |              ^^ E226
 122 | #: E227
 123 | _1kB = _1MB>>10
     |
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E227_E22.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E227_E22.py.snap
index f482ceb131feb..06b73ec109343 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E227_E22.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E227_E22.py.snap
@@ -6,7 +6,7 @@ E22.py:121:12: E227 Missing whitespace around bitwise or shift operator
 121 |     return (i//2 for i in range(n))
 122 | #: E227
 123 | _1kB = _1MB>>10
-    |             E227
+    |            ^^ E227
 124 | #: E227
 125 | _1MB = _1kB<<10
     |
@@ -16,7 +16,7 @@ E22.py:123:12: E227 Missing whitespace around bitwise or shift operator
 123 | _1kB = _1MB>>10
 124 | #: E227
 125 | _1MB = _1kB<<10
-    |             E227
+    |            ^^ E227
 126 | #: E227
 127 | a = b|c
     |
@@ -26,7 +26,7 @@ E22.py:125:6: E227 Missing whitespace around bitwise or shift operator
 125 | _1MB = _1kB<<10
 126 | #: E227
 127 | a = b|c
-    |       E227
+    |      ^ E227
 128 | #: E227
 129 | b = c&a
     |
@@ -36,7 +36,7 @@ E22.py:127:6: E227 Missing whitespace around bitwise or shift operator
 127 | a = b|c
 128 | #: E227
 129 | b = c&a
-    |       E227
+    |      ^ E227
 130 | #: E227
 131 | c = b^a
     |
@@ -46,7 +46,7 @@ E22.py:129:6: E227 Missing whitespace around bitwise or shift operator
 129 | b = c&a
 130 | #: E227
 131 | c = b^a
-    |       E227
+    |      ^ E227
 132 | #: E228
 133 | a = b%c
     |
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E228_E22.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E228_E22.py.snap
index fbb2c5c510df9..6c4e0ca52562f 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E228_E22.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E228_E22.py.snap
@@ -6,7 +6,7 @@ E22.py:131:6: E228 Missing whitespace around modulo operator
 131 | c = b^a
 132 | #: E228
 133 | a = b%c
-    |       E228
+    |      ^ E228
 134 | #: E228
 135 | msg = fmt%(errno, errmsg)
     |
@@ -16,7 +16,7 @@ E22.py:133:10: E228 Missing whitespace around modulo operator
 133 | a = b%c
 134 | #: E228
 135 | msg = fmt%(errno, errmsg)
-    |           E228
+    |          ^ E228
 136 | #: E228
 137 | msg = "Error %d occurred"%errno
     |
@@ -26,7 +26,7 @@ E22.py:135:26: E228 Missing whitespace around modulo operator
 135 | msg = fmt%(errno, errmsg)
 136 | #: E228
 137 | msg = "Error %d occurred"%errno
-    |                           E228
+    |                          ^ E228
 138 | #:
     |
 
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E231_E23.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E231_E23.py.snap
index 26828dc7766e3..4d23eb3c3195f 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E231_E23.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E231_E23.py.snap
@@ -5,7 +5,7 @@ E23.py:2:7: E231 [*] Missing whitespace after ','
   |
 2 | #: E231
 3 | a = (1,2)
-  |        E231
+  |       ^ E231
 4 | #: E231
 5 | a[b1,:]
   |
@@ -24,7 +24,7 @@ E23.py:4:5: E231 [*] Missing whitespace after ','
 4 | a = (1,2)
 5 | #: E231
 6 | a[b1,:]
-  |      E231
+  |     ^ E231
 7 | #: E231
 8 | a = [{'a':''}]
   |
@@ -45,7 +45,7 @@ E23.py:6:10: E231 [*] Missing whitespace after ':'
  6 | a[b1,:]
  7 | #: E231
  8 | a = [{'a':''}]
-   |           E231
+   |          ^ E231
  9 | #: Okay
 10 | a = (4,)
    |
@@ -66,7 +66,7 @@ E23.py:19:10: E231 [*] Missing whitespace after ','
 19 | def foo() -> None:
 20 |     #: E231
 21 |     if (1,2):
-   |           E231
+   |          ^ E231
 22 |         pass
    |
    = help: Added missing whitespace after ','
@@ -78,5 +78,25 @@ E23.py:19:10: E231 [*] Missing whitespace after ','
 19    |-    if (1,2):
    19 |+    if (1, 2):
 20 20 |         pass
+21 21 | 
+22 22 | #: Okay
+
+E23.py:29:20: E231 [*] Missing whitespace after ':'
+   |
+29 | mdtypes_template = {
+30 |     'tag_full': [('mdtype', 'u4'), ('byte_count', 'u4')],
+31 |     'tag_smalldata':[('byte_count_mdtype', 'u4'), ('data', 'S4')],
+   |                    ^ E231
+32 | }
+   |
+   = help: Added missing whitespace after ':'
+
+ℹ Suggested fix
+26 26 | #: E231:2:20
+27 27 | mdtypes_template = {
+28 28 |     'tag_full': [('mdtype', 'u4'), ('byte_count', 'u4')],
+29    |-    'tag_smalldata':[('byte_count_mdtype', 'u4'), ('data', 'S4')],
+   29 |+    'tag_smalldata': [('byte_count_mdtype', 'u4'), ('data', 'S4')],
+30 30 | }
 
 
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E251_E25.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E251_E25.py.snap
index 723f89470801d..be800bd0fbfa0 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E251_E25.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E251_E25.py.snap
@@ -5,7 +5,7 @@ E25.py:2:12: E251 Unexpected spaces around keyword / parameter equals
   |
 2 | #: E251 E251
 3 | def foo(bar = False):
-  |             E251
+  |            ^ E251
 4 |     '''Test function with an error in declaration'''
 5 |     pass
   |
@@ -14,7 +14,7 @@ E25.py:2:14: E251 Unexpected spaces around keyword / parameter equals
   |
 2 | #: E251 E251
 3 | def foo(bar = False):
-  |               E251
+  |              ^ E251
 4 |     '''Test function with an error in declaration'''
 5 |     pass
   |
@@ -24,7 +24,7 @@ E25.py:6:9: E251 Unexpected spaces around keyword / parameter equals
  6 |     pass
  7 | #: E251
  8 | foo(bar= True)
-   |          E251
+   |         ^ E251
  9 | #: E251
 10 | foo(bar =True)
    |
@@ -34,7 +34,7 @@ E25.py:8:8: E251 Unexpected spaces around keyword / parameter equals
  8 | foo(bar= True)
  9 | #: E251
 10 | foo(bar =True)
-   |         E251
+   |        ^ E251
 11 | #: E251 E251
 12 | foo(bar = True)
    |
@@ -44,7 +44,7 @@ E25.py:10:8: E251 Unexpected spaces around keyword / parameter equals
 10 | foo(bar =True)
 11 | #: E251 E251
 12 | foo(bar = True)
-   |         E251
+   |        ^ E251
 13 | #: E251
 14 | y = bar(root= "sdasd")
    |
@@ -54,7 +54,7 @@ E25.py:10:10: E251 Unexpected spaces around keyword / parameter equals
 10 | foo(bar =True)
 11 | #: E251 E251
 12 | foo(bar = True)
-   |           E251
+   |          ^ E251
 13 | #: E251
 14 | y = bar(root= "sdasd")
    |
@@ -64,29 +64,33 @@ E25.py:12:14: E251 Unexpected spaces around keyword / parameter equals
 12 | foo(bar = True)
 13 | #: E251
 14 | y = bar(root= "sdasd")
-   |               E251
+   |              ^ E251
 15 | #: E251:2:29
 16 | parser.add_argument('--long-option',
    |
 
 E25.py:15:29: E251 Unexpected spaces around keyword / parameter equals
    |
-15 | #: E251:2:29
-16 | parser.add_argument('--long-option',
-17 |                     default=
-   |                              E251
-18 |                     "/rather/long/filesystem/path/here/blah/blah/blah")
-19 | #: E251:1:45
+15 |   #: E251:2:29
+16 |   parser.add_argument('--long-option',
+17 |                       default=
+   |  _____________________________^
+18 | |                     "/rather/long/filesystem/path/here/blah/blah/blah")
+   | |____________________^ E251
+19 |   #: E251:1:45
+20 |   parser.add_argument('--long-option', default
    |
 
 E25.py:18:45: E251 Unexpected spaces around keyword / parameter equals
    |
-18 |                     "/rather/long/filesystem/path/here/blah/blah/blah")
-19 | #: E251:1:45
-20 | parser.add_argument('--long-option', default
-   |                                              E251
-21 |                     ="/rather/long/filesystem/path/here/blah/blah/blah")
-22 | #: E251:3:8 E251:3:10
+18 |                       "/rather/long/filesystem/path/here/blah/blah/blah")
+19 |   #: E251:1:45
+20 |   parser.add_argument('--long-option', default
+   |  _____________________________________________^
+21 | |                     ="/rather/long/filesystem/path/here/blah/blah/blah")
+   | |____________________^ E251
+22 |   #: E251:3:8 E251:3:10
+23 |   foo(True,
    |
 
 E25.py:23:8: E251 Unexpected spaces around keyword / parameter equals
@@ -94,7 +98,7 @@ E25.py:23:8: E251 Unexpected spaces around keyword / parameter equals
 23 | foo(True,
 24 |     baz=(1, 2),
 25 |     biz = 'foo'
-   |         E251
+   |        ^ E251
 26 |     )
 27 | #: Okay
    |
@@ -104,7 +108,7 @@ E25.py:23:10: E251 Unexpected spaces around keyword / parameter equals
 23 | foo(True,
 24 |     baz=(1, 2),
 25 |     biz = 'foo'
-   |           E251
+   |          ^ E251
 26 |     )
 27 | #: Okay
    |
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E252_E25.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E252_E25.py.snap
index 00acfa92e65ea..e6b060c884be5 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E252_E25.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E252_E25.py.snap
@@ -6,27 +6,27 @@ E25.py:46:15: E252 Missing whitespace around parameter equals
 46 |     return a + b
 47 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36
 48 | def add(a: int=0, b: int =0, c: int= 0) -> int:
-   |                E252
+   |               ^ E252
 49 |     return a + b + c
 50 | #: Okay
    |
 
-E25.py:46:16: E252 Missing whitespace around parameter equals
+E25.py:46:15: E252 Missing whitespace around parameter equals
    |
 46 |     return a + b
 47 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36
 48 | def add(a: int=0, b: int =0, c: int= 0) -> int:
-   |                 E252
+   |               ^ E252
 49 |     return a + b + c
 50 | #: Okay
    |
 
-E25.py:46:27: E252 Missing whitespace around parameter equals
+E25.py:46:26: E252 Missing whitespace around parameter equals
    |
 46 |     return a + b
 47 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36
 48 | def add(a: int=0, b: int =0, c: int= 0) -> int:
-   |                            E252
+   |                          ^ E252
 49 |     return a + b + c
 50 | #: Okay
    |
@@ -36,7 +36,7 @@ E25.py:46:36: E252 Missing whitespace around parameter equals
 46 |     return a + b
 47 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36
 48 | def add(a: int=0, b: int =0, c: int= 0) -> int:
-   |                                     E252
+   |                                    ^ E252
 49 |     return a + b + c
 50 | #: Okay
    |
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E262_E26.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E262_E26.py.snap
index 36c1bd5be8cb0..9f55ff13ab77d 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E262_E26.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E262_E26.py.snap
@@ -47,6 +47,8 @@ E26.py:66:9: E262 Inline comment should start with `# `
 67 | #  (Two spaces) Ok for block comment
 68 | a = 42  #  (Two spaces)
    |         ^^^^^^^^^^^^^^^ E262
+69 | 
+70 | #: E265:5:1
    |
 
 
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E265_E26.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E265_E26.py.snap
index 72764afcb3c7f..d5246061018a5 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E265_E26.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E265_E26.py.snap
@@ -40,4 +40,13 @@ E26.py:32:1: E265 Block comment should start with `# `
 35 | pass  # an inline comment
    |
 
+E26.py:73:1: E265 Block comment should start with `# `
+   |
+73 | # F   Means test is failing (F)
+74 | # EF  Means test is giving error and Failing
+75 | #!   Means test is segfaulting
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ E265
+76 | # 8   Means test runs forever
+   |
+
 
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E266_E26.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E266_E26.py.snap
index 4ecd7f71f792a..172a3352b8dbc 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E266_E26.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E266_E26.py.snap
@@ -30,4 +30,13 @@ E26.py:26:1: E266 Too many leading `#` before block comment
 30 | #########################################
    |
 
+E26.py:69:1: E266 Too many leading `#` before block comment
+   |
+69 | #: E265:5:1
+70 | ### Means test is not done yet
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ E266
+71 | # E   Means test is giving error (E)
+72 | # F   Means test is failing (F)
+   |
+
 
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E271_E27.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E271_E27.py.snap
index af6e1e52f0b06..841b925644349 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E271_E27.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E271_E27.py.snap
@@ -6,7 +6,7 @@ E27.py:4:9: E271 Multiple spaces after keyword
 4 | True and False
 5 | #: E271
 6 | True and  False
-  |          E271
+  |         ^^ E271
 7 | #: E272
 8 | True  and False
   |
@@ -16,7 +16,7 @@ E27.py:6:5: E271 Multiple spaces after keyword
  6 | True and  False
  7 | #: E272
  8 | True  and False
-   |      E271
+   |     ^^ E271
  9 | #: E271
 10 | if   1:
    |
@@ -26,17 +26,17 @@ E27.py:8:3: E271 Multiple spaces after keyword
  8 | True  and False
  9 | #: E271
 10 | if   1:
-   |    E271
+   |   ^^^ E271
 11 | #: E273
 12 | True and        False
    |
 
 E27.py:14:6: E271 Multiple spaces after keyword
    |
-14 | True        and    False
+14 | True        and False
 15 | #: E271
 16 | a and  b
-   |       E271
+   |      ^^ E271
 17 | #: E271
 18 | 1 and  b
    |
@@ -46,7 +46,7 @@ E27.py:16:6: E271 Multiple spaces after keyword
 16 | a and  b
 17 | #: E271
 18 | 1 and  b
-   |       E271
+   |      ^^ E271
 19 | #: E271
 20 | a and  2
    |
@@ -56,7 +56,7 @@ E27.py:18:6: E271 Multiple spaces after keyword
 18 | 1 and  b
 19 | #: E271
 20 | a and  2
-   |       E271
+   |      ^^ E271
 21 | #: E271 E272
 22 | 1  and  b
    |
@@ -66,7 +66,7 @@ E27.py:20:7: E271 Multiple spaces after keyword
 20 | a and  2
 21 | #: E271 E272
 22 | 1  and  b
-   |        E271
+   |       ^^ E271
 23 | #: E271 E272
 24 | a  and  2
    |
@@ -76,7 +76,7 @@ E27.py:22:7: E271 Multiple spaces after keyword
 22 | 1  and  b
 23 | #: E271 E272
 24 | a  and  2
-   |        E271
+   |       ^^ E271
 25 | #: E272
 26 | this  and False
    |
@@ -86,7 +86,7 @@ E27.py:35:14: E271 Multiple spaces after keyword
 35 | from v import c, d
 36 | #: E271
 37 | from w import  (e, f)
-   |               E271
+   |              ^^ E271
 38 | #: E275
 39 | from w import(e, f)
    |
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E272_E27.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E272_E27.py.snap
index 1bc20e60e5be3..cd1e6c64a4222 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E272_E27.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E272_E27.py.snap
@@ -6,7 +6,7 @@ E27.py:20:2: E272 Multiple spaces before keyword
 20 | a and  2
 21 | #: E271 E272
 22 | 1  and  b
-   |   E272
+   |  ^^ E272
 23 | #: E271 E272
 24 | a  and  2
    |
@@ -16,7 +16,7 @@ E27.py:22:2: E272 Multiple spaces before keyword
 22 | 1  and  b
 23 | #: E271 E272
 24 | a  and  2
-   |   E272
+   |  ^^ E272
 25 | #: E272
 26 | this  and False
    |
@@ -26,9 +26,9 @@ E27.py:24:5: E272 Multiple spaces before keyword
 24 | a  and  2
 25 | #: E272
 26 | this  and False
-   |      E272
+   |     ^^ E272
 27 | #: E273
-28 | a and    b
+28 | a and   b
    |
 
 
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E273_E27.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E273_E27.py.snap
index 87dce5836355a..4bec40e239015 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E273_E27.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E273_E27.py.snap
@@ -6,17 +6,17 @@ E27.py:10:9: E273 Tab after keyword
 10 | if   1:
 11 | #: E273
 12 | True and        False
-   |          E273
+   |         ^^^^^^^^ E273
 13 | #: E273 E274
-14 | True        and    False
+14 | True        and False
    |
 
 E27.py:12:5: E273 Tab after keyword
    |
 12 | True and        False
 13 | #: E273 E274
-14 | True        and    False
-   |      E273
+14 | True        and False
+   |     ^^^^^^^^ E273
 15 | #: E271
 16 | a and  b
    |
@@ -25,8 +25,8 @@ E27.py:12:10: E273 Tab after keyword
    |
 12 | True and        False
 13 | #: E273 E274
-14 | True        and    False
-   |                 E273
+14 | True        and False
+   |                ^ E273
 15 | #: E271
 16 | a and  b
    |
@@ -35,18 +35,18 @@ E27.py:26:6: E273 Tab after keyword
    |
 26 | this  and False
 27 | #: E273
-28 | a and    b
-   |       E273
+28 | a and   b
+   |      ^^^ E273
 29 | #: E274
-30 | a        and b
+30 | a       and b
    |
 
 E27.py:30:10: E273 Tab after keyword
    |
-30 | a        and b
+30 | a       and b
 31 | #: E273 E274
-32 | this        and    False
-   |                 E273
+32 | this        and False
+   |                ^ E273
 33 | #: Okay
 34 | from u import (a, b)
    |
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E274_E27.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E274_E27.py.snap
index 1150a45c696c7..fb5091c264e04 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E274_E27.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E274_E27.py.snap
@@ -1,22 +1,22 @@
 ---
 source: crates/ruff/src/rules/pycodestyle/mod.rs
 ---
-E27.py:28:3: E274 Tab before keyword
+E27.py:28:2: E274 Tab before keyword
    |
-28 | a and    b
+28 | a and   b
 29 | #: E274
-30 | a        and b
-   |       E274
+30 | a       and b
+   |  ^^^^^^^ E274
 31 | #: E273 E274
-32 | this        and    False
+32 | this        and False
    |
 
-E27.py:30:6: E274 Tab before keyword
+E27.py:30:5: E274 Tab before keyword
    |
-30 | a        and b
+30 | a       and b
 31 | #: E273 E274
-32 | this        and    False
-   |          E274
+32 | this        and False
+   |     ^^^^^^^^ E274
 33 | #: Okay
 34 | from u import (a, b)
    |
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E275_E27.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E275_E27.py.snap
index fa43f95e738da..24f27ec0e4609 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E275_E27.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E275_E27.py.snap
@@ -1,52 +1,52 @@
 ---
 source: crates/ruff/src/rules/pycodestyle/mod.rs
 ---
-E27.py:37:14: E275 Missing whitespace after keyword
+E27.py:37:8: E275 Missing whitespace after keyword
    |
 37 | from w import  (e, f)
 38 | #: E275
 39 | from w import(e, f)
-   |               E275
+   |        ^^^^^^ E275
 40 | #: E275
 41 | from importable.module import(e, f)
    |
 
-E27.py:39:30: E275 Missing whitespace after keyword
+E27.py:39:24: E275 Missing whitespace after keyword
    |
 39 | from w import(e, f)
 40 | #: E275
 41 | from importable.module import(e, f)
-   |                               E275
+   |                        ^^^^^^ E275
 42 | #: E275
 43 | try:
    |
 
-E27.py:42:34: E275 Missing whitespace after keyword
+E27.py:42:28: E275 Missing whitespace after keyword
    |
 42 | #: E275
 43 | try:
 44 |     from importable.module import(e, f)
-   |                                   E275
+   |                            ^^^^^^ E275
 45 | except ImportError:
 46 |     pass
    |
 
-E27.py:46:3: E275 Missing whitespace after keyword
+E27.py:46:1: E275 Missing whitespace after keyword
    |
 46 |     pass
 47 | #: E275
 48 | if(foo):
-   |    E275
+   | ^^ E275
 49 |     pass
 50 | else:
    |
 
-E27.py:54:11: E275 Missing whitespace after keyword
+E27.py:54:5: E275 Missing whitespace after keyword
    |
 54 | #: E275:2:11
 55 | if True:
 56 |     assert(1)
-   |            E275
+   |     ^^^^^^ E275
 57 | #: Okay
 58 | def f():
    |
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E402_E402.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E402_E402.py.snap
index c5ab26ba38029..b2e69a17baac0 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E402_E402.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E402_E402.py.snap
@@ -3,7 +3,7 @@ source: crates/ruff/src/rules/pycodestyle/mod.rs
 ---
 E402.py:24:1: E402 Module level import not at top of file
    |
-24 | y = x + 1
+24 | __some__magic = 1
 25 | 
 26 | import f
    | ^^^^^^^^ E402
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E731_E731.py.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E731_E731.py.snap
index db72312da9792..891132f635ff4 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E731_E731.py.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E731_E731.py.snap
@@ -115,6 +115,7 @@ E731.py:14:5: E731 Do not assign a `lambda` expression, use a `def`
 16 |     f = lambda x: 2 * x
    |     ^^^^^^^^^^^^^^^^^^^ E731
    |
+   = help: Rewrite `f` as a `def`
 
 E731.py:32:1: E731 [*] Do not assign a `lambda` expression, use a `def`
    |
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__max_doc_length.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__max_doc_length.snap
index a1fc3e95e1d68..ddd89346dc584 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__max_doc_length.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__max_doc_length.snap
@@ -10,7 +10,7 @@ W505.py:2:51: W505 Doc line too long (57 > 50 characters)
 
 W505.py:6:51: W505 Doc line too long (56 > 50 characters)
   |
-6 | def f():
+6 | def f1():
 7 |     """Here's a docstring that's also over the limit."""
   |                                                   ^^^^^^ W505
 8 | 
@@ -42,4 +42,21 @@ W505.py:18:51: W505 Doc line too long (61 > 50 characters)
    |                                                   ^^^^^^^^^^^ W505
    |
 
+W505.py:24:51: W505 Doc line too long (82 > 50 characters)
+   |
+24 |     """Here's a multi-line docstring.
+25 | 
+26 |     It's over the limit on this line, which isn't the first line in the docstring.
+   |                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ W505
+27 |     """
+   |
+
+W505.py:31:51: W505 Doc line too long (85 > 50 characters)
+   |
+31 |     """Here's a multi-line docstring.
+32 | 
+33 |     It's over the limit on this line, which isn't the first line in the docstring."""
+   |                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ W505
+   |
+
 
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__max_doc_length_with_utf_8.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__max_doc_length_with_utf_8.snap
new file mode 100644
index 0000000000000..17d2ed3c77438
--- /dev/null
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__max_doc_length_with_utf_8.snap
@@ -0,0 +1,62 @@
+---
+source: crates/ruff/src/rules/pycodestyle/mod.rs
+---
+W505_utf_8.py:2:50: W505 Doc line too long (57 > 50 characters)
+  |
+2 | #!/usr/bin/env python3
+3 | """Here's a top-level ß9💣2ℝing that's over theß9💣2ℝ."""
+  |                                                    ^^^^^^ W505
+  |
+
+W505_utf_8.py:6:49: W505 Doc line too long (56 > 50 characters)
+  |
+6 | def f1():
+7 |     """Here's a ß9💣2ℝing that's also over theß9💣2ℝ."""
+  |                                                   ^^^^^^ W505
+8 | 
+9 |     x = 1  # Here's a comment that's over theß9💣2ℝ, but it's not standalone.
+  |
+
+W505_utf_8.py:10:51: W505 Doc line too long (56 > 50 characters)
+   |
+10 |     x = 1  # Here's a comment that's over theß9💣2ℝ, but it's not standalone.
+11 | 
+12 |     # Here's a standalone comment that's over theß9💣2ℝ.
+   |                                                   ^^^^^^ W505
+13 | 
+14 |     x = 2
+   |
+
+W505_utf_8.py:13:51: W505 Doc line too long (93 > 50 characters)
+   |
+13 |     x = 2
+14 |     # Another standalone that is preceded by a newline and indent toke and is over theß9💣2ℝ.
+   |                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ W505
+15 | 
+16 |     print("Here's a string that's over theß9💣2ℝ, but it's not a ß9💣2ℝing.")
+   |
+
+W505_utf_8.py:18:50: W505 Doc line too long (61 > 50 characters)
+   |
+18 | "This is also considered a ß9💣2ℝing, and is over theß9💣2ℝ."
+   |                                                   ^^^^^^^^^^^ W505
+   |
+
+W505_utf_8.py:24:50: W505 Doc line too long (82 > 50 characters)
+   |
+24 |     """Here's a multi-line ß9💣2ℝing.
+25 | 
+26 |     It's over theß9💣2ℝ on this line, which isn't the first line in the ß9💣2ℝing.
+   |                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ W505
+27 |     """
+   |
+
+W505_utf_8.py:31:50: W505 Doc line too long (85 > 50 characters)
+   |
+31 |     """Here's a multi-line ß9💣2ℝing.
+32 | 
+33 |     It's over theß9💣2ℝ on this line, which isn't the first line in the ß9💣2ℝing."""
+   |                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ W505
+   |
+
+
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__shebang.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__shebang.snap
new file mode 100644
index 0000000000000..b3ef62b1e2b58
--- /dev/null
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__shebang.snap
@@ -0,0 +1,13 @@
+---
+source: crates/ruff/src/rules/pycodestyle/mod.rs
+---
+shebang.py:3:1: E265 Block comment should start with `# `
+  |
+3 | #!/usr/bin/python
+4 | #
+5 | #!
+  | ^^ E265
+6 | #:
+  |
+
+
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_1.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_1.snap
new file mode 100644
index 0000000000000..674ac41bd6b5a
--- /dev/null
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_1.snap
@@ -0,0 +1,56 @@
+---
+source: crates/ruff/src/rules/pycodestyle/mod.rs
+---
+E501_2.py:1:81: E501 Line too long (89 > 88 characters)
+  |
+1 | a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |                                                                                         ^ E501
+2 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |
+
+E501_2.py:2:81: E501 Line too long (89 > 88 characters)
+  |
+2 | a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+3 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |                                                                                             ^ E501
+4 | 
+5 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |
+
+E501_2.py:4:81: E501 Line too long (89 > 88 characters)
+  |
+4 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+5 | 
+6 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |                                                                                         ^ E501
+7 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |
+
+E501_2.py:5:81: E501 Line too long (89 > 88 characters)
+  |
+5 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+6 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |                                                                                             ^ E501
+7 | 
+8 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |
+
+E501_2.py:7:82: E501 Line too long (89 > 88 characters)
+   |
+ 7 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+ 8 | 
+ 9 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |                                                                                         ^ E501
+10 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |
+
+E501_2.py:10:82: E501 Line too long (89 > 88 characters)
+   |
+10 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+11 | 
+12 | d       =       """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |                                                                                         ^ E501
+13 | d   =   """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |
+
+
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_2.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_2.snap
new file mode 100644
index 0000000000000..674ac41bd6b5a
--- /dev/null
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_2.snap
@@ -0,0 +1,56 @@
+---
+source: crates/ruff/src/rules/pycodestyle/mod.rs
+---
+E501_2.py:1:81: E501 Line too long (89 > 88 characters)
+  |
+1 | a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |                                                                                         ^ E501
+2 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |
+
+E501_2.py:2:81: E501 Line too long (89 > 88 characters)
+  |
+2 | a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+3 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |                                                                                             ^ E501
+4 | 
+5 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |
+
+E501_2.py:4:81: E501 Line too long (89 > 88 characters)
+  |
+4 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+5 | 
+6 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |                                                                                         ^ E501
+7 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |
+
+E501_2.py:5:81: E501 Line too long (89 > 88 characters)
+  |
+5 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+6 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |                                                                                             ^ E501
+7 | 
+8 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |
+
+E501_2.py:7:82: E501 Line too long (89 > 88 characters)
+   |
+ 7 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+ 8 | 
+ 9 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |                                                                                         ^ E501
+10 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |
+
+E501_2.py:10:82: E501 Line too long (89 > 88 characters)
+   |
+10 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+11 | 
+12 | d       =       """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |                                                                                         ^ E501
+13 | d   =   """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |
+
+
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_4.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_4.snap
new file mode 100644
index 0000000000000..ef6c75a66d0da
--- /dev/null
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_4.snap
@@ -0,0 +1,65 @@
+---
+source: crates/ruff/src/rules/pycodestyle/mod.rs
+---
+E501_2.py:1:81: E501 Line too long (89 > 88 characters)
+  |
+1 | a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |                                                                                         ^ E501
+2 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |
+
+E501_2.py:2:77: E501 Line too long (93 > 88 characters)
+  |
+2 | a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+3 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |                                                                                         ^^^^^ E501
+4 | 
+5 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |
+
+E501_2.py:4:81: E501 Line too long (89 > 88 characters)
+  |
+4 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+5 | 
+6 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |                                                                                         ^ E501
+7 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |
+
+E501_2.py:5:77: E501 Line too long (93 > 88 characters)
+  |
+5 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+6 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |                                                                                         ^^^^^ E501
+7 | 
+8 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |
+
+E501_2.py:7:82: E501 Line too long (89 > 88 characters)
+   |
+ 7 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+ 8 | 
+ 9 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |                                                                                         ^ E501
+10 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |
+
+E501_2.py:8:78: E501 Line too long (89 > 88 characters)
+   |
+ 8 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+ 9 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |                                                                                         ^ E501
+10 | 
+11 | d       =       """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |
+
+E501_2.py:10:82: E501 Line too long (89 > 88 characters)
+   |
+10 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+11 | 
+12 | d       =       """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |                                                                                         ^ E501
+13 | d   =   """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |
+
+
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_8.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_8.snap
new file mode 100644
index 0000000000000..139405c99331d
--- /dev/null
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_8.snap
@@ -0,0 +1,72 @@
+---
+source: crates/ruff/src/rules/pycodestyle/mod.rs
+---
+E501_2.py:1:81: E501 Line too long (89 > 88 characters)
+  |
+1 | a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |                                                                                         ^ E501
+2 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |
+
+E501_2.py:2:70: E501 Line too long (101 > 88 characters)
+  |
+2 | a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+3 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |                                                                                 ^^^^^^^^^^^^^ E501
+4 | 
+5 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |
+
+E501_2.py:4:81: E501 Line too long (89 > 88 characters)
+  |
+4 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+5 | 
+6 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |                                                                                         ^ E501
+7 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |
+
+E501_2.py:5:70: E501 Line too long (101 > 88 characters)
+  |
+5 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+6 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |                                                                                 ^^^^^^^^^^^^^ E501
+7 | 
+8 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+  |
+
+E501_2.py:7:82: E501 Line too long (89 > 88 characters)
+   |
+ 7 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+ 8 | 
+ 9 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |                                                                                         ^ E501
+10 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |
+
+E501_2.py:8:71: E501 Line too long (97 > 88 characters)
+   |
+ 8 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+ 9 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |                                                                                  ^^^^^^^^ E501
+10 | 
+11 | d       =       """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |
+
+E501_2.py:10:82: E501 Line too long (89 > 88 characters)
+   |
+10 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+11 | 
+12 | d       =       """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |                                                                                         ^ E501
+13 | d   =   """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |
+
+E501_2.py:11:70: E501 Line too long (89 > 88 characters)
+   |
+11 | d       =       """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+12 | d   =   """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+   |                                                                                 ^ E501
+   |
+
+
diff --git a/crates/ruff/src/rules/pydocstyle/helpers.rs b/crates/ruff/src/rules/pydocstyle/helpers.rs
index 196fa42f2fca9..9cc9d84e1178a 100644
--- a/crates/ruff/src/rules/pydocstyle/helpers.rs
+++ b/crates/ruff/src/rules/pydocstyle/helpers.rs
@@ -1,13 +1,12 @@
-use ruff_python_ast::call_path::from_qualified_name;
 use std::collections::BTreeSet;
 
+use ruff_newlines::StrExt;
+use ruff_python_ast::call_path::from_qualified_name;
 use ruff_python_ast::cast;
 use ruff_python_ast::helpers::map_callable;
-use ruff_python_ast::newlines::StrExt;
 use ruff_python_ast::str::is_implicit_concatenation;
-
-use crate::checkers::ast::Checker;
-use crate::docstrings::definition::{Definition, DefinitionKind};
+use ruff_python_semantic::definition::{Definition, Member, MemberKind};
+use ruff_python_semantic::model::SemanticModel;
 
 /// Return the index of the first logical line in a string.
 pub(crate) fn logical_line(content: &str) -> Option<usize> {
@@ -37,7 +36,7 @@ pub(crate) fn normalize_word(first_word: &str) -> String {
 
 /// Check decorator list to see if function should be ignored.
 pub(crate) fn should_ignore_definition(
-    checker: &Checker,
+    model: &SemanticModel,
     definition: &Definition,
     ignore_decorators: &BTreeSet<String>,
 ) -> bool {
@@ -45,12 +44,14 @@ pub(crate) fn should_ignore_definition(
         return false;
     }
 
-    if let DefinitionKind::Function(parent)
-    | DefinitionKind::NestedFunction(parent)
-    | DefinitionKind::Method(parent) = definition.kind
+    if let Definition::Member(Member {
+        kind: MemberKind::Function | MemberKind::NestedFunction | MemberKind::Method,
+        stmt,
+        ..
+    }) = definition
     {
-        for decorator in cast::decorator_list(parent) {
-            if let Some(call_path) = checker.ctx.resolve_call_path(map_callable(decorator)) {
+        for decorator in cast::decorator_list(stmt) {
+            if let Some(call_path) = model.resolve_call_path(map_callable(decorator)) {
                 if ignore_decorators
                     .iter()
                     .any(|decorator| from_qualified_name(decorator) == call_path)
diff --git a/crates/ruff/src/rules/pydocstyle/mod.rs b/crates/ruff/src/rules/pydocstyle/mod.rs
index a184174e31b53..9dc0e45fa5597 100644
--- a/crates/ruff/src/rules/pydocstyle/mod.rs
+++ b/crates/ruff/src/rules/pydocstyle/mod.rs
@@ -9,7 +9,6 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
@@ -18,63 +17,72 @@ mod tests {
 
     use super::settings::{Convention, Settings};
 
-    #[test_case(Rule::BlankLineAfterLastSection, Path::new("sections.py"); "D413")]
-    #[test_case(Rule::NoBlankLineAfterSection, Path::new("sections.py"); "D410")]
-    #[test_case(Rule::BlankLineAfterSummary, Path::new("D.py"); "D205")]
-    #[test_case(Rule::NoBlankLineBeforeSection, Path::new("sections.py"); "D411")]
-    #[test_case(Rule::CapitalizeSectionName, Path::new("sections.py"); "D405")]
-    #[test_case(Rule::DashedUnderlineAfterSection, Path::new("sections.py"); "D407")]
-    #[test_case(Rule::UndocumentedParam, Path::new("canonical_google_examples.py"); "D417_2")]
-    #[test_case(Rule::UndocumentedParam, Path::new("canonical_numpy_examples.py"); "D417_1")]
-    #[test_case(Rule::UndocumentedParam, Path::new("sections.py"); "D417_0")]
-    #[test_case(Rule::EndsInPeriod, Path::new("D.py"); "D400_0")]
-    #[test_case(Rule::EndsInPeriod, Path::new("D400.py"); "D400_1")]
-    #[test_case(Rule::EndsInPunctuation, Path::new("D.py"); "D415")]
-    #[test_case(Rule::FirstLineCapitalized, Path::new("D.py"); "D403_0")]
-    #[test_case(Rule::FirstLineCapitalized, Path::new("D403.py"); "D403_1")]
-    #[test_case(Rule::FitsOnOneLine, Path::new("D.py"); "D200")]
-    #[test_case(Rule::IndentWithSpaces, Path::new("D.py"); "D206")]
-    #[test_case(Rule::UndocumentedMagicMethod, Path::new("D.py"); "D105")]
-    #[test_case(Rule::MultiLineSummaryFirstLine, Path::new("D.py"); "D212")]
-    #[test_case(Rule::MultiLineSummarySecondLine, Path::new("D.py"); "D213")]
-    #[test_case(Rule::NewLineAfterLastParagraph, Path::new("D.py"); "D209")]
-    #[test_case(Rule::NewLineAfterSectionName, Path::new("sections.py"); "D406")]
-    #[test_case(Rule::NoBlankLineAfterFunction, Path::new("D.py"); "D202_0")]
-    #[test_case(Rule::NoBlankLineAfterFunction, Path::new("D202.py"); "D202_1")]
-    #[test_case(Rule::BlankLineBeforeClass, Path::new("D.py"); "D211")]
-    #[test_case(Rule::NoBlankLineBeforeFunction, Path::new("D.py"); "D201")]
-    #[test_case(Rule::BlankLinesBetweenHeaderAndContent, Path::new("sections.py"); "D412")]
-    #[test_case(Rule::OverIndentation, Path::new("D.py"); "D208")]
-    #[test_case(Rule::NoSignature, Path::new("D.py"); "D402")]
-    #[test_case(Rule::SurroundingWhitespace, Path::new("D.py"); "D210")]
-    #[test_case(Rule::DocstringStartsWithThis, Path::new("D.py"); "D404")]
-    #[test_case(Rule::UnderIndentation, Path::new("D.py"); "D207")]
-    #[test_case(Rule::EmptyDocstring, Path::new("D.py"); "D419")]
-    #[test_case(Rule::EmptyDocstringSection, Path::new("sections.py"); "D414")]
-    #[test_case(Rule::NonImperativeMood, Path::new("D401.py"); "D401")]
-    #[test_case(Rule::OneBlankLineAfterClass, Path::new("D.py"); "D204")]
-    #[test_case(Rule::OneBlankLineBeforeClass, Path::new("D.py"); "D203")]
-    #[test_case(Rule::UndocumentedPublicClass, Path::new("D.py"); "D101")]
-    #[test_case(Rule::UndocumentedPublicFunction, Path::new("D.py"); "D103")]
-    #[test_case(Rule::UndocumentedPublicInit, Path::new("D.py"); "D107")]
-    #[test_case(Rule::UndocumentedPublicMethod, Path::new("D.py"); "D102_0")]
-    #[test_case(Rule::UndocumentedPublicMethod, Path::new("setter.py"); "D102_1")]
-    #[test_case(Rule::UndocumentedPublicModule, Path::new("D.py"); "D100")]
-    #[test_case(Rule::UndocumentedPublicModule, Path::new("_unrelated/pkg/D100_pub.py"); "D100_ignore_unrelated_pub")]
-    #[test_case(Rule::UndocumentedPublicModule, Path::new("_unrelated/pkg/_priv/no_D100_priv.py"); "no_d100_priv")]
-    #[test_case(Rule::UndocumentedPublicModule, Path::new("_unrelated/_no_pkg_priv.py"); "no_d100_priv_script")]
-    #[test_case(Rule::UndocumentedPublicNestedClass, Path::new("D.py"); "D106")]
-    #[test_case(Rule::UndocumentedPublicPackage, Path::new("D.py"); "D104_0")]
-    #[test_case(Rule::UndocumentedPublicPackage, Path::new("D104/__init__.py"); "D104_1")]
-    #[test_case(Rule::SectionNameEndsInColon, Path::new("D.py"); "D416")]
-    #[test_case(Rule::SectionNotOverIndented, Path::new("sections.py"); "D214")]
-    #[test_case(Rule::SectionNotOverIndented, Path::new("D214_module.py"); "D214_module")]
-    #[test_case(Rule::SectionUnderlineAfterName, Path::new("sections.py"); "D408")]
-    #[test_case(Rule::SectionUnderlineMatchesSectionLength, Path::new("sections.py"); "D409")]
-    #[test_case(Rule::SectionUnderlineNotOverIndented, Path::new("sections.py"); "D215")]
-    #[test_case(Rule::OverloadWithDocstring, Path::new("D.py"); "D418")]
-    #[test_case(Rule::EscapeSequenceInDocstring, Path::new("D.py"); "D301")]
-    #[test_case(Rule::TripleSingleQuotes, Path::new("D.py"); "D300")]
+    #[test_case(Rule::BlankLineAfterLastSection, Path::new("sections.py"))]
+    #[test_case(Rule::NoBlankLineAfterSection, Path::new("sections.py"))]
+    #[test_case(Rule::BlankLineAfterSummary, Path::new("D.py"))]
+    #[test_case(Rule::NoBlankLineBeforeSection, Path::new("sections.py"))]
+    #[test_case(Rule::CapitalizeSectionName, Path::new("sections.py"))]
+    #[test_case(Rule::DashedUnderlineAfterSection, Path::new("sections.py"))]
+    #[test_case(Rule::UndocumentedParam, Path::new("canonical_google_examples.py"))]
+    #[test_case(Rule::UndocumentedParam, Path::new("canonical_numpy_examples.py"))]
+    #[test_case(Rule::UndocumentedParam, Path::new("sections.py"))]
+    #[test_case(Rule::EndsInPeriod, Path::new("D.py"))]
+    #[test_case(Rule::EndsInPeriod, Path::new("D400.py"))]
+    #[test_case(Rule::EndsInPunctuation, Path::new("D.py"))]
+    #[test_case(Rule::FirstLineCapitalized, Path::new("D.py"))]
+    #[test_case(Rule::FirstLineCapitalized, Path::new("D403.py"))]
+    #[test_case(Rule::FitsOnOneLine, Path::new("D.py"))]
+    #[test_case(Rule::IndentWithSpaces, Path::new("D.py"))]
+    #[test_case(Rule::UndocumentedMagicMethod, Path::new("D.py"))]
+    #[test_case(Rule::MultiLineSummaryFirstLine, Path::new("D.py"))]
+    #[test_case(Rule::MultiLineSummarySecondLine, Path::new("D.py"))]
+    #[test_case(Rule::NewLineAfterLastParagraph, Path::new("D.py"))]
+    #[test_case(Rule::NewLineAfterSectionName, Path::new("sections.py"))]
+    #[test_case(Rule::NoBlankLineAfterFunction, Path::new("D.py"))]
+    #[test_case(Rule::NoBlankLineAfterFunction, Path::new("D202.py"))]
+    #[test_case(Rule::BlankLineBeforeClass, Path::new("D.py"))]
+    #[test_case(Rule::NoBlankLineBeforeFunction, Path::new("D.py"))]
+    #[test_case(Rule::BlankLinesBetweenHeaderAndContent, Path::new("sections.py"))]
+    #[test_case(Rule::OverIndentation, Path::new("D.py"))]
+    #[test_case(Rule::NoSignature, Path::new("D.py"))]
+    #[test_case(Rule::SurroundingWhitespace, Path::new("D.py"))]
+    #[test_case(Rule::DocstringStartsWithThis, Path::new("D.py"))]
+    #[test_case(Rule::UnderIndentation, Path::new("D.py"))]
+    #[test_case(Rule::EmptyDocstring, Path::new("D.py"))]
+    #[test_case(Rule::EmptyDocstringSection, Path::new("sections.py"))]
+    #[test_case(Rule::NonImperativeMood, Path::new("D401.py"))]
+    #[test_case(Rule::OneBlankLineAfterClass, Path::new("D.py"))]
+    #[test_case(Rule::OneBlankLineBeforeClass, Path::new("D.py"))]
+    #[test_case(Rule::UndocumentedPublicClass, Path::new("D.py"))]
+    #[test_case(Rule::UndocumentedPublicFunction, Path::new("D.py"))]
+    #[test_case(Rule::UndocumentedPublicInit, Path::new("D.py"))]
+    #[test_case(Rule::UndocumentedPublicMethod, Path::new("D.py"))]
+    #[test_case(Rule::UndocumentedPublicMethod, Path::new("setter.py"))]
+    #[test_case(Rule::UndocumentedPublicModule, Path::new("D.py"))]
+    #[test_case(
+        Rule::UndocumentedPublicModule,
+        Path::new("_unrelated/pkg/D100_pub.py")
+    )]
+    #[test_case(
+        Rule::UndocumentedPublicModule,
+        Path::new("_unrelated/pkg/_priv/no_D100_priv.py")
+    )]
+    #[test_case(
+        Rule::UndocumentedPublicModule,
+        Path::new("_unrelated/_no_pkg_priv.py")
+    )]
+    #[test_case(Rule::UndocumentedPublicNestedClass, Path::new("D.py"))]
+    #[test_case(Rule::UndocumentedPublicPackage, Path::new("D.py"))]
+    #[test_case(Rule::UndocumentedPublicPackage, Path::new("D104/__init__.py"))]
+    #[test_case(Rule::SectionNameEndsInColon, Path::new("D.py"))]
+    #[test_case(Rule::SectionNotOverIndented, Path::new("sections.py"))]
+    #[test_case(Rule::SectionNotOverIndented, Path::new("D214_module.py"))]
+    #[test_case(Rule::SectionUnderlineAfterName, Path::new("sections.py"))]
+    #[test_case(Rule::SectionUnderlineMatchesSectionLength, Path::new("sections.py"))]
+    #[test_case(Rule::SectionUnderlineNotOverIndented, Path::new("sections.py"))]
+    #[test_case(Rule::OverloadWithDocstring, Path::new("D.py"))]
+    #[test_case(Rule::EscapeSequenceInDocstring, Path::new("D.py"))]
+    #[test_case(Rule::TripleSingleQuotes, Path::new("D.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
@@ -168,4 +176,23 @@ mod tests {
         assert_messages!(diagnostics);
         Ok(())
     }
+
+    #[test]
+    fn all() -> Result<()> {
+        let diagnostics = test_path(
+            Path::new("pydocstyle/all.py"),
+            &settings::Settings::for_rules([
+                Rule::UndocumentedPublicModule,
+                Rule::UndocumentedPublicClass,
+                Rule::UndocumentedPublicMethod,
+                Rule::UndocumentedPublicFunction,
+                Rule::UndocumentedPublicPackage,
+                Rule::UndocumentedMagicMethod,
+                Rule::UndocumentedPublicNestedClass,
+                Rule::UndocumentedPublicInit,
+            ]),
+        )?;
+        assert_messages!(diagnostics);
+        Ok(())
+    }
 }
diff --git a/crates/ruff/src/rules/pydocstyle/rules/backslashes.rs b/crates/ruff/src/rules/pydocstyle/rules/backslashes.rs
index b29f3de2cc56c..7bd2b326fda9a 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/backslashes.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/backslashes.rs
@@ -5,7 +5,7 @@ use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::Docstring;
+use crate::docstrings::Docstring;
 
 #[violation]
 pub struct EscapeSequenceInDocstring;
@@ -20,7 +20,7 @@ impl Violation for EscapeSequenceInDocstring {
 static BACKSLASH_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"\\[^(\r\n|\n)uN]").unwrap());
 
 /// D301
-pub fn backslashes(checker: &mut Checker, docstring: &Docstring) {
+pub(crate) fn backslashes(checker: &mut Checker, docstring: &Docstring) {
     let contents = docstring.contents;
 
     // Docstring is already raw.
diff --git a/crates/ruff/src/rules/pydocstyle/rules/blank_after_summary.rs b/crates/ruff/src/rules/pydocstyle/rules/blank_after_summary.rs
index bbac7b3a72fb1..35381b5a8db92 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/blank_after_summary.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/blank_after_summary.rs
@@ -1,19 +1,16 @@
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Violation};
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::{StrExt, UniversalNewlineIterator};
+use ruff_newlines::{StrExt, UniversalNewlineIterator};
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::Docstring;
+use crate::docstrings::Docstring;
 use crate::registry::AsRule;
 
 #[violation]
 pub struct BlankLineAfterSummary {
-    pub num_lines: usize,
+    num_lines: usize,
 }
 
-fn fmt_blank_line_after_summary_autofix_msg(_: &BlankLineAfterSummary) -> String {
-    "Insert single blank line".to_string()
-}
 impl Violation for BlankLineAfterSummary {
     const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
 
@@ -29,17 +26,13 @@ impl Violation for BlankLineAfterSummary {
         }
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        let BlankLineAfterSummary { num_lines } = self;
-        if *num_lines > 0 {
-            return Some(fmt_blank_line_after_summary_autofix_msg);
-        }
-        None
+    fn autofix_title(&self) -> Option<String> {
+        Some("Insert single blank line".to_string())
     }
 }
 
 /// D205
-pub fn blank_after_summary(checker: &mut Checker, docstring: &Docstring) {
+pub(crate) fn blank_after_summary(checker: &mut Checker, docstring: &Docstring) {
     let body = docstring.body();
 
     let mut lines_count: usize = 1;
@@ -82,11 +75,12 @@ pub fn blank_after_summary(checker: &mut Checker, docstring: &Docstring) {
                 }
 
                 // Insert one blank line after the summary (replacing any existing lines).
-                diagnostic.set_fix(Edit::replacement(
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::replacement(
                     checker.stylist.line_ending().to_string(),
                     summary_end,
                     blank_end,
-                ));
+                )));
             }
         }
         checker.diagnostics.push(diagnostic);
diff --git a/crates/ruff/src/rules/pydocstyle/rules/blank_before_after_class.rs b/crates/ruff/src/rules/pydocstyle/rules/blank_before_after_class.rs
index be9ed4141e8f8..b5fd96528d703 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/blank_before_after_class.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/blank_before_after_class.rs
@@ -1,15 +1,18 @@
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
-use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::{StrExt, UniversalNewlineIterator};
 use ruff_text_size::{TextLen, TextRange};
+use rustpython_parser::ast::Ranged;
+
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_newlines::{StrExt, UniversalNewlineIterator};
+use ruff_python_semantic::definition::{Definition, Member, MemberKind};
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::{DefinitionKind, Docstring};
+use crate::docstrings::Docstring;
 use crate::registry::{AsRule, Rule};
 
 #[violation]
 pub struct OneBlankLineBeforeClass {
-    pub lines: usize,
+    lines: usize,
 }
 
 impl AlwaysAutofixableViolation for OneBlankLineBeforeClass {
@@ -25,7 +28,7 @@ impl AlwaysAutofixableViolation for OneBlankLineBeforeClass {
 
 #[violation]
 pub struct OneBlankLineAfterClass {
-    pub lines: usize,
+    lines: usize,
 }
 
 impl AlwaysAutofixableViolation for OneBlankLineAfterClass {
@@ -41,7 +44,7 @@ impl AlwaysAutofixableViolation for OneBlankLineAfterClass {
 
 #[violation]
 pub struct BlankLineBeforeClass {
-    pub lines: usize,
+    lines: usize,
 }
 
 impl AlwaysAutofixableViolation for BlankLineBeforeClass {
@@ -56,23 +59,23 @@ impl AlwaysAutofixableViolation for BlankLineBeforeClass {
 }
 
 /// D203, D204, D211
-pub fn blank_before_after_class(checker: &mut Checker, docstring: &Docstring) {
-    let (DefinitionKind::Class(parent) | DefinitionKind::NestedClass(parent)) = &docstring.kind else {
+pub(crate) fn blank_before_after_class(checker: &mut Checker, docstring: &Docstring) {
+    let Definition::Member(Member {
+        kind: MemberKind::Class | MemberKind::NestedClass ,
+        stmt,
+        ..
+    }) = docstring.definition else {
         return;
     };
 
-    if checker
-        .settings
-        .rules
-        .enabled(Rule::OneBlankLineBeforeClass)
-        || checker.settings.rules.enabled(Rule::BlankLineBeforeClass)
+    if checker.enabled(Rule::OneBlankLineBeforeClass) || checker.enabled(Rule::BlankLineBeforeClass)
     {
         let before = checker
             .locator
-            .slice(TextRange::new(parent.start(), docstring.start()));
+            .slice(TextRange::new(stmt.start(), docstring.start()));
 
         let mut blank_lines_before = 0usize;
-        let mut lines = UniversalNewlineIterator::with_offset(before, parent.start()).rev();
+        let mut lines = UniversalNewlineIterator::with_offset(before, stmt.start()).rev();
         let mut blank_lines_start = lines.next().map(|line| line.start()).unwrap_or_default();
 
         for line in lines {
@@ -84,7 +87,7 @@ pub fn blank_before_after_class(checker: &mut Checker, docstring: &Docstring) {
             }
         }
 
-        if checker.settings.rules.enabled(Rule::BlankLineBeforeClass) {
+        if checker.enabled(Rule::BlankLineBeforeClass) {
             if blank_lines_before != 0 {
                 let mut diagnostic = Diagnostic::new(
                     BlankLineBeforeClass {
@@ -94,19 +97,16 @@ pub fn blank_before_after_class(checker: &mut Checker, docstring: &Docstring) {
                 );
                 if checker.patch(diagnostic.kind.rule()) {
                     // Delete the blank line before the class.
-                    diagnostic.set_fix(Edit::deletion(
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::deletion(
                         blank_lines_start,
                         docstring.start() - docstring.indentation.text_len(),
-                    ));
+                    )));
                 }
                 checker.diagnostics.push(diagnostic);
             }
         }
-        if checker
-            .settings
-            .rules
-            .enabled(Rule::OneBlankLineBeforeClass)
-        {
+        if checker.enabled(Rule::OneBlankLineBeforeClass) {
             if blank_lines_before != 1 {
                 let mut diagnostic = Diagnostic::new(
                     OneBlankLineBeforeClass {
@@ -116,21 +116,22 @@ pub fn blank_before_after_class(checker: &mut Checker, docstring: &Docstring) {
                 );
                 if checker.patch(diagnostic.kind.rule()) {
                     // Insert one blank line before the class.
-                    diagnostic.set_fix(Edit::replacement(
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::replacement(
                         checker.stylist.line_ending().to_string(),
                         blank_lines_start,
                         docstring.start() - docstring.indentation.text_len(),
-                    ));
+                    )));
                 }
                 checker.diagnostics.push(diagnostic);
             }
         }
     }
 
-    if checker.settings.rules.enabled(Rule::OneBlankLineAfterClass) {
+    if checker.enabled(Rule::OneBlankLineAfterClass) {
         let after = checker
             .locator
-            .slice(TextRange::new(docstring.end(), parent.end()));
+            .slice(TextRange::new(docstring.end(), stmt.end()));
 
         let all_blank_after = after
             .universal_newlines()
@@ -163,11 +164,12 @@ pub fn blank_before_after_class(checker: &mut Checker, docstring: &Docstring) {
             );
             if checker.patch(diagnostic.kind.rule()) {
                 // Insert a blank line before the class (replacing any existing lines).
-                diagnostic.set_fix(Edit::replacement(
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::replacement(
                     checker.stylist.line_ending().to_string(),
                     first_line_start,
                     blank_lines_end,
-                ));
+                )));
             }
             checker.diagnostics.push(diagnostic);
         }
diff --git a/crates/ruff/src/rules/pydocstyle/rules/blank_before_after_function.rs b/crates/ruff/src/rules/pydocstyle/rules/blank_before_after_function.rs
index 25cd6ca58b551..beb33af9d72dd 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/blank_before_after_function.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/blank_before_after_function.rs
@@ -1,18 +1,20 @@
 use once_cell::sync::Lazy;
 use regex::Regex;
 use ruff_text_size::{TextLen, TextRange};
+use rustpython_parser::ast::Ranged;
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::{StrExt, UniversalNewlineIterator};
+use ruff_newlines::{StrExt, UniversalNewlineIterator};
+use ruff_python_semantic::definition::{Definition, Member, MemberKind};
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::{DefinitionKind, Docstring};
+use crate::docstrings::Docstring;
 use crate::registry::{AsRule, Rule};
 
 #[violation]
 pub struct NoBlankLineBeforeFunction {
-    pub num_lines: usize,
+    num_lines: usize,
 }
 
 impl AlwaysAutofixableViolation for NoBlankLineBeforeFunction {
@@ -29,7 +31,7 @@ impl AlwaysAutofixableViolation for NoBlankLineBeforeFunction {
 
 #[violation]
 pub struct NoBlankLineAfterFunction {
-    pub num_lines: usize,
+    num_lines: usize,
 }
 
 impl AlwaysAutofixableViolation for NoBlankLineAfterFunction {
@@ -48,25 +50,21 @@ static INNER_FUNCTION_OR_CLASS_REGEX: Lazy<Regex> =
     Lazy::new(|| Regex::new(r"^\s+(?:(?:class|def|async def)\s|@)").unwrap());
 
 /// D201, D202
-pub fn blank_before_after_function(checker: &mut Checker, docstring: &Docstring) {
-    let (
-        DefinitionKind::Function(parent)
-        | DefinitionKind::NestedFunction(parent)
-        | DefinitionKind::Method(parent)
-    ) = &docstring.kind else {
+pub(crate) fn blank_before_after_function(checker: &mut Checker, docstring: &Docstring) {
+    let Definition::Member(Member {
+        kind: MemberKind::Function | MemberKind::NestedFunction | MemberKind::Method,
+        stmt,
+        ..
+    }) = docstring.definition else {
         return;
     };
 
-    if checker
-        .settings
-        .rules
-        .enabled(Rule::NoBlankLineBeforeFunction)
-    {
+    if checker.enabled(Rule::NoBlankLineBeforeFunction) {
         let before = checker
             .locator
-            .slice(TextRange::new(parent.start(), docstring.start()));
+            .slice(TextRange::new(stmt.start(), docstring.start()));
 
-        let mut lines = UniversalNewlineIterator::with_offset(before, parent.start()).rev();
+        let mut lines = UniversalNewlineIterator::with_offset(before, stmt.start()).rev();
         let mut blank_lines_before = 0usize;
         let mut blank_lines_start = lines.next().map(|l| l.end()).unwrap_or_default();
 
@@ -88,23 +86,20 @@ pub fn blank_before_after_function(checker: &mut Checker, docstring: &Docstring)
             );
             if checker.patch(diagnostic.kind.rule()) {
                 // Delete the blank line before the docstring.
-                diagnostic.set_fix(Edit::deletion(
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::deletion(
                     blank_lines_start,
                     docstring.start() - docstring.indentation.text_len(),
-                ));
+                )));
             }
             checker.diagnostics.push(diagnostic);
         }
     }
 
-    if checker
-        .settings
-        .rules
-        .enabled(Rule::NoBlankLineAfterFunction)
-    {
+    if checker.enabled(Rule::NoBlankLineAfterFunction) {
         let after = checker
             .locator
-            .slice(TextRange::new(docstring.end(), parent.end()));
+            .slice(TextRange::new(docstring.end(), stmt.end()));
 
         // If the docstring is only followed by blank and commented lines, abort.
         let all_blank_after = after
@@ -149,7 +144,11 @@ pub fn blank_before_after_function(checker: &mut Checker, docstring: &Docstring)
             );
             if checker.patch(diagnostic.kind.rule()) {
                 // Delete the blank line after the docstring.
-                diagnostic.set_fix(Edit::deletion(first_line_end, blank_lines_end));
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::deletion(
+                    first_line_end,
+                    blank_lines_end,
+                )));
             }
             checker.diagnostics.push(diagnostic);
         }
diff --git a/crates/ruff/src/rules/pydocstyle/rules/capitalized.rs b/crates/ruff/src/rules/pydocstyle/rules/capitalized.rs
index c6ecac7ed12de..7a77ddcd7f99f 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/capitalized.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/capitalized.rs
@@ -1,16 +1,18 @@
 use ruff_text_size::{TextLen, TextRange};
+use rustpython_parser::ast::Ranged;
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
+use ruff_python_semantic::definition::{Definition, Member, MemberKind};
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::{DefinitionKind, Docstring};
+use crate::docstrings::Docstring;
 use crate::registry::AsRule;
 
 #[violation]
 pub struct FirstLineCapitalized {
-    pub first_word: String,
-    pub capitalized_word: String,
+    first_word: String,
+    capitalized_word: String,
 }
 
 impl AlwaysAutofixableViolation for FirstLineCapitalized {
@@ -31,36 +33,39 @@ impl AlwaysAutofixableViolation for FirstLineCapitalized {
 }
 
 /// D403
-pub fn capitalized(checker: &mut Checker, docstring: &Docstring) {
+pub(crate) fn capitalized(checker: &mut Checker, docstring: &Docstring) {
     if !matches!(
-        docstring.kind,
-        DefinitionKind::Function(_) | DefinitionKind::NestedFunction(_) | DefinitionKind::Method(_)
+        docstring.definition,
+        Definition::Member(Member {
+            kind: MemberKind::Function | MemberKind::NestedFunction | MemberKind::Method,
+            ..
+        })
     ) {
         return;
     }
 
     let body = docstring.body();
-
     let Some(first_word) = body.split(' ').next() else {
         return
     };
-    if first_word == first_word.to_uppercase() {
-        return;
-    }
+
+    // Like pydocstyle, we only support ASCII for now.
     for char in first_word.chars() {
         if !char.is_ascii_alphabetic() && char != '\'' {
             return;
         }
     }
+
     let mut first_word_chars = first_word.chars();
     let Some(first_char) = first_word_chars.next() else {
         return;
     };
-    if first_char.is_uppercase() {
+    let uppercase_first_char = first_char.to_ascii_uppercase();
+    if first_char == uppercase_first_char {
         return;
-    };
+    }
 
-    let capitalized_word = first_char.to_uppercase().to_string() + first_word_chars.as_str();
+    let capitalized_word = uppercase_first_char.to_string() + first_word_chars.as_str();
 
     let mut diagnostic = Diagnostic::new(
         FirstLineCapitalized {
@@ -71,10 +76,11 @@ pub fn capitalized(checker: &mut Checker, docstring: &Docstring) {
     );
 
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
             capitalized_word,
             TextRange::at(body.start(), first_word.text_len()),
-        ));
+        )));
     }
 
     checker.diagnostics.push(diagnostic);
diff --git a/crates/ruff/src/rules/pydocstyle/rules/ends_with_period.rs b/crates/ruff/src/rules/pydocstyle/rules/ends_with_period.rs
index ffeb4af655b42..4dca6ae21f4c5 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/ends_with_period.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/ends_with_period.rs
@@ -1,13 +1,13 @@
 use ruff_text_size::TextLen;
 use strum::IntoEnumIterator;
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::{StrExt, UniversalNewlineIterator};
+use ruff_newlines::{StrExt, UniversalNewlineIterator};
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::Docstring;
 use crate::docstrings::sections::SectionKind;
+use crate::docstrings::Docstring;
 use crate::registry::AsRule;
 use crate::rules::pydocstyle::helpers::logical_line;
 
@@ -26,7 +26,7 @@ impl AlwaysAutofixableViolation for EndsInPeriod {
 }
 
 /// D400
-pub fn ends_with_period(checker: &mut Checker, docstring: &Docstring) {
+pub(crate) fn ends_with_period(checker: &mut Checker, docstring: &Docstring) {
     let body = docstring.body();
 
     if let Some(first_line) = body.trim().universal_newlines().next() {
@@ -64,10 +64,11 @@ pub fn ends_with_period(checker: &mut Checker, docstring: &Docstring) {
                 && !trimmed.ends_with(':')
                 && !trimmed.ends_with(';')
             {
-                diagnostic.set_fix(Edit::insertion(
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::insertion(
                     ".".to_string(),
                     line.start() + trimmed.text_len(),
-                ));
+                )));
             }
             checker.diagnostics.push(diagnostic);
         };
diff --git a/crates/ruff/src/rules/pydocstyle/rules/ends_with_punctuation.rs b/crates/ruff/src/rules/pydocstyle/rules/ends_with_punctuation.rs
index b2ed83821fd10..d4cfa195e38f2 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/ends_with_punctuation.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/ends_with_punctuation.rs
@@ -1,13 +1,13 @@
 use ruff_text_size::TextLen;
 use strum::IntoEnumIterator;
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::{StrExt, UniversalNewlineIterator};
+use ruff_newlines::{StrExt, UniversalNewlineIterator};
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::Docstring;
 use crate::docstrings::sections::SectionKind;
+use crate::docstrings::Docstring;
 use crate::registry::AsRule;
 use crate::rules::pydocstyle::helpers::logical_line;
 
@@ -26,7 +26,7 @@ impl AlwaysAutofixableViolation for EndsInPunctuation {
 }
 
 /// D415
-pub fn ends_with_punctuation(checker: &mut Checker, docstring: &Docstring) {
+pub(crate) fn ends_with_punctuation(checker: &mut Checker, docstring: &Docstring) {
     let body = docstring.body();
 
     if let Some(first_line) = body.trim().universal_newlines().next() {
@@ -61,10 +61,11 @@ pub fn ends_with_punctuation(checker: &mut Checker, docstring: &Docstring) {
             let mut diagnostic = Diagnostic::new(EndsInPunctuation, docstring.range());
             // Best-effort autofix: avoid adding a period after other punctuation marks.
             if checker.patch(diagnostic.kind.rule()) && !trimmed.ends_with([':', ';']) {
-                diagnostic.set_fix(Edit::insertion(
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::insertion(
                     ".".to_string(),
                     line.start() + trimmed.text_len(),
-                ));
+                )));
             }
             checker.diagnostics.push(diagnostic);
         };
diff --git a/crates/ruff/src/rules/pydocstyle/rules/if_needed.rs b/crates/ruff/src/rules/pydocstyle/rules/if_needed.rs
index ecb2d9e2998ac..1ef2016d5ae0f 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/if_needed.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/if_needed.rs
@@ -3,9 +3,10 @@ use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::cast;
 use ruff_python_ast::helpers::identifier_range;
 use ruff_python_semantic::analyze::visibility::is_overload;
+use ruff_python_semantic::definition::{Definition, Member, MemberKind};
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::{DefinitionKind, Docstring};
+use crate::docstrings::Docstring;
 
 #[violation]
 pub struct OverloadWithDocstring;
@@ -18,15 +19,15 @@ impl Violation for OverloadWithDocstring {
 }
 
 /// D418
-pub fn if_needed(checker: &mut Checker, docstring: &Docstring) {
-    let (
-        DefinitionKind::Function(stmt)
-        | DefinitionKind::NestedFunction(stmt)
-        | DefinitionKind::Method(stmt)
-    ) = docstring.kind else {
-        return
+pub(crate) fn if_needed(checker: &mut Checker, docstring: &Docstring) {
+    let Definition::Member(Member {
+        kind: MemberKind::Function | MemberKind::NestedFunction | MemberKind::Method,
+        stmt,
+        ..
+    }) = docstring.definition else {
+        return;
     };
-    if !is_overload(&checker.ctx, cast::decorator_list(stmt)) {
+    if !is_overload(checker.semantic_model(), cast::decorator_list(stmt)) {
         return;
     }
     checker.diagnostics.push(Diagnostic::new(
diff --git a/crates/ruff/src/rules/pydocstyle/rules/indent.rs b/crates/ruff/src/rules/pydocstyle/rules/indent.rs
index 92fc84ce10beb..f3fc53a70045f 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/indent.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/indent.rs
@@ -1,12 +1,13 @@
+use ruff_text_size::{TextLen, TextRange};
+
 use ruff_diagnostics::{AlwaysAutofixableViolation, Violation};
-use ruff_diagnostics::{Diagnostic, Edit};
+use ruff_diagnostics::{Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::NewlineWithTrailingNewline;
+use ruff_newlines::NewlineWithTrailingNewline;
 use ruff_python_ast::whitespace;
-use ruff_text_size::{TextLen, TextRange};
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::Docstring;
+use crate::docstrings::Docstring;
 use crate::registry::{AsRule, Rule};
 
 #[violation]
@@ -48,7 +49,7 @@ impl AlwaysAutofixableViolation for OverIndentation {
 }
 
 /// D206, D207, D208
-pub fn indent(checker: &mut Checker, docstring: &Docstring) {
+pub(crate) fn indent(checker: &mut Checker, docstring: &Docstring) {
     let body = docstring.body();
 
     // Split the docstring into lines.
@@ -81,7 +82,7 @@ pub fn indent(checker: &mut Checker, docstring: &Docstring) {
         // yet.
         has_seen_tab = has_seen_tab || line_indent.contains('\t');
 
-        if checker.settings.rules.enabled(Rule::UnderIndentation) {
+        if checker.enabled(Rule::UnderIndentation) {
             // We report under-indentation on every line. This isn't great, but enables
             // autofix.
             if (i == lines.len() - 1 || !is_blank)
@@ -90,10 +91,11 @@ pub fn indent(checker: &mut Checker, docstring: &Docstring) {
                 let mut diagnostic =
                     Diagnostic::new(UnderIndentation, TextRange::empty(line.start()));
                 if checker.patch(diagnostic.kind.rule()) {
-                    diagnostic.set_fix(Edit::range_replacement(
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
                         whitespace::clean(docstring.indentation),
                         TextRange::at(line.start(), line_indent.text_len()),
-                    ));
+                    )));
                 }
                 checker.diagnostics.push(diagnostic);
             }
@@ -114,7 +116,7 @@ pub fn indent(checker: &mut Checker, docstring: &Docstring) {
         }
     }
 
-    if checker.settings.rules.enabled(Rule::IndentWithSpaces) {
+    if checker.enabled(Rule::IndentWithSpaces) {
         if has_seen_tab {
             checker
                 .diagnostics
@@ -122,7 +124,7 @@ pub fn indent(checker: &mut Checker, docstring: &Docstring) {
         }
     }
 
-    if checker.settings.rules.enabled(Rule::OverIndentation) {
+    if checker.enabled(Rule::OverIndentation) {
         // If every line (except the last) is over-indented...
         if is_over_indented {
             for over_indented in over_indented_lines {
@@ -131,14 +133,14 @@ pub fn indent(checker: &mut Checker, docstring: &Docstring) {
                 let mut diagnostic =
                     Diagnostic::new(OverIndentation, TextRange::empty(over_indented.start()));
                 if checker.patch(diagnostic.kind.rule()) {
-                    let new_indent = whitespace::clean(docstring.indentation);
-
-                    let edit = if new_indent.is_empty() {
+                    let indent = whitespace::clean(docstring.indentation);
+                    let edit = if indent.is_empty() {
                         Edit::range_deletion(over_indented)
                     } else {
-                        Edit::range_replacement(new_indent, over_indented)
+                        Edit::range_replacement(indent, over_indented)
                     };
-                    diagnostic.set_fix(edit);
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(edit));
                 }
                 checker.diagnostics.push(diagnostic);
             }
@@ -151,10 +153,15 @@ pub fn indent(checker: &mut Checker, docstring: &Docstring) {
                 let mut diagnostic =
                     Diagnostic::new(OverIndentation, TextRange::empty(last.start()));
                 if checker.patch(diagnostic.kind.rule()) {
-                    diagnostic.set_fix(Edit::range_replacement(
-                        whitespace::clean(docstring.indentation),
-                        TextRange::at(last.start(), line_indent.text_len()),
-                    ));
+                    let indent = whitespace::clean(docstring.indentation);
+                    let range = TextRange::at(last.start(), line_indent.text_len());
+                    let edit = if indent.is_empty() {
+                        Edit::range_deletion(range)
+                    } else {
+                        Edit::range_replacement(indent, range)
+                    };
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(edit));
                 }
                 checker.diagnostics.push(diagnostic);
             }
diff --git a/crates/ruff/src/rules/pydocstyle/rules/mod.rs b/crates/ruff/src/rules/pydocstyle/rules/mod.rs
index 88b6d9bcaabad..2cb62ffe0a51a 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/mod.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/mod.rs
@@ -1,39 +1,41 @@
-pub use backslashes::{backslashes, EscapeSequenceInDocstring};
-pub use blank_after_summary::{blank_after_summary, BlankLineAfterSummary};
-pub use blank_before_after_class::{
+pub(crate) use backslashes::{backslashes, EscapeSequenceInDocstring};
+pub(crate) use blank_after_summary::{blank_after_summary, BlankLineAfterSummary};
+pub(crate) use blank_before_after_class::{
     blank_before_after_class, BlankLineBeforeClass, OneBlankLineAfterClass, OneBlankLineBeforeClass,
 };
-pub use blank_before_after_function::{
+pub(crate) use blank_before_after_function::{
     blank_before_after_function, NoBlankLineAfterFunction, NoBlankLineBeforeFunction,
 };
-pub use capitalized::{capitalized, FirstLineCapitalized};
-pub use ends_with_period::{ends_with_period, EndsInPeriod};
-pub use ends_with_punctuation::{ends_with_punctuation, EndsInPunctuation};
-pub use if_needed::{if_needed, OverloadWithDocstring};
-pub use indent::{indent, IndentWithSpaces, OverIndentation, UnderIndentation};
-pub use multi_line_summary_start::{
+pub(crate) use capitalized::{capitalized, FirstLineCapitalized};
+pub(crate) use ends_with_period::{ends_with_period, EndsInPeriod};
+pub(crate) use ends_with_punctuation::{ends_with_punctuation, EndsInPunctuation};
+pub(crate) use if_needed::{if_needed, OverloadWithDocstring};
+pub(crate) use indent::{indent, IndentWithSpaces, OverIndentation, UnderIndentation};
+pub(crate) use multi_line_summary_start::{
     multi_line_summary_start, MultiLineSummaryFirstLine, MultiLineSummarySecondLine,
 };
-pub use newline_after_last_paragraph::{newline_after_last_paragraph, NewLineAfterLastParagraph};
-pub use no_signature::{no_signature, NoSignature};
-pub use no_surrounding_whitespace::{no_surrounding_whitespace, SurroundingWhitespace};
-pub use non_imperative_mood::{non_imperative_mood, NonImperativeMood};
-pub use not_empty::{not_empty, EmptyDocstring};
-pub use not_missing::{
+pub(crate) use newline_after_last_paragraph::{
+    newline_after_last_paragraph, NewLineAfterLastParagraph,
+};
+pub(crate) use no_signature::{no_signature, NoSignature};
+pub(crate) use no_surrounding_whitespace::{no_surrounding_whitespace, SurroundingWhitespace};
+pub(crate) use non_imperative_mood::{non_imperative_mood, NonImperativeMood};
+pub(crate) use not_empty::{not_empty, EmptyDocstring};
+pub(crate) use not_missing::{
     not_missing, UndocumentedMagicMethod, UndocumentedPublicClass, UndocumentedPublicFunction,
     UndocumentedPublicInit, UndocumentedPublicMethod, UndocumentedPublicModule,
     UndocumentedPublicNestedClass, UndocumentedPublicPackage,
 };
-pub use one_liner::{one_liner, FitsOnOneLine};
-pub use sections::{
+pub(crate) use one_liner::{one_liner, FitsOnOneLine};
+pub(crate) use sections::{
     sections, BlankLineAfterLastSection, BlankLinesBetweenHeaderAndContent, CapitalizeSectionName,
     DashedUnderlineAfterSection, EmptyDocstringSection, NewLineAfterSectionName,
     NoBlankLineAfterSection, NoBlankLineBeforeSection, SectionNameEndsInColon,
     SectionNotOverIndented, SectionUnderlineAfterName, SectionUnderlineMatchesSectionLength,
     SectionUnderlineNotOverIndented, UndocumentedParam,
 };
-pub use starts_with_this::{starts_with_this, DocstringStartsWithThis};
-pub use triple_quotes::{triple_quotes, TripleSingleQuotes};
+pub(crate) use starts_with_this::{starts_with_this, DocstringStartsWithThis};
+pub(crate) use triple_quotes::{triple_quotes, TripleSingleQuotes};
 
 mod backslashes;
 mod blank_after_summary;
diff --git a/crates/ruff/src/rules/pydocstyle/rules/multi_line_summary_start.rs b/crates/ruff/src/rules/pydocstyle/rules/multi_line_summary_start.rs
index 18e51fe435f6c..c15fe2c40b762 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/multi_line_summary_start.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/multi_line_summary_start.rs
@@ -1,11 +1,14 @@
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_text_size::{TextRange, TextSize};
+use rustpython_parser::ast::Ranged;
+
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::{NewlineWithTrailingNewline, UniversalNewlineIterator};
+use ruff_newlines::{NewlineWithTrailingNewline, UniversalNewlineIterator};
 use ruff_python_ast::str::{is_triple_quote, leading_quote};
-use ruff_text_size::{TextRange, TextSize};
+use ruff_python_semantic::definition::{Definition, Member};
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::{DefinitionKind, Docstring};
+use crate::docstrings::Docstring;
 use crate::registry::{AsRule, Rule};
 
 #[violation]
@@ -37,7 +40,7 @@ impl AlwaysAutofixableViolation for MultiLineSummarySecondLine {
 }
 
 /// D212, D213
-pub fn multi_line_summary_start(checker: &mut Checker, docstring: &Docstring) {
+pub(crate) fn multi_line_summary_start(checker: &mut Checker, docstring: &Docstring) {
     let contents = docstring.contents;
     let body = docstring.body();
 
@@ -57,20 +60,17 @@ pub fn multi_line_summary_start(checker: &mut Checker, docstring: &Docstring) {
     };
 
     if is_triple_quote(&first_line) {
-        if checker
-            .settings
-            .rules
-            .enabled(Rule::MultiLineSummaryFirstLine)
-        {
+        if checker.enabled(Rule::MultiLineSummaryFirstLine) {
             let mut diagnostic = Diagnostic::new(MultiLineSummaryFirstLine, docstring.range());
             if checker.patch(diagnostic.kind.rule()) {
                 // Delete until first non-whitespace char.
                 for line in content_lines {
                     if let Some(end_column) = line.find(|c: char| !c.is_whitespace()) {
-                        diagnostic.set_fix(Edit::deletion(
+                        #[allow(deprecated)]
+                        diagnostic.set_fix(Fix::unspecified(Edit::deletion(
                             first_line.end(),
                             line.start() + TextSize::try_from(end_column).unwrap(),
-                        ));
+                        )));
                         break;
                     }
                 }
@@ -78,11 +78,7 @@ pub fn multi_line_summary_start(checker: &mut Checker, docstring: &Docstring) {
             checker.diagnostics.push(diagnostic);
         }
     } else {
-        if checker
-            .settings
-            .rules
-            .enabled(Rule::MultiLineSummarySecondLine)
-        {
+        if checker.enabled(Rule::MultiLineSummarySecondLine) {
             let mut diagnostic = Diagnostic::new(MultiLineSummarySecondLine, docstring.range());
             if checker.patch(diagnostic.kind.rule()) {
                 let mut indentation = String::from(docstring.indentation);
@@ -90,22 +86,17 @@ pub fn multi_line_summary_start(checker: &mut Checker, docstring: &Docstring) {
                 if !indentation.chars().all(char::is_whitespace) {
                     fixable = false;
 
-                    // If the docstring isn't on its own line, look at the parent indentation, and
-                    // add the default indentation to get the "right" level.
-                    if let DefinitionKind::Class(parent)
-                    | DefinitionKind::NestedClass(parent)
-                    | DefinitionKind::Function(parent)
-                    | DefinitionKind::NestedFunction(parent)
-                    | DefinitionKind::Method(parent) = &docstring.kind
-                    {
-                        let parent_line_start = checker.locator.line_start(parent.start());
-                        let parent_indentation = checker
+                    // If the docstring isn't on its own line, look at the statement indentation,
+                    // and add the default indentation to get the "right" level.
+                    if let Definition::Member(Member { stmt, .. }) = &docstring.definition {
+                        let stmt_line_start = checker.locator.line_start(stmt.start());
+                        let stmt_indentation = checker
                             .locator
-                            .slice(TextRange::new(parent_line_start, parent.start()));
+                            .slice(TextRange::new(stmt_line_start, stmt.start()));
 
-                        if parent_indentation.chars().all(char::is_whitespace) {
+                        if stmt_indentation.chars().all(char::is_whitespace) {
                             indentation.clear();
-                            indentation.push_str(parent_indentation);
+                            indentation.push_str(stmt_indentation);
                             indentation.push_str(checker.stylist.indentation());
                             fixable = true;
                         }
@@ -123,7 +114,12 @@ pub fn multi_line_summary_start(checker: &mut Checker, docstring: &Docstring) {
                         first_line.strip_prefix(prefix).unwrap().trim_start()
                     );
 
-                    diagnostic.set_fix(Edit::replacement(repl, body.start(), first_line.end()));
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::replacement(
+                        repl,
+                        body.start(),
+                        first_line.end(),
+                    )));
                 }
             }
             checker.diagnostics.push(diagnostic);
diff --git a/crates/ruff/src/rules/pydocstyle/rules/newline_after_last_paragraph.rs b/crates/ruff/src/rules/pydocstyle/rules/newline_after_last_paragraph.rs
index 3728a42579be4..10c3ff222ec0c 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/newline_after_last_paragraph.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/newline_after_last_paragraph.rs
@@ -1,11 +1,13 @@
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_text_size::{TextLen, TextSize};
+use rustpython_parser::ast::Ranged;
+
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::{NewlineWithTrailingNewline, StrExt};
+use ruff_newlines::{NewlineWithTrailingNewline, StrExt};
 use ruff_python_ast::whitespace;
-use ruff_text_size::{TextLen, TextSize};
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::Docstring;
+use crate::docstrings::Docstring;
 use crate::registry::AsRule;
 
 #[violation]
@@ -23,7 +25,7 @@ impl AlwaysAutofixableViolation for NewLineAfterLastParagraph {
 }
 
 /// D209
-pub fn newline_after_last_paragraph(checker: &mut Checker, docstring: &Docstring) {
+pub(crate) fn newline_after_last_paragraph(checker: &mut Checker, docstring: &Docstring) {
     let contents = docstring.contents;
     let body = docstring.body();
 
@@ -56,11 +58,12 @@ pub fn newline_after_last_paragraph(checker: &mut Checker, docstring: &Docstring
                             checker.stylist.line_ending().as_str(),
                             whitespace::clean(docstring.indentation)
                         );
-                        diagnostic.set_fix(Edit::replacement(
+                        #[allow(deprecated)]
+                        diagnostic.set_fix(Fix::unspecified(Edit::replacement(
                             content,
                             docstring.expr.end() - num_trailing_quotes - num_trailing_spaces,
                             docstring.expr.end() - num_trailing_quotes,
-                        ));
+                        )));
                     }
                     checker.diagnostics.push(diagnostic);
                 }
diff --git a/crates/ruff/src/rules/pydocstyle/rules/no_signature.rs b/crates/ruff/src/rules/pydocstyle/rules/no_signature.rs
index 8d635ed0f9142..fe6b538637b75 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/no_signature.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/no_signature.rs
@@ -1,11 +1,12 @@
-use rustpython_parser::ast::StmtKind;
+use rustpython_parser::ast::{self, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::StrExt;
+use ruff_newlines::StrExt;
+use ruff_python_semantic::definition::{Definition, Member, MemberKind};
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::{DefinitionKind, Docstring};
+use crate::docstrings::Docstring;
 
 #[violation]
 pub struct NoSignature;
@@ -18,15 +19,15 @@ impl Violation for NoSignature {
 }
 
 /// D402
-pub fn no_signature(checker: &mut Checker, docstring: &Docstring) {
-    let (
-        DefinitionKind::Function(parent)
-        | DefinitionKind::NestedFunction(parent)
-        | DefinitionKind::Method(parent)
-    ) = docstring.kind else {
+pub(crate) fn no_signature(checker: &mut Checker, docstring: &Docstring) {
+    let Definition::Member(Member {
+        kind: MemberKind::Function | MemberKind::NestedFunction | MemberKind::Method,
+        stmt,
+        ..
+    }) = docstring.definition else {
         return;
     };
-    let StmtKind::FunctionDef { name, .. } = &parent.node else {
+    let Stmt::FunctionDef(ast::StmtFunctionDef { name, .. }) = stmt else {
         return;
     };
 
diff --git a/crates/ruff/src/rules/pydocstyle/rules/no_surrounding_whitespace.rs b/crates/ruff/src/rules/pydocstyle/rules/no_surrounding_whitespace.rs
index 950390757671b..1125f0482bf4b 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/no_surrounding_whitespace.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/no_surrounding_whitespace.rs
@@ -1,29 +1,32 @@
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
-use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::NewlineWithTrailingNewline;
 use ruff_text_size::{TextLen, TextRange};
 
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_newlines::NewlineWithTrailingNewline;
+
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::Docstring;
+use crate::docstrings::Docstring;
 use crate::registry::AsRule;
 use crate::rules::pydocstyle::helpers::ends_with_backslash;
 
 #[violation]
 pub struct SurroundingWhitespace;
 
-impl AlwaysAutofixableViolation for SurroundingWhitespace {
+impl Violation for SurroundingWhitespace {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         format!("No whitespaces allowed surrounding docstring text")
     }
 
-    fn autofix_title(&self) -> String {
-        "Trim surrounding whitespace".to_string()
+    fn autofix_title(&self) -> Option<String> {
+        Some("Trim surrounding whitespace".to_string())
     }
 }
 
 /// D210
-pub fn no_surrounding_whitespace(checker: &mut Checker, docstring: &Docstring) {
+pub(crate) fn no_surrounding_whitespace(checker: &mut Checker, docstring: &Docstring) {
     let body = docstring.body();
 
     let mut lines = NewlineWithTrailingNewline::from(body.as_str());
@@ -44,10 +47,11 @@ pub fn no_surrounding_whitespace(checker: &mut Checker, docstring: &Docstring) {
         // characters, avoid applying the fix.
         if !trimmed.ends_with(quote) && !trimmed.starts_with(quote) && !ends_with_backslash(trimmed)
         {
-            diagnostic.set_fix(Edit::range_replacement(
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
                 trimmed.to_string(),
                 TextRange::at(body.start(), line.text_len()),
-            ));
+            )));
         }
     }
     checker.diagnostics.push(diagnostic);
diff --git a/crates/ruff/src/rules/pydocstyle/rules/non_imperative_mood.rs b/crates/ruff/src/rules/pydocstyle/rules/non_imperative_mood.rs
index c2b5a63bfd0d0..7df49c500c9f0 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/non_imperative_mood.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/non_imperative_mood.rs
@@ -5,40 +5,44 @@ use once_cell::sync::Lazy;
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
+use ruff_newlines::StrExt;
 use ruff_python_ast::call_path::{from_qualified_name, CallPath};
 use ruff_python_ast::cast;
-use ruff_python_ast::newlines::StrExt;
 use ruff_python_semantic::analyze::visibility::{is_property, is_test};
+use ruff_python_semantic::definition::{Definition, Member, MemberKind};
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::{DefinitionKind, Docstring};
+use crate::docstrings::Docstring;
 use crate::rules::pydocstyle::helpers::normalize_word;
 
 static MOOD: Lazy<Mood> = Lazy::new(Mood::new);
 
 /// D401
-pub fn non_imperative_mood(
+pub(crate) fn non_imperative_mood(
     checker: &mut Checker,
     docstring: &Docstring,
     property_decorators: &BTreeSet<String>,
 ) {
-    let (
-        DefinitionKind::Function(parent)
-        | DefinitionKind::NestedFunction(parent)
-        | DefinitionKind::Method(parent)
-    ) = &docstring.kind else {
+    let Definition::Member(Member { kind, stmt, .. }) = &docstring.definition else {
         return;
     };
 
+    if !matches!(
+        kind,
+        MemberKind::Function | MemberKind::NestedFunction | MemberKind::Method,
+    ) {
+        return;
+    }
+
     let property_decorators = property_decorators
         .iter()
         .map(|decorator| from_qualified_name(decorator))
         .collect::<Vec<CallPath>>();
 
-    if is_test(cast::name(parent))
+    if is_test(cast::name(stmt))
         || is_property(
-            &checker.ctx,
-            cast::decorator_list(parent),
+            checker.semantic_model(),
+            cast::decorator_list(stmt),
             &property_decorators,
         )
     {
diff --git a/crates/ruff/src/rules/pydocstyle/rules/not_empty.rs b/crates/ruff/src/rules/pydocstyle/rules/not_empty.rs
index 1fcaa7a29b437..c349336e7c1a6 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/not_empty.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/not_empty.rs
@@ -2,7 +2,7 @@ use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::Docstring;
+use crate::docstrings::Docstring;
 use crate::registry::Rule;
 
 #[violation]
@@ -16,12 +16,12 @@ impl Violation for EmptyDocstring {
 }
 
 /// D419
-pub fn not_empty(checker: &mut Checker, docstring: &Docstring) -> bool {
+pub(crate) fn not_empty(checker: &mut Checker, docstring: &Docstring) -> bool {
     if !docstring.body().trim().is_empty() {
         return true;
     }
 
-    if checker.settings.rules.enabled(Rule::EmptyDocstring) {
+    if checker.enabled(Rule::EmptyDocstring) {
         checker
             .diagnostics
             .push(Diagnostic::new(EmptyDocstring, docstring.range()));
diff --git a/crates/ruff/src/rules/pydocstyle/rules/not_missing.rs b/crates/ruff/src/rules/pydocstyle/rules/not_missing.rs
index d5107b970f945..a4ecde3e008fc 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/not_missing.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/not_missing.rs
@@ -1,3 +1,5 @@
+use ruff_text_size::TextRange;
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::cast;
@@ -5,10 +7,9 @@ use ruff_python_ast::helpers::identifier_range;
 use ruff_python_semantic::analyze::visibility::{
     is_call, is_init, is_magic, is_new, is_overload, is_override, Visibility,
 };
-use ruff_text_size::TextRange;
+use ruff_python_semantic::definition::{Definition, Member, MemberKind, Module, ModuleKind};
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::{Definition, DefinitionKind};
 use crate::registry::Rule;
 
 #[violation]
@@ -92,18 +93,21 @@ impl Violation for UndocumentedPublicInit {
 }
 
 /// D100, D101, D102, D103, D104, D105, D106, D107
-pub fn not_missing(checker: &mut Checker, definition: &Definition, visibility: Visibility) -> bool {
-    if matches!(visibility, Visibility::Private) {
+pub(crate) fn not_missing(
+    checker: &mut Checker,
+    definition: &Definition,
+    visibility: Visibility,
+) -> bool {
+    if visibility.is_private() {
         return true;
     }
 
-    match definition.kind {
-        DefinitionKind::Module => {
-            if checker
-                .settings
-                .rules
-                .enabled(Rule::UndocumentedPublicModule)
-            {
+    match definition {
+        Definition::Module(Module {
+            kind: ModuleKind::Module,
+            ..
+        }) => {
+            if checker.enabled(Rule::UndocumentedPublicModule) {
                 checker.diagnostics.push(Diagnostic::new(
                     UndocumentedPublicModule,
                     TextRange::default(),
@@ -111,12 +115,11 @@ pub fn not_missing(checker: &mut Checker, definition: &Definition, visibility: V
             }
             false
         }
-        DefinitionKind::Package => {
-            if checker
-                .settings
-                .rules
-                .enabled(Rule::UndocumentedPublicPackage)
-            {
+        Definition::Module(Module {
+            kind: ModuleKind::Package,
+            ..
+        }) => {
+            if checker.enabled(Rule::UndocumentedPublicPackage) {
                 checker.diagnostics.push(Diagnostic::new(
                     UndocumentedPublicPackage,
                     TextRange::default(),
@@ -124,12 +127,12 @@ pub fn not_missing(checker: &mut Checker, definition: &Definition, visibility: V
             }
             false
         }
-        DefinitionKind::Class(stmt) => {
-            if checker
-                .settings
-                .rules
-                .enabled(Rule::UndocumentedPublicClass)
-            {
+        Definition::Member(Member {
+            kind: MemberKind::Class,
+            stmt,
+            ..
+        }) => {
+            if checker.enabled(Rule::UndocumentedPublicClass) {
                 checker.diagnostics.push(Diagnostic::new(
                     UndocumentedPublicClass,
                     identifier_range(stmt, checker.locator),
@@ -137,12 +140,12 @@ pub fn not_missing(checker: &mut Checker, definition: &Definition, visibility: V
             }
             false
         }
-        DefinitionKind::NestedClass(stmt) => {
-            if checker
-                .settings
-                .rules
-                .enabled(Rule::UndocumentedPublicNestedClass)
-            {
+        Definition::Member(Member {
+            kind: MemberKind::NestedClass,
+            stmt,
+            ..
+        }) => {
+            if checker.enabled(Rule::UndocumentedPublicNestedClass) {
                 checker.diagnostics.push(Diagnostic::new(
                     UndocumentedPublicNestedClass,
                     identifier_range(stmt, checker.locator),
@@ -150,15 +153,15 @@ pub fn not_missing(checker: &mut Checker, definition: &Definition, visibility: V
             }
             false
         }
-        DefinitionKind::Function(stmt) | DefinitionKind::NestedFunction(stmt) => {
-            if is_overload(&checker.ctx, cast::decorator_list(stmt)) {
+        Definition::Member(Member {
+            kind: MemberKind::Function | MemberKind::NestedFunction,
+            stmt,
+            ..
+        }) => {
+            if is_overload(checker.semantic_model(), cast::decorator_list(stmt)) {
                 true
             } else {
-                if checker
-                    .settings
-                    .rules
-                    .enabled(Rule::UndocumentedPublicFunction)
-                {
+                if checker.enabled(Rule::UndocumentedPublicFunction) {
                     checker.diagnostics.push(Diagnostic::new(
                         UndocumentedPublicFunction,
                         identifier_range(stmt, checker.locator),
@@ -167,13 +170,17 @@ pub fn not_missing(checker: &mut Checker, definition: &Definition, visibility: V
                 false
             }
         }
-        DefinitionKind::Method(stmt) => {
-            if is_overload(&checker.ctx, cast::decorator_list(stmt))
-                || is_override(&checker.ctx, cast::decorator_list(stmt))
+        Definition::Member(Member {
+            kind: MemberKind::Method,
+            stmt,
+            ..
+        }) => {
+            if is_overload(checker.semantic_model(), cast::decorator_list(stmt))
+                || is_override(checker.semantic_model(), cast::decorator_list(stmt))
             {
                 true
             } else if is_init(cast::name(stmt)) {
-                if checker.settings.rules.enabled(Rule::UndocumentedPublicInit) {
+                if checker.enabled(Rule::UndocumentedPublicInit) {
                     checker.diagnostics.push(Diagnostic::new(
                         UndocumentedPublicInit,
                         identifier_range(stmt, checker.locator),
@@ -181,11 +188,7 @@ pub fn not_missing(checker: &mut Checker, definition: &Definition, visibility: V
                 }
                 true
             } else if is_new(cast::name(stmt)) || is_call(cast::name(stmt)) {
-                if checker
-                    .settings
-                    .rules
-                    .enabled(Rule::UndocumentedPublicMethod)
-                {
+                if checker.enabled(Rule::UndocumentedPublicMethod) {
                     checker.diagnostics.push(Diagnostic::new(
                         UndocumentedPublicMethod,
                         identifier_range(stmt, checker.locator),
@@ -193,11 +196,7 @@ pub fn not_missing(checker: &mut Checker, definition: &Definition, visibility: V
                 }
                 true
             } else if is_magic(cast::name(stmt)) {
-                if checker
-                    .settings
-                    .rules
-                    .enabled(Rule::UndocumentedMagicMethod)
-                {
+                if checker.enabled(Rule::UndocumentedMagicMethod) {
                     checker.diagnostics.push(Diagnostic::new(
                         UndocumentedMagicMethod,
                         identifier_range(stmt, checker.locator),
@@ -205,11 +204,7 @@ pub fn not_missing(checker: &mut Checker, definition: &Definition, visibility: V
                 }
                 true
             } else {
-                if checker
-                    .settings
-                    .rules
-                    .enabled(Rule::UndocumentedPublicMethod)
-                {
+                if checker.enabled(Rule::UndocumentedPublicMethod) {
                     checker.diagnostics.push(Diagnostic::new(
                         UndocumentedPublicMethod,
                         identifier_range(stmt, checker.locator),
diff --git a/crates/ruff/src/rules/pydocstyle/rules/one_liner.rs b/crates/ruff/src/rules/pydocstyle/rules/one_liner.rs
index dfbbc32eeae50..6403d9578ab69 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/one_liner.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/one_liner.rs
@@ -1,28 +1,30 @@
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::NewlineWithTrailingNewline;
+use ruff_newlines::NewlineWithTrailingNewline;
 use ruff_python_ast::str::{leading_quote, trailing_quote};
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::Docstring;
+use crate::docstrings::Docstring;
 use crate::registry::AsRule;
 
 #[violation]
 pub struct FitsOnOneLine;
 
-impl AlwaysAutofixableViolation for FitsOnOneLine {
+impl Violation for FitsOnOneLine {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         format!("One-line docstring should fit on one line")
     }
 
-    fn autofix_title(&self) -> String {
-        "Reformat to one line".to_string()
+    fn autofix_title(&self) -> Option<String> {
+        Some("Reformat to one line".to_string())
     }
 }
 
 /// D200
-pub fn one_liner(checker: &mut Checker, docstring: &Docstring) {
+pub(crate) fn one_liner(checker: &mut Checker, docstring: &Docstring) {
     let mut line_count = 0;
     let mut non_empty_line_count = 0;
     for line in NewlineWithTrailingNewline::from(docstring.body().as_str()) {
@@ -49,10 +51,11 @@ pub fn one_liner(checker: &mut Checker, docstring: &Docstring) {
                 if !trimmed.ends_with(trailing.chars().last().unwrap())
                     && !trimmed.starts_with(leading.chars().last().unwrap())
                 {
-                    diagnostic.set_fix(Edit::range_replacement(
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
                         format!("{leading}{trimmed}{trailing}"),
                         docstring.range(),
-                    ));
+                    )));
                 }
             }
         }
diff --git a/crates/ruff/src/rules/pydocstyle/rules/sections.rs b/crates/ruff/src/rules/pydocstyle/rules/sections.rs
index 8ba8b443f25fe..458d87ac4bfec 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/sections.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/sections.rs
@@ -3,26 +3,28 @@ use once_cell::sync::Lazy;
 use regex::Regex;
 use ruff_text_size::{TextLen, TextRange, TextSize};
 use rustc_hash::FxHashSet;
-use rustpython_parser::ast::StmtKind;
+use rustpython_parser::ast::{self, Stmt};
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Violation};
-use ruff_diagnostics::{Diagnostic, Edit};
+use ruff_diagnostics::{Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
+use ruff_newlines::NewlineWithTrailingNewline;
 use ruff_python_ast::helpers::identifier_range;
-use ruff_python_ast::newlines::NewlineWithTrailingNewline;
 use ruff_python_ast::{cast, whitespace};
 use ruff_python_semantic::analyze::visibility::is_staticmethod;
+use ruff_python_semantic::definition::{Definition, Member, MemberKind};
+use ruff_textwrap::dedent;
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::{DefinitionKind, Docstring};
 use crate::docstrings::sections::{SectionContext, SectionContexts, SectionKind};
 use crate::docstrings::styles::SectionStyle;
+use crate::docstrings::Docstring;
 use crate::registry::{AsRule, Rule};
 use crate::rules::pydocstyle::settings::Convention;
 
 #[violation]
 pub struct SectionNotOverIndented {
-    pub name: String,
+    name: String,
 }
 
 impl AlwaysAutofixableViolation for SectionNotOverIndented {
@@ -40,7 +42,7 @@ impl AlwaysAutofixableViolation for SectionNotOverIndented {
 
 #[violation]
 pub struct SectionUnderlineNotOverIndented {
-    pub name: String,
+    name: String,
 }
 
 impl AlwaysAutofixableViolation for SectionUnderlineNotOverIndented {
@@ -58,7 +60,7 @@ impl AlwaysAutofixableViolation for SectionUnderlineNotOverIndented {
 
 #[violation]
 pub struct CapitalizeSectionName {
-    pub name: String,
+    name: String,
 }
 
 impl AlwaysAutofixableViolation for CapitalizeSectionName {
@@ -76,7 +78,7 @@ impl AlwaysAutofixableViolation for CapitalizeSectionName {
 
 #[violation]
 pub struct NewLineAfterSectionName {
-    pub name: String,
+    name: String,
 }
 
 impl AlwaysAutofixableViolation for NewLineAfterSectionName {
@@ -94,7 +96,7 @@ impl AlwaysAutofixableViolation for NewLineAfterSectionName {
 
 #[violation]
 pub struct DashedUnderlineAfterSection {
-    pub name: String,
+    name: String,
 }
 
 impl AlwaysAutofixableViolation for DashedUnderlineAfterSection {
@@ -112,7 +114,7 @@ impl AlwaysAutofixableViolation for DashedUnderlineAfterSection {
 
 #[violation]
 pub struct SectionUnderlineAfterName {
-    pub name: String,
+    name: String,
 }
 
 impl AlwaysAutofixableViolation for SectionUnderlineAfterName {
@@ -130,7 +132,7 @@ impl AlwaysAutofixableViolation for SectionUnderlineAfterName {
 
 #[violation]
 pub struct SectionUnderlineMatchesSectionLength {
-    pub name: String,
+    name: String,
 }
 
 impl AlwaysAutofixableViolation for SectionUnderlineMatchesSectionLength {
@@ -148,7 +150,7 @@ impl AlwaysAutofixableViolation for SectionUnderlineMatchesSectionLength {
 
 #[violation]
 pub struct NoBlankLineAfterSection {
-    pub name: String,
+    name: String,
 }
 
 impl AlwaysAutofixableViolation for NoBlankLineAfterSection {
@@ -166,7 +168,7 @@ impl AlwaysAutofixableViolation for NoBlankLineAfterSection {
 
 #[violation]
 pub struct NoBlankLineBeforeSection {
-    pub name: String,
+    name: String,
 }
 
 impl AlwaysAutofixableViolation for NoBlankLineBeforeSection {
@@ -184,7 +186,7 @@ impl AlwaysAutofixableViolation for NoBlankLineBeforeSection {
 
 #[violation]
 pub struct BlankLineAfterLastSection {
-    pub name: String,
+    name: String,
 }
 
 impl AlwaysAutofixableViolation for BlankLineAfterLastSection {
@@ -202,7 +204,7 @@ impl AlwaysAutofixableViolation for BlankLineAfterLastSection {
 
 #[violation]
 pub struct EmptyDocstringSection {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for EmptyDocstringSection {
@@ -215,7 +217,7 @@ impl Violation for EmptyDocstringSection {
 
 #[violation]
 pub struct SectionNameEndsInColon {
-    pub name: String,
+    name: String,
 }
 
 impl AlwaysAutofixableViolation for SectionNameEndsInColon {
@@ -252,7 +254,7 @@ impl Violation for UndocumentedParam {
 
 #[violation]
 pub struct BlankLinesBetweenHeaderAndContent {
-    pub name: String,
+    name: String,
 }
 
 impl AlwaysAutofixableViolation for BlankLinesBetweenHeaderAndContent {
@@ -269,7 +271,11 @@ impl AlwaysAutofixableViolation for BlankLinesBetweenHeaderAndContent {
 
 /// D212, D214, D215, D405, D406, D407, D408, D409, D410, D411, D412, D413,
 /// D414, D416, D417
-pub fn sections(checker: &mut Checker, docstring: &Docstring, convention: Option<&Convention>) {
+pub(crate) fn sections(
+    checker: &mut Checker,
+    docstring: &Docstring,
+    convention: Option<&Convention>,
+) {
     match convention {
         Some(Convention::Google) => {
             parse_google_sections(
@@ -358,11 +364,7 @@ fn blanks_and_section_underline(
 
         if dash_line_found {
             if blank_lines_after_header > 0 {
-                if checker
-                    .settings
-                    .rules
-                    .enabled(Rule::SectionUnderlineAfterName)
-                {
+                if checker.enabled(Rule::SectionUnderlineAfterName) {
                     let mut diagnostic = Diagnostic::new(
                         SectionUnderlineAfterName {
                             name: context.section_name().to_string(),
@@ -373,7 +375,8 @@ fn blanks_and_section_underline(
                         let range =
                             TextRange::new(context.following_range().start(), blank_lines_end);
                         // Delete any blank lines between the header and the underline.
-                        diagnostic.set_fix(Edit::range_deletion(range));
+                        #[allow(deprecated)]
+                        diagnostic.set_fix(Fix::unspecified(Edit::range_deletion(range)));
                     }
                     checker.diagnostics.push(diagnostic);
                 }
@@ -386,11 +389,7 @@ fn blanks_and_section_underline(
                 .count()
                 != context.section_name().len()
             {
-                if checker
-                    .settings
-                    .rules
-                    .enabled(Rule::SectionUnderlineMatchesSectionLength)
-                {
+                if checker.enabled(Rule::SectionUnderlineMatchesSectionLength) {
                     let mut diagnostic = Diagnostic::new(
                         SectionUnderlineMatchesSectionLength {
                             name: context.section_name().to_string(),
@@ -405,21 +404,18 @@ fn blanks_and_section_underline(
                             "-".repeat(context.section_name().len()),
                             checker.stylist.line_ending().as_str()
                         );
-                        diagnostic.set_fix(Edit::replacement(
+                        #[allow(deprecated)]
+                        diagnostic.set_fix(Fix::unspecified(Edit::replacement(
                             content,
                             blank_lines_end,
                             non_blank_line.full_end(),
-                        ));
+                        )));
                     };
                     checker.diagnostics.push(diagnostic);
                 }
             }
 
-            if checker
-                .settings
-                .rules
-                .enabled(Rule::SectionUnderlineNotOverIndented)
-            {
+            if checker.enabled(Rule::SectionUnderlineNotOverIndented) {
                 let leading_space = whitespace::leading_space(&non_blank_line);
                 if leading_space.len() > docstring.indentation.len() {
                     let mut diagnostic = Diagnostic::new(
@@ -435,10 +431,11 @@ fn blanks_and_section_underline(
                         );
 
                         // Replace the existing indentation with whitespace of the appropriate length.
-                        diagnostic.set_fix(Edit::range_replacement(
+                        #[allow(deprecated)]
+                        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
                             whitespace::clean(docstring.indentation),
                             range,
-                        ));
+                        )));
                     };
                     checker.diagnostics.push(diagnostic);
                 }
@@ -457,7 +454,7 @@ fn blanks_and_section_underline(
                     }
 
                     if following_lines.peek().is_none() {
-                        if checker.settings.rules.enabled(Rule::EmptyDocstringSection) {
+                        if checker.enabled(Rule::EmptyDocstringSection) {
                             checker.diagnostics.push(Diagnostic::new(
                                 EmptyDocstringSection {
                                     name: context.section_name().to_string(),
@@ -465,11 +462,7 @@ fn blanks_and_section_underline(
                                 docstring.range(),
                             ));
                         }
-                    } else if checker
-                        .settings
-                        .rules
-                        .enabled(Rule::BlankLinesBetweenHeaderAndContent)
-                    {
+                    } else if checker.enabled(Rule::BlankLinesBetweenHeaderAndContent) {
                         let mut diagnostic = Diagnostic::new(
                             BlankLinesBetweenHeaderAndContent {
                                 name: context.section_name().to_string(),
@@ -478,16 +471,17 @@ fn blanks_and_section_underline(
                         );
                         if checker.patch(diagnostic.kind.rule()) {
                             // Delete any blank lines between the header and content.
-                            diagnostic.set_fix(Edit::deletion(
+                            #[allow(deprecated)]
+                            diagnostic.set_fix(Fix::unspecified(Edit::deletion(
                                 line_after_dashes.start(),
                                 blank_lines_after_dashes_end,
-                            ));
+                            )));
                         }
                         checker.diagnostics.push(diagnostic);
                     }
                 }
             } else {
-                if checker.settings.rules.enabled(Rule::EmptyDocstringSection) {
+                if checker.enabled(Rule::EmptyDocstringSection) {
                     checker.diagnostics.push(Diagnostic::new(
                         EmptyDocstringSection {
                             name: context.section_name().to_string(),
@@ -497,11 +491,7 @@ fn blanks_and_section_underline(
                 }
             }
         } else {
-            if checker
-                .settings
-                .rules
-                .enabled(Rule::DashedUnderlineAfterSection)
-            {
+            if checker.enabled(Rule::DashedUnderlineAfterSection) {
                 let mut diagnostic = Diagnostic::new(
                     DashedUnderlineAfterSection {
                         name: context.section_name().to_string(),
@@ -516,16 +506,16 @@ fn blanks_and_section_underline(
                         whitespace::clean(docstring.indentation),
                         "-".repeat(context.section_name().len()),
                     );
-                    diagnostic.set_fix(Edit::insertion(content, context.summary_range().end()));
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::insertion(
+                        content,
+                        context.summary_range().end(),
+                    )));
                 }
                 checker.diagnostics.push(diagnostic);
             }
             if blank_lines_after_header > 0 {
-                if checker
-                    .settings
-                    .rules
-                    .enabled(Rule::BlankLinesBetweenHeaderAndContent)
-                {
+                if checker.enabled(Rule::BlankLinesBetweenHeaderAndContent) {
                     let mut diagnostic = Diagnostic::new(
                         BlankLinesBetweenHeaderAndContent {
                             name: context.section_name().to_string(),
@@ -536,7 +526,8 @@ fn blanks_and_section_underline(
                         let range =
                             TextRange::new(context.following_range().start(), blank_lines_end);
                         // Delete any blank lines between the header and content.
-                        diagnostic.set_fix(Edit::range_deletion(range));
+                        #[allow(deprecated)]
+                        diagnostic.set_fix(Fix::unspecified(Edit::range_deletion(range)));
                     }
                     checker.diagnostics.push(diagnostic);
                 }
@@ -545,11 +536,7 @@ fn blanks_and_section_underline(
     }
     // Nothing but blank lines after the section header.
     else {
-        if checker
-            .settings
-            .rules
-            .enabled(Rule::DashedUnderlineAfterSection)
-        {
+        if checker.enabled(Rule::DashedUnderlineAfterSection) {
             let mut diagnostic = Diagnostic::new(
                 DashedUnderlineAfterSection {
                     name: context.section_name().to_string(),
@@ -565,11 +552,15 @@ fn blanks_and_section_underline(
                     "-".repeat(context.section_name().len()),
                 );
 
-                diagnostic.set_fix(Edit::insertion(content, context.summary_range().end()));
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::insertion(
+                    content,
+                    context.summary_range().end(),
+                )));
             }
             checker.diagnostics.push(diagnostic);
         }
-        if checker.settings.rules.enabled(Rule::EmptyDocstringSection) {
+        if checker.enabled(Rule::EmptyDocstringSection) {
             checker.diagnostics.push(Diagnostic::new(
                 EmptyDocstringSection {
                     name: context.section_name().to_string(),
@@ -586,7 +577,7 @@ fn common_section(
     context: &SectionContext,
     next: Option<&SectionContext>,
 ) {
-    if checker.settings.rules.enabled(Rule::CapitalizeSectionName) {
+    if checker.enabled(Rule::CapitalizeSectionName) {
         let capitalized_section_name = context.kind().as_str();
         if context.section_name() != capitalized_section_name {
             let mut diagnostic = Diagnostic::new(
@@ -599,16 +590,17 @@ fn common_section(
                 // Replace the section title with the capitalized variant. This requires
                 // locating the start and end of the section name.
                 let section_range = context.section_name_range();
-                diagnostic.set_fix(Edit::range_replacement(
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
                     capitalized_section_name.to_string(),
                     section_range,
-                ));
+                )));
             }
             checker.diagnostics.push(diagnostic);
         }
     }
 
-    if checker.settings.rules.enabled(Rule::SectionNotOverIndented) {
+    if checker.enabled(Rule::SectionNotOverIndented) {
         let leading_space = whitespace::leading_space(context.summary_line());
         if leading_space.len() > docstring.indentation.len() {
             let mut diagnostic = Diagnostic::new(
@@ -622,11 +614,12 @@ fn common_section(
                 let content = whitespace::clean(docstring.indentation);
                 let fix_range = TextRange::at(context.range().start(), leading_space.text_len());
 
-                diagnostic.set_fix(if content.is_empty() {
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(if content.is_empty() {
                     Edit::range_deletion(fix_range)
                 } else {
                     Edit::range_replacement(content, fix_range)
-                });
+                }));
             };
             checker.diagnostics.push(diagnostic);
         }
@@ -636,11 +629,7 @@ fn common_section(
     let last_line = context.following_lines().last();
     if last_line.map_or(true, |line| !line.trim().is_empty()) {
         if let Some(next) = next {
-            if checker
-                .settings
-                .rules
-                .enabled(Rule::NoBlankLineAfterSection)
-            {
+            if checker.enabled(Rule::NoBlankLineAfterSection) {
                 let mut diagnostic = Diagnostic::new(
                     NoBlankLineAfterSection {
                         name: context.section_name().to_string(),
@@ -649,16 +638,16 @@ fn common_section(
                 );
                 if checker.patch(diagnostic.kind.rule()) {
                     // Add a newline at the beginning of the next section.
-                    diagnostic.set_fix(Edit::insertion(line_end.to_string(), next.range().start()));
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::insertion(
+                        line_end.to_string(),
+                        next.range().start(),
+                    )));
                 }
                 checker.diagnostics.push(diagnostic);
             }
         } else {
-            if checker
-                .settings
-                .rules
-                .enabled(Rule::BlankLineAfterLastSection)
-            {
+            if checker.enabled(Rule::BlankLineAfterLastSection) {
                 let mut diagnostic = Diagnostic::new(
                     BlankLineAfterLastSection {
                         name: context.section_name().to_string(),
@@ -667,21 +656,18 @@ fn common_section(
                 );
                 if checker.patch(diagnostic.kind.rule()) {
                     // Add a newline after the section.
-                    diagnostic.set_fix(Edit::insertion(
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::insertion(
                         format!("{}{}", line_end, docstring.indentation),
                         context.range().end(),
-                    ));
+                    )));
                 }
                 checker.diagnostics.push(diagnostic);
             }
         }
     }
 
-    if checker
-        .settings
-        .rules
-        .enabled(Rule::NoBlankLineBeforeSection)
-    {
+    if checker.enabled(Rule::NoBlankLineBeforeSection) {
         if !context.previous_line().map_or(false, str::is_empty) {
             let mut diagnostic = Diagnostic::new(
                 NoBlankLineBeforeSection {
@@ -691,10 +677,11 @@ fn common_section(
             );
             if checker.patch(diagnostic.kind.rule()) {
                 // Add a blank line before the section.
-                diagnostic.set_fix(Edit::insertion(
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::insertion(
                     line_end.to_string(),
                     context.range().start(),
-                ));
+                )));
             }
             checker.diagnostics.push(diagnostic);
         }
@@ -704,21 +691,22 @@ fn common_section(
 }
 
 fn missing_args(checker: &mut Checker, docstring: &Docstring, docstrings_args: &FxHashSet<String>) {
-    let (
-        DefinitionKind::Function(parent)
-        | DefinitionKind::NestedFunction(parent)
-        | DefinitionKind::Method(parent)
-    ) = docstring.kind else {
+    let Definition::Member(Member {
+        kind: MemberKind::Function | MemberKind::NestedFunction | MemberKind::Method,
+        stmt,
+        ..
+    }) = docstring.definition else {
         return;
     };
+
     let (
-        StmtKind::FunctionDef {
+        Stmt::FunctionDef(ast::StmtFunctionDef {
             args: arguments, ..
-        }
-        | StmtKind::AsyncFunctionDef {
+        })
+        | Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef {
             args: arguments, ..
-        }
-    ) = &parent.node else {
+        })
+    ) = stmt else {
         return;
     };
 
@@ -732,12 +720,12 @@ fn missing_args(checker: &mut Checker, docstring: &Docstring, docstrings_args: &
         .skip(
             // If this is a non-static method, skip `cls` or `self`.
             usize::from(
-                matches!(docstring.kind, DefinitionKind::Method(_))
-                    && !is_staticmethod(&checker.ctx, cast::decorator_list(parent)),
+                docstring.definition.is_method()
+                    && !is_staticmethod(checker.semantic_model(), cast::decorator_list(stmt)),
             ),
         )
     {
-        let arg_name = &arg.node.arg;
+        let arg_name = arg.arg.as_str();
         if !arg_name.starts_with('_') && !docstrings_args.contains(arg_name) {
             missing_arg_names.insert(arg_name.to_string());
         }
@@ -746,7 +734,7 @@ fn missing_args(checker: &mut Checker, docstring: &Docstring, docstrings_args: &
     // Check specifically for `vararg` and `kwarg`, which can be prefixed with a
     // single or double star, respectively.
     if let Some(arg) = &arguments.vararg {
-        let arg_name = &arg.node.arg;
+        let arg_name = arg.arg.as_str();
         let starred_arg_name = format!("*{arg_name}");
         if !arg_name.starts_with('_')
             && !docstrings_args.contains(arg_name)
@@ -756,7 +744,7 @@ fn missing_args(checker: &mut Checker, docstring: &Docstring, docstrings_args: &
         }
     }
     if let Some(arg) = &arguments.kwarg {
-        let arg_name = &arg.node.arg;
+        let arg_name = arg.arg.as_str();
         let starred_arg_name = format!("**{arg_name}");
         if !arg_name.starts_with('_')
             && !docstrings_args.contains(arg_name)
@@ -770,7 +758,7 @@ fn missing_args(checker: &mut Checker, docstring: &Docstring, docstrings_args: &
         let names = missing_arg_names.into_iter().sorted().collect();
         checker.diagnostics.push(Diagnostic::new(
             UndocumentedParam { names },
-            identifier_range(parent, checker.locator),
+            identifier_range(stmt, checker.locator),
         ));
     }
 }
@@ -793,7 +781,7 @@ fn args_section(context: &SectionContext) -> FxHashSet<String> {
         .map(|l| l.as_str())
         .filter(|line| line.starts_with(leading_space) || line.is_empty())
         .join("\n");
-    let args_content = textwrap::dedent(&relevant_lines);
+    let args_content = dedent(&relevant_lines);
 
     // Reformat each section.
     let mut args_sections: Vec<String> = vec![];
@@ -877,11 +865,7 @@ fn numpy_section(
 ) {
     common_section(checker, docstring, context, next);
 
-    if checker
-        .settings
-        .rules
-        .enabled(Rule::NewLineAfterSectionName)
-    {
+    if checker.enabled(Rule::NewLineAfterSectionName) {
         let suffix = context.summary_after_section_name();
 
         if !suffix.is_empty() {
@@ -893,17 +877,18 @@ fn numpy_section(
             );
             if checker.patch(diagnostic.kind.rule()) {
                 let section_range = context.section_name_range();
-                diagnostic.set_fix(Edit::range_deletion(TextRange::at(
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_deletion(TextRange::at(
                     section_range.end(),
                     suffix.text_len(),
-                )));
+                ))));
             }
 
             checker.diagnostics.push(diagnostic);
         }
     }
 
-    if checker.settings.rules.enabled(Rule::UndocumentedParam) {
+    if checker.enabled(Rule::UndocumentedParam) {
         if matches!(context.kind(), SectionKind::Parameters) {
             parameters_section(checker, docstring, context);
         }
@@ -918,7 +903,7 @@ fn google_section(
 ) {
     common_section(checker, docstring, context, next);
 
-    if checker.settings.rules.enabled(Rule::SectionNameEndsInColon) {
+    if checker.enabled(Rule::SectionNameEndsInColon) {
         let suffix = context.summary_after_section_name();
         if suffix != ":" {
             let mut diagnostic = Diagnostic::new(
@@ -930,10 +915,11 @@ fn google_section(
             if checker.patch(diagnostic.kind.rule()) {
                 // Replace the suffix.
                 let section_name_range = context.section_name_range();
-                diagnostic.set_fix(Edit::range_replacement(
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
                     ":".to_string(),
                     TextRange::at(section_name_range.end(), suffix.text_len()),
-                ));
+                )));
             }
             checker.diagnostics.push(diagnostic);
         }
@@ -961,7 +947,7 @@ fn parse_google_sections(
         google_section(checker, docstring, &context, iterator.peek());
     }
 
-    if checker.settings.rules.enabled(Rule::UndocumentedParam) {
+    if checker.enabled(Rule::UndocumentedParam) {
         let mut has_args = false;
         let mut documented_args: FxHashSet<String> = FxHashSet::default();
         for section_context in section_contexts {
diff --git a/crates/ruff/src/rules/pydocstyle/rules/starts_with_this.rs b/crates/ruff/src/rules/pydocstyle/rules/starts_with_this.rs
index 18a9b8c0c3bb8..efe015b8029bb 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/starts_with_this.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/starts_with_this.rs
@@ -2,7 +2,7 @@ use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::Docstring;
+use crate::docstrings::Docstring;
 use crate::rules::pydocstyle::helpers::normalize_word;
 
 #[violation]
@@ -16,7 +16,7 @@ impl Violation for DocstringStartsWithThis {
 }
 
 /// D404
-pub fn starts_with_this(checker: &mut Checker, docstring: &Docstring) {
+pub(crate) fn starts_with_this(checker: &mut Checker, docstring: &Docstring) {
     let body = docstring.body();
 
     let trimmed = body.trim();
diff --git a/crates/ruff/src/rules/pydocstyle/rules/triple_quotes.rs b/crates/ruff/src/rules/pydocstyle/rules/triple_quotes.rs
index e5cd02e1544d0..5cf020ce38605 100644
--- a/crates/ruff/src/rules/pydocstyle/rules/triple_quotes.rs
+++ b/crates/ruff/src/rules/pydocstyle/rules/triple_quotes.rs
@@ -2,7 +2,7 @@ use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
-use crate::docstrings::definition::Docstring;
+use crate::docstrings::Docstring;
 
 #[violation]
 pub struct TripleSingleQuotes;
@@ -15,7 +15,7 @@ impl Violation for TripleSingleQuotes {
 }
 
 /// D300
-pub fn triple_quotes(checker: &mut Checker, docstring: &Docstring) {
+pub(crate) fn triple_quotes(checker: &mut Checker, docstring: &Docstring) {
     let body = docstring.body();
 
     let leading_quote = docstring.leading_quote().to_ascii_lowercase();
diff --git a/crates/ruff/src/rules/pydocstyle/settings.rs b/crates/ruff/src/rules/pydocstyle/settings.rs
index a3366b9055b04..1ec4a9a7fc3b2 100644
--- a/crates/ruff/src/rules/pydocstyle/settings.rs
+++ b/crates/ruff/src/rules/pydocstyle/settings.rs
@@ -2,15 +2,15 @@
 
 use std::collections::BTreeSet;
 
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::{CacheKey, ConfigurationOptions};
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
 
 use crate::registry::Rule;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, JsonSchema, CacheKey)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, CacheKey)]
 #[serde(deny_unknown_fields, rename_all = "kebab-case")]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum Convention {
     /// Use Google-style docstrings.
     Google,
@@ -72,9 +72,10 @@ impl Convention {
 }
 
 #[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, CombineOptions,
 )]
 #[serde(deny_unknown_fields, rename_all = "kebab-case", rename = "Pydocstyle")]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = r#"None"#,
diff --git a/crates/ruff/src/rules/pydocstyle/snapshots/ruff__rules__pydocstyle__tests__D200_D.py.snap b/crates/ruff/src/rules/pydocstyle/snapshots/ruff__rules__pydocstyle__tests__D200_D.py.snap
index 522bc46e3f71c..5ec3abc0f3e95 100644
--- a/crates/ruff/src/rules/pydocstyle/snapshots/ruff__rules__pydocstyle__tests__D200_D.py.snap
+++ b/crates/ruff/src/rules/pydocstyle/snapshots/ruff__rules__pydocstyle__tests__D200_D.py.snap
@@ -73,7 +73,7 @@ D.py:606:5: D200 [*] One-line docstring should fit on one line
 610 608 | 
 611 609 | @expect('D200: One-line docstring should fit on one line with quotes '
 
-D.py:615:5: D200 [*] One-line docstring should fit on one line
+D.py:615:5: D200 One-line docstring should fit on one line
     |
 615 |   @expect('D212: Multi-line docstring summary should start at the first line')
 616 |   def one_liner():
@@ -85,7 +85,7 @@ D.py:615:5: D200 [*] One-line docstring should fit on one line
     |
     = help: Reformat to one line
 
-D.py:624:5: D200 [*] One-line docstring should fit on one line
+D.py:624:5: D200 One-line docstring should fit on one line
     |
 624 |   @expect('D212: Multi-line docstring summary should start at the first line')
 625 |   def one_liner():
diff --git a/crates/ruff/src/rules/pydocstyle/snapshots/ruff__rules__pydocstyle__tests__D205_D.py.snap b/crates/ruff/src/rules/pydocstyle/snapshots/ruff__rules__pydocstyle__tests__D205_D.py.snap
index bc0e009965550..f524800896ea6 100644
--- a/crates/ruff/src/rules/pydocstyle/snapshots/ruff__rules__pydocstyle__tests__D205_D.py.snap
+++ b/crates/ruff/src/rules/pydocstyle/snapshots/ruff__rules__pydocstyle__tests__D205_D.py.snap
@@ -12,6 +12,7 @@ D.py:200:5: D205 1 blank line required between summary line and description
 205 | |     """
     | |_______^ D205
     |
+    = help: Insert single blank line
 
 D.py:210:5: D205 [*] 1 blank line required between summary line and description (found 2)
     |
diff --git a/crates/ruff/src/rules/pydocstyle/snapshots/ruff__rules__pydocstyle__tests__D210_D.py.snap b/crates/ruff/src/rules/pydocstyle/snapshots/ruff__rules__pydocstyle__tests__D210_D.py.snap
index b6ea3afed3de5..6dd7495d14ac9 100644
--- a/crates/ruff/src/rules/pydocstyle/snapshots/ruff__rules__pydocstyle__tests__D210_D.py.snap
+++ b/crates/ruff/src/rules/pydocstyle/snapshots/ruff__rules__pydocstyle__tests__D210_D.py.snap
@@ -62,7 +62,7 @@ D.py:299:5: D210 [*] No whitespaces allowed surrounding docstring text
 301 301 |     This is the end.
 302 302 |     """
 
-D.py:581:5: D210 [*] No whitespaces allowed surrounding docstring text
+D.py:581:5: D210 No whitespaces allowed surrounding docstring text
     |
 581 |         "or exclamation point (not '\"')")
 582 | def endswith_quote():
diff --git a/crates/ruff/src/rules/pydocstyle/snapshots/ruff__rules__pydocstyle__tests__all.snap b/crates/ruff/src/rules/pydocstyle/snapshots/ruff__rules__pydocstyle__tests__all.snap
new file mode 100644
index 0000000000000..98cba7a11db46
--- /dev/null
+++ b/crates/ruff/src/rules/pydocstyle/snapshots/ruff__rules__pydocstyle__tests__all.snap
@@ -0,0 +1,34 @@
+---
+source: crates/ruff/src/rules/pydocstyle/mod.rs
+---
+all.py:1:1: D100 Missing docstring in public module
+  |
+1 | def public_func():
+  |  D100
+2 |     pass
+  |
+
+all.py:1:5: D103 Missing docstring in public function
+  |
+1 | def public_func():
+  |     ^^^^^^^^^^^ D103
+2 |     pass
+  |
+
+all.py:9:7: D101 Missing docstring in public class
+   |
+ 9 | class PublicClass:
+   |       ^^^^^^^^^^^ D101
+10 |     class PublicNestedClass:
+11 |         pass
+   |
+
+all.py:10:11: D106 Missing docstring in public nested class
+   |
+10 | class PublicClass:
+11 |     class PublicNestedClass:
+   |           ^^^^^^^^^^^^^^^^^ D106
+12 |         pass
+   |
+
+
diff --git a/crates/ruff/src/rules/pyflakes/cformat.rs b/crates/ruff/src/rules/pyflakes/cformat.rs
index ceb56ad69c3fd..1a7c3f6d9e8c0 100644
--- a/crates/ruff/src/rules/pyflakes/cformat.rs
+++ b/crates/ruff/src/rules/pyflakes/cformat.rs
@@ -3,14 +3,14 @@ use std::convert::TryFrom;
 use std::str::FromStr;
 
 use rustc_hash::FxHashSet;
-use rustpython_common::cformat::{
+use rustpython_format::cformat::{
     CFormatError, CFormatPart, CFormatPrecision, CFormatQuantity, CFormatSpec, CFormatString,
 };
 
 pub(crate) struct CFormatSummary {
-    pub starred: bool,
-    pub num_positional: usize,
-    pub keywords: FxHashSet<String>,
+    pub(crate) starred: bool,
+    pub(crate) num_positional: usize,
+    pub(crate) keywords: FxHashSet<String>,
 }
 
 impl From<&CFormatString> for CFormatSummary {
diff --git a/crates/ruff/src/rules/pyflakes/fixes.rs b/crates/ruff/src/rules/pyflakes/fixes.rs
index 52f848fc4aa44..56d2347cc4397 100644
--- a/crates/ruff/src/rules/pyflakes/fixes.rs
+++ b/crates/ruff/src/rules/pyflakes/fixes.rs
@@ -1,22 +1,18 @@
 use anyhow::{bail, Ok, Result};
-use libcst_native::{Codegen, CodegenState, DictElement, Expression};
+use libcst_native::{DictElement, Expression};
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::{Excepthandler, Expr};
+use rustpython_parser::ast::{Excepthandler, Expr, Ranged};
 use rustpython_parser::{lexer, Mode, Tok};
 
 use ruff_diagnostics::Edit;
 use ruff_python_ast::source_code::{Locator, Stylist};
 use ruff_python_ast::str::raw_contents;
-use rustpython_common::format::{
-    FieldName, FieldNamePart, FieldType, FormatPart, FormatString, FromTemplate,
-};
 
-use crate::cst::matchers::{
-    match_attribute, match_call, match_dict, match_expression, match_simple_string,
-};
+use crate::autofix::codemods::CodegenStylist;
+use crate::cst::matchers::{match_call_mut, match_dict, match_expression};
 
 /// Generate a [`Edit`] to remove unused keys from format dict.
-pub fn remove_unused_format_arguments_from_dict(
+pub(crate) fn remove_unused_format_arguments_from_dict(
     unused_arguments: &[&str],
     stmt: &Expr,
     locator: &Locator,
@@ -33,18 +29,14 @@ pub fn remove_unused_format_arguments_from_dict(
         } if raw_contents(name.value).map_or(false, |name| unused_arguments.contains(&name)))
     });
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
-
-    Ok(Edit::range_replacement(state.to_string(), stmt.range()))
+    Ok(Edit::range_replacement(
+        tree.codegen_stylist(stylist),
+        stmt.range(),
+    ))
 }
 
 /// Generate a [`Edit`] to remove unused keyword arguments from a `format` call.
-pub fn remove_unused_keyword_arguments_from_format_call(
+pub(crate) fn remove_unused_keyword_arguments_from_format_call(
     unused_arguments: &[&str],
     location: TextRange,
     locator: &Locator,
@@ -52,127 +44,44 @@ pub fn remove_unused_keyword_arguments_from_format_call(
 ) -> Result<Edit> {
     let module_text = locator.slice(location);
     let mut tree = match_expression(module_text)?;
-    let call = match_call(&mut tree)?;
+    let call = match_call_mut(&mut tree)?;
 
     call.args
         .retain(|e| !matches!(&e.keyword, Some(kw) if unused_arguments.contains(&kw.value)));
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
-
-    Ok(Edit::range_replacement(state.to_string(), location))
-}
-
-fn unparse_format_part(format_part: FormatPart) -> String {
-    match format_part {
-        FormatPart::Literal(literal) => literal,
-        FormatPart::Field {
-            field_name,
-            conversion_spec,
-            format_spec,
-        } => {
-            let mut field_name = field_name;
-            if let Some(conversion) = conversion_spec {
-                field_name.push_str(&format!("!{conversion}"));
-            }
-            if !format_spec.is_empty() {
-                field_name.push_str(&format!(":{format_spec}"));
-            }
-            format!("{{{field_name}}}")
-        }
-    }
-}
-
-fn update_field_types(format_string: &FormatString, min_unused: usize) -> String {
-    format_string
-        .format_parts
-        .iter()
-        .map(|part| match part {
-            FormatPart::Literal(literal) => FormatPart::Literal(literal.to_string()),
-            FormatPart::Field {
-                field_name,
-                conversion_spec,
-                format_spec,
-            } => {
-                let new_field_name = FieldName::parse(field_name).unwrap(); // This should never fail because we parsed it before
-                let mut new_field_name_string = match new_field_name.field_type {
-                    FieldType::Auto => String::new(),
-                    FieldType::Index(i) => (i - min_unused).to_string(),
-                    FieldType::Keyword(keyword) => keyword,
-                };
-                for field_name_part in &new_field_name.parts {
-                    let field_name_part_string = match field_name_part {
-                        FieldNamePart::Attribute(attribute) => format!(".{attribute}"),
-                        FieldNamePart::Index(i) => format!("[{i}]"),
-                        FieldNamePart::StringIndex(s) => format!("[{s}]"),
-                    };
-                    new_field_name_string.push_str(&field_name_part_string);
-                }
-                let new_format_spec = FormatString::from_str(format_spec).unwrap(); // This should never fail because we parsed it before
-                let new_format_spec_string = update_field_types(&new_format_spec, min_unused);
-                FormatPart::Field {
-                    field_name: new_field_name_string,
-                    conversion_spec: *conversion_spec,
-                    format_spec: new_format_spec_string,
-                }
-            }
-        })
-        .map(unparse_format_part)
-        .collect()
+    Ok(Edit::range_replacement(
+        tree.codegen_stylist(stylist),
+        location,
+    ))
 }
 
 /// Generate a [`Edit`] to remove unused positional arguments from a `format` call.
-pub fn remove_unused_positional_arguments_from_format_call(
+pub(crate) fn remove_unused_positional_arguments_from_format_call(
     unused_arguments: &[usize],
     location: TextRange,
     locator: &Locator,
     stylist: &Stylist,
-    format_string: &FormatString,
 ) -> Result<Edit> {
     let module_text = locator.slice(location);
     let mut tree = match_expression(module_text)?;
-    let call = match_call(&mut tree)?;
+    let call = match_call_mut(&mut tree)?;
 
+    // Remove any unused arguments.
     let mut index = 0;
     call.args.retain(|_| {
+        let is_unused = unused_arguments.contains(&index);
         index += 1;
-        !unused_arguments.contains(&(index - 1))
+        !is_unused
     });
 
-    let mut min_unused_index = 0;
-    for index in unused_arguments {
-        if *index == min_unused_index {
-            min_unused_index += 1;
-        } else {
-            break;
-        }
-    }
-
-    let mut new_format_string;
-    if min_unused_index > 0 {
-        let func = match_attribute(&mut call.func)?;
-        let simple_string = match_simple_string(&mut func.value)?;
-        new_format_string = update_field_types(format_string, min_unused_index);
-        new_format_string = format!(r#""{new_format_string}""#);
-        simple_string.value = new_format_string.as_str();
-    }
-
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
-
-    Ok(Edit::range_replacement(state.to_string(), location))
+    Ok(Edit::range_replacement(
+        tree.codegen_stylist(stylist),
+        location,
+    ))
 }
 
 /// Generate a [`Edit`] to remove the binding from an exception handler.
-pub fn remove_exception_handler_assignment(
+pub(crate) fn remove_exception_handler_assignment(
     excepthandler: &Excepthandler,
     locator: &Locator,
 ) -> Result<Edit> {
@@ -182,7 +91,8 @@ pub fn remove_exception_handler_assignment(
 
     // End of the token just before the `as` to the semicolon.
     let mut prev = None;
-    for (tok, range) in lexer::lex_located(contents, Mode::Module, excepthandler.start()).flatten()
+    for (tok, range) in
+        lexer::lex_starts_at(contents, Mode::Module, excepthandler.start()).flatten()
     {
         if matches!(tok, Tok::As) {
             fix_start = prev;
diff --git a/crates/ruff/src/rules/pyflakes/format.rs b/crates/ruff/src/rules/pyflakes/format.rs
index 3452a37ef400b..03d1f30f95ef9 100644
--- a/crates/ruff/src/rules/pyflakes/format.rs
+++ b/crates/ruff/src/rules/pyflakes/format.rs
@@ -1,7 +1,7 @@
 //! Implements helper functions for using vendored/format.rs
 use std::convert::TryFrom;
 
-use rustpython_common::format::{
+use rustpython_format::{
     FieldName, FieldType, FormatParseError, FormatPart, FormatString, FromTemplate,
 };
 
@@ -22,11 +22,10 @@ pub(crate) fn error_to_string(err: &FormatParseError) -> String {
 
 #[derive(Debug)]
 pub(crate) struct FormatSummary {
-    pub autos: Vec<usize>,
-    pub indices: Vec<usize>,
-    pub keywords: Vec<String>,
-    pub has_nested_parts: bool,
-    pub format_string: FormatString,
+    pub(crate) autos: Vec<usize>,
+    pub(crate) indices: Vec<usize>,
+    pub(crate) keywords: Vec<String>,
+    pub(crate) has_nested_parts: bool,
 }
 
 impl TryFrom<&str> for FormatSummary {
@@ -75,7 +74,6 @@ impl TryFrom<&str> for FormatSummary {
             indices,
             keywords,
             has_nested_parts,
-            format_string,
         })
     }
 }
diff --git a/crates/ruff/src/rules/pyflakes/mod.rs b/crates/ruff/src/rules/pyflakes/mod.rs
index a6b0196adb9f7..a27d8c190d6d9 100644
--- a/crates/ruff/src/rules/pyflakes/mod.rs
+++ b/crates/ruff/src/rules/pyflakes/mod.rs
@@ -3,131 +3,140 @@ pub(crate) mod cformat;
 pub(crate) mod fixes;
 pub(crate) mod format;
 pub(crate) mod rules;
+pub mod settings;
 
 #[cfg(test)]
 mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use regex::Regex;
-    use ruff_diagnostics::Diagnostic;
     use rustpython_parser::lexer::LexResult;
     use test_case::test_case;
-    use textwrap::dedent;
 
+    use ruff_diagnostics::Diagnostic;
     use ruff_python_ast::source_code::{Indexer, Locator, Stylist};
+    use ruff_textwrap::dedent;
 
     use crate::linter::{check_path, LinterResult};
     use crate::registry::{AsRule, Linter, Rule};
-    use crate::settings::flags;
-    use crate::test::test_path;
-    use crate::{assert_messages, directives, settings};
-
-    #[test_case(Rule::UnusedImport, Path::new("F401_0.py"); "F401_0")]
-    #[test_case(Rule::UnusedImport, Path::new("F401_1.py"); "F401_1")]
-    #[test_case(Rule::UnusedImport, Path::new("F401_2.py"); "F401_2")]
-    #[test_case(Rule::UnusedImport, Path::new("F401_3.py"); "F401_3")]
-    #[test_case(Rule::UnusedImport, Path::new("F401_4.py"); "F401_4")]
-    #[test_case(Rule::UnusedImport, Path::new("F401_5.py"); "F401_5")]
-    #[test_case(Rule::UnusedImport, Path::new("F401_6.py"); "F401_6")]
-    #[test_case(Rule::UnusedImport, Path::new("F401_7.py"); "F401_7")]
-    #[test_case(Rule::UnusedImport, Path::new("F401_8.py"); "F401_8")]
-    #[test_case(Rule::UnusedImport, Path::new("F401_9.py"); "F401_9")]
-    #[test_case(Rule::UnusedImport, Path::new("F401_10.py"); "F401_10")]
-    #[test_case(Rule::UnusedImport, Path::new("F401_11.py"); "F401_11")]
-    #[test_case(Rule::ImportShadowedByLoopVar, Path::new("F402.py"); "F402")]
-    #[test_case(Rule::UndefinedLocalWithImportStar, Path::new("F403.py"); "F403")]
-    #[test_case(Rule::LateFutureImport, Path::new("F404.py"); "F404")]
-    #[test_case(Rule::UndefinedLocalWithImportStarUsage, Path::new("F405.py"); "F405")]
-    #[test_case(Rule::UndefinedLocalWithNestedImportStarUsage, Path::new("F406.py"); "F406")]
-    #[test_case(Rule::FutureFeatureNotDefined, Path::new("F407.py"); "F407")]
-    #[test_case(Rule::PercentFormatInvalidFormat, Path::new("F50x.py"); "F501")]
-    #[test_case(Rule::PercentFormatExpectedMapping, Path::new("F502.py"); "F502_1")]
-    #[test_case(Rule::PercentFormatExpectedMapping, Path::new("F50x.py"); "F502_0")]
-    #[test_case(Rule::PercentFormatExpectedSequence, Path::new("F503.py"); "F503_1")]
-    #[test_case(Rule::PercentFormatExpectedSequence, Path::new("F50x.py"); "F503_0")]
-    #[test_case(Rule::PercentFormatExtraNamedArguments, Path::new("F504.py"); "F504_1")]
-    #[test_case(Rule::PercentFormatExtraNamedArguments, Path::new("F50x.py"); "F504_0")]
-    #[test_case(Rule::PercentFormatMissingArgument, Path::new("F504.py"); "F505_1")]
-    #[test_case(Rule::PercentFormatMissingArgument, Path::new("F50x.py"); "F505_0")]
-    #[test_case(Rule::PercentFormatMixedPositionalAndNamed, Path::new("F50x.py"); "F506")]
-    #[test_case(Rule::PercentFormatPositionalCountMismatch, Path::new("F50x.py"); "F507")]
-    #[test_case(Rule::PercentFormatStarRequiresSequence, Path::new("F50x.py"); "F508")]
-    #[test_case(Rule::PercentFormatUnsupportedFormatCharacter, Path::new("F50x.py"); "F509")]
-    #[test_case(Rule::StringDotFormatInvalidFormat, Path::new("F521.py"); "F521")]
-    #[test_case(Rule::StringDotFormatExtraNamedArguments, Path::new("F522.py"); "F522")]
-    #[test_case(Rule::StringDotFormatExtraPositionalArguments, Path::new("F523.py"); "F523")]
-    #[test_case(Rule::StringDotFormatMissingArguments, Path::new("F524.py"); "F524")]
-    #[test_case(Rule::StringDotFormatMixingAutomatic, Path::new("F525.py"); "F525")]
-    #[test_case(Rule::FStringMissingPlaceholders, Path::new("F541.py"); "F541")]
-    #[test_case(Rule::MultiValueRepeatedKeyLiteral, Path::new("F601.py"); "F601")]
-    #[test_case(Rule::MultiValueRepeatedKeyVariable, Path::new("F602.py"); "F602")]
-    #[test_case(Rule::MultipleStarredExpressions, Path::new("F622.py"); "F622")]
-    #[test_case(Rule::AssertTuple, Path::new("F631.py"); "F631")]
-    #[test_case(Rule::IsLiteral, Path::new("F632.py"); "F632")]
-    #[test_case(Rule::InvalidPrintSyntax, Path::new("F633.py"); "F633")]
-    #[test_case(Rule::IfTuple, Path::new("F634.py"); "F634")]
-    #[test_case(Rule::BreakOutsideLoop, Path::new("F701.py"); "F701")]
-    #[test_case(Rule::ContinueOutsideLoop, Path::new("F702.py"); "F702")]
-    #[test_case(Rule::YieldOutsideFunction, Path::new("F704.py"); "F704")]
-    #[test_case(Rule::ReturnOutsideFunction, Path::new("F706.py"); "F706")]
-    #[test_case(Rule::DefaultExceptNotLast, Path::new("F707.py"); "F707")]
-    #[test_case(Rule::ForwardAnnotationSyntaxError, Path::new("F722.py"); "F722")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_0.py"); "F811_0")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_1.py"); "F811_1")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_2.py"); "F811_2")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_3.py"); "F811_3")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_4.py"); "F811_4")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_5.py"); "F811_5")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_6.py"); "F811_6")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_7.py"); "F811_7")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_8.py"); "F811_8")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_9.py"); "F811_9")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_10.py"); "F811_10")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_11.py"); "F811_11")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_12.py"); "F811_12")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_13.py"); "F811_13")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_14.py"); "F811_14")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_15.py"); "F811_15")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_16.py"); "F811_16")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_17.py"); "F811_17")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_18.py"); "F811_18")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_19.py"); "F811_19")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_20.py"); "F811_20")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_21.py"); "F811_21")]
-    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_22.py"); "F811_22")]
-    #[test_case(Rule::UndefinedName, Path::new("F821_0.py"); "F821_0")]
-    #[test_case(Rule::UndefinedName, Path::new("F821_1.py"); "F821_1")]
-    #[test_case(Rule::UndefinedName, Path::new("F821_2.py"); "F821_2")]
-    #[test_case(Rule::UndefinedName, Path::new("F821_3.py"); "F821_3")]
-    #[test_case(Rule::UndefinedName, Path::new("F821_4.py"); "F821_4")]
-    #[test_case(Rule::UndefinedName, Path::new("F821_5.py"); "F821_5")]
-    #[test_case(Rule::UndefinedName, Path::new("F821_6.py"); "F821_6")]
-    #[test_case(Rule::UndefinedName, Path::new("F821_7.py"); "F821_7")]
-    #[test_case(Rule::UndefinedName, Path::new("F821_8.pyi"); "F821_8")]
-    #[test_case(Rule::UndefinedName, Path::new("F821_9.py"); "F821_9")]
-    #[test_case(Rule::UndefinedName, Path::new("F821_10.py"); "F821_10")]
-    #[test_case(Rule::UndefinedName, Path::new("F821_11.py"); "F821_11")]
-    #[test_case(Rule::UndefinedName, Path::new("F821_12.py"); "F821_12")]
-    #[test_case(Rule::UndefinedName, Path::new("F821_13.py"); "F821_13")]
-    #[test_case(Rule::UndefinedName, Path::new("F821_14.py"); "F821_14")]
-    #[test_case(Rule::UndefinedName, Path::new("F821_15.py"); "F821_15")]
-    #[test_case(Rule::UndefinedExport, Path::new("F822_0.py"); "F822_0")]
-    #[test_case(Rule::UndefinedExport, Path::new("F822_1.py"); "F822_1")]
-    #[test_case(Rule::UndefinedExport, Path::new("F822_2.py"); "F822_2")]
-    #[test_case(Rule::UndefinedLocal, Path::new("F823.py"); "F823")]
-    #[test_case(Rule::UnusedVariable, Path::new("F841_0.py"); "F841_0")]
-    #[test_case(Rule::UnusedVariable, Path::new("F841_1.py"); "F841_1")]
-    #[test_case(Rule::UnusedVariable, Path::new("F841_2.py"); "F841_2")]
-    #[test_case(Rule::UnusedVariable, Path::new("F841_3.py"); "F841_3")]
-    #[test_case(Rule::UnusedAnnotation, Path::new("F842.py"); "F842")]
-    #[test_case(Rule::RaiseNotImplemented, Path::new("F901.py"); "F901")]
+    use crate::rules::pyflakes;
+    use crate::settings::{flags, Settings};
+    use crate::test::{test_path, test_snippet};
+    use crate::{assert_messages, directives};
+
+    #[test_case(Rule::UnusedImport, Path::new("F401_0.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_1.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_2.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_3.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_4.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_5.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_6.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_7.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_8.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_9.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_10.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_11.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_12.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_13.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_14.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_15.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_16.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_17.py"))]
+    #[test_case(Rule::ImportShadowedByLoopVar, Path::new("F402.py"))]
+    #[test_case(Rule::UndefinedLocalWithImportStar, Path::new("F403.py"))]
+    #[test_case(Rule::LateFutureImport, Path::new("F404.py"))]
+    #[test_case(Rule::UndefinedLocalWithImportStarUsage, Path::new("F405.py"))]
+    #[test_case(Rule::UndefinedLocalWithNestedImportStarUsage, Path::new("F406.py"))]
+    #[test_case(Rule::FutureFeatureNotDefined, Path::new("F407.py"))]
+    #[test_case(Rule::PercentFormatInvalidFormat, Path::new("F50x.py"))]
+    #[test_case(Rule::PercentFormatExpectedMapping, Path::new("F502.py"))]
+    #[test_case(Rule::PercentFormatExpectedMapping, Path::new("F50x.py"))]
+    #[test_case(Rule::PercentFormatExpectedSequence, Path::new("F503.py"))]
+    #[test_case(Rule::PercentFormatExpectedSequence, Path::new("F50x.py"))]
+    #[test_case(Rule::PercentFormatExtraNamedArguments, Path::new("F504.py"))]
+    #[test_case(Rule::PercentFormatExtraNamedArguments, Path::new("F50x.py"))]
+    #[test_case(Rule::PercentFormatMissingArgument, Path::new("F504.py"))]
+    #[test_case(Rule::PercentFormatMissingArgument, Path::new("F50x.py"))]
+    #[test_case(Rule::PercentFormatMixedPositionalAndNamed, Path::new("F50x.py"))]
+    #[test_case(Rule::PercentFormatPositionalCountMismatch, Path::new("F50x.py"))]
+    #[test_case(Rule::PercentFormatStarRequiresSequence, Path::new("F50x.py"))]
+    #[test_case(Rule::PercentFormatUnsupportedFormatCharacter, Path::new("F50x.py"))]
+    #[test_case(Rule::StringDotFormatInvalidFormat, Path::new("F521.py"))]
+    #[test_case(Rule::StringDotFormatExtraNamedArguments, Path::new("F522.py"))]
+    #[test_case(Rule::StringDotFormatExtraPositionalArguments, Path::new("F523.py"))]
+    #[test_case(Rule::StringDotFormatMissingArguments, Path::new("F524.py"))]
+    #[test_case(Rule::StringDotFormatMixingAutomatic, Path::new("F525.py"))]
+    #[test_case(Rule::FStringMissingPlaceholders, Path::new("F541.py"))]
+    #[test_case(Rule::MultiValueRepeatedKeyLiteral, Path::new("F601.py"))]
+    #[test_case(Rule::MultiValueRepeatedKeyVariable, Path::new("F602.py"))]
+    #[test_case(Rule::MultipleStarredExpressions, Path::new("F622.py"))]
+    #[test_case(Rule::AssertTuple, Path::new("F631.py"))]
+    #[test_case(Rule::IsLiteral, Path::new("F632.py"))]
+    #[test_case(Rule::InvalidPrintSyntax, Path::new("F633.py"))]
+    #[test_case(Rule::IfTuple, Path::new("F634.py"))]
+    #[test_case(Rule::BreakOutsideLoop, Path::new("F701.py"))]
+    #[test_case(Rule::ContinueOutsideLoop, Path::new("F702.py"))]
+    #[test_case(Rule::YieldOutsideFunction, Path::new("F704.py"))]
+    #[test_case(Rule::ReturnOutsideFunction, Path::new("F706.py"))]
+    #[test_case(Rule::DefaultExceptNotLast, Path::new("F707.py"))]
+    #[test_case(Rule::ForwardAnnotationSyntaxError, Path::new("F722.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_0.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_1.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_2.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_3.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_4.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_5.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_6.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_7.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_8.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_9.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_10.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_11.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_12.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_13.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_14.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_15.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_16.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_17.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_18.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_19.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_20.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_21.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_22.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_23.py"))]
+    #[test_case(Rule::RedefinedWhileUnused, Path::new("F811_24.py"))]
+    #[test_case(Rule::UndefinedName, Path::new("F821_0.py"))]
+    #[test_case(Rule::UndefinedName, Path::new("F821_1.py"))]
+    #[test_case(Rule::UndefinedName, Path::new("F821_2.py"))]
+    #[test_case(Rule::UndefinedName, Path::new("F821_3.py"))]
+    #[test_case(Rule::UndefinedName, Path::new("F821_4.py"))]
+    #[test_case(Rule::UndefinedName, Path::new("F821_5.py"))]
+    #[test_case(Rule::UndefinedName, Path::new("F821_6.py"))]
+    #[test_case(Rule::UndefinedName, Path::new("F821_7.py"))]
+    #[test_case(Rule::UndefinedName, Path::new("F821_8.pyi"))]
+    #[test_case(Rule::UndefinedName, Path::new("F821_9.py"))]
+    #[test_case(Rule::UndefinedName, Path::new("F821_10.py"))]
+    #[test_case(Rule::UndefinedName, Path::new("F821_11.py"))]
+    #[test_case(Rule::UndefinedName, Path::new("F821_12.py"))]
+    #[test_case(Rule::UndefinedName, Path::new("F821_13.py"))]
+    #[test_case(Rule::UndefinedName, Path::new("F821_14.py"))]
+    #[test_case(Rule::UndefinedName, Path::new("F821_15.py"))]
+    #[test_case(Rule::UndefinedExport, Path::new("F822_0.py"))]
+    #[test_case(Rule::UndefinedExport, Path::new("F822_1.py"))]
+    #[test_case(Rule::UndefinedExport, Path::new("F822_2.py"))]
+    #[test_case(Rule::UndefinedLocal, Path::new("F823.py"))]
+    #[test_case(Rule::UnusedVariable, Path::new("F841_0.py"))]
+    #[test_case(Rule::UnusedVariable, Path::new("F841_1.py"))]
+    #[test_case(Rule::UnusedVariable, Path::new("F841_2.py"))]
+    #[test_case(Rule::UnusedVariable, Path::new("F841_3.py"))]
+    #[test_case(Rule::UnusedAnnotation, Path::new("F842.py"))]
+    #[test_case(Rule::RaiseNotImplemented, Path::new("F901.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
             Path::new("pyflakes").join(path).as_path(),
-            &settings::Settings::for_rule(rule_code),
+            &Settings::for_rule(rule_code),
         )?;
         assert_messages!(snapshot, diagnostics);
         Ok(())
@@ -137,9 +146,9 @@ mod tests {
     fn f841_dummy_variable_rgx() -> Result<()> {
         let diagnostics = test_path(
             Path::new("pyflakes/F841_0.py"),
-            &settings::Settings {
+            &Settings {
                 dummy_variable_rgx: Regex::new(r"^z$").unwrap(),
-                ..settings::Settings::for_rule(Rule::UnusedVariable)
+                ..Settings::for_rule(Rule::UnusedVariable)
             },
         )?;
         assert_messages!(diagnostics);
@@ -150,7 +159,7 @@ mod tests {
     fn init() -> Result<()> {
         let diagnostics = test_path(
             Path::new("pyflakes/__init__.py"),
-            &settings::Settings::for_rules(vec![Rule::UndefinedName, Rule::UndefinedExport]),
+            &Settings::for_rules(vec![Rule::UndefinedName, Rule::UndefinedExport]),
         )?;
         assert_messages!(diagnostics);
         Ok(())
@@ -160,7 +169,7 @@ mod tests {
     fn default_builtins() -> Result<()> {
         let diagnostics = test_path(
             Path::new("pyflakes/builtins.py"),
-            &settings::Settings::for_rules(vec![Rule::UndefinedName]),
+            &Settings::for_rules(vec![Rule::UndefinedName]),
         )?;
         assert_messages!(diagnostics);
         Ok(())
@@ -170,9 +179,9 @@ mod tests {
     fn extra_builtins() -> Result<()> {
         let diagnostics = test_path(
             Path::new("pyflakes/builtins.py"),
-            &settings::Settings {
+            &Settings {
                 builtins: vec!["_".to_string()],
-                ..settings::Settings::for_rules(vec![Rule::UndefinedName])
+                ..Settings::for_rules(vec![Rule::UndefinedName])
             },
         )?;
         assert_messages!(diagnostics);
@@ -183,7 +192,7 @@ mod tests {
     fn default_typing_modules() -> Result<()> {
         let diagnostics = test_path(
             Path::new("pyflakes/typing_modules.py"),
-            &settings::Settings::for_rules(vec![Rule::UndefinedName]),
+            &Settings::for_rules(vec![Rule::UndefinedName]),
         )?;
         assert_messages!(diagnostics);
         Ok(())
@@ -193,9 +202,9 @@ mod tests {
     fn extra_typing_modules() -> Result<()> {
         let diagnostics = test_path(
             Path::new("pyflakes/typing_modules.py"),
-            &settings::Settings {
+            &Settings {
                 typing_modules: vec!["airflow.typing_compat".to_string()],
-                ..settings::Settings::for_rules(vec![Rule::UndefinedName])
+                ..Settings::for_rules(vec![Rule::UndefinedName])
             },
         )?;
         assert_messages!(diagnostics);
@@ -206,7 +215,7 @@ mod tests {
     fn future_annotations() -> Result<()> {
         let diagnostics = test_path(
             Path::new("pyflakes/future_annotations.py"),
-            &settings::Settings::for_rules(vec![Rule::UnusedImport, Rule::UndefinedName]),
+            &Settings::for_rules(vec![Rule::UnusedImport, Rule::UndefinedName]),
         )?;
         assert_messages!(diagnostics);
         Ok(())
@@ -216,7 +225,7 @@ mod tests {
     fn multi_statement_lines() -> Result<()> {
         let diagnostics = test_path(
             Path::new("pyflakes/multi_statement_lines.py"),
-            &settings::Settings::for_rule(Rule::UnusedImport),
+            &Settings::for_rule(Rule::UnusedImport),
         )?;
         assert_messages!(diagnostics);
         Ok(())
@@ -226,9 +235,9 @@ mod tests {
     fn relative_typing_module() -> Result<()> {
         let diagnostics = test_path(
             Path::new("pyflakes/project/foo/bar.py"),
-            &settings::Settings {
+            &Settings {
                 typing_modules: vec!["foo.typical".to_string()],
-                ..settings::Settings::for_rules(vec![Rule::UndefinedName])
+                ..Settings::for_rules(vec![Rule::UndefinedName])
             },
         )?;
         assert_messages!(diagnostics);
@@ -239,20 +248,79 @@ mod tests {
     fn nested_relative_typing_module() -> Result<()> {
         let diagnostics = test_path(
             Path::new("pyflakes/project/foo/bop/baz.py"),
-            &settings::Settings {
+            &Settings {
                 typing_modules: vec!["foo.typical".to_string()],
-                ..settings::Settings::for_rules(vec![Rule::UndefinedName])
+                ..Settings::for_rules(vec![Rule::UndefinedName])
             },
         )?;
         assert_messages!(diagnostics);
         Ok(())
     }
 
+    #[test]
+    fn extend_generics() -> Result<()> {
+        let snapshot = "extend_immutable_calls".to_string();
+        let diagnostics = test_path(
+            Path::new("pyflakes/F401_15.py"),
+            &Settings {
+                pyflakes: pyflakes::settings::Settings {
+                    extend_generics: vec!["django.db.models.ForeignKey".to_string()],
+                },
+                ..Settings::for_rules(vec![Rule::UnusedImport])
+            },
+        )?;
+        assert_messages!(snapshot, diagnostics);
+        Ok(())
+    }
+
+    #[test_case(
+        r#"
+        import os
+
+        def f():
+            import os
+
+            # Despite this `del`, `import os` in `f` should still be flagged as shadowing an unused
+            # import. (This is a false negative.)
+            del os
+    "#,
+        "del_shadowed_global_import_in_local_scope"
+    )]
+    #[test_case(
+        r#"
+        import os
+
+        def f():
+            import os
+
+        # Despite this `del`, `import os` in `f` should still be flagged as shadowing an unused
+        # import. (This is a false negative, but is consistent with Pyflakes.)
+        del os
+    "#,
+        "del_shadowed_global_import_in_global_scope"
+    )]
+    #[test_case(
+        r#"
+        def f():
+            import os
+            import os
+
+            # Despite this `del`, `import os` should still be flagged as shadowing an unused
+            # import.
+            del os
+    "#,
+        "del_shadowed_local_import_in_local_scope"
+    )]
+    fn contents(contents: &str, snapshot: &str) {
+        let diagnostics = test_snippet(contents, &Settings::for_rules(&Linter::Pyflakes));
+        assert_messages!(snapshot, diagnostics);
+    }
+
     /// A re-implementation of the Pyflakes test runner.
     /// Note that all tests marked with `#[ignore]` should be considered TODOs.
     fn flakes(contents: &str, expected: &[Rule]) {
         let contents = dedent(contents);
-        let settings = settings::Settings::for_rules(&Linter::Pyflakes);
+        let settings = Settings::for_rules(&Linter::Pyflakes);
         let tokens: Vec<LexResult> = ruff_rustpython::tokenize(&contents);
         let locator = Locator::new(&contents);
         let stylist = Stylist::from_tokens(&tokens, &locator);
@@ -264,7 +332,7 @@ mod tests {
             &indexer,
         );
         let LinterResult {
-            data: (mut diagnostics, _imports),
+            data: (mut diagnostics, ..),
             ..
         } = check_path(
             Path::new("<filename>"),
@@ -276,7 +344,6 @@ mod tests {
             &directives,
             &settings,
             flags::Noqa::Enabled,
-            flags::Autofix::Enabled,
         );
         diagnostics.sort_by_key(Diagnostic::start);
         let actual = diagnostics
@@ -471,6 +538,16 @@ mod tests {
         "#,
             &[Rule::UndefinedName],
         );
+        flakes(
+            r#"
+        def f():
+            __qualname__ = 1
+
+            class Foo:
+                __qualname__
+        "#,
+            &[Rule::UnusedVariable],
+        );
     }
 
     #[test]
@@ -1031,6 +1108,23 @@ mod tests {
         "#,
             &[],
         );
+
+        flakes(
+            r#"
+        class A:
+            T = 1
+
+            # In each case, `T` is undefined. Only the first `iter` uses the class scope.
+            X = (T for x in range(10))
+            Y = [x for x in range(10) if T]
+            Z = [x for x in range(10) for y in T]
+        "#,
+            &[
+                Rule::UndefinedName,
+                Rule::UndefinedName,
+                Rule::UndefinedName,
+            ],
+        );
     }
 
     #[test]
@@ -1132,6 +1226,40 @@ mod tests {
         "#,
             &[],
         );
+        flakes(
+            r#"
+        class Test(object):
+            print(__class__.__name__)
+
+            def __init__(self):
+                self.x = 1
+
+        t = Test()
+        "#,
+            &[Rule::UndefinedName],
+        );
+        flakes(
+            r#"
+        class Test(object):
+            X = [__class__ for _ in range(10)]
+
+            def __init__(self):
+                self.x = 1
+
+        t = Test()
+        "#,
+            &[Rule::UndefinedName],
+        );
+        flakes(
+            r#"
+        def f(self):
+            print(__class__.__name__)
+            self.x = 1
+
+        f()
+        "#,
+            &[Rule::UndefinedName],
+        );
     }
 
     /// See: <https://github.com/PyCQA/pyflakes/blob/04ecb0c324ef3b61124e2f80f9e1af6c3a4c7b26/pyflakes/test/test_imports.py>
@@ -3627,6 +3755,16 @@ mod tests {
         "#,
             &[],
         );
+        flakes(
+            r#"
+            from typing import NewType
+
+            def f():
+                name = "x"
+                NewType(name, int)
+        "#,
+            &[],
+        );
     }
 
     #[test]
diff --git a/crates/ruff/src/rules/pyflakes/rules/assert_tuple.rs b/crates/ruff/src/rules/pyflakes/rules/assert_tuple.rs
index f91a09ca9c266..9f76c7970d52c 100644
--- a/crates/ruff/src/rules/pyflakes/rules/assert_tuple.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/assert_tuple.rs
@@ -1,10 +1,31 @@
-use rustpython_parser::ast::{Expr, ExprKind, Stmt};
+use rustpython_parser::ast::{self, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
 
+/// ## What it does
+/// Checks for `assert` statements that use non-empty tuples as test
+/// conditions.
+///
+/// ## Why is this bad?
+/// Non-empty tuples are always `True`, so an `assert` statement with a
+/// non-empty tuple as its test condition will always pass. This is likely a
+/// mistake.
+///
+/// ## Example
+/// ```python
+/// assert (some_condition,)
+/// ```
+///
+/// Use instead:
+/// ```python
+/// assert some_condition
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/simple_stmts.html#the-assert-statement)
 #[violation]
 pub struct AssertTuple;
 
@@ -16,8 +37,8 @@ impl Violation for AssertTuple {
 }
 
 /// F631
-pub fn assert_tuple(checker: &mut Checker, stmt: &Stmt, test: &Expr) {
-    if let ExprKind::Tuple { elts, .. } = &test.node {
+pub(crate) fn assert_tuple(checker: &mut Checker, stmt: &Stmt, test: &Expr) {
+    if let Expr::Tuple(ast::ExprTuple { elts, .. }) = &test {
         if !elts.is_empty() {
             checker
                 .diagnostics
diff --git a/crates/ruff/src/rules/pyflakes/rules/break_outside_loop.rs b/crates/ruff/src/rules/pyflakes/rules/break_outside_loop.rs
index d40f6a1714a6f..c867a82bf53b3 100644
--- a/crates/ruff/src/rules/pyflakes/rules/break_outside_loop.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/break_outside_loop.rs
@@ -1,8 +1,23 @@
-use rustpython_parser::ast::{Stmt, StmtKind};
+use rustpython_parser::ast::{self, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
+/// ## What it does
+/// Checks for `break` statements outside of loops.
+///
+/// ## Why is this bad?
+/// The use of a `break` statement outside of a `for` or `while` loop will
+/// raise a `SyntaxError`.
+///
+/// ## Example
+/// ```python
+/// def foo():
+///     break
+/// ```
+///
+/// ## References
+/// - [Python documentation: `break`](https://docs.python.org/3/reference/simple_stmts.html#the-break-statement)
 #[violation]
 pub struct BreakOutsideLoop;
 
@@ -14,25 +29,23 @@ impl Violation for BreakOutsideLoop {
 }
 
 /// F701
-pub fn break_outside_loop<'a>(
+pub(crate) fn break_outside_loop<'a>(
     stmt: &'a Stmt,
     parents: &mut impl Iterator<Item = &'a Stmt>,
 ) -> Option<Diagnostic> {
     let mut allowed: bool = false;
     let mut child = stmt;
     for parent in parents {
-        match &parent.node {
-            StmtKind::For { orelse, .. }
-            | StmtKind::AsyncFor { orelse, .. }
-            | StmtKind::While { orelse, .. } => {
+        match parent {
+            Stmt::For(ast::StmtFor { orelse, .. })
+            | Stmt::AsyncFor(ast::StmtAsyncFor { orelse, .. })
+            | Stmt::While(ast::StmtWhile { orelse, .. }) => {
                 if !orelse.contains(child) {
                     allowed = true;
                     break;
                 }
             }
-            StmtKind::FunctionDef { .. }
-            | StmtKind::AsyncFunctionDef { .. }
-            | StmtKind::ClassDef { .. } => {
+            Stmt::FunctionDef(_) | Stmt::AsyncFunctionDef(_) | Stmt::ClassDef(_) => {
                 break;
             }
             _ => {}
diff --git a/crates/ruff/src/rules/pyflakes/rules/continue_outside_loop.rs b/crates/ruff/src/rules/pyflakes/rules/continue_outside_loop.rs
index 6bee0d00b7694..ced5e9c1e009d 100644
--- a/crates/ruff/src/rules/pyflakes/rules/continue_outside_loop.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/continue_outside_loop.rs
@@ -1,8 +1,23 @@
-use rustpython_parser::ast::{Stmt, StmtKind};
+use rustpython_parser::ast::{self, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
+/// ## What it does
+/// Checks for `continue` statements outside of loops.
+///
+/// ## Why is this bad?
+/// The use of a `continue` statement outside of a `for` or `while` loop will
+/// raise a `SyntaxError`.
+///
+/// ## Example
+/// ```python
+/// def foo():
+///     continue  # SyntaxError
+/// ```
+///
+/// ## References
+/// - [Python documentation: `continue`](https://docs.python.org/3/reference/simple_stmts.html#the-continue-statement)
 #[violation]
 pub struct ContinueOutsideLoop;
 
@@ -14,25 +29,23 @@ impl Violation for ContinueOutsideLoop {
 }
 
 /// F702
-pub fn continue_outside_loop<'a>(
+pub(crate) fn continue_outside_loop<'a>(
     stmt: &'a Stmt,
     parents: &mut impl Iterator<Item = &'a Stmt>,
 ) -> Option<Diagnostic> {
     let mut allowed: bool = false;
     let mut child = stmt;
     for parent in parents {
-        match &parent.node {
-            StmtKind::For { orelse, .. }
-            | StmtKind::AsyncFor { orelse, .. }
-            | StmtKind::While { orelse, .. } => {
+        match parent {
+            Stmt::For(ast::StmtFor { orelse, .. })
+            | Stmt::AsyncFor(ast::StmtAsyncFor { orelse, .. })
+            | Stmt::While(ast::StmtWhile { orelse, .. }) => {
                 if !orelse.contains(child) {
                     allowed = true;
                     break;
                 }
             }
-            StmtKind::FunctionDef { .. }
-            | StmtKind::AsyncFunctionDef { .. }
-            | StmtKind::ClassDef { .. } => {
+            Stmt::FunctionDef(_) | Stmt::AsyncFunctionDef(_) | Stmt::ClassDef(_) => {
                 break;
             }
             _ => {}
diff --git a/crates/ruff/src/rules/pyflakes/rules/default_except_not_last.rs b/crates/ruff/src/rules/pyflakes/rules/default_except_not_last.rs
index 1c87c5c7430d1..197f34e349710 100644
--- a/crates/ruff/src/rules/pyflakes/rules/default_except_not_last.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/default_except_not_last.rs
@@ -1,10 +1,48 @@
-use rustpython_parser::ast::{Excepthandler, ExcepthandlerKind};
+use rustpython_parser::ast::{self, Excepthandler};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::except_range;
 use ruff_python_ast::source_code::Locator;
 
+/// ## What it does
+/// Checks for `except` blocks that handle all exceptions, but are not the last
+/// `except` block in a `try` statement.
+///
+/// ## Why is this bad?
+/// When an exception is raised within a `try` block, the `except` blocks are
+/// evaluated in order, and the first matching block is executed. If an `except`
+/// block handles all exceptions, but isn't the last block, Python will raise a
+/// `SyntaxError`, as the following blocks would never be executed.
+///
+/// ## Example
+/// ```python
+/// def reciprocal(n):
+///     try:
+///         reciprocal = 1 / n
+///     except:
+///         print("An exception occurred.")
+///     except ZeroDivisionError:
+///         print("Cannot divide by zero.")
+///     else:
+///         return reciprocal
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def reciprocal(n):
+///     try:
+///         reciprocal = 1 / n
+///     except ZeroDivisionError:
+///         print("Cannot divide by zero.")
+///     except:
+///         print("An exception occurred.")
+///     else:
+///         return reciprocal
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/compound_stmts.html#except-clause)
 #[violation]
 pub struct DefaultExceptNotLast;
 
@@ -16,12 +54,12 @@ impl Violation for DefaultExceptNotLast {
 }
 
 /// F707
-pub fn default_except_not_last(
+pub(crate) fn default_except_not_last(
     handlers: &[Excepthandler],
     locator: &Locator,
 ) -> Option<Diagnostic> {
     for (idx, handler) in handlers.iter().enumerate() {
-        let ExcepthandlerKind::ExceptHandler { type_, .. } = &handler.node;
+        let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler { type_, .. }) = handler;
         if type_.is_none() && idx < handlers.len() - 1 {
             return Some(Diagnostic::new(
                 DefaultExceptNotLast,
diff --git a/crates/ruff/src/rules/pyflakes/rules/f_string_missing_placeholders.rs b/crates/ruff/src/rules/pyflakes/rules/f_string_missing_placeholders.rs
index 6f1d5d916a67f..b8d04af426861 100644
--- a/crates/ruff/src/rules/pyflakes/rules/f_string_missing_placeholders.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/f_string_missing_placeholders.rs
@@ -1,8 +1,8 @@
 use ruff_text_size::{TextRange, TextSize};
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{Expr, Ranged};
 use rustpython_parser::{lexer, Mode, StringKind, Tok};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::Locator;
 
@@ -54,7 +54,7 @@ fn find_useless_f_strings<'a>(
     locator: &'a Locator,
 ) -> impl Iterator<Item = (TextRange, TextRange)> + 'a {
     let contents = locator.slice(expr.range());
-    lexer::lex_located(contents, Mode::Module, expr.start())
+    lexer::lex_starts_at(contents, Mode::Module, expr.start())
         .flatten()
         .filter_map(|(tok, range)| match tok {
             Tok::String {
@@ -87,20 +87,21 @@ fn fix_f_string_missing_placeholders(
     prefix_range: TextRange,
     tok_range: TextRange,
     checker: &mut Checker,
-) -> Edit {
+) -> Fix {
     let content = &checker.locator.contents()[TextRange::new(prefix_range.end(), tok_range.end())];
-    Edit::replacement(
+    #[allow(deprecated)]
+    Fix::unspecified(Edit::replacement(
         unescape_f_string(content),
         prefix_range.start(),
         tok_range.end(),
-    )
+    ))
 }
 
 /// F541
-pub fn f_string_missing_placeholders(expr: &Expr, values: &[Expr], checker: &mut Checker) {
+pub(crate) fn f_string_missing_placeholders(expr: &Expr, values: &[Expr], checker: &mut Checker) {
     if !values
         .iter()
-        .any(|value| matches!(value.node, ExprKind::FormattedValue { .. }))
+        .any(|value| matches!(value, Expr::FormattedValue(_)))
     {
         for (prefix_range, tok_range) in find_useless_f_strings(expr, checker.locator) {
             let mut diagnostic = Diagnostic::new(FStringMissingPlaceholders, tok_range);
diff --git a/crates/ruff/src/rules/pyflakes/rules/forward_annotation_syntax_error.rs b/crates/ruff/src/rules/pyflakes/rules/forward_annotation_syntax_error.rs
index 5c0b3fb3047c5..aa94f3eb0ae5e 100644
--- a/crates/ruff/src/rules/pyflakes/rules/forward_annotation_syntax_error.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/forward_annotation_syntax_error.rs
@@ -1,6 +1,27 @@
 use ruff_diagnostics::Violation;
 use ruff_macros::{derive_message_formats, violation};
 
+/// ## What it does
+/// Checks for forward annotations that include invalid syntax.
+///
+///
+/// ## Why is this bad?
+/// In Python, type annotations can be quoted as strings literals to enable
+/// references to types that have not yet been defined, known as "forward
+/// references".
+///
+/// However, these quoted annotations must be valid Python expressions. The use
+/// of invalid syntax in a quoted annotation won't raise a `SyntaxError`, but
+/// will instead raise an error when type checking is performed.
+///
+/// ## Example
+/// ```python
+/// def foo() -> "/":
+///     ...
+/// ```
+///
+/// ## References
+/// - [PEP 563](https://www.python.org/dev/peps/pep-0563/)
 #[violation]
 pub struct ForwardAnnotationSyntaxError {
     pub body: String,
diff --git a/crates/ruff/src/rules/pyflakes/rules/future_feature_not_defined.rs b/crates/ruff/src/rules/pyflakes/rules/future_feature_not_defined.rs
new file mode 100644
index 0000000000000..9e234ed1a850b
--- /dev/null
+++ b/crates/ruff/src/rules/pyflakes/rules/future_feature_not_defined.rs
@@ -0,0 +1,41 @@
+use rustpython_parser::ast::{Alias, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_stdlib::future::ALL_FEATURE_NAMES;
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for `__future__` imports that are not defined in the current Python
+/// version.
+///
+/// ## Why is this bad?
+/// Importing undefined or unsupported members from the `__future__` module is
+/// a `SyntaxError`.
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/__future__.html)
+#[violation]
+pub struct FutureFeatureNotDefined {
+    name: String,
+}
+
+impl Violation for FutureFeatureNotDefined {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let FutureFeatureNotDefined { name } = self;
+        format!("Future feature `{name}` is not defined")
+    }
+}
+
+pub(crate) fn future_feature_not_defined(checker: &mut Checker, alias: &Alias) {
+    if !ALL_FEATURE_NAMES.contains(&alias.name.as_str()) {
+        checker.diagnostics.push(Diagnostic::new(
+            FutureFeatureNotDefined {
+                name: alias.name.to_string(),
+            },
+            alias.range(),
+        ));
+    }
+}
diff --git a/crates/ruff/src/rules/pyflakes/rules/if_tuple.rs b/crates/ruff/src/rules/pyflakes/rules/if_tuple.rs
index 70607fb0a9ed2..01f9e9a784c85 100644
--- a/crates/ruff/src/rules/pyflakes/rules/if_tuple.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/if_tuple.rs
@@ -1,10 +1,31 @@
-use rustpython_parser::ast::{Expr, ExprKind, Stmt};
+use rustpython_parser::ast::{self, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
 
+/// ## What it does
+/// Checks for `if statements that use non-empty tuples as test conditions.
+///
+/// ## Why is this bad?
+/// Non-empty tuples are always `True`, so an `if` statement with a non-empty
+/// tuple as its test condition will always pass. This is likely a mistake.
+///
+/// ## Example
+/// ```python
+/// if (False,):
+///     print("This will always run")
+/// ```
+///
+/// Use instead:
+/// ```python
+/// if False:
+///     print("This will never run")
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/compound_stmts.html#the-if-statement)
 #[violation]
 pub struct IfTuple;
 
@@ -16,8 +37,8 @@ impl Violation for IfTuple {
 }
 
 /// F634
-pub fn if_tuple(checker: &mut Checker, stmt: &Stmt, test: &Expr) {
-    if let ExprKind::Tuple { elts, .. } = &test.node {
+pub(crate) fn if_tuple(checker: &mut Checker, stmt: &Stmt, test: &Expr) {
+    if let Expr::Tuple(ast::ExprTuple { elts, .. }) = &test {
         if !elts.is_empty() {
             checker
                 .diagnostics
diff --git a/crates/ruff/src/rules/pyflakes/rules/imports.rs b/crates/ruff/src/rules/pyflakes/rules/imports.rs
index e81aa0567a599..220925b709a80 100644
--- a/crates/ruff/src/rules/pyflakes/rules/imports.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/imports.rs
@@ -1,66 +1,40 @@
 use itertools::Itertools;
-use rustpython_parser::ast::Alias;
 
-use ruff_diagnostics::Diagnostic;
-use ruff_diagnostics::{AutofixKind, Violation};
+use ruff_diagnostics::Violation;
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::OneIndexed;
-use ruff_python_stdlib::future::ALL_FEATURE_NAMES;
 
-use crate::checkers::ast::Checker;
-
-#[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub enum UnusedImportContext {
-    ExceptHandler,
-    Init,
-}
-
-#[violation]
-pub struct UnusedImport {
-    pub name: String,
-    pub context: Option<UnusedImportContext>,
-    pub multiple: bool,
-}
-
-impl Violation for UnusedImport {
-    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
-
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        let UnusedImport { name, context, .. } = self;
-        match context {
-            Some(UnusedImportContext::ExceptHandler) => {
-                format!(
-                    "`{name}` imported but unused; consider using `importlib.util.find_spec` to test for availability"
-                )
-            }
-            Some(UnusedImportContext::Init) => {
-                format!(
-                    "`{name}` imported but unused; consider adding to `__all__` or using a redundant \
-                     alias"
-                )
-            }
-            None => format!("`{name}` imported but unused"),
-        }
-    }
-
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        let UnusedImport { context, .. } = self;
-        context
-            .is_none()
-            .then_some(|UnusedImport { name, multiple, .. }| {
-                if *multiple {
-                    "Remove unused import".to_string()
-                } else {
-                    format!("Remove unused import: `{name}`")
-                }
-            })
-    }
-}
+/// ## What it does
+/// Checks for import bindings that are shadowed by loop variables.
+///
+/// ## Why is this bad?
+/// Shadowing an import with loop variables makes the code harder to read and
+/// reason about, as the identify of the imported binding is no longer clear.
+/// It's also often indicative of a mistake, as it's unlikely that the loop
+/// variable is intended to be used as the imported binding.
+///
+/// Consider using a different name for the loop variable.
+///
+/// ## Example
+/// ```python
+/// from os import path
+///
+/// for path in files:
+///     print(path)
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from os import path
+///
+///
+/// for filename in files:
+///     print(filename)
+/// ```
 #[violation]
 pub struct ImportShadowedByLoopVar {
-    pub name: String,
-    pub line: OneIndexed,
+    pub(crate) name: String,
+    pub(crate) line: OneIndexed,
 }
 
 impl Violation for ImportShadowedByLoopVar {
@@ -71,9 +45,37 @@ impl Violation for ImportShadowedByLoopVar {
     }
 }
 
+/// ## What it does
+/// Checks for the use of wildcard imports.
+///
+/// ## Why is this bad?
+/// Wildcard imports (e.g., `from module import *`) make it hard to determine
+/// which symbols are available in the current namespace, and from which module
+/// they were imported.
+///
+/// ## Example
+/// ```python
+/// from math import *
+///
+///
+/// def area(radius):
+///     return pi * radius**2
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from math import pi
+///
+///
+/// def area(radius):
+///     return pi * radius**2
+/// ```
+///
+/// ## References
+/// - [PEP 8](https://peps.python.org/pep-0008/#imports)
 #[violation]
 pub struct UndefinedLocalWithImportStar {
-    pub name: String,
+    pub(crate) name: String,
 }
 
 impl Violation for UndefinedLocalWithImportStar {
@@ -84,6 +86,31 @@ impl Violation for UndefinedLocalWithImportStar {
     }
 }
 
+/// ## What it does
+/// Checks for `__future__` imports that are not located at the beginning of a
+/// file.
+///
+/// ## Why is this bad?
+/// Imports from `__future__` must be placed the beginning of the file, before any
+/// other statements (apart from docstrings). The use of `__future__` imports
+/// elsewhere is invalid and will result in a `SyntaxError`.
+///
+/// ## Example
+/// ```python
+/// from pathlib import Path
+///
+/// from __future__ import annotations
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from __future__ import annotations
+///
+/// from pathlib import Path
+/// ```
+///
+/// ## References
+/// - [PEP 8](https://peps.python.org/pep-0008/#module-level-dunder-names)
 #[violation]
 pub struct LateFutureImport;
 
@@ -94,10 +121,47 @@ impl Violation for LateFutureImport {
     }
 }
 
+/// ## What it does
+/// Checks for names that might be undefined, but may also be defined in a
+/// wildcard import.
+///
+/// ## Why is this bad?
+/// Wildcard imports (e.g., `from module import *`) make it hard to determine
+/// which symbols are available in the current namespace. If a module contains
+/// a wildcard import, and a name in the current namespace has not been
+/// explicitly defined or imported, then it's unclear whether the name is
+/// undefined or was imported by the wildcard import.
+///
+/// If the name _is_ defined in via a wildcard import, that member should be
+/// imported explicitly to avoid confusion.
+///
+/// If the name is _not_ defined in a wildcard import, it should be defined or
+/// imported.
+///
+/// ## Example
+/// ```python
+/// from math import *
+///
+///
+/// def area(radius):
+///     return pi * radius**2
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from math import pi
+///
+///
+/// def area(radius):
+///     return pi * radius**2
+/// ```
+///
+/// ## References
+/// - [PEP 8](https://peps.python.org/pep-0008/#imports)
 #[violation]
 pub struct UndefinedLocalWithImportStarUsage {
-    pub name: String,
-    pub sources: Vec<String>,
+    pub(crate) name: String,
+    pub(crate) sources: Vec<String>,
 }
 
 impl Violation for UndefinedLocalWithImportStarUsage {
@@ -112,9 +176,36 @@ impl Violation for UndefinedLocalWithImportStarUsage {
     }
 }
 
+/// ## What it does
+/// Check for the use of wildcard imports outside of the module namespace.
+///
+/// ## Why is this bad?
+/// The use of wildcard imports outside of the module namespace (e.g., within
+/// functions) can lead to confusion, as the import can shadow local variables.
+///
+/// Though wildcard imports are discouraged, when necessary, they should be placed
+/// in the module namespace (i.e., at the top-level of a module).
+///
+/// ## Example
+/// ```python
+/// def foo():
+///     from math import *
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from math import *
+///
+///
+/// def foo():
+///     ...
+/// ```
+///
+/// ## References
+/// - [PEP 8](https://peps.python.org/pep-0008/#imports)
 #[violation]
 pub struct UndefinedLocalWithNestedImportStarUsage {
-    pub name: String,
+    pub(crate) name: String,
 }
 
 impl Violation for UndefinedLocalWithNestedImportStarUsage {
@@ -124,27 +215,3 @@ impl Violation for UndefinedLocalWithNestedImportStarUsage {
         format!("`from {name} import *` only allowed at module level")
     }
 }
-
-#[violation]
-pub struct FutureFeatureNotDefined {
-    pub name: String,
-}
-
-impl Violation for FutureFeatureNotDefined {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        let FutureFeatureNotDefined { name } = self;
-        format!("Future feature `{name}` is not defined")
-    }
-}
-
-pub fn future_feature_not_defined(checker: &mut Checker, alias: &Alias) {
-    if !ALL_FEATURE_NAMES.contains(&&*alias.node.name) {
-        checker.diagnostics.push(Diagnostic::new(
-            FutureFeatureNotDefined {
-                name: alias.node.name.to_string(),
-            },
-            alias.range(),
-        ));
-    }
-}
diff --git a/crates/ruff/src/rules/pyflakes/rules/invalid_literal_comparisons.rs b/crates/ruff/src/rules/pyflakes/rules/invalid_literal_comparisons.rs
index 2763551a5a7f7..80cdb4288210c 100644
--- a/crates/ruff/src/rules/pyflakes/rules/invalid_literal_comparisons.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/invalid_literal_comparisons.rs
@@ -4,7 +4,7 @@ use once_cell::unsync::Lazy;
 use ruff_text_size::TextRange;
 use rustpython_parser::ast::{Cmpop, Expr};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers;
 
@@ -12,7 +12,7 @@ use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub enum IsCmpop {
+pub(crate) enum IsCmpop {
     Is,
     IsNot,
 }
@@ -27,9 +27,44 @@ impl From<&Cmpop> for IsCmpop {
     }
 }
 
+/// ## What it does
+/// Checks for `is` and `is not` comparisons against constant literals, like
+/// integers and strings.
+///
+/// ## Why is this bad?
+/// The `is` and `is not` comparators operate on identity, in that they check
+/// whether two objects are the same object. If the objects are not the same
+/// object, the comparison will always be `False`. Using `is` and `is not` with
+/// constant literals often works "by accident", but are not guaranteed to produce
+/// the expected result.
+///
+/// As of Python 3.8, using `is` and `is not` with constant literals will produce
+/// a `SyntaxWarning`.
+///
+/// Instead, use `==` and `!=` to compare constant literals, which will compare
+/// the values of the objects instead of their identities.
+///
+/// ## Example
+/// ```python
+/// x = 200
+/// if x is 200:
+///     print("It's 200!")
+/// ```
+///
+/// Use instead:
+/// ```python
+/// x = 200
+/// if x == 200:
+///     print("It's 200!")
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/expressions.html#is-not)
+/// - [Python documentation](https://docs.python.org/3/reference/expressions.html#value-comparisons)
+/// - [_Why does Python log a SyntaxWarning for ‘is’ with literals?_ by Adam Johnson](https://adamj.eu/tech/2020/01/21/why-does-python-3-8-syntaxwarning-for-is-literal/)
 #[violation]
 pub struct IsLiteral {
-    pub cmpop: IsCmpop,
+    cmpop: IsCmpop,
 }
 
 impl AlwaysAutofixableViolation for IsLiteral {
@@ -52,7 +87,7 @@ impl AlwaysAutofixableViolation for IsLiteral {
 }
 
 /// F632
-pub fn invalid_literal_comparison(
+pub(crate) fn invalid_literal_comparison(
     checker: &mut Checker,
     left: &Expr,
     ops: &[Cmpop],
@@ -69,8 +104,8 @@ pub fn invalid_literal_comparison(
             let mut diagnostic = Diagnostic::new(IsLiteral { cmpop: op.into() }, location);
             if checker.patch(diagnostic.kind.rule()) {
                 if let Some(located_op) = &located.get(index) {
-                    assert_eq!(&located_op.node, op);
-                    if let Some(content) = match &located_op.node {
+                    assert_eq!(located_op.op, *op);
+                    if let Some(content) = match located_op.op {
                         Cmpop::Is => Some("==".to_string()),
                         Cmpop::IsNot => Some("!=".to_string()),
                         node => {
@@ -78,10 +113,11 @@ pub fn invalid_literal_comparison(
                             None
                         }
                     } {
-                        diagnostic.set_fix(Edit::range_replacement(
+                        #[allow(deprecated)]
+                        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
                             content,
-                            located_op.range() + location.start(),
-                        ));
+                            located_op.range + location.start(),
+                        )));
                     }
                 } else {
                     error!("Failed to fix invalid comparison due to missing op");
diff --git a/crates/ruff/src/rules/pyflakes/rules/invalid_print_syntax.rs b/crates/ruff/src/rules/pyflakes/rules/invalid_print_syntax.rs
index d00bf691053a0..651b03d73741e 100644
--- a/crates/ruff/src/rules/pyflakes/rules/invalid_print_syntax.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/invalid_print_syntax.rs
@@ -1,10 +1,50 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
 
+/// ## What it does
+/// Checks for `print` statements that use the `>>` syntax.
+///
+/// ## Why is this bad?
+/// In Python 2, the `print` statement can be used with the `>>` syntax to
+/// print to a file-like object. This `print >> sys.stderr` syntax is
+/// deprecated in Python 3.
+///
+/// Instead, use the `file` keyword argument to the `print` function, the
+/// `sys.stderr.write` function, or the `logging` module.
+///
+/// ## Example
+/// ```python
+/// from __future__ import print_function
+/// import sys
+///
+/// print >> sys.stderr, "Hello, world!"
+/// ```
+///
+/// Use instead:
+/// ```python
+/// print("Hello, world!", file=sys.stderr)
+/// ```
+///
+/// Or:
+/// ```python
+/// import sys
+///
+/// sys.stderr.write("Hello, world!\n")
+/// ```
+///
+/// Or:
+/// ```python
+/// import logging
+///
+/// logging.error("Hello, world!")
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/functions.html#print)
 #[violation]
 pub struct InvalidPrintSyntax;
 
@@ -16,14 +56,14 @@ impl Violation for InvalidPrintSyntax {
 }
 
 /// F633
-pub fn invalid_print_syntax(checker: &mut Checker, left: &Expr) {
-    let ExprKind::Name { id, .. } = &left.node else {
+pub(crate) fn invalid_print_syntax(checker: &mut Checker, left: &Expr) {
+    let Expr::Name(ast::ExprName { id, .. }) = &left else {
         return;
     };
     if id != "print" {
         return;
     }
-    if !checker.ctx.is_builtin("print") {
+    if !checker.semantic_model().is_builtin("print") {
         return;
     };
     checker
diff --git a/crates/ruff/src/rules/pyflakes/rules/mod.rs b/crates/ruff/src/rules/pyflakes/rules/mod.rs
index 4f466f57f1b95..3a66bb0e8f6cf 100644
--- a/crates/ruff/src/rules/pyflakes/rules/mod.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/mod.rs
@@ -1,26 +1,26 @@
-pub use assert_tuple::{assert_tuple, AssertTuple};
-pub use break_outside_loop::{break_outside_loop, BreakOutsideLoop};
-pub use continue_outside_loop::{continue_outside_loop, ContinueOutsideLoop};
-pub use default_except_not_last::{default_except_not_last, DefaultExceptNotLast};
-pub use f_string_missing_placeholders::{
+pub(crate) use assert_tuple::{assert_tuple, AssertTuple};
+pub(crate) use break_outside_loop::{break_outside_loop, BreakOutsideLoop};
+pub(crate) use continue_outside_loop::{continue_outside_loop, ContinueOutsideLoop};
+pub(crate) use default_except_not_last::{default_except_not_last, DefaultExceptNotLast};
+pub(crate) use f_string_missing_placeholders::{
     f_string_missing_placeholders, FStringMissingPlaceholders,
 };
-pub use forward_annotation_syntax_error::ForwardAnnotationSyntaxError;
-pub use if_tuple::{if_tuple, IfTuple};
-pub use imports::{
-    future_feature_not_defined, FutureFeatureNotDefined, ImportShadowedByLoopVar, LateFutureImport,
-    UndefinedLocalWithImportStar, UndefinedLocalWithImportStarUsage,
-    UndefinedLocalWithNestedImportStarUsage, UnusedImport, UnusedImportContext,
+pub(crate) use forward_annotation_syntax_error::ForwardAnnotationSyntaxError;
+pub(crate) use future_feature_not_defined::{future_feature_not_defined, FutureFeatureNotDefined};
+pub(crate) use if_tuple::{if_tuple, IfTuple};
+pub(crate) use imports::{
+    ImportShadowedByLoopVar, LateFutureImport, UndefinedLocalWithImportStar,
+    UndefinedLocalWithImportStarUsage, UndefinedLocalWithNestedImportStarUsage,
 };
-pub use invalid_literal_comparisons::{invalid_literal_comparison, IsLiteral};
-pub use invalid_print_syntax::{invalid_print_syntax, InvalidPrintSyntax};
-pub use raise_not_implemented::{raise_not_implemented, RaiseNotImplemented};
-pub use redefined_while_unused::RedefinedWhileUnused;
-pub use repeated_keys::{
+pub(crate) use invalid_literal_comparisons::{invalid_literal_comparison, IsLiteral};
+pub(crate) use invalid_print_syntax::{invalid_print_syntax, InvalidPrintSyntax};
+pub(crate) use raise_not_implemented::{raise_not_implemented, RaiseNotImplemented};
+pub(crate) use redefined_while_unused::RedefinedWhileUnused;
+pub(crate) use repeated_keys::{
     repeated_keys, MultiValueRepeatedKeyLiteral, MultiValueRepeatedKeyVariable,
 };
-pub use return_outside_function::{return_outside_function, ReturnOutsideFunction};
-pub use starred_expressions::{
+pub(crate) use return_outside_function::{return_outside_function, ReturnOutsideFunction};
+pub(crate) use starred_expressions::{
     starred_expressions, ExpressionsInStarAssignment, MultipleStarredExpressions,
 };
 pub(crate) use strings::{
@@ -37,12 +37,13 @@ pub(crate) use strings::{
     StringDotFormatExtraPositionalArguments, StringDotFormatInvalidFormat,
     StringDotFormatMissingArguments, StringDotFormatMixingAutomatic,
 };
-pub use undefined_export::{undefined_export, UndefinedExport};
-pub use undefined_local::{undefined_local, UndefinedLocal};
-pub use undefined_name::UndefinedName;
-pub use unused_annotation::{unused_annotation, UnusedAnnotation};
-pub use unused_variable::{unused_variable, UnusedVariable};
-pub use yield_outside_function::{yield_outside_function, YieldOutsideFunction};
+pub(crate) use undefined_export::{undefined_export, UndefinedExport};
+pub(crate) use undefined_local::{undefined_local, UndefinedLocal};
+pub(crate) use undefined_name::UndefinedName;
+pub(crate) use unused_annotation::{unused_annotation, UnusedAnnotation};
+pub(crate) use unused_import::{unused_import, UnusedImport};
+pub(crate) use unused_variable::{unused_variable, UnusedVariable};
+pub(crate) use yield_outside_function::{yield_outside_function, YieldOutsideFunction};
 
 mod assert_tuple;
 mod break_outside_loop;
@@ -50,6 +51,7 @@ mod continue_outside_loop;
 mod default_except_not_last;
 mod f_string_missing_placeholders;
 mod forward_annotation_syntax_error;
+mod future_feature_not_defined;
 mod if_tuple;
 mod imports;
 mod invalid_literal_comparisons;
@@ -64,5 +66,6 @@ mod undefined_export;
 mod undefined_local;
 mod undefined_name;
 mod unused_annotation;
+mod unused_import;
 mod unused_variable;
 mod yield_outside_function;
diff --git a/crates/ruff/src/rules/pyflakes/rules/raise_not_implemented.rs b/crates/ruff/src/rules/pyflakes/rules/raise_not_implemented.rs
index 15cc3e9f3b6df..f91e08f0bfcce 100644
--- a/crates/ruff/src/rules/pyflakes/rules/raise_not_implemented.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/raise_not_implemented.rs
@@ -1,11 +1,39 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 
+/// ## What it does
+/// Checks for `raise` statements that raise `NotImplemented`.
+///
+/// ## Why is this bad?
+/// `NotImplemented` is an exception used by binary special methods to indicate
+/// that an operation is not implemented with respect to a particular type.
+///
+/// `NotImplemented` should not be raised directly. Instead, raise
+/// `NotImplementedError`, which is used to indicate that the method is
+/// abstract or not implemented in the derived class.
+///
+/// ## Example
+/// ```python
+/// class Foo:
+///     def bar(self):
+///         raise NotImplemented
+/// ```
+///
+/// Use instead:
+/// ```python
+/// class Foo:
+///     def bar(self):
+///         raise NotImplementedError
+/// ```
+///
+/// ## References
+/// - [Python documentation: `NotImplemented`](https://docs.python.org/3/library/constants.html#NotImplemented)
+/// - [Python documentation: `NotImplementedError`](https://docs.python.org/3/library/exceptions.html#NotImplementedError)
 #[violation]
 pub struct RaiseNotImplemented;
 
@@ -21,15 +49,15 @@ impl AlwaysAutofixableViolation for RaiseNotImplemented {
 }
 
 fn match_not_implemented(expr: &Expr) -> Option<&Expr> {
-    match &expr.node {
-        ExprKind::Call { func, .. } => {
-            if let ExprKind::Name { id, .. } = &func.node {
+    match expr {
+        Expr::Call(ast::ExprCall { func, .. }) => {
+            if let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() {
                 if id == "NotImplemented" {
                     return Some(func);
                 }
             }
         }
-        ExprKind::Name { id, .. } => {
+        Expr::Name(ast::ExprName { id, .. }) => {
             if id == "NotImplemented" {
                 return Some(expr);
             }
@@ -40,16 +68,17 @@ fn match_not_implemented(expr: &Expr) -> Option<&Expr> {
 }
 
 /// F901
-pub fn raise_not_implemented(checker: &mut Checker, expr: &Expr) {
+pub(crate) fn raise_not_implemented(checker: &mut Checker, expr: &Expr) {
     let Some(expr) = match_not_implemented(expr) else {
         return;
     };
     let mut diagnostic = Diagnostic::new(RaiseNotImplemented, expr.range());
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
             "NotImplementedError".to_string(),
             expr.range(),
-        ));
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/pyflakes/rules/redefined_while_unused.rs b/crates/ruff/src/rules/pyflakes/rules/redefined_while_unused.rs
index b32c762209c95..e320e607ad19c 100644
--- a/crates/ruff/src/rules/pyflakes/rules/redefined_while_unused.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/redefined_while_unused.rs
@@ -2,6 +2,26 @@ use ruff_diagnostics::Violation;
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::OneIndexed;
 
+/// ## What it does
+/// Checks for variable definitions that redefine (or "shadow") unused
+/// variables.
+///
+/// ## Why is this bad?
+/// Redefinitions of unused names are unnecessary and often indicative of a
+/// mistake.
+///
+/// ## Example
+/// ```python
+/// import foo
+/// import bar
+/// import foo  # Redefinition of unused `foo` from line 1
+/// ```
+///
+/// Use instead:
+/// ```python
+/// import foo
+/// import bar
+/// ```
 #[violation]
 pub struct RedefinedWhileUnused {
     pub name: String,
diff --git a/crates/ruff/src/rules/pyflakes/rules/repeated_keys.rs b/crates/ruff/src/rules/pyflakes/rules/repeated_keys.rs
index a85c484cd4517..44f2c70a5d27b 100644
--- a/crates/ruff/src/rules/pyflakes/rules/repeated_keys.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/repeated_keys.rs
@@ -1,20 +1,49 @@
 use std::hash::{BuildHasherDefault, Hash};
 
 use rustc_hash::{FxHashMap, FxHashSet};
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Violation};
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::comparable::{ComparableConstant, ComparableExpr};
-use ruff_python_ast::helpers::unparse_expr;
 
 use crate::checkers::ast::Checker;
 use crate::registry::{AsRule, Rule};
 
+/// ## What it does
+/// Checks for dictionary literals that associate multiple values with the
+/// same key.
+///
+/// ## Why is this bad?
+/// Dictionary keys should be unique. If a key is associated with multiple values,
+/// the earlier values will be overwritten. Including multiple values for the
+/// same key in a dictionary literal is likely a mistake.
+///
+/// ## Example
+/// ```python
+/// foo = {
+///     "bar": 1,
+///     "baz": 2,
+///     "baz": 3,
+/// }
+/// foo["baz"]  # 3
+/// ```
+///
+/// Use instead:
+/// ```python
+/// foo = {
+///     "bar": 1,
+///     "baz": 2,
+/// }
+/// foo["baz"]  # 2
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/tutorial/datastructures.html#dictionaries)
 #[violation]
 pub struct MultiValueRepeatedKeyLiteral {
-    pub name: String,
-    pub repeated_value: bool,
+    name: String,
+    repeated_value: bool,
 }
 
 impl Violation for MultiValueRepeatedKeyLiteral {
@@ -26,21 +55,52 @@ impl Violation for MultiValueRepeatedKeyLiteral {
         format!("Dictionary key literal `{name}` repeated")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        let MultiValueRepeatedKeyLiteral { repeated_value, .. } = self;
+    fn autofix_title(&self) -> Option<String> {
+        let MultiValueRepeatedKeyLiteral {
+            repeated_value,
+            name,
+        } = self;
         if *repeated_value {
-            Some(|MultiValueRepeatedKeyLiteral { name, .. }| {
-                format!("Remove repeated key literal `{name}`")
-            })
+            Some(format!("Remove repeated key literal `{name}`"))
         } else {
             None
         }
     }
 }
+
+/// ## What it does
+/// Checks for dictionary keys that are repeated with different values.
+///
+/// ## Why is this bad?
+/// Dictionary keys should be unique. If a key is repeated with a different
+/// value, the first values will be overwritten and the key will correspond to
+/// the last value. This is likely a mistake.
+///
+/// ## Example
+/// ```python
+/// foo = {
+///     bar: 1,
+///     baz: 2,
+///     baz: 3,
+/// }
+/// foo[baz]  # 3
+/// ```
+///
+/// Use instead:
+/// ```python
+/// foo = {
+///     bar: 1,
+///     baz: 2,
+/// }
+/// foo[baz]  # 2
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/tutorial/datastructures.html#dictionaries)
 #[violation]
 pub struct MultiValueRepeatedKeyVariable {
-    pub name: String,
-    pub repeated_value: bool,
+    name: String,
+    repeated_value: bool,
 }
 
 impl Violation for MultiValueRepeatedKeyVariable {
@@ -52,12 +112,13 @@ impl Violation for MultiValueRepeatedKeyVariable {
         format!("Dictionary key `{name}` repeated")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        let MultiValueRepeatedKeyVariable { repeated_value, .. } = self;
+    fn autofix_title(&self) -> Option<String> {
+        let MultiValueRepeatedKeyVariable {
+            repeated_value,
+            name,
+        } = self;
         if *repeated_value {
-            Some(|MultiValueRepeatedKeyVariable { name, .. }| {
-                format!("Remove repeated key `{name}`")
-            })
+            Some(format!("Remove repeated key `{name}`"))
         } else {
             None
         }
@@ -71,15 +132,17 @@ enum DictionaryKey<'a> {
 }
 
 fn into_dictionary_key(expr: &Expr) -> Option<DictionaryKey> {
-    match &expr.node {
-        ExprKind::Constant { value, .. } => Some(DictionaryKey::Constant(value.into())),
-        ExprKind::Name { id, .. } => Some(DictionaryKey::Variable(id)),
+    match expr {
+        Expr::Constant(ast::ExprConstant { value, .. }) => {
+            Some(DictionaryKey::Constant(value.into()))
+        }
+        Expr::Name(ast::ExprName { id, .. }) => Some(DictionaryKey::Variable(id)),
         _ => None,
     }
 }
 
 /// F601, F602
-pub fn repeated_keys(checker: &mut Checker, keys: &[Option<Expr>], values: &[Expr]) {
+pub(crate) fn repeated_keys(checker: &mut Checker, keys: &[Option<Expr>], values: &[Expr]) {
     // Generate a map from key to (index, value).
     let mut seen: FxHashMap<DictionaryKey, FxHashSet<ComparableExpr>> =
         FxHashMap::with_capacity_and_hasher(keys.len(), BuildHasherDefault::default());
@@ -93,26 +156,23 @@ pub fn repeated_keys(checker: &mut Checker, keys: &[Option<Expr>], values: &[Exp
             if let Some(seen_values) = seen.get_mut(&dict_key) {
                 match dict_key {
                     DictionaryKey::Constant(..) => {
-                        if checker
-                            .settings
-                            .rules
-                            .enabled(Rule::MultiValueRepeatedKeyLiteral)
-                        {
+                        if checker.enabled(Rule::MultiValueRepeatedKeyLiteral) {
                             let comparable_value: ComparableExpr = (&values[i]).into();
                             let is_duplicate_value = seen_values.contains(&comparable_value);
                             let mut diagnostic = Diagnostic::new(
                                 MultiValueRepeatedKeyLiteral {
-                                    name: unparse_expr(key, checker.stylist),
+                                    name: checker.generator().expr(key),
                                     repeated_value: is_duplicate_value,
                                 },
                                 key.range(),
                             );
                             if is_duplicate_value {
                                 if checker.patch(diagnostic.kind.rule()) {
-                                    diagnostic.set_fix(Edit::deletion(
+                                    #[allow(deprecated)]
+                                    diagnostic.set_fix(Fix::unspecified(Edit::deletion(
                                         values[i - 1].end(),
                                         values[i].end(),
-                                    ));
+                                    )));
                                 }
                             } else {
                                 seen_values.insert(comparable_value);
@@ -121,11 +181,7 @@ pub fn repeated_keys(checker: &mut Checker, keys: &[Option<Expr>], values: &[Exp
                         }
                     }
                     DictionaryKey::Variable(dict_key) => {
-                        if checker
-                            .settings
-                            .rules
-                            .enabled(Rule::MultiValueRepeatedKeyVariable)
-                        {
+                        if checker.enabled(Rule::MultiValueRepeatedKeyVariable) {
                             let comparable_value: ComparableExpr = (&values[i]).into();
                             let is_duplicate_value = seen_values.contains(&comparable_value);
                             let mut diagnostic = Diagnostic::new(
@@ -137,10 +193,11 @@ pub fn repeated_keys(checker: &mut Checker, keys: &[Option<Expr>], values: &[Exp
                             );
                             if is_duplicate_value {
                                 if checker.patch(diagnostic.kind.rule()) {
-                                    diagnostic.set_fix(Edit::deletion(
+                                    #[allow(deprecated)]
+                                    diagnostic.set_fix(Fix::unspecified(Edit::deletion(
                                         values[i - 1].end(),
                                         values[i].end(),
-                                    ));
+                                    )));
                                 }
                             } else {
                                 seen_values.insert(comparable_value);
diff --git a/crates/ruff/src/rules/pyflakes/rules/return_outside_function.rs b/crates/ruff/src/rules/pyflakes/rules/return_outside_function.rs
index 262c7163de36d..c41d3a0aaa3d0 100644
--- a/crates/ruff/src/rules/pyflakes/rules/return_outside_function.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/return_outside_function.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::Stmt;
+use rustpython_parser::ast::{Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -6,6 +6,21 @@ use ruff_python_semantic::scope::ScopeKind;
 
 use crate::checkers::ast::Checker;
 
+/// ## What it does
+/// Checks for `return` statements outside of functions.
+///
+/// ## Why is this bad?
+/// The use of a `return` statement outside of a function will raise a
+/// `SyntaxError`.
+///
+/// ## Example
+/// ```python
+/// class Foo:
+///     return 1
+/// ```
+///
+/// ## References
+/// - [Python documentation: `return`](https://docs.python.org/3/reference/simple_stmts.html#the-return-statement)
 #[violation]
 pub struct ReturnOutsideFunction;
 
@@ -16,9 +31,9 @@ impl Violation for ReturnOutsideFunction {
     }
 }
 
-pub fn return_outside_function(checker: &mut Checker, stmt: &Stmt) {
+pub(crate) fn return_outside_function(checker: &mut Checker, stmt: &Stmt) {
     if matches!(
-        checker.ctx.scope().kind,
+        checker.semantic_model().scope().kind,
         ScopeKind::Class(_) | ScopeKind::Module
     ) {
         checker
diff --git a/crates/ruff/src/rules/pyflakes/rules/starred_expressions.rs b/crates/ruff/src/rules/pyflakes/rules/starred_expressions.rs
index 10697f2b1673c..d4b3a875fa305 100644
--- a/crates/ruff/src/rules/pyflakes/rules/starred_expressions.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/starred_expressions.rs
@@ -1,9 +1,18 @@
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::Expr;
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
+/// ## What it does
+/// Checks for the use of too many expressions in starred assignment statements.
+///
+/// ## Why is this bad?
+/// In assignment statements, starred expressions can be used to unpack iterables.
+///
+/// In Python 3, no more than 1 << 8 assignments are allowed before a starred
+/// expression, and no more than 1 << 24 expressions are allowed after a starred
+/// expression.
 #[violation]
 pub struct ExpressionsInStarAssignment;
 
@@ -14,6 +23,22 @@ impl Violation for ExpressionsInStarAssignment {
     }
 }
 
+/// ## What it does
+/// Checks for the use of multiple starred expressions in assignment statements.
+///
+/// ## Why is this bad?
+/// In assignment statements, starred expressions can be used to unpack iterables.
+/// Including more than one starred expression on the left-hand-side of an
+/// assignment will cause a `SyntaxError`, as it is unclear which expression
+/// should receive the remaining values.
+///
+/// ## Example
+/// ```python
+/// *foo, *bar, baz = (1, 2, 3)
+/// ```
+///
+/// ## References
+/// - [PEP 3132](https://peps.python.org/pep-3132/)
 #[violation]
 pub struct MultipleStarredExpressions;
 
@@ -25,7 +50,7 @@ impl Violation for MultipleStarredExpressions {
 }
 
 /// F621, F622
-pub fn starred_expressions(
+pub(crate) fn starred_expressions(
     elts: &[Expr],
     check_too_many_expressions: bool,
     check_two_starred_expressions: bool,
@@ -34,7 +59,7 @@ pub fn starred_expressions(
     let mut has_starred: bool = false;
     let mut starred_index: Option<usize> = None;
     for (index, elt) in elts.iter().enumerate() {
-        if matches!(elt.node, ExprKind::Starred { .. }) {
+        if matches!(elt, Expr::Starred(_)) {
             if has_starred && check_two_starred_expressions {
                 return Some(Diagnostic::new(MultipleStarredExpressions, location));
             }
diff --git a/crates/ruff/src/rules/pyflakes/rules/strings.rs b/crates/ruff/src/rules/pyflakes/rules/strings.rs
index 81cf684d7fc1e..11edb1bc45461 100644
--- a/crates/ruff/src/rules/pyflakes/rules/strings.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/strings.rs
@@ -1,10 +1,10 @@
-use ruff_text_size::TextRange;
 use std::string::ToString;
 
+use ruff_text_size::TextRange;
 use rustc_hash::FxHashSet;
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword, KeywordData};
+use rustpython_parser::ast::{self, Constant, Expr, Identifier, Keyword};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Violation};
+use ruff_diagnostics::{AlwaysAutofixableViolation, AutofixKind, Diagnostic, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
@@ -17,9 +17,28 @@ use super::super::fixes::{
 };
 use super::super::format::FormatSummary;
 
+/// ## What it does
+/// Checks for invalid `printf`-style format strings.
+///
+/// ## Why is this bad?
+/// Conversion specifiers are required for `printf`-style format strings. These
+/// specifiers must contain a `%` character followed by a conversion type.
+///
+/// ## Example
+/// ```python
+/// "Hello, %" % "world"
+/// ```
+///
+/// Use instead:
+/// ```python
+/// "Hello, %s" % "world"
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting)
 #[violation]
 pub struct PercentFormatInvalidFormat {
-    pub message: String,
+    pub(crate) message: String,
 }
 
 impl Violation for PercentFormatInvalidFormat {
@@ -30,6 +49,32 @@ impl Violation for PercentFormatInvalidFormat {
     }
 }
 
+/// ## What it does
+/// Checks for named placeholders in `printf`-style format strings without
+/// mapping-type values.
+///
+/// ## Why is this bad?
+/// When using named placeholders in `printf`-style format strings, the values
+/// must be a map type (such as a dictionary). Otherwise, the expression will
+/// raise a `TypeError`.
+///
+/// ## Example
+/// ```python
+/// "%(greeting)s, %(name)s" % ("Hello", "World")
+/// ```
+///
+/// Use instead:
+/// ```python
+/// "%(greeting)s, %(name)s" % {"greeting": "Hello", "name": "World"}
+/// ```
+///
+/// Or:
+/// ```python
+/// "%s, %s" % ("Hello", "World")
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting)
 #[violation]
 pub struct PercentFormatExpectedMapping;
 
@@ -40,6 +85,32 @@ impl Violation for PercentFormatExpectedMapping {
     }
 }
 
+/// ## What it does
+/// Checks for uses of mapping-type values in `printf`-style format strings
+/// without named placeholders.
+///
+/// ## Why is this bad?
+/// When using mapping-type values (such as `dict`) in `printf`-style format
+/// strings, the keys must be named. Otherwise, the expression will raise a
+/// `TypeError`.
+///
+/// ## Example
+/// ```python
+/// "%s, %s" % {"greeting": "Hello", "name": "World"}
+/// ```
+///
+/// Use instead:
+/// ```python
+/// "%(greeting)s, %(name)s" % {"greeting": "Hello", "name": "World"}
+/// ```
+///
+/// Or:
+/// ```python
+/// "%s, %s" % ("Hello", "World")
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting)
 #[violation]
 pub struct PercentFormatExpectedSequence;
 
@@ -50,9 +121,28 @@ impl Violation for PercentFormatExpectedSequence {
     }
 }
 
+/// ## What it does
+/// Checks for unused mapping keys in `printf`-style format strings.
+///
+/// ## Why is this bad?
+/// Unused named placeholders in `printf`-style format strings are unnecessary,
+/// and likely indicative of a mistake. They should be removed.
+///
+/// ## Example
+/// ```python
+/// "Hello, %(name)s" % {"greeting": "Hello", "name": "World"}
+/// ```
+///
+/// Use instead:
+/// ```python
+/// "Hello, %(name)s" % {"name": "World"}
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting)
 #[violation]
 pub struct PercentFormatExtraNamedArguments {
-    pub missing: Vec<String>,
+    missing: Vec<String>,
 }
 
 impl AlwaysAutofixableViolation for PercentFormatExtraNamedArguments {
@@ -70,9 +160,29 @@ impl AlwaysAutofixableViolation for PercentFormatExtraNamedArguments {
     }
 }
 
+/// ## What it does
+/// Checks for named placeholders in `printf`-style format strings that are not
+/// present in the provided mapping.
+///
+/// ## Why is this bad?
+/// Named placeholders that lack a corresponding value in the provided mapping
+/// will raise a `KeyError`.
+///
+/// ## Example
+/// ```python
+/// "%(greeting)s, %(name)s" % {"name": "world"}
+/// ```
+///
+/// Use instead:
+/// ```python
+/// "Hello, %(name)s" % {"name": "world"}
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting)
 #[violation]
 pub struct PercentFormatMissingArgument {
-    pub missing: Vec<String>,
+    missing: Vec<String>,
 }
 
 impl Violation for PercentFormatMissingArgument {
@@ -84,6 +194,32 @@ impl Violation for PercentFormatMissingArgument {
     }
 }
 
+/// ## What it does
+/// Checks for `printf`-style format strings that have mixed positional and
+/// named placeholders.
+///
+/// ## Why is this bad?
+/// Python does not support mixing positional and named placeholders in
+/// `printf`-style format strings. The use of mixed placeholders will raise a
+/// `TypeError` at runtime.
+///
+/// ## Example
+/// ```python
+/// "%s, %(name)s" % ("Hello", {"name": "World"})
+/// ```
+///
+/// Use instead:
+/// ```python
+/// "%s, %s" % ("Hello", "World")
+/// ```
+///
+/// Or:
+/// ```python
+/// "%(greeting)s, %(name)s" % {"greeting": "Hello", "name": "World"}
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting)
 #[violation]
 pub struct PercentFormatMixedPositionalAndNamed;
 
@@ -94,10 +230,30 @@ impl Violation for PercentFormatMixedPositionalAndNamed {
     }
 }
 
+/// ## What it does
+/// Checks for `printf`-style format strings that have a mismatch between the
+/// number of positional placeholders and the number of substitution values.
+///
+/// ## Why is this bad?
+/// When a `printf`-style format string is provided with too many or too few
+/// substitution values, it will raise a `TypeError` at runtime.
+///
+/// ## Example
+/// ```python
+/// "%s, %s" % ("Hello", "world", "!")
+/// ```
+///
+/// Use instead:
+/// ```python
+/// "%s, %s" % ("Hello", "world")
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting)
 #[violation]
 pub struct PercentFormatPositionalCountMismatch {
-    pub wanted: usize,
-    pub got: usize,
+    wanted: usize,
+    got: usize,
 }
 
 impl Violation for PercentFormatPositionalCountMismatch {
@@ -108,6 +264,30 @@ impl Violation for PercentFormatPositionalCountMismatch {
     }
 }
 
+/// ## What it does
+/// Checks for `printf`-style format strings that use the `*` specifier with
+/// non-tuple values.
+///
+/// ## Why is this bad?
+/// The use of the `*` specifier with non-tuple values will raise a
+/// `TypeError` at runtime.
+///
+/// ## Example
+/// ```python
+/// from math import pi
+///
+/// "%(n).*f" % {"n": (2, pi)}
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from math import pi
+///
+/// "%.*f" % (2, pi)  # 3.14
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting)
 #[violation]
 pub struct PercentFormatStarRequiresSequence;
 
@@ -118,9 +298,29 @@ impl Violation for PercentFormatStarRequiresSequence {
     }
 }
 
+/// ## What it does
+/// Checks for `printf`-style format strings with invalid format characters.
+///
+/// ## Why is this bad?
+/// In `printf`-style format strings, the `%` character is used to indicate
+/// placeholders. If a `%` character is not followed by a valid format
+/// character, it will raise a `ValueError` at runtime.
+///
+/// ## Example
+/// ```python
+/// "Hello, %S" % "world"
+/// ```
+///
+/// Use instead:
+/// ```python
+/// "Hello, %s" % "world"
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting)
 #[violation]
 pub struct PercentFormatUnsupportedFormatCharacter {
-    pub char: char,
+    pub(crate) char: char,
 }
 
 impl Violation for PercentFormatUnsupportedFormatCharacter {
@@ -131,9 +331,27 @@ impl Violation for PercentFormatUnsupportedFormatCharacter {
     }
 }
 
+/// ## What it does
+/// Checks for `str.format` calls with invalid format strings.
+///
+/// ## Why is this bad?
+/// Invalid format strings will raise a `ValueError`.
+///
+/// ## Example
+/// ```python
+/// "{".format(foo)
+/// ```
+///
+/// Use instead:
+/// ```python
+/// "{}".format(foo)
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/stdtypes.html#str.format)
 #[violation]
 pub struct StringDotFormatInvalidFormat {
-    pub message: String,
+    pub(crate) message: String,
 }
 
 impl Violation for StringDotFormatInvalidFormat {
@@ -144,12 +362,33 @@ impl Violation for StringDotFormatInvalidFormat {
     }
 }
 
+/// ## What it does
+/// Checks for `str.format` calls with unused keyword arguments.
+///
+/// ## Why is this bad?
+/// Unused keyword arguments are redundant, and often indicative of a mistake.
+/// They should be removed.
+///
+/// ## Example
+/// ```python
+/// "Hello, {name}".format(greeting="Hello", name="World")
+/// ```
+///
+/// Use instead:
+/// ```python
+/// "Hello, {name}".format(name="World")
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/stdtypes.html#str.format)
 #[violation]
 pub struct StringDotFormatExtraNamedArguments {
-    pub missing: Vec<String>,
+    missing: Vec<String>,
 }
 
-impl AlwaysAutofixableViolation for StringDotFormatExtraNamedArguments {
+impl Violation for StringDotFormatExtraNamedArguments {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         let StringDotFormatExtraNamedArguments { missing } = self;
@@ -157,19 +396,40 @@ impl AlwaysAutofixableViolation for StringDotFormatExtraNamedArguments {
         format!("`.format` call has unused named argument(s): {message}")
     }
 
-    fn autofix_title(&self) -> String {
+    fn autofix_title(&self) -> Option<String> {
         let StringDotFormatExtraNamedArguments { missing } = self;
         let message = missing.join(", ");
-        format!("Remove extra named arguments: {message}")
-    }
-}
-
+        Some(format!("Remove extra named arguments: {message}"))
+    }
+}
+
+/// ## What it does
+/// Checks for `str.format` calls with unused positional arguments.
+///
+/// ## Why is this bad?
+/// Unused positional arguments are redundant, and often indicative of a mistake.
+/// They should be removed.
+///
+/// ## Example
+/// ```python
+/// "Hello, {0}".format("world", "!")
+/// ```
+///
+/// Use instead:
+/// ```python
+/// "Hello, {0}".format("world")
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/stdtypes.html#str.format)
 #[violation]
 pub struct StringDotFormatExtraPositionalArguments {
-    pub missing: Vec<String>,
+    missing: Vec<String>,
 }
 
-impl AlwaysAutofixableViolation for StringDotFormatExtraPositionalArguments {
+impl Violation for StringDotFormatExtraPositionalArguments {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         let StringDotFormatExtraPositionalArguments { missing } = self;
@@ -177,16 +437,37 @@ impl AlwaysAutofixableViolation for StringDotFormatExtraPositionalArguments {
         format!("`.format` call has unused arguments at position(s): {message}")
     }
 
-    fn autofix_title(&self) -> String {
+    fn autofix_title(&self) -> Option<String> {
         let StringDotFormatExtraPositionalArguments { missing } = self;
         let message = missing.join(", ");
-        format!("Remove extra positional arguments at position(s): {message}")
-    }
-}
-
+        Some(format!(
+            "Remove extra positional arguments at position(s): {message}"
+        ))
+    }
+}
+
+/// ## What it does
+/// Checks for `str.format` calls with placeholders that are missing arguments.
+///
+/// ## Why is this bad?
+/// In `str.format` calls, omitting arguments for placeholders will raise a
+/// `KeyError` at runtime.
+///
+/// ## Example
+/// ```python
+/// "{greeting}, {name}".format(name="World")
+/// ```
+///
+/// Use instead:
+/// ```python
+/// "{greeting}, {name}".format(greeting="Hello", name="World")
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/stdtypes.html#str.format)
 #[violation]
 pub struct StringDotFormatMissingArguments {
-    pub missing: Vec<String>,
+    missing: Vec<String>,
 }
 
 impl Violation for StringDotFormatMissingArguments {
@@ -198,6 +479,30 @@ impl Violation for StringDotFormatMissingArguments {
     }
 }
 
+/// ## What it does
+/// Checks for `str.format` calls that mix automatic and manual numbering.
+///
+/// ## Why is this bad?
+/// In `str.format` calls, mixing automatic and manual numbering will raise a
+/// `ValueError` at runtime.
+///
+/// ## Example
+/// ```python
+/// "{0}, {}".format("Hello", "World")
+/// ```
+///
+/// Use instead:
+/// ```python
+/// "{0}, {1}".format("Hello", "World")
+/// ```
+///
+/// Or:
+/// ```python
+/// "{}, {}".format("Hello", "World")
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/stdtypes.html#str.format)
 #[violation]
 pub struct StringDotFormatMixingAutomatic;
 
@@ -210,14 +515,13 @@ impl Violation for StringDotFormatMixingAutomatic {
 
 fn has_star_star_kwargs(keywords: &[Keyword]) -> bool {
     keywords.iter().any(|k| {
-        let KeywordData { arg, .. } = &k.node;
+        let Keyword { arg, .. } = &k;
         arg.is_none()
     })
 }
 
 fn has_star_args(args: &[Expr]) -> bool {
-    args.iter()
-        .any(|arg| matches!(&arg.node, ExprKind::Starred { .. }))
+    args.iter().any(|arg| matches!(&arg, Expr::Starred(_)))
 }
 
 /// F502
@@ -229,13 +533,13 @@ pub(crate) fn percent_format_expected_mapping(
 ) {
     if !summary.keywords.is_empty() {
         // Tuple, List, Set (+comprehensions)
-        match right.node {
-            ExprKind::List { .. }
-            | ExprKind::Tuple { .. }
-            | ExprKind::Set { .. }
-            | ExprKind::ListComp { .. }
-            | ExprKind::SetComp { .. }
-            | ExprKind::GeneratorExp { .. } => checker
+        match right {
+            Expr::List(_)
+            | Expr::Tuple(_)
+            | Expr::Set(_)
+            | Expr::ListComp(_)
+            | Expr::SetComp(_)
+            | Expr::GeneratorExp(_) => checker
                 .diagnostics
                 .push(Diagnostic::new(PercentFormatExpectedMapping, location)),
             _ => {}
@@ -250,12 +554,7 @@ pub(crate) fn percent_format_expected_sequence(
     right: &Expr,
     location: TextRange,
 ) {
-    if summary.num_positional > 1
-        && matches!(
-            right.node,
-            ExprKind::Dict { .. } | ExprKind::DictComp { .. }
-        )
-    {
+    if summary.num_positional > 1 && matches!(right, Expr::Dict(_) | Expr::DictComp(_)) {
         checker
             .diagnostics
             .push(Diagnostic::new(PercentFormatExpectedSequence, location));
@@ -272,24 +571,20 @@ pub(crate) fn percent_format_extra_named_arguments(
     if summary.num_positional > 0 {
         return;
     }
-    let ExprKind::Dict { keys, .. } = &right.node else {
+    let Expr::Dict(ast::ExprDict { keys, .. }) = &right else {
         return;
     };
-    if keys.iter().any(std::option::Option::is_none) {
+    if keys.iter().any(Option::is_none) {
         return; // contains **x splat
     }
 
     let missing: Vec<&str> = keys
         .iter()
         .filter_map(|k| match k {
-            Some(Expr {
-                node:
-                    ExprKind::Constant {
-                        value: Constant::Str(value),
-                        ..
-                    },
+            Some(Expr::Constant(ast::ExprConstant {
+                value: Constant::Str(value),
                 ..
-            }) => {
+            })) => {
                 if summary.keywords.contains(value) {
                     None
                 } else {
@@ -312,12 +607,13 @@ pub(crate) fn percent_format_extra_named_arguments(
     );
     if checker.patch(diagnostic.kind.rule()) {
         diagnostic.try_set_fix(|| {
-            remove_unused_format_arguments_from_dict(
+            let edit = remove_unused_format_arguments_from_dict(
                 &missing,
                 right,
                 checker.locator,
                 checker.stylist,
-            )
+            )?;
+            Ok(Fix::automatic(edit))
         });
     }
     checker.diagnostics.push(diagnostic);
@@ -334,18 +630,18 @@ pub(crate) fn percent_format_missing_arguments(
         return;
     }
 
-    if let ExprKind::Dict { keys, .. } = &right.node {
-        if keys.iter().any(std::option::Option::is_none) {
+    if let Expr::Dict(ast::ExprDict { keys, .. }) = &right {
+        if keys.iter().any(Option::is_none) {
             return; // contains **x splat
         }
 
         let mut keywords = FxHashSet::default();
         for key in keys.iter().flatten() {
-            match &key.node {
-                ExprKind::Constant {
+            match key {
+                Expr::Constant(ast::ExprConstant {
                     value: Constant::Str(value),
                     ..
-                } => {
+                }) => {
                     keywords.insert(value);
                 }
                 _ => {
@@ -396,11 +692,13 @@ pub(crate) fn percent_format_positional_count_mismatch(
         return;
     }
 
-    match &right.node {
-        ExprKind::List { elts, .. } | ExprKind::Tuple { elts, .. } | ExprKind::Set { elts, .. } => {
+    match right {
+        Expr::List(ast::ExprList { elts, .. })
+        | Expr::Tuple(ast::ExprTuple { elts, .. })
+        | Expr::Set(ast::ExprSet { elts, .. }) => {
             let mut found = 0;
             for elt in elts {
-                if let ExprKind::Starred { .. } = &elt.node {
+                if let Expr::Starred(_) = &elt {
                     return;
                 }
                 found += 1;
@@ -428,8 +726,8 @@ pub(crate) fn percent_format_star_requires_sequence(
     location: TextRange,
 ) {
     if summary.starred {
-        match &right.node {
-            ExprKind::Dict { .. } | ExprKind::DictComp { .. } => checker
+        match right {
+            Expr::Dict(_) | Expr::DictComp(_) => checker
                 .diagnostics
                 .push(Diagnostic::new(PercentFormatStarRequiresSequence, location)),
             _ => {}
@@ -449,13 +747,13 @@ pub(crate) fn string_dot_format_extra_named_arguments(
     }
 
     let keywords = keywords.iter().filter_map(|k| {
-        let KeywordData { arg, .. } = &k.node;
+        let Keyword { arg, .. } = &k;
         arg.as_ref()
     });
 
     let missing: Vec<&str> = keywords
         .filter_map(|arg| {
-            if summary.keywords.contains(arg) {
+            if summary.keywords.contains(arg.as_ref()) {
                 None
             } else {
                 Some(arg.as_str())
@@ -475,12 +773,13 @@ pub(crate) fn string_dot_format_extra_named_arguments(
     );
     if checker.patch(diagnostic.kind.rule()) {
         diagnostic.try_set_fix(|| {
-            remove_unused_keyword_arguments_from_format_call(
+            let edit = remove_unused_keyword_arguments_from_format_call(
                 &missing,
                 location,
                 checker.locator,
                 checker.stylist,
-            )
+            )?;
+            Ok(Fix::automatic(edit))
         });
     }
     checker.diagnostics.push(diagnostic);
@@ -497,7 +796,7 @@ pub(crate) fn string_dot_format_extra_positional_arguments(
         .iter()
         .enumerate()
         .filter(|(i, arg)| {
-            !(matches!(arg.node, ExprKind::Starred { .. })
+            !(matches!(arg, Expr::Starred(_))
                 || summary.autos.contains(i)
                 || summary.indices.contains(i))
         })
@@ -512,21 +811,48 @@ pub(crate) fn string_dot_format_extra_positional_arguments(
         StringDotFormatExtraPositionalArguments {
             missing: missing
                 .iter()
-                .map(std::string::ToString::to_string)
+                .map(ToString::to_string)
                 .collect::<Vec<String>>(),
         },
         location,
     );
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.try_set_fix(|| {
-            remove_unused_positional_arguments_from_format_call(
-                &missing,
-                location,
-                checker.locator,
-                checker.stylist,
-                &summary.format_string,
-            )
-        });
+        // We can only fix if the positional arguments we're removing don't require re-indexing
+        // the format string itself. For example, we can't fix `"{1}{2}".format(0, 1, 2)"`, since
+        // this requires changing the format string to `"{0}{1}"`. But we can fix
+        // `"{0}{1}".format(0, 1, 2)`, since this only requires modifying the call arguments.
+        fn is_contiguous_from_end<T>(indexes: &[usize], target: &[T]) -> bool {
+            if indexes.is_empty() {
+                return true;
+            }
+
+            let mut expected_index = target.len() - 1;
+            for &index in indexes.iter().rev() {
+                if index != expected_index {
+                    return false;
+                }
+
+                if expected_index == 0 {
+                    break;
+                }
+
+                expected_index -= 1;
+            }
+
+            true
+        }
+
+        if is_contiguous_from_end(&missing, args) {
+            diagnostic.try_set_fix(|| {
+                let edit = remove_unused_positional_arguments_from_format_call(
+                    &missing,
+                    location,
+                    checker.locator,
+                    checker.stylist,
+                )?;
+                Ok(Fix::automatic(edit))
+            });
+        }
     }
     checker.diagnostics.push(diagnostic);
 }
@@ -546,8 +872,8 @@ pub(crate) fn string_dot_format_missing_argument(
     let keywords: FxHashSet<_> = keywords
         .iter()
         .filter_map(|k| {
-            let KeywordData { arg, .. } = &k.node;
-            arg.as_ref()
+            let Keyword { arg, .. } = &k;
+            arg.as_ref().map(Identifier::as_str)
         })
         .collect();
 
@@ -561,7 +887,7 @@ pub(crate) fn string_dot_format_missing_argument(
             summary
                 .keywords
                 .iter()
-                .filter(|k| !keywords.contains(k))
+                .filter(|k| !keywords.contains(k.as_str()))
                 .cloned(),
         )
         .collect();
diff --git a/crates/ruff/src/rules/pyflakes/rules/undefined_export.rs b/crates/ruff/src/rules/pyflakes/rules/undefined_export.rs
index d5a4417d176ec..e4edea697da13 100644
--- a/crates/ruff/src/rules/pyflakes/rules/undefined_export.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/undefined_export.rs
@@ -1,11 +1,42 @@
+use ruff_text_size::TextRange;
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_semantic::scope::Scope;
-use ruff_text_size::TextRange;
 
+/// ## What it does
+/// Checks for undefined names in `__all__`.
+///
+/// ## Why is this bad?
+/// In Python, the `__all__` variable is used to define the names that are
+/// exported when a module is imported as a wildcard (e.g.,
+/// `from foo import *`). The names in `__all__` must be defined in the module,
+/// but are included as strings.
+///
+/// Including an undefined name in `__all__` is likely to raise `NameError` at
+/// runtime, when the module is imported.
+///
+/// ## Example
+/// ```python
+/// from foo import bar
+///
+///
+/// __all__ = ["bar", "baz"]  # undefined name `baz` in `__all__`
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from foo import bar, baz
+///
+///
+/// __all__ = ["bar", "baz"]
+/// ```
+///
+/// ## References
+/// - [Python documentation: `__all__`](https://docs.python.org/3/tutorial/modules.html#importing-from-a-package)
 #[violation]
 pub struct UndefinedExport {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for UndefinedExport {
@@ -17,18 +48,16 @@ impl Violation for UndefinedExport {
 }
 
 /// F822
-pub fn undefined_export(names: &[&str], range: TextRange, scope: &Scope) -> Vec<Diagnostic> {
+pub(crate) fn undefined_export(name: &str, range: TextRange, scope: &Scope) -> Vec<Diagnostic> {
     let mut diagnostics = Vec::new();
     if !scope.uses_star_imports() {
-        for name in names {
-            if !scope.defines(name) {
-                diagnostics.push(Diagnostic::new(
-                    UndefinedExport {
-                        name: (*name).to_string(),
-                    },
-                    range,
-                ));
-            }
+        if !scope.has(name) {
+            diagnostics.push(Diagnostic::new(
+                UndefinedExport {
+                    name: (*name).to_string(),
+                },
+                range,
+            ));
         }
     }
     diagnostics
diff --git a/crates/ruff/src/rules/pyflakes/rules/undefined_local.rs b/crates/ruff/src/rules/pyflakes/rules/undefined_local.rs
index d489c83ed5381..20c8fdef62d78 100644
--- a/crates/ruff/src/rules/pyflakes/rules/undefined_local.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/undefined_local.rs
@@ -5,9 +5,34 @@ use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
 
+/// ## What it does
+/// Checks for undefined local variables.
+///
+/// ## Why is this bad?
+/// Referencing a local variable before it has been assigned will raise
+/// an `UnboundLocalError` at runtime.
+///
+/// ## Example
+/// ```python
+/// x = 1
+///
+///
+/// def foo():
+///     x += 1
+/// ```
+///
+/// Use instead:
+/// ```python
+/// x = 1
+///
+///
+/// def foo():
+///     global x
+///     x += 1
+/// ```
 #[violation]
 pub struct UndefinedLocal {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for UndefinedLocal {
@@ -19,10 +44,10 @@ impl Violation for UndefinedLocal {
 }
 
 /// F823
-pub fn undefined_local(checker: &mut Checker, name: &str) {
+pub(crate) fn undefined_local(checker: &mut Checker, name: &str) {
     // If the name hasn't already been defined in the current scope...
-    let current = checker.ctx.scope();
-    if !current.kind.is_function() || current.defines(name) {
+    let current = checker.semantic_model().scope();
+    if !current.kind.is_any_function() || current.has(name) {
         return;
     }
 
@@ -31,26 +56,46 @@ pub fn undefined_local(checker: &mut Checker, name: &str) {
     };
 
     // For every function and module scope above us...
-    for scope in checker.ctx.scopes.ancestors(parent) {
-        if !(scope.kind.is_function() || scope.kind.is_module()) {
-            continue;
-        }
-
-        // If the name was defined in that scope...
-        if let Some(binding) = scope.get(name).map(|index| &checker.ctx.bindings[*index]) {
-            // And has already been accessed in the current scope...
-            if let Some((scope_id, location)) = binding.runtime_usage {
-                if scope_id == checker.ctx.scope_id {
+    let local_access = checker
+        .semantic_model()
+        .scopes
+        .ancestors(parent)
+        .find_map(|scope| {
+            if !(scope.kind.is_any_function() || scope.kind.is_module()) {
+                return None;
+            }
+
+            // If the name was defined in that scope...
+            if let Some(binding) = scope
+                .get(name)
+                .map(|binding_id| &checker.semantic_model().bindings[binding_id])
+            {
+                // And has already been accessed in the current scope...
+                if let Some(range) = binding.references().find_map(|reference_id| {
+                    let reference = checker.semantic_model().references.resolve(reference_id);
+                    if checker
+                        .semantic_model()
+                        .is_current_scope(reference.scope_id())
+                    {
+                        Some(reference.range())
+                    } else {
+                        None
+                    }
+                }) {
                     // Then it's probably an error.
-                    checker.diagnostics.push(Diagnostic::new(
-                        UndefinedLocal {
-                            name: name.to_string(),
-                        },
-                        location,
-                    ));
-                    return;
+                    return Some(range);
                 }
             }
-        }
+
+            None
+        });
+
+    if let Some(location) = local_access {
+        checker.diagnostics.push(Diagnostic::new(
+            UndefinedLocal {
+                name: name.to_string(),
+            },
+            location,
+        ));
     }
 }
diff --git a/crates/ruff/src/rules/pyflakes/rules/undefined_name.rs b/crates/ruff/src/rules/pyflakes/rules/undefined_name.rs
index b3b94a9928445..a4619cd6180e5 100644
--- a/crates/ruff/src/rules/pyflakes/rules/undefined_name.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/undefined_name.rs
@@ -1,9 +1,29 @@
 use ruff_diagnostics::Violation;
 use ruff_macros::{derive_message_formats, violation};
 
+/// ## What it does
+/// Checks for uses of undefined names.
+///
+/// ## Why is this bad?
+/// An undefined name is likely to raise `NameError` at runtime.
+///
+/// ## Example
+/// ```python
+/// def double():
+///     return n * 2  # raises `NameError` if `n` is undefined when `double` is called
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def double(n):
+///     return n * 2
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/executionmodel.html#naming-and-binding)
 #[violation]
 pub struct UndefinedName {
-    pub name: String,
+    pub(crate) name: String,
 }
 
 impl Violation for UndefinedName {
diff --git a/crates/ruff/src/rules/pyflakes/rules/unused_annotation.rs b/crates/ruff/src/rules/pyflakes/rules/unused_annotation.rs
index 65f60ed927a72..44e96c53f6e44 100644
--- a/crates/ruff/src/rules/pyflakes/rules/unused_annotation.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/unused_annotation.rs
@@ -4,9 +4,24 @@ use ruff_python_semantic::scope::ScopeId;
 
 use crate::checkers::ast::Checker;
 
+/// ## What it does
+/// Checks for local variables that are annotated but never used.
+///
+/// ## Why is this bad?
+/// Annotations are used to provide type hints to static type checkers. If a
+/// variable is annotated but never used, the annotation is unnecessary.
+///
+/// ## Example
+/// ```python
+/// def foo():
+///     bar: int
+/// ```
+///
+/// ## References
+/// - [PEP 484](https://peps.python.org/pep-0484/)
 #[violation]
 pub struct UnusedAnnotation {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for UnusedAnnotation {
@@ -18,22 +33,27 @@ impl Violation for UnusedAnnotation {
 }
 
 /// F842
-pub fn unused_annotation(checker: &mut Checker, scope: ScopeId) {
-    let scope = &checker.ctx.scopes[scope];
-    for (name, binding) in scope
+pub(crate) fn unused_annotation(checker: &mut Checker, scope: ScopeId) {
+    let scope = &checker.semantic_model().scopes[scope];
+
+    let bindings: Vec<_> = scope
         .bindings()
-        .map(|(name, index)| (name, &checker.ctx.bindings[*index]))
-    {
-        if !binding.used()
-            && binding.kind.is_annotation()
-            && !checker.settings.dummy_variable_rgx.is_match(name)
-        {
-            checker.diagnostics.push(Diagnostic::new(
-                UnusedAnnotation {
-                    name: (*name).to_string(),
-                },
-                binding.range,
-            ));
-        }
+        .filter_map(|(name, binding_id)| {
+            let binding = &checker.semantic_model().bindings[binding_id];
+            if binding.kind.is_annotation()
+                && !binding.is_used()
+                && !checker.settings.dummy_variable_rgx.is_match(name)
+            {
+                Some((name.to_string(), binding.range))
+            } else {
+                None
+            }
+        })
+        .collect();
+
+    for (name, range) in bindings {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(UnusedAnnotation { name }, range));
     }
 }
diff --git a/crates/ruff/src/rules/pyflakes/rules/unused_import.rs b/crates/ruff/src/rules/pyflakes/rules/unused_import.rs
new file mode 100644
index 0000000000000..36b02cb5c01f7
--- /dev/null
+++ b/crates/ruff/src/rules/pyflakes/rules/unused_import.rs
@@ -0,0 +1,240 @@
+use anyhow::Result;
+use ruff_text_size::TextRange;
+use rustc_hash::FxHashMap;
+
+use ruff_diagnostics::{AutofixKind, Diagnostic, Fix, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_semantic::binding::Exceptions;
+use ruff_python_semantic::node::NodeId;
+use ruff_python_semantic::scope::Scope;
+
+use crate::autofix;
+use crate::checkers::ast::Checker;
+use crate::registry::Rule;
+
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
+enum UnusedImportContext {
+    ExceptHandler,
+    Init,
+}
+
+/// ## What it does
+/// Checks for unused imports.
+///
+/// ## Why is this bad?
+/// Unused imports add a performance overhead at runtime, and risk creating
+/// import cycles. They also increase the cognitive load of reading the code.
+///
+/// If an import statement is used to check for the availability or existence
+/// of a module, consider using `importlib.util.find_spec` instead.
+///
+/// ## Options
+///
+/// - `pyflakes.extend-generics`
+///
+/// ## Example
+/// ```python
+/// import numpy as np  # unused import
+///
+///
+/// def area(radius):
+///     return 3.14 * radius**2
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def area(radius):
+///     return 3.14 * radius**2
+/// ```
+///
+/// To check the availability of a module, use `importlib.util.find_spec`:
+/// ```python
+/// from importlib.util import find_spec
+///
+/// if find_spec("numpy") is not None:
+///     print("numpy is installed")
+/// else:
+///     print("numpy is not installed")
+/// ```
+///
+/// ## References
+/// - [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)
+/// - [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)
+#[violation]
+pub struct UnusedImport {
+    name: String,
+    context: Option<UnusedImportContext>,
+    multiple: bool,
+}
+
+impl Violation for UnusedImport {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let UnusedImport { name, context, .. } = self;
+        match context {
+            Some(UnusedImportContext::ExceptHandler) => {
+                format!(
+                    "`{name}` imported but unused; consider using `importlib.util.find_spec` to test for availability"
+                )
+            }
+            Some(UnusedImportContext::Init) => {
+                format!(
+                    "`{name}` imported but unused; consider adding to `__all__` or using a redundant alias"
+                )
+            }
+            None => format!("`{name}` imported but unused"),
+        }
+    }
+
+    fn autofix_title(&self) -> Option<String> {
+        let UnusedImport { name, multiple, .. } = self;
+        Some(if *multiple {
+            "Remove unused import".to_string()
+        } else {
+            format!("Remove unused import: `{name}`")
+        })
+    }
+}
+
+pub(crate) fn unused_import(checker: &Checker, scope: &Scope, diagnostics: &mut Vec<Diagnostic>) {
+    // Collect all unused imports by statement.
+    let mut unused: FxHashMap<(NodeId, Exceptions), Vec<Import>> = FxHashMap::default();
+    let mut ignored: FxHashMap<(NodeId, Exceptions), Vec<Import>> = FxHashMap::default();
+
+    for binding_id in scope.binding_ids() {
+        let binding = &checker.semantic_model().bindings[binding_id];
+
+        if binding.is_used() || binding.is_explicit_export() {
+            continue;
+        }
+
+        let Some(qualified_name) = binding.qualified_name() else {
+            continue;
+        };
+
+        let Some(stmt_id) = binding.source else {
+            continue;
+        };
+
+        let import = Import {
+            qualified_name,
+            trimmed_range: binding.trimmed_range(checker.semantic_model(), checker.locator),
+            parent_range: binding.parent_range(checker.semantic_model()),
+        };
+
+        if checker.rule_is_ignored(Rule::UnusedImport, import.trimmed_range.start())
+            || import.parent_range.map_or(false, |parent_range| {
+                checker.rule_is_ignored(Rule::UnusedImport, parent_range.start())
+            })
+        {
+            ignored
+                .entry((stmt_id, binding.exceptions))
+                .or_default()
+                .push(import);
+        } else {
+            unused
+                .entry((stmt_id, binding.exceptions))
+                .or_default()
+                .push(import);
+        }
+    }
+
+    let in_init =
+        checker.settings.ignore_init_module_imports && checker.path().ends_with("__init__.py");
+
+    // Generate a diagnostic for every import, but share a fix across all imports within the same
+    // statement (excluding those that are ignored).
+    for ((stmt_id, exceptions), imports) in unused {
+        let in_except_handler =
+            exceptions.intersects(Exceptions::MODULE_NOT_FOUND_ERROR | Exceptions::IMPORT_ERROR);
+        let multiple = imports.len() > 1;
+
+        let fix = if !in_init && !in_except_handler && checker.patch(Rule::UnusedImport) {
+            fix_imports(checker, stmt_id, &imports).ok()
+        } else {
+            None
+        };
+
+        for Import {
+            qualified_name,
+            trimmed_range,
+            parent_range,
+        } in imports
+        {
+            let mut diagnostic = Diagnostic::new(
+                UnusedImport {
+                    name: qualified_name.to_string(),
+                    context: if in_except_handler {
+                        Some(UnusedImportContext::ExceptHandler)
+                    } else if in_init {
+                        Some(UnusedImportContext::Init)
+                    } else {
+                        None
+                    },
+                    multiple,
+                },
+                trimmed_range,
+            );
+            if let Some(range) = parent_range {
+                diagnostic.set_parent(range.start());
+            }
+            if !in_except_handler {
+                if let Some(fix) = fix.as_ref() {
+                    diagnostic.set_fix(fix.clone());
+                }
+            }
+            diagnostics.push(diagnostic);
+        }
+    }
+
+    // Separately, generate a diagnostic for every _ignored_ import, to ensure that the
+    // suppression comments aren't marked as unused.
+    for Import {
+        qualified_name,
+        trimmed_range,
+        parent_range,
+    } in ignored.into_values().flatten()
+    {
+        let mut diagnostic = Diagnostic::new(
+            UnusedImport {
+                name: qualified_name.to_string(),
+                context: None,
+                multiple: false,
+            },
+            trimmed_range,
+        );
+        if let Some(range) = parent_range {
+            diagnostic.set_parent(range.start());
+        }
+        diagnostics.push(diagnostic);
+    }
+}
+
+/// An unused import with its surrounding context.
+struct Import<'a> {
+    /// The qualified name of the import (e.g., `typing.List` for `from typing import List`).
+    qualified_name: &'a str,
+    /// The trimmed range of the import (e.g., `List` in `from typing import List`).
+    trimmed_range: TextRange,
+    /// The range of the import's parent statement.
+    parent_range: Option<TextRange>,
+}
+
+/// Generate a [`Fix`] to remove unused imports from a statement.
+fn fix_imports(checker: &Checker, stmt_id: NodeId, imports: &[Import]) -> Result<Fix> {
+    let stmt = checker.semantic_model().stmts[stmt_id];
+    let parent = checker.semantic_model().stmts.parent(stmt);
+    let edit = autofix::edits::remove_unused_imports(
+        imports
+            .iter()
+            .map(|Import { qualified_name, .. }| *qualified_name),
+        stmt,
+        parent,
+        checker.locator,
+        checker.indexer,
+        checker.stylist,
+    )?;
+    Ok(Fix::automatic(edit).isolate(checker.isolation(parent)))
+}
diff --git a/crates/ruff/src/rules/pyflakes/rules/unused_variable.rs b/crates/ruff/src/rules/pyflakes/rules/unused_variable.rs
index d7da2e2b69295..fb6932ca3f548 100644
--- a/crates/ruff/src/rules/pyflakes/rules/unused_variable.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/unused_variable.rs
@@ -1,17 +1,15 @@
 use itertools::Itertools;
-use log::error;
-use ruff_text_size::TextRange;
-use rustpython_parser::ast::{ExprKind, Located, Stmt, StmtKind};
+use ruff_text_size::{TextRange, TextSize};
+use rustpython_parser::ast::{self, Ranged, Stmt};
 use rustpython_parser::{lexer, Mode, Tok};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::contains_effect;
 use ruff_python_ast::source_code::Locator;
-use ruff_python_ast::types::RefEquality;
-use ruff_python_semantic::scope::{ScopeId, ScopeKind};
+use ruff_python_semantic::scope::ScopeId;
 
-use crate::autofix::actions::delete_stmt;
+use crate::autofix::edits::delete_stmt;
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 
@@ -48,260 +46,235 @@ pub struct UnusedVariable {
     pub name: String,
 }
 
-impl AlwaysAutofixableViolation for UnusedVariable {
+impl Violation for UnusedVariable {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         let UnusedVariable { name } = self;
         format!("Local variable `{name}` is assigned to but never used")
     }
 
-    fn autofix_title(&self) -> String {
+    fn autofix_title(&self) -> Option<String> {
         let UnusedVariable { name } = self;
-        format!("Remove assignment to unused variable `{name}`")
+        Some(format!("Remove assignment to unused variable `{name}`"))
+    }
+}
+
+/// Return the [`TextRange`] of the token before the next match of the predicate
+fn match_token_before<F>(location: TextSize, locator: &Locator, f: F) -> Option<TextRange>
+where
+    F: Fn(Tok) -> bool,
+{
+    let contents = locator.after(location);
+    for ((_, range), (tok, _)) in lexer::lex_starts_at(contents, Mode::Module, location)
+        .flatten()
+        .tuple_windows()
+    {
+        if f(tok) {
+            return Some(range);
+        }
     }
+    None
 }
 
-/// Return the [`TextRange`] of the token after the next match of
-/// the predicate, skipping over any bracketed expressions.
-fn match_token_after<F, T>(located: &Located<T>, locator: &Locator, f: F) -> TextRange
+/// Return the [`TextRange`] of the token after the next match of the predicate, skipping over
+/// any bracketed expressions.
+fn match_token_after<F>(location: TextSize, locator: &Locator, f: F) -> Option<TextRange>
 where
     F: Fn(Tok) -> bool,
 {
-    let contents = locator.after(located.start());
+    let contents = locator.after(location);
 
     // Track the bracket depth.
-    let mut par_count = 0;
-    let mut sqb_count = 0;
-    let mut brace_count = 0;
+    let mut par_count = 0u32;
+    let mut sqb_count = 0u32;
+    let mut brace_count = 0u32;
 
-    for ((tok, _), (_, range)) in lexer::lex_located(contents, Mode::Module, located.start())
+    for ((tok, _), (_, range)) in lexer::lex_starts_at(contents, Mode::Module, location)
         .flatten()
         .tuple_windows()
     {
         match tok {
             Tok::Lpar => {
-                par_count += 1;
+                par_count = par_count.saturating_add(1);
             }
             Tok::Lsqb => {
-                sqb_count += 1;
+                sqb_count = sqb_count.saturating_add(1);
             }
             Tok::Lbrace => {
-                brace_count += 1;
+                brace_count = brace_count.saturating_add(1);
             }
             Tok::Rpar => {
-                par_count -= 1;
-                // If this is a closing bracket, continue.
-                if par_count == 0 {
-                    continue;
-                }
+                par_count = par_count.saturating_sub(1);
             }
             Tok::Rsqb => {
-                sqb_count -= 1;
-                // If this is a closing bracket, continue.
-                if sqb_count == 0 {
-                    continue;
-                }
+                sqb_count = sqb_count.saturating_sub(1);
             }
             Tok::Rbrace => {
-                brace_count -= 1;
-                // If this is a closing bracket, continue.
-                if brace_count == 0 {
-                    continue;
-                }
+                brace_count = brace_count.saturating_sub(1);
             }
             _ => {}
         }
+
         // If we're in nested brackets, continue.
         if par_count > 0 || sqb_count > 0 || brace_count > 0 {
             continue;
         }
 
         if f(tok) {
-            return range;
+            return Some(range);
         }
     }
-    unreachable!("No token after matched");
+    None
 }
 
-/// Return the [`TextRange`] of the token matching the predicate,
-/// skipping over any bracketed expressions.
-fn match_token<F, T>(located: &Located<T>, locator: &Locator, f: F) -> TextRange
+/// Return the [`TextRange`] of the token matching the predicate or the first mismatched
+/// bracket, skipping over any bracketed expressions.
+fn match_token_or_closing_brace<F>(location: TextSize, locator: &Locator, f: F) -> Option<TextRange>
 where
     F: Fn(Tok) -> bool,
 {
-    let contents = locator.after(located.start());
+    let contents = locator.after(location);
 
     // Track the bracket depth.
-    let mut par_count = 0;
-    let mut sqb_count = 0;
-    let mut brace_count = 0;
+    let mut par_count = 0u32;
+    let mut sqb_count = 0u32;
+    let mut brace_count = 0u32;
 
-    for (tok, range) in lexer::lex_located(contents, Mode::Module, located.start()).flatten() {
+    for (tok, range) in lexer::lex_starts_at(contents, Mode::Module, location).flatten() {
         match tok {
             Tok::Lpar => {
-                par_count += 1;
+                par_count = par_count.saturating_add(1);
             }
             Tok::Lsqb => {
-                sqb_count += 1;
+                sqb_count = sqb_count.saturating_add(1);
             }
             Tok::Lbrace => {
-                brace_count += 1;
+                brace_count = brace_count.saturating_add(1);
             }
             Tok::Rpar => {
-                par_count -= 1;
-                // If this is a closing bracket, continue.
                 if par_count == 0 {
-                    continue;
+                    return Some(range);
                 }
+                par_count = par_count.saturating_sub(1);
             }
             Tok::Rsqb => {
-                sqb_count -= 1;
-                // If this is a closing bracket, continue.
                 if sqb_count == 0 {
-                    continue;
+                    return Some(range);
                 }
+                sqb_count = sqb_count.saturating_sub(1);
             }
             Tok::Rbrace => {
-                brace_count -= 1;
-                // If this is a closing bracket, continue.
                 if brace_count == 0 {
-                    continue;
+                    return Some(range);
                 }
+                brace_count = brace_count.saturating_sub(1);
             }
             _ => {}
         }
+
         // If we're in nested brackets, continue.
         if par_count > 0 || sqb_count > 0 || brace_count > 0 {
             continue;
         }
 
         if f(tok) {
-            return range;
+            return Some(range);
         }
     }
-    unreachable!("No token after matched");
-}
-
-#[derive(Copy, Clone)]
-enum DeletionKind {
-    Whole,
-    Partial,
+    None
 }
 
 /// Generate a [`Edit`] to remove an unused variable assignment, given the
 /// enclosing [`Stmt`] and the [`TextRange`] of the variable binding.
 fn remove_unused_variable(
     stmt: &Stmt,
+    parent: Option<&Stmt>,
     range: TextRange,
     checker: &Checker,
-) -> Option<(DeletionKind, Edit)> {
+) -> Option<Fix> {
     // First case: simple assignment (`x = 1`)
-    if let StmtKind::Assign { targets, value, .. } = &stmt.node {
+    if let Stmt::Assign(ast::StmtAssign { targets, value, .. }) = stmt {
         if let Some(target) = targets.iter().find(|target| range == target.range()) {
-            if matches!(target.node, ExprKind::Name { .. }) {
+            if target.is_name_expr() {
                 return if targets.len() > 1
-                    || contains_effect(value, |id| checker.ctx.is_builtin(id))
+                    || contains_effect(value, |id| checker.semantic_model().is_builtin(id))
                 {
                     // If the expression is complex (`x = foo()`), remove the assignment,
                     // but preserve the right-hand side.
-                    Some((
-                        DeletionKind::Partial,
-                        Edit::deletion(
-                            target.start(),
-                            match_token_after(target, checker.locator, |tok| tok == Tok::Equal)
-                                .start(),
-                        ),
-                    ))
+                    let start = target.start();
+                    let end =
+                        match_token_after(start, checker.locator, |tok| tok == Tok::Equal)?.start();
+                    let edit = Edit::deletion(start, end);
+                    Some(Fix::suggested(edit))
                 } else {
                     // If (e.g.) assigning to a constant (`x = 1`), delete the entire statement.
-                    let parent = checker
-                        .ctx
-                        .child_to_parent
-                        .get(&RefEquality(stmt))
-                        .map(Into::into);
-                    let deleted: Vec<&Stmt> = checker.deletions.iter().map(Into::into).collect();
-                    match delete_stmt(
+                    let edit = delete_stmt(
                         stmt,
                         parent,
-                        &deleted,
                         checker.locator,
                         checker.indexer,
                         checker.stylist,
-                    ) {
-                        Ok(fix) => Some((DeletionKind::Whole, fix)),
-                        Err(err) => {
-                            error!("Failed to delete unused variable: {}", err);
-                            None
-                        }
-                    }
+                    );
+                    Some(Fix::suggested(edit).isolate(checker.isolation(parent)))
                 };
             }
         }
     }
 
     // Second case: simple annotated assignment (`x: int = 1`)
-    if let StmtKind::AnnAssign {
+    if let Stmt::AnnAssign(ast::StmtAnnAssign {
         target,
         value: Some(value),
         ..
-    } = &stmt.node
+    }) = stmt
     {
-        if matches!(target.node, ExprKind::Name { .. }) {
-            return if contains_effect(value, |id| checker.ctx.is_builtin(id)) {
+        if target.is_name_expr() {
+            return if contains_effect(value, |id| checker.semantic_model().is_builtin(id)) {
                 // If the expression is complex (`x = foo()`), remove the assignment,
                 // but preserve the right-hand side.
-                Some((
-                    DeletionKind::Partial,
-                    Edit::deletion(
-                        stmt.start(),
-                        match_token_after(stmt, checker.locator, |tok| tok == Tok::Equal).start(),
-                    ),
-                ))
+                let start = stmt.start();
+                let end =
+                    match_token_after(start, checker.locator, |tok| tok == Tok::Equal)?.start();
+                let edit = Edit::deletion(start, end);
+                Some(Fix::suggested(edit))
             } else {
-                // If assigning to a constant (`x = 1`), delete the entire statement.
-                let parent = checker
-                    .ctx
-                    .child_to_parent
-                    .get(&RefEquality(stmt))
-                    .map(Into::into);
-                let deleted: Vec<&Stmt> = checker.deletions.iter().map(Into::into).collect();
-                match delete_stmt(
+                // If (e.g.) assigning to a constant (`x = 1`), delete the entire statement.
+                let edit = delete_stmt(
                     stmt,
                     parent,
-                    &deleted,
                     checker.locator,
                     checker.indexer,
                     checker.stylist,
-                ) {
-                    Ok(fix) => Some((DeletionKind::Whole, fix)),
-                    Err(err) => {
-                        error!("Failed to delete unused variable: {}", err);
-                        None
-                    }
-                }
+                );
+                Some(Fix::suggested(edit).isolate(checker.isolation(parent)))
             };
         }
     }
 
     // Third case: withitem (`with foo() as x:`)
-    if let StmtKind::With { items, .. } = &stmt.node {
+    if let Stmt::With(ast::StmtWith { items, .. }) = stmt {
         // Find the binding that matches the given `Range`.
         // TODO(charlie): Store the `Withitem` in the `Binding`.
         for item in items {
             if let Some(optional_vars) = &item.optional_vars {
                 if optional_vars.range() == range {
-                    return Some((
-                        DeletionKind::Partial,
-                        Edit::deletion(
-                            item.context_expr.end(),
-                            // The end of the `Withitem` is the colon, comma, or closing
-                            // parenthesis following the `optional_vars`.
-                            match_token(&item.context_expr, checker.locator, |tok| {
-                                tok == Tok::Colon || tok == Tok::Comma || tok == Tok::Rpar
-                            })
-                            .start(),
-                        ),
-                    ));
+                    // Find the first token before the `as` keyword.
+                    let start =
+                        match_token_before(item.context_expr.start(), checker.locator, |tok| {
+                            tok == Tok::As
+                        })?
+                        .end();
+
+                    // Find the first colon, comma, or closing bracket after the `as` keyword.
+                    let end = match_token_or_closing_brace(start, checker.locator, |tok| {
+                        tok == Tok::Colon || tok == Tok::Comma
+                    })?
+                    .start();
+
+                    let edit = Edit::deletion(start, end);
+                    return Some(Fix::suggested(edit));
                 }
             }
         }
@@ -311,42 +284,42 @@ fn remove_unused_variable(
 }
 
 /// F841
-pub fn unused_variable(checker: &mut Checker, scope: ScopeId) {
-    let scope = &checker.ctx.scopes[scope];
-    if scope.uses_locals && matches!(scope.kind, ScopeKind::Function(..)) {
+pub(crate) fn unused_variable(checker: &mut Checker, scope: ScopeId) {
+    let scope = &checker.semantic_model().scopes[scope];
+    if scope.uses_locals() && scope.kind.is_any_function() {
         return;
     }
 
-    for (name, binding) in scope
+    let bindings: Vec<_> = scope
         .bindings()
-        .map(|(name, index)| (name, &checker.ctx.bindings[*index]))
-    {
-        if !binding.used()
-            && (binding.kind.is_assignment() || binding.kind.is_named_expr_assignment())
-            && !checker.settings.dummy_variable_rgx.is_match(name)
-            && name != &"__tracebackhide__"
-            && name != &"__traceback_info__"
-            && name != &"__traceback_supplement__"
-            && name != &"__debuggerskip__"
-        {
-            let mut diagnostic = Diagnostic::new(
-                UnusedVariable {
-                    name: (*name).to_string(),
-                },
-                binding.range,
-            );
-            if checker.patch(diagnostic.kind.rule()) {
-                if let Some(stmt) = binding.source.as_ref().map(Into::into) {
-                    if let Some((kind, fix)) = remove_unused_variable(stmt, binding.range, checker)
-                    {
-                        if matches!(kind, DeletionKind::Whole) {
-                            checker.deletions.insert(RefEquality(stmt));
-                        }
-                        diagnostic.set_fix(fix);
-                    }
+        .map(|(name, binding_id)| (name, &checker.semantic_model().bindings[binding_id]))
+        .filter_map(|(name, binding)| {
+            if (binding.kind.is_assignment() || binding.kind.is_named_expr_assignment())
+                && !binding.is_used()
+                && !checker.settings.dummy_variable_rgx.is_match(name)
+                && name != "__tracebackhide__"
+                && name != "__traceback_info__"
+                && name != "__traceback_supplement__"
+                && name != "__debuggerskip__"
+            {
+                return Some((name.to_string(), binding.range, binding.source));
+            }
+
+            None
+        })
+        .collect();
+
+    for (name, range, source) in bindings {
+        let mut diagnostic = Diagnostic::new(UnusedVariable { name }, range);
+        if checker.patch(diagnostic.kind.rule()) {
+            if let Some(source) = source {
+                let stmt = checker.semantic_model().stmts[source];
+                let parent = checker.semantic_model().stmts.parent(stmt);
+                if let Some(fix) = remove_unused_variable(stmt, parent, range, checker) {
+                    diagnostic.set_fix(fix);
                 }
             }
-            checker.diagnostics.push(diagnostic);
         }
+        checker.diagnostics.push(diagnostic);
     }
 }
diff --git a/crates/ruff/src/rules/pyflakes/rules/yield_outside_function.rs b/crates/ruff/src/rules/pyflakes/rules/yield_outside_function.rs
index e2573faa8552b..baa6cc3b93004 100644
--- a/crates/ruff/src/rules/pyflakes/rules/yield_outside_function.rs
+++ b/crates/ruff/src/rules/pyflakes/rules/yield_outside_function.rs
@@ -1,6 +1,6 @@
 use std::fmt;
 
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -9,7 +9,7 @@ use ruff_python_semantic::scope::ScopeKind;
 use crate::checkers::ast::Checker;
 
 #[derive(Debug, PartialEq, Eq)]
-pub enum DeferralKeyword {
+pub(crate) enum DeferralKeyword {
     Yield,
     YieldFrom,
     Await,
@@ -25,9 +25,24 @@ impl fmt::Display for DeferralKeyword {
     }
 }
 
+/// ## What it does
+/// Checks for `yield` and `yield from` statements outside of functions.
+///
+/// ## Why is this bad?
+/// The use of a `yield` or `yield from` statement outside of a function will
+/// raise a `SyntaxError`.
+///
+/// ## Example
+/// ```python
+/// class Foo:
+///     yield 1
+/// ```
+///
+/// ## References
+/// - [Python documentation: `yield`](https://docs.python.org/3/reference/simple_stmts.html#the-yield-statement)
 #[violation]
 pub struct YieldOutsideFunction {
-    pub keyword: DeferralKeyword,
+    keyword: DeferralKeyword,
 }
 
 impl Violation for YieldOutsideFunction {
@@ -38,16 +53,16 @@ impl Violation for YieldOutsideFunction {
     }
 }
 
-pub fn yield_outside_function(checker: &mut Checker, expr: &Expr) {
+pub(crate) fn yield_outside_function(checker: &mut Checker, expr: &Expr) {
     if matches!(
-        checker.ctx.scope().kind,
+        checker.semantic_model().scope().kind,
         ScopeKind::Class(_) | ScopeKind::Module
     ) {
-        let keyword = match expr.node {
-            ExprKind::Yield { .. } => DeferralKeyword::Yield,
-            ExprKind::YieldFrom { .. } => DeferralKeyword::YieldFrom,
-            ExprKind::Await { .. } => DeferralKeyword::Await,
-            _ => panic!("Expected ExprKind::Yield | ExprKind::YieldFrom | ExprKind::Await"),
+        let keyword = match expr {
+            Expr::Yield(_) => DeferralKeyword::Yield,
+            Expr::YieldFrom(_) => DeferralKeyword::YieldFrom,
+            Expr::Await(_) => DeferralKeyword::Await,
+            _ => panic!("Expected Expr::Yield | Expr::YieldFrom | Expr::Await"),
         };
         checker.diagnostics.push(Diagnostic::new(
             YieldOutsideFunction { keyword },
diff --git a/crates/ruff/src/rules/pyflakes/settings.rs b/crates/ruff/src/rules/pyflakes/settings.rs
new file mode 100644
index 0000000000000..edf6150b1c3cb
--- /dev/null
+++ b/crates/ruff/src/rules/pyflakes/settings.rs
@@ -0,0 +1,47 @@
+//! Settings for the `Pyflakes` plugin.
+
+use serde::{Deserialize, Serialize};
+
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
+
+#[derive(
+    Debug, PartialEq, Eq, Default, Serialize, Deserialize, ConfigurationOptions, CombineOptions,
+)]
+#[serde(
+    deny_unknown_fields,
+    rename_all = "kebab-case",
+    rename = "PyflakesOptions"
+)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+pub struct Options {
+    #[option(
+        default = r#"[]"#,
+        value_type = "list[str]",
+        example = "extend-generics = [\"django.db.models.ForeignKey\"]"
+    )]
+    /// Additional functions or classes to consider generic, such that any
+    /// subscripts should be treated as type annotation (e.g., `ForeignKey` in
+    /// `django.db.models.ForeignKey["User"]`.
+    pub extend_generics: Option<Vec<String>>,
+}
+
+#[derive(Debug, Default, CacheKey)]
+pub struct Settings {
+    pub extend_generics: Vec<String>,
+}
+
+impl From<Options> for Settings {
+    fn from(options: Options) -> Self {
+        Self {
+            extend_generics: options.extend_generics.unwrap_or_default(),
+        }
+    }
+}
+
+impl From<Settings> for Options {
+    fn from(settings: Settings) -> Self {
+        Self {
+            extend_generics: Some(settings.extend_generics),
+        }
+    }
+}
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_0.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_0.py.snap
index 82184448a2467..7b16517674429 100644
--- a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_0.py.snap
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_0.py.snap
@@ -11,7 +11,7 @@ F401_0.py:2:8: F401 [*] `functools` imported but unused
   |
   = help: Remove unused import: `functools`
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | from __future__ import all_feature_names
 2   |-import functools, os
   2 |+import os
@@ -30,7 +30,7 @@ F401_0.py:6:5: F401 [*] `collections.OrderedDict` imported but unused
    |
    = help: Remove unused import: `collections.OrderedDict`
 
-ℹ Suggested fix
+ℹ Fix
 3 3 | from datetime import datetime
 4 4 | from collections import (
 5 5 |     Counter,
@@ -50,7 +50,7 @@ F401_0.py:12:8: F401 [*] `logging.handlers` imported but unused
    |
    = help: Remove unused import: `logging.handlers`
 
-ℹ Suggested fix
+ℹ Fix
 9  9  | import multiprocessing.pool
 10 10 | import multiprocessing.process
 11 11 | import logging.config
@@ -68,7 +68,7 @@ F401_0.py:32:12: F401 [*] `shelve` imported but unused
    |
    = help: Remove unused import: `shelve`
 
-ℹ Suggested fix
+ℹ Fix
 29 29 |     from models import Fruit, Nut, Vegetable
 30 30 | 
 31 31 | if TYPE_CHECKING:
@@ -88,15 +88,14 @@ F401_0.py:33:12: F401 [*] `importlib` imported but unused
    |
    = help: Remove unused import: `importlib`
 
-ℹ Suggested fix
+ℹ Fix
 30 30 | 
 31 31 | if TYPE_CHECKING:
 32 32 |     import shelve
 33    |-    import importlib
-   33 |+    pass
-34 34 | 
-35 35 | if TYPE_CHECKING:
-36 36 |     """Hello, world!"""
+34 33 | 
+35 34 | if TYPE_CHECKING:
+36 35 |     """Hello, world!"""
 
 F401_0.py:37:12: F401 [*] `pathlib` imported but unused
    |
@@ -109,7 +108,7 @@ F401_0.py:37:12: F401 [*] `pathlib` imported but unused
    |
    = help: Remove unused import: `pathlib`
 
-ℹ Suggested fix
+ℹ Fix
 34 34 | 
 35 35 | if TYPE_CHECKING:
 36 36 |     """Hello, world!"""
@@ -126,7 +125,7 @@ F401_0.py:52:16: F401 [*] `pickle` imported but unused
    |
    = help: Remove unused import: `pickle`
 
-ℹ Suggested fix
+ℹ Fix
 49 49 |         z = multiprocessing.pool.ThreadPool()
 50 50 | 
 51 51 |     def b(self) -> None:
@@ -146,7 +145,7 @@ F401_0.py:93:16: F401 [*] `x` imported but unused
    |
    = help: Remove unused import: `x`
 
-ℹ Suggested fix
+ℹ Fix
 90 90 | # Test: match statements.
 91 91 | match *0, 1, *2:
 92 92 |     case 0,:
@@ -162,11 +161,10 @@ F401_0.py:94:16: F401 [*] `y` imported but unused
    |
    = help: Remove unused import: `y`
 
-ℹ Suggested fix
+ℹ Fix
 91 91 | match *0, 1, *2:
 92 92 |     case 0,:
 93 93 |         import x
 94    |-        import y
-   94 |+        pass
 
 
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_10.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_10.py.snap
index a20abcf698879..4bf0f389225ec 100644
--- a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_10.py.snap
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_10.py.snap
@@ -10,8 +10,9 @@ F401_10.py:6:16: F401 `orjson` imported but unused; consider using `importlib.ut
  9 | 
 10 |         return True
    |
+   = help: Remove unused import: `orjson`
 
-F401_10.py:15:16: F401 [*] `orjson` imported but unused
+F401_10.py:15:16: F401 `orjson` imported but unused; consider using `importlib.util.find_spec` to test for availability
    |
 15 | def import_error():
 16 |     try:
@@ -22,13 +23,4 @@ F401_10.py:15:16: F401 [*] `orjson` imported but unused
    |
    = help: Remove unused import: `orjson`
 
-ℹ Suggested fix
-12 12 | 
-13 13 | def import_error():
-14 14 |     try:
-15    |-        import orjson
-16 15 | 
-17 16 |         return True
-18 17 |     except ImportError:
-
 
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_11.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_11.py.snap
index 8b44edaab6186..3087c53de60c2 100644
--- a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_11.py.snap
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_11.py.snap
@@ -9,7 +9,7 @@ F401_11.py:4:27: F401 [*] `pathlib.PurePath` imported but unused
   |
   = help: Remove unused import: `pathlib.PurePath`
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | """Test: parsing of nested string annotations."""
 2 2 | 
 3 3 | from typing import List
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_12.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_12.py.snap
new file mode 100644
index 0000000000000..1976c4331d419
--- /dev/null
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_12.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pyflakes/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_13.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_13.py.snap
new file mode 100644
index 0000000000000..1976c4331d419
--- /dev/null
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_13.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pyflakes/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_14.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_14.py.snap
new file mode 100644
index 0000000000000..1976c4331d419
--- /dev/null
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_14.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pyflakes/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_15.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_15.py.snap
new file mode 100644
index 0000000000000..a5b248c81b70d
--- /dev/null
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_15.py.snap
@@ -0,0 +1,22 @@
+---
+source: crates/ruff/src/rules/pyflakes/mod.rs
+---
+F401_15.py:5:25: F401 [*] `pathlib.Path` imported but unused
+  |
+5 | if TYPE_CHECKING:
+6 |     from pathlib import Path
+  |                         ^^^^ F401
+  |
+  = help: Remove unused import: `pathlib.Path`
+
+ℹ Fix
+2 2 | from django.db.models import ForeignKey
+3 3 | 
+4 4 | if TYPE_CHECKING:
+5   |-    from pathlib import Path
+  5 |+    pass
+6 6 | 
+7 7 | 
+8 8 | class Foo:
+
+
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_16.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_16.py.snap
new file mode 100644
index 0000000000000..1976c4331d419
--- /dev/null
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_16.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pyflakes/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_17.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_17.py.snap
new file mode 100644
index 0000000000000..c8f566d1c4d9a
--- /dev/null
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_17.py.snap
@@ -0,0 +1,42 @@
+---
+source: crates/ruff/src/rules/pyflakes/mod.rs
+---
+F401_17.py:12:27: F401 [*] `threading.Thread` imported but unused
+   |
+12 | def fn(thread: Thread):
+13 |     from threading import Thread
+   |                           ^^^^^^ F401
+14 | 
+15 |     # The `Thread` on the left-hand side should resolve to the `Thread` imported at the
+   |
+   = help: Remove unused import: `threading.Thread`
+
+ℹ Fix
+9  9  | 
+10 10 | 
+11 11 | def fn(thread: Thread):
+12    |-    from threading import Thread
+13 12 | 
+14 13 |     # The `Thread` on the left-hand side should resolve to the `Thread` imported at the
+15 14 |     # top level.
+
+F401_17.py:20:27: F401 [*] `threading.Thread` imported but unused
+   |
+20 | def fn(thread: Thread):
+21 |     from threading import Thread
+   |                           ^^^^^^ F401
+22 | 
+23 |     # The `Thread` on the left-hand side should resolve to the `Thread` imported at the
+   |
+   = help: Remove unused import: `threading.Thread`
+
+ℹ Fix
+17 17 | 
+18 18 | 
+19 19 | def fn(thread: Thread):
+20    |-    from threading import Thread
+21 20 | 
+22 21 |     # The `Thread` on the left-hand side should resolve to the `Thread` imported at the
+23 22 |     # top level.
+
+
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_5.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_5.py.snap
index e04ea8415ac78..c227fee4af8b6 100644
--- a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_5.py.snap
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_5.py.snap
@@ -11,7 +11,7 @@ F401_5.py:2:17: F401 [*] `a.b.c` imported but unused
   |
   = help: Remove unused import: `a.b.c`
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | """Test: removal of multi-segment and aliases imports."""
 2   |-from a.b import c
 3 2 | from d.e import f as g
@@ -29,7 +29,7 @@ F401_5.py:3:17: F401 [*] `d.e.f` imported but unused
   |
   = help: Remove unused import: `d.e.f`
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | """Test: removal of multi-segment and aliases imports."""
 2 2 | from a.b import c
 3   |-from d.e import f as g
@@ -46,7 +46,7 @@ F401_5.py:4:8: F401 [*] `h.i` imported but unused
   |
   = help: Remove unused import: `h.i`
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | """Test: removal of multi-segment and aliases imports."""
 2 2 | from a.b import c
 3 3 | from d.e import f as g
@@ -62,7 +62,7 @@ F401_5.py:5:8: F401 [*] `j.k` imported but unused
   |
   = help: Remove unused import: `j.k`
 
-ℹ Suggested fix
+ℹ Fix
 2 2 | from a.b import c
 3 3 | from d.e import f as g
 4 4 | import h.i
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_6.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_6.py.snap
index 06ef1e3b670c5..2eff2bb2c3b07 100644
--- a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_6.py.snap
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_6.py.snap
@@ -11,7 +11,7 @@ F401_6.py:7:25: F401 [*] `.background.BackgroundTasks` imported but unused
    |
    = help: Remove unused import: `.background.BackgroundTasks`
 
-ℹ Suggested fix
+ℹ Fix
 4 4 | from .applications import FastAPI as FastAPI
 5 5 | 
 6 6 | # F401 `background.BackgroundTasks` imported but unused
@@ -30,7 +30,7 @@ F401_6.py:10:29: F401 [*] `.datastructures.UploadFile` imported but unused
    |
    = help: Remove unused import: `.datastructures.UploadFile`
 
-ℹ Suggested fix
+ℹ Fix
 7  7  | from .background import BackgroundTasks
 8  8  | 
 9  9  | # F401 `datastructures.UploadFile` imported but unused
@@ -49,7 +49,7 @@ F401_6.py:16:8: F401 [*] `background` imported but unused
    |
    = help: Remove unused import: `background`
 
-ℹ Suggested fix
+ℹ Fix
 13 13 | import applications as applications
 14 14 | 
 15 15 | # F401 `background` imported but unused
@@ -66,7 +66,7 @@ F401_6.py:19:8: F401 [*] `datastructures` imported but unused
    |
    = help: Remove unused import: `datastructures`
 
-ℹ Suggested fix
+ℹ Fix
 16 16 | import background
 17 17 | 
 18 18 | # F401 `datastructures` imported but unused
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_7.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_7.py.snap
index e570321d493ba..253f54faca1ff 100644
--- a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_7.py.snap
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_7.py.snap
@@ -11,7 +11,7 @@ F401_7.py:30:5: F401 [*] `typing.Union` imported but unused
    |
    = help: Remove unused import: `typing.Union`
 
-ℹ Suggested fix
+ℹ Fix
 27 27 | # This should ignore the first error.
 28 28 | from typing import (
 29 29 |     Mapping,  # noqa: F401
@@ -30,7 +30,7 @@ F401_7.py:66:20: F401 [*] `typing.Awaitable` imported but unused
    |
    = help: Remove unused import
 
-ℹ Suggested fix
+ℹ Fix
 63 63 | from typing import AsyncIterable, AsyncGenerator  # noqa
 64 64 | 
 65 65 | # This should mark F501 as unused.
@@ -44,7 +44,7 @@ F401_7.py:66:31: F401 [*] `typing.AwaitableGenerator` imported but unused
    |
    = help: Remove unused import
 
-ℹ Suggested fix
+ℹ Fix
 63 63 | from typing import AsyncIterable, AsyncGenerator  # noqa
 64 64 | 
 65 65 | # This should mark F501 as unused.
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_9.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_9.py.snap
index 3db808aa995a4..f9c96f8a38d93 100644
--- a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_9.py.snap
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F401_F401_9.py.snap
@@ -9,7 +9,7 @@ F401_9.py:4:22: F401 [*] `foo.baz` imported but unused
   |
   = help: Remove unused import: `foo.baz`
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | """Test: late-binding of `__all__`."""
 2 2 | 
 3 3 | __all__ = ("bar",)
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F504_F504.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F504_F504.py.snap
index 8ab015510177a..a8f8bc10aa71f 100644
--- a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F504_F504.py.snap
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F504_F504.py.snap
@@ -12,7 +12,7 @@ F504.py:3:1: F504 [*] `%`-format string has unused named argument(s): b
   |
   = help: Remove extra named arguments: b
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | # Ruff has no way of knowing if the following are F505s
 2 2 | a = "wrong"
 3   |-"%(a)s %(c)s" % {a: "?", "b": "!"}  # F504 ("b" not used)
@@ -31,7 +31,7 @@ F504.py:8:1: F504 [*] `%`-format string has unused named argument(s): b
    |
    = help: Remove extra named arguments: b
 
-ℹ Suggested fix
+ℹ Fix
 5 5 | hidden = {"a": "!"}
 6 6 | "%(a)s %(c)s" % {"x": 1, **hidden}  # Ok (cannot see through splat)
 7 7 | 
@@ -47,7 +47,7 @@ F504.py:9:1: F504 [*] `%`-format string has unused named argument(s): b
    |
    = help: Remove extra named arguments: b
 
-ℹ Suggested fix
+ℹ Fix
 6 6 | "%(a)s %(c)s" % {"x": 1, **hidden}  # Ok (cannot see through splat)
 7 7 | 
 8 8 | "%(a)s" % {"a": 1, r"b": "!"}  # F504 ("b" not used)
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F504_F50x.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F504_F50x.py.snap
index 94960c3067b42..7c0f8483383be 100644
--- a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F504_F50x.py.snap
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F504_F50x.py.snap
@@ -12,7 +12,7 @@ F50x.py:8:1: F504 [*] `%`-format string has unused named argument(s): baz
    |
    = help: Remove extra named arguments: baz
 
-ℹ Suggested fix
+ℹ Fix
 5 5 | '%s %s' % (1,)  # F507
 6 6 | '%s %s' % (1, 2, 3)  # F507
 7 7 | '%(bar)s' % {}  # F505
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F522_F522.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F522_F522.py.snap
index 2779b22c72601..b1ae9be9748a2 100644
--- a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F522_F522.py.snap
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F522_F522.py.snap
@@ -10,7 +10,7 @@ F522.py:1:1: F522 [*] `.format` call has unused named argument(s): bar
   |
   = help: Remove extra named arguments: bar
 
-ℹ Suggested fix
+ℹ Fix
 1   |-"{}".format(1, bar=2)  # F522
   1 |+"{}".format(1, )  # F522
 2 2 | "{bar}{}".format(1, bar=2, spam=3)  # F522
@@ -27,12 +27,13 @@ F522.py:2:1: F522 [*] `.format` call has unused named argument(s): spam
   |
   = help: Remove extra named arguments: spam
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | "{}".format(1, bar=2)  # F522
 2   |-"{bar}{}".format(1, bar=2, spam=3)  # F522
   2 |+"{bar}{}".format(1, bar=2, )  # F522
 3 3 | "{bar:{spam}}".format(bar=2, spam=3)  # No issues
 4 4 | "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5)  # F522
+5 5 | # Not fixable
 
 F522.py:4:1: F522 [*] `.format` call has unused named argument(s): eggs, ham
   |
@@ -40,14 +41,30 @@ F522.py:4:1: F522 [*] `.format` call has unused named argument(s): eggs, ham
 5 | "{bar:{spam}}".format(bar=2, spam=3)  # No issues
 6 | "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5)  # F522
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ F522
+7 | # Not fixable
+8 | (''
   |
   = help: Remove extra named arguments: eggs, ham
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | "{}".format(1, bar=2)  # F522
 2 2 | "{bar}{}".format(1, bar=2, spam=3)  # F522
 3 3 | "{bar:{spam}}".format(bar=2, spam=3)  # No issues
 4   |-"{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5)  # F522
   4 |+"{bar:{spam}}".format(bar=2, spam=3, )  # F522
+5 5 | # Not fixable
+6 6 | (''
+7 7 |  .format(x=2))
+
+F522.py:6:2: F522 `.format` call has unused named argument(s): x
+  |
+6 |   "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5)  # F522
+7 |   # Not fixable
+8 |   (''
+  |  __^
+9 | |  .format(x=2))
+  | |_____________^ F522
+  |
+  = help: Remove extra named arguments: x
 
 
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F523_F523.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F523_F523.py.snap
index 51163b5e06493..42d75903155e0 100644
--- a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F523_F523.py.snap
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F523_F523.py.snap
@@ -11,7 +11,7 @@ F523.py:2:1: F523 [*] `.format` call has unused arguments at position(s): 1
   |
   = help: Remove extra positional arguments at position(s): 1
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | # With indexes
 2   |-"{0}".format(1, 2)  # F523
   2 |+"{0}".format(1, )  # F523
@@ -19,7 +19,7 @@ F523.py:2:1: F523 [*] `.format` call has unused arguments at position(s): 1
 4 4 | "{1:{0}}".format(1, 2)  # No issues
 5 5 | "{1:{0}}".format(1, 2, 3)  # F523
 
-F523.py:3:1: F523 [*] `.format` call has unused arguments at position(s): 0, 2
+F523.py:3:1: F523 `.format` call has unused arguments at position(s): 0, 2
   |
 3 | # With indexes
 4 | "{0}".format(1, 2)  # F523
@@ -30,15 +30,6 @@ F523.py:3:1: F523 [*] `.format` call has unused arguments at position(s): 0, 2
   |
   = help: Remove extra positional arguments at position(s): 0, 2
 
-ℹ Suggested fix
-1 1 | # With indexes
-2 2 | "{0}".format(1, 2)  # F523
-3   |-"{1}".format(1, 2, 3)  # F523
-  3 |+"{0}".format(2, )  # F523
-4 4 | "{1:{0}}".format(1, 2)  # No issues
-5 5 | "{1:{0}}".format(1, 2, 3)  # F523
-6 6 | "{0}{2}".format(1, 2)  # F523, # F524
-
 F523.py:5:1: F523 [*] `.format` call has unused arguments at position(s): 2
   |
 5 | "{1}".format(1, 2, 3)  # F523
@@ -50,7 +41,7 @@ F523.py:5:1: F523 [*] `.format` call has unused arguments at position(s): 2
   |
   = help: Remove extra positional arguments at position(s): 2
 
-ℹ Suggested fix
+ℹ Fix
 2 2 | "{0}".format(1, 2)  # F523
 3 3 | "{1}".format(1, 2, 3)  # F523
 4 4 | "{1:{0}}".format(1, 2)  # No issues
@@ -70,7 +61,7 @@ F523.py:6:1: F523 [*] `.format` call has unused arguments at position(s): 1
   |
   = help: Remove extra positional arguments at position(s): 1
 
-ℹ Suggested fix
+ℹ Fix
 3 3 | "{1}".format(1, 2, 3)  # F523
 4 4 | "{1:{0}}".format(1, 2)  # No issues
 5 5 | "{1:{0}}".format(1, 2, 3)  # F523
@@ -80,7 +71,7 @@ F523.py:6:1: F523 [*] `.format` call has unused arguments at position(s): 1
 8 8 | 
 9 9 | # With no indexes
 
-F523.py:7:1: F523 [*] `.format` call has unused arguments at position(s): 0, 3
+F523.py:7:1: F523 `.format` call has unused arguments at position(s): 0, 3
    |
  7 | "{1:{0}}".format(1, 2, 3)  # F523
  8 | "{0}{2}".format(1, 2)  # F523, # F524
@@ -91,16 +82,6 @@ F523.py:7:1: F523 [*] `.format` call has unused arguments at position(s): 0, 3
    |
    = help: Remove extra positional arguments at position(s): 0, 3
 
-ℹ Suggested fix
-4 4 | "{1:{0}}".format(1, 2)  # No issues
-5 5 | "{1:{0}}".format(1, 2, 3)  # F523
-6 6 | "{0}{2}".format(1, 2)  # F523, # F524
-7   |-"{1.arg[1]!r:0{2['arg']}{1}}".format(1, 2, 3, 4) # F523
-  7 |+"{0.arg[1]!r:0{1['arg']}{0}}".format(2, 3, ) # F523
-8 8 | 
-9 9 | # With no indexes
-10 10 | "{}".format(1, 2)  # F523
-
 F523.py:10:1: F523 [*] `.format` call has unused arguments at position(s): 1
    |
 10 | # With no indexes
@@ -111,7 +92,7 @@ F523.py:10:1: F523 [*] `.format` call has unused arguments at position(s): 1
    |
    = help: Remove extra positional arguments at position(s): 1
 
-ℹ Suggested fix
+ℹ Fix
 7  7  | "{1.arg[1]!r:0{2['arg']}{1}}".format(1, 2, 3, 4) # F523
 8  8  | 
 9  9  | # With no indexes
@@ -132,7 +113,7 @@ F523.py:11:1: F523 [*] `.format` call has unused arguments at position(s): 1, 2
    |
    = help: Remove extra positional arguments at position(s): 1, 2
 
-ℹ Suggested fix
+ℹ Fix
 8  8  | 
 9  9  | # With no indexes
 10 10 | "{}".format(1, 2)  # F523
@@ -153,7 +134,7 @@ F523.py:13:1: F523 [*] `.format` call has unused arguments at position(s): 2
    |
    = help: Remove extra positional arguments at position(s): 2
 
-ℹ Suggested fix
+ℹ Fix
 10 10 | "{}".format(1, 2)  # F523
 11 11 | "{}".format(1, 2, 3)  # F523
 12 12 | "{:{}}".format(1, 2)  # No issues
@@ -163,20 +144,117 @@ F523.py:13:1: F523 [*] `.format` call has unused arguments at position(s): 2
 15 15 | # With *args
 16 16 | "{0}{1}".format(*args)  # No issues
 
-F523.py:19:1: F523 [*] `.format` call has unused arguments at position(s): 2
+F523.py:19:1: F523 `.format` call has unused arguments at position(s): 2
    |
 19 | "{0}{1}".format(1, *args)  # No issues
 20 | "{0}{1}".format(1, 2, *args)  # No issues
 21 | "{0}{1}".format(1, 2, 3, *args)  # F523
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ F523
+22 | 
+23 | # With nested quotes
    |
    = help: Remove extra positional arguments at position(s): 2
 
-ℹ Suggested fix
-16 16 | "{0}{1}".format(*args)  # No issues
-17 17 | "{0}{1}".format(1, *args)  # No issues
-18 18 | "{0}{1}".format(1, 2, *args)  # No issues
-19    |-"{0}{1}".format(1, 2, 3, *args)  # F523
-   19 |+"{0}{1}".format(1, 2, *args)  # F523
+F523.py:22:1: F523 [*] `.format` call has unused arguments at position(s): 1, 2
+   |
+22 | # With nested quotes
+23 | "''1{0}".format(1, 2, 3)  # F523
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ F523
+24 | "\"\"{1}{0}".format(1, 2, 3)  # F523
+25 | '""{1}{0}'.format(1, 2, 3)  # F523
+   |
+   = help: Remove extra positional arguments at position(s): 1, 2
+
+ℹ Fix
+19 19 | "{0}{1}".format(1, 2, 3, *args)  # F523
+20 20 | 
+21 21 | # With nested quotes
+22    |-"''1{0}".format(1, 2, 3)  # F523
+   22 |+"''1{0}".format(1, )  # F523
+23 23 | "\"\"{1}{0}".format(1, 2, 3)  # F523
+24 24 | '""{1}{0}'.format(1, 2, 3)  # F523
+25 25 | 
+
+F523.py:23:1: F523 [*] `.format` call has unused arguments at position(s): 2
+   |
+23 | # With nested quotes
+24 | "''1{0}".format(1, 2, 3)  # F523
+25 | "\"\"{1}{0}".format(1, 2, 3)  # F523
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ F523
+26 | '""{1}{0}'.format(1, 2, 3)  # F523
+   |
+   = help: Remove extra positional arguments at position(s): 2
+
+ℹ Fix
+20 20 | 
+21 21 | # With nested quotes
+22 22 | "''1{0}".format(1, 2, 3)  # F523
+23    |-"\"\"{1}{0}".format(1, 2, 3)  # F523
+   23 |+"\"\"{1}{0}".format(1, 2, )  # F523
+24 24 | '""{1}{0}'.format(1, 2, 3)  # F523
+25 25 | 
+26 26 | # With modified indexes
+
+F523.py:24:1: F523 [*] `.format` call has unused arguments at position(s): 2
+   |
+24 | "''1{0}".format(1, 2, 3)  # F523
+25 | "\"\"{1}{0}".format(1, 2, 3)  # F523
+26 | '""{1}{0}'.format(1, 2, 3)  # F523
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^ F523
+27 | 
+28 | # With modified indexes
+   |
+   = help: Remove extra positional arguments at position(s): 2
+
+ℹ Fix
+21 21 | # With nested quotes
+22 22 | "''1{0}".format(1, 2, 3)  # F523
+23 23 | "\"\"{1}{0}".format(1, 2, 3)  # F523
+24    |-'""{1}{0}'.format(1, 2, 3)  # F523
+   24 |+'""{1}{0}'.format(1, 2, )  # F523
+25 25 | 
+26 26 | # With modified indexes
+27 27 | "{1}{2}".format(1, 2, 3)  # F523, # F524
+
+F523.py:27:1: F523 `.format` call has unused arguments at position(s): 0
+   |
+27 | # With modified indexes
+28 | "{1}{2}".format(1, 2, 3)  # F523, # F524
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ F523
+29 | "{1}{3}".format(1, 2, 3, 4)  # F523, # F524
+30 | "{1} {8}".format(0, 1)  # F523, # F524
+   |
+   = help: Remove extra positional arguments at position(s): 0
+
+F523.py:28:1: F523 `.format` call has unused arguments at position(s): 0, 2
+   |
+28 | # With modified indexes
+29 | "{1}{2}".format(1, 2, 3)  # F523, # F524
+30 | "{1}{3}".format(1, 2, 3, 4)  # F523, # F524
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ F523
+31 | "{1} {8}".format(0, 1)  # F523, # F524
+   |
+   = help: Remove extra positional arguments at position(s): 0, 2
+
+F523.py:29:1: F523 `.format` call has unused arguments at position(s): 0
+   |
+29 | "{1}{2}".format(1, 2, 3)  # F523, # F524
+30 | "{1}{3}".format(1, 2, 3, 4)  # F523, # F524
+31 | "{1} {8}".format(0, 1)  # F523, # F524
+   | ^^^^^^^^^^^^^^^^^^^^^^ F523
+32 | 
+33 | # Not fixable
+   |
+   = help: Remove extra positional arguments at position(s): 0
+
+F523.py:32:2: F523 `.format` call has unused arguments at position(s): 0
+   |
+32 |   # Not fixable
+33 |   (''
+   |  __^
+34 | | .format(2))
+   | |__________^ F523
+   |
+   = help: Remove extra positional arguments at position(s): 0
 
 
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F524_F524.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F524_F524.py.snap
index d4abbf0a6102e..5d37ffa6ed140 100644
--- a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F524_F524.py.snap
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F524_F524.py.snap
@@ -45,6 +45,7 @@ F524.py:5:1: F524 `.format` call is missing argument(s) for placeholder(s): 0, b
 7 | "{0} {bar}".format()  # F524
   | ^^^^^^^^^^^^^^^^^^^^ F524
 8 | "{bar} {0}".format()  # F524
+9 | "{1} {8}".format(0, 1)
   |
 
 F524.py:6:1: F524 `.format` call is missing argument(s) for placeholder(s): 0, bar
@@ -53,6 +54,15 @@ F524.py:6:1: F524 `.format` call is missing argument(s) for placeholder(s): 0, b
 7 | "{0} {bar}".format()  # F524
 8 | "{bar} {0}".format()  # F524
   | ^^^^^^^^^^^^^^^^^^^^ F524
+9 | "{1} {8}".format(0, 1)
+  |
+
+F524.py:7:1: F524 `.format` call is missing argument(s) for placeholder(s): 8
+  |
+7 | "{0} {bar}".format()  # F524
+8 | "{bar} {0}".format()  # F524
+9 | "{1} {8}".format(0, 1)
+  | ^^^^^^^^^^^^^^^^^^^^^^ F524
   |
 
 
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F811_F811_23.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F811_F811_23.py.snap
new file mode 100644
index 0000000000000..ddb037066fec8
--- /dev/null
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F811_F811_23.py.snap
@@ -0,0 +1,11 @@
+---
+source: crates/ruff/src/rules/pyflakes/mod.rs
+---
+F811_23.py:4:8: F811 Redefinition of unused `foo` from line 3
+  |
+4 | import foo as foo
+5 | import bar as foo
+  |        ^^^^^^^^^^ F811
+  |
+
+
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F811_F811_24.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F811_F811_24.py.snap
new file mode 100644
index 0000000000000..1976c4331d419
--- /dev/null
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F811_F811_24.py.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pyflakes/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F841_F841_0.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F841_F841_0.py.snap
index 95da0702b47c9..47e2e59bdc3ca 100644
--- a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F841_F841_0.py.snap
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F841_F841_0.py.snap
@@ -57,7 +57,7 @@ F841_0.py:20:5: F841 [*] Local variable `foo` is assigned to but never used
 22 21 | 
 23 22 |     bar = (1, 2)
 
-F841_0.py:21:6: F841 [*] Local variable `a` is assigned to but never used
+F841_0.py:21:6: F841 Local variable `a` is assigned to but never used
    |
 21 | def f():
 22 |     foo = (1, 2)
@@ -68,7 +68,7 @@ F841_0.py:21:6: F841 [*] Local variable `a` is assigned to but never used
    |
    = help: Remove assignment to unused variable `a`
 
-F841_0.py:21:9: F841 [*] Local variable `b` is assigned to but never used
+F841_0.py:21:9: F841 Local variable `b` is assigned to but never used
    |
 21 | def f():
 22 |     foo = (1, 2)
@@ -200,7 +200,7 @@ F841_0.py:115:5: F841 [*] Local variable `Baz` is assigned to but never used
 117 117 |     match x:
 118 118 |         case (Foo.A):
 
-F841_0.py:122:14: F841 [*] Local variable `y` is assigned to but never used
+F841_0.py:122:14: F841 Local variable `y` is assigned to but never used
     |
 122 |         case [Bar.A, *_]:
 123 |             print("A")
@@ -210,7 +210,7 @@ F841_0.py:122:14: F841 [*] Local variable `y` is assigned to but never used
     |
     = help: Remove assignment to unused variable `y`
 
-F841_0.py:127:21: F841 [*] Local variable `value` is assigned to but never used
+F841_0.py:127:21: F841 Local variable `value` is assigned to but never used
     |
 127 | def f():
 128 |     if any((key := (value := x)) for x in ["ok"]):
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F841_F841_1.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F841_F841_1.py.snap
index 171acd5e18d12..e390ce18f5f85 100644
--- a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F841_F841_1.py.snap
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F841_F841_1.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/pyflakes/mod.rs
 ---
-F841_1.py:6:5: F841 [*] Local variable `x` is assigned to but never used
+F841_1.py:6:5: F841 Local variable `x` is assigned to but never used
   |
 6 | def f():
 7 |     x, y = 1, 2  # this triggers F841 as it's just a simple assignment where unpacking isn't needed
@@ -9,7 +9,7 @@ F841_1.py:6:5: F841 [*] Local variable `x` is assigned to but never used
   |
   = help: Remove assignment to unused variable `x`
 
-F841_1.py:6:8: F841 [*] Local variable `y` is assigned to but never used
+F841_1.py:6:8: F841 Local variable `y` is assigned to but never used
   |
 6 | def f():
 7 |     x, y = 1, 2  # this triggers F841 as it's just a simple assignment where unpacking isn't needed
@@ -53,7 +53,7 @@ F841_1.py:20:5: F841 [*] Local variable `coords` is assigned to but never used
 22 22 | 
 23 23 | def f():
 
-F841_1.py:24:6: F841 [*] Local variable `a` is assigned to but never used
+F841_1.py:24:6: F841 Local variable `a` is assigned to but never used
    |
 24 | def f():
 25 |     (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
@@ -61,7 +61,7 @@ F841_1.py:24:6: F841 [*] Local variable `a` is assigned to but never used
    |
    = help: Remove assignment to unused variable `a`
 
-F841_1.py:24:9: F841 [*] Local variable `b` is assigned to but never used
+F841_1.py:24:9: F841 Local variable `b` is assigned to but never used
    |
 24 | def f():
 25 |     (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
@@ -69,7 +69,7 @@ F841_1.py:24:9: F841 [*] Local variable `b` is assigned to but never used
    |
    = help: Remove assignment to unused variable `b`
 
-F841_1.py:24:15: F841 [*] Local variable `x` is assigned to but never used
+F841_1.py:24:15: F841 Local variable `x` is assigned to but never used
    |
 24 | def f():
 25 |     (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
@@ -77,7 +77,7 @@ F841_1.py:24:15: F841 [*] Local variable `x` is assigned to but never used
    |
    = help: Remove assignment to unused variable `x`
 
-F841_1.py:24:18: F841 [*] Local variable `y` is assigned to but never used
+F841_1.py:24:18: F841 Local variable `y` is assigned to but never used
    |
 24 | def f():
 25 |     (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F841_F841_3.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F841_F841_3.py.snap
index a04fb11f5e616..327fa2a561e08 100644
--- a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F841_F841_3.py.snap
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F841_F841_3.py.snap
@@ -156,7 +156,7 @@ F841_3.py:27:46: F841 [*] Local variable `z3` is assigned to but never used
 29 29 | 
 30 30 | 
 
-F841_3.py:32:6: F841 [*] Local variable `x1` is assigned to but never used
+F841_3.py:32:6: F841 Local variable `x1` is assigned to but never used
    |
 32 | def f():
 33 |     (x1, y1) = (1, 2)
@@ -166,7 +166,7 @@ F841_3.py:32:6: F841 [*] Local variable `x1` is assigned to but never used
    |
    = help: Remove assignment to unused variable `x1`
 
-F841_3.py:32:10: F841 [*] Local variable `y1` is assigned to but never used
+F841_3.py:32:10: F841 Local variable `y1` is assigned to but never used
    |
 32 | def f():
 33 |     (x1, y1) = (1, 2)
@@ -315,10 +315,9 @@ F841_3.py:61:5: F841 [*] Local variable `x` is assigned to but never used
 63    |-        if a is not None
 64    |-        else b
 65    |-    )
-   61 |+    pass
-66 62 | 
-67 63 |     y = \
-68 64 |         a if a is not None else b
+66 61 | 
+67 62 |     y = \
+68 63 |         a if a is not None else b
 
 F841_3.py:67:5: F841 [*] Local variable `y` is assigned to but never used
    |
@@ -378,126 +377,145 @@ F841_3.py:77:25: F841 [*] Local variable `cm` is assigned to but never used
 79 79 | 
 80 80 | 
 
-F841_3.py:87:5: F841 [*] Local variable `toplevel` is assigned to but never used
+F841_3.py:87:26: F841 [*] Local variable `cm` is assigned to but never used
    |
 87 | def f():
-88 |     toplevel = tt = lexer.get_token()
-   |     ^^^^^^^^ F841
-89 |     if not tt:
-90 |         break
+88 |     with (Nested(m)) as (cm):
+   |                          ^^ F841
+89 |         pass
    |
-   = help: Remove assignment to unused variable `toplevel`
+   = help: Remove assignment to unused variable `cm`
 
 ℹ Suggested fix
 84 84 | 
 85 85 | 
 86 86 | def f():
-87    |-    toplevel = tt = lexer.get_token()
-   87 |+    tt = lexer.get_token()
-88 88 |     if not tt:
-89 89 |         break
+87    |-    with (Nested(m)) as (cm):
+   87 |+    with (Nested(m)):
+88 88 |         pass
+89 89 | 
 90 90 | 
 
-F841_3.py:93:5: F841 [*] Local variable `toplevel` is assigned to but never used
+F841_3.py:92:5: F841 [*] Local variable `toplevel` is assigned to but never used
    |
-93 | def f():
-94 |     toplevel = tt = lexer.get_token()
+92 | def f():
+93 |     toplevel = tt = lexer.get_token()
    |     ^^^^^^^^ F841
+94 |     if not tt:
+95 |         break
    |
    = help: Remove assignment to unused variable `toplevel`
 
 ℹ Suggested fix
+89 89 | 
 90 90 | 
-91 91 | 
-92 92 | def f():
-93    |-    toplevel = tt = lexer.get_token()
-   93 |+    tt = lexer.get_token()
-94 94 | 
+91 91 | def f():
+92    |-    toplevel = tt = lexer.get_token()
+   92 |+    tt = lexer.get_token()
+93 93 |     if not tt:
+94 94 |         break
 95 95 | 
-96 96 | def f():
 
-F841_3.py:93:16: F841 [*] Local variable `tt` is assigned to but never used
+F841_3.py:98:5: F841 [*] Local variable `toplevel` is assigned to but never used
    |
-93 | def f():
-94 |     toplevel = tt = lexer.get_token()
-   |                ^^ F841
+98 | def f():
+99 |     toplevel = tt = lexer.get_token()
+   |     ^^^^^^^^ F841
    |
-   = help: Remove assignment to unused variable `tt`
+   = help: Remove assignment to unused variable `toplevel`
 
 ℹ Suggested fix
-90 90 | 
-91 91 | 
-92 92 | def f():
-93    |-    toplevel = tt = lexer.get_token()
-   93 |+    toplevel = lexer.get_token()
-94 94 | 
 95 95 | 
-96 96 | def f():
+96 96 | 
+97 97 | def f():
+98    |-    toplevel = tt = lexer.get_token()
+   98 |+    tt = lexer.get_token()
+99 99 | 
+100 100 | 
+101 101 | def f():
 
-F841_3.py:97:5: F841 [*] Local variable `toplevel` is assigned to but never used
+F841_3.py:98:16: F841 [*] Local variable `tt` is assigned to but never used
    |
-97 | def f():
-98 |     toplevel = (a, b) = lexer.get_token()
-   |     ^^^^^^^^ F841
+98 | def f():
+99 |     toplevel = tt = lexer.get_token()
+   |                ^^ F841
    |
-   = help: Remove assignment to unused variable `toplevel`
+   = help: Remove assignment to unused variable `tt`
 
 ℹ Suggested fix
-94 94 | 
 95 95 | 
-96 96 | def f():
-97    |-    toplevel = (a, b) = lexer.get_token()
-   97 |+    (a, b) = lexer.get_token()
-98 98 | 
+96 96 | 
+97 97 | def f():
+98    |-    toplevel = tt = lexer.get_token()
+   98 |+    toplevel = lexer.get_token()
 99 99 | 
-100 100 | def f():
+100 100 | 
+101 101 | def f():
 
-F841_3.py:101:14: F841 [*] Local variable `toplevel` is assigned to but never used
+F841_3.py:102:5: F841 [*] Local variable `toplevel` is assigned to but never used
     |
-101 | def f():
-102 |     (a, b) = toplevel = lexer.get_token()
-    |              ^^^^^^^^ F841
+102 | def f():
+103 |     toplevel = (a, b) = lexer.get_token()
+    |     ^^^^^^^^ F841
     |
     = help: Remove assignment to unused variable `toplevel`
 
 ℹ Suggested fix
-98  98  | 
 99  99  | 
-100 100 | def f():
-101     |-    (a, b) = toplevel = lexer.get_token()
-    101 |+    (a, b) = lexer.get_token()
-102 102 | 
+100 100 | 
+101 101 | def f():
+102     |-    toplevel = (a, b) = lexer.get_token()
+    102 |+    (a, b) = lexer.get_token()
 103 103 | 
-104 104 | def f():
+104 104 | 
+105 105 | def f():
 
-F841_3.py:105:5: F841 [*] Local variable `toplevel` is assigned to but never used
+F841_3.py:106:14: F841 [*] Local variable `toplevel` is assigned to but never used
     |
-105 | def f():
-106 |     toplevel = tt = 1
-    |     ^^^^^^^^ F841
+106 | def f():
+107 |     (a, b) = toplevel = lexer.get_token()
+    |              ^^^^^^^^ F841
     |
     = help: Remove assignment to unused variable `toplevel`
 
 ℹ Suggested fix
-102 102 | 
 103 103 | 
-104 104 | def f():
-105     |-    toplevel = tt = 1
-    105 |+    tt = 1
+104 104 | 
+105 105 | def f():
+106     |-    (a, b) = toplevel = lexer.get_token()
+    106 |+    (a, b) = lexer.get_token()
+107 107 | 
+108 108 | 
+109 109 | def f():
+
+F841_3.py:110:5: F841 [*] Local variable `toplevel` is assigned to but never used
+    |
+110 | def f():
+111 |     toplevel = tt = 1
+    |     ^^^^^^^^ F841
+    |
+    = help: Remove assignment to unused variable `toplevel`
 
-F841_3.py:105:16: F841 [*] Local variable `tt` is assigned to but never used
+ℹ Suggested fix
+107 107 | 
+108 108 | 
+109 109 | def f():
+110     |-    toplevel = tt = 1
+    110 |+    tt = 1
+
+F841_3.py:110:16: F841 [*] Local variable `tt` is assigned to but never used
     |
-105 | def f():
-106 |     toplevel = tt = 1
+110 | def f():
+111 |     toplevel = tt = 1
     |                ^^ F841
     |
     = help: Remove assignment to unused variable `tt`
 
 ℹ Suggested fix
-102 102 | 
-103 103 | 
-104 104 | def f():
-105     |-    toplevel = tt = 1
-    105 |+    toplevel = 1
+107 107 | 
+108 108 | 
+109 109 | def f():
+110     |-    toplevel = tt = 1
+    110 |+    toplevel = 1
 
 
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__del_shadowed_global_import_in_global_scope.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__del_shadowed_global_import_in_global_scope.snap
new file mode 100644
index 0000000000000..58716e88ec9d5
--- /dev/null
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__del_shadowed_global_import_in_global_scope.snap
@@ -0,0 +1,24 @@
+---
+source: crates/ruff/src/rules/pyflakes/mod.rs
+---
+<filename>:5:12: F401 [*] `os` imported but unused
+  |
+5 | def f():
+6 |     import os
+  |            ^^ F401
+7 | 
+8 | # Despite this `del`, `import os` in `f` should still be flagged as shadowing an unused
+  |
+  = help: Remove unused import: `os`
+
+ℹ Fix
+2 2 | import os
+3 3 | 
+4 4 | def f():
+5   |-    import os
+  5 |+    pass
+6 6 | 
+7 7 | # Despite this `del`, `import os` in `f` should still be flagged as shadowing an unused
+8 8 | # import. (This is a false negative, but is consistent with Pyflakes.)
+
+
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__del_shadowed_global_import_in_local_scope.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__del_shadowed_global_import_in_local_scope.snap
new file mode 100644
index 0000000000000..37beaccce1f93
--- /dev/null
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__del_shadowed_global_import_in_local_scope.snap
@@ -0,0 +1,20 @@
+---
+source: crates/ruff/src/rules/pyflakes/mod.rs
+---
+<filename>:2:8: F401 [*] `os` imported but unused
+  |
+2 | import os
+  |        ^^ F401
+3 | 
+4 | def f():
+  |
+  = help: Remove unused import: `os`
+
+ℹ Fix
+1 1 | 
+2   |-import os
+3 2 | 
+4 3 | def f():
+5 4 |     import os
+
+
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__del_shadowed_local_import_in_local_scope.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__del_shadowed_local_import_in_local_scope.snap
new file mode 100644
index 0000000000000..be56cdb44ca64
--- /dev/null
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__del_shadowed_local_import_in_local_scope.snap
@@ -0,0 +1,14 @@
+---
+source: crates/ruff/src/rules/pyflakes/mod.rs
+---
+<filename>:4:12: F811 Redefinition of unused `os` from line 3
+  |
+4 | def f():
+5 |     import os
+6 |     import os
+  |            ^^ F811
+7 | 
+8 |     # Despite this `del`, `import os` should still be flagged as shadowing an unused
+  |
+
+
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__extend_immutable_calls.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__extend_immutable_calls.snap
new file mode 100644
index 0000000000000..1976c4331d419
--- /dev/null
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__extend_immutable_calls.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/pyflakes/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__f841_dummy_variable_rgx.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__f841_dummy_variable_rgx.snap
index 55ad23a7604d7..740d6c2f7f916 100644
--- a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__f841_dummy_variable_rgx.snap
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__f841_dummy_variable_rgx.snap
@@ -38,7 +38,7 @@ F841_0.py:20:5: F841 [*] Local variable `foo` is assigned to but never used
 22 21 | 
 23 22 |     bar = (1, 2)
 
-F841_0.py:21:6: F841 [*] Local variable `a` is assigned to but never used
+F841_0.py:21:6: F841 Local variable `a` is assigned to but never used
    |
 21 | def f():
 22 |     foo = (1, 2)
@@ -49,7 +49,7 @@ F841_0.py:21:6: F841 [*] Local variable `a` is assigned to but never used
    |
    = help: Remove assignment to unused variable `a`
 
-F841_0.py:21:9: F841 [*] Local variable `b` is assigned to but never used
+F841_0.py:21:9: F841 Local variable `b` is assigned to but never used
    |
 21 | def f():
 22 |     foo = (1, 2)
@@ -131,10 +131,9 @@ F841_0.py:37:5: F841 [*] Local variable `_discarded` is assigned to but never us
 35 35 |     _ = 1
 36 36 |     __ = 1
 37    |-    _discarded = 1
-   37 |+    pass
-38 38 | 
-39 39 | 
-40 40 | a = 1
+38 37 | 
+39 38 | 
+40 39 | a = 1
 
 F841_0.py:51:9: F841 [*] Local variable `b` is assigned to but never used
    |
@@ -238,7 +237,7 @@ F841_0.py:115:5: F841 [*] Local variable `Baz` is assigned to but never used
 117 117 |     match x:
 118 118 |         case (Foo.A):
 
-F841_0.py:122:14: F841 [*] Local variable `y` is assigned to but never used
+F841_0.py:122:14: F841 Local variable `y` is assigned to but never used
     |
 122 |         case [Bar.A, *_]:
 123 |             print("A")
@@ -248,7 +247,7 @@ F841_0.py:122:14: F841 [*] Local variable `y` is assigned to but never used
     |
     = help: Remove assignment to unused variable `y`
 
-F841_0.py:127:21: F841 [*] Local variable `value` is assigned to but never used
+F841_0.py:127:21: F841 Local variable `value` is assigned to but never used
     |
 127 | def f():
 128 |     if any((key := (value := x)) for x in ["ok"]):
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__future_annotations.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__future_annotations.snap
index 4f4798bbc551f..2c461e8868726 100644
--- a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__future_annotations.snap
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__future_annotations.snap
@@ -11,7 +11,7 @@ future_annotations.py:8:5: F401 [*] `models.Nut` imported but unused
    |
    = help: Remove unused import: `models.Nut`
 
-ℹ Suggested fix
+ℹ Fix
 5 5 | 
 6 6 | from models import (
 7 7 |     Fruit,
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__multi_statement_lines.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__multi_statement_lines.snap
index c64d7951120db..90e9bd0203c8d 100644
--- a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__multi_statement_lines.snap
+++ b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__multi_statement_lines.snap
@@ -10,7 +10,7 @@ multi_statement_lines.py:3:12: F401 [*] `foo1` imported but unused
   |
   = help: Remove unused import: `foo1`
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | 
 2 2 | if True:
 3   |-    import foo1; x = 1
@@ -30,7 +30,7 @@ multi_statement_lines.py:4:12: F401 [*] `foo2` imported but unused
   |
   = help: Remove unused import: `foo2`
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | 
 2 2 | if True:
 3 3 |     import foo1; x = 1
@@ -49,7 +49,7 @@ multi_statement_lines.py:7:12: F401 [*] `foo3` imported but unused
   |
   = help: Remove unused import: `foo3`
 
-ℹ Suggested fix
+ℹ Fix
 4 4 |     import foo2;     x = 1
 5 5 | 
 6 6 | if True:
@@ -69,7 +69,7 @@ multi_statement_lines.py:11:12: F401 [*] `foo4` imported but unused
    |
    = help: Remove unused import: `foo4`
 
-ℹ Suggested fix
+ℹ Fix
 8  8  | x = 1
 9  9  | 
 10 10 | if True:
@@ -88,7 +88,7 @@ multi_statement_lines.py:16:19: F401 [*] `foo5` imported but unused
    |
    = help: Remove unused import: `foo5`
 
-ℹ Suggested fix
+ℹ Fix
 13 13 | 
 14 14 | 
 15 15 | if True:
@@ -107,7 +107,7 @@ multi_statement_lines.py:21:17: F401 [*] `foo6` imported but unused
    |
    = help: Remove unused import: `foo6`
 
-ℹ Suggested fix
+ℹ Fix
 18 18 | 
 19 19 | if True:
 20 20 |     x = 1; \
@@ -126,7 +126,7 @@ multi_statement_lines.py:26:18: F401 [*] `foo7` imported but unused
    |
    = help: Remove unused import: `foo7`
 
-ℹ Suggested fix
+ℹ Fix
 23 23 | 
 24 24 | if True:
 25 25 |     x = 1 \
@@ -145,7 +145,7 @@ multi_statement_lines.py:30:19: F401 [*] `foo8` imported but unused
    |
    = help: Remove unused import: `foo8`
 
-ℹ Suggested fix
+ℹ Fix
 27 27 | 
 28 28 | 
 29 29 | if True:
@@ -166,7 +166,7 @@ multi_statement_lines.py:31:23: F401 [*] `foo9` imported but unused
    |
    = help: Remove unused import: `foo9`
 
-ℹ Suggested fix
+ℹ Fix
 28 28 | 
 29 29 | if True:
 30 30 |     x = 1; import foo8; x = 1
@@ -186,7 +186,7 @@ multi_statement_lines.py:35:16: F401 [*] `foo10` imported but unused
    |
    = help: Remove unused import: `foo10`
 
-ℹ Suggested fix
+ℹ Fix
 32 32 | 
 33 33 | if True:
 34 34 |     x = 1; \
@@ -207,7 +207,7 @@ multi_statement_lines.py:40:17: F401 [*] `foo11` imported but unused
    |
    = help: Remove unused import: `foo11`
 
-ℹ Suggested fix
+ℹ Fix
 37 37 | 
 38 38 | if True:
 39 39 |     x = 1 \
@@ -227,7 +227,7 @@ multi_statement_lines.py:46:8: F401 [*] `foo12` imported but unused
    |
    = help: Remove unused import: `foo12`
 
-ℹ Suggested fix
+ℹ Fix
 43 43 | 
 44 44 | # Continuation, but not as the last content in the file.
 45 45 | x = 1; \
@@ -247,7 +247,7 @@ multi_statement_lines.py:51:8: F401 [*] `foo13` imported but unused
    |
    = help: Remove unused import: `foo13`
 
-ℹ Suggested fix
+ℹ Fix
 48 48 | # Continuation, followed by end-of-file. (Removing `import foo` would cause a syntax
 49 49 | # error.)
 50 50 | x = 1; \
diff --git a/crates/ruff/src/rules/pygrep_hooks/mod.rs b/crates/ruff/src/rules/pygrep_hooks/mod.rs
index b31c5028717ca..a19bfe9adbf03 100644
--- a/crates/ruff/src/rules/pygrep_hooks/mod.rs
+++ b/crates/ruff/src/rules/pygrep_hooks/mod.rs
@@ -6,20 +6,20 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::Eval, Path::new("PGH001_0.py"); "PGH001_0")]
-    #[test_case(Rule::Eval, Path::new("PGH001_1.py"); "PGH001_1")]
-    #[test_case(Rule::DeprecatedLogWarn, Path::new("PGH002_0.py"); "PGH002_0")]
-    #[test_case(Rule::DeprecatedLogWarn, Path::new("PGH002_1.py"); "PGH002_1")]
-    #[test_case(Rule::BlanketTypeIgnore, Path::new("PGH003_0.py"); "PGH003_0")]
-    #[test_case(Rule::BlanketTypeIgnore, Path::new("PGH003_1.py"); "PGH003_1")]
-    #[test_case(Rule::BlanketNOQA, Path::new("PGH004_0.py"); "PGH004_0")]
+    #[test_case(Rule::Eval, Path::new("PGH001_0.py"))]
+    #[test_case(Rule::Eval, Path::new("PGH001_1.py"))]
+    #[test_case(Rule::DeprecatedLogWarn, Path::new("PGH002_0.py"))]
+    #[test_case(Rule::DeprecatedLogWarn, Path::new("PGH002_1.py"))]
+    #[test_case(Rule::BlanketTypeIgnore, Path::new("PGH003_0.py"))]
+    #[test_case(Rule::BlanketTypeIgnore, Path::new("PGH003_1.py"))]
+    #[test_case(Rule::BlanketNOQA, Path::new("PGH004_0.py"))]
+    #[test_case(Rule::InvalidMockAccess, Path::new("PGH005_0.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/pygrep_hooks/rules/blanket_noqa.rs b/crates/ruff/src/rules/pygrep_hooks/rules/blanket_noqa.rs
index 23673721fee3d..540ccb6fc1d74 100644
--- a/crates/ruff/src/rules/pygrep_hooks/rules/blanket_noqa.rs
+++ b/crates/ruff/src/rules/pygrep_hooks/rules/blanket_noqa.rs
@@ -4,7 +4,7 @@ use ruff_text_size::{TextLen, TextRange, TextSize};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::Line;
+use ruff_newlines::Line;
 
 /// ## What it does
 /// Check for `noqa` annotations that suppress all diagnostics, as opposed to
diff --git a/crates/ruff/src/rules/pygrep_hooks/rules/blanket_type_ignore.rs b/crates/ruff/src/rules/pygrep_hooks/rules/blanket_type_ignore.rs
index d16c9e7c226b1..f4675229e0707 100644
--- a/crates/ruff/src/rules/pygrep_hooks/rules/blanket_type_ignore.rs
+++ b/crates/ruff/src/rules/pygrep_hooks/rules/blanket_type_ignore.rs
@@ -5,7 +5,7 @@ use ruff_text_size::{TextLen, TextRange, TextSize};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::Line;
+use ruff_newlines::Line;
 
 /// ## What it does
 /// Check for `type: ignore` annotations that suppress all type warnings, as
diff --git a/crates/ruff/src/rules/pygrep_hooks/rules/deprecated_log_warn.rs b/crates/ruff/src/rules/pygrep_hooks/rules/deprecated_log_warn.rs
index 769898a3719c1..ba941d1d85510 100644
--- a/crates/ruff/src/rules/pygrep_hooks/rules/deprecated_log_warn.rs
+++ b/crates/ruff/src/rules/pygrep_hooks/rules/deprecated_log_warn.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::Expr;
+use rustpython_parser::ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -24,6 +24,7 @@ use crate::checkers::ast::Checker;
 /// ```python
 /// import logging
 ///
+///
 /// def foo():
 ///     logging.warning("Something happened")
 /// ```
@@ -41,9 +42,9 @@ impl Violation for DeprecatedLogWarn {
 }
 
 /// PGH002
-pub fn deprecated_log_warn(checker: &mut Checker, func: &Expr) {
+pub(crate) fn deprecated_log_warn(checker: &mut Checker, func: &Expr) {
     if checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(func)
         .map_or(false, |call_path| {
             call_path.as_slice() == ["logging", "warn"]
diff --git a/crates/ruff/src/rules/pygrep_hooks/rules/invalid_mock_access.rs b/crates/ruff/src/rules/pygrep_hooks/rules/invalid_mock_access.rs
new file mode 100644
index 0000000000000..d0b52d3ca8cff
--- /dev/null
+++ b/crates/ruff/src/rules/pygrep_hooks/rules/invalid_mock_access.rs
@@ -0,0 +1,99 @@
+use rustpython_parser::ast::{self, Expr, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+#[derive(Debug, PartialEq, Eq)]
+enum Reason {
+    UncalledMethod(String),
+    NonExistentMethod(String),
+}
+
+/// ## What it does
+/// Checks for common mistakes when using mock objects.
+///
+/// ## Why is this bad?
+/// The `mock` module exposes an assertion API that can be used to verify that
+/// mock objects undergo expected interactions. This rule checks for common
+/// mistakes when using this API.
+///
+/// For example, it checks for mock attribute accesses that should be replaced
+/// with mock method calls.
+///
+/// ## Example
+/// ```python
+/// my_mock.assert_called
+/// ```
+///
+/// Use instead:
+/// ```python
+/// my_mock.assert_called()
+/// ```
+#[violation]
+pub struct InvalidMockAccess {
+    reason: Reason,
+}
+
+impl Violation for InvalidMockAccess {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let InvalidMockAccess { reason } = self;
+        match reason {
+            Reason::UncalledMethod(name) => format!("Mock method should be called: `{name}`"),
+            Reason::NonExistentMethod(name) => format!("Non-existent mock method: `{name}`"),
+        }
+    }
+}
+
+/// PGH005
+pub(crate) fn uncalled_mock_method(checker: &mut Checker, expr: &Expr) {
+    if let Expr::Attribute(ast::ExprAttribute { attr, .. }) = expr {
+        if matches!(
+            attr.as_str(),
+            "assert_any_call"
+                | "assert_called"
+                | "assert_called_once"
+                | "assert_called_once_with"
+                | "assert_called_with"
+                | "assert_has_calls"
+                | "assert_not_called"
+        ) {
+            checker.diagnostics.push(Diagnostic::new(
+                InvalidMockAccess {
+                    reason: Reason::UncalledMethod(attr.to_string()),
+                },
+                expr.range(),
+            ));
+        }
+    }
+}
+
+/// PGH005
+pub(crate) fn non_existent_mock_method(checker: &mut Checker, test: &Expr) {
+    let attr = match test {
+        Expr::Attribute(ast::ExprAttribute { attr, .. }) => attr,
+        Expr::Call(ast::ExprCall { func, .. }) => match func.as_ref() {
+            Expr::Attribute(ast::ExprAttribute { attr, .. }) => attr,
+            _ => return,
+        },
+        _ => return,
+    };
+    if matches!(
+        attr.as_str(),
+        "any_call"
+            | "called_once"
+            | "called_once_with"
+            | "called_with"
+            | "has_calls"
+            | "not_called"
+    ) {
+        checker.diagnostics.push(Diagnostic::new(
+            InvalidMockAccess {
+                reason: Reason::NonExistentMethod(attr.to_string()),
+            },
+            test.range(),
+        ));
+    }
+}
diff --git a/crates/ruff/src/rules/pygrep_hooks/rules/mod.rs b/crates/ruff/src/rules/pygrep_hooks/rules/mod.rs
index 3cdb1112e03bb..b8fbfb773c062 100644
--- a/crates/ruff/src/rules/pygrep_hooks/rules/mod.rs
+++ b/crates/ruff/src/rules/pygrep_hooks/rules/mod.rs
@@ -1,9 +1,13 @@
 pub(crate) use blanket_noqa::{blanket_noqa, BlanketNOQA};
 pub(crate) use blanket_type_ignore::{blanket_type_ignore, BlanketTypeIgnore};
-pub use deprecated_log_warn::{deprecated_log_warn, DeprecatedLogWarn};
-pub use no_eval::{no_eval, Eval};
+pub(crate) use deprecated_log_warn::{deprecated_log_warn, DeprecatedLogWarn};
+pub(crate) use invalid_mock_access::{
+    non_existent_mock_method, uncalled_mock_method, InvalidMockAccess,
+};
+pub(crate) use no_eval::{no_eval, Eval};
 
 mod blanket_noqa;
 mod blanket_type_ignore;
 mod deprecated_log_warn;
+mod invalid_mock_access;
 mod no_eval;
diff --git a/crates/ruff/src/rules/pygrep_hooks/rules/no_eval.rs b/crates/ruff/src/rules/pygrep_hooks/rules/no_eval.rs
index df0cc8d34ca57..40b224a22c595 100644
--- a/crates/ruff/src/rules/pygrep_hooks/rules/no_eval.rs
+++ b/crates/ruff/src/rules/pygrep_hooks/rules/no_eval.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -39,14 +39,14 @@ impl Violation for Eval {
 }
 
 /// PGH001
-pub fn no_eval(checker: &mut Checker, func: &Expr) {
-    let ExprKind::Name { id, .. } = &func.node else {
+pub(crate) fn no_eval(checker: &mut Checker, func: &Expr) {
+    let Expr::Name(ast::ExprName { id, .. }) = func else {
         return;
     };
     if id != "eval" {
         return;
     }
-    if !checker.ctx.is_builtin("eval") {
+    if !checker.semantic_model().is_builtin("eval") {
         return;
     }
     checker
diff --git a/crates/ruff/src/rules/pygrep_hooks/snapshots/ruff__rules__pygrep_hooks__tests__PGH005_PGH005_0.py.snap b/crates/ruff/src/rules/pygrep_hooks/snapshots/ruff__rules__pygrep_hooks__tests__PGH005_PGH005_0.py.snap
new file mode 100644
index 0000000000000..fbf587a5b827f
--- /dev/null
+++ b/crates/ruff/src/rules/pygrep_hooks/snapshots/ruff__rules__pygrep_hooks__tests__PGH005_PGH005_0.py.snap
@@ -0,0 +1,92 @@
+---
+source: crates/ruff/src/rules/pygrep_hooks/mod.rs
+---
+PGH005_0.py:2:8: PGH005 Non-existent mock method: `not_called`
+  |
+2 | # Errors
+3 | assert my_mock.not_called()
+  |        ^^^^^^^^^^^^^^^^^^^^ PGH005
+4 | assert my_mock.called_once_with()
+5 | assert my_mock.not_called
+  |
+
+PGH005_0.py:3:8: PGH005 Non-existent mock method: `called_once_with`
+  |
+3 | # Errors
+4 | assert my_mock.not_called()
+5 | assert my_mock.called_once_with()
+  |        ^^^^^^^^^^^^^^^^^^^^^^^^^^ PGH005
+6 | assert my_mock.not_called
+7 | assert my_mock.called_once_with
+  |
+
+PGH005_0.py:4:8: PGH005 Non-existent mock method: `not_called`
+  |
+4 | assert my_mock.not_called()
+5 | assert my_mock.called_once_with()
+6 | assert my_mock.not_called
+  |        ^^^^^^^^^^^^^^^^^^ PGH005
+7 | assert my_mock.called_once_with
+8 | my_mock.assert_not_called
+  |
+
+PGH005_0.py:5:8: PGH005 Non-existent mock method: `called_once_with`
+  |
+5 | assert my_mock.called_once_with()
+6 | assert my_mock.not_called
+7 | assert my_mock.called_once_with
+  |        ^^^^^^^^^^^^^^^^^^^^^^^^ PGH005
+8 | my_mock.assert_not_called
+9 | my_mock.assert_called
+  |
+
+PGH005_0.py:6:1: PGH005 Mock method should be called: `assert_not_called`
+   |
+ 6 | assert my_mock.not_called
+ 7 | assert my_mock.called_once_with
+ 8 | my_mock.assert_not_called
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^ PGH005
+ 9 | my_mock.assert_called
+10 | my_mock.assert_called_once_with
+   |
+
+PGH005_0.py:7:1: PGH005 Mock method should be called: `assert_called`
+   |
+ 7 | assert my_mock.called_once_with
+ 8 | my_mock.assert_not_called
+ 9 | my_mock.assert_called
+   | ^^^^^^^^^^^^^^^^^^^^^ PGH005
+10 | my_mock.assert_called_once_with
+11 | my_mock.assert_called_once_with
+   |
+
+PGH005_0.py:8:1: PGH005 Mock method should be called: `assert_called_once_with`
+   |
+ 8 | my_mock.assert_not_called
+ 9 | my_mock.assert_called
+10 | my_mock.assert_called_once_with
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PGH005
+11 | my_mock.assert_called_once_with
+12 | MyMock.assert_called_once_with
+   |
+
+PGH005_0.py:9:1: PGH005 Mock method should be called: `assert_called_once_with`
+   |
+ 9 | my_mock.assert_called
+10 | my_mock.assert_called_once_with
+11 | my_mock.assert_called_once_with
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PGH005
+12 | MyMock.assert_called_once_with
+   |
+
+PGH005_0.py:10:1: PGH005 Mock method should be called: `assert_called_once_with`
+   |
+10 | my_mock.assert_called_once_with
+11 | my_mock.assert_called_once_with
+12 | MyMock.assert_called_once_with
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PGH005
+13 | 
+14 | # OK
+   |
+
+
diff --git a/crates/ruff/src/rules/pylint/helpers.rs b/crates/ruff/src/rules/pylint/helpers.rs
index ca3e84daa6f7d..8c27fb73670e3 100644
--- a/crates/ruff/src/rules/pylint/helpers.rs
+++ b/crates/ruff/src/rules/pylint/helpers.rs
@@ -1,33 +1,42 @@
 use ruff_python_semantic::analyze::function_type;
 use ruff_python_semantic::analyze::function_type::FunctionType;
-use ruff_python_semantic::scope::{FunctionDef, ScopeKind};
+use ruff_python_semantic::model::SemanticModel;
+use ruff_python_semantic::scope::ScopeKind;
+use rustpython_parser::ast;
 
-use crate::checkers::ast::Checker;
+use crate::settings::Settings;
 
-pub fn in_dunder_init(checker: &Checker) -> bool {
-    let scope = checker.ctx.scope();
-    let ScopeKind::Function(FunctionDef {
-        name,
-        decorator_list,
+pub(crate) fn in_dunder_init(model: &SemanticModel, settings: &Settings) -> bool {
+    let scope = model.scope();
+    let (
+        ScopeKind::Function(ast::StmtFunctionDef {
+            name,
+            decorator_list,
         ..
-    }): ScopeKind = scope.kind else {
+        }) |
+        ScopeKind::AsyncFunction(ast::StmtAsyncFunctionDef {
+            name,
+            decorator_list,
+            ..
+        })
+    ) = scope.kind else {
         return false;
     };
     if name != "__init__" {
         return false;
     }
-    let Some(parent) = scope.parent.map(|scope_id| &checker.ctx.scopes[scope_id]) else {
+    let Some(parent) = scope.parent.map(|scope_id| &model.scopes[scope_id]) else {
         return false;
     };
 
     if !matches!(
         function_type::classify(
-            &checker.ctx,
+            model,
             parent,
             name,
             decorator_list,
-            &checker.settings.pep8_naming.classmethod_decorators,
-            &checker.settings.pep8_naming.staticmethod_decorators,
+            &settings.pep8_naming.classmethod_decorators,
+            &settings.pep8_naming.staticmethod_decorators,
         ),
         FunctionType::Method
     ) {
diff --git a/crates/ruff/src/rules/pylint/mod.rs b/crates/ruff/src/rules/pylint/mod.rs
index 2cac8fb3d24dc..c7536d1922faa 100644
--- a/crates/ruff/src/rules/pylint/mod.rs
+++ b/crates/ruff/src/rules/pylint/mod.rs
@@ -7,67 +7,103 @@ pub mod settings;
 mod tests {
     use std::path::Path;
 
-    use crate::assert_messages;
     use anyhow::Result;
-
     use regex::Regex;
     use test_case::test_case;
 
+    use crate::assert_messages;
     use crate::registry::Rule;
     use crate::rules::pylint;
     use crate::settings::types::PythonVersion;
     use crate::settings::Settings;
     use crate::test::test_path;
 
-    #[test_case(Rule::AwaitOutsideAsync, Path::new("await_outside_async.py"); "PLE1142")]
-    #[test_case(Rule::AssertOnStringLiteral, Path::new("assert_on_string_literal.py"); "PLW0129")]
-    #[test_case(Rule::BadStrStripCall, Path::new("bad_str_strip_call.py"); "PLE01310")]
-    #[test_case(Rule::BadStringFormatType, Path::new("bad_string_format_type.py"); "PLE1307")]
-    #[test_case(Rule::BidirectionalUnicode, Path::new("bidirectional_unicode.py"); "PLE2502")]
-    #[test_case(Rule::BinaryOpException, Path::new("binary_op_exception.py"); "PLW0711")]
-    #[test_case(Rule::CollapsibleElseIf, Path::new("collapsible_else_if.py"); "PLR5501")]
-    #[test_case(Rule::CompareToEmptyString, Path::new("compare_to_empty_string.py"); "PLC1901")]
-    #[test_case(Rule::ComparisonOfConstant, Path::new("comparison_of_constant.py"); "PLR0133")]
-    #[test_case(Rule::RepeatedIsinstanceCalls, Path::new("repeated_isinstance_calls.py"); "PLR1701")]
-    #[test_case(Rule::ManualFromImport, Path::new("import_aliasing.py"); "PLR0402")]
-    #[test_case(Rule::SysExitAlias, Path::new("sys_exit_alias_0.py"); "PLR1722_0")]
-    #[test_case(Rule::SysExitAlias, Path::new("sys_exit_alias_1.py"); "PLR1722_1")]
-    #[test_case(Rule::SysExitAlias, Path::new("sys_exit_alias_2.py"); "PLR1722_2")]
-    #[test_case(Rule::SysExitAlias, Path::new("sys_exit_alias_3.py"); "PLR1722_3")]
-    #[test_case(Rule::SysExitAlias, Path::new("sys_exit_alias_4.py"); "PLR1722_4")]
-    #[test_case(Rule::SysExitAlias, Path::new("sys_exit_alias_5.py"); "PLR1722_5")]
-    #[test_case(Rule::SysExitAlias, Path::new("sys_exit_alias_6.py"); "PLR1722_6")]
-    #[test_case(Rule::ContinueInFinally, Path::new("continue_in_finally.py"); "PLE0116")]
-    #[test_case(Rule::GlobalStatement, Path::new("global_statement.py"); "PLW0603")]
-    #[test_case(Rule::GlobalVariableNotAssigned, Path::new("global_variable_not_assigned.py"); "PLW0602")]
-    #[test_case(Rule::ImportSelf, Path::new("import_self/module.py"); "PLW0406")]
-    #[test_case(Rule::InvalidAllFormat, Path::new("invalid_all_format.py"); "PLE0605")]
-    #[test_case(Rule::InvalidAllObject, Path::new("invalid_all_object.py"); "PLE0604")]
-    #[test_case(Rule::InvalidCharacterBackspace, Path::new("invalid_characters.py"); "PLE2510")]
-    #[test_case(Rule::InvalidCharacterEsc, Path::new("invalid_characters.py"); "PLE2513")]
-    #[test_case(Rule::InvalidCharacterNul, Path::new("invalid_characters.py"); "PLE2514")]
-    #[test_case(Rule::InvalidCharacterSub, Path::new("invalid_characters.py"); "PLE2512")]
-    #[test_case(Rule::InvalidCharacterZeroWidthSpace, Path::new("invalid_characters.py"); "PLE2515")]
-    #[test_case(Rule::InvalidEnvvarDefault, Path::new("invalid_envvar_default.py"); "PLW1508")]
-    #[test_case(Rule::InvalidEnvvarValue, Path::new("invalid_envvar_value.py"); "PLE1507")]
-    #[test_case(Rule::LoggingTooFewArgs, Path::new("logging_too_few_args.py"); "PLE1206")]
-    #[test_case(Rule::LoggingTooManyArgs, Path::new("logging_too_many_args.py"); "PLE1205")]
-    #[test_case(Rule::MagicValueComparison, Path::new("magic_value_comparison.py"); "PLR2004")]
-    #[test_case(Rule::NonlocalWithoutBinding, Path::new("nonlocal_without_binding.py"); "PLE0117")]
-    #[test_case(Rule::PropertyWithParameters, Path::new("property_with_parameters.py"); "PLR0206")]
-    #[test_case(Rule::RedefinedLoopName, Path::new("redefined_loop_name.py"); "PLW2901")]
-    #[test_case(Rule::ReturnInInit, Path::new("return_in_init.py"); "PLE0101")]
-    #[test_case(Rule::TooManyArguments, Path::new("too_many_arguments.py"); "PLR0913")]
-    #[test_case(Rule::TooManyBranches, Path::new("too_many_branches.py"); "PLR0912")]
-    #[test_case(Rule::TooManyReturnStatements, Path::new("too_many_return_statements.py"); "PLR0911")]
-    #[test_case(Rule::TooManyStatements, Path::new("too_many_statements.py"); "PLR0915")]
-    #[test_case(Rule::UnexpectedSpecialMethodSignature, Path::new("unexpected_special_method_signature.py"); "PLE0302")]
-    #[test_case(Rule::UnnecessaryDirectLambdaCall, Path::new("unnecessary_direct_lambda_call.py"); "PLC3002")]
-    #[test_case(Rule::LoadBeforeGlobalDeclaration, Path::new("load_before_global_declaration.py"); "PLE0118")]
-    #[test_case(Rule::UselessElseOnLoop, Path::new("useless_else_on_loop.py"); "PLW0120")]
-    #[test_case(Rule::UselessImportAlias, Path::new("import_aliasing.py"); "PLC0414")]
-    #[test_case(Rule::UselessReturn, Path::new("useless_return.py"); "PLR1711")]
-    #[test_case(Rule::YieldInInit, Path::new("yield_in_init.py"); "PLE0100")]
+    #[test_case(Rule::AwaitOutsideAsync, Path::new("await_outside_async.py"))]
+    #[test_case(Rule::AssertOnStringLiteral, Path::new("assert_on_string_literal.py"))]
+    #[test_case(Rule::BadStrStripCall, Path::new("bad_str_strip_call.py"))]
+    #[test_case(Rule::BadStringFormatType, Path::new("bad_string_format_type.py"))]
+    #[test_case(Rule::BidirectionalUnicode, Path::new("bidirectional_unicode.py"))]
+    #[test_case(Rule::BinaryOpException, Path::new("binary_op_exception.py"))]
+    #[test_case(Rule::CollapsibleElseIf, Path::new("collapsible_else_if.py"))]
+    #[test_case(Rule::CompareToEmptyString, Path::new("compare_to_empty_string.py"))]
+    #[test_case(Rule::ComparisonOfConstant, Path::new("comparison_of_constant.py"))]
+    #[test_case(
+        Rule::RepeatedIsinstanceCalls,
+        Path::new("repeated_isinstance_calls.py")
+    )]
+    #[test_case(Rule::ManualFromImport, Path::new("import_aliasing.py"))]
+    #[test_case(Rule::SysExitAlias, Path::new("sys_exit_alias_0.py"))]
+    #[test_case(Rule::SysExitAlias, Path::new("sys_exit_alias_1.py"))]
+    #[test_case(Rule::SysExitAlias, Path::new("sys_exit_alias_2.py"))]
+    #[test_case(Rule::SysExitAlias, Path::new("sys_exit_alias_3.py"))]
+    #[test_case(Rule::SysExitAlias, Path::new("sys_exit_alias_4.py"))]
+    #[test_case(Rule::SysExitAlias, Path::new("sys_exit_alias_5.py"))]
+    #[test_case(Rule::SysExitAlias, Path::new("sys_exit_alias_6.py"))]
+    #[test_case(Rule::SysExitAlias, Path::new("sys_exit_alias_7.py"))]
+    #[test_case(Rule::SysExitAlias, Path::new("sys_exit_alias_8.py"))]
+    #[test_case(Rule::SysExitAlias, Path::new("sys_exit_alias_9.py"))]
+    #[test_case(Rule::SysExitAlias, Path::new("sys_exit_alias_10.py"))]
+    #[test_case(Rule::ContinueInFinally, Path::new("continue_in_finally.py"))]
+    #[test_case(Rule::GlobalStatement, Path::new("global_statement.py"))]
+    #[test_case(
+        Rule::GlobalVariableNotAssigned,
+        Path::new("global_variable_not_assigned.py")
+    )]
+    #[test_case(Rule::ImportSelf, Path::new("import_self/module.py"))]
+    #[test_case(Rule::InvalidAllFormat, Path::new("invalid_all_format.py"))]
+    #[test_case(Rule::InvalidAllObject, Path::new("invalid_all_object.py"))]
+    #[test_case(Rule::InvalidStrReturnType, Path::new("invalid_return_type_str.py"))]
+    #[test_case(Rule::DuplicateBases, Path::new("duplicate_bases.py"))]
+    #[test_case(Rule::InvalidCharacterBackspace, Path::new("invalid_characters.py"))]
+    #[test_case(Rule::InvalidCharacterEsc, Path::new("invalid_characters.py"))]
+    #[test_case(Rule::InvalidCharacterNul, Path::new("invalid_characters.py"))]
+    #[test_case(Rule::InvalidCharacterSub, Path::new("invalid_characters.py"))]
+    #[test_case(
+        Rule::InvalidCharacterZeroWidthSpace,
+        Path::new("invalid_characters.py")
+    )]
+    #[test_case(Rule::InvalidEnvvarDefault, Path::new("invalid_envvar_default.py"))]
+    #[test_case(Rule::InvalidEnvvarValue, Path::new("invalid_envvar_value.py"))]
+    #[test_case(Rule::IterationOverSet, Path::new("iteration_over_set.py"))]
+    #[test_case(Rule::LoggingTooFewArgs, Path::new("logging_too_few_args.py"))]
+    #[test_case(Rule::LoggingTooManyArgs, Path::new("logging_too_many_args.py"))]
+    #[test_case(Rule::MagicValueComparison, Path::new("magic_value_comparison.py"))]
+    #[test_case(
+        Rule::NamedExprWithoutContext,
+        Path::new("named_expr_without_context.py")
+    )]
+    #[test_case(Rule::NonlocalWithoutBinding, Path::new("nonlocal_without_binding.py"))]
+    #[test_case(Rule::PropertyWithParameters, Path::new("property_with_parameters.py"))]
+    #[test_case(Rule::RedefinedLoopName, Path::new("redefined_loop_name.py"))]
+    #[test_case(Rule::ReturnInInit, Path::new("return_in_init.py"))]
+    #[test_case(Rule::TooManyArguments, Path::new("too_many_arguments.py"))]
+    #[test_case(Rule::TooManyBranches, Path::new("too_many_branches.py"))]
+    #[test_case(
+        Rule::TooManyReturnStatements,
+        Path::new("too_many_return_statements.py")
+    )]
+    #[test_case(Rule::TooManyStatements, Path::new("too_many_statements.py"))]
+    #[test_case(
+        Rule::UnexpectedSpecialMethodSignature,
+        Path::new("unexpected_special_method_signature.py")
+    )]
+    #[test_case(
+        Rule::UnnecessaryDirectLambdaCall,
+        Path::new("unnecessary_direct_lambda_call.py")
+    )]
+    #[test_case(
+        Rule::LoadBeforeGlobalDeclaration,
+        Path::new("load_before_global_declaration.py")
+    )]
+    #[test_case(Rule::UselessElseOnLoop, Path::new("useless_else_on_loop.py"))]
+    #[test_case(Rule::UselessImportAlias, Path::new("import_aliasing.py"))]
+    #[test_case(Rule::UselessReturn, Path::new("useless_return.py"))]
+    #[test_case(
+        Rule::YieldFromInAsyncFunction,
+        Path::new("yield_from_in_async_function.py")
+    )]
+    #[test_case(Rule::YieldInInit, Path::new("yield_in_init.py"))]
+    #[test_case(Rule::NestedMinMax, Path::new("nested_min_max.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
@@ -78,6 +114,19 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn repeated_isinstance_calls() -> Result<()> {
+        let diagnostics = test_path(
+            Path::new("pylint/repeated_isinstance_calls.py"),
+            &Settings {
+                target_version: PythonVersion::Py39,
+                ..Settings::for_rules(vec![Rule::RepeatedIsinstanceCalls])
+            },
+        )?;
+        assert_messages!(diagnostics);
+        Ok(())
+    }
+
     #[test]
     fn continue_in_finally() -> Result<()> {
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/pylint/rules/assert_on_string_literal.rs b/crates/ruff/src/rules/pylint/rules/assert_on_string_literal.rs
index 3a1fc68d55730..a529d9f256364 100644
--- a/crates/ruff/src/rules/pylint/rules/assert_on_string_literal.rs
+++ b/crates/ruff/src/rules/pylint/rules/assert_on_string_literal.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Constant, Expr, ExprKind};
+use rustpython_parser::ast::{self, Constant, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -42,9 +42,9 @@ impl Violation for AssertOnStringLiteral {
 }
 
 /// PLW0129
-pub fn assert_on_string_literal(checker: &mut Checker, test: &Expr) {
-    match &test.node {
-        ExprKind::Constant { value, .. } => match value {
+pub(crate) fn assert_on_string_literal(checker: &mut Checker, test: &Expr) {
+    match test {
+        Expr::Constant(ast::ExprConstant { value, .. }) => match value {
             Constant::Str(value, ..) => {
                 checker.diagnostics.push(Diagnostic::new(
                     AssertOnStringLiteral {
@@ -71,11 +71,11 @@ pub fn assert_on_string_literal(checker: &mut Checker, test: &Expr) {
             }
             _ => {}
         },
-        ExprKind::JoinedStr { values } => {
+        Expr::JoinedStr(ast::ExprJoinedStr { values, range: _ }) => {
             checker.diagnostics.push(Diagnostic::new(
                 AssertOnStringLiteral {
-                    kind: if values.iter().all(|value| match &value.node {
-                        ExprKind::Constant { value, .. } => match value {
+                    kind: if values.iter().all(|value| match value {
+                        Expr::Constant(ast::ExprConstant { value, .. }) => match value {
                             Constant::Str(value, ..) => value.is_empty(),
                             Constant::Bytes(value) => value.is_empty(),
                             _ => false,
@@ -83,8 +83,8 @@ pub fn assert_on_string_literal(checker: &mut Checker, test: &Expr) {
                         _ => false,
                     }) {
                         Kind::Empty
-                    } else if values.iter().any(|value| match &value.node {
-                        ExprKind::Constant { value, .. } => match value {
+                    } else if values.iter().any(|value| match value {
+                        Expr::Constant(ast::ExprConstant { value, .. }) => match value {
                             Constant::Str(value, ..) => !value.is_empty(),
                             Constant::Bytes(value) => !value.is_empty(),
                             _ => false,
diff --git a/crates/ruff/src/rules/pylint/rules/await_outside_async.rs b/crates/ruff/src/rules/pylint/rules/await_outside_async.rs
index fdc54f37e80d6..0a7c2936aafdd 100644
--- a/crates/ruff/src/rules/pylint/rules/await_outside_async.rs
+++ b/crates/ruff/src/rules/pylint/rules/await_outside_async.rs
@@ -1,11 +1,37 @@
-use rustpython_parser::ast::Expr;
+use rustpython_parser::ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_semantic::scope::{FunctionDef, ScopeKind};
 
 use crate::checkers::ast::Checker;
 
+/// ## What it does
+/// Checks for usages of `await` outside of `async` functions.
+///
+/// ## Why is this bad?
+/// Using `await` outside of an `async` function is a syntax error.
+///
+/// ## Example
+/// ```python
+/// import asyncio
+///
+///
+/// def foo():
+///     await asyncio.sleep(1)
+/// ```
+///
+/// Use instead:
+/// ```python
+/// import asyncio
+///
+///
+/// async def foo():
+///     await asyncio.sleep(1)
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/expressions.html#await)
+/// - [PEP 492](https://peps.python.org/pep-0492/#await-expression)
 #[violation]
 pub struct AwaitOutsideAsync;
 
@@ -17,19 +43,8 @@ impl Violation for AwaitOutsideAsync {
 }
 
 /// PLE1142
-pub fn await_outside_async(checker: &mut Checker, expr: &Expr) {
-    if !checker
-        .ctx
-        .scopes()
-        .find_map(|scope| {
-            if let ScopeKind::Function(FunctionDef { async_, .. }) = &scope.kind {
-                Some(*async_)
-            } else {
-                None
-            }
-        })
-        .unwrap_or(true)
-    {
+pub(crate) fn await_outside_async(checker: &mut Checker, expr: &Expr) {
+    if !checker.semantic_model().in_async_context() {
         checker
             .diagnostics
             .push(Diagnostic::new(AwaitOutsideAsync, expr.range()));
diff --git a/crates/ruff/src/rules/pylint/rules/bad_str_strip_call.rs b/crates/ruff/src/rules/pylint/rules/bad_str_strip_call.rs
index 233f04e97ebc9..4e961f434b9ab 100644
--- a/crates/ruff/src/rules/pylint/rules/bad_str_strip_call.rs
+++ b/crates/ruff/src/rules/pylint/rules/bad_str_strip_call.rs
@@ -1,7 +1,7 @@
 use std::fmt;
 
 use rustc_hash::FxHashSet;
-use rustpython_parser::ast::{Constant, Expr, ExprKind};
+use rustpython_parser::ast::{self, Constant, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -9,6 +9,26 @@ use ruff_macros::{derive_message_formats, violation};
 use crate::checkers::ast::Checker;
 use crate::settings::types::PythonVersion;
 
+/// ## What it does
+/// Checks duplicate characters in `str#strip` calls.
+///
+/// ## Why is this bad?
+/// All characters in `str#strip` calls are removed from both the leading and
+/// trailing ends of the string. Including duplicate characters in the call
+/// is redundant and often indicative of a mistake.
+///
+/// ## Example
+/// ```python
+/// "bar foo baz".strip("bar baz ")  # "foo"
+/// ```
+///
+/// Use instead:
+/// ```python
+/// "bar foo baz".strip("abrz ")  # "foo"
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/stdtypes.html?highlight=strip#str.strip)
 #[violation]
 pub struct BadStrStripCall {
     strip: StripKind,
@@ -30,14 +50,14 @@ impl Violation for BadStrStripCall {
 }
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub enum StripKind {
+pub(crate) enum StripKind {
     Strip,
     LStrip,
     RStrip,
 }
 
 impl StripKind {
-    pub fn from_str(s: &str) -> Option<Self> {
+    pub(crate) fn from_str(s: &str) -> Option<Self> {
         match s {
             "strip" => Some(Self::Strip),
             "lstrip" => Some(Self::LStrip),
@@ -59,13 +79,13 @@ impl fmt::Display for StripKind {
 }
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub enum RemovalKind {
+pub(crate) enum RemovalKind {
     RemovePrefix,
     RemoveSuffix,
 }
 
 impl RemovalKind {
-    pub fn for_strip(s: StripKind) -> Option<Self> {
+    pub(crate) fn for_strip(s: StripKind) -> Option<Self> {
         match s {
             StripKind::Strip => None,
             StripKind::LStrip => Some(Self::RemovePrefix),
@@ -106,21 +126,21 @@ fn has_duplicates(s: &str) -> bool {
 }
 
 /// PLE1310
-pub fn bad_str_strip_call(checker: &mut Checker, func: &Expr, args: &[Expr]) {
-    if let ExprKind::Attribute { value, attr, .. } = &func.node {
+pub(crate) fn bad_str_strip_call(checker: &mut Checker, func: &Expr, args: &[Expr]) {
+    if let Expr::Attribute(ast::ExprAttribute { value, attr, .. }) = func {
         if matches!(
-            value.node,
-            ExprKind::Constant {
+            value.as_ref(),
+            Expr::Constant(ast::ExprConstant {
                 value: Constant::Str(_) | Constant::Bytes(_),
                 ..
-            }
+            })
         ) {
             if let Some(strip) = StripKind::from_str(attr.as_str()) {
                 if let Some(arg) = args.get(0) {
-                    if let ExprKind::Constant {
+                    if let Expr::Constant(ast::ExprConstant {
                         value: Constant::Str(value),
                         ..
-                    } = &arg.node
+                    }) = &arg
                     {
                         if has_duplicates(value) {
                             let removal = if checker.settings.target_version >= PythonVersion::Py39
diff --git a/crates/ruff/src/rules/pylint/rules/bad_string_format_type.rs b/crates/ruff/src/rules/pylint/rules/bad_string_format_type.rs
index 7870c0395a11b..137b346cda293 100644
--- a/crates/ruff/src/rules/pylint/rules/bad_string_format_type.rs
+++ b/crates/ruff/src/rules/pylint/rules/bad_string_format_type.rs
@@ -1,14 +1,15 @@
-use ruff_text_size::TextRange;
 use std::str::FromStr;
 
+use ruff_text_size::TextRange;
 use rustc_hash::FxHashMap;
-use rustpython_common::cformat::{CFormatPart, CFormatSpec, CFormatStrOrBytes, CFormatString};
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Operator};
+use rustpython_format::cformat::{CFormatPart, CFormatSpec, CFormatStrOrBytes, CFormatString};
+use rustpython_parser::ast::{self, Constant, Expr, Ranged};
 use rustpython_parser::{lexer, Mode, Tok};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::str::{leading_quote, trailing_quote};
+use ruff_python_semantic::analyze::type_inference::PythonType;
 
 use crate::checkers::ast::Checker;
 
@@ -39,66 +40,34 @@ impl Violation for BadStringFormatType {
 }
 
 #[derive(Debug, Copy, Clone)]
-enum DataType {
+enum FormatType {
+    Repr,
     String,
     Integer,
     Float,
-    Object,
+    Number,
     Unknown,
 }
 
-impl From<&Expr> for DataType {
-    fn from(expr: &Expr) -> Self {
-        match &expr.node {
-            ExprKind::NamedExpr { value, .. } => (&**value).into(),
-            ExprKind::UnaryOp { operand, .. } => (&**operand).into(),
-            ExprKind::Dict { .. } => DataType::Object,
-            ExprKind::Set { .. } => DataType::Object,
-            ExprKind::ListComp { .. } => DataType::Object,
-            ExprKind::SetComp { .. } => DataType::Object,
-            ExprKind::DictComp { .. } => DataType::Object,
-            ExprKind::GeneratorExp { .. } => DataType::Object,
-            ExprKind::JoinedStr { .. } => DataType::String,
-            ExprKind::BinOp { left, op, .. } => {
-                // Ex) "a" % "b"
-                if matches!(
-                    left.node,
-                    ExprKind::Constant {
-                        value: Constant::Str(..),
-                        ..
-                    }
-                ) && matches!(op, Operator::Mod)
-                {
-                    return DataType::String;
-                }
-                DataType::Unknown
-            }
-            ExprKind::Constant { value, .. } => match value {
-                Constant::Str(_) => DataType::String,
-                Constant::Int(_) => DataType::Integer,
-                Constant::Float(_) => DataType::Float,
-                _ => DataType::Unknown,
-            },
-            ExprKind::List { .. } => DataType::Object,
-            ExprKind::Tuple { .. } => DataType::Object,
-            _ => DataType::Unknown,
-        }
-    }
-}
-
-impl DataType {
-    fn is_compatible_with(self, format: FormatType) -> bool {
-        match self {
-            DataType::String => matches!(
-                format,
-                FormatType::Unknown | FormatType::String | FormatType::Repr
-            ),
-            DataType::Object => matches!(
-                format,
+impl FormatType {
+    fn is_compatible_with(self, data_type: PythonType) -> bool {
+        match data_type {
+            PythonType::String
+            | PythonType::Bytes
+            | PythonType::List
+            | PythonType::Dict
+            | PythonType::Set
+            | PythonType::Tuple
+            | PythonType::Generator
+            | PythonType::Complex
+            | PythonType::Bool
+            | PythonType::Ellipsis
+            | PythonType::None => matches!(
+                self,
                 FormatType::Unknown | FormatType::String | FormatType::Repr
             ),
-            DataType::Integer => matches!(
-                format,
+            PythonType::Integer => matches!(
+                self,
                 FormatType::Unknown
                     | FormatType::String
                     | FormatType::Repr
@@ -106,29 +75,19 @@ impl DataType {
                     | FormatType::Float
                     | FormatType::Number
             ),
-            DataType::Float => matches!(
-                format,
+            PythonType::Float => matches!(
+                self,
                 FormatType::Unknown
                     | FormatType::String
                     | FormatType::Repr
                     | FormatType::Float
                     | FormatType::Number
             ),
-            DataType::Unknown => true,
+            PythonType::Unknown => true,
         }
     }
 }
 
-#[derive(Debug, Copy, Clone)]
-enum FormatType {
-    Repr,
-    String,
-    Integer,
-    Float,
-    Number,
-    Unknown,
-}
-
 impl From<char> for FormatType {
     fn from(format: char) -> Self {
         match format {
@@ -159,9 +118,9 @@ fn collect_specs(formats: &[CFormatStrOrBytes<String>]) -> Vec<&CFormatSpec> {
 
 /// Return `true` if the format string is equivalent to the constant type
 fn equivalent(format: &CFormatSpec, value: &Expr) -> bool {
-    let constant: DataType = value.into();
     let format: FormatType = format.format_char.into();
-    constant.is_compatible_with(format)
+    let constant: PythonType = value.into();
+    format.is_compatible_with(constant)
 }
 
 /// Return `true` if the [`Constnat`] aligns with the format type.
@@ -221,10 +180,10 @@ fn is_valid_dict(
         let Some(key) = key else {
             return true;
         };
-        if let ExprKind::Constant {
+        if let Expr::Constant(ast::ExprConstant {
             value: Constant::Str(mapping_key),
             ..
-        } = &key.node
+        }) = key
         {
             let Some(format) = formats_hash.get(mapping_key.as_str()) else {
                 return true;
@@ -241,11 +200,11 @@ fn is_valid_dict(
 }
 
 /// PLE1307
-pub fn bad_string_format_type(checker: &mut Checker, expr: &Expr, right: &Expr) {
+pub(crate) fn bad_string_format_type(checker: &mut Checker, expr: &Expr, right: &Expr) {
     // Grab each string segment (in case there's an implicit concatenation).
     let content = checker.locator.slice(expr.range());
     let mut strings: Vec<TextRange> = vec![];
-    for (tok, range) in lexer::lex_located(content, Mode::Module, expr.start()).flatten() {
+    for (tok, range) in lexer::lex_starts_at(content, Mode::Module, expr.start()).flatten() {
         if matches!(tok, Tok::String { .. }) {
             strings.push(range);
         } else if matches!(tok, Tok::Percent) {
@@ -275,10 +234,14 @@ pub fn bad_string_format_type(checker: &mut Checker, expr: &Expr, right: &Expr)
     }
 
     // Parse the parameters.
-    let is_valid = match &right.node {
-        ExprKind::Tuple { elts, .. } => is_valid_tuple(&format_strings, elts),
-        ExprKind::Dict { keys, values } => is_valid_dict(&format_strings, keys, values),
-        ExprKind::Constant { .. } => is_valid_constant(&format_strings, right),
+    let is_valid = match right {
+        Expr::Tuple(ast::ExprTuple { elts, .. }) => is_valid_tuple(&format_strings, elts),
+        Expr::Dict(ast::ExprDict {
+            keys,
+            values,
+            range: _,
+        }) => is_valid_dict(&format_strings, keys, values),
+        Expr::Constant(_) => is_valid_constant(&format_strings, right),
         _ => true,
     };
     if !is_valid {
diff --git a/crates/ruff/src/rules/pylint/rules/bidirectional_unicode.rs b/crates/ruff/src/rules/pylint/rules/bidirectional_unicode.rs
index 769ac2de907a6..1bf4583995a77 100644
--- a/crates/ruff/src/rules/pylint/rules/bidirectional_unicode.rs
+++ b/crates/ruff/src/rules/pylint/rules/bidirectional_unicode.rs
@@ -1,6 +1,6 @@
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::Line;
+use ruff_newlines::Line;
 
 const BIDI_UNICODE: [char; 10] = [
     '\u{202A}', //{LEFT-TO-RIGHT EMBEDDING}
@@ -22,6 +22,25 @@ const BIDI_UNICODE: [char; 10] = [
                 // to hide code
 ];
 
+/// ## What it does
+/// Checks for bidirectional unicode characters.
+///
+/// ## Why is this bad?
+/// The interaction between bidirectional unicode characters and the
+/// surrounding code can be surprising to those that are unfamiliar
+/// with right-to-left writing systems.
+///
+/// In some cases, bidirectional unicode characters can also be used to
+/// obfuscate code and introduce or mask security vulnerabilities.
+///
+/// ## Example
+/// ```python
+/// s = "א" * 100  #  "א" is assigned
+/// print(s)  # prints a 100-character string
+/// ```
+///
+/// ## References
+/// - [PEP 672](https://peps.python.org/pep-0672/#bidirectional-text)
 #[violation]
 pub struct BidirectionalUnicode;
 
@@ -33,7 +52,7 @@ impl Violation for BidirectionalUnicode {
 }
 
 /// PLE2502
-pub fn bidirectional_unicode(line: &Line) -> Vec<Diagnostic> {
+pub(crate) fn bidirectional_unicode(line: &Line) -> Vec<Diagnostic> {
     let mut diagnostics = Vec::new();
     if line.contains(BIDI_UNICODE) {
         diagnostics.push(Diagnostic::new(BidirectionalUnicode, line.full_range()));
diff --git a/crates/ruff/src/rules/pylint/rules/binary_op_exception.rs b/crates/ruff/src/rules/pylint/rules/binary_op_exception.rs
index d5ea82c807264..8ce1fc2bfd79b 100644
--- a/crates/ruff/src/rules/pylint/rules/binary_op_exception.rs
+++ b/crates/ruff/src/rules/pylint/rules/binary_op_exception.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Excepthandler, ExcepthandlerKind, ExprKind};
+use rustpython_parser::ast::{self, Excepthandler, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -11,11 +11,11 @@ enum Boolop {
     Or,
 }
 
-impl From<&rustpython_parser::ast::Boolop> for Boolop {
-    fn from(op: &rustpython_parser::ast::Boolop) -> Self {
+impl From<&ast::Boolop> for Boolop {
+    fn from(op: &ast::Boolop) -> Self {
         match op {
-            rustpython_parser::ast::Boolop::And => Boolop::And,
-            rustpython_parser::ast::Boolop::Or => Boolop::Or,
+            ast::Boolop::And => Boolop::And,
+            ast::Boolop::Or => Boolop::Or,
         }
     }
 }
@@ -42,7 +42,7 @@ impl From<&rustpython_parser::ast::Boolop> for Boolop {
 /// ```python
 /// try:
 ///     pass
-/// except (A ,B):
+/// except (A, B):
 ///     pass
 /// ```
 #[violation]
@@ -62,14 +62,14 @@ impl Violation for BinaryOpException {
 }
 
 /// PLW0711
-pub fn binary_op_exception(checker: &mut Checker, excepthandler: &Excepthandler) {
-    let ExcepthandlerKind::ExceptHandler { type_, .. } = &excepthandler.node;
+pub(crate) fn binary_op_exception(checker: &mut Checker, excepthandler: &Excepthandler) {
+    let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler { type_, .. }) = excepthandler;
 
     let Some(type_) = type_ else {
         return;
     };
 
-    let ExprKind::BoolOp { op, .. } = &type_.node else {
+    let Expr::BoolOp(ast::ExprBoolOp { op, .. }) = type_.as_ref() else {
         return;
     };
 
diff --git a/crates/ruff/src/rules/pylint/rules/collapsible_else_if.rs b/crates/ruff/src/rules/pylint/rules/collapsible_else_if.rs
index acea825011498..d53fd72869b38 100644
--- a/crates/ruff/src/rules/pylint/rules/collapsible_else_if.rs
+++ b/crates/ruff/src/rules/pylint/rules/collapsible_else_if.rs
@@ -1,24 +1,56 @@
-use rustpython_parser::ast::{Stmt, StmtKind};
+use rustpython_parser::ast::{Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::Locator;
 
+/// ## What it does
+/// Checks for `else` blocks that consist of a single `if` statement.
+///
+/// ## Why is this bad?
+/// If an `else` block contains a single `if` statement, it can be collapsed
+/// into an `elif`, thus reducing the indentation level.
+///
+/// ## Example
+/// ```python
+/// def check_sign(value: int) -> None:
+///     if value > 0:
+///         print("Number is positive.")
+///     else:
+///         if value < 0:
+///             print("Number is negative.")
+///         else:
+///             print("Number is zero.")
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def check_sign(value: int) -> None:
+///     if value > 0:
+///         print("Number is positive.")
+///     elif value < 0:
+///         print("Number is negative.")
+///     else:
+///         print("Number is zero.")
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/tutorial/controlflow.html#if-statements)
 #[violation]
 pub struct CollapsibleElseIf;
 
 impl Violation for CollapsibleElseIf {
     #[derive_message_formats]
     fn message(&self) -> String {
-        format!("Consider using `elif` instead of `else` then `if` to remove one indentation level")
+        format!("Use `elif` instead of `else` then `if`, to reduce indentation")
     }
 }
 
 /// PLR5501
-pub fn collapsible_else_if(orelse: &[Stmt], locator: &Locator) -> Option<Diagnostic> {
+pub(crate) fn collapsible_else_if(orelse: &[Stmt], locator: &Locator) -> Option<Diagnostic> {
     if orelse.len() == 1 {
         let first = &orelse[0];
-        if matches!(first.node, StmtKind::If { .. }) {
+        if matches!(first, Stmt::If(_)) {
             // Determine whether this is an `elif`, or an `if` in an `else` block.
             if locator.slice(first.range()).starts_with("if") {
                 return Some(Diagnostic::new(CollapsibleElseIf, first.range()));
diff --git a/crates/ruff/src/rules/pylint/rules/compare_to_empty_string.rs b/crates/ruff/src/rules/pylint/rules/compare_to_empty_string.rs
index 02ea183b44ccf..8cde351c82ef9 100644
--- a/crates/ruff/src/rules/pylint/rules/compare_to_empty_string.rs
+++ b/crates/ruff/src/rules/pylint/rules/compare_to_empty_string.rs
@@ -1,15 +1,14 @@
 use anyhow::bail;
 use itertools::Itertools;
-use rustpython_parser::ast::{Cmpop, Constant, Expr, ExprKind};
+use rustpython_parser::ast::{self, Cmpop, Constant, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::{unparse_constant, unparse_expr};
 
 use crate::checkers::ast::Checker;
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub enum EmptyStringCmpop {
+pub(crate) enum EmptyStringCmpop {
     Is,
     IsNot,
     Eq,
@@ -31,7 +30,7 @@ impl TryFrom<&Cmpop> for EmptyStringCmpop {
 }
 
 impl EmptyStringCmpop {
-    pub fn into_unary(self) -> &'static str {
+    pub(crate) fn into_unary(self) -> &'static str {
         match self {
             Self::Is | Self::Eq => "not ",
             Self::IsNot | Self::NotEq => "",
@@ -77,8 +76,8 @@ impl std::fmt::Display for EmptyStringCmpop {
 /// - [Python documentation](https://docs.python.org/3/library/stdtypes.html#truth-value-testing)
 #[violation]
 pub struct CompareToEmptyString {
-    pub existing: String,
-    pub replacement: String,
+    existing: String,
+    replacement: String,
 }
 
 impl Violation for CompareToEmptyString {
@@ -91,7 +90,7 @@ impl Violation for CompareToEmptyString {
     }
 }
 
-pub fn compare_to_empty_string(
+pub(crate) fn compare_to_empty_string(
     checker: &mut Checker,
     left: &Expr,
     ops: &[Cmpop],
@@ -99,8 +98,8 @@ pub fn compare_to_empty_string(
 ) {
     // Omit string comparison rules within subscripts. This is mostly commonly used within
     // DataFrame and np.ndarray indexing.
-    for parent in checker.ctx.expr_ancestors() {
-        if matches!(parent.node, ExprKind::Subscript { .. }) {
+    for parent in checker.semantic_model().expr_ancestors() {
+        if matches!(parent, Expr::Subscript(_)) {
             return;
         }
     }
@@ -114,11 +113,11 @@ pub fn compare_to_empty_string(
         if let Ok(op) = EmptyStringCmpop::try_from(op) {
             if std::mem::take(&mut first) {
                 // Check the left-most expression.
-                if let ExprKind::Constant { value, .. } = &lhs.node {
+                if let Expr::Constant(ast::ExprConstant { value, .. }) = &lhs {
                     if let Constant::Str(s) = value {
                         if s.is_empty() {
-                            let constant = unparse_constant(value, checker.stylist);
-                            let expr = unparse_expr(rhs, checker.stylist);
+                            let constant = checker.generator().constant(value);
+                            let expr = checker.generator().expr(rhs);
                             let existing = format!("{constant} {op} {expr}");
                             let replacement = format!("{}{expr}", op.into_unary());
                             checker.diagnostics.push(Diagnostic::new(
@@ -134,11 +133,11 @@ pub fn compare_to_empty_string(
             }
 
             // Check all right-hand expressions.
-            if let ExprKind::Constant { value, .. } = &rhs.node {
+            if let Expr::Constant(ast::ExprConstant { value, .. }) = &rhs {
                 if let Constant::Str(s) = value {
                     if s.is_empty() {
-                        let expr = unparse_expr(lhs, checker.stylist);
-                        let constant = unparse_constant(value, checker.stylist);
+                        let expr = checker.generator().expr(lhs);
+                        let constant = checker.generator().constant(value);
                         let existing = format!("{expr} {op} {constant}");
                         let replacement = format!("{}{expr}", op.into_unary());
                         checker.diagnostics.push(Diagnostic::new(
diff --git a/crates/ruff/src/rules/pylint/rules/comparison_of_constant.rs b/crates/ruff/src/rules/pylint/rules/comparison_of_constant.rs
index 6b677ca4635dd..76d4468f7ff8f 100644
--- a/crates/ruff/src/rules/pylint/rules/comparison_of_constant.rs
+++ b/crates/ruff/src/rules/pylint/rules/comparison_of_constant.rs
@@ -1,16 +1,15 @@
 use std::fmt;
 
 use itertools::Itertools;
-use rustpython_parser::ast::{Cmpop, Expr, ExprKind, Located};
+use rustpython_parser::ast::{self, Cmpop, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::unparse_constant;
 
 use crate::checkers::ast::Checker;
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub enum ViolationsCmpop {
+pub(crate) enum ViolationsCmpop {
     Eq,
     NotEq,
     Lt,
@@ -58,11 +57,31 @@ impl fmt::Display for ViolationsCmpop {
     }
 }
 
+/// ## What it does
+/// Checks for comparisons between constants.
+///
+/// ## Why is this bad?
+/// Comparing two constants will always resolve to the same value, so the
+/// comparison is redundant. Instead, the expression should be replaced
+/// with the result of the comparison.
+///
+/// ## Example
+/// ```python
+/// foo = 1 == 1
+/// ```
+///
+/// Use instead:
+/// ```python
+/// foo = True
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/expressions.html#comparisons)
 #[violation]
 pub struct ComparisonOfConstant {
-    pub left_constant: String,
-    pub op: ViolationsCmpop,
-    pub right_constant: String,
+    left_constant: String,
+    op: ViolationsCmpop,
+    right_constant: String,
 }
 
 impl Violation for ComparisonOfConstant {
@@ -82,7 +101,7 @@ impl Violation for ComparisonOfConstant {
 }
 
 /// PLR0133
-pub fn comparison_of_constant(
+pub(crate) fn comparison_of_constant(
     checker: &mut Checker,
     left: &Expr,
     ops: &[Cmpop],
@@ -90,25 +109,25 @@ pub fn comparison_of_constant(
 ) {
     for ((left, right), op) in std::iter::once(left)
         .chain(comparators.iter())
-        .tuple_windows::<(&Located<_>, &Located<_>)>()
+        .tuple_windows()
         .zip(ops)
     {
         if let (
-            ExprKind::Constant {
+            Expr::Constant(ast::ExprConstant {
                 value: left_constant,
                 ..
-            },
-            ExprKind::Constant {
+            }),
+            Expr::Constant(ast::ExprConstant {
                 value: right_constant,
                 ..
-            },
-        ) = (&left.node, &right.node)
+            }),
+        ) = (&left, &right)
         {
             let diagnostic = Diagnostic::new(
                 ComparisonOfConstant {
-                    left_constant: unparse_constant(left_constant, checker.stylist),
+                    left_constant: checker.generator().constant(left_constant),
                     op: op.into(),
-                    right_constant: unparse_constant(right_constant, checker.stylist),
+                    right_constant: checker.generator().constant(right_constant),
                 },
                 left.range(),
             );
diff --git a/crates/ruff/src/rules/pylint/rules/continue_in_finally.rs b/crates/ruff/src/rules/pylint/rules/continue_in_finally.rs
index b54b3ef997ec8..09e6c21793d55 100644
--- a/crates/ruff/src/rules/pylint/rules/continue_in_finally.rs
+++ b/crates/ruff/src/rules/pylint/rules/continue_in_finally.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Stmt, StmtKind};
+use rustpython_parser::ast::{self, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -16,21 +16,21 @@ use crate::checkers::ast::Checker;
 /// ## Example
 /// ```python
 /// while True:
-///  try:
-///     pass
-///  finally:
-///     continue
+///     try:
+///         pass
+///     finally:
+///         continue
 /// ```
 ///
 /// Use instead:
 /// ```python
 /// while True:
-///  try:
-///     pass
-///  except Exception:
-///     pass
-///  else:
-///     continue
+///     try:
+///         pass
+///     except Exception:
+///         pass
+///     else:
+///         continue
 /// ```
 #[violation]
 pub struct ContinueInFinally;
@@ -44,26 +44,27 @@ impl Violation for ContinueInFinally {
 
 fn traverse_body(checker: &mut Checker, body: &[Stmt]) {
     for stmt in body {
-        if matches!(stmt.node, StmtKind::Continue { .. }) {
+        if stmt.is_continue_stmt() {
             checker
                 .diagnostics
                 .push(Diagnostic::new(ContinueInFinally, stmt.range()));
         }
 
-        match &stmt.node {
-            StmtKind::If { body, orelse, .. }
-            | StmtKind::Try { body, orelse, .. }
-            | StmtKind::TryStar { body, orelse, .. } => {
+        match stmt {
+            Stmt::If(ast::StmtIf { body, orelse, .. })
+            | Stmt::Try(ast::StmtTry { body, orelse, .. })
+            | Stmt::TryStar(ast::StmtTryStar { body, orelse, .. }) => {
                 traverse_body(checker, body);
                 traverse_body(checker, orelse);
             }
-            StmtKind::For { orelse, .. }
-            | StmtKind::AsyncFor { orelse, .. }
-            | StmtKind::While { orelse, .. } => traverse_body(checker, orelse),
-            StmtKind::With { body, .. } | StmtKind::AsyncWith { body, .. } => {
+            Stmt::For(ast::StmtFor { orelse, .. })
+            | Stmt::AsyncFor(ast::StmtAsyncFor { orelse, .. })
+            | Stmt::While(ast::StmtWhile { orelse, .. }) => traverse_body(checker, orelse),
+            Stmt::With(ast::StmtWith { body, .. })
+            | Stmt::AsyncWith(ast::StmtAsyncWith { body, .. }) => {
                 traverse_body(checker, body);
             }
-            StmtKind::Match { cases, .. } => {
+            Stmt::Match(ast::StmtMatch { cases, .. }) => {
                 for case in cases {
                     traverse_body(checker, &case.body);
                 }
@@ -74,6 +75,6 @@ fn traverse_body(checker: &mut Checker, body: &[Stmt]) {
 }
 
 /// PLE0116
-pub fn continue_in_finally(checker: &mut Checker, body: &[Stmt]) {
+pub(crate) fn continue_in_finally(checker: &mut Checker, body: &[Stmt]) {
     traverse_body(checker, body);
 }
diff --git a/crates/ruff/src/rules/pylint/rules/duplicate_bases.rs b/crates/ruff/src/rules/pylint/rules/duplicate_bases.rs
new file mode 100644
index 0000000000000..6d6256f4722d1
--- /dev/null
+++ b/crates/ruff/src/rules/pylint/rules/duplicate_bases.rs
@@ -0,0 +1,70 @@
+use std::hash::BuildHasherDefault;
+
+use rustc_hash::FxHashSet;
+use rustpython_parser::ast::{self, Expr, Identifier, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for duplicate base classes in class definitions.
+///
+/// ## Why is this bad?
+/// Including duplicate base classes will raise a `TypeError` at runtime.
+///
+/// ## Example
+/// ```python
+/// class Foo:
+///     pass
+///
+///
+/// class Bar(Foo, Foo):
+///     pass
+/// ```
+///
+/// Use instead:
+/// ```python
+/// class Foo:
+///     pass
+///
+///
+/// class Bar(Foo):
+///     pass
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/compound_stmts.html#class-definitions)
+#[violation]
+pub struct DuplicateBases {
+    base: String,
+    class: String,
+}
+
+impl Violation for DuplicateBases {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let DuplicateBases { base, class } = self;
+        format!("Duplicate base `{base}` for class `{class}`")
+    }
+}
+
+/// PLE0241
+pub(crate) fn duplicate_bases(checker: &mut Checker, name: &str, bases: &[Expr]) {
+    let mut seen: FxHashSet<&Identifier> =
+        FxHashSet::with_capacity_and_hasher(bases.len(), BuildHasherDefault::default());
+    for base in bases {
+        if let Expr::Name(ast::ExprName { id, .. }) = base {
+            if !seen.insert(id) {
+                checker.diagnostics.push(Diagnostic::new(
+                    DuplicateBases {
+                        base: id.to_string(),
+                        class: name.to_string(),
+                    },
+                    base.range(),
+                ));
+            }
+        }
+    }
+}
diff --git a/crates/ruff/src/rules/pylint/rules/duplicate_value.rs b/crates/ruff/src/rules/pylint/rules/duplicate_value.rs
new file mode 100644
index 0000000000000..46ba673cc88a1
--- /dev/null
+++ b/crates/ruff/src/rules/pylint/rules/duplicate_value.rs
@@ -0,0 +1,57 @@
+use rustc_hash::FxHashSet;
+use rustpython_parser::ast::{self, Expr, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::comparable::ComparableExpr;
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for set literals that contain duplicate values.
+///
+/// ## Why is this bad?
+/// In Python, sets are unordered collections of unique elements. Including a
+/// duplicate value in a set literal is redundant, and may be indicative of a
+/// mistake.
+///
+/// ## Example
+/// ```python
+/// {1, 2, 3, 1}
+/// ```
+///
+/// Use instead:
+/// ```python
+/// {1, 2, 3}
+/// ```
+#[violation]
+pub struct DuplicateValue {
+    value: String,
+}
+
+impl Violation for DuplicateValue {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        let DuplicateValue { value } = self;
+        format!("Duplicate value `{value}` in set")
+    }
+}
+
+/// PLW0130
+pub(crate) fn duplicate_value(checker: &mut Checker, elts: &Vec<Expr>) {
+    let mut seen_values: FxHashSet<ComparableExpr> = FxHashSet::default();
+    for elt in elts {
+        if let Expr::Constant(ast::ExprConstant { value, .. }) = elt {
+            let comparable_value: ComparableExpr = elt.into();
+
+            if !seen_values.insert(comparable_value) {
+                checker.diagnostics.push(Diagnostic::new(
+                    DuplicateValue {
+                        value: checker.generator().constant(value),
+                    },
+                    elt.range(),
+                ));
+            }
+        };
+    }
+}
diff --git a/crates/ruff/src/rules/pylint/rules/global_statement.rs b/crates/ruff/src/rules/pylint/rules/global_statement.rs
index afb8aa843a55b..c65bf96d57473 100644
--- a/crates/ruff/src/rules/pylint/rules/global_statement.rs
+++ b/crates/ruff/src/rules/pylint/rules/global_statement.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::Stmt;
+use rustpython_parser::ast::Ranged;
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -16,11 +16,13 @@ use crate::checkers::ast::Checker;
 /// ```python
 /// var = 1
 ///
+///
 /// def foo():
 ///     global var  # [global-statement]
 ///     var = 10
 ///     print(var)
 ///
+///
 /// foo()
 /// print(var)
 /// ```
@@ -29,16 +31,18 @@ use crate::checkers::ast::Checker;
 /// ```python
 /// var = 1
 ///
+///
 /// def foo():
 ///     print(var)
 ///     return 10
 ///
+///
 /// var = foo()
 /// print(var)
 /// ```
 #[violation]
 pub struct GlobalStatement {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for GlobalStatement {
@@ -50,16 +54,14 @@ impl Violation for GlobalStatement {
 }
 
 /// PLW0603
-pub fn global_statement(checker: &mut Checker, name: &str) {
-    let scope = checker.ctx.scope();
-    if let Some(index) = scope.get(name) {
-        let binding = &checker.ctx.bindings[*index];
+pub(crate) fn global_statement(checker: &mut Checker, name: &str) {
+    let scope = checker.semantic_model().scope();
+    if let Some(binding_id) = scope.get(name) {
+        let binding = &checker.semantic_model().bindings[binding_id];
         if binding.kind.is_global() {
-            let source: &Stmt = binding
+            let source = checker.semantic_model().stmts[binding
                 .source
-                .as_ref()
-                .expect("`global` bindings should always have a `source`")
-                .into();
+                .expect("`global` bindings should always have a `source`")];
             let diagnostic = Diagnostic::new(
                 GlobalStatement {
                     name: name.to_string(),
diff --git a/crates/ruff/src/rules/pylint/rules/global_variable_not_assigned.rs b/crates/ruff/src/rules/pylint/rules/global_variable_not_assigned.rs
index 8fe979803f7f2..9ac5cbe2952d9 100644
--- a/crates/ruff/src/rules/pylint/rules/global_variable_not_assigned.rs
+++ b/crates/ruff/src/rules/pylint/rules/global_variable_not_assigned.rs
@@ -1,6 +1,40 @@
 use ruff_diagnostics::Violation;
 use ruff_macros::{derive_message_formats, violation};
 
+/// ## What it does
+/// Checks for `global` variables that are not assigned a value in the current
+/// scope.
+///
+/// ## Why is this bad?
+/// The `global` keyword allows an inner scope to modify a variable declared
+/// in the outer scope. If the variable is not modified within the inner scope,
+/// there is no need to use `global`.
+///
+/// ## Example
+/// ```python
+/// DEBUG = True
+///
+///
+/// def foo():
+///     global DEBUG
+///     if DEBUG:
+///         print("foo() called")
+///     ...
+/// ```
+///
+/// Use instead:
+/// ```python
+/// DEBUG = True
+///
+///
+/// def foo():
+///     if DEBUG:
+///         print("foo() called")
+///     ...
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/simple_stmts.html#the-global-statement)
 #[violation]
 pub struct GlobalVariableNotAssigned {
     pub name: String,
diff --git a/crates/ruff/src/rules/pylint/rules/import_self.rs b/crates/ruff/src/rules/pylint/rules/import_self.rs
index b3fc53f03793b..a06f84bfe464f 100644
--- a/crates/ruff/src/rules/pylint/rules/import_self.rs
+++ b/crates/ruff/src/rules/pylint/rules/import_self.rs
@@ -1,12 +1,27 @@
-use rustpython_parser::ast::Alias;
+use rustpython_parser::ast::{Alias, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::resolve_imported_module_path;
 
+/// ## What it does
+/// Checks for import statements that import the current module.
+///
+/// ## Why is this bad?
+/// Importing a module from itself is a circular dependency.
+///
+/// ## Example
+/// ```python
+/// # file: this_file.py
+/// from this_file import foo
+///
+///
+/// def foo():
+///     ...
+/// ```
 #[violation]
 pub struct ImportSelf {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for ImportSelf {
@@ -18,15 +33,15 @@ impl Violation for ImportSelf {
 }
 
 /// PLW0406
-pub fn import_self(alias: &Alias, module_path: Option<&[String]>) -> Option<Diagnostic> {
+pub(crate) fn import_self(alias: &Alias, module_path: Option<&[String]>) -> Option<Diagnostic> {
     let Some(module_path) = module_path else {
         return None;
     };
 
-    if alias.node.name.split('.').eq(module_path) {
+    if alias.name.split('.').eq(module_path) {
         return Some(Diagnostic::new(
             ImportSelf {
-                name: alias.node.name.clone(),
+                name: alias.name.to_string(),
             },
             alias.range(),
         ));
@@ -36,8 +51,8 @@ pub fn import_self(alias: &Alias, module_path: Option<&[String]>) -> Option<Diag
 }
 
 /// PLW0406
-pub fn import_from_self(
-    level: Option<usize>,
+pub(crate) fn import_from_self(
+    level: Option<u32>,
     module: Option<&str>,
     names: &[Alias],
     module_path: Option<&[String]>,
@@ -55,11 +70,11 @@ pub fn import_from_self(
     {
         if let Some(alias) = names
             .iter()
-            .find(|alias| alias.node.name == module_path[module_path.len() - 1])
+            .find(|alias| alias.name == module_path[module_path.len() - 1])
         {
             return Some(Diagnostic::new(
                 ImportSelf {
-                    name: format!("{}.{}", imported_module_path, alias.node.name),
+                    name: format!("{}.{}", imported_module_path, alias.name),
                 },
                 alias.range(),
             ));
diff --git a/crates/ruff/src/rules/pylint/rules/invalid_all_format.rs b/crates/ruff/src/rules/pylint/rules/invalid_all_format.rs
index ad9525fc52f31..0a818814ee063 100644
--- a/crates/ruff/src/rules/pylint/rules/invalid_all_format.rs
+++ b/crates/ruff/src/rules/pylint/rules/invalid_all_format.rs
@@ -1,8 +1,30 @@
-use rustpython_parser::ast::Expr;
+use rustpython_parser::ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
+/// ## What it does
+/// Checks for invalid assignments to `__all__`.
+///
+/// ## Why is this bad?
+/// In Python, `__all__` should contain a sequence of strings that represent
+/// the names of all "public" symbols exported by a module.
+///
+/// Assigning anything other than a `tuple` or `list` of strings to `__all__`
+/// is invalid.
+///
+/// ## Example
+/// ```python
+/// __all__ = "Foo"
+/// ```
+///
+/// Use instead:
+/// ```python
+/// __all__ = ("Foo",)
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)
 #[violation]
 pub struct InvalidAllFormat;
 
@@ -14,6 +36,6 @@ impl Violation for InvalidAllFormat {
 }
 
 /// PLE0605
-pub fn invalid_all_format(expr: &Expr) -> Diagnostic {
+pub(crate) fn invalid_all_format(expr: &Expr) -> Diagnostic {
     Diagnostic::new(InvalidAllFormat, expr.range())
 }
diff --git a/crates/ruff/src/rules/pylint/rules/invalid_all_object.rs b/crates/ruff/src/rules/pylint/rules/invalid_all_object.rs
index 542182b1635b7..46e05c80e7c10 100644
--- a/crates/ruff/src/rules/pylint/rules/invalid_all_object.rs
+++ b/crates/ruff/src/rules/pylint/rules/invalid_all_object.rs
@@ -1,8 +1,30 @@
-use rustpython_parser::ast::Expr;
+use rustpython_parser::ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
+/// ## What it does
+/// Checks for the inclusion of invalid objects in `__all__`.
+///
+/// ## Why is this bad?
+/// In Python, `__all__` should contain a sequence of strings that represent
+/// the names of all "public" symbols exported by a module.
+///
+/// Assigning anything other than a `tuple` or `list` of strings to `__all__`
+/// is invalid.
+///
+/// ## Example
+/// ```python
+/// __all__ = [Foo, 1, None]
+/// ```
+///
+/// Use instead:
+/// ```python
+/// __all__ = ["Foo", "Bar", "Baz"]
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)
 #[violation]
 pub struct InvalidAllObject;
 
@@ -14,6 +36,6 @@ impl Violation for InvalidAllObject {
 }
 
 /// PLE0604
-pub fn invalid_all_object(expr: &Expr) -> Diagnostic {
+pub(crate) fn invalid_all_object(expr: &Expr) -> Diagnostic {
     Diagnostic::new(InvalidAllObject, expr.range())
 }
diff --git a/crates/ruff/src/rules/pylint/rules/invalid_envvar_default.rs b/crates/ruff/src/rules/pylint/rules/invalid_envvar_default.rs
index 1298dc155c704..a70ae406d61ae 100644
--- a/crates/ruff/src/rules/pylint/rules/invalid_envvar_default.rs
+++ b/crates/ruff/src/rules/pylint/rules/invalid_envvar_default.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword, Operator};
+use rustpython_parser::ast::{self, Constant, Expr, Keyword, Operator, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -39,54 +39,52 @@ impl Violation for InvalidEnvvarDefault {
 fn is_valid_default(expr: &Expr) -> bool {
     // We can't infer the types of these defaults, so assume they're valid.
     if matches!(
-        expr.node,
-        ExprKind::Name { .. }
-            | ExprKind::Attribute { .. }
-            | ExprKind::Subscript { .. }
-            | ExprKind::Call { .. }
+        expr,
+        Expr::Name(_) | Expr::Attribute(_) | Expr::Subscript(_) | Expr::Call(_)
     ) {
         return true;
     }
 
     // Allow string concatenation.
-    if let ExprKind::BinOp {
+    if let Expr::BinOp(ast::ExprBinOp {
         left,
         right,
         op: Operator::Add,
-    } = &expr.node
+        range: _,
+    }) = expr
     {
         return is_valid_default(left) && is_valid_default(right);
     }
 
     // Allow string formatting.
-    if let ExprKind::BinOp {
+    if let Expr::BinOp(ast::ExprBinOp {
         left,
         op: Operator::Mod,
         ..
-    } = &expr.node
+    }) = expr
     {
         return is_valid_default(left);
     }
 
     // Otherwise, the default must be a string or `None`.
     matches!(
-        expr.node,
-        ExprKind::Constant {
+        expr,
+        Expr::Constant(ast::ExprConstant {
             value: Constant::Str { .. } | Constant::None { .. },
             ..
-        } | ExprKind::JoinedStr { .. }
+        }) | Expr::JoinedStr(_)
     )
 }
 
 /// PLW1508
-pub fn invalid_envvar_default(
+pub(crate) fn invalid_envvar_default(
     checker: &mut Checker,
     func: &Expr,
     args: &[Expr],
     keywords: &[Keyword],
 ) {
     if checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(func)
         .map_or(false, |call_path| call_path.as_slice() == ["os", "getenv"])
     {
@@ -94,8 +92,8 @@ pub fn invalid_envvar_default(
         let Some(expr) = args.get(1).or_else(|| {
             keywords
                 .iter()
-                .find(|keyword| keyword.node.arg.as_ref().map_or(false, |arg| arg == "default"))
-                .map(|keyword| &keyword.node.value)
+                .find(|keyword| keyword.arg.as_ref().map_or(false, |arg| arg .as_str()== "default"))
+                .map(|keyword| &keyword.value)
         }) else {
             return;
         };
diff --git a/crates/ruff/src/rules/pylint/rules/invalid_envvar_value.rs b/crates/ruff/src/rules/pylint/rules/invalid_envvar_value.rs
index 7c364a514805a..2377de846615f 100644
--- a/crates/ruff/src/rules/pylint/rules/invalid_envvar_value.rs
+++ b/crates/ruff/src/rules/pylint/rules/invalid_envvar_value.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword, Operator};
+use rustpython_parser::ast::{self, Constant, Expr, Keyword, Operator, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -36,54 +36,52 @@ impl Violation for InvalidEnvvarValue {
 fn is_valid_key(expr: &Expr) -> bool {
     // We can't infer the types of these defaults, so assume they're valid.
     if matches!(
-        expr.node,
-        ExprKind::Name { .. }
-            | ExprKind::Attribute { .. }
-            | ExprKind::Subscript { .. }
-            | ExprKind::Call { .. }
+        expr,
+        Expr::Name(_) | Expr::Attribute(_) | Expr::Subscript(_) | Expr::Call(_)
     ) {
         return true;
     }
 
     // Allow string concatenation.
-    if let ExprKind::BinOp {
+    if let Expr::BinOp(ast::ExprBinOp {
         left,
         right,
         op: Operator::Add,
-    } = &expr.node
+        range: _,
+    }) = expr
     {
         return is_valid_key(left) && is_valid_key(right);
     }
 
     // Allow string formatting.
-    if let ExprKind::BinOp {
+    if let Expr::BinOp(ast::ExprBinOp {
         left,
         op: Operator::Mod,
         ..
-    } = &expr.node
+    }) = expr
     {
         return is_valid_key(left);
     }
 
     // Otherwise, the default must be a string.
     matches!(
-        expr.node,
-        ExprKind::Constant {
+        expr,
+        Expr::Constant(ast::ExprConstant {
             value: Constant::Str { .. },
             ..
-        } | ExprKind::JoinedStr { .. }
+        }) | Expr::JoinedStr(_)
     )
 }
 
 /// PLE1507
-pub fn invalid_envvar_value(
+pub(crate) fn invalid_envvar_value(
     checker: &mut Checker,
     func: &Expr,
     args: &[Expr],
     keywords: &[Keyword],
 ) {
     if checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(func)
         .map_or(false, |call_path| call_path.as_slice() == ["os", "getenv"])
     {
@@ -91,8 +89,8 @@ pub fn invalid_envvar_value(
         let Some(expr) = args.get(0).or_else(|| {
             keywords
                 .iter()
-                .find(|keyword| keyword.node.arg.as_ref().map_or(false, |arg| arg == "key"))
-                .map(|keyword| &keyword.node.value)
+                .find(|keyword| keyword.arg.as_ref().map_or(false, |arg| arg == "key"))
+                .map(|keyword| &keyword.value)
         }) else {
             return;
         };
diff --git a/crates/ruff/src/rules/pylint/rules/invalid_str_return.rs b/crates/ruff/src/rules/pylint/rules/invalid_str_return.rs
new file mode 100644
index 0000000000000..486c8a474e259
--- /dev/null
+++ b/crates/ruff/src/rules/pylint/rules/invalid_str_return.rs
@@ -0,0 +1,60 @@
+use rustpython_parser::ast::{Ranged, Stmt};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::{helpers::ReturnStatementVisitor, statement_visitor::StatementVisitor};
+use ruff_python_semantic::analyze::type_inference::PythonType;
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for `__str__` implementations that return a type other than `str`.
+///
+/// ## Why is this bad?
+/// The `__str__` method should return a `str` object. Returning a different
+/// type may cause unexpected behavior.
+#[violation]
+pub struct InvalidStrReturnType;
+
+impl Violation for InvalidStrReturnType {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("`__str__` does not return `str`")
+    }
+}
+
+/// E0307
+pub(crate) fn invalid_str_return(checker: &mut Checker, name: &str, body: &[Stmt]) {
+    if name != "__str__" {
+        return;
+    }
+
+    if !checker.semantic_model().scope().kind.is_class() {
+        return;
+    }
+
+    let returns = {
+        let mut visitor = ReturnStatementVisitor::default();
+        visitor.visit_body(body);
+        visitor.returns
+    };
+
+    for stmt in returns {
+        if let Some(value) = stmt.value.as_deref() {
+            // Disallow other, non-
+            if !matches!(
+                PythonType::from(value),
+                PythonType::String | PythonType::Unknown
+            ) {
+                checker
+                    .diagnostics
+                    .push(Diagnostic::new(InvalidStrReturnType, value.range()));
+            }
+        } else {
+            // Disallow implicit `None`.
+            checker
+                .diagnostics
+                .push(Diagnostic::new(InvalidStrReturnType, stmt.range()));
+        }
+    }
+}
diff --git a/crates/ruff/src/rules/pylint/rules/invalid_string_characters.rs b/crates/ruff/src/rules/pylint/rules/invalid_string_characters.rs
index d57a2f61521df..7a792d3bcbe09 100644
--- a/crates/ruff/src/rules/pylint/rules/invalid_string_characters.rs
+++ b/crates/ruff/src/rules/pylint/rules/invalid_string_characters.rs
@@ -2,7 +2,7 @@ use ruff_text_size::{TextLen, TextRange, TextSize};
 
 use ruff_diagnostics::AlwaysAutofixableViolation;
 use ruff_diagnostics::Edit;
-use ruff_diagnostics::{Diagnostic, DiagnosticKind};
+use ruff_diagnostics::{Diagnostic, DiagnosticKind, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::Locator;
 
@@ -18,12 +18,12 @@ use ruff_python_ast::source_code::Locator;
 ///
 /// ## Example
 /// ```python
-/// x = ''
+/// x = ""
 /// ```
 ///
 /// Use instead:
 /// ```python
-/// x = '\b'
+/// x = "\b"
 /// ```
 #[violation]
 pub struct InvalidCharacterBackspace;
@@ -51,12 +51,12 @@ impl AlwaysAutofixableViolation for InvalidCharacterBackspace {
 ///
 /// ## Example
 /// ```python
-/// x = ''
+/// x = ""
 /// ```
 ///
 /// Use instead:
 /// ```python
-/// x = '\x1A'
+/// x = "\x1A"
 /// ```
 #[violation]
 pub struct InvalidCharacterSub;
@@ -84,12 +84,12 @@ impl AlwaysAutofixableViolation for InvalidCharacterSub {
 ///
 /// ## Example
 /// ```python
-/// x = ''
+/// x = ""
 /// ```
 ///
 /// Use instead:
 /// ```python
-/// x = '\x1B'
+/// x = "\x1B"
 /// ```
 #[violation]
 pub struct InvalidCharacterEsc;
@@ -117,12 +117,12 @@ impl AlwaysAutofixableViolation for InvalidCharacterEsc {
 ///
 /// ## Example
 /// ```python
-/// x = ''
+/// x = ""
 /// ```
 ///
 /// Use instead:
 /// ```python
-/// x = '\0'
+/// x = "\0"
 /// ```
 #[violation]
 pub struct InvalidCharacterNul;
@@ -149,12 +149,12 @@ impl AlwaysAutofixableViolation for InvalidCharacterNul {
 ///
 /// ## Example
 /// ```python
-/// x = 'Dear Sir/Madam'
+/// x = "Dear Sir/Madam"
 /// ```
 ///
 /// Use instead:
 /// ```python
-/// x = 'Dear Sir\u200B/\u200BMadam'  # zero width space
+/// x = "Dear Sir\u200B/\u200BMadam"  # zero width space
 /// ```
 #[violation]
 pub struct InvalidCharacterZeroWidthSpace;
@@ -171,11 +171,7 @@ impl AlwaysAutofixableViolation for InvalidCharacterZeroWidthSpace {
 }
 
 /// PLE2510, PLE2512, PLE2513, PLE2514, PLE2515
-pub fn invalid_string_characters(
-    locator: &Locator,
-    range: TextRange,
-    autofix: bool,
-) -> Vec<Diagnostic> {
+pub(crate) fn invalid_string_characters(locator: &Locator, range: TextRange) -> Vec<Diagnostic> {
     let mut diagnostics = Vec::new();
     let text = locator.slice(range);
 
@@ -195,11 +191,10 @@ pub fn invalid_string_characters(
         let location = range.start() + TextSize::try_from(column).unwrap();
         let range = TextRange::at(location, c.text_len());
 
-        let mut diagnostic = Diagnostic::new(rule, range);
-        if autofix {
-            diagnostic.set_fix(Edit::range_replacement(replacement.to_string(), range));
-        }
-        diagnostics.push(diagnostic);
+        #[allow(deprecated)]
+        diagnostics.push(Diagnostic::new(rule, range).with_fix(Fix::unspecified(
+            Edit::range_replacement(replacement.to_string(), range),
+        )));
     }
 
     diagnostics
diff --git a/crates/ruff/src/rules/pylint/rules/iteration_over_set.rs b/crates/ruff/src/rules/pylint/rules/iteration_over_set.rs
new file mode 100644
index 0000000000000..b98806c7c8e86
--- /dev/null
+++ b/crates/ruff/src/rules/pylint/rules/iteration_over_set.rs
@@ -0,0 +1,46 @@
+use rustpython_parser::ast::{Expr, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for iterations over `set` literals.
+///
+/// ## Why is this bad?
+/// Iterating over a `set` is less efficient than iterating over a sequence
+/// type, like `list` or `tuple`.
+///
+/// ## Example
+/// ```python
+/// for number in {1, 2, 3}:
+///     ...
+/// ```
+///
+/// Use instead:
+/// ```python
+/// for number in (1, 2, 3):
+///     ...
+/// ```
+///
+/// ## References
+/// - [Python documentation: `set`](https://docs.python.org/3/library/stdtypes.html#set)
+#[violation]
+pub struct IterationOverSet;
+
+impl Violation for IterationOverSet {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Use a sequence type instead of a `set` when iterating over values")
+    }
+}
+
+/// PLC0208
+pub(crate) fn iteration_over_set(checker: &mut Checker, expr: &Expr) {
+    if expr.is_set_expr() {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(IterationOverSet, expr.range()));
+    }
+}
diff --git a/crates/ruff/src/rules/pylint/rules/load_before_global_declaration.rs b/crates/ruff/src/rules/pylint/rules/load_before_global_declaration.rs
index 219260e76e91c..5e936bf334332 100644
--- a/crates/ruff/src/rules/pylint/rules/load_before_global_declaration.rs
+++ b/crates/ruff/src/rules/pylint/rules/load_before_global_declaration.rs
@@ -1,16 +1,48 @@
-use rustpython_parser::ast::Expr;
+use rustpython_parser::ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::OneIndexed;
-use ruff_python_semantic::scope::ScopeKind;
 
 use crate::checkers::ast::Checker;
 
+/// ## What it does
+/// Checks for usages of names that are declared as `global` prior to the
+/// relevant `global` declaration.
+///
+/// ## Why is this bad?
+/// The `global` declaration applies to the entire scope. Using a name that's
+/// declared as `global` in a given scope prior to the relevant `global`
+/// declaration is a syntax error.
+///
+/// ## Example
+/// ```python
+/// counter = 1
+///
+///
+/// def increment():
+///     print(f"Adding 1 to {counter}")
+///     global counter
+///     counter += 1
+/// ```
+///
+/// Use instead:
+/// ```python
+/// counter = 1
+///
+///
+/// def increment():
+///     global counter
+///     print(f"Adding 1 to {counter}")
+///     counter += 1
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/simple_stmts.html#the-global-statement)
 #[violation]
 pub struct LoadBeforeGlobalDeclaration {
-    pub name: String,
-    pub line: OneIndexed,
+    name: String,
+    line: OneIndexed,
 }
 
 impl Violation for LoadBeforeGlobalDeclaration {
@@ -21,13 +53,8 @@ impl Violation for LoadBeforeGlobalDeclaration {
     }
 }
 /// PLE0118
-pub fn load_before_global_declaration(checker: &mut Checker, name: &str, expr: &Expr) {
-    let globals = match &checker.ctx.scope().kind {
-        ScopeKind::Class(class_def) => &class_def.globals,
-        ScopeKind::Function(function_def) => &function_def.globals,
-        _ => return,
-    };
-    if let Some(stmt) = globals.get(name) {
+pub(crate) fn load_before_global_declaration(checker: &mut Checker, name: &str, expr: &Expr) {
+    if let Some(stmt) = checker.semantic_model().global(name) {
         if expr.start() < stmt.start() {
             #[allow(deprecated)]
             let location = checker.locator.compute_source_location(stmt.start());
diff --git a/crates/ruff/src/rules/pylint/rules/logging.rs b/crates/ruff/src/rules/pylint/rules/logging.rs
index 3dd5f7f9cb82b..2cf9930caa44a 100644
--- a/crates/ruff/src/rules/pylint/rules/logging.rs
+++ b/crates/ruff/src/rules/pylint/rules/logging.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Constant, Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -86,60 +86,60 @@ impl Violation for LoggingTooManyArgs {
 
 /// PLE1205
 /// PLE1206
-pub fn logging_call(checker: &mut Checker, func: &Expr, args: &[Expr], keywords: &[Keyword]) {
+pub(crate) fn logging_call(
+    checker: &mut Checker,
+    func: &Expr,
+    args: &[Expr],
+    keywords: &[Keyword],
+) {
     // If there are any starred arguments, abort.
-    if args
-        .iter()
-        .any(|arg| matches!(arg.node, ExprKind::Starred { .. }))
-    {
+    if args.iter().any(|arg| matches!(arg, Expr::Starred(_))) {
         return;
     }
 
     // If there are any starred keyword arguments, abort.
-    if keywords.iter().any(|keyword| keyword.node.arg.is_none()) {
+    if keywords.iter().any(|keyword| keyword.arg.is_none()) {
         return;
     }
 
-    if !logging::is_logger_candidate(&checker.ctx, func) {
+    if !logging::is_logger_candidate(func, checker.semantic_model()) {
         return;
     }
 
-    if let ExprKind::Attribute { attr, .. } = &func.node {
+    if let Expr::Attribute(ast::ExprAttribute { attr, .. }) = func {
         if LoggingLevel::from_attribute(attr.as_str()).is_some() {
             let call_args = SimpleCallArgs::new(args, keywords);
-            if let Some(msg) = call_args.argument("msg", 0) {
-                if let ExprKind::Constant {
-                    value: Constant::Str(value),
-                    ..
-                } = &msg.node
-                {
-                    if let Ok(summary) = CFormatSummary::try_from(value.as_str()) {
-                        if summary.starred {
-                            return;
-                        }
-                        if !summary.keywords.is_empty() {
-                            return;
-                        }
+            if let Some(Expr::Constant(ast::ExprConstant {
+                value: Constant::Str(value),
+                ..
+            })) = call_args.argument("msg", 0)
+            {
+                if let Ok(summary) = CFormatSummary::try_from(value.as_str()) {
+                    if summary.starred {
+                        return;
+                    }
+                    if !summary.keywords.is_empty() {
+                        return;
+                    }
 
-                        let message_args = call_args.args.len() - 1;
+                    let message_args = call_args.args.len() - 1;
 
-                        if checker.settings.rules.enabled(Rule::LoggingTooManyArgs) {
-                            if summary.num_positional < message_args {
-                                checker
-                                    .diagnostics
-                                    .push(Diagnostic::new(LoggingTooManyArgs, func.range()));
-                            }
+                    if checker.enabled(Rule::LoggingTooManyArgs) {
+                        if summary.num_positional < message_args {
+                            checker
+                                .diagnostics
+                                .push(Diagnostic::new(LoggingTooManyArgs, func.range()));
                         }
+                    }
 
-                        if checker.settings.rules.enabled(Rule::LoggingTooFewArgs) {
-                            if message_args > 0
-                                && call_args.kwargs.is_empty()
-                                && summary.num_positional > message_args
-                            {
-                                checker
-                                    .diagnostics
-                                    .push(Diagnostic::new(LoggingTooFewArgs, func.range()));
-                            }
+                    if checker.enabled(Rule::LoggingTooFewArgs) {
+                        if message_args > 0
+                            && call_args.kwargs.is_empty()
+                            && summary.num_positional > message_args
+                        {
+                            checker
+                                .diagnostics
+                                .push(Diagnostic::new(LoggingTooFewArgs, func.range()));
                         }
                     }
                 }
diff --git a/crates/ruff/src/rules/pylint/rules/magic_value_comparison.rs b/crates/ruff/src/rules/pylint/rules/magic_value_comparison.rs
index 866412af86a7a..60a6a8e4c2a86 100644
--- a/crates/ruff/src/rules/pylint/rules/magic_value_comparison.rs
+++ b/crates/ruff/src/rules/pylint/rules/magic_value_comparison.rs
@@ -1,16 +1,44 @@
 use itertools::Itertools;
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Unaryop};
+use rustpython_parser::ast::{self, Constant, Expr, Ranged, Unaryop};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::unparse_expr;
 
 use crate::checkers::ast::Checker;
 use crate::rules::pylint::settings::ConstantType;
 
+/// ## What it does
+/// Checks for the use of unnamed numerical constants ("magic") values in
+/// comparisons.
+///
+/// ## Why is this bad?
+/// The use of "magic" can make code harder to read and maintain, as readers
+/// will have to infer the meaning of the value from the context.
+///
+/// For convenience, this rule excludes a variety of common values from the
+/// "magic" value definition, such as `0`, `1`, `""`, and `"__main__"`.
+///
+/// ## Example
+/// ```python
+/// def calculate_discount(price: float) -> float:
+///     return price * (1 - 0.2)
+/// ```
+///
+/// Use instead:
+/// ```python
+/// DISCOUNT_RATE = 0.2
+///
+///
+/// def calculate_discount(price: float) -> float:
+///     return price * (1 - DISCOUNT_RATE)
+/// ```
+///
+/// ## References
+/// - [Wikipedia](https://en.wikipedia.org/wiki/Magic_number_(programming)#Unnamed_numerical_constants)
+/// - [PEP 8](https://peps.python.org/pep-0008/#constants)
 #[violation]
 pub struct MagicValueComparison {
-    pub value: String,
+    value: String,
 }
 
 impl Violation for MagicValueComparison {
@@ -25,13 +53,14 @@ impl Violation for MagicValueComparison {
 
 /// If an [`Expr`] is a constant (or unary operation on a constant), return the [`Constant`].
 fn as_constant(expr: &Expr) -> Option<&Constant> {
-    match &expr.node {
-        ExprKind::Constant { value, .. } => Some(value),
-        ExprKind::UnaryOp {
+    match expr {
+        Expr::Constant(ast::ExprConstant { value, .. }) => Some(value),
+        Expr::UnaryOp(ast::ExprUnaryOp {
             op: Unaryop::UAdd | Unaryop::USub | Unaryop::Invert,
             operand,
-        } => match &operand.node {
-            ExprKind::Constant { value, .. } => Some(value),
+            range: _,
+        }) => match operand.as_ref() {
+            Expr::Constant(ast::ExprConstant { value, .. }) => Some(value),
             _ => None,
         },
         _ => None,
@@ -61,7 +90,7 @@ fn is_magic_value(constant: &Constant, allowed_types: &[ConstantType]) -> bool {
 }
 
 /// PLR2004
-pub fn magic_value_comparison(checker: &mut Checker, left: &Expr, comparators: &[Expr]) {
+pub(crate) fn magic_value_comparison(checker: &mut Checker, left: &Expr, comparators: &[Expr]) {
     for (left, right) in std::iter::once(left)
         .chain(comparators.iter())
         .tuple_windows()
@@ -78,7 +107,7 @@ pub fn magic_value_comparison(checker: &mut Checker, left: &Expr, comparators: &
             if is_magic_value(value, &checker.settings.pylint.allow_magic_value_types) {
                 checker.diagnostics.push(Diagnostic::new(
                     MagicValueComparison {
-                        value: unparse_expr(comparison_expr, checker.stylist),
+                        value: checker.generator().expr(comparison_expr),
                     },
                     comparison_expr.range(),
                 ));
diff --git a/crates/ruff/src/rules/pylint/rules/manual_import_from.rs b/crates/ruff/src/rules/pylint/rules/manual_import_from.rs
index 2658c00e55aa8..5201bc906d82c 100644
--- a/crates/ruff/src/rules/pylint/rules/manual_import_from.rs
+++ b/crates/ruff/src/rules/pylint/rules/manual_import_from.rs
@@ -1,17 +1,35 @@
-use rustpython_parser::ast::{Alias, AliasData, Located, Stmt, StmtKind};
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Alias, Int, Ranged, Stmt};
 
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Violation};
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::{create_stmt, unparse_stmt};
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 
+/// ## What it does
+/// Checks for submodule imports that are aliased to the submodule name.
+///
+/// ## Why is this bad?
+/// Using the `from` keyword to import the submodule is more concise and
+/// readable.
+///
+/// ## Example
+/// ```python
+/// import concurrent.futures as futures
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from concurrent import futures
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/import.html#submodules)
 #[violation]
 pub struct ManualFromImport {
-    pub module: String,
-    pub name: String,
-    pub fixable: bool,
+    module: String,
+    name: String,
 }
 
 impl Violation for ManualFromImport {
@@ -19,57 +37,58 @@ impl Violation for ManualFromImport {
 
     #[derive_message_formats]
     fn message(&self) -> String {
-        let ManualFromImport { module, name, .. } = self;
+        let ManualFromImport { module, name } = self;
         format!("Use `from {module} import {name}` in lieu of alias")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable
-            .then_some(|ManualFromImport { module, name, .. }| {
-                format!("Replace with `from {module} import {name}`")
-            })
+    fn autofix_title(&self) -> Option<String> {
+        let ManualFromImport { module, name } = self;
+        Some(format!("Replace with `from {module} import {name}`"))
     }
 }
 
 /// PLR0402
-pub fn manual_from_import(checker: &mut Checker, stmt: &Stmt, alias: &Alias, names: &[Alias]) {
-    let Some(asname) = &alias.node.asname else {
+pub(crate) fn manual_from_import(
+    checker: &mut Checker,
+    stmt: &Stmt,
+    alias: &Alias,
+    names: &[Alias],
+) {
+    let Some(asname) = &alias.asname else {
         return;
     };
-    let Some((module, name)) = alias.node.name.rsplit_once('.') else {
+    let Some((module, name)) = alias.name.rsplit_once('.') else {
         return;
     };
-    if name != asname {
+    if asname != name {
         return;
     }
 
-    let fixable = names.len() == 1;
     let mut diagnostic = Diagnostic::new(
         ManualFromImport {
             module: module.to_string(),
             name: name.to_string(),
-            fixable,
         },
         alias.range(),
     );
-    if fixable && checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(
-            unparse_stmt(
-                &create_stmt(StmtKind::ImportFrom {
-                    module: Some(module.to_string()),
-                    names: vec![Located::with_range(
-                        AliasData {
-                            name: asname.into(),
-                            asname: None,
-                        },
-                        stmt.range(),
-                    )],
-                    level: Some(0),
-                }),
-                checker.stylist,
-            ),
-            stmt.range(),
-        ));
+    if checker.patch(diagnostic.kind.rule()) {
+        if names.len() == 1 {
+            let node = ast::StmtImportFrom {
+                module: Some(module.into()),
+                names: vec![Alias {
+                    name: asname.clone(),
+                    asname: None,
+                    range: TextRange::default(),
+                }],
+                level: Some(Int::new(0)),
+                range: TextRange::default(),
+            };
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                checker.generator().stmt(&node.into()),
+                stmt.range(),
+            )));
+        }
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/pylint/rules/mod.rs b/crates/ruff/src/rules/pylint/rules/mod.rs
index ed332ee4db34f..70f088b3135a9 100644
--- a/crates/ruff/src/rules/pylint/rules/mod.rs
+++ b/crates/ruff/src/rules/pylint/rules/mod.rs
@@ -1,50 +1,58 @@
-pub use assert_on_string_literal::{assert_on_string_literal, AssertOnStringLiteral};
-pub use await_outside_async::{await_outside_async, AwaitOutsideAsync};
-pub use bad_str_strip_call::{bad_str_strip_call, BadStrStripCall};
-pub use bad_string_format_type::{bad_string_format_type, BadStringFormatType};
-pub use bidirectional_unicode::{bidirectional_unicode, BidirectionalUnicode};
-pub use binary_op_exception::{binary_op_exception, BinaryOpException};
-pub use collapsible_else_if::{collapsible_else_if, CollapsibleElseIf};
-pub use compare_to_empty_string::{compare_to_empty_string, CompareToEmptyString};
-pub use comparison_of_constant::{comparison_of_constant, ComparisonOfConstant};
-pub use continue_in_finally::{continue_in_finally, ContinueInFinally};
-pub use global_statement::{global_statement, GlobalStatement};
-pub use global_variable_not_assigned::GlobalVariableNotAssigned;
-pub use import_self::{import_from_self, import_self, ImportSelf};
-pub use invalid_all_format::{invalid_all_format, InvalidAllFormat};
-pub use invalid_all_object::{invalid_all_object, InvalidAllObject};
-pub use invalid_envvar_default::{invalid_envvar_default, InvalidEnvvarDefault};
-pub use invalid_envvar_value::{invalid_envvar_value, InvalidEnvvarValue};
-pub use invalid_string_characters::{
+pub(crate) use assert_on_string_literal::{assert_on_string_literal, AssertOnStringLiteral};
+pub(crate) use await_outside_async::{await_outside_async, AwaitOutsideAsync};
+pub(crate) use bad_str_strip_call::{bad_str_strip_call, BadStrStripCall};
+pub(crate) use bad_string_format_type::{bad_string_format_type, BadStringFormatType};
+pub(crate) use bidirectional_unicode::{bidirectional_unicode, BidirectionalUnicode};
+pub(crate) use binary_op_exception::{binary_op_exception, BinaryOpException};
+pub(crate) use collapsible_else_if::{collapsible_else_if, CollapsibleElseIf};
+pub(crate) use compare_to_empty_string::{compare_to_empty_string, CompareToEmptyString};
+pub(crate) use comparison_of_constant::{comparison_of_constant, ComparisonOfConstant};
+pub(crate) use continue_in_finally::{continue_in_finally, ContinueInFinally};
+pub(crate) use duplicate_bases::{duplicate_bases, DuplicateBases};
+pub(crate) use global_statement::{global_statement, GlobalStatement};
+pub(crate) use global_variable_not_assigned::GlobalVariableNotAssigned;
+pub(crate) use import_self::{import_from_self, import_self, ImportSelf};
+pub(crate) use invalid_all_format::{invalid_all_format, InvalidAllFormat};
+pub(crate) use invalid_all_object::{invalid_all_object, InvalidAllObject};
+pub(crate) use invalid_envvar_default::{invalid_envvar_default, InvalidEnvvarDefault};
+pub(crate) use invalid_envvar_value::{invalid_envvar_value, InvalidEnvvarValue};
+pub(crate) use invalid_str_return::{invalid_str_return, InvalidStrReturnType};
+pub(crate) use invalid_string_characters::{
     invalid_string_characters, InvalidCharacterBackspace, InvalidCharacterEsc, InvalidCharacterNul,
     InvalidCharacterSub, InvalidCharacterZeroWidthSpace,
 };
-pub use load_before_global_declaration::{
+pub(crate) use iteration_over_set::{iteration_over_set, IterationOverSet};
+pub(crate) use load_before_global_declaration::{
     load_before_global_declaration, LoadBeforeGlobalDeclaration,
 };
-pub use logging::{logging_call, LoggingTooFewArgs, LoggingTooManyArgs};
-pub use magic_value_comparison::{magic_value_comparison, MagicValueComparison};
-pub use manual_import_from::{manual_from_import, ManualFromImport};
-pub use nonlocal_without_binding::NonlocalWithoutBinding;
-pub use property_with_parameters::{property_with_parameters, PropertyWithParameters};
-pub use redefined_loop_name::{redefined_loop_name, RedefinedLoopName};
-pub use repeated_isinstance_calls::{repeated_isinstance_calls, RepeatedIsinstanceCalls};
-pub use return_in_init::{return_in_init, ReturnInInit};
-pub use sys_exit_alias::{sys_exit_alias, SysExitAlias};
-pub use too_many_arguments::{too_many_arguments, TooManyArguments};
-pub use too_many_branches::{too_many_branches, TooManyBranches};
-pub use too_many_return_statements::{too_many_return_statements, TooManyReturnStatements};
-pub use too_many_statements::{too_many_statements, TooManyStatements};
-pub use unexpected_special_method_signature::{
+pub(crate) use logging::{logging_call, LoggingTooFewArgs, LoggingTooManyArgs};
+pub(crate) use magic_value_comparison::{magic_value_comparison, MagicValueComparison};
+pub(crate) use manual_import_from::{manual_from_import, ManualFromImport};
+pub(crate) use named_expr_without_context::{named_expr_without_context, NamedExprWithoutContext};
+pub(crate) use nested_min_max::{nested_min_max, NestedMinMax};
+pub(crate) use nonlocal_without_binding::NonlocalWithoutBinding;
+pub(crate) use property_with_parameters::{property_with_parameters, PropertyWithParameters};
+pub(crate) use redefined_loop_name::{redefined_loop_name, RedefinedLoopName};
+pub(crate) use repeated_isinstance_calls::{repeated_isinstance_calls, RepeatedIsinstanceCalls};
+pub(crate) use return_in_init::{return_in_init, ReturnInInit};
+pub(crate) use sys_exit_alias::{sys_exit_alias, SysExitAlias};
+pub(crate) use too_many_arguments::{too_many_arguments, TooManyArguments};
+pub(crate) use too_many_branches::{too_many_branches, TooManyBranches};
+pub(crate) use too_many_return_statements::{too_many_return_statements, TooManyReturnStatements};
+pub(crate) use too_many_statements::{too_many_statements, TooManyStatements};
+pub(crate) use unexpected_special_method_signature::{
     unexpected_special_method_signature, UnexpectedSpecialMethodSignature,
 };
-pub use unnecessary_direct_lambda_call::{
+pub(crate) use unnecessary_direct_lambda_call::{
     unnecessary_direct_lambda_call, UnnecessaryDirectLambdaCall,
 };
-pub use useless_else_on_loop::{useless_else_on_loop, UselessElseOnLoop};
-pub use useless_import_alias::{useless_import_alias, UselessImportAlias};
-pub use useless_return::{useless_return, UselessReturn};
-pub use yield_in_init::{yield_in_init, YieldInInit};
+pub(crate) use useless_else_on_loop::{useless_else_on_loop, UselessElseOnLoop};
+pub(crate) use useless_import_alias::{useless_import_alias, UselessImportAlias};
+pub(crate) use useless_return::{useless_return, UselessReturn};
+pub(crate) use yield_from_in_async_function::{
+    yield_from_in_async_function, YieldFromInAsyncFunction,
+};
+pub(crate) use yield_in_init::{yield_in_init, YieldInInit};
 
 mod assert_on_string_literal;
 mod await_outside_async;
@@ -56,6 +64,7 @@ mod collapsible_else_if;
 mod compare_to_empty_string;
 mod comparison_of_constant;
 mod continue_in_finally;
+mod duplicate_bases;
 mod global_statement;
 mod global_variable_not_assigned;
 mod import_self;
@@ -63,11 +72,15 @@ mod invalid_all_format;
 mod invalid_all_object;
 mod invalid_envvar_default;
 mod invalid_envvar_value;
+mod invalid_str_return;
 mod invalid_string_characters;
+mod iteration_over_set;
 mod load_before_global_declaration;
 mod logging;
 mod magic_value_comparison;
 mod manual_import_from;
+mod named_expr_without_context;
+mod nested_min_max;
 mod nonlocal_without_binding;
 mod property_with_parameters;
 mod redefined_loop_name;
@@ -83,4 +96,5 @@ mod unnecessary_direct_lambda_call;
 mod useless_else_on_loop;
 mod useless_import_alias;
 mod useless_return;
+mod yield_from_in_async_function;
 mod yield_in_init;
diff --git a/crates/ruff/src/rules/pylint/rules/named_expr_without_context.rs b/crates/ruff/src/rules/pylint/rules/named_expr_without_context.rs
new file mode 100644
index 0000000000000..3576d36ea393c
--- /dev/null
+++ b/crates/ruff/src/rules/pylint/rules/named_expr_without_context.rs
@@ -0,0 +1,44 @@
+use rustpython_parser::ast::{self, Expr};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for usages of named expressions (e.g., `a := 42`) that can be
+/// replaced by regular assignment statements (e.g., `a = 42`).
+///
+/// ## Why is this bad?
+/// While a top-level named expression is syntactically and semantically valid,
+/// it's less clear than a regular assignment statement. Named expressions are
+/// intended to be used in comprehensions and generator expressions, where
+/// assignment statements are not allowed.
+///
+/// ## Example
+/// ```python
+/// (a := 42)
+/// ```
+///
+/// Use instead:
+/// ```python
+/// a = 42
+/// ```
+#[violation]
+pub struct NamedExprWithoutContext;
+
+impl Violation for NamedExprWithoutContext {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Named expression used without context")
+    }
+}
+
+/// PLW0131
+pub(crate) fn named_expr_without_context(checker: &mut Checker, value: &Expr) {
+    if let Expr::NamedExpr(ast::ExprNamedExpr { range, .. }) = value {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(NamedExprWithoutContext, *range));
+    }
+}
diff --git a/crates/ruff/src/rules/pylint/rules/nested_min_max.rs b/crates/ruff/src/rules/pylint/rules/nested_min_max.rs
new file mode 100644
index 0000000000000..3c5aee7852d6b
--- /dev/null
+++ b/crates/ruff/src/rules/pylint/rules/nested_min_max.rs
@@ -0,0 +1,166 @@
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Expr, Keyword, Ranged};
+
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::helpers::has_comments;
+use ruff_python_semantic::model::SemanticModel;
+
+use crate::{checkers::ast::Checker, registry::AsRule};
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub(crate) enum MinMax {
+    Min,
+    Max,
+}
+
+/// ## What it does
+/// Checks for nested `min` and `max` calls.
+///
+/// ## Why is this bad?
+/// Nested `min` and `max` calls can be flattened into a single call to improve
+/// readability.
+///
+/// ## Example
+/// ```python
+/// minimum = min(1, 2, min(3, 4, 5))
+/// maximum = max(1, 2, max(3, 4, 5))
+/// diff = maximum - minimum
+/// ```
+///
+/// Use instead:
+/// ```python
+/// minimum = min(1, 2, 3, 4, 5)
+/// maximum = max(1, 2, 3, 4, 5)
+/// diff = maximum - minimum
+/// ```
+///
+/// ## References
+/// - [Python documentation: `min`](https://docs.python.org/3/library/functions.html#min)
+/// - [Python documentation: `max`](https://docs.python.org/3/library/functions.html#max)
+#[violation]
+pub struct NestedMinMax {
+    func: MinMax,
+}
+
+impl Violation for NestedMinMax {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Nested `{}` calls can be flattened", self.func)
+    }
+
+    fn autofix_title(&self) -> Option<String> {
+        let NestedMinMax { func } = self;
+        Some(format!("Flatten nested `{func}` calls"))
+    }
+}
+
+impl MinMax {
+    /// Converts a function call [`Expr`] into a [`MinMax`] if it is a call to `min` or `max`.
+    fn try_from_call(func: &Expr, keywords: &[Keyword], model: &SemanticModel) -> Option<MinMax> {
+        if !keywords.is_empty() {
+            return None;
+        }
+        let Expr::Name(ast::ExprName { id, .. }) = func else {
+            return None;
+        };
+        if id.as_str() == "min" && model.is_builtin("min") {
+            Some(MinMax::Min)
+        } else if id.as_str() == "max" && model.is_builtin("max") {
+            Some(MinMax::Max)
+        } else {
+            None
+        }
+    }
+}
+
+impl std::fmt::Display for MinMax {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            MinMax::Min => write!(f, "min"),
+            MinMax::Max => write!(f, "max"),
+        }
+    }
+}
+
+/// Collect a new set of arguments to by either accepting existing args as-is or
+/// collecting child arguments, if it's a call to the same function.
+fn collect_nested_args(model: &SemanticModel, min_max: MinMax, args: &[Expr]) -> Vec<Expr> {
+    fn inner(model: &SemanticModel, min_max: MinMax, args: &[Expr], new_args: &mut Vec<Expr>) {
+        for arg in args {
+            if let Expr::Call(ast::ExprCall {
+                func,
+                args,
+                keywords,
+                range: _,
+            }) = arg
+            {
+                if args.len() == 1 {
+                    let new_arg = Expr::Starred(ast::ExprStarred {
+                        value: Box::new(args[0].clone()),
+                        ctx: ast::ExprContext::Load,
+                        range: TextRange::default(),
+                    });
+                    new_args.push(new_arg);
+                    continue;
+                }
+                if MinMax::try_from_call(func, keywords, model) == Some(min_max) {
+                    inner(model, min_max, args, new_args);
+                    continue;
+                }
+            }
+            new_args.push(arg.clone());
+        }
+    }
+
+    let mut new_args = Vec::with_capacity(args.len());
+    inner(model, min_max, args, &mut new_args);
+    new_args
+}
+
+/// W3301
+pub(crate) fn nested_min_max(
+    checker: &mut Checker,
+    expr: &Expr,
+    func: &Expr,
+    args: &[Expr],
+    keywords: &[Keyword],
+) {
+    let Some(min_max) = MinMax::try_from_call(func, keywords, checker.semantic_model()) else {
+        return;
+    };
+
+    if args.len() == 1
+        && matches!(&args[0], Expr::Call(ast::ExprCall { args, .. }) if args.len() == 1)
+    {
+        return;
+    }
+
+    if args.iter().any(|arg| {
+        let Expr::Call(ast::ExprCall { func, keywords, ..} )= arg else {
+            return false;
+        };
+        MinMax::try_from_call(func.as_ref(), keywords.as_ref(), checker.semantic_model())
+            == Some(min_max)
+    }) {
+        let mut diagnostic = Diagnostic::new(NestedMinMax { func: min_max }, expr.range());
+        if checker.patch(diagnostic.kind.rule()) {
+            if !has_comments(expr, checker.locator) {
+                let flattened_expr = Expr::Call(ast::ExprCall {
+                    func: Box::new(func.clone()),
+                    args: collect_nested_args(checker.semantic_model(), min_max, args),
+                    keywords: keywords.to_owned(),
+                    range: TextRange::default(),
+                });
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                    checker.generator().expr(&flattened_expr),
+                    expr.range(),
+                )));
+            }
+        }
+        checker.diagnostics.push(diagnostic);
+    }
+}
diff --git a/crates/ruff/src/rules/pylint/rules/nonlocal_without_binding.rs b/crates/ruff/src/rules/pylint/rules/nonlocal_without_binding.rs
index 94a5f29226890..9f66ff859ab99 100644
--- a/crates/ruff/src/rules/pylint/rules/nonlocal_without_binding.rs
+++ b/crates/ruff/src/rules/pylint/rules/nonlocal_without_binding.rs
@@ -1,9 +1,36 @@
 use ruff_diagnostics::Violation;
 use ruff_macros::{derive_message_formats, violation};
 
+/// ## What it does
+/// Checks for `nonlocal` names without bindings.
+///
+/// ## Why is this bad?
+/// `nonlocal` names must be bound to a name in an outer scope.
+///
+/// ## Example
+/// ```python
+/// class Foo:
+///     def get_bar(self):
+///         nonlocal bar
+///         ...
+/// ```
+///
+/// Use instead:
+/// ```python
+/// class Foo:
+///     bar = 1
+///
+///     def get_bar(self):
+///         nonlocal bar
+///         ...
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/simple_stmts.html#nonlocal)
+/// - [PEP 3104](https://peps.python.org/pep-3104/)
 #[violation]
 pub struct NonlocalWithoutBinding {
-    pub name: String,
+    pub(crate) name: String,
 }
 
 impl Violation for NonlocalWithoutBinding {
diff --git a/crates/ruff/src/rules/pylint/rules/property_with_parameters.rs b/crates/ruff/src/rules/pylint/rules/property_with_parameters.rs
index d33e77ea8765f..79b06331a4d55 100644
--- a/crates/ruff/src/rules/pylint/rules/property_with_parameters.rs
+++ b/crates/ruff/src/rules/pylint/rules/property_with_parameters.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Arguments, Expr, ExprKind, Stmt};
+use rustpython_parser::ast::{self, Arguments, Expr, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -6,6 +6,36 @@ use ruff_python_ast::helpers::identifier_range;
 
 use crate::checkers::ast::Checker;
 
+/// ## What it does
+/// Checks for property definitions that accept function parameters.
+///
+/// ## Why is this bad?
+/// Properties cannot be called with parameters.
+///
+/// If you need to pass parameters to a property, create a method with the
+/// desired parameters and call that method instead.
+///
+/// ## Example
+/// ```python
+/// class Cat:
+///     @property
+///     def purr(self, volume):
+///         ...
+/// ```
+///
+/// Use instead:
+/// ```python
+/// class Cat:
+///     @property
+///     def purr(self):
+///         ...
+///
+///     def purr_volume(self, volume):
+///         ...
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/functions.html#property)
 #[violation]
 pub struct PropertyWithParameters;
 
@@ -17,7 +47,7 @@ impl Violation for PropertyWithParameters {
 }
 
 /// PLR0206
-pub fn property_with_parameters(
+pub(crate) fn property_with_parameters(
     checker: &mut Checker,
     stmt: &Stmt,
     decorator_list: &[Expr],
@@ -25,11 +55,11 @@ pub fn property_with_parameters(
 ) {
     if !decorator_list
         .iter()
-        .any(|d| matches!(&d.node, ExprKind::Name { id, .. } if id == "property"))
+        .any(|d| matches!(&d, Expr::Name(ast::ExprName { id, .. }) if id == "property"))
     {
         return;
     }
-    if checker.ctx.is_builtin("property")
+    if checker.semantic_model().is_builtin("property")
         && args
             .args
             .iter()
diff --git a/crates/ruff/src/rules/pylint/rules/redefined_loop_name.rs b/crates/ruff/src/rules/pylint/rules/redefined_loop_name.rs
index 0824fbc1997b0..8964206d1c75d 100644
--- a/crates/ruff/src/rules/pylint/rules/redefined_loop_name.rs
+++ b/crates/ruff/src/rules/pylint/rules/redefined_loop_name.rs
@@ -1,21 +1,19 @@
 use std::{fmt, iter};
 
 use regex::Regex;
-use rustpython_parser::ast::{Expr, ExprContext, ExprKind, Stmt, StmtKind, Withitem};
+use rustpython_parser::ast::{self, Expr, ExprContext, Ranged, Stmt, Withitem};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::comparable::ComparableExpr;
-use ruff_python_ast::helpers::unparse_expr;
+use ruff_python_ast::statement_visitor::{walk_stmt, StatementVisitor};
 use ruff_python_ast::types::Node;
-use ruff_python_ast::visitor;
-use ruff_python_ast::visitor::Visitor;
-use ruff_python_semantic::context::Context;
+use ruff_python_semantic::model::SemanticModel;
 
 use crate::checkers::ast::Checker;
 
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum OuterBindingKind {
+pub(crate) enum OuterBindingKind {
     For,
     With,
 }
@@ -30,7 +28,7 @@ impl fmt::Display for OuterBindingKind {
 }
 
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum InnerBindingKind {
+pub(crate) enum InnerBindingKind {
     For,
     With,
     Assignment,
@@ -94,9 +92,9 @@ impl PartialEq<InnerBindingKind> for OuterBindingKind {
 /// ```
 #[violation]
 pub struct RedefinedLoopName {
-    pub name: String,
-    pub outer_kind: OuterBindingKind,
-    pub inner_kind: InnerBindingKind,
+    name: String,
+    outer_kind: OuterBindingKind,
+    inner_kind: InnerBindingKind,
 }
 
 impl Violation for RedefinedLoopName {
@@ -140,21 +138,19 @@ struct ExprWithInnerBindingKind<'a> {
     binding_kind: InnerBindingKind,
 }
 
-struct InnerForWithAssignTargetsVisitor<'a> {
-    context: &'a Context<'a>,
+struct InnerForWithAssignTargetsVisitor<'a, 'b> {
+    context: &'a SemanticModel<'b>,
     dummy_variable_rgx: &'a Regex,
     assignment_targets: Vec<ExprWithInnerBindingKind<'a>>,
 }
 
-impl<'a, 'b> Visitor<'b> for InnerForWithAssignTargetsVisitor<'a>
-where
-    'b: 'a,
-{
+impl<'a, 'b> StatementVisitor<'b> for InnerForWithAssignTargetsVisitor<'a, 'b> {
     fn visit_stmt(&mut self, stmt: &'b Stmt) {
         // Collect target expressions.
-        match &stmt.node {
+        match stmt {
             // For and async for.
-            StmtKind::For { target, .. } | StmtKind::AsyncFor { target, .. } => {
+            Stmt::For(ast::StmtFor { target, .. })
+            | Stmt::AsyncFor(ast::StmtAsyncFor { target, .. }) => {
                 self.assignment_targets.extend(
                     assignment_targets_from_expr(target, self.dummy_variable_rgx).map(|expr| {
                         ExprWithInnerBindingKind {
@@ -165,7 +161,7 @@ where
                 );
             }
             // With.
-            StmtKind::With { items, .. } => {
+            Stmt::With(ast::StmtWith { items, .. }) => {
                 self.assignment_targets.extend(
                     assignment_targets_from_with_items(items, self.dummy_variable_rgx).map(
                         |expr| ExprWithInnerBindingKind {
@@ -176,7 +172,7 @@ where
                 );
             }
             // Assignment, augmented assignment, and annotated assignment.
-            StmtKind::Assign { targets, value, .. } => {
+            Stmt::Assign(ast::StmtAssign { targets, value, .. }) => {
                 // Check for single-target assignments which are of the
                 // form `x = cast(..., x)`.
                 if targets.first().map_or(false, |target| {
@@ -193,7 +189,7 @@ where
                     ),
                 );
             }
-            StmtKind::AugAssign { target, .. } => {
+            Stmt::AugAssign(ast::StmtAugAssign { target, .. }) => {
                 self.assignment_targets.extend(
                     assignment_targets_from_expr(target, self.dummy_variable_rgx).map(|expr| {
                         ExprWithInnerBindingKind {
@@ -203,7 +199,7 @@ where
                     }),
                 );
             }
-            StmtKind::AnnAssign { target, value, .. } => {
+            Stmt::AnnAssign(ast::StmtAnnAssign { target, value, .. }) => {
                 if value.is_none() {
                     return;
                 }
@@ -219,13 +215,13 @@ where
             _ => {}
         }
         // Decide whether to recurse.
-        match &stmt.node {
+        match stmt {
             // Don't recurse into blocks that create a new scope.
-            StmtKind::ClassDef { .. } => {}
-            StmtKind::FunctionDef { .. } => {}
+            Stmt::ClassDef(_) => {}
+            Stmt::FunctionDef(_) => {}
             // Otherwise, do recurse.
             _ => {
-                visitor::walk_stmt(self, stmt);
+                walk_stmt(self, stmt);
             }
         }
     }
@@ -240,23 +236,23 @@ where
 ///
 /// x = cast(int, x)
 /// ```
-fn assignment_is_cast_expr(context: &Context, value: &Expr, target: &Expr) -> bool {
-    let ExprKind::Call { func, args, .. } = &value.node else {
+fn assignment_is_cast_expr(model: &SemanticModel, value: &Expr, target: &Expr) -> bool {
+    let Expr::Call(ast::ExprCall { func, args, .. }) = value else {
         return false;
     };
-    let ExprKind::Name { id: target_id, .. } = &target.node else {
+    let Expr::Name(ast::ExprName { id: target_id, .. }) = target else {
         return false;
     };
     if args.len() != 2 {
         return false;
     }
-    let ExprKind::Name { id: arg_id, .. } = &args[1].node else {
+    let Expr::Name(ast::ExprName { id: arg_id, .. }) = &args[1] else {
         return false;
     };
     if arg_id != target_id {
         return false;
     }
-    context.match_typing_expr(func, "cast")
+    model.match_typing_expr(func, "cast")
 }
 
 fn assignment_targets_from_expr<'a, U>(
@@ -266,25 +262,25 @@ fn assignment_targets_from_expr<'a, U>(
     // The Box is necessary to ensure the match arms have the same return type - we can't use
     // a cast to "impl Iterator", since at the time of writing that is only allowed for
     // return types and argument types.
-    match &expr.node {
-        ExprKind::Attribute {
+    match expr {
+        Expr::Attribute(ast::ExprAttribute {
             ctx: ExprContext::Store,
             ..
-        } => Box::new(iter::once(expr)),
-        ExprKind::Subscript {
+        }) => Box::new(iter::once(expr)),
+        Expr::Subscript(ast::ExprSubscript {
             ctx: ExprContext::Store,
             ..
-        } => Box::new(iter::once(expr)),
-        ExprKind::Starred {
+        }) => Box::new(iter::once(expr)),
+        Expr::Starred(ast::ExprStarred {
             ctx: ExprContext::Store,
             value,
-            ..
-        } => Box::new(iter::once(&**value)),
-        ExprKind::Name {
+            range: _,
+        }) => Box::new(iter::once(&**value)),
+        Expr::Name(ast::ExprName {
             ctx: ExprContext::Store,
             id,
-            ..
-        } => {
+            range: _,
+        }) => {
             // Ignore dummy variables.
             if dummy_variable_rgx.is_match(id) {
                 Box::new(iter::empty())
@@ -292,19 +288,19 @@ fn assignment_targets_from_expr<'a, U>(
                 Box::new(iter::once(expr))
             }
         }
-        ExprKind::List {
+        Expr::List(ast::ExprList {
             ctx: ExprContext::Store,
             elts,
-            ..
-        } => Box::new(
+            range: _,
+        }) => Box::new(
             elts.iter()
                 .flat_map(|elt| assignment_targets_from_expr(elt, dummy_variable_rgx)),
         ),
-        ExprKind::Tuple {
+        Expr::Tuple(ast::ExprTuple {
             ctx: ExprContext::Store,
             elts,
-            ..
-        } => Box::new(
+            range: _,
+        }) => Box::new(
             elts.iter()
                 .flat_map(|elt| assignment_targets_from_expr(elt, dummy_variable_rgx)),
         ),
@@ -336,11 +332,11 @@ fn assignment_targets_from_assign_targets<'a, U>(
 }
 
 /// PLW2901
-pub fn redefined_loop_name<'a, 'b>(checker: &'a mut Checker<'b>, node: &Node<'b>) {
+pub(crate) fn redefined_loop_name<'a, 'b>(checker: &'a mut Checker<'b>, node: &Node<'b>) {
     let (outer_assignment_targets, inner_assignment_targets) = match node {
-        Node::Stmt(stmt) => match &stmt.node {
+        Node::Stmt(stmt) => match stmt {
             // With.
-            StmtKind::With { items, body, .. } => {
+            Stmt::With(ast::StmtWith { items, body, .. }) => {
                 let outer_assignment_targets: Vec<ExprWithOuterBindingKind<'a>> =
                     assignment_targets_from_with_items(items, &checker.settings.dummy_variable_rgx)
                         .map(|expr| ExprWithOuterBindingKind {
@@ -349,7 +345,7 @@ pub fn redefined_loop_name<'a, 'b>(checker: &'a mut Checker<'b>, node: &Node<'b>
                         })
                         .collect();
                 let mut visitor = InnerForWithAssignTargetsVisitor {
-                    context: &checker.ctx,
+                    context: checker.semantic_model(),
                     dummy_variable_rgx: &checker.settings.dummy_variable_rgx,
                     assignment_targets: vec![],
                 };
@@ -359,7 +355,8 @@ pub fn redefined_loop_name<'a, 'b>(checker: &'a mut Checker<'b>, node: &Node<'b>
                 (outer_assignment_targets, visitor.assignment_targets)
             }
             // For and async for.
-            StmtKind::For { target, body, .. } | StmtKind::AsyncFor { target, body, .. } => {
+            Stmt::For(ast::StmtFor { target, body, .. })
+            | Stmt::AsyncFor(ast::StmtAsyncFor { target, body, .. }) => {
                 let outer_assignment_targets: Vec<ExprWithOuterBindingKind<'a>> =
                     assignment_targets_from_expr(target, &checker.settings.dummy_variable_rgx)
                         .map(|expr| ExprWithOuterBindingKind {
@@ -368,7 +365,7 @@ pub fn redefined_loop_name<'a, 'b>(checker: &'a mut Checker<'b>, node: &Node<'b>
                         })
                         .collect();
                 let mut visitor = InnerForWithAssignTargetsVisitor {
-                    context: &checker.ctx,
+                    context: checker.semantic_model(),
                     dummy_variable_rgx: &checker.settings.dummy_variable_rgx,
                     assignment_targets: vec![],
                 };
@@ -384,15 +381,17 @@ pub fn redefined_loop_name<'a, 'b>(checker: &'a mut Checker<'b>, node: &Node<'b>
         Node::Expr(_) => panic!("redefined_loop_name called on Node that is not a Statement"),
     };
 
+    let mut diagnostics = Vec::new();
+
     for outer_assignment_target in &outer_assignment_targets {
         for inner_assignment_target in &inner_assignment_targets {
             // Compare the targets structurally.
             if ComparableExpr::from(outer_assignment_target.expr)
                 .eq(&(ComparableExpr::from(inner_assignment_target.expr)))
             {
-                checker.diagnostics.push(Diagnostic::new(
+                diagnostics.push(Diagnostic::new(
                     RedefinedLoopName {
-                        name: unparse_expr(outer_assignment_target.expr, checker.stylist),
+                        name: checker.generator().expr(outer_assignment_target.expr),
                         outer_kind: outer_assignment_target.binding_kind,
                         inner_kind: inner_assignment_target.binding_kind,
                     },
@@ -401,4 +400,6 @@ pub fn redefined_loop_name<'a, 'b>(checker: &'a mut Checker<'b>, node: &Node<'b>
             }
         }
     }
+
+    checker.diagnostics.extend(diagnostics);
 }
diff --git a/crates/ruff/src/rules/pylint/rules/repeated_isinstance_calls.rs b/crates/ruff/src/rules/pylint/rules/repeated_isinstance_calls.rs
index 0fbde300155a7..031eee89d25a3 100644
--- a/crates/ruff/src/rules/pylint/rules/repeated_isinstance_calls.rs
+++ b/crates/ruff/src/rules/pylint/rules/repeated_isinstance_calls.rs
@@ -1,54 +1,96 @@
 use itertools::Itertools;
 use rustc_hash::{FxHashMap, FxHashSet};
-use rustpython_parser::ast::{Boolop, Expr, ExprKind};
+use rustpython_parser::ast::{self, Boolop, Expr, Ranged};
 
-use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::hashable::HashableExpr;
-use ruff_python_ast::helpers::unparse_expr;
 
 use crate::checkers::ast::Checker;
+use crate::registry::AsRule;
+use crate::settings::types::PythonVersion;
 
+/// ## What it does
+/// Checks for repeated `isinstance` calls on the same object.
+///
+/// ## Why is this bad?
+/// Repeated `isinstance` calls on the same object can be merged into a
+/// single call.
+///
+/// ## Example
+/// ```python
+/// def is_number(x):
+///     return isinstance(x, int) or isinstance(x, float) or isinstance(x, complex)
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def is_number(x):
+///     return isinstance(x, (int, float, complex))
+/// ```
+///
+/// Or, for Python 3.10 and later:
+///
+/// ```python
+/// def is_number(x):
+///     return isinstance(x, int | float | complex)
+/// ```
+///
+/// ## References
+/// - [Python documentation: `isinstance`](https://docs.python.org/3/library/functions.html#isinstance)
 #[violation]
 pub struct RepeatedIsinstanceCalls {
-    pub obj: String,
-    pub types: Vec<String>,
+    expr: String,
 }
 
-impl Violation for RepeatedIsinstanceCalls {
+impl AlwaysAutofixableViolation for RepeatedIsinstanceCalls {
     #[derive_message_formats]
     fn message(&self) -> String {
-        let RepeatedIsinstanceCalls { obj, types } = self;
-        let types = types.join(", ");
-        format!("Merge these isinstance calls: `isinstance({obj}, ({types}))`")
+        let RepeatedIsinstanceCalls { expr } = self;
+        format!("Merge `isinstance` calls: `{expr}`")
+    }
+
+    fn autofix_title(&self) -> String {
+        let RepeatedIsinstanceCalls { expr } = self;
+        format!("Replace with `{expr}`")
     }
 }
 
 /// PLR1701
-pub fn repeated_isinstance_calls(checker: &mut Checker, expr: &Expr, op: &Boolop, values: &[Expr]) {
-    if !matches!(op, Boolop::Or) || !checker.ctx.is_builtin("isinstance") {
+pub(crate) fn repeated_isinstance_calls(
+    checker: &mut Checker,
+    expr: &Expr,
+    op: Boolop,
+    values: &[Expr],
+) {
+    if !op.is_or() {
         return;
     }
 
     let mut obj_to_types: FxHashMap<HashableExpr, (usize, FxHashSet<HashableExpr>)> =
         FxHashMap::default();
     for value in values {
-        let ExprKind::Call { func, args, .. } = &value.node else {
+        let Expr::Call(ast::ExprCall { func, args, .. }) = value else {
             continue;
         };
-        if !matches!(&func.node, ExprKind::Name { id, .. } if id == "isinstance") {
+        if !matches!(func.as_ref(), Expr::Name(ast::ExprName { id, .. }) if id == "isinstance") {
             continue;
         }
         let [obj, types] = &args[..] else {
             continue;
         };
+        if !checker.semantic_model().is_builtin("isinstance") {
+            return;
+        }
         let (num_calls, matches) = obj_to_types
             .entry(obj.into())
             .or_insert_with(|| (0, FxHashSet::default()));
 
         *num_calls += 1;
-        matches.extend(match &types.node {
-            ExprKind::Tuple { elts, .. } => elts.iter().map(HashableExpr::from_expr).collect(),
+        matches.extend(match types {
+            Expr::Tuple(ast::ExprTuple { elts, .. }) => {
+                elts.iter().map(HashableExpr::from_expr).collect()
+            }
             _ => {
                 vec![types.into()]
             }
@@ -57,18 +99,33 @@ pub fn repeated_isinstance_calls(checker: &mut Checker, expr: &Expr, op: &Boolop
 
     for (obj, (num_calls, types)) in obj_to_types {
         if num_calls > 1 && types.len() > 1 {
-            checker.diagnostics.push(Diagnostic::new(
-                RepeatedIsinstanceCalls {
-                    obj: unparse_expr(obj.as_expr(), checker.stylist),
-                    types: types
-                        .iter()
-                        .map(HashableExpr::as_expr)
-                        .map(|expr| unparse_expr(expr, checker.stylist))
-                        .sorted()
-                        .collect(),
-                },
-                expr.range(),
-            ));
+            let call = merged_isinstance_call(
+                &checker.generator().expr(obj.as_expr()),
+                types
+                    .iter()
+                    .map(HashableExpr::as_expr)
+                    .map(|expr| checker.generator().expr(expr))
+                    .sorted(),
+                checker.settings.target_version,
+            );
+            let mut diagnostic =
+                Diagnostic::new(RepeatedIsinstanceCalls { expr: call.clone() }, expr.range());
+            if checker.patch(diagnostic.kind.rule()) {
+                diagnostic.set_fix(Fix::automatic(Edit::range_replacement(call, expr.range())));
+            }
+            checker.diagnostics.push(diagnostic);
         }
     }
 }
+
+fn merged_isinstance_call(
+    obj: &str,
+    types: impl IntoIterator<Item = String>,
+    target_version: PythonVersion,
+) -> String {
+    if target_version >= PythonVersion::Py310 {
+        format!("isinstance({}, {})", obj, types.into_iter().join(" | "))
+    } else {
+        format!("isinstance({}, ({}))", obj, types.into_iter().join(", "))
+    }
+}
diff --git a/crates/ruff/src/rules/pylint/rules/return_in_init.rs b/crates/ruff/src/rules/pylint/rules/return_in_init.rs
index ddf1c715ae848..0bd7cd77583be 100644
--- a/crates/ruff/src/rules/pylint/rules/return_in_init.rs
+++ b/crates/ruff/src/rules/pylint/rules/return_in_init.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Constant, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Constant, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -43,15 +43,15 @@ impl Violation for ReturnInInit {
 }
 
 /// PLE0101
-pub fn return_in_init(checker: &mut Checker, stmt: &Stmt) {
-    if let StmtKind::Return { value } = &stmt.node {
+pub(crate) fn return_in_init(checker: &mut Checker, stmt: &Stmt) {
+    if let Stmt::Return(ast::StmtReturn { value, range: _ }) = stmt {
         if let Some(expr) = value {
             if matches!(
-                expr.node,
-                ExprKind::Constant {
+                expr.as_ref(),
+                Expr::Constant(ast::ExprConstant {
                     value: Constant::None,
                     ..
-                }
+                })
             ) {
                 // Explicit `return None`.
                 return;
@@ -62,7 +62,7 @@ pub fn return_in_init(checker: &mut Checker, stmt: &Stmt) {
         }
     }
 
-    if in_dunder_init(checker) {
+    if in_dunder_init(checker.semantic_model(), checker.settings) {
         checker
             .diagnostics
             .push(Diagnostic::new(ReturnInInit, stmt.range()));
diff --git a/crates/ruff/src/rules/pylint/rules/sys_exit_alias.rs b/crates/ruff/src/rules/pylint/rules/sys_exit_alias.rs
index cc563eba2b456..e9dccdd1cdcc4 100644
--- a/crates/ruff/src/rules/pylint/rules/sys_exit_alias.rs
+++ b/crates/ruff/src/rules/pylint/rules/sys_exit_alias.rs
@@ -1,15 +1,44 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
 use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
-use crate::autofix::actions::get_or_import_symbol;
 use crate::checkers::ast::Checker;
+use crate::importer::ImportRequest;
 use crate::registry::AsRule;
 
+/// ## What it does
+/// Checks for uses of the `exit()` and `quit()`.
+///
+/// ## Why is this bad?
+/// `exit` and `quit` come from the `site` module, which is typically imported
+/// automatically during startup. However, it is not _guaranteed_ to be
+/// imported, and so using these functions may result in a `NameError` at
+/// runtime. Generally, these constants are intended to be used in an interactive
+/// interpreter, and not in programs.
+///
+/// Prefer `sys.exit()`, as the `sys` module is guaranteed to exist in all
+/// contexts.
+///
+/// ## Example
+/// ```python
+/// if __name__ == "__main__":
+///     exit()
+/// ```
+///
+/// Use instead:
+/// ```python
+/// import sys
+///
+/// if __name__ == "__main__":
+///     sys.exit()
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/library/constants.html#constants-added-by-the-site-module)
 #[violation]
 pub struct SysExitAlias {
-    pub name: String,
+    name: String,
 }
 
 impl Violation for SysExitAlias {
@@ -21,21 +50,22 @@ impl Violation for SysExitAlias {
         format!("Use `sys.exit()` instead of `{name}`")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        Some(|SysExitAlias { name }| format!("Replace `{name}` with `sys.exit()`"))
+    fn autofix_title(&self) -> Option<String> {
+        let SysExitAlias { name } = self;
+        Some(format!("Replace `{name}` with `sys.exit()`"))
     }
 }
 
 /// PLR1722
-pub fn sys_exit_alias(checker: &mut Checker, func: &Expr) {
-    let ExprKind::Name { id, .. } = &func.node else {
+pub(crate) fn sys_exit_alias(checker: &mut Checker, func: &Expr) {
+    let Expr::Name(ast::ExprName { id, .. }) = func else {
         return;
     };
     for name in ["exit", "quit"] {
         if id != name {
             continue;
         }
-        if !checker.ctx.is_builtin(name) {
+        if !checker.semantic_model().is_builtin(name) {
             continue;
         }
         let mut diagnostic = Diagnostic::new(
@@ -46,15 +76,14 @@ pub fn sys_exit_alias(checker: &mut Checker, func: &Expr) {
         );
         if checker.patch(diagnostic.kind.rule()) {
             diagnostic.try_set_fix(|| {
-                let (import_edit, binding) = get_or_import_symbol(
-                    "sys",
-                    "exit",
-                    &checker.ctx,
-                    &checker.importer,
-                    checker.locator,
+                let (import_edit, binding) = checker.importer.get_or_import_symbol(
+                    &ImportRequest::import("sys", "exit"),
+                    func.start(),
+                    checker.semantic_model(),
                 )?;
                 let reference_edit = Edit::range_replacement(binding, func.range());
-                Ok(Fix::from_iter([import_edit, reference_edit]))
+                #[allow(deprecated)]
+                Ok(Fix::unspecified_edits(import_edit, [reference_edit]))
             });
         }
         checker.diagnostics.push(diagnostic);
diff --git a/crates/ruff/src/rules/pylint/rules/too_many_arguments.rs b/crates/ruff/src/rules/pylint/rules/too_many_arguments.rs
index e39a5d0bf0546..bd06b69c99560 100644
--- a/crates/ruff/src/rules/pylint/rules/too_many_arguments.rs
+++ b/crates/ruff/src/rules/pylint/rules/too_many_arguments.rs
@@ -6,10 +6,47 @@ use ruff_python_ast::helpers::identifier_range;
 
 use crate::checkers::ast::Checker;
 
+/// ## What it does
+/// Checks for function definitions that include too many arguments.
+///
+/// By default, this rule allows up to five arguments, as configured by the
+/// `pylint.max-args` option.
+///
+/// ## Why is this bad?
+/// Functions with many arguments are harder to understand, maintain, and call.
+/// Consider refactoring functions with many arguments into smaller functions
+/// with fewer arguments, or using objects to group related arguments.
+///
+/// ## Example
+/// ```python
+/// def calculate_position(x_pos, y_pos, z_pos, x_vel, y_vel, z_vel, time):
+///     new_x = x_pos + x_vel * time
+///     new_y = y_pos + y_vel * time
+///     new_z = z_pos + z_vel * time
+///     return new_x, new_y, new_z
+/// ```
+///
+/// Use instead:
+/// ```python
+/// from typing import NamedTuple
+///
+///
+/// class Vector(NamedTuple):
+///     x: float
+///     y: float
+///     z: float
+///
+///
+/// def calculate_position(pos: Vector, vel: Vector, time: float) -> Vector:
+///     return Vector(*(p + v * time for p, v in zip(pos, vel)))
+/// ```
+///
+/// ## Options
+/// - `pylint.max-args`
 #[violation]
 pub struct TooManyArguments {
-    pub c_args: usize,
-    pub max_args: usize,
+    c_args: usize,
+    max_args: usize,
 }
 
 impl Violation for TooManyArguments {
@@ -21,11 +58,13 @@ impl Violation for TooManyArguments {
 }
 
 /// PLR0913
-pub fn too_many_arguments(checker: &mut Checker, args: &Arguments, stmt: &Stmt) {
+pub(crate) fn too_many_arguments(checker: &mut Checker, args: &Arguments, stmt: &Stmt) {
     let num_args = args
         .args
         .iter()
-        .filter(|arg| !checker.settings.dummy_variable_rgx.is_match(&arg.node.arg))
+        .chain(args.kwonlyargs.iter())
+        .chain(args.posonlyargs.iter())
+        .filter(|arg| !checker.settings.dummy_variable_rgx.is_match(&arg.arg))
         .count();
     if num_args > checker.settings.pylint.max_args {
         checker.diagnostics.push(Diagnostic::new(
diff --git a/crates/ruff/src/rules/pylint/rules/too_many_branches.rs b/crates/ruff/src/rules/pylint/rules/too_many_branches.rs
index 86d31810dee61..449a261d2b20d 100644
--- a/crates/ruff/src/rules/pylint/rules/too_many_branches.rs
+++ b/crates/ruff/src/rules/pylint/rules/too_many_branches.rs
@@ -1,14 +1,78 @@
-use rustpython_parser::ast::{ExcepthandlerKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Excepthandler, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::identifier_range;
 use ruff_python_ast::source_code::Locator;
 
+/// ## What it does
+/// Checks for functions or methods with too many branches.
+///
+/// By default, this rule allows up to 12 branches. This can be configured
+/// using the `max-branches` option.
+///
+/// ## Why is this bad?
+/// Functions or methods with many branches are harder to understand
+/// and maintain than functions or methods with fewer branches.
+///
+/// ## Example
+/// ```python
+/// def capital(country):
+///     if country == "Australia":
+///         return "Canberra"
+///     elif country == "Brazil":
+///         return "Brasilia"
+///     elif country == "Canada":
+///         return "Ottawa"
+///     elif country == "England":
+///         return "London"
+///     elif country == "France":
+///         return "Paris"
+///     elif country == "Germany":
+///         return "Berlin"
+///     elif country == "Poland":
+///         return "Warsaw"
+///     elif country == "Romania":
+///         return "Bucharest"
+///     elif country == "Spain":
+///         return "Madrid"
+///     elif country == "Thailand":
+///         return "Bangkok"
+///     elif country == "Turkey":
+///         return "Ankara"
+///     elif country == "United States":
+///         return "Washington"
+///     else:
+///         return "Unknown"  # 13th branch
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def capital(country):
+///     capitals = {
+///         "Australia": "Canberra",
+///         "Brazil": "Brasilia",
+///         "Canada": "Ottawa",
+///         "England": "London",
+///         "France": "Paris",
+///         "Germany": "Berlin",
+///         "Poland": "Warsaw",
+///         "Romania": "Bucharest",
+///         "Spain": "Madrid",
+///         "Thailand": "Bangkok",
+///         "Turkey": "Ankara",
+///         "United States": "Washington",
+///     }
+///     city = capitals.get(country, "Unknown")
+///     return city
+/// ```
+///
+/// ## References
+/// - [Ruff configuration documentation](https://beta.ruff.rs/docs/settings/#max-branches)
 #[violation]
 pub struct TooManyBranches {
-    pub branches: usize,
-    pub max_branches: usize,
+    branches: usize,
+    max_branches: usize,
 }
 
 impl Violation for TooManyBranches {
@@ -26,27 +90,27 @@ fn num_branches(stmts: &[Stmt]) -> usize {
     stmts
         .iter()
         .map(|stmt| {
-            match &stmt.node {
-                StmtKind::If { body, orelse, .. } => {
+            match stmt {
+                Stmt::If(ast::StmtIf { body, orelse, .. }) => {
                     1 + num_branches(body)
                         + (if let Some(stmt) = orelse.first() {
                             // `elif:` and `else: if:` have the same AST representation.
                             // Avoid treating `elif:` as two statements.
-                            usize::from(!matches!(stmt.node, StmtKind::If { .. }))
+                            usize::from(!stmt.is_if_stmt())
                         } else {
                             0
                         })
                         + num_branches(orelse)
                 }
-                StmtKind::Match { cases, .. } => {
+                Stmt::Match(ast::StmtMatch { cases, .. }) => {
                     1 + cases
                         .iter()
                         .map(|case| num_branches(&case.body))
                         .sum::<usize>()
                 }
-                StmtKind::For { body, orelse, .. }
-                | StmtKind::AsyncFor { body, orelse, .. }
-                | StmtKind::While { body, orelse, .. } => {
+                Stmt::For(ast::StmtFor { body, orelse, .. })
+                | Stmt::AsyncFor(ast::StmtAsyncFor { body, orelse, .. })
+                | Stmt::While(ast::StmtWhile { body, orelse, .. }) => {
                     1 + num_branches(body)
                         + (if orelse.is_empty() {
                             0
@@ -54,18 +118,20 @@ fn num_branches(stmts: &[Stmt]) -> usize {
                             1 + num_branches(orelse)
                         })
                 }
-                StmtKind::Try {
+                Stmt::Try(ast::StmtTry {
                     body,
                     handlers,
                     orelse,
                     finalbody,
-                }
-                | StmtKind::TryStar {
+                    range: _,
+                })
+                | Stmt::TryStar(ast::StmtTryStar {
                     body,
                     handlers,
                     orelse,
                     finalbody,
-                } => {
+                    range: _,
+                }) => {
                     1 + num_branches(body)
                         + (if orelse.is_empty() {
                             0
@@ -81,8 +147,9 @@ fn num_branches(stmts: &[Stmt]) -> usize {
                             .iter()
                             .map(|handler| {
                                 1 + {
-                                    let ExcepthandlerKind::ExceptHandler { body, .. } =
-                                        &handler.node;
+                                    let Excepthandler::ExceptHandler(
+                                        ast::ExcepthandlerExceptHandler { body, .. },
+                                    ) = handler;
                                     num_branches(body)
                                 }
                             })
@@ -95,7 +162,7 @@ fn num_branches(stmts: &[Stmt]) -> usize {
 }
 
 /// PLR0912
-pub fn too_many_branches(
+pub(crate) fn too_many_branches(
     stmt: &Stmt,
     body: &[Stmt],
     max_branches: usize,
@@ -118,12 +185,13 @@ pub fn too_many_branches(
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use rustpython_parser as parser;
+    use rustpython_parser::ast::Suite;
+    use rustpython_parser::Parse;
 
     use super::num_branches;
 
     fn test_helper(source: &str, expected_num_branches: usize) -> Result<()> {
-        let branches = parser::parse_program(source, "<filename>")?;
+        let branches = Suite::parse(source, "<filename>")?;
         assert_eq!(num_branches(&branches), expected_num_branches);
         Ok(())
     }
diff --git a/crates/ruff/src/rules/pylint/rules/too_many_return_statements.rs b/crates/ruff/src/rules/pylint/rules/too_many_return_statements.rs
index 687225e6e7803..2a4851706756a 100644
--- a/crates/ruff/src/rules/pylint/rules/too_many_return_statements.rs
+++ b/crates/ruff/src/rules/pylint/rules/too_many_return_statements.rs
@@ -4,12 +4,57 @@ use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::{identifier_range, ReturnStatementVisitor};
 use ruff_python_ast::source_code::Locator;
-use ruff_python_ast::visitor::Visitor;
+use ruff_python_ast::statement_visitor::StatementVisitor;
 
+/// ## What it does
+/// Checks for functions or methods with too many return statements.
+///
+/// By default, this rule allows up to six return statements, as configured by
+/// the `pylint.max-returns` option.
+///
+/// ## Why is this bad?
+/// Functions or methods with many return statements are harder to understand
+/// and maintain, and often indicative of complex logic.
+///
+/// ## Example
+/// ```python
+/// def capital(country: str) -> str | None:
+///     if country == "England":
+///         return "London"
+///     elif country == "France":
+///         return "Paris"
+///     elif country == "Poland":
+///         return "Warsaw"
+///     elif country == "Romania":
+///         return "Bucharest"
+///     elif country == "Spain":
+///         return "Madrid"
+///     elif country == "Thailand":
+///         return "Bangkok"
+///     else:
+///         return None
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def capital(country: str) -> str | None:
+///     capitals = {
+///         "England": "London",
+///         "France": "Paris",
+///         "Poland": "Warsaw",
+///         "Romania": "Bucharest",
+///         "Spain": "Madrid",
+///         "Thailand": "Bangkok",
+///     }
+///     return capitals.get(country)
+/// ```
+///
+/// ## Options
+/// - `pylint.max-returns`
 #[violation]
 pub struct TooManyReturnStatements {
-    pub returns: usize,
-    pub max_returns: usize,
+    returns: usize,
+    max_returns: usize,
 }
 
 impl Violation for TooManyReturnStatements {
@@ -31,7 +76,7 @@ fn num_returns(body: &[Stmt]) -> usize {
 }
 
 /// PLR0911
-pub fn too_many_return_statements(
+pub(crate) fn too_many_return_statements(
     stmt: &Stmt,
     body: &[Stmt],
     max_returns: usize,
@@ -54,12 +99,13 @@ pub fn too_many_return_statements(
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use rustpython_parser as parser;
+    use rustpython_parser::ast::Suite;
+    use rustpython_parser::Parse;
 
     use super::num_returns;
 
     fn test_helper(source: &str, expected: usize) -> Result<()> {
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(num_returns(&stmts), expected);
         Ok(())
     }
diff --git a/crates/ruff/src/rules/pylint/rules/too_many_statements.rs b/crates/ruff/src/rules/pylint/rules/too_many_statements.rs
index 8a07fe92b0ffa..87f3d57e9f0cb 100644
--- a/crates/ruff/src/rules/pylint/rules/too_many_statements.rs
+++ b/crates/ruff/src/rules/pylint/rules/too_many_statements.rs
@@ -1,14 +1,55 @@
-use rustpython_parser::ast::{ExcepthandlerKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Excepthandler, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::identifier_range;
 use ruff_python_ast::source_code::Locator;
 
+/// ## What it does
+/// Checks for functions or methods with too many statements.
+///
+/// By default, this rule allows up to 50 statements, as configured by the
+/// `pylint.max-statements` option.
+///
+/// ## Why is this bad?
+/// Functions or methods with many statements are harder to understand
+/// and maintain.
+///
+/// Instead, consider refactoring the function or method into smaller
+/// functions or methods, or identifying generalizable patterns and
+/// replacing them with generic logic or abstractions.
+///
+/// ## Example
+/// ```python
+/// def is_even(number: int) -> bool:
+///     if number == 0:
+///         return True
+///     elif number == 1:
+///         return False
+///     elif number == 2:
+///         return True
+///     elif number == 3:
+///         return False
+///     elif number == 4:
+///         return True
+///     elif number == 5:
+///         return False
+///     else:
+///         ...
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def is_even(number: int) -> bool:
+///     return number % 2 == 0
+/// ```
+///
+/// ## Options
+/// - `pylint.max-statements`
 #[violation]
 pub struct TooManyStatements {
-    pub statements: usize,
-    pub max_statements: usize,
+    statements: usize,
+    max_statements: usize,
 }
 
 impl Violation for TooManyStatements {
@@ -25,46 +66,49 @@ impl Violation for TooManyStatements {
 fn num_statements(stmts: &[Stmt]) -> usize {
     let mut count = 0;
     for stmt in stmts {
-        match &stmt.node {
-            StmtKind::If { body, orelse, .. } => {
+        match stmt {
+            Stmt::If(ast::StmtIf { body, orelse, .. }) => {
                 count += 1;
                 count += num_statements(body);
                 if let Some(stmt) = orelse.first() {
                     // `elif:` and `else: if:` have the same AST representation.
                     // Avoid treating `elif:` as two statements.
-                    if !matches!(stmt.node, StmtKind::If { .. }) {
+                    if !stmt.is_if_stmt() {
                         count += 1;
                     }
                     count += num_statements(orelse);
                 }
             }
-            StmtKind::For { body, orelse, .. } | StmtKind::AsyncFor { body, orelse, .. } => {
+            Stmt::For(ast::StmtFor { body, orelse, .. })
+            | Stmt::AsyncFor(ast::StmtAsyncFor { body, orelse, .. }) => {
                 count += num_statements(body);
                 count += num_statements(orelse);
             }
-            StmtKind::While { body, orelse, .. } => {
+            Stmt::While(ast::StmtWhile { body, orelse, .. }) => {
                 count += 1;
                 count += num_statements(body);
                 count += num_statements(orelse);
             }
-            StmtKind::Match { cases, .. } => {
+            Stmt::Match(ast::StmtMatch { cases, .. }) => {
                 count += 1;
                 for case in cases {
                     count += num_statements(&case.body);
                 }
             }
-            StmtKind::Try {
+            Stmt::Try(ast::StmtTry {
                 body,
                 handlers,
                 orelse,
                 finalbody,
-            }
-            | StmtKind::TryStar {
+                range: _,
+            })
+            | Stmt::TryStar(ast::StmtTryStar {
                 body,
                 handlers,
                 orelse,
                 finalbody,
-            } => {
+                range: _,
+            }) => {
                 count += 1;
                 count += num_statements(body);
                 if !orelse.is_empty() {
@@ -79,17 +123,19 @@ fn num_statements(stmts: &[Stmt]) -> usize {
                 }
                 for handler in handlers {
                     count += 1;
-                    let ExcepthandlerKind::ExceptHandler { body, .. } = &handler.node;
+                    let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler {
+                        body, ..
+                    }) = handler;
                     count += num_statements(body);
                 }
             }
-            StmtKind::FunctionDef { body, .. }
-            | StmtKind::AsyncFunctionDef { body, .. }
-            | StmtKind::With { body, .. } => {
+            Stmt::FunctionDef(ast::StmtFunctionDef { body, .. })
+            | Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef { body, .. })
+            | Stmt::With(ast::StmtWith { body, .. }) => {
                 count += 1;
                 count += num_statements(body);
             }
-            StmtKind::Return { .. } => {}
+            Stmt::Return(_) => {}
             _ => {
                 count += 1;
             }
@@ -99,13 +145,13 @@ fn num_statements(stmts: &[Stmt]) -> usize {
 }
 
 /// PLR0915
-pub fn too_many_statements(
+pub(crate) fn too_many_statements(
     stmt: &Stmt,
     body: &[Stmt],
     max_statements: usize,
     locator: &Locator,
 ) -> Option<Diagnostic> {
-    let statements = num_statements(body) + 1;
+    let statements = num_statements(body);
     if statements > max_statements {
         Some(Diagnostic::new(
             TooManyStatements {
@@ -122,17 +168,18 @@ pub fn too_many_statements(
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use rustpython_parser as parser;
+    use rustpython_parser::ast::Suite;
+    use rustpython_parser::Parse;
 
     use super::num_statements;
 
     #[test]
     fn pass() -> Result<()> {
         let source: &str = r#"
-def f():  # 2
+def f():
     pass
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(num_statements(&stmts), 2);
         Ok(())
     }
@@ -146,7 +193,7 @@ def f():
     else:
         print()
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(num_statements(&stmts), 5);
         Ok(())
     }
@@ -161,7 +208,7 @@ def f():
         if a:
             print()
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(num_statements(&stmts), 5);
         Ok(())
     }
@@ -169,13 +216,13 @@ def f():
     #[test]
     fn if_elif() -> Result<()> {
         let source: &str = r#"
-def f():  # 5
+def f():
     if a:
         print()
     elif a:
         print()
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(num_statements(&stmts), 5);
         Ok(())
     }
@@ -183,7 +230,7 @@ def f():  # 5
     #[test]
     fn if_elif_else() -> Result<()> {
         let source: &str = r#"
-def f():  # 9
+def f():
     if a:
         print()
     elif a == 2:
@@ -193,7 +240,7 @@ def f():  # 9
     else:
         print()
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(num_statements(&stmts), 9);
         Ok(())
     }
@@ -201,7 +248,7 @@ def f():  # 9
     #[test]
     fn many_statements() -> Result<()> {
         let source: &str = r#"
-async def f():  # 19
+async def f():
     a = 1
     b = 2
     c = 3
@@ -222,7 +269,7 @@ async def f():  # 19
             import time
             pass
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(num_statements(&stmts), 19);
         Ok(())
     }
@@ -230,11 +277,11 @@ async def f():  # 19
     #[test]
     fn for_() -> Result<()> {
         let source: &str = r#"
-def f():  # 2
+def f():
     for i in range(10):
         pass
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(num_statements(&stmts), 2);
         Ok(())
     }
@@ -242,13 +289,13 @@ def f():  # 2
     #[test]
     fn for_else() -> Result<()> {
         let source: &str = r#"
-def f():  # 3
+def f():
     for i in range(10):
         print()
     else:
         print()
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(num_statements(&stmts), 3);
         Ok(())
     }
@@ -256,14 +303,14 @@ def f():  # 3
     #[test]
     fn nested_def() -> Result<()> {
         let source: &str = r#"
-def f():  # 5
+def f():
     def g():
         print()
         print()
 
     print()
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(num_statements(&stmts), 5);
         Ok(())
     }
@@ -271,7 +318,7 @@ def f():  # 5
     #[test]
     fn nested_class() -> Result<()> {
         let source: &str = r#"
-def f():  # 3
+def f():
     class A:
         def __init__(self):
             pass
@@ -281,7 +328,7 @@ def f():  # 3
 
     print()
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(num_statements(&stmts), 3);
         Ok(())
     }
@@ -292,7 +339,7 @@ def f():  # 3
 def f():
     return
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(num_statements(&stmts), 1);
         Ok(())
     }
@@ -300,7 +347,7 @@ def f():
     #[test]
     fn with() -> Result<()> {
         let source: &str = r#"
-def f():  # 6
+def f():
     with a:
         if a:
             print()
@@ -308,7 +355,7 @@ def f():  # 6
             print()
 
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(num_statements(&stmts), 6);
         Ok(())
     }
@@ -316,13 +363,13 @@ def f():  # 6
     #[test]
     fn try_except() -> Result<()> {
         let source: &str = r#"
-def f():  # 5
+def f():
     try:
         print()
     except Exception:
         raise
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(num_statements(&stmts), 5);
         Ok(())
     }
@@ -330,7 +377,7 @@ def f():  # 5
     #[test]
     fn try_except_else() -> Result<()> {
         let source: &str = r#"
-def f():  # 7
+def f():
     try:
         print()
     except ValueError:
@@ -338,7 +385,7 @@ def f():  # 7
     else:
         print()
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(num_statements(&stmts), 7);
         Ok(())
     }
@@ -346,7 +393,7 @@ def f():  # 7
     #[test]
     fn try_except_else_finally() -> Result<()> {
         let source: &str = r#"
-def f():  # 10
+def f():
     try:
         print()
     except ValueError:
@@ -356,7 +403,7 @@ def f():  # 10
     finally:
         pass
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(num_statements(&stmts), 10);
         Ok(())
     }
@@ -364,7 +411,7 @@ def f():  # 10
     #[test]
     fn try_except_except() -> Result<()> {
         let source: &str = r#"
-def f():  # 8
+def f():
     try:
         print()
     except ValueError:
@@ -372,7 +419,7 @@ def f():  # 8
     except Exception:
         raise
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(num_statements(&stmts), 8);
         Ok(())
     }
@@ -380,7 +427,7 @@ def f():  # 8
     #[test]
     fn try_except_except_finally() -> Result<()> {
         let source: &str = r#"
-def f():  # 11
+def f():
     try:
         print()
     except:
@@ -390,7 +437,7 @@ def f():  # 11
     finally:
         print()
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(num_statements(&stmts), 11);
         Ok(())
     }
@@ -398,11 +445,11 @@ def f():  # 11
     #[test]
     fn yield_() -> Result<()> {
         let source: &str = r#"
-def f():  # 2
+def f():
     for i in range(10):
         yield i
 "#;
-        let stmts = parser::parse_program(source, "<filename>")?;
+        let stmts = Suite::parse(source, "<filename>")?;
         assert_eq!(num_statements(&stmts), 2);
         Ok(())
     }
diff --git a/crates/ruff/src/rules/pylint/rules/unexpected_special_method_signature.rs b/crates/ruff/src/rules/pylint/rules/unexpected_special_method_signature.rs
index b02f046bf2460..94b8cdbf0a7ed 100644
--- a/crates/ruff/src/rules/pylint/rules/unexpected_special_method_signature.rs
+++ b/crates/ruff/src/rules/pylint/rules/unexpected_special_method_signature.rs
@@ -7,12 +7,11 @@ use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::identifier_range;
 use ruff_python_ast::source_code::Locator;
 use ruff_python_semantic::analyze::visibility::is_staticmethod;
-use ruff_python_semantic::scope::ScopeKind;
 
 use crate::checkers::ast::Checker;
 
 #[derive(Debug, Eq, PartialEq)]
-pub enum ExpectedParams {
+pub(crate) enum ExpectedParams {
     Fixed(usize),
     Range(usize, usize),
 }
@@ -75,11 +74,48 @@ impl ExpectedParams {
     }
 }
 
+/// ## What it does
+/// Checks for "special" methods that have an unexpected method signature.
+///
+/// ## Why is this bad?
+/// "Special" methods, like `__len__`, are expected to adhere to a specific,
+/// standard function signature. Implementing a "special" method using a
+/// non-standard function signature can lead to unexpected and surprising
+/// behavior for users of a given class.
+///
+/// ## Example
+/// ```python
+/// class Bookshelf:
+///     def __init__(self):
+///         self._books = ["Foo", "Bar", "Baz"]
+///
+///     def __len__(self, index):  # __len__ does not except an index parameter
+///         return len(self._books)
+///
+///     def __getitem__(self, index):
+///         return self._books[index]
+/// ```
+///
+/// Use instead:
+/// ```python
+/// class Bookshelf:
+///     def __init__(self):
+///         self._books = ["Foo", "Bar", "Baz"]
+///
+///     def __len__(self):
+///         return len(self._books)
+///
+///     def __getitem__(self, index):
+///         return self._books[index]
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/reference/datamodel.html)
 #[violation]
 pub struct UnexpectedSpecialMethodSignature {
-    pub method_name: String,
-    pub expected_params: ExpectedParams,
-    pub actual_params: usize,
+    method_name: String,
+    expected_params: ExpectedParams,
+    actual_params: usize,
 }
 
 impl Violation for UnexpectedSpecialMethodSignature {
@@ -101,7 +137,7 @@ impl Violation for UnexpectedSpecialMethodSignature {
 }
 
 /// PLE0302
-pub fn unexpected_special_method_signature(
+pub(crate) fn unexpected_special_method_signature(
     checker: &mut Checker,
     stmt: &Stmt,
     name: &str,
@@ -109,7 +145,12 @@ pub fn unexpected_special_method_signature(
     args: &Arguments,
     locator: &Locator,
 ) {
-    if !matches!(checker.ctx.scope().kind, ScopeKind::Class(_)) {
+    if !checker.semantic_model().scope().kind.is_class() {
+        return;
+    }
+
+    // Ignore methods with positional-only or keyword-only parameters, or variadic parameters.
+    if !args.posonlyargs.is_empty() || !args.kwonlyargs.is_empty() || args.kwarg.is_some() {
         return;
     }
 
@@ -122,22 +163,26 @@ pub fn unexpected_special_method_signature(
     let optional_params = args.defaults.len();
     let mandatory_params = actual_params - optional_params;
 
-    let Some(expected_params) = ExpectedParams::from_method(name, is_staticmethod(&checker.ctx, decorator_list)) else {
+    let Some(expected_params) = ExpectedParams::from_method(name, is_staticmethod(checker.semantic_model(), decorator_list)) else {
         return;
     };
 
-    let emit = match expected_params {
-        ExpectedParams::Range(min, max) => !(min..=max).contains(&actual_params),
-        ExpectedParams::Fixed(expected) => match expected.cmp(&mandatory_params) {
-            Ordering::Less => true,
-            Ordering::Greater => {
-                args.vararg.is_none() && optional_params < (expected - mandatory_params)
+    let valid_signature = match expected_params {
+        ExpectedParams::Range(min, max) => {
+            if mandatory_params >= min {
+                mandatory_params <= max
+            } else {
+                args.vararg.is_some() || actual_params <= max
             }
-            Ordering::Equal => false,
+        }
+        ExpectedParams::Fixed(expected) => match expected.cmp(&mandatory_params) {
+            Ordering::Less => false,
+            Ordering::Greater => args.vararg.is_some() || actual_params >= expected,
+            Ordering::Equal => true,
         },
     };
 
-    if emit {
+    if !valid_signature {
         checker.diagnostics.push(Diagnostic::new(
             UnexpectedSpecialMethodSignature {
                 method_name: name.to_owned(),
diff --git a/crates/ruff/src/rules/pylint/rules/unnecessary_direct_lambda_call.rs b/crates/ruff/src/rules/pylint/rules/unnecessary_direct_lambda_call.rs
index 9bc6c86184b08..32207ad8850e1 100644
--- a/crates/ruff/src/rules/pylint/rules/unnecessary_direct_lambda_call.rs
+++ b/crates/ruff/src/rules/pylint/rules/unnecessary_direct_lambda_call.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -14,12 +14,12 @@ use crate::checkers::ast::Checker;
 ///
 /// ## Example
 /// ```python
-/// area = (lambda r: 3.14 * r ** 2)(radius)
+/// area = (lambda r: 3.14 * r**2)(radius)
 /// ```
 ///
 /// Use instead:
 /// ```python
-/// area = 3.14 * radius ** 2
+/// area = 3.14 * radius**2
 /// ```
 ///
 /// ## References
@@ -35,8 +35,8 @@ impl Violation for UnnecessaryDirectLambdaCall {
 }
 
 /// PLC3002
-pub fn unnecessary_direct_lambda_call(checker: &mut Checker, expr: &Expr, func: &Expr) {
-    if let ExprKind::Lambda { .. } = &func.node {
+pub(crate) fn unnecessary_direct_lambda_call(checker: &mut Checker, expr: &Expr, func: &Expr) {
+    if let Expr::Lambda(_) = func {
         checker
             .diagnostics
             .push(Diagnostic::new(UnnecessaryDirectLambdaCall, expr.range()));
diff --git a/crates/ruff/src/rules/pylint/rules/useless_else_on_loop.rs b/crates/ruff/src/rules/pylint/rules/useless_else_on_loop.rs
index 691606fb52369..79404a5bcaa88 100644
--- a/crates/ruff/src/rules/pylint/rules/useless_else_on_loop.rs
+++ b/crates/ruff/src/rules/pylint/rules/useless_else_on_loop.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{ExcepthandlerKind, MatchCase, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Excepthandler, MatchCase, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -6,6 +6,38 @@ use ruff_python_ast::helpers;
 
 use crate::checkers::ast::Checker;
 
+/// ## What it does
+/// Checks for `else` clauses on loops without a `break` statement.
+///
+/// ## Why is this bad?
+/// When a loop includes an `else` statement, the code inside the `else` clause
+/// will be executed if the loop terminates "normally" (i.e., without a
+/// `break`).
+///
+/// If a loop _always_ terminates "normally" (i.e., does _not_ contain a
+/// `break`), then the `else` clause is redundant, as the code inside the
+/// `else` clause will always be executed.
+///
+/// In such cases, the code inside the `else` clause can be moved outside the
+/// loop entirely, and the `else` clause can be removed.
+///
+/// ## Example
+/// ```python
+/// for item in items:
+///     print(item)
+/// else:
+///     print("All items printed")
+/// ```
+///
+/// Use instead:
+/// ```python
+/// for item in items:
+///     print(item)
+/// print("All items printed")
+/// ```
+///
+/// ## References
+/// - [Python documentation](https://docs.python.org/3/tutorial/controlflow.html#break-and-continue-statements-and-else-clauses-on-loops)
 #[violation]
 pub struct UselessElseOnLoop;
 
@@ -20,43 +52,53 @@ impl Violation for UselessElseOnLoop {
 }
 
 fn loop_exits_early(body: &[Stmt]) -> bool {
-    body.iter().any(|stmt| match &stmt.node {
-        StmtKind::If { body, orelse, .. } => loop_exits_early(body) || loop_exits_early(orelse),
-        StmtKind::With { body, .. } | StmtKind::AsyncWith { body, .. } => loop_exits_early(body),
-        StmtKind::Match { cases, .. } => cases
+    body.iter().any(|stmt| match stmt {
+        Stmt::If(ast::StmtIf { body, orelse, .. }) => {
+            loop_exits_early(body) || loop_exits_early(orelse)
+        }
+        Stmt::With(ast::StmtWith { body, .. })
+        | Stmt::AsyncWith(ast::StmtAsyncWith { body, .. }) => loop_exits_early(body),
+        Stmt::Match(ast::StmtMatch { cases, .. }) => cases
             .iter()
             .any(|MatchCase { body, .. }| loop_exits_early(body)),
-        StmtKind::Try {
+        Stmt::Try(ast::StmtTry {
             body,
             handlers,
             orelse,
             finalbody,
             ..
-        }
-        | StmtKind::TryStar {
+        })
+        | Stmt::TryStar(ast::StmtTryStar {
             body,
             handlers,
             orelse,
             finalbody,
             ..
-        } => {
+        }) => {
             loop_exits_early(body)
                 || loop_exits_early(orelse)
                 || loop_exits_early(finalbody)
-                || handlers.iter().any(|handler| match &handler.node {
-                    ExcepthandlerKind::ExceptHandler { body, .. } => loop_exits_early(body),
+                || handlers.iter().any(|handler| match handler {
+                    Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler {
+                        body, ..
+                    }) => loop_exits_early(body),
                 })
         }
-        StmtKind::For { orelse, .. }
-        | StmtKind::AsyncFor { orelse, .. }
-        | StmtKind::While { orelse, .. } => loop_exits_early(orelse),
-        StmtKind::Break { .. } => true,
+        Stmt::For(ast::StmtFor { orelse, .. })
+        | Stmt::AsyncFor(ast::StmtAsyncFor { orelse, .. })
+        | Stmt::While(ast::StmtWhile { orelse, .. }) => loop_exits_early(orelse),
+        Stmt::Break(_) => true,
         _ => false,
     })
 }
 
 /// PLW0120
-pub fn useless_else_on_loop(checker: &mut Checker, stmt: &Stmt, body: &[Stmt], orelse: &[Stmt]) {
+pub(crate) fn useless_else_on_loop(
+    checker: &mut Checker,
+    stmt: &Stmt,
+    body: &[Stmt],
+    orelse: &[Stmt],
+) {
     if !orelse.is_empty() && !loop_exits_early(body) {
         checker.diagnostics.push(Diagnostic::new(
             UselessElseOnLoop,
diff --git a/crates/ruff/src/rules/pylint/rules/useless_import_alias.rs b/crates/ruff/src/rules/pylint/rules/useless_import_alias.rs
index 3249e80a6b75a..7c657a584056c 100644
--- a/crates/ruff/src/rules/pylint/rules/useless_import_alias.rs
+++ b/crates/ruff/src/rules/pylint/rules/useless_import_alias.rs
@@ -1,6 +1,6 @@
-use rustpython_parser::ast::Alias;
+use rustpython_parser::ast::{Alias, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
@@ -36,20 +36,24 @@ impl AlwaysAutofixableViolation for UselessImportAlias {
 }
 
 /// PLC0414
-pub fn useless_import_alias(checker: &mut Checker, alias: &Alias) {
-    let Some(asname) = &alias.node.asname else {
+pub(crate) fn useless_import_alias(checker: &mut Checker, alias: &Alias) {
+    let Some(asname) = &alias.asname else {
         return;
     };
-    if alias.node.name.contains('.') {
+    if alias.name.contains('.') {
         return;
     }
-    if &alias.node.name != asname {
+    if &alias.name != asname {
         return;
     }
 
     let mut diagnostic = Diagnostic::new(UselessImportAlias, alias.range());
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(asname.to_string(), alias.range()));
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+            asname.to_string(),
+            alias.range(),
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/pylint/rules/useless_return.rs b/crates/ruff/src/rules/pylint/rules/useless_return.rs
index 52c24da5f7d79..82436e976e950 100644
--- a/crates/ruff/src/rules/pylint/rules/useless_return.rs
+++ b/crates/ruff/src/rules/pylint/rules/useless_return.rs
@@ -1,13 +1,11 @@
-use log::error;
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Constant, Expr, Ranged, Stmt};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::{is_const_none, ReturnStatementVisitor};
-use ruff_python_ast::types::RefEquality;
-use ruff_python_ast::visitor::Visitor;
+use ruff_python_ast::statement_visitor::StatementVisitor;
 
-use crate::autofix::actions::delete_stmt;
+use crate::autofix;
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 
@@ -29,7 +27,7 @@ use crate::registry::AsRule;
 /// Use instead:
 /// ```python
 /// def f():
-///    print(5)
+///     print(5)
 /// ```
 #[violation]
 pub struct UselessReturn;
@@ -46,7 +44,7 @@ impl AlwaysAutofixableViolation for UselessReturn {
 }
 
 /// PLR1711
-pub fn useless_return<'a>(
+pub(crate) fn useless_return<'a>(
     checker: &mut Checker<'a>,
     stmt: &'a Stmt,
     body: &'a [Stmt],
@@ -57,14 +55,12 @@ pub fn useless_return<'a>(
         return;
     }
 
-    // Skip empty functions.
-    if body.is_empty() {
-        return;
-    }
-
     // Find the last statement in the function.
-    let last_stmt = body.last().unwrap();
-    if !matches!(last_stmt.node, StmtKind::Return { .. }) {
+    let Some(last_stmt) = body.last() else {
+        // Skip empty functions.
+        return;
+    };
+    if !last_stmt.is_return_stmt() {
         return;
     }
 
@@ -75,13 +71,13 @@ pub fn useless_return<'a>(
 
     // Skip functions that consist of a docstring and a return statement.
     if body.len() == 2 {
-        if let StmtKind::Expr { value } = &body[0].node {
+        if let Stmt::Expr(ast::StmtExpr { value, range: _ }) = &body[0] {
             if matches!(
-                value.node,
-                ExprKind::Constant {
+                value.as_ref(),
+                Expr::Constant(ast::ExprConstant {
                     value: Constant::Str(_),
                     ..
-                }
+                })
             ) {
                 return;
             }
@@ -89,7 +85,7 @@ pub fn useless_return<'a>(
     }
 
     // Verify that the last statement is a return statement.
-    let StmtKind::Return { value} = &last_stmt.node else {
+    let Stmt::Return(ast::StmtReturn { value, range: _}) = &last_stmt else {
         return;
     };
 
@@ -107,25 +103,14 @@ pub fn useless_return<'a>(
 
     let mut diagnostic = Diagnostic::new(UselessReturn, last_stmt.range());
     if checker.patch(diagnostic.kind.rule()) {
-        let deleted: Vec<&Stmt> = checker.deletions.iter().map(Into::into).collect();
-        match delete_stmt(
+        let edit = autofix::edits::delete_stmt(
             last_stmt,
             Some(stmt),
-            &deleted,
             checker.locator,
             checker.indexer,
             checker.stylist,
-        ) {
-            Ok(fix) => {
-                if fix.is_deletion() || fix.content() == Some("pass") {
-                    checker.deletions.insert(RefEquality(last_stmt));
-                }
-                diagnostic.set_fix(fix);
-            }
-            Err(e) => {
-                error!("Failed to delete `return` statement: {}", e);
-            }
-        };
+        );
+        diagnostic.set_fix(Fix::automatic(edit).isolate(checker.isolation(Some(stmt))));
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/pylint/rules/yield_from_in_async_function.rs b/crates/ruff/src/rules/pylint/rules/yield_from_in_async_function.rs
new file mode 100644
index 0000000000000..4895faa12a9dc
--- /dev/null
+++ b/crates/ruff/src/rules/pylint/rules/yield_from_in_async_function.rs
@@ -0,0 +1,47 @@
+use rustpython_parser::ast::{ExprYieldFrom, Ranged};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for uses of `yield from` in async functions.
+///
+/// ## Why is this bad?
+/// Python doesn't support the use of `yield from` in async functions, and will
+/// raise a `SyntaxError` in such cases.
+///
+/// Instead, considering refactoring the code to use an `async for` loop instead.
+///
+/// ## Example
+/// ```python
+/// async def numbers():
+///     yield from [1, 2, 3, 4, 5]
+/// ```
+///
+/// Use instead:
+/// ```python
+/// async def numbers():
+///     async for number in [1, 2, 3, 4, 5]:
+///         yield number
+/// ```
+#[violation]
+pub struct YieldFromInAsyncFunction;
+
+impl Violation for YieldFromInAsyncFunction {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("`yield from` statement in async function; use `async for` instead")
+    }
+}
+
+/// PLE1700
+pub(crate) fn yield_from_in_async_function(checker: &mut Checker, expr: &ExprYieldFrom) {
+    let scope = checker.semantic_model().scope();
+    if scope.kind.is_async_function() {
+        checker
+            .diagnostics
+            .push(Diagnostic::new(YieldFromInAsyncFunction, expr.range()));
+    }
+}
diff --git a/crates/ruff/src/rules/pylint/rules/yield_in_init.rs b/crates/ruff/src/rules/pylint/rules/yield_in_init.rs
index cee9a9cffd27f..9ee87e70a712a 100644
--- a/crates/ruff/src/rules/pylint/rules/yield_in_init.rs
+++ b/crates/ruff/src/rules/pylint/rules/yield_in_init.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::Expr;
+use rustpython_parser::ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -38,8 +38,8 @@ impl Violation for YieldInInit {
 }
 
 /// PLE0100
-pub fn yield_in_init(checker: &mut Checker, expr: &Expr) {
-    if in_dunder_init(checker) {
+pub(crate) fn yield_in_init(checker: &mut Checker, expr: &Expr) {
+    if in_dunder_init(checker.semantic_model(), checker.settings) {
         checker
             .diagnostics
             .push(Diagnostic::new(YieldInInit, expr.range()));
diff --git a/crates/ruff/src/rules/pylint/settings.rs b/crates/ruff/src/rules/pylint/settings.rs
index 518a897f10a1a..bc40d7b6a4123 100644
--- a/crates/ruff/src/rules/pylint/settings.rs
+++ b/crates/ruff/src/rules/pylint/settings.rs
@@ -2,13 +2,13 @@
 
 use anyhow::anyhow;
 use rustpython_parser::ast::Constant;
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use ruff_macros::{CacheKey, ConfigurationOptions};
+use ruff_macros::{CacheKey, CombineOptions, ConfigurationOptions};
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize, CacheKey, JsonSchema)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize, CacheKey)]
 #[serde(deny_unknown_fields, rename_all = "kebab-case")]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum ConstantType {
     Bytes,
     Complex,
@@ -37,13 +37,14 @@ impl TryFrom<&Constant> for ConstantType {
 }
 
 #[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, CombineOptions,
 )]
 #[serde(
     deny_unknown_fields,
     rename_all = "kebab-case",
     rename = "PylintOptions"
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = r#"["str", "bytes"]"#,
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLC0208_iteration_over_set.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLC0208_iteration_over_set.py.snap
new file mode 100644
index 0000000000000..88c00a735f2c8
--- /dev/null
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLC0208_iteration_over_set.py.snap
@@ -0,0 +1,53 @@
+---
+source: crates/ruff/src/rules/pylint/mod.rs
+---
+iteration_over_set.py:3:13: PLC0208 Use a sequence type instead of a `set` when iterating over values
+  |
+3 | # Errors
+4 | 
+5 | for item in {"apples", "lemons", "water"}:  # flags in-line set literals
+  |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PLC0208
+6 |     print(f"I like {item}.")
+  |
+
+iteration_over_set.py:6:28: PLC0208 Use a sequence type instead of a `set` when iterating over values
+   |
+ 6 |     print(f"I like {item}.")
+ 7 | 
+ 8 | numbers_list = [i for i in {1, 2, 3}]  # flags sets in list comprehensions
+   |                            ^^^^^^^^^ PLC0208
+ 9 | 
+10 | numbers_set = {i for i in {1, 2, 3}}  # flags sets in set comprehensions
+   |
+
+iteration_over_set.py:8:27: PLC0208 Use a sequence type instead of a `set` when iterating over values
+   |
+ 8 | numbers_list = [i for i in {1, 2, 3}]  # flags sets in list comprehensions
+ 9 | 
+10 | numbers_set = {i for i in {1, 2, 3}}  # flags sets in set comprehensions
+   |                           ^^^^^^^^^ PLC0208
+11 | 
+12 | numbers_dict = {str(i): i for i in {1, 2, 3}}  # flags sets in dict comprehensions
+   |
+
+iteration_over_set.py:10:36: PLC0208 Use a sequence type instead of a `set` when iterating over values
+   |
+10 | numbers_set = {i for i in {1, 2, 3}}  # flags sets in set comprehensions
+11 | 
+12 | numbers_dict = {str(i): i for i in {1, 2, 3}}  # flags sets in dict comprehensions
+   |                                    ^^^^^^^^^ PLC0208
+13 | 
+14 | numbers_gen = (i for i in {1, 2, 3})  # flags sets in generator expressions
+   |
+
+iteration_over_set.py:12:27: PLC0208 Use a sequence type instead of a `set` when iterating over values
+   |
+12 | numbers_dict = {str(i): i for i in {1, 2, 3}}  # flags sets in dict comprehensions
+13 | 
+14 | numbers_gen = (i for i in {1, 2, 3})  # flags sets in generator expressions
+   |                           ^^^^^^^^^ PLC0208
+15 | 
+16 | # Non-errors
+   |
+
+
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLE0241_duplicate_bases.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLE0241_duplicate_bases.py.snap
new file mode 100644
index 0000000000000..60b9ce981b7cf
--- /dev/null
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLE0241_duplicate_bases.py.snap
@@ -0,0 +1,11 @@
+---
+source: crates/ruff/src/rules/pylint/mod.rs
+---
+duplicate_bases.py:8:12: PLE0241 Duplicate base `A` for class `B`
+  |
+8 | class B(A, A):
+  |            ^ PLE0241
+9 |     ...
+  |
+
+
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLE0302_unexpected_special_method_signature.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLE0302_unexpected_special_method_signature.py.snap
index 602b0ad4aa31a..82d3395dd1f9d 100644
--- a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLE0302_unexpected_special_method_signature.py.snap
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLE0302_unexpected_special_method_signature.py.snap
@@ -4,54 +4,72 @@ source: crates/ruff/src/rules/pylint/mod.rs
 unexpected_special_method_signature.py:5:9: PLE0302 The special method `__bool__` expects 1 parameter, 2 were given
   |
 5 |         ...
-6 |     
+6 | 
 7 |     def __bool__(self, x):  # too many mandatory args
   |         ^^^^^^^^ PLE0302
 8 |         ...
   |
 
-unexpected_special_method_signature.py:22:9: PLE0302 The special method `__bool__` expects 0 parameters, 1 was given
+unexpected_special_method_signature.py:19:9: PLE0302 The special method `__bool__` expects 0 parameters, 1 was given
    |
-22 |     @staticmethod
-23 |     def __bool__(x):  # too many mandatory args
+19 |     @staticmethod
+20 |     def __bool__(x):  # too many mandatory args
    |         ^^^^^^^^ PLE0302
-24 |         ...
+21 |         ...
    |
 
-unexpected_special_method_signature.py:35:9: PLE0302 The special method `__eq__` expects 2 parameters, 1 was given
+unexpected_special_method_signature.py:32:9: PLE0302 The special method `__eq__` expects 2 parameters, 1 was given
    |
+32 |         ...
+33 | 
+34 |     def __eq__(self):  # too few mandatory args
+   |         ^^^^^^ PLE0302
 35 |         ...
-36 |     
-37 |     def __eq__(self):  # too few mandatory args
+   |
+
+unexpected_special_method_signature.py:35:9: PLE0302 The special method `__eq__` expects 2 parameters, 3 were given
+   |
+35 |         ...
+36 | 
+37 |     def __eq__(self, other, other_other):  # too many mandatory args
    |         ^^^^^^ PLE0302
 38 |         ...
    |
 
-unexpected_special_method_signature.py:38:9: PLE0302 The special method `__eq__` expects 2 parameters, 3 were given
+unexpected_special_method_signature.py:44:9: PLE0302 The special method `__round__` expects between 1 and 2 parameters, 3 were given
    |
-38 |         ...
-39 |     
-40 |     def __eq__(self, other, other_other):  # too many mandatory args
-   |         ^^^^^^ PLE0302
-41 |         ...
+44 |         ...
+45 | 
+46 |     def __round__(self, x, y):  # disallow 2 args
+   |         ^^^^^^^^^ PLE0302
+47 |         ...
    |
 
-unexpected_special_method_signature.py:47:9: PLE0302 The special method `__round__` expects between 1 and 2 parameters, 3 were given
+unexpected_special_method_signature.py:47:9: PLE0302 The special method `__round__` expects between 1 and 2 parameters, 4 were given
    |
 47 |         ...
-48 |     
-49 |     def __round__(self, x, y):  # disallow 2 args
+48 | 
+49 |     def __round__(self, x, y, z=2):  # disallow 3 args even when one is optional
    |         ^^^^^^^^^ PLE0302
 50 |         ...
    |
 
-unexpected_special_method_signature.py:50:9: PLE0302 The special method `__round__` expects between 1 and 2 parameters, 4 were given
+unexpected_special_method_signature.py:56:9: PLE0302 The special method `__eq__` expects 2 parameters, 3 were given
    |
-50 |         ...
-51 |     
-52 |     def __round__(self, x, y, z=2):  # disallow 3 args even when one is optional
+56 |         ...
+57 | 
+58 |     def __eq__(self, x, y, *args):  # too many args with *args
+   |         ^^^^^^ PLE0302
+59 |         ...
+   |
+
+unexpected_special_method_signature.py:65:9: PLE0302 The special method `__round__` expects between 1 and 2 parameters, 3 were given
+   |
+65 |         ...
+66 | 
+67 |     def __round__(self, x, y, *args):  # disallow 2 args
    |         ^^^^^^^^^ PLE0302
-53 |         ...
+68 |         ...
    |
 
 
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLE0307_invalid_return_type_str.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLE0307_invalid_return_type_str.py.snap
new file mode 100644
index 0000000000000..69d872d03ef29
--- /dev/null
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLE0307_invalid_return_type_str.py.snap
@@ -0,0 +1,44 @@
+---
+source: crates/ruff/src/rules/pylint/mod.rs
+---
+invalid_return_type_str.py:3:16: PLE0307 `__str__` does not return `str`
+  |
+3 | class Str:
+4 |     def __str__(self):
+5 |         return 1
+  |                ^ PLE0307
+6 | 
+7 | class Float:
+  |
+
+invalid_return_type_str.py:7:16: PLE0307 `__str__` does not return `str`
+   |
+ 7 | class Float:
+ 8 |     def __str__(self):
+ 9 |         return 3.05
+   |                ^^^^ PLE0307
+10 |     
+11 | class Int:
+   |
+
+invalid_return_type_str.py:11:16: PLE0307 `__str__` does not return `str`
+   |
+11 | class Int:
+12 |     def __str__(self):
+13 |         return 0
+   |                ^ PLE0307
+14 |     
+15 | class Bool:
+   |
+
+invalid_return_type_str.py:15:16: PLE0307 `__str__` does not return `str`
+   |
+15 | class Bool:
+16 |     def __str__(self):
+17 |         return False
+   |                ^^^^^ PLE0307
+18 |     
+19 | class Str2:
+   |
+
+
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLE1700_yield_from_in_async_function.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLE1700_yield_from_in_async_function.py.snap
new file mode 100644
index 0000000000000..6832eb464095b
--- /dev/null
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLE1700_yield_from_in_async_function.py.snap
@@ -0,0 +1,12 @@
+---
+source: crates/ruff/src/rules/pylint/mod.rs
+---
+yield_from_in_async_function.py:7:5: PLE1700 `yield from` statement in async function; use `async for` instead
+  |
+7 | async def fail():
+8 |     l = (1, 2, 3)
+9 |     yield from l
+  |     ^^^^^^^^^^^^ PLE1700
+  |
+
+
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR0402_import_aliasing.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR0402_import_aliasing.py.snap
index 32a35232d58d2..4816274fa507c 100644
--- a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR0402_import_aliasing.py.snap
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR0402_import_aliasing.py.snap
@@ -52,5 +52,6 @@ import_aliasing.py:12:8: PLR0402 Use `from foo.bar import foobar` in lieu of ali
 15 | import os
 16 | import os as OS
    |
+   = help: Replace with `from foo.bar import foobar`
 
 
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR0913_too_many_arguments.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR0913_too_many_arguments.py.snap
index edc3842afb99d..e64ab51552fea 100644
--- a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR0913_too_many_arguments.py.snap
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR0913_too_many_arguments.py.snap
@@ -15,9 +15,23 @@ too_many_arguments.py:17:5: PLR0913 Too many arguments to function call (6 > 5)
 18 |     pass
    |
 
-too_many_arguments.py:33:5: PLR0913 Too many arguments to function call (6 > 5)
+too_many_arguments.py:25:5: PLR0913 Too many arguments to function call (6 > 5)
    |
-33 | def f(x, y, z, a, b, c, *, u, v, w):  # Too many arguments (6/5)
+25 | def f(x, y, z, /, u, v, w):  # Too many arguments (6/5)
+   |     ^ PLR0913
+26 |     pass
+   |
+
+too_many_arguments.py:29:5: PLR0913 Too many arguments to function call (6 > 5)
+   |
+29 | def f(x, y, z, *, u, v, w):  # Too many arguments (6/5)
+   |     ^ PLR0913
+30 |     pass
+   |
+
+too_many_arguments.py:33:5: PLR0913 Too many arguments to function call (9 > 5)
+   |
+33 | def f(x, y, z, a, b, c, *, u, v, w):  # Too many arguments (9/5)
    |     ^ PLR0913
 34 |     pass
    |
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR0915_too_many_statements.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR0915_too_many_statements.py.snap
index 8bf44746fb31b..9f645629012b2 100644
--- a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR0915_too_many_statements.py.snap
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR0915_too_many_statements.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/pylint/mod.rs
 ---
-too_many_statements.py:5:11: PLR0915 Too many statements (52 > 50)
+too_many_statements.py:5:11: PLR0915 Too many statements (51 > 50)
   |
 5 | async def f():  # Too many statements (52/50)
   |           ^ PLR0915
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1701_repeated_isinstance_calls.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1701_repeated_isinstance_calls.py.snap
index 725ccd6cfe7dc..ca7bf98cb9725 100644
--- a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1701_repeated_isinstance_calls.py.snap
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1701_repeated_isinstance_calls.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/pylint/mod.rs
 ---
-repeated_isinstance_calls.py:15:8: PLR1701 Merge these isinstance calls: `isinstance(var[3], (float, int))`
+repeated_isinstance_calls.py:15:8: PLR1701 [*] Merge `isinstance` calls: `isinstance(var[3], float | int)`
    |
 15 |     # not merged
 16 |     if isinstance(var[3], int) or isinstance(var[3], float) or isinstance(var[3], list) and True:  # [consider-merging-isinstance]
@@ -9,8 +9,19 @@ repeated_isinstance_calls.py:15:8: PLR1701 Merge these isinstance calls: `isinst
 17 |         pass
 18 |     result = isinstance(var[4], int) or isinstance(var[4], float) or isinstance(var[5], list) and False  # [consider-merging-isinstance]
    |
+   = help: Replace with `isinstance(var[3], float | int)`
 
-repeated_isinstance_calls.py:17:14: PLR1701 Merge these isinstance calls: `isinstance(var[4], (float, int))`
+ℹ Fix
+12 12 |     result = isinstance(var[2], (int, float))
+13 13 | 
+14 14 |     # not merged
+15    |-    if isinstance(var[3], int) or isinstance(var[3], float) or isinstance(var[3], list) and True:  # [consider-merging-isinstance]
+   15 |+    if isinstance(var[3], float | int):  # [consider-merging-isinstance]
+16 16 |         pass
+17 17 |     result = isinstance(var[4], int) or isinstance(var[4], float) or isinstance(var[5], list) and False  # [consider-merging-isinstance]
+18 18 | 
+
+repeated_isinstance_calls.py:17:14: PLR1701 [*] Merge `isinstance` calls: `isinstance(var[4], float | int)`
    |
 17 |     if isinstance(var[3], int) or isinstance(var[3], float) or isinstance(var[3], list) and True:  # [consider-merging-isinstance]
 18 |         pass
@@ -19,8 +30,19 @@ repeated_isinstance_calls.py:17:14: PLR1701 Merge these isinstance calls: `isins
 20 | 
 21 |     result = isinstance(var[5], int) or True or isinstance(var[5], float)  # [consider-merging-isinstance]
    |
+   = help: Replace with `isinstance(var[4], float | int)`
+
+ℹ Fix
+14 14 |     # not merged
+15 15 |     if isinstance(var[3], int) or isinstance(var[3], float) or isinstance(var[3], list) and True:  # [consider-merging-isinstance]
+16 16 |         pass
+17    |-    result = isinstance(var[4], int) or isinstance(var[4], float) or isinstance(var[5], list) and False  # [consider-merging-isinstance]
+   17 |+    result = isinstance(var[4], float | int)  # [consider-merging-isinstance]
+18 18 | 
+19 19 |     result = isinstance(var[5], int) or True or isinstance(var[5], float)  # [consider-merging-isinstance]
+20 20 | 
 
-repeated_isinstance_calls.py:19:14: PLR1701 Merge these isinstance calls: `isinstance(var[5], (float, int))`
+repeated_isinstance_calls.py:19:14: PLR1701 [*] Merge `isinstance` calls: `isinstance(var[5], float | int)`
    |
 19 |     result = isinstance(var[4], int) or isinstance(var[4], float) or isinstance(var[5], list) and False  # [consider-merging-isinstance]
 20 | 
@@ -29,8 +51,19 @@ repeated_isinstance_calls.py:19:14: PLR1701 Merge these isinstance calls: `isins
 22 | 
 23 |     inferred_isinstance = isinstance
    |
+   = help: Replace with `isinstance(var[5], float | int)`
+
+ℹ Fix
+16 16 |         pass
+17 17 |     result = isinstance(var[4], int) or isinstance(var[4], float) or isinstance(var[5], list) and False  # [consider-merging-isinstance]
+18 18 | 
+19    |-    result = isinstance(var[5], int) or True or isinstance(var[5], float)  # [consider-merging-isinstance]
+   19 |+    result = isinstance(var[5], float | int)  # [consider-merging-isinstance]
+20 20 | 
+21 21 |     inferred_isinstance = isinstance
+22 22 |     result = inferred_isinstance(var[6], int) or inferred_isinstance(var[6], float) or inferred_isinstance(var[6], list) and False   # [consider-merging-isinstance]
 
-repeated_isinstance_calls.py:23:14: PLR1701 Merge these isinstance calls: `isinstance(var[10], (list, str))`
+repeated_isinstance_calls.py:23:14: PLR1701 [*] Merge `isinstance` calls: `isinstance(var[10], list | str)`
    |
 23 |     inferred_isinstance = isinstance
 24 |     result = inferred_isinstance(var[6], int) or inferred_isinstance(var[6], float) or inferred_isinstance(var[6], list) and False   # [consider-merging-isinstance]
@@ -38,8 +71,19 @@ repeated_isinstance_calls.py:23:14: PLR1701 Merge these isinstance calls: `isins
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PLR1701
 26 |     result = isinstance(var[11], int) or isinstance(var[11], int) or isinstance(var[11], float)   # [consider-merging-isinstance]
    |
+   = help: Replace with `isinstance(var[10], list | str)`
 
-repeated_isinstance_calls.py:24:14: PLR1701 Merge these isinstance calls: `isinstance(var[11], (float, int))`
+ℹ Fix
+20 20 | 
+21 21 |     inferred_isinstance = isinstance
+22 22 |     result = inferred_isinstance(var[6], int) or inferred_isinstance(var[6], float) or inferred_isinstance(var[6], list) and False   # [consider-merging-isinstance]
+23    |-    result = isinstance(var[10], str) or isinstance(var[10], int) and var[8] * 14 or isinstance(var[10], float) and var[5] * 14.4 or isinstance(var[10], list)   # [consider-merging-isinstance]
+   23 |+    result = isinstance(var[10], list | str)   # [consider-merging-isinstance]
+24 24 |     result = isinstance(var[11], int) or isinstance(var[11], int) or isinstance(var[11], float)   # [consider-merging-isinstance]
+25 25 | 
+26 26 |     result = isinstance(var[20])
+
+repeated_isinstance_calls.py:24:14: PLR1701 [*] Merge `isinstance` calls: `isinstance(var[11], float | int)`
    |
 24 |     result = inferred_isinstance(var[6], int) or inferred_isinstance(var[6], float) or inferred_isinstance(var[6], list) and False   # [consider-merging-isinstance]
 25 |     result = isinstance(var[10], str) or isinstance(var[10], int) and var[8] * 14 or isinstance(var[10], float) and var[5] * 14.4 or isinstance(var[10], list)   # [consider-merging-isinstance]
@@ -48,8 +92,19 @@ repeated_isinstance_calls.py:24:14: PLR1701 Merge these isinstance calls: `isins
 27 | 
 28 |     result = isinstance(var[20])
    |
+   = help: Replace with `isinstance(var[11], float | int)`
+
+ℹ Fix
+21 21 |     inferred_isinstance = isinstance
+22 22 |     result = inferred_isinstance(var[6], int) or inferred_isinstance(var[6], float) or inferred_isinstance(var[6], list) and False   # [consider-merging-isinstance]
+23 23 |     result = isinstance(var[10], str) or isinstance(var[10], int) and var[8] * 14 or isinstance(var[10], float) and var[5] * 14.4 or isinstance(var[10], list)   # [consider-merging-isinstance]
+24    |-    result = isinstance(var[11], int) or isinstance(var[11], int) or isinstance(var[11], float)   # [consider-merging-isinstance]
+   24 |+    result = isinstance(var[11], float | int)   # [consider-merging-isinstance]
+25 25 | 
+26 26 |     result = isinstance(var[20])
+27 27 |     result = isinstance()
 
-repeated_isinstance_calls.py:30:14: PLR1701 Merge these isinstance calls: `isinstance(var[12], (float, int, list))`
+repeated_isinstance_calls.py:30:14: PLR1701 [*] Merge `isinstance` calls: `isinstance(var[12], float | int | list)`
    |
 30 |     # Combination merged and not merged
 31 |     result = isinstance(var[12], (int, float)) or isinstance(var[12], list)  # [consider-merging-isinstance]
@@ -57,5 +112,16 @@ repeated_isinstance_calls.py:30:14: PLR1701 Merge these isinstance calls: `isins
 32 | 
 33 |     # not merged but valid
    |
+   = help: Replace with `isinstance(var[12], float | int | list)`
+
+ℹ Fix
+27 27 |     result = isinstance()
+28 28 | 
+29 29 |     # Combination merged and not merged
+30    |-    result = isinstance(var[12], (int, float)) or isinstance(var[12], list)  # [consider-merging-isinstance]
+   30 |+    result = isinstance(var[12], float | int | list)  # [consider-merging-isinstance]
+31 31 | 
+32 32 |     # not merged but valid
+33 33 |     result = isinstance(var[5], int) and var[5] * 14 or isinstance(var[5], float) and var[5] * 14.4
 
 
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1711_useless_return.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1711_useless_return.py.snap
index 6a8d8cb1cb3eb..1b32cb61ecdeb 100644
--- a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1711_useless_return.py.snap
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1711_useless_return.py.snap
@@ -10,7 +10,7 @@ useless_return.py:6:5: PLR1711 [*] Useless `return` statement at end of function
   |
   = help: Remove useless `return` statement
 
-ℹ Suggested fix
+ℹ Fix
 3 3 | 
 4 4 | def print_python_version():
 5 5 |     print(sys.version)
@@ -28,7 +28,7 @@ useless_return.py:11:5: PLR1711 [*] Useless `return` statement at end of functio
    |
    = help: Remove useless `return` statement
 
-ℹ Suggested fix
+ℹ Fix
 8  8  | 
 9  9  | def print_python_version():
 10 10 |     print(sys.version)
@@ -46,7 +46,7 @@ useless_return.py:16:5: PLR1711 [*] Useless `return` statement at end of functio
    |
    = help: Remove useless `return` statement
 
-ℹ Suggested fix
+ℹ Fix
 13 13 | 
 14 14 | def print_python_version():
 15 15 |     print(sys.version)
@@ -64,7 +64,7 @@ useless_return.py:22:9: PLR1711 [*] Useless `return` statement at end of functio
    |
    = help: Remove useless `return` statement
 
-ℹ Suggested fix
+ℹ Fix
 19 19 | class SomeClass:
 20 20 |     def print_python_version(self):
 21 21 |         print(sys.version)
@@ -82,7 +82,7 @@ useless_return.py:50:5: PLR1711 [*] Useless `return` statement at end of functio
    |
    = help: Remove useless `return` statement
 
-ℹ Suggested fix
+ℹ Fix
 47 47 | def print_python_version():
 48 48 |     """This function returns None."""
 49 49 |     print(sys.version)
@@ -100,7 +100,7 @@ useless_return.py:60:9: PLR1711 [*] Useless `return` statement at end of functio
    |
    = help: Remove useless `return` statement
 
-ℹ Suggested fix
+ℹ Fix
 57 57 | 
 58 58 |     def get(self, key: str) -> None:
 59 59 |         print(f"{key} not found")
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_1.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_1.py.snap
index 609269cabb92a..56d67f936e7d8 100644
--- a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_1.py.snap
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_1.py.snap
@@ -76,7 +76,7 @@ sys_exit_alias_1.py:9:5: PLR1722 [*] Use `sys.exit()` instead of `quit`
 11 11 | 
 12 12 | def main():
 
-sys_exit_alias_1.py:15:5: PLR1722 [*] Use `sys.exit()` instead of `exit`
+sys_exit_alias_1.py:15:5: PLR1722 Use `sys.exit()` instead of `exit`
    |
 15 |     sys = 1
 16 | 
@@ -86,7 +86,7 @@ sys_exit_alias_1.py:15:5: PLR1722 [*] Use `sys.exit()` instead of `exit`
    |
    = help: Replace `exit` with `sys.exit()`
 
-sys_exit_alias_1.py:16:5: PLR1722 [*] Use `sys.exit()` instead of `quit`
+sys_exit_alias_1.py:16:5: PLR1722 Use `sys.exit()` instead of `quit`
    |
 16 |     exit(1)
 17 |     quit(1)
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_10.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_10.py.snap
new file mode 100644
index 0000000000000..b555d867bb79f
--- /dev/null
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_10.py.snap
@@ -0,0 +1,12 @@
+---
+source: crates/ruff/src/rules/pylint/mod.rs
+---
+sys_exit_alias_10.py:8:5: PLR1722 Use `sys.exit()` instead of `exit`
+  |
+8 | def main():
+9 |     exit(0)
+  |     ^^^^ PLR1722
+  |
+  = help: Replace `exit` with `sys.exit()`
+
+
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_3.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_3.py.snap
index 0e26708d378a8..cb59edc6b60ae 100644
--- a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_3.py.snap
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_3.py.snap
@@ -38,7 +38,7 @@ sys_exit_alias_3.py:9:5: PLR1722 [*] Use `sys.exit()` instead of `quit`
 11 11 | 
 12 12 | def main():
 
-sys_exit_alias_3.py:16:5: PLR1722 [*] Use `sys.exit()` instead of `quit`
+sys_exit_alias_3.py:16:5: PLR1722 Use `sys.exit()` instead of `quit`
    |
 16 |     exit(1)
 17 |     quit(1)
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_5.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_5.py.snap
index 6669d3fa5d61b..350bc9306db4e 100644
--- a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_5.py.snap
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_5.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/pylint/mod.rs
 ---
-sys_exit_alias_5.py:3:1: PLR1722 [*] Use `sys.exit()` instead of `exit`
+sys_exit_alias_5.py:3:1: PLR1722 Use `sys.exit()` instead of `exit`
   |
 3 | from sys import *
 4 | 
@@ -11,7 +11,7 @@ sys_exit_alias_5.py:3:1: PLR1722 [*] Use `sys.exit()` instead of `exit`
   |
   = help: Replace `exit` with `sys.exit()`
 
-sys_exit_alias_5.py:4:1: PLR1722 [*] Use `sys.exit()` instead of `quit`
+sys_exit_alias_5.py:4:1: PLR1722 Use `sys.exit()` instead of `quit`
   |
 4 | exit(0)
 5 | quit(0)
@@ -19,7 +19,7 @@ sys_exit_alias_5.py:4:1: PLR1722 [*] Use `sys.exit()` instead of `quit`
   |
   = help: Replace `quit` with `sys.exit()`
 
-sys_exit_alias_5.py:8:5: PLR1722 [*] Use `sys.exit()` instead of `exit`
+sys_exit_alias_5.py:8:5: PLR1722 Use `sys.exit()` instead of `exit`
    |
  8 | def main():
  9 |     exit(1)
@@ -28,7 +28,7 @@ sys_exit_alias_5.py:8:5: PLR1722 [*] Use `sys.exit()` instead of `exit`
    |
    = help: Replace `exit` with `sys.exit()`
 
-sys_exit_alias_5.py:9:5: PLR1722 [*] Use `sys.exit()` instead of `quit`
+sys_exit_alias_5.py:9:5: PLR1722 Use `sys.exit()` instead of `quit`
    |
  9 | def main():
 10 |     exit(1)
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_7.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_7.py.snap
new file mode 100644
index 0000000000000..f1e22c8894145
--- /dev/null
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_7.py.snap
@@ -0,0 +1,21 @@
+---
+source: crates/ruff/src/rules/pylint/mod.rs
+---
+sys_exit_alias_7.py:2:5: PLR1722 [*] Use `sys.exit()` instead of `exit`
+  |
+2 | def main():
+3 |     exit(0)
+  |     ^^^^ PLR1722
+  |
+  = help: Replace `exit` with `sys.exit()`
+
+ℹ Suggested fix
+  1 |+import sys
+1 2 | def main():
+2   |-    exit(0)
+  3 |+    sys.exit(0)
+3 4 | 
+4 5 | 
+5 6 | import functools
+
+
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_8.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_8.py.snap
new file mode 100644
index 0000000000000..521226dc31654
--- /dev/null
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_8.py.snap
@@ -0,0 +1,19 @@
+---
+source: crates/ruff/src/rules/pylint/mod.rs
+---
+sys_exit_alias_8.py:5:5: PLR1722 [*] Use `sys.exit()` instead of `exit`
+  |
+5 | def main():
+6 |     exit(0)
+  |     ^^^^ PLR1722
+  |
+  = help: Replace `exit` with `sys.exit()`
+
+ℹ Suggested fix
+1   |-from sys import argv
+  1 |+from sys import argv, exit
+2 2 | 
+3 3 | 
+4 4 | def main():
+
+
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_9.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_9.py.snap
new file mode 100644
index 0000000000000..4cf0610c856e3
--- /dev/null
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR1722_sys_exit_alias_9.py.snap
@@ -0,0 +1,21 @@
+---
+source: crates/ruff/src/rules/pylint/mod.rs
+---
+sys_exit_alias_9.py:2:5: PLR1722 [*] Use `sys.exit()` instead of `exit`
+  |
+2 | def main():
+3 |     exit(0)
+  |     ^^^^ PLR1722
+  |
+  = help: Replace `exit` with `sys.exit()`
+
+ℹ Suggested fix
+  1 |+import sys
+1 2 | def main():
+2   |-    exit(0)
+  3 |+    sys.exit(0)
+3 4 | 
+4 5 | 
+5 6 | from sys import argv
+
+
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR5501_collapsible_else_if.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR5501_collapsible_else_if.py.snap
index 59d16efdead37..567c03d257f78 100644
--- a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR5501_collapsible_else_if.py.snap
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR5501_collapsible_else_if.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/pylint/mod.rs
 ---
-collapsible_else_if.py:38:9: PLR5501 Consider using `elif` instead of `else` then `if` to remove one indentation level
+collapsible_else_if.py:38:9: PLR5501 Use `elif` instead of `else` then `if`, to reduce indentation
    |
 38 |           pass
 39 |       else:
@@ -11,7 +11,7 @@ collapsible_else_if.py:38:9: PLR5501 Consider using `elif` instead of `else` the
    | |________________^ PLR5501
    |
 
-collapsible_else_if.py:46:9: PLR5501 Consider using `elif` instead of `else` then `if` to remove one indentation level
+collapsible_else_if.py:46:9: PLR5501 Use `elif` instead of `else` then `if`, to reduce indentation
    |
 46 |           pass
 47 |       else:
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLW0131_named_expr_without_context.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLW0131_named_expr_without_context.py.snap
new file mode 100644
index 0000000000000..141525c79698b
--- /dev/null
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLW0131_named_expr_without_context.py.snap
@@ -0,0 +1,28 @@
+---
+source: crates/ruff/src/rules/pylint/mod.rs
+---
+named_expr_without_context.py:2:2: PLW0131 Named expression used without context
+  |
+2 | # Errors
+3 | (a := 42)
+  |  ^^^^^^^ PLW0131
+4 | if True:
+5 |     (b := 1)
+  |
+
+named_expr_without_context.py:4:6: PLW0131 Named expression used without context
+  |
+4 | (a := 42)
+5 | if True:
+6 |     (b := 1)
+  |      ^^^^^^ PLW0131
+  |
+
+named_expr_without_context.py:8:6: PLW0131 Named expression used without context
+  |
+8 | class Foo:
+9 |     (c := 1)
+  |      ^^^^^^ PLW0131
+  |
+
+
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLW3301_nested_min_max.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLW3301_nested_min_max.py.snap
new file mode 100644
index 0000000000000..60e730fd94ccc
--- /dev/null
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLW3301_nested_min_max.py.snap
@@ -0,0 +1,281 @@
+---
+source: crates/ruff/src/rules/pylint/mod.rs
+---
+nested_min_max.py:2:1: PLW3301 [*] Nested `min` calls can be flattened
+  |
+2 | min(1, 2, 3)
+3 | min(1, min(2, 3))
+  | ^^^^^^^^^^^^^^^^^ PLW3301
+4 | min(1, min(2, min(3, 4)))
+5 | min(1, foo("a", "b"), min(3, 4))
+  |
+  = help: Flatten nested `min` calls
+
+ℹ Suggested fix
+1 1 | min(1, 2, 3)
+2   |-min(1, min(2, 3))
+  2 |+min(1, 2, 3)
+3 3 | min(1, min(2, min(3, 4)))
+4 4 | min(1, foo("a", "b"), min(3, 4))
+5 5 | min(1, max(2, 3))
+
+nested_min_max.py:3:1: PLW3301 [*] Nested `min` calls can be flattened
+  |
+3 | min(1, 2, 3)
+4 | min(1, min(2, 3))
+5 | min(1, min(2, min(3, 4)))
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^ PLW3301
+6 | min(1, foo("a", "b"), min(3, 4))
+7 | min(1, max(2, 3))
+  |
+  = help: Flatten nested `min` calls
+
+ℹ Suggested fix
+1 1 | min(1, 2, 3)
+2 2 | min(1, min(2, 3))
+3   |-min(1, min(2, min(3, 4)))
+  3 |+min(1, 2, 3, 4)
+4 4 | min(1, foo("a", "b"), min(3, 4))
+5 5 | min(1, max(2, 3))
+6 6 | max(1, 2, 3)
+
+nested_min_max.py:3:8: PLW3301 [*] Nested `min` calls can be flattened
+  |
+3 | min(1, 2, 3)
+4 | min(1, min(2, 3))
+5 | min(1, min(2, min(3, 4)))
+  |        ^^^^^^^^^^^^^^^^^ PLW3301
+6 | min(1, foo("a", "b"), min(3, 4))
+7 | min(1, max(2, 3))
+  |
+  = help: Flatten nested `min` calls
+
+ℹ Suggested fix
+1 1 | min(1, 2, 3)
+2 2 | min(1, min(2, 3))
+3   |-min(1, min(2, min(3, 4)))
+  3 |+min(1, min(2, 3, 4))
+4 4 | min(1, foo("a", "b"), min(3, 4))
+5 5 | min(1, max(2, 3))
+6 6 | max(1, 2, 3)
+
+nested_min_max.py:4:1: PLW3301 [*] Nested `min` calls can be flattened
+  |
+4 | min(1, min(2, 3))
+5 | min(1, min(2, min(3, 4)))
+6 | min(1, foo("a", "b"), min(3, 4))
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PLW3301
+7 | min(1, max(2, 3))
+8 | max(1, 2, 3)
+  |
+  = help: Flatten nested `min` calls
+
+ℹ Suggested fix
+1 1 | min(1, 2, 3)
+2 2 | min(1, min(2, 3))
+3 3 | min(1, min(2, min(3, 4)))
+4   |-min(1, foo("a", "b"), min(3, 4))
+  4 |+min(1, foo("a", "b"), 3, 4)
+5 5 | min(1, max(2, 3))
+6 6 | max(1, 2, 3)
+7 7 | max(1, max(2, 3))
+
+nested_min_max.py:7:1: PLW3301 [*] Nested `max` calls can be flattened
+   |
+ 7 | min(1, max(2, 3))
+ 8 | max(1, 2, 3)
+ 9 | max(1, max(2, 3))
+   | ^^^^^^^^^^^^^^^^^ PLW3301
+10 | max(1, max(2, max(3, 4)))
+11 | max(1, foo("a", "b"), max(3, 4))
+   |
+   = help: Flatten nested `max` calls
+
+ℹ Suggested fix
+4 4 | min(1, foo("a", "b"), min(3, 4))
+5 5 | min(1, max(2, 3))
+6 6 | max(1, 2, 3)
+7   |-max(1, max(2, 3))
+  7 |+max(1, 2, 3)
+8 8 | max(1, max(2, max(3, 4)))
+9 9 | max(1, foo("a", "b"), max(3, 4))
+10 10 | 
+
+nested_min_max.py:8:1: PLW3301 [*] Nested `max` calls can be flattened
+   |
+ 8 | max(1, 2, 3)
+ 9 | max(1, max(2, 3))
+10 | max(1, max(2, max(3, 4)))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^ PLW3301
+11 | max(1, foo("a", "b"), max(3, 4))
+   |
+   = help: Flatten nested `max` calls
+
+ℹ Suggested fix
+5 5 | min(1, max(2, 3))
+6 6 | max(1, 2, 3)
+7 7 | max(1, max(2, 3))
+8   |-max(1, max(2, max(3, 4)))
+  8 |+max(1, 2, 3, 4)
+9 9 | max(1, foo("a", "b"), max(3, 4))
+10 10 | 
+11 11 | # These should not trigger; we do not flag cases with keyword args.
+
+nested_min_max.py:8:8: PLW3301 [*] Nested `max` calls can be flattened
+   |
+ 8 | max(1, 2, 3)
+ 9 | max(1, max(2, 3))
+10 | max(1, max(2, max(3, 4)))
+   |        ^^^^^^^^^^^^^^^^^ PLW3301
+11 | max(1, foo("a", "b"), max(3, 4))
+   |
+   = help: Flatten nested `max` calls
+
+ℹ Suggested fix
+5 5 | min(1, max(2, 3))
+6 6 | max(1, 2, 3)
+7 7 | max(1, max(2, 3))
+8   |-max(1, max(2, max(3, 4)))
+  8 |+max(1, max(2, 3, 4))
+9 9 | max(1, foo("a", "b"), max(3, 4))
+10 10 | 
+11 11 | # These should not trigger; we do not flag cases with keyword args.
+
+nested_min_max.py:9:1: PLW3301 [*] Nested `max` calls can be flattened
+   |
+ 9 | max(1, max(2, 3))
+10 | max(1, max(2, max(3, 4)))
+11 | max(1, foo("a", "b"), max(3, 4))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PLW3301
+12 | 
+13 | # These should not trigger; we do not flag cases with keyword args.
+   |
+   = help: Flatten nested `max` calls
+
+ℹ Suggested fix
+6  6  | max(1, 2, 3)
+7  7  | max(1, max(2, 3))
+8  8  | max(1, max(2, max(3, 4)))
+9     |-max(1, foo("a", "b"), max(3, 4))
+   9  |+max(1, foo("a", "b"), 3, 4)
+10 10 | 
+11 11 | # These should not trigger; we do not flag cases with keyword args.
+12 12 | min(1, min(2, 3), key=test)
+
+nested_min_max.py:15:1: PLW3301 [*] Nested `min` calls can be flattened
+   |
+15 | min(1, min(2, 3, key=test))
+16 | # This will still trigger, to merge the calls without keyword args.
+17 | min(1, min(2, 3, key=test), min(4, 5))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PLW3301
+18 | 
+19 | # Don't provide a fix if there are comments within the call.
+   |
+   = help: Flatten nested `min` calls
+
+ℹ Suggested fix
+12 12 | min(1, min(2, 3), key=test)
+13 13 | min(1, min(2, 3, key=test))
+14 14 | # This will still trigger, to merge the calls without keyword args.
+15    |-min(1, min(2, 3, key=test), min(4, 5))
+   15 |+min(1, min(2, 3, key=test), 4, 5)
+16 16 | 
+17 17 | # Don't provide a fix if there are comments within the call.
+18 18 | min(
+
+nested_min_max.py:18:1: PLW3301 Nested `min` calls can be flattened
+   |
+18 |   # Don't provide a fix if there are comments within the call.
+19 | / min(
+20 | |     1,  # This is a comment.
+21 | |     min(2, 3),
+22 | | )
+   | |_^ PLW3301
+23 |   
+24 |   # Handle iterable expressions.
+   |
+   = help: Flatten nested `min` calls
+
+nested_min_max.py:24:1: PLW3301 [*] Nested `min` calls can be flattened
+   |
+24 | # Handle iterable expressions.
+25 | min(1, min(a))
+   | ^^^^^^^^^^^^^^ PLW3301
+26 | min(1, min(i for i in range(10)))
+27 | max(1, max(a))
+   |
+   = help: Flatten nested `min` calls
+
+ℹ Suggested fix
+21 21 | )
+22 22 | 
+23 23 | # Handle iterable expressions.
+24    |-min(1, min(a))
+   24 |+min(1, *a)
+25 25 | min(1, min(i for i in range(10)))
+26 26 | max(1, max(a))
+27 27 | max(1, max(i for i in range(10)))
+
+nested_min_max.py:25:1: PLW3301 [*] Nested `min` calls can be flattened
+   |
+25 | # Handle iterable expressions.
+26 | min(1, min(a))
+27 | min(1, min(i for i in range(10)))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PLW3301
+28 | max(1, max(a))
+29 | max(1, max(i for i in range(10)))
+   |
+   = help: Flatten nested `min` calls
+
+ℹ Suggested fix
+22 22 | 
+23 23 | # Handle iterable expressions.
+24 24 | min(1, min(a))
+25    |-min(1, min(i for i in range(10)))
+   25 |+min(1, *(i for i in range(10)))
+26 26 | max(1, max(a))
+27 27 | max(1, max(i for i in range(10)))
+28 28 | 
+
+nested_min_max.py:26:1: PLW3301 [*] Nested `max` calls can be flattened
+   |
+26 | min(1, min(a))
+27 | min(1, min(i for i in range(10)))
+28 | max(1, max(a))
+   | ^^^^^^^^^^^^^^ PLW3301
+29 | max(1, max(i for i in range(10)))
+   |
+   = help: Flatten nested `max` calls
+
+ℹ Suggested fix
+23 23 | # Handle iterable expressions.
+24 24 | min(1, min(a))
+25 25 | min(1, min(i for i in range(10)))
+26    |-max(1, max(a))
+   26 |+max(1, *a)
+27 27 | max(1, max(i for i in range(10)))
+28 28 | 
+29 29 | tuples_list = [
+
+nested_min_max.py:27:1: PLW3301 [*] Nested `max` calls can be flattened
+   |
+27 | min(1, min(i for i in range(10)))
+28 | max(1, max(a))
+29 | max(1, max(i for i in range(10)))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PLW3301
+30 | 
+31 | tuples_list = [
+   |
+   = help: Flatten nested `max` calls
+
+ℹ Suggested fix
+24 24 | min(1, min(a))
+25 25 | min(1, min(i for i in range(10)))
+26 26 | max(1, max(a))
+27    |-max(1, max(i for i in range(10)))
+   27 |+max(1, *(i for i in range(10)))
+28 28 | 
+29 29 | tuples_list = [
+30 30 |     (1, 2),
+
+
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__max_statements.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__max_statements.snap
index e2e963c6fd3e3..55e63e6817060 100644
--- a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__max_statements.snap
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__max_statements.snap
@@ -1,15 +1,7 @@
 ---
 source: crates/ruff/src/rules/pylint/mod.rs
 ---
-too_many_statements_params.py:2:5: PLR0915 Too many statements (2 > 1)
-  |
-2 | # Too may statements (2/1) for max_statements=1
-3 | def f(x):
-  |     ^ PLR0915
-4 |     pass
-  |
-
-too_many_statements_params.py:6:5: PLR0915 Too many statements (3 > 1)
+too_many_statements_params.py:6:5: PLR0915 Too many statements (2 > 1)
   |
 6 | def f(x):
   |     ^ PLR0915
@@ -17,12 +9,4 @@ too_many_statements_params.py:6:5: PLR0915 Too many statements (3 > 1)
 8 |         pass
   |
 
-too_many_statements_params.py:7:9: PLR0915 Too many statements (2 > 1)
-  |
-7 | def f(x):
-8 |     def g(x):
-  |         ^ PLR0915
-9 |         pass
-  |
-
 
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__repeated_isinstance_calls.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__repeated_isinstance_calls.snap
new file mode 100644
index 0000000000000..22051533bff25
--- /dev/null
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__repeated_isinstance_calls.snap
@@ -0,0 +1,127 @@
+---
+source: crates/ruff/src/rules/pylint/mod.rs
+---
+repeated_isinstance_calls.py:15:8: PLR1701 [*] Merge `isinstance` calls: `isinstance(var[3], (float, int))`
+   |
+15 |     # not merged
+16 |     if isinstance(var[3], int) or isinstance(var[3], float) or isinstance(var[3], list) and True:  # [consider-merging-isinstance]
+   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PLR1701
+17 |         pass
+18 |     result = isinstance(var[4], int) or isinstance(var[4], float) or isinstance(var[5], list) and False  # [consider-merging-isinstance]
+   |
+   = help: Replace with `isinstance(var[3], (float, int))`
+
+ℹ Fix
+12 12 |     result = isinstance(var[2], (int, float))
+13 13 | 
+14 14 |     # not merged
+15    |-    if isinstance(var[3], int) or isinstance(var[3], float) or isinstance(var[3], list) and True:  # [consider-merging-isinstance]
+   15 |+    if isinstance(var[3], (float, int)):  # [consider-merging-isinstance]
+16 16 |         pass
+17 17 |     result = isinstance(var[4], int) or isinstance(var[4], float) or isinstance(var[5], list) and False  # [consider-merging-isinstance]
+18 18 | 
+
+repeated_isinstance_calls.py:17:14: PLR1701 [*] Merge `isinstance` calls: `isinstance(var[4], (float, int))`
+   |
+17 |     if isinstance(var[3], int) or isinstance(var[3], float) or isinstance(var[3], list) and True:  # [consider-merging-isinstance]
+18 |         pass
+19 |     result = isinstance(var[4], int) or isinstance(var[4], float) or isinstance(var[5], list) and False  # [consider-merging-isinstance]
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PLR1701
+20 | 
+21 |     result = isinstance(var[5], int) or True or isinstance(var[5], float)  # [consider-merging-isinstance]
+   |
+   = help: Replace with `isinstance(var[4], (float, int))`
+
+ℹ Fix
+14 14 |     # not merged
+15 15 |     if isinstance(var[3], int) or isinstance(var[3], float) or isinstance(var[3], list) and True:  # [consider-merging-isinstance]
+16 16 |         pass
+17    |-    result = isinstance(var[4], int) or isinstance(var[4], float) or isinstance(var[5], list) and False  # [consider-merging-isinstance]
+   17 |+    result = isinstance(var[4], (float, int))  # [consider-merging-isinstance]
+18 18 | 
+19 19 |     result = isinstance(var[5], int) or True or isinstance(var[5], float)  # [consider-merging-isinstance]
+20 20 | 
+
+repeated_isinstance_calls.py:19:14: PLR1701 [*] Merge `isinstance` calls: `isinstance(var[5], (float, int))`
+   |
+19 |     result = isinstance(var[4], int) or isinstance(var[4], float) or isinstance(var[5], list) and False  # [consider-merging-isinstance]
+20 | 
+21 |     result = isinstance(var[5], int) or True or isinstance(var[5], float)  # [consider-merging-isinstance]
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PLR1701
+22 | 
+23 |     inferred_isinstance = isinstance
+   |
+   = help: Replace with `isinstance(var[5], (float, int))`
+
+ℹ Fix
+16 16 |         pass
+17 17 |     result = isinstance(var[4], int) or isinstance(var[4], float) or isinstance(var[5], list) and False  # [consider-merging-isinstance]
+18 18 | 
+19    |-    result = isinstance(var[5], int) or True or isinstance(var[5], float)  # [consider-merging-isinstance]
+   19 |+    result = isinstance(var[5], (float, int))  # [consider-merging-isinstance]
+20 20 | 
+21 21 |     inferred_isinstance = isinstance
+22 22 |     result = inferred_isinstance(var[6], int) or inferred_isinstance(var[6], float) or inferred_isinstance(var[6], list) and False   # [consider-merging-isinstance]
+
+repeated_isinstance_calls.py:23:14: PLR1701 [*] Merge `isinstance` calls: `isinstance(var[10], (list, str))`
+   |
+23 |     inferred_isinstance = isinstance
+24 |     result = inferred_isinstance(var[6], int) or inferred_isinstance(var[6], float) or inferred_isinstance(var[6], list) and False   # [consider-merging-isinstance]
+25 |     result = isinstance(var[10], str) or isinstance(var[10], int) and var[8] * 14 or isinstance(var[10], float) and var[5] * 14.4 or isinstance(var[10], list)   # [consider-merging-isinstance]
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PLR1701
+26 |     result = isinstance(var[11], int) or isinstance(var[11], int) or isinstance(var[11], float)   # [consider-merging-isinstance]
+   |
+   = help: Replace with `isinstance(var[10], (list, str))`
+
+ℹ Fix
+20 20 | 
+21 21 |     inferred_isinstance = isinstance
+22 22 |     result = inferred_isinstance(var[6], int) or inferred_isinstance(var[6], float) or inferred_isinstance(var[6], list) and False   # [consider-merging-isinstance]
+23    |-    result = isinstance(var[10], str) or isinstance(var[10], int) and var[8] * 14 or isinstance(var[10], float) and var[5] * 14.4 or isinstance(var[10], list)   # [consider-merging-isinstance]
+   23 |+    result = isinstance(var[10], (list, str))   # [consider-merging-isinstance]
+24 24 |     result = isinstance(var[11], int) or isinstance(var[11], int) or isinstance(var[11], float)   # [consider-merging-isinstance]
+25 25 | 
+26 26 |     result = isinstance(var[20])
+
+repeated_isinstance_calls.py:24:14: PLR1701 [*] Merge `isinstance` calls: `isinstance(var[11], (float, int))`
+   |
+24 |     result = inferred_isinstance(var[6], int) or inferred_isinstance(var[6], float) or inferred_isinstance(var[6], list) and False   # [consider-merging-isinstance]
+25 |     result = isinstance(var[10], str) or isinstance(var[10], int) and var[8] * 14 or isinstance(var[10], float) and var[5] * 14.4 or isinstance(var[10], list)   # [consider-merging-isinstance]
+26 |     result = isinstance(var[11], int) or isinstance(var[11], int) or isinstance(var[11], float)   # [consider-merging-isinstance]
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PLR1701
+27 | 
+28 |     result = isinstance(var[20])
+   |
+   = help: Replace with `isinstance(var[11], (float, int))`
+
+ℹ Fix
+21 21 |     inferred_isinstance = isinstance
+22 22 |     result = inferred_isinstance(var[6], int) or inferred_isinstance(var[6], float) or inferred_isinstance(var[6], list) and False   # [consider-merging-isinstance]
+23 23 |     result = isinstance(var[10], str) or isinstance(var[10], int) and var[8] * 14 or isinstance(var[10], float) and var[5] * 14.4 or isinstance(var[10], list)   # [consider-merging-isinstance]
+24    |-    result = isinstance(var[11], int) or isinstance(var[11], int) or isinstance(var[11], float)   # [consider-merging-isinstance]
+   24 |+    result = isinstance(var[11], (float, int))   # [consider-merging-isinstance]
+25 25 | 
+26 26 |     result = isinstance(var[20])
+27 27 |     result = isinstance()
+
+repeated_isinstance_calls.py:30:14: PLR1701 [*] Merge `isinstance` calls: `isinstance(var[12], (float, int, list))`
+   |
+30 |     # Combination merged and not merged
+31 |     result = isinstance(var[12], (int, float)) or isinstance(var[12], list)  # [consider-merging-isinstance]
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PLR1701
+32 | 
+33 |     # not merged but valid
+   |
+   = help: Replace with `isinstance(var[12], (float, int, list))`
+
+ℹ Fix
+27 27 |     result = isinstance()
+28 28 | 
+29 29 |     # Combination merged and not merged
+30    |-    result = isinstance(var[12], (int, float)) or isinstance(var[12], list)  # [consider-merging-isinstance]
+   30 |+    result = isinstance(var[12], (float, int, list))  # [consider-merging-isinstance]
+31 31 | 
+32 32 |     # not merged but valid
+33 33 |     result = isinstance(var[5], int) and var[5] * 14 or isinstance(var[5], float) and var[5] * 14.4
+
+
diff --git a/crates/ruff/src/rules/pyupgrade/fixes.rs b/crates/ruff/src/rules/pyupgrade/fixes.rs
index baf259423c9aa..5f37034a2d169 100644
--- a/crates/ruff/src/rules/pyupgrade/fixes.rs
+++ b/crates/ruff/src/rules/pyupgrade/fixes.rs
@@ -1,19 +1,19 @@
-use anyhow::{bail, Result};
-use libcst_native::{
-    Codegen, CodegenState, CompoundStatement, Expression, ParenthesizableWhitespace,
-    SmallStatement, Statement, Suite,
-};
+use anyhow::Result;
+use libcst_native::ParenthesizableWhitespace;
 use ruff_text_size::{TextRange, TextSize};
-use rustpython_parser::ast::Expr;
+use rustpython_parser::ast::{Expr, Ranged};
 use rustpython_parser::{lexer, Mode, Tok};
 
+use crate::autofix::codemods::CodegenStylist;
 use ruff_diagnostics::Edit;
 use ruff_python_ast::source_code::{Locator, Stylist};
 
-use crate::cst::matchers::match_module;
+use crate::cst::matchers::{
+    match_call_mut, match_expression, match_function_def, match_indented_block, match_statement,
+};
 
 /// Safely adjust the indentation of the indented block at [`TextRange`].
-pub fn adjust_indentation(
+pub(crate) fn adjust_indentation(
     range: TextRange,
     indentation: &str,
     locator: &Locator,
@@ -23,25 +23,14 @@ pub fn adjust_indentation(
 
     let module_text = format!("def f():{}{contents}", stylist.line_ending().as_str());
 
-    let mut tree = match_module(&module_text)?;
+    let mut tree = match_statement(&module_text)?;
 
-    let [Statement::Compound(CompoundStatement::FunctionDef(embedding))] = &mut *tree.body else {
-        bail!("Expected statement to be embedded in a function definition")
-    };
+    let embedding = match_function_def(&mut tree)?;
 
-    let Suite::IndentedBlock(indented_block) = &mut embedding.body else {
-        bail!("Expected indented block")
-    };
+    let indented_block = match_indented_block(&mut embedding.body)?;
     indented_block.indent = Some(indentation);
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..Default::default()
-    };
-    indented_block.codegen(&mut state);
-
-    let module_text = state.to_string();
+    let module_text = indented_block.codegen_stylist(stylist);
     let module_text = module_text
         .strip_prefix(stylist.line_ending().as_str())
         .unwrap()
@@ -50,38 +39,30 @@ pub fn adjust_indentation(
 }
 
 /// Generate a fix to remove arguments from a `super` call.
-pub fn remove_super_arguments(locator: &Locator, stylist: &Stylist, expr: &Expr) -> Option<Edit> {
+pub(crate) fn remove_super_arguments(
+    locator: &Locator,
+    stylist: &Stylist,
+    expr: &Expr,
+) -> Option<Edit> {
     let range = expr.range();
     let contents = locator.slice(range);
 
-    let mut tree = libcst_native::parse_module(contents, None).ok()?;
+    let mut tree = match_expression(contents).ok()?;
 
-    let Statement::Simple(body) = tree.body.first_mut()? else {
-        return None;
-    };
-    let SmallStatement::Expr(body) = body.body.first_mut()? else {
-        return None;
-    };
-    let Expression::Call(body) = &mut body.value else {
-        return None;
-    };
+    let body = match_call_mut(&mut tree).ok()?;
 
     body.args = vec![];
     body.whitespace_before_args = ParenthesizableWhitespace::default();
     body.whitespace_after_func = ParenthesizableWhitespace::default();
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    tree.codegen(&mut state);
-
-    Some(Edit::range_replacement(state.to_string(), range))
+    Some(Edit::range_replacement(
+        tree.codegen_stylist(stylist),
+        range,
+    ))
 }
 
 /// Remove any imports matching `members` from an import-from statement.
-pub fn remove_import_members(contents: &str, members: &[&str]) -> String {
+pub(crate) fn remove_import_members(contents: &str, members: &[&str]) -> String {
     let mut names: Vec<TextRange> = vec![];
     let mut commas: Vec<TextRange> = vec![];
     let mut removal_indices: Vec<usize> = vec![];
diff --git a/crates/ruff/src/rules/pyupgrade/helpers.rs b/crates/ruff/src/rules/pyupgrade/helpers.rs
index 6d3cfa8dbb9b9..b035b2b1e6496 100644
--- a/crates/ruff/src/rules/pyupgrade/helpers.rs
+++ b/crates/ruff/src/rules/pyupgrade/helpers.rs
@@ -3,7 +3,7 @@ use regex::{Captures, Regex};
 
 static CURLY_BRACES: Lazy<Regex> = Lazy::new(|| Regex::new(r"(\\N\{[^}]+})|([{}])").unwrap());
 
-pub fn curly_escape(text: &str) -> String {
+pub(crate) fn curly_escape(text: &str) -> String {
     // Match all curly braces. This will include named unicode escapes (like
     // \N{SNOWMAN}), which we _don't_ want to escape, so take care to preserve them.
     CURLY_BRACES
diff --git a/crates/ruff/src/rules/pyupgrade/mod.rs b/crates/ruff/src/rules/pyupgrade/mod.rs
index 56c2236526aac..331194a03de3e 100644
--- a/crates/ruff/src/rules/pyupgrade/mod.rs
+++ b/crates/ruff/src/rules/pyupgrade/mod.rs
@@ -2,7 +2,6 @@
 mod fixes;
 mod helpers;
 pub(crate) mod rules;
-pub mod settings;
 pub(crate) mod types;
 
 #[cfg(test)]
@@ -10,7 +9,6 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
@@ -18,58 +16,64 @@ mod tests {
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::UselessMetaclassType, Path::new("UP001.py"); "UP001")]
-    #[test_case(Rule::TypeOfPrimitive, Path::new("UP003.py"); "UP003")]
-    #[test_case(Rule::UselessObjectInheritance, Path::new("UP004.py"); "UP004")]
-    #[test_case(Rule::DeprecatedUnittestAlias, Path::new("UP005.py"); "UP005")]
-    #[test_case(Rule::NonPEP585Annotation, Path::new("UP006.py"); "UP006")]
-    #[test_case(Rule::NonPEP604Annotation, Path::new("UP007.py"); "UP007")]
-    #[test_case(Rule::SuperCallWithParameters, Path::new("UP008.py"); "UP008")]
-    #[test_case(Rule::UTF8EncodingDeclaration, Path::new("UP009_0.py"); "UP009_0")]
-    #[test_case(Rule::UTF8EncodingDeclaration, Path::new("UP009_1.py"); "UP009_1")]
-    #[test_case(Rule::UTF8EncodingDeclaration, Path::new("UP009_2.py"); "UP009_2")]
-    #[test_case(Rule::UTF8EncodingDeclaration, Path::new("UP009_3.py"); "UP009_3")]
-    #[test_case(Rule::UTF8EncodingDeclaration, Path::new("UP009_4.py"); "UP009_4")]
-    #[test_case(Rule::UnnecessaryFutureImport, Path::new("UP010.py"); "UP010")]
-    #[test_case(Rule::LRUCacheWithoutParameters, Path::new("UP011.py"); "UP011")]
-    #[test_case(Rule::UnnecessaryEncodeUTF8, Path::new("UP012.py"); "UP012")]
-    #[test_case(Rule::ConvertTypedDictFunctionalToClass, Path::new("UP013.py"); "UP013")]
-    #[test_case(Rule::ConvertNamedTupleFunctionalToClass, Path::new("UP014.py"); "UP014")]
-    #[test_case(Rule::RedundantOpenModes, Path::new("UP015.py"); "UP015")]
-    #[test_case(Rule::NativeLiterals, Path::new("UP018.py"); "UP018")]
-    #[test_case(Rule::TypingTextStrAlias, Path::new("UP019.py"); "UP019")]
-    #[test_case(Rule::OpenAlias, Path::new("UP020.py"); "UP020")]
-    #[test_case(Rule::ReplaceUniversalNewlines, Path::new("UP021.py"); "UP021")]
-    #[test_case(Rule::ReplaceStdoutStderr, Path::new("UP022.py"); "UP022")]
-    #[test_case(Rule::DeprecatedCElementTree, Path::new("UP023.py"); "UP023")]
-    #[test_case(Rule::OSErrorAlias, Path::new("UP024_0.py"); "UP024_0")]
-    #[test_case(Rule::OSErrorAlias, Path::new("UP024_1.py"); "UP024_1")]
-    #[test_case(Rule::OSErrorAlias, Path::new("UP024_2.py"); "UP024_2")]
-    #[test_case(Rule::OSErrorAlias, Path::new("UP024_3.py"); "UP024_3")]
-    #[test_case(Rule::OSErrorAlias, Path::new("UP024_4.py"); "UP024_4")]
-    #[test_case(Rule::UnicodeKindPrefix, Path::new("UP025.py"); "UP025")]
-    #[test_case(Rule::DeprecatedMockImport, Path::new("UP026.py"); "UP026")]
-    #[test_case(Rule::UnpackedListComprehension, Path::new("UP027.py"); "UP027")]
-    #[test_case(Rule::YieldInForLoop, Path::new("UP028_0.py"); "UP028_0")]
-    #[test_case(Rule::YieldInForLoop, Path::new("UP028_1.py"); "UP028_1")]
-    #[test_case(Rule::UnnecessaryBuiltinImport, Path::new("UP029.py"); "UP029")]
-    #[test_case(Rule::FormatLiterals, Path::new("UP030_0.py"); "UP030_0")]
-    #[test_case(Rule::FormatLiterals, Path::new("UP030_1.py"); "UP030_1")]
-    #[test_case(Rule::FormatLiterals, Path::new("UP030_2.py"); "UP030_2")]
-    #[test_case(Rule::PrintfStringFormatting, Path::new("UP031_0.py"); "UP031_0")]
-    #[test_case(Rule::PrintfStringFormatting, Path::new("UP031_1.py"); "UP031_1")]
-    #[test_case(Rule::FString, Path::new("UP032.py"); "UP032")]
-    #[test_case(Rule::LRUCacheWithMaxsizeNone, Path::new("UP033_0.py"); "UP033_0")]
-    #[test_case(Rule::LRUCacheWithMaxsizeNone, Path::new("UP033_1.py"); "UP033_1")]
-    #[test_case(Rule::ExtraneousParentheses, Path::new("UP034.py"); "UP034")]
-    #[test_case(Rule::DeprecatedImport, Path::new("UP035.py"); "UP035")]
-    #[test_case(Rule::OutdatedVersionBlock, Path::new("UP036_0.py"); "UP036_0")]
-    #[test_case(Rule::OutdatedVersionBlock, Path::new("UP036_1.py"); "UP036_1")]
-    #[test_case(Rule::OutdatedVersionBlock, Path::new("UP036_2.py"); "UP036_2")]
-    #[test_case(Rule::OutdatedVersionBlock, Path::new("UP036_3.py"); "UP036_3")]
-    #[test_case(Rule::OutdatedVersionBlock, Path::new("UP036_4.py"); "UP036_4")]
-    #[test_case(Rule::QuotedAnnotation, Path::new("UP037.py"); "UP037")]
-    #[test_case(Rule::NonPEP604Isinstance, Path::new("UP038.py"); "UP038")]
+    #[test_case(Rule::UselessMetaclassType, Path::new("UP001.py"))]
+    #[test_case(Rule::TypeOfPrimitive, Path::new("UP003.py"))]
+    #[test_case(Rule::UselessObjectInheritance, Path::new("UP004.py"))]
+    #[test_case(Rule::DeprecatedUnittestAlias, Path::new("UP005.py"))]
+    #[test_case(Rule::NonPEP585Annotation, Path::new("UP006_0.py"))]
+    #[test_case(Rule::NonPEP585Annotation, Path::new("UP006_1.py"))]
+    #[test_case(Rule::NonPEP585Annotation, Path::new("UP006_2.py"))]
+    #[test_case(Rule::NonPEP585Annotation, Path::new("UP006_3.py"))]
+    #[test_case(Rule::NonPEP604Annotation, Path::new("UP007.py"))]
+    #[test_case(Rule::SuperCallWithParameters, Path::new("UP008.py"))]
+    #[test_case(Rule::UTF8EncodingDeclaration, Path::new("UP009_0.py"))]
+    #[test_case(Rule::UTF8EncodingDeclaration, Path::new("UP009_1.py"))]
+    #[test_case(Rule::UTF8EncodingDeclaration, Path::new("UP009_2.py"))]
+    #[test_case(Rule::UTF8EncodingDeclaration, Path::new("UP009_3.py"))]
+    #[test_case(Rule::UTF8EncodingDeclaration, Path::new("UP009_4.py"))]
+    #[test_case(Rule::UnnecessaryFutureImport, Path::new("UP010.py"))]
+    #[test_case(Rule::LRUCacheWithoutParameters, Path::new("UP011.py"))]
+    #[test_case(Rule::UnnecessaryEncodeUTF8, Path::new("UP012.py"))]
+    #[test_case(Rule::ConvertTypedDictFunctionalToClass, Path::new("UP013.py"))]
+    #[test_case(Rule::ConvertNamedTupleFunctionalToClass, Path::new("UP014.py"))]
+    #[test_case(Rule::RedundantOpenModes, Path::new("UP015.py"))]
+    #[test_case(Rule::NativeLiterals, Path::new("UP018.py"))]
+    #[test_case(Rule::TypingTextStrAlias, Path::new("UP019.py"))]
+    #[test_case(Rule::OpenAlias, Path::new("UP020.py"))]
+    #[test_case(Rule::ReplaceUniversalNewlines, Path::new("UP021.py"))]
+    #[test_case(Rule::ReplaceStdoutStderr, Path::new("UP022.py"))]
+    #[test_case(Rule::DeprecatedCElementTree, Path::new("UP023.py"))]
+    #[test_case(Rule::OSErrorAlias, Path::new("UP024_0.py"))]
+    #[test_case(Rule::OSErrorAlias, Path::new("UP024_1.py"))]
+    #[test_case(Rule::OSErrorAlias, Path::new("UP024_2.py"))]
+    #[test_case(Rule::OSErrorAlias, Path::new("UP024_3.py"))]
+    #[test_case(Rule::OSErrorAlias, Path::new("UP024_4.py"))]
+    #[test_case(Rule::UnicodeKindPrefix, Path::new("UP025.py"))]
+    #[test_case(Rule::DeprecatedMockImport, Path::new("UP026.py"))]
+    #[test_case(Rule::UnpackedListComprehension, Path::new("UP027.py"))]
+    #[test_case(Rule::YieldInForLoop, Path::new("UP028_0.py"))]
+    #[test_case(Rule::YieldInForLoop, Path::new("UP028_1.py"))]
+    #[test_case(Rule::UnnecessaryBuiltinImport, Path::new("UP029.py"))]
+    #[test_case(Rule::FormatLiterals, Path::new("UP030_0.py"))]
+    #[test_case(Rule::FormatLiterals, Path::new("UP030_1.py"))]
+    #[test_case(Rule::FormatLiterals, Path::new("UP030_2.py"))]
+    #[test_case(Rule::PrintfStringFormatting, Path::new("UP031_0.py"))]
+    #[test_case(Rule::PrintfStringFormatting, Path::new("UP031_1.py"))]
+    #[test_case(Rule::FString, Path::new("UP032_0.py"))]
+    #[test_case(Rule::FString, Path::new("UP032_1.py"))]
+    #[test_case(Rule::FString, Path::new("UP032_2.py"))]
+    #[test_case(Rule::LRUCacheWithMaxsizeNone, Path::new("UP033_0.py"))]
+    #[test_case(Rule::LRUCacheWithMaxsizeNone, Path::new("UP033_1.py"))]
+    #[test_case(Rule::ExtraneousParentheses, Path::new("UP034.py"))]
+    #[test_case(Rule::DeprecatedImport, Path::new("UP035.py"))]
+    #[test_case(Rule::OutdatedVersionBlock, Path::new("UP036_0.py"))]
+    #[test_case(Rule::OutdatedVersionBlock, Path::new("UP036_1.py"))]
+    #[test_case(Rule::OutdatedVersionBlock, Path::new("UP036_2.py"))]
+    #[test_case(Rule::OutdatedVersionBlock, Path::new("UP036_3.py"))]
+    #[test_case(Rule::OutdatedVersionBlock, Path::new("UP036_4.py"))]
+    #[test_case(Rule::OutdatedVersionBlock, Path::new("UP036_5.py"))]
+    #[test_case(Rule::QuotedAnnotation, Path::new("UP037.py"))]
+    #[test_case(Rule::NonPEP604Isinstance, Path::new("UP038.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = path.to_string_lossy().to_string();
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs b/crates/ruff/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs
index 32aedf8cc1a72..d2de8fb2b837e 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs
@@ -1,11 +1,12 @@
 use anyhow::{bail, Result};
 use log::debug;
-use rustpython_parser::ast::{Constant, Expr, ExprContext, ExprKind, Keyword, Stmt, StmtKind};
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Constant, Expr, ExprContext, Keyword, Ranged, Stmt};
 
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Violation};
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::{create_expr, create_stmt, unparse_stmt};
-use ruff_python_ast::source_code::Stylist;
+use ruff_python_ast::source_code::Generator;
+use ruff_python_semantic::model::SemanticModel;
 use ruff_python_stdlib::identifiers::is_identifier;
 
 use crate::checkers::ast::Checker;
@@ -13,8 +14,7 @@ use crate::registry::AsRule;
 
 #[violation]
 pub struct ConvertNamedTupleFunctionalToClass {
-    pub name: String,
-    pub fixable: bool,
+    name: String,
 }
 
 impl Violation for ConvertNamedTupleFunctionalToClass {
@@ -22,79 +22,79 @@ impl Violation for ConvertNamedTupleFunctionalToClass {
 
     #[derive_message_formats]
     fn message(&self) -> String {
-        let ConvertNamedTupleFunctionalToClass { name, .. } = self;
+        let ConvertNamedTupleFunctionalToClass { name } = self;
         format!("Convert `{name}` from `NamedTuple` functional to class syntax")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable
-            .then_some(|ConvertNamedTupleFunctionalToClass { name, .. }| {
-                format!("Convert `{name}` to class syntax")
-            })
+    fn autofix_title(&self) -> Option<String> {
+        let ConvertNamedTupleFunctionalToClass { name } = self;
+
+        Some(format!("Convert `{name}` to class syntax"))
     }
 }
 
 /// Return the typename, args, keywords, and base class.
 fn match_named_tuple_assign<'a>(
-    checker: &Checker,
+    model: &SemanticModel,
     targets: &'a [Expr],
     value: &'a Expr,
 ) -> Option<(&'a str, &'a [Expr], &'a [Keyword], &'a Expr)> {
     let target = targets.get(0)?;
-    let ExprKind::Name { id: typename, .. } = &target.node else {
+    let Expr::Name(ast::ExprName { id: typename, .. }) = target else {
         return None;
     };
-    let ExprKind::Call {
+    let Expr::Call(ast::ExprCall {
         func,
         args,
         keywords,
-    } = &value.node else {
+        range: _,
+    }) = value else {
         return None;
     };
-    if !checker
-        .ctx
-        .resolve_call_path(func)
-        .map_or(false, |call_path| {
-            call_path.as_slice() == ["typing", "NamedTuple"]
-        })
-    {
+    if !model.resolve_call_path(func).map_or(false, |call_path| {
+        call_path.as_slice() == ["typing", "NamedTuple"]
+    }) {
         return None;
     }
     Some((typename, args, keywords, func))
 }
 
-/// Generate a `StmtKind::AnnAssign` representing the provided property
+/// Generate a `Stmt::AnnAssign` representing the provided property
 /// definition.
 fn create_property_assignment_stmt(
     property: &str,
     annotation: &Expr,
     value: Option<&Expr>,
 ) -> Stmt {
-    create_stmt(StmtKind::AnnAssign {
-        target: Box::new(create_expr(ExprKind::Name {
-            id: property.to_string(),
-            ctx: ExprContext::Load,
-        })),
+    let node = ast::ExprName {
+        id: property.into(),
+        ctx: ExprContext::Load,
+        range: TextRange::default(),
+    };
+    let node1 = ast::StmtAnnAssign {
+        target: Box::new(node.into()),
         annotation: Box::new(annotation.clone()),
         value: value.map(|value| Box::new(value.clone())),
-        simple: 1,
-    })
+        simple: true,
+        range: TextRange::default(),
+    };
+    node1.into()
 }
 
 /// Match the `defaults` keyword in a `NamedTuple(...)` call.
 fn match_defaults(keywords: &[Keyword]) -> Result<&[Expr]> {
     let defaults = keywords.iter().find(|keyword| {
-        if let Some(arg) = &keyword.node.arg {
-            arg.as_str() == "defaults"
+        if let Some(arg) = &keyword.arg {
+            arg == "defaults"
         } else {
             false
         }
     });
     match defaults {
-        Some(defaults) => match &defaults.node.value.node {
-            ExprKind::List { elts, .. } => Ok(elts),
-            ExprKind::Tuple { elts, .. } => Ok(elts),
-            _ => bail!("Expected defaults to be `ExprKind::List` | `ExprKind::Tuple`"),
+        Some(defaults) => match &defaults.value {
+            Expr::List(ast::ExprList { elts, .. }) => Ok(elts),
+            Expr::Tuple(ast::ExprTuple { elts, .. }) => Ok(elts),
+            _ => bail!("Expected defaults to be `Expr::List` | `Expr::Tuple`"),
         },
         None => Ok(&[]),
     }
@@ -103,13 +103,17 @@ fn match_defaults(keywords: &[Keyword]) -> Result<&[Expr]> {
 /// Create a list of property assignments from the `NamedTuple` arguments.
 fn create_properties_from_args(args: &[Expr], defaults: &[Expr]) -> Result<Vec<Stmt>> {
     let Some(fields) = args.get(1) else {
-        return Ok(vec![create_stmt(StmtKind::Pass)]);
+        let node = Stmt::Pass(ast::StmtPass { range: TextRange::default()});
+        return Ok(vec![node]);
     };
-    let ExprKind::List { elts, .. } = &fields.node else {
-        bail!("Expected argument to be `ExprKind::List`");
+    let Expr::List(ast::ExprList { elts, .. } )= &fields else {
+        bail!("Expected argument to be `Expr::List`");
     };
     if elts.is_empty() {
-        return Ok(vec![create_stmt(StmtKind::Pass)]);
+        let node = Stmt::Pass(ast::StmtPass {
+            range: TextRange::default(),
+        });
+        return Ok(vec![node]);
     }
     let padded_defaults = if elts.len() >= defaults.len() {
         std::iter::repeat(None)
@@ -121,16 +125,16 @@ fn create_properties_from_args(args: &[Expr], defaults: &[Expr]) -> Result<Vec<S
     elts.iter()
         .zip(padded_defaults)
         .map(|(field, default)| {
-            let ExprKind::Tuple { elts, .. } = &field.node else {
-                bail!("Expected `field` to be `ExprKind::Tuple`")
+            let Expr::Tuple(ast::ExprTuple { elts, .. }) = &field else {
+                bail!("Expected `field` to be `Expr::Tuple`")
             };
             let [field_name, annotation] = elts.as_slice() else {
                 bail!("Expected `elts` to have exactly two elements")
             };
-            let ExprKind::Constant {
+            let Expr::Constant(ast::ExprConstant {
                 value: Constant::Str(property),
                 ..
-            } = &field_name.node else {
+            }) = &field_name else {
                 bail!("Expected `field_name` to be `Constant::Str`")
             };
             if !is_identifier(property) {
@@ -146,13 +150,15 @@ fn create_properties_from_args(args: &[Expr], defaults: &[Expr]) -> Result<Vec<S
 /// Generate a `StmtKind:ClassDef` statement based on the provided body and
 /// keywords.
 fn create_class_def_stmt(typename: &str, body: Vec<Stmt>, base_class: &Expr) -> Stmt {
-    create_stmt(StmtKind::ClassDef {
-        name: typename.to_string(),
+    let node = ast::StmtClassDef {
+        name: typename.into(),
         bases: vec![base_class.clone()],
         keywords: vec![],
         body,
         decorator_list: vec![],
-    })
+        range: TextRange::default(),
+    };
+    node.into()
 }
 
 /// Generate a `Fix` to convert a `NamedTuple` assignment to a class definition.
@@ -161,23 +167,24 @@ fn convert_to_class(
     typename: &str,
     body: Vec<Stmt>,
     base_class: &Expr,
-    stylist: &Stylist,
-) -> Edit {
-    Edit::range_replacement(
-        unparse_stmt(&create_class_def_stmt(typename, body, base_class), stylist),
+    generator: Generator,
+) -> Fix {
+    #[allow(deprecated)]
+    Fix::unspecified(Edit::range_replacement(
+        generator.stmt(&create_class_def_stmt(typename, body, base_class)),
         stmt.range(),
-    )
+    ))
 }
 
 /// UP014
-pub fn convert_named_tuple_functional_to_class(
+pub(crate) fn convert_named_tuple_functional_to_class(
     checker: &mut Checker,
     stmt: &Stmt,
     targets: &[Expr],
     value: &Expr,
 ) {
     let Some((typename, args, keywords, base_class)) =
-        match_named_tuple_assign(checker, targets, value) else
+        match_named_tuple_assign(checker.semantic_model(), targets, value) else
     {
         return;
     };
@@ -191,23 +198,24 @@ pub fn convert_named_tuple_functional_to_class(
             return;
         }
     };
-    // TODO(charlie): Preserve indentation, to remove the first-column requirement.
-    let fixable = checker.locator.is_at_start_of_line(stmt.start());
+
     let mut diagnostic = Diagnostic::new(
         ConvertNamedTupleFunctionalToClass {
             name: typename.to_string(),
-            fixable,
         },
         stmt.range(),
     );
-    if fixable && checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(convert_to_class(
-            stmt,
-            typename,
-            properties,
-            base_class,
-            checker.stylist,
-        ));
+    if checker.patch(diagnostic.kind.rule()) {
+        // TODO(charlie): Preserve indentation, to remove the first-column requirement.
+        if checker.locator.is_at_start_of_line(stmt.start()) {
+            diagnostic.set_fix(convert_to_class(
+                stmt,
+                typename,
+                properties,
+                base_class,
+                checker.generator(),
+            ));
+        }
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs b/crates/ruff/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs
index b700ce5b0b325..e1906fa880a31 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs
@@ -1,11 +1,12 @@
 use anyhow::{bail, Result};
 use log::debug;
-use rustpython_parser::ast::{Constant, Expr, ExprContext, ExprKind, Keyword, Stmt, StmtKind};
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Constant, Expr, ExprContext, Keyword, Ranged, Stmt};
 
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Violation};
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::{create_expr, create_stmt, unparse_stmt};
-use ruff_python_ast::source_code::Stylist;
+use ruff_python_ast::source_code::Generator;
+use ruff_python_semantic::model::SemanticModel;
 use ruff_python_stdlib::identifiers::is_identifier;
 
 use crate::checkers::ast::Checker;
@@ -13,8 +14,7 @@ use crate::registry::AsRule;
 
 #[violation]
 pub struct ConvertTypedDictFunctionalToClass {
-    pub name: String,
-    pub fixable: bool,
+    name: String,
 }
 
 impl Violation for ConvertTypedDictFunctionalToClass {
@@ -22,60 +22,60 @@ impl Violation for ConvertTypedDictFunctionalToClass {
 
     #[derive_message_formats]
     fn message(&self) -> String {
-        let ConvertTypedDictFunctionalToClass { name, .. } = self;
+        let ConvertTypedDictFunctionalToClass { name } = self;
         format!("Convert `{name}` from `TypedDict` functional to class syntax")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable
-            .then_some(|ConvertTypedDictFunctionalToClass { name, .. }| {
-                format!("Convert `{name}` to class syntax")
-            })
+    fn autofix_title(&self) -> Option<String> {
+        let ConvertTypedDictFunctionalToClass { name } = self;
+        Some(format!("Convert `{name}` to class syntax"))
     }
 }
 
 /// Return the class name, arguments, keywords and base class for a `TypedDict`
 /// assignment.
 fn match_typed_dict_assign<'a>(
-    checker: &Checker,
+    model: &SemanticModel,
     targets: &'a [Expr],
     value: &'a Expr,
 ) -> Option<(&'a str, &'a [Expr], &'a [Keyword], &'a Expr)> {
     let target = targets.get(0)?;
-    let ExprKind::Name { id: class_name, .. } = &target.node else {
+    let Expr::Name(ast::ExprName { id: class_name, .. }) = target else {
         return None;
     };
-    let ExprKind::Call {
+    let Expr::Call(ast::ExprCall {
         func,
         args,
         keywords,
-    } = &value.node else {
+        range: _
+    }) = value else {
         return None;
     };
-    if !checker
-        .ctx
-        .resolve_call_path(func)
-        .map_or(false, |call_path| {
-            call_path.as_slice() == ["typing", "TypedDict"]
-        })
-    {
+    if !model.resolve_call_path(func).map_or(false, |call_path| {
+        call_path.as_slice() == ["typing", "TypedDict"]
+    }) {
         return None;
     }
     Some((class_name, args, keywords, func))
 }
 
-/// Generate a `StmtKind::AnnAssign` representing the provided property
+/// Generate a `Stmt::AnnAssign` representing the provided property
 /// definition.
-fn create_property_assignment_stmt(property: &str, annotation: &ExprKind) -> Stmt {
-    create_stmt(StmtKind::AnnAssign {
-        target: Box::new(create_expr(ExprKind::Name {
-            id: property.to_string(),
-            ctx: ExprContext::Load,
-        })),
-        annotation: Box::new(create_expr(annotation.clone())),
+fn create_property_assignment_stmt(property: &str, annotation: &Expr) -> Stmt {
+    let node = annotation.clone();
+    let node1 = ast::ExprName {
+        id: property.into(),
+        ctx: ExprContext::Load,
+        range: TextRange::default(),
+    };
+    let node2 = ast::StmtAnnAssign {
+        target: Box::new(node1.into()),
+        annotation: Box::new(node),
         value: None,
-        simple: 1,
-    })
+        simple: true,
+        range: TextRange::default(),
+    };
+    node2.into()
 }
 
 /// Generate a `StmtKind:ClassDef` statement based on the provided body,
@@ -90,33 +90,34 @@ fn create_class_def_stmt(
         Some(keyword) => vec![keyword.clone()],
         None => vec![],
     };
-    create_stmt(StmtKind::ClassDef {
-        name: class_name.to_string(),
+    let node = ast::StmtClassDef {
+        name: class_name.into(),
         bases: vec![base_class.clone()],
         keywords,
         body,
         decorator_list: vec![],
-    })
+        range: TextRange::default(),
+    };
+    node.into()
 }
 
 fn properties_from_dict_literal(keys: &[Option<Expr>], values: &[Expr]) -> Result<Vec<Stmt>> {
     if keys.is_empty() {
-        return Ok(vec![create_stmt(StmtKind::Pass)]);
+        let node = Stmt::Pass(ast::StmtPass {
+            range: TextRange::default(),
+        });
+        return Ok(vec![node]);
     }
 
     keys.iter()
         .zip(values.iter())
         .map(|(key, value)| match key {
-            Some(Expr {
-                node:
-                    ExprKind::Constant {
-                        value: Constant::Str(property),
-                        ..
-                    },
+            Some(Expr::Constant(ast::ExprConstant {
+                value: Constant::Str(property),
                 ..
-            }) => {
+            })) => {
                 if is_identifier(property) {
-                    Ok(create_property_assignment_stmt(property, &value.node))
+                    Ok(create_property_assignment_stmt(property, value))
                 } else {
                     bail!("Property name is not valid identifier: {}", property)
                 }
@@ -127,14 +128,17 @@ fn properties_from_dict_literal(keys: &[Option<Expr>], values: &[Expr]) -> Resul
 }
 
 fn properties_from_dict_call(func: &Expr, keywords: &[Keyword]) -> Result<Vec<Stmt>> {
-    let ExprKind::Name { id, .. } = &func.node else {
-        bail!("Expected `func` to be `ExprKind::Name`")
+    let Expr::Name(ast::ExprName { id, .. }) = func else {
+        bail!("Expected `func` to be `Expr::Name`")
     };
     if id != "dict" {
         bail!("Expected `id` to be `\"dict\"`")
     }
     if keywords.is_empty() {
-        return Ok(vec![create_stmt(StmtKind::Pass)]);
+        let node = Stmt::Pass(ast::StmtPass {
+            range: TextRange::default(),
+        });
+        return Ok(vec![node]);
     }
 
     properties_from_keywords(keywords)
@@ -143,17 +147,17 @@ fn properties_from_dict_call(func: &Expr, keywords: &[Keyword]) -> Result<Vec<St
 // Deprecated in Python 3.11, removed in Python 3.13.
 fn properties_from_keywords(keywords: &[Keyword]) -> Result<Vec<Stmt>> {
     if keywords.is_empty() {
-        return Ok(vec![create_stmt(StmtKind::Pass)]);
+        let node = Stmt::Pass(ast::StmtPass {
+            range: TextRange::default(),
+        });
+        return Ok(vec![node]);
     }
 
     keywords
         .iter()
         .map(|keyword| {
-            if let Some(property) = &keyword.node.arg {
-                Ok(create_property_assignment_stmt(
-                    property,
-                    &keyword.node.value.node,
-                ))
+            if let Some(property) = &keyword.arg {
+                Ok(create_property_assignment_stmt(property, &keyword.value))
             } else {
                 bail!("Expected `arg` to be `Some`")
             }
@@ -167,7 +171,7 @@ fn properties_from_keywords(keywords: &[Keyword]) -> Result<Vec<Stmt>> {
 // ```
 fn match_total_from_only_keyword(keywords: &[Keyword]) -> Option<&Keyword> {
     let keyword = keywords.get(0)?;
-    let arg = &keyword.node.arg.as_ref()?;
+    let arg = &keyword.arg.as_ref()?;
     match arg.as_str() {
         "total" => Some(keyword),
         _ => None,
@@ -185,19 +189,24 @@ fn match_properties_and_total<'a>(
     // ```
     if let Some(dict) = args.get(1) {
         let total = match_total_from_only_keyword(keywords);
-        match &dict.node {
-            ExprKind::Dict { keys, values } => {
-                Ok((properties_from_dict_literal(keys, values)?, total))
-            }
-            ExprKind::Call { func, keywords, .. } => {
+        match dict {
+            Expr::Dict(ast::ExprDict {
+                keys,
+                values,
+                range: _,
+            }) => Ok((properties_from_dict_literal(keys, values)?, total)),
+            Expr::Call(ast::ExprCall { func, keywords, .. }) => {
                 Ok((properties_from_dict_call(func, keywords)?, total))
             }
-            _ => bail!("Expected `arg` to be `ExprKind::Dict` or `ExprKind::Call`"),
+            _ => bail!("Expected `arg` to be `Expr::Dict` or `Expr::Call`"),
         }
     } else if !keywords.is_empty() {
         Ok((properties_from_keywords(keywords)?, None))
     } else {
-        Ok((vec![create_stmt(StmtKind::Pass)], None))
+        let node = Stmt::Pass(ast::StmtPass {
+            range: TextRange::default(),
+        });
+        Ok((vec![node], None))
     }
 }
 
@@ -208,26 +217,29 @@ fn convert_to_class(
     body: Vec<Stmt>,
     total_keyword: Option<&Keyword>,
     base_class: &Expr,
-    stylist: &Stylist,
-) -> Edit {
-    Edit::range_replacement(
-        unparse_stmt(
-            &create_class_def_stmt(class_name, body, total_keyword, base_class),
-            stylist,
-        ),
+    generator: Generator,
+) -> Fix {
+    #[allow(deprecated)]
+    Fix::unspecified(Edit::range_replacement(
+        generator.stmt(&create_class_def_stmt(
+            class_name,
+            body,
+            total_keyword,
+            base_class,
+        )),
         stmt.range(),
-    )
+    ))
 }
 
 /// UP013
-pub fn convert_typed_dict_functional_to_class(
+pub(crate) fn convert_typed_dict_functional_to_class(
     checker: &mut Checker,
     stmt: &Stmt,
     targets: &[Expr],
     value: &Expr,
 ) {
     let Some((class_name, args, keywords, base_class)) =
-        match_typed_dict_assign(checker, targets, value) else
+        match_typed_dict_assign(checker.semantic_model(), targets, value) else
     {
         return;
     };
@@ -239,24 +251,25 @@ pub fn convert_typed_dict_functional_to_class(
             return;
         }
     };
-    // TODO(charlie): Preserve indentation, to remove the first-column requirement.
-    let fixable = checker.locator.is_at_start_of_line(stmt.start());
+
     let mut diagnostic = Diagnostic::new(
         ConvertTypedDictFunctionalToClass {
             name: class_name.to_string(),
-            fixable,
         },
         stmt.range(),
     );
-    if fixable && checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(convert_to_class(
-            stmt,
-            class_name,
-            body,
-            total_keyword,
-            base_class,
-            checker.stylist,
-        ));
+    if checker.patch(diagnostic.kind.rule()) {
+        // TODO(charlie): Preserve indentation, to remove the first-column requirement.
+        if checker.locator.is_at_start_of_line(stmt.start()) {
+            diagnostic.set_fix(convert_to_class(
+                stmt,
+                class_name,
+                body,
+                total_keyword,
+                base_class,
+                checker.generator(),
+            ));
+        }
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/datetime_utc_alias.rs b/crates/ruff/src/rules/pyupgrade/rules/datetime_utc_alias.rs
index f31e3049470f2..16aa05a1454dc 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/datetime_utc_alias.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/datetime_utc_alias.rs
@@ -1,6 +1,6 @@
-use rustpython_parser::ast::Expr;
+use rustpython_parser::ast::{Expr, Ranged};
 
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Violation};
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::call_path::collect_call_path;
 
@@ -9,7 +9,7 @@ use crate::registry::AsRule;
 
 #[violation]
 pub struct DatetimeTimezoneUTC {
-    pub straight_import: bool,
+    straight_import: bool,
 }
 
 impl Violation for DatetimeTimezoneUTC {
@@ -20,19 +20,15 @@ impl Violation for DatetimeTimezoneUTC {
         format!("Use `datetime.UTC` alias")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        if self.straight_import {
-            Some(|_| "Convert to `datetime.UTC` alias".to_string())
-        } else {
-            None
-        }
+    fn autofix_title(&self) -> Option<String> {
+        Some("Convert to `datetime.UTC` alias".to_string())
     }
 }
 
 /// UP017
-pub fn datetime_utc_alias(checker: &mut Checker, expr: &Expr) {
+pub(crate) fn datetime_utc_alias(checker: &mut Checker, expr: &Expr) {
     if checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(expr)
         .map_or(false, |call_path| {
             call_path.as_slice() == ["datetime", "timezone", "utc"]
@@ -44,10 +40,11 @@ pub fn datetime_utc_alias(checker: &mut Checker, expr: &Expr) {
         let mut diagnostic = Diagnostic::new(DatetimeTimezoneUTC { straight_import }, expr.range());
         if checker.patch(diagnostic.kind.rule()) {
             if straight_import {
-                diagnostic.set_fix(Edit::range_replacement(
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
                     "datetime.UTC".to_string(),
                     expr.range(),
-                ));
+                )));
             }
         }
         checker.diagnostics.push(diagnostic);
diff --git a/crates/ruff/src/rules/pyupgrade/rules/deprecated_c_element_tree.rs b/crates/ruff/src/rules/pyupgrade/rules/deprecated_c_element_tree.rs
index 7af7c123e4d7f..dddc5b328f9e3 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/deprecated_c_element_tree.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/deprecated_c_element_tree.rs
@@ -1,6 +1,6 @@
-use rustpython_parser::ast::{Located, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Ranged, Stmt};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
@@ -20,35 +20,40 @@ impl AlwaysAutofixableViolation for DeprecatedCElementTree {
     }
 }
 
-fn add_check_for_node<T>(checker: &mut Checker, node: &Located<T>) {
+fn add_check_for_node<T>(checker: &mut Checker, node: &T)
+where
+    T: Ranged,
+{
     let mut diagnostic = Diagnostic::new(DeprecatedCElementTree, node.range());
     if checker.patch(diagnostic.kind.rule()) {
         let contents = checker.locator.slice(node.range());
-        diagnostic.set_fix(Edit::range_replacement(
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
             contents.replacen("cElementTree", "ElementTree", 1),
             node.range(),
-        ));
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
 
 /// UP023
-pub fn deprecated_c_element_tree(checker: &mut Checker, stmt: &Stmt) {
-    match &stmt.node {
-        StmtKind::Import { names } => {
+pub(crate) fn deprecated_c_element_tree(checker: &mut Checker, stmt: &Stmt) {
+    match stmt {
+        Stmt::Import(ast::StmtImport { names, range: _ }) => {
             // Ex) `import xml.etree.cElementTree as ET`
             for name in names {
-                if name.node.name == "xml.etree.cElementTree" && name.node.asname.is_some() {
+                if &name.name == "xml.etree.cElementTree" && name.asname.is_some() {
                     add_check_for_node(checker, name);
                 }
             }
         }
-        StmtKind::ImportFrom {
+        Stmt::ImportFrom(ast::StmtImportFrom {
             module,
             names,
             level,
-        } => {
-            if level.map_or(false, |level| level > 0) {
+            range: _,
+        }) => {
+            if level.map_or(false, |level| level.to_u32() > 0) {
                 // Ex) `import .xml.etree.cElementTree as ET`
             } else if let Some(module) = module {
                 if module == "xml.etree.cElementTree" {
@@ -57,13 +62,13 @@ pub fn deprecated_c_element_tree(checker: &mut Checker, stmt: &Stmt) {
                 } else if module == "xml.etree" {
                     // Ex) `from xml.etree import cElementTree as ET`
                     for name in names {
-                        if name.node.name == "cElementTree" && name.node.asname.is_some() {
+                        if &name.name == "cElementTree" && name.asname.is_some() {
                             add_check_for_node(checker, name);
                         }
                     }
                 }
             }
         }
-        _ => panic!("Expected StmtKind::Import | StmtKind::ImportFrom"),
+        _ => panic!("Expected Stmt::Import | Stmt::ImportFrom"),
     }
 }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/deprecated_import.rs b/crates/ruff/src/rules/pyupgrade/rules/deprecated_import.rs
index 781c5b8ddeb73..b2c5c623948ff 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/deprecated_import.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/deprecated_import.rs
@@ -1,7 +1,7 @@
 use itertools::Itertools;
-use rustpython_parser::ast::{Alias, AliasData, Stmt};
+use rustpython_parser::ast::{Alias, Ranged, Stmt};
 
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Violation};
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::{Locator, Stylist};
 use ruff_python_ast::whitespace::indentation;
@@ -62,14 +62,9 @@ impl Violation for DeprecatedImport {
         }
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        if let Deprecation::WithoutRename(WithoutRename { fixable, .. }) = self.deprecation {
-            fixable.then_some(|DeprecatedImport { deprecation }| {
-                let Deprecation::WithoutRename(WithoutRename { target, .. }) = deprecation else {
-                    unreachable!();
-                };
-                format!("Import from `{target}`")
-            })
+    fn autofix_title(&self) -> Option<String> {
+        if let Deprecation::WithoutRename(WithoutRename { target, .. }) = &self.deprecation {
+            Some(format!("Import from `{target}`"))
         } else {
             None
         }
@@ -266,7 +261,7 @@ const TYPING_EXTENSIONS_TO_TYPING_311: &[&str] = &[
 struct ImportReplacer<'a> {
     stmt: &'a Stmt,
     module: &'a str,
-    members: &'a [AliasData],
+    members: &'a [Alias],
     locator: &'a Locator<'a>,
     stylist: &'a Stylist<'a>,
     version: PythonVersion,
@@ -276,7 +271,7 @@ impl<'a> ImportReplacer<'a> {
     const fn new(
         stmt: &'a Stmt,
         module: &'a str,
-        members: &'a [AliasData],
+        members: &'a [Alias],
         locator: &'a Locator<'a>,
         stylist: &'a Stylist<'a>,
         version: PythonVersion,
@@ -298,7 +293,7 @@ impl<'a> ImportReplacer<'a> {
             if self.version >= PythonVersion::Py39 {
                 for member in self.members {
                     if let Some(target) = TYPING_TO_RENAME_PY39.iter().find_map(|(name, target)| {
-                        if member.name == *name {
+                        if &member.name == *name {
                             Some(*target)
                         } else {
                             None
@@ -480,7 +475,7 @@ impl<'a> ImportReplacer<'a> {
     }
 
     /// Partitions imports into matched and unmatched names.
-    fn partition_imports(&self, candidates: &[&str]) -> (Vec<&AliasData>, Vec<&AliasData>) {
+    fn partition_imports(&self, candidates: &[&str]) -> (Vec<&Alias>, Vec<&Alias>) {
         let mut matched_names = vec![];
         let mut unmatched_names = vec![];
         for name in self.members {
@@ -495,33 +490,33 @@ impl<'a> ImportReplacer<'a> {
 
     /// Converts a list of names and a module into an `import from`-style
     /// import.
-    fn format_import_from(names: &[&AliasData], module: &str) -> String {
+    fn format_import_from(names: &[&Alias], module: &str) -> String {
         // Construct the whitespace strings.
         // Generate the formatted names.
-        let full_names: String = names
+        let qualified_names: String = names
             .iter()
             .map(|name| match &name.asname {
-                Some(asname) => format!("{} as {asname}", name.name),
+                Some(asname) => format!("{} as {}", name.name, asname),
                 None => format!("{}", name.name),
             })
             .join(", ");
-        format!("from {module} import {full_names}")
+        format!("from {module} import {qualified_names}")
     }
 }
 
 /// UP035
-pub fn deprecated_import(
+pub(crate) fn deprecated_import(
     checker: &mut Checker,
     stmt: &Stmt,
     names: &[Alias],
     module: Option<&str>,
-    level: Option<usize>,
+    level: Option<u32>,
 ) {
     // Avoid relative and star imports.
     if level.map_or(false, |level| level > 0) {
         return;
     }
-    if names.first().map_or(false, |name| name.node.name == "*") {
+    if names.first().map_or(false, |name| &name.name == "*") {
         return;
     }
     let Some(module) = module else {
@@ -532,7 +527,7 @@ pub fn deprecated_import(
         return;
     }
 
-    let members: Vec<AliasData> = names.iter().map(|alias| alias.node.clone()).collect();
+    let members: Vec<Alias> = names.iter().map(Clone::clone).collect();
     let fixer = ImportReplacer::new(
         stmt,
         module,
@@ -551,7 +546,11 @@ pub fn deprecated_import(
         );
         if checker.patch(Rule::DeprecatedImport) {
             if let Some(content) = fix {
-                diagnostic.set_fix(Edit::range_replacement(content, stmt.range()));
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                    content,
+                    stmt.range(),
+                )));
             }
         }
         checker.diagnostics.push(diagnostic);
diff --git a/crates/ruff/src/rules/pyupgrade/rules/deprecated_mock_import.rs b/crates/ruff/src/rules/pyupgrade/rules/deprecated_mock_import.rs
index e638aa459f599..9680aa8998a13 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/deprecated_mock_import.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/deprecated_mock_import.rs
@@ -1,30 +1,31 @@
 use anyhow::Result;
 use libcst_native::{
-    AsName, AssignTargetExpression, Attribute, Codegen, CodegenState, Dot, Expression, Import,
-    ImportAlias, ImportFrom, ImportNames, Name, NameOrAttribute, ParenthesizableWhitespace,
+    AsName, AssignTargetExpression, Attribute, Dot, Expression, Import, ImportAlias, ImportFrom,
+    ImportNames, Name, NameOrAttribute, ParenthesizableWhitespace,
 };
 use log::error;
-use rustpython_parser::ast::{Expr, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Expr, Ranged, Stmt};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use crate::autofix::codemods::CodegenStylist;
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::call_path::collect_call_path;
 use ruff_python_ast::source_code::{Locator, Stylist};
 use ruff_python_ast::whitespace::indentation;
 
 use crate::checkers::ast::Checker;
-use crate::cst::matchers::{match_import, match_import_from, match_module};
+use crate::cst::matchers::{match_import, match_import_from, match_statement};
 use crate::registry::{AsRule, Rule};
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub enum MockReference {
+pub(crate) enum MockReference {
     Import,
     Attribute,
 }
 
 #[violation]
 pub struct DeprecatedMockImport {
-    pub reference_type: MockReference,
+    reference_type: MockReference,
 }
 
 impl AlwaysAutofixableViolation for DeprecatedMockImport {
@@ -126,8 +127,8 @@ fn format_import(
     stylist: &Stylist,
 ) -> Result<String> {
     let module_text = locator.slice(stmt.range());
-    let mut tree = match_module(module_text)?;
-    let mut import = match_import(&mut tree)?;
+    let mut tree = match_statement(module_text)?;
+    let import = match_import(&mut tree)?;
 
     let Import { names, .. } = import.clone();
     let (clean_aliases, mock_aliases) = clean_import_aliases(names);
@@ -137,14 +138,7 @@ fn format_import(
     } else {
         import.names = clean_aliases;
 
-        let mut state = CodegenState {
-            default_newline: &stylist.line_ending(),
-            default_indent: stylist.indentation(),
-            ..CodegenState::default()
-        };
-        tree.codegen(&mut state);
-
-        let mut content = state.to_string();
+        let mut content = tree.codegen_stylist(stylist);
         content.push_str(&stylist.line_ending());
         content.push_str(indent);
         content.push_str(&format_mocks(mock_aliases, indent, stylist));
@@ -160,8 +154,8 @@ fn format_import_from(
     stylist: &Stylist,
 ) -> Result<String> {
     let module_text = locator.slice(stmt.range());
-    let mut tree = match_module(module_text).unwrap();
-    let mut import = match_import_from(&mut tree)?;
+    let mut tree = match_statement(module_text).unwrap();
+    let import = match_import_from(&mut tree)?;
 
     if let ImportFrom {
         names: ImportNames::Star(..),
@@ -187,13 +181,7 @@ fn format_import_from(
             lpar: vec![],
             rpar: vec![],
         })));
-        let mut state = CodegenState {
-            default_newline: &stylist.line_ending(),
-            default_indent: stylist.indentation(),
-            ..CodegenState::default()
-        };
-        tree.codegen(&mut state);
-        Ok(state.to_string())
+        Ok(tree.codegen_stylist(stylist))
     } else if let ImportFrom {
         names: ImportNames::Aliases(aliases),
         ..
@@ -224,14 +212,7 @@ fn format_import_from(
                 rpar: vec![],
             })));
 
-            let mut state = CodegenState {
-                default_newline: &stylist.line_ending(),
-                default_indent: stylist.indentation(),
-                ..CodegenState::default()
-            };
-            tree.codegen(&mut state);
-
-            let mut content = state.to_string();
+            let mut content = tree.codegen_stylist(stylist);
             if !mock_aliases.is_empty() {
                 content.push_str(&stylist.line_ending());
                 content.push_str(indent);
@@ -245,8 +226,8 @@ fn format_import_from(
 }
 
 /// UP026
-pub fn deprecated_mock_attribute(checker: &mut Checker, expr: &Expr) {
-    if let ExprKind::Attribute { value, .. } = &expr.node {
+pub(crate) fn deprecated_mock_attribute(checker: &mut Checker, expr: &Expr) {
+    if let Expr::Attribute(ast::ExprAttribute { value, .. }) = expr {
         if collect_call_path(value)
             .map_or(false, |call_path| call_path.as_slice() == ["mock", "mock"])
         {
@@ -257,7 +238,11 @@ pub fn deprecated_mock_attribute(checker: &mut Checker, expr: &Expr) {
                 value.range(),
             );
             if checker.patch(diagnostic.kind.rule()) {
-                diagnostic.set_fix(Edit::range_replacement("mock".to_string(), value.range()));
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                    "mock".to_string(),
+                    value.range(),
+                )));
             }
             checker.diagnostics.push(diagnostic);
         }
@@ -265,13 +250,13 @@ pub fn deprecated_mock_attribute(checker: &mut Checker, expr: &Expr) {
 }
 
 /// UP026
-pub fn deprecated_mock_import(checker: &mut Checker, stmt: &Stmt) {
-    match &stmt.node {
-        StmtKind::Import { names } => {
+pub(crate) fn deprecated_mock_import(checker: &mut Checker, stmt: &Stmt) {
+    match stmt {
+        Stmt::Import(ast::StmtImport { names, range: _ }) => {
             // Find all `mock` imports.
             if names
                 .iter()
-                .any(|name| name.node.name == "mock" || name.node.name == "mock.mock")
+                .any(|name| &name.name == "mock" || &name.name == "mock.mock")
             {
                 // Generate the fix, if needed, which is shared between all `mock` imports.
                 let content = if checker.patch(Rule::DeprecatedMockImport) {
@@ -292,7 +277,7 @@ pub fn deprecated_mock_import(checker: &mut Checker, stmt: &Stmt) {
 
                 // Add a `Diagnostic` for each `mock` import.
                 for name in names {
-                    if name.node.name == "mock" || name.node.name == "mock.mock" {
+                    if &name.name == "mock" || &name.name == "mock.mock" {
                         let mut diagnostic = Diagnostic::new(
                             DeprecatedMockImport {
                                 reference_type: MockReference::Import,
@@ -300,20 +285,23 @@ pub fn deprecated_mock_import(checker: &mut Checker, stmt: &Stmt) {
                             name.range(),
                         );
                         if let Some(content) = content.as_ref() {
-                            diagnostic
-                                .set_fix(Edit::range_replacement(content.clone(), stmt.range()));
+                            #[allow(deprecated)]
+                            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                                content.clone(),
+                                stmt.range(),
+                            )));
                         }
                         checker.diagnostics.push(diagnostic);
                     }
                 }
             }
         }
-        StmtKind::ImportFrom {
+        Stmt::ImportFrom(ast::StmtImportFrom {
             module: Some(module),
             level,
             ..
-        } => {
-            if level.map_or(false, |level| level > 0) {
+        }) => {
+            if level.map_or(false, |level| level.to_u32() > 0) {
                 return;
             }
 
@@ -326,7 +314,8 @@ pub fn deprecated_mock_import(checker: &mut Checker, stmt: &Stmt) {
                 );
                 if checker.patch(diagnostic.kind.rule()) {
                     if let Some(indent) = indentation(checker.locator, stmt) {
-                        diagnostic.try_set_fix(|| {
+                        #[allow(deprecated)]
+                        diagnostic.try_set_fix_from_edit(|| {
                             format_import_from(stmt, indent, checker.locator, checker.stylist)
                                 .map(|content| Edit::range_replacement(content, stmt.range()))
                         });
diff --git a/crates/ruff/src/rules/pyupgrade/rules/deprecated_unittest_alias.rs b/crates/ruff/src/rules/pyupgrade/rules/deprecated_unittest_alias.rs
index 73db5418eae2d..e73b6a1efc002 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/deprecated_unittest_alias.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/deprecated_unittest_alias.rs
@@ -1,8 +1,8 @@
 use once_cell::sync::Lazy;
 use rustc_hash::FxHashMap;
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
@@ -10,8 +10,8 @@ use crate::registry::AsRule;
 
 #[violation]
 pub struct DeprecatedUnittestAlias {
-    pub alias: String,
-    pub target: String,
+    alias: String,
+    target: String,
 }
 
 impl AlwaysAutofixableViolation for DeprecatedUnittestAlias {
@@ -48,14 +48,14 @@ static DEPRECATED_ALIASES: Lazy<FxHashMap<&'static str, &'static str>> = Lazy::n
 });
 
 /// UP005
-pub fn deprecated_unittest_alias(checker: &mut Checker, expr: &Expr) {
-    let ExprKind::Attribute { value, attr, .. } = &expr.node else {
+pub(crate) fn deprecated_unittest_alias(checker: &mut Checker, expr: &Expr) {
+    let Expr::Attribute(ast::ExprAttribute { value, attr, .. }) = expr else {
         return;
     };
-    let Some(&target) = DEPRECATED_ALIASES.get(attr.as_str()) else {
+    let Some(target) = DEPRECATED_ALIASES.get(attr.as_str()) else {
         return;
     };
-    let ExprKind::Name { id, .. } = &value.node else {
+    let Expr::Name(ast::ExprName { id, .. }) = value.as_ref() else {
         return;
     };
     if id != "self" {
@@ -64,15 +64,16 @@ pub fn deprecated_unittest_alias(checker: &mut Checker, expr: &Expr) {
     let mut diagnostic = Diagnostic::new(
         DeprecatedUnittestAlias {
             alias: attr.to_string(),
-            target: target.to_string(),
+            target: (*target).to_string(),
         },
         expr.range(),
     );
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
             format!("self.{target}"),
             expr.range(),
-        ));
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/extraneous_parentheses.rs b/crates/ruff/src/rules/pyupgrade/rules/extraneous_parentheses.rs
index d7dc4964ad8e6..25884db60bfc8 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/extraneous_parentheses.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/extraneous_parentheses.rs
@@ -2,12 +2,12 @@ use ruff_text_size::TextRange;
 use rustpython_parser::lexer::LexResult;
 use rustpython_parser::Tok;
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::Locator;
 
 use crate::registry::Rule;
-use crate::settings::{flags, Settings};
+use crate::settings::Settings;
 
 #[violation]
 pub struct ExtraneousParentheses;
@@ -51,7 +51,7 @@ fn match_extraneous_parentheses(tokens: &[LexResult], mut i: usize) -> Option<(u
     let start = i;
 
     // Verify that we're not in a tuple or coroutine.
-    let mut depth = 1;
+    let mut depth = 1u32;
     while depth > 0 {
         i += 1;
         if i >= tokens.len() {
@@ -65,9 +65,9 @@ fn match_extraneous_parentheses(tokens: &[LexResult], mut i: usize) -> Option<(u
         if depth == 1 && matches!(tok, Tok::Comma | Tok::Yield) {
             return None;
         } else if matches!(tok, Tok::Lpar | Tok::Lbrace | Tok::Lsqb) {
-            depth += 1;
+            depth = depth.saturating_add(1);
         } else if matches!(tok, Tok::Rpar | Tok::Rbrace | Tok::Rsqb) {
-            depth -= 1;
+            depth = depth.saturating_sub(1);
         }
     }
 
@@ -117,11 +117,10 @@ fn match_extraneous_parentheses(tokens: &[LexResult], mut i: usize) -> Option<(u
 }
 
 /// UP034
-pub fn extraneous_parentheses(
+pub(crate) fn extraneous_parentheses(
     tokens: &[LexResult],
     locator: &Locator,
     settings: &Settings,
-    autofix: flags::Autofix,
 ) -> Vec<Diagnostic> {
     let mut diagnostics = vec![];
     let mut i = 0;
@@ -139,14 +138,15 @@ pub fn extraneous_parentheses(
                     ExtraneousParentheses,
                     TextRange::new(start_range.start(), end_range.end()),
                 );
-                if autofix.into() && settings.rules.should_fix(Rule::ExtraneousParentheses) {
+                if settings.rules.should_fix(Rule::ExtraneousParentheses) {
                     let contents =
                         locator.slice(TextRange::new(start_range.start(), end_range.end()));
-                    diagnostic.set_fix(Edit::replacement(
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::replacement(
                         contents[1..contents.len() - 1].to_string(),
                         start_range.start(),
                         end_range.end(),
-                    ));
+                    )));
                 }
                 diagnostics.push(diagnostic);
             } else {
diff --git a/crates/ruff/src/rules/pyupgrade/rules/f_strings.rs b/crates/ruff/src/rules/pyupgrade/rules/f_strings.rs
index 2038ef5bf7101..2c23330d2dd9b 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/f_strings.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/f_strings.rs
@@ -1,12 +1,15 @@
+use std::borrow::Cow;
+
 use ruff_text_size::TextRange;
 use rustc_hash::FxHashMap;
-use rustpython_common::format::{
+use rustpython_format::{
     FieldName, FieldNamePart, FieldType, FormatPart, FormatString, FromTemplate,
 };
-use rustpython_parser::ast::{Constant, Expr, ExprKind, KeywordData};
+use rustpython_parser::ast::{self, Constant, Expr, Keyword, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::source_code::Locator;
 use ruff_python_ast::str::{is_implicit_concatenation, leading_quote, trailing_quote};
 
 use crate::checkers::ast::Checker;
@@ -34,30 +37,32 @@ impl AlwaysAutofixableViolation for FString {
 /// respectively.
 #[derive(Debug)]
 struct FormatSummaryValues<'a> {
-    args: Vec<String>,
-    kwargs: FxHashMap<&'a str, String>,
+    args: Vec<&'a Expr>,
+    kwargs: FxHashMap<&'a str, &'a Expr>,
 }
 
 impl<'a> FormatSummaryValues<'a> {
-    fn try_from_expr(checker: &'a Checker, expr: &'a Expr) -> Option<Self> {
-        let mut extracted_args: Vec<String> = Vec::new();
-        let mut extracted_kwargs: FxHashMap<&str, String> = FxHashMap::default();
-        if let ExprKind::Call { args, keywords, .. } = &expr.node {
+    fn try_from_expr(expr: &'a Expr, locator: &'a Locator) -> Option<Self> {
+        let mut extracted_args: Vec<&Expr> = Vec::new();
+        let mut extracted_kwargs: FxHashMap<&str, &Expr> = FxHashMap::default();
+        if let Expr::Call(ast::ExprCall { args, keywords, .. }) = expr {
             for arg in args {
-                let arg = checker.locator.slice(arg.range());
-                if contains_invalids(arg) {
+                if contains_invalids(locator.slice(arg.range())) {
                     return None;
                 }
-                extracted_args.push(arg.to_string());
+                extracted_args.push(arg);
             }
             for keyword in keywords {
-                let KeywordData { arg, value } = &keyword.node;
+                let Keyword {
+                    arg,
+                    value,
+                    range: _,
+                } = keyword;
                 if let Some(key) = arg {
-                    let kwarg = checker.locator.slice(value.range());
-                    if contains_invalids(kwarg) {
+                    if contains_invalids(locator.slice(value.range())) {
                         return None;
                     }
-                    extracted_kwargs.insert(key, kwarg.to_string());
+                    extracted_kwargs.insert(key, value);
                 }
             }
         }
@@ -72,7 +77,7 @@ impl<'a> FormatSummaryValues<'a> {
         })
     }
 
-    fn consume_next(&mut self) -> Option<String> {
+    fn consume_next(&mut self) -> Option<&Expr> {
         if self.args.is_empty() {
             None
         } else {
@@ -80,7 +85,7 @@ impl<'a> FormatSummaryValues<'a> {
         }
     }
 
-    fn consume_arg(&mut self, index: usize) -> Option<String> {
+    fn consume_arg(&mut self, index: usize) -> Option<&Expr> {
         if self.args.len() > index {
             Some(self.args.remove(index))
         } else {
@@ -88,13 +93,13 @@ impl<'a> FormatSummaryValues<'a> {
         }
     }
 
-    fn consume_kwarg(&mut self, key: &str) -> Option<String> {
+    fn consume_kwarg(&mut self, key: &str) -> Option<&Expr> {
         self.kwargs.remove(key)
     }
 }
 
-/// Return `true` if the string contains characters that are forbidden in
-/// argument identifier.
+/// Return `true` if the string contains characters that are forbidden by
+/// argument identifiers.
 fn contains_invalids(string: &str) -> bool {
     string.contains('*')
         || string.contains('\'')
@@ -102,29 +107,82 @@ fn contains_invalids(string: &str) -> bool {
         || string.contains("await")
 }
 
+enum FormatContext {
+    /// The expression is used as a bare format spec (e.g., `{x}`).
+    Bare,
+    /// The expression is used with conversion flags, or attribute or subscript access
+    /// (e.g., `{x!r}`, `{x.y}`, `{x[y]}`).
+    Accessed,
+}
+
+/// Given an [`Expr`], format it for use in a formatted expression within an f-string.
+fn formatted_expr<'a>(expr: &Expr, context: FormatContext, locator: &Locator<'a>) -> Cow<'a, str> {
+    let text = locator.slice(expr.range());
+    let parenthesize = match (context, expr) {
+        // E.g., `x + y` should be parenthesized in `f"{(x + y)[0]}"`.
+        (
+            FormatContext::Accessed,
+            Expr::BinOp(_)
+            | Expr::UnaryOp(_)
+            | Expr::BoolOp(_)
+            | Expr::NamedExpr(_)
+            | Expr::Compare(_)
+            | Expr::IfExp(_)
+            | Expr::Lambda(_)
+            | Expr::Await(_)
+            | Expr::Yield(_)
+            | Expr::YieldFrom(_)
+            | Expr::Starred(_),
+        ) => true,
+        // E.g., `12` should be parenthesized in `f"{(12).real}"`.
+        (
+            FormatContext::Accessed,
+            Expr::Constant(ast::ExprConstant {
+                value: Constant::Int(..),
+                ..
+            }),
+        ) => text.chars().all(|c| c.is_ascii_digit()),
+        // E.g., `{x, y}` should be parenthesized in `f"{(x, y)}"`.
+        (
+            _,
+            Expr::GeneratorExp(_)
+            | Expr::Dict(_)
+            | Expr::Set(_)
+            | Expr::SetComp(_)
+            | Expr::DictComp(_),
+        ) => true,
+        _ => false,
+    };
+    if parenthesize && !text.starts_with('(') && !text.ends_with(')') {
+        Cow::Owned(format!("({text})"))
+    } else {
+        Cow::Borrowed(text)
+    }
+}
+
 /// Generate an f-string from an [`Expr`].
-fn try_convert_to_f_string(checker: &Checker, expr: &Expr) -> Option<String> {
-    let ExprKind::Call { func, .. } = &expr.node else {
+fn try_convert_to_f_string(expr: &Expr, locator: &Locator) -> Option<String> {
+    let Expr::Call(ast::ExprCall { func, .. }) = expr else {
         return None;
     };
-    let ExprKind::Attribute { value, .. } = &func.node else {
+    let Expr::Attribute(ast::ExprAttribute { value, .. }) = func.as_ref() else {
         return None;
     };
     if !matches!(
-        &value.node,
-        ExprKind::Constant {
+        value.as_ref(),
+        Expr::Constant(ast::ExprConstant {
             value: Constant::Str(..),
             ..
-        },
+        }),
     ) {
         return None;
     };
 
-    let Some(mut summary) = FormatSummaryValues::try_from_expr(checker, expr) else {
+    let Some(mut summary) = FormatSummaryValues::try_from_expr( expr, locator) else {
         return None;
     };
 
-    let contents = checker.locator.slice(value.range());
+    let contents = locator.slice(value.range());
 
     // Skip implicit string concatenations.
     if is_implicit_concatenation(contents) {
@@ -167,26 +225,20 @@ fn try_convert_to_f_string(checker: &Checker, expr: &Expr) -> Option<String> {
                 converted.push('{');
 
                 let field = FieldName::parse(&field_name).ok()?;
-                match field.field_type {
-                    FieldType::Auto => {
-                        let Some(arg) = summary.consume_next() else {
-                            return None;
-                        };
-                        converted.push_str(&arg);
-                    }
-                    FieldType::Index(index) => {
-                        let Some(arg) = summary.consume_arg(index) else {
-                            return None;
-                        };
-                        converted.push_str(&arg);
-                    }
-                    FieldType::Keyword(name) => {
-                        let Some(arg) = summary.consume_kwarg(&name) else {
-                            return None;
-                        };
-                        converted.push_str(&arg);
-                    }
-                }
+                let arg = match field.field_type {
+                    FieldType::Auto => summary.consume_next(),
+                    FieldType::Index(index) => summary.consume_arg(index),
+                    FieldType::Keyword(name) => summary.consume_kwarg(&name),
+                }?;
+                converted.push_str(&formatted_expr(
+                    arg,
+                    if field.parts.is_empty() {
+                        FormatContext::Bare
+                    } else {
+                        FormatContext::Accessed
+                    },
+                    locator,
+                ));
 
                 for part in field.parts {
                     match part {
@@ -254,7 +306,7 @@ pub(crate) fn f_strings(checker: &mut Checker, summary: &FormatSummary, expr: &E
 
     // Currently, the only issue we know of is in LibCST:
     // https://github.com/Instagram/LibCST/issues/846
-    let Some(mut contents) = try_convert_to_f_string(checker, expr) else {
+    let Some(mut contents) = try_convert_to_f_string( expr, checker.locator) else {
         return;
     };
 
@@ -267,13 +319,21 @@ pub(crate) fn f_strings(checker: &mut Checker, summary: &FormatSummary, expr: &E
     // If necessary, add a space between any leading keyword (`return`, `yield`, `assert`, etc.)
     // and the string. For example, `return"foo"` is valid, but `returnf"foo"` is not.
     let existing = checker.locator.slice(TextRange::up_to(expr.start()));
-    if existing.chars().last().unwrap().is_ascii_alphabetic() {
+    if existing
+        .chars()
+        .last()
+        .map_or(false, |char| char.is_ascii_alphabetic())
+    {
         contents.insert(0, ' ');
     }
 
     let mut diagnostic = Diagnostic::new(FString, expr.range());
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(contents, expr.range()));
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+            contents,
+            expr.range(),
+        )));
     };
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/format_literals.rs b/crates/ruff/src/rules/pyupgrade/rules/format_literals.rs
index d912872e77296..0918d050788e8 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/format_literals.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/format_literals.rs
@@ -1,29 +1,32 @@
 use anyhow::{anyhow, bail, Result};
-use libcst_native::{Arg, Codegen, CodegenState, Expression};
+use libcst_native::Arg;
 use once_cell::sync::Lazy;
 use regex::Regex;
-use rustpython_parser::ast::Expr;
+use rustpython_parser::ast::{Expr, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use crate::autofix::codemods::CodegenStylist;
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::{Locator, Stylist};
 
 use crate::checkers::ast::Checker;
-use crate::cst::matchers::{match_call, match_expression};
+use crate::cst::matchers::{match_attribute, match_call_mut, match_expression};
 use crate::registry::AsRule;
 use crate::rules::pyflakes::format::FormatSummary;
 
 #[violation]
 pub struct FormatLiterals;
 
-impl AlwaysAutofixableViolation for FormatLiterals {
+impl Violation for FormatLiterals {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         format!("Use implicit references for positional format fields")
     }
 
-    fn autofix_title(&self) -> String {
-        "Remove explicit positional indices".to_string()
+    fn autofix_title(&self) -> Option<String> {
+        Some("Remove explicit positional indices".to_string())
     }
 }
 
@@ -87,7 +90,7 @@ fn generate_call(
 ) -> Result<String> {
     let module_text = locator.slice(expr.range());
     let mut expression = match_expression(module_text)?;
-    let mut call = match_call(&mut expression)?;
+    let call = match_call_mut(&mut expression)?;
 
     // Fix the call arguments.
     if !is_sequential(correct_order) {
@@ -95,31 +98,18 @@ fn generate_call(
     }
 
     // Fix the string itself.
-    let Expression::Attribute(item) = &*call.func else {
-        panic!("Expected: Expression::Attribute")
-    };
-
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    item.codegen(&mut state);
-    let cleaned = remove_specifiers(&state.to_string());
+    let item = match_attribute(&mut call.func)?;
+
+    let cleaned = remove_specifiers(&item.codegen_stylist(stylist));
 
     call.func = Box::new(match_expression(&cleaned)?);
 
-    let mut state = CodegenState {
-        default_newline: &stylist.line_ending(),
-        default_indent: stylist.indentation(),
-        ..CodegenState::default()
-    };
-    expression.codegen(&mut state);
-    if module_text == state.to_string() {
+    let state = expression.codegen_stylist(stylist);
+    if module_text == state {
         // Ex) `'{' '0}'.format(1)`
         bail!("Failed to generate call expression for: {module_text}")
     }
-    Ok(state.to_string())
+    Ok(state)
 }
 
 /// UP030
@@ -145,7 +135,11 @@ pub(crate) fn format_literals(checker: &mut Checker, summary: &FormatSummary, ex
         if let Ok(contents) =
             generate_call(expr, &summary.indices, checker.locator, checker.stylist)
         {
-            diagnostic.set_fix(Edit::range_replacement(contents, expr.range()));
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                contents,
+                expr.range(),
+            )));
         };
     }
     checker.diagnostics.push(diagnostic);
diff --git a/crates/ruff/src/rules/pyupgrade/rules/lru_cache_with_maxsize_none.rs b/crates/ruff/src/rules/pyupgrade/rules/lru_cache_with_maxsize_none.rs
index c0f266e968b9e..9303ddfd28132 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/lru_cache_with_maxsize_none.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/lru_cache_with_maxsize_none.rs
@@ -1,11 +1,11 @@
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::{Constant, Expr, ExprKind, KeywordData};
+use rustpython_parser::ast::{self, Constant, Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 
-use crate::autofix::actions::get_or_import_symbol;
 use crate::checkers::ast::Checker;
+use crate::importer::ImportRequest;
 use crate::registry::AsRule;
 
 #[violation]
@@ -23,13 +23,14 @@ impl AlwaysAutofixableViolation for LRUCacheWithMaxsizeNone {
 }
 
 /// UP033
-pub fn lru_cache_with_maxsize_none(checker: &mut Checker, decorator_list: &[Expr]) {
+pub(crate) fn lru_cache_with_maxsize_none(checker: &mut Checker, decorator_list: &[Expr]) {
     for expr in decorator_list.iter() {
-        let ExprKind::Call {
+        let Expr::Call(ast::ExprCall {
             func,
             args,
             keywords,
-        } = &expr.node else {
+            range: _,
+        }) = expr else {
             continue;
         };
 
@@ -37,20 +38,25 @@ pub fn lru_cache_with_maxsize_none(checker: &mut Checker, decorator_list: &[Expr
         if args.is_empty()
             && keywords.len() == 1
             && checker
-                .ctx
+                .semantic_model()
                 .resolve_call_path(func)
                 .map_or(false, |call_path| {
                     call_path.as_slice() == ["functools", "lru_cache"]
                 })
         {
-            let KeywordData { arg, value } = &keywords[0].node;
+            let Keyword {
+                arg,
+                value,
+                range: _,
+            } = &keywords[0];
             if arg.as_ref().map_or(false, |arg| arg == "maxsize")
                 && matches!(
-                    value.node,
-                    ExprKind::Constant {
+                    value,
+                    Expr::Constant(ast::ExprConstant {
                         value: Constant::None,
                         kind: None,
-                    }
+                        range: _,
+                    })
                 )
             {
                 let mut diagnostic = Diagnostic::new(
@@ -59,15 +65,14 @@ pub fn lru_cache_with_maxsize_none(checker: &mut Checker, decorator_list: &[Expr
                 );
                 if checker.patch(diagnostic.kind.rule()) {
                     diagnostic.try_set_fix(|| {
-                        let (import_edit, binding) = get_or_import_symbol(
-                            "functools",
-                            "cache",
-                            &checker.ctx,
-                            &checker.importer,
-                            checker.locator,
+                        let (import_edit, binding) = checker.importer.get_or_import_symbol(
+                            &ImportRequest::import("functools", "cache"),
+                            expr.start(),
+                            checker.semantic_model(),
                         )?;
                         let reference_edit = Edit::range_replacement(binding, expr.range());
-                        Ok(Fix::from_iter([import_edit, reference_edit]))
+                        #[allow(deprecated)]
+                        Ok(Fix::unspecified_edits(import_edit, [reference_edit]))
                     });
                 }
                 checker.diagnostics.push(diagnostic);
diff --git a/crates/ruff/src/rules/pyupgrade/rules/lru_cache_without_parameters.rs b/crates/ruff/src/rules/pyupgrade/rules/lru_cache_without_parameters.rs
index fb15799b050a3..f276d8f8e526b 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/lru_cache_without_parameters.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/lru_cache_without_parameters.rs
@@ -1,9 +1,8 @@
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::unparse_expr;
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
@@ -14,22 +13,23 @@ pub struct LRUCacheWithoutParameters;
 impl AlwaysAutofixableViolation for LRUCacheWithoutParameters {
     #[derive_message_formats]
     fn message(&self) -> String {
-        format!("Unnecessary parameters to `functools.lru_cache`")
+        format!("Unnecessary parentheses to `functools.lru_cache`")
     }
 
     fn autofix_title(&self) -> String {
-        "Remove unnecessary parameters".to_string()
+        "Remove unnecessary parentheses".to_string()
     }
 }
 
 /// UP011
-pub fn lru_cache_without_parameters(checker: &mut Checker, decorator_list: &[Expr]) {
+pub(crate) fn lru_cache_without_parameters(checker: &mut Checker, decorator_list: &[Expr]) {
     for expr in decorator_list.iter() {
-        let ExprKind::Call {
+        let Expr::Call(ast::ExprCall {
             func,
             args,
             keywords,
-        } = &expr.node else {
+            range: _,
+        }) = expr else {
             continue;
         };
 
@@ -37,7 +37,7 @@ pub fn lru_cache_without_parameters(checker: &mut Checker, decorator_list: &[Exp
         if args.is_empty()
             && keywords.is_empty()
             && checker
-                .ctx
+                .semantic_model()
                 .resolve_call_path(func)
                 .map_or(false, |call_path| {
                     call_path.as_slice() == ["functools", "lru_cache"]
@@ -48,10 +48,11 @@ pub fn lru_cache_without_parameters(checker: &mut Checker, decorator_list: &[Exp
                 TextRange::new(func.end(), expr.end()),
             );
             if checker.patch(diagnostic.kind.rule()) {
-                diagnostic.set_fix(Edit::range_replacement(
-                    unparse_expr(func, checker.stylist),
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                    checker.generator().expr(func),
                     expr.range(),
-                ));
+                )));
             }
             checker.diagnostics.push(diagnostic);
         }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/native_literals.rs b/crates/ruff/src/rules/pyupgrade/rules/native_literals.rs
index 734caa7d56c5c..a7849d2c4f404 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/native_literals.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/native_literals.rs
@@ -1,8 +1,8 @@
 use std::fmt;
 
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Constant, Expr, Keyword, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::str::is_implicit_concatenation;
 
@@ -10,7 +10,7 @@ use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub enum LiteralType {
+pub(crate) enum LiteralType {
     Str,
     Bytes,
 }
@@ -26,7 +26,7 @@ impl fmt::Display for LiteralType {
 
 #[violation]
 pub struct NativeLiterals {
-    pub literal_type: LiteralType,
+    literal_type: LiteralType,
 }
 
 impl AlwaysAutofixableViolation for NativeLiterals {
@@ -38,25 +38,35 @@ impl AlwaysAutofixableViolation for NativeLiterals {
 
     fn autofix_title(&self) -> String {
         let NativeLiterals { literal_type } = self;
-        format!("Replace with `{literal_type}`")
+        match literal_type {
+            LiteralType::Str => "Replace with empty string".to_string(),
+            LiteralType::Bytes => "Replace with empty bytes".to_string(),
+        }
     }
 }
 
 /// UP018
-pub fn native_literals(
+pub(crate) fn native_literals(
     checker: &mut Checker,
     expr: &Expr,
     func: &Expr,
     args: &[Expr],
     keywords: &[Keyword],
 ) {
-    let ExprKind::Name { id, .. } = &func.node else { return; };
+    let Expr::Name(ast::ExprName { id, .. }) = func else {
+        return;
+    };
 
     if !keywords.is_empty() || args.len() > 1 {
         return;
     }
 
-    if (id == "str" || id == "bytes") && checker.ctx.is_builtin(id) {
+    // There's no way to rewrite, e.g., `f"{f'{str()}'}"` within a nested f-string.
+    if checker.semantic_model().in_nested_f_string() {
+        return;
+    }
+
+    if (id == "str" || id == "bytes") && checker.semantic_model().is_builtin(id) {
         let Some(arg) = args.get(0) else {
             let mut diagnostic = Diagnostic::new(NativeLiterals{literal_type:if id == "str" {
                 LiteralType::Str
@@ -64,21 +74,17 @@ pub fn native_literals(
                 LiteralType::Bytes
             }}, expr.range());
             if checker.patch(diagnostic.kind.rule()) {
-                diagnostic.set_fix(Edit::range_replacement(
-                    if id == "bytes" {
-                        let mut content = String::with_capacity(3);
-                        content.push('b');
-                        content.push(checker.stylist.quote().into());
-                        content.push(checker.stylist.quote().into());
-                        content
-                    } else {
-                        let mut content = String::with_capacity(2);
-                        content.push(checker.stylist.quote().into());
-                        content.push(checker.stylist.quote().into());
-                        content
-                    },
+                let constant = if id == "bytes" {
+                    Constant::Bytes(vec![])
+                } else {
+                    Constant::Str(String::new())
+                };
+                let content = checker.generator().constant(&constant);
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                    content,
                     expr.range(),
-                ));
+                )));
             }
             checker.diagnostics.push(diagnostic);
             return;
@@ -87,11 +93,11 @@ pub fn native_literals(
         // Look for `str("")`.
         if id == "str"
             && !matches!(
-                &arg.node,
-                ExprKind::Constant {
+                &arg,
+                Expr::Constant(ast::ExprConstant {
                     value: Constant::Str(_),
                     ..
-                },
+                }),
             )
         {
             return;
@@ -100,11 +106,11 @@ pub fn native_literals(
         // Look for `bytes(b"")`
         if id == "bytes"
             && !matches!(
-                &arg.node,
-                ExprKind::Constant {
+                &arg,
+                Expr::Constant(ast::ExprConstant {
                     value: Constant::Bytes(_),
                     ..
-                },
+                }),
             )
         {
             return;
@@ -127,7 +133,11 @@ pub fn native_literals(
             expr.range(),
         );
         if checker.patch(diagnostic.kind.rule()) {
-            diagnostic.set_fix(Edit::range_replacement(arg_code.to_string(), expr.range()));
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                arg_code.to_string(),
+                expr.range(),
+            )));
         }
         checker.diagnostics.push(diagnostic);
     }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/open_alias.rs b/crates/ruff/src/rules/pyupgrade/rules/open_alias.rs
index c6db74f64f913..c8e38091235f6 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/open_alias.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/open_alias.rs
@@ -1,15 +1,13 @@
-use rustpython_parser::ast::Expr;
+use rustpython_parser::ast::{Expr, Ranged};
 
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Violation};
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 
 #[violation]
-pub struct OpenAlias {
-    pub fixable: bool,
-}
+pub struct OpenAlias;
 
 impl Violation for OpenAlias {
     const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
@@ -19,26 +17,27 @@ impl Violation for OpenAlias {
         format!("Use builtin `open`")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable
-            .then_some(|_| format!("Replace with builtin `open`"))
+    fn autofix_title(&self) -> Option<String> {
+        Some("Replace with builtin `open`".to_string())
     }
 }
 
 /// UP020
-pub fn open_alias(checker: &mut Checker, expr: &Expr, func: &Expr) {
+pub(crate) fn open_alias(checker: &mut Checker, expr: &Expr, func: &Expr) {
     if checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(func)
         .map_or(false, |call_path| call_path.as_slice() == ["io", "open"])
     {
-        let fixable = checker
-            .ctx
-            .find_binding("open")
-            .map_or(true, |binding| binding.kind.is_builtin());
-        let mut diagnostic = Diagnostic::new(OpenAlias { fixable }, expr.range());
-        if fixable && checker.patch(diagnostic.kind.rule()) {
-            diagnostic.set_fix(Edit::range_replacement("open".to_string(), func.range()));
+        let mut diagnostic = Diagnostic::new(OpenAlias, expr.range());
+        if checker.patch(diagnostic.kind.rule()) {
+            if checker.semantic_model().is_unbound("open") {
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                    "open".to_string(),
+                    func.range(),
+                )));
+            }
         }
         checker.diagnostics.push(diagnostic);
     }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/os_error_alias.rs b/crates/ruff/src/rules/pyupgrade/rules/os_error_alias.rs
index 794220b864540..82a3da68ba452 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/os_error_alias.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/os_error_alias.rs
@@ -1,10 +1,10 @@
-use rustpython_parser::ast::{Excepthandler, ExcepthandlerKind, Expr, ExprContext, ExprKind};
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Excepthandler, Expr, ExprContext, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::call_path::compose_call_path;
-use ruff_python_ast::helpers::{create_expr, unparse_expr};
-use ruff_python_semantic::context::Context;
+use ruff_python_semantic::model::SemanticModel;
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
@@ -39,8 +39,8 @@ const ALIASES: &[(&str, &str)] = &[
 ];
 
 /// Return `true` if an [`Expr`] is an alias of `OSError`.
-fn is_alias(context: &Context, expr: &Expr) -> bool {
-    context.resolve_call_path(expr).map_or(false, |call_path| {
+fn is_alias(model: &SemanticModel, expr: &Expr) -> bool {
+    model.resolve_call_path(expr).map_or(false, |call_path| {
         ALIASES
             .iter()
             .any(|(module, member)| call_path.as_slice() == [*module, *member])
@@ -48,13 +48,13 @@ fn is_alias(context: &Context, expr: &Expr) -> bool {
 }
 
 /// Return `true` if an [`Expr`] is `OSError`.
-fn is_os_error(context: &Context, expr: &Expr) -> bool {
-    context
+fn is_os_error(model: &SemanticModel, expr: &Expr) -> bool {
+    model
         .resolve_call_path(expr)
         .map_or(false, |call_path| call_path.as_slice() == ["", "OSError"])
 }
 
-/// Create a [`Diagnostic`] for a single target, like an [`ExprKind::Name`].
+/// Create a [`Diagnostic`] for a single target, like an [`Expr::Name`].
 fn atom_diagnostic(checker: &mut Checker, target: &Expr) {
     let mut diagnostic = Diagnostic::new(
         OSErrorAlias {
@@ -63,10 +63,11 @@ fn atom_diagnostic(checker: &mut Checker, target: &Expr) {
         target.range(),
     );
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
             "OSError".to_string(),
             target.range(),
-        ));
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
@@ -75,8 +76,8 @@ fn atom_diagnostic(checker: &mut Checker, target: &Expr) {
 fn tuple_diagnostic(checker: &mut Checker, target: &Expr, aliases: &[&Expr]) {
     let mut diagnostic = Diagnostic::new(OSErrorAlias { name: None }, target.range());
     if checker.patch(diagnostic.kind.rule()) {
-        let ExprKind::Tuple { elts, ..} = &target.node else {
-            panic!("Expected ExprKind::Tuple");
+        let Expr::Tuple(ast::ExprTuple { elts, ..}) = target else {
+            panic!("Expected Expr::Tuple");
         };
 
         // Filter out any `OSErrors` aliases.
@@ -92,58 +93,58 @@ fn tuple_diagnostic(checker: &mut Checker, target: &Expr, aliases: &[&Expr]) {
             .collect();
 
         // If `OSError` itself isn't already in the tuple, add it.
-        if elts.iter().all(|elt| !is_os_error(&checker.ctx, elt)) {
-            remaining.insert(
-                0,
-                create_expr(ExprKind::Name {
-                    id: "OSError".to_string(),
-                    ctx: ExprContext::Load,
-                }),
-            );
+        if elts
+            .iter()
+            .all(|elt| !is_os_error(checker.semantic_model(), elt))
+        {
+            let node = ast::ExprName {
+                id: "OSError".into(),
+                ctx: ExprContext::Load,
+                range: TextRange::default(),
+            };
+            remaining.insert(0, node.into());
         }
 
         if remaining.len() == 1 {
-            diagnostic.set_fix(Edit::range_replacement(
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
                 "OSError".to_string(),
                 target.range(),
-            ));
+            )));
         } else {
-            diagnostic.set_fix(Edit::range_replacement(
-                format!(
-                    "({})",
-                    unparse_expr(
-                        &create_expr(ExprKind::Tuple {
-                            elts: remaining,
-                            ctx: ExprContext::Load,
-                        }),
-                        checker.stylist,
-                    )
-                ),
+            let node = ast::ExprTuple {
+                elts: remaining,
+                ctx: ExprContext::Load,
+                range: TextRange::default(),
+            };
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                format!("({})", checker.generator().expr(&node.into())),
                 target.range(),
-            ));
+            )));
         }
     }
     checker.diagnostics.push(diagnostic);
 }
 
 /// UP024
-pub fn os_error_alias_handlers(checker: &mut Checker, handlers: &[Excepthandler]) {
+pub(crate) fn os_error_alias_handlers(checker: &mut Checker, handlers: &[Excepthandler]) {
     for handler in handlers {
-        let ExcepthandlerKind::ExceptHandler { type_, .. } = &handler.node;
+        let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler { type_, .. }) = handler;
         let Some(expr) = type_.as_ref() else {
             continue;
         };
-        match &expr.node {
-            ExprKind::Name { .. } | ExprKind::Attribute { .. } => {
-                if is_alias(&checker.ctx, expr) {
+        match expr.as_ref() {
+            Expr::Name(_) | Expr::Attribute(_) => {
+                if is_alias(checker.semantic_model(), expr) {
                     atom_diagnostic(checker, expr);
                 }
             }
-            ExprKind::Tuple { elts, .. } => {
+            Expr::Tuple(ast::ExprTuple { elts, .. }) => {
                 // List of aliases to replace with `OSError`.
                 let mut aliases: Vec<&Expr> = vec![];
                 for elt in elts {
-                    if is_alias(&checker.ctx, elt) {
+                    if is_alias(checker.semantic_model(), elt) {
                         aliases.push(elt);
                     }
                 }
@@ -157,19 +158,16 @@ pub fn os_error_alias_handlers(checker: &mut Checker, handlers: &[Excepthandler]
 }
 
 /// UP024
-pub fn os_error_alias_call(checker: &mut Checker, func: &Expr) {
-    if is_alias(&checker.ctx, func) {
+pub(crate) fn os_error_alias_call(checker: &mut Checker, func: &Expr) {
+    if is_alias(checker.semantic_model(), func) {
         atom_diagnostic(checker, func);
     }
 }
 
 /// UP024
-pub fn os_error_alias_raise(checker: &mut Checker, expr: &Expr) {
-    if matches!(
-        expr.node,
-        ExprKind::Name { .. } | ExprKind::Attribute { .. }
-    ) {
-        if is_alias(&checker.ctx, expr) {
+pub(crate) fn os_error_alias_raise(checker: &mut Checker, expr: &Expr) {
+    if matches!(expr, Expr::Name(_) | Expr::Attribute(_)) {
+        if is_alias(checker.semantic_model(), expr) {
             atom_diagnostic(checker, expr);
         }
     }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/outdated_version_block.rs b/crates/ruff/src/rules/pyupgrade/rules/outdated_version_block.rs
index be064dec61e75..96e8d3ac0a1fe 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/outdated_version_block.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/outdated_version_block.rs
@@ -1,18 +1,16 @@
 use std::cmp::Ordering;
 
-use log::error;
 use num_bigint::{BigInt, Sign};
 use ruff_text_size::{TextRange, TextSize};
-use rustpython_parser::ast::{Cmpop, Constant, Expr, ExprKind, Located, Stmt};
+use rustpython_parser::ast::{self, Cmpop, Constant, Expr, Ranged, Stmt};
 use rustpython_parser::{lexer, Mode, Tok};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::Locator;
-use ruff_python_ast::types::RefEquality;
 use ruff_python_ast::whitespace::indentation;
 
-use crate::autofix::actions::delete_stmt;
+use crate::autofix::edits::delete_stmt;
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 use crate::rules::pyupgrade::fixes::adjust_indentation;
@@ -32,69 +30,99 @@ impl AlwaysAutofixableViolation for OutdatedVersionBlock {
     }
 }
 
+/// The metadata for a version-comparison block.
 #[derive(Debug)]
 struct BlockMetadata {
-    /// The first non-whitespace token in the block.
-    starter: Tok,
-    /// The location of the first `elif` token, if any.
-    elif: Option<TextSize>,
-    /// The location of the `else` token, if any.
-    else_: Option<TextSize>,
+    /// The first `if` or `elif` token in the block, used to signal the start of the
+    /// version-comparison block.
+    leading_token: StartToken,
+    /// The first `elif` or `else` token following the start token, if any, used to signal the end
+    /// of the version-comparison block.
+    trailing_token: Option<EndToken>,
 }
 
-impl BlockMetadata {
-    const fn new(starter: Tok, elif: Option<TextSize>, else_: Option<TextSize>) -> Self {
-        Self {
-            starter,
-            elif,
-            else_,
+/// The set of tokens that can start a block, i.e., the first token in an `if` statement.
+#[derive(Debug)]
+enum StartTok {
+    If,
+    Elif,
+}
+
+impl StartTok {
+    fn from_tok(tok: &Tok) -> Option<Self> {
+        match tok {
+            Tok::If => Some(Self::If),
+            Tok::Elif => Some(Self::Elif),
+            _ => None,
         }
     }
 }
 
-fn metadata<T>(locator: &Locator, located: &Located<T>) -> Option<BlockMetadata> {
-    indentation(locator, located)?;
-
-    let line_start = locator.line_start(located.start());
-    // Start the selection at the start-of-line. This ensures consistent indentation
-    // in the token stream, in the event that the entire block is indented.
-    let text = locator.slice(TextRange::new(line_start, located.end()));
+#[derive(Debug)]
+struct StartToken {
+    tok: StartTok,
+    range: TextRange,
+}
 
-    let mut starter: Option<Tok> = None;
-    let mut elif = None;
-    let mut else_ = None;
+/// The set of tokens that can end a block, i.e., the first token in the subsequent `elif` or `else`
+/// branch that follows an `if` or `elif` statement.
+#[derive(Debug)]
+enum EndTok {
+    Elif,
+    Else,
+}
 
-    for (tok, range) in lexer::lex_located(text, Mode::Module, line_start)
-        .flatten()
-        .filter(|(tok, _)| {
-            !matches!(
-                tok,
-                Tok::Indent
-                    | Tok::Dedent
-                    | Tok::NonLogicalNewline
-                    | Tok::Newline
-                    | Tok::Comment(..)
-            )
-        })
-    {
-        if starter.is_none() {
-            starter = Some(tok.clone());
-        } else {
-            if matches!(tok, Tok::Elif) && elif.is_none() {
-                elif = Some(range.start());
-            }
-            if matches!(tok, Tok::Else) && else_.is_none() {
-                else_ = Some(range.start());
-            }
-        }
-        if starter.is_some() && elif.is_some() && else_.is_some() {
-            break;
+impl EndTok {
+    fn from_tok(tok: &Tok) -> Option<Self> {
+        match tok {
+            Tok::Elif => Some(Self::Elif),
+            Tok::Else => Some(Self::Else),
+            _ => None,
         }
     }
-    Some(BlockMetadata::new(starter.unwrap(), elif, else_))
 }
 
-/// Converts a `BigInt` to a `u32`, if the number is negative, it will return 0
+#[derive(Debug)]
+struct EndToken {
+    tok: EndTok,
+    range: TextRange,
+}
+
+fn metadata<T>(locator: &Locator, located: &T, body: &[Stmt]) -> Option<BlockMetadata>
+where
+    T: Ranged,
+{
+    indentation(locator, located)?;
+
+    let mut iter = lexer::lex_starts_at(
+        locator.slice(located.range()),
+        Mode::Module,
+        located.start(),
+    )
+    .flatten();
+
+    // First the leading `if` or `elif` token.
+    let (tok, range) = iter.next()?;
+    let leading_token = StartToken {
+        tok: StartTok::from_tok(&tok)?,
+        range,
+    };
+
+    // Skip any tokens until we reach the end of the `if` body.
+    let body_end = body.last()?.range().end();
+
+    // Find the trailing `elif` or `else` token, if any.
+    let trailing_token = iter
+        .skip_while(|(_, range)| range.start() < body_end)
+        .find_map(|(tok, range)| EndTok::from_tok(&tok).map(|tok| EndToken { tok, range }));
+
+    Some(BlockMetadata {
+        leading_token,
+        trailing_token,
+    })
+}
+
+/// Converts a `BigInt` to a `u32`. If the number is negative, it will return 0.
 fn bigint_to_u32(number: &BigInt) -> u32 {
     let the_number = number.to_u32_digits();
     match the_number.0 {
@@ -107,10 +135,10 @@ fn bigint_to_u32(number: &BigInt) -> u32 {
 fn extract_version(elts: &[Expr]) -> Vec<u32> {
     let mut version: Vec<u32> = vec![];
     for elt in elts {
-        if let ExprKind::Constant {
+        if let Expr::Constant(ast::ExprConstant {
             value: Constant::Int(item),
             ..
-        } = &elt.node
+        }) = &elt
         {
             let number = bigint_to_u32(item);
             version.push(number);
@@ -148,119 +176,113 @@ fn compare_version(if_version: &[u32], py_version: PythonVersion, or_equal: bool
     }
 }
 
-/// Convert a [`StmtKind::If`], retaining the `else`.
+/// Convert a [`Stmt::If`], retaining the `else`.
 fn fix_py2_block(
-    checker: &mut Checker,
+    checker: &Checker,
     stmt: &Stmt,
-    body: &[Stmt],
     orelse: &[Stmt],
     block: &BlockMetadata,
-) -> Option<Edit> {
-    if orelse.is_empty() {
+) -> Option<Fix> {
+    let leading_token = &block.leading_token;
+    let Some(trailing_token) = &block.trailing_token else {
         // Delete the entire statement. If this is an `elif`, know it's the only child
         // of its parent, so avoid passing in the parent at all. Otherwise,
         // `delete_stmt` will erroneously include a `pass`.
-        let deleted: Vec<&Stmt> = checker.deletions.iter().map(Into::into).collect();
-        let defined_by = checker.ctx.current_stmt();
-        let defined_in = checker.ctx.current_stmt_parent();
-        return match delete_stmt(
-            defined_by.into(),
-            if block.starter == Tok::If {
-                defined_in.map(Into::into)
-            } else {
-                None
-            },
-            &deleted,
+        let stmt = checker.semantic_model().stmt();
+        let parent = checker.semantic_model().stmt_parent();
+        let edit = delete_stmt(
+            stmt,
+            if matches!(block.leading_token.tok, StartTok::If) { parent } else { None },
             checker.locator,
             checker.indexer,
             checker.stylist,
-        ) {
-            Ok(fix) => {
-                checker.deletions.insert(RefEquality(defined_by.into()));
-                Some(fix)
-            }
-            Err(err) => {
-                error!("Failed to remove block: {}", err);
-                None
-            }
-        };
-    }
-
-    // If we only have an `if` and an `else`, dedent the `else` block.
-    if block.starter == Tok::If && block.elif.is_none() {
-        let start = orelse.first().unwrap();
-        let end = orelse.last().unwrap();
+        );
+        return Some(Fix::suggested(edit));
+    };
 
-        if indentation(checker.locator, start).is_none() {
-            // Inline `else` block (e.g., `else: x = 1`).
-            Some(Edit::range_replacement(
-                checker
-                    .locator
-                    .slice(TextRange::new(start.start(), end.end()))
-                    .to_string(),
-                stmt.range(),
-            ))
-        } else {
-            indentation(checker.locator, stmt)
-                .and_then(|indentation| {
-                    adjust_indentation(
-                        TextRange::new(checker.locator.line_start(start.start()), end.end()),
-                        indentation,
-                        checker.locator,
-                        checker.stylist,
-                    )
-                    .ok()
-                })
-                .map(|contents| {
-                    Edit::replacement(
-                        contents,
-                        checker.locator.line_start(stmt.start()),
-                        stmt.end(),
-                    )
-                })
-        }
-    } else {
-        let mut end_location = orelse.last().unwrap().start();
-        if block.starter == Tok::If && block.elif.is_some() {
-            // Turn the `elif` into an `if`.
-            end_location = block.elif.unwrap() + TextSize::from(2);
-        } else if block.starter == Tok::Elif {
-            if let Some(elif) = block.elif {
-                end_location = elif;
-            } else if let Some(else_) = block.else_ {
-                end_location = else_;
+    match (&leading_token.tok, &trailing_token.tok) {
+        // If we only have an `if` and an `else`, dedent the `else` block.
+        (StartTok::If, EndTok::Else) => {
+            let start = orelse.first()?;
+            let end = orelse.last()?;
+            if indentation(checker.locator, start).is_none() {
+                // Inline `else` block (e.g., `else: x = 1`).
+                #[allow(deprecated)]
+                Some(Fix::unspecified(Edit::range_replacement(
+                    checker
+                        .locator
+                        .slice(TextRange::new(start.start(), end.end()))
+                        .to_string(),
+                    stmt.range(),
+                )))
             } else {
-                end_location = body.last().unwrap().end();
+                indentation(checker.locator, stmt)
+                    .and_then(|indentation| {
+                        adjust_indentation(
+                            TextRange::new(checker.locator.line_start(start.start()), end.end()),
+                            indentation,
+                            checker.locator,
+                            checker.stylist,
+                        )
+                        .ok()
+                    })
+                    .map(|contents| {
+                        #[allow(deprecated)]
+                        Fix::unspecified(Edit::replacement(
+                            contents,
+                            checker.locator.line_start(stmt.start()),
+                            stmt.end(),
+                        ))
+                    })
             }
         }
-        Some(Edit::deletion(stmt.start(), end_location))
+        (StartTok::If, EndTok::Elif) => {
+            // If we have an `if` and an `elif`, turn the `elif` into an `if`.
+            let start_location = leading_token.range.start();
+            let end_location = trailing_token.range.start() + TextSize::from(2);
+            #[allow(deprecated)]
+            Some(Fix::unspecified(Edit::deletion(
+                start_location,
+                end_location,
+            )))
+        }
+        (StartTok::Elif, _) => {
+            // If we have an `elif`, delete up to the `else` or the end of the statement.
+            let start_location = leading_token.range.start();
+            let end_location = trailing_token.range.start();
+            #[allow(deprecated)]
+            Some(Fix::unspecified(Edit::deletion(
+                start_location,
+                end_location,
+            )))
+        }
     }
 }
 
-/// Convert a [`StmtKind::If`], removing the `else` block.
+/// Convert a [`Stmt::If`], removing the `else` block.
 fn fix_py3_block(
     checker: &mut Checker,
     stmt: &Stmt,
     test: &Expr,
     body: &[Stmt],
     block: &BlockMetadata,
-) -> Option<Edit> {
-    match block.starter {
-        Tok::If => {
+) -> Option<Fix> {
+    match block.leading_token.tok {
+        StartTok::If => {
             // If the first statement is an if, use the body of this statement, and ignore
             // the rest.
-            let start = body.first().unwrap();
-            let end = body.last().unwrap();
-
+            let start = body.first()?;
+            let end = body.last()?;
             if indentation(checker.locator, start).is_none() {
                 // Inline `if` block (e.g., `if ...: x = 1`).
-                Some(Edit::range_replacement(
+                #[allow(deprecated)]
+                Some(Fix::unspecified(Edit::range_replacement(
                     checker
                         .locator
                         .slice(TextRange::new(start.start(), end.end()))
                         .to_string(),
                     stmt.range(),
-                ))
+                )))
             } else {
                 indentation(checker.locator, stmt)
                     .and_then(|indentation| {
@@ -273,43 +295,48 @@ fn fix_py3_block(
                         .ok()
                     })
                     .map(|contents| {
-                        Edit::replacement(
+                        #[allow(deprecated)]
+                        Fix::unspecified(Edit::replacement(
                             contents,
                             checker.locator.line_start(stmt.start()),
                             stmt.end(),
-                        )
+                        ))
                     })
             }
         }
-        Tok::Elif => {
+        StartTok::Elif => {
             // Replace the `elif` with an `else, preserve the body of the elif, and remove
             // the rest.
-            let end = body.last().unwrap();
+            let end = body.last()?;
             let text = checker.locator.slice(TextRange::new(test.end(), end.end()));
-            Some(Edit::range_replacement(format!("else{text}"), stmt.range()))
+            #[allow(deprecated)]
+            Some(Fix::unspecified(Edit::range_replacement(
+                format!("else{text}"),
+                stmt.range(),
+            )))
         }
-        _ => None,
     }
 }
 
 /// UP036
-pub fn outdated_version_block(
+pub(crate) fn outdated_version_block(
     checker: &mut Checker,
     stmt: &Stmt,
     test: &Expr,
     body: &[Stmt],
     orelse: &[Stmt],
 ) {
-    let ExprKind::Compare {
+    let Expr::Compare(ast::ExprCompare {
         left,
         ops,
         comparators,
-    } = &test.node else {
+        range: _,
+    }) = &test else {
         return;
     };
 
     if !checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(left)
         .map_or(false, |call_path| {
             call_path.as_slice() == ["sys", "version_info"]
@@ -319,20 +346,18 @@ pub fn outdated_version_block(
     }
 
     if ops.len() == 1 && comparators.len() == 1 {
-        let comparison = &comparators[0].node;
+        let comparison = &comparators[0];
         let op = &ops[0];
         match comparison {
-            ExprKind::Tuple { elts, .. } => {
+            Expr::Tuple(ast::ExprTuple { elts, .. }) => {
                 let version = extract_version(elts);
                 let target = checker.settings.target_version;
                 if op == &Cmpop::Lt || op == &Cmpop::LtE {
                     if compare_version(&version, target, op == &Cmpop::LtE) {
                         let mut diagnostic = Diagnostic::new(OutdatedVersionBlock, stmt.range());
                         if checker.patch(diagnostic.kind.rule()) {
-                            if let Some(block) = metadata(checker.locator, stmt) {
-                                if let Some(fix) =
-                                    fix_py2_block(checker, stmt, body, orelse, &block)
-                                {
+                            if let Some(block) = metadata(checker.locator, stmt, body) {
+                                if let Some(fix) = fix_py2_block(checker, stmt, orelse, &block) {
                                     diagnostic.set_fix(fix);
                                 }
                             }
@@ -343,7 +368,7 @@ pub fn outdated_version_block(
                     if compare_version(&version, target, op == &Cmpop::GtE) {
                         let mut diagnostic = Diagnostic::new(OutdatedVersionBlock, stmt.range());
                         if checker.patch(diagnostic.kind.rule()) {
-                            if let Some(block) = metadata(checker.locator, stmt) {
+                            if let Some(block) = metadata(checker.locator, stmt, body) {
                                 if let Some(fix) = fix_py3_block(checker, stmt, test, body, &block)
                                 {
                                     diagnostic.set_fix(fix);
@@ -354,16 +379,16 @@ pub fn outdated_version_block(
                     }
                 }
             }
-            ExprKind::Constant {
+            Expr::Constant(ast::ExprConstant {
                 value: Constant::Int(number),
                 ..
-            } => {
+            }) => {
                 let version_number = bigint_to_u32(number);
                 if version_number == 2 && op == &Cmpop::Eq {
                     let mut diagnostic = Diagnostic::new(OutdatedVersionBlock, stmt.range());
                     if checker.patch(diagnostic.kind.rule()) {
-                        if let Some(block) = metadata(checker.locator, stmt) {
-                            if let Some(fix) = fix_py2_block(checker, stmt, body, orelse, &block) {
+                        if let Some(block) = metadata(checker.locator, stmt, body) {
+                            if let Some(fix) = fix_py2_block(checker, stmt, orelse, &block) {
                                 diagnostic.set_fix(fix);
                             }
                         }
@@ -372,7 +397,7 @@ pub fn outdated_version_block(
                 } else if version_number == 3 && op == &Cmpop::Eq {
                     let mut diagnostic = Diagnostic::new(OutdatedVersionBlock, stmt.range());
                     if checker.patch(diagnostic.kind.rule()) {
-                        if let Some(block) = metadata(checker.locator, stmt) {
+                        if let Some(block) = metadata(checker.locator, stmt, body) {
                             if let Some(fix) = fix_py3_block(checker, stmt, test, body, &block) {
                                 diagnostic.set_fix(fix);
                             }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/printf_string_formatting.rs b/crates/ruff/src/rules/pyupgrade/rules/printf_string_formatting.rs
index d8438bf76480d..5bcf6c764daec 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/printf_string_formatting.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/printf_string_formatting.rs
@@ -1,13 +1,13 @@
-use ruff_text_size::TextRange;
 use std::str::FromStr;
 
-use rustpython_common::cformat::{
+use ruff_text_size::TextRange;
+use rustpython_format::cformat::{
     CConversionFlags, CFormatPart, CFormatPrecision, CFormatQuantity, CFormatString,
 };
-use rustpython_parser::ast::{Constant, Expr, ExprKind};
+use rustpython_parser::ast::{self, Constant, Expr, Ranged};
 use rustpython_parser::{lexer, Mode, Tok};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::Locator;
 use ruff_python_ast::str::{leading_quote, trailing_quote};
@@ -140,7 +140,7 @@ fn percent_to_format(format_string: &CFormatString) -> String {
 /// If a tuple has one argument, remove the comma; otherwise, return it as-is.
 fn clean_params_tuple(checker: &mut Checker, right: &Expr, locator: &Locator) -> String {
     let mut contents = checker.locator.slice(right.range()).to_string();
-    if let ExprKind::Tuple { elts, .. } = &right.node {
+    if let Expr::Tuple(ast::ExprTuple { elts, .. }) = &right {
         if elts.len() == 1 {
             if !locator.contains_line_break(right.range()) {
                 for (i, character) in contents.chars().rev().enumerate() {
@@ -165,17 +165,22 @@ fn clean_params_dictionary(
 ) -> Option<String> {
     let is_multi_line = locator.contains_line_break(right.range());
     let mut contents = String::new();
-    if let ExprKind::Dict { keys, values } = &right.node {
+    if let Expr::Dict(ast::ExprDict {
+        keys,
+        values,
+        range: _,
+    }) = &right
+    {
         let mut arguments: Vec<String> = vec![];
         let mut seen: Vec<&str> = vec![];
         let mut indent = None;
         for (key, value) in keys.iter().zip(values.iter()) {
             match key {
                 Some(key) => {
-                    if let ExprKind::Constant {
+                    if let Expr::Constant(ast::ExprConstant {
                         value: Constant::Str(key_string),
                         ..
-                    } = &key.node
+                    }) = key
                     {
                         // If the dictionary key is not a valid variable name, abort.
                         if !is_identifier(key_string) {
@@ -291,7 +296,7 @@ fn convertible(format_string: &CFormatString, params: &Expr) -> bool {
         }
 
         // All dict substitutions must be named.
-        if let ExprKind::Dict { .. } = &params.node {
+        if let Expr::Dict(_) = &params {
             if fmt.mapping_key.is_none() {
                 return false;
             }
@@ -310,7 +315,7 @@ pub(crate) fn printf_string_formatting(
     // Grab each string segment (in case there's an implicit concatenation).
     let mut strings: Vec<TextRange> = vec![];
     let mut extension = None;
-    for (tok, range) in lexer::lex_located(
+    for (tok, range) in lexer::lex_starts_at(
         checker.locator.slice(expr.range()),
         Mode::Module,
         expr.start(),
@@ -370,14 +375,11 @@ pub(crate) fn printf_string_formatting(
     }
 
     // Parse the parameters.
-    let params_string = match right.node {
-        ExprKind::Constant { .. } | ExprKind::JoinedStr { .. } => {
+    let params_string = match right {
+        Expr::Constant(_) | Expr::JoinedStr(_) => {
             format!("({})", checker.locator.slice(right.range()))
         }
-        ExprKind::Name { .. }
-        | ExprKind::Attribute { .. }
-        | ExprKind::Subscript { .. }
-        | ExprKind::Call { .. } => {
+        Expr::Name(_) | Expr::Attribute(_) | Expr::Subscript(_) | Expr::Call(_) => {
             if num_keyword_arguments > 0 {
                 // If we have _any_ named fields, assume the right-hand side is a mapping.
                 format!("(**{})", checker.locator.slice(right.range()))
@@ -398,8 +400,8 @@ pub(crate) fn printf_string_formatting(
                 return;
             }
         }
-        ExprKind::Tuple { .. } => clean_params_tuple(checker, right, locator),
-        ExprKind::Dict { .. } => {
+        Expr::Tuple(_) => clean_params_tuple(checker, right, locator),
+        Expr::Dict(_) => {
             if let Some(params_string) = clean_params_dictionary(checker, right, locator) {
                 params_string
             } else {
@@ -444,7 +446,11 @@ pub(crate) fn printf_string_formatting(
 
     let mut diagnostic = Diagnostic::new(PrintfStringFormatting, expr.range());
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(contents, expr.range()));
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+            contents,
+            expr.range(),
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/quoted_annotation.rs b/crates/ruff/src/rules/pyupgrade/rules/quoted_annotation.rs
index dad06f86c1fb9..1a8a29e0a6c1b 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/quoted_annotation.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/quoted_annotation.rs
@@ -1,7 +1,8 @@
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
-use ruff_macros::{derive_message_formats, violation};
 use ruff_text_size::TextRange;
 
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
+use ruff_macros::{derive_message_formats, violation};
+
 use crate::checkers::ast::Checker;
 use crate::registry::Rule;
 
@@ -20,10 +21,14 @@ impl AlwaysAutofixableViolation for QuotedAnnotation {
 }
 
 /// UP037
-pub fn quoted_annotation(checker: &mut Checker, annotation: &str, range: TextRange) {
+pub(crate) fn quoted_annotation(checker: &mut Checker, annotation: &str, range: TextRange) {
     let mut diagnostic = Diagnostic::new(QuotedAnnotation, range);
     if checker.patch(Rule::QuotedAnnotation) {
-        diagnostic.set_fix(Edit::range_replacement(annotation.to_string(), range));
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+            annotation.to_string(),
+            range,
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/redundant_open_modes.rs b/crates/ruff/src/rules/pyupgrade/rules/redundant_open_modes.rs
index 4b89564af2c1c..9dabf61d244b8 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/redundant_open_modes.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/redundant_open_modes.rs
@@ -2,10 +2,10 @@ use std::str::FromStr;
 
 use anyhow::{anyhow, Result};
 use ruff_text_size::TextSize;
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Constant, Expr, Keyword, Ranged};
 use rustpython_parser::{lexer, Mode, Tok};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::find_keyword;
 use ruff_python_ast::source_code::Locator;
@@ -87,13 +87,14 @@ impl OpenMode {
 }
 
 fn match_open(expr: &Expr) -> (Option<&Expr>, Vec<Keyword>) {
-    if let ExprKind::Call {
+    if let Expr::Call(ast::ExprCall {
         func,
         args,
         keywords,
-    } = &expr.node
+        range: _,
+    }) = expr
     {
-        if matches!(&func.node, ExprKind::Name {id, ..} if id == OPEN_FUNC_NAME) {
+        if matches!(func.as_ref(), Expr::Name(ast::ExprName {id, ..}) if id == OPEN_FUNC_NAME) {
             // Return the "open mode" parameter and keywords.
             return (args.get(1), keywords.clone());
         }
@@ -116,12 +117,14 @@ fn create_check(
     );
     if patch {
         if let Some(content) = replacement_value {
-            diagnostic.set_fix(Edit::range_replacement(
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
                 content.to_string(),
                 mode_param.range(),
-            ));
+            )));
         } else {
-            diagnostic.try_set_fix(|| create_remove_param_fix(locator, expr, mode_param));
+            #[allow(deprecated)]
+            diagnostic.try_set_fix_from_edit(|| create_remove_param_fix(locator, expr, mode_param));
         }
     }
     diagnostic
@@ -135,7 +138,7 @@ fn create_remove_param_fix(locator: &Locator, expr: &Expr, mode_param: &Expr) ->
     let mut fix_end: Option<TextSize> = None;
     let mut is_first_arg: bool = false;
     let mut delete_first_arg: bool = false;
-    for (tok, range) in lexer::lex_located(content, Mode::Module, expr.start()).flatten() {
+    for (tok, range) in lexer::lex_starts_at(content, Mode::Module, expr.start()).flatten() {
         if range.start() == mode_param.start() {
             if is_first_arg {
                 delete_first_arg = true;
@@ -168,23 +171,23 @@ fn create_remove_param_fix(locator: &Locator, expr: &Expr, mode_param: &Expr) ->
 }
 
 /// UP015
-pub fn redundant_open_modes(checker: &mut Checker, expr: &Expr) {
+pub(crate) fn redundant_open_modes(checker: &mut Checker, expr: &Expr) {
     // If `open` has been rebound, skip this check entirely.
-    if !checker.ctx.is_builtin(OPEN_FUNC_NAME) {
+    if !checker.semantic_model().is_builtin(OPEN_FUNC_NAME) {
         return;
     }
     let (mode_param, keywords): (Option<&Expr>, Vec<Keyword>) = match_open(expr);
     if mode_param.is_none() && !keywords.is_empty() {
         if let Some(keyword) = find_keyword(&keywords, MODE_KEYWORD_ARGUMENT) {
-            if let ExprKind::Constant {
+            if let Expr::Constant(ast::ExprConstant {
                 value: Constant::Str(mode_param_value),
                 ..
-            } = &keyword.node.value.node
+            }) = &keyword.value
             {
                 if let Ok(mode) = OpenMode::from_str(mode_param_value.as_str()) {
                     checker.diagnostics.push(create_check(
                         expr,
-                        &keyword.node.value,
+                        &keyword.value,
                         mode.replacement_value(),
                         checker.locator,
                         checker.patch(Rule::RedundantOpenModes),
@@ -193,10 +196,10 @@ pub fn redundant_open_modes(checker: &mut Checker, expr: &Expr) {
             }
         }
     } else if let Some(mode_param) = mode_param {
-        if let ExprKind::Constant {
+        if let Expr::Constant(ast::ExprConstant {
             value: Constant::Str(mode_param_value),
             ..
-        } = &mode_param.node
+        }) = &mode_param
         {
             if let Ok(mode) = OpenMode::from_str(mode_param_value.as_str()) {
                 checker.diagnostics.push(create_check(
diff --git a/crates/ruff/src/rules/pyupgrade/rules/replace_stdout_stderr.rs b/crates/ruff/src/rules/pyupgrade/rules/replace_stdout_stderr.rs
index d39394b88fae3..b1aee43ed4c76 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/replace_stdout_stderr.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/replace_stdout_stderr.rs
@@ -1,12 +1,12 @@
 use anyhow::Result;
-use rustpython_parser::ast::{Expr, Keyword};
+use rustpython_parser::ast::{Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::find_keyword;
 use ruff_python_ast::source_code::Locator;
 
-use crate::autofix::actions::remove_argument;
+use crate::autofix::edits::remove_argument;
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 
@@ -38,14 +38,22 @@ fn generate_fix(
     } else {
         (stderr, stdout)
     };
-    Ok(Fix::new(vec![
+    #[allow(deprecated)]
+    Ok(Fix::unspecified_edits(
         Edit::range_replacement("capture_output=True".to_string(), first.range()),
-        remove_argument(locator, func.start(), second.range(), args, keywords, false)?,
-    ]))
+        [remove_argument(
+            locator,
+            func.start(),
+            second.range(),
+            args,
+            keywords,
+            false,
+        )?],
+    ))
 }
 
 /// UP022
-pub fn replace_stdout_stderr(
+pub(crate) fn replace_stdout_stderr(
     checker: &mut Checker,
     expr: &Expr,
     func: &Expr,
@@ -53,7 +61,7 @@ pub fn replace_stdout_stderr(
     keywords: &[Keyword],
 ) {
     if checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(func)
         .map_or(false, |call_path| {
             call_path.as_slice() == ["subprocess", "run"]
@@ -69,14 +77,14 @@ pub fn replace_stdout_stderr(
 
         // Verify that they're both set to `subprocess.PIPE`.
         if !checker
-            .ctx
-            .resolve_call_path(&stdout.node.value)
+            .semantic_model()
+            .resolve_call_path(&stdout.value)
             .map_or(false, |call_path| {
                 call_path.as_slice() == ["subprocess", "PIPE"]
             })
             || !checker
-                .ctx
-                .resolve_call_path(&stderr.node.value)
+                .semantic_model()
+                .resolve_call_path(&stderr.value)
                 .map_or(false, |call_path| {
                     call_path.as_slice() == ["subprocess", "PIPE"]
                 })
diff --git a/crates/ruff/src/rules/pyupgrade/rules/replace_universal_newlines.rs b/crates/ruff/src/rules/pyupgrade/rules/replace_universal_newlines.rs
index 7fb590ae015dd..23c0e49de0181 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/replace_universal_newlines.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/replace_universal_newlines.rs
@@ -1,7 +1,7 @@
 use ruff_text_size::{TextLen, TextRange};
-use rustpython_parser::ast::{Expr, Keyword};
+use rustpython_parser::ast::{Expr, Keyword, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::find_keyword;
 
@@ -23,9 +23,9 @@ impl AlwaysAutofixableViolation for ReplaceUniversalNewlines {
 }
 
 /// UP021
-pub fn replace_universal_newlines(checker: &mut Checker, func: &Expr, kwargs: &[Keyword]) {
+pub(crate) fn replace_universal_newlines(checker: &mut Checker, func: &Expr, kwargs: &[Keyword]) {
     if checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(func)
         .map_or(false, |call_path| {
             call_path.as_slice() == ["subprocess", "run"]
@@ -35,7 +35,11 @@ pub fn replace_universal_newlines(checker: &mut Checker, func: &Expr, kwargs: &[
         let range = TextRange::at(kwarg.start(), "universal_newlines".text_len());
         let mut diagnostic = Diagnostic::new(ReplaceUniversalNewlines, range);
         if checker.patch(diagnostic.kind.rule()) {
-            diagnostic.set_fix(Edit::range_replacement("text".to_string(), range));
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                "text".to_string(),
+                range,
+            )));
         }
         checker.diagnostics.push(diagnostic);
     }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/super_call_with_parameters.rs b/crates/ruff/src/rules/pyupgrade/rules/super_call_with_parameters.rs
index b221ced0029a1..63b4db3443e46 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/super_call_with_parameters.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/super_call_with_parameters.rs
@@ -1,8 +1,7 @@
-use rustpython_parser::ast::{ArgData, Expr, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Arg, Expr, Ranged, Stmt};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_semantic::scope::ScopeKind;
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
@@ -24,7 +23,7 @@ impl AlwaysAutofixableViolation for SuperCallWithParameters {
 
 /// Returns `true` if a call is an argumented `super` invocation.
 fn is_super_call_with_arguments(func: &Expr, args: &[Expr]) -> bool {
-    if let ExprKind::Name { id, .. } = &func.node {
+    if let Expr::Name(ast::ExprName { id, .. }) = func {
         id == "super" && !args.is_empty()
     } else {
         false
@@ -32,21 +31,25 @@ fn is_super_call_with_arguments(func: &Expr, args: &[Expr]) -> bool {
 }
 
 /// UP008
-pub fn super_call_with_parameters(checker: &mut Checker, expr: &Expr, func: &Expr, args: &[Expr]) {
+pub(crate) fn super_call_with_parameters(
+    checker: &mut Checker,
+    expr: &Expr,
+    func: &Expr,
+    args: &[Expr],
+) {
     // Only bother going through the super check at all if we're in a `super` call.
     // (We check this in `super_args` too, so this is just an optimization.)
     if !is_super_call_with_arguments(func, args) {
         return;
     }
-    let scope = checker.ctx.scope();
-    let parents: Vec<&Stmt> = checker.ctx.parents.iter().map(Into::into).collect();
+    let scope = checker.semantic_model().scope();
 
     // Check: are we in a Function scope?
-    if !matches!(scope.kind, ScopeKind::Function { .. }) {
+    if !scope.kind.is_any_function() {
         return;
     }
 
-    let mut parents = parents.iter().rev();
+    let mut parents = checker.semantic_model().parents();
 
     // For a `super` invocation to be unnecessary, the first argument needs to match
     // the enclosing class, and the second argument needs to match the first
@@ -56,38 +59,34 @@ pub fn super_call_with_parameters(checker: &mut Checker, expr: &Expr, func: &Exp
     };
 
     // Find the enclosing function definition (if any).
-    let Some(StmtKind::FunctionDef {
+    let Some(Stmt::FunctionDef(ast::StmtFunctionDef {
         args: parent_args, ..
-    }) = parents
-        .find(|stmt| matches!(stmt.node, StmtKind::FunctionDef { .. }))
-        .map(|stmt| &stmt.node) else {
+    })) = parents.find(|stmt| stmt.is_function_def_stmt()) else {
         return;
     };
 
     // Extract the name of the first argument to the enclosing function.
-    let Some(ArgData {
+    let Some(Arg {
         arg: parent_arg, ..
-    }) = parent_args.args.first().map(|expr| &expr.node) else {
+    }) = parent_args.args.first() else {
         return;
     };
 
     // Find the enclosing class definition (if any).
-    let Some(StmtKind::ClassDef {
+    let Some(Stmt::ClassDef(ast::StmtClassDef {
         name: parent_name, ..
-    }) = parents
-        .find(|stmt| matches!(stmt.node, StmtKind::ClassDef { .. }))
-        .map(|stmt| &stmt.node) else {
+    })) = parents.find(|stmt| stmt.is_class_def_stmt()) else {
         return;
     };
 
     let (
-        ExprKind::Name {
+        Expr::Name(ast::ExprName {
             id: first_arg_id, ..
-        },
-        ExprKind::Name {
+        }),
+        Expr::Name(ast::ExprName {
             id: second_arg_id, ..
-        },
-    ) = (&first_arg.node, &second_arg.node) else {
+        }),
+    ) = (first_arg, second_arg) else {
         return;
     };
 
@@ -95,10 +94,12 @@ pub fn super_call_with_parameters(checker: &mut Checker, expr: &Expr, func: &Exp
         return;
     }
 
+    drop(parents);
+
     let mut diagnostic = Diagnostic::new(SuperCallWithParameters, expr.range());
     if checker.patch(diagnostic.kind.rule()) {
-        if let Some(fix) = fixes::remove_super_arguments(checker.locator, checker.stylist, expr) {
-            diagnostic.set_fix(fix);
+        if let Some(edit) = fixes::remove_super_arguments(checker.locator, checker.stylist, expr) {
+            diagnostic.set_fix(Fix::suggested(edit));
         }
     }
     checker.diagnostics.push(diagnostic);
diff --git a/crates/ruff/src/rules/pyupgrade/rules/type_of_primitive.rs b/crates/ruff/src/rules/pyupgrade/rules/type_of_primitive.rs
index b0cf937777177..7f2c9a59641bd 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/type_of_primitive.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/type_of_primitive.rs
@@ -1,6 +1,6 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
@@ -10,7 +10,7 @@ use super::super::types::Primitive;
 
 #[violation]
 pub struct TypeOfPrimitive {
-    pub primitive: Primitive,
+    primitive: Primitive,
 }
 
 impl AlwaysAutofixableViolation for TypeOfPrimitive {
@@ -27,18 +27,18 @@ impl AlwaysAutofixableViolation for TypeOfPrimitive {
 }
 
 /// UP003
-pub fn type_of_primitive(checker: &mut Checker, expr: &Expr, func: &Expr, args: &[Expr]) {
+pub(crate) fn type_of_primitive(checker: &mut Checker, expr: &Expr, func: &Expr, args: &[Expr]) {
     if args.len() != 1 {
         return;
     }
     if !checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(func)
         .map_or(false, |call_path| call_path.as_slice() == ["", "type"])
     {
         return;
     }
-    let ExprKind::Constant { value, .. } = &args[0].node else {
+    let Expr::Constant(ast::ExprConstant { value, .. } )= &args[0] else {
         return;
     };
     let Some(primitive) = Primitive::from_constant(value) else {
@@ -46,7 +46,11 @@ pub fn type_of_primitive(checker: &mut Checker, expr: &Expr, func: &Expr, args:
     };
     let mut diagnostic = Diagnostic::new(TypeOfPrimitive { primitive }, expr.range());
     if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.set_fix(Edit::range_replacement(primitive.builtin(), expr.range()));
+        #[allow(deprecated)]
+        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+            primitive.builtin(),
+            expr.range(),
+        )));
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/typing_text_str_alias.rs b/crates/ruff/src/rules/pyupgrade/rules/typing_text_str_alias.rs
index b9b6b9a0d8377..5b1a867cca35e 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/typing_text_str_alias.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/typing_text_str_alias.rs
@@ -1,6 +1,6 @@
-use rustpython_parser::ast::Expr;
+use rustpython_parser::ast::{Expr, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
@@ -21,9 +21,9 @@ impl AlwaysAutofixableViolation for TypingTextStrAlias {
 }
 
 /// UP019
-pub fn typing_text_str_alias(checker: &mut Checker, expr: &Expr) {
+pub(crate) fn typing_text_str_alias(checker: &mut Checker, expr: &Expr) {
     if checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(expr)
         .map_or(false, |call_path| {
             call_path.as_slice() == ["typing", "Text"]
@@ -31,7 +31,11 @@ pub fn typing_text_str_alias(checker: &mut Checker, expr: &Expr) {
     {
         let mut diagnostic = Diagnostic::new(TypingTextStrAlias, expr.range());
         if checker.patch(diagnostic.kind.rule()) {
-            diagnostic.set_fix(Edit::range_replacement("str".to_string(), expr.range()));
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                "str".to_string(),
+                expr.range(),
+            )));
         }
         checker.diagnostics.push(diagnostic);
     }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/unicode_kind_prefix.rs b/crates/ruff/src/rules/pyupgrade/rules/unicode_kind_prefix.rs
index d07cb4792c6b4..45dbf962d5302 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/unicode_kind_prefix.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/unicode_kind_prefix.rs
@@ -1,7 +1,7 @@
 use ruff_text_size::{TextRange, TextSize};
-use rustpython_parser::ast::Expr;
+use rustpython_parser::ast::{Expr, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
@@ -22,15 +22,16 @@ impl AlwaysAutofixableViolation for UnicodeKindPrefix {
 }
 
 /// UP025
-pub fn unicode_kind_prefix(checker: &mut Checker, expr: &Expr, kind: Option<&str>) {
+pub(crate) fn unicode_kind_prefix(checker: &mut Checker, expr: &Expr, kind: Option<&str>) {
     if let Some(const_kind) = kind {
         if const_kind.to_lowercase() == "u" {
             let mut diagnostic = Diagnostic::new(UnicodeKindPrefix, expr.range());
             if checker.patch(diagnostic.kind.rule()) {
-                diagnostic.set_fix(Edit::range_deletion(TextRange::at(
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_deletion(TextRange::at(
                     expr.start(),
                     TextSize::from(1),
-                )));
+                ))));
             }
             checker.diagnostics.push(diagnostic);
         }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/unnecessary_builtin_import.rs b/crates/ruff/src/rules/pyupgrade/rules/unnecessary_builtin_import.rs
index 6867c381a0e8e..b604684c1c2a5 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/unnecessary_builtin_import.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/unnecessary_builtin_import.rs
@@ -1,8 +1,7 @@
 use itertools::Itertools;
-use log::error;
-use rustpython_parser::ast::{Alias, AliasData, Located, Stmt};
+use rustpython_parser::ast::{Alias, Ranged, Stmt};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Fix};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::autofix;
@@ -64,11 +63,11 @@ const SIX: &[&str] = &["callable", "next"];
 const SIX_MOVES: &[&str] = &["filter", "input", "map", "range", "zip"];
 
 /// UP029
-pub fn unnecessary_builtin_import(
+pub(crate) fn unnecessary_builtin_import(
     checker: &mut Checker,
     stmt: &Stmt,
     module: &str,
-    names: &[Located<AliasData>],
+    names: &[Alias],
 ) {
     let deprecated_names = match module {
         "builtins" => BUILTINS,
@@ -79,12 +78,13 @@ pub fn unnecessary_builtin_import(
         _ => return,
     };
 
+    // Do this with a filter?
     let mut unused_imports: Vec<&Alias> = vec![];
     for alias in names {
-        if alias.node.asname.is_some() {
+        if alias.asname.is_some() {
             continue;
         }
-        if deprecated_names.contains(&alias.node.name.as_str()) {
+        if deprecated_names.contains(&alias.name.as_str()) {
             unused_imports.push(alias);
         }
     }
@@ -92,42 +92,35 @@ pub fn unnecessary_builtin_import(
     if unused_imports.is_empty() {
         return;
     }
+
     let mut diagnostic = Diagnostic::new(
         UnnecessaryBuiltinImport {
             names: unused_imports
                 .iter()
-                .map(|alias| alias.node.name.to_string())
+                .map(|alias| alias.name.to_string())
                 .sorted()
                 .collect(),
         },
         stmt.range(),
     );
-
     if checker.patch(diagnostic.kind.rule()) {
-        let deleted: Vec<&Stmt> = checker.deletions.iter().map(Into::into).collect();
-        let defined_by = checker.ctx.current_stmt();
-        let defined_in = checker.ctx.current_stmt_parent();
-        let unused_imports: Vec<String> = unused_imports
-            .iter()
-            .map(|alias| format!("{module}.{}", alias.node.name))
-            .collect();
-        match autofix::actions::remove_unused_imports(
-            unused_imports.iter().map(String::as_str),
-            defined_by.into(),
-            defined_in.map(Into::into),
-            &deleted,
-            checker.locator,
-            checker.indexer,
-            checker.stylist,
-        ) {
-            Ok(fix) => {
-                if fix.is_deletion() || fix.content() == Some("pass") {
-                    checker.deletions.insert(*defined_by);
-                }
-                diagnostic.set_fix(fix);
-            }
-            Err(e) => error!("Failed to remove builtin import: {e}"),
-        }
+        diagnostic.try_set_fix(|| {
+            let stmt = checker.semantic_model().stmt();
+            let parent = checker.semantic_model().stmt_parent();
+            let unused_imports: Vec<String> = unused_imports
+                .iter()
+                .map(|alias| format!("{module}.{}", alias.name))
+                .collect();
+            let edit = autofix::edits::remove_unused_imports(
+                unused_imports.iter().map(String::as_str),
+                stmt,
+                parent,
+                checker.locator,
+                checker.indexer,
+                checker.stylist,
+            )?;
+            Ok(Fix::suggested(edit).isolate(checker.isolation(parent)))
+        });
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/unnecessary_coding_comment.rs b/crates/ruff/src/rules/pyupgrade/rules/unnecessary_coding_comment.rs
index b73fc9b6269ab..2da53041e4c23 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/unnecessary_coding_comment.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/unnecessary_coding_comment.rs
@@ -1,9 +1,9 @@
 use once_cell::sync::Lazy;
 use regex::Regex;
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::newlines::Line;
+use ruff_newlines::Line;
 
 // TODO: document referencing [PEP 3120]: https://peps.python.org/pep-3120/
 #[violation]
@@ -30,7 +30,11 @@ pub(crate) fn unnecessary_coding_comment(line: &Line, autofix: bool) -> Option<D
     if CODING_COMMENT_REGEX.is_match(line.as_str()) {
         let mut diagnostic = Diagnostic::new(UTF8EncodingDeclaration, line.full_range());
         if autofix {
-            diagnostic.set_fix(Edit::deletion(line.start(), line.full_end()));
+            #[allow(deprecated)]
+            diagnostic.set_fix(Fix::unspecified(Edit::deletion(
+                line.start(),
+                line.full_end(),
+            )));
         }
         Some(diagnostic)
     } else {
diff --git a/crates/ruff/src/rules/pyupgrade/rules/unnecessary_encode_utf8.rs b/crates/ruff/src/rules/pyupgrade/rules/unnecessary_encode_utf8.rs
index 6854f175b7c76..3e286b2d95c35 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/unnecessary_encode_utf8.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/unnecessary_encode_utf8.rs
@@ -1,24 +1,24 @@
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Constant, Expr, Keyword, Ranged};
 use rustpython_parser::{lexer, Mode, Tok};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::Locator;
 
-use crate::autofix::actions::remove_argument;
+use crate::autofix::edits::remove_argument;
 use crate::checkers::ast::Checker;
 use crate::registry::Rule;
 
 #[derive(Debug, PartialEq, Eq)]
-pub enum Reason {
+pub(crate) enum Reason {
     BytesLiteral,
     DefaultArgument,
 }
 
 #[violation]
 pub struct UnnecessaryEncodeUTF8 {
-    pub reason: Reason,
+    reason: Reason,
 }
 
 impl AlwaysAutofixableViolation for UnnecessaryEncodeUTF8 {
@@ -38,11 +38,11 @@ impl AlwaysAutofixableViolation for UnnecessaryEncodeUTF8 {
 const UTF8_LITERALS: &[&str] = &["utf-8", "utf8", "utf_8", "u8", "utf", "cp65001"];
 
 fn match_encoded_variable(func: &Expr) -> Option<&Expr> {
-    let ExprKind::Attribute {
+    let Expr::Attribute(ast::ExprAttribute {
         value: variable,
         attr,
         ..
-    } = &func.node else {
+    }) = func else {
         return None;
     };
     if attr != "encode" {
@@ -52,10 +52,10 @@ fn match_encoded_variable(func: &Expr) -> Option<&Expr> {
 }
 
 fn is_utf8_encoding_arg(arg: &Expr) -> bool {
-    if let ExprKind::Constant {
+    if let Expr::Constant(ast::ExprConstant {
         value: Constant::Str(value),
         ..
-    } = &arg.node
+    }) = &arg
     {
         UTF8_LITERALS.contains(&value.to_lowercase().as_str())
     } else {
@@ -89,13 +89,8 @@ fn match_encoding_arg<'a>(args: &'a [Expr], kwargs: &'a [Keyword]) -> Option<Enc
         // Ex `"".encode(kwarg=kwarg)`
         (0, 1) => {
             let kwarg = &kwargs[0];
-            if kwarg
-                .node
-                .arg
-                .as_ref()
-                .map_or(false, |arg| arg == "encoding")
-            {
-                if is_utf8_encoding_arg(&kwarg.node.value) {
+            if kwarg.arg.as_ref().map_or(false, |arg| arg == "encoding") {
+                if is_utf8_encoding_arg(&kwarg.value) {
                     return Some(EncodingArg::Keyword(kwarg));
                 }
             }
@@ -106,34 +101,35 @@ fn match_encoding_arg<'a>(args: &'a [Expr], kwargs: &'a [Keyword]) -> Option<Enc
     None
 }
 
-/// Return an [`Edit`] replacing the call to encode with a byte string.
-fn replace_with_bytes_literal(locator: &Locator, expr: &Expr, constant: &Expr) -> Edit {
+/// Return a [`Fix`] replacing the call to encode with a byte string.
+fn replace_with_bytes_literal(locator: &Locator, expr: &Expr) -> Fix {
     // Build up a replacement string by prefixing all string tokens with `b`.
-    let contents = locator.slice(constant.range());
+    let contents = locator.slice(expr.range());
     let mut replacement = String::with_capacity(contents.len() + 1);
-    let mut prev = None;
-    for (tok, range) in lexer::lex_located(contents, Mode::Module, constant.start()).flatten() {
-        if matches!(tok, Tok::String { .. }) {
-            if let Some(prev) = prev {
+    let mut prev = expr.start();
+    for (tok, range) in lexer::lex_starts_at(contents, Mode::Module, expr.start()).flatten() {
+        match tok {
+            Tok::Dot => break,
+            Tok::String { .. } => {
                 replacement.push_str(locator.slice(TextRange::new(prev, range.start())));
+                let string = locator.slice(range);
+                replacement.push_str(&format!(
+                    "b{}",
+                    &string.trim_start_matches('u').trim_start_matches('U')
+                ));
             }
-            let string = locator.slice(range);
-            replacement.push_str(&format!(
-                "b{}",
-                &string.trim_start_matches('u').trim_start_matches('U')
-            ));
-        } else {
-            if let Some(prev) = prev {
+            _ => {
                 replacement.push_str(locator.slice(TextRange::new(prev, range.end())));
             }
         }
-        prev = Some(range.end());
+        prev = range.end();
     }
-    Edit::range_replacement(replacement, expr.range())
+    #[allow(deprecated)]
+    Fix::unspecified(Edit::range_replacement(replacement, expr.range()))
 }
 
 /// UP012
-pub fn unnecessary_encode_utf8(
+pub(crate) fn unnecessary_encode_utf8(
     checker: &mut Checker,
     expr: &Expr,
     func: &Expr,
@@ -143,11 +139,11 @@ pub fn unnecessary_encode_utf8(
     let Some(variable) = match_encoded_variable(func) else {
         return;
     };
-    match &variable.node {
-        ExprKind::Constant {
+    match variable {
+        Expr::Constant(ast::ExprConstant {
             value: Constant::Str(literal),
             ..
-        } => {
+        }) => {
             // Ex) `"str".encode()`, `"str".encode("utf-8")`
             if let Some(encoding_arg) = match_encoding_arg(args, kwargs) {
                 if literal.is_ascii() {
@@ -159,11 +155,7 @@ pub fn unnecessary_encode_utf8(
                         expr.range(),
                     );
                     if checker.patch(Rule::UnnecessaryEncodeUTF8) {
-                        diagnostic.set_fix(replace_with_bytes_literal(
-                            checker.locator,
-                            expr,
-                            variable,
-                        ));
+                        diagnostic.set_fix(replace_with_bytes_literal(checker.locator, expr));
                     }
                     checker.diagnostics.push(diagnostic);
                 } else if let EncodingArg::Keyword(kwarg) = encoding_arg {
@@ -176,7 +168,8 @@ pub fn unnecessary_encode_utf8(
                         expr.range(),
                     );
                     if checker.patch(Rule::UnnecessaryEncodeUTF8) {
-                        diagnostic.try_set_fix(|| {
+                        #[allow(deprecated)]
+                        diagnostic.try_set_fix_from_edit(|| {
                             remove_argument(
                                 checker.locator,
                                 func.start(),
@@ -197,7 +190,8 @@ pub fn unnecessary_encode_utf8(
                         expr.range(),
                     );
                     if checker.patch(Rule::UnnecessaryEncodeUTF8) {
-                        diagnostic.try_set_fix(|| {
+                        #[allow(deprecated)]
+                        diagnostic.try_set_fix_from_edit(|| {
                             remove_argument(
                                 checker.locator,
                                 func.start(),
@@ -213,7 +207,7 @@ pub fn unnecessary_encode_utf8(
             }
         }
         // Ex) `f"foo{bar}".encode("utf-8")`
-        ExprKind::JoinedStr { .. } => {
+        Expr::JoinedStr(_) => {
             if let Some(encoding_arg) = match_encoding_arg(args, kwargs) {
                 if let EncodingArg::Keyword(kwarg) = encoding_arg {
                     // Ex) Convert `f"unicode text©".encode(encoding="utf-8")` to
@@ -225,7 +219,8 @@ pub fn unnecessary_encode_utf8(
                         expr.range(),
                     );
                     if checker.patch(Rule::UnnecessaryEncodeUTF8) {
-                        diagnostic.try_set_fix(|| {
+                        #[allow(deprecated)]
+                        diagnostic.try_set_fix_from_edit(|| {
                             remove_argument(
                                 checker.locator,
                                 func.start(),
@@ -246,7 +241,8 @@ pub fn unnecessary_encode_utf8(
                         expr.range(),
                     );
                     if checker.patch(Rule::UnnecessaryEncodeUTF8) {
-                        diagnostic.try_set_fix(|| {
+                        #[allow(deprecated)]
+                        diagnostic.try_set_fix_from_edit(|| {
                             remove_argument(
                                 checker.locator,
                                 func.start(),
diff --git a/crates/ruff/src/rules/pyupgrade/rules/unnecessary_future_import.rs b/crates/ruff/src/rules/pyupgrade/rules/unnecessary_future_import.rs
index df31d7695a886..34cd3e5ca5629 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/unnecessary_future_import.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/unnecessary_future_import.rs
@@ -1,8 +1,7 @@
 use itertools::Itertools;
-use log::error;
-use rustpython_parser::ast::{Alias, AliasData, Located, Stmt};
+use rustpython_parser::ast::{Alias, Ranged, Stmt};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Fix};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::autofix;
@@ -56,14 +55,14 @@ const PY37_PLUS_REMOVE_FUTURES: &[&str] = &[
 ];
 
 /// UP010
-pub fn unnecessary_future_import(checker: &mut Checker, stmt: &Stmt, names: &[Located<AliasData>]) {
+pub(crate) fn unnecessary_future_import(checker: &mut Checker, stmt: &Stmt, names: &[Alias]) {
     let mut unused_imports: Vec<&Alias> = vec![];
     for alias in names {
-        if alias.node.asname.is_some() {
+        if alias.asname.is_some() {
             continue;
         }
-        if PY33_PLUS_REMOVE_FUTURES.contains(&alias.node.name.as_str())
-            || PY37_PLUS_REMOVE_FUTURES.contains(&alias.node.name.as_str())
+        if PY33_PLUS_REMOVE_FUTURES.contains(&alias.name.as_str())
+            || PY37_PLUS_REMOVE_FUTURES.contains(&alias.name.as_str())
         {
             unused_imports.push(alias);
         }
@@ -76,7 +75,7 @@ pub fn unnecessary_future_import(checker: &mut Checker, stmt: &Stmt, names: &[Lo
         UnnecessaryFutureImport {
             names: unused_imports
                 .iter()
-                .map(|alias| alias.node.name.to_string())
+                .map(|alias| alias.name.to_string())
                 .sorted()
                 .collect(),
         },
@@ -84,30 +83,23 @@ pub fn unnecessary_future_import(checker: &mut Checker, stmt: &Stmt, names: &[Lo
     );
 
     if checker.patch(diagnostic.kind.rule()) {
-        let deleted: Vec<&Stmt> = checker.deletions.iter().map(Into::into).collect();
-        let defined_by = checker.ctx.current_stmt();
-        let defined_in = checker.ctx.current_stmt_parent();
-        let unused_imports: Vec<String> = unused_imports
-            .iter()
-            .map(|alias| format!("__future__.{}", alias.node.name))
-            .collect();
-        match autofix::actions::remove_unused_imports(
-            unused_imports.iter().map(String::as_str),
-            defined_by.into(),
-            defined_in.map(Into::into),
-            &deleted,
-            checker.locator,
-            checker.indexer,
-            checker.stylist,
-        ) {
-            Ok(fix) => {
-                if fix.is_deletion() || fix.content() == Some("pass") {
-                    checker.deletions.insert(*defined_by);
-                }
-                diagnostic.set_fix(fix);
-            }
-            Err(e) => error!("Failed to remove `__future__` import: {e}"),
-        }
+        diagnostic.try_set_fix(|| {
+            let unused_imports: Vec<String> = unused_imports
+                .iter()
+                .map(|alias| format!("__future__.{}", alias.name))
+                .collect();
+            let stmt = checker.semantic_model().stmt();
+            let parent = checker.semantic_model().stmt_parent();
+            let edit = autofix::edits::remove_unused_imports(
+                unused_imports.iter().map(String::as_str),
+                stmt,
+                parent,
+                checker.locator,
+                checker.indexer,
+                checker.stylist,
+            )?;
+            Ok(Fix::suggested(edit).isolate(checker.isolation(parent)))
+        });
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/unpacked_list_comprehension.rs b/crates/ruff/src/rules/pyupgrade/rules/unpacked_list_comprehension.rs
index da53487ff0273..3ff0a14ffb9d7 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/unpacked_list_comprehension.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/unpacked_list_comprehension.rs
@@ -1,6 +1,6 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 
 use crate::checkers::ast::Checker;
@@ -20,61 +20,88 @@ impl AlwaysAutofixableViolation for UnpackedListComprehension {
     }
 }
 
-/// Returns `true` if `expr` contains an `ExprKind::Await`.
+/// Returns `true` if `expr` contains an `Expr::Await`.
 fn contains_await(expr: &Expr) -> bool {
-    match &expr.node {
-        ExprKind::Await { .. } => true,
-        ExprKind::BoolOp { values, .. } => values.iter().any(contains_await),
-        ExprKind::NamedExpr { target, value } => contains_await(target) || contains_await(value),
-        ExprKind::BinOp { left, right, .. } => contains_await(left) || contains_await(right),
-        ExprKind::UnaryOp { operand, .. } => contains_await(operand),
-        ExprKind::Lambda { body, .. } => contains_await(body),
-        ExprKind::IfExp { test, body, orelse } => {
-            contains_await(test) || contains_await(body) || contains_await(orelse)
+    match expr {
+        Expr::Await(_) => true,
+        Expr::BoolOp(ast::ExprBoolOp { values, .. }) => values.iter().any(contains_await),
+        Expr::NamedExpr(ast::ExprNamedExpr {
+            target,
+            value,
+            range: _,
+        }) => contains_await(target) || contains_await(value),
+        Expr::BinOp(ast::ExprBinOp { left, right, .. }) => {
+            contains_await(left) || contains_await(right)
         }
-        ExprKind::Dict { keys, values } => keys
+        Expr::UnaryOp(ast::ExprUnaryOp { operand, .. }) => contains_await(operand),
+        Expr::Lambda(ast::ExprLambda { body, .. }) => contains_await(body),
+        Expr::IfExp(ast::ExprIfExp {
+            test,
+            body,
+            orelse,
+            range: _,
+        }) => contains_await(test) || contains_await(body) || contains_await(orelse),
+        Expr::Dict(ast::ExprDict {
+            keys,
+            values,
+            range: _,
+        }) => keys
             .iter()
             .flatten()
             .chain(values.iter())
             .any(contains_await),
-        ExprKind::Set { elts } => elts.iter().any(contains_await),
-        ExprKind::ListComp { elt, .. } => contains_await(elt),
-        ExprKind::SetComp { elt, .. } => contains_await(elt),
-        ExprKind::DictComp { key, value, .. } => contains_await(key) || contains_await(value),
-        ExprKind::GeneratorExp { elt, .. } => contains_await(elt),
-        ExprKind::Yield { value } => value.as_ref().map_or(false, |value| contains_await(value)),
-        ExprKind::YieldFrom { value } => contains_await(value),
-        ExprKind::Compare {
+        Expr::Set(ast::ExprSet { elts, range: _ }) => elts.iter().any(contains_await),
+        Expr::ListComp(ast::ExprListComp { elt, .. }) => contains_await(elt),
+        Expr::SetComp(ast::ExprSetComp { elt, .. }) => contains_await(elt),
+        Expr::DictComp(ast::ExprDictComp { key, value, .. }) => {
+            contains_await(key) || contains_await(value)
+        }
+        Expr::GeneratorExp(ast::ExprGeneratorExp { elt, .. }) => contains_await(elt),
+        Expr::Yield(ast::ExprYield { value, range: _ }) => {
+            value.as_ref().map_or(false, |value| contains_await(value))
+        }
+        Expr::YieldFrom(ast::ExprYieldFrom { value, range: _ }) => contains_await(value),
+        Expr::Compare(ast::ExprCompare {
             left, comparators, ..
-        } => contains_await(left) || comparators.iter().any(contains_await),
-        ExprKind::Call {
+        }) => contains_await(left) || comparators.iter().any(contains_await),
+        Expr::Call(ast::ExprCall {
             func,
             args,
             keywords,
-        } => {
+            range: _,
+        }) => {
             contains_await(func)
                 || args.iter().any(contains_await)
                 || keywords
                     .iter()
-                    .any(|keyword| contains_await(&keyword.node.value))
+                    .any(|keyword| contains_await(&keyword.value))
         }
-        ExprKind::FormattedValue {
+        Expr::FormattedValue(ast::ExprFormattedValue {
             value, format_spec, ..
-        } => {
+        }) => {
             contains_await(value)
                 || format_spec
                     .as_ref()
                     .map_or(false, |value| contains_await(value))
         }
-        ExprKind::JoinedStr { values } => values.iter().any(contains_await),
-        ExprKind::Constant { .. } => false,
-        ExprKind::Attribute { value, .. } => contains_await(value),
-        ExprKind::Subscript { value, slice, .. } => contains_await(value) || contains_await(slice),
-        ExprKind::Starred { value, .. } => contains_await(value),
-        ExprKind::Name { .. } => false,
-        ExprKind::List { elts, .. } => elts.iter().any(contains_await),
-        ExprKind::Tuple { elts, .. } => elts.iter().any(contains_await),
-        ExprKind::Slice { lower, upper, step } => {
+        Expr::JoinedStr(ast::ExprJoinedStr { values, range: _ }) => {
+            values.iter().any(contains_await)
+        }
+        Expr::Constant(_) => false,
+        Expr::Attribute(ast::ExprAttribute { value, .. }) => contains_await(value),
+        Expr::Subscript(ast::ExprSubscript { value, slice, .. }) => {
+            contains_await(value) || contains_await(slice)
+        }
+        Expr::Starred(ast::ExprStarred { value, .. }) => contains_await(value),
+        Expr::Name(_) => false,
+        Expr::List(ast::ExprList { elts, .. }) => elts.iter().any(contains_await),
+        Expr::Tuple(ast::ExprTuple { elts, .. }) => elts.iter().any(contains_await),
+        Expr::Slice(ast::ExprSlice {
+            lower,
+            upper,
+            step,
+            range: _,
+        }) => {
             lower.as_ref().map_or(false, |value| contains_await(value))
                 || upper.as_ref().map_or(false, |value| contains_await(value))
                 || step.as_ref().map_or(false, |value| contains_await(value))
@@ -83,13 +110,18 @@ fn contains_await(expr: &Expr) -> bool {
 }
 
 /// UP027
-pub fn unpacked_list_comprehension(checker: &mut Checker, targets: &[Expr], value: &Expr) {
+pub(crate) fn unpacked_list_comprehension(checker: &mut Checker, targets: &[Expr], value: &Expr) {
     let Some(target) = targets.get(0) else {
         return;
     };
-    if let ExprKind::Tuple { .. } = target.node {
-        if let ExprKind::ListComp { elt, generators } = &value.node {
-            if generators.iter().any(|generator| generator.is_async > 0) || contains_await(elt) {
+    if let Expr::Tuple(_) = target {
+        if let Expr::ListComp(ast::ExprListComp {
+            elt,
+            generators,
+            range: _,
+        }) = value
+        {
+            if generators.iter().any(|generator| generator.is_async) || contains_await(elt) {
                 return;
             }
 
@@ -101,7 +133,11 @@ pub fn unpacked_list_comprehension(checker: &mut Checker, targets: &[Expr], valu
                 content.push('(');
                 content.push_str(&existing[1..existing.len() - 1]);
                 content.push(')');
-                diagnostic.set_fix(Edit::range_replacement(content, value.range()));
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                    content,
+                    value.range(),
+                )));
             }
             checker.diagnostics.push(diagnostic);
         }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/use_pep585_annotation.rs b/crates/ruff/src/rules/pyupgrade/rules/use_pep585_annotation.rs
index 2bea49df43e0e..20e09a7528bdf 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/use_pep585_annotation.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/use_pep585_annotation.rs
@@ -1,16 +1,18 @@
-use rustpython_parser::ast::Expr;
+use rustpython_parser::ast::{Expr, Ranged};
 
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Violation};
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::typing::AnnotationKind;
+use ruff_python_ast::call_path::compose_call_path;
+use ruff_python_semantic::analyze::typing::ModuleMember;
 
 use crate::checkers::ast::Checker;
+use crate::importer::ImportRequest;
 use crate::registry::AsRule;
 
 #[violation]
 pub struct NonPEP585Annotation {
-    pub name: String,
-    pub fixable: bool,
+    from: String,
+    to: String,
 }
 
 impl Violation for NonPEP585Annotation {
@@ -18,46 +20,58 @@ impl Violation for NonPEP585Annotation {
 
     #[derive_message_formats]
     fn message(&self) -> String {
-        let NonPEP585Annotation { name, .. } = self;
-        format!(
-            "Use `{}` instead of `{}` for type annotations",
-            name.to_lowercase(),
-            name,
-        )
+        let NonPEP585Annotation { from, to } = self;
+        format!("Use `{to}` instead of `{from}` for type annotation")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable.then_some(|NonPEP585Annotation { name, .. }| {
-            format!("Replace `{name}` with `{}`", name.to_lowercase())
-        })
+    fn autofix_title(&self) -> Option<String> {
+        let NonPEP585Annotation { to, .. } = self;
+        Some(format!("Replace with `{to}`"))
     }
 }
 
 /// UP006
-pub fn use_pep585_annotation(checker: &mut Checker, expr: &Expr) {
-    if let Some(binding) = checker
-        .ctx
-        .resolve_call_path(expr)
-        .and_then(|call_path| call_path.last().copied())
-    {
-        let fixable = checker
-            .ctx
-            .in_deferred_string_type_definition
-            .as_ref()
-            .map_or(true, AnnotationKind::is_simple);
-        let mut diagnostic = Diagnostic::new(
-            NonPEP585Annotation {
-                name: binding.to_string(),
-                fixable,
-            },
-            expr.range(),
-        );
-        if fixable && checker.patch(diagnostic.kind.rule()) {
-            let binding = binding.to_lowercase();
-            if checker.ctx.is_builtin(&binding) {
-                diagnostic.set_fix(Edit::range_replacement(binding, expr.range()));
+pub(crate) fn use_pep585_annotation(
+    checker: &mut Checker,
+    expr: &Expr,
+    replacement: &ModuleMember,
+) {
+    let Some(from) = compose_call_path(expr) else {
+        return;
+    };
+    let mut diagnostic = Diagnostic::new(
+        NonPEP585Annotation {
+            from,
+            to: replacement.to_string(),
+        },
+        expr.range(),
+    );
+    if checker.patch(diagnostic.kind.rule()) {
+        if !checker.semantic_model().in_complex_string_type_definition() {
+            match replacement {
+                ModuleMember::BuiltIn(name) => {
+                    // Built-in type, like `list`.
+                    if checker.semantic_model().is_builtin(name) {
+                        diagnostic.set_fix(Fix::automatic(Edit::range_replacement(
+                            (*name).to_string(),
+                            expr.range(),
+                        )));
+                    }
+                }
+                ModuleMember::Member(module, member) => {
+                    // Imported type, like `collections.deque`.
+                    diagnostic.try_set_fix(|| {
+                        let (import_edit, binding) = checker.importer.get_or_import_symbol(
+                            &ImportRequest::import_from(module, member),
+                            expr.start(),
+                            checker.semantic_model(),
+                        )?;
+                        let reference_edit = Edit::range_replacement(binding, expr.range());
+                        Ok(Fix::suggested_edits(import_edit, [reference_edit]))
+                    });
+                }
             }
         }
-        checker.diagnostics.push(diagnostic);
     }
+    checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/use_pep604_annotation.rs b/crates/ruff/src/rules/pyupgrade/rules/use_pep604_annotation.rs
index e6e1500d37fa6..789e89b68545d 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/use_pep604_annotation.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/use_pep604_annotation.rs
@@ -1,18 +1,15 @@
-use ruff_text_size::TextSize;
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Operator};
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Constant, Expr, Operator, Ranged};
 
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Violation};
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::unparse_expr;
-use ruff_python_ast::typing::AnnotationKind;
+use ruff_python_semantic::analyze::typing::Pep604Operator;
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 
 #[violation]
-pub struct NonPEP604Annotation {
-    pub fixable: bool,
-}
+pub struct NonPEP604Annotation;
 
 impl Violation for NonPEP604Annotation {
     const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
@@ -22,122 +19,80 @@ impl Violation for NonPEP604Annotation {
         format!("Use `X | Y` for type annotations")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable.then_some(|_| format!("Convert to `X | Y`"))
+    fn autofix_title(&self) -> Option<String> {
+        Some("Convert to `X | Y`".to_string())
     }
 }
 
 fn optional(expr: &Expr) -> Expr {
-    Expr::new(
-        TextSize::default(),
-        TextSize::default(),
-        ExprKind::BinOp {
-            left: Box::new(expr.clone()),
-            op: Operator::BitOr,
-            right: Box::new(Expr::new(
-                TextSize::default(),
-                TextSize::default(),
-                ExprKind::Constant {
-                    value: Constant::None,
-                    kind: None,
-                },
-            )),
-        },
-    )
+    Expr::BinOp(ast::ExprBinOp {
+        left: Box::new(expr.clone()),
+        op: Operator::BitOr,
+        right: Box::new(Expr::Constant(ast::ExprConstant {
+            value: Constant::None,
+            kind: None,
+            range: TextRange::default(),
+        })),
+        range: TextRange::default(),
+    })
 }
 
 fn union(elts: &[Expr]) -> Expr {
     if elts.len() == 1 {
         elts[0].clone()
     } else {
-        Expr::new(
-            TextSize::default(),
-            TextSize::default(),
-            ExprKind::BinOp {
-                left: Box::new(union(&elts[..elts.len() - 1])),
-                op: Operator::BitOr,
-                right: Box::new(elts[elts.len() - 1].clone()),
-            },
-        )
-    }
-}
-
-/// Returns `true` if any argument in the slice is a string.
-fn any_arg_is_str(slice: &Expr) -> bool {
-    match &slice.node {
-        ExprKind::Constant {
-            value: Constant::Str(_),
-            ..
-        } => true,
-        ExprKind::Tuple { elts, .. } => elts.iter().any(any_arg_is_str),
-        _ => false,
+        Expr::BinOp(ast::ExprBinOp {
+            left: Box::new(union(&elts[..elts.len() - 1])),
+            op: Operator::BitOr,
+            right: Box::new(elts[elts.len() - 1].clone()),
+            range: TextRange::default(),
+        })
     }
 }
 
-#[derive(Copy, Clone)]
-enum TypingMember {
-    Union,
-    Optional,
-}
-
 /// UP007
-pub fn use_pep604_annotation(checker: &mut Checker, expr: &Expr, value: &Expr, slice: &Expr) {
-    // If any of the _arguments_ are forward references, we can't use PEP 604.
-    // Ex) `Union["str", "int"]` can't be converted to `"str" | "int"`.
-    if any_arg_is_str(slice) {
-        return;
-    }
-
-    let Some(typing_member) = checker.ctx.resolve_call_path(value).as_ref().and_then(|call_path| {
-        if checker.ctx.match_typing_call_path(call_path, "Optional") {
-            Some(TypingMember::Optional)
-        } else if checker.ctx.match_typing_call_path(call_path, "Union") {
-            Some(TypingMember::Union)
-        } else {
-            None
-        }
-    }) else {
-        return;
-    };
-
+pub(crate) fn use_pep604_annotation(
+    checker: &mut Checker,
+    expr: &Expr,
+    slice: &Expr,
+    operator: Pep604Operator,
+) {
     // Avoid fixing forward references, or types not in an annotation.
-    let fixable = checker.ctx.in_type_definition
-        && checker
-            .ctx
-            .in_deferred_string_type_definition
-            .as_ref()
-            .map_or(true, AnnotationKind::is_simple);
-
-    match typing_member {
-        TypingMember::Optional => {
-            let mut diagnostic = Diagnostic::new(NonPEP604Annotation { fixable }, expr.range());
+    let fixable = checker.semantic_model().in_type_definition()
+        && !checker.semantic_model().in_complex_string_type_definition();
+    match operator {
+        Pep604Operator::Optional => {
+            let mut diagnostic = Diagnostic::new(NonPEP604Annotation, expr.range());
             if fixable && checker.patch(diagnostic.kind.rule()) {
-                diagnostic.set_fix(Edit::range_replacement(
-                    unparse_expr(&optional(slice), checker.stylist),
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                    checker.generator().expr(&optional(slice)),
                     expr.range(),
-                ));
+                )));
             }
             checker.diagnostics.push(diagnostic);
         }
-        TypingMember::Union => {
-            let mut diagnostic = Diagnostic::new(NonPEP604Annotation { fixable }, expr.range());
+        Pep604Operator::Union => {
+            let mut diagnostic = Diagnostic::new(NonPEP604Annotation, expr.range());
             if fixable && checker.patch(diagnostic.kind.rule()) {
-                match &slice.node {
-                    ExprKind::Slice { .. } => {
+                match slice {
+                    Expr::Slice(_) => {
                         // Invalid type annotation.
                     }
-                    ExprKind::Tuple { elts, .. } => {
-                        diagnostic.set_fix(Edit::range_replacement(
-                            unparse_expr(&union(elts), checker.stylist),
+                    Expr::Tuple(ast::ExprTuple { elts, .. }) => {
+                        #[allow(deprecated)]
+                        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                            checker.generator().expr(&union(elts)),
                             expr.range(),
-                        ));
+                        )));
                     }
                     _ => {
                         // Single argument.
-                        diagnostic.set_fix(Edit::range_replacement(
-                            unparse_expr(slice, checker.stylist),
+                        #[allow(deprecated)]
+                        diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                            checker.generator().expr(slice),
                             expr.range(),
-                        ));
+                        )));
                     }
                 }
             }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/use_pep604_isinstance.rs b/crates/ruff/src/rules/pyupgrade/rules/use_pep604_isinstance.rs
index 3745d05ae21a6..d0f8baaf9211d 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/use_pep604_isinstance.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/use_pep604_isinstance.rs
@@ -1,17 +1,16 @@
-use ruff_text_size::TextSize;
 use std::fmt;
 
-use rustpython_parser::ast::{Expr, ExprKind, Operator};
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Expr, Operator, Ranged};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::unparse_expr;
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub enum CallKind {
+pub(crate) enum CallKind {
     Isinstance,
     Issubclass,
 }
@@ -26,7 +25,7 @@ impl fmt::Display for CallKind {
 }
 
 impl CallKind {
-    pub fn from_name(name: &str) -> Option<Self> {
+    pub(crate) fn from_name(name: &str) -> Option<Self> {
         match name {
             "isinstance" => Some(CallKind::Isinstance),
             "issubclass" => Some(CallKind::Issubclass),
@@ -37,7 +36,7 @@ impl CallKind {
 
 #[violation]
 pub struct NonPEP604Isinstance {
-    pub kind: CallKind,
+    kind: CallKind,
 }
 
 impl AlwaysAutofixableViolation for NonPEP604Isinstance {
@@ -55,48 +54,48 @@ fn union(elts: &[Expr]) -> Expr {
     if elts.len() == 1 {
         elts[0].clone()
     } else {
-        Expr::new(
-            TextSize::default(),
-            TextSize::default(),
-            ExprKind::BinOp {
-                left: Box::new(union(&elts[..elts.len() - 1])),
-                op: Operator::BitOr,
-                right: Box::new(elts[elts.len() - 1].clone()),
-            },
-        )
+        Expr::BinOp(ast::ExprBinOp {
+            left: Box::new(union(&elts[..elts.len() - 1])),
+            op: Operator::BitOr,
+            right: Box::new(elts[elts.len() - 1].clone()),
+            range: TextRange::default(),
+        })
     }
 }
 
 /// UP038
-pub fn use_pep604_isinstance(checker: &mut Checker, expr: &Expr, func: &Expr, args: &[Expr]) {
-    if let ExprKind::Name { id, .. } = &func.node {
+pub(crate) fn use_pep604_isinstance(
+    checker: &mut Checker,
+    expr: &Expr,
+    func: &Expr,
+    args: &[Expr],
+) {
+    if let Expr::Name(ast::ExprName { id, .. }) = func {
         let Some(kind) = CallKind::from_name(id) else {
             return;
         };
-        if !checker.ctx.is_builtin(id) {
+        if !checker.semantic_model().is_builtin(id) {
             return;
         };
         if let Some(types) = args.get(1) {
-            if let ExprKind::Tuple { elts, .. } = &types.node {
+            if let Expr::Tuple(ast::ExprTuple { elts, .. }) = &types {
                 // Ex) `()`
                 if elts.is_empty() {
                     return;
                 }
 
                 // Ex) `(*args,)`
-                if elts
-                    .iter()
-                    .any(|elt| matches!(elt.node, ExprKind::Starred { .. }))
-                {
+                if elts.iter().any(|elt| matches!(elt, Expr::Starred(_))) {
                     return;
                 }
 
                 let mut diagnostic = Diagnostic::new(NonPEP604Isinstance { kind }, expr.range());
                 if checker.patch(diagnostic.kind.rule()) {
-                    diagnostic.set_fix(Edit::range_replacement(
-                        unparse_expr(&union(elts), checker.stylist),
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                        checker.generator().expr(&union(elts)),
                         types.range(),
-                    ));
+                    )));
                 }
                 checker.diagnostics.push(diagnostic);
             }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/useless_metaclass_type.rs b/crates/ruff/src/rules/pyupgrade/rules/useless_metaclass_type.rs
index e1b283982869c..783bc520c892d 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/useless_metaclass_type.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/useless_metaclass_type.rs
@@ -1,11 +1,9 @@
-use log::error;
-use ruff_text_size::TextRange;
-use rustpython_parser::ast::{Expr, ExprKind, Stmt};
+use rustpython_parser::ast::{self, Expr, Ranged, Stmt};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Fix};
 use ruff_macros::{derive_message_formats, violation};
 
-use crate::autofix::actions;
+use crate::autofix;
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 
@@ -23,51 +21,41 @@ impl AlwaysAutofixableViolation for UselessMetaclassType {
     }
 }
 
-fn rule(targets: &[Expr], value: &Expr, location: TextRange) -> Option<Diagnostic> {
+/// UP001
+pub(crate) fn useless_metaclass_type(
+    checker: &mut Checker,
+    stmt: &Stmt,
+    value: &Expr,
+    targets: &[Expr],
+) {
     if targets.len() != 1 {
-        return None;
+        return;
     }
-    let ExprKind::Name { id, .. } = targets.first().map(|expr| &expr.node).unwrap() else {
-        return None;
+    let Expr::Name(ast::ExprName { id, .. }) = targets.first().unwrap() else {
+        return ;
     };
     if id != "__metaclass__" {
-        return None;
+        return;
     }
-    let ExprKind::Name { id, .. } = &value.node else {
-        return None;
+    let Expr::Name(ast::ExprName { id, .. }) = value else {
+        return ;
     };
     if id != "type" {
-        return None;
+        return;
     }
-    Some(Diagnostic::new(UselessMetaclassType, location))
-}
 
-/// UP001
-pub fn useless_metaclass_type(checker: &mut Checker, stmt: &Stmt, value: &Expr, targets: &[Expr]) {
-    let Some(mut diagnostic) =
-        rule(targets, value, stmt.range()) else {
-            return;
-        };
+    let mut diagnostic = Diagnostic::new(UselessMetaclassType, stmt.range());
     if checker.patch(diagnostic.kind.rule()) {
-        let deleted: Vec<&Stmt> = checker.deletions.iter().map(Into::into).collect();
-        let defined_by = checker.ctx.current_stmt();
-        let defined_in = checker.ctx.current_stmt_parent();
-        match actions::delete_stmt(
-            defined_by.into(),
-            defined_in.map(Into::into),
-            &deleted,
+        let stmt = checker.semantic_model().stmt();
+        let parent = checker.semantic_model().stmt_parent();
+        let edit = autofix::edits::delete_stmt(
+            stmt,
+            parent,
             checker.locator,
             checker.indexer,
             checker.stylist,
-        ) {
-            Ok(fix) => {
-                if fix.is_deletion() || fix.content() == Some("pass") {
-                    checker.deletions.insert(*defined_by);
-                }
-                diagnostic.set_fix(fix);
-            }
-            Err(e) => error!("Failed to fix remove metaclass type: {e}"),
-        }
+        );
+        diagnostic.set_fix(Fix::automatic(edit).isolate(checker.isolation(parent)));
     }
     checker.diagnostics.push(diagnostic);
 }
diff --git a/crates/ruff/src/rules/pyupgrade/rules/useless_object_inheritance.rs b/crates/ruff/src/rules/pyupgrade/rules/useless_object_inheritance.rs
index 1390e58833641..8a3bc3839d1da 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/useless_object_inheritance.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/useless_object_inheritance.rs
@@ -1,17 +1,17 @@
-use rustpython_parser::ast::{Expr, ExprKind, Keyword, Stmt};
+use rustpython_parser::ast::{self, Expr, Keyword, Ranged, Stmt};
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_semantic::binding::{Binding, BindingKind, Bindings};
 use ruff_python_semantic::scope::Scope;
 
-use crate::autofix::actions::remove_argument;
+use crate::autofix::edits::remove_argument;
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 
 #[violation]
 pub struct UselessObjectInheritance {
-    pub name: String,
+    name: String,
 }
 
 impl AlwaysAutofixableViolation for UselessObjectInheritance {
@@ -28,14 +28,16 @@ impl AlwaysAutofixableViolation for UselessObjectInheritance {
 
 fn rule(name: &str, bases: &[Expr], scope: &Scope, bindings: &Bindings) -> Option<Diagnostic> {
     for expr in bases {
-        let ExprKind::Name { id, .. } = &expr.node else {
+        let Expr::Name(ast::ExprName { id, .. }) = expr else {
             continue;
         };
         if id != "object" {
             continue;
         }
         if !matches!(
-            scope.get(id.as_str()).map(|index| &bindings[*index]),
+            scope
+                .get(id.as_str())
+                .map(|binding_id| &bindings[binding_id]),
             None | Some(Binding {
                 kind: BindingKind::Builtin,
                 ..
@@ -55,17 +57,23 @@ fn rule(name: &str, bases: &[Expr], scope: &Scope, bindings: &Bindings) -> Optio
 }
 
 /// UP004
-pub fn useless_object_inheritance(
+pub(crate) fn useless_object_inheritance(
     checker: &mut Checker,
     stmt: &Stmt,
     name: &str,
     bases: &[Expr],
     keywords: &[Keyword],
 ) {
-    if let Some(mut diagnostic) = rule(name, bases, checker.ctx.scope(), &checker.ctx.bindings) {
+    if let Some(mut diagnostic) = rule(
+        name,
+        bases,
+        checker.semantic_model().scope(),
+        &checker.semantic_model().bindings,
+    ) {
         if checker.patch(diagnostic.kind.rule()) {
             let expr_range = diagnostic.range();
-            diagnostic.try_set_fix(|| {
+            #[allow(deprecated)]
+            diagnostic.try_set_fix_from_edit(|| {
                 remove_argument(
                     checker.locator,
                     stmt.start(),
diff --git a/crates/ruff/src/rules/pyupgrade/rules/yield_in_for_loop.rs b/crates/ruff/src/rules/pyupgrade/rules/yield_in_for_loop.rs
index 263d4441a40d1..999df0fd04b79 100644
--- a/crates/ruff/src/rules/pyupgrade/rules/yield_in_for_loop.rs
+++ b/crates/ruff/src/rules/pyupgrade/rules/yield_in_for_loop.rs
@@ -1,11 +1,12 @@
 use rustc_hash::FxHashMap;
-use rustpython_parser::ast::{Expr, ExprContext, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Expr, ExprContext, Ranged, Stmt};
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::statement_visitor::StatementVisitor;
 use ruff_python_ast::types::RefEquality;
-use ruff_python_ast::visitor;
 use ruff_python_ast::visitor::Visitor;
+use ruff_python_ast::{statement_visitor, visitor};
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
@@ -27,11 +28,14 @@ impl AlwaysAutofixableViolation for YieldInForLoop {
 /// Return `true` if the two expressions are equivalent, and consistent solely
 /// of tuples and names.
 fn is_same_expr(a: &Expr, b: &Expr) -> bool {
-    match (&a.node, &b.node) {
-        (ExprKind::Name { id: a, .. }, ExprKind::Name { id: b, .. }) => a == b,
-        (ExprKind::Tuple { elts: a, .. }, ExprKind::Tuple { elts: b, .. }) => {
-            a.len() == b.len() && a.iter().zip(b).all(|(a, b)| is_same_expr(a, b))
+    match (&a, &b) {
+        (Expr::Name(ast::ExprName { id: a, .. }), Expr::Name(ast::ExprName { id: b, .. })) => {
+            a == b
         }
+        (
+            Expr::Tuple(ast::ExprTuple { elts: a, .. }),
+            Expr::Tuple(ast::ExprTuple { elts: b, .. }),
+        ) => a.len() == b.len() && a.iter().zip(b).all(|(a, b)| is_same_expr(a, b)),
         _ => false,
     }
 }
@@ -39,10 +43,10 @@ fn is_same_expr(a: &Expr, b: &Expr) -> bool {
 /// Collect all named variables in an expression consisting solely of tuples and
 /// names.
 fn collect_names(expr: &Expr) -> Vec<&str> {
-    match &expr.node {
-        ExprKind::Name { id, .. } => vec![id],
-        ExprKind::Tuple { elts, .. } => elts.iter().flat_map(collect_names).collect(),
-        _ => panic!("Expected: ExprKind::Name | ExprKind::Tuple"),
+    match expr {
+        Expr::Name(ast::ExprName { id, .. }) => vec![id],
+        Expr::Tuple(ast::ExprTuple { elts, .. }) => elts.iter().flat_map(collect_names).collect(),
+        _ => panic!("Expected: Expr::Name | Expr::Tuple"),
     }
 }
 
@@ -59,16 +63,16 @@ struct YieldFromVisitor<'a> {
     yields: Vec<YieldFrom<'a>>,
 }
 
-impl<'a> Visitor<'a> for YieldFromVisitor<'a> {
+impl<'a> StatementVisitor<'a> for YieldFromVisitor<'a> {
     fn visit_stmt(&mut self, stmt: &'a Stmt) {
-        match &stmt.node {
-            StmtKind::For {
+        match stmt {
+            Stmt::For(ast::StmtFor {
                 target,
                 body,
                 orelse,
                 iter,
                 ..
-            } => {
+            }) => {
                 // If there is an else statement, don't rewrite.
                 if !orelse.is_empty() {
                     return;
@@ -79,8 +83,12 @@ impl<'a> Visitor<'a> for YieldFromVisitor<'a> {
                 }
                 // If the body is not a yield, don't rewrite.
                 let body = &body[0];
-                if let StmtKind::Expr { value } = &body.node {
-                    if let ExprKind::Yield { value: Some(value) } = &value.node {
+                if let Stmt::Expr(ast::StmtExpr { value, range: _ }) = &body {
+                    if let Expr::Yield(ast::ExprYield {
+                        value: Some(value),
+                        range: _,
+                    }) = value.as_ref()
+                    {
                         if is_same_expr(target, value) {
                             self.yields.push(YieldFrom {
                                 stmt,
@@ -92,25 +100,10 @@ impl<'a> Visitor<'a> for YieldFromVisitor<'a> {
                     }
                 }
             }
-            StmtKind::FunctionDef { .. }
-            | StmtKind::AsyncFunctionDef { .. }
-            | StmtKind::ClassDef { .. } => {
+            Stmt::FunctionDef(_) | Stmt::AsyncFunctionDef(_) | Stmt::ClassDef(_) => {
                 // Don't recurse into anything that defines a new scope.
             }
-            _ => visitor::walk_stmt(self, stmt),
-        }
-    }
-
-    fn visit_expr(&mut self, expr: &'a Expr) {
-        match &expr.node {
-            ExprKind::ListComp { .. }
-            | ExprKind::SetComp { .. }
-            | ExprKind::DictComp { .. }
-            | ExprKind::GeneratorExp { .. }
-            | ExprKind::Lambda { .. } => {
-                // Don't recurse into anything that defines a new scope.
-            }
-            _ => visitor::walk_expr(self, expr),
+            _ => statement_visitor::walk_stmt(self, stmt),
         }
     }
 }
@@ -130,8 +123,8 @@ impl<'a> Visitor<'a> for ReferenceVisitor<'a> {
     }
 
     fn visit_expr(&mut self, expr: &'a Expr) {
-        match &expr.node {
-            ExprKind::Name { id, ctx } => {
+        match expr {
+            Expr::Name(ast::ExprName { id, ctx, range: _ }) => {
                 if matches!(ctx, ExprContext::Load | ExprContext::Del) {
                     if let Some(parent) = self.parent {
                         self.references
@@ -147,9 +140,9 @@ impl<'a> Visitor<'a> for ReferenceVisitor<'a> {
 }
 
 /// UP028
-pub fn yield_in_for_loop(checker: &mut Checker, stmt: &Stmt) {
+pub(crate) fn yield_in_for_loop(checker: &mut Checker, stmt: &Stmt) {
     // Intentionally omit async functions.
-    if let StmtKind::FunctionDef { body, .. } = &stmt.node {
+    if let Stmt::FunctionDef(ast::StmtFunctionDef { body, .. }) = stmt {
         let yields = {
             let mut visitor = YieldFromVisitor::default();
             visitor.visit_body(body);
@@ -176,7 +169,11 @@ pub fn yield_in_for_loop(checker: &mut Checker, stmt: &Stmt) {
             if checker.patch(diagnostic.kind.rule()) {
                 let contents = checker.locator.slice(item.iter.range());
                 let contents = format!("yield from {contents}");
-                diagnostic.set_fix(Edit::range_replacement(contents, item.stmt.range()));
+                #[allow(deprecated)]
+                diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                    contents,
+                    item.stmt.range(),
+                )));
             }
             checker.diagnostics.push(diagnostic);
         }
diff --git a/crates/ruff/src/rules/pyupgrade/settings.rs b/crates/ruff/src/rules/pyupgrade/settings.rs
deleted file mode 100644
index aa72129836237..0000000000000
--- a/crates/ruff/src/rules/pyupgrade/settings.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-//! Settings for the `pyupgrade` plugin.
-
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-use ruff_macros::{CacheKey, ConfigurationOptions};
-
-#[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
-)]
-#[serde(
-    deny_unknown_fields,
-    rename_all = "kebab-case",
-    rename = "PyUpgradeOptions"
-)]
-pub struct Options {
-    #[option(
-        default = r#"false"#,
-        value_type = "bool",
-        example = r#"
-            # Preserve types, even if a file imports `from __future__ import annotations`.
-            keep-runtime-typing = true
-        "#
-    )]
-    /// Whether to avoid PEP 585 (`List[int]` -> `list[int]`) and PEP 604
-    /// (`Optional[str]` -> `str | None`) rewrites even if a file imports
-    /// `from __future__ import annotations`. Note that this setting is only
-    /// applicable when the target Python version is below 3.9 and 3.10
-    /// respectively, and enabling it is equivalent to disabling
-    /// `use-pep585-annotation` (`UP006`) and `use-pep604-annotation`
-    /// (`UP007`) entirely.
-    pub keep_runtime_typing: Option<bool>,
-}
-
-#[derive(Debug, Default, CacheKey)]
-pub struct Settings {
-    pub keep_runtime_typing: bool,
-}
-
-impl From<Options> for Settings {
-    fn from(options: Options) -> Self {
-        Self {
-            keep_runtime_typing: options.keep_runtime_typing.unwrap_or_default(),
-        }
-    }
-}
-
-impl From<Settings> for Options {
-    fn from(settings: Settings) -> Self {
-        Self {
-            keep_runtime_typing: Some(settings.keep_runtime_typing),
-        }
-    }
-}
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP001.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP001.py.snap
index 56563313c7491..42716da839636 100644
--- a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP001.py.snap
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP001.py.snap
@@ -9,7 +9,7 @@ UP001.py:2:5: UP001 [*] `__metaclass__ = type` is implied
   |
   = help: Remove `metaclass = type`
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | class A:
 2   |-    __metaclass__ = type
   2 |+    pass
@@ -27,7 +27,7 @@ UP001.py:6:5: UP001 [*] `__metaclass__ = type` is implied
   |
   = help: Remove `metaclass = type`
 
-ℹ Suggested fix
+ℹ Fix
 3 3 | 
 4 4 | 
 5 5 | class B:
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP006.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP006_0.py.snap
similarity index 51%
rename from crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP006.py.snap
rename to crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP006_0.py.snap
index 19db55b0dec9f..2e0f6ee588794 100644
--- a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP006.py.snap
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP006_0.py.snap
@@ -1,15 +1,15 @@
 ---
 source: crates/ruff/src/rules/pyupgrade/mod.rs
 ---
-UP006.py:4:10: UP006 [*] Use `list` instead of `List` for type annotations
+UP006_0.py:4:10: UP006 [*] Use `list` instead of `typing.List` for type annotation
   |
 4 | def f(x: typing.List[str]) -> None:
   |          ^^^^^^^^^^^ UP006
 5 |     ...
   |
-  = help: Replace `List` with `list`
+  = help: Replace with `list`
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | import typing
 2 2 | 
 3 3 | 
@@ -19,15 +19,15 @@ UP006.py:4:10: UP006 [*] Use `list` instead of `List` for type annotations
 6 6 | 
 7 7 | 
 
-UP006.py:11:10: UP006 [*] Use `list` instead of `List` for type annotations
+UP006_0.py:11:10: UP006 [*] Use `list` instead of `List` for type annotation
    |
 11 | def f(x: List[str]) -> None:
    |          ^^^^ UP006
 12 |     ...
    |
-   = help: Replace `List` with `list`
+   = help: Replace with `list`
 
-ℹ Suggested fix
+ℹ Fix
 8  8  | from typing import List
 9  9  | 
 10 10 | 
@@ -37,15 +37,15 @@ UP006.py:11:10: UP006 [*] Use `list` instead of `List` for type annotations
 13 13 | 
 14 14 | 
 
-UP006.py:18:10: UP006 [*] Use `list` instead of `List` for type annotations
+UP006_0.py:18:10: UP006 [*] Use `list` instead of `t.List` for type annotation
    |
 18 | def f(x: t.List[str]) -> None:
    |          ^^^^^^ UP006
 19 |     ...
    |
-   = help: Replace `List` with `list`
+   = help: Replace with `list`
 
-ℹ Suggested fix
+ℹ Fix
 15 15 | import typing as t
 16 16 | 
 17 17 | 
@@ -55,15 +55,15 @@ UP006.py:18:10: UP006 [*] Use `list` instead of `List` for type annotations
 20 20 | 
 21 21 | 
 
-UP006.py:25:10: UP006 [*] Use `list` instead of `List` for type annotations
+UP006_0.py:25:10: UP006 [*] Use `list` instead of `IList` for type annotation
    |
 25 | def f(x: IList[str]) -> None:
    |          ^^^^^ UP006
 26 |     ...
    |
-   = help: Replace `List` with `list`
+   = help: Replace with `list`
 
-ℹ Suggested fix
+ℹ Fix
 22 22 | from typing import List as IList
 23 23 | 
 24 24 | 
@@ -73,15 +73,15 @@ UP006.py:25:10: UP006 [*] Use `list` instead of `List` for type annotations
 27 27 | 
 28 28 | 
 
-UP006.py:29:11: UP006 [*] Use `list` instead of `List` for type annotations
+UP006_0.py:29:11: UP006 [*] Use `list` instead of `List` for type annotation
    |
 29 | def f(x: "List[str]") -> None:
    |           ^^^^ UP006
 30 |     ...
    |
-   = help: Replace `List` with `list`
+   = help: Replace with `list`
 
-ℹ Suggested fix
+ℹ Fix
 26 26 |     ...
 27 27 | 
 28 28 | 
@@ -91,15 +91,15 @@ UP006.py:29:11: UP006 [*] Use `list` instead of `List` for type annotations
 31 31 | 
 32 32 | 
 
-UP006.py:33:12: UP006 [*] Use `list` instead of `List` for type annotations
+UP006_0.py:33:12: UP006 [*] Use `list` instead of `List` for type annotation
    |
 33 | def f(x: r"List[str]") -> None:
    |            ^^^^ UP006
 34 |     ...
    |
-   = help: Replace `List` with `list`
+   = help: Replace with `list`
 
-ℹ Suggested fix
+ℹ Fix
 30 30 |     ...
 31 31 | 
 32 32 | 
@@ -109,15 +109,15 @@ UP006.py:33:12: UP006 [*] Use `list` instead of `List` for type annotations
 35 35 | 
 36 36 | 
 
-UP006.py:37:11: UP006 [*] Use `list` instead of `List` for type annotations
+UP006_0.py:37:11: UP006 [*] Use `list` instead of `List` for type annotation
    |
 37 | def f(x: "List[str]") -> None:
    |           ^^^^ UP006
 38 |     ...
    |
-   = help: Replace `List` with `list`
+   = help: Replace with `list`
 
-ℹ Suggested fix
+ℹ Fix
 34 34 |     ...
 35 35 | 
 36 36 | 
@@ -127,15 +127,15 @@ UP006.py:37:11: UP006 [*] Use `list` instead of `List` for type annotations
 39 39 | 
 40 40 | 
 
-UP006.py:41:13: UP006 [*] Use `list` instead of `List` for type annotations
+UP006_0.py:41:13: UP006 [*] Use `list` instead of `List` for type annotation
    |
 41 | def f(x: """List[str]""") -> None:
    |             ^^^^ UP006
 42 |     ...
    |
-   = help: Replace `List` with `list`
+   = help: Replace with `list`
 
-ℹ Suggested fix
+ℹ Fix
 38 38 |     ...
 39 39 | 
 40 40 | 
@@ -145,22 +145,23 @@ UP006.py:41:13: UP006 [*] Use `list` instead of `List` for type annotations
 43 43 | 
 44 44 | 
 
-UP006.py:45:10: UP006 Use `list` instead of `List` for type annotations
+UP006_0.py:45:10: UP006 Use `list` instead of `List` for type annotation
    |
 45 | def f(x: "Li" "st[str]") -> None:
    |          ^^^^^^^^^^^^^^ UP006
 46 |     ...
    |
+   = help: Replace with `list`
 
-UP006.py:49:11: UP006 [*] Use `list` instead of `List` for type annotations
+UP006_0.py:49:11: UP006 [*] Use `list` instead of `List` for type annotation
    |
 49 | def f(x: "List['List[str]']") -> None:
    |           ^^^^ UP006
 50 |     ...
    |
-   = help: Replace `List` with `list`
+   = help: Replace with `list`
 
-ℹ Suggested fix
+ℹ Fix
 46 46 |     ...
 47 47 | 
 48 48 | 
@@ -170,15 +171,15 @@ UP006.py:49:11: UP006 [*] Use `list` instead of `List` for type annotations
 51 51 | 
 52 52 | 
 
-UP006.py:49:17: UP006 [*] Use `list` instead of `List` for type annotations
+UP006_0.py:49:17: UP006 [*] Use `list` instead of `List` for type annotation
    |
 49 | def f(x: "List['List[str]']") -> None:
    |                 ^^^^ UP006
 50 |     ...
    |
-   = help: Replace `List` with `list`
+   = help: Replace with `list`
 
-ℹ Suggested fix
+ℹ Fix
 46 46 |     ...
 47 47 | 
 48 48 | 
@@ -188,15 +189,15 @@ UP006.py:49:17: UP006 [*] Use `list` instead of `List` for type annotations
 51 51 | 
 52 52 | 
 
-UP006.py:53:11: UP006 [*] Use `list` instead of `List` for type annotations
+UP006_0.py:53:11: UP006 [*] Use `list` instead of `List` for type annotation
    |
 53 | def f(x: "List['Li' 'st[str]']") -> None:
    |           ^^^^ UP006
 54 |     ...
    |
-   = help: Replace `List` with `list`
+   = help: Replace with `list`
 
-ℹ Suggested fix
+ℹ Fix
 50 50 |     ...
 51 51 | 
 52 52 | 
@@ -206,25 +207,78 @@ UP006.py:53:11: UP006 [*] Use `list` instead of `List` for type annotations
 55 55 | 
 56 56 | 
 
-UP006.py:53:16: UP006 Use `list` instead of `List` for type annotations
+UP006_0.py:53:16: UP006 Use `list` instead of `List` for type annotation
    |
 53 | def f(x: "List['Li' 'st[str]']") -> None:
    |                ^^^^^^^^^^^^^^ UP006
 54 |     ...
    |
+   = help: Replace with `list`
 
-UP006.py:57:10: UP006 Use `list` instead of `List` for type annotations
+UP006_0.py:57:10: UP006 Use `list` instead of `List` for type annotation
    |
 57 | def f(x: "Li" "st['List[str]']") -> None:
    |          ^^^^^^^^^^^^^^^^^^^^^^ UP006
 58 |     ...
    |
+   = help: Replace with `list`
 
-UP006.py:57:10: UP006 Use `list` instead of `List` for type annotations
+UP006_0.py:57:10: UP006 Use `list` instead of `List` for type annotation
    |
 57 | def f(x: "Li" "st['List[str]']") -> None:
    |          ^^^^^^^^^^^^^^^^^^^^^^ UP006
 58 |     ...
    |
+   = help: Replace with `list`
+
+UP006_0.py:61:10: UP006 [*] Use `collections.deque` instead of `typing.Deque` for type annotation
+   |
+61 | def f(x: typing.Deque[str]) -> None:
+   |          ^^^^^^^^^^^^ UP006
+62 |     ...
+   |
+   = help: Replace with `collections.deque`
+
+ℹ Suggested fix
+20 20 | 
+21 21 | 
+22 22 | from typing import List as IList
+   23 |+from collections import deque
+23 24 | 
+24 25 | 
+25 26 | def f(x: IList[str]) -> None:
+--------------------------------------------------------------------------------
+58 59 |     ...
+59 60 | 
+60 61 | 
+61    |-def f(x: typing.Deque[str]) -> None:
+   62 |+def f(x: deque[str]) -> None:
+62 63 |     ...
+63 64 | 
+64 65 | 
+
+UP006_0.py:65:10: UP006 [*] Use `collections.defaultdict` instead of `typing.DefaultDict` for type annotation
+   |
+65 | def f(x: typing.DefaultDict[str, str]) -> None:
+   |          ^^^^^^^^^^^^^^^^^^ UP006
+66 |     ...
+   |
+   = help: Replace with `collections.defaultdict`
+
+ℹ Suggested fix
+20 20 | 
+21 21 | 
+22 22 | from typing import List as IList
+   23 |+from collections import defaultdict
+23 24 | 
+24 25 | 
+25 26 | def f(x: IList[str]) -> None:
+--------------------------------------------------------------------------------
+62 63 |     ...
+63 64 | 
+64 65 | 
+65    |-def f(x: typing.DefaultDict[str, str]) -> None:
+   66 |+def f(x: defaultdict[str, str]) -> None:
+66 67 |     ...
 
 
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP006_1.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP006_1.py.snap
new file mode 100644
index 0000000000000..d0b32a6494443
--- /dev/null
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP006_1.py.snap
@@ -0,0 +1,20 @@
+---
+source: crates/ruff/src/rules/pyupgrade/mod.rs
+---
+UP006_1.py:9:10: UP006 [*] Use `collections.defaultdict` instead of `typing.DefaultDict` for type annotation
+   |
+ 9 | def f(x: typing.DefaultDict[str, str]) -> None:
+   |          ^^^^^^^^^^^^^^^^^^ UP006
+10 |     ...
+   |
+   = help: Replace with `collections.defaultdict`
+
+ℹ Suggested fix
+6  6  |     from collections import defaultdict
+7  7  | 
+8  8  | 
+9     |-def f(x: typing.DefaultDict[str, str]) -> None:
+   9  |+def f(x: defaultdict[str, str]) -> None:
+10 10 |     ...
+
+
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP006_2.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP006_2.py.snap
new file mode 100644
index 0000000000000..58c06666cb75e
--- /dev/null
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP006_2.py.snap
@@ -0,0 +1,12 @@
+---
+source: crates/ruff/src/rules/pyupgrade/mod.rs
+---
+UP006_2.py:7:10: UP006 Use `collections.defaultdict` instead of `typing.DefaultDict` for type annotation
+  |
+7 | def f(x: typing.DefaultDict[str, str]) -> None:
+  |          ^^^^^^^^^^^^^^^^^^ UP006
+8 |     ...
+  |
+  = help: Replace with `collections.defaultdict`
+
+
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP006_3.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP006_3.py.snap
new file mode 100644
index 0000000000000..3a724af5edbf1
--- /dev/null
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP006_3.py.snap
@@ -0,0 +1,20 @@
+---
+source: crates/ruff/src/rules/pyupgrade/mod.rs
+---
+UP006_3.py:7:11: UP006 [*] Use `collections.defaultdict` instead of `typing.DefaultDict` for type annotation
+  |
+7 | def f(x: "typing.DefaultDict[str, str]") -> None:
+  |           ^^^^^^^^^^^^^^^^^^ UP006
+8 |     ...
+  |
+  = help: Replace with `collections.defaultdict`
+
+ℹ Suggested fix
+4 4 |     from collections import defaultdict
+5 5 | 
+6 6 | 
+7   |-def f(x: "typing.DefaultDict[str, str]") -> None:
+  7 |+def f(x: "defaultdict[str, str]") -> None:
+8 8 |     ...
+
+
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP007.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP007.py.snap
index b844f6a84b223..dc6c3fa7647cc 100644
--- a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP007.py.snap
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP007.py.snap
@@ -209,6 +209,7 @@ UP007.py:48:9: UP007 Use `X | Y` for type annotations
 51 | 
 52 |     x = Union[str, int]
    |
+   = help: Convert to `X | Y`
 
 UP007.py:50:9: UP007 Use `X | Y` for type annotations
    |
@@ -219,6 +220,7 @@ UP007.py:50:9: UP007 Use `X | Y` for type annotations
 53 |     x = Union["str", "int"]
 54 |     x: Union[str, int]
    |
+   = help: Convert to `X | Y`
 
 UP007.py:52:8: UP007 [*] Use `X | Y` for type annotations
    |
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP010.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP010.py.snap
index 218acc54539f8..a1e3b4a36e447 100644
--- a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP010.py.snap
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP010.py.snap
@@ -146,10 +146,9 @@ UP010.py:10:5: UP010 [*] Unnecessary `__future__` import `generators` for target
 8  8  | if True:
 9  9  |     from __future__ import generator_stop
 10    |-    from __future__ import generators
-   10 |+    pass
-11 11 | 
-12 12 | if True:
-13 13 |     from __future__ import generator_stop
+11 10 | 
+12 11 | if True:
+13 12 |     from __future__ import generator_stop
 
 UP010.py:13:5: UP010 [*] Unnecessary `__future__` import `generator_stop` for target Python version
    |
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP011.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP011.py.snap
index cdd094abe4108..e1063247151b4 100644
--- a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP011.py.snap
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP011.py.snap
@@ -1,14 +1,14 @@
 ---
 source: crates/ruff/src/rules/pyupgrade/mod.rs
 ---
-UP011.py:5:21: UP011 [*] Unnecessary parameters to `functools.lru_cache`
+UP011.py:5:21: UP011 [*] Unnecessary parentheses to `functools.lru_cache`
   |
 5 | @functools.lru_cache()
   |                     ^^ UP011
 6 | def fixme():
 7 |     pass
   |
-  = help: Remove unnecessary parameters
+  = help: Remove unnecessary parentheses
 
 ℹ Suggested fix
 2 2 | from functools import lru_cache
@@ -20,14 +20,14 @@ UP011.py:5:21: UP011 [*] Unnecessary parameters to `functools.lru_cache`
 7 7 |     pass
 8 8 | 
 
-UP011.py:10:11: UP011 [*] Unnecessary parameters to `functools.lru_cache`
+UP011.py:10:11: UP011 [*] Unnecessary parentheses to `functools.lru_cache`
    |
 10 | @lru_cache()
    |           ^^ UP011
 11 | def fixme():
 12 |     pass
    |
-   = help: Remove unnecessary parameters
+   = help: Remove unnecessary parentheses
 
 ℹ Suggested fix
 7  7  |     pass
@@ -39,7 +39,7 @@ UP011.py:10:11: UP011 [*] Unnecessary parameters to `functools.lru_cache`
 12 12 |     pass
 13 13 | 
 
-UP011.py:16:21: UP011 [*] Unnecessary parameters to `functools.lru_cache`
+UP011.py:16:21: UP011 [*] Unnecessary parentheses to `functools.lru_cache`
    |
 16 | @other_decorator
 17 | @functools.lru_cache()
@@ -47,7 +47,7 @@ UP011.py:16:21: UP011 [*] Unnecessary parameters to `functools.lru_cache`
 18 | def fixme():
 19 |     pass
    |
-   = help: Remove unnecessary parameters
+   = help: Remove unnecessary parentheses
 
 ℹ Suggested fix
 13 13 | 
@@ -59,14 +59,14 @@ UP011.py:16:21: UP011 [*] Unnecessary parameters to `functools.lru_cache`
 18 18 |     pass
 19 19 | 
 
-UP011.py:21:21: UP011 [*] Unnecessary parameters to `functools.lru_cache`
+UP011.py:21:21: UP011 [*] Unnecessary parentheses to `functools.lru_cache`
    |
 21 | @functools.lru_cache()
    |                     ^^ UP011
 22 | @other_decorator
 23 | def fixme():
    |
-   = help: Remove unnecessary parameters
+   = help: Remove unnecessary parentheses
 
 ℹ Suggested fix
 18 18 |     pass
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP012.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP012.py.snap
index 485ba36a2a148..1006d7fcb3ad4 100644
--- a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP012.py.snap
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP012.py.snap
@@ -373,6 +373,7 @@ UP012.py:59:1: UP012 [*] Unnecessary call to `encode` as UTF-8
    59 |+bR"foo\o"  # br"foo\o"
 60 60 | U"foo".encode("utf-8")  # b"foo"
 61 61 | print("foo".encode())  # print(b"foo")
+62 62 | 
 
 UP012.py:60:1: UP012 [*] Unnecessary call to `encode` as UTF-8
    |
@@ -391,6 +392,8 @@ UP012.py:60:1: UP012 [*] Unnecessary call to `encode` as UTF-8
 60    |-U"foo".encode("utf-8")  # b"foo"
    60 |+b"foo"  # b"foo"
 61 61 | print("foo".encode())  # print(b"foo")
+62 62 | 
+63 63 | # `encode` on parenthesized strings.
 
 UP012.py:61:7: UP012 [*] Unnecessary call to `encode` as UTF-8
    |
@@ -398,6 +401,8 @@ UP012.py:61:7: UP012 [*] Unnecessary call to `encode` as UTF-8
 62 | U"foo".encode("utf-8")  # b"foo"
 63 | print("foo".encode())  # print(b"foo")
    |       ^^^^^^^^^^^^^^ UP012
+64 | 
+65 | # `encode` on parenthesized strings.
    |
    = help: Rewrite as bytes literal
 
@@ -407,5 +412,58 @@ UP012.py:61:7: UP012 [*] Unnecessary call to `encode` as UTF-8
 60 60 | U"foo".encode("utf-8")  # b"foo"
 61    |-print("foo".encode())  # print(b"foo")
    61 |+print(b"foo")  # print(b"foo")
+62 62 | 
+63 63 | # `encode` on parenthesized strings.
+64 64 | (
+
+UP012.py:64:1: UP012 [*] Unnecessary call to `encode` as UTF-8
+   |
+64 |   # `encode` on parenthesized strings.
+65 | / (
+66 | |     "abc"
+67 | |     "def"
+68 | | ).encode()
+   | |__________^ UP012
+69 |   
+70 |   ((
+   |
+   = help: Rewrite as bytes literal
+
+ℹ Suggested fix
+62 62 | 
+63 63 | # `encode` on parenthesized strings.
+64 64 | (
+65    |-    "abc"
+66    |-    "def"
+67    |-).encode()
+   65 |+    b"abc"
+   66 |+    b"def"
+   67 |+)
+68 68 | 
+69 69 | ((
+70 70 |     "abc"
+
+UP012.py:69:1: UP012 [*] Unnecessary call to `encode` as UTF-8
+   |
+69 |   ).encode()
+70 |   
+71 | / ((
+72 | |     "abc"
+73 | |     "def"
+74 | | )).encode()
+   | |___________^ UP012
+   |
+   = help: Rewrite as bytes literal
+
+ℹ Suggested fix
+67 67 | ).encode()
+68 68 | 
+69 69 | ((
+70    |-    "abc"
+71    |-    "def"
+72    |-)).encode()
+   70 |+    b"abc"
+   71 |+    b"def"
+   72 |+))
 
 
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP018.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP018.py.snap
index a7faa63d8a991..874b172d50059 100644
--- a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP018.py.snap
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP018.py.snap
@@ -1,129 +1,148 @@
 ---
 source: crates/ruff/src/rules/pyupgrade/mod.rs
 ---
-UP018.py:20:1: UP018 [*] Unnecessary call to `str`
+UP018.py:21:1: UP018 [*] Unnecessary call to `str`
    |
-20 | # These become string or byte literals
-21 | str()
+21 | # These become string or byte literals
+22 | str()
    | ^^^^^ UP018
-22 | str("foo")
-23 | str("""
+23 | str("foo")
+24 | str("""
    |
-   = help: Replace with `str`
+   = help: Replace with empty string
 
 ℹ Suggested fix
-17 17 | bytes("foo")
-18 18 | 
-19 19 | # These become string or byte literals
-20    |-str()
-   20 |+""
-21 21 | str("foo")
-22 22 | str("""
-23 23 | foo""")
+18 18 | f"{f'{str()}'}"
+19 19 | 
+20 20 | # These become string or byte literals
+21    |-str()
+   21 |+""
+22 22 | str("foo")
+23 23 | str("""
+24 24 | foo""")
 
-UP018.py:21:1: UP018 [*] Unnecessary call to `str`
+UP018.py:22:1: UP018 [*] Unnecessary call to `str`
    |
-21 | # These become string or byte literals
-22 | str()
-23 | str("foo")
+22 | # These become string or byte literals
+23 | str()
+24 | str("foo")
    | ^^^^^^^^^^ UP018
-24 | str("""
-25 | foo""")
+25 | str("""
+26 | foo""")
    |
-   = help: Replace with `str`
+   = help: Replace with empty string
 
 ℹ Suggested fix
-18 18 | 
-19 19 | # These become string or byte literals
-20 20 | str()
-21    |-str("foo")
-   21 |+"foo"
-22 22 | str("""
-23 23 | foo""")
-24 24 | bytes()
+19 19 | 
+20 20 | # These become string or byte literals
+21 21 | str()
+22    |-str("foo")
+   22 |+"foo"
+23 23 | str("""
+24 24 | foo""")
+25 25 | bytes()
 
-UP018.py:22:1: UP018 [*] Unnecessary call to `str`
+UP018.py:23:1: UP018 [*] Unnecessary call to `str`
    |
-22 |   str()
-23 |   str("foo")
-24 | / str("""
-25 | | foo""")
+23 |   str()
+24 |   str("foo")
+25 | / str("""
+26 | | foo""")
    | |_______^ UP018
-26 |   bytes()
-27 |   bytes(b"foo")
+27 |   bytes()
+28 |   bytes(b"foo")
    |
-   = help: Replace with `str`
+   = help: Replace with empty string
 
 ℹ Suggested fix
-19 19 | # These become string or byte literals
-20 20 | str()
-21 21 | str("foo")
-22    |-str("""
-23    |-foo""")
-   22 |+"""
-   23 |+foo"""
-24 24 | bytes()
-25 25 | bytes(b"foo")
-26 26 | bytes(b"""
+20 20 | # These become string or byte literals
+21 21 | str()
+22 22 | str("foo")
+23    |-str("""
+24    |-foo""")
+   23 |+"""
+   24 |+foo"""
+25 25 | bytes()
+26 26 | bytes(b"foo")
+27 27 | bytes(b"""
 
-UP018.py:24:1: UP018 [*] Unnecessary call to `bytes`
+UP018.py:25:1: UP018 [*] Unnecessary call to `bytes`
    |
-24 | str("""
-25 | foo""")
-26 | bytes()
+25 | str("""
+26 | foo""")
+27 | bytes()
    | ^^^^^^^ UP018
-27 | bytes(b"foo")
-28 | bytes(b"""
+28 | bytes(b"foo")
+29 | bytes(b"""
    |
-   = help: Replace with `bytes`
+   = help: Replace with empty bytes
 
 ℹ Suggested fix
-21 21 | str("foo")
-22 22 | str("""
-23 23 | foo""")
-24    |-bytes()
-   24 |+b""
-25 25 | bytes(b"foo")
-26 26 | bytes(b"""
-27 27 | foo""")
+22 22 | str("foo")
+23 23 | str("""
+24 24 | foo""")
+25    |-bytes()
+   25 |+b""
+26 26 | bytes(b"foo")
+27 27 | bytes(b"""
+28 28 | foo""")
 
-UP018.py:25:1: UP018 [*] Unnecessary call to `bytes`
+UP018.py:26:1: UP018 [*] Unnecessary call to `bytes`
    |
-25 | foo""")
-26 | bytes()
-27 | bytes(b"foo")
+26 | foo""")
+27 | bytes()
+28 | bytes(b"foo")
    | ^^^^^^^^^^^^^ UP018
-28 | bytes(b"""
-29 | foo""")
+29 | bytes(b"""
+30 | foo""")
    |
-   = help: Replace with `bytes`
+   = help: Replace with empty bytes
 
 ℹ Suggested fix
-22 22 | str("""
-23 23 | foo""")
-24 24 | bytes()
-25    |-bytes(b"foo")
-   25 |+b"foo"
-26 26 | bytes(b"""
-27 27 | foo""")
+23 23 | str("""
+24 24 | foo""")
+25 25 | bytes()
+26    |-bytes(b"foo")
+   26 |+b"foo"
+27 27 | bytes(b"""
+28 28 | foo""")
+29 29 | f"{str()}"
 
-UP018.py:26:1: UP018 [*] Unnecessary call to `bytes`
+UP018.py:27:1: UP018 [*] Unnecessary call to `bytes`
    |
-26 |   bytes()
-27 |   bytes(b"foo")
-28 | / bytes(b"""
-29 | | foo""")
+27 |   bytes()
+28 |   bytes(b"foo")
+29 | / bytes(b"""
+30 | | foo""")
    | |_______^ UP018
+31 |   f"{str()}"
+   |
+   = help: Replace with empty bytes
+
+ℹ Suggested fix
+24 24 | foo""")
+25 25 | bytes()
+26 26 | bytes(b"foo")
+27    |-bytes(b"""
+28    |-foo""")
+   27 |+b"""
+   28 |+foo"""
+29 29 | f"{str()}"
+
+UP018.py:29:4: UP018 [*] Unnecessary call to `str`
+   |
+29 | bytes(b"""
+30 | foo""")
+31 | f"{str()}"
+   |    ^^^^^ UP018
    |
-   = help: Replace with `bytes`
+   = help: Replace with empty string
 
 ℹ Suggested fix
-23 23 | foo""")
-24 24 | bytes()
-25 25 | bytes(b"foo")
-26    |-bytes(b"""
-27    |-foo""")
-   26 |+b"""
-   27 |+foo"""
+26 26 | bytes(b"foo")
+27 27 | bytes(b"""
+28 28 | foo""")
+29    |-f"{str()}"
+   29 |+f"{''}"
 
 
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP020.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP020.py.snap
index b219ec28d9636..e4a5fedc988fb 100644
--- a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP020.py.snap
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP020.py.snap
@@ -28,5 +28,6 @@ UP020.py:8:6: UP020 Use builtin `open`
    |      ^^^^^^^^^^^^^ UP020
 11 |     print(f.read())
    |
+   = help: Replace with builtin `open`
 
 
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP030_0.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP030_0.py.snap
index 986ccd2c0a0b9..009c9d9f7d7cb 100644
--- a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP030_0.py.snap
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP030_0.py.snap
@@ -197,7 +197,7 @@ UP030_0.py:22:1: UP030 [*] Use implicit references for positional format fields
 24 24 | '{' '0}'.format(1)
 25 25 | 
 
-UP030_0.py:24:1: UP030 [*] Use implicit references for positional format fields
+UP030_0.py:24:1: UP030 Use implicit references for positional format fields
    |
 24 | "\N{snowman} {0}".format(1)
 25 | 
@@ -208,7 +208,7 @@ UP030_0.py:24:1: UP030 [*] Use implicit references for positional format fields
    |
    = help: Remove explicit positional indices
 
-UP030_0.py:29:5: UP030 [*] Use implicit references for positional format fields
+UP030_0.py:29:5: UP030 Use implicit references for positional format fields
    |
 29 |   # https://github.com/Instagram/LibCST/issues/846
 30 |   print(
@@ -220,7 +220,7 @@ UP030_0.py:29:5: UP030 [*] Use implicit references for positional format fields
    |
    = help: Remove explicit positional indices
 
-UP030_0.py:34:5: UP030 [*] Use implicit references for positional format fields
+UP030_0.py:34:5: UP030 Use implicit references for positional format fields
    |
 34 |   print(
 35 |       'foo{0}'  # ohai\n"
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP030_2.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP030_2.py.snap
index 0838b6cb7008d..4154088277b70 100644
--- a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP030_2.py.snap
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP030_2.py.snap
@@ -85,7 +85,7 @@ UP030_2.py:12:1: UP030 [*] Use implicit references for positional format fields
 14 14 | "{1}_{0}".format(*args)
 15 15 | 
 
-UP030_2.py:14:1: UP030 [*] Use implicit references for positional format fields
+UP030_2.py:14:1: UP030 Use implicit references for positional format fields
    |
 14 | "{0}_{1}".format(1, *args)
 15 | 
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP032.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP032_0.py.snap
similarity index 83%
rename from crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP032.py.snap
rename to crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP032_0.py.snap
index 2560a9f4ce235..fe27ef4530558 100644
--- a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP032.py.snap
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP032_0.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/pyupgrade/mod.rs
 ---
-UP032.py:5:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:5:1: UP032 [*] Use f-string instead of `format` call
   |
 5 | ###
 6 | 
@@ -22,7 +22,7 @@ UP032.py:5:1: UP032 [*] Use f-string instead of `format` call
 7 7 | "{1} {0}".format(a, b)
 8 8 | 
 
-UP032.py:7:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:7:1: UP032 [*] Use f-string instead of `format` call
    |
  7 | "{} {}".format(a, b)
  8 | 
@@ -43,7 +43,7 @@ UP032.py:7:1: UP032 [*] Use f-string instead of `format` call
 9 9 | "{x.y}".format(x=z)
 10 10 | 
 
-UP032.py:9:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:9:1: UP032 [*] Use f-string instead of `format` call
    |
  9 | "{1} {0}".format(a, b)
 10 | 
@@ -64,7 +64,7 @@ UP032.py:9:1: UP032 [*] Use f-string instead of `format` call
 11 11 | "{.x} {.y}".format(a, b)
 12 12 | 
 
-UP032.py:11:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:11:1: UP032 [*] Use f-string instead of `format` call
    |
 11 | "{x.y}".format(x=z)
 12 | 
@@ -85,7 +85,7 @@ UP032.py:11:1: UP032 [*] Use f-string instead of `format` call
 13 13 | "{} {}".format(a.b, c.d)
 14 14 | 
 
-UP032.py:13:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:13:1: UP032 [*] Use f-string instead of `format` call
    |
 13 | "{.x} {.y}".format(a, b)
 14 | 
@@ -106,7 +106,7 @@ UP032.py:13:1: UP032 [*] Use f-string instead of `format` call
 15 15 | "{}".format(a())
 16 16 | 
 
-UP032.py:15:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:15:1: UP032 [*] Use f-string instead of `format` call
    |
 15 | "{} {}".format(a.b, c.d)
 16 | 
@@ -127,7 +127,7 @@ UP032.py:15:1: UP032 [*] Use f-string instead of `format` call
 17 17 | "{}".format(a.b())
 18 18 | 
 
-UP032.py:17:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:17:1: UP032 [*] Use f-string instead of `format` call
    |
 17 | "{}".format(a())
 18 | 
@@ -148,7 +148,7 @@ UP032.py:17:1: UP032 [*] Use f-string instead of `format` call
 19 19 | "{}".format(a.b().c())
 20 20 | 
 
-UP032.py:19:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:19:1: UP032 [*] Use f-string instead of `format` call
    |
 19 | "{}".format(a.b())
 20 | 
@@ -169,7 +169,7 @@ UP032.py:19:1: UP032 [*] Use f-string instead of `format` call
 21 21 | "hello {}!".format(name)
 22 22 | 
 
-UP032.py:21:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:21:1: UP032 [*] Use f-string instead of `format` call
    |
 21 | "{}".format(a.b().c())
 22 | 
@@ -190,7 +190,7 @@ UP032.py:21:1: UP032 [*] Use f-string instead of `format` call
 23 23 | "{}{b}{}".format(a, c, b=b)
 24 24 | 
 
-UP032.py:23:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:23:1: UP032 [*] Use f-string instead of `format` call
    |
 23 | "hello {}!".format(name)
 24 | 
@@ -211,7 +211,7 @@ UP032.py:23:1: UP032 [*] Use f-string instead of `format` call
 25 25 | "{}".format(0x0)
 26 26 | 
 
-UP032.py:25:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:25:1: UP032 [*] Use f-string instead of `format` call
    |
 25 | "{}{b}{}".format(a, c, b=b)
 26 | 
@@ -232,7 +232,7 @@ UP032.py:25:1: UP032 [*] Use f-string instead of `format` call
 27 27 | "{} {}".format(a, b)
 28 28 | 
 
-UP032.py:27:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:27:1: UP032 [*] Use f-string instead of `format` call
    |
 27 | "{}".format(0x0)
 28 | 
@@ -253,7 +253,7 @@ UP032.py:27:1: UP032 [*] Use f-string instead of `format` call
 29 29 | """{} {}""".format(a, b)
 30 30 | 
 
-UP032.py:29:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:29:1: UP032 [*] Use f-string instead of `format` call
    |
 29 | "{} {}".format(a, b)
 30 | 
@@ -274,7 +274,7 @@ UP032.py:29:1: UP032 [*] Use f-string instead of `format` call
 31 31 | "foo{}".format(1)
 32 32 | 
 
-UP032.py:31:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:31:1: UP032 [*] Use f-string instead of `format` call
    |
 31 | """{} {}""".format(a, b)
 32 | 
@@ -295,7 +295,7 @@ UP032.py:31:1: UP032 [*] Use f-string instead of `format` call
 33 33 | r"foo{}".format(1)
 34 34 | 
 
-UP032.py:33:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:33:1: UP032 [*] Use f-string instead of `format` call
    |
 33 | "foo{}".format(1)
 34 | 
@@ -316,7 +316,7 @@ UP032.py:33:1: UP032 [*] Use f-string instead of `format` call
 35 35 | x = "{a}".format(a=1)
 36 36 | 
 
-UP032.py:35:5: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:35:5: UP032 [*] Use f-string instead of `format` call
    |
 35 | r"foo{}".format(1)
 36 | 
@@ -337,7 +337,7 @@ UP032.py:35:5: UP032 [*] Use f-string instead of `format` call
 37 37 | print("foo {} ".format(x))
 38 38 | 
 
-UP032.py:37:7: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:37:7: UP032 [*] Use f-string instead of `format` call
    |
 37 | x = "{a}".format(a=1)
 38 | 
@@ -358,7 +358,7 @@ UP032.py:37:7: UP032 [*] Use f-string instead of `format` call
 39 39 | "{a[b]}".format(a=a)
 40 40 | 
 
-UP032.py:39:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:39:1: UP032 [*] Use f-string instead of `format` call
    |
 39 | print("foo {} ".format(x))
 40 | 
@@ -379,7 +379,7 @@ UP032.py:39:1: UP032 [*] Use f-string instead of `format` call
 41 41 | "{a.a[b]}".format(a=a)
 42 42 | 
 
-UP032.py:41:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:41:1: UP032 [*] Use f-string instead of `format` call
    |
 41 | "{a[b]}".format(a=a)
 42 | 
@@ -400,7 +400,7 @@ UP032.py:41:1: UP032 [*] Use f-string instead of `format` call
 43 43 | "{}{{}}{}".format(escaped, y)
 44 44 | 
 
-UP032.py:43:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:43:1: UP032 [*] Use f-string instead of `format` call
    |
 43 | "{a.a[b]}".format(a=a)
 44 | 
@@ -421,7 +421,7 @@ UP032.py:43:1: UP032 [*] Use f-string instead of `format` call
 45 45 | "{}".format(a)
 46 46 | 
 
-UP032.py:45:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:45:1: UP032 [*] Use f-string instead of `format` call
    |
 45 | "{}{{}}{}".format(escaped, y)
 46 | 
@@ -442,7 +442,7 @@ UP032.py:45:1: UP032 [*] Use f-string instead of `format` call
 47 47 | '({}={{0!e}})'.format(a)
 48 48 | 
 
-UP032.py:47:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:47:1: UP032 [*] Use f-string instead of `format` call
    |
 47 | "{}".format(a)
 48 | 
@@ -463,7 +463,7 @@ UP032.py:47:1: UP032 [*] Use f-string instead of `format` call
 49 49 | "{[b]}".format(a)
 50 50 | 
 
-UP032.py:49:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:49:1: UP032 [*] Use f-string instead of `format` call
    |
 49 | '({}={{0!e}})'.format(a)
 50 | 
@@ -484,7 +484,7 @@ UP032.py:49:1: UP032 [*] Use f-string instead of `format` call
 51 51 | '{[b]}'.format(a)
 52 52 | 
 
-UP032.py:51:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:51:1: UP032 [*] Use f-string instead of `format` call
    |
 51 | "{[b]}".format(a)
 52 | 
@@ -505,7 +505,7 @@ UP032.py:51:1: UP032 [*] Use f-string instead of `format` call
 53 53 | """{[b]}""".format(a)
 54 54 | 
 
-UP032.py:53:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:53:1: UP032 [*] Use f-string instead of `format` call
    |
 53 | '{[b]}'.format(a)
 54 | 
@@ -526,7 +526,7 @@ UP032.py:53:1: UP032 [*] Use f-string instead of `format` call
 55 55 | '''{[b]}'''.format(a)
 56 56 | 
 
-UP032.py:55:1: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:55:1: UP032 [*] Use f-string instead of `format` call
    |
 55 | """{[b]}""".format(a)
 56 | 
@@ -547,7 +547,7 @@ UP032.py:55:1: UP032 [*] Use f-string instead of `format` call
 57 57 | ###
 58 58 | # Non-errors
 
-UP032.py:100:11: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:100:11: UP032 [*] Use f-string instead of `format` call
     |
 100 | def d(osname, version, release):
 101 |     return"{}-{}.{}".format(osname, version, release)
@@ -565,7 +565,7 @@ UP032.py:100:11: UP032 [*] Use f-string instead of `format` call
 102 102 | 
 103 103 | def e():
 
-UP032.py:104:10: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:104:10: UP032 [*] Use f-string instead of `format` call
     |
 104 | def e():
 105 |     yield"{}".format(1)
@@ -583,7 +583,7 @@ UP032.py:104:10: UP032 [*] Use f-string instead of `format` call
 106 106 | 
 107 107 | assert"{}".format(1)
 
-UP032.py:107:7: UP032 [*] Use f-string instead of `format` call
+UP032_0.py:107:7: UP032 [*] Use f-string instead of `format` call
     |
 107 | assert"{}".format(1)
     |       ^^^^^^^^^^^^^^ UP032
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP032_1.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP032_1.py.snap
new file mode 100644
index 0000000000000..ead382b08ce9d
--- /dev/null
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP032_1.py.snap
@@ -0,0 +1,15 @@
+---
+source: crates/ruff/src/rules/pyupgrade/mod.rs
+---
+UP032_1.py:1:1: UP032 [*] Use f-string instead of `format` call
+  |
+1 | "{} {}".format(a, b)  # Intentionally at start-of-file, to ensure graceful handling.
+  | ^^^^^^^^^^^^^^^^^^^^ UP032
+  |
+  = help: Convert to f-string
+
+ℹ Suggested fix
+1   |-"{} {}".format(a, b)  # Intentionally at start-of-file, to ensure graceful handling.
+  1 |+f"{a} {b}"  # Intentionally at start-of-file, to ensure graceful handling.
+
+
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP032_2.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP032_2.py.snap
new file mode 100644
index 0000000000000..572576e1ee29c
--- /dev/null
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP032_2.py.snap
@@ -0,0 +1,443 @@
+---
+source: crates/ruff/src/rules/pyupgrade/mod.rs
+---
+UP032_2.py:2:1: UP032 [*] Use f-string instead of `format` call
+  |
+2 | # Errors
+3 | "{.real}".format(1)
+  | ^^^^^^^^^^^^^^^^^^^ UP032
+4 | "{0.real}".format(1)
+5 | "{a.real}".format(a=1)
+  |
+  = help: Convert to f-string
+
+ℹ Suggested fix
+1 1 | # Errors
+2   |-"{.real}".format(1)
+  2 |+f"{(1).real}"
+3 3 | "{0.real}".format(1)
+4 4 | "{a.real}".format(a=1)
+5 5 | 
+
+UP032_2.py:3:1: UP032 [*] Use f-string instead of `format` call
+  |
+3 | # Errors
+4 | "{.real}".format(1)
+5 | "{0.real}".format(1)
+  | ^^^^^^^^^^^^^^^^^^^^ UP032
+6 | "{a.real}".format(a=1)
+  |
+  = help: Convert to f-string
+
+ℹ Suggested fix
+1 1 | # Errors
+2 2 | "{.real}".format(1)
+3   |-"{0.real}".format(1)
+  3 |+f"{(1).real}"
+4 4 | "{a.real}".format(a=1)
+5 5 | 
+6 6 | "{.real}".format(1.0)
+
+UP032_2.py:4:1: UP032 [*] Use f-string instead of `format` call
+  |
+4 | "{.real}".format(1)
+5 | "{0.real}".format(1)
+6 | "{a.real}".format(a=1)
+  | ^^^^^^^^^^^^^^^^^^^^^^ UP032
+7 | 
+8 | "{.real}".format(1.0)
+  |
+  = help: Convert to f-string
+
+ℹ Suggested fix
+1 1 | # Errors
+2 2 | "{.real}".format(1)
+3 3 | "{0.real}".format(1)
+4   |-"{a.real}".format(a=1)
+  4 |+f"{(1).real}"
+5 5 | 
+6 6 | "{.real}".format(1.0)
+7 7 | "{0.real}".format(1.0)
+
+UP032_2.py:6:1: UP032 [*] Use f-string instead of `format` call
+   |
+ 6 | "{a.real}".format(a=1)
+ 7 | 
+ 8 | "{.real}".format(1.0)
+   | ^^^^^^^^^^^^^^^^^^^^^ UP032
+ 9 | "{0.real}".format(1.0)
+10 | "{a.real}".format(a=1.0)
+   |
+   = help: Convert to f-string
+
+ℹ Suggested fix
+3 3 | "{0.real}".format(1)
+4 4 | "{a.real}".format(a=1)
+5 5 | 
+6   |-"{.real}".format(1.0)
+  6 |+f"{1.0.real}"
+7 7 | "{0.real}".format(1.0)
+8 8 | "{a.real}".format(a=1.0)
+9 9 | 
+
+UP032_2.py:7:1: UP032 [*] Use f-string instead of `format` call
+  |
+7 | "{.real}".format(1.0)
+8 | "{0.real}".format(1.0)
+  | ^^^^^^^^^^^^^^^^^^^^^^ UP032
+9 | "{a.real}".format(a=1.0)
+  |
+  = help: Convert to f-string
+
+ℹ Suggested fix
+4 4 | "{a.real}".format(a=1)
+5 5 | 
+6 6 | "{.real}".format(1.0)
+7   |-"{0.real}".format(1.0)
+  7 |+f"{1.0.real}"
+8 8 | "{a.real}".format(a=1.0)
+9 9 | 
+10 10 | "{.real}".format(1j)
+
+UP032_2.py:8:1: UP032 [*] Use f-string instead of `format` call
+   |
+ 8 | "{.real}".format(1.0)
+ 9 | "{0.real}".format(1.0)
+10 | "{a.real}".format(a=1.0)
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ UP032
+11 | 
+12 | "{.real}".format(1j)
+   |
+   = help: Convert to f-string
+
+ℹ Suggested fix
+5 5 | 
+6 6 | "{.real}".format(1.0)
+7 7 | "{0.real}".format(1.0)
+8   |-"{a.real}".format(a=1.0)
+  8 |+f"{1.0.real}"
+9 9 | 
+10 10 | "{.real}".format(1j)
+11 11 | "{0.real}".format(1j)
+
+UP032_2.py:10:1: UP032 [*] Use f-string instead of `format` call
+   |
+10 | "{a.real}".format(a=1.0)
+11 | 
+12 | "{.real}".format(1j)
+   | ^^^^^^^^^^^^^^^^^^^^ UP032
+13 | "{0.real}".format(1j)
+14 | "{a.real}".format(a=1j)
+   |
+   = help: Convert to f-string
+
+ℹ Suggested fix
+7  7  | "{0.real}".format(1.0)
+8  8  | "{a.real}".format(a=1.0)
+9  9  | 
+10    |-"{.real}".format(1j)
+   10 |+f"{1j.real}"
+11 11 | "{0.real}".format(1j)
+12 12 | "{a.real}".format(a=1j)
+13 13 | 
+
+UP032_2.py:11:1: UP032 [*] Use f-string instead of `format` call
+   |
+11 | "{.real}".format(1j)
+12 | "{0.real}".format(1j)
+   | ^^^^^^^^^^^^^^^^^^^^^ UP032
+13 | "{a.real}".format(a=1j)
+   |
+   = help: Convert to f-string
+
+ℹ Suggested fix
+8  8  | "{a.real}".format(a=1.0)
+9  9  | 
+10 10 | "{.real}".format(1j)
+11    |-"{0.real}".format(1j)
+   11 |+f"{1j.real}"
+12 12 | "{a.real}".format(a=1j)
+13 13 | 
+14 14 | "{.real}".format(0b01)
+
+UP032_2.py:12:1: UP032 [*] Use f-string instead of `format` call
+   |
+12 | "{.real}".format(1j)
+13 | "{0.real}".format(1j)
+14 | "{a.real}".format(a=1j)
+   | ^^^^^^^^^^^^^^^^^^^^^^^ UP032
+15 | 
+16 | "{.real}".format(0b01)
+   |
+   = help: Convert to f-string
+
+ℹ Suggested fix
+9  9  | 
+10 10 | "{.real}".format(1j)
+11 11 | "{0.real}".format(1j)
+12    |-"{a.real}".format(a=1j)
+   12 |+f"{1j.real}"
+13 13 | 
+14 14 | "{.real}".format(0b01)
+15 15 | "{0.real}".format(0b01)
+
+UP032_2.py:14:1: UP032 [*] Use f-string instead of `format` call
+   |
+14 | "{a.real}".format(a=1j)
+15 | 
+16 | "{.real}".format(0b01)
+   | ^^^^^^^^^^^^^^^^^^^^^^ UP032
+17 | "{0.real}".format(0b01)
+18 | "{a.real}".format(a=0b01)
+   |
+   = help: Convert to f-string
+
+ℹ Suggested fix
+11 11 | "{0.real}".format(1j)
+12 12 | "{a.real}".format(a=1j)
+13 13 | 
+14    |-"{.real}".format(0b01)
+   14 |+f"{0b01.real}"
+15 15 | "{0.real}".format(0b01)
+16 16 | "{a.real}".format(a=0b01)
+17 17 | 
+
+UP032_2.py:15:1: UP032 [*] Use f-string instead of `format` call
+   |
+15 | "{.real}".format(0b01)
+16 | "{0.real}".format(0b01)
+   | ^^^^^^^^^^^^^^^^^^^^^^^ UP032
+17 | "{a.real}".format(a=0b01)
+   |
+   = help: Convert to f-string
+
+ℹ Suggested fix
+12 12 | "{a.real}".format(a=1j)
+13 13 | 
+14 14 | "{.real}".format(0b01)
+15    |-"{0.real}".format(0b01)
+   15 |+f"{0b01.real}"
+16 16 | "{a.real}".format(a=0b01)
+17 17 | 
+18 18 | "{}".format(1 + 2)
+
+UP032_2.py:16:1: UP032 [*] Use f-string instead of `format` call
+   |
+16 | "{.real}".format(0b01)
+17 | "{0.real}".format(0b01)
+18 | "{a.real}".format(a=0b01)
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^ UP032
+19 | 
+20 | "{}".format(1 + 2)
+   |
+   = help: Convert to f-string
+
+ℹ Suggested fix
+13 13 | 
+14 14 | "{.real}".format(0b01)
+15 15 | "{0.real}".format(0b01)
+16    |-"{a.real}".format(a=0b01)
+   16 |+f"{0b01.real}"
+17 17 | 
+18 18 | "{}".format(1 + 2)
+19 19 | "{}".format([1, 2])
+
+UP032_2.py:18:1: UP032 [*] Use f-string instead of `format` call
+   |
+18 | "{a.real}".format(a=0b01)
+19 | 
+20 | "{}".format(1 + 2)
+   | ^^^^^^^^^^^^^^^^^^ UP032
+21 | "{}".format([1, 2])
+22 | "{}".format({1, 2})
+   |
+   = help: Convert to f-string
+
+ℹ Suggested fix
+15 15 | "{0.real}".format(0b01)
+16 16 | "{a.real}".format(a=0b01)
+17 17 | 
+18    |-"{}".format(1 + 2)
+   18 |+f"{1 + 2}"
+19 19 | "{}".format([1, 2])
+20 20 | "{}".format({1, 2})
+21 21 | "{}".format({1: 2, 3: 4})
+
+UP032_2.py:19:1: UP032 [*] Use f-string instead of `format` call
+   |
+19 | "{}".format(1 + 2)
+20 | "{}".format([1, 2])
+   | ^^^^^^^^^^^^^^^^^^^ UP032
+21 | "{}".format({1, 2})
+22 | "{}".format({1: 2, 3: 4})
+   |
+   = help: Convert to f-string
+
+ℹ Suggested fix
+16 16 | "{a.real}".format(a=0b01)
+17 17 | 
+18 18 | "{}".format(1 + 2)
+19    |-"{}".format([1, 2])
+   19 |+f"{[1, 2]}"
+20 20 | "{}".format({1, 2})
+21 21 | "{}".format({1: 2, 3: 4})
+22 22 | "{}".format((i for i in range(2)))
+
+UP032_2.py:20:1: UP032 [*] Use f-string instead of `format` call
+   |
+20 | "{}".format(1 + 2)
+21 | "{}".format([1, 2])
+22 | "{}".format({1, 2})
+   | ^^^^^^^^^^^^^^^^^^^ UP032
+23 | "{}".format({1: 2, 3: 4})
+24 | "{}".format((i for i in range(2)))
+   |
+   = help: Convert to f-string
+
+ℹ Suggested fix
+17 17 | 
+18 18 | "{}".format(1 + 2)
+19 19 | "{}".format([1, 2])
+20    |-"{}".format({1, 2})
+   20 |+f"{({1, 2})}"
+21 21 | "{}".format({1: 2, 3: 4})
+22 22 | "{}".format((i for i in range(2)))
+23 23 | 
+
+UP032_2.py:21:1: UP032 [*] Use f-string instead of `format` call
+   |
+21 | "{}".format([1, 2])
+22 | "{}".format({1, 2})
+23 | "{}".format({1: 2, 3: 4})
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^ UP032
+24 | "{}".format((i for i in range(2)))
+   |
+   = help: Convert to f-string
+
+ℹ Suggested fix
+18 18 | "{}".format(1 + 2)
+19 19 | "{}".format([1, 2])
+20 20 | "{}".format({1, 2})
+21    |-"{}".format({1: 2, 3: 4})
+   21 |+f"{({1: 2, 3: 4})}"
+22 22 | "{}".format((i for i in range(2)))
+23 23 | 
+24 24 | "{.real}".format(1 + 2)
+
+UP032_2.py:22:1: UP032 [*] Use f-string instead of `format` call
+   |
+22 | "{}".format({1, 2})
+23 | "{}".format({1: 2, 3: 4})
+24 | "{}".format((i for i in range(2)))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ UP032
+25 | 
+26 | "{.real}".format(1 + 2)
+   |
+   = help: Convert to f-string
+
+ℹ Suggested fix
+19 19 | "{}".format([1, 2])
+20 20 | "{}".format({1, 2})
+21 21 | "{}".format({1: 2, 3: 4})
+22    |-"{}".format((i for i in range(2)))
+   22 |+f"{(i for i in range(2))}"
+23 23 | 
+24 24 | "{.real}".format(1 + 2)
+25 25 | "{.real}".format([1, 2])
+
+UP032_2.py:24:1: UP032 [*] Use f-string instead of `format` call
+   |
+24 | "{}".format((i for i in range(2)))
+25 | 
+26 | "{.real}".format(1 + 2)
+   | ^^^^^^^^^^^^^^^^^^^^^^^ UP032
+27 | "{.real}".format([1, 2])
+28 | "{.real}".format({1, 2})
+   |
+   = help: Convert to f-string
+
+ℹ Suggested fix
+21 21 | "{}".format({1: 2, 3: 4})
+22 22 | "{}".format((i for i in range(2)))
+23 23 | 
+24    |-"{.real}".format(1 + 2)
+   24 |+f"{(1 + 2).real}"
+25 25 | "{.real}".format([1, 2])
+26 26 | "{.real}".format({1, 2})
+27 27 | "{.real}".format({1: 2, 3: 4})
+
+UP032_2.py:25:1: UP032 [*] Use f-string instead of `format` call
+   |
+25 | "{.real}".format(1 + 2)
+26 | "{.real}".format([1, 2])
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ UP032
+27 | "{.real}".format({1, 2})
+28 | "{.real}".format({1: 2, 3: 4})
+   |
+   = help: Convert to f-string
+
+ℹ Suggested fix
+22 22 | "{}".format((i for i in range(2)))
+23 23 | 
+24 24 | "{.real}".format(1 + 2)
+25    |-"{.real}".format([1, 2])
+   25 |+f"{[1, 2].real}"
+26 26 | "{.real}".format({1, 2})
+27 27 | "{.real}".format({1: 2, 3: 4})
+28 28 | "{}".format((i for i in range(2)))
+
+UP032_2.py:26:1: UP032 [*] Use f-string instead of `format` call
+   |
+26 | "{.real}".format(1 + 2)
+27 | "{.real}".format([1, 2])
+28 | "{.real}".format({1, 2})
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ UP032
+29 | "{.real}".format({1: 2, 3: 4})
+30 | "{}".format((i for i in range(2)))
+   |
+   = help: Convert to f-string
+
+ℹ Suggested fix
+23 23 | 
+24 24 | "{.real}".format(1 + 2)
+25 25 | "{.real}".format([1, 2])
+26    |-"{.real}".format({1, 2})
+   26 |+f"{({1, 2}).real}"
+27 27 | "{.real}".format({1: 2, 3: 4})
+28 28 | "{}".format((i for i in range(2)))
+
+UP032_2.py:27:1: UP032 [*] Use f-string instead of `format` call
+   |
+27 | "{.real}".format([1, 2])
+28 | "{.real}".format({1, 2})
+29 | "{.real}".format({1: 2, 3: 4})
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ UP032
+30 | "{}".format((i for i in range(2)))
+   |
+   = help: Convert to f-string
+
+ℹ Suggested fix
+24 24 | "{.real}".format(1 + 2)
+25 25 | "{.real}".format([1, 2])
+26 26 | "{.real}".format({1, 2})
+27    |-"{.real}".format({1: 2, 3: 4})
+   27 |+f"{({1: 2, 3: 4}).real}"
+28 28 | "{}".format((i for i in range(2)))
+
+UP032_2.py:28:1: UP032 [*] Use f-string instead of `format` call
+   |
+28 | "{.real}".format({1, 2})
+29 | "{.real}".format({1: 2, 3: 4})
+30 | "{}".format((i for i in range(2)))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ UP032
+   |
+   = help: Convert to f-string
+
+ℹ Suggested fix
+25 25 | "{.real}".format([1, 2])
+26 26 | "{.real}".format({1, 2})
+27 27 | "{.real}".format({1: 2, 3: 4})
+28    |-"{}".format((i for i in range(2)))
+   28 |+f"{(i for i in range(2))}"
+
+
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP035.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP035.py.snap
index c57bb255da822..64d92cbd7431b 100644
--- a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP035.py.snap
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP035.py.snap
@@ -418,5 +418,6 @@ UP035.py:46:10: UP035 Import from `collections.abc` instead: `Mapping`
 50 |   
 51 |   # OK
    |
+   = help: Import from `collections.abc`
 
 
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP036_5.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP036_5.py.snap
new file mode 100644
index 0000000000000..7deb2813ac60a
--- /dev/null
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP036_5.py.snap
@@ -0,0 +1,89 @@
+---
+source: crates/ruff/src/rules/pyupgrade/mod.rs
+---
+UP036_5.py:3:1: UP036 [*] Version block is outdated for minimum Python version
+   |
+ 3 |   import sys
+ 4 |   
+ 5 | / if sys.version_info < (3, 8):
+ 6 | | 
+ 7 | |     def a():
+ 8 | |         if b:
+ 9 | |             print(1)
+10 | |         elif c:
+11 | |             print(2)
+12 | |         return None
+13 | | 
+14 | | else:
+15 | |     pass
+   | |________^ UP036
+   |
+   = help: Remove outdated version block
+
+ℹ Suggested fix
+1  1  | import sys
+2  2  | 
+3     |-if sys.version_info < (3, 8):
+4     |-
+5     |-    def a():
+6     |-        if b:
+7     |-            print(1)
+8     |-        elif c:
+9     |-            print(2)
+10    |-        return None
+11    |-
+12    |-else:
+13    |-    pass
+   3  |+pass
+14 4  | 
+15 5  | 
+16 6  | import sys
+
+UP036_5.py:18:1: UP036 [*] Version block is outdated for minimum Python version
+   |
+18 |   import sys
+19 |   
+20 | / if sys.version_info < (3, 8):
+21 | |     pass
+22 | | 
+23 | | else:
+24 | | 
+25 | |     def a():
+26 | |         if b:
+27 | |             print(1)
+28 | |         elif c:
+29 | |             print(2)
+30 | |         else:
+31 | |             print(3)
+32 | |         return None
+   | |___________________^ UP036
+   |
+   = help: Remove outdated version block
+
+ℹ Suggested fix
+15 15 | 
+16 16 | import sys
+17 17 | 
+18    |-if sys.version_info < (3, 8):
+19    |-    pass
+20    |-
+21    |-else:
+22    |-
+23    |-    def a():
+24    |-        if b:
+25    |-            print(1)
+26    |-        elif c:
+27    |-            print(2)
+28    |-        else:
+29    |-            print(3)
+30    |-        return None
+   18 |+def a():
+   19 |+    if b:
+   20 |+        print(1)
+   21 |+    elif c:
+   22 |+        print(2)
+   23 |+    else:
+   24 |+        print(3)
+   25 |+    return None
+
+
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__datetime_utc_alias_py311.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__datetime_utc_alias_py311.snap
index 5aace83b437dd..65807c0e0f339 100644
--- a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__datetime_utc_alias_py311.snap
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__datetime_utc_alias_py311.snap
@@ -8,6 +8,7 @@ UP017.py:7:7: UP017 Use `datetime.UTC` alias
   |       ^^^^^^^^^^^^ UP017
 9 | print(tz.utc)
   |
+  = help: Convert to `datetime.UTC` alias
 
 UP017.py:8:7: UP017 Use `datetime.UTC` alias
    |
@@ -18,6 +19,7 @@ UP017.py:8:7: UP017 Use `datetime.UTC` alias
 11 | 
 12 | print(datetime.timezone.utc)
    |
+   = help: Convert to `datetime.UTC` alias
 
 UP017.py:10:7: UP017 [*] Use `datetime.UTC` alias
    |
@@ -43,5 +45,6 @@ UP017.py:11:7: UP017 Use `datetime.UTC` alias
 12 | print(dt.timezone.utc)
    |       ^^^^^^^^^^^^^^^ UP017
    |
+   = help: Convert to `datetime.UTC` alias
 
 
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__future_annotations_pep_585_p37.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__future_annotations_pep_585_p37.snap
index 6f8585b8ef3be..d60757c3e0b45 100644
--- a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__future_annotations_pep_585_p37.snap
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__future_annotations_pep_585_p37.snap
@@ -1,16 +1,16 @@
 ---
 source: crates/ruff/src/rules/pyupgrade/mod.rs
 ---
-future_annotations.py:34:18: UP006 [*] Use `list` instead of `List` for type annotations
+future_annotations.py:34:18: UP006 [*] Use `list` instead of `List` for type annotation
    |
 34 | def f(x: int) -> List[int]:
    |                  ^^^^ UP006
 35 |     y = List[int]()
 36 |     y.append(x)
    |
-   = help: Replace `List` with `list`
+   = help: Replace with `list`
 
-ℹ Suggested fix
+ℹ Fix
 31 31 |         return cls(x=0, y=0)
 32 32 | 
 33 33 | 
diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__future_annotations_pep_585_py310.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__future_annotations_pep_585_py310.snap
index 6e9bf5fb17e6f..74775747022c8 100644
--- a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__future_annotations_pep_585_py310.snap
+++ b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__future_annotations_pep_585_py310.snap
@@ -1,16 +1,16 @@
 ---
 source: crates/ruff/src/rules/pyupgrade/mod.rs
 ---
-future_annotations.py:34:18: UP006 [*] Use `list` instead of `List` for type annotations
+future_annotations.py:34:18: UP006 [*] Use `list` instead of `List` for type annotation
    |
 34 | def f(x: int) -> List[int]:
    |                  ^^^^ UP006
 35 |     y = List[int]()
 36 |     y.append(x)
    |
-   = help: Replace `List` with `list`
+   = help: Replace with `list`
 
-ℹ Suggested fix
+ℹ Fix
 31 31 |         return cls(x=0, y=0)
 32 32 | 
 33 33 | 
@@ -20,7 +20,7 @@ future_annotations.py:34:18: UP006 [*] Use `list` instead of `List` for type ann
 36 36 |     y.append(x)
 37 37 |     return y
 
-future_annotations.py:35:9: UP006 [*] Use `list` instead of `List` for type annotations
+future_annotations.py:35:9: UP006 [*] Use `list` instead of `List` for type annotation
    |
 35 | def f(x: int) -> List[int]:
 36 |     y = List[int]()
@@ -28,9 +28,9 @@ future_annotations.py:35:9: UP006 [*] Use `list` instead of `List` for type anno
 37 |     y.append(x)
 38 |     return y
    |
-   = help: Replace `List` with `list`
+   = help: Replace with `list`
 
-ℹ Suggested fix
+ℹ Fix
 32 32 | 
 33 33 | 
 34 34 | def f(x: int) -> List[int]:
@@ -40,32 +40,32 @@ future_annotations.py:35:9: UP006 [*] Use `list` instead of `List` for type anno
 37 37 |     return y
 38 38 | 
 
-future_annotations.py:42:27: UP006 [*] Use `list` instead of `List` for type annotations
+future_annotations.py:42:27: UP006 [*] Use `list` instead of `List` for type annotation
    |
 42 | x: Optional[int] = None
 43 | 
 44 | MyList: TypeAlias = Union[List[int], List[str]]
    |                           ^^^^ UP006
    |
-   = help: Replace `List` with `list`
+   = help: Replace with `list`
 
-ℹ Suggested fix
+ℹ Fix
 39 39 | 
 40 40 | x: Optional[int] = None
 41 41 | 
 42    |-MyList: TypeAlias = Union[List[int], List[str]]
    42 |+MyList: TypeAlias = Union[list[int], List[str]]
 
-future_annotations.py:42:38: UP006 [*] Use `list` instead of `List` for type annotations
+future_annotations.py:42:38: UP006 [*] Use `list` instead of `List` for type annotation
    |
 42 | x: Optional[int] = None
 43 | 
 44 | MyList: TypeAlias = Union[List[int], List[str]]
    |                                      ^^^^ UP006
    |
-   = help: Replace `List` with `list`
+   = help: Replace with `list`
 
-ℹ Suggested fix
+ℹ Fix
 39 39 | 
 40 40 | x: Optional[int] = None
 41 41 | 
diff --git a/crates/ruff/src/rules/pyupgrade/types.rs b/crates/ruff/src/rules/pyupgrade/types.rs
index b94c983f21967..ab7223aa8e361 100644
--- a/crates/ruff/src/rules/pyupgrade/types.rs
+++ b/crates/ruff/src/rules/pyupgrade/types.rs
@@ -2,7 +2,7 @@ use rustpython_parser::ast::Constant;
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub enum Primitive {
+pub(crate) enum Primitive {
     Bool,
     Str,
     Bytes,
@@ -12,7 +12,7 @@ pub enum Primitive {
 }
 
 impl Primitive {
-    pub const fn from_constant(constant: &Constant) -> Option<Self> {
+    pub(crate) const fn from_constant(constant: &Constant) -> Option<Self> {
         match constant {
             Constant::Bool(_) => Some(Self::Bool),
             Constant::Str(_) => Some(Self::Str),
@@ -24,7 +24,7 @@ impl Primitive {
         }
     }
 
-    pub fn builtin(self) -> String {
+    pub(crate) fn builtin(self) -> String {
         match self {
             Self::Bool => "bool".to_string(),
             Self::Str => "str".to_string(),
diff --git a/crates/ruff/src/rules/ruff/mod.rs b/crates/ruff/src/rules/ruff/mod.rs
index 0be811b724722..40bc686e478e9 100644
--- a/crates/ruff/src/rules/ruff/mod.rs
+++ b/crates/ruff/src/rules/ruff/mod.rs
@@ -4,21 +4,25 @@ pub(crate) mod rules;
 
 #[cfg(test)]
 mod tests {
+    use std::fs;
     use std::path::Path;
 
     use anyhow::Result;
-
     use rustc_hash::FxHashSet;
     use test_case::test_case;
 
+    use ruff_python_ast::source_code::SourceFileBuilder;
+
+    use crate::pyproject_toml::lint_pyproject_toml;
     use crate::registry::Rule;
     use crate::settings::resolve_per_file_ignores;
     use crate::settings::types::PerFileIgnore;
-    use crate::test::test_path;
+    use crate::test::{test_path, test_resource_path};
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::CollectionLiteralConcatenation, Path::new("RUF005.py"); "RUF005")]
-    #[test_case(Rule::AsyncioDanglingTask, Path::new("RUF006.py"); "RUF006")]
+    #[test_case(Rule::ExplicitFStringTypeConversion, Path::new("RUF010.py"))]
+    #[test_case(Rule::CollectionLiteralConcatenation, Path::new("RUF005.py"))]
+    #[test_case(Rule::AsyncioDanglingTask, Path::new("RUF006.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
@@ -46,6 +50,16 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn noqa() -> Result<()> {
+        let diagnostics = test_path(
+            Path::new("ruff/noqa.py"),
+            &settings::Settings::for_rules(vec![Rule::UnusedVariable, Rule::AmbiguousVariableName]),
+        )?;
+        assert_messages!(diagnostics);
+        Ok(())
+    }
+
     #[test]
     fn ruf100_0() -> Result<()> {
         let diagnostics = test_path(
@@ -153,8 +167,8 @@ mod tests {
         Ok(())
     }
 
-    #[test_case(Rule::MutableDataclassDefault, Path::new("RUF008.py"); "RUF008")]
-    #[test_case(Rule::FunctionCallInDataclassDefaultArgument, Path::new("RUF009.py"); "RUF009")]
+    #[test_case(Rule::MutableDataclassDefault, Path::new("RUF008.py"))]
+    #[test_case(Rule::FunctionCallInDataclassDefaultArgument, Path::new("RUF009.py"))]
     fn mutable_defaults(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
@@ -164,4 +178,22 @@ mod tests {
         assert_messages!(snapshot, diagnostics);
         Ok(())
     }
+
+    #[test_case(Rule::InvalidPyprojectToml, Path::new("bleach"))]
+    #[test_case(Rule::InvalidPyprojectToml, Path::new("invalid_author"))]
+    #[test_case(Rule::InvalidPyprojectToml, Path::new("maturin"))]
+    #[test_case(Rule::InvalidPyprojectToml, Path::new("maturin_gh_1615"))]
+    fn invalid_pyproject_toml(rule_code: Rule, path: &Path) -> Result<()> {
+        let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
+        let path = test_resource_path("fixtures")
+            .join("ruff")
+            .join("pyproject_toml")
+            .join(path)
+            .join("pyproject.toml");
+        let contents = fs::read_to_string(path)?;
+        let source_file = SourceFileBuilder::new("pyproject.toml", contents).finish();
+        let messages = lint_pyproject_toml(source_file)?;
+        assert_messages!(snapshot, messages);
+        Ok(())
+    }
 }
diff --git a/crates/ruff/src/rules/ruff/rules/ambiguous_unicode_character.rs b/crates/ruff/src/rules/ruff/rules/ambiguous_unicode_character.rs
index 707fc21db3cf2..65d05f9095b4d 100644
--- a/crates/ruff/src/rules/ruff/rules/ambiguous_unicode_character.rs
+++ b/crates/ruff/src/rules/ruff/rules/ambiguous_unicode_character.rs
@@ -1,19 +1,20 @@
-use once_cell::sync::Lazy;
+use bitflags::bitflags;
 use ruff_text_size::{TextLen, TextRange, TextSize};
-use rustc_hash::FxHashMap;
+use std::fmt;
 
-use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, DiagnosticKind, Edit};
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, DiagnosticKind, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::source_code::Locator;
 
 use crate::registry::AsRule;
+use crate::rules::ruff::rules::confusables::CONFUSABLES;
 use crate::rules::ruff::rules::Context;
-use crate::settings::{flags, Settings};
+use crate::settings::Settings;
 
 #[violation]
 pub struct AmbiguousUnicodeCharacterString {
-    pub confusable: char,
-    pub representant: char,
+    confusable: char,
+    representant: char,
 }
 
 impl AlwaysAutofixableViolation for AmbiguousUnicodeCharacterString {
@@ -24,8 +25,9 @@ impl AlwaysAutofixableViolation for AmbiguousUnicodeCharacterString {
             representant,
         } = self;
         format!(
-            "String contains ambiguous unicode character `{confusable}` (did you mean \
-             `{representant}`?)"
+            "String contains ambiguous {}. Did you mean {}?",
+            NamedUnicode(*confusable),
+            NamedUnicode(*representant)
         )
     }
 
@@ -34,14 +36,18 @@ impl AlwaysAutofixableViolation for AmbiguousUnicodeCharacterString {
             confusable,
             representant,
         } = self;
-        format!("Replace `{confusable}` with `{representant}`")
+        format!(
+            "Replace {} with {}",
+            NamedUnicode(*confusable),
+            NamedUnicode(*representant)
+        )
     }
 }
 
 #[violation]
 pub struct AmbiguousUnicodeCharacterDocstring {
-    pub confusable: char,
-    pub representant: char,
+    confusable: char,
+    representant: char,
 }
 
 impl AlwaysAutofixableViolation for AmbiguousUnicodeCharacterDocstring {
@@ -52,8 +58,9 @@ impl AlwaysAutofixableViolation for AmbiguousUnicodeCharacterDocstring {
             representant,
         } = self;
         format!(
-            "Docstring contains ambiguous unicode character `{confusable}` (did you mean \
-             `{representant}`?)"
+            "Docstring contains ambiguous {}. Did you mean {}?",
+            NamedUnicode(*confusable),
+            NamedUnicode(*representant)
         )
     }
 
@@ -62,14 +69,18 @@ impl AlwaysAutofixableViolation for AmbiguousUnicodeCharacterDocstring {
             confusable,
             representant,
         } = self;
-        format!("Replace `{confusable}` with `{representant}`")
+        format!(
+            "Replace {} with {}",
+            NamedUnicode(*confusable),
+            NamedUnicode(*representant)
+        )
     }
 }
 
 #[violation]
 pub struct AmbiguousUnicodeCharacterComment {
-    pub confusable: char,
-    pub representant: char,
+    confusable: char,
+    representant: char,
 }
 
 impl AlwaysAutofixableViolation for AmbiguousUnicodeCharacterComment {
@@ -80,8 +91,9 @@ impl AlwaysAutofixableViolation for AmbiguousUnicodeCharacterComment {
             representant,
         } = self;
         format!(
-            "Comment contains ambiguous unicode character `{confusable}` (did you mean \
-             `{representant}`?)"
+            "Comment contains ambiguous {}. Did you mean {}?",
+            NamedUnicode(*confusable),
+            NamedUnicode(*representant)
         )
     }
 
@@ -90,1652 +102,182 @@ impl AlwaysAutofixableViolation for AmbiguousUnicodeCharacterComment {
             confusable,
             representant,
         } = self;
-        format!("Replace `{confusable}` with `{representant}`")
+        format!(
+            "Replace {} with {}",
+            NamedUnicode(*confusable),
+            NamedUnicode(*representant)
+        )
     }
 }
 
-/// See: <https://github.com/microsoft/vscode/blob/095ddabc52b82498ee7f718a34f9dd11d59099a8/src/vs/base/common/strings.ts#L1094>
-static CONFUSABLES: Lazy<FxHashMap<u32, u8>> = Lazy::new(|| {
-    #[allow(clippy::unreadable_literal)]
-    FxHashMap::from_iter([
-        (8232, 32),
-        (8233, 32),
-        (5760, 32),
-        (8192, 32),
-        (8193, 32),
-        (8194, 32),
-        (8195, 32),
-        (8196, 32),
-        (8197, 32),
-        (8198, 32),
-        (8200, 32),
-        (8201, 32),
-        (8202, 32),
-        (8287, 32),
-        (8199, 32),
-        (8239, 32),
-        (2042, 95),
-        (65101, 95),
-        (65102, 95),
-        (65103, 95),
-        (8208, 45),
-        (8209, 45),
-        (8210, 45),
-        (65112, 45),
-        (1748, 45),
-        (8259, 45),
-        (727, 45),
-        (8722, 45),
-        (10134, 45),
-        (11450, 45),
-        (1549, 44),
-        (1643, 44),
-        (8218, 44),
-        (184, 44),
-        (42233, 44),
-        (894, 59),
-        (2307, 58),
-        (2691, 58),
-        (1417, 58),
-        (1795, 58),
-        (1796, 58),
-        (5868, 58),
-        (65072, 58),
-        (6147, 58),
-        (6153, 58),
-        (8282, 58),
-        (1475, 58),
-        (760, 58),
-        (42889, 58),
-        (8758, 58),
-        (720, 58),
-        (42237, 58),
-        (451, 33),
-        (11601, 33),
-        (660, 63),
-        (577, 63),
-        (2429, 63),
-        (5038, 63),
-        (42731, 63),
-        (119149, 46),
-        (8228, 46),
-        (1793, 46),
-        (1794, 46),
-        (42510, 46),
-        (68176, 46),
-        (1632, 46),
-        (1776, 46),
-        (42232, 46),
-        (1373, 96),
-        (65287, 96),
-        (8219, 96),
-        (8242, 96),
-        (1370, 96),
-        (1523, 96),
-        (8175, 96),
-        (65344, 96),
-        (900, 96),
-        (8189, 96),
-        (8125, 96),
-        (8127, 96),
-        (8190, 96),
-        (697, 96),
-        (884, 96),
-        (712, 96),
-        (714, 96),
-        (715, 96),
-        (756, 96),
-        (699, 96),
-        (701, 96),
-        (700, 96),
-        (702, 96),
-        (42892, 96),
-        (1497, 96),
-        (2036, 96),
-        (2037, 96),
-        (5194, 96),
-        (5836, 96),
-        (94033, 96),
-        (94034, 96),
-        (65339, 91),
-        (10088, 40),
-        (10098, 40),
-        (12308, 40),
-        (64830, 40),
-        (65341, 93),
-        (10089, 41),
-        (10099, 41),
-        (12309, 41),
-        (64831, 41),
-        (10100, 123),
-        (119060, 123),
-        (10101, 125),
-        (65342, 94),
-        (8270, 42),
-        (1645, 42),
-        (8727, 42),
-        (66335, 42),
-        (5941, 47),
-        (8257, 47),
-        (8725, 47),
-        (8260, 47),
-        (9585, 47),
-        (10187, 47),
-        (10744, 47),
-        (119354, 47),
-        (12755, 47),
-        (12339, 47),
-        (11462, 47),
-        (20031, 47),
-        (12035, 47),
-        (65340, 92),
-        (65128, 92),
-        (8726, 92),
-        (10189, 92),
-        (10741, 92),
-        (10745, 92),
-        (119311, 92),
-        (119355, 92),
-        (12756, 92),
-        (20022, 92),
-        (12034, 92),
-        (42872, 38),
-        (708, 94),
-        (710, 94),
-        (5869, 43),
-        (10133, 43),
-        (66203, 43),
-        (8249, 60),
-        (10094, 60),
-        (706, 60),
-        (119350, 60),
-        (5176, 60),
-        (5810, 60),
-        (5120, 61),
-        (11840, 61),
-        (12448, 61),
-        (42239, 61),
-        (8250, 62),
-        (10095, 62),
-        (707, 62),
-        (119351, 62),
-        (5171, 62),
-        (94015, 62),
-        (8275, 126),
-        (732, 126),
-        (8128, 126),
-        (8764, 126),
-        (65372, 124),
-        (65293, 45),
-        (120784, 50),
-        (120794, 50),
-        (120804, 50),
-        (120814, 50),
-        (120824, 50),
-        (130034, 50),
-        (42842, 50),
-        (423, 50),
-        (1000, 50),
-        (42564, 50),
-        (5311, 50),
-        (42735, 50),
-        (119302, 51),
-        (120785, 51),
-        (120795, 51),
-        (120805, 51),
-        (120815, 51),
-        (120825, 51),
-        (130035, 51),
-        (42923, 51),
-        (540, 51),
-        (439, 51),
-        (42858, 51),
-        (11468, 51),
-        (1248, 51),
-        (94011, 51),
-        (71882, 51),
-        (120786, 52),
-        (120796, 52),
-        (120806, 52),
-        (120816, 52),
-        (120826, 52),
-        (130036, 52),
-        (5070, 52),
-        (71855, 52),
-        (120787, 53),
-        (120797, 53),
-        (120807, 53),
-        (120817, 53),
-        (120827, 53),
-        (130037, 53),
-        (444, 53),
-        (71867, 53),
-        (120788, 54),
-        (120798, 54),
-        (120808, 54),
-        (120818, 54),
-        (120828, 54),
-        (130038, 54),
-        (11474, 54),
-        (5102, 54),
-        (71893, 54),
-        (119314, 55),
-        (120789, 55),
-        (120799, 55),
-        (120809, 55),
-        (120819, 55),
-        (120829, 55),
-        (130039, 55),
-        (66770, 55),
-        (71878, 55),
-        (2819, 56),
-        (2538, 56),
-        (2666, 56),
-        (125131, 56),
-        (120790, 56),
-        (120800, 56),
-        (120810, 56),
-        (120820, 56),
-        (120830, 56),
-        (130040, 56),
-        (547, 56),
-        (546, 56),
-        (66330, 56),
-        (2663, 57),
-        (2920, 57),
-        (2541, 57),
-        (3437, 57),
-        (120791, 57),
-        (120801, 57),
-        (120811, 57),
-        (120821, 57),
-        (120831, 57),
-        (130041, 57),
-        (42862, 57),
-        (11466, 57),
-        (71884, 57),
-        (71852, 57),
-        (71894, 57),
-        (9082, 97),
-        (65345, 97),
-        (119834, 97),
-        (119886, 97),
-        (119938, 97),
-        (119990, 97),
-        (120042, 97),
-        (120094, 97),
-        (120146, 97),
-        (120198, 97),
-        (120250, 97),
-        (120302, 97),
-        (120354, 97),
-        (120406, 97),
-        (120458, 97),
-        (593, 97),
-        (945, 97),
-        (120514, 97),
-        (120572, 97),
-        (120630, 97),
-        (120688, 97),
-        (120746, 97),
-        (65313, 65),
-        (119808, 65),
-        (119860, 65),
-        (119912, 65),
-        (119964, 65),
-        (120016, 65),
-        (120068, 65),
-        (120120, 65),
-        (120172, 65),
-        (120224, 65),
-        (120276, 65),
-        (120328, 65),
-        (120380, 65),
-        (120432, 65),
-        (913, 65),
-        (120488, 65),
-        (120546, 65),
-        (120604, 65),
-        (120662, 65),
-        (120720, 65),
-        (5034, 65),
-        (5573, 65),
-        (42222, 65),
-        (94016, 65),
-        (66208, 65),
-        (119835, 98),
-        (119887, 98),
-        (119939, 98),
-        (119991, 98),
-        (120043, 98),
-        (120095, 98),
-        (120147, 98),
-        (120199, 98),
-        (120251, 98),
-        (120303, 98),
-        (120355, 98),
-        (120407, 98),
-        (120459, 98),
-        (388, 98),
-        (5071, 98),
-        (5234, 98),
-        (5551, 98),
-        (65314, 66),
-        (8492, 66),
-        (119809, 66),
-        (119861, 66),
-        (119913, 66),
-        (120017, 66),
-        (120069, 66),
-        (120121, 66),
-        (120173, 66),
-        (120225, 66),
-        (120277, 66),
-        (120329, 66),
-        (120381, 66),
-        (120433, 66),
-        (42932, 66),
-        (914, 66),
-        (120489, 66),
-        (120547, 66),
-        (120605, 66),
-        (120663, 66),
-        (120721, 66),
-        (5108, 66),
-        (5623, 66),
-        (42192, 66),
-        (66178, 66),
-        (66209, 66),
-        (66305, 66),
-        (65347, 99),
-        (8573, 99),
-        (119836, 99),
-        (119888, 99),
-        (119940, 99),
-        (119992, 99),
-        (120044, 99),
-        (120096, 99),
-        (120148, 99),
-        (120200, 99),
-        (120252, 99),
-        (120304, 99),
-        (120356, 99),
-        (120408, 99),
-        (120460, 99),
-        (7428, 99),
-        (1010, 99),
-        (11429, 99),
-        (43951, 99),
-        (66621, 99),
-        (128844, 67),
-        (71922, 67),
-        (71913, 67),
-        (65315, 67),
-        (8557, 67),
-        (8450, 67),
-        (8493, 67),
-        (119810, 67),
-        (119862, 67),
-        (119914, 67),
-        (119966, 67),
-        (120018, 67),
-        (120174, 67),
-        (120226, 67),
-        (120278, 67),
-        (120330, 67),
-        (120382, 67),
-        (120434, 67),
-        (1017, 67),
-        (11428, 67),
-        (5087, 67),
-        (42202, 67),
-        (66210, 67),
-        (66306, 67),
-        (66581, 67),
-        (66844, 67),
-        (8574, 100),
-        (8518, 100),
-        (119837, 100),
-        (119889, 100),
-        (119941, 100),
-        (119993, 100),
-        (120045, 100),
-        (120097, 100),
-        (120149, 100),
-        (120201, 100),
-        (120253, 100),
-        (120305, 100),
-        (120357, 100),
-        (120409, 100),
-        (120461, 100),
-        (1281, 100),
-        (5095, 100),
-        (5231, 100),
-        (42194, 100),
-        (8558, 68),
-        (8517, 68),
-        (119811, 68),
-        (119863, 68),
-        (119915, 68),
-        (119967, 68),
-        (120019, 68),
-        (120071, 68),
-        (120123, 68),
-        (120175, 68),
-        (120227, 68),
-        (120279, 68),
-        (120331, 68),
-        (120383, 68),
-        (120435, 68),
-        (5024, 68),
-        (5598, 68),
-        (5610, 68),
-        (42195, 68),
-        (8494, 101),
-        (65349, 101),
-        (8495, 101),
-        (8519, 101),
-        (119838, 101),
-        (119890, 101),
-        (119942, 101),
-        (120046, 101),
-        (120098, 101),
-        (120150, 101),
-        (120202, 101),
-        (120254, 101),
-        (120306, 101),
-        (120358, 101),
-        (120410, 101),
-        (120462, 101),
-        (43826, 101),
-        (1213, 101),
-        (8959, 69),
-        (65317, 69),
-        (8496, 69),
-        (119812, 69),
-        (119864, 69),
-        (119916, 69),
-        (120020, 69),
-        (120072, 69),
-        (120124, 69),
-        (120176, 69),
-        (120228, 69),
-        (120280, 69),
-        (120332, 69),
-        (120384, 69),
-        (120436, 69),
-        (917, 69),
-        (120492, 69),
-        (120550, 69),
-        (120608, 69),
-        (120666, 69),
-        (120724, 69),
-        (11577, 69),
-        (5036, 69),
-        (42224, 69),
-        (71846, 69),
-        (71854, 69),
-        (66182, 69),
-        (119839, 102),
-        (119891, 102),
-        (119943, 102),
-        (119995, 102),
-        (120047, 102),
-        (120099, 102),
-        (120151, 102),
-        (120203, 102),
-        (120255, 102),
-        (120307, 102),
-        (120359, 102),
-        (120411, 102),
-        (120463, 102),
-        (43829, 102),
-        (42905, 102),
-        (383, 102),
-        (7837, 102),
-        (1412, 102),
-        (119315, 70),
-        (8497, 70),
-        (119813, 70),
-        (119865, 70),
-        (119917, 70),
-        (120021, 70),
-        (120073, 70),
-        (120125, 70),
-        (120177, 70),
-        (120229, 70),
-        (120281, 70),
-        (120333, 70),
-        (120385, 70),
-        (120437, 70),
-        (42904, 70),
-        (988, 70),
-        (120778, 70),
-        (5556, 70),
-        (42205, 70),
-        (71874, 70),
-        (71842, 70),
-        (66183, 70),
-        (66213, 70),
-        (66853, 70),
-        (65351, 103),
-        (8458, 103),
-        (119840, 103),
-        (119892, 103),
-        (119944, 103),
-        (120048, 103),
-        (120100, 103),
-        (120152, 103),
-        (120204, 103),
-        (120256, 103),
-        (120308, 103),
-        (120360, 103),
-        (120412, 103),
-        (120464, 103),
-        (609, 103),
-        (7555, 103),
-        (397, 103),
-        (1409, 103),
-        (119814, 71),
-        (119866, 71),
-        (119918, 71),
-        (119970, 71),
-        (120022, 71),
-        (120074, 71),
-        (120126, 71),
-        (120178, 71),
-        (120230, 71),
-        (120282, 71),
-        (120334, 71),
-        (120386, 71),
-        (120438, 71),
-        (1292, 71),
-        (5056, 71),
-        (5107, 71),
-        (42198, 71),
-        (65352, 104),
-        (8462, 104),
-        (119841, 104),
-        (119945, 104),
-        (119997, 104),
-        (120049, 104),
-        (120101, 104),
-        (120153, 104),
-        (120205, 104),
-        (120257, 104),
-        (120309, 104),
-        (120361, 104),
-        (120413, 104),
-        (120465, 104),
-        (1211, 104),
-        (1392, 104),
-        (5058, 104),
-        (65320, 72),
-        (8459, 72),
-        (8460, 72),
-        (8461, 72),
-        (119815, 72),
-        (119867, 72),
-        (119919, 72),
-        (120023, 72),
-        (120179, 72),
-        (120231, 72),
-        (120283, 72),
-        (120335, 72),
-        (120387, 72),
-        (120439, 72),
-        (919, 72),
-        (120494, 72),
-        (120552, 72),
-        (120610, 72),
-        (120668, 72),
-        (120726, 72),
-        (11406, 72),
-        (5051, 72),
-        (5500, 72),
-        (42215, 72),
-        (66255, 72),
-        (731, 105),
-        (9075, 105),
-        (65353, 105),
-        (8560, 105),
-        (8505, 105),
-        (8520, 105),
-        (119842, 105),
-        (119894, 105),
-        (119946, 105),
-        (119998, 105),
-        (120050, 105),
-        (120102, 105),
-        (120154, 105),
-        (120206, 105),
-        (120258, 105),
-        (120310, 105),
-        (120362, 105),
-        (120414, 105),
-        (120466, 105),
-        (120484, 105),
-        (618, 105),
-        (617, 105),
-        (953, 105),
-        (8126, 105),
-        (890, 105),
-        (120522, 105),
-        (120580, 105),
-        (120638, 105),
-        (120696, 105),
-        (120754, 105),
-        (1110, 105),
-        (42567, 105),
-        (1231, 105),
-        (43893, 105),
-        (5029, 105),
-        (71875, 105),
-        (65354, 106),
-        (8521, 106),
-        (119843, 106),
-        (119895, 106),
-        (119947, 106),
-        (119999, 106),
-        (120051, 106),
-        (120103, 106),
-        (120155, 106),
-        (120207, 106),
-        (120259, 106),
-        (120311, 106),
-        (120363, 106),
-        (120415, 106),
-        (120467, 106),
-        (1011, 106),
-        (1112, 106),
-        (65322, 74),
-        (119817, 74),
-        (119869, 74),
-        (119921, 74),
-        (119973, 74),
-        (120025, 74),
-        (120077, 74),
-        (120129, 74),
-        (120181, 74),
-        (120233, 74),
-        (120285, 74),
-        (120337, 74),
-        (120389, 74),
-        (120441, 74),
-        (42930, 74),
-        (895, 74),
-        (1032, 74),
-        (5035, 74),
-        (5261, 74),
-        (42201, 74),
-        (119844, 107),
-        (119896, 107),
-        (119948, 107),
-        (120000, 107),
-        (120052, 107),
-        (120104, 107),
-        (120156, 107),
-        (120208, 107),
-        (120260, 107),
-        (120312, 107),
-        (120364, 107),
-        (120416, 107),
-        (120468, 107),
-        (8490, 75),
-        (65323, 75),
-        (119818, 75),
-        (119870, 75),
-        (119922, 75),
-        (119974, 75),
-        (120026, 75),
-        (120078, 75),
-        (120130, 75),
-        (120182, 75),
-        (120234, 75),
-        (120286, 75),
-        (120338, 75),
-        (120390, 75),
-        (120442, 75),
-        (922, 75),
-        (120497, 75),
-        (120555, 75),
-        (120613, 75),
-        (120671, 75),
-        (120729, 75),
-        (11412, 75),
-        (5094, 75),
-        (5845, 75),
-        (42199, 75),
-        (66840, 75),
-        (1472, 108),
-        (8739, 73),
-        (9213, 73),
-        (65512, 73),
-        (1633, 108),
-        (1777, 73),
-        (66336, 108),
-        (125127, 108),
-        (120783, 73),
-        (120793, 73),
-        (120803, 73),
-        (120813, 73),
-        (120823, 73),
-        (130033, 73),
-        (65321, 73),
-        (8544, 73),
-        (8464, 73),
-        (8465, 73),
-        (119816, 73),
-        (119868, 73),
-        (119920, 73),
-        (120024, 73),
-        (120128, 73),
-        (120180, 73),
-        (120232, 73),
-        (120284, 73),
-        (120336, 73),
-        (120388, 73),
-        (120440, 73),
-        (65356, 108),
-        (8572, 73),
-        (8467, 108),
-        (119845, 108),
-        (119897, 108),
-        (119949, 108),
-        (120001, 108),
-        (120053, 108),
-        (120105, 73),
-        (120157, 73),
-        (120209, 73),
-        (120261, 73),
-        (120313, 73),
-        (120365, 73),
-        (120417, 73),
-        (120469, 73),
-        (448, 73),
-        (120496, 73),
-        (120554, 73),
-        (120612, 73),
-        (120670, 73),
-        (120728, 73),
-        (11410, 73),
-        (1030, 73),
-        (1216, 73),
-        (1493, 108),
-        (1503, 108),
-        (1575, 108),
-        (126464, 108),
-        (126592, 108),
-        (65166, 108),
-        (65165, 108),
-        (1994, 108),
-        (11599, 73),
-        (5825, 73),
-        (42226, 73),
-        (93992, 73),
-        (66186, 124),
-        (66313, 124),
-        (119338, 76),
-        (8556, 76),
-        (8466, 76),
-        (119819, 76),
-        (119871, 76),
-        (119923, 76),
-        (120027, 76),
-        (120079, 76),
-        (120131, 76),
-        (120183, 76),
-        (120235, 76),
-        (120287, 76),
-        (120339, 76),
-        (120391, 76),
-        (120443, 76),
-        (11472, 76),
-        (5086, 76),
-        (5290, 76),
-        (42209, 76),
-        (93974, 76),
-        (71843, 76),
-        (71858, 76),
-        (66587, 76),
-        (66854, 76),
-        (65325, 77),
-        (8559, 77),
-        (8499, 77),
-        (119820, 77),
-        (119872, 77),
-        (119924, 77),
-        (120028, 77),
-        (120080, 77),
-        (120132, 77),
-        (120184, 77),
-        (120236, 77),
-        (120288, 77),
-        (120340, 77),
-        (120392, 77),
-        (120444, 77),
-        (924, 77),
-        (120499, 77),
-        (120557, 77),
-        (120615, 77),
-        (120673, 77),
-        (120731, 77),
-        (1018, 77),
-        (11416, 77),
-        (5047, 77),
-        (5616, 77),
-        (5846, 77),
-        (42207, 77),
-        (66224, 77),
-        (66321, 77),
-        (119847, 110),
-        (119899, 110),
-        (119951, 110),
-        (120003, 110),
-        (120055, 110),
-        (120107, 110),
-        (120159, 110),
-        (120211, 110),
-        (120263, 110),
-        (120315, 110),
-        (120367, 110),
-        (120419, 110),
-        (120471, 110),
-        (1400, 110),
-        (1404, 110),
-        (65326, 78),
-        (8469, 78),
-        (119821, 78),
-        (119873, 78),
-        (119925, 78),
-        (119977, 78),
-        (120029, 78),
-        (120081, 78),
-        (120185, 78),
-        (120237, 78),
-        (120289, 78),
-        (120341, 78),
-        (120393, 78),
-        (120445, 78),
-        (925, 78),
-        (120500, 78),
-        (120558, 78),
-        (120616, 78),
-        (120674, 78),
-        (120732, 78),
-        (11418, 78),
-        (42208, 78),
-        (66835, 78),
-        (3074, 111),
-        (3202, 111),
-        (3330, 111),
-        (3458, 111),
-        (2406, 111),
-        (2662, 111),
-        (2790, 111),
-        (3046, 111),
-        (3174, 111),
-        (3302, 111),
-        (3430, 111),
-        (3664, 111),
-        (3792, 111),
-        (4160, 111),
-        (1637, 111),
-        (1781, 111),
-        (65359, 111),
-        (8500, 111),
-        (119848, 111),
-        (119900, 111),
-        (119952, 111),
-        (120056, 111),
-        (120108, 111),
-        (120160, 111),
-        (120212, 111),
-        (120264, 111),
-        (120316, 111),
-        (120368, 111),
-        (120420, 111),
-        (120472, 111),
-        (7439, 111),
-        (7441, 111),
-        (43837, 111),
-        (959, 111),
-        (120528, 111),
-        (120586, 111),
-        (120644, 111),
-        (120702, 111),
-        (120760, 111),
-        (963, 111),
-        (120532, 111),
-        (120590, 111),
-        (120648, 111),
-        (120706, 111),
-        (120764, 111),
-        (11423, 111),
-        (4351, 111),
-        (1413, 111),
-        (1505, 111),
-        (1607, 111),
-        (126500, 111),
-        (126564, 111),
-        (126596, 111),
-        (65259, 111),
-        (65260, 111),
-        (65258, 111),
-        (65257, 111),
-        (1726, 111),
-        (64428, 111),
-        (64429, 111),
-        (64427, 111),
-        (64426, 111),
-        (1729, 111),
-        (64424, 111),
-        (64425, 111),
-        (64423, 111),
-        (64422, 111),
-        (1749, 111),
-        (3360, 111),
-        (4125, 111),
-        (66794, 111),
-        (71880, 111),
-        (71895, 111),
-        (66604, 111),
-        (1984, 79),
-        (2534, 79),
-        (2918, 79),
-        (12295, 79),
-        (70864, 79),
-        (71904, 79),
-        (120782, 79),
-        (120792, 79),
-        (120802, 79),
-        (120812, 79),
-        (120822, 79),
-        (130032, 79),
-        (65327, 79),
-        (119822, 79),
-        (119874, 79),
-        (119926, 79),
-        (119978, 79),
-        (120030, 79),
-        (120082, 79),
-        (120134, 79),
-        (120186, 79),
-        (120238, 79),
-        (120290, 79),
-        (120342, 79),
-        (120394, 79),
-        (120446, 79),
-        (927, 79),
-        (120502, 79),
-        (120560, 79),
-        (120618, 79),
-        (120676, 79),
-        (120734, 79),
-        (11422, 79),
-        (1365, 79),
-        (11604, 79),
-        (4816, 79),
-        (2848, 79),
-        (66754, 79),
-        (42227, 79),
-        (71861, 79),
-        (66194, 79),
-        (66219, 79),
-        (66564, 79),
-        (66838, 79),
-        (9076, 112),
-        (65360, 112),
-        (119849, 112),
-        (119901, 112),
-        (119953, 112),
-        (120005, 112),
-        (120057, 112),
-        (120109, 112),
-        (120161, 112),
-        (120213, 112),
-        (120265, 112),
-        (120317, 112),
-        (120369, 112),
-        (120421, 112),
-        (120473, 112),
-        (961, 112),
-        (120530, 112),
-        (120544, 112),
-        (120588, 112),
-        (120602, 112),
-        (120646, 112),
-        (120660, 112),
-        (120704, 112),
-        (120718, 112),
-        (120762, 112),
-        (120776, 112),
-        (11427, 112),
-        (65328, 80),
-        (8473, 80),
-        (119823, 80),
-        (119875, 80),
-        (119927, 80),
-        (119979, 80),
-        (120031, 80),
-        (120083, 80),
-        (120187, 80),
-        (120239, 80),
-        (120291, 80),
-        (120343, 80),
-        (120395, 80),
-        (120447, 80),
-        (929, 80),
-        (120504, 80),
-        (120562, 80),
-        (120620, 80),
-        (120678, 80),
-        (120736, 80),
-        (11426, 80),
-        (5090, 80),
-        (5229, 80),
-        (42193, 80),
-        (66197, 80),
-        (119850, 113),
-        (119902, 113),
-        (119954, 113),
-        (120006, 113),
-        (120058, 113),
-        (120110, 113),
-        (120162, 113),
-        (120214, 113),
-        (120266, 113),
-        (120318, 113),
-        (120370, 113),
-        (120422, 113),
-        (120474, 113),
-        (1307, 113),
-        (1379, 113),
-        (1382, 113),
-        (8474, 81),
-        (119824, 81),
-        (119876, 81),
-        (119928, 81),
-        (119980, 81),
-        (120032, 81),
-        (120084, 81),
-        (120188, 81),
-        (120240, 81),
-        (120292, 81),
-        (120344, 81),
-        (120396, 81),
-        (120448, 81),
-        (11605, 81),
-        (119851, 114),
-        (119903, 114),
-        (119955, 114),
-        (120007, 114),
-        (120059, 114),
-        (120111, 114),
-        (120163, 114),
-        (120215, 114),
-        (120267, 114),
-        (120319, 114),
-        (120371, 114),
-        (120423, 114),
-        (120475, 114),
-        (43847, 114),
-        (43848, 114),
-        (7462, 114),
-        (11397, 114),
-        (43905, 114),
-        (119318, 82),
-        (8475, 82),
-        (8476, 82),
-        (8477, 82),
-        (119825, 82),
-        (119877, 82),
-        (119929, 82),
-        (120033, 82),
-        (120189, 82),
-        (120241, 82),
-        (120293, 82),
-        (120345, 82),
-        (120397, 82),
-        (120449, 82),
-        (422, 82),
-        (5025, 82),
-        (5074, 82),
-        (66740, 82),
-        (5511, 82),
-        (42211, 82),
-        (94005, 82),
-        (65363, 115),
-        (119852, 115),
-        (119904, 115),
-        (119956, 115),
-        (120008, 115),
-        (120060, 115),
-        (120112, 115),
-        (120164, 115),
-        (120216, 115),
-        (120268, 115),
-        (120320, 115),
-        (120372, 115),
-        (120424, 115),
-        (120476, 115),
-        (42801, 115),
-        (445, 115),
-        (1109, 115),
-        (43946, 115),
-        (71873, 115),
-        (66632, 115),
-        (65331, 83),
-        (119826, 83),
-        (119878, 83),
-        (119930, 83),
-        (119982, 83),
-        (120034, 83),
-        (120086, 83),
-        (120138, 83),
-        (120190, 83),
-        (120242, 83),
-        (120294, 83),
-        (120346, 83),
-        (120398, 83),
-        (120450, 83),
-        (1029, 83),
-        (1359, 83),
-        (5077, 83),
-        (5082, 83),
-        (42210, 83),
-        (94010, 83),
-        (66198, 83),
-        (66592, 83),
-        (119853, 116),
-        (119905, 116),
-        (119957, 116),
-        (120009, 116),
-        (120061, 116),
-        (120113, 116),
-        (120165, 116),
-        (120217, 116),
-        (120269, 116),
-        (120321, 116),
-        (120373, 116),
-        (120425, 116),
-        (120477, 116),
-        (8868, 84),
-        (10201, 84),
-        (128872, 84),
-        (65332, 84),
-        (119827, 84),
-        (119879, 84),
-        (119931, 84),
-        (119983, 84),
-        (120035, 84),
-        (120087, 84),
-        (120139, 84),
-        (120191, 84),
-        (120243, 84),
-        (120295, 84),
-        (120347, 84),
-        (120399, 84),
-        (120451, 84),
-        (932, 84),
-        (120507, 84),
-        (120565, 84),
-        (120623, 84),
-        (120681, 84),
-        (120739, 84),
-        (11430, 84),
-        (5026, 84),
-        (42196, 84),
-        (93962, 84),
-        (71868, 84),
-        (66199, 84),
-        (66225, 84),
-        (66325, 84),
-        (119854, 117),
-        (119906, 117),
-        (119958, 117),
-        (120010, 117),
-        (120062, 117),
-        (120114, 117),
-        (120166, 117),
-        (120218, 117),
-        (120270, 117),
-        (120322, 117),
-        (120374, 117),
-        (120426, 117),
-        (120478, 117),
-        (42911, 117),
-        (7452, 117),
-        (43854, 117),
-        (43858, 117),
-        (651, 117),
-        (965, 117),
-        (120534, 117),
-        (120592, 117),
-        (120650, 117),
-        (120708, 117),
-        (120766, 117),
-        (1405, 117),
-        (66806, 117),
-        (71896, 117),
-        (8746, 85),
-        (8899, 85),
-        (119828, 85),
-        (119880, 85),
-        (119932, 85),
-        (119984, 85),
-        (120036, 85),
-        (120088, 85),
-        (120140, 85),
-        (120192, 85),
-        (120244, 85),
-        (120296, 85),
-        (120348, 85),
-        (120400, 85),
-        (120452, 85),
-        (1357, 85),
-        (4608, 85),
-        (66766, 85),
-        (5196, 85),
-        (42228, 85),
-        (94018, 85),
-        (71864, 85),
-        (8744, 118),
-        (8897, 118),
-        (65366, 118),
-        (8564, 118),
-        (119855, 118),
-        (119907, 118),
-        (119959, 118),
-        (120011, 118),
-        (120063, 118),
-        (120115, 118),
-        (120167, 118),
-        (120219, 118),
-        (120271, 118),
-        (120323, 118),
-        (120375, 118),
-        (120427, 118),
-        (120479, 118),
-        (7456, 118),
-        (957, 118),
-        (120526, 118),
-        (120584, 118),
-        (120642, 118),
-        (120700, 118),
-        (120758, 118),
-        (1141, 118),
-        (1496, 118),
-        (71430, 118),
-        (43945, 118),
-        (71872, 118),
-        (119309, 86),
-        (1639, 86),
-        (1783, 86),
-        (8548, 86),
-        (119829, 86),
-        (119881, 86),
-        (119933, 86),
-        (119985, 86),
-        (120037, 86),
-        (120089, 86),
-        (120141, 86),
-        (120193, 86),
-        (120245, 86),
-        (120297, 86),
-        (120349, 86),
-        (120401, 86),
-        (120453, 86),
-        (1140, 86),
-        (11576, 86),
-        (5081, 86),
-        (5167, 86),
-        (42719, 86),
-        (42214, 86),
-        (93960, 86),
-        (71840, 86),
-        (66845, 86),
-        (623, 119),
-        (119856, 119),
-        (119908, 119),
-        (119960, 119),
-        (120012, 119),
-        (120064, 119),
-        (120116, 119),
-        (120168, 119),
-        (120220, 119),
-        (120272, 119),
-        (120324, 119),
-        (120376, 119),
-        (120428, 119),
-        (120480, 119),
-        (7457, 119),
-        (1121, 119),
-        (1309, 119),
-        (1377, 119),
-        (71434, 119),
-        (71438, 119),
-        (71439, 119),
-        (43907, 119),
-        (71919, 87),
-        (71910, 87),
-        (119830, 87),
-        (119882, 87),
-        (119934, 87),
-        (119986, 87),
-        (120038, 87),
-        (120090, 87),
-        (120142, 87),
-        (120194, 87),
-        (120246, 87),
-        (120298, 87),
-        (120350, 87),
-        (120402, 87),
-        (120454, 87),
-        (1308, 87),
-        (5043, 87),
-        (5076, 87),
-        (42218, 87),
-        (5742, 120),
-        (10539, 120),
-        (10540, 120),
-        (10799, 120),
-        (65368, 120),
-        (8569, 120),
-        (119857, 120),
-        (119909, 120),
-        (119961, 120),
-        (120013, 120),
-        (120065, 120),
-        (120117, 120),
-        (120169, 120),
-        (120221, 120),
-        (120273, 120),
-        (120325, 120),
-        (120377, 120),
-        (120429, 120),
-        (120481, 120),
-        (5441, 120),
-        (5501, 120),
-        (5741, 88),
-        (9587, 88),
-        (66338, 88),
-        (71916, 88),
-        (65336, 88),
-        (8553, 88),
-        (119831, 88),
-        (119883, 88),
-        (119935, 88),
-        (119987, 88),
-        (120039, 88),
-        (120091, 88),
-        (120143, 88),
-        (120195, 88),
-        (120247, 88),
-        (120299, 88),
-        (120351, 88),
-        (120403, 88),
-        (120455, 88),
-        (42931, 88),
-        (935, 88),
-        (120510, 88),
-        (120568, 88),
-        (120626, 88),
-        (120684, 88),
-        (120742, 88),
-        (11436, 88),
-        (11613, 88),
-        (5815, 88),
-        (42219, 88),
-        (66192, 88),
-        (66228, 88),
-        (66327, 88),
-        (66855, 88),
-        (611, 121),
-        (7564, 121),
-        (65369, 121),
-        (119858, 121),
-        (119910, 121),
-        (119962, 121),
-        (120014, 121),
-        (120066, 121),
-        (120118, 121),
-        (120170, 121),
-        (120222, 121),
-        (120274, 121),
-        (120326, 121),
-        (120378, 121),
-        (120430, 121),
-        (120482, 121),
-        (655, 121),
-        (7935, 121),
-        (43866, 121),
-        (947, 121),
-        (8509, 121),
-        (120516, 121),
-        (120574, 121),
-        (120632, 121),
-        (120690, 121),
-        (120748, 121),
-        (1199, 121),
-        (4327, 121),
-        (71900, 121),
-        (65337, 89),
-        (119832, 89),
-        (119884, 89),
-        (119936, 89),
-        (119988, 89),
-        (120040, 89),
-        (120092, 89),
-        (120144, 89),
-        (120196, 89),
-        (120248, 89),
-        (120300, 89),
-        (120352, 89),
-        (120404, 89),
-        (120456, 89),
-        (933, 89),
-        (978, 89),
-        (120508, 89),
-        (120566, 89),
-        (120624, 89),
-        (120682, 89),
-        (120740, 89),
-        (11432, 89),
-        (1198, 89),
-        (5033, 89),
-        (5053, 89),
-        (42220, 89),
-        (94019, 89),
-        (71844, 89),
-        (66226, 89),
-        (119859, 122),
-        (119911, 122),
-        (119963, 122),
-        (120015, 122),
-        (120067, 122),
-        (120119, 122),
-        (120171, 122),
-        (120223, 122),
-        (120275, 122),
-        (120327, 122),
-        (120379, 122),
-        (120431, 122),
-        (120483, 122),
-        (7458, 122),
-        (43923, 122),
-        (71876, 122),
-        (66293, 90),
-        (71909, 90),
-        (65338, 90),
-        (8484, 90),
-        (8488, 90),
-        (119833, 90),
-        (119885, 90),
-        (119937, 90),
-        (119989, 90),
-        (120041, 90),
-        (120197, 90),
-        (120249, 90),
-        (120301, 90),
-        (120353, 90),
-        (120405, 90),
-        (120457, 90),
-        (918, 90),
-        (120493, 90),
-        (120551, 90),
-        (120609, 90),
-        (120667, 90),
-        (120725, 90),
-        (5059, 90),
-        (42204, 90),
-        (71849, 90),
-        (65282, 34),
-        (65284, 36),
-        (65285, 37),
-        (65286, 38),
-        (65290, 42),
-        (65291, 43),
-        (65294, 46),
-        (65295, 47),
-        (65296, 48),
-        (65297, 49),
-        (65298, 50),
-        (65299, 51),
-        (65300, 52),
-        (65301, 53),
-        (65302, 54),
-        (65303, 55),
-        (65304, 56),
-        (65305, 57),
-        (65308, 60),
-        (65309, 61),
-        (65310, 62),
-        (65312, 64),
-        (65316, 68),
-        (65318, 70),
-        (65319, 71),
-        (65324, 76),
-        (65329, 81),
-        (65330, 82),
-        (65333, 85),
-        (65334, 86),
-        (65335, 87),
-        (65343, 95),
-        (65346, 98),
-        (65348, 100),
-        (65350, 102),
-        (65355, 107),
-        (65357, 109),
-        (65358, 110),
-        (65361, 113),
-        (65362, 114),
-        (65364, 116),
-        (65365, 117),
-        (65367, 119),
-        (65370, 122),
-        (65371, 123),
-        (65373, 125),
-        (160, 32),
-        (8211, 45),
-        (65374, 126),
-        (65306, 58),
-        (65281, 33),
-        (8216, 96),
-        (8217, 96),
-        (8245, 96),
-        (180, 96),
-        (12494, 47),
-        (1047, 51),
-        (1073, 54),
-        (1072, 97),
-        (1040, 65),
-        (1068, 98),
-        (1042, 66),
-        (1089, 99),
-        (1057, 67),
-        (1077, 101),
-        (1045, 69),
-        (1053, 72),
-        (305, 105),
-        (1050, 75),
-        (921, 73),
-        (1052, 77),
-        (1086, 111),
-        (1054, 79),
-        (1009, 112),
-        (1088, 112),
-        (1056, 80),
-        (1075, 114),
-        (1058, 84),
-        (215, 120),
-        (1093, 120),
-        (1061, 88),
-        (1091, 121),
-        (1059, 89),
-        (65283, 35),
-        (65288, 40),
-        (65289, 41),
-        (65292, 44),
-        (65307, 59),
-        (65311, 63),
-    ])
-});
-
-pub fn ambiguous_unicode_character(
+pub(crate) fn ambiguous_unicode_character(
     locator: &Locator,
     range: TextRange,
     context: Context,
     settings: &Settings,
-    autofix: flags::Autofix,
 ) -> Vec<Diagnostic> {
     let mut diagnostics = vec![];
 
     let text = locator.slice(range);
 
+    // Most of the time, we don't need to check for ambiguous unicode characters at all.
+    if text.is_ascii() {
+        return diagnostics;
+    }
+
+    // Iterate over the "words" in the text.
+    let mut word_flags = WordFlags::empty();
+    let mut word_candidates: Vec<Candidate> = vec![];
     for (relative_offset, current_char) in text.char_indices() {
-        if !current_char.is_ascii() {
-            // Search for confusing characters.
-            if let Some(representant) = CONFUSABLES.get(&(current_char as u32)).copied() {
-                if !settings.allowed_confusables.contains(&current_char) {
-                    let char_range = TextRange::at(
-                        TextSize::try_from(relative_offset).unwrap() + range.start(),
-                        current_char.text_len(),
-                    );
+        // Word boundary.
+        if !current_char.is_alphanumeric() {
+            if !word_candidates.is_empty() {
+                if word_flags.is_candidate_word() {
+                    for candidate in word_candidates.drain(..) {
+                        if let Some(diagnostic) = candidate.into_diagnostic(context, settings) {
+                            diagnostics.push(diagnostic);
+                        }
+                    }
+                }
+                word_candidates.clear();
+            }
+            word_flags = WordFlags::empty();
 
-                    let mut diagnostic = Diagnostic::new::<DiagnosticKind>(
-                        match context {
-                            Context::String => AmbiguousUnicodeCharacterString {
-                                confusable: current_char,
-                                representant: representant as char,
-                            }
-                            .into(),
-                            Context::Docstring => AmbiguousUnicodeCharacterDocstring {
-                                confusable: current_char,
-                                representant: representant as char,
-                            }
-                            .into(),
-                            Context::Comment => AmbiguousUnicodeCharacterComment {
-                                confusable: current_char,
-                                representant: representant as char,
-                            }
-                            .into(),
-                        },
-                        char_range,
+            // Check if the boundary character is itself an ambiguous unicode character, in which
+            // case, it's always included as a diagnostic.
+            if !current_char.is_ascii() {
+                if let Some(representant) = CONFUSABLES.get(&(current_char as u32)).copied() {
+                    let candidate = Candidate::new(
+                        TextSize::try_from(relative_offset).unwrap() + range.start(),
+                        current_char,
+                        representant as char,
                     );
-                    if settings.rules.enabled(diagnostic.kind.rule()) {
-                        if autofix.into() && settings.rules.should_fix(diagnostic.kind.rule()) {
-                            diagnostic.set_fix(Edit::range_replacement(
-                                (representant as char).to_string(),
-                                char_range,
-                            ));
-                        }
+                    if let Some(diagnostic) = candidate.into_diagnostic(context, settings) {
                         diagnostics.push(diagnostic);
                     }
                 }
             }
+        } else if current_char.is_ascii() {
+            // The current word contains at least one ASCII character.
+            word_flags |= WordFlags::ASCII;
+        } else if let Some(representant) = CONFUSABLES.get(&(current_char as u32)).copied() {
+            // The current word contains an ambiguous unicode character.
+            word_candidates.push(Candidate::new(
+                TextSize::try_from(relative_offset).unwrap() + range.start(),
+                current_char,
+                representant as char,
+            ));
+        } else {
+            // The current word contains at least one unambiguous unicode character.
+            word_flags |= WordFlags::UNAMBIGUOUS_UNICODE;
         }
     }
 
+    // End of the text.
+    if !word_candidates.is_empty() {
+        if word_flags.is_candidate_word() {
+            for candidate in word_candidates.drain(..) {
+                if let Some(diagnostic) = candidate.into_diagnostic(context, settings) {
+                    diagnostics.push(diagnostic);
+                }
+            }
+        }
+        word_candidates.clear();
+    }
+
     diagnostics
 }
+
+bitflags! {
+    #[derive(Default, Debug, Copy, Clone, PartialEq, Eq)]
+    pub struct WordFlags: u8 {
+        /// The word contains at least one ASCII character (like `B`).
+        const ASCII = 0b0000_0001;
+        /// The word contains at least one unambiguous unicode character (like `β`).
+        const UNAMBIGUOUS_UNICODE = 0b0000_0010;
+    }
+}
+
+impl WordFlags {
+    /// Return `true` if the flags indicate that the word is a candidate for flagging
+    /// ambiguous unicode characters.
+    ///
+    /// We follow VS Code's logic for determining whether ambiguous unicode characters within a
+    /// given word should be flagged, i.e., we flag a word if it contains at least one ASCII
+    /// character, or is purely unicode but _only_ consists of ambiguous characters.
+    ///
+    /// See: [VS Code](https://github.com/microsoft/vscode/issues/143720#issuecomment-1048757234)
+    const fn is_candidate_word(self) -> bool {
+        self.contains(WordFlags::ASCII) || !self.contains(WordFlags::UNAMBIGUOUS_UNICODE)
+    }
+}
+
+/// An ambiguous unicode character in the text.
+struct Candidate {
+    /// The offset of the candidate in the text.
+    offset: TextSize,
+    /// The ambiguous unicode character.
+    confusable: char,
+    /// The character with which the ambiguous unicode character is confusable.
+    representant: char,
+}
+
+impl Candidate {
+    fn new(offset: TextSize, confusable: char, representant: char) -> Self {
+        Self {
+            offset,
+            confusable,
+            representant,
+        }
+    }
+
+    fn into_diagnostic(self, context: Context, settings: &Settings) -> Option<Diagnostic> {
+        if !settings.allowed_confusables.contains(&self.confusable) {
+            let char_range = TextRange::at(self.offset, self.confusable.text_len());
+            let mut diagnostic = Diagnostic::new::<DiagnosticKind>(
+                match context {
+                    Context::String => AmbiguousUnicodeCharacterString {
+                        confusable: self.confusable,
+                        representant: self.representant,
+                    }
+                    .into(),
+                    Context::Docstring => AmbiguousUnicodeCharacterDocstring {
+                        confusable: self.confusable,
+                        representant: self.representant,
+                    }
+                    .into(),
+                    Context::Comment => AmbiguousUnicodeCharacterComment {
+                        confusable: self.confusable,
+                        representant: self.representant,
+                    }
+                    .into(),
+                },
+                char_range,
+            );
+            if settings.rules.enabled(diagnostic.kind.rule()) {
+                if settings.rules.should_fix(diagnostic.kind.rule()) {
+                    #[allow(deprecated)]
+                    diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
+                        self.representant.to_string(),
+                        char_range,
+                    )));
+                }
+                return Some(diagnostic);
+            }
+        }
+        None
+    }
+}
+
+struct NamedUnicode(char);
+
+impl fmt::Display for NamedUnicode {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let NamedUnicode(c) = self;
+        if let Some(name) = unicode_names2::name(*c) {
+            write!(f, "`{c}` ({name})")
+        } else {
+            write!(f, "`{c}`")
+        }
+    }
+}
diff --git a/crates/ruff/src/rules/ruff/rules/asyncio_dangling_task.rs b/crates/ruff/src/rules/ruff/rules/asyncio_dangling_task.rs
index e82bdcc682ab4..1171926ee3350 100644
--- a/crates/ruff/src/rules/ruff/rules/asyncio_dangling_task.rs
+++ b/crates/ruff/src/rules/ruff/rules/asyncio_dangling_task.rs
@@ -1,6 +1,6 @@
 use std::fmt;
 
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -51,7 +51,7 @@ use ruff_python_ast::call_path::CallPath;
 /// - [The Python Standard Library](https://docs.python.org/3/library/asyncio-task.html#asyncio.create_task)
 #[violation]
 pub struct AsyncioDanglingTask {
-    pub method: Method,
+    method: Method,
 }
 
 impl Violation for AsyncioDanglingTask {
@@ -63,7 +63,7 @@ impl Violation for AsyncioDanglingTask {
 }
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub enum Method {
+pub(crate) enum Method {
     CreateTask,
     EnsureFuture,
 }
@@ -78,11 +78,14 @@ impl fmt::Display for Method {
 }
 
 /// RUF006
-pub fn asyncio_dangling_task<'a, F>(expr: &'a Expr, resolve_call_path: F) -> Option<Diagnostic>
+pub(crate) fn asyncio_dangling_task<'a, F>(
+    expr: &'a Expr,
+    resolve_call_path: F,
+) -> Option<Diagnostic>
 where
     F: FnOnce(&'a Expr) -> Option<CallPath<'a>>,
 {
-    if let ExprKind::Call { func, .. } = &expr.node {
+    if let Expr::Call(ast::ExprCall { func, .. }) = expr {
         match resolve_call_path(func).as_deref() {
             Some(["asyncio", "create_task"]) => Some(Diagnostic::new(
                 AsyncioDanglingTask {
diff --git a/crates/ruff/src/rules/ruff/rules/collection_literal_concatenation.rs b/crates/ruff/src/rules/ruff/rules/collection_literal_concatenation.rs
index 82b2fe8ca6c1f..c5b2196d53ef9 100644
--- a/crates/ruff/src/rules/ruff/rules/collection_literal_concatenation.rs
+++ b/crates/ruff/src/rules/ruff/rules/collection_literal_concatenation.rs
@@ -1,16 +1,16 @@
-use rustpython_parser::ast::{Expr, ExprContext, ExprKind, Operator};
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{self, Expr, ExprContext, Operator, Ranged};
 
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Violation};
+use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::{create_expr, has_comments, unparse_expr};
+use ruff_python_ast::helpers::has_comments;
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 
 #[violation]
 pub struct CollectionLiteralConcatenation {
-    pub expr: String,
-    pub fixable: bool,
+    expr: String,
 }
 
 impl Violation for CollectionLiteralConcatenation {
@@ -18,15 +18,13 @@ impl Violation for CollectionLiteralConcatenation {
 
     #[derive_message_formats]
     fn message(&self) -> String {
-        let CollectionLiteralConcatenation { expr, .. } = self;
+        let CollectionLiteralConcatenation { expr } = self;
         format!("Consider `{expr}` instead of concatenation")
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        self.fixable
-            .then_some(|CollectionLiteralConcatenation { expr, .. }| {
-                format!("Replace with `{expr}`")
-            })
+    fn autofix_title(&self) -> Option<String> {
+        let CollectionLiteralConcatenation { expr } = self;
+        Some(format!("Replace with `{expr}`"))
     }
 }
 
@@ -36,10 +34,12 @@ fn make_splat_elts(
     splat_at_left: bool,
 ) -> Vec<Expr> {
     let mut new_elts = other_elements.to_owned();
-    let splat = create_expr(ExprKind::Starred {
+    let node = ast::ExprStarred {
         value: Box::from(splat_element.clone()),
         ctx: ExprContext::Load,
-    });
+        range: TextRange::default(),
+    };
+    let splat = node.into();
     if splat_at_left {
         new_elts.insert(0, splat);
     } else {
@@ -49,66 +49,120 @@ fn make_splat_elts(
 }
 
 #[derive(Debug, Copy, Clone)]
-enum Kind {
+enum Type {
     List,
     Tuple,
 }
 
-/// RUF005
-/// This suggestion could be unsafe if the non-literal expression in the
-/// expression has overridden the `__add__` (or `__radd__`) magic methods.
-pub fn collection_literal_concatenation(checker: &mut Checker, expr: &Expr) {
-    let ExprKind::BinOp { left, op: Operator::Add, right } = &expr.node else {
-        return;
+/// Recursively merge all the tuples and lists in the expression.
+fn concatenate_expressions(expr: &Expr) -> Option<(Expr, Type)> {
+    let Expr::BinOp(ast::ExprBinOp { left, op: Operator::Add, right, range: _ }) = expr else {
+        return None;
+    };
+
+    let new_left = match left.as_ref() {
+        Expr::BinOp(ast::ExprBinOp { .. }) => match concatenate_expressions(left) {
+            Some((new_left, _)) => new_left,
+            None => *left.clone(),
+        },
+        _ => *left.clone(),
+    };
+
+    let new_right = match right.as_ref() {
+        Expr::BinOp(ast::ExprBinOp { .. }) => match concatenate_expressions(right) {
+            Some((new_right, _)) => new_right,
+            None => *right.clone(),
+        },
+        _ => *right.clone(),
+    };
+
+    // Figure out which way the splat is, and the type of the collection.
+    let (type_, splat_element, other_elements, splat_at_left) = match (&new_left, &new_right) {
+        (Expr::List(ast::ExprList { elts: l_elts, .. }), _) => {
+            (Type::List, &new_right, l_elts, false)
+        }
+        (Expr::Tuple(ast::ExprTuple { elts: l_elts, .. }), _) => {
+            (Type::Tuple, &new_right, l_elts, false)
+        }
+        (_, Expr::List(ast::ExprList { elts: r_elts, .. })) => {
+            (Type::List, &new_left, r_elts, true)
+        }
+        (_, Expr::Tuple(ast::ExprTuple { elts: r_elts, .. })) => {
+            (Type::Tuple, &new_left, r_elts, true)
+        }
+        _ => return None,
     };
 
-    // Figure out which way the splat is, and what the kind of the collection is.
-    let (kind, splat_element, other_elements, splat_at_left, ctx) = match (&left.node, &right.node)
-    {
-        (ExprKind::List { elts: l_elts, ctx }, _) => (Kind::List, right, l_elts, false, ctx),
-        (ExprKind::Tuple { elts: l_elts, ctx }, _) => (Kind::Tuple, right, l_elts, false, ctx),
-        (_, ExprKind::List { elts: r_elts, ctx }) => (Kind::List, left, r_elts, true, ctx),
-        (_, ExprKind::Tuple { elts: r_elts, ctx }) => (Kind::Tuple, left, r_elts, true, ctx),
-        _ => return,
+    let new_elts = match splat_element {
+        // We'll be a bit conservative here; only calls, names and attribute accesses
+        // will be considered as splat elements.
+        Expr::Call(_) | Expr::Attribute(_) | Expr::Name(_) => {
+            make_splat_elts(splat_element, other_elements, splat_at_left)
+        }
+        // If the splat element is itself a list/tuple, insert them in the other list/tuple.
+        Expr::List(ast::ExprList { elts, .. }) if matches!(type_, Type::List) => {
+            other_elements.iter().chain(elts.iter()).cloned().collect()
+        }
+        Expr::Tuple(ast::ExprTuple { elts, .. }) if matches!(type_, Type::Tuple) => {
+            other_elements.iter().chain(elts.iter()).cloned().collect()
+        }
+        _ => return None,
     };
 
-    // We'll be a bit conservative here; only calls, names and attribute accesses
-    // will be considered as splat elements.
-    if !matches!(
-        splat_element.node,
-        ExprKind::Call { .. } | ExprKind::Name { .. } | ExprKind::Attribute { .. }
+    let new_expr = match type_ {
+        Type::List => ast::ExprList {
+            elts: new_elts,
+            ctx: ExprContext::Load,
+            range: TextRange::default(),
+        }
+        .into(),
+        Type::Tuple => ast::ExprTuple {
+            elts: new_elts,
+            ctx: ExprContext::Load,
+            range: TextRange::default(),
+        }
+        .into(),
+    };
+
+    Some((new_expr, type_))
+}
+
+/// RUF005
+pub(crate) fn collection_literal_concatenation(checker: &mut Checker, expr: &Expr) {
+    // If the expression is already a child of an addition, we'll have analyzed it already.
+    if matches!(
+        checker.semantic_model().expr_parent(),
+        Some(Expr::BinOp(ast::ExprBinOp {
+            op: Operator::Add,
+            ..
+        }))
     ) {
         return;
     }
 
-    let new_expr = match kind {
-        Kind::List => create_expr(ExprKind::List {
-            elts: make_splat_elts(splat_element, other_elements, splat_at_left),
-            ctx: ctx.clone(),
-        }),
-        Kind::Tuple => create_expr(ExprKind::Tuple {
-            elts: make_splat_elts(splat_element, other_elements, splat_at_left),
-            ctx: ctx.clone(),
-        }),
+    let Some((new_expr, type_)) = concatenate_expressions(expr) else {
+        return
     };
 
-    let contents = match kind {
-        // Wrap the new expression in parentheses if it was a tuple
-        Kind::Tuple => format!("({})", unparse_expr(&new_expr, checker.stylist)),
-        Kind::List => unparse_expr(&new_expr, checker.stylist),
+    let contents = match type_ {
+        // Wrap the new expression in parentheses if it was a tuple.
+        Type::Tuple => format!("({})", checker.generator().expr(&new_expr)),
+        Type::List => checker.generator().expr(&new_expr),
     };
-    let fixable = !has_comments(expr, checker.locator);
-
     let mut diagnostic = Diagnostic::new(
         CollectionLiteralConcatenation {
             expr: contents.clone(),
-            fixable,
         },
         expr.range(),
     );
     if checker.patch(diagnostic.kind.rule()) {
-        if fixable {
-            diagnostic.set_fix(Edit::range_replacement(contents, expr.range()));
+        if !has_comments(expr, checker.locator) {
+            // This suggestion could be unsafe if the non-literal expression in the
+            // expression has overridden the `__add__` (or `__radd__`) magic methods.
+            diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
+                contents,
+                expr.range(),
+            )));
         }
     }
     checker.diagnostics.push(diagnostic);
diff --git a/crates/ruff/src/rules/ruff/rules/confusables.rs b/crates/ruff/src/rules/ruff/rules/confusables.rs
new file mode 100644
index 0000000000000..e3ff076259c5f
--- /dev/null
+++ b/crates/ruff/src/rules/ruff/rules/confusables.rs
@@ -0,0 +1,2120 @@
+/// This file is auto-generated by `scripts/update_ambiguous_characters.py`.
+use once_cell::sync::Lazy;
+use rustc_hash::FxHashMap;
+
+/// Via: <https://github.com/hediet/vscode-unicode-data/blob/main/out/ambiguous.json>
+/// See: <https://github.com/microsoft/vscode/blob/095ddabc52b82498ee7f718a34f9dd11d59099a8/src/vs/base/common/strings.ts#L1094>
+pub(crate) static CONFUSABLES: Lazy<FxHashMap<u32, u8>> = Lazy::new(|| {
+    #[allow(clippy::unreadable_literal)]
+    FxHashMap::from_iter([
+        (8232, 32),
+        (8233, 32),
+        (5760, 32),
+        (8192, 32),
+        (8193, 32),
+        (8194, 32),
+        (8195, 32),
+        (8196, 32),
+        (8197, 32),
+        (8198, 32),
+        (8200, 32),
+        (8201, 32),
+        (8202, 32),
+        (8287, 32),
+        (8199, 32),
+        (8239, 32),
+        (2042, 95),
+        (65101, 95),
+        (65102, 95),
+        (65103, 95),
+        (8208, 45),
+        (8209, 45),
+        (8210, 45),
+        (65112, 45),
+        (1748, 45),
+        (8259, 45),
+        (727, 45),
+        (8722, 45),
+        (10134, 45),
+        (11450, 45),
+        (1549, 44),
+        (1643, 44),
+        (8218, 44),
+        (184, 44),
+        (42233, 44),
+        (894, 59),
+        (2307, 58),
+        (2691, 58),
+        (1417, 58),
+        (1795, 58),
+        (1796, 58),
+        (5868, 58),
+        (65072, 58),
+        (6147, 58),
+        (6153, 58),
+        (8282, 58),
+        (1475, 58),
+        (760, 58),
+        (42889, 58),
+        (8758, 58),
+        (720, 58),
+        (42237, 58),
+        (451, 33),
+        (11601, 33),
+        (660, 63),
+        (577, 63),
+        (2429, 63),
+        (5038, 63),
+        (42731, 63),
+        (119149, 46),
+        (8228, 46),
+        (1793, 46),
+        (1794, 46),
+        (42510, 46),
+        (68176, 46),
+        (1632, 46),
+        (1776, 46),
+        (42232, 46),
+        (1373, 96),
+        (65287, 96),
+        (8219, 96),
+        (8242, 96),
+        (1370, 96),
+        (1523, 96),
+        (8175, 96),
+        (65344, 96),
+        (900, 96),
+        (8189, 96),
+        (8125, 96),
+        (8127, 96),
+        (8190, 96),
+        (697, 96),
+        (884, 96),
+        (712, 96),
+        (714, 96),
+        (715, 96),
+        (756, 96),
+        (699, 96),
+        (701, 96),
+        (700, 96),
+        (702, 96),
+        (42892, 96),
+        (1497, 96),
+        (2036, 96),
+        (2037, 96),
+        (5194, 96),
+        (5836, 96),
+        (94033, 96),
+        (94034, 96),
+        (65339, 91),
+        (10088, 40),
+        (10098, 40),
+        (12308, 40),
+        (64830, 40),
+        (65341, 93),
+        (10089, 41),
+        (10099, 41),
+        (12309, 41),
+        (64831, 41),
+        (10100, 123),
+        (119060, 123),
+        (10101, 125),
+        (65342, 94),
+        (8270, 42),
+        (1645, 42),
+        (8727, 42),
+        (66335, 42),
+        (5941, 47),
+        (8257, 47),
+        (8725, 47),
+        (8260, 47),
+        (9585, 47),
+        (10187, 47),
+        (10744, 47),
+        (119354, 47),
+        (12755, 47),
+        (12339, 47),
+        (11462, 47),
+        (20031, 47),
+        (12035, 47),
+        (65340, 92),
+        (65128, 92),
+        (8726, 92),
+        (10189, 92),
+        (10741, 92),
+        (10745, 92),
+        (119311, 92),
+        (119355, 92),
+        (12756, 92),
+        (20022, 92),
+        (12034, 92),
+        (42872, 38),
+        (708, 94),
+        (710, 94),
+        (5869, 43),
+        (10133, 43),
+        (66203, 43),
+        (8249, 60),
+        (10094, 60),
+        (706, 60),
+        (119350, 60),
+        (5176, 60),
+        (5810, 60),
+        (5120, 61),
+        (11840, 61),
+        (12448, 61),
+        (42239, 61),
+        (8250, 62),
+        (10095, 62),
+        (707, 62),
+        (119351, 62),
+        (5171, 62),
+        (94015, 62),
+        (8275, 126),
+        (732, 126),
+        (8128, 126),
+        (8764, 126),
+        (65372, 124),
+        (65293, 45),
+        (120784, 50),
+        (120794, 50),
+        (120804, 50),
+        (120814, 50),
+        (120824, 50),
+        (130034, 50),
+        (42842, 50),
+        (423, 50),
+        (1000, 50),
+        (42564, 50),
+        (5311, 50),
+        (42735, 50),
+        (119302, 51),
+        (120785, 51),
+        (120795, 51),
+        (120805, 51),
+        (120815, 51),
+        (120825, 51),
+        (130035, 51),
+        (42923, 51),
+        (540, 51),
+        (439, 51),
+        (42858, 51),
+        (11468, 51),
+        (1248, 51),
+        (94011, 51),
+        (71882, 51),
+        (120786, 52),
+        (120796, 52),
+        (120806, 52),
+        (120816, 52),
+        (120826, 52),
+        (130036, 52),
+        (5070, 52),
+        (71855, 52),
+        (120787, 53),
+        (120797, 53),
+        (120807, 53),
+        (120817, 53),
+        (120827, 53),
+        (130037, 53),
+        (444, 53),
+        (71867, 53),
+        (120788, 54),
+        (120798, 54),
+        (120808, 54),
+        (120818, 54),
+        (120828, 54),
+        (130038, 54),
+        (11474, 54),
+        (5102, 54),
+        (71893, 54),
+        (119314, 55),
+        (120789, 55),
+        (120799, 55),
+        (120809, 55),
+        (120819, 55),
+        (120829, 55),
+        (130039, 55),
+        (66770, 55),
+        (71878, 55),
+        (2819, 56),
+        (2538, 56),
+        (2666, 56),
+        (125131, 56),
+        (120790, 56),
+        (120800, 56),
+        (120810, 56),
+        (120820, 56),
+        (120830, 56),
+        (130040, 56),
+        (547, 56),
+        (546, 56),
+        (66330, 56),
+        (2663, 57),
+        (2920, 57),
+        (2541, 57),
+        (3437, 57),
+        (120791, 57),
+        (120801, 57),
+        (120811, 57),
+        (120821, 57),
+        (120831, 57),
+        (130041, 57),
+        (42862, 57),
+        (11466, 57),
+        (71884, 57),
+        (71852, 57),
+        (71894, 57),
+        (9082, 97),
+        (65345, 97),
+        (119834, 97),
+        (119886, 97),
+        (119938, 97),
+        (119990, 97),
+        (120042, 97),
+        (120094, 97),
+        (120146, 97),
+        (120198, 97),
+        (120250, 97),
+        (120302, 97),
+        (120354, 97),
+        (120406, 97),
+        (120458, 97),
+        (593, 97),
+        (945, 97),
+        (120514, 97),
+        (120572, 97),
+        (120630, 97),
+        (120688, 97),
+        (120746, 97),
+        (65313, 65),
+        (119808, 65),
+        (119860, 65),
+        (119912, 65),
+        (119964, 65),
+        (120016, 65),
+        (120068, 65),
+        (120120, 65),
+        (120172, 65),
+        (120224, 65),
+        (120276, 65),
+        (120328, 65),
+        (120380, 65),
+        (120432, 65),
+        (913, 65),
+        (120488, 65),
+        (120546, 65),
+        (120604, 65),
+        (120662, 65),
+        (120720, 65),
+        (5034, 65),
+        (5573, 65),
+        (42222, 65),
+        (94016, 65),
+        (66208, 65),
+        (119835, 98),
+        (119887, 98),
+        (119939, 98),
+        (119991, 98),
+        (120043, 98),
+        (120095, 98),
+        (120147, 98),
+        (120199, 98),
+        (120251, 98),
+        (120303, 98),
+        (120355, 98),
+        (120407, 98),
+        (120459, 98),
+        (388, 98),
+        (5071, 98),
+        (5234, 98),
+        (5551, 98),
+        (65314, 66),
+        (8492, 66),
+        (119809, 66),
+        (119861, 66),
+        (119913, 66),
+        (120017, 66),
+        (120069, 66),
+        (120121, 66),
+        (120173, 66),
+        (120225, 66),
+        (120277, 66),
+        (120329, 66),
+        (120381, 66),
+        (120433, 66),
+        (42932, 66),
+        (914, 66),
+        (120489, 66),
+        (120547, 66),
+        (120605, 66),
+        (120663, 66),
+        (120721, 66),
+        (5108, 66),
+        (5623, 66),
+        (42192, 66),
+        (66178, 66),
+        (66209, 66),
+        (66305, 66),
+        (65347, 99),
+        (8573, 99),
+        (119836, 99),
+        (119888, 99),
+        (119940, 99),
+        (119992, 99),
+        (120044, 99),
+        (120096, 99),
+        (120148, 99),
+        (120200, 99),
+        (120252, 99),
+        (120304, 99),
+        (120356, 99),
+        (120408, 99),
+        (120460, 99),
+        (7428, 99),
+        (1010, 99),
+        (11429, 99),
+        (43951, 99),
+        (66621, 99),
+        (128844, 67),
+        (71922, 67),
+        (71913, 67),
+        (65315, 67),
+        (8557, 67),
+        (8450, 67),
+        (8493, 67),
+        (119810, 67),
+        (119862, 67),
+        (119914, 67),
+        (119966, 67),
+        (120018, 67),
+        (120174, 67),
+        (120226, 67),
+        (120278, 67),
+        (120330, 67),
+        (120382, 67),
+        (120434, 67),
+        (1017, 67),
+        (11428, 67),
+        (5087, 67),
+        (42202, 67),
+        (66210, 67),
+        (66306, 67),
+        (66581, 67),
+        (66844, 67),
+        (8574, 100),
+        (8518, 100),
+        (119837, 100),
+        (119889, 100),
+        (119941, 100),
+        (119993, 100),
+        (120045, 100),
+        (120097, 100),
+        (120149, 100),
+        (120201, 100),
+        (120253, 100),
+        (120305, 100),
+        (120357, 100),
+        (120409, 100),
+        (120461, 100),
+        (1281, 100),
+        (5095, 100),
+        (5231, 100),
+        (42194, 100),
+        (8558, 68),
+        (8517, 68),
+        (119811, 68),
+        (119863, 68),
+        (119915, 68),
+        (119967, 68),
+        (120019, 68),
+        (120071, 68),
+        (120123, 68),
+        (120175, 68),
+        (120227, 68),
+        (120279, 68),
+        (120331, 68),
+        (120383, 68),
+        (120435, 68),
+        (5024, 68),
+        (5598, 68),
+        (5610, 68),
+        (42195, 68),
+        (8494, 101),
+        (65349, 101),
+        (8495, 101),
+        (8519, 101),
+        (119838, 101),
+        (119890, 101),
+        (119942, 101),
+        (120046, 101),
+        (120098, 101),
+        (120150, 101),
+        (120202, 101),
+        (120254, 101),
+        (120306, 101),
+        (120358, 101),
+        (120410, 101),
+        (120462, 101),
+        (43826, 101),
+        (1213, 101),
+        (8959, 69),
+        (65317, 69),
+        (8496, 69),
+        (119812, 69),
+        (119864, 69),
+        (119916, 69),
+        (120020, 69),
+        (120072, 69),
+        (120124, 69),
+        (120176, 69),
+        (120228, 69),
+        (120280, 69),
+        (120332, 69),
+        (120384, 69),
+        (120436, 69),
+        (917, 69),
+        (120492, 69),
+        (120550, 69),
+        (120608, 69),
+        (120666, 69),
+        (120724, 69),
+        (11577, 69),
+        (5036, 69),
+        (42224, 69),
+        (71846, 69),
+        (71854, 69),
+        (66182, 69),
+        (119839, 102),
+        (119891, 102),
+        (119943, 102),
+        (119995, 102),
+        (120047, 102),
+        (120099, 102),
+        (120151, 102),
+        (120203, 102),
+        (120255, 102),
+        (120307, 102),
+        (120359, 102),
+        (120411, 102),
+        (120463, 102),
+        (43829, 102),
+        (42905, 102),
+        (383, 102),
+        (7837, 102),
+        (1412, 102),
+        (119315, 70),
+        (8497, 70),
+        (119813, 70),
+        (119865, 70),
+        (119917, 70),
+        (120021, 70),
+        (120073, 70),
+        (120125, 70),
+        (120177, 70),
+        (120229, 70),
+        (120281, 70),
+        (120333, 70),
+        (120385, 70),
+        (120437, 70),
+        (42904, 70),
+        (988, 70),
+        (120778, 70),
+        (5556, 70),
+        (42205, 70),
+        (71874, 70),
+        (71842, 70),
+        (66183, 70),
+        (66213, 70),
+        (66853, 70),
+        (65351, 103),
+        (8458, 103),
+        (119840, 103),
+        (119892, 103),
+        (119944, 103),
+        (120048, 103),
+        (120100, 103),
+        (120152, 103),
+        (120204, 103),
+        (120256, 103),
+        (120308, 103),
+        (120360, 103),
+        (120412, 103),
+        (120464, 103),
+        (609, 103),
+        (7555, 103),
+        (397, 103),
+        (1409, 103),
+        (119814, 71),
+        (119866, 71),
+        (119918, 71),
+        (119970, 71),
+        (120022, 71),
+        (120074, 71),
+        (120126, 71),
+        (120178, 71),
+        (120230, 71),
+        (120282, 71),
+        (120334, 71),
+        (120386, 71),
+        (120438, 71),
+        (1292, 71),
+        (5056, 71),
+        (5107, 71),
+        (42198, 71),
+        (65352, 104),
+        (8462, 104),
+        (119841, 104),
+        (119945, 104),
+        (119997, 104),
+        (120049, 104),
+        (120101, 104),
+        (120153, 104),
+        (120205, 104),
+        (120257, 104),
+        (120309, 104),
+        (120361, 104),
+        (120413, 104),
+        (120465, 104),
+        (1211, 104),
+        (1392, 104),
+        (5058, 104),
+        (65320, 72),
+        (8459, 72),
+        (8460, 72),
+        (8461, 72),
+        (119815, 72),
+        (119867, 72),
+        (119919, 72),
+        (120023, 72),
+        (120179, 72),
+        (120231, 72),
+        (120283, 72),
+        (120335, 72),
+        (120387, 72),
+        (120439, 72),
+        (919, 72),
+        (120494, 72),
+        (120552, 72),
+        (120610, 72),
+        (120668, 72),
+        (120726, 72),
+        (11406, 72),
+        (5051, 72),
+        (5500, 72),
+        (42215, 72),
+        (66255, 72),
+        (731, 105),
+        (9075, 105),
+        (65353, 105),
+        (8560, 105),
+        (8505, 105),
+        (8520, 105),
+        (119842, 105),
+        (119894, 105),
+        (119946, 105),
+        (119998, 105),
+        (120050, 105),
+        (120102, 105),
+        (120154, 105),
+        (120206, 105),
+        (120258, 105),
+        (120310, 105),
+        (120362, 105),
+        (120414, 105),
+        (120466, 105),
+        (120484, 105),
+        (618, 105),
+        (617, 105),
+        (953, 105),
+        (8126, 105),
+        (890, 105),
+        (120522, 105),
+        (120580, 105),
+        (120638, 105),
+        (120696, 105),
+        (120754, 105),
+        (1110, 105),
+        (42567, 105),
+        (1231, 105),
+        (43893, 105),
+        (5029, 105),
+        (71875, 105),
+        (65354, 106),
+        (8521, 106),
+        (119843, 106),
+        (119895, 106),
+        (119947, 106),
+        (119999, 106),
+        (120051, 106),
+        (120103, 106),
+        (120155, 106),
+        (120207, 106),
+        (120259, 106),
+        (120311, 106),
+        (120363, 106),
+        (120415, 106),
+        (120467, 106),
+        (1011, 106),
+        (1112, 106),
+        (65322, 74),
+        (119817, 74),
+        (119869, 74),
+        (119921, 74),
+        (119973, 74),
+        (120025, 74),
+        (120077, 74),
+        (120129, 74),
+        (120181, 74),
+        (120233, 74),
+        (120285, 74),
+        (120337, 74),
+        (120389, 74),
+        (120441, 74),
+        (42930, 74),
+        (895, 74),
+        (1032, 74),
+        (5035, 74),
+        (5261, 74),
+        (42201, 74),
+        (119844, 107),
+        (119896, 107),
+        (119948, 107),
+        (120000, 107),
+        (120052, 107),
+        (120104, 107),
+        (120156, 107),
+        (120208, 107),
+        (120260, 107),
+        (120312, 107),
+        (120364, 107),
+        (120416, 107),
+        (120468, 107),
+        (8490, 75),
+        (65323, 75),
+        (119818, 75),
+        (119870, 75),
+        (119922, 75),
+        (119974, 75),
+        (120026, 75),
+        (120078, 75),
+        (120130, 75),
+        (120182, 75),
+        (120234, 75),
+        (120286, 75),
+        (120338, 75),
+        (120390, 75),
+        (120442, 75),
+        (922, 75),
+        (120497, 75),
+        (120555, 75),
+        (120613, 75),
+        (120671, 75),
+        (120729, 75),
+        (11412, 75),
+        (5094, 75),
+        (5845, 75),
+        (42199, 75),
+        (66840, 75),
+        (1472, 108),
+        (8739, 73),
+        (9213, 73),
+        (65512, 73),
+        (1633, 108),
+        (1777, 73),
+        (66336, 108),
+        (125127, 108),
+        (120783, 73),
+        (120793, 73),
+        (120803, 73),
+        (120813, 73),
+        (120823, 73),
+        (130033, 73),
+        (65321, 73),
+        (8544, 73),
+        (8464, 73),
+        (8465, 73),
+        (119816, 73),
+        (119868, 73),
+        (119920, 73),
+        (120024, 73),
+        (120128, 73),
+        (120180, 73),
+        (120232, 73),
+        (120284, 73),
+        (120336, 73),
+        (120388, 73),
+        (120440, 73),
+        (65356, 108),
+        (8572, 73),
+        (8467, 108),
+        (119845, 108),
+        (119897, 108),
+        (119949, 108),
+        (120001, 108),
+        (120053, 108),
+        (120105, 73),
+        (120157, 73),
+        (120209, 73),
+        (120261, 73),
+        (120313, 73),
+        (120365, 73),
+        (120417, 73),
+        (120469, 73),
+        (448, 73),
+        (120496, 73),
+        (120554, 73),
+        (120612, 73),
+        (120670, 73),
+        (120728, 73),
+        (11410, 73),
+        (1030, 73),
+        (1216, 73),
+        (1493, 108),
+        (1503, 108),
+        (1575, 108),
+        (126464, 108),
+        (126592, 108),
+        (65166, 108),
+        (65165, 108),
+        (1994, 108),
+        (11599, 73),
+        (5825, 73),
+        (42226, 73),
+        (93992, 73),
+        (66186, 124),
+        (66313, 124),
+        (119338, 76),
+        (8556, 76),
+        (8466, 76),
+        (119819, 76),
+        (119871, 76),
+        (119923, 76),
+        (120027, 76),
+        (120079, 76),
+        (120131, 76),
+        (120183, 76),
+        (120235, 76),
+        (120287, 76),
+        (120339, 76),
+        (120391, 76),
+        (120443, 76),
+        (11472, 76),
+        (5086, 76),
+        (5290, 76),
+        (42209, 76),
+        (93974, 76),
+        (71843, 76),
+        (71858, 76),
+        (66587, 76),
+        (66854, 76),
+        (65325, 77),
+        (8559, 77),
+        (8499, 77),
+        (119820, 77),
+        (119872, 77),
+        (119924, 77),
+        (120028, 77),
+        (120080, 77),
+        (120132, 77),
+        (120184, 77),
+        (120236, 77),
+        (120288, 77),
+        (120340, 77),
+        (120392, 77),
+        (120444, 77),
+        (924, 77),
+        (120499, 77),
+        (120557, 77),
+        (120615, 77),
+        (120673, 77),
+        (120731, 77),
+        (1018, 77),
+        (11416, 77),
+        (5047, 77),
+        (5616, 77),
+        (5846, 77),
+        (42207, 77),
+        (66224, 77),
+        (66321, 77),
+        (119847, 110),
+        (119899, 110),
+        (119951, 110),
+        (120003, 110),
+        (120055, 110),
+        (120107, 110),
+        (120159, 110),
+        (120211, 110),
+        (120263, 110),
+        (120315, 110),
+        (120367, 110),
+        (120419, 110),
+        (120471, 110),
+        (1400, 110),
+        (1404, 110),
+        (65326, 78),
+        (8469, 78),
+        (119821, 78),
+        (119873, 78),
+        (119925, 78),
+        (119977, 78),
+        (120029, 78),
+        (120081, 78),
+        (120185, 78),
+        (120237, 78),
+        (120289, 78),
+        (120341, 78),
+        (120393, 78),
+        (120445, 78),
+        (925, 78),
+        (120500, 78),
+        (120558, 78),
+        (120616, 78),
+        (120674, 78),
+        (120732, 78),
+        (11418, 78),
+        (42208, 78),
+        (66835, 78),
+        (3074, 111),
+        (3202, 111),
+        (3330, 111),
+        (3458, 111),
+        (2406, 111),
+        (2662, 111),
+        (2790, 111),
+        (3046, 111),
+        (3174, 111),
+        (3302, 111),
+        (3430, 111),
+        (3664, 111),
+        (3792, 111),
+        (4160, 111),
+        (1637, 111),
+        (1781, 111),
+        (65359, 111),
+        (8500, 111),
+        (119848, 111),
+        (119900, 111),
+        (119952, 111),
+        (120056, 111),
+        (120108, 111),
+        (120160, 111),
+        (120212, 111),
+        (120264, 111),
+        (120316, 111),
+        (120368, 111),
+        (120420, 111),
+        (120472, 111),
+        (7439, 111),
+        (7441, 111),
+        (43837, 111),
+        (959, 111),
+        (120528, 111),
+        (120586, 111),
+        (120644, 111),
+        (120702, 111),
+        (120760, 111),
+        (963, 111),
+        (120532, 111),
+        (120590, 111),
+        (120648, 111),
+        (120706, 111),
+        (120764, 111),
+        (11423, 111),
+        (4351, 111),
+        (1413, 111),
+        (1505, 111),
+        (1607, 111),
+        (126500, 111),
+        (126564, 111),
+        (126596, 111),
+        (65259, 111),
+        (65260, 111),
+        (65258, 111),
+        (65257, 111),
+        (1726, 111),
+        (64428, 111),
+        (64429, 111),
+        (64427, 111),
+        (64426, 111),
+        (1729, 111),
+        (64424, 111),
+        (64425, 111),
+        (64423, 111),
+        (64422, 111),
+        (1749, 111),
+        (3360, 111),
+        (4125, 111),
+        (66794, 111),
+        (71880, 111),
+        (71895, 111),
+        (66604, 111),
+        (1984, 79),
+        (2534, 79),
+        (2918, 79),
+        (12295, 79),
+        (70864, 79),
+        (71904, 79),
+        (120782, 79),
+        (120792, 79),
+        (120802, 79),
+        (120812, 79),
+        (120822, 79),
+        (130032, 79),
+        (65327, 79),
+        (119822, 79),
+        (119874, 79),
+        (119926, 79),
+        (119978, 79),
+        (120030, 79),
+        (120082, 79),
+        (120134, 79),
+        (120186, 79),
+        (120238, 79),
+        (120290, 79),
+        (120342, 79),
+        (120394, 79),
+        (120446, 79),
+        (927, 79),
+        (120502, 79),
+        (120560, 79),
+        (120618, 79),
+        (120676, 79),
+        (120734, 79),
+        (11422, 79),
+        (1365, 79),
+        (11604, 79),
+        (4816, 79),
+        (2848, 79),
+        (66754, 79),
+        (42227, 79),
+        (71861, 79),
+        (66194, 79),
+        (66219, 79),
+        (66564, 79),
+        (66838, 79),
+        (9076, 112),
+        (65360, 112),
+        (119849, 112),
+        (119901, 112),
+        (119953, 112),
+        (120005, 112),
+        (120057, 112),
+        (120109, 112),
+        (120161, 112),
+        (120213, 112),
+        (120265, 112),
+        (120317, 112),
+        (120369, 112),
+        (120421, 112),
+        (120473, 112),
+        (961, 112),
+        (120530, 112),
+        (120544, 112),
+        (120588, 112),
+        (120602, 112),
+        (120646, 112),
+        (120660, 112),
+        (120704, 112),
+        (120718, 112),
+        (120762, 112),
+        (120776, 112),
+        (11427, 112),
+        (65328, 80),
+        (8473, 80),
+        (119823, 80),
+        (119875, 80),
+        (119927, 80),
+        (119979, 80),
+        (120031, 80),
+        (120083, 80),
+        (120187, 80),
+        (120239, 80),
+        (120291, 80),
+        (120343, 80),
+        (120395, 80),
+        (120447, 80),
+        (929, 80),
+        (120504, 80),
+        (120562, 80),
+        (120620, 80),
+        (120678, 80),
+        (120736, 80),
+        (11426, 80),
+        (5090, 80),
+        (5229, 80),
+        (42193, 80),
+        (66197, 80),
+        (119850, 113),
+        (119902, 113),
+        (119954, 113),
+        (120006, 113),
+        (120058, 113),
+        (120110, 113),
+        (120162, 113),
+        (120214, 113),
+        (120266, 113),
+        (120318, 113),
+        (120370, 113),
+        (120422, 113),
+        (120474, 113),
+        (1307, 113),
+        (1379, 113),
+        (1382, 113),
+        (8474, 81),
+        (119824, 81),
+        (119876, 81),
+        (119928, 81),
+        (119980, 81),
+        (120032, 81),
+        (120084, 81),
+        (120188, 81),
+        (120240, 81),
+        (120292, 81),
+        (120344, 81),
+        (120396, 81),
+        (120448, 81),
+        (11605, 81),
+        (119851, 114),
+        (119903, 114),
+        (119955, 114),
+        (120007, 114),
+        (120059, 114),
+        (120111, 114),
+        (120163, 114),
+        (120215, 114),
+        (120267, 114),
+        (120319, 114),
+        (120371, 114),
+        (120423, 114),
+        (120475, 114),
+        (43847, 114),
+        (43848, 114),
+        (7462, 114),
+        (11397, 114),
+        (43905, 114),
+        (119318, 82),
+        (8475, 82),
+        (8476, 82),
+        (8477, 82),
+        (119825, 82),
+        (119877, 82),
+        (119929, 82),
+        (120033, 82),
+        (120189, 82),
+        (120241, 82),
+        (120293, 82),
+        (120345, 82),
+        (120397, 82),
+        (120449, 82),
+        (422, 82),
+        (5025, 82),
+        (5074, 82),
+        (66740, 82),
+        (5511, 82),
+        (42211, 82),
+        (94005, 82),
+        (65363, 115),
+        (119852, 115),
+        (119904, 115),
+        (119956, 115),
+        (120008, 115),
+        (120060, 115),
+        (120112, 115),
+        (120164, 115),
+        (120216, 115),
+        (120268, 115),
+        (120320, 115),
+        (120372, 115),
+        (120424, 115),
+        (120476, 115),
+        (42801, 115),
+        (445, 115),
+        (1109, 115),
+        (43946, 115),
+        (71873, 115),
+        (66632, 115),
+        (65331, 83),
+        (119826, 83),
+        (119878, 83),
+        (119930, 83),
+        (119982, 83),
+        (120034, 83),
+        (120086, 83),
+        (120138, 83),
+        (120190, 83),
+        (120242, 83),
+        (120294, 83),
+        (120346, 83),
+        (120398, 83),
+        (120450, 83),
+        (1029, 83),
+        (1359, 83),
+        (5077, 83),
+        (5082, 83),
+        (42210, 83),
+        (94010, 83),
+        (66198, 83),
+        (66592, 83),
+        (119853, 116),
+        (119905, 116),
+        (119957, 116),
+        (120009, 116),
+        (120061, 116),
+        (120113, 116),
+        (120165, 116),
+        (120217, 116),
+        (120269, 116),
+        (120321, 116),
+        (120373, 116),
+        (120425, 116),
+        (120477, 116),
+        (8868, 84),
+        (10201, 84),
+        (128872, 84),
+        (65332, 84),
+        (119827, 84),
+        (119879, 84),
+        (119931, 84),
+        (119983, 84),
+        (120035, 84),
+        (120087, 84),
+        (120139, 84),
+        (120191, 84),
+        (120243, 84),
+        (120295, 84),
+        (120347, 84),
+        (120399, 84),
+        (120451, 84),
+        (932, 84),
+        (120507, 84),
+        (120565, 84),
+        (120623, 84),
+        (120681, 84),
+        (120739, 84),
+        (11430, 84),
+        (5026, 84),
+        (42196, 84),
+        (93962, 84),
+        (71868, 84),
+        (66199, 84),
+        (66225, 84),
+        (66325, 84),
+        (119854, 117),
+        (119906, 117),
+        (119958, 117),
+        (120010, 117),
+        (120062, 117),
+        (120114, 117),
+        (120166, 117),
+        (120218, 117),
+        (120270, 117),
+        (120322, 117),
+        (120374, 117),
+        (120426, 117),
+        (120478, 117),
+        (42911, 117),
+        (7452, 117),
+        (43854, 117),
+        (43858, 117),
+        (651, 117),
+        (965, 117),
+        (120534, 117),
+        (120592, 117),
+        (120650, 117),
+        (120708, 117),
+        (120766, 117),
+        (1405, 117),
+        (66806, 117),
+        (71896, 117),
+        (8746, 85),
+        (8899, 85),
+        (119828, 85),
+        (119880, 85),
+        (119932, 85),
+        (119984, 85),
+        (120036, 85),
+        (120088, 85),
+        (120140, 85),
+        (120192, 85),
+        (120244, 85),
+        (120296, 85),
+        (120348, 85),
+        (120400, 85),
+        (120452, 85),
+        (1357, 85),
+        (4608, 85),
+        (66766, 85),
+        (5196, 85),
+        (42228, 85),
+        (94018, 85),
+        (71864, 85),
+        (8744, 118),
+        (8897, 118),
+        (65366, 118),
+        (8564, 118),
+        (119855, 118),
+        (119907, 118),
+        (119959, 118),
+        (120011, 118),
+        (120063, 118),
+        (120115, 118),
+        (120167, 118),
+        (120219, 118),
+        (120271, 118),
+        (120323, 118),
+        (120375, 118),
+        (120427, 118),
+        (120479, 118),
+        (7456, 118),
+        (957, 118),
+        (120526, 118),
+        (120584, 118),
+        (120642, 118),
+        (120700, 118),
+        (120758, 118),
+        (1141, 118),
+        (1496, 118),
+        (71430, 118),
+        (43945, 118),
+        (71872, 118),
+        (119309, 86),
+        (1639, 86),
+        (1783, 86),
+        (8548, 86),
+        (119829, 86),
+        (119881, 86),
+        (119933, 86),
+        (119985, 86),
+        (120037, 86),
+        (120089, 86),
+        (120141, 86),
+        (120193, 86),
+        (120245, 86),
+        (120297, 86),
+        (120349, 86),
+        (120401, 86),
+        (120453, 86),
+        (1140, 86),
+        (11576, 86),
+        (5081, 86),
+        (5167, 86),
+        (42719, 86),
+        (42214, 86),
+        (93960, 86),
+        (71840, 86),
+        (66845, 86),
+        (623, 119),
+        (119856, 119),
+        (119908, 119),
+        (119960, 119),
+        (120012, 119),
+        (120064, 119),
+        (120116, 119),
+        (120168, 119),
+        (120220, 119),
+        (120272, 119),
+        (120324, 119),
+        (120376, 119),
+        (120428, 119),
+        (120480, 119),
+        (7457, 119),
+        (1121, 119),
+        (1309, 119),
+        (1377, 119),
+        (71434, 119),
+        (71438, 119),
+        (71439, 119),
+        (43907, 119),
+        (71919, 87),
+        (71910, 87),
+        (119830, 87),
+        (119882, 87),
+        (119934, 87),
+        (119986, 87),
+        (120038, 87),
+        (120090, 87),
+        (120142, 87),
+        (120194, 87),
+        (120246, 87),
+        (120298, 87),
+        (120350, 87),
+        (120402, 87),
+        (120454, 87),
+        (1308, 87),
+        (5043, 87),
+        (5076, 87),
+        (42218, 87),
+        (5742, 120),
+        (10539, 120),
+        (10540, 120),
+        (10799, 120),
+        (65368, 120),
+        (8569, 120),
+        (119857, 120),
+        (119909, 120),
+        (119961, 120),
+        (120013, 120),
+        (120065, 120),
+        (120117, 120),
+        (120169, 120),
+        (120221, 120),
+        (120273, 120),
+        (120325, 120),
+        (120377, 120),
+        (120429, 120),
+        (120481, 120),
+        (5441, 120),
+        (5501, 120),
+        (5741, 88),
+        (9587, 88),
+        (66338, 88),
+        (71916, 88),
+        (65336, 88),
+        (8553, 88),
+        (119831, 88),
+        (119883, 88),
+        (119935, 88),
+        (119987, 88),
+        (120039, 88),
+        (120091, 88),
+        (120143, 88),
+        (120195, 88),
+        (120247, 88),
+        (120299, 88),
+        (120351, 88),
+        (120403, 88),
+        (120455, 88),
+        (42931, 88),
+        (935, 88),
+        (120510, 88),
+        (120568, 88),
+        (120626, 88),
+        (120684, 88),
+        (120742, 88),
+        (11436, 88),
+        (11613, 88),
+        (5815, 88),
+        (42219, 88),
+        (66192, 88),
+        (66228, 88),
+        (66327, 88),
+        (66855, 88),
+        (611, 121),
+        (7564, 121),
+        (65369, 121),
+        (119858, 121),
+        (119910, 121),
+        (119962, 121),
+        (120014, 121),
+        (120066, 121),
+        (120118, 121),
+        (120170, 121),
+        (120222, 121),
+        (120274, 121),
+        (120326, 121),
+        (120378, 121),
+        (120430, 121),
+        (120482, 121),
+        (655, 121),
+        (7935, 121),
+        (43866, 121),
+        (947, 121),
+        (8509, 121),
+        (120516, 121),
+        (120574, 121),
+        (120632, 121),
+        (120690, 121),
+        (120748, 121),
+        (1199, 121),
+        (4327, 121),
+        (71900, 121),
+        (65337, 89),
+        (119832, 89),
+        (119884, 89),
+        (119936, 89),
+        (119988, 89),
+        (120040, 89),
+        (120092, 89),
+        (120144, 89),
+        (120196, 89),
+        (120248, 89),
+        (120300, 89),
+        (120352, 89),
+        (120404, 89),
+        (120456, 89),
+        (933, 89),
+        (978, 89),
+        (120508, 89),
+        (120566, 89),
+        (120624, 89),
+        (120682, 89),
+        (120740, 89),
+        (11432, 89),
+        (1198, 89),
+        (5033, 89),
+        (5053, 89),
+        (42220, 89),
+        (94019, 89),
+        (71844, 89),
+        (66226, 89),
+        (119859, 122),
+        (119911, 122),
+        (119963, 122),
+        (120015, 122),
+        (120067, 122),
+        (120119, 122),
+        (120171, 122),
+        (120223, 122),
+        (120275, 122),
+        (120327, 122),
+        (120379, 122),
+        (120431, 122),
+        (120483, 122),
+        (7458, 122),
+        (43923, 122),
+        (71876, 122),
+        (66293, 90),
+        (71909, 90),
+        (65338, 90),
+        (8484, 90),
+        (8488, 90),
+        (119833, 90),
+        (119885, 90),
+        (119937, 90),
+        (119989, 90),
+        (120041, 90),
+        (120197, 90),
+        (120249, 90),
+        (120301, 90),
+        (120353, 90),
+        (120405, 90),
+        (120457, 90),
+        (918, 90),
+        (120493, 90),
+        (120551, 90),
+        (120609, 90),
+        (120667, 90),
+        (120725, 90),
+        (5059, 90),
+        (42204, 90),
+        (71849, 90),
+        (65282, 34),
+        (65284, 36),
+        (65285, 37),
+        (65286, 38),
+        (65290, 42),
+        (65291, 43),
+        (65294, 46),
+        (65295, 47),
+        (65296, 48),
+        (65297, 49),
+        (65298, 50),
+        (65299, 51),
+        (65300, 52),
+        (65301, 53),
+        (65302, 54),
+        (65303, 55),
+        (65304, 56),
+        (65305, 57),
+        (65308, 60),
+        (65309, 61),
+        (65310, 62),
+        (65312, 64),
+        (65316, 68),
+        (65318, 70),
+        (65319, 71),
+        (65324, 76),
+        (65329, 81),
+        (65330, 82),
+        (65333, 85),
+        (65334, 86),
+        (65335, 87),
+        (65343, 95),
+        (65346, 98),
+        (65348, 100),
+        (65350, 102),
+        (65355, 107),
+        (65357, 109),
+        (65358, 110),
+        (65361, 113),
+        (65362, 114),
+        (65364, 116),
+        (65365, 117),
+        (65367, 119),
+        (65370, 122),
+        (65371, 123),
+        (65373, 125),
+        (119846, 109),
+        (160, 32),
+        (8211, 45),
+        (65374, 126),
+        (65306, 58),
+        (65281, 33),
+        (8216, 96),
+        (8217, 96),
+        (8245, 96),
+        (180, 96),
+        (12494, 47),
+        (1047, 51),
+        (1073, 54),
+        (1072, 97),
+        (1040, 65),
+        (1068, 98),
+        (1042, 66),
+        (1089, 99),
+        (1057, 67),
+        (1077, 101),
+        (1045, 69),
+        (1053, 72),
+        (305, 105),
+        (1050, 75),
+        (921, 73),
+        (1052, 77),
+        (1086, 111),
+        (1054, 79),
+        (1009, 112),
+        (1088, 112),
+        (1056, 80),
+        (1075, 114),
+        (1058, 84),
+        (215, 120),
+        (1093, 120),
+        (1061, 88),
+        (1091, 121),
+        (1059, 89),
+        (65283, 35),
+        (65288, 40),
+        (65289, 41),
+        (65292, 44),
+        (65307, 59),
+        (65311, 63),
+        (65374, 126),
+        (65306, 58),
+        (65281, 33),
+        (8216, 96),
+        (8217, 96),
+        (8245, 96),
+        (180, 96),
+        (12494, 47),
+        (1047, 51),
+        (1073, 54),
+        (1072, 97),
+        (1040, 65),
+        (1068, 98),
+        (1042, 66),
+        (1089, 99),
+        (1057, 67),
+        (1077, 101),
+        (1045, 69),
+        (1053, 72),
+        (305, 105),
+        (1050, 75),
+        (921, 73),
+        (1052, 77),
+        (1086, 111),
+        (1054, 79),
+        (1009, 112),
+        (1088, 112),
+        (1056, 80),
+        (1075, 114),
+        (1058, 84),
+        (1093, 120),
+        (1061, 88),
+        (1091, 121),
+        (1059, 89),
+        (65283, 35),
+        (65288, 40),
+        (65289, 41),
+        (65292, 44),
+        (65307, 59),
+        (65311, 63),
+        (65374, 126),
+        (65306, 58),
+        (65281, 33),
+        (8216, 96),
+        (8217, 96),
+        (8245, 96),
+        (180, 96),
+        (12494, 47),
+        (1047, 51),
+        (1073, 54),
+        (1072, 97),
+        (1040, 65),
+        (1068, 98),
+        (1042, 66),
+        (1089, 99),
+        (1057, 67),
+        (1077, 101),
+        (1045, 69),
+        (1053, 72),
+        (305, 105),
+        (1050, 75),
+        (921, 73),
+        (1052, 77),
+        (1086, 111),
+        (1054, 79),
+        (1009, 112),
+        (1088, 112),
+        (1056, 80),
+        (1075, 114),
+        (1058, 84),
+        (1093, 120),
+        (1061, 88),
+        (1091, 121),
+        (1059, 89),
+        (65283, 35),
+        (65288, 40),
+        (65289, 41),
+        (65292, 44),
+        (65307, 59),
+        (65311, 63),
+        (8211, 45),
+        (65374, 126),
+        (65306, 58),
+        (65281, 33),
+        (8245, 96),
+        (180, 96),
+        (12494, 47),
+        (1047, 51),
+        (1073, 54),
+        (1072, 97),
+        (1040, 65),
+        (1068, 98),
+        (1042, 66),
+        (1089, 99),
+        (1057, 67),
+        (1077, 101),
+        (1045, 69),
+        (1053, 72),
+        (305, 105),
+        (1050, 75),
+        (1052, 77),
+        (1086, 111),
+        (1054, 79),
+        (1009, 112),
+        (1088, 112),
+        (1056, 80),
+        (1075, 114),
+        (1058, 84),
+        (215, 120),
+        (1093, 120),
+        (1061, 88),
+        (1091, 121),
+        (1059, 89),
+        (65283, 35),
+        (65288, 40),
+        (65289, 41),
+        (65292, 44),
+        (65307, 59),
+        (65311, 63),
+        (65374, 126),
+        (65306, 58),
+        (65281, 33),
+        (8216, 96),
+        (8245, 96),
+        (12494, 47),
+        (1047, 51),
+        (1073, 54),
+        (1072, 97),
+        (1040, 65),
+        (1068, 98),
+        (1042, 66),
+        (1089, 99),
+        (1057, 67),
+        (1077, 101),
+        (1045, 69),
+        (1053, 72),
+        (305, 105),
+        (1050, 75),
+        (921, 73),
+        (1052, 77),
+        (1086, 111),
+        (1054, 79),
+        (1009, 112),
+        (1088, 112),
+        (1056, 80),
+        (1075, 114),
+        (1058, 84),
+        (215, 120),
+        (1093, 120),
+        (1061, 88),
+        (1091, 121),
+        (1059, 89),
+        (65283, 35),
+        (65288, 40),
+        (65289, 41),
+        (65292, 44),
+        (65307, 59),
+        (65311, 63),
+        (160, 32),
+        (8211, 45),
+        (65374, 126),
+        (65306, 58),
+        (65281, 33),
+        (8216, 96),
+        (8245, 96),
+        (180, 96),
+        (12494, 47),
+        (1047, 51),
+        (1073, 54),
+        (1072, 97),
+        (1040, 65),
+        (1068, 98),
+        (1042, 66),
+        (1089, 99),
+        (1057, 67),
+        (1077, 101),
+        (1045, 69),
+        (1053, 72),
+        (305, 105),
+        (1050, 75),
+        (921, 73),
+        (1052, 77),
+        (1086, 111),
+        (1054, 79),
+        (1009, 112),
+        (1088, 112),
+        (1056, 80),
+        (1075, 114),
+        (1058, 84),
+        (215, 120),
+        (1093, 120),
+        (1061, 88),
+        (1091, 121),
+        (1059, 89),
+        (65283, 35),
+        (65288, 40),
+        (65289, 41),
+        (65292, 44),
+        (65307, 59),
+        (65311, 63),
+        (8211, 45),
+        (65306, 58),
+        (65281, 33),
+        (8216, 96),
+        (8217, 96),
+        (8245, 96),
+        (180, 96),
+        (1047, 51),
+        (1073, 54),
+        (1072, 97),
+        (1040, 65),
+        (1068, 98),
+        (1042, 66),
+        (1089, 99),
+        (1057, 67),
+        (1077, 101),
+        (1045, 69),
+        (1053, 72),
+        (305, 105),
+        (1050, 75),
+        (921, 73),
+        (1052, 77),
+        (1086, 111),
+        (1054, 79),
+        (1009, 112),
+        (1088, 112),
+        (1056, 80),
+        (1075, 114),
+        (1058, 84),
+        (215, 120),
+        (1093, 120),
+        (1061, 88),
+        (1091, 121),
+        (1059, 89),
+        (65283, 35),
+        (65292, 44),
+        (65307, 59),
+        (8211, 45),
+        (65374, 126),
+        (65306, 58),
+        (65281, 33),
+        (8245, 96),
+        (180, 96),
+        (12494, 47),
+        (1047, 51),
+        (1073, 54),
+        (1072, 97),
+        (1040, 65),
+        (1068, 98),
+        (1042, 66),
+        (1089, 99),
+        (1057, 67),
+        (1077, 101),
+        (1045, 69),
+        (1053, 72),
+        (305, 105),
+        (1050, 75),
+        (921, 73),
+        (1052, 77),
+        (1086, 111),
+        (1054, 79),
+        (1009, 112),
+        (1088, 112),
+        (1056, 80),
+        (1075, 114),
+        (1058, 84),
+        (215, 120),
+        (1093, 120),
+        (1061, 88),
+        (1091, 121),
+        (1059, 89),
+        (65283, 35),
+        (65288, 40),
+        (65289, 41),
+        (65292, 44),
+        (65307, 59),
+        (65311, 63),
+        (65374, 126),
+        (65306, 58),
+        (65281, 33),
+        (8216, 96),
+        (8217, 96),
+        (8245, 96),
+        (180, 96),
+        (12494, 47),
+        (1047, 51),
+        (1073, 54),
+        (1072, 97),
+        (1040, 65),
+        (1068, 98),
+        (1042, 66),
+        (1089, 99),
+        (1057, 67),
+        (1077, 101),
+        (1045, 69),
+        (1053, 72),
+        (305, 105),
+        (1050, 75),
+        (921, 73),
+        (1052, 77),
+        (1086, 111),
+        (1054, 79),
+        (1009, 112),
+        (1088, 112),
+        (1056, 80),
+        (1075, 114),
+        (1058, 84),
+        (215, 120),
+        (1093, 120),
+        (1061, 88),
+        (1091, 121),
+        (1059, 89),
+        (65283, 35),
+        (65288, 40),
+        (65289, 41),
+        (65292, 44),
+        (65307, 59),
+        (65311, 63),
+        (65374, 126),
+        (65306, 58),
+        (65281, 33),
+        (8216, 96),
+        (8217, 96),
+        (8245, 96),
+        (180, 96),
+        (12494, 47),
+        (1047, 51),
+        (1073, 54),
+        (1072, 97),
+        (1040, 65),
+        (1068, 98),
+        (1042, 66),
+        (1089, 99),
+        (1057, 67),
+        (1077, 101),
+        (1045, 69),
+        (1053, 72),
+        (305, 105),
+        (1050, 75),
+        (921, 73),
+        (1052, 77),
+        (1086, 111),
+        (1054, 79),
+        (1009, 112),
+        (1088, 112),
+        (1056, 80),
+        (1075, 114),
+        (1058, 84),
+        (215, 120),
+        (1093, 120),
+        (1061, 88),
+        (1091, 121),
+        (1059, 89),
+        (65283, 35),
+        (65288, 40),
+        (65289, 41),
+        (65292, 44),
+        (65307, 59),
+        (65311, 63),
+        (160, 32),
+        (8211, 45),
+        (65374, 126),
+        (65306, 58),
+        (65281, 33),
+        (8216, 96),
+        (8217, 96),
+        (8245, 96),
+        (180, 96),
+        (12494, 47),
+        (1047, 51),
+        (1073, 54),
+        (1072, 97),
+        (1040, 65),
+        (1068, 98),
+        (1042, 66),
+        (1089, 99),
+        (1057, 67),
+        (1077, 101),
+        (1045, 69),
+        (1053, 72),
+        (305, 105),
+        (1050, 75),
+        (921, 73),
+        (1052, 77),
+        (1086, 111),
+        (1054, 79),
+        (1088, 112),
+        (1056, 80),
+        (1075, 114),
+        (1058, 84),
+        (215, 120),
+        (1093, 120),
+        (1061, 88),
+        (1091, 121),
+        (1059, 89),
+        (65283, 35),
+        (65288, 40),
+        (65289, 41),
+        (65292, 44),
+        (65307, 59),
+        (65311, 63),
+        (65374, 126),
+        (65306, 58),
+        (65281, 33),
+        (8216, 96),
+        (8217, 96),
+        (8245, 96),
+        (180, 96),
+        (12494, 47),
+        (305, 105),
+        (921, 73),
+        (1009, 112),
+        (215, 120),
+        (65283, 35),
+        (65288, 40),
+        (65289, 41),
+        (65292, 44),
+        (65307, 59),
+        (65311, 63),
+        (160, 32),
+        (8211, 45),
+        (65374, 126),
+        (65306, 58),
+        (65281, 33),
+        (8245, 96),
+        (180, 96),
+        (12494, 47),
+        (1047, 51),
+        (1073, 54),
+        (1072, 97),
+        (1040, 65),
+        (1068, 98),
+        (1042, 66),
+        (1089, 99),
+        (1057, 67),
+        (1077, 101),
+        (1045, 69),
+        (1053, 72),
+        (1050, 75),
+        (921, 73),
+        (1052, 77),
+        (1086, 111),
+        (1054, 79),
+        (1009, 112),
+        (1088, 112),
+        (1056, 80),
+        (1075, 114),
+        (1058, 84),
+        (215, 120),
+        (1093, 120),
+        (1061, 88),
+        (1091, 121),
+        (1059, 89),
+        (65283, 35),
+        (65288, 40),
+        (65289, 41),
+        (65292, 44),
+        (65307, 59),
+        (65311, 63),
+        (65374, 126),
+        (65306, 58),
+        (65281, 33),
+        (8245, 96),
+        (180, 96),
+        (12494, 47),
+        (1047, 51),
+        (1073, 54),
+        (1072, 97),
+        (1040, 65),
+        (1068, 98),
+        (1042, 66),
+        (1089, 99),
+        (1057, 67),
+        (1077, 101),
+        (1045, 69),
+        (1053, 72),
+        (305, 105),
+        (1050, 75),
+        (921, 73),
+        (1052, 77),
+        (1086, 111),
+        (1054, 79),
+        (1009, 112),
+        (1088, 112),
+        (1056, 80),
+        (1075, 114),
+        (1058, 84),
+        (215, 120),
+        (1093, 120),
+        (1061, 88),
+        (1091, 121),
+        (1059, 89),
+        (65288, 40),
+        (65289, 41),
+        (8211, 45),
+        (65374, 126),
+        (180, 96),
+        (12494, 47),
+        (1047, 51),
+        (1073, 54),
+        (1072, 97),
+        (1040, 65),
+        (1068, 98),
+        (1042, 66),
+        (1089, 99),
+        (1057, 67),
+        (1077, 101),
+        (1045, 69),
+        (1053, 72),
+        (305, 105),
+        (1050, 75),
+        (921, 73),
+        (1052, 77),
+        (1086, 111),
+        (1054, 79),
+        (1009, 112),
+        (1088, 112),
+        (1056, 80),
+        (1075, 114),
+        (1058, 84),
+        (215, 120),
+        (1093, 120),
+        (1061, 88),
+        (1091, 121),
+        (1059, 89),
+        (65283, 35),
+        (65307, 59),
+    ])
+});
diff --git a/crates/ruff/src/rules/ruff/rules/explicit_f_string_type_conversion.rs b/crates/ruff/src/rules/ruff/rules/explicit_f_string_type_conversion.rs
new file mode 100644
index 0000000000000..b41e8ae77b7ae
--- /dev/null
+++ b/crates/ruff/src/rules/ruff/rules/explicit_f_string_type_conversion.rs
@@ -0,0 +1,206 @@
+use anyhow::{bail, Result};
+use libcst_native::{
+    ConcatenatedString, Expression, FormattedStringContent, FormattedStringExpression,
+};
+use rustpython_parser::ast::{self, Expr, Ranged};
+
+use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
+use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::source_code::{Locator, Stylist};
+
+use crate::autofix::codemods::CodegenStylist;
+use crate::checkers::ast::Checker;
+use crate::cst::matchers::{match_call_mut, match_expression, match_name};
+use crate::registry::AsRule;
+
+/// ## What it does
+/// Checks for usages of `str()`, `repr()`, and `ascii()` as explicit type
+/// conversions within f-strings.
+///
+/// ## Why is this bad?
+/// f-strings support dedicated conversion flags for these types, which are
+/// more succinct and idiomatic.
+///
+/// ## Example
+/// ```python
+/// a = "some string"
+/// f"{repr(a)}"
+/// ```
+///
+/// Use instead:
+/// ```python
+/// a = "some string"
+/// f"{a!r}"
+/// ```
+#[violation]
+pub struct ExplicitFStringTypeConversion;
+
+impl AlwaysAutofixableViolation for ExplicitFStringTypeConversion {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Use conversion in f-string")
+    }
+
+    fn autofix_title(&self) -> String {
+        "Replace f-string function call with conversion".to_string()
+    }
+}
+
+/// RUF010
+pub(crate) fn explicit_f_string_type_conversion(
+    checker: &mut Checker,
+    expr: &Expr,
+    values: &[Expr],
+) {
+    for (index, formatted_value) in values
+        .iter()
+        .filter_map(|expr| {
+            if let Expr::FormattedValue(expr) = &expr {
+                Some(expr)
+            } else {
+                None
+            }
+        })
+        .enumerate()
+    {
+        let ast::ExprFormattedValue {
+            value, conversion, ..
+        } = formatted_value;
+
+        // Skip if there's already a conversion flag.
+        if !conversion.is_none() {
+            continue;
+        }
+
+        let Expr::Call(ast::ExprCall {
+            func,
+            args,
+            keywords,
+            ..
+        }) = value.as_ref() else {
+            continue;
+        };
+
+        // Can't be a conversion otherwise.
+        if args.len() != 1 || !keywords.is_empty() {
+            continue;
+        }
+
+        let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() else {
+            continue;
+        };
+
+        if !matches!(id.as_str(), "str" | "repr" | "ascii") {
+            continue;
+        };
+
+        if !checker.semantic_model().is_builtin(id) {
+            continue;
+        }
+
+        let mut diagnostic = Diagnostic::new(ExplicitFStringTypeConversion, value.range());
+        if checker.patch(diagnostic.kind.rule()) {
+            diagnostic.try_set_fix(|| {
+                fix_explicit_f_string_type_conversion(expr, index, checker.locator, checker.stylist)
+            });
+        }
+        checker.diagnostics.push(diagnostic);
+    }
+}
+
+/// Generate a [`Fix`] to replace an explicit type conversion with a conversion flag.
+fn fix_explicit_f_string_type_conversion(
+    expr: &Expr,
+    index: usize,
+    locator: &Locator,
+    stylist: &Stylist,
+) -> Result<Fix> {
+    // Parenthesize the expression, to support implicit concatenation.
+    let range = expr.range();
+    let content = locator.slice(range);
+    let parenthesized_content = format!("({content})");
+    let mut expression = match_expression(&parenthesized_content)?;
+
+    // Replace the formatted call expression at `index` with a conversion flag.
+    let mut formatted_string_expression = match_part(index, &mut expression)?;
+    let call = match_call_mut(&mut formatted_string_expression.expression)?;
+    let name = match_name(&call.func)?;
+    match name.value {
+        "str" => {
+            formatted_string_expression.conversion = Some("s");
+        }
+        "repr" => {
+            formatted_string_expression.conversion = Some("r");
+        }
+        "ascii" => {
+            formatted_string_expression.conversion = Some("a");
+        }
+        _ => bail!("Unexpected function call: `{:?}`", name.value),
+    }
+    formatted_string_expression.expression = call.args[0].value.clone();
+
+    // Remove the parentheses (first and last characters).
+    let mut content = expression.codegen_stylist(stylist);
+    content.remove(0);
+    content.pop();
+
+    Ok(Fix::automatic(Edit::range_replacement(content, range)))
+}
+
+/// Return the [`FormattedStringContent`] at the given index in an f-string or implicit
+/// string concatenation.
+fn match_part<'a, 'b>(
+    index: usize,
+    expr: &'a mut Expression<'b>,
+) -> Result<&'a mut FormattedStringExpression<'b>> {
+    match expr {
+        Expression::ConcatenatedString(expr) => Ok(collect_parts(expr).remove(index)),
+        Expression::FormattedString(expr) => {
+            // Find the formatted expression at the given index. The `parts` field contains a mix
+            // of string literals and expressions, but our `index` only counts expressions. All
+            // the boxing and mutability makes this difficult to write in a functional style.
+            let mut format_index = 0;
+            for part in &mut expr.parts {
+                if let FormattedStringContent::Expression(expr) = part {
+                    if format_index == index {
+                        return Ok(expr);
+                    }
+                    format_index += 1;
+                }
+            }
+
+            bail!("Index out of bounds: `{index}`")
+        }
+        _ => bail!("Unexpected expression: `{:?}`", expr),
+    }
+}
+
+/// Given an implicit string concatenation, return a list of all the formatted expressions.
+fn collect_parts<'a, 'b>(
+    expr: &'a mut ConcatenatedString<'b>,
+) -> Vec<&'a mut FormattedStringExpression<'b>> {
+    fn inner<'a, 'b>(
+        string: &'a mut libcst_native::String<'b>,
+        formatted_expressions: &mut Vec<&'a mut FormattedStringExpression<'b>>,
+    ) {
+        match string {
+            libcst_native::String::Formatted(expr) => {
+                for part in &mut expr.parts {
+                    if let FormattedStringContent::Expression(expr) = part {
+                        formatted_expressions.push(expr);
+                    }
+                }
+            }
+            libcst_native::String::Concatenated(expr) => {
+                inner(&mut expr.left, formatted_expressions);
+                inner(&mut expr.right, formatted_expressions);
+            }
+            libcst_native::String::Simple(_) => {}
+        }
+    }
+
+    let mut formatted_expressions = vec![];
+    inner(&mut expr.left, &mut formatted_expressions);
+    inner(&mut expr.right, &mut formatted_expressions);
+    formatted_expressions
+}
diff --git a/crates/ruff/src/rules/ruff/rules/invalid_pyproject_toml.rs b/crates/ruff/src/rules/ruff/rules/invalid_pyproject_toml.rs
new file mode 100644
index 0000000000000..6410cb526dc85
--- /dev/null
+++ b/crates/ruff/src/rules/ruff/rules/invalid_pyproject_toml.rs
@@ -0,0 +1,45 @@
+use ruff_diagnostics::{AutofixKind, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+/// ## What it does
+/// Checks for any pyproject.toml that does not conform to the schema from the relevant PEPs.
+///
+/// ## Why is this bad?
+/// Your project may contain invalid metadata or configuration without you noticing
+///
+/// ## Example
+/// ```toml
+/// [project]
+/// name = "crab"
+/// version = "1.0.0"
+/// authors = ["Ferris the Crab <ferris@example.org>"]
+/// ```
+///
+/// Use instead:
+/// ```toml
+/// [project]
+/// name = "crab"
+/// version = "1.0.0"
+/// authors = [
+///   { email = "ferris@example.org" },
+///   { name = "Ferris the Crab"}
+/// ]
+/// ```
+///
+/// ## References
+/// - [Specification of `[project]` in pyproject.toml](https://packaging.python.org/en/latest/specifications/declaring-project-metadata/)
+/// - [Specification of `[build-system]` in pyproject.toml](https://peps.python.org/pep-0518/)
+/// - [Draft but implemented license declaration extensions](https://peps.python.org/pep-0639)
+#[violation]
+pub struct InvalidPyprojectToml {
+    pub message: String,
+}
+
+impl Violation for InvalidPyprojectToml {
+    const AUTOFIX: AutofixKind = AutofixKind::None;
+
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Failed to parse pyproject.toml: {}", self.message)
+    }
+}
diff --git a/crates/ruff/src/rules/ruff/rules/mod.rs b/crates/ruff/src/rules/ruff/rules/mod.rs
index 6a063c18dc1f8..62b75371fc63e 100644
--- a/crates/ruff/src/rules/ruff/rules/mod.rs
+++ b/crates/ruff/src/rules/ruff/rules/mod.rs
@@ -1,27 +1,34 @@
-mod ambiguous_unicode_character;
-mod asyncio_dangling_task;
-mod collection_literal_concatenation;
-mod mutable_defaults_in_dataclass_fields;
-mod pairwise_over_zipped;
-mod unused_noqa;
-
-pub use ambiguous_unicode_character::{
+pub(crate) use ambiguous_unicode_character::{
     ambiguous_unicode_character, AmbiguousUnicodeCharacterComment,
     AmbiguousUnicodeCharacterDocstring, AmbiguousUnicodeCharacterString,
 };
-pub use asyncio_dangling_task::{asyncio_dangling_task, AsyncioDanglingTask};
-pub use collection_literal_concatenation::{
+pub(crate) use asyncio_dangling_task::{asyncio_dangling_task, AsyncioDanglingTask};
+pub(crate) use collection_literal_concatenation::{
     collection_literal_concatenation, CollectionLiteralConcatenation,
 };
-pub use mutable_defaults_in_dataclass_fields::{
+pub(crate) use explicit_f_string_type_conversion::{
+    explicit_f_string_type_conversion, ExplicitFStringTypeConversion,
+};
+pub(crate) use invalid_pyproject_toml::InvalidPyprojectToml;
+pub(crate) use mutable_defaults_in_dataclass_fields::{
     function_call_in_dataclass_defaults, is_dataclass, mutable_dataclass_default,
     FunctionCallInDataclassDefaultArgument, MutableDataclassDefault,
 };
-pub use pairwise_over_zipped::{pairwise_over_zipped, PairwiseOverZipped};
-pub use unused_noqa::{UnusedCodes, UnusedNOQA};
+pub(crate) use pairwise_over_zipped::{pairwise_over_zipped, PairwiseOverZipped};
+pub(crate) use unused_noqa::{UnusedCodes, UnusedNOQA};
+
+mod ambiguous_unicode_character;
+mod asyncio_dangling_task;
+mod collection_literal_concatenation;
+mod confusables;
+mod explicit_f_string_type_conversion;
+mod invalid_pyproject_toml;
+mod mutable_defaults_in_dataclass_fields;
+mod pairwise_over_zipped;
+mod unused_noqa;
 
 #[derive(Clone, Copy)]
-pub enum Context {
+pub(crate) enum Context {
     String,
     Docstring,
     Comment,
diff --git a/crates/ruff/src/rules/ruff/rules/mutable_defaults_in_dataclass_fields.rs b/crates/ruff/src/rules/ruff/rules/mutable_defaults_in_dataclass_fields.rs
index 3fe3e13b44a41..b1c72ecdf8503 100644
--- a/crates/ruff/src/rules/ruff/rules/mutable_defaults_in_dataclass_fields.rs
+++ b/crates/ruff/src/rules/ruff/rules/mutable_defaults_in_dataclass_fields.rs
@@ -1,12 +1,12 @@
-use ruff_python_ast::call_path::{from_qualified_name, CallPath};
-use rustpython_parser::ast::{Expr, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::call_path::{from_qualified_name, CallPath};
 use ruff_python_ast::{call_path::compose_call_path, helpers::map_callable};
 use ruff_python_semantic::{
     analyze::typing::{is_immutable_annotation, is_immutable_func},
-    context::Context,
+    model::SemanticModel,
 };
 
 use crate::checkers::ast::Checker;
@@ -15,7 +15,7 @@ use crate::checkers::ast::Checker;
 /// Checks for mutable default values in dataclasses without the use of
 /// `dataclasses.field`.
 ///
-/// ## Why is it bad?
+/// ## Why is this bad?
 /// Mutable default values share state across all instances of the dataclass,
 /// while not being obvious. This can lead to bugs when the attributes are
 /// changed in one instance, as those changes will unexpectedly affect all
@@ -25,6 +25,7 @@ use crate::checkers::ast::Checker;
 /// ```python
 /// from dataclasses import dataclass
 ///
+///
 /// @dataclass
 /// class A:
 ///     mutable_default: list[int] = []
@@ -34,6 +35,7 @@ use crate::checkers::ast::Checker;
 /// ```python
 /// from dataclasses import dataclass, field
 ///
+///
 /// @dataclass
 /// class A:
 ///     mutable_default: list[int] = field(default_factory=list)
@@ -46,6 +48,7 @@ use crate::checkers::ast::Checker;
 ///
 /// I_KNOW_THIS_IS_SHARED_STATE = [1, 2, 3, 4]
 ///
+///
 /// @dataclass
 /// class A:
 ///     mutable_default: list[int] = I_KNOW_THIS_IS_SHARED_STATE
@@ -63,7 +66,7 @@ impl Violation for MutableDataclassDefault {
 /// ## What it does
 /// Checks for function calls in dataclass defaults.
 ///
-/// ## Why is it bad?
+/// ## Why is this bad?
 /// Function calls are only performed once, at definition time. The returned
 /// value is then reused by all instances of the dataclass.
 ///
@@ -74,15 +77,19 @@ impl Violation for MutableDataclassDefault {
 /// ```python
 /// from dataclasses import dataclass
 ///
-/// def creating_list() -> list[]:
+///
+/// def creating_list() -> list[int]:
 ///     return [1, 2, 3, 4]
 ///
+///
 /// @dataclass
 /// class A:
 ///     mutable_default: list[int] = creating_list()
 ///
+///
 /// # also:
 ///
+///
 /// @dataclass
 /// class B:
 ///     also_mutable_default_but_sneakier: A = A()
@@ -92,13 +99,16 @@ impl Violation for MutableDataclassDefault {
 /// ```python
 /// from dataclasses import dataclass, field
 ///
-/// def creating_list() -> list[]:
+///
+/// def creating_list() -> list[int]:
 ///     return [1, 2, 3, 4]
 ///
+///
 /// @dataclass
 /// class A:
 ///     mutable_default: list[int] = field(default_factory=creating_list)
 ///
+///
 /// @dataclass
 /// class B:
 ///     also_mutable_default_but_sneakier: A = field(default_factory=A)
@@ -109,11 +119,14 @@ impl Violation for MutableDataclassDefault {
 /// ```python
 /// from dataclasses import dataclass
 ///
-/// def creating_list() -> list[]:
+///
+/// def creating_list() -> list[int]:
 ///     return [1, 2, 3, 4]
 ///
+///
 /// I_KNOW_THIS_IS_SHARED_STATE = creating_list()
 ///
+///
 /// @dataclass
 /// class A:
 ///     mutable_default: list[int] = I_KNOW_THIS_IS_SHARED_STATE
@@ -137,20 +150,20 @@ impl Violation for FunctionCallInDataclassDefaultArgument {
 
 fn is_mutable_expr(expr: &Expr) -> bool {
     matches!(
-        &expr.node,
-        ExprKind::List { .. }
-            | ExprKind::Dict { .. }
-            | ExprKind::Set { .. }
-            | ExprKind::ListComp { .. }
-            | ExprKind::DictComp { .. }
-            | ExprKind::SetComp { .. }
+        expr,
+        Expr::List(_)
+            | Expr::Dict(_)
+            | Expr::Set(_)
+            | Expr::ListComp(_)
+            | Expr::DictComp(_)
+            | Expr::SetComp(_)
     )
 }
 
 const ALLOWED_DATACLASS_SPECIFIC_FUNCTIONS: &[&[&str]] = &[&["dataclasses", "field"]];
 
-fn is_allowed_dataclass_function(context: &Context, func: &Expr) -> bool {
-    context.resolve_call_path(func).map_or(false, |call_path| {
+fn is_allowed_dataclass_function(model: &SemanticModel, func: &Expr) -> bool {
+    model.resolve_call_path(func).map_or(false, |call_path| {
         ALLOWED_DATACLASS_SPECIFIC_FUNCTIONS
             .iter()
             .any(|target| call_path.as_slice() == *target)
@@ -158,15 +171,15 @@ fn is_allowed_dataclass_function(context: &Context, func: &Expr) -> bool {
 }
 
 /// Returns `true` if the given [`Expr`] is a `typing.ClassVar` annotation.
-fn is_class_var_annotation(context: &Context, annotation: &Expr) -> bool {
-    let ExprKind::Subscript { value, .. } = &annotation.node else {
+fn is_class_var_annotation(model: &SemanticModel, annotation: &Expr) -> bool {
+    let Expr::Subscript(ast::ExprSubscript { value, .. }) = &annotation else {
         return false;
     };
-    context.match_typing_expr(value, "ClassVar")
+    model.match_typing_expr(value, "ClassVar")
 }
 
 /// RUF009
-pub fn function_call_in_dataclass_defaults(checker: &mut Checker, body: &[Stmt]) {
+pub(crate) fn function_call_in_dataclass_defaults(checker: &mut Checker, body: &[Stmt]) {
     let extend_immutable_calls: Vec<CallPath> = checker
         .settings
         .flake8_bugbear
@@ -176,18 +189,18 @@ pub fn function_call_in_dataclass_defaults(checker: &mut Checker, body: &[Stmt])
         .collect();
 
     for statement in body {
-        if let StmtKind::AnnAssign {
+        if let Stmt::AnnAssign(ast::StmtAnnAssign {
             annotation,
             value: Some(expr),
             ..
-        } = &statement.node
+        }) = statement
         {
-            if is_class_var_annotation(&checker.ctx, annotation) {
+            if is_class_var_annotation(checker.semantic_model(), annotation) {
                 continue;
             }
-            if let ExprKind::Call { func, .. } = &expr.node {
-                if !is_immutable_func(&checker.ctx, func, &extend_immutable_calls)
-                    && !is_allowed_dataclass_function(&checker.ctx, func)
+            if let Expr::Call(ast::ExprCall { func, .. }) = expr.as_ref() {
+                if !is_immutable_func(checker.semantic_model(), func, &extend_immutable_calls)
+                    && !is_allowed_dataclass_function(checker.semantic_model(), func)
                 {
                     checker.diagnostics.push(Diagnostic::new(
                         FunctionCallInDataclassDefaultArgument {
@@ -202,16 +215,16 @@ pub fn function_call_in_dataclass_defaults(checker: &mut Checker, body: &[Stmt])
 }
 
 /// RUF008
-pub fn mutable_dataclass_default(checker: &mut Checker, body: &[Stmt]) {
+pub(crate) fn mutable_dataclass_default(checker: &mut Checker, body: &[Stmt]) {
     for statement in body {
-        match &statement.node {
-            StmtKind::AnnAssign {
+        match statement {
+            Stmt::AnnAssign(ast::StmtAnnAssign {
                 annotation,
                 value: Some(value),
                 ..
-            } => {
-                if !is_class_var_annotation(&checker.ctx, annotation)
-                    && !is_immutable_annotation(&checker.ctx, annotation)
+            }) => {
+                if !is_class_var_annotation(checker.semantic_model(), annotation)
+                    && !is_immutable_annotation(checker.semantic_model(), annotation)
                     && is_mutable_expr(value)
                 {
                     checker
@@ -219,7 +232,7 @@ pub fn mutable_dataclass_default(checker: &mut Checker, body: &[Stmt]) {
                         .push(Diagnostic::new(MutableDataclassDefault, value.range()));
                 }
             }
-            StmtKind::Assign { value, .. } => {
+            Stmt::Assign(ast::StmtAssign { value, .. }) => {
                 if is_mutable_expr(value) {
                     checker
                         .diagnostics
@@ -231,10 +244,9 @@ pub fn mutable_dataclass_default(checker: &mut Checker, body: &[Stmt]) {
     }
 }
 
-pub fn is_dataclass(checker: &Checker, decorator_list: &[Expr]) -> bool {
+pub(crate) fn is_dataclass(model: &SemanticModel, decorator_list: &[Expr]) -> bool {
     decorator_list.iter().any(|decorator| {
-        checker
-            .ctx
+        model
             .resolve_call_path(map_callable(decorator))
             .map_or(false, |call_path| {
                 call_path.as_slice() == ["dataclasses", "dataclass"]
diff --git a/crates/ruff/src/rules/ruff/rules/pairwise_over_zipped.rs b/crates/ruff/src/rules/ruff/rules/pairwise_over_zipped.rs
index 0e05c76424fa2..99c2286a759bd 100644
--- a/crates/ruff/src/rules/ruff/rules/pairwise_over_zipped.rs
+++ b/crates/ruff/src/rules/ruff/rules/pairwise_over_zipped.rs
@@ -1,5 +1,5 @@
 use num_traits::ToPrimitive;
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Unaryop};
+use rustpython_parser::ast::{self, Constant, Expr, Ranged, Unaryop};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -23,7 +23,7 @@ struct SliceInfo {
 }
 
 impl SliceInfo {
-    pub fn new(arg_name: String, slice_start: Option<i64>) -> Self {
+    pub(crate) fn new(arg_name: String, slice_start: Option<i64>) -> Self {
         Self {
             arg_name,
             slice_start,
@@ -33,15 +33,15 @@ impl SliceInfo {
 
 /// Return the argument name, lower bound, and  upper bound for an expression, if it's a slice.
 fn match_slice_info(expr: &Expr) -> Option<SliceInfo> {
-    let ExprKind::Subscript { value, slice, .. } = &expr.node else {
+    let Expr::Subscript(ast::ExprSubscript { value, slice, .. }) = expr else {
         return None;
     };
 
-    let ExprKind::Name { id: arg_id, .. } = &value.node else {
+    let Expr::Name(ast::ExprName { id: arg_id, .. }) = value.as_ref() else {
         return None;
     };
 
-    let ExprKind::Slice { lower,  step, .. } = &slice.node else {
+    let Expr::Slice(ast::ExprSlice { lower,  step, .. }) = slice.as_ref() else {
         return None;
     };
 
@@ -63,19 +63,20 @@ fn match_slice_info(expr: &Expr) -> Option<SliceInfo> {
 }
 
 fn to_bound(expr: &Expr) -> Option<i64> {
-    match &expr.node {
-        ExprKind::Constant {
+    match expr {
+        Expr::Constant(ast::ExprConstant {
             value: Constant::Int(value),
             ..
-        } => value.to_i64(),
-        ExprKind::UnaryOp {
+        }) => value.to_i64(),
+        Expr::UnaryOp(ast::ExprUnaryOp {
             op: Unaryop::USub | Unaryop::Invert,
             operand,
-        } => {
-            if let ExprKind::Constant {
+            range: _,
+        }) => {
+            if let Expr::Constant(ast::ExprConstant {
                 value: Constant::Int(value),
                 ..
-            } = &operand.node
+            }) = operand.as_ref()
             {
                 value.to_i64().map(|v| -v)
             } else {
@@ -87,8 +88,8 @@ fn to_bound(expr: &Expr) -> Option<i64> {
 }
 
 /// RUF007
-pub fn pairwise_over_zipped(checker: &mut Checker, func: &Expr, args: &[Expr]) {
-    let ExprKind::Name { id, .. } = &func.node else {
+pub(crate) fn pairwise_over_zipped(checker: &mut Checker, func: &Expr, args: &[Expr]) {
+    let Expr::Name(ast::ExprName { id, .. }) = func else {
         return;
     };
 
@@ -98,16 +99,13 @@ pub fn pairwise_over_zipped(checker: &mut Checker, func: &Expr, args: &[Expr]) {
     }
 
     // Require the function to be the builtin `zip`.
-    if id != "zip" {
-        return;
-    }
-    if !checker.ctx.is_builtin(id) {
+    if !(id == "zip" && checker.semantic_model().is_builtin(id)) {
         return;
     }
 
     // Allow the first argument to be a `Name` or `Subscript`.
     let Some(first_arg_info) = ({
-        if let ExprKind::Name { id, .. } = &args[0].node {
+        if let Expr::Name(ast::ExprName { id, .. }) = &args[0] {
             Some(SliceInfo::new(id.to_string(), None))
         } else {
             match_slice_info(&args[0])
@@ -117,9 +115,9 @@ pub fn pairwise_over_zipped(checker: &mut Checker, func: &Expr, args: &[Expr]) {
     };
 
     // Require second argument to be a `Subscript`.
-    let ExprKind::Subscript { .. } = &args[1].node else {
+    if !matches!(&args[1], Expr::Subscript(_)) {
         return;
-    };
+    }
     let Some(second_arg_info) = match_slice_info(&args[1]) else {
         return;
     };
diff --git a/crates/ruff/src/rules/ruff/rules/unused_noqa.rs b/crates/ruff/src/rules/ruff/rules/unused_noqa.rs
index 6bce540d23691..7b5a446540628 100644
--- a/crates/ruff/src/rules/ruff/rules/unused_noqa.rs
+++ b/crates/ruff/src/rules/ruff/rules/unused_noqa.rs
@@ -21,6 +21,7 @@ pub struct UnusedCodes {
 /// ```python
 /// import foo  # noqa: F401
 ///
+///
 /// def bar():
 ///     foo.bar()
 /// ```
@@ -29,6 +30,7 @@ pub struct UnusedCodes {
 /// ```python
 /// import foo
 ///
+///
 /// def bar():
 ///     foo.bar()
 /// ```
diff --git a/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF005_RUF005.py.snap b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF005_RUF005.py.snap
index 88464a097946d..a2885f683f89c 100644
--- a/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF005_RUF005.py.snap
+++ b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF005_RUF005.py.snap
@@ -1,268 +1,357 @@
 ---
 source: crates/ruff/src/rules/ruff/mod.rs
 ---
-RUF005.py:10:7: RUF005 [*] Consider `[1, 2, 3, *foo]` instead of concatenation
+RUF005.py:4:1: RUF005 Consider `[*foo]` instead of concatenation
+  |
+4 |   # Non-fixable Errors.
+5 |   ###
+6 | / foo + [  # This will be preserved.
+7 | | ]
+  | |_^ RUF005
+8 |   [*foo] + [  # This will be preserved.
+9 |   ]
+  |
+  = help: Replace with `[*foo]`
+
+RUF005.py:6:1: RUF005 Consider `[*foo]` instead of concatenation
+   |
+ 6 |   foo + [  # This will be preserved.
+ 7 |   ]
+ 8 | / [*foo] + [  # This will be preserved.
+ 9 | | ]
+   | |_^ RUF005
+10 |   first = [
+11 |       # The order
    |
-10 | foo = [4, 5, 6]
-11 | bar = [1, 2, 3] + foo
+   = help: Replace with `[*foo]`
+
+RUF005.py:16:10: RUF005 Consider `[*first, 4, 5, 6]` instead of concatenation
+   |
+16 |       # to preserve
+17 |   ]
+18 |   second = first + [
+   |  __________^
+19 | |     # please
+20 | |     4,
+21 | |     # don't
+22 | |     5,
+23 | |     # touch
+24 | |     6,
+25 | | ]
+   | |_^ RUF005
+   |
+   = help: Replace with `[*first, 4, 5, 6]`
+
+RUF005.py:39:7: RUF005 [*] Consider `[1, 2, 3, *foo]` instead of concatenation
+   |
+39 | foo = [4, 5, 6]
+40 | bar = [1, 2, 3] + foo
    |       ^^^^^^^^^^^^^^^ RUF005
-12 | zoob = tuple(bar)
-13 | quux = (7, 8, 9) + zoob
+41 | zoob = tuple(bar)
+42 | quux = (7, 8, 9) + zoob
    |
    = help: Replace with `[1, 2, 3, *foo]`
 
 ℹ Suggested fix
-7  7  | yay = Fun().yay
-8  8  | 
-9  9  | foo = [4, 5, 6]
-10    |-bar = [1, 2, 3] + foo
-   10 |+bar = [1, 2, 3, *foo]
-11 11 | zoob = tuple(bar)
-12 12 | quux = (7, 8, 9) + zoob
-13 13 | spam = quux + (10, 11, 12)
-
-RUF005.py:12:8: RUF005 [*] Consider `(7, 8, 9, *zoob)` instead of concatenation
-   |
-12 | bar = [1, 2, 3] + foo
-13 | zoob = tuple(bar)
-14 | quux = (7, 8, 9) + zoob
+36 36 | yay = Fun().yay
+37 37 | 
+38 38 | foo = [4, 5, 6]
+39    |-bar = [1, 2, 3] + foo
+   39 |+bar = [1, 2, 3, *foo]
+40 40 | zoob = tuple(bar)
+41 41 | quux = (7, 8, 9) + zoob
+42 42 | spam = quux + (10, 11, 12)
+
+RUF005.py:41:8: RUF005 [*] Consider `(7, 8, 9, *zoob)` instead of concatenation
+   |
+41 | bar = [1, 2, 3] + foo
+42 | zoob = tuple(bar)
+43 | quux = (7, 8, 9) + zoob
    |        ^^^^^^^^^^^^^^^^ RUF005
-15 | spam = quux + (10, 11, 12)
-16 | spom = list(spam)
+44 | spam = quux + (10, 11, 12)
+45 | spom = list(spam)
    |
    = help: Replace with `(7, 8, 9, *zoob)`
 
 ℹ Suggested fix
-9  9  | foo = [4, 5, 6]
-10 10 | bar = [1, 2, 3] + foo
-11 11 | zoob = tuple(bar)
-12    |-quux = (7, 8, 9) + zoob
-   12 |+quux = (7, 8, 9, *zoob)
-13 13 | spam = quux + (10, 11, 12)
-14 14 | spom = list(spam)
-15 15 | eggs = spom + [13, 14, 15]
-
-RUF005.py:13:8: RUF005 [*] Consider `(*quux, 10, 11, 12)` instead of concatenation
-   |
-13 | zoob = tuple(bar)
-14 | quux = (7, 8, 9) + zoob
-15 | spam = quux + (10, 11, 12)
+38 38 | foo = [4, 5, 6]
+39 39 | bar = [1, 2, 3] + foo
+40 40 | zoob = tuple(bar)
+41    |-quux = (7, 8, 9) + zoob
+   41 |+quux = (7, 8, 9, *zoob)
+42 42 | spam = quux + (10, 11, 12)
+43 43 | spom = list(spam)
+44 44 | eggs = spom + [13, 14, 15]
+
+RUF005.py:42:8: RUF005 [*] Consider `(*quux, 10, 11, 12)` instead of concatenation
+   |
+42 | zoob = tuple(bar)
+43 | quux = (7, 8, 9) + zoob
+44 | spam = quux + (10, 11, 12)
    |        ^^^^^^^^^^^^^^^^^^^ RUF005
-16 | spom = list(spam)
-17 | eggs = spom + [13, 14, 15]
+45 | spom = list(spam)
+46 | eggs = spom + [13, 14, 15]
    |
    = help: Replace with `(*quux, 10, 11, 12)`
 
 ℹ Suggested fix
-10 10 | bar = [1, 2, 3] + foo
-11 11 | zoob = tuple(bar)
-12 12 | quux = (7, 8, 9) + zoob
-13    |-spam = quux + (10, 11, 12)
-   13 |+spam = (*quux, 10, 11, 12)
-14 14 | spom = list(spam)
-15 15 | eggs = spom + [13, 14, 15]
-16 16 | elatement = ("we all say", ) + yay()
-
-RUF005.py:15:8: RUF005 [*] Consider `[*spom, 13, 14, 15]` instead of concatenation
-   |
-15 | spam = quux + (10, 11, 12)
-16 | spom = list(spam)
-17 | eggs = spom + [13, 14, 15]
+39 39 | bar = [1, 2, 3] + foo
+40 40 | zoob = tuple(bar)
+41 41 | quux = (7, 8, 9) + zoob
+42    |-spam = quux + (10, 11, 12)
+   42 |+spam = (*quux, 10, 11, 12)
+43 43 | spom = list(spam)
+44 44 | eggs = spom + [13, 14, 15]
+45 45 | elatement = ("we all say",) + yay()
+
+RUF005.py:44:8: RUF005 [*] Consider `[*spom, 13, 14, 15]` instead of concatenation
+   |
+44 | spam = quux + (10, 11, 12)
+45 | spom = list(spam)
+46 | eggs = spom + [13, 14, 15]
    |        ^^^^^^^^^^^^^^^^^^^ RUF005
-18 | elatement = ("we all say", ) + yay()
-19 | excitement = ("we all think", ) + Fun().yay()
+47 | elatement = ("we all say",) + yay()
+48 | excitement = ("we all think",) + Fun().yay()
    |
    = help: Replace with `[*spom, 13, 14, 15]`
 
 ℹ Suggested fix
-12 12 | quux = (7, 8, 9) + zoob
-13 13 | spam = quux + (10, 11, 12)
-14 14 | spom = list(spam)
-15    |-eggs = spom + [13, 14, 15]
-   15 |+eggs = [*spom, 13, 14, 15]
-16 16 | elatement = ("we all say", ) + yay()
-17 17 | excitement = ("we all think", ) + Fun().yay()
-18 18 | astonishment = ("we all feel", ) + Fun.words
-
-RUF005.py:16:13: RUF005 [*] Consider `("we all say", *yay())` instead of concatenation
-   |
-16 | spom = list(spam)
-17 | eggs = spom + [13, 14, 15]
-18 | elatement = ("we all say", ) + yay()
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^ RUF005
-19 | excitement = ("we all think", ) + Fun().yay()
-20 | astonishment = ("we all feel", ) + Fun.words
+41 41 | quux = (7, 8, 9) + zoob
+42 42 | spam = quux + (10, 11, 12)
+43 43 | spom = list(spam)
+44    |-eggs = spom + [13, 14, 15]
+   44 |+eggs = [*spom, 13, 14, 15]
+45 45 | elatement = ("we all say",) + yay()
+46 46 | excitement = ("we all think",) + Fun().yay()
+47 47 | astonishment = ("we all feel",) + Fun.words
+
+RUF005.py:45:13: RUF005 [*] Consider `("we all say", *yay())` instead of concatenation
+   |
+45 | spom = list(spam)
+46 | eggs = spom + [13, 14, 15]
+47 | elatement = ("we all say",) + yay()
+   |             ^^^^^^^^^^^^^^^^^^^^^^^ RUF005
+48 | excitement = ("we all think",) + Fun().yay()
+49 | astonishment = ("we all feel",) + Fun.words
    |
    = help: Replace with `("we all say", *yay())`
 
 ℹ Suggested fix
-13 13 | spam = quux + (10, 11, 12)
-14 14 | spom = list(spam)
-15 15 | eggs = spom + [13, 14, 15]
-16    |-elatement = ("we all say", ) + yay()
-   16 |+elatement = ("we all say", *yay())
-17 17 | excitement = ("we all think", ) + Fun().yay()
-18 18 | astonishment = ("we all feel", ) + Fun.words
-19 19 | 
-
-RUF005.py:17:14: RUF005 [*] Consider `("we all think", *Fun().yay())` instead of concatenation
-   |
-17 | eggs = spom + [13, 14, 15]
-18 | elatement = ("we all say", ) + yay()
-19 | excitement = ("we all think", ) + Fun().yay()
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUF005
-20 | astonishment = ("we all feel", ) + Fun.words
+42 42 | spam = quux + (10, 11, 12)
+43 43 | spom = list(spam)
+44 44 | eggs = spom + [13, 14, 15]
+45    |-elatement = ("we all say",) + yay()
+   45 |+elatement = ("we all say", *yay())
+46 46 | excitement = ("we all think",) + Fun().yay()
+47 47 | astonishment = ("we all feel",) + Fun.words
+48 48 | 
+
+RUF005.py:46:14: RUF005 [*] Consider `("we all think", *Fun().yay())` instead of concatenation
+   |
+46 | eggs = spom + [13, 14, 15]
+47 | elatement = ("we all say",) + yay()
+48 | excitement = ("we all think",) + Fun().yay()
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUF005
+49 | astonishment = ("we all feel",) + Fun.words
    |
    = help: Replace with `("we all think", *Fun().yay())`
 
 ℹ Suggested fix
-14 14 | spom = list(spam)
-15 15 | eggs = spom + [13, 14, 15]
-16 16 | elatement = ("we all say", ) + yay()
-17    |-excitement = ("we all think", ) + Fun().yay()
-   17 |+excitement = ("we all think", *Fun().yay())
-18 18 | astonishment = ("we all feel", ) + Fun.words
-19 19 | 
-20 20 | chain = ['a', 'b', 'c'] + eggs + list(('yes', 'no', 'pants') + zoob)
-
-RUF005.py:18:16: RUF005 [*] Consider `("we all feel", *Fun.words)` instead of concatenation
-   |
-18 | elatement = ("we all say", ) + yay()
-19 | excitement = ("we all think", ) + Fun().yay()
-20 | astonishment = ("we all feel", ) + Fun.words
-   |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUF005
-21 | 
-22 | chain = ['a', 'b', 'c'] + eggs + list(('yes', 'no', 'pants') + zoob)
+43 43 | spom = list(spam)
+44 44 | eggs = spom + [13, 14, 15]
+45 45 | elatement = ("we all say",) + yay()
+46    |-excitement = ("we all think",) + Fun().yay()
+   46 |+excitement = ("we all think", *Fun().yay())
+47 47 | astonishment = ("we all feel",) + Fun.words
+48 48 | 
+49 49 | chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob)
+
+RUF005.py:47:16: RUF005 [*] Consider `("we all feel", *Fun.words)` instead of concatenation
+   |
+47 | elatement = ("we all say",) + yay()
+48 | excitement = ("we all think",) + Fun().yay()
+49 | astonishment = ("we all feel",) + Fun.words
+   |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUF005
+50 | 
+51 | chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob)
    |
    = help: Replace with `("we all feel", *Fun.words)`
 
 ℹ Suggested fix
-15 15 | eggs = spom + [13, 14, 15]
-16 16 | elatement = ("we all say", ) + yay()
-17 17 | excitement = ("we all think", ) + Fun().yay()
-18    |-astonishment = ("we all feel", ) + Fun.words
-   18 |+astonishment = ("we all feel", *Fun.words)
-19 19 | 
-20 20 | chain = ['a', 'b', 'c'] + eggs + list(('yes', 'no', 'pants') + zoob)
-21 21 | 
-
-RUF005.py:20:9: RUF005 [*] Consider `["a", "b", "c", *eggs]` instead of concatenation
-   |
-20 | astonishment = ("we all feel", ) + Fun.words
-21 | 
-22 | chain = ['a', 'b', 'c'] + eggs + list(('yes', 'no', 'pants') + zoob)
-   |         ^^^^^^^^^^^^^^^^^^^^^^ RUF005
-23 | 
-24 | baz = () + zoob
-   |
-   = help: Replace with `["a", "b", "c", *eggs]`
+44 44 | eggs = spom + [13, 14, 15]
+45 45 | elatement = ("we all say",) + yay()
+46 46 | excitement = ("we all think",) + Fun().yay()
+47    |-astonishment = ("we all feel",) + Fun.words
+   47 |+astonishment = ("we all feel", *Fun.words)
+48 48 | 
+49 49 | chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob)
+50 50 | 
+
+RUF005.py:49:9: RUF005 [*] Consider `["a", "b", "c", *eggs, *list(("yes", "no", "pants") + zoob)]` instead of concatenation
+   |
+49 | astonishment = ("we all feel",) + Fun.words
+50 | 
+51 | chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob)
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUF005
+52 | 
+53 | baz = () + zoob
+   |
+   = help: Replace with `["a", "b", "c", *eggs, *list(("yes", "no", "pants") + zoob)]`
 
 ℹ Suggested fix
-17 17 | excitement = ("we all think", ) + Fun().yay()
-18 18 | astonishment = ("we all feel", ) + Fun.words
-19 19 | 
-20    |-chain = ['a', 'b', 'c'] + eggs + list(('yes', 'no', 'pants') + zoob)
-   20 |+chain = ["a", "b", "c", *eggs] + list(('yes', 'no', 'pants') + zoob)
-21 21 | 
-22 22 | baz = () + zoob
-23 23 | 
-
-RUF005.py:20:39: RUF005 [*] Consider `("yes", "no", "pants", *zoob)` instead of concatenation
-   |
-20 | astonishment = ("we all feel", ) + Fun.words
-21 | 
-22 | chain = ['a', 'b', 'c'] + eggs + list(('yes', 'no', 'pants') + zoob)
+46 46 | excitement = ("we all think",) + Fun().yay()
+47 47 | astonishment = ("we all feel",) + Fun.words
+48 48 | 
+49    |-chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob)
+   49 |+chain = ["a", "b", "c", *eggs, *list(("yes", "no", "pants") + zoob)]
+50 50 | 
+51 51 | baz = () + zoob
+52 52 | 
+
+RUF005.py:49:39: RUF005 [*] Consider `("yes", "no", "pants", *zoob)` instead of concatenation
+   |
+49 | astonishment = ("we all feel",) + Fun.words
+50 | 
+51 | chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob)
    |                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUF005
-23 | 
-24 | baz = () + zoob
+52 | 
+53 | baz = () + zoob
    |
    = help: Replace with `("yes", "no", "pants", *zoob)`
 
 ℹ Suggested fix
-17 17 | excitement = ("we all think", ) + Fun().yay()
-18 18 | astonishment = ("we all feel", ) + Fun.words
-19 19 | 
-20    |-chain = ['a', 'b', 'c'] + eggs + list(('yes', 'no', 'pants') + zoob)
-   20 |+chain = ['a', 'b', 'c'] + eggs + list(("yes", "no", "pants", *zoob))
-21 21 | 
-22 22 | baz = () + zoob
-23 23 | 
-
-RUF005.py:22:7: RUF005 [*] Consider `(*zoob,)` instead of concatenation
-   |
-22 | chain = ['a', 'b', 'c'] + eggs + list(('yes', 'no', 'pants') + zoob)
-23 | 
-24 | baz = () + zoob
+46 46 | excitement = ("we all think",) + Fun().yay()
+47 47 | astonishment = ("we all feel",) + Fun.words
+48 48 | 
+49    |-chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob)
+   49 |+chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants", *zoob))
+50 50 | 
+51 51 | baz = () + zoob
+52 52 | 
+
+RUF005.py:51:7: RUF005 [*] Consider `(*zoob,)` instead of concatenation
+   |
+51 | chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob)
+52 | 
+53 | baz = () + zoob
    |       ^^^^^^^^^ RUF005
-25 | 
-26 | first = [
+54 | 
+55 | [] + foo + [
    |
    = help: Replace with `(*zoob,)`
 
 ℹ Suggested fix
-19 19 | 
-20 20 | chain = ['a', 'b', 'c'] + eggs + list(('yes', 'no', 'pants') + zoob)
-21 21 | 
-22    |-baz = () + zoob
-   22 |+baz = (*zoob,)
-23 23 | 
-24 24 | first = [
-25 25 |     # The order
-
-RUF005.py:32:10: RUF005 Consider `[*first, 4, 5, 6]` instead of concatenation
-   |
-32 |       # to preserve
-33 |   ]
-34 |   second = first + [
-   |  __________^
-35 | |     # please
-36 | |     4,
-37 | |     # don't
-38 | |     5,
-39 | |     # touch
-40 | |     6,
-41 | | ]
+48 48 | 
+49 49 | chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob)
+50 50 | 
+51    |-baz = () + zoob
+   51 |+baz = (*zoob,)
+52 52 | 
+53 53 | [] + foo + [
+54 54 | ]
+
+RUF005.py:53:1: RUF005 [*] Consider `[*foo]` instead of concatenation
+   |
+53 |   baz = () + zoob
+54 |   
+55 | / [] + foo + [
+56 | | ]
    | |_^ RUF005
-42 |   
-43 |   [] + foo + [
+57 |   
+58 |   pylint_call = [sys.executable, "-m", "pylint"] + args + [path]
    |
+   = help: Replace with `[*foo]`
+
+ℹ Suggested fix
+50 50 | 
+51 51 | baz = () + zoob
+52 52 | 
+53    |-[] + foo + [
+54    |-]
+   53 |+[*foo]
+55 54 | 
+56 55 | pylint_call = [sys.executable, "-m", "pylint"] + args + [path]
+57 56 | pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2)
 
-RUF005.py:41:1: RUF005 [*] Consider `[*foo]` instead of concatenation
+RUF005.py:56:15: RUF005 [*] Consider `[sys.executable, "-m", "pylint", *args, path]` instead of concatenation
    |
-41 | ]
-42 | 
-43 | [] + foo + [
-   | ^^^^^^^^ RUF005
-44 | ]
+56 | ]
+57 | 
+58 | pylint_call = [sys.executable, "-m", "pylint"] + args + [path]
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUF005
+59 | pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2)
+60 | b = a + [2, 3] + [4]
    |
-   = help: Replace with `[*foo]`
+   = help: Replace with `[sys.executable, "-m", "pylint", *args, path]`
 
 ℹ Suggested fix
-38 38 |     6,
-39 39 | ]
-40 40 | 
-41    |-[] + foo + [
-   41 |+[*foo] + [
-42 42 | ]
-43 43 | 
-44 44 | [] + foo + [  # This will be preserved, but doesn't prevent the fix
-
-RUF005.py:44:1: RUF005 [*] Consider `[*foo]` instead of concatenation
-   |
-44 | ]
-45 | 
-46 | [] + foo + [  # This will be preserved, but doesn't prevent the fix
-   | ^^^^^^^^ RUF005
-47 | ]
+53 53 | [] + foo + [
+54 54 | ]
+55 55 | 
+56    |-pylint_call = [sys.executable, "-m", "pylint"] + args + [path]
+   56 |+pylint_call = [sys.executable, "-m", "pylint", *args, path]
+57 57 | pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2)
+58 58 | b = a + [2, 3] + [4]
+59 59 | 
+
+RUF005.py:57:21: RUF005 [*] Consider `(sys.executable, "-m", "pylint", *args, path, path2)` instead of concatenation
    |
-   = help: Replace with `[*foo]`
+57 | pylint_call = [sys.executable, "-m", "pylint"] + args + [path]
+58 | pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2)
+   |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUF005
+59 | b = a + [2, 3] + [4]
+   |
+   = help: Replace with `(sys.executable, "-m", "pylint", *args, path, path2)`
+
+ℹ Suggested fix
+54 54 | ]
+55 55 | 
+56 56 | pylint_call = [sys.executable, "-m", "pylint"] + args + [path]
+57    |-pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2)
+   57 |+pylint_call_tuple = (sys.executable, "-m", "pylint", *args, path, path2)
+58 58 | b = a + [2, 3] + [4]
+59 59 | 
+60 60 | # Uses the non-preferred quote style, which should be retained.
+
+RUF005.py:58:5: RUF005 [*] Consider `[*a, 2, 3, 4]` instead of concatenation
+   |
+58 | pylint_call = [sys.executable, "-m", "pylint"] + args + [path]
+59 | pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2)
+60 | b = a + [2, 3] + [4]
+   |     ^^^^^^^^^^^^^^^^ RUF005
+61 | 
+62 | # Uses the non-preferred quote style, which should be retained.
+   |
+   = help: Replace with `[*a, 2, 3, 4]`
+
+ℹ Suggested fix
+55 55 | 
+56 56 | pylint_call = [sys.executable, "-m", "pylint"] + args + [path]
+57 57 | pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2)
+58    |-b = a + [2, 3] + [4]
+   58 |+b = [*a, 2, 3, 4]
+59 59 | 
+60 60 | # Uses the non-preferred quote style, which should be retained.
+61 61 | f"{a() + ['b']}"
+
+RUF005.py:61:4: RUF005 [*] Consider `[*a(), 'b']` instead of concatenation
+   |
+61 | # Uses the non-preferred quote style, which should be retained.
+62 | f"{a() + ['b']}"
+   |    ^^^^^^^^^^^ RUF005
+63 | 
+64 | ###
+   |
+   = help: Replace with `[*a(), 'b']`
 
 ℹ Suggested fix
-41 41 | [] + foo + [
-42 42 | ]
-43 43 | 
-44    |-[] + foo + [  # This will be preserved, but doesn't prevent the fix
-   44 |+[*foo] + [  # This will be preserved, but doesn't prevent the fix
-45 45 | ]
+58 58 | b = a + [2, 3] + [4]
+59 59 | 
+60 60 | # Uses the non-preferred quote style, which should be retained.
+61    |-f"{a() + ['b']}"
+   61 |+f"{[*a(), 'b']}"
+62 62 | 
+63 63 | ###
+64 64 | # Non-errors.
 
 
diff --git a/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF009_RUF009.py.snap b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF009_RUF009.py.snap
index 096591e7f9be4..48f097a86b620 100644
--- a/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF009_RUF009.py.snap
+++ b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF009_RUF009.py.snap
@@ -11,34 +11,34 @@ RUF009.py:19:41: RUF009 Do not perform function call `default_function` in datac
 23 |     another_class_var: ClassVar[list[int]] = default_function()
    |
 
-RUF009.py:36:41: RUF009 Do not perform function call `default_function` in dataclass defaults
+RUF009.py:41:41: RUF009 Do not perform function call `default_function` in dataclass defaults
    |
-36 | @dataclass
-37 | class B:
-38 |     hidden_mutable_default: list[int] = default_function()
+41 | @dataclass
+42 | class B:
+43 |     hidden_mutable_default: list[int] = default_function()
    |                                         ^^^^^^^^^^^^^^^^^^ RUF009
-39 |     another_dataclass: A = A()
-40 |     not_optimal: ImmutableType = ImmutableType(20)
+44 |     another_dataclass: A = A()
+45 |     not_optimal: ImmutableType = ImmutableType(20)
    |
 
-RUF009.py:37:28: RUF009 Do not perform function call `A` in dataclass defaults
+RUF009.py:42:28: RUF009 Do not perform function call `A` in dataclass defaults
    |
-37 | class B:
-38 |     hidden_mutable_default: list[int] = default_function()
-39 |     another_dataclass: A = A()
+42 | class B:
+43 |     hidden_mutable_default: list[int] = default_function()
+44 |     another_dataclass: A = A()
    |                            ^^^ RUF009
-40 |     not_optimal: ImmutableType = ImmutableType(20)
-41 |     good_variant: ImmutableType = DEFAULT_IMMUTABLETYPE_FOR_ALL_DATACLASSES
+45 |     not_optimal: ImmutableType = ImmutableType(20)
+46 |     good_variant: ImmutableType = DEFAULT_IMMUTABLETYPE_FOR_ALL_DATACLASSES
    |
 
-RUF009.py:38:34: RUF009 Do not perform function call `ImmutableType` in dataclass defaults
+RUF009.py:43:34: RUF009 Do not perform function call `ImmutableType` in dataclass defaults
    |
-38 |     hidden_mutable_default: list[int] = default_function()
-39 |     another_dataclass: A = A()
-40 |     not_optimal: ImmutableType = ImmutableType(20)
+43 |     hidden_mutable_default: list[int] = default_function()
+44 |     another_dataclass: A = A()
+45 |     not_optimal: ImmutableType = ImmutableType(20)
    |                                  ^^^^^^^^^^^^^^^^^ RUF009
-41 |     good_variant: ImmutableType = DEFAULT_IMMUTABLETYPE_FOR_ALL_DATACLASSES
-42 |     okay_variant: A = DEFAULT_A_FOR_ALL_DATACLASSES
+46 |     good_variant: ImmutableType = DEFAULT_IMMUTABLETYPE_FOR_ALL_DATACLASSES
+47 |     okay_variant: A = DEFAULT_A_FOR_ALL_DATACLASSES
    |
 
 
diff --git a/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF010_RUF010.py.snap b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF010_RUF010.py.snap
new file mode 100644
index 0000000000000..4a82c0546383a
--- /dev/null
+++ b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF010_RUF010.py.snap
@@ -0,0 +1,247 @@
+---
+source: crates/ruff/src/rules/ruff/mod.rs
+---
+RUF010.py:9:4: RUF010 [*] Use conversion in f-string
+   |
+ 9 | f"{str(bla)}, {repr(bla)}, {ascii(bla)}"  # RUF010
+   |    ^^^^^^^^ RUF010
+10 | 
+11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+   |
+   = help: Replace f-string function call with conversion
+
+ℹ Fix
+6  6  |     pass
+7  7  | 
+8  8  | 
+9     |-f"{str(bla)}, {repr(bla)}, {ascii(bla)}"  # RUF010
+   9  |+f"{bla!s}, {repr(bla)}, {ascii(bla)}"  # RUF010
+10 10 | 
+11 11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+12 12 | 
+
+RUF010.py:9:16: RUF010 [*] Use conversion in f-string
+   |
+ 9 | f"{str(bla)}, {repr(bla)}, {ascii(bla)}"  # RUF010
+   |                ^^^^^^^^^ RUF010
+10 | 
+11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+   |
+   = help: Replace f-string function call with conversion
+
+ℹ Fix
+6  6  |     pass
+7  7  | 
+8  8  | 
+9     |-f"{str(bla)}, {repr(bla)}, {ascii(bla)}"  # RUF010
+   9  |+f"{str(bla)}, {bla!r}, {ascii(bla)}"  # RUF010
+10 10 | 
+11 11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+12 12 | 
+
+RUF010.py:9:29: RUF010 [*] Use conversion in f-string
+   |
+ 9 | f"{str(bla)}, {repr(bla)}, {ascii(bla)}"  # RUF010
+   |                             ^^^^^^^^^^ RUF010
+10 | 
+11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+   |
+   = help: Replace f-string function call with conversion
+
+ℹ Fix
+6  6  |     pass
+7  7  | 
+8  8  | 
+9     |-f"{str(bla)}, {repr(bla)}, {ascii(bla)}"  # RUF010
+   9  |+f"{str(bla)}, {repr(bla)}, {bla!a}"  # RUF010
+10 10 | 
+11 11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+12 12 | 
+
+RUF010.py:11:4: RUF010 [*] Use conversion in f-string
+   |
+11 | f"{str(bla)}, {repr(bla)}, {ascii(bla)}"  # RUF010
+12 | 
+13 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+   |    ^^^^^^^^^^^ RUF010
+14 | 
+15 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+   |
+   = help: Replace f-string function call with conversion
+
+ℹ Fix
+8  8  | 
+9  9  | f"{str(bla)}, {repr(bla)}, {ascii(bla)}"  # RUF010
+10 10 | 
+11    |-f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+   11 |+f"{d['a']!s}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+12 12 | 
+13 13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+14 14 | 
+
+RUF010.py:11:19: RUF010 [*] Use conversion in f-string
+   |
+11 | f"{str(bla)}, {repr(bla)}, {ascii(bla)}"  # RUF010
+12 | 
+13 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+   |                   ^^^^^^^^^^^^ RUF010
+14 | 
+15 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+   |
+   = help: Replace f-string function call with conversion
+
+ℹ Fix
+8  8  | 
+9  9  | f"{str(bla)}, {repr(bla)}, {ascii(bla)}"  # RUF010
+10 10 | 
+11    |-f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+   11 |+f"{str(d['a'])}, {d['b']!r}, {ascii(d['c'])}"  # RUF010
+12 12 | 
+13 13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+14 14 | 
+
+RUF010.py:11:35: RUF010 [*] Use conversion in f-string
+   |
+11 | f"{str(bla)}, {repr(bla)}, {ascii(bla)}"  # RUF010
+12 | 
+13 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+   |                                   ^^^^^^^^^^^^^ RUF010
+14 | 
+15 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+   |
+   = help: Replace f-string function call with conversion
+
+ℹ Fix
+8  8  | 
+9  9  | f"{str(bla)}, {repr(bla)}, {ascii(bla)}"  # RUF010
+10 10 | 
+11    |-f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+   11 |+f"{str(d['a'])}, {repr(d['b'])}, {d['c']!a}"  # RUF010
+12 12 | 
+13 13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+14 14 | 
+
+RUF010.py:13:5: RUF010 [*] Use conversion in f-string
+   |
+13 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+14 | 
+15 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+   |     ^^^^^^^^ RUF010
+16 | 
+17 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+   |
+   = help: Replace f-string function call with conversion
+
+ℹ Fix
+10 10 | 
+11 11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+12 12 | 
+13    |-f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+   13 |+f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+14 14 | 
+15 15 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+16 16 | 
+
+RUF010.py:13:19: RUF010 [*] Use conversion in f-string
+   |
+13 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+14 | 
+15 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+   |                   ^^^^^^^^^ RUF010
+16 | 
+17 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+   |
+   = help: Replace f-string function call with conversion
+
+ℹ Fix
+10 10 | 
+11 11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+12 12 | 
+13    |-f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+   13 |+f"{(str(bla))}, {bla!r}, {(ascii(bla))}"  # RUF010
+14 14 | 
+15 15 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+16 16 | 
+
+RUF010.py:13:34: RUF010 [*] Use conversion in f-string
+   |
+13 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+14 | 
+15 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+   |                                  ^^^^^^^^^^ RUF010
+16 | 
+17 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+   |
+   = help: Replace f-string function call with conversion
+
+ℹ Fix
+10 10 | 
+11 11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}"  # RUF010
+12 12 | 
+13    |-f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+   13 |+f"{(str(bla))}, {(repr(bla))}, {bla!a}"  # RUF010
+14 14 | 
+15 15 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+16 16 | 
+
+RUF010.py:15:14: RUF010 [*] Use conversion in f-string
+   |
+15 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+16 | 
+17 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+   |              ^^^^^^^^^ RUF010
+18 | 
+19 | f"{foo(bla)}"  # OK
+   |
+   = help: Replace f-string function call with conversion
+
+ℹ Fix
+12 12 | 
+13 13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+14 14 | 
+15    |-f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+   15 |+f"{bla!s}, {bla!r}, {(ascii(bla))}"  # RUF010
+16 16 | 
+17 17 | f"{foo(bla)}"  # OK
+18 18 | 
+
+RUF010.py:15:29: RUF010 [*] Use conversion in f-string
+   |
+15 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+16 | 
+17 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+   |                             ^^^^^^^^^^ RUF010
+18 | 
+19 | f"{foo(bla)}"  # OK
+   |
+   = help: Replace f-string function call with conversion
+
+ℹ Fix
+12 12 | 
+13 13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+14 14 | 
+15    |-f"{bla!s}, {(repr(bla))}, {(ascii(bla))}"  # RUF010
+   15 |+f"{bla!s}, {(repr(bla))}, {bla!a}"  # RUF010
+16 16 | 
+17 17 | f"{foo(bla)}"  # OK
+18 18 | 
+
+RUF010.py:35:20: RUF010 [*] Use conversion in f-string
+   |
+35 |     f"Member of tuple mismatches type at index {i}. Expected {of_shape_i}. Got "
+36 |     " intermediary content "
+37 |     f" that flows {repr(obj)} of type {type(obj)}.{additional_message}"  # RUF010
+   |                    ^^^^^^^^^ RUF010
+38 | )
+   |
+   = help: Replace f-string function call with conversion
+
+ℹ Fix
+32 32 | (
+33 33 |     f"Member of tuple mismatches type at index {i}. Expected {of_shape_i}. Got "
+34 34 |     " intermediary content "
+35    |-    f" that flows {repr(obj)} of type {type(obj)}.{additional_message}"  # RUF010
+   35 |+    f" that flows {obj!r} of type {type(obj)}.{additional_message}"  # RUF010
+36 36 | )
+
+
diff --git a/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF200_bleach.snap b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF200_bleach.snap
new file mode 100644
index 0000000000000..6b8d240bdb38b
--- /dev/null
+++ b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF200_bleach.snap
@@ -0,0 +1,17 @@
+---
+source: crates/ruff/src/rules/ruff/mod.rs
+---
+pyproject.toml:5:16: RUF200 Failed to parse pyproject.toml: Version specifier `>=1.1.0<1.2` doesn't match PEP 440 rules
+tinycss2>=1.1.0<1.2
+        ^^^^^^^^^^^
+  |
+5 |   version = "0.1.0"
+6 |   # There's a comma missing here
+7 |   dependencies = [
+  |  ________________^
+8 | |   "tinycss2>=1.1.0<1.2",
+9 | | ]
+  | |_^ RUF200
+  |
+
+
diff --git a/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF200_invalid_author.snap b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF200_invalid_author.snap
new file mode 100644
index 0000000000000..889257d1a6f54
--- /dev/null
+++ b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF200_invalid_author.snap
@@ -0,0 +1,13 @@
+---
+source: crates/ruff/src/rules/ruff/mod.rs
+---
+pyproject.toml:6:84: RUF200 Failed to parse pyproject.toml: invalid type: integer `1`, expected a string
+  |
+6 | # Ensure that the spans from toml handle utf-8 correctly
+7 | authors = [
+8 |     { name = "Z͑ͫ̓ͪ̂ͫ̽͏̴̙̤̞͉͚̯̞̠͍A̴̵̜̰͔ͫ͗͢L̠ͨͧͩ͘G̴̻͈͍͔̹̑͗̎̅͛́Ǫ̵̹̻̝̳͂̌̌͘", email = 1 }
+  |                               ^ RUF200
+9 | ]
+  |
+
+
diff --git a/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF200_maturin.snap b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF200_maturin.snap
new file mode 100644
index 0000000000000..e51f71f81152a
--- /dev/null
+++ b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF200_maturin.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff/src/rules/ruff/mod.rs
+---
+
diff --git a/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF200_maturin_gh_1615.snap b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF200_maturin_gh_1615.snap
new file mode 100644
index 0000000000000..b73fcf6cf745c
--- /dev/null
+++ b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__RUF200_maturin_gh_1615.snap
@@ -0,0 +1,14 @@
+---
+source: crates/ruff/src/rules/ruff/mod.rs
+---
+pyproject.toml:9:17: RUF200 Failed to parse pyproject.toml: wanted string or table
+   |
+ 9 | [project]
+10 | name = "..."
+11 | license-files = [ "license.txt",]
+   |                 ^^^^^^^^^^^^^^^^^ RUF200
+12 | requires-python = ">=3.8"
+13 | requires-dist = [ "maturin>=0.14", "...",]
+   |
+
+
diff --git a/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__confusables.snap b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__confusables.snap
index 75d127a751bf3..e9e180c02383e 100644
--- a/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__confusables.snap
+++ b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__confusables.snap
@@ -1,13 +1,13 @@
 ---
 source: crates/ruff/src/rules/ruff/mod.rs
 ---
-confusables.py:1:6: RUF001 [*] String contains ambiguous unicode character `𝐁` (did you mean `B`?)
+confusables.py:1:6: RUF001 [*] String contains ambiguous `𝐁` (MATHEMATICAL BOLD CAPITAL B). Did you mean `B` (LATIN CAPITAL LETTER B)?
   |
 1 | x = "𝐁ad string"
   |      ^ RUF001
 2 | y = "−"
   |
-  = help: Replace `𝐁` with `B`
+  = help: Replace `𝐁` (MATHEMATICAL BOLD CAPITAL B) with `B` (LATIN CAPITAL LETTER B)
 
 ℹ Suggested fix
 1   |-x = "𝐁ad string"
@@ -16,7 +16,7 @@ confusables.py:1:6: RUF001 [*] String contains ambiguous unicode character `𝐁
 3 3 | 
 4 4 | 
 
-confusables.py:6:56: RUF002 [*] Docstring contains ambiguous unicode character `）` (did you mean `)`?)
+confusables.py:6:56: RUF002 [*] Docstring contains ambiguous `）` (FULLWIDTH RIGHT PARENTHESIS). Did you mean `)` (RIGHT PARENTHESIS)?
   |
 6 | def f():
 7 |     """Here's a docstring with an unusual parenthesis: ）"""
@@ -24,7 +24,7 @@ confusables.py:6:56: RUF002 [*] Docstring contains ambiguous unicode character `
 8 |     # And here's a comment with an unusual punctuation mark: ᜵
 9 |     ...
   |
-  = help: Replace `）` with `)`
+  = help: Replace `）` (FULLWIDTH RIGHT PARENTHESIS) with `)` (RIGHT PARENTHESIS)
 
 ℹ Suggested fix
 3 3 | 
@@ -36,7 +36,7 @@ confusables.py:6:56: RUF002 [*] Docstring contains ambiguous unicode character `
 8 8 |     ...
 9 9 | 
 
-confusables.py:7:62: RUF003 [*] Comment contains ambiguous unicode character `᜵` (did you mean `/`?)
+confusables.py:7:62: RUF003 [*] Comment contains ambiguous `᜵` (PHILIPPINE SINGLE PUNCTUATION). Did you mean `/` (SOLIDUS)?
    |
  7 | def f():
  8 |     """Here's a docstring with an unusual parenthesis: ）"""
@@ -44,7 +44,7 @@ confusables.py:7:62: RUF003 [*] Comment contains ambiguous unicode character `
    |                                                              ^ RUF003
 10 |     ...
    |
-   = help: Replace `᜵` with `/`
+   = help: Replace `᜵` (PHILIPPINE SINGLE PUNCTUATION) with `/` (SOLIDUS)
 
 ℹ Suggested fix
 4 4 | 
@@ -56,4 +56,75 @@ confusables.py:7:62: RUF003 [*] Comment contains ambiguous unicode character `
 9 9 | 
 10 10 | 
 
+confusables.py:17:6: RUF001 [*] String contains ambiguous `𝐁` (MATHEMATICAL BOLD CAPITAL B). Did you mean `B` (LATIN CAPITAL LETTER B)?
+   |
+17 | x = "𝐁ad string"
+   |      ^ RUF001
+18 | x = "−"
+   |
+   = help: Replace `𝐁` (MATHEMATICAL BOLD CAPITAL B) with `B` (LATIN CAPITAL LETTER B)
+
+ℹ Suggested fix
+14 14 |     ...
+15 15 | 
+16 16 | 
+17    |-x = "𝐁ad string"
+   17 |+x = "Bad string"
+18 18 | x = "−"
+19 19 | 
+20 20 | # This should be ignored, since it contains an unambiguous unicode character, and no
+
+confusables.py:26:10: RUF001 [*] String contains ambiguous `α` (GREEK SMALL LETTER ALPHA). Did you mean `a` (LATIN SMALL LETTER A)?
+   |
+26 | # The first word should be ignored, while the second should be included, since it
+27 | # contains ASCII.
+28 | x = "βα Bαd"
+   |          ^ RUF001
+29 | 
+30 | # The two characters should be flagged here. The first character is a "word"
+   |
+   = help: Replace `α` (GREEK SMALL LETTER ALPHA) with `a` (LATIN SMALL LETTER A)
+
+ℹ Suggested fix
+23 23 | 
+24 24 | # The first word should be ignored, while the second should be included, since it
+25 25 | # contains ASCII.
+26    |-x = "βα Bαd"
+   26 |+x = "βα Bad"
+27 27 | 
+28 28 | # The two characters should be flagged here. The first character is a "word"
+29 29 | # consisting of a single ambiguous character, while the second character is a "word
+
+confusables.py:31:6: RUF001 [*] String contains ambiguous `Р` (CYRILLIC CAPITAL LETTER ER). Did you mean `P` (LATIN CAPITAL LETTER P)?
+   |
+31 | # consisting of a single ambiguous character, while the second character is a "word
+32 | # boundary" (whitespace) that it itself ambiguous.
+33 | x = "Р усский"
+   |      ^ RUF001
+   |
+   = help: Replace `Р` (CYRILLIC CAPITAL LETTER ER) with `P` (LATIN CAPITAL LETTER P)
+
+ℹ Suggested fix
+28 28 | # The two characters should be flagged here. The first character is a "word"
+29 29 | # consisting of a single ambiguous character, while the second character is a "word
+30 30 | # boundary" (whitespace) that it itself ambiguous.
+31    |-x = "Р усский"
+   31 |+x = "P усский"
+
+confusables.py:31:7: RUF001 [*] String contains ambiguous ` ` (EN QUAD). Did you mean ` ` (SPACE)?
+   |
+31 | # consisting of a single ambiguous character, while the second character is a "word
+32 | # boundary" (whitespace) that it itself ambiguous.
+33 | x = "Р усский"
+   |       ^ RUF001
+   |
+   = help: Replace ` ` (EN QUAD) with ` ` (SPACE)
+
+ℹ Suggested fix
+28 28 | # The two characters should be flagged here. The first character is a "word"
+29 29 | # consisting of a single ambiguous character, while the second character is a "word
+30 30 | # boundary" (whitespace) that it itself ambiguous.
+31    |-x = "Р усский"
+   31 |+x = "Р усский"
+
 
diff --git a/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__noqa.snap b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__noqa.snap
new file mode 100644
index 0000000000000..01c68b7ef6fec
--- /dev/null
+++ b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__noqa.snap
@@ -0,0 +1,20 @@
+---
+source: crates/ruff/src/rules/ruff/mod.rs
+---
+noqa.py:23:5: F841 [*] Local variable `I` is assigned to but never used
+   |
+23 | def f():
+24 |     # Only `E741` should be ignored by the `noqa`.
+25 |     I = 1  # noqa: E741.F841
+   |     ^ F841
+   |
+   = help: Remove assignment to unused variable `I`
+
+ℹ Suggested fix
+20 20 | 
+21 21 | def f():
+22 22 |     # Only `E741` should be ignored by the `noqa`.
+23    |-    I = 1  # noqa: E741.F841
+   23 |+    pass  # noqa: E741.F841
+
+
diff --git a/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__ruf100_0.snap b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__ruf100_0.snap
index 7c3a3bf874f0f..e18b92414a947 100644
--- a/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__ruf100_0.snap
+++ b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__ruf100_0.snap
@@ -228,7 +228,7 @@ RUF100_0.py:85:8: F401 [*] `shelve` imported but unused
    |
    = help: Remove unused import: `shelve`
 
-ℹ Suggested fix
+ℹ Fix
 82 82 | 
 83 83 | import collections  # noqa
 84 84 | import os  # noqa: F401, RUF100
@@ -260,5 +260,8 @@ RUF100_0.py:90:92: RUF100 [*] Unused `noqa` directive (unused: `F401`)
 89 89 | 
 90    |-"shape:  (6,)\nSeries: '' [duration[μs]]\n[\n\t0µs\n\t1µs\n\t2µs\n\t3µs\n\t4µs\n\t5µs\n]"  # noqa: F401
    90 |+"shape:  (6,)\nSeries: '' [duration[μs]]\n[\n\t0µs\n\t1µs\n\t2µs\n\t3µs\n\t4µs\n\t5µs\n]"
+91 91 | 
+92 92 | 
+93 93 | def f():
 
 
diff --git a/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__ruf100_1.snap b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__ruf100_1.snap
index 18c066c26db13..355eb2976ccd8 100644
--- a/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__ruf100_1.snap
+++ b/crates/ruff/src/rules/ruff/snapshots/ruff__rules__ruff__tests__ruf100_1.snap
@@ -11,7 +11,7 @@ RUF100_1.py:37:9: F401 [*] `typing.Union` imported but unused
    |
    = help: Remove unused import: `typing.Union`
 
-ℹ Suggested fix
+ℹ Fix
 34 34 |     # This should ignore the first error.
 35 35 |     from typing import (
 36 36 |         Mapping,  # noqa: F401
@@ -112,7 +112,7 @@ RUF100_1.py:89:24: F401 [*] `typing.Awaitable` imported but unused
    |
    = help: Remove unused import
 
-ℹ Suggested fix
+ℹ Fix
 86 86 | 
 87 87 | def f():
 88 88 |     # This should mark F501 as unused.
@@ -128,7 +128,7 @@ RUF100_1.py:89:35: F401 [*] `typing.AwaitableGenerator` imported but unused
    |
    = help: Remove unused import
 
-ℹ Suggested fix
+ℹ Fix
 86 86 | 
 87 87 | def f():
 88 88 |     # This should mark F501 as unused.
diff --git a/crates/ruff/src/rules/tryceratops/helpers.rs b/crates/ruff/src/rules/tryceratops/helpers.rs
index f9a204dc69b91..3517f33e2b976 100644
--- a/crates/ruff/src/rules/tryceratops/helpers.rs
+++ b/crates/ruff/src/rules/tryceratops/helpers.rs
@@ -1,33 +1,30 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr};
 
 use ruff_python_ast::visitor;
 use ruff_python_ast::visitor::Visitor;
 use ruff_python_semantic::analyze::logging;
-use ruff_python_semantic::context::Context;
+use ruff_python_semantic::model::SemanticModel;
 
 /// Collect `logging`-like calls from an AST.
-pub struct LoggerCandidateVisitor<'a> {
-    context: &'a Context<'a>,
-    pub calls: Vec<(&'a Expr, &'a Expr)>,
+pub(crate) struct LoggerCandidateVisitor<'a, 'b> {
+    semantic_model: &'a SemanticModel<'b>,
+    pub(crate) calls: Vec<&'b ast::ExprCall>,
 }
 
-impl<'a> LoggerCandidateVisitor<'a> {
-    pub fn new(context: &'a Context<'a>) -> Self {
+impl<'a, 'b> LoggerCandidateVisitor<'a, 'b> {
+    pub(crate) fn new(semantic_model: &'a SemanticModel<'b>) -> Self {
         LoggerCandidateVisitor {
-            context,
+            semantic_model,
             calls: Vec::new(),
         }
     }
 }
 
-impl<'a, 'b> Visitor<'b> for LoggerCandidateVisitor<'a>
-where
-    'b: 'a,
-{
+impl<'a, 'b> Visitor<'b> for LoggerCandidateVisitor<'a, 'b> {
     fn visit_expr(&mut self, expr: &'b Expr) {
-        if let ExprKind::Call { func, .. } = &expr.node {
-            if logging::is_logger_candidate(self.context, func) {
-                self.calls.push((expr, func));
+        if let Expr::Call(call) = expr {
+            if logging::is_logger_candidate(&call.func, self.semantic_model) {
+                self.calls.push(call);
             }
         }
         visitor::walk_expr(self, expr);
diff --git a/crates/ruff/src/rules/tryceratops/mod.rs b/crates/ruff/src/rules/tryceratops/mod.rs
index ad86aaa54d2e5..bf88fb825b0a4 100644
--- a/crates/ruff/src/rules/tryceratops/mod.rs
+++ b/crates/ruff/src/rules/tryceratops/mod.rs
@@ -8,22 +8,22 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
-
     use test_case::test_case;
 
     use crate::registry::Rule;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
-    #[test_case(Rule::RaiseVanillaClass, Path::new("TRY002.py"); "TRY002")]
-    #[test_case(Rule::RaiseVanillaArgs, Path::new("TRY003.py"); "TRY003")]
-    #[test_case(Rule::TypeCheckWithoutTypeError, Path::new("TRY004.py"); "TRY004")]
-    #[test_case(Rule::ReraiseNoCause, Path::new("TRY200.py"); "TRY200")]
-    #[test_case(Rule::VerboseRaise, Path::new("TRY201.py"); "TRY201")]
-    #[test_case(Rule::TryConsiderElse, Path::new("TRY300.py"); "TRY300")]
-    #[test_case(Rule::RaiseWithinTry , Path::new("TRY301.py"); "TRY301")]
-    #[test_case(Rule::ErrorInsteadOfException, Path::new("TRY400.py"); "TRY400")]
-    #[test_case(Rule::VerboseLogMessage, Path::new("TRY401.py"); "TRY401")]
+    #[test_case(Rule::RaiseVanillaClass, Path::new("TRY002.py"))]
+    #[test_case(Rule::RaiseVanillaArgs, Path::new("TRY003.py"))]
+    #[test_case(Rule::TypeCheckWithoutTypeError, Path::new("TRY004.py"))]
+    #[test_case(Rule::ReraiseNoCause, Path::new("TRY200.py"))]
+    #[test_case(Rule::VerboseRaise, Path::new("TRY201.py"))]
+    #[test_case(Rule::TryConsiderElse, Path::new("TRY300.py"))]
+    #[test_case(Rule::RaiseWithinTry, Path::new("TRY301.py"))]
+    #[test_case(Rule::UselessTryExcept, Path::new("TRY302.py"))]
+    #[test_case(Rule::ErrorInsteadOfException, Path::new("TRY400.py"))]
+    #[test_case(Rule::VerboseLogMessage, Path::new("TRY401.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.as_ref(), path.to_string_lossy());
         let diagnostics = test_path(
diff --git a/crates/ruff/src/rules/tryceratops/rules/error_instead_of_exception.rs b/crates/ruff/src/rules/tryceratops/rules/error_instead_of_exception.rs
index 3557348e35060..09af41b601a4b 100644
--- a/crates/ruff/src/rules/tryceratops/rules/error_instead_of_exception.rs
+++ b/crates/ruff/src/rules/tryceratops/rules/error_instead_of_exception.rs
@@ -1,8 +1,9 @@
-use rustpython_parser::ast::{Excepthandler, ExcepthandlerKind, ExprKind};
+use rustpython_parser::ast::{self, Excepthandler, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::visitor::Visitor;
+use ruff_python_semantic::analyze::logging::exc_info;
 
 use crate::checkers::ast::Checker;
 use crate::rules::tryceratops::helpers::LoggerCandidateVisitor;
@@ -41,7 +42,7 @@ use crate::rules::tryceratops::helpers::LoggerCandidateVisitor;
 /// ```
 ///
 /// ## References
-/// - [Python documentation](https://docs.python.org/3/library/logging.html#logging.exception)
+/// - [Python documentation: `logging.exception`](https://docs.python.org/3/library/logging.html#logging.exception)
 #[violation]
 pub struct ErrorInsteadOfException;
 
@@ -53,20 +54,22 @@ impl Violation for ErrorInsteadOfException {
 }
 
 /// TRY400
-pub fn error_instead_of_exception(checker: &mut Checker, handlers: &[Excepthandler]) {
+pub(crate) fn error_instead_of_exception(checker: &mut Checker, handlers: &[Excepthandler]) {
     for handler in handlers {
-        let ExcepthandlerKind::ExceptHandler { body, .. } = &handler.node;
+        let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler { body, .. }) = handler;
         let calls = {
-            let mut visitor = LoggerCandidateVisitor::new(&checker.ctx);
+            let mut visitor = LoggerCandidateVisitor::new(checker.semantic_model());
             visitor.visit_body(body);
             visitor.calls
         };
-        for (expr, func) in calls {
-            if let ExprKind::Attribute { attr, .. } = &func.node {
+        for expr in calls {
+            if let Expr::Attribute(ast::ExprAttribute { attr, .. }) = expr.func.as_ref() {
                 if attr == "error" {
-                    checker
-                        .diagnostics
-                        .push(Diagnostic::new(ErrorInsteadOfException, expr.range()));
+                    if exc_info(&expr.keywords, checker.semantic_model()).is_none() {
+                        checker
+                            .diagnostics
+                            .push(Diagnostic::new(ErrorInsteadOfException, expr.range()));
+                    }
                 }
             }
         }
diff --git a/crates/ruff/src/rules/tryceratops/rules/mod.rs b/crates/ruff/src/rules/tryceratops/rules/mod.rs
index c1ee2203f589a..c833503d30127 100644
--- a/crates/ruff/src/rules/tryceratops/rules/mod.rs
+++ b/crates/ruff/src/rules/tryceratops/rules/mod.rs
@@ -1,12 +1,15 @@
-pub use error_instead_of_exception::{error_instead_of_exception, ErrorInsteadOfException};
-pub use raise_vanilla_args::{raise_vanilla_args, RaiseVanillaArgs};
-pub use raise_vanilla_class::{raise_vanilla_class, RaiseVanillaClass};
-pub use raise_within_try::{raise_within_try, RaiseWithinTry};
-pub use reraise_no_cause::{reraise_no_cause, ReraiseNoCause};
-pub use try_consider_else::{try_consider_else, TryConsiderElse};
-pub use type_check_without_type_error::{type_check_without_type_error, TypeCheckWithoutTypeError};
-pub use verbose_log_message::{verbose_log_message, VerboseLogMessage};
-pub use verbose_raise::{verbose_raise, VerboseRaise};
+pub(crate) use error_instead_of_exception::{error_instead_of_exception, ErrorInsteadOfException};
+pub(crate) use raise_vanilla_args::{raise_vanilla_args, RaiseVanillaArgs};
+pub(crate) use raise_vanilla_class::{raise_vanilla_class, RaiseVanillaClass};
+pub(crate) use raise_within_try::{raise_within_try, RaiseWithinTry};
+pub(crate) use reraise_no_cause::{reraise_no_cause, ReraiseNoCause};
+pub(crate) use try_consider_else::{try_consider_else, TryConsiderElse};
+pub(crate) use type_check_without_type_error::{
+    type_check_without_type_error, TypeCheckWithoutTypeError,
+};
+pub(crate) use useless_try_except::{useless_try_except, UselessTryExcept};
+pub(crate) use verbose_log_message::{verbose_log_message, VerboseLogMessage};
+pub(crate) use verbose_raise::{verbose_raise, VerboseRaise};
 
 mod error_instead_of_exception;
 mod raise_vanilla_args;
@@ -15,5 +18,6 @@ mod raise_within_try;
 mod reraise_no_cause;
 mod try_consider_else;
 mod type_check_without_type_error;
+mod useless_try_except;
 mod verbose_log_message;
 mod verbose_raise;
diff --git a/crates/ruff/src/rules/tryceratops/rules/raise_vanilla_args.rs b/crates/ruff/src/rules/tryceratops/rules/raise_vanilla_args.rs
index 600e4e1a82305..a4ff800789cdf 100644
--- a/crates/ruff/src/rules/tryceratops/rules/raise_vanilla_args.rs
+++ b/crates/ruff/src/rules/tryceratops/rules/raise_vanilla_args.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Constant, Expr, ExprKind};
+use rustpython_parser::ast::{self, Constant, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -53,18 +53,18 @@ fn any_string<F>(expr: &Expr, predicate: F) -> bool
 where
     F: (Fn(&str) -> bool) + Copy,
 {
-    match &expr.node {
-        ExprKind::JoinedStr { values } => {
+    match expr {
+        Expr::JoinedStr(ast::ExprJoinedStr { values, range: _ }) => {
             for value in values {
                 if any_string(value, predicate) {
                     return true;
                 }
             }
         }
-        ExprKind::Constant {
+        Expr::Constant(ast::ExprConstant {
             value: Constant::Str(val),
             ..
-        } => {
+        }) => {
             if predicate(val.as_str()) {
                 return true;
             }
@@ -76,8 +76,8 @@ where
 }
 
 /// TRY003
-pub fn raise_vanilla_args(checker: &mut Checker, expr: &Expr) {
-    if let ExprKind::Call { args, .. } = &expr.node {
+pub(crate) fn raise_vanilla_args(checker: &mut Checker, expr: &Expr) {
+    if let Expr::Call(ast::ExprCall { args, .. }) = expr {
         if let Some(arg) = args.first() {
             if any_string(arg, |part| part.chars().any(char::is_whitespace)) {
                 checker
diff --git a/crates/ruff/src/rules/tryceratops/rules/raise_vanilla_class.rs b/crates/ruff/src/rules/tryceratops/rules/raise_vanilla_class.rs
index dd315bda2eaea..46024b2db3bca 100644
--- a/crates/ruff/src/rules/tryceratops/rules/raise_vanilla_class.rs
+++ b/crates/ruff/src/rules/tryceratops/rules/raise_vanilla_class.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -61,10 +61,10 @@ impl Violation for RaiseVanillaClass {
 }
 
 /// TRY002
-pub fn raise_vanilla_class(checker: &mut Checker, expr: &Expr) {
+pub(crate) fn raise_vanilla_class(checker: &mut Checker, expr: &Expr) {
     if checker
-        .ctx
-        .resolve_call_path(if let ExprKind::Call { func, .. } = &expr.node {
+        .semantic_model()
+        .resolve_call_path(if let Expr::Call(ast::ExprCall { func, .. }) = expr {
             func
         } else {
             expr
diff --git a/crates/ruff/src/rules/tryceratops/rules/raise_within_try.rs b/crates/ruff/src/rules/tryceratops/rules/raise_within_try.rs
index 88ad74dbfabdd..5dcdcc117ec99 100644
--- a/crates/ruff/src/rules/tryceratops/rules/raise_within_try.rs
+++ b/crates/ruff/src/rules/tryceratops/rules/raise_within_try.rs
@@ -1,8 +1,8 @@
-use rustpython_parser::ast::{Stmt, StmtKind};
+use rustpython_parser::ast::{Excepthandler, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::visitor::{self, Visitor};
+use ruff_python_ast::statement_visitor::{walk_stmt, StatementVisitor};
 
 use crate::checkers::ast::Checker;
 
@@ -58,26 +58,28 @@ struct RaiseStatementVisitor<'a> {
     raises: Vec<&'a Stmt>,
 }
 
-impl<'a, 'b> Visitor<'b> for RaiseStatementVisitor<'a>
+impl<'a, 'b> StatementVisitor<'b> for RaiseStatementVisitor<'a>
 where
     'b: 'a,
 {
     fn visit_stmt(&mut self, stmt: &'b Stmt) {
-        match stmt.node {
-            StmtKind::Raise { .. } => self.raises.push(stmt),
-            StmtKind::Try { .. } | StmtKind::TryStar { .. } => (),
-            _ => visitor::walk_stmt(self, stmt),
+        match stmt {
+            Stmt::Raise(_) => self.raises.push(stmt),
+            Stmt::Try(_) | Stmt::TryStar(_) => (),
+            _ => walk_stmt(self, stmt),
         }
     }
 }
 
 /// TRY301
-pub fn raise_within_try(checker: &mut Checker, body: &[Stmt]) {
+pub(crate) fn raise_within_try(checker: &mut Checker, body: &[Stmt], handlers: &[Excepthandler]) {
+    if handlers.is_empty() {
+        return;
+    }
+
     let raises = {
         let mut visitor = RaiseStatementVisitor::default();
-        for stmt in body {
-            visitor.visit_stmt(stmt);
-        }
+        visitor.visit_body(body);
         visitor.raises
     };
 
diff --git a/crates/ruff/src/rules/tryceratops/rules/reraise_no_cause.rs b/crates/ruff/src/rules/tryceratops/rules/reraise_no_cause.rs
index c18b01fb9af79..259dfac22386f 100644
--- a/crates/ruff/src/rules/tryceratops/rules/reraise_no_cause.rs
+++ b/crates/ruff/src/rules/tryceratops/rules/reraise_no_cause.rs
@@ -1,9 +1,9 @@
-use rustpython_parser::ast::{ExprKind, Stmt};
+use rustpython_parser::ast::Stmt;
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::RaiseStatementVisitor;
-use ruff_python_ast::visitor::Visitor;
+use ruff_python_ast::statement_visitor::StatementVisitor;
 
 use crate::checkers::ast::Checker;
 
@@ -47,17 +47,15 @@ impl Violation for ReraiseNoCause {
 }
 
 /// TRY200
-pub fn reraise_no_cause(checker: &mut Checker, body: &[Stmt]) {
+pub(crate) fn reraise_no_cause(checker: &mut Checker, body: &[Stmt]) {
     let raises = {
         let mut visitor = RaiseStatementVisitor::default();
-        for stmt in body {
-            visitor.visit_stmt(stmt);
-        }
+        visitor.visit_body(body);
         visitor.raises
     };
 
     for (range, exc, cause) in raises {
-        if exc.map_or(false, |expr| matches!(expr.node, ExprKind::Call { .. })) && cause.is_none() {
+        if exc.map_or(false, |expr| expr.is_call_expr() && cause.is_none()) {
             checker
                 .diagnostics
                 .push(Diagnostic::new(ReraiseNoCause, range));
diff --git a/crates/ruff/src/rules/tryceratops/rules/try_consider_else.rs b/crates/ruff/src/rules/tryceratops/rules/try_consider_else.rs
index db322c19e1469..91e7624f94aa6 100644
--- a/crates/ruff/src/rules/tryceratops/rules/try_consider_else.rs
+++ b/crates/ruff/src/rules/tryceratops/rules/try_consider_else.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Excepthandler, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Excepthandler, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -56,7 +56,7 @@ impl Violation for TryConsiderElse {
 }
 
 /// TRY300
-pub fn try_consider_else(
+pub(crate) fn try_consider_else(
     checker: &mut Checker,
     body: &[Stmt],
     orelse: &[Stmt],
@@ -64,9 +64,9 @@ pub fn try_consider_else(
 ) {
     if body.len() > 1 && orelse.is_empty() && !handler.is_empty() {
         if let Some(stmt) = body.last() {
-            if let StmtKind::Return { value } = &stmt.node {
+            if let Stmt::Return(ast::StmtReturn { value, range: _ }) = stmt {
                 if let Some(value) = value {
-                    if contains_effect(value, |id| checker.ctx.is_builtin(id)) {
+                    if contains_effect(value, |id| checker.semantic_model().is_builtin(id)) {
                         return;
                     }
                 }
diff --git a/crates/ruff/src/rules/tryceratops/rules/type_check_without_type_error.rs b/crates/ruff/src/rules/tryceratops/rules/type_check_without_type_error.rs
index a1fc8504010fb..f87d7b010afd0 100644
--- a/crates/ruff/src/rules/tryceratops/rules/type_check_without_type_error.rs
+++ b/crates/ruff/src/rules/tryceratops/rules/type_check_without_type_error.rs
@@ -1,9 +1,8 @@
-use rustpython_parser::ast::{Expr, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::visitor;
-use ruff_python_ast::visitor::Visitor;
+use ruff_python_ast::statement_visitor::{walk_stmt, StatementVisitor};
 
 use crate::checkers::ast::Checker;
 
@@ -51,33 +50,19 @@ struct ControlFlowVisitor<'a> {
     continues: Vec<&'a Stmt>,
 }
 
-impl<'a, 'b> Visitor<'b> for ControlFlowVisitor<'a>
+impl<'a, 'b> StatementVisitor<'b> for ControlFlowVisitor<'a>
 where
     'b: 'a,
 {
     fn visit_stmt(&mut self, stmt: &'b Stmt) {
-        match &stmt.node {
-            StmtKind::FunctionDef { .. }
-            | StmtKind::AsyncFunctionDef { .. }
-            | StmtKind::ClassDef { .. } => {
+        match stmt {
+            Stmt::FunctionDef(_) | Stmt::AsyncFunctionDef(_) | Stmt::ClassDef(_) => {
                 // Don't recurse.
             }
-            StmtKind::Return { .. } => self.returns.push(stmt),
-            StmtKind::Break => self.breaks.push(stmt),
-            StmtKind::Continue => self.continues.push(stmt),
-            _ => visitor::walk_stmt(self, stmt),
-        }
-    }
-
-    fn visit_expr(&mut self, expr: &'b Expr) {
-        match &expr.node {
-            ExprKind::ListComp { .. }
-            | ExprKind::DictComp { .. }
-            | ExprKind::SetComp { .. }
-            | ExprKind::GeneratorExp { .. } => {
-                // Don't recurse.
-            }
-            _ => visitor::walk_expr(self, expr),
+            Stmt::Return(_) => self.returns.push(stmt),
+            Stmt::Break(_) => self.breaks.push(stmt),
+            Stmt::Continue(_) => self.continues.push(stmt),
+            _ => walk_stmt(self, stmt),
         }
     }
 }
@@ -92,7 +77,7 @@ fn has_control_flow(stmt: &Stmt) -> bool {
 /// Returns `true` if an [`Expr`] is a call to check types.
 fn check_type_check_call(checker: &mut Checker, call: &Expr) -> bool {
     checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(call)
         .map_or(false, |call_path| {
             call_path.as_slice() == ["", "isinstance"]
@@ -103,12 +88,12 @@ fn check_type_check_call(checker: &mut Checker, call: &Expr) -> bool {
 
 /// Returns `true` if an [`Expr`] is a test to check types (e.g. via isinstance)
 fn check_type_check_test(checker: &mut Checker, test: &Expr) -> bool {
-    match &test.node {
-        ExprKind::BoolOp { values, .. } => values
+    match test {
+        Expr::BoolOp(ast::ExprBoolOp { values, .. }) => values
             .iter()
             .all(|expr| check_type_check_test(checker, expr)),
-        ExprKind::UnaryOp { operand, .. } => check_type_check_test(checker, operand),
-        ExprKind::Call { func, .. } => check_type_check_call(checker, func),
+        Expr::UnaryOp(ast::ExprUnaryOp { operand, .. }) => check_type_check_test(checker, operand),
+        Expr::Call(ast::ExprCall { func, .. }) => check_type_check_call(checker, func),
         _ => false,
     }
 }
@@ -116,7 +101,7 @@ fn check_type_check_test(checker: &mut Checker, test: &Expr) -> bool {
 /// Returns `true` if `exc` is a reference to a builtin exception.
 fn is_builtin_exception(checker: &mut Checker, exc: &Expr) -> bool {
     return checker
-        .ctx
+        .semantic_model()
         .resolve_call_path(exc)
         .map_or(false, |call_path| {
             [
@@ -143,10 +128,10 @@ fn is_builtin_exception(checker: &mut Checker, exc: &Expr) -> bool {
 
 /// Returns `true` if an [`Expr`] is a reference to a builtin exception.
 fn check_raise_type(checker: &mut Checker, exc: &Expr) -> bool {
-    match &exc.node {
-        ExprKind::Name { .. } => is_builtin_exception(checker, exc),
-        ExprKind::Call { func, .. } => {
-            if let ExprKind::Name { .. } = &func.node {
+    match exc {
+        Expr::Name(_) => is_builtin_exception(checker, exc),
+        Expr::Call(ast::ExprCall { func, .. }) => {
+            if let Expr::Name(_) = func.as_ref() {
                 is_builtin_exception(checker, func)
             } else {
                 false
@@ -170,7 +155,7 @@ fn check_body(checker: &mut Checker, body: &[Stmt]) {
         if has_control_flow(item) {
             return;
         }
-        if let StmtKind::Raise { exc: Some(exc), .. } = &item.node {
+        if let Stmt::Raise(ast::StmtRaise { exc: Some(exc), .. }) = &item {
             check_raise(checker, exc, item);
         }
     }
@@ -182,13 +167,13 @@ fn check_orelse(checker: &mut Checker, body: &[Stmt]) {
         if has_control_flow(item) {
             return;
         }
-        match &item.node {
-            StmtKind::If { test, .. } => {
+        match item {
+            Stmt::If(ast::StmtIf { test, .. }) => {
                 if !check_type_check_test(checker, test) {
                     return;
                 }
             }
-            StmtKind::Raise { exc: Some(exc), .. } => {
+            Stmt::Raise(ast::StmtRaise { exc: Some(exc), .. }) => {
                 check_raise(checker, exc, item);
             }
             _ => {}
@@ -197,18 +182,16 @@ fn check_orelse(checker: &mut Checker, body: &[Stmt]) {
 }
 
 /// TRY004
-pub fn type_check_without_type_error(
+pub(crate) fn type_check_without_type_error(
     checker: &mut Checker,
     body: &[Stmt],
     test: &Expr,
     orelse: &[Stmt],
     parent: Option<&Stmt>,
 ) {
-    if let Some(parent) = parent {
-        if let StmtKind::If { test, .. } = &parent.node {
-            if !check_type_check_test(checker, test) {
-                return;
-            }
+    if let Some(Stmt::If(ast::StmtIf { test, .. })) = parent {
+        if !check_type_check_test(checker, test) {
+            return;
         }
     }
 
diff --git a/crates/ruff/src/rules/tryceratops/rules/useless_try_except.rs b/crates/ruff/src/rules/tryceratops/rules/useless_try_except.rs
new file mode 100644
index 0000000000000..8869e4eccdc26
--- /dev/null
+++ b/crates/ruff/src/rules/tryceratops/rules/useless_try_except.rs
@@ -0,0 +1,68 @@
+use rustpython_parser::ast::Excepthandler::ExceptHandler;
+use rustpython_parser::ast::{self, Excepthandler, ExcepthandlerExceptHandler, Expr, Ranged, Stmt};
+
+use ruff_diagnostics::{Diagnostic, Violation};
+use ruff_macros::{derive_message_formats, violation};
+
+use crate::checkers::ast::Checker;
+
+/// ## What it does
+/// Checks for immediate uses of `raise` within exception handlers.
+///
+/// ## Why is this bad?
+/// Capturing an exception, only to immediately reraise it, has no effect.
+/// Instead, remove the error-handling code and let the exception propagate
+/// upwards without the unnecessary `try`-`except` block.
+///
+/// ## Example
+/// ```python
+/// def foo():
+///     try:
+///         bar()
+///     except NotImplementedError:
+///         raise
+/// ```
+///
+/// Use instead:
+/// ```python
+/// def foo():
+///     bar()
+/// ```
+#[violation]
+pub struct UselessTryExcept;
+
+impl Violation for UselessTryExcept {
+    #[derive_message_formats]
+    fn message(&self) -> String {
+        format!("Remove exception handler; error is immediately re-raised")
+    }
+}
+
+/// TRY302
+pub(crate) fn useless_try_except(checker: &mut Checker, handlers: &[Excepthandler]) {
+    if let Some(diagnostics) = handlers
+        .iter()
+        .map(|handler| {
+            let ExceptHandler(ExcepthandlerExceptHandler { name, body, .. }) = handler;
+            let Some(Stmt::Raise(ast::StmtRaise {  exc, cause: None, .. })) = &body.first() else {
+                return None;
+            };
+            if let Some(expr) = exc {
+                // E.g., `except ... as e: raise e`
+                if let Expr::Name(ast::ExprName { id, .. }) = expr.as_ref() {
+                    if Some(id) == name.as_ref() {
+                        return Some(Diagnostic::new(UselessTryExcept, handler.range()));
+                    }
+                }
+                None
+            } else {
+                // E.g., `except ...: raise`
+                Some(Diagnostic::new(UselessTryExcept, handler.range()))
+            }
+        })
+        .collect::<Option<Vec<_>>>()
+    {
+        // Require that all handlers are useless, but create one diagnostic per handler.
+        checker.diagnostics.extend(diagnostics);
+    }
+}
diff --git a/crates/ruff/src/rules/tryceratops/rules/verbose_log_message.rs b/crates/ruff/src/rules/tryceratops/rules/verbose_log_message.rs
index 9ca1f8cb53226..dd1dd7d34c622 100644
--- a/crates/ruff/src/rules/tryceratops/rules/verbose_log_message.rs
+++ b/crates/ruff/src/rules/tryceratops/rules/verbose_log_message.rs
@@ -1,4 +1,4 @@
-use rustpython_parser::ast::{Excepthandler, ExcepthandlerKind, Expr, ExprContext, ExprKind};
+use rustpython_parser::ast::{self, Excepthandler, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -43,58 +43,50 @@ impl Violation for VerboseLogMessage {
 
 #[derive(Default)]
 struct NameVisitor<'a> {
-    names: Vec<(&'a str, &'a Expr)>,
+    names: Vec<&'a ast::ExprName>,
 }
 
-impl<'a, 'b> Visitor<'b> for NameVisitor<'a>
-where
-    'b: 'a,
-{
-    fn visit_expr(&mut self, expr: &'b Expr) {
-        match &expr.node {
-            ExprKind::Name {
-                id,
-                ctx: ExprContext::Load,
-            } => self.names.push((id, expr)),
-            ExprKind::Attribute { .. } => {}
+impl<'a> Visitor<'a> for NameVisitor<'a> {
+    fn visit_expr(&mut self, expr: &'a Expr) {
+        match expr {
+            Expr::Name(name) if name.ctx.is_load() => self.names.push(name),
+            Expr::Attribute(_) => {}
             _ => visitor::walk_expr(self, expr),
         }
     }
 }
 
 /// TRY401
-pub fn verbose_log_message(checker: &mut Checker, handlers: &[Excepthandler]) {
+pub(crate) fn verbose_log_message(checker: &mut Checker, handlers: &[Excepthandler]) {
     for handler in handlers {
-        let ExcepthandlerKind::ExceptHandler { name, body, .. } = &handler.node;
+        let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler { name, body, .. }) =
+            handler;
         let Some(target) = name else {
             continue;
         };
 
         // Find all calls to `logging.exception`.
         let calls = {
-            let mut visitor = LoggerCandidateVisitor::new(&checker.ctx);
+            let mut visitor = LoggerCandidateVisitor::new(checker.semantic_model());
             visitor.visit_body(body);
             visitor.calls
         };
 
-        for (expr, func) in calls {
-            let ExprKind::Call { args, .. } = &expr.node else {
-                continue;
-            };
-            if let ExprKind::Attribute { attr, .. } = &func.node {
+        for expr in calls {
+            if let Expr::Attribute(ast::ExprAttribute { attr, .. }) = expr.func.as_ref() {
                 if attr == "exception" {
                     // Collect all referenced names in the `logging.exception` call.
-                    let names: Vec<(&str, &Expr)> = {
+                    let names: Vec<&ast::ExprName> = {
                         let mut names = Vec::new();
-                        for arg in args {
+                        for arg in &expr.args {
                             let mut visitor = NameVisitor::default();
                             visitor.visit_expr(arg);
                             names.extend(visitor.names);
                         }
                         names
                     };
-                    for (id, expr) in names {
-                        if id == target {
+                    for expr in names {
+                        if expr.id == *target {
                             checker
                                 .diagnostics
                                 .push(Diagnostic::new(VerboseLogMessage, expr.range()));
diff --git a/crates/ruff/src/rules/tryceratops/rules/verbose_raise.rs b/crates/ruff/src/rules/tryceratops/rules/verbose_raise.rs
index 426e359ae8d30..b740212215a3d 100644
--- a/crates/ruff/src/rules/tryceratops/rules/verbose_raise.rs
+++ b/crates/ruff/src/rules/tryceratops/rules/verbose_raise.rs
@@ -1,9 +1,8 @@
-use rustpython_parser::ast::{Excepthandler, ExcepthandlerKind, Expr, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Excepthandler, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::visitor;
-use ruff_python_ast::visitor::Visitor;
+use ruff_python_ast::statement_visitor::{walk_stmt, StatementVisitor};
 
 use crate::checkers::ast::Checker;
 
@@ -46,43 +45,47 @@ struct RaiseStatementVisitor<'a> {
     raises: Vec<(Option<&'a Expr>, Option<&'a Expr>)>,
 }
 
-impl<'a, 'b> Visitor<'b> for RaiseStatementVisitor<'a>
+impl<'a, 'b> StatementVisitor<'b> for RaiseStatementVisitor<'a>
 where
     'b: 'a,
 {
     fn visit_stmt(&mut self, stmt: &'b Stmt) {
-        match &stmt.node {
-            StmtKind::Raise { exc, cause } => self.raises.push((exc.as_deref(), cause.as_deref())),
-            StmtKind::Try {
-                body, finalbody, ..
+        match stmt {
+            Stmt::Raise(ast::StmtRaise {
+                exc,
+                cause,
+                range: _,
+            }) => {
+                self.raises.push((exc.as_deref(), cause.as_deref()));
             }
-            | StmtKind::TryStar {
+            Stmt::Try(ast::StmtTry {
+                body, finalbody, ..
+            })
+            | Stmt::TryStar(ast::StmtTryStar {
                 body, finalbody, ..
-            } => {
+            }) => {
                 for stmt in body.iter().chain(finalbody.iter()) {
-                    visitor::walk_stmt(self, stmt);
+                    walk_stmt(self, stmt);
                 }
             }
-            _ => visitor::walk_stmt(self, stmt),
+            _ => walk_stmt(self, stmt),
         }
     }
 }
 
 /// TRY201
-pub fn verbose_raise(checker: &mut Checker, handlers: &[Excepthandler]) {
+pub(crate) fn verbose_raise(checker: &mut Checker, handlers: &[Excepthandler]) {
     for handler in handlers {
         // If the handler assigned a name to the exception...
-        if let ExcepthandlerKind::ExceptHandler {
+        if let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler {
             name: Some(exception_name),
             body,
             ..
-        } = &handler.node
+        }) = handler
         {
             let raises = {
                 let mut visitor = RaiseStatementVisitor::default();
-                for stmt in body {
-                    visitor.visit_stmt(stmt);
-                }
+                visitor.visit_body(body);
                 visitor.raises
             };
             for (exc, cause) in raises {
@@ -91,7 +94,7 @@ pub fn verbose_raise(checker: &mut Checker, handlers: &[Excepthandler]) {
                 }
                 if let Some(exc) = exc {
                     // ...and the raised object is bound to the same name...
-                    if let ExprKind::Name { id, .. } = &exc.node {
+                    if let Expr::Name(ast::ExprName { id, .. }) = exc {
                         if id == exception_name {
                             checker
                                 .diagnostics
diff --git a/crates/ruff/src/rules/tryceratops/snapshots/ruff__rules__tryceratops__tests__error-instead-of-exception_TRY400.py.snap b/crates/ruff/src/rules/tryceratops/snapshots/ruff__rules__tryceratops__tests__error-instead-of-exception_TRY400.py.snap
index b02e9153f680d..3824e75fdd7c8 100644
--- a/crates/ruff/src/rules/tryceratops/snapshots/ruff__rules__tryceratops__tests__error-instead-of-exception_TRY400.py.snap
+++ b/crates/ruff/src/rules/tryceratops/snapshots/ruff__rules__tryceratops__tests__error-instead-of-exception_TRY400.py.snap
@@ -1,71 +1,71 @@
 ---
 source: crates/ruff/src/rules/tryceratops/mod.rs
 ---
-TRY400.py:15:9: TRY400 Use `logging.exception` instead of `logging.error`
+TRY400.py:16:9: TRY400 Use `logging.exception` instead of `logging.error`
    |
-15 |         a = 1
-16 |     except Exception:
-17 |         logging.error("Context message here")
+16 |         a = 1
+17 |     except Exception:
+18 |         logging.error("Context message here")
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ TRY400
-18 | 
-19 |         if True:
+19 | 
+20 |         if True:
    |
 
-TRY400.py:18:13: TRY400 Use `logging.exception` instead of `logging.error`
+TRY400.py:19:13: TRY400 Use `logging.exception` instead of `logging.error`
    |
-18 |         if True:
-19 |             logging.error("Context message here")
+19 |         if True:
+20 |             logging.error("Context message here")
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ TRY400
    |
 
-TRY400.py:25:9: TRY400 Use `logging.exception` instead of `logging.error`
+TRY400.py:26:9: TRY400 Use `logging.exception` instead of `logging.error`
    |
-25 |         a = 1
-26 |     except Exception:
-27 |         logger.error("Context message here")
+26 |         a = 1
+27 |     except Exception:
+28 |         logger.error("Context message here")
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ TRY400
-28 | 
-29 |         if True:
+29 | 
+30 |         if True:
    |
 
-TRY400.py:28:13: TRY400 Use `logging.exception` instead of `logging.error`
+TRY400.py:29:13: TRY400 Use `logging.exception` instead of `logging.error`
    |
-28 |         if True:
-29 |             logger.error("Context message here")
+29 |         if True:
+30 |             logger.error("Context message here")
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ TRY400
    |
 
-TRY400.py:35:9: TRY400 Use `logging.exception` instead of `logging.error`
+TRY400.py:36:9: TRY400 Use `logging.exception` instead of `logging.error`
    |
-35 |         a = 1
-36 |     except Exception:
-37 |         log.error("Context message here")
+36 |         a = 1
+37 |     except Exception:
+38 |         log.error("Context message here")
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ TRY400
-38 | 
-39 |         if True:
+39 | 
+40 |         if True:
    |
 
-TRY400.py:38:13: TRY400 Use `logging.exception` instead of `logging.error`
+TRY400.py:39:13: TRY400 Use `logging.exception` instead of `logging.error`
    |
-38 |         if True:
-39 |             log.error("Context message here")
+39 |         if True:
+40 |             log.error("Context message here")
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ TRY400
    |
 
-TRY400.py:45:9: TRY400 Use `logging.exception` instead of `logging.error`
+TRY400.py:46:9: TRY400 Use `logging.exception` instead of `logging.error`
    |
-45 |         a = 1
-46 |     except Exception:
-47 |         self.logger.error("Context message here")
+46 |         a = 1
+47 |     except Exception:
+48 |         self.logger.error("Context message here")
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ TRY400
-48 | 
-49 |         if True:
+49 | 
+50 |         if True:
    |
 
-TRY400.py:48:13: TRY400 Use `logging.exception` instead of `logging.error`
+TRY400.py:49:13: TRY400 Use `logging.exception` instead of `logging.error`
    |
-48 |         if True:
-49 |             self.logger.error("Context message here")
+49 |         if True:
+50 |             self.logger.error("Context message here")
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ TRY400
    |
 
diff --git a/crates/ruff/src/rules/tryceratops/snapshots/ruff__rules__tryceratops__tests__raise-within-try_TRY301.py.snap b/crates/ruff/src/rules/tryceratops/snapshots/ruff__rules__tryceratops__tests__raise-within-try_TRY301.py.snap
index a0197f6526616..0e42ca42cd342 100644
--- a/crates/ruff/src/rules/tryceratops/snapshots/ruff__rules__tryceratops__tests__raise-within-try_TRY301.py.snap
+++ b/crates/ruff/src/rules/tryceratops/snapshots/ruff__rules__tryceratops__tests__raise-within-try_TRY301.py.snap
@@ -1,64 +1,64 @@
 ---
 source: crates/ruff/src/rules/tryceratops/mod.rs
 ---
-TRY301.py:9:13: TRY301 Abstract `raise` to an inner function
+TRY301.py:14:13: TRY301 Abstract `raise` to an inner function
    |
- 9 |         a = process()
-10 |         if not a:
-11 |             raise MyException(a)
+14 |         a = process()
+15 |         if not a:
+16 |             raise MyException(a)
    |             ^^^^^^^^^^^^^^^^^^^^ TRY301
-12 | 
-13 |         raise MyException(a)
+17 | 
+18 |         raise MyException(a)
    |
 
-TRY301.py:11:9: TRY301 Abstract `raise` to an inner function
+TRY301.py:16:9: TRY301 Abstract `raise` to an inner function
    |
-11 |             raise MyException(a)
-12 | 
-13 |         raise MyException(a)
+16 |             raise MyException(a)
+17 | 
+18 |         raise MyException(a)
    |         ^^^^^^^^^^^^^^^^^^^^ TRY301
-14 | 
-15 |         try:
+19 | 
+20 |         try:
    |
 
-TRY301.py:16:17: TRY301 Abstract `raise` to an inner function
+TRY301.py:21:17: TRY301 Abstract `raise` to an inner function
    |
-16 |             b = process()
-17 |             if not b:
-18 |                 raise MyException(b)
+21 |             b = process()
+22 |             if not b:
+23 |                 raise MyException(b)
    |                 ^^^^^^^^^^^^^^^^^^^^ TRY301
-19 |         except Exception:
-20 |             logger.exception("something failed")
+24 |         except Exception:
+25 |             logger.exception("something failed")
    |
 
-TRY301.py:27:13: TRY301 Abstract `raise` to an inner function
+TRY301.py:32:13: TRY301 Abstract `raise` to an inner function
    |
-27 |         a = process()
-28 |         if not a:
-29 |             raise MyException(a)
+32 |         a = process()
+33 |         if not a:
+34 |             raise MyException(a)
    |             ^^^^^^^^^^^^^^^^^^^^ TRY301
-30 | 
-31 |         raise MyException(a)
+35 | 
+36 |         raise MyException(a)
    |
 
-TRY301.py:29:9: TRY301 Abstract `raise` to an inner function
+TRY301.py:34:9: TRY301 Abstract `raise` to an inner function
    |
-29 |             raise MyException(a)
-30 | 
-31 |         raise MyException(a)
+34 |             raise MyException(a)
+35 | 
+36 |         raise MyException(a)
    |         ^^^^^^^^^^^^^^^^^^^^ TRY301
-32 | 
-33 |         try:
+37 | 
+38 |         try:
    |
 
-TRY301.py:34:17: TRY301 Abstract `raise` to an inner function
+TRY301.py:39:17: TRY301 Abstract `raise` to an inner function
    |
-34 |             b = process()
-35 |             if not b:
-36 |                 raise MyException(b)
+39 |             b = process()
+40 |             if not b:
+41 |                 raise MyException(b)
    |                 ^^^^^^^^^^^^^^^^^^^^ TRY301
-37 |         except* Exception:
-38 |             logger.exception("something failed")
+42 |         except* Exception:
+43 |             logger.exception("something failed")
    |
 
 
diff --git a/crates/ruff/src/rules/tryceratops/snapshots/ruff__rules__tryceratops__tests__useless-try-except_TRY302.py.snap b/crates/ruff/src/rules/tryceratops/snapshots/ruff__rules__tryceratops__tests__useless-try-except_TRY302.py.snap
new file mode 100644
index 0000000000000..e69fb05edfa46
--- /dev/null
+++ b/crates/ruff/src/rules/tryceratops/snapshots/ruff__rules__tryceratops__tests__useless-try-except_TRY302.py.snap
@@ -0,0 +1,150 @@
+---
+source: crates/ruff/src/rules/tryceratops/mod.rs
+---
+TRY302.py:12:5: TRY302 Remove exception handler; error is immediately re-raised
+   |
+12 |       try:
+13 |           process()
+14 |       except Exception:
+   |  _____^
+15 | |         raise
+   | |_____________^ TRY302
+16 |   
+17 |   def bad():
+   |
+
+TRY302.py:18:5: TRY302 Remove exception handler; error is immediately re-raised
+   |
+18 |       try:
+19 |           process()
+20 |       except Exception:
+   |  _____^
+21 | |         raise
+22 | |         print("this code is pointless!")
+   | |________________________________________^ TRY302
+23 |   
+24 |   def bad():
+   |
+
+TRY302.py:25:5: TRY302 Remove exception handler; error is immediately re-raised
+   |
+25 |       try:
+26 |           process()
+27 |       except:
+   |  _____^
+28 | |         # I am a comment, not a statement!
+29 | |         raise
+   | |_____________^ TRY302
+30 |   
+31 |   def bad():
+   |
+
+TRY302.py:32:5: TRY302 Remove exception handler; error is immediately re-raised
+   |
+32 |       try:
+33 |           process()
+34 |       except Exception:
+   |  _____^
+35 | |         raise
+   | |_____________^ TRY302
+36 |   
+37 |   def bad():
+   |
+
+TRY302.py:38:5: TRY302 Remove exception handler; error is immediately re-raised
+   |
+38 |       try:
+39 |           process()
+40 |       except Exception as e:
+   |  _____^
+41 | |         raise
+   | |_____________^ TRY302
+42 |   
+43 |   def bad():
+   |
+
+TRY302.py:44:5: TRY302 Remove exception handler; error is immediately re-raised
+   |
+44 |       try:
+45 |           process()
+46 |       except Exception as e:
+   |  _____^
+47 | |         raise e
+   | |_______________^ TRY302
+48 |   
+49 |   def bad():
+   |
+
+TRY302.py:50:5: TRY302 Remove exception handler; error is immediately re-raised
+   |
+50 |       try:
+51 |           process()
+52 |       except MyException:
+   |  _____^
+53 | |         raise
+   | |_____________^ TRY302
+54 |       except Exception:
+55 |           raise
+   |
+
+TRY302.py:52:5: TRY302 Remove exception handler; error is immediately re-raised
+   |
+52 |       except MyException:
+53 |           raise
+54 |       except Exception:
+   |  _____^
+55 | |         raise
+   | |_____________^ TRY302
+56 |   
+57 |   def bad():
+   |
+
+TRY302.py:58:5: TRY302 Remove exception handler; error is immediately re-raised
+   |
+58 |       try:
+59 |           process()
+60 |       except MyException as e:
+   |  _____^
+61 | |         raise e
+   | |_______________^ TRY302
+62 |       except Exception as e:
+63 |           raise e
+   |
+
+TRY302.py:60:5: TRY302 Remove exception handler; error is immediately re-raised
+   |
+60 |       except MyException as e:
+61 |           raise e
+62 |       except Exception as e:
+   |  _____^
+63 | |         raise e
+   | |_______________^ TRY302
+64 |   
+65 |   def bad():
+   |
+
+TRY302.py:66:5: TRY302 Remove exception handler; error is immediately re-raised
+   |
+66 |       try:
+67 |           process()
+68 |       except MyException as ex:
+   |  _____^
+69 | |         raise ex
+   | |________________^ TRY302
+70 |       except Exception as e:
+71 |           raise e
+   |
+
+TRY302.py:68:5: TRY302 Remove exception handler; error is immediately re-raised
+   |
+68 |       except MyException as ex:
+69 |           raise ex
+70 |       except Exception as e:
+   |  _____^
+71 | |         raise e
+   | |_______________^ TRY302
+72 |   
+73 |   def fine():
+   |
+
+
diff --git a/crates/ruff/src/settings/configuration.rs b/crates/ruff/src/settings/configuration.rs
index 59a611746eed4..16acabe30a6c6 100644
--- a/crates/ruff/src/settings/configuration.rs
+++ b/crates/ruff/src/settings/configuration.rs
@@ -13,13 +13,13 @@ use shellexpand;
 use shellexpand::LookupError;
 
 use crate::fs;
+use crate::line_width::{LineLength, TabSize};
 use crate::rule_selector::RuleSelector;
 use crate::rules::{
     flake8_annotations, flake8_bandit, flake8_bugbear, flake8_builtins, flake8_comprehensions,
     flake8_errmsg, flake8_gettext, flake8_implicit_str_concat, flake8_import_conventions,
     flake8_pytest_style, flake8_quotes, flake8_self, flake8_tidy_imports, flake8_type_checking,
-    flake8_unused_arguments, isort, mccabe, pep8_naming, pycodestyle, pydocstyle, pylint,
-    pyupgrade,
+    flake8_unused_arguments, isort, mccabe, pep8_naming, pycodestyle, pydocstyle, pyflakes, pylint,
 };
 use crate::settings::options::Options;
 use crate::settings::types::{
@@ -33,6 +33,7 @@ pub struct RuleSelection {
     pub extend_select: Vec<RuleSelector>,
     pub fixable: Option<Vec<RuleSelector>>,
     pub unfixable: Vec<RuleSelector>,
+    pub extend_fixable: Vec<RuleSelector>,
 }
 
 #[derive(Debug, Default)]
@@ -48,6 +49,7 @@ pub struct Configuration {
     pub extend: Option<PathBuf>,
     pub extend_exclude: Vec<FilePattern>,
     pub extend_include: Vec<FilePattern>,
+    pub extend_per_file_ignores: Vec<PerFileIgnore>,
     pub external: Option<Vec<String>>,
     pub fix: Option<bool>,
     pub fix_only: Option<bool>,
@@ -55,7 +57,8 @@ pub struct Configuration {
     pub format: Option<SerializationFormat>,
     pub ignore_init_module_imports: Option<bool>,
     pub include: Option<Vec<FilePattern>>,
-    pub line_length: Option<usize>,
+    pub line_length: Option<LineLength>,
+    pub tab_size: Option<TabSize>,
     pub namespace_packages: Option<Vec<PathBuf>>,
     pub required_version: Option<Version>,
     pub respect_gitignore: Option<bool>,
@@ -65,7 +68,6 @@ pub struct Configuration {
     pub target_version: Option<PythonVersion>,
     pub task_tags: Option<Vec<String>>,
     pub typing_modules: Option<Vec<String>>,
-    pub update_check: Option<bool>,
     // Plugins
     pub flake8_annotations: Option<flake8_annotations::settings::Options>,
     pub flake8_bandit: Option<flake8_bandit::settings::Options>,
@@ -87,8 +89,8 @@ pub struct Configuration {
     pub pep8_naming: Option<pep8_naming::settings::Options>,
     pub pycodestyle: Option<pycodestyle::settings::Options>,
     pub pydocstyle: Option<pydocstyle::settings::Options>,
+    pub pyflakes: Option<pyflakes::settings::Options>,
     pub pylint: Option<pylint::settings::Options>,
-    pub pyupgrade: Option<pyupgrade::settings::Options>,
 }
 
 impl Configuration {
@@ -104,7 +106,13 @@ impl Configuration {
                     .collect(),
                 extend_select: options.extend_select.unwrap_or_default(),
                 fixable: options.fixable,
-                unfixable: options.unfixable.unwrap_or_default(),
+                unfixable: options
+                    .unfixable
+                    .into_iter()
+                    .flatten()
+                    .chain(options.extend_unfixable.into_iter().flatten())
+                    .collect(),
+                extend_fixable: options.extend_fixable.unwrap_or_default(),
             }],
             allowed_confusables: options.allowed_confusables,
             builtins: options.builtins,
@@ -162,6 +170,17 @@ impl Configuration {
                         .collect()
                 })
                 .unwrap_or_default(),
+            extend_per_file_ignores: options
+                .extend_per_file_ignores
+                .map(|per_file_ignores| {
+                    per_file_ignores
+                        .into_iter()
+                        .map(|(pattern, prefixes)| {
+                            PerFileIgnore::new(pattern, &prefixes, Some(project_root))
+                        })
+                        .collect()
+                })
+                .unwrap_or_default(),
             external: options.external,
             fix: options.fix,
             fix_only: options.fix_only,
@@ -178,6 +197,7 @@ impl Configuration {
                     .collect()
             }),
             line_length: options.line_length,
+            tab_size: options.tab_size,
             namespace_packages: options
                 .namespace_packages
                 .map(|namespace_package| resolve_src(&namespace_package, project_root))
@@ -201,7 +221,6 @@ impl Configuration {
             target_version: options.target_version,
             task_tags: options.task_tags,
             typing_modules: options.typing_modules,
-            update_check: options.update_check,
             // Plugins
             flake8_annotations: options.flake8_annotations,
             flake8_bandit: options.flake8_bandit,
@@ -223,8 +242,8 @@ impl Configuration {
             pep8_naming: options.pep8_naming,
             pycodestyle: options.pycodestyle,
             pydocstyle: options.pydocstyle,
+            pyflakes: options.pyflakes,
             pylint: options.pylint,
-            pyupgrade: options.pyupgrade,
         })
     }
 
@@ -252,6 +271,11 @@ impl Configuration {
                 .into_iter()
                 .chain(self.extend_include.into_iter())
                 .collect(),
+            extend_per_file_ignores: config
+                .extend_per_file_ignores
+                .into_iter()
+                .chain(self.extend_per_file_ignores.into_iter())
+                .collect(),
             external: self.external.or(config.external),
             fix: self.fix.or(config.fix),
             fix_only: self.fix_only.or(config.fix_only),
@@ -262,6 +286,7 @@ impl Configuration {
                 .ignore_init_module_imports
                 .or(config.ignore_init_module_imports),
             line_length: self.line_length.or(config.line_length),
+            tab_size: self.tab_size.or(config.tab_size),
             namespace_packages: self.namespace_packages.or(config.namespace_packages),
             per_file_ignores: self.per_file_ignores.or(config.per_file_ignores),
             required_version: self.required_version.or(config.required_version),
@@ -272,36 +297,55 @@ impl Configuration {
             target_version: self.target_version.or(config.target_version),
             task_tags: self.task_tags.or(config.task_tags),
             typing_modules: self.typing_modules.or(config.typing_modules),
-            update_check: self.update_check.or(config.update_check),
             // Plugins
-            flake8_annotations: self.flake8_annotations.or(config.flake8_annotations),
-            flake8_bandit: self.flake8_bandit.or(config.flake8_bandit),
-            flake8_bugbear: self.flake8_bugbear.or(config.flake8_bugbear),
-            flake8_builtins: self.flake8_builtins.or(config.flake8_builtins),
-            flake8_comprehensions: self.flake8_comprehensions.or(config.flake8_comprehensions),
-            flake8_errmsg: self.flake8_errmsg.or(config.flake8_errmsg),
-            flake8_gettext: self.flake8_gettext.or(config.flake8_gettext),
+            flake8_annotations: self.flake8_annotations.combine(config.flake8_annotations),
+            flake8_bandit: self.flake8_bandit.combine(config.flake8_bandit),
+            flake8_bugbear: self.flake8_bugbear.combine(config.flake8_bugbear),
+            flake8_builtins: self.flake8_builtins.combine(config.flake8_builtins),
+            flake8_comprehensions: self
+                .flake8_comprehensions
+                .combine(config.flake8_comprehensions),
+            flake8_errmsg: self.flake8_errmsg.combine(config.flake8_errmsg),
+            flake8_gettext: self.flake8_gettext.combine(config.flake8_gettext),
             flake8_implicit_str_concat: self
                 .flake8_implicit_str_concat
-                .or(config.flake8_implicit_str_concat),
+                .combine(config.flake8_implicit_str_concat),
             flake8_import_conventions: self
                 .flake8_import_conventions
-                .or(config.flake8_import_conventions),
-            flake8_pytest_style: self.flake8_pytest_style.or(config.flake8_pytest_style),
-            flake8_quotes: self.flake8_quotes.or(config.flake8_quotes),
-            flake8_self: self.flake8_self.or(config.flake8_self),
-            flake8_tidy_imports: self.flake8_tidy_imports.or(config.flake8_tidy_imports),
-            flake8_type_checking: self.flake8_type_checking.or(config.flake8_type_checking),
+                .combine(config.flake8_import_conventions),
+            flake8_pytest_style: self.flake8_pytest_style.combine(config.flake8_pytest_style),
+            flake8_quotes: self.flake8_quotes.combine(config.flake8_quotes),
+            flake8_self: self.flake8_self.combine(config.flake8_self),
+            flake8_tidy_imports: self.flake8_tidy_imports.combine(config.flake8_tidy_imports),
+            flake8_type_checking: self
+                .flake8_type_checking
+                .combine(config.flake8_type_checking),
             flake8_unused_arguments: self
                 .flake8_unused_arguments
-                .or(config.flake8_unused_arguments),
-            isort: self.isort.or(config.isort),
-            mccabe: self.mccabe.or(config.mccabe),
-            pep8_naming: self.pep8_naming.or(config.pep8_naming),
-            pycodestyle: self.pycodestyle.or(config.pycodestyle),
-            pydocstyle: self.pydocstyle.or(config.pydocstyle),
-            pylint: self.pylint.or(config.pylint),
-            pyupgrade: self.pyupgrade.or(config.pyupgrade),
+                .combine(config.flake8_unused_arguments),
+            isort: self.isort.combine(config.isort),
+            mccabe: self.mccabe.combine(config.mccabe),
+            pep8_naming: self.pep8_naming.combine(config.pep8_naming),
+            pycodestyle: self.pycodestyle.combine(config.pycodestyle),
+            pydocstyle: self.pydocstyle.combine(config.pydocstyle),
+            pyflakes: self.pyflakes.combine(config.pyflakes),
+            pylint: self.pylint.combine(config.pylint),
+        }
+    }
+}
+
+pub trait CombinePluginOptions {
+    #[must_use]
+    fn combine(self, other: Self) -> Self;
+}
+
+impl<T: CombinePluginOptions> CombinePluginOptions for Option<T> {
+    fn combine(self, other: Self) -> Self {
+        match (self, other) {
+            (Some(base), Some(other)) => Some(base.combine(other)),
+            (Some(base), None) => Some(base),
+            (None, Some(other)) => Some(other),
+            (None, None) => None,
         }
     }
 }
diff --git a/crates/ruff/src/settings/defaults.rs b/crates/ruff/src/settings/defaults.rs
index d5398ef14953d..aa5007789d58d 100644
--- a/crates/ruff/src/settings/defaults.rs
+++ b/crates/ruff/src/settings/defaults.rs
@@ -1,23 +1,25 @@
+use std::collections::HashSet;
+
 use once_cell::sync::Lazy;
 use path_absolutize::path_dedot;
 use regex::Regex;
 use rustc_hash::FxHashSet;
-use std::collections::HashSet;
 
-use super::types::{FilePattern, PythonVersion};
-use super::Settings;
 use crate::codes::{self, RuleCodePrefix};
+use crate::line_width::{LineLength, TabSize};
 use crate::registry::Linter;
 use crate::rule_selector::{prefix_to_selector, RuleSelector};
 use crate::rules::{
     flake8_annotations, flake8_bandit, flake8_bugbear, flake8_builtins, flake8_comprehensions,
     flake8_errmsg, flake8_gettext, flake8_implicit_str_concat, flake8_import_conventions,
     flake8_pytest_style, flake8_quotes, flake8_self, flake8_tidy_imports, flake8_type_checking,
-    flake8_unused_arguments, isort, mccabe, pep8_naming, pycodestyle, pydocstyle, pylint,
-    pyupgrade,
+    flake8_unused_arguments, isort, mccabe, pep8_naming, pycodestyle, pydocstyle, pyflakes, pylint,
 };
 use crate::settings::types::FilePatternSet;
 
+use super::types::{FilePattern, PythonVersion};
+use super::Settings;
+
 pub const PREFIXES: &[RuleSelector] = &[
     prefix_to_selector(RuleCodePrefix::Pycodestyle(codes::Pycodestyle::E)),
     RuleSelector::Linter(Linter::Pyflakes),
@@ -25,8 +27,6 @@ pub const PREFIXES: &[RuleSelector] = &[
 
 pub const TARGET_VERSION: PythonVersion = PythonVersion::Py310;
 
-pub const LINE_LENGTH: usize = 88;
-
 pub const TASK_TAGS: &[&str] = &["TODO", "FIXME", "XXX"];
 
 pub static DUMMY_VARIABLE_RGX: Lazy<Regex> =
@@ -38,6 +38,7 @@ pub static EXCLUDE: Lazy<Vec<FilePattern>> = Lazy::new(|| {
         FilePattern::Builtin(".direnv"),
         FilePattern::Builtin(".eggs"),
         FilePattern::Builtin(".git"),
+        FilePattern::Builtin(".git-rewrite"),
         FilePattern::Builtin(".hg"),
         FilePattern::Builtin(".mypy_cache"),
         FilePattern::Builtin(".nox"),
@@ -57,8 +58,13 @@ pub static EXCLUDE: Lazy<Vec<FilePattern>> = Lazy::new(|| {
     ]
 });
 
-pub static INCLUDE: Lazy<Vec<FilePattern>> =
-    Lazy::new(|| vec![FilePattern::Builtin("*.py"), FilePattern::Builtin("*.pyi")]);
+pub static INCLUDE: Lazy<Vec<FilePattern>> = Lazy::new(|| {
+    vec![
+        FilePattern::Builtin("*.py"),
+        FilePattern::Builtin("*.pyi"),
+        FilePattern::Builtin("**/pyproject.toml"),
+    ]
+});
 
 impl Default for Settings {
     fn default() -> Self {
@@ -74,11 +80,11 @@ impl Default for Settings {
             force_exclude: false,
             ignore_init_module_imports: false,
             include: FilePatternSet::try_from_vec(INCLUDE.clone()).unwrap(),
-            line_length: LINE_LENGTH,
+            line_length: LineLength::default(),
+            tab_size: TabSize::default(),
             namespace_packages: vec![],
             per_file_ignores: vec![],
             respect_gitignore: true,
-            show_source: false,
             src: vec![path_dedot::CWD.clone()],
             project_root: path_dedot::CWD.clone(),
             target_version: TARGET_VERSION,
@@ -96,7 +102,7 @@ impl Default for Settings {
             flake8_quotes: flake8_quotes::settings::Settings::default(),
             flake8_gettext: flake8_gettext::settings::Settings::default(),
             flake8_self: flake8_self::settings::Settings::default(),
-            flake8_tidy_imports: flake8_tidy_imports::Settings::default(),
+            flake8_tidy_imports: flake8_tidy_imports::settings::Settings::default(),
             flake8_type_checking: flake8_type_checking::settings::Settings::default(),
             flake8_unused_arguments: flake8_unused_arguments::settings::Settings::default(),
             isort: isort::settings::Settings::default(),
@@ -104,8 +110,8 @@ impl Default for Settings {
             pep8_naming: pep8_naming::settings::Settings::default(),
             pycodestyle: pycodestyle::settings::Settings::default(),
             pydocstyle: pydocstyle::settings::Settings::default(),
+            pyflakes: pyflakes::settings::Settings::default(),
             pylint: pylint::settings::Settings::default(),
-            pyupgrade: pyupgrade::settings::Settings::default(),
         }
     }
 }
diff --git a/crates/ruff/src/settings/flags.rs b/crates/ruff/src/settings/flags.rs
index c3b93edcff256..f7e761ade1933 100644
--- a/crates/ruff/src/settings/flags.rs
+++ b/crates/ruff/src/settings/flags.rs
@@ -1,5 +1,3 @@
-use ruff_macros::CacheKey;
-
 #[derive(Debug, Copy, Clone, Hash)]
 pub enum FixMode {
     Generate,
@@ -18,21 +16,6 @@ impl From<bool> for FixMode {
     }
 }
 
-#[derive(Debug, Copy, Clone, CacheKey, result_like::BoolLike)]
-pub enum Autofix {
-    Enabled,
-    Disabled,
-}
-
-impl From<FixMode> for Autofix {
-    fn from(value: FixMode) -> Self {
-        match value {
-            FixMode::Generate | FixMode::Diff | FixMode::Apply => Self::Enabled,
-            FixMode::None => Self::Disabled,
-        }
-    }
-}
-
 #[derive(Debug, Copy, Clone, Hash, result_like::BoolLike)]
 pub enum Noqa {
     Enabled,
diff --git a/crates/ruff/src/settings/mod.rs b/crates/ruff/src/settings/mod.rs
index 4f83bb43491d3..f2e2aec2db5d5 100644
--- a/crates/ruff/src/settings/mod.rs
+++ b/crates/ruff/src/settings/mod.rs
@@ -19,14 +19,14 @@ use crate::rules::{
     flake8_annotations, flake8_bandit, flake8_bugbear, flake8_builtins, flake8_comprehensions,
     flake8_errmsg, flake8_gettext, flake8_implicit_str_concat, flake8_import_conventions,
     flake8_pytest_style, flake8_quotes, flake8_self, flake8_tidy_imports, flake8_type_checking,
-    flake8_unused_arguments, isort, mccabe, pep8_naming, pycodestyle, pydocstyle, pylint,
-    pyupgrade,
+    flake8_unused_arguments, isort, mccabe, pep8_naming, pycodestyle, pydocstyle, pyflakes, pylint,
 };
 use crate::settings::configuration::Configuration;
 use crate::settings::types::{FilePatternSet, PerFileIgnore, PythonVersion, SerializationFormat};
 use crate::warn_user_once_by_id;
 
 use self::rule_table::RuleTable;
+use super::line_width::{LineLength, TabSize};
 
 pub mod configuration;
 pub mod defaults;
@@ -57,7 +57,7 @@ impl AllSettings {
                 fix_only: config.fix_only.unwrap_or(false),
                 format: config.format.unwrap_or_default(),
                 show_fixes: config.show_fixes.unwrap_or(false),
-                update_check: config.update_check.unwrap_or_default(),
+                show_source: config.show_source.unwrap_or(false),
             },
             lib: Settings::from_configuration(config, project_root)?,
         })
@@ -66,15 +66,14 @@ impl AllSettings {
 
 #[derive(Debug, Default, Clone)]
 #[allow(clippy::struct_excessive_bools)]
-/// Settings that are not used by this library and
-/// only here so that `ruff_cli` can use them.
+/// Settings that are not used by this library and only here so that `ruff_cli` can use them.
 pub struct CliSettings {
     pub cache_dir: PathBuf,
     pub fix: bool,
     pub fix_only: bool,
     pub format: SerializationFormat,
     pub show_fixes: bool,
-    pub update_check: bool,
+    pub show_source: bool,
 }
 
 #[derive(Debug, CacheKey)]
@@ -83,7 +82,6 @@ pub struct Settings {
     pub rules: RuleTable,
     pub per_file_ignores: Vec<(GlobMatcher, GlobMatcher, RuleSet)>,
 
-    pub show_source: bool,
     pub target_version: PythonVersion,
 
     // Resolver settings
@@ -101,7 +99,8 @@ pub struct Settings {
     pub dummy_variable_rgx: Regex,
     pub external: FxHashSet<String>,
     pub ignore_init_module_imports: bool,
-    pub line_length: usize,
+    pub line_length: LineLength,
+    pub tab_size: TabSize,
     pub namespace_packages: Vec<PathBuf>,
     pub src: Vec<PathBuf>,
     pub task_tags: Vec<String>,
@@ -119,7 +118,7 @@ pub struct Settings {
     pub flake8_pytest_style: flake8_pytest_style::settings::Settings,
     pub flake8_quotes: flake8_quotes::settings::Settings,
     pub flake8_self: flake8_self::settings::Settings,
-    pub flake8_tidy_imports: flake8_tidy_imports::Settings,
+    pub flake8_tidy_imports: flake8_tidy_imports::settings::Settings,
     pub flake8_type_checking: flake8_type_checking::settings::Settings,
     pub flake8_unused_arguments: flake8_unused_arguments::settings::Settings,
     pub isort: isort::settings::Settings,
@@ -127,8 +126,8 @@ pub struct Settings {
     pub pep8_naming: pep8_naming::settings::Settings,
     pub pycodestyle: pycodestyle::settings::Settings,
     pub pydocstyle: pydocstyle::settings::Settings,
+    pub pyflakes: pyflakes::settings::Settings,
     pub pylint: pylint::settings::Settings,
-    pub pyupgrade: pyupgrade::settings::Settings,
 }
 
 impl Settings {
@@ -164,13 +163,18 @@ impl Settings {
                 config.include.unwrap_or_else(|| defaults::INCLUDE.clone()),
             )?,
             ignore_init_module_imports: config.ignore_init_module_imports.unwrap_or_default(),
-            line_length: config.line_length.unwrap_or(defaults::LINE_LENGTH),
+            line_length: config.line_length.unwrap_or_default(),
+            tab_size: config.tab_size.unwrap_or_default(),
             namespace_packages: config.namespace_packages.unwrap_or_default(),
             per_file_ignores: resolve_per_file_ignores(
-                config.per_file_ignores.unwrap_or_default(),
+                config
+                    .per_file_ignores
+                    .unwrap_or_default()
+                    .into_iter()
+                    .chain(config.extend_per_file_ignores)
+                    .collect(),
             )?,
             respect_gitignore: config.respect_gitignore.unwrap_or(true),
-            show_source: config.show_source.unwrap_or_default(),
             src: config
                 .src
                 .unwrap_or_else(|| vec![project_root.to_path_buf()]),
@@ -228,8 +232,8 @@ impl Settings {
             pep8_naming: config.pep8_naming.map(Into::into).unwrap_or_default(),
             pycodestyle: config.pycodestyle.map(Into::into).unwrap_or_default(),
             pydocstyle: config.pydocstyle.map(Into::into).unwrap_or_default(),
+            pyflakes: config.pyflakes.map(Into::into).unwrap_or_default(),
             pylint: config.pylint.map(Into::into).unwrap_or_default(),
-            pyupgrade: config.pyupgrade.map(Into::into).unwrap_or_default(),
         })
     }
 
@@ -255,7 +259,10 @@ impl From<&Configuration> for RuleTable {
         // The select_set keeps track of which rules have been selected.
         let mut select_set: RuleSet = defaults::PREFIXES.iter().flatten().collect();
         // The fixable set keeps track of which rules are fixable.
-        let mut fixable_set: RuleSet = RuleSelector::All.into_iter().collect();
+        let mut fixable_set: RuleSet = RuleSelector::All
+            .into_iter()
+            .chain(RuleSelector::Nursery.into_iter())
+            .collect();
 
         // Ignores normally only subtract from the current set of selected
         // rules.  By that logic the ignore in `select = [], ignore = ["E501"]`
@@ -264,16 +271,11 @@ impl From<&Configuration> for RuleTable {
         // across config files (which otherwise wouldn't be possible since ruff
         // only has `extended` but no `extended-by`).
         let mut carryover_ignores: Option<&[RuleSelector]> = None;
+        let mut carryover_unfixables: Option<&[RuleSelector]> = None;
 
         let mut redirects = FxHashMap::default();
 
         for selection in &config.rule_selections {
-            // We do not have an extend-fixable option, so fixable and unfixable
-            // selectors can simply be applied directly to fixable_set.
-            if selection.fixable.is_some() {
-                fixable_set.clear();
-            }
-
             // If a selection only specifies extend-select we cannot directly
             // apply its rule selectors to the select_set because we firstly have
             // to resolve the effectively selected rules within the current rule selection
@@ -282,10 +284,13 @@ impl From<&Configuration> for RuleTable {
             // We do this via the following HashMap where the bool indicates
             // whether to enable or disable the given rule.
             let mut select_map_updates: FxHashMap<Rule, bool> = FxHashMap::default();
+            let mut fixable_map_updates: FxHashMap<Rule, bool> = FxHashMap::default();
 
             let carriedover_ignores = carryover_ignores.take();
+            let carriedover_unfixables = carryover_unfixables.take();
 
             for spec in Specificity::iter() {
+                // Iterate over rule selectors in order of specificity.
                 for selector in selection
                     .select
                     .iter()
@@ -307,17 +312,26 @@ impl From<&Configuration> for RuleTable {
                         select_map_updates.insert(rule, false);
                     }
                 }
-                if let Some(fixable) = &selection.fixable {
-                    fixable_set
-                        .extend(fixable.iter().filter(|s| s.specificity() == spec).flatten());
+                // Apply the same logic to `fixable` and `unfixable`.
+                for selector in selection
+                    .fixable
+                    .iter()
+                    .flatten()
+                    .chain(selection.extend_fixable.iter())
+                    .filter(|s| s.specificity() == spec)
+                {
+                    for rule in selector {
+                        fixable_map_updates.insert(rule, true);
+                    }
                 }
                 for selector in selection
                     .unfixable
                     .iter()
+                    .chain(carriedover_unfixables.into_iter().flatten())
                     .filter(|s| s.specificity() == spec)
                 {
                     for rule in selector {
-                        fixable_set.remove(rule);
+                        fixable_map_updates.insert(rule, false);
                     }
                 }
             }
@@ -347,6 +361,29 @@ impl From<&Configuration> for RuleTable {
                 }
             }
 
+            // Apply the same logic to `fixable` and `unfixable`.
+            if let Some(fixable) = &selection.fixable {
+                fixable_set = fixable_map_updates
+                    .into_iter()
+                    .filter_map(|(rule, enabled)| enabled.then_some(rule))
+                    .collect();
+
+                if fixable.is_empty()
+                    && selection.extend_fixable.is_empty()
+                    && !selection.unfixable.is_empty()
+                {
+                    carryover_unfixables = Some(&selection.unfixable);
+                }
+            } else {
+                for (rule, enabled) in fixable_map_updates {
+                    if enabled {
+                        fixable_set.insert(rule);
+                    } else {
+                        fixable_set.remove(rule);
+                    }
+                }
+            }
+
             // We insert redirects into the hashmap so that we
             // can warn the users about remapped rule codes.
             for selector in selection
@@ -357,6 +394,7 @@ impl From<&Configuration> for RuleTable {
                 .chain(selection.ignore.iter())
                 .chain(selection.extend_select.iter())
                 .chain(selection.unfixable.iter())
+                .chain(selection.extend_fixable.iter())
             {
                 if let RuleSelector::Prefix {
                     prefix,
@@ -431,7 +469,7 @@ pub fn resolve_per_file_ignores(
 
 #[cfg(test)]
 mod tests {
-    use crate::codes::{self, Pycodestyle};
+    use crate::codes::Pycodestyle;
     use crate::registry::{Rule, RuleSet};
     use crate::settings::configuration::Configuration;
     use crate::settings::rule_table::RuleTable;
@@ -451,7 +489,7 @@ mod tests {
     #[test]
     fn rule_codes() {
         let actual = resolve_rules([RuleSelection {
-            select: Some(vec![codes::Pycodestyle::W.into()]),
+            select: Some(vec![Pycodestyle::W.into()]),
             ..RuleSelection::default()
         }]);
 
diff --git a/crates/ruff/src/settings/options.rs b/crates/ruff/src/settings/options.rs
index 44511cc7c75f2..0a7462cc8f5f9 100644
--- a/crates/ruff/src/settings/options.rs
+++ b/crates/ruff/src/settings/options.rs
@@ -1,24 +1,23 @@
 //! Options that the user can provide via pyproject.toml.
 
-use ruff_macros::ConfigurationOptions;
 use rustc_hash::FxHashMap;
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
+use ruff_macros::ConfigurationOptions;
+
+use crate::line_width::{LineLength, TabSize};
 use crate::rule_selector::RuleSelector;
 use crate::rules::{
     flake8_annotations, flake8_bandit, flake8_bugbear, flake8_builtins, flake8_comprehensions,
     flake8_errmsg, flake8_gettext, flake8_implicit_str_concat, flake8_import_conventions,
     flake8_pytest_style, flake8_quotes, flake8_self, flake8_tidy_imports, flake8_type_checking,
-    flake8_unused_arguments, isort, mccabe, pep8_naming, pycodestyle, pydocstyle, pylint,
-    pyupgrade,
+    flake8_unused_arguments, isort, mccabe, pep8_naming, pycodestyle, pydocstyle, pyflakes, pylint,
 };
 use crate::settings::types::{PythonVersion, SerializationFormat, Version};
 
-#[derive(
-    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
-)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions)]
 #[serde(deny_unknown_fields, rename_all = "kebab-case")]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Options {
     #[option(
         default = r#"[]"#,
@@ -71,7 +70,7 @@ pub struct Options {
     /// default expression matches `_`, `__`, and `_var`, but not `_var_`.
     pub dummy_variable_rgx: Option<String>,
     #[option(
-        default = r#"[".bzr", ".direnv", ".eggs", ".git", ".hg", ".mypy_cache", ".nox", ".pants.d", ".pytype", ".ruff_cache", ".svn", ".tox", ".venv", "__pypackages__", "_build", "buck-out", "build", "dist", "node_modules", "venv"]"#,
+        default = r#"[".bzr", ".direnv", ".eggs", ".git", ".git-rewrite", ".hg", ".mypy_cache", ".nox", ".pants.d", ".pytype", ".ruff_cache", ".svn", ".tox", ".venv", "__pypackages__", "_build", "buck-out", "build", "dist", "node_modules", "venv"]"#,
         value_type = "list[str]",
         example = r#"
             exclude = [".venv"]
@@ -164,7 +163,7 @@ pub struct Options {
     ///
     /// This option has been **deprecated** in favor of `ignore`
     /// since its usage is now interchangeable with `ignore`.
-    #[schemars(skip)]
+    #[cfg_attr(feature = "schemars", schemars(skip))]
     pub extend_ignore: Option<Vec<RuleSelector>>,
     #[option(
         default = "[]",
@@ -177,6 +176,24 @@ pub struct Options {
     /// A list of rule codes or prefixes to enable, in addition to those
     /// specified by `select`.
     pub extend_select: Option<Vec<RuleSelector>>,
+    #[option(
+        default = r#"[]"#,
+        value_type = "list[RuleSelector]",
+        example = r#"
+            # Enable autofix for flake8-bugbear (`B`), on top of any rules specified by `fixable`.
+            extend-fixable = ["B"]
+        "#
+    )]
+    /// A list of rule codes or prefixes to consider autofixable, in addition to those
+    /// specified by `fixable`.
+    pub extend_fixable: Option<Vec<RuleSelector>>,
+    /// A list of rule codes or prefixes to consider non-auto-fixable, in addition to those
+    /// specified by `unfixable`.
+    ///
+    /// This option has been **deprecated** in favor of `unfixable` since its usage is now
+    /// interchangeable with `unfixable`.
+    #[cfg_attr(feature = "schemars", schemars(skip))]
+    pub extend_unfixable: Option<Vec<RuleSelector>>,
     #[option(
         default = "[]",
         value_type = "list[str]",
@@ -199,7 +216,7 @@ pub struct Options {
     /// Like `fix`, but disables reporting on leftover violation. Implies `fix`.
     pub fix_only: Option<bool>,
     #[option(
-        default = r#"["A", "ANN", "ARG", "B", "BLE", "C", "COM", "D", "DTZ", "E", "EM", "ERA", "EXE", "F", "FBT", "G", "I", "ICN", "INP", "ISC", "N", "PD", "PGH", "PIE", "PL", "PT", "PTH", "Q", "RET", "RUF", "S", "SIM", "T", "TCH", "TID", "TRY", "UP", "W", "YTT"]"#,
+        default = r#"["ALL"]"#,
         value_type = "list[RuleSelector]",
         example = r#"
             # Only allow autofix behavior for `E` and `F` rules.
@@ -237,7 +254,7 @@ pub struct Options {
     /// respect these exclusions unequivocally.
     ///
     /// This is useful for [`pre-commit`](https://pre-commit.com/), which explicitly passes all
-    /// changed files to the [`ruff-pre-commit`](https://github.com/charliermarsh/ruff-pre-commit)
+    /// changed files to the [`ruff-pre-commit`](https://github.com/astral-sh/ruff-pre-commit)
     /// plugin, regardless of whether they're marked as excluded by Ruff's own
     /// settings.
     pub force_exclude: Option<bool>,
@@ -287,13 +304,22 @@ pub struct Options {
         default = "88",
         value_type = "int",
         example = r#"
-            # Allow lines to be as long as 120 characters.
-            line-length = 120
+        # Allow lines to be as long as 120 characters.
+        line-length = 120
         "#
     )]
     /// The line length to use when enforcing long-lines violations (like
     /// `E501`).
-    pub line_length: Option<usize>,
+    pub line_length: Option<LineLength>,
+    #[option(
+        default = "4",
+        value_type = "int",
+        example = r#"
+            tab_size = 8
+        "#
+    )]
+    /// The tabulation size to calculate line length.
+    pub tab_size: Option<TabSize>,
     #[option(
         default = "None",
         value_type = "str",
@@ -381,11 +407,15 @@ pub struct Options {
     /// (e.g., `src = ["src"]`), such that when resolving imports,
     /// `my_package.foo` is considered a first-party import.
     ///
+    /// When omitted, the `src` directory will typically default to the
+    /// directory containing the nearest `pyproject.toml`, `ruff.toml`, or
+    /// `.ruff.toml` file (the "project root"), unless a configuration file
+    /// is explicitly provided (e.g., via the `--config` command-line flag).
+    ///
     /// This field supports globs. For example, if you have a series of Python
     /// packages in a `python_modules` directory, `src = ["python_modules/*"]`
-    /// would expand to incorporate all of the
-    /// packages in that directory. User home directory and environment
-    /// variables will also be expanded.
+    /// would expand to incorporate all of the packages in that directory. User
+    /// home directory and environment variables will also be expanded.
     pub src: Option<Vec<String>>,
     #[option(
         default = r#"[]"#,
@@ -406,12 +436,13 @@ pub struct Options {
             target-version = "py37"
         "#
     )]
-    /// The Python version to target, e.g., when considering automatic code
-    /// upgrades, like rewriting type annotations.
+    /// The minimum Python version to target, e.g., when considering automatic
+    /// code upgrades, like rewriting type annotations.
     ///
-    /// If omitted, the target version will be inferred from the
-    /// `project.requires-python` field in the relevant `pyproject.toml`
-    /// (e.g., `requires-python = ">=3.8"`), if present.
+    /// If omitted, and Ruff is configured via a `pyproject.toml` file, the
+    /// target version will be inferred from its `project.requires-python`
+    /// field (e.g., `requires-python = ">=3.8"`). If Ruff is configured via
+    /// `ruff.toml` or `.ruff.toml`, no such inference will be performed.
     pub target_version: Option<PythonVersion>,
     #[option(
         default = r#"["TODO", "FIXME", "XXX"]"#,
@@ -448,14 +479,6 @@ pub struct Options {
     )]
     /// A list of rule codes or prefixes to consider non-autofix-able.
     pub unfixable: Option<Vec<RuleSelector>>,
-    #[option(
-        default = "false",
-        value_type = "bool",
-        example = "update-check = true"
-    )]
-    /// Enable or disable automatic update checks (overridden by the
-    /// `--update-check` and `--no-update-check` command-line flags).
-    pub update_check: Option<bool>,
     #[option_group]
     /// Options for the `flake8-annotations` plugin.
     pub flake8_annotations: Option<flake8_annotations::settings::Options>,
@@ -517,11 +540,11 @@ pub struct Options {
     /// Options for the `pydocstyle` plugin.
     pub pydocstyle: Option<pydocstyle::settings::Options>,
     #[option_group]
+    /// Options for the `pyflakes` plugin.
+    pub pyflakes: Option<pyflakes::settings::Options>,
+    #[option_group]
     /// Options for the `pylint` plugin.
     pub pylint: Option<pylint::settings::Options>,
-    #[option_group]
-    /// Options for the `pyupgrade` plugin.
-    pub pyupgrade: Option<pyupgrade::settings::Options>,
     // Tables are required to go last.
     #[option(
         default = "{}",
@@ -536,4 +559,16 @@ pub struct Options {
     /// A list of mappings from file pattern to rule codes or prefixes to
     /// exclude, when considering any matching files.
     pub per_file_ignores: Option<FxHashMap<String, Vec<RuleSelector>>>,
+    #[option(
+        default = "{}",
+        value_type = "dict[str, list[RuleSelector]]",
+        example = r#"
+            # Also ignore `E401` in all `__init__.py` files.
+            [tool.ruff.extend-per-file-ignores]
+            "__init__.py" = ["E402"]
+        "#
+    )]
+    /// A list of mappings from file pattern to rule codes or prefixes to
+    /// exclude, in addition to any rules excluded by `per-file-ignores`.
+    pub extend_per_file_ignores: Option<FxHashMap<String, Vec<RuleSelector>>>,
 }
diff --git a/crates/ruff/src/settings/pyproject.rs b/crates/ruff/src/settings/pyproject.rs
index 929d5bb541235..6577dedd5cc3f 100644
--- a/crates/ruff/src/settings/pyproject.rs
+++ b/crates/ruff/src/settings/pyproject.rs
@@ -151,9 +151,9 @@ mod tests {
     use rustc_hash::FxHashMap;
 
     use crate::codes::{self, RuleCodePrefix};
+    use crate::line_width::LineLength;
     use crate::rules::flake8_quotes::settings::Quote;
-    use crate::rules::flake8_tidy_imports::banned_api::ApiBan;
-    use crate::rules::flake8_tidy_imports::relative_imports::Strictness;
+    use crate::rules::flake8_tidy_imports::settings::{ApiBan, Strictness};
     use crate::rules::{
         flake8_bugbear, flake8_builtins, flake8_errmsg, flake8_import_conventions,
         flake8_pytest_style, flake8_quotes, flake8_tidy_imports, mccabe, pep8_naming,
@@ -200,7 +200,7 @@ line-length = 79
             pyproject.tool,
             Some(Tools {
                 ruff: Some(Options {
-                    line_length: Some(79),
+                    line_length: Some(LineLength::from(79)),
                     ..Options::default()
                 })
             })
@@ -301,7 +301,7 @@ other-attribute = 1
             config,
             Options {
                 allowed_confusables: Some(vec!['−', 'ρ', '∗']),
-                line_length: Some(88),
+                line_length: Some(LineLength::from(88)),
                 extend_exclude: Some(vec![
                     "excluded_file.py".to_string(),
                     "migrations".to_string(),
diff --git a/crates/ruff/src/settings/types.rs b/crates/ruff/src/settings/types.rs
index a7e7975458bc5..49689d8948b16 100644
--- a/crates/ruff/src/settings/types.rs
+++ b/crates/ruff/src/settings/types.rs
@@ -7,7 +7,6 @@ use std::string::ToString;
 use anyhow::{bail, Result};
 use globset::{Glob, GlobSet, GlobSetBuilder};
 use pep440_rs::{Version as Pep440Version, VersionSpecifiers};
-use schemars::JsonSchema;
 use serde::{de, Deserialize, Deserializer, Serialize};
 use strum::IntoEnumIterator;
 use strum_macros::EnumIter;
@@ -20,21 +19,11 @@ use crate::registry::RuleSet;
 use crate::rule_selector::RuleSelector;
 
 #[derive(
-    Clone,
-    Copy,
-    Debug,
-    PartialOrd,
-    Ord,
-    PartialEq,
-    Eq,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    CacheKey,
-    EnumIter,
+    Clone, Copy, Debug, PartialOrd, Ord, PartialEq, Eq, Serialize, Deserialize, CacheKey, EnumIter,
 )]
 #[cfg_attr(feature = "clap", derive(clap::ValueEnum))]
 #[serde(rename_all = "lowercase")]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum PythonVersion {
     Py37,
     Py38,
@@ -218,9 +207,10 @@ impl FromStr for PatternPrefixPair {
     }
 }
 
-#[derive(Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Debug, JsonSchema, Hash)]
+#[derive(Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Debug, Hash)]
 #[cfg_attr(feature = "clap", derive(clap::ValueEnum))]
 #[serde(rename_all = "kebab-case")]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum SerializationFormat {
     Text,
     Json,
@@ -238,8 +228,9 @@ impl Default for SerializationFormat {
     }
 }
 
-#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, JsonSchema, Hash)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Hash)]
 #[serde(try_from = "String")]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Version(String);
 
 impl TryFrom<String> for Version {
diff --git a/crates/ruff/src/test.rs b/crates/ruff/src/test.rs
index 5fef8804b41ca..60a4eb9739fef 100644
--- a/crates/ruff/src/test.rs
+++ b/crates/ruff/src/test.rs
@@ -1,14 +1,16 @@
-#![cfg(test)]
+#![cfg(any(test, fuzzing))]
+//! Helper functions for the tests of rule implementations.
 
-/// Helper functions for the tests of rule implementations.
 use std::path::Path;
 
+#[cfg(not(fuzzing))]
 use anyhow::Result;
 use itertools::Itertools;
-use ruff_diagnostics::Diagnostic;
+use ruff_textwrap::dedent;
 use rustc_hash::FxHashMap;
 use rustpython_parser::lexer::LexResult;
 
+use ruff_diagnostics::{AutofixKind, Diagnostic};
 use ruff_python_ast::source_code::{Indexer, Locator, SourceFileBuilder, Stylist};
 
 use crate::autofix::fix_file;
@@ -16,22 +18,47 @@ use crate::directives;
 use crate::linter::{check_path, LinterResult};
 use crate::message::{Emitter, EmitterContext, Message, TextEmitter};
 use crate::packaging::detect_package_root;
+use crate::registry::AsRule;
 use crate::rules::pycodestyle::rules::syntax_error;
 use crate::settings::{flags, Settings};
 
-pub fn test_resource_path(path: impl AsRef<Path>) -> std::path::PathBuf {
+#[cfg(not(fuzzing))]
+pub(crate) fn test_resource_path(path: impl AsRef<Path>) -> std::path::PathBuf {
     Path::new("./resources/test/").join(path)
 }
 
-/// A convenient wrapper around [`check_path`], that additionally
-/// asserts that autofixes converge after 10 iterations.
-pub fn test_path(path: impl AsRef<Path>, settings: &Settings) -> Result<Vec<Message>> {
-    static MAX_ITERATIONS: usize = 10;
-
+/// Run [`check_path`] on a file in the `resources/test/fixtures` directory.
+#[cfg(not(fuzzing))]
+pub(crate) fn test_path(path: impl AsRef<Path>, settings: &Settings) -> Result<Vec<Message>> {
     let path = test_resource_path("fixtures").join(path);
     let contents = std::fs::read_to_string(&path)?;
-    let tokens: Vec<LexResult> = ruff_rustpython::tokenize(&contents);
-    let locator = Locator::new(&contents);
+    Ok(test_contents(&contents, &path, settings))
+}
+
+/// Run [`check_path`] on a snippet of Python code.
+pub fn test_snippet(contents: &str, settings: &Settings) -> Vec<Message> {
+    let path = Path::new("<filename>");
+    let contents = dedent(contents);
+    test_contents(&contents, path, settings)
+}
+
+thread_local! {
+    static MAX_ITERATIONS: std::cell::Cell<usize> = std::cell::Cell::new(20);
+}
+
+pub fn set_max_iterations(max: usize) {
+    MAX_ITERATIONS.with(|iterations| iterations.set(max));
+}
+
+pub(crate) fn max_iterations() -> usize {
+    MAX_ITERATIONS.with(std::cell::Cell::get)
+}
+
+/// A convenient wrapper around [`check_path`], that additionally
+/// asserts that autofixes converge after a fixed number of iterations.
+fn test_contents(contents: &str, path: &Path, settings: &Settings) -> Vec<Message> {
+    let tokens: Vec<LexResult> = ruff_rustpython::tokenize(contents);
+    let locator = Locator::new(contents);
     let stylist = Stylist::from_tokens(&tokens, &locator);
     let indexer = Indexer::from_tokens(&tokens, &locator);
     let directives = directives::extract_directives(
@@ -44,7 +71,7 @@ pub fn test_path(path: impl AsRef<Path>, settings: &Settings) -> Result<Vec<Mess
         data: (diagnostics, _imports),
         error,
     } = check_path(
-        &path,
+        path,
         path.parent()
             .and_then(|parent| detect_package_root(parent, &settings.namespace_packages)),
         tokens,
@@ -54,7 +81,6 @@ pub fn test_path(path: impl AsRef<Path>, settings: &Settings) -> Result<Vec<Mess
         &directives,
         settings,
         flags::Noqa::Enabled,
-        flags::Autofix::Enabled,
     );
 
     let source_has_errors = error.is_some();
@@ -64,21 +90,23 @@ pub fn test_path(path: impl AsRef<Path>, settings: &Settings) -> Result<Vec<Mess
 
     if diagnostics
         .iter()
-        .any(|diagnostic| !diagnostic.fix.is_empty())
+        .any(|diagnostic| diagnostic.fix.is_some())
     {
         let mut diagnostics = diagnostics.clone();
-        let mut contents = contents.clone();
+        let mut contents = contents.to_string();
 
         while let Some((fixed_contents, _)) = fix_file(&diagnostics, &Locator::new(&contents)) {
-            if iterations < MAX_ITERATIONS {
+            if iterations < max_iterations() {
                 iterations += 1;
             } else {
-                let output = print_diagnostics(diagnostics, &path, &contents);
+                let output = print_diagnostics(diagnostics, path, &contents);
 
                 panic!(
-                        "Failed to converge after {MAX_ITERATIONS} iterations. This likely \
-                         indicates a bug in the implementation of the fix. Last diagnostics:\n{output}"
-                    );
+                    "Failed to converge after {} iterations. This likely \
+                     indicates a bug in the implementation of the fix. Last diagnostics:\n{}",
+                    max_iterations(),
+                    output
+                );
             }
 
             let tokens: Vec<LexResult> = ruff_rustpython::tokenize(&fixed_contents);
@@ -96,7 +124,7 @@ pub fn test_path(path: impl AsRef<Path>, settings: &Settings) -> Result<Vec<Mess
                 data: (fixed_diagnostics, _),
                 error: fixed_error,
             } = check_path(
-                &path,
+                path,
                 None,
                 tokens,
                 &locator,
@@ -105,18 +133,17 @@ pub fn test_path(path: impl AsRef<Path>, settings: &Settings) -> Result<Vec<Mess
                 &directives,
                 settings,
                 flags::Noqa::Enabled,
-                flags::Autofix::Enabled,
             );
 
             if let Some(fixed_error) = fixed_error {
                 if !source_has_errors {
                     // Previous fix introduced a syntax error, abort
-                    let fixes = print_diagnostics(diagnostics, &path, &contents);
+                    let fixes = print_diagnostics(diagnostics, path, &contents);
 
                     let mut syntax_diagnostics = Vec::new();
                     syntax_error(&mut syntax_diagnostics, &fixed_error, &locator);
                     let syntax_errors =
-                        print_diagnostics(syntax_diagnostics, &path, &fixed_contents);
+                        print_diagnostics(syntax_diagnostics, path, &fixed_contents);
 
                     panic!(
                         r#"Fixed source has a syntax error where the source document does not. This is a bug in one of the generated fixes:
@@ -140,16 +167,34 @@ Source with applied fixes:
     )
     .finish();
 
-    Ok(diagnostics
+    diagnostics
         .into_iter()
         .map(|diagnostic| {
+            let rule = diagnostic.kind.rule();
+            let fixable = diagnostic.fix.is_some();
+
+            match (fixable, rule.autofixable()) {
+                (true, AutofixKind::Sometimes | AutofixKind::Always)
+                | (false, AutofixKind::None | AutofixKind::Sometimes) => {
+                    // Ok
+                }
+                (true, AutofixKind::None) => {
+                    panic!("Rule {rule:?} is marked as non-fixable but it created a fix. Change the `Violation::AUTOFIX` to either `AutofixKind::Sometimes` or `AutofixKind::Always`");
+                },
+                (false, AutofixKind::Always) => {
+                    panic!("Rule {rule:?} is marked to always-fixable but the diagnostic has no fix. Either ensure you always emit a fix or change `Violation::AUTOFIX` to either `AutofixKind::Sometimes` or `AutofixKind::None")
+                }
+            }
+
+            assert!(!(fixable && diagnostic.kind.suggestion.is_none()), "Diagnostic emitted by {rule:?} is fixable but `Violation::autofix_title` returns `None`.`");
+
             // Not strictly necessary but adds some coverage for this code path
             let noqa = directives.noqa_line_for.resolve(diagnostic.start());
 
             Message::from_diagnostic(diagnostic, source_code.clone(), noqa)
         })
         .sorted()
-        .collect())
+        .collect()
 }
 
 fn print_diagnostics(diagnostics: Vec<Diagnostic>, file_path: &Path, source: &str) -> String {
@@ -176,7 +221,7 @@ pub(crate) fn print_messages(messages: &[Message]) -> String {
 
     TextEmitter::default()
         .with_show_fix_status(true)
-        .with_show_fix(true)
+        .with_show_fix_diff(true)
         .with_show_source(true)
         .emit(
             &mut output,
diff --git a/crates/ruff_benchmark/Cargo.toml b/crates/ruff_benchmark/Cargo.toml
index 2585eeb7f6f5c..f3d63336e08c1 100644
--- a/crates/ruff_benchmark/Cargo.toml
+++ b/crates/ruff_benchmark/Cargo.toml
@@ -20,6 +20,10 @@ harness = false
 name = "parser"
 harness = false
 
+[[bench]]
+name = "formatter"
+harness = false
+
 [dependencies]
 once_cell.workspace = true
 serde.workspace = true
@@ -30,7 +34,8 @@ ureq = "2.6.2"
 [dev-dependencies]
 ruff.path = "../ruff"
 ruff_python_ast.path = "../ruff_python_ast"
-criterion = { version = "0.4.0"}
+ruff_python_formatter = { path = "../ruff_python_formatter" }
+criterion = { version = "0.5.1"}
 rustpython-parser.workspace = true
 
 [target.'cfg(target_os = "windows")'.dev-dependencies]
@@ -39,5 +44,3 @@ mimalloc = "0.1.34"
 [target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64")))'.dev-dependencies]
 tikv-jemallocator = "0.5.0"
 
-[features]
-logical_lines = [ "ruff/logical_lines" ]
diff --git a/crates/ruff_benchmark/README.md b/crates/ruff_benchmark/README.md
index 3e85474385f03..3151b03b955ed 100644
--- a/crates/ruff_benchmark/README.md
+++ b/crates/ruff_benchmark/README.md
@@ -12,8 +12,9 @@ cargo benchmark
 
 ## Benchmark driven Development
 
-You can use `--save-baseline=<name>` to store an initial baseline benchmark (e.g. on `main`) and then use
-`--benchmark=<name>` to compare against that benchmark. Criterion will print a message telling you if the benchmark improved/regressed compared to that baseline.
+You can use `--save-baseline=<name>` to store an initial baseline benchmark (e.g. on `main`) and
+then use `--benchmark=<name>` to compare against that benchmark. Criterion will print a message
+telling you if the benchmark improved/regressed compared to that baseline.
 
 ```shell
 # Run once on your "baseline" code
@@ -46,7 +47,8 @@ cargo install critcmp
 
 ## Tips
 
-- Use `cargo benchmark <filter>` to only run specific benchmarks. For example: `cargo benchmark linter/pydantic` to only run the pydantic tests.
+- Use `cargo benchmark <filter>` to only run specific benchmarks. For example: `cargo benchmark linter/pydantic`
+  to only run the pydantic tests.
 - Use `cargo benchmark --quiet` for a more cleaned up output (without statistical relevance)
 - Use `cargo benchmark --quick` to get faster results (more prone to noise)
 
@@ -84,5 +86,6 @@ Then run the profiler with
 cargo instruments -t time --bench linter --profile release-debug -p ruff_benchmark -- --profile-time=1
 ```
 
-- `-t`: Specifies what to profile. Useful options are `time` to profile the wall time and `alloc` for profiling the allocations.
+- `-t`: Specifies what to profile. Useful options are `time` to profile the wall time and `alloc`
+  for profiling the allocations.
 - You may want to pass an additional filter to run a single test file
diff --git a/crates/ruff_benchmark/benches/formatter.rs b/crates/ruff_benchmark/benches/formatter.rs
new file mode 100644
index 0000000000000..15698dbba0ee6
--- /dev/null
+++ b/crates/ruff_benchmark/benches/formatter.rs
@@ -0,0 +1,62 @@
+use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
+use ruff_benchmark::{TestCase, TestCaseSpeed, TestFile, TestFileDownloadError};
+use ruff_python_formatter::format_module;
+use std::time::Duration;
+
+#[cfg(target_os = "windows")]
+#[global_allocator]
+static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
+
+#[cfg(all(
+    not(target_os = "windows"),
+    not(target_os = "openbsd"),
+    any(
+        target_arch = "x86_64",
+        target_arch = "aarch64",
+        target_arch = "powerpc64"
+    )
+))]
+#[global_allocator]
+static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
+
+fn create_test_cases() -> Result<Vec<TestCase>, TestFileDownloadError> {
+    Ok(vec![
+        TestCase::fast(TestFile::try_download("numpy/globals.py", "https://raw.githubusercontent.com/numpy/numpy/89d64415e349ca75a25250f22b874aa16e5c0973/numpy/_globals.py")?),
+        TestCase::normal(TestFile::try_download(
+            "pydantic/types.py",
+            "https://raw.githubusercontent.com/pydantic/pydantic/83b3c49e99ceb4599d9286a3d793cea44ac36d4b/pydantic/types.py",
+        )?),
+        TestCase::normal(TestFile::try_download("numpy/ctypeslib.py", "https://raw.githubusercontent.com/numpy/numpy/e42c9503a14d66adfd41356ef5640c6975c45218/numpy/ctypeslib.py")?),
+        TestCase::slow(TestFile::try_download(
+            "large/dataset.py",
+            "https://raw.githubusercontent.com/DHI/mikeio/b7d26418f4db2909b0aa965253dbe83194d7bb5b/tests/test_dataset.py",
+        )?),
+    ])
+}
+
+fn benchmark_formatter(criterion: &mut Criterion) {
+    let mut group = criterion.benchmark_group("formatter");
+    let test_cases = create_test_cases().unwrap();
+
+    for case in test_cases {
+        group.throughput(Throughput::Bytes(case.code().len() as u64));
+        group.measurement_time(match case.speed() {
+            TestCaseSpeed::Fast => Duration::from_secs(5),
+            TestCaseSpeed::Normal => Duration::from_secs(10),
+            TestCaseSpeed::Slow => Duration::from_secs(20),
+        });
+
+        group.bench_with_input(
+            BenchmarkId::from_parameter(case.name()),
+            &case,
+            |b, case| {
+                b.iter(|| format_module(case.code()).expect("Formatting to succeed"));
+            },
+        );
+    }
+
+    group.finish();
+}
+
+criterion_group!(formatter, benchmark_formatter);
+criterion_main!(formatter);
diff --git a/crates/ruff_benchmark/benches/linter.rs b/crates/ruff_benchmark/benches/linter.rs
index fef37fcce16a8..98ea5c1bd3327 100644
--- a/crates/ruff_benchmark/benches/linter.rs
+++ b/crates/ruff_benchmark/benches/linter.rs
@@ -1,12 +1,14 @@
+use std::time::Duration;
+
 use criterion::measurement::WallTime;
 use criterion::{
     criterion_group, criterion_main, BenchmarkGroup, BenchmarkId, Criterion, Throughput,
 };
+
 use ruff::linter::lint_only;
 use ruff::settings::{flags, Settings};
 use ruff::RuleSelector;
 use ruff_benchmark::{TestCase, TestCaseSpeed, TestFile, TestFileDownloadError};
-use std::time::Duration;
 
 #[cfg(target_os = "windows")]
 #[global_allocator]
@@ -61,7 +63,6 @@ fn benchmark_linter(mut group: BenchmarkGroup<WallTime>, settings: &Settings) {
                         None,
                         settings,
                         flags::Noqa::Enabled,
-                        flags::Autofix::Enabled,
                     );
 
                     // Assert that file contains no parse errors
diff --git a/crates/ruff_benchmark/benches/parser.rs b/crates/ruff_benchmark/benches/parser.rs
index e339e91966ddc..e08836e685f5d 100644
--- a/crates/ruff_benchmark/benches/parser.rs
+++ b/crates/ruff_benchmark/benches/parser.rs
@@ -1,9 +1,11 @@
+use std::time::Duration;
+
 use criterion::measurement::WallTime;
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
 use ruff_benchmark::{TestCase, TestCaseSpeed, TestFile, TestFileDownloadError};
-use ruff_python_ast::visitor::{walk_stmt, Visitor};
-use rustpython_parser::ast::Stmt;
-use std::time::Duration;
+use ruff_python_ast::statement_visitor::{walk_stmt, StatementVisitor};
+use rustpython_parser::ast::{Stmt, Suite};
+use rustpython_parser::Parse;
 
 #[cfg(target_os = "windows")]
 #[global_allocator]
@@ -40,7 +42,7 @@ struct CountVisitor {
     count: usize,
 }
 
-impl<'a> Visitor<'a> for CountVisitor {
+impl<'a> StatementVisitor<'a> for CountVisitor {
     fn visit_stmt(&mut self, stmt: &'a Stmt) {
         walk_stmt(self, stmt);
         self.count += 1;
@@ -64,8 +66,7 @@ fn benchmark_parser(criterion: &mut Criterion<WallTime>) {
             &case,
             |b, case| {
                 b.iter(|| {
-                    let parsed =
-                        rustpython_parser::parse_program(case.code(), case.name()).unwrap();
+                    let parsed = Suite::parse(case.code(), case.name()).unwrap();
 
                     let mut visitor = CountVisitor { count: 0 };
                     visitor.visit_body(&parsed);
diff --git a/crates/ruff_benchmark/src/lib.rs b/crates/ruff_benchmark/src/lib.rs
index 6ea1fcabe160c..70d2e7a34f34d 100644
--- a/crates/ruff_benchmark/src/lib.rs
+++ b/crates/ruff_benchmark/src/lib.rs
@@ -1,6 +1,7 @@
 use std::fmt::{Display, Formatter};
 use std::path::PathBuf;
 use std::process::Command;
+
 use url::Url;
 
 /// Relative size of a test case. Benchmarks can use it to configure the time for how long a benchmark should run to get stable results.
diff --git a/crates/ruff_cache/src/cache_key.rs b/crates/ruff_cache/src/cache_key.rs
index 6b24ba82c4834..c05bf48ead8ce 100644
--- a/crates/ruff_cache/src/cache_key.rs
+++ b/crates/ruff_cache/src/cache_key.rs
@@ -1,5 +1,3 @@
-use itertools::Itertools;
-use regex::Regex;
 use std::borrow::Cow;
 use std::collections::hash_map::DefaultHasher;
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
@@ -7,6 +5,9 @@ use std::hash::{Hash, Hasher};
 use std::ops::{Deref, DerefMut};
 use std::path::{Path, PathBuf};
 
+use itertools::Itertools;
+use regex::Regex;
+
 #[derive(Clone, Debug, Default)]
 pub struct CacheKeyHasher {
     inner: DefaultHasher,
@@ -90,7 +91,7 @@ impl DerefMut for CacheKeyHasher {
 /// * Cache keys must be deterministic where hash keys do not have this constraint. That's why pointers don't implement [`CacheKey`] but they implement [`Hash`].
 /// * Ideally, cache keys are portable
 ///
-/// [`Hash`](std::hash::Hash)
+/// [`Hash`](Hash)
 pub trait CacheKey {
     fn cache_key(&self, state: &mut CacheKeyHasher);
 
diff --git a/crates/ruff_cache/src/filetime.rs b/crates/ruff_cache/src/filetime.rs
index 17e8eb551e742..29c2d074a54a5 100644
--- a/crates/ruff_cache/src/filetime.rs
+++ b/crates/ruff_cache/src/filetime.rs
@@ -1,7 +1,9 @@
-use crate::{CacheKey, CacheKeyHasher};
-use filetime::FileTime;
 use std::hash::Hash;
 
+use filetime::FileTime;
+
+use crate::{CacheKey, CacheKeyHasher};
+
 impl CacheKey for FileTime {
     fn cache_key(&self, state: &mut CacheKeyHasher) {
         self.hash(&mut **state);
diff --git a/crates/ruff_cache/src/globset.rs b/crates/ruff_cache/src/globset.rs
index fbaf79ca05709..8011b7e0558d1 100644
--- a/crates/ruff_cache/src/globset.rs
+++ b/crates/ruff_cache/src/globset.rs
@@ -1,6 +1,7 @@
-use crate::{CacheKey, CacheKeyHasher};
 use globset::{Glob, GlobMatcher};
 
+use crate::{CacheKey, CacheKeyHasher};
+
 impl CacheKey for GlobMatcher {
     fn cache_key(&self, state: &mut CacheKeyHasher) {
         self.glob().cache_key(state);
diff --git a/crates/ruff_cache/src/lib.rs b/crates/ruff_cache/src/lib.rs
index ddde67db1f66b..3d17f883365dc 100644
--- a/crates/ruff_cache/src/lib.rs
+++ b/crates/ruff_cache/src/lib.rs
@@ -1,10 +1,10 @@
-mod cache_key;
-pub mod filetime;
-pub mod globset;
+use std::path::{Path, PathBuf};
 
 pub use cache_key::{CacheKey, CacheKeyHasher};
 
-use std::path::{Path, PathBuf};
+mod cache_key;
+pub mod filetime;
+pub mod globset;
 
 pub const CACHE_DIR_NAME: &str = ".ruff_cache";
 
diff --git a/crates/ruff_cache/tests/cache_key.rs b/crates/ruff_cache/tests/cache_key.rs
index 0041afd253947..43e8f092032fc 100644
--- a/crates/ruff_cache/tests/cache_key.rs
+++ b/crates/ruff_cache/tests/cache_key.rs
@@ -1,8 +1,9 @@
-use ruff_cache::{CacheKey, CacheKeyHasher};
-use ruff_macros::CacheKey;
 use std::collections::hash_map::DefaultHasher;
 use std::hash::{Hash, Hasher};
 
+use ruff_cache::{CacheKey, CacheKeyHasher};
+use ruff_macros::CacheKey;
+
 #[derive(CacheKey, Hash)]
 struct UnitStruct;
 
diff --git a/crates/ruff_cli/Cargo.toml b/crates/ruff_cli/Cargo.toml
index 509d9eddd1ea6..110495bfc94aa 100644
--- a/crates/ruff_cli/Cargo.toml
+++ b/crates/ruff_cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_cli"
-version = "0.0.265"
+version = "0.0.272"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 edition = { workspace = true }
 rust-version = { workspace = true }
@@ -26,7 +26,9 @@ ruff = { path = "../ruff", features = ["clap"] }
 ruff_cache = { path = "../ruff_cache" }
 ruff_diagnostics = { path = "../ruff_diagnostics" }
 ruff_python_ast = { path = "../ruff_python_ast" }
+ruff_python_formatter = { path = "../ruff_python_formatter" }
 ruff_text_size = { workspace = true }
+ruff_textwrap = { path = "../ruff_textwrap" }
 
 annotate-snippets = { version = "0.9.1", features = ["color"] }
 anyhow = { workspace = true }
@@ -56,7 +58,6 @@ serde_json = { workspace = true }
 shellexpand = { workspace = true }
 similar = { workspace = true }
 strum = { workspace = true, features = [] }
-textwrap = { workspace = true }
 walkdir = { version = "2.3.2" }
 wild = { version = "2" }
 
@@ -67,9 +68,6 @@ ureq = { version = "2.6.2", features = [] }
 [features]
 jupyter_notebook = ["ruff/jupyter_notebook"]
 
-[package.metadata.maturin]
-name = "ruff"
-
 [target.'cfg(target_os = "windows")'.dependencies]
 mimalloc = "0.1.34"
 
diff --git a/crates/ruff_cli/src/args.rs b/crates/ruff_cli/src/args.rs
index 6236f4a2e49c9..09662c827281a 100644
--- a/crates/ruff_cli/src/args.rs
+++ b/crates/ruff_cli/src/args.rs
@@ -3,6 +3,9 @@ use std::str::FromStr;
 
 use clap::{command, Parser};
 use regex::Regex;
+use rustc_hash::FxHashMap;
+
+use ruff::line_width::LineLength;
 use ruff::logging::LogLevel;
 use ruff::registry::Rule;
 use ruff::resolver::ConfigProcessor;
@@ -11,7 +14,6 @@ use ruff::settings::types::{
     FilePattern, PatternPrefixPair, PerFileIgnore, PythonVersion, SerializationFormat,
 };
 use ruff::RuleSelector;
-use rustc_hash::FxHashMap;
 
 #[derive(Debug, Parser)]
 #[command(
@@ -57,6 +59,13 @@ pub enum Command {
     /// Generate shell completion.
     #[clap(alias = "--generate-shell-completion", hide = true)]
     GenerateShellCompletion { shell: clap_complete_command::Shell },
+    /// Format the given files, or stdin when using `-`.
+    #[doc(hidden)]
+    #[clap(hide = true)]
+    Format {
+        /// List of files or directories to format or `-` for stdin
+        files: Vec<PathBuf>,
+    },
 }
 
 #[derive(Debug, clap::Args)]
@@ -126,8 +135,8 @@ pub struct CheckArgs {
         hide_possible_values = true
     )]
     pub ignore: Option<Vec<RuleSelector>>,
-    /// Like --select, but adds additional rule codes on top of the selected
-    /// ones.
+    /// Like --select, but adds additional rule codes on top of those already
+    /// specified.
     #[arg(
         long,
         value_delimiter = ',',
@@ -147,9 +156,13 @@ pub struct CheckArgs {
         hide = true
     )]
     pub extend_ignore: Option<Vec<RuleSelector>>,
-    /// List of mappings from file pattern to code to exclude
+    /// List of mappings from file pattern to code to exclude.
     #[arg(long, value_delimiter = ',', help_heading = "Rule selection")]
     pub per_file_ignores: Option<Vec<PatternPrefixPair>>,
+    /// Like `--per-file-ignores`, but adds additional ignores on top of
+    /// those already specified.
+    #[arg(long, value_delimiter = ',', help_heading = "Rule selection")]
+    pub extend_per_file_ignores: Option<Vec<PatternPrefixPair>>,
     /// List of paths, used to omit files and/or directories from analysis.
     #[arg(
         long,
@@ -189,6 +202,27 @@ pub struct CheckArgs {
         hide_possible_values = true
     )]
     pub unfixable: Option<Vec<RuleSelector>>,
+    /// Like --fixable, but adds additional rule codes on top of those already
+    /// specified.
+    #[arg(
+        long,
+        value_delimiter = ',',
+        value_name = "RULE_CODE",
+        value_parser = parse_rule_selector,
+        help_heading = "Rule selection",
+        hide_possible_values = true
+    )]
+    pub extend_fixable: Option<Vec<RuleSelector>>,
+    /// Like --unfixable. (Deprecated: You can just use --unfixable instead.)
+    #[arg(
+        long,
+        value_delimiter = ',',
+        value_name = "RULE_CODE",
+        value_parser = parse_rule_selector,
+        help_heading = "Rule selection",
+        hide = true
+    )]
+    pub extend_unfixable: Option<Vec<RuleSelector>>,
     /// Respect file exclusions via `.gitignore` and other standard ignore
     /// files.
     #[arg(
@@ -240,16 +274,6 @@ pub struct CheckArgs {
     /// autofix, even if no lint violations remain.
     #[arg(long, help_heading = "Miscellaneous", conflicts_with = "exit_zero")]
     pub exit_non_zero_on_fix: bool,
-    /// Does nothing and will be removed in the future.
-    #[arg(
-        long,
-        overrides_with("no_update_check"),
-        help_heading = "Miscellaneous",
-        hide = true
-    )]
-    update_check: bool,
-    #[clap(long, overrides_with("update_check"), hide = true)]
-    no_update_check: bool,
     /// Show counts for every rule with at least one violation.
     #[arg(
         long,
@@ -301,6 +325,9 @@ pub struct CheckArgs {
         conflicts_with = "watch",
     )]
     pub show_settings: bool,
+    /// Dev-only argument to show fixes
+    #[arg(long, hide = true)]
+    pub ecosystem_ci: bool,
 }
 
 #[derive(Debug, Clone, Copy, clap::ValueEnum)]
@@ -365,8 +392,9 @@ impl CheckArgs {
                 add_noqa: self.add_noqa,
                 config: self.config,
                 diff: self.diff,
-                exit_zero: self.exit_zero,
+                ecosystem_ci: self.ecosystem_ci,
                 exit_non_zero_on_fix: self.exit_non_zero_on_fix,
+                exit_zero: self.exit_zero,
                 files: self.files,
                 ignore_noqa: self.ignore_noqa,
                 isolated: self.isolated,
@@ -381,8 +409,10 @@ impl CheckArgs {
                 dummy_variable_rgx: self.dummy_variable_rgx,
                 exclude: self.exclude,
                 extend_exclude: self.extend_exclude,
+                extend_fixable: self.extend_fixable,
                 extend_ignore: self.extend_ignore,
                 extend_select: self.extend_select,
+                extend_unfixable: self.extend_unfixable,
                 fixable: self.fixable,
                 ignore: self.ignore,
                 line_length: self.line_length,
@@ -402,7 +432,6 @@ impl CheckArgs {
                 force_exclude: resolve_bool_arg(self.force_exclude, self.no_force_exclude),
                 format: self.format,
                 show_fixes: resolve_bool_arg(self.show_fixes, self.no_show_fixes),
-                update_check: resolve_bool_arg(self.update_check, self.no_update_check),
             },
         )
     }
@@ -429,8 +458,9 @@ pub struct Arguments {
     pub add_noqa: bool,
     pub config: Option<PathBuf>,
     pub diff: bool,
-    pub exit_zero: bool,
+    pub ecosystem_ci: bool,
     pub exit_non_zero_on_fix: bool,
+    pub exit_zero: bool,
     pub files: Vec<PathBuf>,
     pub ignore_noqa: bool,
     pub isolated: bool,
@@ -449,8 +479,10 @@ pub struct Overrides {
     pub dummy_variable_rgx: Option<Regex>,
     pub exclude: Option<Vec<FilePattern>>,
     pub extend_exclude: Option<Vec<FilePattern>>,
+    pub extend_fixable: Option<Vec<RuleSelector>>,
     pub extend_ignore: Option<Vec<RuleSelector>>,
     pub extend_select: Option<Vec<RuleSelector>>,
+    pub extend_unfixable: Option<Vec<RuleSelector>>,
     pub fixable: Option<Vec<RuleSelector>>,
     pub ignore: Option<Vec<RuleSelector>>,
     pub line_length: Option<usize>,
@@ -467,7 +499,6 @@ pub struct Overrides {
     pub force_exclude: Option<bool>,
     pub format: Option<SerializationFormat>,
     pub show_fixes: Option<bool>,
-    pub update_check: Option<bool>,
 }
 
 impl ConfigProcessor for &Overrides {
@@ -501,7 +532,14 @@ impl ConfigProcessor for &Overrides {
                 .collect(),
             extend_select: self.extend_select.clone().unwrap_or_default(),
             fixable: self.fixable.clone(),
-            unfixable: self.unfixable.clone().unwrap_or_default(),
+            unfixable: self
+                .unfixable
+                .iter()
+                .cloned()
+                .chain(self.extend_unfixable.iter().cloned())
+                .flatten()
+                .collect(),
+            extend_fixable: self.extend_fixable.clone().unwrap_or_default(),
         });
         if let Some(format) = &self.format {
             config.format = Some(*format);
@@ -510,7 +548,7 @@ impl ConfigProcessor for &Overrides {
             config.force_exclude = Some(*force_exclude);
         }
         if let Some(line_length) = &self.line_length {
-            config.line_length = Some(*line_length);
+            config.line_length = Some(LineLength::from(*line_length));
         }
         if let Some(per_file_ignores) = &self.per_file_ignores {
             config.per_file_ignores = Some(collect_per_file_ignores(per_file_ignores.clone()));
@@ -527,9 +565,6 @@ impl ConfigProcessor for &Overrides {
         if let Some(target_version) = &self.target_version {
             config.target_version = Some(*target_version);
         }
-        if let Some(update_check) = &self.update_check {
-            config.update_check = Some(*update_check);
-        }
     }
 }
 
diff --git a/crates/ruff_cli/src/cache.rs b/crates/ruff_cli/src/cache.rs
index 2d7bd0dd368e2..0147d9ccb563c 100644
--- a/crates/ruff_cli/src/cache.rs
+++ b/crates/ruff_cli/src/cache.rs
@@ -2,23 +2,24 @@ use std::cell::RefCell;
 use std::fs;
 use std::hash::Hasher;
 use std::io::Write;
+#[cfg(unix)]
+use std::os::unix::fs::PermissionsExt;
 use std::path::Path;
 
 use anyhow::Result;
 use filetime::FileTime;
 use log::error;
 use path_absolutize::Absolutize;
+use ruff_text_size::{TextRange, TextSize};
+use serde::ser::{SerializeSeq, SerializeStruct};
+use serde::{Deserialize, Serialize, Serializer};
+
 use ruff::message::Message;
-use ruff::settings::{flags, AllSettings, Settings};
+use ruff::settings::{AllSettings, Settings};
 use ruff_cache::{CacheKey, CacheKeyHasher};
 use ruff_diagnostics::{DiagnosticKind, Fix};
 use ruff_python_ast::imports::ImportMap;
 use ruff_python_ast::source_code::SourceFileBuilder;
-use ruff_text_size::{TextRange, TextSize};
-use serde::ser::{SerializeSeq, SerializeStruct};
-use serde::{Deserialize, Serialize, Serializer};
-#[cfg(unix)]
-use std::os::unix::fs::PermissionsExt;
 
 const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
 
@@ -124,7 +125,7 @@ impl Serialize for SerializeMessage<'_> {
 struct MessageHeader {
     kind: DiagnosticKind,
     range: TextRange,
-    fix: Fix,
+    fix: Option<Fix>,
     file_id: usize,
     noqa_row: TextSize,
 }
@@ -145,7 +146,6 @@ fn cache_key(
     package: Option<&Path>,
     metadata: &fs::Metadata,
     settings: &Settings,
-    autofix: flags::Autofix,
 ) -> u64 {
     let mut hasher = CacheKeyHasher::new();
     CARGO_PKG_VERSION.cache_key(&mut hasher);
@@ -158,13 +158,12 @@ fn cache_key(
     #[cfg(unix)]
     metadata.permissions().mode().cache_key(&mut hasher);
     settings.cache_key(&mut hasher);
-    autofix.cache_key(&mut hasher);
     hasher.finish()
 }
 
 #[allow(dead_code)]
 /// Initialize the cache at the specified `Path`.
-pub fn init(path: &Path) -> Result<()> {
+pub(crate) fn init(path: &Path) -> Result<()> {
     // Create the cache directories.
     fs::create_dir_all(path.join(content_dir()))?;
 
@@ -199,16 +198,15 @@ fn del_sync(cache_dir: &Path, key: u64) -> Result<(), std::io::Error> {
 }
 
 /// Get a value from the cache.
-pub fn get(
+pub(crate) fn get(
     path: &Path,
     package: Option<&Path>,
     metadata: &fs::Metadata,
     settings: &AllSettings,
-    autofix: flags::Autofix,
 ) -> Option<(Vec<Message>, ImportMap)> {
     let encoded = read_sync(
         &settings.cli.cache_dir,
-        cache_key(path, package, metadata, &settings.lib, autofix),
+        cache_key(path, package, metadata, &settings.lib),
     )
     .ok()?;
     match bincode::deserialize::<CheckResult>(&encoded[..]) {
@@ -249,19 +247,18 @@ pub fn get(
 }
 
 /// Set a value in the cache.
-pub fn set(
+pub(crate) fn set(
     path: &Path,
     package: Option<&Path>,
     metadata: &fs::Metadata,
     settings: &AllSettings,
-    autofix: flags::Autofix,
     messages: &[Message],
     imports: &ImportMap,
 ) {
     let check_result = CheckResultRef { imports, messages };
     if let Err(e) = write_sync(
         &settings.cli.cache_dir,
-        cache_key(path, package, metadata, &settings.lib, autofix),
+        cache_key(path, package, metadata, &settings.lib),
         &bincode::serialize(&check_result).unwrap(),
     ) {
         error!("Failed to write to cache: {e:?}");
@@ -269,15 +266,14 @@ pub fn set(
 }
 
 /// Delete a value from the cache.
-pub fn del(
+pub(crate) fn del(
     path: &Path,
     package: Option<&Path>,
     metadata: &fs::Metadata,
     settings: &AllSettings,
-    autofix: flags::Autofix,
 ) {
     drop(del_sync(
         &settings.cli.cache_dir,
-        cache_key(path, package, metadata, &settings.lib, autofix),
+        cache_key(path, package, metadata, &settings.lib),
     ));
 }
diff --git a/crates/ruff_cli/src/commands/add_noqa.rs b/crates/ruff_cli/src/commands/add_noqa.rs
index b73d676d6b7de..54d6417524c3b 100644
--- a/crates/ruff_cli/src/commands/add_noqa.rs
+++ b/crates/ruff_cli/src/commands/add_noqa.rs
@@ -13,7 +13,7 @@ use ruff::{packaging, resolver, warn_user_once};
 use crate::args::Overrides;
 
 /// Add `noqa` directives to a collection of files.
-pub fn add_noqa(
+pub(crate) fn add_noqa(
     files: &[PathBuf],
     pyproject_config: &PyprojectConfig,
     overrides: &Overrides,
diff --git a/crates/ruff_cli/src/commands/clean.rs b/crates/ruff_cli/src/commands/clean.rs
index 0a00290920910..d89f643a53f51 100644
--- a/crates/ruff_cli/src/commands/clean.rs
+++ b/crates/ruff_cli/src/commands/clean.rs
@@ -11,7 +11,7 @@ use ruff::logging::LogLevel;
 use ruff_cache::CACHE_DIR_NAME;
 
 /// Clear any caches in the current directory or any subdirectories.
-pub fn clean(level: LogLevel) -> Result<()> {
+pub(crate) fn clean(level: LogLevel) -> Result<()> {
     let mut stderr = BufWriter::new(io::stderr().lock());
     for entry in WalkDir::new(&*path_dedot::CWD)
         .into_iter()
diff --git a/crates/ruff_cli/src/commands/config.rs b/crates/ruff_cli/src/commands/config.rs
index a2db72a85fe44..22c414a3619fc 100644
--- a/crates/ruff_cli/src/commands/config.rs
+++ b/crates/ruff_cli/src/commands/config.rs
@@ -1,6 +1,7 @@
-use crate::ExitStatus;
 use ruff::settings::options::Options;
 
+use crate::ExitStatus;
+
 #[allow(clippy::print_stdout)]
 pub(crate) fn config(key: Option<&str>) -> ExitStatus {
     match key {
diff --git a/crates/ruff_cli/src/commands/linter.rs b/crates/ruff_cli/src/commands/linter.rs
index 643ddba813abf..ccbeb5ba453a3 100644
--- a/crates/ruff_cli/src/commands/linter.rs
+++ b/crates/ruff_cli/src/commands/linter.rs
@@ -25,7 +25,7 @@ struct LinterCategoryInfo {
     name: &'static str,
 }
 
-pub fn linter(format: HelpFormat) -> Result<()> {
+pub(crate) fn linter(format: HelpFormat) -> Result<()> {
     let mut stdout = BufWriter::new(io::stdout().lock());
     let mut output = String::new();
 
diff --git a/crates/ruff_cli/src/commands/mod.rs b/crates/ruff_cli/src/commands/mod.rs
index cbe30fd5c53b8..e989f433e03c5 100644
--- a/crates/ruff_cli/src/commands/mod.rs
+++ b/crates/ruff_cli/src/commands/mod.rs
@@ -1,9 +1,9 @@
-pub mod add_noqa;
-pub mod clean;
-pub mod config;
-pub mod linter;
-pub mod rule;
-pub mod run;
-pub mod run_stdin;
-pub mod show_files;
-pub mod show_settings;
+pub(crate) mod add_noqa;
+pub(crate) mod clean;
+pub(crate) mod config;
+pub(crate) mod linter;
+pub(crate) mod rule;
+pub(crate) mod run;
+pub(crate) mod run_stdin;
+pub(crate) mod show_files;
+pub(crate) mod show_settings;
diff --git a/crates/ruff_cli/src/commands/rule.rs b/crates/ruff_cli/src/commands/rule.rs
index a9717b57ae79f..ddb8e4ff21485 100644
--- a/crates/ruff_cli/src/commands/rule.rs
+++ b/crates/ruff_cli/src/commands/rule.rs
@@ -10,13 +10,17 @@ use crate::args::HelpFormat;
 
 #[derive(Serialize)]
 struct Explanation<'a> {
+    name: &'a str,
     code: &'a str,
     linter: &'a str,
     summary: &'a str,
+    message_formats: &'a [&'a str],
+    autofix: &'a str,
+    explanation: Option<&'a str>,
 }
 
 /// Explain a `Rule` to the user.
-pub fn rule(rule: Rule, format: HelpFormat) -> Result<()> {
+pub(crate) fn rule(rule: Rule, format: HelpFormat) -> Result<()> {
     let (linter, _) = Linter::parse_code(&rule.noqa_code().to_string()).unwrap();
     let mut stdout = BufWriter::new(io::stdout().lock());
     let mut output = String::new();
@@ -39,6 +43,17 @@ pub fn rule(rule: Rule, format: HelpFormat) -> Result<()> {
                 output.push('\n');
             }
 
+            if rule.is_nursery() {
+                output.push_str(&format!(
+                    r#"This rule is part of the **nursery**, a collection of newer lints that are
+still under development. As such, it must be enabled by explicitly selecting
+{}."#,
+                    rule.noqa_code()
+                ));
+                output.push('\n');
+                output.push('\n');
+            }
+
             if let Some(explanation) = rule.explanation() {
                 output.push_str(explanation.trim());
             } else {
@@ -51,9 +66,13 @@ pub fn rule(rule: Rule, format: HelpFormat) -> Result<()> {
         }
         HelpFormat::Json => {
             output.push_str(&serde_json::to_string_pretty(&Explanation {
+                name: rule.as_ref(),
                 code: &rule.noqa_code().to_string(),
                 linter: linter.name(),
                 summary: rule.message_formats()[0],
+                message_formats: rule.message_formats(),
+                autofix: &rule.autofixable().to_string(),
+                explanation: rule.explanation(),
             })?);
         }
     };
diff --git a/crates/ruff_cli/src/commands/run.rs b/crates/ruff_cli/src/commands/run.rs
index 6eea564bc19a1..d33a55ed2fe3d 100644
--- a/crates/ruff_cli/src/commands/run.rs
+++ b/crates/ruff_cli/src/commands/run.rs
@@ -25,7 +25,7 @@ use crate::diagnostics::Diagnostics;
 use crate::panic::catch_unwind;
 
 /// Run the linter over a collection of files.
-pub fn run(
+pub(crate) fn run(
     files: &[PathBuf],
     pyproject_config: &PyprojectConfig,
     overrides: &Overrides,
@@ -143,7 +143,8 @@ pub fn run(
             acc
         });
 
-    diagnostics.messages.sort_unstable();
+    diagnostics.messages.sort();
+
     let duration = start.elapsed();
     debug!("Checked {:?} files in: {:?}", paths.len(), duration);
 
diff --git a/crates/ruff_cli/src/commands/run_stdin.rs b/crates/ruff_cli/src/commands/run_stdin.rs
index b5d06d7da3fa2..f0ac60f32ac10 100644
--- a/crates/ruff_cli/src/commands/run_stdin.rs
+++ b/crates/ruff_cli/src/commands/run_stdin.rs
@@ -11,14 +11,14 @@ use crate::args::Overrides;
 use crate::diagnostics::{lint_stdin, Diagnostics};
 
 /// Read a `String` from `stdin`.
-fn read_from_stdin() -> Result<String> {
+pub(crate) fn read_from_stdin() -> Result<String> {
     let mut buffer = String::new();
     io::stdin().lock().read_to_string(&mut buffer)?;
     Ok(buffer)
 }
 
 /// Run the linter over a single file, read from `stdin`.
-pub fn run_stdin(
+pub(crate) fn run_stdin(
     filename: Option<&Path>,
     pyproject_config: &PyprojectConfig,
     overrides: &Overrides,
diff --git a/crates/ruff_cli/src/commands/show_files.rs b/crates/ruff_cli/src/commands/show_files.rs
index 4efdae3ca99f0..802501b578cab 100644
--- a/crates/ruff_cli/src/commands/show_files.rs
+++ b/crates/ruff_cli/src/commands/show_files.rs
@@ -10,7 +10,7 @@ use ruff::{resolver, warn_user_once};
 use crate::args::Overrides;
 
 /// Show the list of files to be checked based on current settings.
-pub fn show_files(
+pub(crate) fn show_files(
     files: &[PathBuf],
     pyproject_config: &PyprojectConfig,
     overrides: &Overrides,
diff --git a/crates/ruff_cli/src/commands/show_settings.rs b/crates/ruff_cli/src/commands/show_settings.rs
index f0e152c3833a4..48a88b811d6d9 100644
--- a/crates/ruff_cli/src/commands/show_settings.rs
+++ b/crates/ruff_cli/src/commands/show_settings.rs
@@ -10,7 +10,7 @@ use ruff::resolver::PyprojectConfig;
 use crate::args::Overrides;
 
 /// Print the user-facing configuration settings.
-pub fn show_settings(
+pub(crate) fn show_settings(
     files: &[PathBuf],
     pyproject_config: &PyprojectConfig,
     overrides: &Overrides,
diff --git a/crates/ruff_cli/src/diagnostics.rs b/crates/ruff_cli/src/diagnostics.rs
index 2a7f2a26e95e1..1cf5268c88b18 100644
--- a/crates/ruff_cli/src/diagnostics.rs
+++ b/crates/ruff_cli/src/diagnostics.rs
@@ -18,24 +18,26 @@ use ruff::jupyter::{is_jupyter_notebook, JupyterIndex, JupyterNotebook};
 use ruff::linter::{lint_fix, lint_only, FixTable, FixerResult, LinterResult};
 use ruff::logging::DisplayParseError;
 use ruff::message::Message;
+use ruff::pyproject_toml::lint_pyproject_toml;
 use ruff::settings::{flags, AllSettings, Settings};
 use ruff_python_ast::imports::ImportMap;
 use ruff_python_ast::source_code::{LineIndex, SourceCode, SourceFileBuilder};
+use ruff_python_stdlib::path::is_project_toml;
 
 use crate::cache;
 
 #[derive(Debug, Default, PartialEq)]
-pub struct Diagnostics {
-    pub messages: Vec<Message>,
-    pub fixed: FxHashMap<String, FixTable>,
-    pub imports: ImportMap,
+pub(crate) struct Diagnostics {
+    pub(crate) messages: Vec<Message>,
+    pub(crate) fixed: FxHashMap<String, FixTable>,
+    pub(crate) imports: ImportMap,
     /// Jupyter notebook indexing table for each input file that is a jupyter notebook
     /// so we can rewrite the diagnostics in the end
-    pub jupyter_index: FxHashMap<String, JupyterIndex>,
+    pub(crate) jupyter_index: FxHashMap<String, JupyterIndex>,
 }
 
 impl Diagnostics {
-    pub fn new(messages: Vec<Message>, imports: ImportMap) -> Self {
+    pub(crate) fn new(messages: Vec<Message>, imports: ImportMap) -> Self {
         Self {
             messages,
             fixed: FxHashMap::default(),
@@ -100,7 +102,7 @@ fn load_jupyter_notebook(path: &Path) -> Result<(String, JupyterIndex), Box<Diag
 }
 
 /// Lint the source code at the given `Path`.
-pub fn lint_path(
+pub(crate) fn lint_path(
     path: &Path,
     package: Option<&Path>,
     settings: &AllSettings,
@@ -119,9 +121,7 @@ pub fn lint_path(
         && matches!(autofix, flags::FixMode::None | flags::FixMode::Generate)
     {
         let metadata = path.metadata()?;
-        if let Some((messages, imports)) =
-            cache::get(path, package, &metadata, settings, autofix.into())
-        {
+        if let Some((messages, imports)) = cache::get(path, package, &metadata, settings) {
             debug!("Cache hit for: {}", path.display());
             return Ok(Diagnostics::new(messages, imports));
         }
@@ -132,6 +132,17 @@ pub fn lint_path(
 
     debug!("Checking: {}", path.display());
 
+    // We have to special case this here since the python tokenizer doesn't work with toml
+    if is_project_toml(path) {
+        let contents = std::fs::read_to_string(path)?;
+        let source_file = SourceFileBuilder::new(path.to_string_lossy(), contents).finish();
+        let messages = lint_pyproject_toml(source_file)?;
+        return Ok(Diagnostics {
+            messages,
+            ..Diagnostics::default()
+        });
+    }
+
     // Read the file from disk
     let (contents, jupyter_index) = if is_jupyter_notebook(path) {
         match load_jupyter_notebook(path) {
@@ -172,26 +183,12 @@ pub fn lint_path(
             (result, fixed)
         } else {
             // If we fail to autofix, lint the original source code.
-            let result = lint_only(
-                &contents,
-                path,
-                package,
-                &settings.lib,
-                noqa,
-                autofix.into(),
-            );
+            let result = lint_only(&contents, path, package, &settings.lib, noqa);
             let fixed = FxHashMap::default();
             (result, fixed)
         }
     } else {
-        let result = lint_only(
-            &contents,
-            path,
-            package,
-            &settings.lib,
-            noqa,
-            autofix.into(),
-        );
+        let result = lint_only(&contents, path, package, &settings.lib, noqa);
         let fixed = FxHashMap::default();
         (result, fixed)
     };
@@ -209,20 +206,12 @@ pub fn lint_path(
 
         // Purge the cache.
         if let Some(metadata) = metadata {
-            cache::del(path, package, &metadata, settings, autofix.into());
+            cache::del(path, package, &metadata, settings);
         }
     } else {
         // Re-populate the cache.
         if let Some(metadata) = metadata {
-            cache::set(
-                path,
-                package,
-                &metadata,
-                settings,
-                autofix.into(),
-                &messages,
-                &imports,
-            );
+            cache::set(path, package, &metadata, settings, &messages, &imports);
         }
     }
 
@@ -250,7 +239,7 @@ pub fn lint_path(
 
 /// Generate `Diagnostic`s from source code content derived from
 /// stdin.
-pub fn lint_stdin(
+pub(crate) fn lint_stdin(
     path: Option<&Path>,
     package: Option<&Path>,
     contents: &str,
@@ -305,7 +294,6 @@ pub fn lint_stdin(
                 package,
                 settings,
                 noqa,
-                autofix.into(),
             );
             let fixed = FxHashMap::default();
 
@@ -323,7 +311,6 @@ pub fn lint_stdin(
             package,
             settings,
             noqa,
-            autofix.into(),
         );
         let fixed = FxHashMap::default();
         (result, fixed)
diff --git a/crates/ruff_cli/src/lib.rs b/crates/ruff_cli/src/lib.rs
index dc7a1ae7a2ed1..8f0f2d34c8fad 100644
--- a/crates/ruff_cli/src/lib.rs
+++ b/crates/ruff_cli/src/lib.rs
@@ -1,18 +1,21 @@
-use std::io::{self, BufWriter};
-use std::path::PathBuf;
+use std::io::{self, stdout, BufWriter, Write};
+use std::path::{Path, PathBuf};
 use std::process::ExitCode;
 use std::sync::mpsc::channel;
 
-use anyhow::Result;
+use anyhow::{Context, Result};
 use clap::CommandFactory;
+use log::warn;
 use notify::{recommended_watcher, RecursiveMode, Watcher};
 
 use ruff::logging::{set_up_logging, LogLevel};
 use ruff::settings::types::SerializationFormat;
 use ruff::settings::{flags, CliSettings};
 use ruff::{fs, warn_user_once};
+use ruff_python_formatter::format_module;
 
 use crate::args::{Args, CheckArgs, Command};
+use crate::commands::run_stdin::read_from_stdin;
 use crate::printer::{Flags as PrinterFlags, Printer};
 
 pub mod args;
@@ -43,6 +46,36 @@ impl From<ExitStatus> for ExitCode {
     }
 }
 
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
+enum ChangeKind {
+    Configuration,
+    SourceFile,
+}
+
+/// Return the [`ChangeKind`] based on the list of modified file paths.
+///
+/// Returns `None` if no relevant changes were detected.
+fn change_detected(paths: &[PathBuf]) -> Option<ChangeKind> {
+    // If any `.toml` files were modified, return `ChangeKind::Configuration`. Otherwise, return
+    // `ChangeKind::SourceFile` if any `.py`, `.pyi`, or `.pyw` files were modified.
+    let mut source_file = false;
+    for path in paths {
+        if let Some(suffix) = path.extension() {
+            match suffix.to_str() {
+                Some("toml") => {
+                    return Some(ChangeKind::Configuration);
+                }
+                Some("py" | "pyi" | "pyw") => source_file = true,
+                _ => {}
+            }
+        }
+    }
+    if source_file {
+        return Some(ChangeKind::SourceFile);
+    }
+    None
+}
+
 pub fn run(
     Args {
         command,
@@ -75,7 +108,7 @@ quoting the executed command, along with the relevant file contents and `pyproje
     #[cfg(windows)]
     assert!(colored::control::set_virtual_terminal(true).is_ok());
 
-    let log_level: LogLevel = (&log_level_args).into();
+    let log_level = LogLevel::from(&log_level_args);
     set_up_logging(&log_level)?;
 
     match command {
@@ -87,11 +120,45 @@ quoting the executed command, along with the relevant file contents and `pyproje
             shell.generate(&mut Args::command(), &mut io::stdout());
         }
         Command::Check(args) => return check(args, log_level),
+        Command::Format { files } => return format(&files),
     }
 
     Ok(ExitStatus::Success)
 }
 
+fn format(files: &[PathBuf]) -> Result<ExitStatus> {
+    warn_user_once!(
+        "`ruff format` is a work-in-progress, subject to change at any time, and intended for \
+        internal use only."
+    );
+
+    let format_code = |code: &str| {
+        // dummy, to check that the function was actually called
+        let contents = code.replace("# DEL", "");
+        // real formatting that is currently a passthrough
+        format_module(&contents)
+    };
+
+    match &files {
+        // Check if we should read from stdin
+        [path] if path == Path::new("-") => {
+            let unformatted = read_from_stdin()?;
+            let formatted = format_code(&unformatted)?;
+            stdout().lock().write_all(formatted.as_code().as_bytes())?;
+        }
+        _ => {
+            for file in files {
+                let unformatted = std::fs::read_to_string(file)
+                    .with_context(|| format!("Could not read {}: ", file.display()))?;
+                let formatted = format_code(&unformatted)?;
+                std::fs::write(file, formatted.as_code().as_bytes())
+                    .with_context(|| format!("Could not write to {}, exiting", file.display()))?;
+            }
+        }
+    }
+    Ok(ExitStatus::Success)
+}
+
 fn check(args: CheckArgs, log_level: LogLevel) -> Result<ExitStatus> {
     let (cli, overrides) = args.partition();
 
@@ -120,7 +187,7 @@ fn check(args: CheckArgs, log_level: LogLevel) -> Result<ExitStatus> {
         fix_only,
         format,
         show_fixes,
-        update_check,
+        show_source,
         ..
     } = pyproject_config.settings.cli;
 
@@ -150,12 +217,18 @@ fn check(args: CheckArgs, log_level: LogLevel) -> Result<ExitStatus> {
         printer_flags |= PrinterFlags::SHOW_VIOLATIONS;
     }
     if show_fixes {
-        printer_flags |= PrinterFlags::SHOW_FIXES;
+        printer_flags |= PrinterFlags::SHOW_FIX_SUMMARY;
     }
-
-    if pyproject_config.settings.lib.show_source {
+    if show_source {
         printer_flags |= PrinterFlags::SHOW_SOURCE;
     }
+    if cli.ecosystem_ci {
+        warn_user_once!(
+            "The formatting of fixes emitted by this option is a work-in-progress, subject to \
+            change at any time, and intended only for internal use."
+        );
+        printer_flags |= PrinterFlags::SHOW_FIX_DIFF;
+    }
 
     #[cfg(debug_assertions)]
     if cache {
@@ -187,6 +260,16 @@ fn check(args: CheckArgs, log_level: LogLevel) -> Result<ExitStatus> {
             warn_user_once!("--format 'text' is used in watch mode.");
         }
 
+        // Configure the file watcher.
+        let (tx, rx) = channel();
+        let mut watcher = recommended_watcher(tx)?;
+        for file in &cli.files {
+            watcher.watch(file, RecursiveMode::Recursive)?;
+        }
+        if let Some(file) = pyproject_config.path.as_ref() {
+            watcher.watch(file, RecursiveMode::Recursive)?;
+        }
+
         // Perform an initial run instantly.
         Printer::clear_screen()?;
         printer.write_to_user("Starting linter in watch mode...\n");
@@ -197,40 +280,41 @@ fn check(args: CheckArgs, log_level: LogLevel) -> Result<ExitStatus> {
             &overrides,
             cache.into(),
             noqa.into(),
-            flags::FixMode::None,
+            autofix,
         )?;
         printer.write_continuously(&messages)?;
 
-        // Configure the file watcher.
-        let (tx, rx) = channel();
-        let mut watcher = recommended_watcher(tx)?;
-        for file in &cli.files {
-            watcher.watch(file, RecursiveMode::Recursive)?;
-        }
+        // In watch mode, we may need to re-resolve the configuration.
+        // TODO(charlie): Re-compute other derivative values, like the `printer`.
+        let mut pyproject_config = pyproject_config;
 
         loop {
             match rx.recv() {
                 Ok(event) => {
-                    let paths = event?.paths;
-                    let py_changed = paths.iter().any(|path| {
-                        path.extension()
-                            .map(|ext| ext == "py" || ext == "pyi")
-                            .unwrap_or_default()
-                    });
-                    if py_changed {
-                        Printer::clear_screen()?;
-                        printer.write_to_user("File change detected...\n");
-
-                        let messages = commands::run::run(
-                            &cli.files,
-                            &pyproject_config,
+                    let Some(change_kind) = change_detected(&event?.paths) else {
+                        continue;
+                    };
+
+                    if matches!(change_kind, ChangeKind::Configuration) {
+                        pyproject_config = resolve::resolve(
+                            cli.isolated,
+                            cli.config.as_deref(),
                             &overrides,
-                            cache.into(),
-                            noqa.into(),
-                            autofix,
+                            cli.stdin_filename.as_deref(),
                         )?;
-                        printer.write_continuously(&messages)?;
                     }
+                    Printer::clear_screen()?;
+                    printer.write_to_user("File change detected...\n");
+
+                    let messages = commands::run::run(
+                        &cli.files,
+                        &pyproject_config,
+                        &overrides,
+                        cache.into(),
+                        noqa.into(),
+                        autofix,
+                    )?;
+                    printer.write_continuously(&messages)?;
                 }
                 Err(err) => return Err(err.into()),
             }
@@ -270,13 +354,6 @@ fn check(args: CheckArgs, log_level: LogLevel) -> Result<ExitStatus> {
             }
         }
 
-        if update_check {
-            warn_user_once!(
-                "update-check has been removed; setting it will cause an error in a future \
-                 version."
-            );
-        }
-
         if !cli.exit_zero {
             if cli.diff {
                 // If we're printing a diff, we always want to exit non-zero if there are
@@ -311,3 +388,84 @@ fn check(args: CheckArgs, log_level: LogLevel) -> Result<ExitStatus> {
     }
     Ok(ExitStatus::Success)
 }
+
+#[cfg(test)]
+mod test_file_change_detector {
+    use std::path::PathBuf;
+
+    use crate::{change_detected, ChangeKind};
+
+    #[test]
+    fn detect_correct_file_change() {
+        assert_eq!(
+            Some(ChangeKind::Configuration),
+            change_detected(&[
+                PathBuf::from("tmp/pyproject.toml"),
+                PathBuf::from("tmp/bin/ruff.rs"),
+            ]),
+        );
+        assert_eq!(
+            Some(ChangeKind::Configuration),
+            change_detected(&[
+                PathBuf::from("pyproject.toml"),
+                PathBuf::from("tmp/bin/ruff.rs"),
+            ]),
+        );
+        assert_eq!(
+            Some(ChangeKind::Configuration),
+            change_detected(&[
+                PathBuf::from("tmp1/tmp2/tmp3/pyproject.toml"),
+                PathBuf::from("tmp/bin/ruff.rs"),
+            ]),
+        );
+        assert_eq!(
+            Some(ChangeKind::Configuration),
+            change_detected(&[
+                PathBuf::from("tmp/ruff.toml"),
+                PathBuf::from("tmp/bin/ruff.rs"),
+            ]),
+        );
+        assert_eq!(
+            Some(ChangeKind::Configuration),
+            change_detected(&[
+                PathBuf::from("tmp/.ruff.toml"),
+                PathBuf::from("tmp/bin/ruff.rs"),
+            ]),
+        );
+        assert_eq!(
+            Some(ChangeKind::SourceFile),
+            change_detected(&[
+                PathBuf::from("tmp/rule.py"),
+                PathBuf::from("tmp/bin/ruff.rs"),
+            ]),
+        );
+        assert_eq!(
+            Some(ChangeKind::SourceFile),
+            change_detected(&[
+                PathBuf::from("tmp/rule.pyi"),
+                PathBuf::from("tmp/bin/ruff.rs"),
+            ]),
+        );
+        assert_eq!(
+            Some(ChangeKind::Configuration),
+            change_detected(&[
+                PathBuf::from("pyproject.toml"),
+                PathBuf::from("tmp/rule.py"),
+            ]),
+        );
+        assert_eq!(
+            Some(ChangeKind::Configuration),
+            change_detected(&[
+                PathBuf::from("tmp/rule.py"),
+                PathBuf::from("pyproject.toml"),
+            ]),
+        );
+        assert_eq!(
+            None,
+            change_detected(&[
+                PathBuf::from("tmp/rule.js"),
+                PathBuf::from("tmp/bin/ruff.rs"),
+            ]),
+        );
+    }
+}
diff --git a/crates/ruff_cli/src/panic.rs b/crates/ruff_cli/src/panic.rs
index e67a2e96661b1..d7ab8d38a90f3 100644
--- a/crates/ruff_cli/src/panic.rs
+++ b/crates/ruff_cli/src/panic.rs
@@ -1,7 +1,7 @@
 #[derive(Default, Debug)]
 pub(crate) struct PanicError {
-    pub info: String,
-    pub backtrace: Option<std::backtrace::Backtrace>,
+    pub(crate) info: String,
+    pub(crate) backtrace: Option<std::backtrace::Backtrace>,
 }
 
 impl std::fmt::Display for PanicError {
diff --git a/crates/ruff_cli/src/printer.rs b/crates/ruff_cli/src/printer.rs
index d82d6b181f809..81d4c95f4e758 100644
--- a/crates/ruff_cli/src/printer.rs
+++ b/crates/ruff_cli/src/printer.rs
@@ -28,9 +28,14 @@ use crate::diagnostics::Diagnostics;
 bitflags! {
     #[derive(Default, Debug, Copy, Clone)]
     pub(crate) struct Flags: u8 {
+        /// Whether to show violations when emitting diagnostics.
         const SHOW_VIOLATIONS = 0b0000_0001;
-        const SHOW_FIXES = 0b0000_0010;
-        const SHOW_SOURCE = 0b000_0100;
+        /// Whether to show the source code when emitting diagnostics.
+        const SHOW_SOURCE = 0b000_0010;
+        /// Whether to show a summary of the fixed violations when emitting diagnostics.
+        const SHOW_FIX_SUMMARY = 0b0000_0100;
+        /// Whether to show a diff of each fixed violation when emitting diagnostics.
+        const SHOW_FIX_DIFF = 0b0000_1000;
     }
 }
 
@@ -73,7 +78,7 @@ pub(crate) struct Printer {
 }
 
 impl Printer {
-    pub const fn new(
+    pub(crate) const fn new(
         format: SerializationFormat,
         log_level: LogLevel,
         autofix_level: flags::FixMode,
@@ -87,7 +92,7 @@ impl Printer {
         }
     }
 
-    pub fn write_to_user(&self, message: &str) {
+    pub(crate) fn write_to_user(&self, message: &str) {
         if self.log_level >= LogLevel::Default {
             notify_user!("{}", message);
         }
@@ -118,7 +123,7 @@ impl Printer {
                     let num_fixable = diagnostics
                         .messages
                         .iter()
-                        .filter(|message| message.kind.fixable)
+                        .filter(|message| message.fix.is_some())
                         .count();
                     if num_fixable > 0 {
                         writeln!(
@@ -147,7 +152,11 @@ impl Printer {
         Ok(())
     }
 
-    pub fn write_once(&self, diagnostics: &Diagnostics, writer: &mut impl Write) -> Result<()> {
+    pub(crate) fn write_once(
+        &self,
+        diagnostics: &Diagnostics,
+        writer: &mut impl Write,
+    ) -> Result<()> {
         if matches!(self.log_level, LogLevel::Silent) {
             return Ok(());
         }
@@ -157,10 +166,10 @@ impl Printer {
                 self.format,
                 SerializationFormat::Text | SerializationFormat::Grouped
             ) {
-                if self.flags.contains(Flags::SHOW_FIXES) {
+                if self.flags.contains(Flags::SHOW_FIX_SUMMARY) {
                     if !diagnostics.fixed.is_empty() {
                         writeln!(writer)?;
-                        print_fixed(writer, &diagnostics.fixed)?;
+                        print_fix_summary(writer, &diagnostics.fixed)?;
                         writeln!(writer)?;
                     }
                 }
@@ -181,13 +190,14 @@ impl Printer {
             SerializationFormat::Text => {
                 TextEmitter::default()
                     .with_show_fix_status(show_fix_status(self.autofix_level))
+                    .with_show_fix_diff(self.flags.contains(Flags::SHOW_FIX_DIFF))
                     .with_show_source(self.flags.contains(Flags::SHOW_SOURCE))
                     .emit(writer, &diagnostics.messages, &context)?;
 
-                if self.flags.contains(Flags::SHOW_FIXES) {
+                if self.flags.contains(Flags::SHOW_FIX_SUMMARY) {
                     if !diagnostics.fixed.is_empty() {
                         writeln!(writer)?;
-                        print_fixed(writer, &diagnostics.fixed)?;
+                        print_fix_summary(writer, &diagnostics.fixed)?;
                         writeln!(writer)?;
                     }
                 }
@@ -200,10 +210,10 @@ impl Printer {
                     .with_show_fix_status(show_fix_status(self.autofix_level))
                     .emit(writer, &diagnostics.messages, &context)?;
 
-                if self.flags.contains(Flags::SHOW_FIXES) {
+                if self.flags.contains(Flags::SHOW_FIX_SUMMARY) {
                     if !diagnostics.fixed.is_empty() {
                         writeln!(writer)?;
-                        print_fixed(writer, &diagnostics.fixed)?;
+                        print_fix_summary(writer, &diagnostics.fixed)?;
                         writeln!(writer)?;
                     }
                 }
@@ -228,7 +238,7 @@ impl Printer {
         Ok(())
     }
 
-    pub fn write_statistics(&self, diagnostics: &Diagnostics) -> Result<()> {
+    pub(crate) fn write_statistics(&self, diagnostics: &Diagnostics) -> Result<()> {
         let statistics: Vec<ExpandedStatistics> = diagnostics
             .messages
             .iter()
@@ -236,7 +246,7 @@ impl Printer {
                 (
                     message.kind.rule(),
                     &message.kind.body,
-                    message.kind.fixable,
+                    message.fix.is_some(),
                 )
             })
             .sorted()
@@ -323,7 +333,7 @@ impl Printer {
         Ok(())
     }
 
-    pub fn write_continuously(&self, diagnostics: &Diagnostics) -> Result<()> {
+    pub(crate) fn write_continuously(&self, diagnostics: &Diagnostics) -> Result<()> {
         if matches!(self.log_level, LogLevel::Silent) {
             return Ok(());
         }
@@ -357,7 +367,7 @@ impl Printer {
         Ok(())
     }
 
-    pub fn clear_screen() -> Result<()> {
+    pub(crate) fn clear_screen() -> Result<()> {
         #[cfg(not(target_family = "wasm"))]
         clearscreen::clear()?;
         Ok(())
@@ -381,7 +391,7 @@ const fn show_fix_status(autofix_level: flags::FixMode) -> bool {
     !matches!(autofix_level, flags::FixMode::Apply)
 }
 
-fn print_fixed<T: Write>(stdout: &mut T, fixed: &FxHashMap<String, FixTable>) -> Result<()> {
+fn print_fix_summary<T: Write>(stdout: &mut T, fixed: &FxHashMap<String, FixTable>) -> Result<()> {
     let total = fixed
         .values()
         .map(|table| table.values().sum::<usize>())
diff --git a/crates/ruff_cli/src/resolve.rs b/crates/ruff_cli/src/resolve.rs
index 0bf5db66708f3..7952d70158b1f 100644
--- a/crates/ruff_cli/src/resolve.rs
+++ b/crates/ruff_cli/src/resolve.rs
@@ -14,7 +14,7 @@ use crate::args::Overrides;
 
 /// Resolve the relevant settings strategy and defaults for the current
 /// invocation.
-pub fn resolve(
+pub(crate) fn resolve(
     isolated: bool,
     config: Option<&Path>,
     overrides: &Overrides,
diff --git a/crates/ruff_cli/tests/black_compatibility_test.rs b/crates/ruff_cli/tests/black_compatibility_test.rs
index 5daafd09afc19..39f5ba54973c1 100644
--- a/crates/ruff_cli/tests/black_compatibility_test.rs
+++ b/crates/ruff_cli/tests/black_compatibility_test.rs
@@ -11,9 +11,10 @@ use std::{fs, process, str};
 use anyhow::{anyhow, Context, Result};
 use assert_cmd::Command;
 use log::info;
-use ruff::logging::{set_up_logging, LogLevel};
 use walkdir::WalkDir;
 
+use ruff::logging::{set_up_logging, LogLevel};
+
 /// Handles `blackd` process and allows submitting code to it for formatting.
 struct Blackd {
     address: SocketAddr,
@@ -24,7 +25,7 @@ struct Blackd {
 const BIN_NAME: &str = "ruff";
 
 impl Blackd {
-    pub fn new() -> Result<Self> {
+    pub(crate) fn new() -> Result<Self> {
         // Get free TCP port to run on
         let address = TcpListener::bind(SocketAddrV4::new(Ipv4Addr::LOCALHOST, 0))?.local_addr()?;
 
@@ -63,7 +64,7 @@ impl Blackd {
     }
 
     /// Format given code with blackd.
-    pub fn check(&self, code: &[u8]) -> Result<Vec<u8>> {
+    pub(crate) fn check(&self, code: &[u8]) -> Result<Vec<u8>> {
         match self
             .client
             .post(&format!("http://{}/", self.address))
diff --git a/crates/ruff_cli/tests/integration_test.rs b/crates/ruff_cli/tests/integration_test.rs
index 075c0f1a9df26..033839d28fbcc 100644
--- a/crates/ruff_cli/tests/integration_test.rs
+++ b/crates/ruff_cli/tests/integration_test.rs
@@ -12,7 +12,7 @@ use path_absolutize::path_dedot;
 const BIN_NAME: &str = "ruff";
 
 #[test]
-fn test_stdin_success() -> Result<()> {
+fn stdin_success() -> Result<()> {
     let mut cmd = Command::cargo_bin(BIN_NAME)?;
     cmd.args(["-", "--format", "text", "--isolated"])
         .write_stdin("")
@@ -22,7 +22,7 @@ fn test_stdin_success() -> Result<()> {
 }
 
 #[test]
-fn test_stdin_error() -> Result<()> {
+fn stdin_error() -> Result<()> {
     let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
         .args(["-", "--format", "text", "--isolated"])
@@ -40,7 +40,7 @@ Found 1 error.
 }
 
 #[test]
-fn test_stdin_filename() -> Result<()> {
+fn stdin_filename() -> Result<()> {
     let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
         .args([
@@ -66,7 +66,7 @@ Found 1 error.
 
 #[cfg(unix)]
 #[test]
-fn test_stdin_json() -> Result<()> {
+fn stdin_json() -> Result<()> {
     let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
         .args([
@@ -93,17 +93,18 @@ fn test_stdin_json() -> Result<()> {
     "code": "F401",
     "message": "`os` imported but unused",
     "fix": {{
+      "applicability": "Automatic",
       "message": "Remove unused import: `os`",
       "edits": [
         {{
           "content": "",
           "location": {{
             "row": 1,
-            "column": 0
+            "column": 1
           }},
           "end_location": {{
             "row": 2,
-            "column": 0
+            "column": 1
           }}
         }}
       ]
@@ -126,7 +127,7 @@ fn test_stdin_json() -> Result<()> {
 }
 
 #[test]
-fn test_stdin_autofix() -> Result<()> {
+fn stdin_autofix() -> Result<()> {
     let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
         .args(["-", "--format", "text", "--fix", "--isolated"])
@@ -141,7 +142,7 @@ fn test_stdin_autofix() -> Result<()> {
 }
 
 #[test]
-fn test_stdin_autofix_when_not_fixable_should_still_print_contents() -> Result<()> {
+fn stdin_autofix_when_not_fixable_should_still_print_contents() -> Result<()> {
     let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
         .args(["-", "--format", "text", "--fix", "--isolated"])
@@ -156,7 +157,7 @@ fn test_stdin_autofix_when_not_fixable_should_still_print_contents() -> Result<(
 }
 
 #[test]
-fn test_stdin_autofix_when_no_issues_should_still_print_contents() -> Result<()> {
+fn stdin_autofix_when_no_issues_should_still_print_contents() -> Result<()> {
     let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
         .args(["-", "--format", "text", "--fix", "--isolated"])
@@ -171,7 +172,7 @@ fn test_stdin_autofix_when_no_issues_should_still_print_contents() -> Result<()>
 }
 
 #[test]
-fn test_show_source() -> Result<()> {
+fn show_source() -> Result<()> {
     let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
         .args(["-", "--format", "text", "--show-source", "--isolated"])
@@ -195,7 +196,15 @@ fn explain_status_codes() -> Result<()> {
 fn show_statistics() -> Result<()> {
     let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
-        .args(["-", "--format", "text", "--select", "F401", "--statistics"])
+        .args([
+            "-",
+            "--format",
+            "text",
+            "--select",
+            "F401",
+            "--statistics",
+            "--isolated",
+        ])
         .write_stdin("import sys\nimport os\n\nprint(os.getuid())\n")
         .assert()
         .failure();
@@ -208,3 +217,63 @@ fn show_statistics() -> Result<()> {
     );
     Ok(())
 }
+
+#[test]
+fn nursery_prefix() -> Result<()> {
+    let mut cmd = Command::cargo_bin(BIN_NAME)?;
+
+    // `--select E` should detect E741, but not E225, which is in the nursery.
+    let output = cmd
+        .args(["-", "--format", "text", "--isolated", "--select", "E"])
+        .write_stdin("I=42\n")
+        .assert()
+        .failure();
+    assert_eq!(
+        str::from_utf8(&output.get_output().stdout)?,
+        r#"-:1:1: E741 Ambiguous variable name: `I`
+Found 1 error.
+"#
+    );
+
+    Ok(())
+}
+
+#[test]
+fn nursery_all() -> Result<()> {
+    let mut cmd = Command::cargo_bin(BIN_NAME)?;
+
+    // `--select ALL` should detect E741, but not E225, which is in the nursery.
+    let output = cmd
+        .args(["-", "--format", "text", "--isolated", "--select", "E"])
+        .write_stdin("I=42\n")
+        .assert()
+        .failure();
+    assert_eq!(
+        str::from_utf8(&output.get_output().stdout)?,
+        r#"-:1:1: E741 Ambiguous variable name: `I`
+Found 1 error.
+"#
+    );
+
+    Ok(())
+}
+
+#[test]
+fn nursery_direct() -> Result<()> {
+    let mut cmd = Command::cargo_bin(BIN_NAME)?;
+
+    // `--select E225` should detect E225.
+    let output = cmd
+        .args(["-", "--format", "text", "--isolated", "--select", "E225"])
+        .write_stdin("I=42\n")
+        .assert()
+        .failure();
+    assert_eq!(
+        str::from_utf8(&output.get_output().stdout)?,
+        r#"-:1:2: E225 Missing whitespace around operator
+Found 1 error.
+"#
+    );
+
+    Ok(())
+}
diff --git a/crates/ruff_dev/Cargo.toml b/crates/ruff_dev/Cargo.toml
index d01b6b756c832..4fa0405c9a7fb 100644
--- a/crates/ruff_dev/Cargo.toml
+++ b/crates/ruff_dev/Cargo.toml
@@ -6,9 +6,10 @@ edition = { workspace = true }
 rust-version = { workspace = true }
 
 [dependencies]
-ruff = { path = "../ruff" }
+ruff = { path = "../ruff", features = ["schemars"] }
 ruff_cli = { path = "../ruff_cli" }
 ruff_diagnostics = { path = "../ruff_diagnostics" }
+ruff_textwrap = { path = "../ruff_textwrap" }
 
 anyhow = { workspace = true }
 clap = { workspace = true }
@@ -17,10 +18,9 @@ libcst = { workspace = true }
 once_cell = { workspace = true }
 pretty_assertions = { version = "1.3.0" }
 regex = { workspace = true }
-rustpython-common = { workspace = true }
+rustpython-format = { workspace = true }
 rustpython-parser = { workspace = true }
 schemars = { workspace = true }
 serde_json = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
-textwrap = { workspace = true }
diff --git a/crates/ruff_dev/src/generate_all.rs b/crates/ruff_dev/src/generate_all.rs
index 5e548429af81f..3eb1b0adfa3ca 100644
--- a/crates/ruff_dev/src/generate_all.rs
+++ b/crates/ruff_dev/src/generate_all.rs
@@ -4,16 +4,16 @@ use anyhow::Result;
 
 use crate::{generate_cli_help, generate_docs, generate_json_schema};
 
-pub const REGENERATE_ALL_COMMAND: &str = "cargo dev generate-all";
+pub(crate) const REGENERATE_ALL_COMMAND: &str = "cargo dev generate-all";
 
 #[derive(clap::Args)]
-pub struct Args {
+pub(crate) struct Args {
     #[arg(long, default_value_t, value_enum)]
     mode: Mode,
 }
 
 #[derive(Copy, Clone, PartialEq, Eq, clap::ValueEnum, Default)]
-pub enum Mode {
+pub(crate) enum Mode {
     /// Update the content in the `configuration.md`.
     #[default]
     Write,
@@ -31,7 +31,7 @@ impl Mode {
     }
 }
 
-pub fn main(args: &Args) -> Result<()> {
+pub(crate) fn main(args: &Args) -> Result<()> {
     generate_json_schema::main(&generate_json_schema::Args { mode: args.mode })?;
     generate_cli_help::main(&generate_cli_help::Args { mode: args.mode })?;
     generate_docs::main(&generate_docs::Args {
diff --git a/crates/ruff_dev/src/generate_cli_help.rs b/crates/ruff_dev/src/generate_cli_help.rs
index 7b5b0d46bca6a..25e2417467666 100644
--- a/crates/ruff_dev/src/generate_cli_help.rs
+++ b/crates/ruff_dev/src/generate_cli_help.rs
@@ -7,6 +7,7 @@ use std::{fs, str};
 use anyhow::{bail, Context, Result};
 use clap::CommandFactory;
 use pretty_assertions::StrComparison;
+
 use ruff_cli::args;
 
 use crate::generate_all::{Mode, REGENERATE_ALL_COMMAND};
@@ -19,7 +20,7 @@ const SUBCOMMAND_HELP_BEGIN_PRAGMA: &str = "<!-- Begin auto-generated subcommand
 const SUBCOMMAND_HELP_END_PRAGMA: &str = "<!-- End auto-generated subcommand help. -->";
 
 #[derive(clap::Args)]
-pub struct Args {
+pub(crate) struct Args {
     #[arg(long, default_value_t, value_enum)]
     pub(crate) mode: Mode,
 }
@@ -119,10 +120,12 @@ fn check_help_text() -> String {
 
 #[cfg(test)]
 mod test {
-    use super::{main, Args};
-    use crate::generate_all::Mode;
     use anyhow::Result;
 
+    use crate::generate_all::Mode;
+
+    use super::{main, Args};
+
     #[test]
     fn test_generate_json_schema() -> Result<()> {
         main(&Args { mode: Mode::Check })
diff --git a/crates/ruff_dev/src/generate_docs.rs b/crates/ruff_dev/src/generate_docs.rs
index 6bfddb7e869d7..864b030ad4f1f 100644
--- a/crates/ruff_dev/src/generate_docs.rs
+++ b/crates/ruff_dev/src/generate_docs.rs
@@ -15,13 +15,13 @@ use ruff_diagnostics::AutofixKind;
 use crate::ROOT_DIR;
 
 #[derive(clap::Args)]
-pub struct Args {
+pub(crate) struct Args {
     /// Write the generated docs to stdout (rather than to the filesystem).
     #[arg(long)]
     pub(crate) dry_run: bool,
 }
 
-pub fn main(args: &Args) -> Result<()> {
+pub(crate) fn main(args: &Args) -> Result<()> {
     for rule in Rule::iter() {
         if let Some(explanation) = rule.explanation() {
             let mut output = String::new();
@@ -43,6 +43,17 @@ pub fn main(args: &Args) -> Result<()> {
                 output.push('\n');
             }
 
+            if rule.is_nursery() {
+                output.push_str(&format!(
+                    r#"This rule is part of the **nursery**, a collection of newer lints that are
+still under development. As such, it must be enabled by explicitly selecting
+{}."#,
+                    rule.noqa_code()
+                ));
+                output.push('\n');
+                output.push('\n');
+            }
+
             process_documentation(explanation.trim(), &mut output);
 
             let filename = PathBuf::from(ROOT_DIR)
@@ -93,7 +104,7 @@ fn process_documentation(documentation: &str, out: &mut String) {
                     "unknown option {option}"
                 );
 
-                let anchor = option.rsplit('.').next().unwrap();
+                let anchor = option.replace('.', "-");
                 out.push_str(&format!("- [`{option}`][{option}]\n"));
                 after.push_str(&format!("[{option}]: ../../settings#{anchor}"));
 
@@ -116,7 +127,7 @@ mod tests {
 
     #[test]
     fn test_process_documentation() {
-        let mut out = String::new();
+        let mut output = String::new();
         process_documentation(
             "
 See also [`mccabe.max-complexity`].
@@ -127,10 +138,10 @@ Something [`else`][other].
 - `mccabe.max-complexity`
 
 [other]: http://example.com.",
-            &mut out,
+            &mut output,
         );
         assert_eq!(
-            out,
+            output,
             "
 See also [`mccabe.max-complexity`][mccabe.max-complexity].
 Something [`else`][other].
@@ -141,7 +152,7 @@ Something [`else`][other].
 
 [other]: http://example.com.
 
-[mccabe.max-complexity]: ../../settings#max-complexity\n"
+[mccabe.max-complexity]: ../../settings#mccabe-max-complexity\n"
         );
     }
 }
diff --git a/crates/ruff_dev/src/generate_json_schema.rs b/crates/ruff_dev/src/generate_json_schema.rs
index 0d8d0d6a0cc26..147638dba6ef4 100644
--- a/crates/ruff_dev/src/generate_json_schema.rs
+++ b/crates/ruff_dev/src/generate_json_schema.rs
@@ -3,22 +3,23 @@
 use std::fs;
 use std::path::PathBuf;
 
-use crate::generate_all::{Mode, REGENERATE_ALL_COMMAND};
 use anyhow::{bail, Result};
 use pretty_assertions::StrComparison;
-use ruff::settings::options::Options;
 use schemars::schema_for;
 
+use ruff::settings::options::Options;
+
+use crate::generate_all::{Mode, REGENERATE_ALL_COMMAND};
 use crate::ROOT_DIR;
 
 #[derive(clap::Args)]
-pub struct Args {
+pub(crate) struct Args {
     /// Write the generated table to stdout (rather than to `ruff.schema.json`).
     #[arg(long, default_value_t, value_enum)]
     pub(crate) mode: Mode,
 }
 
-pub fn main(args: &Args) -> Result<()> {
+pub(crate) fn main(args: &Args) -> Result<()> {
     let schema = schema_for!(Options);
     let schema_string = serde_json::to_string_pretty(&schema).unwrap();
     let filename = "ruff.schema.json";
@@ -48,10 +49,12 @@ pub fn main(args: &Args) -> Result<()> {
 
 #[cfg(test)]
 mod test {
-    use super::{main, Args};
-    use crate::generate_all::Mode;
     use anyhow::Result;
 
+    use crate::generate_all::Mode;
+
+    use super::{main, Args};
+
     #[test]
     fn test_generate_json_schema() -> Result<()> {
         main(&Args { mode: Mode::Check })
diff --git a/crates/ruff_dev/src/generate_options.rs b/crates/ruff_dev/src/generate_options.rs
index 8e6fe6f077285..4e6bfe280f2fe 100644
--- a/crates/ruff_dev/src/generate_options.rs
+++ b/crates/ruff_dev/src/generate_options.rs
@@ -1,10 +1,22 @@
 //! Generate a Markdown-compatible listing of configuration options.
 use itertools::Itertools;
+
 use ruff::settings::options::Options;
 use ruff::settings::options_base::{OptionEntry, OptionField};
 
 fn emit_field(output: &mut String, name: &str, field: &OptionField, group_name: Option<&str>) {
-    output.push_str(&format!("#### [`{name}`](#{name})\n"));
+    // if there's a group name, we need to add it to the anchor
+    if let Some(group_name) = group_name {
+        // the anchor used to just be the name, but now it's the group name
+        // for backwards compatibility, we need to keep the old anchor
+        output.push_str(&format!("<span id=\"{name}\"></span>\n"));
+
+        output.push_str(&format!(
+            "#### [`{name}`](#{group_name}-{name}) {{: #{group_name}-{name} }}\n"
+        ));
+    } else {
+        output.push_str(&format!("#### [`{name}`](#{name})\n"));
+    }
     output.push('\n');
     output.push_str(field.doc);
     output.push_str("\n\n");
@@ -24,7 +36,7 @@ fn emit_field(output: &mut String, name: &str, field: &OptionField, group_name:
     output.push('\n');
 }
 
-pub fn generate() -> String {
+pub(crate) fn generate() -> String {
     let mut output: String = "### Top-level\n\n".into();
 
     let sorted_options: Vec<_> = Options::metadata()
diff --git a/crates/ruff_dev/src/generate_rules_table.rs b/crates/ruff_dev/src/generate_rules_table.rs
index 78289742a792a..4d29bfea2bf3a 100644
--- a/crates/ruff_dev/src/generate_rules_table.rs
+++ b/crates/ruff_dev/src/generate_rules_table.rs
@@ -39,7 +39,7 @@ fn generate_table(table_out: &mut String, rules: impl IntoIterator<Item = Rule>,
     table_out.push('\n');
 }
 
-pub fn generate() -> String {
+pub(crate) fn generate() -> String {
     // Generate the table string.
     let mut table_out = format!("The {FIX_SYMBOL} emoji indicates that a rule is automatically fixable by the `--fix` command-line option.\n\n");
     for linter in Linter::iter() {
diff --git a/crates/ruff_dev/src/print_ast.rs b/crates/ruff_dev/src/print_ast.rs
index d4dd75b32688b..d19f07a373c50 100644
--- a/crates/ruff_dev/src/print_ast.rs
+++ b/crates/ruff_dev/src/print_ast.rs
@@ -5,18 +5,19 @@ use std::fs;
 use std::path::PathBuf;
 
 use anyhow::Result;
-use rustpython_parser as parser;
+use rustpython_parser::ast::Suite;
+use rustpython_parser::Parse;
 
 #[derive(clap::Args)]
-pub struct Args {
+pub(crate) struct Args {
     /// Python file for which to generate the AST.
     #[arg(required = true)]
     file: PathBuf,
 }
 
-pub fn main(args: &Args) -> Result<()> {
+pub(crate) fn main(args: &Args) -> Result<()> {
     let contents = fs::read_to_string(&args.file)?;
-    let python_ast = parser::parse_program(&contents, &args.file.to_string_lossy())?;
+    let python_ast = Suite::parse(&contents, &args.file.to_string_lossy())?;
     println!("{python_ast:#?}");
     Ok(())
 }
diff --git a/crates/ruff_dev/src/print_cst.rs b/crates/ruff_dev/src/print_cst.rs
index 671227377f33f..166923486e149 100644
--- a/crates/ruff_dev/src/print_cst.rs
+++ b/crates/ruff_dev/src/print_cst.rs
@@ -7,13 +7,13 @@ use std::path::PathBuf;
 use anyhow::{bail, Result};
 
 #[derive(clap::Args)]
-pub struct Args {
+pub(crate) struct Args {
     /// Python file for which to generate the CST.
     #[arg(required = true)]
     file: PathBuf,
 }
 
-pub fn main(args: &Args) -> Result<()> {
+pub(crate) fn main(args: &Args) -> Result<()> {
     let contents = fs::read_to_string(&args.file)?;
     match libcst_native::parse_module(&contents, None) {
         Ok(python_cst) => {
diff --git a/crates/ruff_dev/src/print_tokens.rs b/crates/ruff_dev/src/print_tokens.rs
index 176ef4ec95f62..39b05b3a6236e 100644
--- a/crates/ruff_dev/src/print_tokens.rs
+++ b/crates/ruff_dev/src/print_tokens.rs
@@ -8,13 +8,13 @@ use anyhow::Result;
 use rustpython_parser::{lexer, Mode};
 
 #[derive(clap::Args)]
-pub struct Args {
+pub(crate) struct Args {
     /// Python file for which to generate the AST.
     #[arg(required = true)]
     file: PathBuf,
 }
 
-pub fn main(args: &Args) -> Result<()> {
+pub(crate) fn main(args: &Args) -> Result<()> {
     let contents = fs::read_to_string(&args.file)?;
     for (tok, range) in lexer::lex(&contents, Mode::Module).flatten() {
         println!(
diff --git a/crates/ruff_dev/src/round_trip.rs b/crates/ruff_dev/src/round_trip.rs
index 73def5788f7c8..4cc4f36c598ae 100644
--- a/crates/ruff_dev/src/round_trip.rs
+++ b/crates/ruff_dev/src/round_trip.rs
@@ -9,13 +9,13 @@ use anyhow::Result;
 use ruff::round_trip;
 
 #[derive(clap::Args)]
-pub struct Args {
+pub(crate) struct Args {
     /// Python file to round-trip.
     #[arg(required = true)]
     file: PathBuf,
 }
 
-pub fn main(args: &Args) -> Result<()> {
+pub(crate) fn main(args: &Args) -> Result<()> {
     let contents = fs::read_to_string(&args.file)?;
     println!("{}", round_trip(&contents, &args.file.to_string_lossy())?);
     Ok(())
diff --git a/crates/ruff_diagnostics/Cargo.toml b/crates/ruff_diagnostics/Cargo.toml
index 6aaad1e20a909..980abbbc51c0a 100644
--- a/crates/ruff_diagnostics/Cargo.toml
+++ b/crates/ruff_diagnostics/Cargo.toml
@@ -8,7 +8,8 @@ rust-version = { workspace = true }
 [lib]
 
 [dependencies]
+ruff_text_size = { workspace = true }
+
 anyhow = { workspace = true }
 log = { workspace = true }
-ruff_text_size = { workspace = true }
 serde = { workspace = true, optional = true, features = [] }
diff --git a/crates/ruff_diagnostics/src/diagnostic.rs b/crates/ruff_diagnostics/src/diagnostic.rs
index 931c436bac1ef..419f048674c0d 100644
--- a/crates/ruff_diagnostics/src/diagnostic.rs
+++ b/crates/ruff_diagnostics/src/diagnostic.rs
@@ -1,11 +1,10 @@
 use anyhow::Result;
 use log::error;
 use ruff_text_size::{TextRange, TextSize};
-
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-use crate::Fix;
+use crate::{Edit, Fix};
 
 #[derive(Debug, PartialEq, Eq, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
@@ -16,15 +15,13 @@ pub struct DiagnosticKind {
     pub body: String,
     /// The message to display to the user, to explain the suggested fix.
     pub suggestion: Option<String>,
-    /// Whether the diagnostic is automatically fixable.
-    pub fixable: bool,
 }
 
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub struct Diagnostic {
     pub kind: DiagnosticKind,
     pub range: TextRange,
-    pub fix: Fix,
+    pub fix: Option<Fix>,
     pub parent: Option<TextSize>,
 }
 
@@ -33,21 +30,29 @@ impl Diagnostic {
         Self {
             kind: kind.into(),
             range,
-            fix: Fix::empty(),
+            fix: None,
             parent: None,
         }
     }
 
     /// Set the [`Fix`] used to fix the diagnostic.
     #[inline]
-    pub fn set_fix<T: Into<Fix>>(&mut self, fix: T) {
-        self.fix = fix.into();
+    pub fn set_fix(&mut self, fix: Fix) {
+        self.fix = Some(fix);
+    }
+
+    /// Set the [`Fix`] used to fix the diagnostic.
+    #[inline]
+    #[deprecated(note = "Use `Diagnostic::set_fix` instead.")]
+    #[allow(deprecated)]
+    pub fn set_fix_from_edit(&mut self, edit: Edit) {
+        self.fix = Some(Fix::unspecified(edit));
     }
 
     /// Consumes `self` and returns a new `Diagnostic` with the given `fix`.
     #[inline]
     #[must_use]
-    pub fn with_fix<T: Into<Fix>>(mut self, fix: T) -> Self {
+    pub fn with_fix(mut self, fix: Fix) -> Self {
         self.set_fix(fix);
         self
     }
@@ -55,10 +60,23 @@ impl Diagnostic {
     /// Set the [`Fix`] used to fix the diagnostic, if the provided function returns `Ok`.
     /// Otherwise, log the error.
     #[inline]
-    pub fn try_set_fix<T: Into<Fix>>(&mut self, func: impl FnOnce() -> Result<T>) {
+    #[allow(deprecated)]
+    pub fn try_set_fix(&mut self, func: impl FnOnce() -> Result<Fix>) {
+        match func() {
+            Ok(fix) => self.fix = Some(fix),
+            Err(err) => error!("Failed to create fix for {}: {}", self.kind.name, err),
+        }
+    }
+
+    /// Sets an [`Edit`] used to fix the diagnostic, if the provided function returns `Ok`.
+    /// Otherwise, log the error.
+    #[inline]
+    #[deprecated(note = "Use Diagnostic::try_set_fix instead")]
+    #[allow(deprecated)]
+    pub fn try_set_fix_from_edit(&mut self, func: impl FnOnce() -> Result<Edit>) {
         match func() {
-            Ok(fix) => self.fix = fix.into(),
-            Err(err) => error!("Failed to create fix: {}", err),
+            Ok(edit) => self.fix = Some(Fix::unspecified(edit)),
+            Err(err) => error!("Failed to create fix for {}: {}", self.kind.name, err),
         }
     }
 
diff --git a/crates/ruff_diagnostics/src/edit.rs b/crates/ruff_diagnostics/src/edit.rs
index 733d5c049d6c3..5da2dc590a001 100644
--- a/crates/ruff_diagnostics/src/edit.rs
+++ b/crates/ruff_diagnostics/src/edit.rs
@@ -1,8 +1,8 @@
-use ruff_text_size::{TextRange, TextSize};
+use std::cmp::Ordering;
 
+use ruff_text_size::{TextRange, TextSize};
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
-use std::cmp::Ordering;
 
 /// A text edit to be applied to a source file. Inserts, deletes, or replaces
 /// content at a given location.
@@ -132,15 +132,15 @@ enum EditOperationKind {
 }
 
 impl EditOperationKind {
-    pub const fn is_insertion(self) -> bool {
+    pub(crate) const fn is_insertion(self) -> bool {
         matches!(self, EditOperationKind::Insertion)
     }
 
-    pub const fn is_deletion(self) -> bool {
+    pub(crate) const fn is_deletion(self) -> bool {
         matches!(self, EditOperationKind::Deletion)
     }
 
-    pub const fn is_replacement(self) -> bool {
+    pub(crate) const fn is_replacement(self) -> bool {
         matches!(self, EditOperationKind::Replacement)
     }
 }
diff --git a/crates/ruff_diagnostics/src/fix.rs b/crates/ruff_diagnostics/src/fix.rs
index c06de1fbbed37..ae54282d041db 100644
--- a/crates/ruff_diagnostics/src/fix.rs
+++ b/crates/ruff_diagnostics/src/fix.rs
@@ -4,27 +4,126 @@ use serde::{Deserialize, Serialize};
 
 use crate::edit::Edit;
 
+/// Indicates confidence in the correctness of a suggested fix.
+#[derive(Default, Copy, Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+pub enum Applicability {
+    /// The fix is definitely what the user intended, or maintains the exact meaning of the code.
+    /// This fix should be automatically applied.
+    Automatic,
+
+    /// The fix may be what the user intended, but it is uncertain.
+    /// The fix should result in valid code if it is applied.
+    /// The fix can be applied with user opt-in.
+    Suggested,
+
+    /// The fix has a good chance of being incorrect or the code be incomplete.
+    /// The fix may result in invalid code if it is applied.
+    /// The fix should only be manually applied by the user.
+    Manual,
+
+    /// The applicability of the fix is unknown.
+    #[default]
+    Unspecified,
+}
+
+/// Indicates the level of isolation required to apply a fix.
+#[derive(Default, Copy, Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+pub enum IsolationLevel {
+    /// The fix should be applied as long as no other fixes in the same group have been applied.
+    Group(u32),
+    /// The fix should be applied as long as it does not overlap with any other fixes.
+    #[default]
+    NonOverlapping,
+}
+
 /// A collection of [`Edit`] elements to be applied to a source file.
-#[derive(Default, Debug, PartialEq, Eq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct Fix {
     edits: Vec<Edit>,
+    applicability: Applicability,
+    isolation_level: IsolationLevel,
 }
 
 impl Fix {
-    /// Create a new [`Fix`] from a vector of [`Edit`] elements.
-    pub fn new(edits: Vec<Edit>) -> Self {
-        Self { edits }
+    /// Create a new [`Fix`] with an unspecified applicability from an [`Edit`] element.
+    #[deprecated(
+        note = "Use `Fix::automatic`, `Fix::suggested`, or `Fix::manual` instead to specify an applicability."
+    )]
+    pub fn unspecified(edit: Edit) -> Self {
+        Self {
+            edits: vec![edit],
+            applicability: Applicability::Unspecified,
+            isolation_level: IsolationLevel::default(),
+        }
     }
 
-    /// Create an empty [`Fix`].
-    pub const fn empty() -> Self {
-        Self { edits: Vec::new() }
+    /// Create a new [`Fix`] with an unspecified applicability from multiple [`Edit`] elements.
+    #[deprecated(
+        note = "Use `Fix::automatic_edits`, `Fix::suggested_edits`, or `Fix::manual_edits` instead to specify an applicability."
+    )]
+    pub fn unspecified_edits(edit: Edit, rest: impl IntoIterator<Item = Edit>) -> Self {
+        Self {
+            edits: std::iter::once(edit).chain(rest.into_iter()).collect(),
+            applicability: Applicability::Unspecified,
+            isolation_level: IsolationLevel::default(),
+        }
+    }
+
+    /// Create a new [`Fix`] with [automatic applicability](Applicability::Automatic) from an [`Edit`] element.
+    pub fn automatic(edit: Edit) -> Self {
+        Self {
+            edits: vec![edit],
+            applicability: Applicability::Automatic,
+            isolation_level: IsolationLevel::default(),
+        }
     }
 
-    /// Return `true` if the [`Fix`] contains no [`Edit`] elements.
-    pub fn is_empty(&self) -> bool {
-        self.edits.is_empty()
+    /// Create a new [`Fix`] with [automatic applicability](Applicability::Automatic) from multiple [`Edit`] elements.
+    pub fn automatic_edits(edit: Edit, rest: impl IntoIterator<Item = Edit>) -> Self {
+        Self {
+            edits: std::iter::once(edit).chain(rest.into_iter()).collect(),
+            applicability: Applicability::Automatic,
+            isolation_level: IsolationLevel::default(),
+        }
+    }
+
+    /// Create a new [`Fix`] with [suggested applicability](Applicability::Suggested) from an [`Edit`] element.
+    pub fn suggested(edit: Edit) -> Self {
+        Self {
+            edits: vec![edit],
+            applicability: Applicability::Suggested,
+            isolation_level: IsolationLevel::default(),
+        }
+    }
+
+    /// Create a new [`Fix`] with [suggested applicability](Applicability::Suggested) from multiple [`Edit`] elements.
+    pub fn suggested_edits(edit: Edit, rest: impl IntoIterator<Item = Edit>) -> Self {
+        Self {
+            edits: std::iter::once(edit).chain(rest.into_iter()).collect(),
+            applicability: Applicability::Suggested,
+            isolation_level: IsolationLevel::default(),
+        }
+    }
+
+    /// Create a new [`Fix`] with [manual applicability](Applicability::Manual) from an [`Edit`] element.
+    pub fn manual(edit: Edit) -> Self {
+        Self {
+            edits: vec![edit],
+            applicability: Applicability::Manual,
+            isolation_level: IsolationLevel::default(),
+        }
+    }
+
+    /// Create a new [`Fix`] with [manual applicability](Applicability::Manual) from multiple [`Edit`] elements.
+    pub fn manual_edits(edit: Edit, rest: impl IntoIterator<Item = Edit>) -> Self {
+        Self {
+            edits: std::iter::once(edit).chain(rest.into_iter()).collect(),
+            applicability: Applicability::Manual,
+            isolation_level: IsolationLevel::default(),
+        }
     }
 
     /// Return the [`TextSize`] of the first [`Edit`] in the [`Fix`].
@@ -40,18 +139,21 @@ impl Fix {
     pub fn into_edits(self) -> Vec<Edit> {
         self.edits
     }
-}
 
-impl FromIterator<Edit> for Fix {
-    fn from_iter<T: IntoIterator<Item = Edit>>(iter: T) -> Self {
-        Self {
-            edits: Vec::from_iter(iter),
-        }
+    /// Return the [`Applicability`] of the [`Fix`].
+    pub fn applicability(&self) -> Applicability {
+        self.applicability
+    }
+
+    /// Return the [`IsolationLevel`] of the [`Fix`].
+    pub fn isolation(&self) -> IsolationLevel {
+        self.isolation_level
     }
-}
 
-impl From<Edit> for Fix {
-    fn from(edit: Edit) -> Self {
-        Self { edits: vec![edit] }
+    /// Create a new [`Fix`] with the given [`IsolationLevel`].
+    #[must_use]
+    pub fn isolate(mut self, isolation: IsolationLevel) -> Self {
+        self.isolation_level = isolation;
+        self
     }
 }
diff --git a/crates/ruff_diagnostics/src/lib.rs b/crates/ruff_diagnostics/src/lib.rs
index b3b1ee2567a51..c166e8dbd8bb4 100644
--- a/crates/ruff_diagnostics/src/lib.rs
+++ b/crates/ruff_diagnostics/src/lib.rs
@@ -1,6 +1,6 @@
 pub use diagnostic::{Diagnostic, DiagnosticKind};
 pub use edit::Edit;
-pub use fix::Fix;
+pub use fix::{Applicability, Fix, IsolationLevel};
 pub use violation::{AlwaysAutofixableViolation, AutofixKind, Violation};
 
 mod diagnostic;
diff --git a/crates/ruff_diagnostics/src/violation.rs b/crates/ruff_diagnostics/src/violation.rs
index e4bb9034ae6fb..d57a1b4e38b1b 100644
--- a/crates/ruff_diagnostics/src/violation.rs
+++ b/crates/ruff_diagnostics/src/violation.rs
@@ -1,6 +1,6 @@
 use std::fmt::{Debug, Display};
 
-#[derive(Copy, Clone)]
+#[derive(Debug, Copy, Clone)]
 pub enum AutofixKind {
     Sometimes,
     Always,
@@ -30,10 +30,13 @@ pub trait Violation: Debug + PartialEq + Eq {
         None
     }
 
-    /// If autofix is (potentially) available for this violation returns another
-    /// function that in turn can be used to obtain a string describing the
-    /// autofix.
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
+    // TODO(micha): Move `autofix_title` to `Fix`, add new `advice` method that is shown as an advice.
+    // Change the `Diagnostic` renderer to show the advice, and render the fix message after the `Suggested fix: <here>`
+
+    /// Returns the title for the autofix. The message is also shown as an advice as part of the diagnostics.
+    ///
+    /// Required for rules that have autofixes.
+    fn autofix_title(&self) -> Option<String> {
         None
     }
 
@@ -72,8 +75,8 @@ impl<VA: AlwaysAutofixableViolation> Violation for VA {
         <Self as AlwaysAutofixableViolation>::explanation()
     }
 
-    fn autofix_title_formatter(&self) -> Option<fn(&Self) -> String> {
-        Some(Self::autofix_title)
+    fn autofix_title(&self) -> Option<String> {
+        Some(<Self as AlwaysAutofixableViolation>::autofix_title(self))
     }
 
     fn message_formats() -> &'static [&'static str] {
diff --git a/crates/ruff_formatter/Cargo.toml b/crates/ruff_formatter/Cargo.toml
index a9c82b91a8fa7..593b47e3592d2 100644
--- a/crates/ruff_formatter/Cargo.toml
+++ b/crates/ruff_formatter/Cargo.toml
@@ -14,6 +14,7 @@ schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
 tracing = { version = "0.1.37", default-features = false, features = ["std"] }
 unicode-width = { version = "0.1.10" }
+static_assertions = "1.1.0"
 
 [dev-dependencies]
 insta = { workspace = true }
diff --git a/crates/ruff_python_formatter/src/shared_traits.rs b/crates/ruff_formatter/shared_traits.rs
similarity index 90%
rename from crates/ruff_python_formatter/src/shared_traits.rs
rename to crates/ruff_formatter/shared_traits.rs
index 421d1f6b1b11f..aab0120ea798e 100644
--- a/crates/ruff_python_formatter/src/shared_traits.rs
+++ b/crates/ruff_formatter/shared_traits.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::all)]
-
 /// Used to get an object that knows how to format this object.
 pub trait AsFormat<Context> {
     type Format<'a>: ruff_formatter::Format<Context>
@@ -46,6 +44,18 @@ where
     }
 }
 
+/// Implement [`IntoFormat`] for references to types that implement [`AsFormat`].
+impl<'a, T, C> IntoFormat<C> for &'a T
+where
+    T: AsFormat<C>,
+{
+    type Format = T::Format<'a>;
+
+    fn into_format(self) -> Self::Format {
+        AsFormat::format(self)
+    }
+}
+
 /// Formatting specific [`Iterator`] extensions
 pub trait FormattedIterExt {
     /// Converts every item to an object that knows how to format it.
diff --git a/crates/ruff_formatter/src/builders.rs b/crates/ruff_formatter/src/builders.rs
index 3d5b0e13a1d44..24879eb868bf1 100644
--- a/crates/ruff_formatter/src/builders.rs
+++ b/crates/ruff_formatter/src/builders.rs
@@ -1,14 +1,13 @@
 use crate::format_element::tag::{Condition, Tag};
 use crate::prelude::tag::{DedentMode, GroupMode, LabelId};
 use crate::prelude::*;
-use crate::{format_element, write, Argument, Arguments, GroupId, TextSize};
+use crate::{format_element, write, Argument, Arguments, FormatContext, GroupId, TextSize};
 use crate::{Buffer, VecBuffer};
 
 use ruff_text_size::TextRange;
 use std::cell::Cell;
 use std::marker::PhantomData;
 use std::num::NonZeroU8;
-use std::rc::Rc;
 use Tag::*;
 
 /// A line break that only gets printed if the enclosing `Group` doesn't fit on a single line.
@@ -276,8 +275,62 @@ impl std::fmt::Debug for StaticText {
     }
 }
 
-/// Creates a text from a dynamic string and a range of the input source
-pub fn dynamic_text(text: &str, position: TextSize) -> DynamicText {
+/// Creates a source map entry from the passed source `position` to the position in the formatted output.
+///
+/// ## Examples
+///
+/// ```
+/// /// ```
+/// use ruff_formatter::format;
+/// use ruff_formatter::prelude::*;
+///
+/// # fn main() -> FormatResult<()> {
+/// // the tab must be encoded as \\t to not literally print a tab character ("Hello{tab}World" vs "Hello\tWorld")
+/// use ruff_text_size::TextSize;
+/// use ruff_formatter::SourceMarker;
+///
+///
+/// let elements = format!(SimpleFormatContext::default(), [
+///     source_position(TextSize::new(0)),
+///     text("\"Hello "),
+///     source_position(TextSize::new(8)),
+///     text("'Ruff'"),
+///     source_position(TextSize::new(14)),
+///     text("\""),
+///     source_position(TextSize::new(20))
+/// ])?;
+///
+/// let printed = elements.print()?;
+///
+/// assert_eq!(printed.as_code(), r#""Hello 'Ruff'""#);
+/// assert_eq!(printed.sourcemap(), [
+///     SourceMarker { source: TextSize::new(0), dest: TextSize::new(0) },
+///     SourceMarker { source: TextSize::new(0), dest: TextSize::new(7) },
+///     SourceMarker { source: TextSize::new(8), dest: TextSize::new(7) },
+///     SourceMarker { source: TextSize::new(8), dest: TextSize::new(13) },
+///     SourceMarker { source: TextSize::new(14), dest: TextSize::new(13) },
+///     SourceMarker { source: TextSize::new(14), dest: TextSize::new(14) },
+///     SourceMarker { source: TextSize::new(20), dest: TextSize::new(14) },
+/// ]);
+///
+/// # Ok(())
+/// # }
+/// ```
+pub const fn source_position(position: TextSize) -> SourcePosition {
+    SourcePosition(position)
+}
+
+#[derive(Eq, PartialEq, Copy, Clone, Debug)]
+pub struct SourcePosition(TextSize);
+
+impl<Context> Format<Context> for SourcePosition {
+    fn fmt(&self, f: &mut Formatter<Context>) -> FormatResult<()> {
+        f.write_element(FormatElement::SourcePosition(self.0))
+    }
+}
+
+/// Creates a text from a dynamic string with its optional start-position in the source document
+pub fn dynamic_text(text: &str, position: Option<TextSize>) -> DynamicText {
     debug_assert_no_newlines(text);
 
     DynamicText { text, position }
@@ -286,14 +339,17 @@ pub fn dynamic_text(text: &str, position: TextSize) -> DynamicText {
 #[derive(Eq, PartialEq)]
 pub struct DynamicText<'a> {
     text: &'a str,
-    position: TextSize,
+    position: Option<TextSize>,
 }
 
 impl<Context> Format<Context> for DynamicText<'_> {
     fn fmt(&self, f: &mut Formatter<Context>) -> FormatResult<()> {
+        if let Some(source_position) = self.position {
+            f.write_element(FormatElement::SourcePosition(source_position))?;
+        }
+
         f.write_element(FormatElement::DynamicText {
             text: self.text.to_string().into_boxed_str(),
-            source_position: self.position,
         })
     }
 }
@@ -304,31 +360,65 @@ impl std::fmt::Debug for DynamicText<'_> {
     }
 }
 
-/// Creates a text from a dynamic string and a range of the input source
-pub fn static_text_slice(text: Rc<str>, range: TextRange) -> StaticTextSlice {
-    debug_assert_no_newlines(&text[range]);
+/// Emits a text as it is written in the source document. Optimized to avoid allocations.
+pub const fn source_text_slice(
+    range: TextRange,
+    newlines: ContainsNewlines,
+) -> SourceTextSliceBuilder {
+    SourceTextSliceBuilder {
+        range,
+        new_lines: newlines,
+    }
+}
+
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+pub enum ContainsNewlines {
+    /// The string contains newline characters
+    Yes,
+    /// The string contains no newline characters
+    No,
 
-    StaticTextSlice { text, range }
+    /// The string may contain newline characters, search the string to determine if there are any newlines.
+    Detect,
 }
 
-#[derive(Eq, PartialEq)]
-pub struct StaticTextSlice {
-    text: Rc<str>,
+#[derive(Eq, PartialEq, Debug)]
+pub struct SourceTextSliceBuilder {
     range: TextRange,
+    new_lines: ContainsNewlines,
 }
 
-impl<Context> Format<Context> for StaticTextSlice {
+impl<Context> Format<Context> for SourceTextSliceBuilder
+where
+    Context: FormatContext,
+{
     fn fmt(&self, f: &mut Formatter<Context>) -> FormatResult<()> {
-        f.write_element(FormatElement::StaticTextSlice {
-            text: self.text.clone(),
-            range: self.range,
-        })
-    }
-}
+        let source_code = f.context().source_code();
+        let slice = source_code.slice(self.range);
+        debug_assert_no_newlines(slice.text(source_code));
+
+        let contains_newlines = match self.new_lines {
+            ContainsNewlines::Yes => {
+                debug_assert!(
+                    slice.text(source_code).contains('\n'),
+                    "Text contains no new line characters but the caller specified that it does."
+                );
+                true
+            }
+            ContainsNewlines::No => {
+                debug_assert!(
+                    !slice.text(source_code).contains('\n'),
+                    "Text contains new line characters but the caller specified that it does not."
+                );
+                false
+            }
+            ContainsNewlines::Detect => slice.text(source_code).contains('\n'),
+        };
 
-impl std::fmt::Debug for StaticTextSlice {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::write!(f, "StaticTextSlice({})", &self.text[self.range])
+        f.write_element(FormatElement::SourceCodeSlice {
+            slice,
+            contains_newlines,
+        })
     }
 }
 
@@ -1781,7 +1871,7 @@ impl<Context, T> std::fmt::Debug for FormatWith<Context, T> {
 ///                 let mut join = f.join_with(&separator);
 ///
 ///                 for item in &self.items {
-///                     join.entry(&format_with(|f| write!(f, [dynamic_text(item, TextSize::default())])));
+///                     join.entry(&format_with(|f| write!(f, [dynamic_text(item, None)])));
 ///                 }
 ///                 join.finish()
 ///             })),
@@ -2041,11 +2131,11 @@ impl<'a, 'buf, Context> FillBuilder<'a, 'buf, Context> {
 /// The first variant is the most flat, and the last is the most expanded variant.
 /// See [`best_fitting!`] macro for a more in-detail documentation
 #[derive(Copy, Clone)]
-pub struct BestFitting<'a, Context> {
+pub struct FormatBestFitting<'a, Context> {
     variants: Arguments<'a, Context>,
 }
 
-impl<'a, Context> BestFitting<'a, Context> {
+impl<'a, Context> FormatBestFitting<'a, Context> {
     /// Creates a new best fitting IR with the given variants. The method itself isn't unsafe
     /// but it is to discourage people from using it because the printer will panic if
     /// the slice doesn't contain at least the least and most expanded variants.
@@ -2064,7 +2154,7 @@ impl<'a, Context> BestFitting<'a, Context> {
     }
 }
 
-impl<Context> Format<Context> for BestFitting<'_, Context> {
+impl<Context> Format<Context> for FormatBestFitting<'_, Context> {
     fn fmt(&self, f: &mut Formatter<Context>) -> FormatResult<()> {
         let mut buffer = VecBuffer::new(f.state_mut());
         let variants = self.variants.items();
diff --git a/crates/ruff_formatter/src/format_element.rs b/crates/ruff_formatter/src/format_element.rs
index fda6ee227201d..a7dd7dedae9ba 100644
--- a/crates/ruff_formatter/src/format_element.rs
+++ b/crates/ruff_formatter/src/format_element.rs
@@ -1,17 +1,16 @@
 pub mod document;
 pub mod tag;
 
-use crate::format_element::tag::{LabelId, Tag};
 use std::borrow::Cow;
-
-#[cfg(target_pointer_width = "64")]
-use crate::static_assert;
-use crate::{TagKind, TextSize};
-use ruff_text_size::TextRange;
 use std::hash::{Hash, Hasher};
 use std::ops::Deref;
 use std::rc::Rc;
 
+use crate::format_element::tag::{LabelId, Tag};
+use crate::source_code::SourceCodeSlice;
+use crate::TagKind;
+use ruff_text_size::TextSize;
+
 /// Language agnostic IR for formatting source code.
 ///
 /// Use the helper functions like [crate::builders::space], [crate::builders::soft_line_break] etc. defined in this file to create elements.
@@ -26,20 +25,27 @@ pub enum FormatElement {
     /// Forces the parent group to print in expanded mode.
     ExpandParent,
 
+    /// Indicates the position of the elements coming after this element in the source document.
+    /// The printer will create a source map entry from this position in the source document to the
+    /// formatted position.
+    SourcePosition(TextSize),
+
     /// Token constructed by the formatter from a static string
     StaticText { text: &'static str },
 
     /// Token constructed from the input source as a dynamic
-    /// string with its start position in the input document.
+    /// string.
     DynamicText {
         /// There's no need for the text to be mutable, using `Box<str>` safes 8 bytes over `String`.
         text: Box<str>,
-        /// The start position of the dynamic token in the unformatted source code
-        source_position: TextSize,
     },
 
-    /// Token constructed by slicing a defined range from a static string.
-    StaticTextSlice { text: Rc<str>, range: TextRange },
+    /// Text that gets emitted as it is in the source code. Optimized to avoid any allocations.
+    SourceCodeSlice {
+        slice: SourceCodeSlice,
+        /// Whether the string contains any new line characters
+        contains_newlines: bool,
+    },
 
     /// Prevents that line suffixes move past this boundary. Forces the printer to print any pending
     /// line suffixes, potentially by inserting a hard line break.
@@ -69,9 +75,14 @@ impl std::fmt::Debug for FormatElement {
             FormatElement::DynamicText { text, .. } => {
                 fmt.debug_tuple("DynamicText").field(text).finish()
             }
-            FormatElement::StaticTextSlice { text, .. } => {
-                fmt.debug_tuple("Text").field(text).finish()
-            }
+            FormatElement::SourceCodeSlice {
+                slice,
+                contains_newlines,
+            } => fmt
+                .debug_tuple("Text")
+                .field(slice)
+                .field(contains_newlines)
+                .finish(),
             FormatElement::LineSuffixBoundary => write!(fmt, "LineSuffixBoundary"),
             FormatElement::BestFitting(best_fitting) => {
                 fmt.debug_tuple("BestFitting").field(&best_fitting).finish()
@@ -80,6 +91,9 @@ impl std::fmt::Debug for FormatElement {
                 fmt.debug_list().entries(interned.deref()).finish()
             }
             FormatElement::Tag(tag) => fmt.debug_tuple("Tag").field(tag).finish(),
+            FormatElement::SourcePosition(position) => {
+                fmt.debug_tuple("SourcePosition").field(position).finish()
+            }
         }
     }
 }
@@ -217,7 +231,7 @@ impl FormatElement {
     pub const fn is_text(&self) -> bool {
         matches!(
             self,
-            FormatElement::StaticTextSlice { .. }
+            FormatElement::SourceCodeSlice { .. }
                 | FormatElement::DynamicText { .. }
                 | FormatElement::StaticText { .. }
         )
@@ -236,14 +250,17 @@ impl FormatElements for FormatElement {
             FormatElement::Line(line_mode) => matches!(line_mode, LineMode::Hard | LineMode::Empty),
             FormatElement::StaticText { text } => text.contains('\n'),
             FormatElement::DynamicText { text, .. } => text.contains('\n'),
-            FormatElement::StaticTextSlice { text, range } => text[*range].contains('\n'),
+            FormatElement::SourceCodeSlice {
+                contains_newlines, ..
+            } => *contains_newlines,
             FormatElement::Interned(interned) => interned.will_break(),
             // Traverse into the most flat version because the content is guaranteed to expand when even
             // the most flat version contains some content that forces a break.
             FormatElement::BestFitting(best_fitting) => best_fitting.most_flat().will_break(),
-            FormatElement::LineSuffixBoundary | FormatElement::Space | FormatElement::Tag(_) => {
-                false
-            }
+            FormatElement::LineSuffixBoundary
+            | FormatElement::Space
+            | FormatElement::Tag(_)
+            | FormatElement::SourcePosition(_) => false,
         }
     }
 
@@ -369,20 +386,25 @@ mod tests {
 }
 
 #[cfg(target_pointer_width = "64")]
-static_assert!(std::mem::size_of::<ruff_text_size::TextRange>() == 8usize);
+mod sizes {
+    // Increasing the size of FormatElement has serious consequences on runtime performance and memory footprint.
+    // Is there a more efficient way to encode the data to avoid increasing its size? Can the information
+    // be recomputed at a later point in time?
+    // You reduced the size of a format element? Excellent work!
 
-#[cfg(target_pointer_width = "64")]
-static_assert!(std::mem::size_of::<crate::format_element::tag::VerbatimKind>() == 8usize);
+    use static_assertions::assert_eq_size;
 
-#[cfg(not(debug_assertions))]
-#[cfg(target_pointer_width = "64")]
-static_assert!(std::mem::size_of::<crate::format_element::Tag>() == 16usize);
+    assert_eq_size!(ruff_text_size::TextRange, [u8; 8]);
+    assert_eq_size!(crate::prelude::tag::VerbatimKind, [u8; 8]);
+    assert_eq_size!(crate::prelude::Interned, [u8; 16]);
+    assert_eq_size!(crate::format_element::BestFitting, [u8; 16]);
 
-// Increasing the size of FormatElement has serious consequences on runtime performance and memory footprint.
-// Is there a more efficient way to encode the data to avoid increasing its size? Can the information
-// be recomputed at a later point in time?
-// You reduced the size of a format element? Excellent work!
+    #[cfg(not(debug_assertions))]
+    assert_eq_size!(crate::SourceCodeSlice, [u8; 8]);
 
-#[cfg(not(debug_assertions))]
-#[cfg(target_pointer_width = "64")]
-static_assert!(std::mem::size_of::<crate::FormatElement>() == 32usize);
+    #[cfg(not(debug_assertions))]
+    assert_eq_size!(crate::format_element::Tag, [u8; 16]);
+
+    #[cfg(not(debug_assertions))]
+    assert_eq_size!(crate::FormatElement, [u8; 24]);
+}
diff --git a/crates/ruff_formatter/src/format_element/document.rs b/crates/ruff_formatter/src/format_element/document.rs
index be389b1a348b2..2b83cb9907028 100644
--- a/crates/ruff_formatter/src/format_element/document.rs
+++ b/crates/ruff_formatter/src/format_element/document.rs
@@ -3,12 +3,12 @@ use crate::format_element::tag::DedentMode;
 use crate::prelude::tag::GroupMode;
 use crate::prelude::*;
 use crate::printer::LineEnding;
+use crate::source_code::SourceCode;
 use crate::{format, write};
 use crate::{
     BufferExtensions, Format, FormatContext, FormatElement, FormatOptions, FormatResult, Formatter,
     IndentStyle, LineWidth, PrinterOptions,
 };
-use ruff_text_size::TextSize;
 use rustc_hash::FxHashMap;
 use std::collections::HashMap;
 use std::ops::Deref;
@@ -81,7 +81,9 @@ impl Document {
                     }
                     FormatElement::StaticText { text } => text.contains('\n'),
                     FormatElement::DynamicText { text, .. } => text.contains('\n'),
-                    FormatElement::StaticTextSlice { text, range } => text[*range].contains('\n'),
+                    FormatElement::SourceCodeSlice {
+                        contains_newlines, ..
+                    } => *contains_newlines,
                     FormatElement::ExpandParent
                     | FormatElement::Line(LineMode::Hard | LineMode::Empty) => true,
                     _ => false,
@@ -100,6 +102,13 @@ impl Document {
         let mut interned: FxHashMap<&Interned, bool> = FxHashMap::default();
         propagate_expands(self, &mut enclosing, &mut interned);
     }
+
+    pub fn display<'a>(&'a self, source_code: SourceCode<'a>) -> DisplayDocument {
+        DisplayDocument {
+            elements: self.elements.as_slice(),
+            source_code,
+        }
+    }
 }
 
 impl From<Vec<FormatElement>> for Document {
@@ -116,9 +125,14 @@ impl Deref for Document {
     }
 }
 
-impl std::fmt::Display for Document {
+pub struct DisplayDocument<'a> {
+    elements: &'a [FormatElement],
+    source_code: SourceCode<'a>,
+}
+
+impl std::fmt::Display for DisplayDocument<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let formatted = format!(IrFormatContext::default(), [self.elements.as_slice()])
+        let formatted = format!(IrFormatContext::new(self.source_code), [self.elements])
             .expect("Formatting not to throw any FormatErrors");
 
         f.write_str(
@@ -130,18 +144,39 @@ impl std::fmt::Display for Document {
     }
 }
 
-#[derive(Clone, Default, Debug)]
-struct IrFormatContext {
+impl std::fmt::Debug for DisplayDocument<'_> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Display::fmt(self, f)
+    }
+}
+
+#[derive(Clone, Debug)]
+struct IrFormatContext<'a> {
     /// The interned elements that have been printed to this point
     printed_interned_elements: HashMap<Interned, usize>,
+
+    source_code: SourceCode<'a>,
 }
 
-impl FormatContext for IrFormatContext {
+impl<'a> IrFormatContext<'a> {
+    fn new(source_code: SourceCode<'a>) -> Self {
+        Self {
+            source_code,
+            printed_interned_elements: HashMap::new(),
+        }
+    }
+}
+
+impl FormatContext for IrFormatContext<'_> {
     type Options = IrFormatOptions;
 
     fn options(&self) -> &Self::Options {
         &IrFormatOptions
     }
+
+    fn source_code(&self) -> SourceCode {
+        self.source_code
+    }
 }
 
 #[derive(Debug, Clone, Default)]
@@ -166,7 +201,7 @@ impl FormatOptions for IrFormatOptions {
     }
 }
 
-impl Format<IrFormatContext> for &[FormatElement] {
+impl Format<IrFormatContext<'_>> for &[FormatElement] {
     fn fmt(&self, f: &mut Formatter<IrFormatContext>) -> FormatResult<()> {
         use Tag::*;
 
@@ -190,7 +225,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
                 element @ FormatElement::Space
                 | element @ FormatElement::StaticText { .. }
                 | element @ FormatElement::DynamicText { .. }
-                | element @ FormatElement::StaticTextSlice { .. } => {
+                | element @ FormatElement::SourceCodeSlice { .. } => {
                     if !in_text {
                         write!(f, [text("\"")])?;
                     }
@@ -231,6 +266,16 @@ impl Format<IrFormatContext> for &[FormatElement] {
                     write!(f, [text("expand_parent")])?;
                 }
 
+                FormatElement::SourcePosition(position) => {
+                    write!(
+                        f,
+                        [dynamic_text(
+                            &std::format!("source_position({:?})", position),
+                            None
+                        )]
+                    )?;
+                }
+
                 FormatElement::LineSuffixBoundary => {
                     write!(f, [text("line_suffix_boundary")])?;
                 }
@@ -265,10 +310,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
                             write!(
                                 f,
                                 [
-                                    dynamic_text(
-                                        &std::format!("<interned {index}>"),
-                                        TextSize::default()
-                                    ),
+                                    dynamic_text(&std::format!("<interned {index}>"), None),
                                     space(),
                                     &interned.deref(),
                                 ]
@@ -279,7 +321,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
                                 f,
                                 [dynamic_text(
                                     &std::format!("<ref interned *{reference}>"),
-                                    TextSize::default()
+                                    None
                                 )]
                             )?;
                         }
@@ -300,10 +342,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
                                     f,
                                     [
                                         text("<END_TAG_WITHOUT_START<"),
-                                        dynamic_text(
-                                            &std::format!("{:?}", tag.kind()),
-                                            TextSize::default()
-                                        ),
+                                        dynamic_text(&std::format!("{:?}", tag.kind()), None),
                                         text(">>"),
                                     ]
                                 )?;
@@ -318,15 +357,9 @@ impl Format<IrFormatContext> for &[FormatElement] {
                                         text(")"),
                                         soft_line_break_or_space(),
                                         text("ERROR<START_END_TAG_MISMATCH<start: "),
-                                        dynamic_text(
-                                            &std::format!("{start_kind:?}"),
-                                            TextSize::default()
-                                        ),
+                                        dynamic_text(&std::format!("{start_kind:?}"), None),
                                         text(", end: "),
-                                        dynamic_text(
-                                            &std::format!("{:?}", tag.kind()),
-                                            TextSize::default()
-                                        ),
+                                        dynamic_text(&std::format!("{:?}", tag.kind()), None),
                                         text(">>")
                                     ]
                                 )?;
@@ -358,7 +391,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
                                 f,
                                 [
                                     text("align("),
-                                    dynamic_text(&count.to_string(), TextSize::default()),
+                                    dynamic_text(&count.to_string(), None),
                                     text(","),
                                     space(),
                                 ]
@@ -380,10 +413,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
                                 write!(
                                     f,
                                     [
-                                        dynamic_text(
-                                            &std::format!("\"{group_id:?}\""),
-                                            TextSize::default()
-                                        ),
+                                        dynamic_text(&std::format!("\"{group_id:?}\""), None),
                                         text(","),
                                         space(),
                                     ]
@@ -406,7 +436,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
                                 f,
                                 [
                                     text("indent_if_group_breaks("),
-                                    dynamic_text(&std::format!("\"{id:?}\""), TextSize::default()),
+                                    dynamic_text(&std::format!("\"{id:?}\""), None),
                                     text(","),
                                     space(),
                                 ]
@@ -427,10 +457,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
                                 write!(
                                     f,
                                     [
-                                        dynamic_text(
-                                            &std::format!("\"{group_id:?}\""),
-                                            TextSize::default()
-                                        ),
+                                        dynamic_text(&std::format!("\"{group_id:?}\""), None),
                                         text(","),
                                         space(),
                                     ]
@@ -443,10 +470,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
                                 f,
                                 [
                                     text("label("),
-                                    dynamic_text(
-                                        &std::format!("\"{label_id:?}\""),
-                                        TextSize::default()
-                                    ),
+                                    dynamic_text(&std::format!("\"{label_id:?}\""), None),
                                     text(","),
                                     space(),
                                 ]
@@ -490,10 +514,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
                     ContentArrayEnd,
                     text(")"),
                     soft_line_break_or_space(),
-                    dynamic_text(
-                        &std::format!("<START_WITHOUT_END<{top:?}>>"),
-                        TextSize::default()
-                    ),
+                    dynamic_text(&std::format!("<START_WITHOUT_END<{top:?}>>"), None),
                 ]
             )?;
         }
@@ -504,7 +525,7 @@ impl Format<IrFormatContext> for &[FormatElement] {
 
 struct ContentArrayStart;
 
-impl Format<IrFormatContext> for ContentArrayStart {
+impl Format<IrFormatContext<'_>> for ContentArrayStart {
     fn fmt(&self, f: &mut Formatter<IrFormatContext>) -> FormatResult<()> {
         use Tag::*;
 
@@ -520,7 +541,7 @@ impl Format<IrFormatContext> for ContentArrayStart {
 
 struct ContentArrayEnd;
 
-impl Format<IrFormatContext> for ContentArrayEnd {
+impl Format<IrFormatContext<'_>> for ContentArrayEnd {
     fn fmt(&self, f: &mut Formatter<IrFormatContext>) -> FormatResult<()> {
         use Tag::*;
         f.write_elements([
@@ -630,8 +651,9 @@ impl FormatElements for [FormatElement] {
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
-    use crate::SimpleFormatContext;
     use crate::{format, format_args, write};
+    use crate::{SimpleFormatContext, SourceCode};
+    use ruff_text_size::{TextRange, TextSize};
 
     #[test]
     fn display_elements() {
@@ -656,7 +678,51 @@ mod tests {
         let document = formatted.into_document();
 
         assert_eq!(
-            &std::format!("{document}"),
+            &std::format!("{}", document.display(SourceCode::default())),
+            r#"[
+  group([
+    "(",
+    indent([
+      soft_line_break,
+      "Some longer content That should ultimately break"
+    ]),
+    soft_line_break
+  ])
+]"#
+        );
+    }
+
+    #[test]
+    fn display_elements_with_source_text_slice() {
+        let source_code = "Some longer content\nThat should ultimately break";
+        let formatted = format!(
+            SimpleFormatContext::default().with_source_code(source_code),
+            [format_with(|f| {
+                write!(
+                    f,
+                    [group(&format_args![
+                        text("("),
+                        soft_block_indent(&format_args![
+                            source_text_slice(
+                                TextRange::at(TextSize::new(0), TextSize::new(19)),
+                                ContainsNewlines::No
+                            ),
+                            space(),
+                            source_text_slice(
+                                TextRange::at(TextSize::new(20), TextSize::new(28)),
+                                ContainsNewlines::No
+                            ),
+                        ])
+                    ])]
+                )
+            })]
+        )
+        .unwrap();
+
+        let document = formatted.into_document();
+
+        assert_eq!(
+            &std::format!("{}", document.display(SourceCode::new(source_code))),
             r#"[
   group([
     "(",
@@ -692,7 +758,7 @@ mod tests {
         ]);
 
         assert_eq!(
-            &std::format!("{document}"),
+            &std::format!("{}", document.display(SourceCode::default())),
             r#"[
   "[",
   group([
diff --git a/crates/ruff_formatter/src/format_extensions.rs b/crates/ruff_formatter/src/format_extensions.rs
index ceea27f0cbaa5..82b99fda935de 100644
--- a/crates/ruff_formatter/src/format_extensions.rs
+++ b/crates/ruff_formatter/src/format_extensions.rs
@@ -35,7 +35,7 @@ pub trait MemoizeFormat<Context> {
     ///         let value = self.value.get();
     ///         self.value.set(value + 1);
     ///
-    ///         write!(f, [dynamic_text(&std::format!("Formatted {value} times."), TextSize::from(0))])
+    ///         write!(f, [dynamic_text(&std::format!("Formatted {value} times."), None)])
     ///     }
     /// }
     ///
@@ -114,7 +114,7 @@ where
     ///         write!(f, [
     ///             text("Count:"),
     ///             space(),
-    ///             dynamic_text(&std::format!("{current}"), TextSize::default()),
+    ///             dynamic_text(&std::format!("{current}"), None),
     ///             hard_line_break()
     ///         ])?;
     ///
diff --git a/crates/ruff_formatter/src/group_id.rs b/crates/ruff_formatter/src/group_id.rs
index 396bc50b416fc..8f06ae8e3788f 100644
--- a/crates/ruff_formatter/src/group_id.rs
+++ b/crates/ruff_formatter/src/group_id.rs
@@ -64,7 +64,7 @@ pub(super) struct UniqueGroupIdBuilder {
 
 impl UniqueGroupIdBuilder {
     /// Creates a new unique group id with the given debug name.
-    pub fn group_id(&self, debug_name: &'static str) -> GroupId {
+    pub(crate) fn group_id(&self, debug_name: &'static str) -> GroupId {
         let id = self.next_id.fetch_add(1, Ordering::Relaxed);
         let id = NonZeroU32::new(id).unwrap_or_else(|| panic!("Group ID counter overflowed"));
 
diff --git a/crates/ruff_formatter/src/lib.rs b/crates/ruff_formatter/src/lib.rs
index d350705c5b84b..e1f9e4f21e8df 100644
--- a/crates/ruff_formatter/src/lib.rs
+++ b/crates/ruff_formatter/src/lib.rs
@@ -33,12 +33,13 @@ pub mod group_id;
 pub mod macros;
 pub mod prelude;
 pub mod printer;
-mod utility_types;
+mod source_code;
 
 use crate::formatter::Formatter;
 use crate::group_id::UniqueGroupIdBuilder;
 use crate::prelude::TagKind;
 use std::fmt::Debug;
+use std::marker::PhantomData;
 
 use crate::format_element::document::Document;
 use crate::printer::{Printer, PrinterOptions};
@@ -47,7 +48,8 @@ pub use buffer::{
     Buffer, BufferExtensions, BufferSnapshot, Inspect, PreambleBuffer, RemoveSoftLinesBuffer,
     VecBuffer,
 };
-pub use builders::BestFitting;
+pub use builders::FormatBestFitting;
+pub use source_code::{SourceCode, SourceCodeSlice};
 
 pub use crate::diagnostics::{ActualStart, FormatError, InvalidDocumentError, PrintError};
 pub use format_element::{normalize_newlines, FormatElement, LINE_TERMINATORS};
@@ -203,6 +205,9 @@ pub trait FormatContext {
 
     /// Returns the formatting options
     fn options(&self) -> &Self::Options;
+
+    /// Returns the source code from the document that gets formatted.
+    fn source_code(&self) -> SourceCode;
 }
 
 /// Options customizing how the source code should be formatted.
@@ -220,11 +225,20 @@ pub trait FormatOptions {
 #[derive(Debug, Default, Eq, PartialEq)]
 pub struct SimpleFormatContext {
     options: SimpleFormatOptions,
+    source_code: String,
 }
 
 impl SimpleFormatContext {
     pub fn new(options: SimpleFormatOptions) -> Self {
-        Self { options }
+        Self {
+            options,
+            source_code: String::new(),
+        }
+    }
+
+    pub fn with_source_code(mut self, code: &str) -> Self {
+        self.source_code = String::from(code);
+        self
     }
 }
 
@@ -234,9 +248,13 @@ impl FormatContext for SimpleFormatContext {
     fn options(&self) -> &Self::Options {
         &self.options
     }
+
+    fn source_code(&self) -> SourceCode {
+        SourceCode::new(&self.source_code)
+    }
 }
 
-#[derive(Debug, Default, Eq, PartialEq)]
+#[derive(Debug, Default, Eq, PartialEq, Clone)]
 pub struct SimpleFormatOptions {
     pub indent_style: IndentStyle,
     pub line_width: LineWidth,
@@ -303,15 +321,18 @@ where
     Context: FormatContext,
 {
     pub fn print(&self) -> PrintResult<Printed> {
+        let source_code = self.context.source_code();
         let print_options = self.context.options().as_print_options();
-        let printed = Printer::new(print_options).print(&self.document)?;
+        let printed = Printer::new(source_code, print_options).print(&self.document)?;
 
         Ok(printed)
     }
 
     pub fn print_with_indent(&self, indent: u16) -> PrintResult<Printed> {
+        let source_code = self.context.source_code();
         let print_options = self.context.options().as_print_options();
-        let printed = Printer::new(print_options).print_with_indent(&self.document, indent)?;
+        let printed =
+            Printer::new(source_code, print_options).print_with_indent(&self.document, indent)?;
 
         Ok(printed)
     }
@@ -428,7 +449,7 @@ pub type FormatResult<F> = Result<F, FormatError>;
 ///     fn fmt(&self, f: &mut Formatter<SimpleFormatContext>) -> FormatResult<()> {
 ///         write!(f, [
 ///             hard_line_break(),
-///             dynamic_text(&self.0, TextSize::from(0)),
+///             dynamic_text(&self.0, None),
 ///             hard_line_break(),
 ///         ])
 ///     }
@@ -497,14 +518,12 @@ impl<Context> Format<Context> for () {
 ///
 /// That's why the `ruff_js_formatter` crate must define a new-type that implements the formatting
 /// of `JsIfStatement`.
-pub trait FormatRule<T> {
-    type Context;
-
-    fn fmt(&self, item: &T, f: &mut Formatter<Self::Context>) -> FormatResult<()>;
+pub trait FormatRule<T, C> {
+    fn fmt(&self, item: &T, f: &mut Formatter<C>) -> FormatResult<()>;
 }
 
 /// Rule that supports customizing how it formats an object of type `T`.
-pub trait FormatRuleWithOptions<T>: FormatRule<T> {
+pub trait FormatRuleWithOptions<T, C>: FormatRule<T, C> {
     type Options;
 
     /// Returns a new rule that uses the given options to format an object.
@@ -544,26 +563,31 @@ pub trait FormatWithRule<Context>: Format<Context> {
 
 /// Formats the referenced `item` with the specified rule.
 #[derive(Debug, Copy, Clone)]
-pub struct FormatRefWithRule<'a, T, R>
+pub struct FormatRefWithRule<'a, T, R, C>
 where
-    R: FormatRule<T>,
+    R: FormatRule<T, C>,
 {
     item: &'a T,
     rule: R,
+    context: PhantomData<C>,
 }
 
-impl<'a, T, R> FormatRefWithRule<'a, T, R>
+impl<'a, T, R, C> FormatRefWithRule<'a, T, R, C>
 where
-    R: FormatRule<T>,
+    R: FormatRule<T, C>,
 {
     pub fn new(item: &'a T, rule: R) -> Self {
-        Self { item, rule }
+        Self {
+            item,
+            rule,
+            context: PhantomData,
+        }
     }
 }
 
-impl<T, R, O> FormatRefWithRule<'_, T, R>
+impl<T, R, O, C> FormatRefWithRule<'_, T, R, C>
 where
-    R: FormatRuleWithOptions<T, Options = O>,
+    R: FormatRuleWithOptions<T, C, Options = O>,
 {
     pub fn with_options(mut self, options: O) -> Self {
         self.rule = self.rule.with_options(options);
@@ -571,9 +595,9 @@ where
     }
 }
 
-impl<T, R> FormatWithRule<R::Context> for FormatRefWithRule<'_, T, R>
+impl<T, R, C> FormatWithRule<C> for FormatRefWithRule<'_, T, R, C>
 where
-    R: FormatRule<T>,
+    R: FormatRule<T, C>,
 {
     type Item = T;
 
@@ -582,32 +606,37 @@ where
     }
 }
 
-impl<T, R> Format<R::Context> for FormatRefWithRule<'_, T, R>
+impl<T, R, C> Format<C> for FormatRefWithRule<'_, T, R, C>
 where
-    R: FormatRule<T>,
+    R: FormatRule<T, C>,
 {
     #[inline(always)]
-    fn fmt(&self, f: &mut Formatter<R::Context>) -> FormatResult<()> {
+    fn fmt(&self, f: &mut Formatter<C>) -> FormatResult<()> {
         self.rule.fmt(self.item, f)
     }
 }
 
 /// Formats the `item` with the specified rule.
 #[derive(Debug, Clone)]
-pub struct FormatOwnedWithRule<T, R>
+pub struct FormatOwnedWithRule<T, R, C>
 where
-    R: FormatRule<T>,
+    R: FormatRule<T, C>,
 {
     item: T,
     rule: R,
+    context: PhantomData<C>,
 }
 
-impl<T, R> FormatOwnedWithRule<T, R>
+impl<T, R, C> FormatOwnedWithRule<T, R, C>
 where
-    R: FormatRule<T>,
+    R: FormatRule<T, C>,
 {
     pub fn new(item: T, rule: R) -> Self {
-        Self { item, rule }
+        Self {
+            item,
+            rule,
+            context: PhantomData,
+        }
     }
 
     pub fn with_item(mut self, item: T) -> Self {
@@ -620,19 +649,19 @@ where
     }
 }
 
-impl<T, R> Format<R::Context> for FormatOwnedWithRule<T, R>
+impl<T, R, C> Format<C> for FormatOwnedWithRule<T, R, C>
 where
-    R: FormatRule<T>,
+    R: FormatRule<T, C>,
 {
     #[inline(always)]
-    fn fmt(&self, f: &mut Formatter<R::Context>) -> FormatResult<()> {
+    fn fmt(&self, f: &mut Formatter<C>) -> FormatResult<()> {
         self.rule.fmt(&self.item, f)
     }
 }
 
-impl<T, R, O> FormatOwnedWithRule<T, R>
+impl<T, R, O, C> FormatOwnedWithRule<T, R, C>
 where
-    R: FormatRuleWithOptions<T, Options = O>,
+    R: FormatRuleWithOptions<T, C, Options = O>,
 {
     pub fn with_options(mut self, options: O) -> Self {
         self.rule = self.rule.with_options(options);
@@ -640,9 +669,9 @@ where
     }
 }
 
-impl<T, R> FormatWithRule<R::Context> for FormatOwnedWithRule<T, R>
+impl<T, R, C> FormatWithRule<C> for FormatOwnedWithRule<T, R, C>
 where
-    R: FormatRule<T>,
+    R: FormatRule<T, C>,
 {
     type Item = T;
 
diff --git a/crates/ruff_formatter/src/macros.rs b/crates/ruff_formatter/src/macros.rs
index 88ad9612406ac..fb6c66e6fa9a0 100644
--- a/crates/ruff_formatter/src/macros.rs
+++ b/crates/ruff_formatter/src/macros.rs
@@ -320,7 +320,7 @@ macro_rules! format {
 /// the content up to the first non-soft line break without exceeding the configured print width.
 /// This definition differs from groups as that non-soft line breaks make group expand.
 ///
-/// [crate::BestFitting] acts as a "break" boundary, meaning that it is considered to fit
+/// [crate::FormatBestFitting] acts as a "break" boundary, meaning that it is considered to fit
 ///
 ///
 /// [`Flat`]: crate::format_element::PrintMode::Flat
@@ -330,7 +330,7 @@ macro_rules! format {
 macro_rules! best_fitting {
     ($least_expanded:expr, $($tail:expr),+ $(,)?) => {{
         unsafe {
-            $crate::BestFitting::from_arguments_unchecked($crate::format_args!($least_expanded, $($tail),+))
+            $crate::FormatBestFitting::from_arguments_unchecked($crate::format_args!($least_expanded, $($tail),+))
         }
     }}
 }
diff --git a/crates/ruff_formatter/src/printer/call_stack.rs b/crates/ruff_formatter/src/printer/call_stack.rs
index 243dbe6fa94c7..8bedc9f783fcc 100644
--- a/crates/ruff_formatter/src/printer/call_stack.rs
+++ b/crates/ruff_formatter/src/printer/call_stack.rs
@@ -31,7 +31,7 @@ pub(super) struct PrintElementArgs {
 }
 
 impl PrintElementArgs {
-    pub fn new(indent: Indention) -> Self {
+    pub(crate) fn new(indent: Indention) -> Self {
         Self {
             indent,
             ..Self::default()
@@ -46,27 +46,27 @@ impl PrintElementArgs {
         self.indent
     }
 
-    pub fn increment_indent_level(mut self, indent_style: IndentStyle) -> Self {
+    pub(crate) fn increment_indent_level(mut self, indent_style: IndentStyle) -> Self {
         self.indent = self.indent.increment_level(indent_style);
         self
     }
 
-    pub fn decrement_indent(mut self) -> Self {
+    pub(crate) fn decrement_indent(mut self) -> Self {
         self.indent = self.indent.decrement();
         self
     }
 
-    pub fn reset_indent(mut self) -> Self {
+    pub(crate) fn reset_indent(mut self) -> Self {
         self.indent = Indention::default();
         self
     }
 
-    pub fn set_indent_align(mut self, count: NonZeroU8) -> Self {
+    pub(crate) fn set_indent_align(mut self, count: NonZeroU8) -> Self {
         self.indent = self.indent.set_align(count);
         self
     }
 
-    pub fn with_print_mode(mut self, mode: PrintMode) -> Self {
+    pub(crate) fn with_print_mode(mut self, mode: PrintMode) -> Self {
         self.mode = mode;
         self
     }
diff --git a/crates/ruff_formatter/src/printer/mod.rs b/crates/ruff_formatter/src/printer/mod.rs
index fa0ade60bbaa8..223a42005db24 100644
--- a/crates/ruff_formatter/src/printer/mod.rs
+++ b/crates/ruff_formatter/src/printer/mod.rs
@@ -23,6 +23,7 @@ use crate::printer::line_suffixes::{LineSuffixEntry, LineSuffixes};
 use crate::printer::queue::{
     AllPredicate, FitsEndPredicate, FitsQueue, PrintQueue, Queue, SingleEntryPredicate,
 };
+use crate::source_code::SourceCode;
 use drop_bomb::DebugDropBomb;
 use ruff_text_size::{TextLen, TextSize};
 use std::num::NonZeroU8;
@@ -32,12 +33,14 @@ use unicode_width::UnicodeWidthChar;
 #[derive(Debug, Default)]
 pub struct Printer<'a> {
     options: PrinterOptions,
+    source_code: SourceCode<'a>,
     state: PrinterState<'a>,
 }
 
 impl<'a> Printer<'a> {
-    pub fn new(options: PrinterOptions) -> Self {
+    pub fn new(source_code: SourceCode<'a>, options: PrinterOptions) -> Self {
         Self {
+            source_code,
             options,
             state: PrinterState::default(),
         }
@@ -88,24 +91,19 @@ impl<'a> Printer<'a> {
         let args = stack.top();
 
         match element {
-            FormatElement::Space => {
-                if self.state.line_width > 0 {
-                    self.state.pending_space = true;
-                }
-            }
-
+            FormatElement::Space => self.print_text(" ", None),
             FormatElement::StaticText { text } => self.print_text(text, None),
-            FormatElement::DynamicText {
-                text,
-                source_position,
-            } => self.print_text(text, Some(*source_position)),
-            FormatElement::StaticTextSlice { text, range } => self.print_text(&text[*range], None),
+            FormatElement::DynamicText { text } => self.print_text(text, None),
+            FormatElement::SourceCodeSlice { slice, .. } => {
+                let text = slice.text(self.source_code);
+                self.print_text(text, Some(slice.range()))
+            }
             FormatElement::Line(line_mode) => {
                 if args.mode().is_flat()
                     && matches!(line_mode, LineMode::Soft | LineMode::SoftOrSpace)
                 {
-                    if line_mode == &LineMode::SoftOrSpace && self.state.line_width > 0 {
-                        self.state.pending_space = true;
+                    if line_mode == &LineMode::SoftOrSpace {
+                        self.print_text(" ", None);
                     }
                 } else if self.state.line_suffixes.has_pending() {
                     self.flush_line_suffixes(queue, stack, Some(element));
@@ -129,6 +127,11 @@ impl<'a> Printer<'a> {
                 // Handled in `Document::propagate_expands()
             }
 
+            FormatElement::SourcePosition(position) => {
+                self.state.source_position = *position;
+                self.push_marker();
+            }
+
             FormatElement::LineSuffixBoundary => {
                 const HARD_BREAK: &FormatElement = &FormatElement::Line(LineMode::Hard);
                 self.flush_line_suffixes(queue, stack, Some(HARD_BREAK));
@@ -273,7 +276,7 @@ impl<'a> Printer<'a> {
         result
     }
 
-    fn print_text(&mut self, text: &str, source_position: Option<TextSize>) {
+    fn print_text(&mut self, text: &str, source_range: Option<TextRange>) {
         if !self.state.pending_indent.is_empty() {
             let (indent_char, repeat_count) = match self.options.indent_style() {
                 IndentStyle::Tab => ('\t', 1),
@@ -296,12 +299,6 @@ impl<'a> Printer<'a> {
             }
         }
 
-        // Print pending spaces
-        if self.state.pending_space {
-            self.print_str(" ");
-            self.state.pending_space = false;
-        }
-
         // Insert source map markers before and after the token
         //
         // If the token has source position information the start marker
@@ -311,28 +308,27 @@ impl<'a> Printer<'a> {
         // If the token has no source position (was created by the formatter)
         // both the start and end marker will use the last known position
         // in the input source (from state.source_position)
-        if let Some(source) = source_position {
-            self.state.source_position = source;
+        if let Some(range) = source_range {
+            self.state.source_position = range.start();
         }
 
-        self.push_marker(SourceMarker {
-            source: self.state.source_position,
-            dest: self.state.buffer.text_len(),
-        });
+        self.push_marker();
 
         self.print_str(text);
 
-        if source_position.is_some() {
-            self.state.source_position += text.text_len();
+        if let Some(range) = source_range {
+            self.state.source_position = range.end();
         }
 
-        self.push_marker(SourceMarker {
+        self.push_marker();
+    }
+
+    fn push_marker(&mut self) {
+        let marker = SourceMarker {
             source: self.state.source_position,
             dest: self.state.buffer.text_len(),
-        });
-    }
+        };
 
-    fn push_marker(&mut self, marker: SourceMarker) {
         if let Some(last) = self.state.source_markers.last() {
             if last != &marker {
                 self.state.source_markers.push(marker)
@@ -872,7 +868,6 @@ impl<'a, 'print> FitsMeasurer<'a, 'print> {
 
         let fits_state = FitsState {
             pending_indent: printer.state.pending_indent,
-            pending_space: printer.state.pending_space,
             line_width: printer.state.line_width,
             has_line_suffix: printer.state.line_suffixes.has_pending(),
         };
@@ -961,18 +956,12 @@ impl<'a, 'print> FitsMeasurer<'a, 'print> {
         let args = self.stack.top();
 
         match element {
-            FormatElement::Space => {
-                if self.state.line_width > 0 {
-                    self.state.pending_space = true;
-                }
-            }
+            FormatElement::Space => return Ok(self.fits_text(" ")),
 
             FormatElement::Line(line_mode) => {
                 if args.mode().is_flat() {
                     match line_mode {
-                        LineMode::SoftOrSpace => {
-                            self.state.pending_space = true;
-                        }
+                        LineMode::SoftOrSpace => return Ok(self.fits_text(" ")),
                         LineMode::Soft => {}
                         LineMode::Hard | LineMode::Empty => {
                             return Ok(if self.must_be_flat {
@@ -993,8 +982,9 @@ impl<'a, 'print> FitsMeasurer<'a, 'print> {
 
             FormatElement::StaticText { text } => return Ok(self.fits_text(text)),
             FormatElement::DynamicText { text, .. } => return Ok(self.fits_text(text)),
-            FormatElement::StaticTextSlice { text, range } => {
-                return Ok(self.fits_text(&text[*range]))
+            FormatElement::SourceCodeSlice { slice, .. } => {
+                let text = slice.text(self.printer.source_code);
+                return Ok(self.fits_text(text));
             }
             FormatElement::LineSuffixBoundary => {
                 if self.state.has_line_suffix {
@@ -1008,6 +998,8 @@ impl<'a, 'print> FitsMeasurer<'a, 'print> {
                 }
             }
 
+            FormatElement::SourcePosition(_) => {}
+
             FormatElement::BestFitting(best_fitting) => {
                 let slice = match args.mode() {
                     PrintMode::Flat => best_fitting.most_flat(),
@@ -1135,10 +1127,6 @@ impl<'a, 'print> FitsMeasurer<'a, 'print> {
         self.state.line_width += indent.level() as usize * self.options().indent_width() as usize
             + indent.align() as usize;
 
-        if self.state.pending_space {
-            self.state.line_width += 1;
-        }
-
         for c in text.chars() {
             let char_width = match c {
                 '\t' => self.options().tab_width as usize,
@@ -1158,8 +1146,6 @@ impl<'a, 'print> FitsMeasurer<'a, 'print> {
             return Fits::No;
         }
 
-        self.state.pending_space = false;
-
         Fits::Maybe
     }
 
@@ -1244,7 +1230,6 @@ impl From<bool> for Fits {
 #[derive(Debug)]
 struct FitsState {
     pending_indent: Indention,
-    pending_space: bool,
     has_line_suffix: bool,
     line_width: usize,
 }
@@ -1253,6 +1238,7 @@ struct FitsState {
 mod tests {
     use crate::prelude::*;
     use crate::printer::{LineEnding, PrintWidth, Printer, PrinterOptions};
+    use crate::source_code::SourceCode;
     use crate::{format_args, write, Document, FormatState, IndentStyle, Printed, VecBuffer};
 
     fn format(root: &dyn Format<SimpleFormatContext>) -> Printed {
@@ -1271,7 +1257,7 @@ mod tests {
     ) -> Printed {
         let formatted = crate::format!(SimpleFormatContext::default(), [root]).unwrap();
 
-        Printer::new(options)
+        Printer::new(SourceCode::default(), options)
             .print(formatted.document())
             .expect("Document to be valid")
     }
@@ -1507,9 +1493,12 @@ two lines`,
 
         let document = Document::from(buffer.into_vec());
 
-        let printed = Printer::new(PrinterOptions::default().with_print_width(PrintWidth::new(10)))
-            .print(&document)
-            .unwrap();
+        let printed = Printer::new(
+            SourceCode::default(),
+            PrinterOptions::default().with_print_width(PrintWidth::new(10)),
+        )
+        .print(&document)
+        .unwrap();
 
         assert_eq!(
             printed.as_code(),
@@ -1541,7 +1530,7 @@ two lines`,
                 text("]")
             ]),
             text(";"),
-            &line_suffix(&format_args![space(), text("// trailing"), space()])
+            &line_suffix(&format_args![space(), text("// trailing")])
         ]);
 
         assert_eq!(printed.as_code(), "[1, 2, 3]; // trailing")
diff --git a/crates/ruff_formatter/src/source_code.rs b/crates/ruff_formatter/src/source_code.rs
new file mode 100644
index 0000000000000..8f2104966fd0d
--- /dev/null
+++ b/crates/ruff_formatter/src/source_code.rs
@@ -0,0 +1,93 @@
+use ruff_text_size::{TextRange, TextSize};
+use std::fmt::{Debug, Formatter};
+
+/// The source code of a document that gets formatted
+#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default)]
+pub struct SourceCode<'a> {
+    text: &'a str,
+}
+
+impl<'a> SourceCode<'a> {
+    pub fn new(text: &'a str) -> Self {
+        Self { text }
+    }
+
+    pub fn slice(self, range: TextRange) -> SourceCodeSlice {
+        assert!(
+            usize::from(range.end()) <= self.text.len(),
+            "Range end {:?} out of bounds {}.",
+            range.end(),
+            self.text.len()
+        );
+
+        assert!(
+            self.text.is_char_boundary(usize::from(range.start())),
+            "The range start position {:?} is not a char boundary.",
+            range.start()
+        );
+
+        assert!(
+            self.text.is_char_boundary(usize::from(range.end())),
+            "The range end position {:?} is not a char boundary.",
+            range.end()
+        );
+
+        SourceCodeSlice {
+            range,
+            #[cfg(debug_assertions)]
+            text: String::from(&self.text[range]).into_boxed_str(),
+        }
+    }
+
+    pub fn as_str(&self) -> &'a str {
+        self.text
+    }
+}
+
+impl Debug for SourceCode<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_tuple("SourceCode").field(&self.text).finish()
+    }
+}
+
+/// A slice into the source text of a document.
+///
+/// It only stores the range in production builds for a more compact representation, but it
+/// keeps the original text in debug builds for better developer experience.
+#[derive(Clone, Eq, PartialEq)]
+pub struct SourceCodeSlice {
+    range: TextRange,
+    #[cfg(debug_assertions)]
+    text: Box<str>,
+}
+
+impl SourceCodeSlice {
+    /// Returns the slice's text.
+    pub fn text<'a>(&self, code: SourceCode<'a>) -> &'a str {
+        assert!(usize::from(self.range.end()) <= code.text.len(), "The range of this slice is out of bounds. Did you provide the correct source code for this slice?");
+        &code.text[self.range]
+    }
+
+    pub const fn range(&self) -> TextRange {
+        self.range
+    }
+
+    pub const fn start(&self) -> TextSize {
+        self.range.start()
+    }
+
+    pub const fn end(&self) -> TextSize {
+        self.range.end()
+    }
+}
+
+impl Debug for SourceCodeSlice {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        let mut tuple = f.debug_tuple("SourceCodeSlice");
+
+        #[cfg(debug_assertions)]
+        tuple.field(&self.text);
+
+        tuple.field(&self.range).finish()
+    }
+}
diff --git a/crates/ruff_formatter/src/utility_types.rs b/crates/ruff_formatter/src/utility_types.rs
deleted file mode 100644
index 9a8f0e122c775..0000000000000
--- a/crates/ruff_formatter/src/utility_types.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#[cfg(target_pointer_width = "64")]
-#[macro_export]
-macro_rules! static_assert {
-    ($expr:expr) => {
-        const _: i32 = 0 / $expr as i32;
-    };
-}
diff --git a/crates/ruff_index/Cargo.toml b/crates/ruff_index/Cargo.toml
new file mode 100644
index 0000000000000..77e1c3fb56d28
--- /dev/null
+++ b/crates/ruff_index/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "ruff_index"
+version = "0.0.0"
+publish = false
+edition = { workspace = true }
+rust-version = { workspace = true }
+
+[lib]
+
+[dependencies]
+ruff_macros = { path = "../ruff_macros" }
+
+[dev-dependencies]
+static_assertions = "1.1.0"
diff --git a/crates/ruff_index/src/idx.rs b/crates/ruff_index/src/idx.rs
new file mode 100644
index 0000000000000..aa7b1f6ac4533
--- /dev/null
+++ b/crates/ruff_index/src/idx.rs
@@ -0,0 +1,60 @@
+use std::hash::Hash;
+
+/// Represents a newtype wrapper used to index into a Vec or a slice.
+///
+/// You can use the [`newtype_index`](crate::newtype_index) macro to define your own index.
+pub trait Idx: Copy + PartialEq + Eq + Hash + std::fmt::Debug + 'static {
+    fn new(value: usize) -> Self;
+
+    fn index(self) -> usize;
+}
+
+#[cfg(test)]
+mod tests {
+
+    use crate::newtype_index;
+    use static_assertions::{assert_eq_size, assert_impl_all};
+
+    // Allows the macro invocation below to work
+    use crate as ruff_index;
+
+    #[newtype_index]
+    #[derive(PartialOrd, Ord)]
+    struct MyIndex;
+
+    assert_impl_all!(MyIndex: Ord, PartialOrd);
+    assert_eq_size!(MyIndex, Option<MyIndex>);
+
+    #[test]
+    #[should_panic(expected = "assertion failed: value <= Self::MAX")]
+    fn from_u32_panics_for_u32_max() {
+        MyIndex::from_u32(u32::MAX);
+    }
+
+    #[test]
+    #[should_panic(expected = "assertion failed: value <= Self::MAX")]
+    fn from_usize_panics_for_u32_max() {
+        MyIndex::from_usize(u32::MAX as usize);
+    }
+
+    #[test]
+    fn max_value() {
+        let max_value = MyIndex::from_u32(u32::MAX - 1);
+
+        assert_eq!(max_value.as_u32(), u32::MAX - 1);
+    }
+
+    #[test]
+    fn max_value_usize() {
+        let max_value = MyIndex::from_usize((u32::MAX - 1) as usize);
+
+        assert_eq!(max_value.as_u32(), u32::MAX - 1);
+    }
+
+    #[test]
+    fn debug() {
+        let output = format!("{:?}", MyIndex::from(10u32));
+
+        assert_eq!(output, "MyIndex(10)");
+    }
+}
diff --git a/crates/ruff_index/src/lib.rs b/crates/ruff_index/src/lib.rs
new file mode 100644
index 0000000000000..6f7ac59c41791
--- /dev/null
+++ b/crates/ruff_index/src/lib.rs
@@ -0,0 +1,13 @@
+//! Provides new-type wrappers for collections that are indexed by a [`Idx`] rather
+//! than `usize`.
+//!
+//! Inspired by [rustc_index](https://github.com/rust-lang/rust/blob/master/compiler/rustc_index/src/lib.rs).
+
+mod idx;
+mod slice;
+mod vec;
+
+pub use idx::Idx;
+pub use ruff_macros::newtype_index;
+pub use slice::IndexSlice;
+pub use vec::IndexVec;
diff --git a/crates/ruff_index/src/slice.rs b/crates/ruff_index/src/slice.rs
new file mode 100644
index 0000000000000..ddb534ea82358
--- /dev/null
+++ b/crates/ruff_index/src/slice.rs
@@ -0,0 +1,178 @@
+use crate::vec::IndexVec;
+use crate::Idx;
+use std::fmt::{Debug, Formatter};
+use std::marker::PhantomData;
+use std::ops::{Index, IndexMut};
+
+/// A view into contiguous `T`s, indexed by `I` rather than by `usize`.
+#[derive(PartialEq, Eq, Hash)]
+#[repr(transparent)]
+pub struct IndexSlice<I, T> {
+    index: PhantomData<I>,
+    pub raw: [T],
+}
+
+impl<I: Idx, T> IndexSlice<I, T> {
+    #[inline]
+    pub const fn empty() -> &'static Self {
+        Self::from_raw(&[])
+    }
+
+    #[inline]
+    pub const fn from_raw(raw: &[T]) -> &Self {
+        let ptr: *const [T] = raw;
+
+        #[allow(unsafe_code)]
+        // SAFETY: `IndexSlice` is `repr(transparent)` over a normal slice
+        unsafe {
+            &*(ptr as *const Self)
+        }
+    }
+
+    #[inline]
+    pub fn from_raw_mut(raw: &mut [T]) -> &mut Self {
+        let ptr: *mut [T] = raw;
+
+        #[allow(unsafe_code)]
+        // SAFETY: `IndexSlice` is `repr(transparent)` over a normal slice
+        unsafe {
+            &mut *(ptr as *mut Self)
+        }
+    }
+
+    #[inline]
+    pub const fn len(&self) -> usize {
+        self.raw.len()
+    }
+
+    #[inline]
+    pub const fn is_empty(&self) -> bool {
+        self.raw.is_empty()
+    }
+
+    #[inline]
+    pub fn iter(&self) -> std::slice::Iter<'_, T> {
+        self.raw.iter()
+    }
+
+    /// Returns an iterator over the indices
+    #[inline]
+    pub fn indices(
+        &self,
+    ) -> impl DoubleEndedIterator<Item = I> + ExactSizeIterator + Clone + 'static {
+        (0..self.len()).map(|n| I::new(n))
+    }
+
+    #[inline]
+    pub fn iter_mut(&mut self) -> std::slice::IterMut<'_, T> {
+        self.raw.iter_mut()
+    }
+
+    #[inline]
+    pub fn last_index(&self) -> Option<I> {
+        self.len().checked_sub(1).map(I::new)
+    }
+
+    #[inline]
+    pub fn swap(&mut self, a: I, b: I) {
+        self.raw.swap(a.index(), b.index());
+    }
+
+    #[inline]
+    pub fn get(&self, index: I) -> Option<&T> {
+        self.raw.get(index.index())
+    }
+
+    #[inline]
+    pub fn get_mut(&mut self, index: I) -> Option<&mut T> {
+        self.raw.get_mut(index.index())
+    }
+
+    #[inline]
+    pub fn binary_search(&self, value: &T) -> Result<I, I>
+    where
+        T: Ord,
+    {
+        match self.raw.binary_search(value) {
+            Ok(i) => Ok(Idx::new(i)),
+            Err(i) => Err(Idx::new(i)),
+        }
+    }
+}
+
+impl<I, T> Debug for IndexSlice<I, T>
+where
+    I: Idx,
+    T: Debug,
+{
+    fn fmt(&self, fmt: &mut Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Debug::fmt(&self.raw, fmt)
+    }
+}
+
+impl<I: Idx, T> Index<I> for IndexSlice<I, T> {
+    type Output = T;
+
+    #[inline]
+    fn index(&self, index: I) -> &T {
+        &self.raw[index.index()]
+    }
+}
+
+impl<I: Idx, T> IndexMut<I> for IndexSlice<I, T> {
+    #[inline]
+    fn index_mut(&mut self, index: I) -> &mut T {
+        &mut self.raw[index.index()]
+    }
+}
+
+impl<'a, I: Idx, T> IntoIterator for &'a IndexSlice<I, T> {
+    type Item = &'a T;
+    type IntoIter = std::slice::Iter<'a, T>;
+
+    #[inline]
+    fn into_iter(self) -> std::slice::Iter<'a, T> {
+        self.raw.iter()
+    }
+}
+
+impl<'a, I: Idx, T> IntoIterator for &'a mut IndexSlice<I, T> {
+    type Item = &'a mut T;
+    type IntoIter = std::slice::IterMut<'a, T>;
+
+    #[inline]
+    fn into_iter(self) -> std::slice::IterMut<'a, T> {
+        self.raw.iter_mut()
+    }
+}
+
+impl<I: Idx, T: Clone> ToOwned for IndexSlice<I, T> {
+    type Owned = IndexVec<I, T>;
+
+    fn to_owned(&self) -> IndexVec<I, T> {
+        IndexVec::from_raw(self.raw.to_owned())
+    }
+
+    fn clone_into(&self, target: &mut IndexVec<I, T>) {
+        self.raw.clone_into(&mut target.raw);
+    }
+}
+
+impl<I: Idx, T> Default for &IndexSlice<I, T> {
+    #[inline]
+    fn default() -> Self {
+        IndexSlice::from_raw(Default::default())
+    }
+}
+
+impl<I: Idx, T> Default for &mut IndexSlice<I, T> {
+    #[inline]
+    fn default() -> Self {
+        IndexSlice::from_raw_mut(Default::default())
+    }
+}
+
+// Whether `IndexSlice` is `Send` depends only on the data,
+// not the phantom data.
+#[allow(unsafe_code)]
+unsafe impl<I: Idx, T> Send for IndexSlice<I, T> where T: Send {}
diff --git a/crates/ruff_index/src/vec.rs b/crates/ruff_index/src/vec.rs
new file mode 100644
index 0000000000000..36fa6388aca89
--- /dev/null
+++ b/crates/ruff_index/src/vec.rs
@@ -0,0 +1,170 @@
+use crate::slice::IndexSlice;
+use crate::Idx;
+use std::borrow::{Borrow, BorrowMut};
+use std::fmt::{Debug, Formatter};
+use std::marker::PhantomData;
+use std::ops::{Deref, DerefMut, RangeBounds};
+
+/// An owned sequence of `T` indexed by `I`
+#[derive(Clone, PartialEq, Eq, Hash)]
+#[repr(transparent)]
+pub struct IndexVec<I, T> {
+    pub raw: Vec<T>,
+    index: PhantomData<I>,
+}
+
+impl<I: Idx, T> IndexVec<I, T> {
+    #[inline]
+    pub fn new() -> Self {
+        Self {
+            raw: Vec::new(),
+            index: PhantomData,
+        }
+    }
+
+    #[inline]
+    pub fn with_capacity(capacity: usize) -> Self {
+        Self {
+            raw: Vec::with_capacity(capacity),
+            index: PhantomData,
+        }
+    }
+
+    #[inline]
+    pub fn from_raw(raw: Vec<T>) -> Self {
+        Self {
+            raw,
+            index: PhantomData,
+        }
+    }
+
+    #[inline]
+    pub fn drain<R: RangeBounds<usize>>(&mut self, range: R) -> impl Iterator<Item = T> + '_ {
+        self.raw.drain(range)
+    }
+
+    #[inline]
+    pub fn truncate(&mut self, a: usize) {
+        self.raw.truncate(a);
+    }
+
+    #[inline]
+    pub fn as_slice(&self) -> &IndexSlice<I, T> {
+        IndexSlice::from_raw(&self.raw)
+    }
+
+    #[inline]
+    pub fn as_mut_slice(&mut self) -> &mut IndexSlice<I, T> {
+        IndexSlice::from_raw_mut(&mut self.raw)
+    }
+
+    #[inline]
+    pub fn push(&mut self, data: T) -> I {
+        let index = self.next_index();
+        self.raw.push(data);
+        index
+    }
+
+    #[inline]
+    pub fn next_index(&self) -> I {
+        I::new(self.raw.len())
+    }
+}
+
+impl<I, T> Debug for IndexVec<I, T>
+where
+    T: Debug,
+{
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Debug::fmt(&self.raw, f)
+    }
+}
+
+impl<I: Idx, T> Deref for IndexVec<I, T> {
+    type Target = IndexSlice<I, T>;
+
+    fn deref(&self) -> &Self::Target {
+        self.as_slice()
+    }
+}
+
+impl<I: Idx, T> DerefMut for IndexVec<I, T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        self.as_mut_slice()
+    }
+}
+
+impl<I: Idx, T> Borrow<IndexSlice<I, T>> for IndexVec<I, T> {
+    fn borrow(&self) -> &IndexSlice<I, T> {
+        self
+    }
+}
+
+impl<I: Idx, T> BorrowMut<IndexSlice<I, T>> for IndexVec<I, T> {
+    fn borrow_mut(&mut self) -> &mut IndexSlice<I, T> {
+        self
+    }
+}
+
+impl<I, T> Extend<T> for IndexVec<I, T> {
+    #[inline]
+    fn extend<Iter: IntoIterator<Item = T>>(&mut self, iter: Iter) {
+        self.raw.extend(iter);
+    }
+}
+
+impl<I: Idx, T> FromIterator<T> for IndexVec<I, T> {
+    #[inline]
+    fn from_iter<Iter: IntoIterator<Item = T>>(iter: Iter) -> Self {
+        Self::from_raw(Vec::from_iter(iter))
+    }
+}
+
+impl<I: Idx, T> IntoIterator for IndexVec<I, T> {
+    type Item = T;
+    type IntoIter = std::vec::IntoIter<T>;
+
+    #[inline]
+    fn into_iter(self) -> std::vec::IntoIter<T> {
+        self.raw.into_iter()
+    }
+}
+
+impl<'a, I: Idx, T> IntoIterator for &'a IndexVec<I, T> {
+    type Item = &'a T;
+    type IntoIter = std::slice::Iter<'a, T>;
+
+    #[inline]
+    fn into_iter(self) -> std::slice::Iter<'a, T> {
+        self.iter()
+    }
+}
+
+impl<'a, I: Idx, T> IntoIterator for &'a mut IndexVec<I, T> {
+    type Item = &'a mut T;
+    type IntoIter = std::slice::IterMut<'a, T>;
+
+    #[inline]
+    fn into_iter(self) -> std::slice::IterMut<'a, T> {
+        self.iter_mut()
+    }
+}
+
+impl<I: Idx, T> Default for IndexVec<I, T> {
+    #[inline]
+    fn default() -> Self {
+        IndexVec::new()
+    }
+}
+
+impl<I: Idx, T, const N: usize> From<[T; N]> for IndexVec<I, T> {
+    #[inline]
+    fn from(array: [T; N]) -> Self {
+        IndexVec::from_raw(array.into())
+    }
+}
+
+// Whether `IndexVec` is `Send` depends only on the data,
+// not the phantom data.
+#[allow(unsafe_code)]
+unsafe impl<I: Idx, T> Send for IndexVec<I, T> where T: Send {}
diff --git a/crates/ruff_macros/Cargo.toml b/crates/ruff_macros/Cargo.toml
index b2c9b7ca99e4d..f774aee299fde 100644
--- a/crates/ruff_macros/Cargo.toml
+++ b/crates/ruff_macros/Cargo.toml
@@ -10,8 +10,9 @@ proc-macro = true
 doctest = false
 
 [dependencies]
+ruff_textwrap = { path = "../ruff_textwrap" }
+
 proc-macro2 = { workspace = true }
 quote = { workspace = true }
-syn = { workspace = true, features = ["derive", "parsing", "extra-traits"] }
-textwrap = { workspace = true }
+syn = { workspace = true, features = ["derive", "parsing", "extra-traits", "full"] }
 itertools = { workspace = true }
diff --git a/crates/ruff_macros/src/cache_key.rs b/crates/ruff_macros/src/cache_key.rs
index 85087f392f0df..fa1acecedd735 100644
--- a/crates/ruff_macros/src/cache_key.rs
+++ b/crates/ruff_macros/src/cache_key.rs
@@ -3,7 +3,7 @@ use quote::{format_ident, quote};
 use syn::spanned::Spanned;
 use syn::{Data, DeriveInput, Error, Fields};
 
-pub fn derive_cache_key(item: &DeriveInput) -> syn::Result<TokenStream> {
+pub(crate) fn derive_cache_key(item: &DeriveInput) -> syn::Result<TokenStream> {
     let fields = match &item.data {
         Data::Enum(item_enum) => {
             let arms = item_enum.variants.iter().enumerate().map(|(i, variant)| {
diff --git a/crates/ruff_macros/src/combine_options.rs b/crates/ruff_macros/src/combine_options.rs
new file mode 100644
index 0000000000000..8f7e381093e65
--- /dev/null
+++ b/crates/ruff_macros/src/combine_options.rs
@@ -0,0 +1,62 @@
+use quote::{quote, quote_spanned};
+use syn::{Data, DataStruct, DeriveInput, Field, Fields, Path, PathSegment, Type, TypePath};
+
+pub(crate) fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream> {
+    let DeriveInput { ident, data, .. } = input;
+
+    match data {
+        Data::Struct(DataStruct {
+            fields: Fields::Named(fields),
+            ..
+        }) => {
+            let output = fields
+                .named
+                .iter()
+                .map(handle_field)
+                .collect::<Result<Vec<_>, _>>()?;
+
+            Ok(quote! {
+                use crate::settings::configuration::CombinePluginOptions;
+
+                impl CombinePluginOptions for #ident {
+                    fn combine(self, other: Self) -> Self {
+                        Self {
+                        #(
+                            #output
+                        ),*
+                        }
+                    }
+                }
+            })
+        }
+        _ => Err(syn::Error::new(
+            ident.span(),
+            "Can only derive CombineOptions from structs with named fields.",
+        )),
+    }
+}
+
+fn handle_field(field: &Field) -> syn::Result<proc_macro2::TokenStream> {
+    let ident = field
+        .ident
+        .as_ref()
+        .expect("Expected to handle named fields");
+
+    match &field.ty {
+        Type::Path(TypePath {
+            path: Path { segments, .. },
+            ..
+        }) => match segments.first() {
+            Some(PathSegment {
+                ident: type_ident, ..
+            }) if type_ident == "Option" => Ok(quote_spanned!(
+                ident.span() => #ident: self.#ident.or(other.#ident)
+            )),
+            _ => Err(syn::Error::new(
+                ident.span(),
+                "Expected `Option<_>` or `Vec<_>` as type.",
+            )),
+        },
+        _ => Err(syn::Error::new(ident.span(), "Expected type.")),
+    }
+}
diff --git a/crates/ruff_macros/src/config.rs b/crates/ruff_macros/src/config.rs
index f0f2a1843f6a6..38dcaef14bfa7 100644
--- a/crates/ruff_macros/src/config.rs
+++ b/crates/ruff_macros/src/config.rs
@@ -1,3 +1,5 @@
+use ruff_textwrap::dedent;
+
 use quote::{quote, quote_spanned};
 use syn::parse::{Parse, ParseStream};
 use syn::spanned::Spanned;
@@ -7,7 +9,7 @@ use syn::{
     Fields, Lit, LitStr, Path, PathArguments, PathSegment, Token, Type, TypePath,
 };
 
-pub fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream> {
+pub(crate) fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream> {
     let DeriveInput { ident, data, .. } = input;
 
     match data {
@@ -126,7 +128,7 @@ fn handle_option(
     docs: Vec<&Attribute>,
 ) -> syn::Result<proc_macro2::TokenStream> {
     // Convert the list of `doc` attributes into a single string.
-    let doc = textwrap::dedent(
+    let doc = dedent(
         &docs
             .into_iter()
             .map(parse_doc)
@@ -179,7 +181,7 @@ impl Parse for FieldAttributes {
         Ok(Self {
             default,
             value_type,
-            example: textwrap::dedent(&example).trim_matches('\n').to_string(),
+            example: dedent(&example).trim_matches('\n').to_string(),
         })
     }
 }
diff --git a/crates/ruff_macros/src/derive_message_formats.rs b/crates/ruff_macros/src/derive_message_formats.rs
index 9a9fa8e844d71..f72113c2234a0 100644
--- a/crates/ruff_macros/src/derive_message_formats.rs
+++ b/crates/ruff_macros/src/derive_message_formats.rs
@@ -3,7 +3,7 @@ use quote::{quote, quote_spanned, ToTokens};
 use syn::spanned::Spanned;
 use syn::{Block, Expr, ItemFn, Stmt};
 
-pub fn derive_message_formats(func: &ItemFn) -> proc_macro2::TokenStream {
+pub(crate) fn derive_message_formats(func: &ItemFn) -> TokenStream {
     let mut strings = quote!();
 
     if let Err(err) = parse_block(&func.block, &mut strings) {
diff --git a/crates/ruff_macros/src/lib.rs b/crates/ruff_macros/src/lib.rs
index 8234653419d3b..addba01392942 100644
--- a/crates/ruff_macros/src/lib.rs
+++ b/crates/ruff_macros/src/lib.rs
@@ -1,20 +1,22 @@
 //! This crate implements internal macros for the `ruff` library.
 
 use crate::cache_key::derive_cache_key;
+use crate::newtype_index::generate_newtype_index;
 use proc_macro::TokenStream;
 use syn::{parse_macro_input, DeriveInput, ItemFn, ItemStruct};
 
 mod cache_key;
+mod combine_options;
 mod config;
 mod derive_message_formats;
 mod map_codes;
-mod register_rules;
+mod newtype_index;
 mod rule_code_prefix;
 mod rule_namespace;
 mod violation;
 
 #[proc_macro_derive(ConfigurationOptions, attributes(option, doc, option_group))]
-pub fn derive_config(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+pub fn derive_config(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as DeriveInput);
 
     config::derive_impl(input)
@@ -22,6 +24,15 @@ pub fn derive_config(input: proc_macro::TokenStream) -> proc_macro::TokenStream
         .into()
 }
 
+#[proc_macro_derive(CombineOptions)]
+pub fn derive_combine_options(input: TokenStream) -> TokenStream {
+    let input = parse_macro_input!(input as DeriveInput);
+
+    combine_options::derive_impl(input)
+        .unwrap_or_else(syn::Error::into_compile_error)
+        .into()
+}
+
 #[proc_macro_derive(CacheKey)]
 pub fn cache_key(input: TokenStream) -> TokenStream {
     let item = parse_macro_input!(input as DeriveInput);
@@ -32,14 +43,7 @@ pub fn cache_key(input: TokenStream) -> TokenStream {
     TokenStream::from(stream)
 }
 
-#[proc_macro]
-pub fn register_rules(item: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    let mapping = parse_macro_input!(item as register_rules::Input);
-    register_rules::register_rules(&mapping).into()
-}
-
-/// Adds an `explanation()` method from the doc comment and
-/// `#[derive(Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]`
+/// Adds an `explanation()` method from the doc comment.
 #[proc_macro_attribute]
 pub fn violation(_attr: TokenStream, item: TokenStream) -> TokenStream {
     let violation = parse_macro_input!(item as ItemStruct);
@@ -49,7 +53,7 @@ pub fn violation(_attr: TokenStream, item: TokenStream) -> TokenStream {
 }
 
 #[proc_macro_derive(RuleNamespace, attributes(prefix))]
-pub fn derive_rule_namespace(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+pub fn derive_rule_namespace(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as DeriveInput);
 
     rule_namespace::derive_impl(input)
@@ -70,3 +74,33 @@ pub fn derive_message_formats(_attr: TokenStream, item: TokenStream) -> TokenStr
     let func = parse_macro_input!(item as ItemFn);
     derive_message_formats::derive_message_formats(&func).into()
 }
+
+/// Derives a newtype wrapper that can be used as an index.
+/// The wrapper can represent indices up to `u32::MAX - 1`.
+///
+/// The `u32::MAX - 1` is an optimization so that `Option<Index>` has the same size as `Index`.
+///
+/// Can store at most `u32::MAX - 1` values
+///
+/// ## Warning
+///
+/// Additional `derive` attributes must come AFTER this attribute:
+///
+/// Good:
+///
+/// ```rust
+/// #[newtype_index]
+/// #[derive(Ord, PartialOrd)]
+/// struct MyIndex;
+/// ```
+#[proc_macro_attribute]
+pub fn newtype_index(_metadata: TokenStream, input: TokenStream) -> TokenStream {
+    let item = parse_macro_input!(input as ItemStruct);
+
+    let output = match generate_newtype_index(item) {
+        Ok(output) => output,
+        Err(err) => err.to_compile_error(),
+    };
+
+    TokenStream::from(output)
+}
diff --git a/crates/ruff_macros/src/map_codes.rs b/crates/ruff_macros/src/map_codes.rs
index 9c6579ce851b0..0d4b33643ff29 100644
--- a/crates/ruff_macros/src/map_codes.rs
+++ b/crates/ruff_macros/src/map_codes.rs
@@ -8,37 +8,61 @@ use syn::{
     Ident, ItemFn, LitStr, Pat, Path, Stmt, Token,
 };
 
-use crate::rule_code_prefix::{get_prefix_ident, if_all_same};
+use crate::rule_code_prefix::{get_prefix_ident, if_all_same, is_nursery};
+
+/// A rule entry in the big match statement such a
+/// `(Pycodestyle, "E112") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::NoIndentedBlock),`
+#[derive(Clone)]
+struct Rule {
+    /// The actual name of the rule, e.g., `NoIndentedBlock`.
+    name: Ident,
+    /// The linter associated with the rule, e.g., `Pycodestyle`.
+    linter: Ident,
+    /// The code associated with the rule, e.g., `"E112"`.
+    code: LitStr,
+    /// The rule group identifier, e.g., `RuleGroup::Nursery`.
+    group: Path,
+    /// The path to the struct implementing the rule, e.g.
+    /// `rules::pycodestyle::rules::logical_lines::NoIndentedBlock`
+    path: Path,
+    /// The rule attributes, e.g. for feature gates
+    attrs: Vec<Attribute>,
+}
 
-pub fn map_codes(func: &ItemFn) -> syn::Result<TokenStream> {
+pub(crate) fn map_codes(func: &ItemFn) -> syn::Result<TokenStream> {
     let Some(last_stmt) = func.block.stmts.last() else {
         return Err(Error::new(func.block.span(), "expected body to end in an expression"));
     };
-    let Stmt::Expr(Expr::Call(ExprCall{args: some_args, ..}), _) = last_stmt else {
-        return Err(Error::new(last_stmt.span(), "expected last expression to be Some(match (..) { .. })"))
+    let Stmt::Expr(Expr::Call(ExprCall { args: some_args, .. }), _) = last_stmt else {
+        return Err(Error::new(last_stmt.span(), "expected last expression to be `Some(match (..) { .. })`"));
     };
     let mut some_args = some_args.into_iter();
     let (Some(Expr::Match(ExprMatch { arms, .. })), None) = (some_args.next(), some_args.next()) else {
-        return Err(Error::new(last_stmt.span(), "expected last expression to be Some(match (..) { .. })"))
+        return Err(Error::new(last_stmt.span(), "expected last expression to be `Some(match (..) { .. })`"));
     };
 
-    let mut linters: BTreeMap<Ident, BTreeMap<String, (Path, Vec<Attribute>)>> = BTreeMap::new();
+    // Map from: linter (e.g., `Flake8Bugbear`) to rule code (e.g.,`"002"`) to rule data (e.g.,
+    // `(Rule::UnaryPrefixIncrement, RuleGroup::Unspecified, vec![])`).
+    let mut linter_to_rules: BTreeMap<Ident, BTreeMap<String, Rule>> = BTreeMap::new();
 
     for arm in arms {
         if matches!(arm.pat, Pat::Wild(..)) {
             break;
         }
 
-        let entry = syn::parse::<Entry>(arm.into_token_stream().into())?;
-        linters
-            .entry(entry.linter)
+        let rule = syn::parse::<Rule>(arm.into_token_stream().into())?;
+        linter_to_rules
+            .entry(rule.linter.clone())
             .or_default()
-            .insert(entry.code.value(), (entry.rule, entry.attrs));
+            .insert(rule.code.value(), rule);
     }
 
-    let linter_idents: Vec<_> = linters.keys().collect();
+    let linter_idents: Vec<_> = linter_to_rules.keys().collect();
+
+    let all_rules = linter_to_rules.values().flat_map(BTreeMap::values);
+    let mut output = register_rules(all_rules);
 
-    let mut out = quote! {
+    output.extend(quote! {
         #[derive(Debug, Clone, PartialEq, Eq, Hash)]
         pub enum RuleCodePrefix {
             #(#linter_idents(#linter_idents),)*
@@ -47,7 +71,7 @@ pub fn map_codes(func: &ItemFn) -> syn::Result<TokenStream> {
         impl RuleCodePrefix {
             pub fn linter(&self) -> &'static Linter {
                 match self {
-                    #(Self::#linter_idents(..) => &crate::registry::Linter::#linter_idents,)*
+                    #(Self::#linter_idents(..) => &Linter::#linter_idents,)*
                 }
             }
 
@@ -57,15 +81,17 @@ pub fn map_codes(func: &ItemFn) -> syn::Result<TokenStream> {
                 }
             }
         }
-    };
+    });
 
-    for (linter, map) in &linters {
-        out.extend(super::rule_code_prefix::expand(
+    for (linter, rules) in &linter_to_rules {
+        output.extend(super::rule_code_prefix::expand(
             linter,
-            map.iter().map(|(k, v)| (k.as_str(), &v.1)),
+            rules
+                .iter()
+                .map(|(code, Rule { group, attrs, .. })| (code.as_str(), group, attrs)),
         ));
 
-        out.extend(quote! {
+        output.extend(quote! {
             impl From<#linter> for RuleCodePrefix {
                 fn from(linter: #linter) -> Self {
                     Self::#linter(linter)
@@ -81,32 +107,12 @@ pub fn map_codes(func: &ItemFn) -> syn::Result<TokenStream> {
 
     let mut all_codes = Vec::new();
 
-    for (linter, map) in &linters {
-        let mut full_map: HashMap<_, _> = map
-            .iter()
-            .map(|(code, rule)| (code.clone(), vec![rule.clone()]))
-            .collect();
-        for code in map.keys() {
-            for i in 1..=code.len() {
-                let prefix = code[..i].to_string();
-                let rules: Vec<_> = map
-                    .iter()
-                    .filter_map(|(code, rules)| {
-                        if code.starts_with(&prefix) {
-                            Some(rules)
-                        } else {
-                            None
-                        }
-                    })
-                    .cloned()
-                    .collect();
-                full_map.insert(prefix, rules);
-            }
-        }
+    for (linter, rules) in &linter_to_rules {
+        let rules_by_prefix = rules_by_prefix(rules);
 
-        for (code, names) in &full_map {
-            let prefix_ident = get_prefix_ident(code);
-            let attr = match if_all_same(names.iter().map(|(_, attrs)| attrs)) {
+        for (prefix, rules) in &rules_by_prefix {
+            let prefix_ident = get_prefix_ident(prefix);
+            let attr = match if_all_same(rules.iter().map(|(.., attrs)| attrs)) {
                 Some(attr) => quote!(#(#attr)*),
                 None => quote!(),
             };
@@ -117,10 +123,13 @@ pub fn map_codes(func: &ItemFn) -> syn::Result<TokenStream> {
 
         let mut prefix_into_iter_match_arms = quote!();
 
-        for (code, rules) in full_map {
-            let rule_paths = rules.iter().map(|(path, attrs)| quote!(#(#attrs)* #path));
-            let prefix_ident = get_prefix_ident(&code);
-            let attr = match if_all_same(rules.iter().map(|(_, attrs)| attrs)) {
+        for (prefix, rules) in rules_by_prefix {
+            let rule_paths = rules.iter().map(|(path, .., attrs)| {
+                let rule_name = path.segments.last().unwrap();
+                quote!(#(#attrs)* Rule::#rule_name)
+            });
+            let prefix_ident = get_prefix_ident(&prefix);
+            let attr = match if_all_same(rules.iter().map(|(.., attrs)| attrs)) {
                 Some(attr) => quote!(#(#attr)*),
                 None => quote!(),
             };
@@ -129,7 +138,7 @@ pub fn map_codes(func: &ItemFn) -> syn::Result<TokenStream> {
             });
         }
 
-        out.extend(quote! {
+        output.extend(quote! {
             impl IntoIterator for &#linter {
                 type Item = Rule;
                 type IntoIter = ::std::vec::IntoIter<Self::Item>;
@@ -141,7 +150,7 @@ pub fn map_codes(func: &ItemFn) -> syn::Result<TokenStream> {
         });
     }
 
-    out.extend(quote! {
+    output.extend(quote! {
         impl IntoIterator for &RuleCodePrefix {
             type Item = Rule;
             type IntoIter = ::std::vec::IntoIter<Self::Item>;
@@ -154,7 +163,7 @@ pub fn map_codes(func: &ItemFn) -> syn::Result<TokenStream> {
         }
     });
 
-    out.extend(quote! {
+    output.extend(quote! {
         impl RuleCodePrefix {
             pub fn parse(linter: &Linter, code: &str) -> Result<Self, crate::registry::FromCodeError> {
                 use std::str::FromStr;
@@ -166,67 +175,143 @@ pub fn map_codes(func: &ItemFn) -> syn::Result<TokenStream> {
         }
     });
 
-    #[allow(clippy::type_complexity)]
-    let mut rule_to_codes: HashMap<&Path, Vec<(&Ident, &str, &Vec<Attribute>)>> = HashMap::new();
+    let rule_to_code = generate_rule_to_code(&linter_to_rules);
+    output.extend(rule_to_code);
+
+    let iter = generate_iter_impl(&linter_to_rules, &all_codes);
+    output.extend(iter);
+
+    Ok(output)
+}
+
+/// Group the rules by their common prefixes.
+fn rules_by_prefix(
+    rules: &BTreeMap<String, Rule>,
+) -> BTreeMap<String, Vec<(Path, Vec<Attribute>)>> {
+    // TODO(charlie): Why do we do this here _and_ in `rule_code_prefix::expand`?
+    let mut rules_by_prefix = BTreeMap::new();
+
+    for (code, rule) in rules {
+        // Nursery rules have to be explicitly selected, so we ignore them when looking at
+        // prefixes.
+        if is_nursery(&rule.group) {
+            rules_by_prefix.insert(code.clone(), vec![(rule.path.clone(), rule.attrs.clone())]);
+            continue;
+        }
+
+        for i in 1..=code.len() {
+            let prefix = code[..i].to_string();
+            let rules: Vec<_> = rules
+                .iter()
+                .filter_map(|(code, rule)| {
+                    // Nursery rules have to be explicitly selected, so we ignore them when
+                    // looking at prefixes.
+                    if is_nursery(&rule.group) {
+                        return None;
+                    }
+
+                    if code.starts_with(&prefix) {
+                        Some((rule.path.clone(), rule.attrs.clone()))
+                    } else {
+                        None
+                    }
+                })
+                .collect();
+            rules_by_prefix.insert(prefix, rules);
+        }
+    }
+    rules_by_prefix
+}
+
+/// Map from rule to codes that can be used to select it.
+/// This abstraction exists to support a one-to-many mapping, whereby a single rule could map
+/// to multiple codes (e.g., if it existed in multiple linters, like Pylint and Flake8, under
+/// different codes). We haven't actually activated this functionality yet, but some work was
+/// done to support it, so the logic exists here.
+fn generate_rule_to_code(linter_to_rules: &BTreeMap<Ident, BTreeMap<String, Rule>>) -> TokenStream {
+    let mut rule_to_codes: HashMap<&Path, Vec<&Rule>> = HashMap::new();
     let mut linter_code_for_rule_match_arms = quote!();
 
-    for (linter, map) in &linters {
-        for (code, (rule, attrs)) in map {
-            rule_to_codes
-                .entry(rule)
-                .or_default()
-                .push((linter, code, attrs));
+    for (linter, map) in linter_to_rules {
+        for (code, rule) in map {
+            let Rule {
+                path, attrs, name, ..
+            } = rule;
+            rule_to_codes.entry(path).or_default().push(rule);
             linter_code_for_rule_match_arms.extend(quote! {
-                #(#attrs)* (Self::#linter, #rule) => Some(#code),
+                #(#attrs)* (Self::#linter, Rule::#name) => Some(#code),
             });
         }
     }
 
     let mut rule_noqa_code_match_arms = quote!();
+    let mut rule_group_match_arms = quote!();
 
     for (rule, codes) in rule_to_codes {
-        assert!(
-            codes.len() == 1,
+        let rule_name = rule.segments.last().unwrap();
+        assert_eq!(
+            codes.len(),
+            1,
             "
-            The mapping of multiple codes to one rule has been disabled due to UX concerns (it would
-            be confusing if violations were reported under a different code than the code you selected).
+{} is mapped to multiple codes.
 
-            We firstly want to allow rules to be selected by their names (and report them by name),
-            and before we can do that we have to rename all our rules to match our naming convention
-            (see CONTRIBUTING.md) because after that change every rule rename will be a breaking change.
+The mapping of multiple codes to one rule has been disabled due to UX concerns (it would
+be confusing if violations were reported under a different code than the code you selected).
 
-            See also https://github.com/charliermarsh/ruff/issues/2186.
+We firstly want to allow rules to be selected by their names (and report them by name),
+and before we can do that we have to rename all our rules to match our naming convention
+(see CONTRIBUTING.md) because after that change every rule rename will be a breaking change.
 
-            (this was triggered by {} being mapped to multiple codes)
-            ",
-            rule.segments.last().unwrap().ident
+See also https://github.com/charliermarsh/ruff/issues/2186.
+",
+            rule_name.ident
         );
 
-        let (linter, code, attrs) = codes
+        let Rule {
+            linter,
+            code,
+            group,
+            attrs,
+            ..
+        } = codes
             .iter()
-            .sorted_by_key(|(l, ..)| *l == "Pylint") // TODO: more sophisticated sorting
+            .sorted_by_key(|data| data.linter == "Pylint")
             .next()
             .unwrap();
 
         rule_noqa_code_match_arms.extend(quote! {
-            #(#attrs)* #rule => NoqaCode(crate::registry::Linter::#linter.common_prefix(), #code),
+            #(#attrs)* Rule::#rule_name => NoqaCode(crate::registry::Linter::#linter.common_prefix(), #code),
+        });
+
+        rule_group_match_arms.extend(quote! {
+            #(#attrs)* Rule::#rule_name => #group,
         });
     }
 
-    out.extend(quote! {
-        impl crate::registry::Rule {
+    let rule_to_code = quote! {
+        impl Rule {
             pub fn noqa_code(&self) -> NoqaCode {
                 use crate::registry::RuleNamespace;
 
                 match self {
                     #rule_noqa_code_match_arms
-                    // TODO: support rules without codes
-                    // rule => rule.as_ref()
                 }
             }
+
+            pub fn group(&self) -> RuleGroup {
+                use crate::registry::RuleNamespace;
+
+                match self {
+                    #rule_group_match_arms
+                }
+            }
+
+            pub fn is_nursery(&self) -> bool {
+                matches!(self.group(), RuleGroup::Nursery)
+            }
         }
 
-        impl crate::registry::Linter {
+        impl Linter {
             pub fn code_for_rule(&self, rule: Rule) -> Option<&'static str> {
                 match (self, rule) {
                     #linter_code_for_rule_match_arms
@@ -234,19 +319,28 @@ pub fn map_codes(func: &ItemFn) -> syn::Result<TokenStream> {
                 }
             }
         }
-    });
+    };
+    rule_to_code
+}
 
+/// Implement `impl IntoIterator for &Linter` and `RuleCodePrefix::iter()`
+fn generate_iter_impl(
+    linter_to_rules: &BTreeMap<Ident, BTreeMap<String, Rule>>,
+    all_codes: &[TokenStream],
+) -> TokenStream {
     let mut linter_into_iter_match_arms = quote!();
-    for (linter, map) in &linters {
-        let rule_paths = map.values().map(|(path, attrs)| quote!(#(#attrs)* #path));
+    for (linter, map) in linter_to_rules {
+        let rule_paths = map.values().map(|Rule { attrs, path, .. }| {
+            let rule_name = path.segments.last().unwrap();
+            quote!(#(#attrs)* Rule::#rule_name)
+        });
         linter_into_iter_match_arms.extend(quote! {
-            crate::registry::Linter::#linter => vec![#(#rule_paths,)*].into_iter(),
+            Linter::#linter => vec![#(#rule_paths,)*].into_iter(),
         });
     }
 
-    out.extend(quote! {
-
-        impl IntoIterator for &crate::registry::Linter {
+    quote! {
+        impl IntoIterator for &Linter {
             type Item = Rule;
             type IntoIter = ::std::vec::IntoIter<Self::Item>;
 
@@ -257,28 +351,94 @@ pub fn map_codes(func: &ItemFn) -> syn::Result<TokenStream> {
             }
         }
 
-    });
-
-    out.extend(quote! {
         impl RuleCodePrefix {
             pub fn iter() -> ::std::vec::IntoIter<RuleCodePrefix> {
                 vec![ #(#all_codes,)* ].into_iter()
             }
         }
-    });
-
-    Ok(out)
+    }
 }
 
-struct Entry {
-    linter: Ident,
-    code: LitStr,
-    rule: Path,
-    attrs: Vec<Attribute>,
+/// Generate the `Rule` enum
+fn register_rules<'a>(input: impl Iterator<Item = &'a Rule>) -> TokenStream {
+    let mut rule_variants = quote!();
+    let mut rule_message_formats_match_arms = quote!();
+    let mut rule_autofixable_match_arms = quote!();
+    let mut rule_explanation_match_arms = quote!();
+
+    let mut from_impls_for_diagnostic_kind = quote!();
+
+    for Rule {
+        name, attrs, path, ..
+    } in input
+    {
+        rule_variants.extend(quote! {
+            #(#attrs)*
+            #name,
+        });
+        // Apply the `attrs` to each arm, like `[cfg(feature = "foo")]`.
+        rule_message_formats_match_arms
+            .extend(quote! {#(#attrs)* Self::#name => <#path as ruff_diagnostics::Violation>::message_formats(),});
+        rule_autofixable_match_arms.extend(
+            quote! {#(#attrs)* Self::#name => <#path as ruff_diagnostics::Violation>::AUTOFIX,},
+        );
+        rule_explanation_match_arms
+            .extend(quote! {#(#attrs)* Self::#name => #path::explanation(),});
+
+        // Enable conversion from `DiagnosticKind` to `Rule`.
+        from_impls_for_diagnostic_kind
+            .extend(quote! {#(#attrs)* stringify!(#name) => Rule::#name,});
+    }
+
+    quote! {
+        #[derive(
+            EnumIter,
+            Debug,
+            PartialEq,
+            Eq,
+            Copy,
+            Clone,
+            Hash,
+            PartialOrd,
+            Ord,
+            ::ruff_macros::CacheKey,
+            AsRefStr,
+            ::strum_macros::IntoStaticStr,
+        )]
+        #[repr(u16)]
+        #[strum(serialize_all = "kebab-case")]
+        pub enum Rule { #rule_variants }
+
+        impl Rule {
+            /// Returns the format strings used to report violations of this rule.
+            pub fn message_formats(&self) -> &'static [&'static str] {
+                match self { #rule_message_formats_match_arms }
+            }
+
+            /// Returns the documentation for this rule.
+            pub fn explanation(&self) -> Option<&'static str> {
+                match self { #rule_explanation_match_arms }
+            }
+
+            /// Returns the autofix status of this rule.
+            pub const fn autofixable(&self) -> ruff_diagnostics::AutofixKind {
+                match self { #rule_autofixable_match_arms }
+            }
+        }
+
+        impl AsRule for ruff_diagnostics::DiagnosticKind {
+            fn rule(&self) -> Rule {
+                match self.name.as_str() {
+                    #from_impls_for_diagnostic_kind
+                    _ => unreachable!("invalid rule name: {}", self.name),
+                }
+            }
+        }
+    }
 }
 
-impl Parse for Entry {
-    /// Parses a match arm such as `(Pycodestyle, "E101") => Rule::MixedSpacesAndTabs,`
+impl Parse for Rule {
+    /// Parses a match arm such as `(Pycodestyle, "E112") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::NoIndentedBlock),`
     fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
         let attrs = Attribute::parse_outer(input)?;
         let pat_tuple;
@@ -287,12 +447,19 @@ impl Parse for Entry {
         let _: Token!(,) = pat_tuple.parse()?;
         let code: LitStr = pat_tuple.parse()?;
         let _: Token!(=>) = input.parse()?;
-        let rule: Path = input.parse()?;
+        let pat_tuple;
+        parenthesized!(pat_tuple in input);
+        let group: Path = pat_tuple.parse()?;
+        let _: Token!(,) = pat_tuple.parse()?;
+        let rule_path: Path = pat_tuple.parse()?;
         let _: Token!(,) = input.parse()?;
-        Ok(Entry {
+        let rule_name = rule_path.segments.last().unwrap().ident.clone();
+        Ok(Rule {
+            name: rule_name,
             linter,
             code,
-            rule,
+            group,
+            path: rule_path,
             attrs,
         })
     }
diff --git a/crates/ruff_macros/src/newtype_index.rs b/crates/ruff_macros/src/newtype_index.rs
new file mode 100644
index 0000000000000..f6524b48a9e3d
--- /dev/null
+++ b/crates/ruff_macros/src/newtype_index.rs
@@ -0,0 +1,139 @@
+use quote::quote;
+use syn::spanned::Spanned;
+use syn::{Error, ItemStruct};
+
+pub(super) fn generate_newtype_index(item: ItemStruct) -> syn::Result<proc_macro2::TokenStream> {
+    if !item.fields.is_empty() {
+        return Err(Error::new(
+            item.span(),
+            "A new type index cannot have any fields.",
+        ));
+    }
+
+    if !item.generics.params.is_empty() {
+        return Err(Error::new(
+            item.span(),
+            "A new type index cannot be generic.",
+        ));
+    }
+
+    let ItemStruct {
+        attrs,
+        vis,
+        struct_token,
+        ident,
+        generics: _,
+        fields: _,
+        semi_token,
+    } = item;
+
+    let debug_name = ident.to_string();
+
+    let semi_token = semi_token.unwrap_or_default();
+    let output = quote! {
+        #(#attrs)*
+        #[derive(Copy, Clone, Eq, PartialEq, Hash)]
+        #vis #struct_token #ident(std::num::NonZeroU32)#semi_token
+
+        impl #ident {
+            const MAX: u32 = u32::MAX - 1;
+
+            #vis const fn from_usize(value: usize) -> Self {
+                assert!(value <= Self::MAX as usize);
+
+                // SAFETY:
+                // * The `value < u32::MAX` guarantees that the add doesn't overflow.
+                // * The `+ 1` guarantees that the index is not zero
+                #[allow(unsafe_code)]
+                Self(unsafe { std::num::NonZeroU32::new_unchecked((value as u32) + 1) })
+            }
+
+            #vis const fn from_u32(value: u32) -> Self {
+                assert!(value <= Self::MAX);
+
+                // SAFETY:
+                // * The `value < u32::MAX` guarantees that the add doesn't overflow.
+                // * The `+ 1` guarantees that the index is larger than zero.
+                #[allow(unsafe_code)]
+                Self(unsafe { std::num::NonZeroU32::new_unchecked(value + 1) })
+            }
+
+            /// Returns the index as a `u32` value
+            #[inline]
+            #vis const fn as_u32(self) -> u32 {
+                self.0.get() - 1
+            }
+
+            /// Returns the index as a `u32` value
+            #[inline]
+            #vis const fn as_usize(self) -> usize {
+                self.as_u32() as usize
+            }
+
+            #[inline]
+            #vis const fn index(self) -> usize {
+                self.as_usize()
+            }
+        }
+
+        impl std::ops::Add<usize> for #ident {
+            type Output = #ident;
+
+            fn add(self, rhs: usize) -> Self::Output {
+                #ident::from_usize(self.index() + rhs)
+            }
+        }
+
+        impl std::ops::Add for #ident {
+            type Output = #ident;
+
+            fn add(self, rhs: Self) -> Self::Output {
+                #ident::from_usize(self.index() + rhs.index())
+            }
+        }
+
+        impl std::fmt::Debug for #ident {
+            fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                f.debug_tuple(#debug_name).field(&self.index()).finish()
+            }
+        }
+
+        impl ruff_index::Idx for #ident {
+            #[inline]
+            fn new(value: usize) -> Self {
+                #ident::from_usize(value)
+            }
+
+            #[inline]
+            fn index(self) -> usize {
+                self.index()
+            }
+        }
+
+        impl From<usize> for #ident {
+            fn from(value: usize) -> Self {
+                #ident::from_usize(value)
+            }
+        }
+
+        impl From<u32> for #ident {
+            fn from(value: u32) -> Self {
+                #ident::from_u32(value)
+            }
+        }
+
+        impl From<#ident> for usize {
+            fn from(value: #ident) -> Self {
+                value.as_usize()
+            }
+        }
+
+        impl From<#ident> for u32 {
+            fn from(value: #ident) -> Self {
+                value.as_u32()
+            }
+        }
+    };
+
+    Ok(output)
+}
diff --git a/crates/ruff_macros/src/register_rules.rs b/crates/ruff_macros/src/register_rules.rs
deleted file mode 100644
index db98f71d64356..0000000000000
--- a/crates/ruff_macros/src/register_rules.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-use quote::quote;
-use syn::parse::Parse;
-use syn::{Attribute, Ident, Path, Token};
-
-pub fn register_rules(input: &Input) -> proc_macro2::TokenStream {
-    let mut rule_variants = quote!();
-    let mut rule_message_formats_match_arms = quote!();
-    let mut rule_autofixable_match_arms = quote!();
-    let mut rule_explanation_match_arms = quote!();
-
-    let mut from_impls_for_diagnostic_kind = quote!();
-
-    for (path, name, attr) in &input.entries {
-        rule_variants.extend(quote! {
-            #(#attr)*
-            #name,
-        });
-        // Apply the `attrs` to each arm, like `[cfg(feature = "foo")]`.
-        rule_message_formats_match_arms
-            .extend(quote! {#(#attr)* Self::#name => <#path as ruff_diagnostics::Violation>::message_formats(),});
-        rule_autofixable_match_arms.extend(
-            quote! {#(#attr)* Self::#name => <#path as ruff_diagnostics::Violation>::AUTOFIX,},
-        );
-        rule_explanation_match_arms.extend(quote! {#(#attr)* Self::#name => #path::explanation(),});
-
-        // Enable conversion from `DiagnosticKind` to `Rule`.
-        from_impls_for_diagnostic_kind.extend(quote! {#(#attr)* stringify!(#name) => Rule::#name,});
-    }
-
-    quote! {
-        #[derive(
-            EnumIter,
-            Debug,
-            PartialEq,
-            Eq,
-            Copy,
-            Clone,
-            Hash,
-            PartialOrd,
-            Ord,
-            ::ruff_macros::CacheKey,
-            AsRefStr,
-            ::strum_macros::IntoStaticStr,
-        )]
-        #[repr(u16)]
-        #[strum(serialize_all = "kebab-case")]
-        pub enum Rule { #rule_variants }
-
-        impl Rule {
-            /// Returns the format strings used to report violations of this rule.
-            pub fn message_formats(&self) -> &'static [&'static str] {
-                match self { #rule_message_formats_match_arms }
-            }
-
-            /// Returns the documentation for this rule.
-            pub fn explanation(&self) -> Option<&'static str> {
-                match self { #rule_explanation_match_arms }
-            }
-
-            /// Returns the autofix status of this rule.
-            pub const fn autofixable(&self) -> ruff_diagnostics::AutofixKind {
-                match self { #rule_autofixable_match_arms }
-            }
-        }
-
-        impl AsRule for ruff_diagnostics::DiagnosticKind {
-            fn rule(&self) -> Rule {
-                match self.name.as_str() {
-                    #from_impls_for_diagnostic_kind
-                    _ => unreachable!("invalid rule name: {}", self.name),
-                }
-            }
-        }
-    }
-}
-
-pub struct Input {
-    entries: Vec<(Path, Ident, Vec<Attribute>)>,
-}
-
-impl Parse for Input {
-    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
-        let mut entries = Vec::new();
-        while !input.is_empty() {
-            // Grab the `#[cfg(...)]` attributes.
-            let attrs = input.call(Attribute::parse_outer)?;
-
-            let path: Path = input.parse()?;
-            let name = path.segments.last().unwrap().ident.clone();
-            let _: Token![,] = input.parse()?;
-            entries.push((path, name, attrs));
-        }
-        Ok(Self { entries })
-    }
-}
diff --git a/crates/ruff_macros/src/rule_code_prefix.rs b/crates/ruff_macros/src/rule_code_prefix.rs
index 3485cd9734fdb..29379b2cb3610 100644
--- a/crates/ruff_macros/src/rule_code_prefix.rs
+++ b/crates/ruff_macros/src/rule_code_prefix.rs
@@ -2,35 +2,34 @@ use std::collections::{BTreeMap, BTreeSet};
 
 use proc_macro2::Span;
 use quote::quote;
-use syn::{Attribute, Ident};
+use syn::{Attribute, Ident, Path};
 
-pub fn get_prefix_ident(prefix: &str) -> Ident {
-    let prefix = if prefix.as_bytes()[0].is_ascii_digit() {
-        // Identifiers in Rust may not start with a number.
-        format!("_{prefix}")
-    } else {
-        prefix.to_string()
-    };
-    Ident::new(&prefix, Span::call_site())
-}
-
-pub fn expand<'a>(
+pub(crate) fn expand<'a>(
     prefix_ident: &Ident,
-    variants: impl Iterator<Item = (&'a str, &'a Vec<Attribute>)>,
+    variants: impl Iterator<Item = (&'a str, &'a Path, &'a Vec<Attribute>)>,
 ) -> proc_macro2::TokenStream {
     // Build up a map from prefix to matching RuleCodes.
     let mut prefix_to_codes: BTreeMap<String, BTreeSet<String>> = BTreeMap::default();
     let mut code_to_attributes: BTreeMap<String, &[Attribute]> = BTreeMap::default();
 
-    for (variant, attr) in variants {
+    for (variant, group, attr) in variants {
         let code_str = variant.to_string();
-        for i in 1..=code_str.len() {
-            let prefix = code_str[..i].to_string();
+        // Nursery rules have to be explicitly selected, so we ignore them when looking at prefixes.
+        if is_nursery(group) {
             prefix_to_codes
-                .entry(prefix)
+                .entry(code_str.clone())
                 .or_default()
                 .insert(code_str.clone());
+        } else {
+            for i in 1..=code_str.len() {
+                let prefix = code_str[..i].to_string();
+                prefix_to_codes
+                    .entry(prefix)
+                    .or_default()
+                    .insert(code_str.clone());
+            }
         }
+
         code_to_attributes.insert(code_str, attr);
     }
 
@@ -106,7 +105,7 @@ fn attributes_for_prefix(
 
 /// If all values in an iterator are the same, return that value. Otherwise,
 /// return `None`.
-pub fn if_all_same<T: PartialEq>(iter: impl Iterator<Item = T>) -> Option<T> {
+pub(crate) fn if_all_same<T: PartialEq>(iter: impl Iterator<Item = T>) -> Option<T> {
     let mut iter = iter.peekable();
     let first = iter.next()?;
     if iter.all(|x| x == first) {
@@ -115,3 +114,25 @@ pub fn if_all_same<T: PartialEq>(iter: impl Iterator<Item = T>) -> Option<T> {
         None
     }
 }
+
+/// Returns an identifier for the given prefix.
+pub(crate) fn get_prefix_ident(prefix: &str) -> Ident {
+    let prefix = if prefix.as_bytes()[0].is_ascii_digit() {
+        // Identifiers in Rust may not start with a number.
+        format!("_{prefix}")
+    } else {
+        prefix.to_string()
+    };
+    Ident::new(&prefix, Span::call_site())
+}
+
+/// Returns true if the given group is the "nursery" group.
+pub(crate) fn is_nursery(group: &Path) -> bool {
+    let group = group
+        .segments
+        .iter()
+        .map(|segment| segment.ident.to_string())
+        .collect::<Vec<String>>()
+        .join("::");
+    group == "RuleGroup::Nursery"
+}
diff --git a/crates/ruff_macros/src/rule_namespace.rs b/crates/ruff_macros/src/rule_namespace.rs
index b95cbe6f36757..67dd7c4070ea4 100644
--- a/crates/ruff_macros/src/rule_namespace.rs
+++ b/crates/ruff_macros/src/rule_namespace.rs
@@ -5,7 +5,7 @@ use quote::quote;
 use syn::spanned::Spanned;
 use syn::{Attribute, Data, DataEnum, DeriveInput, Error, ExprLit, Lit, Meta, MetaNameValue};
 
-pub fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream> {
+pub(crate) fn derive_impl(input: DeriveInput) -> syn::Result<proc_macro2::TokenStream> {
     let DeriveInput { ident, data: Data::Enum(DataEnum {
         variants, ..
     }), .. } = input else {
diff --git a/crates/ruff_macros/src/violation.rs b/crates/ruff_macros/src/violation.rs
index d5a4a572695a9..8356d0d56ce7e 100644
--- a/crates/ruff_macros/src/violation.rs
+++ b/crates/ruff_macros/src/violation.rs
@@ -45,7 +45,7 @@ fn get_docs(attrs: &[Attribute]) -> Result<String> {
     Ok(explanation)
 }
 
-pub fn violation(violation: &ItemStruct) -> Result<TokenStream> {
+pub(crate) fn violation(violation: &ItemStruct) -> Result<TokenStream> {
     let ident = &violation.ident;
     let explanation = get_docs(&violation.attrs)?;
     let violation = if explanation.trim().is_empty() {
@@ -59,8 +59,7 @@ pub fn violation(violation: &ItemStruct) -> Result<TokenStream> {
 
                     Self {
                         body: Violation::message(&value),
-                        fixable: value.autofix_title_formatter().is_some(),
-                        suggestion: value.autofix_title_formatter().map(|f| f(&value)),
+                        suggestion: Violation::autofix_title(&value),
                         name: stringify!(#ident).to_string(),
                     }
                 }
@@ -83,8 +82,7 @@ pub fn violation(violation: &ItemStruct) -> Result<TokenStream> {
 
                     Self {
                         body: Violation::message(&value),
-                        fixable: value.autofix_title_formatter().is_some(),
-                        suggestion: value.autofix_title_formatter().map(|f| f(&value)),
+                        suggestion: Violation::autofix_title(&value),
                         name: stringify!(#ident).to_string(),
                     }
                 }
diff --git a/crates/ruff_newlines/Cargo.toml b/crates/ruff_newlines/Cargo.toml
new file mode 100644
index 0000000000000..a2dfe8959d38d
--- /dev/null
+++ b/crates/ruff_newlines/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "ruff_newlines"
+version = "0.0.0"
+publish = false
+edition = { workspace = true }
+rust-version = { workspace = true }
+
+[lib]
+
+[dependencies]
+ruff_text_size = { workspace = true }
+
+memchr = { workspace = true }
diff --git a/crates/ruff_python_ast/src/newlines.rs b/crates/ruff_newlines/src/lib.rs
similarity index 95%
rename from crates/ruff_python_ast/src/newlines.rs
rename to crates/ruff_newlines/src/lib.rs
index 5e3b97f85a435..919d4ac231c31 100644
--- a/crates/ruff_python_ast/src/newlines.rs
+++ b/crates/ruff_newlines/src/lib.rs
@@ -1,8 +1,9 @@
-use memchr::{memchr2, memrchr2};
-use ruff_text_size::{TextLen, TextRange, TextSize};
 use std::iter::FusedIterator;
 use std::ops::Deref;
 
+use memchr::{memchr2, memrchr2};
+use ruff_text_size::{TextLen, TextRange, TextSize};
+
 /// Extension trait for [`str`] that provides a [`UniversalNewlineIterator`].
 pub trait StrExt {
     fn universal_newlines(&self) -> UniversalNewlineIterator<'_>;
@@ -21,7 +22,7 @@ impl StrExt for str {
 ///
 /// ```rust
 /// # use ruff_text_size::TextSize;
-/// # use ruff_python_ast::newlines::{Line, UniversalNewlineIterator};
+/// # use ruff_newlines::{Line, UniversalNewlineIterator};
 /// let mut lines = UniversalNewlineIterator::from("foo\nbar\n\r\nbaz\rbop");
 ///
 /// assert_eq!(lines.next_back(), Some(Line::new("bop", TextSize::from(14))));
@@ -231,23 +232,29 @@ impl<'a> Line<'a> {
         TextRange::new(self.start(), self.end())
     }
 
-    /// Returns the text of the line, excluding the terminating new line character.
+    /// Returns the line's new line character, if any.
     #[inline]
-    pub fn as_str(&self) -> &'a str {
+    pub fn line_ending(&self) -> Option<LineEnding> {
         let mut bytes = self.text.bytes().rev();
-
-        let newline_len = match bytes.next() {
+        match bytes.next() {
             Some(b'\n') => {
                 if bytes.next() == Some(b'\r') {
-                    2
+                    Some(LineEnding::CrLf)
                 } else {
-                    1
+                    Some(LineEnding::Lf)
                 }
             }
-            Some(b'\r') => 1,
-            _ => 0,
-        };
+            Some(b'\r') => Some(LineEnding::Cr),
+            _ => None,
+        }
+    }
 
+    /// Returns the text of the line, excluding the terminating new line character.
+    #[inline]
+    pub fn as_str(&self) -> &'a str {
+        let newline_len = self
+            .line_ending()
+            .map_or(0, |line_ending| line_ending.len());
         &self.text[..self.text.len() - newline_len]
     }
 
@@ -337,10 +344,10 @@ impl Deref for LineEnding {
 
 #[cfg(test)]
 mod tests {
-    use super::UniversalNewlineIterator;
-    use crate::newlines::Line;
     use ruff_text_size::TextSize;
 
+    use super::{Line, UniversalNewlineIterator};
+
     #[test]
     fn universal_newlines_empty_str() {
         let lines: Vec<_> = UniversalNewlineIterator::from("").collect();
diff --git a/crates/ruff_python_ast/Cargo.toml b/crates/ruff_python_ast/Cargo.toml
index 1c38445bed7ce..5f5a53ef3552f 100644
--- a/crates/ruff_python_ast/Cargo.toml
+++ b/crates/ruff_python_ast/Cargo.toml
@@ -8,21 +8,27 @@ rust-version = { workspace = true }
 [lib]
 
 [dependencies]
-ruff_rustpython = { path = "../ruff_rustpython" }
-ruff_text_size = { workspace = true, features = ["serde"] }
+ruff_newlines = { path = "../ruff_newlines" }
+ruff_text_size = { workspace = true }
 
 anyhow = { workspace = true }
 bitflags = { workspace = true }
 is-macro = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true }
-memchr = "2.5.0"
-num-bigint = { version = "0.4.3" }
-num-traits = { version = "0.2.15" }
+memchr = { workspace = true }
+num-bigint = { workspace = true }
+num-traits = { workspace = true }
 once_cell = { workspace = true }
-regex = { workspace = true }
 rustc-hash = { workspace = true }
-rustpython-common = { workspace = true }
+rustpython-literal = { workspace = true }
 rustpython-parser = { workspace = true }
+rustpython-ast = { workspace = true }
 serde = { workspace = true, optional = true }
 smallvec = { workspace = true }
+
+[dev-dependencies]
+insta = { workspace = true }
+
+[features]
+serde = ["dep:serde", "ruff_text_size/serde"]
diff --git a/crates/ruff_python_ast/src/all.rs b/crates/ruff_python_ast/src/all.rs
index 1e2a4df836554..29a17869f1356 100644
--- a/crates/ruff_python_ast/src/all.rs
+++ b/crates/ruff_python_ast/src/all.rs
@@ -1,5 +1,5 @@
 use bitflags::bitflags;
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Constant, Expr, Stmt};
 
 bitflags! {
     #[derive(Default, Debug, Copy, Clone, PartialEq, Eq)]
@@ -18,10 +18,10 @@ where
 {
     fn add_to_names<'a>(elts: &'a [Expr], names: &mut Vec<&'a str>, flags: &mut AllNamesFlags) {
         for elt in elts {
-            if let ExprKind::Constant {
+            if let Expr::Constant(ast::ExprConstant {
                 value: Constant::Str(value),
                 ..
-            } = &elt.node
+            }) = elt
             {
                 names.push(value);
             } else {
@@ -30,44 +30,45 @@ where
         }
     }
 
-    fn extract_elts<F>(expr: &Expr, is_builtin: F) -> (Option<&Vec<Expr>>, AllNamesFlags)
+    fn extract_elts<F>(expr: &Expr, is_builtin: F) -> (Option<&[Expr]>, AllNamesFlags)
     where
         F: Fn(&str) -> bool,
     {
-        match &expr.node {
-            ExprKind::List { elts, .. } => {
+        match expr {
+            Expr::List(ast::ExprList { elts, .. }) => {
                 return (Some(elts), AllNamesFlags::empty());
             }
-            ExprKind::Tuple { elts, .. } => {
+            Expr::Tuple(ast::ExprTuple { elts, .. }) => {
                 return (Some(elts), AllNamesFlags::empty());
             }
-            ExprKind::ListComp { .. } => {
+            Expr::ListComp(_) => {
                 // Allow comprehensions, even though we can't statically analyze them.
                 return (None, AllNamesFlags::empty());
             }
-            ExprKind::Call {
+            Expr::Call(ast::ExprCall {
                 func,
                 args,
                 keywords,
-                ..
-            } => {
+                range: _range,
+            }) => {
                 // Allow `tuple()` and `list()` calls.
                 if keywords.is_empty() && args.len() <= 1 {
-                    if let ExprKind::Name { id, .. } = &func.node {
+                    if let Expr::Name(ast::ExprName { id, .. }) = &**func {
+                        let id = id.as_str();
                         if id == "tuple" || id == "list" {
                             if is_builtin(id) {
                                 if args.is_empty() {
                                     return (None, AllNamesFlags::empty());
                                 }
-                                match &args[0].node {
-                                    ExprKind::List { elts, .. }
-                                    | ExprKind::Set { elts, .. }
-                                    | ExprKind::Tuple { elts, .. } => {
+                                match &args[0] {
+                                    Expr::List(ast::ExprList { elts, .. })
+                                    | Expr::Set(ast::ExprSet { elts, .. })
+                                    | Expr::Tuple(ast::ExprTuple { elts, .. }) => {
                                         return (Some(elts), AllNamesFlags::empty());
                                     }
-                                    ExprKind::ListComp { .. }
-                                    | ExprKind::SetComp { .. }
-                                    | ExprKind::GeneratorExp { .. } => {
+                                    Expr::ListComp(_)
+                                    | Expr::SetComp(_)
+                                    | Expr::GeneratorExp(_) => {
                                         // Allow comprehensions, even though we can't statically analyze
                                         // them.
                                         return (None, AllNamesFlags::empty());
@@ -87,13 +88,13 @@ where
     let mut names: Vec<&str> = vec![];
     let mut flags = AllNamesFlags::empty();
 
-    if let Some(value) = match &stmt.node {
-        StmtKind::Assign { value, .. } => Some(value),
-        StmtKind::AnnAssign { value, .. } => value.as_ref(),
-        StmtKind::AugAssign { value, .. } => Some(value),
+    if let Some(value) = match stmt {
+        Stmt::Assign(ast::StmtAssign { value, .. }) => Some(value),
+        Stmt::AnnAssign(ast::StmtAnnAssign { value, .. }) => value.as_ref(),
+        Stmt::AugAssign(ast::StmtAugAssign { value, .. }) => Some(value),
         _ => None,
     } {
-        if let ExprKind::BinOp { left, right, .. } = &value.node {
+        if let Expr::BinOp(ast::ExprBinOp { left, right, .. }) = &**value {
             let mut current_left = left;
             let mut current_right = right;
             loop {
@@ -106,7 +107,7 @@ where
 
                 // Process the left side, which can be a "real" value or the "rest" of the
                 // binary operation.
-                if let ExprKind::BinOp { left, right, .. } = &current_left.node {
+                if let Expr::BinOp(ast::ExprBinOp { left, right, .. }) = &**current_left {
                     current_left = left;
                     current_right = right;
                 } else {
diff --git a/crates/ruff_python_ast/src/branch_detection.rs b/crates/ruff_python_ast/src/branch_detection.rs
deleted file mode 100644
index 2e3b2ced285d4..0000000000000
--- a/crates/ruff_python_ast/src/branch_detection.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-use std::cmp::Ordering;
-
-use rustc_hash::FxHashMap;
-use rustpython_parser::ast::ExcepthandlerKind::ExceptHandler;
-use rustpython_parser::ast::{Stmt, StmtKind};
-
-use crate::types::RefEquality;
-
-/// Return the common ancestor of `left` and `right` below `stop`, or `None`.
-fn common_ancestor<'a>(
-    left: RefEquality<'a, Stmt>,
-    right: RefEquality<'a, Stmt>,
-    stop: Option<RefEquality<'a, Stmt>>,
-    depths: &'a FxHashMap<RefEquality<'a, Stmt>, usize>,
-    child_to_parent: &'a FxHashMap<RefEquality<'a, Stmt>, RefEquality<'a, Stmt>>,
-) -> Option<RefEquality<'a, Stmt>> {
-    if Some(left) == stop || Some(right) == stop {
-        return None;
-    }
-
-    if left == right {
-        return Some(left);
-    }
-
-    let left_depth = depths.get(&left)?;
-    let right_depth = depths.get(&right)?;
-    match left_depth.cmp(right_depth) {
-        Ordering::Less => common_ancestor(
-            left,
-            *child_to_parent.get(&right)?,
-            stop,
-            depths,
-            child_to_parent,
-        ),
-        Ordering::Equal => common_ancestor(
-            *child_to_parent.get(&left)?,
-            *child_to_parent.get(&right)?,
-            stop,
-            depths,
-            child_to_parent,
-        ),
-        Ordering::Greater => common_ancestor(
-            *child_to_parent.get(&left)?,
-            right,
-            stop,
-            depths,
-            child_to_parent,
-        ),
-    }
-}
-
-/// Return the alternative branches for a given node.
-fn alternatives(stmt: RefEquality<Stmt>) -> Vec<Vec<RefEquality<Stmt>>> {
-    match &stmt.as_ref().node {
-        StmtKind::If { body, .. } => vec![body.iter().map(RefEquality).collect()],
-        StmtKind::Try {
-            body,
-            handlers,
-            orelse,
-            ..
-        }
-        | StmtKind::TryStar {
-            body,
-            handlers,
-            orelse,
-            ..
-        } => vec![body.iter().chain(orelse.iter()).map(RefEquality).collect()]
-            .into_iter()
-            .chain(handlers.iter().map(|handler| {
-                let ExceptHandler { body, .. } = &handler.node;
-                body.iter().map(RefEquality).collect()
-            }))
-            .collect(),
-        StmtKind::Match { cases, .. } => cases
-            .iter()
-            .map(|case| case.body.iter().map(RefEquality).collect())
-            .collect(),
-        _ => vec![],
-    }
-}
-
-/// Return `true` if `stmt` is a descendent of any of the nodes in `ancestors`.
-fn descendant_of<'a>(
-    stmt: RefEquality<'a, Stmt>,
-    ancestors: &[RefEquality<'a, Stmt>],
-    stop: RefEquality<'a, Stmt>,
-    depths: &FxHashMap<RefEquality<'a, Stmt>, usize>,
-    child_to_parent: &FxHashMap<RefEquality<'a, Stmt>, RefEquality<'a, Stmt>>,
-) -> bool {
-    ancestors.iter().any(|ancestor| {
-        common_ancestor(stmt, *ancestor, Some(stop), depths, child_to_parent).is_some()
-    })
-}
-
-/// Return `true` if `left` and `right` are on different branches of an `if` or
-/// `try` statement.
-pub fn different_forks<'a>(
-    left: RefEquality<'a, Stmt>,
-    right: RefEquality<'a, Stmt>,
-    depths: &FxHashMap<RefEquality<'a, Stmt>, usize>,
-    child_to_parent: &FxHashMap<RefEquality<'a, Stmt>, RefEquality<'a, Stmt>>,
-) -> bool {
-    if let Some(ancestor) = common_ancestor(left, right, None, depths, child_to_parent) {
-        for items in alternatives(ancestor) {
-            let l = descendant_of(left, &items, ancestor, depths, child_to_parent);
-            let r = descendant_of(right, &items, ancestor, depths, child_to_parent);
-            if l ^ r {
-                return true;
-            }
-        }
-    }
-    false
-}
diff --git a/crates/ruff_python_ast/src/call_path.rs b/crates/ruff_python_ast/src/call_path.rs
index 24cbee3e63c26..eedc2c76a14c6 100644
--- a/crates/ruff_python_ast/src/call_path.rs
+++ b/crates/ruff_python_ast/src/call_path.rs
@@ -1,21 +1,21 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Expr};
 use smallvec::smallvec;
 
 /// A representation of a qualified name, like `typing.List`.
 pub type CallPath<'a> = smallvec::SmallVec<[&'a str; 8]>;
 
 fn collect_call_path_inner<'a>(expr: &'a Expr, parts: &mut CallPath<'a>) -> bool {
-    match &expr.node {
-        ExprKind::Attribute { value, attr, .. } => {
+    match expr {
+        Expr::Attribute(ast::ExprAttribute { value, attr, .. }) => {
             if collect_call_path_inner(value, parts) {
-                parts.push(attr);
+                parts.push(attr.as_str());
                 true
             } else {
                 false
             }
         }
-        ExprKind::Name { id, .. } => {
-            parts.push(id);
+        Expr::Name(ast::ExprName { id, .. }) => {
+            parts.push(id.as_str());
             true
         }
         _ => false,
diff --git a/crates/ruff_python_ast/src/cast.rs b/crates/ruff_python_ast/src/cast.rs
index 8a893bedfb393..7e75ac49987f5 100644
--- a/crates/ruff_python_ast/src/cast.rs
+++ b/crates/ruff_python_ast/src/cast.rs
@@ -1,16 +1,19 @@
-use rustpython_parser::ast::{Expr, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Expr, Stmt};
 
 pub fn name(stmt: &Stmt) -> &str {
-    match &stmt.node {
-        StmtKind::FunctionDef { name, .. } | StmtKind::AsyncFunctionDef { name, .. } => name,
-        _ => panic!("Expected StmtKind::FunctionDef | StmtKind::AsyncFunctionDef"),
+    match stmt {
+        Stmt::FunctionDef(ast::StmtFunctionDef { name, .. })
+        | Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef { name, .. }) => name.as_str(),
+        _ => panic!("Expected Stmt::FunctionDef | Stmt::AsyncFunctionDef"),
     }
 }
 
-pub fn decorator_list(stmt: &Stmt) -> &Vec<Expr> {
-    match &stmt.node {
-        StmtKind::FunctionDef { decorator_list, .. }
-        | StmtKind::AsyncFunctionDef { decorator_list, .. } => decorator_list,
-        _ => panic!("Expected StmtKind::FunctionDef | StmtKind::AsyncFunctionDef"),
+pub fn decorator_list(stmt: &Stmt) -> &[Expr] {
+    match stmt {
+        Stmt::FunctionDef(ast::StmtFunctionDef { decorator_list, .. })
+        | Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef { decorator_list, .. }) => {
+            decorator_list
+        }
+        _ => panic!("Expected Stmt::FunctionDef | Stmt::AsyncFunctionDef"),
     }
 }
diff --git a/crates/ruff_python_ast/src/comparable.rs b/crates/ruff_python_ast/src/comparable.rs
index 3ddad10a94288..3d6cba47ef8df 100644
--- a/crates/ruff_python_ast/src/comparable.rs
+++ b/crates/ruff_python_ast/src/comparable.rs
@@ -3,9 +3,9 @@
 
 use num_bigint::BigInt;
 use rustpython_parser::ast::{
-    Alias, Arg, Arguments, Boolop, Cmpop, Comprehension, Constant, Excepthandler,
-    ExcepthandlerKind, Expr, ExprContext, ExprKind, Keyword, MatchCase, Operator, Pattern,
-    PatternKind, Stmt, StmtKind, Unaryop, Withitem,
+    self, Alias, Arg, Arguments, Boolop, Cmpop, Comprehension, Constant, ConversionFlag,
+    Excepthandler, Expr, ExprContext, Identifier, Int, Keyword, MatchCase, Operator, Pattern, Stmt,
+    Unaryop, Withitem,
 };
 
 #[derive(Debug, PartialEq, Eq, Hash, Copy, Clone)]
@@ -136,8 +136,8 @@ pub struct ComparableAlias<'a> {
 impl<'a> From<&'a Alias> for ComparableAlias<'a> {
     fn from(alias: &'a Alias) -> Self {
         Self {
-            name: &alias.node.name,
-            asname: alias.node.asname.as_deref(),
+            name: alias.name.as_str(),
+            asname: alias.asname.as_deref(),
         }
     }
 }
@@ -194,44 +194,50 @@ pub enum ComparablePattern<'a> {
 
 impl<'a> From<&'a Pattern> for ComparablePattern<'a> {
     fn from(pattern: &'a Pattern) -> Self {
-        match &pattern.node {
-            PatternKind::MatchValue { value } => Self::MatchValue {
+        match pattern {
+            Pattern::MatchValue(ast::PatternMatchValue { value, .. }) => Self::MatchValue {
                 value: value.into(),
             },
-            PatternKind::MatchSingleton { value } => Self::MatchSingleton {
-                value: value.into(),
-            },
-            PatternKind::MatchSequence { patterns } => Self::MatchSequence {
-                patterns: patterns.iter().map(Into::into).collect(),
-            },
-            PatternKind::MatchMapping {
+            Pattern::MatchSingleton(ast::PatternMatchSingleton { value, .. }) => {
+                Self::MatchSingleton {
+                    value: value.into(),
+                }
+            }
+            Pattern::MatchSequence(ast::PatternMatchSequence { patterns, .. }) => {
+                Self::MatchSequence {
+                    patterns: patterns.iter().map(Into::into).collect(),
+                }
+            }
+            Pattern::MatchMapping(ast::PatternMatchMapping {
                 keys,
                 patterns,
                 rest,
-            } => Self::MatchMapping {
+                ..
+            }) => Self::MatchMapping {
                 keys: keys.iter().map(Into::into).collect(),
                 patterns: patterns.iter().map(Into::into).collect(),
                 rest: rest.as_deref(),
             },
-            PatternKind::MatchClass {
+            Pattern::MatchClass(ast::PatternMatchClass {
                 cls,
                 patterns,
                 kwd_attrs,
                 kwd_patterns,
-            } => Self::MatchClass {
+                ..
+            }) => Self::MatchClass {
                 cls: cls.into(),
                 patterns: patterns.iter().map(Into::into).collect(),
-                kwd_attrs: kwd_attrs.iter().map(String::as_str).collect(),
+                kwd_attrs: kwd_attrs.iter().map(Identifier::as_str).collect(),
                 kwd_patterns: kwd_patterns.iter().map(Into::into).collect(),
             },
-            PatternKind::MatchStar { name } => Self::MatchStar {
+            Pattern::MatchStar(ast::PatternMatchStar { name, .. }) => Self::MatchStar {
                 name: name.as_deref(),
             },
-            PatternKind::MatchAs { pattern, name } => Self::MatchAs {
+            Pattern::MatchAs(ast::PatternMatchAs { pattern, name, .. }) => Self::MatchAs {
                 pattern: pattern.as_ref().map(Into::into),
                 name: name.as_deref(),
             },
-            PatternKind::MatchOr { patterns } => Self::MatchOr {
+            Pattern::MatchOr(ast::PatternMatchOr { patterns, .. }) => Self::MatchOr {
                 patterns: patterns.iter().map(Into::into).collect(),
             },
         }
@@ -340,9 +346,9 @@ pub struct ComparableArg<'a> {
 impl<'a> From<&'a Arg> for ComparableArg<'a> {
     fn from(arg: &'a Arg) -> Self {
         Self {
-            arg: &arg.node.arg,
-            annotation: arg.node.annotation.as_ref().map(Into::into),
-            type_comment: arg.node.type_comment.as_deref(),
+            arg: arg.arg.as_str(),
+            annotation: arg.annotation.as_ref().map(Into::into),
+            type_comment: arg.type_comment.as_deref(),
         }
     }
 }
@@ -356,8 +362,8 @@ pub struct ComparableKeyword<'a> {
 impl<'a> From<&'a Keyword> for ComparableKeyword<'a> {
     fn from(keyword: &'a Keyword) -> Self {
         Self {
-            arg: keyword.node.arg.as_deref(),
-            value: (&keyword.node.value).into(),
+            arg: keyword.arg.as_ref().map(Identifier::as_str),
+            value: (&keyword.value).into(),
         }
     }
 }
@@ -367,7 +373,7 @@ pub struct ComparableComprehension<'a> {
     pub target: ComparableExpr<'a>,
     pub iter: ComparableExpr<'a>,
     pub ifs: Vec<ComparableExpr<'a>>,
-    pub is_async: usize,
+    pub is_async: bool,
 }
 
 impl<'a> From<&'a Comprehension> for ComparableComprehension<'a> {
@@ -392,7 +398,9 @@ pub enum ComparableExcepthandler<'a> {
 
 impl<'a> From<&'a Excepthandler> for ComparableExcepthandler<'a> {
     fn from(excepthandler: &'a Excepthandler) -> Self {
-        let ExcepthandlerKind::ExceptHandler { type_, name, body } = &excepthandler.node;
+        let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler {
+            type_, name, body, ..
+        }) = excepthandler;
         Self::ExceptHandler {
             type_: type_.as_ref().map(Into::into),
             name: name.as_deref(),
@@ -474,7 +482,7 @@ pub enum ComparableExpr<'a> {
     },
     FormattedValue {
         value: Box<ComparableExpr<'a>>,
-        conversion: usize,
+        conversion: ConversionFlag,
         format_spec: Option<Box<ComparableExpr<'a>>>,
     },
     JoinedStr {
@@ -531,134 +539,230 @@ impl<'a> From<&'a Box<Expr>> for ComparableExpr<'a> {
 
 impl<'a> From<&'a Expr> for ComparableExpr<'a> {
     fn from(expr: &'a Expr) -> Self {
-        match &expr.node {
-            ExprKind::BoolOp { op, values } => Self::BoolOp {
+        match expr {
+            Expr::BoolOp(ast::ExprBoolOp {
+                op,
+                values,
+                range: _range,
+            }) => Self::BoolOp {
                 op: op.into(),
                 values: values.iter().map(Into::into).collect(),
             },
-            ExprKind::NamedExpr { target, value } => Self::NamedExpr {
+            Expr::NamedExpr(ast::ExprNamedExpr {
+                target,
+                value,
+                range: _range,
+            }) => Self::NamedExpr {
                 target: target.into(),
                 value: value.into(),
             },
-            ExprKind::BinOp { left, op, right } => Self::BinOp {
+            Expr::BinOp(ast::ExprBinOp {
+                left,
+                op,
+                right,
+                range: _range,
+            }) => Self::BinOp {
                 left: left.into(),
                 op: op.into(),
                 right: right.into(),
             },
-            ExprKind::UnaryOp { op, operand } => Self::UnaryOp {
+            Expr::UnaryOp(ast::ExprUnaryOp {
+                op,
+                operand,
+                range: _range,
+            }) => Self::UnaryOp {
                 op: op.into(),
                 operand: operand.into(),
             },
-            ExprKind::Lambda { args, body } => Self::Lambda {
+            Expr::Lambda(ast::ExprLambda {
+                args,
+                body,
+                range: _range,
+            }) => Self::Lambda {
                 args: (&**args).into(),
                 body: body.into(),
             },
-            ExprKind::IfExp { test, body, orelse } => Self::IfExp {
+            Expr::IfExp(ast::ExprIfExp {
+                test,
+                body,
+                orelse,
+                range: _range,
+            }) => Self::IfExp {
                 test: test.into(),
                 body: body.into(),
                 orelse: orelse.into(),
             },
-            ExprKind::Dict { keys, values } => Self::Dict {
+            Expr::Dict(ast::ExprDict {
+                keys,
+                values,
+                range: _range,
+            }) => Self::Dict {
                 keys: keys
                     .iter()
                     .map(|expr| expr.as_ref().map(Into::into))
                     .collect(),
                 values: values.iter().map(Into::into).collect(),
             },
-            ExprKind::Set { elts } => Self::Set {
+            Expr::Set(ast::ExprSet {
+                elts,
+                range: _range,
+            }) => Self::Set {
                 elts: elts.iter().map(Into::into).collect(),
             },
-            ExprKind::ListComp { elt, generators } => Self::ListComp {
+            Expr::ListComp(ast::ExprListComp {
+                elt,
+                generators,
+                range: _range,
+            }) => Self::ListComp {
                 elt: elt.into(),
                 generators: generators.iter().map(Into::into).collect(),
             },
-            ExprKind::SetComp { elt, generators } => Self::SetComp {
+            Expr::SetComp(ast::ExprSetComp {
+                elt,
+                generators,
+                range: _range,
+            }) => Self::SetComp {
                 elt: elt.into(),
                 generators: generators.iter().map(Into::into).collect(),
             },
-            ExprKind::DictComp {
+            Expr::DictComp(ast::ExprDictComp {
                 key,
                 value,
                 generators,
-            } => Self::DictComp {
+                range: _range,
+            }) => Self::DictComp {
                 key: key.into(),
                 value: value.into(),
                 generators: generators.iter().map(Into::into).collect(),
             },
-            ExprKind::GeneratorExp { elt, generators } => Self::GeneratorExp {
+            Expr::GeneratorExp(ast::ExprGeneratorExp {
+                elt,
+                generators,
+                range: _range,
+            }) => Self::GeneratorExp {
                 elt: elt.into(),
                 generators: generators.iter().map(Into::into).collect(),
             },
-            ExprKind::Await { value } => Self::Await {
+            Expr::Await(ast::ExprAwait {
+                value,
+                range: _range,
+            }) => Self::Await {
                 value: value.into(),
             },
-            ExprKind::Yield { value } => Self::Yield {
+            Expr::Yield(ast::ExprYield {
+                value,
+                range: _range,
+            }) => Self::Yield {
                 value: value.as_ref().map(Into::into),
             },
-            ExprKind::YieldFrom { value } => Self::YieldFrom {
+            Expr::YieldFrom(ast::ExprYieldFrom {
+                value,
+                range: _range,
+            }) => Self::YieldFrom {
                 value: value.into(),
             },
-            ExprKind::Compare {
+            Expr::Compare(ast::ExprCompare {
                 left,
                 ops,
                 comparators,
-            } => Self::Compare {
+                range: _range,
+            }) => Self::Compare {
                 left: left.into(),
                 ops: ops.iter().map(Into::into).collect(),
                 comparators: comparators.iter().map(Into::into).collect(),
             },
-            ExprKind::Call {
+            Expr::Call(ast::ExprCall {
                 func,
                 args,
                 keywords,
-            } => Self::Call {
+                range: _range,
+            }) => Self::Call {
                 func: func.into(),
                 args: args.iter().map(Into::into).collect(),
                 keywords: keywords.iter().map(Into::into).collect(),
             },
-            ExprKind::FormattedValue {
+            Expr::FormattedValue(ast::ExprFormattedValue {
                 value,
                 conversion,
                 format_spec,
-            } => Self::FormattedValue {
+                range: _range,
+            }) => Self::FormattedValue {
                 value: value.into(),
                 conversion: *conversion,
                 format_spec: format_spec.as_ref().map(Into::into),
             },
-            ExprKind::JoinedStr { values } => Self::JoinedStr {
+            Expr::JoinedStr(ast::ExprJoinedStr {
+                values,
+                range: _range,
+            }) => Self::JoinedStr {
                 values: values.iter().map(Into::into).collect(),
             },
-            ExprKind::Constant { value, kind } => Self::Constant {
+            Expr::Constant(ast::ExprConstant {
+                value,
+                kind,
+                range: _range,
+            }) => Self::Constant {
                 value: value.into(),
                 kind: kind.as_ref().map(String::as_str),
             },
-            ExprKind::Attribute { value, attr, ctx } => Self::Attribute {
-                value: value.into(),
+            Expr::Attribute(ast::ExprAttribute {
+                value,
                 attr,
+                ctx,
+                range: _range,
+            }) => Self::Attribute {
+                value: value.into(),
+                attr: attr.as_str(),
                 ctx: ctx.into(),
             },
-            ExprKind::Subscript { value, slice, ctx } => Self::Subscript {
+            Expr::Subscript(ast::ExprSubscript {
+                value,
+                slice,
+                ctx,
+                range: _range,
+            }) => Self::Subscript {
                 value: value.into(),
                 slice: slice.into(),
                 ctx: ctx.into(),
             },
-            ExprKind::Starred { value, ctx } => Self::Starred {
+            Expr::Starred(ast::ExprStarred {
+                value,
+                ctx,
+                range: _range,
+            }) => Self::Starred {
                 value: value.into(),
                 ctx: ctx.into(),
             },
-            ExprKind::Name { id, ctx } => Self::Name {
+            Expr::Name(ast::ExprName {
                 id,
+                ctx,
+                range: _range,
+            }) => Self::Name {
+                id: id.as_str(),
                 ctx: ctx.into(),
             },
-            ExprKind::List { elts, ctx } => Self::List {
+            Expr::List(ast::ExprList {
+                elts,
+                ctx,
+                range: _range,
+            }) => Self::List {
                 elts: elts.iter().map(Into::into).collect(),
                 ctx: ctx.into(),
             },
-            ExprKind::Tuple { elts, ctx } => Self::Tuple {
+            Expr::Tuple(ast::ExprTuple {
+                elts,
+                ctx,
+                range: _range,
+            }) => Self::Tuple {
                 elts: elts.iter().map(Into::into).collect(),
                 ctx: ctx.into(),
             },
-            ExprKind::Slice { lower, upper, step } => Self::Slice {
+            Expr::Slice(ast::ExprSlice {
+                lower,
+                upper,
+                step,
+                range: _range,
+            }) => Self::Slice {
                 lower: lower.as_ref().map(Into::into),
                 upper: upper.as_ref().map(Into::into),
                 step: step.as_ref().map(Into::into),
@@ -712,7 +816,7 @@ pub enum ComparableStmt<'a> {
         target: ComparableExpr<'a>,
         annotation: ComparableExpr<'a>,
         value: Option<ComparableExpr<'a>>,
-        simple: usize,
+        simple: bool,
     },
     For {
         target: ComparableExpr<'a>,
@@ -778,7 +882,7 @@ pub enum ComparableStmt<'a> {
     ImportFrom {
         module: Option<&'a str>,
         names: Vec<ComparableAlias<'a>>,
-        level: Option<usize>,
+        level: Option<Int>,
     },
     Global {
         names: Vec<&'a str>,
@@ -796,193 +900,250 @@ pub enum ComparableStmt<'a> {
 
 impl<'a> From<&'a Stmt> for ComparableStmt<'a> {
     fn from(stmt: &'a Stmt) -> Self {
-        match &stmt.node {
-            StmtKind::FunctionDef {
+        match stmt {
+            Stmt::FunctionDef(ast::StmtFunctionDef {
                 name,
                 args,
                 body,
                 decorator_list,
                 returns,
                 type_comment,
-            } => Self::FunctionDef {
-                name,
+                range: _range,
+            }) => Self::FunctionDef {
+                name: name.as_str(),
                 args: args.into(),
                 body: body.iter().map(Into::into).collect(),
                 decorator_list: decorator_list.iter().map(Into::into).collect(),
                 returns: returns.as_ref().map(Into::into),
-                type_comment: type_comment.as_ref().map(std::string::String::as_str),
+                type_comment: type_comment.as_ref().map(String::as_str),
             },
-            StmtKind::AsyncFunctionDef {
+            Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef {
                 name,
                 args,
                 body,
                 decorator_list,
                 returns,
                 type_comment,
-            } => Self::AsyncFunctionDef {
-                name,
+                range: _range,
+            }) => Self::AsyncFunctionDef {
+                name: name.as_str(),
                 args: args.into(),
                 body: body.iter().map(Into::into).collect(),
                 decorator_list: decorator_list.iter().map(Into::into).collect(),
                 returns: returns.as_ref().map(Into::into),
-                type_comment: type_comment.as_ref().map(std::string::String::as_str),
+                type_comment: type_comment.as_ref().map(String::as_str),
             },
-            StmtKind::ClassDef {
+            Stmt::ClassDef(ast::StmtClassDef {
                 name,
                 bases,
                 keywords,
                 body,
                 decorator_list,
-            } => Self::ClassDef {
-                name,
+                range: _range,
+            }) => Self::ClassDef {
+                name: name.as_str(),
                 bases: bases.iter().map(Into::into).collect(),
                 keywords: keywords.iter().map(Into::into).collect(),
                 body: body.iter().map(Into::into).collect(),
                 decorator_list: decorator_list.iter().map(Into::into).collect(),
             },
-            StmtKind::Return { value } => Self::Return {
+            Stmt::Return(ast::StmtReturn {
+                value,
+                range: _range,
+            }) => Self::Return {
                 value: value.as_ref().map(Into::into),
             },
-            StmtKind::Delete { targets } => Self::Delete {
+            Stmt::Delete(ast::StmtDelete {
+                targets,
+                range: _range,
+            }) => Self::Delete {
                 targets: targets.iter().map(Into::into).collect(),
             },
-            StmtKind::Assign {
+            Stmt::Assign(ast::StmtAssign {
                 targets,
                 value,
                 type_comment,
-            } => Self::Assign {
+                range: _range,
+            }) => Self::Assign {
                 targets: targets.iter().map(Into::into).collect(),
                 value: value.into(),
-                type_comment: type_comment.as_ref().map(std::string::String::as_str),
+                type_comment: type_comment.as_ref().map(String::as_str),
             },
-            StmtKind::AugAssign { target, op, value } => Self::AugAssign {
+            Stmt::AugAssign(ast::StmtAugAssign {
+                target,
+                op,
+                value,
+                range: _range,
+            }) => Self::AugAssign {
                 target: target.into(),
                 op: op.into(),
                 value: value.into(),
             },
-            StmtKind::AnnAssign {
+            Stmt::AnnAssign(ast::StmtAnnAssign {
                 target,
                 annotation,
                 value,
                 simple,
-            } => Self::AnnAssign {
+                range: _range,
+            }) => Self::AnnAssign {
                 target: target.into(),
                 annotation: annotation.into(),
                 value: value.as_ref().map(Into::into),
                 simple: *simple,
             },
-            StmtKind::For {
+            Stmt::For(ast::StmtFor {
                 target,
                 iter,
                 body,
                 orelse,
                 type_comment,
-            } => Self::For {
+                range: _range,
+            }) => Self::For {
                 target: target.into(),
                 iter: iter.into(),
                 body: body.iter().map(Into::into).collect(),
                 orelse: orelse.iter().map(Into::into).collect(),
                 type_comment: type_comment.as_ref().map(String::as_str),
             },
-            StmtKind::AsyncFor {
+            Stmt::AsyncFor(ast::StmtAsyncFor {
                 target,
                 iter,
                 body,
                 orelse,
                 type_comment,
-            } => Self::AsyncFor {
+                range: _range,
+            }) => Self::AsyncFor {
                 target: target.into(),
                 iter: iter.into(),
                 body: body.iter().map(Into::into).collect(),
                 orelse: orelse.iter().map(Into::into).collect(),
                 type_comment: type_comment.as_ref().map(String::as_str),
             },
-            StmtKind::While { test, body, orelse } => Self::While {
+            Stmt::While(ast::StmtWhile {
+                test,
+                body,
+                orelse,
+                range: _range,
+            }) => Self::While {
                 test: test.into(),
                 body: body.iter().map(Into::into).collect(),
                 orelse: orelse.iter().map(Into::into).collect(),
             },
-            StmtKind::If { test, body, orelse } => Self::If {
+            Stmt::If(ast::StmtIf {
+                test,
+                body,
+                orelse,
+                range: _range,
+            }) => Self::If {
                 test: test.into(),
                 body: body.iter().map(Into::into).collect(),
                 orelse: orelse.iter().map(Into::into).collect(),
             },
-            StmtKind::With {
+            Stmt::With(ast::StmtWith {
                 items,
                 body,
                 type_comment,
-            } => Self::With {
+                range: _range,
+            }) => Self::With {
                 items: items.iter().map(Into::into).collect(),
                 body: body.iter().map(Into::into).collect(),
                 type_comment: type_comment.as_ref().map(String::as_str),
             },
-            StmtKind::AsyncWith {
+            Stmt::AsyncWith(ast::StmtAsyncWith {
                 items,
                 body,
                 type_comment,
-            } => Self::AsyncWith {
+                range: _range,
+            }) => Self::AsyncWith {
                 items: items.iter().map(Into::into).collect(),
                 body: body.iter().map(Into::into).collect(),
                 type_comment: type_comment.as_ref().map(String::as_str),
             },
-            StmtKind::Match { subject, cases } => Self::Match {
+            Stmt::Match(ast::StmtMatch {
+                subject,
+                cases,
+                range: _range,
+            }) => Self::Match {
                 subject: subject.into(),
                 cases: cases.iter().map(Into::into).collect(),
             },
-            StmtKind::Raise { exc, cause } => Self::Raise {
+            Stmt::Raise(ast::StmtRaise {
+                exc,
+                cause,
+                range: _range,
+            }) => Self::Raise {
                 exc: exc.as_ref().map(Into::into),
                 cause: cause.as_ref().map(Into::into),
             },
-            StmtKind::Try {
+            Stmt::Try(ast::StmtTry {
                 body,
                 handlers,
                 orelse,
                 finalbody,
-            } => Self::Try {
+                range: _range,
+            }) => Self::Try {
                 body: body.iter().map(Into::into).collect(),
                 handlers: handlers.iter().map(Into::into).collect(),
                 orelse: orelse.iter().map(Into::into).collect(),
                 finalbody: finalbody.iter().map(Into::into).collect(),
             },
-            StmtKind::TryStar {
+            Stmt::TryStar(ast::StmtTryStar {
                 body,
                 handlers,
                 orelse,
                 finalbody,
-            } => Self::TryStar {
+                range: _range,
+            }) => Self::TryStar {
                 body: body.iter().map(Into::into).collect(),
                 handlers: handlers.iter().map(Into::into).collect(),
                 orelse: orelse.iter().map(Into::into).collect(),
                 finalbody: finalbody.iter().map(Into::into).collect(),
             },
-            StmtKind::Assert { test, msg } => Self::Assert {
+            Stmt::Assert(ast::StmtAssert {
+                test,
+                msg,
+                range: _range,
+            }) => Self::Assert {
                 test: test.into(),
                 msg: msg.as_ref().map(Into::into),
             },
-            StmtKind::Import { names } => Self::Import {
+            Stmt::Import(ast::StmtImport {
+                names,
+                range: _range,
+            }) => Self::Import {
                 names: names.iter().map(Into::into).collect(),
             },
-            StmtKind::ImportFrom {
+            Stmt::ImportFrom(ast::StmtImportFrom {
                 module,
                 names,
                 level,
-            } => Self::ImportFrom {
-                module: module.as_ref().map(String::as_str),
+                range: _range,
+            }) => Self::ImportFrom {
+                module: module.as_deref(),
                 names: names.iter().map(Into::into).collect(),
                 level: *level,
             },
-            StmtKind::Global { names } => Self::Global {
-                names: names.iter().map(String::as_str).collect(),
+            Stmt::Global(ast::StmtGlobal {
+                names,
+                range: _range,
+            }) => Self::Global {
+                names: names.iter().map(Identifier::as_str).collect(),
             },
-            StmtKind::Nonlocal { names } => Self::Nonlocal {
-                names: names.iter().map(String::as_str).collect(),
+            Stmt::Nonlocal(ast::StmtNonlocal {
+                names,
+                range: _range,
+            }) => Self::Nonlocal {
+                names: names.iter().map(Identifier::as_str).collect(),
             },
-            StmtKind::Expr { value } => Self::Expr {
+            Stmt::Expr(ast::StmtExpr {
+                value,
+                range: _range,
+            }) => Self::Expr {
                 value: value.into(),
             },
-            StmtKind::Pass => Self::Pass,
-            StmtKind::Break => Self::Break,
-            StmtKind::Continue => Self::Continue,
+            Stmt::Pass(_) => Self::Pass,
+            Stmt::Break(_) => Self::Break,
+            Stmt::Continue(_) => Self::Continue,
         }
     }
 }
diff --git a/crates/ruff_python_ast/src/function.rs b/crates/ruff_python_ast/src/function.rs
new file mode 100644
index 0000000000000..1f7f114f69f43
--- /dev/null
+++ b/crates/ruff_python_ast/src/function.rs
@@ -0,0 +1,114 @@
+use crate::node::AnyNodeRef;
+use ruff_text_size::TextRange;
+use rustpython_ast::{
+    Arguments, Expr, Identifier, Ranged, StmtAsyncFunctionDef, StmtFunctionDef, Suite,
+};
+
+/// Enum that represents any python function definition.
+#[derive(Copy, Clone, PartialEq, Debug)]
+pub enum AnyFunctionDefinition<'a> {
+    FunctionDefinition(&'a StmtFunctionDef),
+    AsyncFunctionDefinition(&'a StmtAsyncFunctionDef),
+}
+
+impl<'a> AnyFunctionDefinition<'a> {
+    pub const fn cast_ref(reference: AnyNodeRef<'a>) -> Option<Self> {
+        match reference {
+            AnyNodeRef::StmtAsyncFunctionDef(definition) => {
+                Some(Self::AsyncFunctionDefinition(definition))
+            }
+            AnyNodeRef::StmtFunctionDef(definition) => Some(Self::FunctionDefinition(definition)),
+            _ => None,
+        }
+    }
+
+    /// Returns `Some` if this is a [`StmtFunctionDef`] and `None` otherwise.
+    pub const fn as_function_definition(self) -> Option<&'a StmtFunctionDef> {
+        if let Self::FunctionDefinition(definition) = self {
+            Some(definition)
+        } else {
+            None
+        }
+    }
+
+    /// Returns `Some` if this is a [`StmtAsyncFunctionDef`] and `None` otherwise.
+    pub const fn as_async_function_definition(self) -> Option<&'a StmtAsyncFunctionDef> {
+        if let Self::AsyncFunctionDefinition(definition) = self {
+            Some(definition)
+        } else {
+            None
+        }
+    }
+
+    /// Returns the function's name
+    pub const fn name(self) -> &'a Identifier {
+        match self {
+            Self::FunctionDefinition(definition) => &definition.name,
+            Self::AsyncFunctionDefinition(definition) => &definition.name,
+        }
+    }
+
+    /// Returns the function arguments (parameters).
+    pub fn arguments(self) -> &'a Arguments {
+        match self {
+            Self::FunctionDefinition(definition) => definition.args.as_ref(),
+            Self::AsyncFunctionDefinition(definition) => definition.args.as_ref(),
+        }
+    }
+
+    /// Returns the function's body
+    pub const fn body(self) -> &'a Suite {
+        match self {
+            Self::FunctionDefinition(definition) => &definition.body,
+            Self::AsyncFunctionDefinition(definition) => &definition.body,
+        }
+    }
+
+    /// Returns the decorators attributing the function.
+    pub fn decorators(self) -> &'a [Expr] {
+        match self {
+            Self::FunctionDefinition(definition) => &definition.decorator_list,
+            Self::AsyncFunctionDefinition(definition) => &definition.decorator_list,
+        }
+    }
+
+    pub fn returns(self) -> Option<&'a Expr> {
+        match self {
+            Self::FunctionDefinition(definition) => definition.returns.as_deref(),
+            Self::AsyncFunctionDefinition(definition) => definition.returns.as_deref(),
+        }
+    }
+
+    pub fn type_comments(self) -> Option<&'a str> {
+        match self {
+            Self::FunctionDefinition(definition) => definition.type_comment.as_deref(),
+            Self::AsyncFunctionDefinition(definition) => definition.type_comment.as_deref(),
+        }
+    }
+
+    /// Returns `true` if this is [`Self::AsyncFunctionDefinition`]
+    pub const fn is_async(self) -> bool {
+        matches!(self, Self::AsyncFunctionDefinition(_))
+    }
+}
+
+impl Ranged for AnyFunctionDefinition<'_> {
+    fn range(&self) -> TextRange {
+        match self {
+            AnyFunctionDefinition::FunctionDefinition(definition) => definition.range(),
+            AnyFunctionDefinition::AsyncFunctionDefinition(definition) => definition.range(),
+        }
+    }
+}
+
+impl<'a> From<&'a StmtFunctionDef> for AnyFunctionDefinition<'a> {
+    fn from(value: &'a StmtFunctionDef) -> Self {
+        Self::FunctionDefinition(value)
+    }
+}
+
+impl<'a> From<&'a StmtAsyncFunctionDef> for AnyFunctionDefinition<'a> {
+    fn from(value: &'a StmtAsyncFunctionDef) -> Self {
+        Self::AsyncFunctionDefinition(value)
+    }
+}
diff --git a/crates/ruff_python_ast/src/helpers.rs b/crates/ruff_python_ast/src/helpers.rs
index 213ae1e7707b3..0f3340c1f7854 100644
--- a/crates/ruff_python_ast/src/helpers.rs
+++ b/crates/ruff_python_ast/src/helpers.rs
@@ -4,53 +4,19 @@ use std::path::Path;
 use itertools::Itertools;
 use log::error;
 use num_traits::Zero;
-use once_cell::sync::Lazy;
-use regex::Regex;
+use ruff_newlines::UniversalNewlineIterator;
 use ruff_text_size::{TextRange, TextSize};
 use rustc_hash::{FxHashMap, FxHashSet};
 use rustpython_parser::ast::{
-    Arguments, Cmpop, Constant, Excepthandler, ExcepthandlerKind, Expr, ExprKind, Keyword,
-    KeywordData, Located, MatchCase, Pattern, PatternKind, Stmt, StmtKind,
+    self, Arguments, Cmpop, Constant, Excepthandler, Expr, Keyword, MatchCase, Pattern, Ranged,
+    Stmt,
 };
 use rustpython_parser::{lexer, Mode, Tok};
 use smallvec::SmallVec;
 
 use crate::call_path::CallPath;
-use crate::newlines::UniversalNewlineIterator;
-use crate::source_code::{Generator, Indexer, Locator, Stylist};
-use crate::visitor;
-use crate::visitor::Visitor;
-
-/// Create an `Expr` with default location from an `ExprKind`.
-pub fn create_expr(node: ExprKind) -> Expr {
-    Expr::with_range(node, TextRange::default())
-}
-
-/// Create a `Stmt` with a default location from a `StmtKind`.
-pub fn create_stmt(node: StmtKind) -> Stmt {
-    Stmt::with_range(node, TextRange::default())
-}
-
-/// Generate source code from an [`Expr`].
-pub fn unparse_expr(expr: &Expr, stylist: &Stylist) -> String {
-    let mut generator: Generator = stylist.into();
-    generator.unparse_expr(expr, 0);
-    generator.generate()
-}
-
-/// Generate source code from a [`Stmt`].
-pub fn unparse_stmt(stmt: &Stmt, stylist: &Stylist) -> String {
-    let mut generator: Generator = stylist.into();
-    generator.unparse_stmt(stmt);
-    generator.generate()
-}
-
-/// Generate source code from an [`Constant`].
-pub fn unparse_constant(constant: &Constant, stylist: &Stylist) -> String {
-    let mut generator: Generator = stylist.into();
-    generator.unparse_constant(constant);
-    generator.generate()
-}
+use crate::source_code::{Indexer, Locator};
+use crate::statement_visitor::{walk_body, walk_stmt, StatementVisitor};
 
 fn is_iterable_initializer<F>(id: &str, is_builtin: F) -> bool
 where
@@ -69,14 +35,15 @@ where
 {
     any_over_expr(expr, &|expr| {
         // Accept empty initializers.
-        if let ExprKind::Call {
+        if let Expr::Call(ast::ExprCall {
             func,
             args,
             keywords,
-        } = &expr.node
+            range: _range,
+        }) = expr
         {
             if args.is_empty() && keywords.is_empty() {
-                if let ExprKind::Name { id, .. } = &func.node {
+                if let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() {
                     if !is_iterable_initializer(id.as_str(), |id| is_builtin(id)) {
                         return true;
                     }
@@ -86,32 +53,32 @@ where
         }
 
         // Avoid false positive for overloaded operators.
-        if let ExprKind::BinOp { left, right, .. } = &expr.node {
+        if let Expr::BinOp(ast::ExprBinOp { left, right, .. }) = expr {
             if !matches!(
-                left.node,
-                ExprKind::Constant { .. }
-                    | ExprKind::JoinedStr { .. }
-                    | ExprKind::List { .. }
-                    | ExprKind::Tuple { .. }
-                    | ExprKind::Set { .. }
-                    | ExprKind::Dict { .. }
-                    | ExprKind::ListComp { .. }
-                    | ExprKind::SetComp { .. }
-                    | ExprKind::DictComp { .. }
+                left.as_ref(),
+                Expr::Constant(_)
+                    | Expr::JoinedStr(_)
+                    | Expr::List(_)
+                    | Expr::Tuple(_)
+                    | Expr::Set(_)
+                    | Expr::Dict(_)
+                    | Expr::ListComp(_)
+                    | Expr::SetComp(_)
+                    | Expr::DictComp(_)
             ) {
                 return true;
             }
             if !matches!(
-                right.node,
-                ExprKind::Constant { .. }
-                    | ExprKind::JoinedStr { .. }
-                    | ExprKind::List { .. }
-                    | ExprKind::Tuple { .. }
-                    | ExprKind::Set { .. }
-                    | ExprKind::Dict { .. }
-                    | ExprKind::ListComp { .. }
-                    | ExprKind::SetComp { .. }
-                    | ExprKind::DictComp { .. }
+                right.as_ref(),
+                Expr::Constant(_)
+                    | Expr::JoinedStr(_)
+                    | Expr::List(_)
+                    | Expr::Tuple(_)
+                    | Expr::Set(_)
+                    | Expr::Dict(_)
+                    | Expr::ListComp(_)
+                    | Expr::SetComp(_)
+                    | Expr::DictComp(_)
             ) {
                 return true;
             }
@@ -120,16 +87,16 @@ where
 
         // Otherwise, avoid all complex expressions.
         matches!(
-            expr.node,
-            ExprKind::Await { .. }
-                | ExprKind::Call { .. }
-                | ExprKind::DictComp { .. }
-                | ExprKind::GeneratorExp { .. }
-                | ExprKind::ListComp { .. }
-                | ExprKind::SetComp { .. }
-                | ExprKind::Subscript { .. }
-                | ExprKind::Yield { .. }
-                | ExprKind::YieldFrom { .. }
+            expr,
+            Expr::Await(_)
+                | Expr::Call(_)
+                | Expr::DictComp(_)
+                | Expr::GeneratorExp(_)
+                | Expr::ListComp(_)
+                | Expr::SetComp(_)
+                | Expr::Subscript(_)
+                | Expr::Yield(_)
+                | Expr::YieldFrom(_)
         )
     })
 }
@@ -143,31 +110,69 @@ where
     if func(expr) {
         return true;
     }
-    match &expr.node {
-        ExprKind::BoolOp { values, .. } | ExprKind::JoinedStr { values } => {
-            values.iter().any(|expr| any_over_expr(expr, func))
-        }
-        ExprKind::NamedExpr { target, value } => {
-            any_over_expr(target, func) || any_over_expr(value, func)
-        }
-        ExprKind::BinOp { left, right, .. } => {
+    match expr {
+        Expr::BoolOp(ast::ExprBoolOp {
+            values,
+            range: _range,
+            ..
+        })
+        | Expr::JoinedStr(ast::ExprJoinedStr {
+            values,
+            range: _range,
+        }) => values.iter().any(|expr| any_over_expr(expr, func)),
+        Expr::NamedExpr(ast::ExprNamedExpr {
+            target,
+            value,
+            range: _range,
+        }) => any_over_expr(target, func) || any_over_expr(value, func),
+        Expr::BinOp(ast::ExprBinOp { left, right, .. }) => {
             any_over_expr(left, func) || any_over_expr(right, func)
         }
-        ExprKind::UnaryOp { operand, .. } => any_over_expr(operand, func),
-        ExprKind::Lambda { body, .. } => any_over_expr(body, func),
-        ExprKind::IfExp { test, body, orelse } => {
-            any_over_expr(test, func) || any_over_expr(body, func) || any_over_expr(orelse, func)
-        }
-        ExprKind::Dict { keys, values } => values
+        Expr::UnaryOp(ast::ExprUnaryOp { operand, .. }) => any_over_expr(operand, func),
+        Expr::Lambda(ast::ExprLambda { body, .. }) => any_over_expr(body, func),
+        Expr::IfExp(ast::ExprIfExp {
+            test,
+            body,
+            orelse,
+            range: _range,
+        }) => any_over_expr(test, func) || any_over_expr(body, func) || any_over_expr(orelse, func),
+        Expr::Dict(ast::ExprDict {
+            keys,
+            values,
+            range: _range,
+        }) => values
             .iter()
             .chain(keys.iter().flatten())
             .any(|expr| any_over_expr(expr, func)),
-        ExprKind::Set { elts } | ExprKind::List { elts, .. } | ExprKind::Tuple { elts, .. } => {
-            elts.iter().any(|expr| any_over_expr(expr, func))
-        }
-        ExprKind::ListComp { elt, generators }
-        | ExprKind::SetComp { elt, generators }
-        | ExprKind::GeneratorExp { elt, generators } => {
+        Expr::Set(ast::ExprSet {
+            elts,
+            range: _range,
+        })
+        | Expr::List(ast::ExprList {
+            elts,
+            range: _range,
+            ..
+        })
+        | Expr::Tuple(ast::ExprTuple {
+            elts,
+            range: _range,
+            ..
+        }) => elts.iter().any(|expr| any_over_expr(expr, func)),
+        Expr::ListComp(ast::ExprListComp {
+            elt,
+            generators,
+            range: _range,
+        })
+        | Expr::SetComp(ast::ExprSetComp {
+            elt,
+            generators,
+            range: _range,
+        })
+        | Expr::GeneratorExp(ast::ExprGeneratorExp {
+            elt,
+            generators,
+            range: _range,
+        }) => {
             any_over_expr(elt, func)
                 || generators.iter().any(|generator| {
                     any_over_expr(&generator.target, func)
@@ -175,11 +180,12 @@ where
                         || generator.ifs.iter().any(|expr| any_over_expr(expr, func))
                 })
         }
-        ExprKind::DictComp {
+        Expr::DictComp(ast::ExprDictComp {
             key,
             value,
             generators,
-        } => {
+            range: _range,
+        }) => {
             any_over_expr(key, func)
                 || any_over_expr(value, func)
                 || generators.iter().any(|generator| {
@@ -188,39 +194,62 @@ where
                         || generator.ifs.iter().any(|expr| any_over_expr(expr, func))
                 })
         }
-        ExprKind::Await { value }
-        | ExprKind::YieldFrom { value }
-        | ExprKind::Attribute { value, .. }
-        | ExprKind::Starred { value, .. } => any_over_expr(value, func),
-        ExprKind::Yield { value } => value
+        Expr::Await(ast::ExprAwait {
+            value,
+            range: _range,
+        })
+        | Expr::YieldFrom(ast::ExprYieldFrom {
+            value,
+            range: _range,
+        })
+        | Expr::Attribute(ast::ExprAttribute {
+            value,
+            range: _range,
+            ..
+        })
+        | Expr::Starred(ast::ExprStarred {
+            value,
+            range: _range,
+            ..
+        }) => any_over_expr(value, func),
+        Expr::Yield(ast::ExprYield {
+            value,
+            range: _range,
+        }) => value
             .as_ref()
             .map_or(false, |value| any_over_expr(value, func)),
-        ExprKind::Compare {
+        Expr::Compare(ast::ExprCompare {
             left, comparators, ..
-        } => any_over_expr(left, func) || comparators.iter().any(|expr| any_over_expr(expr, func)),
-        ExprKind::Call {
+        }) => any_over_expr(left, func) || comparators.iter().any(|expr| any_over_expr(expr, func)),
+        Expr::Call(ast::ExprCall {
             func: call_func,
             args,
             keywords,
-        } => {
+            range: _range,
+        }) => {
             any_over_expr(call_func, func)
                 || args.iter().any(|expr| any_over_expr(expr, func))
                 || keywords
                     .iter()
-                    .any(|keyword| any_over_expr(&keyword.node.value, func))
+                    .any(|keyword| any_over_expr(&keyword.value, func))
         }
-        ExprKind::FormattedValue {
+        Expr::FormattedValue(ast::ExprFormattedValue {
             value, format_spec, ..
-        } => {
+        }) => {
             any_over_expr(value, func)
                 || format_spec
                     .as_ref()
                     .map_or(false, |value| any_over_expr(value, func))
         }
-        ExprKind::Subscript { value, slice, .. } => {
+        Expr::Subscript(ast::ExprSubscript { value, slice, .. }) => {
             any_over_expr(value, func) || any_over_expr(slice, func)
         }
-        ExprKind::Slice { lower, upper, step } => {
+        Expr::Slice(ast::ExprSlice {
+            lower,
+            upper,
+            step,
+            range: _range,
+        }) => {
             lower
                 .as_ref()
                 .map_or(false, |value| any_over_expr(value, func))
@@ -231,7 +260,7 @@ where
                     .as_ref()
                     .map_or(false, |value| any_over_expr(value, func))
         }
-        ExprKind::Name { .. } | ExprKind::Constant { .. } => false,
+        Expr::Name(_) | Expr::Constant(_) => false,
     }
 }
 
@@ -239,24 +268,30 @@ pub fn any_over_pattern<F>(pattern: &Pattern, func: &F) -> bool
 where
     F: Fn(&Expr) -> bool,
 {
-    match &pattern.node {
-        PatternKind::MatchValue { value } => any_over_expr(value, func),
-        PatternKind::MatchSingleton { .. } => false,
-        PatternKind::MatchSequence { patterns } => patterns
+    match pattern {
+        Pattern::MatchValue(ast::PatternMatchValue {
+            value,
+            range: _range,
+        }) => any_over_expr(value, func),
+        Pattern::MatchSingleton(_) => false,
+        Pattern::MatchSequence(ast::PatternMatchSequence {
+            patterns,
+            range: _range,
+        }) => patterns
             .iter()
             .any(|pattern| any_over_pattern(pattern, func)),
-        PatternKind::MatchMapping { keys, patterns, .. } => {
+        Pattern::MatchMapping(ast::PatternMatchMapping { keys, patterns, .. }) => {
             keys.iter().any(|key| any_over_expr(key, func))
                 || patterns
                     .iter()
                     .any(|pattern| any_over_pattern(pattern, func))
         }
-        PatternKind::MatchClass {
+        Pattern::MatchClass(ast::PatternMatchClass {
             cls,
             patterns,
             kwd_patterns,
             ..
-        } => {
+        }) => {
             any_over_expr(cls, func)
                 || patterns
                     .iter()
@@ -265,11 +300,14 @@ where
                     .iter()
                     .any(|pattern| any_over_pattern(pattern, func))
         }
-        PatternKind::MatchStar { .. } => false,
-        PatternKind::MatchAs { pattern, .. } => pattern
+        Pattern::MatchStar(_) => false,
+        Pattern::MatchAs(ast::PatternMatchAs { pattern, .. }) => pattern
             .as_ref()
             .map_or(false, |pattern| any_over_pattern(pattern, func)),
-        PatternKind::MatchOr { patterns } => patterns
+        Pattern::MatchOr(ast::PatternMatchOr {
+            patterns,
+            range: _range,
+        }) => patterns
             .iter()
             .any(|pattern| any_over_pattern(pattern, func)),
     }
@@ -279,53 +317,48 @@ pub fn any_over_stmt<F>(stmt: &Stmt, func: &F) -> bool
 where
     F: Fn(&Expr) -> bool,
 {
-    match &stmt.node {
-        StmtKind::FunctionDef {
+    match stmt {
+        Stmt::FunctionDef(ast::StmtFunctionDef {
             args,
             body,
             decorator_list,
             returns,
             ..
-        }
-        | StmtKind::AsyncFunctionDef {
+        })
+        | Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef {
             args,
             body,
             decorator_list,
             returns,
             ..
-        } => {
+        }) => {
             args.defaults.iter().any(|expr| any_over_expr(expr, func))
                 || args
                     .kw_defaults
                     .iter()
                     .any(|expr| any_over_expr(expr, func))
                 || args.args.iter().any(|arg| {
-                    arg.node
-                        .annotation
+                    arg.annotation
                         .as_ref()
                         .map_or(false, |expr| any_over_expr(expr, func))
                 })
                 || args.kwonlyargs.iter().any(|arg| {
-                    arg.node
-                        .annotation
+                    arg.annotation
                         .as_ref()
                         .map_or(false, |expr| any_over_expr(expr, func))
                 })
                 || args.posonlyargs.iter().any(|arg| {
-                    arg.node
-                        .annotation
+                    arg.annotation
                         .as_ref()
                         .map_or(false, |expr| any_over_expr(expr, func))
                 })
                 || args.vararg.as_ref().map_or(false, |arg| {
-                    arg.node
-                        .annotation
+                    arg.annotation
                         .as_ref()
                         .map_or(false, |expr| any_over_expr(expr, func))
                 })
                 || args.kwarg.as_ref().map_or(false, |arg| {
-                    arg.node
-                        .annotation
+                    arg.annotation
                         .as_ref()
                         .map_or(false, |expr| any_over_expr(expr, func))
                 })
@@ -335,68 +368,81 @@ where
                     .as_ref()
                     .map_or(false, |value| any_over_expr(value, func))
         }
-        StmtKind::ClassDef {
+        Stmt::ClassDef(ast::StmtClassDef {
             bases,
             keywords,
             body,
             decorator_list,
             ..
-        } => {
+        }) => {
             bases.iter().any(|expr| any_over_expr(expr, func))
                 || keywords
                     .iter()
-                    .any(|keyword| any_over_expr(&keyword.node.value, func))
+                    .any(|keyword| any_over_expr(&keyword.value, func))
                 || body.iter().any(|stmt| any_over_stmt(stmt, func))
                 || decorator_list.iter().any(|expr| any_over_expr(expr, func))
         }
-        StmtKind::Return { value } => value
+        Stmt::Return(ast::StmtReturn {
+            value,
+            range: _range,
+        }) => value
             .as_ref()
             .map_or(false, |value| any_over_expr(value, func)),
-        StmtKind::Delete { targets } => targets.iter().any(|expr| any_over_expr(expr, func)),
-        StmtKind::Assign { targets, value, .. } => {
+        Stmt::Delete(ast::StmtDelete {
+            targets,
+            range: _range,
+        }) => targets.iter().any(|expr| any_over_expr(expr, func)),
+        Stmt::Assign(ast::StmtAssign { targets, value, .. }) => {
             targets.iter().any(|expr| any_over_expr(expr, func)) || any_over_expr(value, func)
         }
-        StmtKind::AugAssign { target, value, .. } => {
+        Stmt::AugAssign(ast::StmtAugAssign { target, value, .. }) => {
             any_over_expr(target, func) || any_over_expr(value, func)
         }
-        StmtKind::AnnAssign {
+        Stmt::AnnAssign(ast::StmtAnnAssign {
             target,
             annotation,
             value,
             ..
-        } => {
+        }) => {
             any_over_expr(target, func)
                 || any_over_expr(annotation, func)
                 || value
                     .as_ref()
                     .map_or(false, |value| any_over_expr(value, func))
         }
-        StmtKind::For {
+        Stmt::For(ast::StmtFor {
             target,
             iter,
             body,
             orelse,
             ..
-        }
-        | StmtKind::AsyncFor {
+        })
+        | Stmt::AsyncFor(ast::StmtAsyncFor {
             target,
             iter,
             body,
             orelse,
             ..
-        } => {
+        }) => {
             any_over_expr(target, func)
                 || any_over_expr(iter, func)
                 || any_over_body(body, func)
                 || any_over_body(orelse, func)
         }
-        StmtKind::While { test, body, orelse } => {
-            any_over_expr(test, func) || any_over_body(body, func) || any_over_body(orelse, func)
-        }
-        StmtKind::If { test, body, orelse } => {
-            any_over_expr(test, func) || any_over_body(body, func) || any_over_body(orelse, func)
-        }
-        StmtKind::With { items, body, .. } | StmtKind::AsyncWith { items, body, .. } => {
+        Stmt::While(ast::StmtWhile {
+            test,
+            body,
+            orelse,
+            range: _range,
+        }) => any_over_expr(test, func) || any_over_body(body, func) || any_over_body(orelse, func),
+        Stmt::If(ast::StmtIf {
+            test,
+            body,
+            orelse,
+            range: _range,
+        }) => any_over_expr(test, func) || any_over_body(body, func) || any_over_body(orelse, func),
+        Stmt::With(ast::StmtWith { items, body, .. })
+        | Stmt::AsyncWith(ast::StmtAsyncWith { items, body, .. }) => {
             items.iter().any(|withitem| {
                 any_over_expr(&withitem.context_expr, func)
                     || withitem
@@ -405,28 +451,38 @@ where
                         .map_or(false, |expr| any_over_expr(expr, func))
             }) || any_over_body(body, func)
         }
-        StmtKind::Raise { exc, cause } => {
+        Stmt::Raise(ast::StmtRaise {
+            exc,
+            cause,
+            range: _range,
+        }) => {
             exc.as_ref()
                 .map_or(false, |value| any_over_expr(value, func))
                 || cause
                     .as_ref()
                     .map_or(false, |value| any_over_expr(value, func))
         }
-        StmtKind::Try {
+        Stmt::Try(ast::StmtTry {
             body,
             handlers,
             orelse,
             finalbody,
-        }
-        | StmtKind::TryStar {
+            range: _range,
+        })
+        | Stmt::TryStar(ast::StmtTryStar {
             body,
             handlers,
             orelse,
             finalbody,
-        } => {
+            range: _range,
+        }) => {
             any_over_body(body, func)
                 || handlers.iter().any(|handler| {
-                    let ExcepthandlerKind::ExceptHandler { type_, body, .. } = &handler.node;
+                    let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler {
+                        type_,
+                        body,
+                        ..
+                    }) = handler;
                     type_
                         .as_ref()
                         .map_or(false, |expr| any_over_expr(expr, func))
@@ -435,19 +491,28 @@ where
                 || any_over_body(orelse, func)
                 || any_over_body(finalbody, func)
         }
-        StmtKind::Assert { test, msg } => {
+        Stmt::Assert(ast::StmtAssert {
+            test,
+            msg,
+            range: _range,
+        }) => {
             any_over_expr(test, func)
                 || msg
                     .as_ref()
                     .map_or(false, |value| any_over_expr(value, func))
         }
-        StmtKind::Match { subject, cases } => {
+        Stmt::Match(ast::StmtMatch {
+            subject,
+            cases,
+            range: _range,
+        }) => {
             any_over_expr(subject, func)
                 || cases.iter().any(|case| {
                     let MatchCase {
                         pattern,
                         guard,
                         body,
+                        range: _range,
                     } = case;
                     any_over_pattern(pattern, func)
                         || guard
@@ -456,14 +521,15 @@ where
                         || any_over_body(body, func)
                 })
         }
-        StmtKind::Import { .. } => false,
-        StmtKind::ImportFrom { .. } => false,
-        StmtKind::Global { .. } => false,
-        StmtKind::Nonlocal { .. } => false,
-        StmtKind::Expr { value } => any_over_expr(value, func),
-        StmtKind::Pass => false,
-        StmtKind::Break => false,
-        StmtKind::Continue => false,
+        Stmt::Import(_) => false,
+        Stmt::ImportFrom(_) => false,
+        Stmt::Global(_) => false,
+        Stmt::Nonlocal(_) => false,
+        Stmt::Expr(ast::StmtExpr {
+            value,
+            range: _range,
+        }) => any_over_expr(value, func),
+        Stmt::Pass(_) | Stmt::Break(_) | Stmt::Continue(_) => false,
     }
 }
 
@@ -474,26 +540,32 @@ where
     body.iter().any(|stmt| any_over_stmt(stmt, func))
 }
 
-static DUNDER_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"__[^\s]+__").unwrap());
+fn is_dunder(id: &str) -> bool {
+    id.starts_with("__") && id.ends_with("__")
+}
 
 /// Return `true` if the [`Stmt`] is an assignment to a dunder (like `__all__`).
 pub fn is_assignment_to_a_dunder(stmt: &Stmt) -> bool {
     // Check whether it's an assignment to a dunder, with or without a type
     // annotation. This is what pycodestyle (as of 2.9.1) does.
-    match &stmt.node {
-        StmtKind::Assign { targets, .. } => {
+    match stmt {
+        Stmt::Assign(ast::StmtAssign { targets, .. }) => {
             if targets.len() != 1 {
                 return false;
             }
-            match &targets[0].node {
-                ExprKind::Name { id, .. } => DUNDER_REGEX.is_match(id),
-                _ => false,
+            if let Expr::Name(ast::ExprName { id, .. }) = &targets[0] {
+                is_dunder(id)
+            } else {
+                false
+            }
+        }
+        Stmt::AnnAssign(ast::StmtAnnAssign { target, .. }) => {
+            if let Expr::Name(ast::ExprName { id, .. }) = target.as_ref() {
+                is_dunder(id)
+            } else {
+                false
             }
         }
-        StmtKind::AnnAssign { target, .. } => match &target.node {
-            ExprKind::Name { id, .. } => DUNDER_REGEX.is_match(id),
-            _ => false,
-        },
         _ => false,
     }
 }
@@ -502,19 +574,19 @@ pub fn is_assignment_to_a_dunder(stmt: &Stmt) -> bool {
 /// `...`).
 pub const fn is_singleton(expr: &Expr) -> bool {
     matches!(
-        expr.node,
-        ExprKind::Constant {
+        expr,
+        Expr::Constant(ast::ExprConstant {
             value: Constant::None | Constant::Bool(_) | Constant::Ellipsis,
             ..
-        }
+        })
     )
 }
 
 /// Return `true` if the [`Expr`] is a constant or tuple of constants.
 pub fn is_constant(expr: &Expr) -> bool {
-    match &expr.node {
-        ExprKind::Constant { .. } => true,
-        ExprKind::Tuple { elts, .. } => elts.iter().all(is_constant),
+    match expr {
+        Expr::Constant(_) => true,
+        Expr::Tuple(ast::ExprTuple { elts, .. }) => elts.iter().all(is_constant),
         _ => false,
     }
 }
@@ -528,7 +600,7 @@ pub fn is_constant_non_singleton(expr: &Expr) -> bool {
 /// [`Keyword`] arguments.
 pub fn find_keyword<'a>(keywords: &'a [Keyword], keyword_name: &str) -> Option<&'a Keyword> {
     keywords.iter().find(|keyword| {
-        let KeywordData { arg, .. } = &keyword.node;
+        let Keyword { arg, .. } = keyword;
         arg.as_ref().map_or(false, |arg| arg == keyword_name)
     })
 }
@@ -536,29 +608,31 @@ pub fn find_keyword<'a>(keywords: &'a [Keyword], keyword_name: &str) -> Option<&
 /// Return `true` if an [`Expr`] is `None`.
 pub const fn is_const_none(expr: &Expr) -> bool {
     matches!(
-        &expr.node,
-        ExprKind::Constant {
+        expr,
+        Expr::Constant(ast::ExprConstant {
             value: Constant::None,
-            kind: None
-        },
+            kind: None,
+            ..
+        }),
     )
 }
 
 /// Return `true` if an [`Expr`] is `True`.
 pub const fn is_const_true(expr: &Expr) -> bool {
     matches!(
-        &expr.node,
-        ExprKind::Constant {
+        expr,
+        Expr::Constant(ast::ExprConstant {
             value: Constant::Bool(true),
-            kind: None
-        },
+            kind: None,
+            ..
+        }),
     )
 }
 
 /// Return `true` if a keyword argument is present with a non-`None` value.
 pub fn has_non_none_keyword(keywords: &[Keyword], keyword: &str) -> bool {
     find_keyword(keywords, keyword).map_or(false, |keyword| {
-        let KeywordData { value, .. } = &keyword.node;
+        let Keyword { value, .. } = keyword;
         !is_const_none(value)
     })
 }
@@ -567,10 +641,10 @@ pub fn has_non_none_keyword(keywords: &[Keyword], keyword: &str) -> bool {
 pub fn extract_handled_exceptions(handlers: &[Excepthandler]) -> Vec<&Expr> {
     let mut handled_exceptions = Vec::new();
     for handler in handlers {
-        match &handler.node {
-            ExcepthandlerKind::ExceptHandler { type_, .. } => {
+        match handler {
+            Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler { type_, .. }) => {
                 if let Some(type_) = type_ {
-                    if let ExprKind::Tuple { elts, .. } = &type_.node {
+                    if let Expr::Tuple(ast::ExprTuple { elts, .. }) = &type_.as_ref() {
                         for type_ in elts {
                             handled_exceptions.push(type_);
                         }
@@ -588,19 +662,19 @@ pub fn extract_handled_exceptions(handlers: &[Excepthandler]) -> Vec<&Expr> {
 pub fn collect_arg_names<'a>(arguments: &'a Arguments) -> FxHashSet<&'a str> {
     let mut arg_names: FxHashSet<&'a str> = FxHashSet::default();
     for arg in &arguments.posonlyargs {
-        arg_names.insert(arg.node.arg.as_str());
+        arg_names.insert(arg.arg.as_str());
     }
     for arg in &arguments.args {
-        arg_names.insert(arg.node.arg.as_str());
+        arg_names.insert(arg.arg.as_str());
     }
     if let Some(arg) = &arguments.vararg {
-        arg_names.insert(arg.node.arg.as_str());
+        arg_names.insert(arg.arg.as_str());
     }
     for arg in &arguments.kwonlyargs {
-        arg_names.insert(arg.node.arg.as_str());
+        arg_names.insert(arg.arg.as_str());
     }
     if let Some(arg) = &arguments.kwarg {
-        arg_names.insert(arg.node.arg.as_str());
+        arg_names.insert(arg.arg.as_str());
     }
     arg_names
 }
@@ -609,15 +683,33 @@ pub fn collect_arg_names<'a>(arguments: &'a Arguments) -> FxHashSet<&'a str> {
 /// be used with or without explicit call syntax), return the underlying
 /// callable.
 pub fn map_callable(decorator: &Expr) -> &Expr {
-    if let ExprKind::Call { func, .. } = &decorator.node {
+    if let Expr::Call(ast::ExprCall { func, .. }) = decorator {
+        // Ex) `@decorator()`
         func
     } else {
+        // Ex) `@decorator`
         decorator
     }
 }
 
+/// Given an [`Expr`] that can be callable or not (like a decorator, which could
+/// be used with or without explicit call syntax), return the underlying
+/// callable.
+pub fn map_subscript(expr: &Expr) -> &Expr {
+    if let Expr::Subscript(ast::ExprSubscript { value, .. }) = expr {
+        // Ex) `Iterable[T]`
+        value
+    } else {
+        // Ex) `Iterable`
+        expr
+    }
+}
+
 /// Returns `true` if a statement or expression includes at least one comment.
-pub fn has_comments<T>(located: &Located<T>, locator: &Locator) -> bool {
+pub fn has_comments<T>(located: &T, locator: &Locator) -> bool
+where
+    T: Ranged,
+{
     let start = if has_leading_content(located, locator) {
         located.start()
     } else {
@@ -636,7 +728,7 @@ pub fn has_comments<T>(located: &Located<T>, locator: &Locator) -> bool {
 pub fn has_comments_in(range: TextRange, locator: &Locator) -> bool {
     let source = &locator.contents()[range];
 
-    for tok in lexer::lex_located(source, Mode::Module, range.start()) {
+    for tok in lexer::lex_starts_at(source, Mode::Module, range.start()) {
         match tok {
             Ok((tok, _)) => {
                 if matches!(tok, Tok::Comment(..)) {
@@ -659,8 +751,8 @@ where
     F: Fn(&str) -> bool,
 {
     any_over_body(body, &|expr| {
-        if let ExprKind::Call { func, .. } = &expr.node {
-            if let ExprKind::Name { id, .. } = &func.node {
+        if let Expr::Call(ast::ExprCall { func, .. }) = expr {
+            if let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() {
                 if matches!(id.as_str(), "locals" | "globals" | "vars" | "exec" | "eval") {
                     if is_builtin(id.as_str()) {
                         return true;
@@ -683,7 +775,7 @@ where
 /// assert_eq!(format_import_from(Some(1), None), ".".to_string());
 /// assert_eq!(format_import_from(Some(1), Some("foo")), ".foo".to_string());
 /// ```
-pub fn format_import_from(level: Option<usize>, module: Option<&str>) -> String {
+pub fn format_import_from(level: Option<u32>, module: Option<&str>) -> String {
     let mut module_name = String::with_capacity(16);
     if let Some(level) = level {
         for _ in 0..level {
@@ -707,28 +799,24 @@ pub fn format_import_from(level: Option<usize>, module: Option<&str>) -> String
 /// assert_eq!(format_import_from_member(Some(1), None, "bar"), ".bar".to_string());
 /// assert_eq!(format_import_from_member(Some(1), Some("foo"), "bar"), ".foo.bar".to_string());
 /// ```
-pub fn format_import_from_member(
-    level: Option<usize>,
-    module: Option<&str>,
-    member: &str,
-) -> String {
-    let mut full_name = String::with_capacity(
-        level.map_or(0, |level| level)
+pub fn format_import_from_member(level: Option<u32>, module: Option<&str>, member: &str) -> String {
+    let mut qualified_name = String::with_capacity(
+        (level.unwrap_or(0) as usize)
             + module.as_ref().map_or(0, |module| module.len())
             + 1
             + member.len(),
     );
     if let Some(level) = level {
         for _ in 0..level {
-            full_name.push('.');
+            qualified_name.push('.');
         }
     }
     if let Some(module) = module {
-        full_name.push_str(module);
-        full_name.push('.');
+        qualified_name.push_str(module);
+        qualified_name.push('.');
     }
-    full_name.push_str(member);
-    full_name
+    qualified_name.push_str(member);
+    qualified_name
 }
 
 /// Create a module path from a (package, path) pair.
@@ -786,7 +874,7 @@ pub fn from_relative_import<'a>(module: &'a [String], name: &'a str) -> CallPath
 /// Given an imported module (based on its relative import level and module name), return the
 /// fully-qualified module path.
 pub fn resolve_imported_module_path<'a>(
-    level: Option<usize>,
+    level: Option<u32>,
     module: Option<&'a str>,
     module_path: Option<&[String]>,
 ) -> Option<Cow<'a, str>> {
@@ -802,11 +890,11 @@ pub fn resolve_imported_module_path<'a>(
         return None;
     };
 
-    if level >= module_path.len() {
+    if level as usize >= module_path.len() {
         return None;
     }
 
-    let mut qualified_path = module_path[..module_path.len() - level].join(".");
+    let mut qualified_path = module_path[..module_path.len() - level as usize].join(".");
     if let Some(module) = module {
         if !qualified_path.is_empty() {
             qualified_path.push('.');
@@ -816,62 +904,66 @@ pub fn resolve_imported_module_path<'a>(
     Some(Cow::Owned(qualified_path))
 }
 
-/// A [`Visitor`] that collects all `return` statements in a function or method.
+/// A [`StatementVisitor`] that collects all `return` statements in a function or method.
 #[derive(Default)]
 pub struct ReturnStatementVisitor<'a> {
-    pub returns: Vec<Option<&'a Expr>>,
+    pub returns: Vec<&'a ast::StmtReturn>,
 }
 
-impl<'a, 'b> Visitor<'b> for ReturnStatementVisitor<'a>
+impl<'a, 'b> StatementVisitor<'b> for ReturnStatementVisitor<'a>
 where
     'b: 'a,
 {
     fn visit_stmt(&mut self, stmt: &'b Stmt) {
-        match &stmt.node {
-            StmtKind::FunctionDef { .. } | StmtKind::AsyncFunctionDef { .. } => {
+        match stmt {
+            Stmt::FunctionDef(_) | Stmt::AsyncFunctionDef(_) => {
                 // Don't recurse.
             }
-            StmtKind::Return { value } => self.returns.push(value.as_deref()),
-            _ => visitor::walk_stmt(self, stmt),
+            Stmt::Return(stmt) => self.returns.push(stmt),
+            _ => walk_stmt(self, stmt),
         }
     }
 }
 
-/// A [`Visitor`] that collects all `raise` statements in a function or method.
+/// A [`StatementVisitor`] that collects all `raise` statements in a function or method.
 #[derive(Default)]
 pub struct RaiseStatementVisitor<'a> {
     pub raises: Vec<(TextRange, Option<&'a Expr>, Option<&'a Expr>)>,
 }
 
-impl<'a, 'b> Visitor<'b> for RaiseStatementVisitor<'b>
+impl<'a, 'b> StatementVisitor<'b> for RaiseStatementVisitor<'b>
 where
     'b: 'a,
 {
     fn visit_stmt(&mut self, stmt: &'b Stmt) {
-        match &stmt.node {
-            StmtKind::Raise { exc, cause } => {
+        match stmt {
+            Stmt::Raise(ast::StmtRaise {
+                exc,
+                cause,
+                range: _range,
+            }) => {
                 self.raises
                     .push((stmt.range(), exc.as_deref(), cause.as_deref()));
             }
-            StmtKind::ClassDef { .. }
-            | StmtKind::FunctionDef { .. }
-            | StmtKind::AsyncFunctionDef { .. }
-            | StmtKind::Try { .. }
-            | StmtKind::TryStar { .. } => {}
-            StmtKind::If { body, orelse, .. } => {
-                visitor::walk_body(self, body);
-                visitor::walk_body(self, orelse);
+            Stmt::ClassDef(_)
+            | Stmt::FunctionDef(_)
+            | Stmt::AsyncFunctionDef(_)
+            | Stmt::Try(_)
+            | Stmt::TryStar(_) => {}
+            Stmt::If(ast::StmtIf { body, orelse, .. }) => {
+                walk_body(self, body);
+                walk_body(self, orelse);
             }
-            StmtKind::While { body, .. }
-            | StmtKind::With { body, .. }
-            | StmtKind::AsyncWith { body, .. }
-            | StmtKind::For { body, .. }
-            | StmtKind::AsyncFor { body, .. } => {
-                visitor::walk_body(self, body);
+            Stmt::While(ast::StmtWhile { body, .. })
+            | Stmt::With(ast::StmtWith { body, .. })
+            | Stmt::AsyncWith(ast::StmtAsyncWith { body, .. })
+            | Stmt::For(ast::StmtFor { body, .. })
+            | Stmt::AsyncFor(ast::StmtAsyncFor { body, .. }) => {
+                walk_body(self, body);
             }
-            StmtKind::Match { cases, .. } => {
+            Stmt::Match(ast::StmtMatch { cases, .. }) => {
                 for case in cases {
-                    visitor::walk_body(self, &case.body);
+                    walk_body(self, &case.body);
                 }
             }
             _ => {}
@@ -879,47 +971,21 @@ where
     }
 }
 
-#[derive(Default)]
-struct GlobalStatementVisitor<'a> {
-    globals: FxHashMap<&'a str, &'a Stmt>,
-}
-
-impl<'a> Visitor<'a> for GlobalStatementVisitor<'a> {
-    fn visit_stmt(&mut self, stmt: &'a Stmt) {
-        match &stmt.node {
-            StmtKind::Global { names } => {
-                for name in names {
-                    self.globals.insert(name, stmt);
-                }
-            }
-            StmtKind::FunctionDef { .. }
-            | StmtKind::AsyncFunctionDef { .. }
-            | StmtKind::ClassDef { .. } => {
-                // Don't recurse.
-            }
-            _ => visitor::walk_stmt(self, stmt),
-        }
-    }
-}
-
-/// Extract a map from global name to its last-defining [`Stmt`].
-pub fn extract_globals(body: &[Stmt]) -> FxHashMap<&str, &Stmt> {
-    let mut visitor = GlobalStatementVisitor::default();
-    for stmt in body {
-        visitor.visit_stmt(stmt);
-    }
-    visitor.globals
-}
-
-/// Return `true` if a [`Located`] has leading content.
-pub fn has_leading_content<T>(located: &Located<T>, locator: &Locator) -> bool {
+/// Return `true` if a [`Ranged`] has leading content.
+pub fn has_leading_content<T>(located: &T, locator: &Locator) -> bool
+where
+    T: Ranged,
+{
     let line_start = locator.line_start(located.start());
     let leading = &locator.contents()[TextRange::new(line_start, located.start())];
     leading.chars().any(|char| !char.is_whitespace())
 }
 
-/// Return `true` if a [`Located`] has trailing content.
-pub fn has_trailing_content<T>(located: &Located<T>, locator: &Locator) -> bool {
+/// Return `true` if a [`Ranged`] has trailing content.
+pub fn has_trailing_content<T>(located: &T, locator: &Locator) -> bool
+where
+    T: Ranged,
+{
     let line_end = locator.line_end(located.end());
     let trailing = &locator.contents()[TextRange::new(located.end(), line_end)];
 
@@ -934,11 +1000,11 @@ pub fn has_trailing_content<T>(located: &Located<T>, locator: &Locator) -> bool
     false
 }
 
-/// If a [`Located`] has a trailing comment, return the index of the hash.
-pub fn trailing_comment_start_offset<T>(
-    located: &Located<T>,
-    locator: &Locator,
-) -> Option<TextSize> {
+/// If a [`Ranged`] has a trailing comment, return the index of the hash.
+pub fn trailing_comment_start_offset<T>(located: &T, locator: &Locator) -> Option<TextSize>
+where
+    T: Ranged,
+{
     let line_end = locator.line_end(located.end());
 
     let trailing = &locator.contents()[TextRange::new(located.end(), line_end)];
@@ -972,18 +1038,18 @@ pub fn match_parens(start: TextSize, locator: &Locator) -> Option<TextRange> {
 
     let mut fix_start = None;
     let mut fix_end = None;
-    let mut count: usize = 0;
+    let mut count = 0u32;
 
-    for (tok, range) in lexer::lex_located(contents, Mode::Module, start).flatten() {
+    for (tok, range) in lexer::lex_starts_at(contents, Mode::Module, start).flatten() {
         match tok {
             Tok::Lpar => {
                 if count == 0 {
                     fix_start = Some(range.start());
                 }
-                count += 1;
+                count = count.saturating_add(1);
             }
             Tok::Rpar => {
-                count -= 1;
+                count = count.saturating_sub(1);
                 if count == 0 {
                     fix_end = Some(range.end());
                     break;
@@ -1003,33 +1069,53 @@ pub fn match_parens(start: TextSize, locator: &Locator) -> Option<TextRange> {
 /// Specifically, this method returns the range of a function or class name,
 /// rather than that of the entire function or class body.
 pub fn identifier_range(stmt: &Stmt, locator: &Locator) -> TextRange {
-    if matches!(
-        stmt.node,
-        StmtKind::ClassDef { .. }
-            | StmtKind::FunctionDef { .. }
-            | StmtKind::AsyncFunctionDef { .. }
-    ) {
-        let contents = &locator.contents()[stmt.range()];
-
-        for (tok, range) in lexer::lex_located(contents, Mode::Module, stmt.start()).flatten() {
-            if matches!(tok, Tok::Name { .. }) {
-                return range;
-            }
+    match stmt {
+        Stmt::ClassDef(ast::StmtClassDef {
+            decorator_list,
+            range,
+            ..
+        })
+        | Stmt::FunctionDef(ast::StmtFunctionDef {
+            decorator_list,
+            range,
+            ..
+        })
+        | Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef {
+            decorator_list,
+            range,
+            ..
+        }) => {
+            let header_range = decorator_list.last().map_or(*range, |last_decorator| {
+                TextRange::new(last_decorator.end(), range.end())
+            });
+
+            let contents = locator.slice(header_range);
+
+            let mut tokens =
+                lexer::lex_starts_at(contents, Mode::Module, header_range.start()).flatten();
+            tokens
+                .find_map(|(t, range)| t.is_name().then_some(range))
+                .unwrap_or_else(|| {
+                    error!("Failed to find identifier for {:?}", stmt);
+
+                    header_range
+                })
         }
-        error!("Failed to find identifier for {:?}", stmt);
+        _ => stmt.range(),
     }
-
-    stmt.range()
 }
 
 /// Return the ranges of [`Tok::Name`] tokens within a specified node.
 pub fn find_names<'a, T>(
-    located: &'a Located<T>,
+    located: &'a T,
     locator: &'a Locator,
-) -> impl Iterator<Item = TextRange> + 'a {
+) -> impl Iterator<Item = TextRange> + 'a
+where
+    T: Ranged,
+{
     let contents = locator.slice(located.range());
 
-    lexer::lex_located(contents, Mode::Module, located.start())
+    lexer::lex_starts_at(contents, Mode::Module, located.start())
         .flatten()
         .filter(|(tok, _)| matches!(tok, Tok::Name { .. }))
         .map(|(_, range)| range)
@@ -1037,15 +1123,18 @@ pub fn find_names<'a, T>(
 
 /// Return the `Range` of `name` in `Excepthandler`.
 pub fn excepthandler_name_range(handler: &Excepthandler, locator: &Locator) -> Option<TextRange> {
-    let ExcepthandlerKind::ExceptHandler {
-        name, type_, body, ..
-    } = &handler.node;
+    let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler {
+        name,
+        type_,
+        body,
+        range: _range,
+    }) = handler;
 
     match (name, type_) {
         (Some(_), Some(type_)) => {
             let contents = &locator.contents()[TextRange::new(type_.end(), body[0].start())];
 
-            lexer::lex_located(contents, Mode::Module, type_.end())
+            lexer::lex_starts_at(contents, Mode::Module, type_.end())
                 .flatten()
                 .tuple_windows()
                 .find(|(tok, next_tok)| {
@@ -1059,7 +1148,7 @@ pub fn excepthandler_name_range(handler: &Excepthandler, locator: &Locator) -> O
 
 /// Return the `Range` of `except` in `Excepthandler`.
 pub fn except_range(handler: &Excepthandler, locator: &Locator) -> TextRange {
-    let ExcepthandlerKind::ExceptHandler { body, type_, .. } = &handler.node;
+    let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler { body, type_, .. }) = handler;
     let end = if let Some(type_) = type_ {
         type_.end()
     } else {
@@ -1067,7 +1156,7 @@ pub fn except_range(handler: &Excepthandler, locator: &Locator) -> TextRange {
     };
     let contents = &locator.contents()[TextRange::new(handler.start(), end)];
 
-    lexer::lex_located(contents, Mode::Module, handler.start())
+    lexer::lex_starts_at(contents, Mode::Module, handler.start())
         .flatten()
         .find(|(kind, _)| matches!(kind, Tok::Except { .. }))
         .map(|(_, range)| range)
@@ -1076,10 +1165,10 @@ pub fn except_range(handler: &Excepthandler, locator: &Locator) -> TextRange {
 
 /// Return the `Range` of `else` in `For`, `AsyncFor`, and `While` statements.
 pub fn else_range(stmt: &Stmt, locator: &Locator) -> Option<TextRange> {
-    match &stmt.node {
-        StmtKind::For { body, orelse, .. }
-        | StmtKind::AsyncFor { body, orelse, .. }
-        | StmtKind::While { body, orelse, .. }
+    match stmt {
+        Stmt::For(ast::StmtFor { body, orelse, .. })
+        | Stmt::AsyncFor(ast::StmtAsyncFor { body, orelse, .. })
+        | Stmt::While(ast::StmtWhile { body, orelse, .. })
             if !orelse.is_empty() =>
         {
             let body_end = body.last().expect("Expected body to be non-empty").end();
@@ -1089,7 +1178,7 @@ pub fn else_range(stmt: &Stmt, locator: &Locator) -> Option<TextRange> {
                 .start();
             let contents = &locator.contents()[TextRange::new(body_end, or_else_start)];
 
-            lexer::lex_located(contents, Mode::Module, body_end)
+            lexer::lex_starts_at(contents, Mode::Module, body_end)
                 .flatten()
                 .find(|(kind, _)| matches!(kind, Tok::Else))
                 .map(|(_, range)| range)
@@ -1101,7 +1190,7 @@ pub fn else_range(stmt: &Stmt, locator: &Locator) -> Option<TextRange> {
 /// Return the `Range` of the first `Tok::Colon` token in a `Range`.
 pub fn first_colon_range(range: TextRange, locator: &Locator) -> Option<TextRange> {
     let contents = &locator.contents()[range];
-    let range = lexer::lex_located(contents, Mode::Module, range.start())
+    let range = lexer::lex_starts_at(contents, Mode::Module, range.start())
         .flatten()
         .find(|(kind, _)| matches!(kind, Tok::Colon))
         .map(|(_, range)| range);
@@ -1110,23 +1199,20 @@ pub fn first_colon_range(range: TextRange, locator: &Locator) -> Option<TextRang
 
 /// Return the `Range` of the first `Elif` or `Else` token in an `If` statement.
 pub fn elif_else_range(stmt: &Stmt, locator: &Locator) -> Option<TextRange> {
-    let StmtKind::If { body, orelse, .. } = &stmt.node else {
+    let Stmt::If(ast::StmtIf { body, orelse, .. } )= stmt else {
         return None;
     };
 
     let start = body.last().expect("Expected body to be non-empty").end();
 
     let end = match &orelse[..] {
-        [Stmt {
-            node: StmtKind::If { test, .. },
-            ..
-        }] => test.start(),
+        [Stmt::If(ast::StmtIf { test, .. })] => test.start(),
         [stmt, ..] => stmt.start(),
         _ => return None,
     };
 
     let contents = &locator.contents()[TextRange::new(start, end)];
-    lexer::lex_located(contents, Mode::Module, start)
+    lexer::lex_starts_at(contents, Mode::Module, start)
         .flatten()
         .find(|(kind, _)| matches!(kind, Tok::Elif | Tok::Else))
         .map(|(_, range)| range)
@@ -1174,14 +1260,18 @@ pub fn followed_by_multi_statement_line(stmt: &Stmt, locator: &Locator) -> bool
 }
 
 /// Return `true` if a `Stmt` is a docstring.
-pub const fn is_docstring_stmt(stmt: &Stmt) -> bool {
-    if let StmtKind::Expr { value } = &stmt.node {
+pub fn is_docstring_stmt(stmt: &Stmt) -> bool {
+    if let Stmt::Expr(ast::StmtExpr {
+        value,
+        range: _range,
+    }) = stmt
+    {
         matches!(
-            value.node,
-            ExprKind::Constant {
+            value.as_ref(),
+            Expr::Constant(ast::ExprConstant {
                 value: Constant::Str { .. },
                 ..
-            }
+            })
         )
     } else {
         false
@@ -1202,14 +1292,14 @@ impl<'a> SimpleCallArgs<'a> {
     ) -> Self {
         let args = args
             .into_iter()
-            .take_while(|arg| !matches!(arg.node, ExprKind::Starred { .. }))
+            .take_while(|arg| !matches!(arg, Expr::Starred(_)))
             .collect();
 
         let kwargs = keywords
             .into_iter()
             .filter_map(|keyword| {
-                let node = &keyword.node;
-                node.arg.as_ref().map(|arg| (arg.as_ref(), &node.value))
+                let node = keyword;
+                node.arg.as_ref().map(|arg| (arg.as_str(), &node.value))
             })
             .collect();
 
@@ -1245,14 +1335,15 @@ impl<'a> SimpleCallArgs<'a> {
 /// Check if a node is parent of a conditional branch.
 pub fn on_conditional_branch<'a>(parents: &mut impl Iterator<Item = &'a Stmt>) -> bool {
     parents.any(|parent| {
-        if matches!(
-            parent.node,
-            StmtKind::If { .. } | StmtKind::While { .. } | StmtKind::Match { .. }
-        ) {
+        if matches!(parent, Stmt::If(_) | Stmt::While(_) | Stmt::Match(_)) {
             return true;
         }
-        if let StmtKind::Expr { value } = &parent.node {
-            if matches!(value.node, ExprKind::IfExp { .. }) {
+        if let Stmt::Expr(ast::StmtExpr {
+            value,
+            range: _range,
+        }) = parent
+        {
+            if matches!(value.as_ref(), Expr::IfExp(_)) {
                 return true;
             }
         }
@@ -1264,22 +1355,18 @@ pub fn on_conditional_branch<'a>(parents: &mut impl Iterator<Item = &'a Stmt>) -
 pub fn in_nested_block<'a>(mut parents: impl Iterator<Item = &'a Stmt>) -> bool {
     parents.any(|parent| {
         matches!(
-            parent.node,
-            StmtKind::Try { .. }
-                | StmtKind::TryStar { .. }
-                | StmtKind::If { .. }
-                | StmtKind::With { .. }
-                | StmtKind::Match { .. }
+            parent,
+            Stmt::Try(_) | Stmt::TryStar(_) | Stmt::If(_) | Stmt::With(_) | Stmt::Match(_)
         )
     })
 }
 
 /// Check if a node represents an unpacking assignment.
 pub fn is_unpacking_assignment(parent: &Stmt, child: &Expr) -> bool {
-    match &parent.node {
-        StmtKind::With { items, .. } => items.iter().any(|item| {
+    match parent {
+        Stmt::With(ast::StmtWith { items, .. }) => items.iter().any(|item| {
             if let Some(optional_vars) = &item.optional_vars {
-                if matches!(optional_vars.node, ExprKind::Tuple { .. }) {
+                if matches!(optional_vars.as_ref(), Expr::Tuple(_)) {
                     if any_over_expr(optional_vars, &|expr| expr == child) {
                         return true;
                     }
@@ -1287,29 +1374,24 @@ pub fn is_unpacking_assignment(parent: &Stmt, child: &Expr) -> bool {
             }
             false
         }),
-        StmtKind::Assign { targets, value, .. } => {
+        Stmt::Assign(ast::StmtAssign { targets, value, .. }) => {
             // In `(a, b) = (1, 2)`, `(1, 2)` is the target, and it is a tuple.
             let value_is_tuple = matches!(
-                &value.node,
-                ExprKind::Set { .. } | ExprKind::List { .. } | ExprKind::Tuple { .. }
+                value.as_ref(),
+                Expr::Set(_) | Expr::List(_) | Expr::Tuple(_)
             );
             // In `(a, b) = coords = (1, 2)`, `(a, b)` and `coords` are the targets, and
             // `(a, b)` is a tuple. (We use "tuple" as a placeholder for any
             // unpackable expression.)
-            let targets_are_tuples = targets.iter().all(|item| {
-                matches!(
-                    item.node,
-                    ExprKind::Set { .. } | ExprKind::List { .. } | ExprKind::Tuple { .. }
-                )
-            });
+            let targets_are_tuples = targets
+                .iter()
+                .all(|item| matches!(item, Expr::Set(_) | Expr::List(_) | Expr::Tuple(_)));
             // If we're looking at `a` in `(a, b) = coords = (1, 2)`, then we should
             // identify that the current expression is in a tuple.
             let child_in_tuple = targets_are_tuples
                 || targets.iter().any(|item| {
-                    matches!(
-                        item.node,
-                        ExprKind::Set { .. } | ExprKind::List { .. } | ExprKind::Tuple { .. }
-                    ) && any_over_expr(item, &|expr| expr == child)
+                    matches!(item, Expr::Set(_) | Expr::List(_) | Expr::Tuple(_))
+                        && any_over_expr(item, &|expr| expr == child)
                 });
 
             // If our child is a tuple, and value is not, it's always an unpacking
@@ -1339,7 +1421,20 @@ pub fn is_unpacking_assignment(parent: &Stmt, child: &Expr) -> bool {
     }
 }
 
-pub type LocatedCmpop<U = ()> = Located<Cmpop, U>;
+#[derive(Clone, PartialEq, Debug)]
+pub struct LocatedCmpop {
+    pub range: TextRange,
+    pub op: Cmpop,
+}
+
+impl LocatedCmpop {
+    fn new<T: Into<TextRange>>(range: T, op: Cmpop) -> Self {
+        Self {
+            range: range.into(),
+            op,
+        }
+    }
+}
 
 /// Extract all [`Cmpop`] operators from a source code snippet, with appropriate
 /// ranges.
@@ -1350,16 +1445,16 @@ pub type LocatedCmpop<U = ()> = Located<Cmpop, U>;
 pub fn locate_cmpops(contents: &str) -> Vec<LocatedCmpop> {
     let mut tok_iter = lexer::lex(contents, Mode::Module).flatten().peekable();
     let mut ops: Vec<LocatedCmpop> = vec![];
-    let mut count: usize = 0;
+    let mut count = 0u32;
     loop {
         let Some((tok, range)) = tok_iter.next() else {
             break;
         };
         if matches!(tok, Tok::Lpar) {
-            count += 1;
+            count = count.saturating_add(1);
             continue;
         } else if matches!(tok, Tok::Rpar) {
-            count -= 1;
+            count = count.saturating_sub(1);
             continue;
         }
         if count == 0 {
@@ -1369,42 +1464,44 @@ pub fn locate_cmpops(contents: &str) -> Vec<LocatedCmpop> {
                         tok_iter.next_if(|(tok, _)| matches!(tok, Tok::In))
                     {
                         ops.push(LocatedCmpop::new(
-                            range.start(),
-                            next_range.end(),
+                            TextRange::new(range.start(), next_range.end()),
                             Cmpop::NotIn,
                         ));
                     }
                 }
                 Tok::In => {
-                    ops.push(LocatedCmpop::with_range(Cmpop::In, range));
+                    ops.push(LocatedCmpop::new(range, Cmpop::In));
                 }
                 Tok::Is => {
                     let op = if let Some((_, next_range)) =
                         tok_iter.next_if(|(tok, _)| matches!(tok, Tok::Not))
                     {
-                        LocatedCmpop::new(range.start(), next_range.end(), Cmpop::IsNot)
+                        LocatedCmpop::new(
+                            TextRange::new(range.start(), next_range.end()),
+                            Cmpop::IsNot,
+                        )
                     } else {
-                        LocatedCmpop::with_range(Cmpop::Is, range)
+                        LocatedCmpop::new(range, Cmpop::Is)
                     };
                     ops.push(op);
                 }
                 Tok::NotEqual => {
-                    ops.push(LocatedCmpop::with_range(Cmpop::NotEq, range));
+                    ops.push(LocatedCmpop::new(range, Cmpop::NotEq));
                 }
                 Tok::EqEqual => {
-                    ops.push(LocatedCmpop::with_range(Cmpop::Eq, range));
+                    ops.push(LocatedCmpop::new(range, Cmpop::Eq));
                 }
                 Tok::GreaterEqual => {
-                    ops.push(LocatedCmpop::with_range(Cmpop::GtE, range));
+                    ops.push(LocatedCmpop::new(range, Cmpop::GtE));
                 }
                 Tok::Greater => {
-                    ops.push(LocatedCmpop::with_range(Cmpop::Gt, range));
+                    ops.push(LocatedCmpop::new(range, Cmpop::Gt));
                 }
                 Tok::LessEqual => {
-                    ops.push(LocatedCmpop::with_range(Cmpop::LtE, range));
+                    ops.push(LocatedCmpop::new(range, Cmpop::LtE));
                 }
                 Tok::Less => {
-                    ops.push(LocatedCmpop::with_range(Cmpop::Lt, range));
+                    ops.push(LocatedCmpop::new(range, Cmpop::Lt));
                 }
                 _ => {}
             }
@@ -1448,8 +1545,8 @@ impl Truthiness {
     where
         F: Fn(&str) -> bool,
     {
-        match &expr.node {
-            ExprKind::Constant { value, .. } => match value {
+        match expr {
+            Expr::Constant(ast::ExprConstant { value, .. }) => match value {
                 Constant::Bool(value) => Some(*value),
                 Constant::None => Some(false),
                 Constant::Str(string) => Some(!string.is_empty()),
@@ -1460,11 +1557,11 @@ impl Truthiness {
                 Constant::Ellipsis => Some(true),
                 Constant::Tuple(elts) => Some(!elts.is_empty()),
             },
-            ExprKind::JoinedStr { values, .. } => {
+            Expr::JoinedStr(ast::ExprJoinedStr { values, range: _range }) => {
                 if values.is_empty() {
                     Some(false)
                 } else if values.iter().any(|value| {
-                    let ExprKind::Constant { value: Constant::Str(string), .. } = &value.node else {
+                    let Expr::Constant(ast::ExprConstant { value: Constant::Str(string), .. } )= &value else {
                         return false;
                     };
                     !string.is_empty()
@@ -1474,16 +1571,16 @@ impl Truthiness {
                     None
                 }
             }
-            ExprKind::List { elts, .. }
-            | ExprKind::Set { elts, .. }
-            | ExprKind::Tuple { elts, .. } => Some(!elts.is_empty()),
-            ExprKind::Dict { keys, .. } => Some(!keys.is_empty()),
-            ExprKind::Call {
+            Expr::List(ast::ExprList { elts, range: _range, .. })
+            | Expr::Set(ast::ExprSet { elts, range: _range })
+            | Expr::Tuple(ast::ExprTuple { elts,  range: _range,.. }) => Some(!elts.is_empty()),
+            Expr::Dict(ast::ExprDict { keys, range: _range, .. }) => Some(!keys.is_empty()),
+            Expr::Call(ast::ExprCall {
                 func,
                 args,
-                keywords,
-            } => {
-                if let ExprKind::Name { id, .. } = &func.node {
+                keywords, range: _range,
+            }) => {
+                if let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() {
                     if is_iterable_initializer(id.as_str(), |id| is_builtin(id)) {
                         if args.is_empty() && keywords.is_empty() {
                             Some(false)
@@ -1511,8 +1608,9 @@ mod tests {
 
     use anyhow::Result;
     use ruff_text_size::{TextLen, TextRange, TextSize};
-    use rustpython_parser as parser;
+    use rustpython_ast::Suite;
     use rustpython_parser::ast::Cmpop;
+    use rustpython_parser::Parse;
 
     use crate::helpers::{
         elif_else_range, else_range, first_colon_range, has_trailing_content, identifier_range,
@@ -1523,25 +1621,25 @@ mod tests {
     #[test]
     fn trailing_content() -> Result<()> {
         let contents = "x = 1";
-        let program = parser::parse_program(contents, "<filename>")?;
+        let program = Suite::parse(contents, "<filename>")?;
         let stmt = program.first().unwrap();
         let locator = Locator::new(contents);
         assert!(!has_trailing_content(stmt, &locator));
 
         let contents = "x = 1; y = 2";
-        let program = parser::parse_program(contents, "<filename>")?;
+        let program = Suite::parse(contents, "<filename>")?;
         let stmt = program.first().unwrap();
         let locator = Locator::new(contents);
         assert!(has_trailing_content(stmt, &locator));
 
         let contents = "x = 1  ";
-        let program = parser::parse_program(contents, "<filename>")?;
+        let program = Suite::parse(contents, "<filename>")?;
         let stmt = program.first().unwrap();
         let locator = Locator::new(contents);
         assert!(!has_trailing_content(stmt, &locator));
 
         let contents = "x = 1  # Comment";
-        let program = parser::parse_program(contents, "<filename>")?;
+        let program = Suite::parse(contents, "<filename>")?;
         let stmt = program.first().unwrap();
         let locator = Locator::new(contents);
         assert!(!has_trailing_content(stmt, &locator));
@@ -1551,7 +1649,7 @@ x = 1
 y = 2
 "#
         .trim();
-        let program = parser::parse_program(contents, "<filename>")?;
+        let program = Suite::parse(contents, "<filename>")?;
         let stmt = program.first().unwrap();
         let locator = Locator::new(contents);
         assert!(!has_trailing_content(stmt, &locator));
@@ -1562,7 +1660,7 @@ y = 2
     #[test]
     fn extract_identifier_range() -> Result<()> {
         let contents = "def f(): pass".trim();
-        let program = parser::parse_program(contents, "<filename>")?;
+        let program = Suite::parse(contents, "<filename>")?;
         let stmt = program.first().unwrap();
         let locator = Locator::new(contents);
         assert_eq!(
@@ -1576,7 +1674,7 @@ def \
   pass
 "#
         .trim();
-        let program = parser::parse_program(contents, "<filename>")?;
+        let program = Suite::parse(contents, "<filename>")?;
         let stmt = program.first().unwrap();
         let locator = Locator::new(contents);
         assert_eq!(
@@ -1585,7 +1683,7 @@ def \
         );
 
         let contents = "class Class(): pass".trim();
-        let program = parser::parse_program(contents, "<filename>")?;
+        let program = Suite::parse(contents, "<filename>")?;
         let stmt = program.first().unwrap();
         let locator = Locator::new(contents);
         assert_eq!(
@@ -1594,7 +1692,7 @@ def \
         );
 
         let contents = "class Class: pass".trim();
-        let program = parser::parse_program(contents, "<filename>")?;
+        let program = Suite::parse(contents, "<filename>")?;
         let stmt = program.first().unwrap();
         let locator = Locator::new(contents);
         assert_eq!(
@@ -1608,7 +1706,7 @@ class Class():
   pass
 "#
         .trim();
-        let program = parser::parse_program(contents, "<filename>")?;
+        let program = Suite::parse(contents, "<filename>")?;
         let stmt = program.first().unwrap();
         let locator = Locator::new(contents);
         assert_eq!(
@@ -1617,7 +1715,7 @@ class Class():
         );
 
         let contents = r#"x = y + 1"#.trim();
-        let program = parser::parse_program(contents, "<filename>")?;
+        let program = Suite::parse(contents, "<filename>")?;
         let stmt = program.first().unwrap();
         let locator = Locator::new(contents);
         assert_eq!(
@@ -1674,7 +1772,7 @@ else:
     pass
 "#
         .trim();
-        let program = parser::parse_program(contents, "<filename>")?;
+        let program = Suite::parse(contents, "<filename>")?;
         let stmt = program.first().unwrap();
         let locator = Locator::new(contents);
         let range = else_range(stmt, &locator).unwrap();
@@ -1708,7 +1806,7 @@ elif b:
     ...
 "
         .trim_start();
-        let program = parser::parse_program(contents, "<filename>")?;
+        let program = Suite::parse(contents, "<filename>")?;
         let stmt = program.first().unwrap();
         let locator = Locator::new(contents);
         let range = elif_else_range(stmt, &locator).unwrap();
@@ -1722,7 +1820,7 @@ else:
     ...
 "
         .trim_start();
-        let program = parser::parse_program(contents, "<filename>")?;
+        let program = Suite::parse(contents, "<filename>")?;
         let stmt = program.first().unwrap();
         let locator = Locator::new(contents);
         let range = elif_else_range(stmt, &locator).unwrap();
@@ -1737,8 +1835,7 @@ else:
         assert_eq!(
             locate_cmpops("x == 1"),
             vec![LocatedCmpop::new(
-                TextSize::from(2),
-                TextSize::from(4),
+                TextSize::from(2)..TextSize::from(4),
                 Cmpop::Eq
             )]
         );
@@ -1746,8 +1843,7 @@ else:
         assert_eq!(
             locate_cmpops("x != 1"),
             vec![LocatedCmpop::new(
-                TextSize::from(2),
-                TextSize::from(4),
+                TextSize::from(2)..TextSize::from(4),
                 Cmpop::NotEq
             )]
         );
@@ -1755,8 +1851,7 @@ else:
         assert_eq!(
             locate_cmpops("x is 1"),
             vec![LocatedCmpop::new(
-                TextSize::from(2),
-                TextSize::from(4),
+                TextSize::from(2)..TextSize::from(4),
                 Cmpop::Is
             )]
         );
@@ -1764,8 +1859,7 @@ else:
         assert_eq!(
             locate_cmpops("x is not 1"),
             vec![LocatedCmpop::new(
-                TextSize::from(2),
-                TextSize::from(8),
+                TextSize::from(2)..TextSize::from(8),
                 Cmpop::IsNot
             )]
         );
@@ -1773,8 +1867,7 @@ else:
         assert_eq!(
             locate_cmpops("x in 1"),
             vec![LocatedCmpop::new(
-                TextSize::from(2),
-                TextSize::from(4),
+                TextSize::from(2)..TextSize::from(4),
                 Cmpop::In
             )]
         );
@@ -1782,8 +1875,7 @@ else:
         assert_eq!(
             locate_cmpops("x not in 1"),
             vec![LocatedCmpop::new(
-                TextSize::from(2),
-                TextSize::from(8),
+                TextSize::from(2)..TextSize::from(8),
                 Cmpop::NotIn
             )]
         );
@@ -1791,8 +1883,7 @@ else:
         assert_eq!(
             locate_cmpops("x != (1 is not 2)"),
             vec![LocatedCmpop::new(
-                TextSize::from(2),
-                TextSize::from(4),
+                TextSize::from(2)..TextSize::from(4),
                 Cmpop::NotEq
             )]
         );
diff --git a/crates/ruff_python_ast/src/imports.rs b/crates/ruff_python_ast/src/imports.rs
index f3913d225d736..098f75c0d66b4 100644
--- a/crates/ruff_python_ast/src/imports.rs
+++ b/crates/ruff_python_ast/src/imports.rs
@@ -1,6 +1,5 @@
 use ruff_text_size::TextRange;
 use rustc_hash::FxHashMap;
-
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
@@ -22,7 +21,7 @@ pub struct Import<'a> {
 pub struct ImportFrom<'a> {
     pub module: Option<&'a str>,
     pub name: Alias<'a>,
-    pub level: Option<usize>,
+    pub level: Option<u32>,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -32,6 +31,7 @@ pub struct Alias<'a> {
 }
 
 impl<'a> Import<'a> {
+    /// Creates a new `Import` to import the specified module.
     pub fn module(name: &'a str) -> Self {
         Self {
             name: Alias {
@@ -42,6 +42,20 @@ impl<'a> Import<'a> {
     }
 }
 
+impl<'a> ImportFrom<'a> {
+    /// Creates a new `ImportFrom` to import a member from the specified module.
+    pub fn member(module: &'a str, name: &'a str) -> Self {
+        Self {
+            module: Some(module),
+            name: Alias {
+                name,
+                as_name: None,
+            },
+            level: None,
+        }
+    }
+}
+
 impl std::fmt::Display for AnyImport<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         match self {
@@ -65,7 +79,7 @@ impl std::fmt::Display for ImportFrom<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         write!(f, "from ")?;
         if let Some(level) = self.level {
-            write!(f, "{}", ".".repeat(level))?;
+            write!(f, "{}", ".".repeat(level as usize))?;
         }
         if let Some(module) = self.module {
             write!(f, "{module}")?;
diff --git a/crates/ruff_python_ast/src/lib.rs b/crates/ruff_python_ast/src/lib.rs
index 14afd50a66ed1..552c7f02bdaa9 100644
--- a/crates/ruff_python_ast/src/lib.rs
+++ b/crates/ruff_python_ast/src/lib.rs
@@ -1,14 +1,16 @@
 pub mod all;
-pub mod branch_detection;
 pub mod call_path;
 pub mod cast;
 pub mod comparable;
+pub mod function;
 pub mod hashable;
 pub mod helpers;
 pub mod imports;
-pub mod newlines;
+pub mod node;
+pub mod prelude;
 pub mod relocate;
 pub mod source_code;
+pub mod statement_visitor;
 pub mod str;
 pub mod token_kind;
 pub mod types;
diff --git a/crates/ruff_python_ast/src/node.rs b/crates/ruff_python_ast/src/node.rs
new file mode 100644
index 0000000000000..96c77e8fdc3ec
--- /dev/null
+++ b/crates/ruff_python_ast/src/node.rs
@@ -0,0 +1,4880 @@
+use crate::prelude::*;
+use ruff_text_size::TextRange;
+use std::ptr::NonNull;
+
+pub trait AstNode: Ranged {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized;
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self>;
+
+    /// Returns the [`AnyNodeRef`] referencing this node.
+    fn as_any_node_ref(&self) -> AnyNodeRef;
+
+    /// Consumes `self` and returns its [`AnyNode`] representation.
+    fn into_any_node(self) -> AnyNode;
+}
+
+#[derive(Clone, Debug, is_macro::Is, PartialEq)]
+pub enum AnyNode {
+    ModModule(ModModule<TextRange>),
+    ModInteractive(ModInteractive<TextRange>),
+    ModExpression(ModExpression<TextRange>),
+    ModFunctionType(ModFunctionType<TextRange>),
+    StmtFunctionDef(StmtFunctionDef<TextRange>),
+    StmtAsyncFunctionDef(StmtAsyncFunctionDef<TextRange>),
+    StmtClassDef(StmtClassDef<TextRange>),
+    StmtReturn(StmtReturn<TextRange>),
+    StmtDelete(StmtDelete<TextRange>),
+    StmtAssign(StmtAssign<TextRange>),
+    StmtAugAssign(StmtAugAssign<TextRange>),
+    StmtAnnAssign(StmtAnnAssign<TextRange>),
+    StmtFor(StmtFor<TextRange>),
+    StmtAsyncFor(StmtAsyncFor<TextRange>),
+    StmtWhile(StmtWhile<TextRange>),
+    StmtIf(StmtIf<TextRange>),
+    StmtWith(StmtWith<TextRange>),
+    StmtAsyncWith(StmtAsyncWith<TextRange>),
+    StmtMatch(StmtMatch<TextRange>),
+    StmtRaise(StmtRaise<TextRange>),
+    StmtTry(StmtTry<TextRange>),
+    StmtTryStar(StmtTryStar<TextRange>),
+    StmtAssert(StmtAssert<TextRange>),
+    StmtImport(StmtImport<TextRange>),
+    StmtImportFrom(StmtImportFrom<TextRange>),
+    StmtGlobal(StmtGlobal<TextRange>),
+    StmtNonlocal(StmtNonlocal<TextRange>),
+    StmtExpr(StmtExpr<TextRange>),
+    StmtPass(StmtPass<TextRange>),
+    StmtBreak(StmtBreak<TextRange>),
+    StmtContinue(StmtContinue<TextRange>),
+    ExprBoolOp(ExprBoolOp<TextRange>),
+    ExprNamedExpr(ExprNamedExpr<TextRange>),
+    ExprBinOp(ExprBinOp<TextRange>),
+    ExprUnaryOp(ExprUnaryOp<TextRange>),
+    ExprLambda(ExprLambda<TextRange>),
+    ExprIfExp(ExprIfExp<TextRange>),
+    ExprDict(ExprDict<TextRange>),
+    ExprSet(ExprSet<TextRange>),
+    ExprListComp(ExprListComp<TextRange>),
+    ExprSetComp(ExprSetComp<TextRange>),
+    ExprDictComp(ExprDictComp<TextRange>),
+    ExprGeneratorExp(ExprGeneratorExp<TextRange>),
+    ExprAwait(ExprAwait<TextRange>),
+    ExprYield(ExprYield<TextRange>),
+    ExprYieldFrom(ExprYieldFrom<TextRange>),
+    ExprCompare(ExprCompare<TextRange>),
+    ExprCall(ExprCall<TextRange>),
+    ExprFormattedValue(ExprFormattedValue<TextRange>),
+    ExprJoinedStr(ExprJoinedStr<TextRange>),
+    ExprConstant(ExprConstant<TextRange>),
+    ExprAttribute(ExprAttribute<TextRange>),
+    ExprSubscript(ExprSubscript<TextRange>),
+    ExprStarred(ExprStarred<TextRange>),
+    ExprName(ExprName<TextRange>),
+    ExprList(ExprList<TextRange>),
+    ExprTuple(ExprTuple<TextRange>),
+    ExprSlice(ExprSlice<TextRange>),
+    ExcepthandlerExceptHandler(ExcepthandlerExceptHandler<TextRange>),
+    PatternMatchValue(PatternMatchValue<TextRange>),
+    PatternMatchSingleton(PatternMatchSingleton<TextRange>),
+    PatternMatchSequence(PatternMatchSequence<TextRange>),
+    PatternMatchMapping(PatternMatchMapping<TextRange>),
+    PatternMatchClass(PatternMatchClass<TextRange>),
+    PatternMatchStar(PatternMatchStar<TextRange>),
+    PatternMatchAs(PatternMatchAs<TextRange>),
+    PatternMatchOr(PatternMatchOr<TextRange>),
+    TypeIgnoreTypeIgnore(TypeIgnoreTypeIgnore<TextRange>),
+    Comprehension(Comprehension<TextRange>),
+    Arguments(Arguments<TextRange>),
+    Arg(Arg<TextRange>),
+    Keyword(Keyword<TextRange>),
+    Alias(Alias<TextRange>),
+    Withitem(Withitem<TextRange>),
+    MatchCase(MatchCase<TextRange>),
+}
+
+impl AnyNode {
+    pub fn statement(self) -> Option<Stmt> {
+        match self {
+            AnyNode::StmtFunctionDef(node) => Some(Stmt::FunctionDef(node)),
+            AnyNode::StmtAsyncFunctionDef(node) => Some(Stmt::AsyncFunctionDef(node)),
+            AnyNode::StmtClassDef(node) => Some(Stmt::ClassDef(node)),
+            AnyNode::StmtReturn(node) => Some(Stmt::Return(node)),
+            AnyNode::StmtDelete(node) => Some(Stmt::Delete(node)),
+            AnyNode::StmtAssign(node) => Some(Stmt::Assign(node)),
+            AnyNode::StmtAugAssign(node) => Some(Stmt::AugAssign(node)),
+            AnyNode::StmtAnnAssign(node) => Some(Stmt::AnnAssign(node)),
+            AnyNode::StmtFor(node) => Some(Stmt::For(node)),
+            AnyNode::StmtAsyncFor(node) => Some(Stmt::AsyncFor(node)),
+            AnyNode::StmtWhile(node) => Some(Stmt::While(node)),
+            AnyNode::StmtIf(node) => Some(Stmt::If(node)),
+            AnyNode::StmtWith(node) => Some(Stmt::With(node)),
+            AnyNode::StmtAsyncWith(node) => Some(Stmt::AsyncWith(node)),
+            AnyNode::StmtMatch(node) => Some(Stmt::Match(node)),
+            AnyNode::StmtRaise(node) => Some(Stmt::Raise(node)),
+            AnyNode::StmtTry(node) => Some(Stmt::Try(node)),
+            AnyNode::StmtTryStar(node) => Some(Stmt::TryStar(node)),
+            AnyNode::StmtAssert(node) => Some(Stmt::Assert(node)),
+            AnyNode::StmtImport(node) => Some(Stmt::Import(node)),
+            AnyNode::StmtImportFrom(node) => Some(Stmt::ImportFrom(node)),
+            AnyNode::StmtGlobal(node) => Some(Stmt::Global(node)),
+            AnyNode::StmtNonlocal(node) => Some(Stmt::Nonlocal(node)),
+            AnyNode::StmtExpr(node) => Some(Stmt::Expr(node)),
+            AnyNode::StmtPass(node) => Some(Stmt::Pass(node)),
+            AnyNode::StmtBreak(node) => Some(Stmt::Break(node)),
+            AnyNode::StmtContinue(node) => Some(Stmt::Continue(node)),
+
+            AnyNode::ModModule(_)
+            | AnyNode::ModInteractive(_)
+            | AnyNode::ModExpression(_)
+            | AnyNode::ModFunctionType(_)
+            | AnyNode::ExprBoolOp(_)
+            | AnyNode::ExprNamedExpr(_)
+            | AnyNode::ExprBinOp(_)
+            | AnyNode::ExprUnaryOp(_)
+            | AnyNode::ExprLambda(_)
+            | AnyNode::ExprIfExp(_)
+            | AnyNode::ExprDict(_)
+            | AnyNode::ExprSet(_)
+            | AnyNode::ExprListComp(_)
+            | AnyNode::ExprSetComp(_)
+            | AnyNode::ExprDictComp(_)
+            | AnyNode::ExprGeneratorExp(_)
+            | AnyNode::ExprAwait(_)
+            | AnyNode::ExprYield(_)
+            | AnyNode::ExprYieldFrom(_)
+            | AnyNode::ExprCompare(_)
+            | AnyNode::ExprCall(_)
+            | AnyNode::ExprFormattedValue(_)
+            | AnyNode::ExprJoinedStr(_)
+            | AnyNode::ExprConstant(_)
+            | AnyNode::ExprAttribute(_)
+            | AnyNode::ExprSubscript(_)
+            | AnyNode::ExprStarred(_)
+            | AnyNode::ExprName(_)
+            | AnyNode::ExprList(_)
+            | AnyNode::ExprTuple(_)
+            | AnyNode::ExprSlice(_)
+            | AnyNode::ExcepthandlerExceptHandler(_)
+            | AnyNode::PatternMatchValue(_)
+            | AnyNode::PatternMatchSingleton(_)
+            | AnyNode::PatternMatchSequence(_)
+            | AnyNode::PatternMatchMapping(_)
+            | AnyNode::PatternMatchClass(_)
+            | AnyNode::PatternMatchStar(_)
+            | AnyNode::PatternMatchAs(_)
+            | AnyNode::PatternMatchOr(_)
+            | AnyNode::TypeIgnoreTypeIgnore(_)
+            | AnyNode::Comprehension(_)
+            | AnyNode::Arguments(_)
+            | AnyNode::Arg(_)
+            | AnyNode::Keyword(_)
+            | AnyNode::Alias(_)
+            | AnyNode::Withitem(_)
+            | AnyNode::MatchCase(_) => None,
+        }
+    }
+
+    pub fn expression(self) -> Option<Expr> {
+        match self {
+            AnyNode::ExprBoolOp(node) => Some(Expr::BoolOp(node)),
+            AnyNode::ExprNamedExpr(node) => Some(Expr::NamedExpr(node)),
+            AnyNode::ExprBinOp(node) => Some(Expr::BinOp(node)),
+            AnyNode::ExprUnaryOp(node) => Some(Expr::UnaryOp(node)),
+            AnyNode::ExprLambda(node) => Some(Expr::Lambda(node)),
+            AnyNode::ExprIfExp(node) => Some(Expr::IfExp(node)),
+            AnyNode::ExprDict(node) => Some(Expr::Dict(node)),
+            AnyNode::ExprSet(node) => Some(Expr::Set(node)),
+            AnyNode::ExprListComp(node) => Some(Expr::ListComp(node)),
+            AnyNode::ExprSetComp(node) => Some(Expr::SetComp(node)),
+            AnyNode::ExprDictComp(node) => Some(Expr::DictComp(node)),
+            AnyNode::ExprGeneratorExp(node) => Some(Expr::GeneratorExp(node)),
+            AnyNode::ExprAwait(node) => Some(Expr::Await(node)),
+            AnyNode::ExprYield(node) => Some(Expr::Yield(node)),
+            AnyNode::ExprYieldFrom(node) => Some(Expr::YieldFrom(node)),
+            AnyNode::ExprCompare(node) => Some(Expr::Compare(node)),
+            AnyNode::ExprCall(node) => Some(Expr::Call(node)),
+            AnyNode::ExprFormattedValue(node) => Some(Expr::FormattedValue(node)),
+            AnyNode::ExprJoinedStr(node) => Some(Expr::JoinedStr(node)),
+            AnyNode::ExprConstant(node) => Some(Expr::Constant(node)),
+            AnyNode::ExprAttribute(node) => Some(Expr::Attribute(node)),
+            AnyNode::ExprSubscript(node) => Some(Expr::Subscript(node)),
+            AnyNode::ExprStarred(node) => Some(Expr::Starred(node)),
+            AnyNode::ExprName(node) => Some(Expr::Name(node)),
+            AnyNode::ExprList(node) => Some(Expr::List(node)),
+            AnyNode::ExprTuple(node) => Some(Expr::Tuple(node)),
+            AnyNode::ExprSlice(node) => Some(Expr::Slice(node)),
+
+            AnyNode::ModModule(_)
+            | AnyNode::ModInteractive(_)
+            | AnyNode::ModExpression(_)
+            | AnyNode::ModFunctionType(_)
+            | AnyNode::StmtFunctionDef(_)
+            | AnyNode::StmtAsyncFunctionDef(_)
+            | AnyNode::StmtClassDef(_)
+            | AnyNode::StmtReturn(_)
+            | AnyNode::StmtDelete(_)
+            | AnyNode::StmtAssign(_)
+            | AnyNode::StmtAugAssign(_)
+            | AnyNode::StmtAnnAssign(_)
+            | AnyNode::StmtFor(_)
+            | AnyNode::StmtAsyncFor(_)
+            | AnyNode::StmtWhile(_)
+            | AnyNode::StmtIf(_)
+            | AnyNode::StmtWith(_)
+            | AnyNode::StmtAsyncWith(_)
+            | AnyNode::StmtMatch(_)
+            | AnyNode::StmtRaise(_)
+            | AnyNode::StmtTry(_)
+            | AnyNode::StmtTryStar(_)
+            | AnyNode::StmtAssert(_)
+            | AnyNode::StmtImport(_)
+            | AnyNode::StmtImportFrom(_)
+            | AnyNode::StmtGlobal(_)
+            | AnyNode::StmtNonlocal(_)
+            | AnyNode::StmtExpr(_)
+            | AnyNode::StmtPass(_)
+            | AnyNode::StmtBreak(_)
+            | AnyNode::StmtContinue(_)
+            | AnyNode::ExcepthandlerExceptHandler(_)
+            | AnyNode::PatternMatchValue(_)
+            | AnyNode::PatternMatchSingleton(_)
+            | AnyNode::PatternMatchSequence(_)
+            | AnyNode::PatternMatchMapping(_)
+            | AnyNode::PatternMatchClass(_)
+            | AnyNode::PatternMatchStar(_)
+            | AnyNode::PatternMatchAs(_)
+            | AnyNode::PatternMatchOr(_)
+            | AnyNode::TypeIgnoreTypeIgnore(_)
+            | AnyNode::Comprehension(_)
+            | AnyNode::Arguments(_)
+            | AnyNode::Arg(_)
+            | AnyNode::Keyword(_)
+            | AnyNode::Alias(_)
+            | AnyNode::Withitem(_)
+            | AnyNode::MatchCase(_) => None,
+        }
+    }
+
+    pub fn module(self) -> Option<Mod> {
+        match self {
+            AnyNode::ModModule(node) => Some(Mod::Module(node)),
+            AnyNode::ModInteractive(node) => Some(Mod::Interactive(node)),
+            AnyNode::ModExpression(node) => Some(Mod::Expression(node)),
+            AnyNode::ModFunctionType(node) => Some(Mod::FunctionType(node)),
+
+            AnyNode::StmtFunctionDef(_)
+            | AnyNode::StmtAsyncFunctionDef(_)
+            | AnyNode::StmtClassDef(_)
+            | AnyNode::StmtReturn(_)
+            | AnyNode::StmtDelete(_)
+            | AnyNode::StmtAssign(_)
+            | AnyNode::StmtAugAssign(_)
+            | AnyNode::StmtAnnAssign(_)
+            | AnyNode::StmtFor(_)
+            | AnyNode::StmtAsyncFor(_)
+            | AnyNode::StmtWhile(_)
+            | AnyNode::StmtIf(_)
+            | AnyNode::StmtWith(_)
+            | AnyNode::StmtAsyncWith(_)
+            | AnyNode::StmtMatch(_)
+            | AnyNode::StmtRaise(_)
+            | AnyNode::StmtTry(_)
+            | AnyNode::StmtTryStar(_)
+            | AnyNode::StmtAssert(_)
+            | AnyNode::StmtImport(_)
+            | AnyNode::StmtImportFrom(_)
+            | AnyNode::StmtGlobal(_)
+            | AnyNode::StmtNonlocal(_)
+            | AnyNode::StmtExpr(_)
+            | AnyNode::StmtPass(_)
+            | AnyNode::StmtBreak(_)
+            | AnyNode::StmtContinue(_)
+            | AnyNode::ExprBoolOp(_)
+            | AnyNode::ExprNamedExpr(_)
+            | AnyNode::ExprBinOp(_)
+            | AnyNode::ExprUnaryOp(_)
+            | AnyNode::ExprLambda(_)
+            | AnyNode::ExprIfExp(_)
+            | AnyNode::ExprDict(_)
+            | AnyNode::ExprSet(_)
+            | AnyNode::ExprListComp(_)
+            | AnyNode::ExprSetComp(_)
+            | AnyNode::ExprDictComp(_)
+            | AnyNode::ExprGeneratorExp(_)
+            | AnyNode::ExprAwait(_)
+            | AnyNode::ExprYield(_)
+            | AnyNode::ExprYieldFrom(_)
+            | AnyNode::ExprCompare(_)
+            | AnyNode::ExprCall(_)
+            | AnyNode::ExprFormattedValue(_)
+            | AnyNode::ExprJoinedStr(_)
+            | AnyNode::ExprConstant(_)
+            | AnyNode::ExprAttribute(_)
+            | AnyNode::ExprSubscript(_)
+            | AnyNode::ExprStarred(_)
+            | AnyNode::ExprName(_)
+            | AnyNode::ExprList(_)
+            | AnyNode::ExprTuple(_)
+            | AnyNode::ExprSlice(_)
+            | AnyNode::ExcepthandlerExceptHandler(_)
+            | AnyNode::PatternMatchValue(_)
+            | AnyNode::PatternMatchSingleton(_)
+            | AnyNode::PatternMatchSequence(_)
+            | AnyNode::PatternMatchMapping(_)
+            | AnyNode::PatternMatchClass(_)
+            | AnyNode::PatternMatchStar(_)
+            | AnyNode::PatternMatchAs(_)
+            | AnyNode::PatternMatchOr(_)
+            | AnyNode::TypeIgnoreTypeIgnore(_)
+            | AnyNode::Comprehension(_)
+            | AnyNode::Arguments(_)
+            | AnyNode::Arg(_)
+            | AnyNode::Keyword(_)
+            | AnyNode::Alias(_)
+            | AnyNode::Withitem(_)
+            | AnyNode::MatchCase(_) => None,
+        }
+    }
+
+    pub fn pattern(self) -> Option<Pattern> {
+        match self {
+            AnyNode::PatternMatchValue(node) => Some(Pattern::MatchValue(node)),
+            AnyNode::PatternMatchSingleton(node) => Some(Pattern::MatchSingleton(node)),
+            AnyNode::PatternMatchSequence(node) => Some(Pattern::MatchSequence(node)),
+            AnyNode::PatternMatchMapping(node) => Some(Pattern::MatchMapping(node)),
+            AnyNode::PatternMatchClass(node) => Some(Pattern::MatchClass(node)),
+            AnyNode::PatternMatchStar(node) => Some(Pattern::MatchStar(node)),
+            AnyNode::PatternMatchAs(node) => Some(Pattern::MatchAs(node)),
+            AnyNode::PatternMatchOr(node) => Some(Pattern::MatchOr(node)),
+
+            AnyNode::ModModule(_)
+            | AnyNode::ModInteractive(_)
+            | AnyNode::ModExpression(_)
+            | AnyNode::ModFunctionType(_)
+            | AnyNode::StmtFunctionDef(_)
+            | AnyNode::StmtAsyncFunctionDef(_)
+            | AnyNode::StmtClassDef(_)
+            | AnyNode::StmtReturn(_)
+            | AnyNode::StmtDelete(_)
+            | AnyNode::StmtAssign(_)
+            | AnyNode::StmtAugAssign(_)
+            | AnyNode::StmtAnnAssign(_)
+            | AnyNode::StmtFor(_)
+            | AnyNode::StmtAsyncFor(_)
+            | AnyNode::StmtWhile(_)
+            | AnyNode::StmtIf(_)
+            | AnyNode::StmtWith(_)
+            | AnyNode::StmtAsyncWith(_)
+            | AnyNode::StmtMatch(_)
+            | AnyNode::StmtRaise(_)
+            | AnyNode::StmtTry(_)
+            | AnyNode::StmtTryStar(_)
+            | AnyNode::StmtAssert(_)
+            | AnyNode::StmtImport(_)
+            | AnyNode::StmtImportFrom(_)
+            | AnyNode::StmtGlobal(_)
+            | AnyNode::StmtNonlocal(_)
+            | AnyNode::StmtExpr(_)
+            | AnyNode::StmtPass(_)
+            | AnyNode::StmtBreak(_)
+            | AnyNode::StmtContinue(_)
+            | AnyNode::ExprBoolOp(_)
+            | AnyNode::ExprNamedExpr(_)
+            | AnyNode::ExprBinOp(_)
+            | AnyNode::ExprUnaryOp(_)
+            | AnyNode::ExprLambda(_)
+            | AnyNode::ExprIfExp(_)
+            | AnyNode::ExprDict(_)
+            | AnyNode::ExprSet(_)
+            | AnyNode::ExprListComp(_)
+            | AnyNode::ExprSetComp(_)
+            | AnyNode::ExprDictComp(_)
+            | AnyNode::ExprGeneratorExp(_)
+            | AnyNode::ExprAwait(_)
+            | AnyNode::ExprYield(_)
+            | AnyNode::ExprYieldFrom(_)
+            | AnyNode::ExprCompare(_)
+            | AnyNode::ExprCall(_)
+            | AnyNode::ExprFormattedValue(_)
+            | AnyNode::ExprJoinedStr(_)
+            | AnyNode::ExprConstant(_)
+            | AnyNode::ExprAttribute(_)
+            | AnyNode::ExprSubscript(_)
+            | AnyNode::ExprStarred(_)
+            | AnyNode::ExprName(_)
+            | AnyNode::ExprList(_)
+            | AnyNode::ExprTuple(_)
+            | AnyNode::ExprSlice(_)
+            | AnyNode::ExcepthandlerExceptHandler(_)
+            | AnyNode::TypeIgnoreTypeIgnore(_)
+            | AnyNode::Comprehension(_)
+            | AnyNode::Arguments(_)
+            | AnyNode::Arg(_)
+            | AnyNode::Keyword(_)
+            | AnyNode::Alias(_)
+            | AnyNode::Withitem(_)
+            | AnyNode::MatchCase(_) => None,
+        }
+    }
+
+    pub fn except_handler(self) -> Option<Excepthandler> {
+        match self {
+            AnyNode::ExcepthandlerExceptHandler(node) => Some(Excepthandler::ExceptHandler(node)),
+
+            AnyNode::ModModule(_)
+            | AnyNode::ModInteractive(_)
+            | AnyNode::ModExpression(_)
+            | AnyNode::ModFunctionType(_)
+            | AnyNode::StmtFunctionDef(_)
+            | AnyNode::StmtAsyncFunctionDef(_)
+            | AnyNode::StmtClassDef(_)
+            | AnyNode::StmtReturn(_)
+            | AnyNode::StmtDelete(_)
+            | AnyNode::StmtAssign(_)
+            | AnyNode::StmtAugAssign(_)
+            | AnyNode::StmtAnnAssign(_)
+            | AnyNode::StmtFor(_)
+            | AnyNode::StmtAsyncFor(_)
+            | AnyNode::StmtWhile(_)
+            | AnyNode::StmtIf(_)
+            | AnyNode::StmtWith(_)
+            | AnyNode::StmtAsyncWith(_)
+            | AnyNode::StmtMatch(_)
+            | AnyNode::StmtRaise(_)
+            | AnyNode::StmtTry(_)
+            | AnyNode::StmtTryStar(_)
+            | AnyNode::StmtAssert(_)
+            | AnyNode::StmtImport(_)
+            | AnyNode::StmtImportFrom(_)
+            | AnyNode::StmtGlobal(_)
+            | AnyNode::StmtNonlocal(_)
+            | AnyNode::StmtExpr(_)
+            | AnyNode::StmtPass(_)
+            | AnyNode::StmtBreak(_)
+            | AnyNode::StmtContinue(_)
+            | AnyNode::ExprBoolOp(_)
+            | AnyNode::ExprNamedExpr(_)
+            | AnyNode::ExprBinOp(_)
+            | AnyNode::ExprUnaryOp(_)
+            | AnyNode::ExprLambda(_)
+            | AnyNode::ExprIfExp(_)
+            | AnyNode::ExprDict(_)
+            | AnyNode::ExprSet(_)
+            | AnyNode::ExprListComp(_)
+            | AnyNode::ExprSetComp(_)
+            | AnyNode::ExprDictComp(_)
+            | AnyNode::ExprGeneratorExp(_)
+            | AnyNode::ExprAwait(_)
+            | AnyNode::ExprYield(_)
+            | AnyNode::ExprYieldFrom(_)
+            | AnyNode::ExprCompare(_)
+            | AnyNode::ExprCall(_)
+            | AnyNode::ExprFormattedValue(_)
+            | AnyNode::ExprJoinedStr(_)
+            | AnyNode::ExprConstant(_)
+            | AnyNode::ExprAttribute(_)
+            | AnyNode::ExprSubscript(_)
+            | AnyNode::ExprStarred(_)
+            | AnyNode::ExprName(_)
+            | AnyNode::ExprList(_)
+            | AnyNode::ExprTuple(_)
+            | AnyNode::ExprSlice(_)
+            | AnyNode::PatternMatchValue(_)
+            | AnyNode::PatternMatchSingleton(_)
+            | AnyNode::PatternMatchSequence(_)
+            | AnyNode::PatternMatchMapping(_)
+            | AnyNode::PatternMatchClass(_)
+            | AnyNode::PatternMatchStar(_)
+            | AnyNode::PatternMatchAs(_)
+            | AnyNode::PatternMatchOr(_)
+            | AnyNode::TypeIgnoreTypeIgnore(_)
+            | AnyNode::Comprehension(_)
+            | AnyNode::Arguments(_)
+            | AnyNode::Arg(_)
+            | AnyNode::Keyword(_)
+            | AnyNode::Alias(_)
+            | AnyNode::Withitem(_)
+            | AnyNode::MatchCase(_) => None,
+        }
+    }
+
+    pub fn type_ignore(self) -> Option<TypeIgnore> {
+        match self {
+            AnyNode::TypeIgnoreTypeIgnore(node) => Some(TypeIgnore::TypeIgnore(node)),
+
+            AnyNode::ModModule(_)
+            | AnyNode::ModInteractive(_)
+            | AnyNode::ModExpression(_)
+            | AnyNode::ModFunctionType(_)
+            | AnyNode::StmtFunctionDef(_)
+            | AnyNode::StmtAsyncFunctionDef(_)
+            | AnyNode::StmtClassDef(_)
+            | AnyNode::StmtReturn(_)
+            | AnyNode::StmtDelete(_)
+            | AnyNode::StmtAssign(_)
+            | AnyNode::StmtAugAssign(_)
+            | AnyNode::StmtAnnAssign(_)
+            | AnyNode::StmtFor(_)
+            | AnyNode::StmtAsyncFor(_)
+            | AnyNode::StmtWhile(_)
+            | AnyNode::StmtIf(_)
+            | AnyNode::StmtWith(_)
+            | AnyNode::StmtAsyncWith(_)
+            | AnyNode::StmtMatch(_)
+            | AnyNode::StmtRaise(_)
+            | AnyNode::StmtTry(_)
+            | AnyNode::StmtTryStar(_)
+            | AnyNode::StmtAssert(_)
+            | AnyNode::StmtImport(_)
+            | AnyNode::StmtImportFrom(_)
+            | AnyNode::StmtGlobal(_)
+            | AnyNode::StmtNonlocal(_)
+            | AnyNode::StmtExpr(_)
+            | AnyNode::StmtPass(_)
+            | AnyNode::StmtBreak(_)
+            | AnyNode::StmtContinue(_)
+            | AnyNode::ExprBoolOp(_)
+            | AnyNode::ExprNamedExpr(_)
+            | AnyNode::ExprBinOp(_)
+            | AnyNode::ExprUnaryOp(_)
+            | AnyNode::ExprLambda(_)
+            | AnyNode::ExprIfExp(_)
+            | AnyNode::ExprDict(_)
+            | AnyNode::ExprSet(_)
+            | AnyNode::ExprListComp(_)
+            | AnyNode::ExprSetComp(_)
+            | AnyNode::ExprDictComp(_)
+            | AnyNode::ExprGeneratorExp(_)
+            | AnyNode::ExprAwait(_)
+            | AnyNode::ExprYield(_)
+            | AnyNode::ExprYieldFrom(_)
+            | AnyNode::ExprCompare(_)
+            | AnyNode::ExprCall(_)
+            | AnyNode::ExprFormattedValue(_)
+            | AnyNode::ExprJoinedStr(_)
+            | AnyNode::ExprConstant(_)
+            | AnyNode::ExprAttribute(_)
+            | AnyNode::ExprSubscript(_)
+            | AnyNode::ExprStarred(_)
+            | AnyNode::ExprName(_)
+            | AnyNode::ExprList(_)
+            | AnyNode::ExprTuple(_)
+            | AnyNode::ExprSlice(_)
+            | AnyNode::PatternMatchValue(_)
+            | AnyNode::PatternMatchSingleton(_)
+            | AnyNode::PatternMatchSequence(_)
+            | AnyNode::PatternMatchMapping(_)
+            | AnyNode::PatternMatchClass(_)
+            | AnyNode::PatternMatchStar(_)
+            | AnyNode::PatternMatchAs(_)
+            | AnyNode::PatternMatchOr(_)
+            | AnyNode::ExcepthandlerExceptHandler(_)
+            | AnyNode::Comprehension(_)
+            | AnyNode::Arguments(_)
+            | AnyNode::Arg(_)
+            | AnyNode::Keyword(_)
+            | AnyNode::Alias(_)
+            | AnyNode::Withitem(_)
+            | AnyNode::MatchCase(_) => None,
+        }
+    }
+
+    pub const fn is_statement(&self) -> bool {
+        self.as_ref().is_statement()
+    }
+
+    pub const fn is_expression(&self) -> bool {
+        self.as_ref().is_expression()
+    }
+
+    pub const fn is_module(&self) -> bool {
+        self.as_ref().is_module()
+    }
+
+    pub const fn is_pattern(&self) -> bool {
+        self.as_ref().is_pattern()
+    }
+
+    pub const fn is_except_handler(&self) -> bool {
+        self.as_ref().is_except_handler()
+    }
+
+    pub const fn is_type_ignore(&self) -> bool {
+        self.as_ref().is_type_ignore()
+    }
+
+    pub const fn as_ref(&self) -> AnyNodeRef {
+        match self {
+            Self::ModModule(node) => AnyNodeRef::ModModule(node),
+            Self::ModInteractive(node) => AnyNodeRef::ModInteractive(node),
+            Self::ModExpression(node) => AnyNodeRef::ModExpression(node),
+            Self::ModFunctionType(node) => AnyNodeRef::ModFunctionType(node),
+            Self::StmtFunctionDef(node) => AnyNodeRef::StmtFunctionDef(node),
+            Self::StmtAsyncFunctionDef(node) => AnyNodeRef::StmtAsyncFunctionDef(node),
+            Self::StmtClassDef(node) => AnyNodeRef::StmtClassDef(node),
+            Self::StmtReturn(node) => AnyNodeRef::StmtReturn(node),
+            Self::StmtDelete(node) => AnyNodeRef::StmtDelete(node),
+            Self::StmtAssign(node) => AnyNodeRef::StmtAssign(node),
+            Self::StmtAugAssign(node) => AnyNodeRef::StmtAugAssign(node),
+            Self::StmtAnnAssign(node) => AnyNodeRef::StmtAnnAssign(node),
+            Self::StmtFor(node) => AnyNodeRef::StmtFor(node),
+            Self::StmtAsyncFor(node) => AnyNodeRef::StmtAsyncFor(node),
+            Self::StmtWhile(node) => AnyNodeRef::StmtWhile(node),
+            Self::StmtIf(node) => AnyNodeRef::StmtIf(node),
+            Self::StmtWith(node) => AnyNodeRef::StmtWith(node),
+            Self::StmtAsyncWith(node) => AnyNodeRef::StmtAsyncWith(node),
+            Self::StmtMatch(node) => AnyNodeRef::StmtMatch(node),
+            Self::StmtRaise(node) => AnyNodeRef::StmtRaise(node),
+            Self::StmtTry(node) => AnyNodeRef::StmtTry(node),
+            Self::StmtTryStar(node) => AnyNodeRef::StmtTryStar(node),
+            Self::StmtAssert(node) => AnyNodeRef::StmtAssert(node),
+            Self::StmtImport(node) => AnyNodeRef::StmtImport(node),
+            Self::StmtImportFrom(node) => AnyNodeRef::StmtImportFrom(node),
+            Self::StmtGlobal(node) => AnyNodeRef::StmtGlobal(node),
+            Self::StmtNonlocal(node) => AnyNodeRef::StmtNonlocal(node),
+            Self::StmtExpr(node) => AnyNodeRef::StmtExpr(node),
+            Self::StmtPass(node) => AnyNodeRef::StmtPass(node),
+            Self::StmtBreak(node) => AnyNodeRef::StmtBreak(node),
+            Self::StmtContinue(node) => AnyNodeRef::StmtContinue(node),
+            Self::ExprBoolOp(node) => AnyNodeRef::ExprBoolOp(node),
+            Self::ExprNamedExpr(node) => AnyNodeRef::ExprNamedExpr(node),
+            Self::ExprBinOp(node) => AnyNodeRef::ExprBinOp(node),
+            Self::ExprUnaryOp(node) => AnyNodeRef::ExprUnaryOp(node),
+            Self::ExprLambda(node) => AnyNodeRef::ExprLambda(node),
+            Self::ExprIfExp(node) => AnyNodeRef::ExprIfExp(node),
+            Self::ExprDict(node) => AnyNodeRef::ExprDict(node),
+            Self::ExprSet(node) => AnyNodeRef::ExprSet(node),
+            Self::ExprListComp(node) => AnyNodeRef::ExprListComp(node),
+            Self::ExprSetComp(node) => AnyNodeRef::ExprSetComp(node),
+            Self::ExprDictComp(node) => AnyNodeRef::ExprDictComp(node),
+            Self::ExprGeneratorExp(node) => AnyNodeRef::ExprGeneratorExp(node),
+            Self::ExprAwait(node) => AnyNodeRef::ExprAwait(node),
+            Self::ExprYield(node) => AnyNodeRef::ExprYield(node),
+            Self::ExprYieldFrom(node) => AnyNodeRef::ExprYieldFrom(node),
+            Self::ExprCompare(node) => AnyNodeRef::ExprCompare(node),
+            Self::ExprCall(node) => AnyNodeRef::ExprCall(node),
+            Self::ExprFormattedValue(node) => AnyNodeRef::ExprFormattedValue(node),
+            Self::ExprJoinedStr(node) => AnyNodeRef::ExprJoinedStr(node),
+            Self::ExprConstant(node) => AnyNodeRef::ExprConstant(node),
+            Self::ExprAttribute(node) => AnyNodeRef::ExprAttribute(node),
+            Self::ExprSubscript(node) => AnyNodeRef::ExprSubscript(node),
+            Self::ExprStarred(node) => AnyNodeRef::ExprStarred(node),
+            Self::ExprName(node) => AnyNodeRef::ExprName(node),
+            Self::ExprList(node) => AnyNodeRef::ExprList(node),
+            Self::ExprTuple(node) => AnyNodeRef::ExprTuple(node),
+            Self::ExprSlice(node) => AnyNodeRef::ExprSlice(node),
+            Self::ExcepthandlerExceptHandler(node) => AnyNodeRef::ExcepthandlerExceptHandler(node),
+            Self::PatternMatchValue(node) => AnyNodeRef::PatternMatchValue(node),
+            Self::PatternMatchSingleton(node) => AnyNodeRef::PatternMatchSingleton(node),
+            Self::PatternMatchSequence(node) => AnyNodeRef::PatternMatchSequence(node),
+            Self::PatternMatchMapping(node) => AnyNodeRef::PatternMatchMapping(node),
+            Self::PatternMatchClass(node) => AnyNodeRef::PatternMatchClass(node),
+            Self::PatternMatchStar(node) => AnyNodeRef::PatternMatchStar(node),
+            Self::PatternMatchAs(node) => AnyNodeRef::PatternMatchAs(node),
+            Self::PatternMatchOr(node) => AnyNodeRef::PatternMatchOr(node),
+            Self::TypeIgnoreTypeIgnore(node) => AnyNodeRef::TypeIgnoreTypeIgnore(node),
+            Self::Comprehension(node) => AnyNodeRef::Comprehension(node),
+            Self::Arguments(node) => AnyNodeRef::Arguments(node),
+            Self::Arg(node) => AnyNodeRef::Arg(node),
+            Self::Keyword(node) => AnyNodeRef::Keyword(node),
+            Self::Alias(node) => AnyNodeRef::Alias(node),
+            Self::Withitem(node) => AnyNodeRef::Withitem(node),
+            Self::MatchCase(node) => AnyNodeRef::MatchCase(node),
+        }
+    }
+
+    /// Returns the node's [`kind`](NodeKind) that has no data associated and is [`Copy`].
+    pub const fn kind(&self) -> NodeKind {
+        self.as_ref().kind()
+    }
+}
+
+impl AstNode for ModModule<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ModModule(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ModModule(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ModInteractive<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ModInteractive(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ModInteractive(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ModExpression<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ModExpression(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ModExpression(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ModFunctionType<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ModFunctionType(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ModFunctionType(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtFunctionDef<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtFunctionDef(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtFunctionDef(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtAsyncFunctionDef<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtAsyncFunctionDef(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtAsyncFunctionDef(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtClassDef<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtClassDef(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtClassDef(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtReturn<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtReturn(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtReturn(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtDelete<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtDelete(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtDelete(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtAssign<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtAssign(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtAssign(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtAugAssign<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtAugAssign(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtAugAssign(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtAnnAssign<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtAnnAssign(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtAnnAssign(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtFor<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtFor(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtFor(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtAsyncFor<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtAsyncFor(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtAsyncFor(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtWhile<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtWhile(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtWhile(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtIf<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtIf(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtIf(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtWith<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtWith(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtWith(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtAsyncWith<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtAsyncWith(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtAsyncWith(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtMatch<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtMatch(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtMatch(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtRaise<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtRaise(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtRaise(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtTry<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtTry(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtTry(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtTryStar<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtTryStar(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtTryStar(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtAssert<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtAssert(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtAssert(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtImport<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtImport(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtImport(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtImportFrom<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtImportFrom(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtImportFrom(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtGlobal<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtGlobal(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtGlobal(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtNonlocal<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtNonlocal(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtNonlocal(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtExpr<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtExpr(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtExpr(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtPass<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtPass(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtPass(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtBreak<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtBreak(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtBreak(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for StmtContinue<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::StmtContinue(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::StmtContinue(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprBoolOp<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprBoolOp(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprBoolOp(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprNamedExpr<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprNamedExpr(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprNamedExpr(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprBinOp<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprBinOp(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprBinOp(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprUnaryOp<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprUnaryOp(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprUnaryOp(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprLambda<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprLambda(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprLambda(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprIfExp<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprIfExp(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprIfExp(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprDict<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprDict(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprDict(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprSet<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprSet(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprSet(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprListComp<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprListComp(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprListComp(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprSetComp<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprSetComp(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprSetComp(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprDictComp<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprDictComp(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprDictComp(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprGeneratorExp<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprGeneratorExp(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprGeneratorExp(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprAwait<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprAwait(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprAwait(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprYield<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprYield(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprYield(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprYieldFrom<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprYieldFrom(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprYieldFrom(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprCompare<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprCompare(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprCompare(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprCall<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprCall(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprCall(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprFormattedValue<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprFormattedValue(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprFormattedValue(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprJoinedStr<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprJoinedStr(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprJoinedStr(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprConstant<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprConstant(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprConstant(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprAttribute<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprAttribute(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprAttribute(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprSubscript<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprSubscript(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprSubscript(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprStarred<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprStarred(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprStarred(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprName<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprName(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprName(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprList<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprList(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprList(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprTuple<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprTuple(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprTuple(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExprSlice<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExprSlice(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExprSlice(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for ExcepthandlerExceptHandler<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::ExcepthandlerExceptHandler(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::ExcepthandlerExceptHandler(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for PatternMatchValue<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::PatternMatchValue(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::PatternMatchValue(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for PatternMatchSingleton<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::PatternMatchSingleton(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::PatternMatchSingleton(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for PatternMatchSequence<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::PatternMatchSequence(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::PatternMatchSequence(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for PatternMatchMapping<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::PatternMatchMapping(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::PatternMatchMapping(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for PatternMatchClass<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::PatternMatchClass(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::PatternMatchClass(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for PatternMatchStar<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::PatternMatchStar(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::PatternMatchStar(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for PatternMatchAs<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::PatternMatchAs(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::PatternMatchAs(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for PatternMatchOr<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::PatternMatchOr(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::PatternMatchOr(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for TypeIgnoreTypeIgnore<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::TypeIgnoreTypeIgnore(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::TypeIgnoreTypeIgnore(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+
+impl AstNode for Comprehension<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::Comprehension(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::Comprehension(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for Arguments<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::Arguments(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::Arguments(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for Arg<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::Arg(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::Arg(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for Keyword<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::Keyword(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::Keyword(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for Alias<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::Alias(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::Alias(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for Withitem<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::Withitem(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::Withitem(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+impl AstNode for MatchCase<TextRange> {
+    fn cast(kind: AnyNode) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        if let AnyNode::MatchCase(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn cast_ref(kind: AnyNodeRef) -> Option<&Self> {
+        if let AnyNodeRef::MatchCase(node) = kind {
+            Some(node)
+        } else {
+            None
+        }
+    }
+
+    fn as_any_node_ref(&self) -> AnyNodeRef {
+        AnyNodeRef::from(self)
+    }
+
+    fn into_any_node(self) -> AnyNode {
+        AnyNode::from(self)
+    }
+}
+
+impl From<Stmt> for AnyNode {
+    fn from(stmt: Stmt) -> Self {
+        match stmt {
+            Stmt::FunctionDef(node) => AnyNode::StmtFunctionDef(node),
+            Stmt::AsyncFunctionDef(node) => AnyNode::StmtAsyncFunctionDef(node),
+            Stmt::ClassDef(node) => AnyNode::StmtClassDef(node),
+            Stmt::Return(node) => AnyNode::StmtReturn(node),
+            Stmt::Delete(node) => AnyNode::StmtDelete(node),
+            Stmt::Assign(node) => AnyNode::StmtAssign(node),
+            Stmt::AugAssign(node) => AnyNode::StmtAugAssign(node),
+            Stmt::AnnAssign(node) => AnyNode::StmtAnnAssign(node),
+            Stmt::For(node) => AnyNode::StmtFor(node),
+            Stmt::AsyncFor(node) => AnyNode::StmtAsyncFor(node),
+            Stmt::While(node) => AnyNode::StmtWhile(node),
+            Stmt::If(node) => AnyNode::StmtIf(node),
+            Stmt::With(node) => AnyNode::StmtWith(node),
+            Stmt::AsyncWith(node) => AnyNode::StmtAsyncWith(node),
+            Stmt::Match(node) => AnyNode::StmtMatch(node),
+            Stmt::Raise(node) => AnyNode::StmtRaise(node),
+            Stmt::Try(node) => AnyNode::StmtTry(node),
+            Stmt::TryStar(node) => AnyNode::StmtTryStar(node),
+            Stmt::Assert(node) => AnyNode::StmtAssert(node),
+            Stmt::Import(node) => AnyNode::StmtImport(node),
+            Stmt::ImportFrom(node) => AnyNode::StmtImportFrom(node),
+            Stmt::Global(node) => AnyNode::StmtGlobal(node),
+            Stmt::Nonlocal(node) => AnyNode::StmtNonlocal(node),
+            Stmt::Expr(node) => AnyNode::StmtExpr(node),
+            Stmt::Pass(node) => AnyNode::StmtPass(node),
+            Stmt::Break(node) => AnyNode::StmtBreak(node),
+            Stmt::Continue(node) => AnyNode::StmtContinue(node),
+        }
+    }
+}
+
+impl From<Expr> for AnyNode {
+    fn from(expr: Expr) -> Self {
+        match expr {
+            Expr::BoolOp(node) => AnyNode::ExprBoolOp(node),
+            Expr::NamedExpr(node) => AnyNode::ExprNamedExpr(node),
+            Expr::BinOp(node) => AnyNode::ExprBinOp(node),
+            Expr::UnaryOp(node) => AnyNode::ExprUnaryOp(node),
+            Expr::Lambda(node) => AnyNode::ExprLambda(node),
+            Expr::IfExp(node) => AnyNode::ExprIfExp(node),
+            Expr::Dict(node) => AnyNode::ExprDict(node),
+            Expr::Set(node) => AnyNode::ExprSet(node),
+            Expr::ListComp(node) => AnyNode::ExprListComp(node),
+            Expr::SetComp(node) => AnyNode::ExprSetComp(node),
+            Expr::DictComp(node) => AnyNode::ExprDictComp(node),
+            Expr::GeneratorExp(node) => AnyNode::ExprGeneratorExp(node),
+            Expr::Await(node) => AnyNode::ExprAwait(node),
+            Expr::Yield(node) => AnyNode::ExprYield(node),
+            Expr::YieldFrom(node) => AnyNode::ExprYieldFrom(node),
+            Expr::Compare(node) => AnyNode::ExprCompare(node),
+            Expr::Call(node) => AnyNode::ExprCall(node),
+            Expr::FormattedValue(node) => AnyNode::ExprFormattedValue(node),
+            Expr::JoinedStr(node) => AnyNode::ExprJoinedStr(node),
+            Expr::Constant(node) => AnyNode::ExprConstant(node),
+            Expr::Attribute(node) => AnyNode::ExprAttribute(node),
+            Expr::Subscript(node) => AnyNode::ExprSubscript(node),
+            Expr::Starred(node) => AnyNode::ExprStarred(node),
+            Expr::Name(node) => AnyNode::ExprName(node),
+            Expr::List(node) => AnyNode::ExprList(node),
+            Expr::Tuple(node) => AnyNode::ExprTuple(node),
+            Expr::Slice(node) => AnyNode::ExprSlice(node),
+        }
+    }
+}
+
+impl From<Mod> for AnyNode {
+    fn from(module: Mod) -> Self {
+        match module {
+            Mod::Module(node) => AnyNode::ModModule(node),
+            Mod::Interactive(node) => AnyNode::ModInteractive(node),
+            Mod::Expression(node) => AnyNode::ModExpression(node),
+            Mod::FunctionType(node) => AnyNode::ModFunctionType(node),
+        }
+    }
+}
+
+impl From<Pattern> for AnyNode {
+    fn from(pattern: Pattern) -> Self {
+        match pattern {
+            Pattern::MatchValue(node) => AnyNode::PatternMatchValue(node),
+            Pattern::MatchSingleton(node) => AnyNode::PatternMatchSingleton(node),
+            Pattern::MatchSequence(node) => AnyNode::PatternMatchSequence(node),
+            Pattern::MatchMapping(node) => AnyNode::PatternMatchMapping(node),
+            Pattern::MatchClass(node) => AnyNode::PatternMatchClass(node),
+            Pattern::MatchStar(node) => AnyNode::PatternMatchStar(node),
+            Pattern::MatchAs(node) => AnyNode::PatternMatchAs(node),
+            Pattern::MatchOr(node) => AnyNode::PatternMatchOr(node),
+        }
+    }
+}
+
+impl From<Excepthandler> for AnyNode {
+    fn from(handler: Excepthandler) -> Self {
+        match handler {
+            Excepthandler::ExceptHandler(handler) => AnyNode::ExcepthandlerExceptHandler(handler),
+        }
+    }
+}
+
+impl From<TypeIgnore> for AnyNode {
+    fn from(ignore: TypeIgnore) -> Self {
+        match ignore {
+            TypeIgnore::TypeIgnore(ignore) => AnyNode::TypeIgnoreTypeIgnore(ignore),
+        }
+    }
+}
+
+impl From<ModModule> for AnyNode {
+    fn from(node: ModModule) -> Self {
+        AnyNode::ModModule(node)
+    }
+}
+
+impl From<ModInteractive> for AnyNode {
+    fn from(node: ModInteractive) -> Self {
+        AnyNode::ModInteractive(node)
+    }
+}
+
+impl From<ModExpression> for AnyNode {
+    fn from(node: ModExpression) -> Self {
+        AnyNode::ModExpression(node)
+    }
+}
+
+impl From<ModFunctionType> for AnyNode {
+    fn from(node: ModFunctionType) -> Self {
+        AnyNode::ModFunctionType(node)
+    }
+}
+
+impl From<StmtFunctionDef> for AnyNode {
+    fn from(node: StmtFunctionDef) -> Self {
+        AnyNode::StmtFunctionDef(node)
+    }
+}
+
+impl From<StmtAsyncFunctionDef> for AnyNode {
+    fn from(node: StmtAsyncFunctionDef) -> Self {
+        AnyNode::StmtAsyncFunctionDef(node)
+    }
+}
+
+impl From<StmtClassDef> for AnyNode {
+    fn from(node: StmtClassDef) -> Self {
+        AnyNode::StmtClassDef(node)
+    }
+}
+
+impl From<StmtReturn> for AnyNode {
+    fn from(node: StmtReturn) -> Self {
+        AnyNode::StmtReturn(node)
+    }
+}
+
+impl From<StmtDelete> for AnyNode {
+    fn from(node: StmtDelete) -> Self {
+        AnyNode::StmtDelete(node)
+    }
+}
+
+impl From<StmtAssign> for AnyNode {
+    fn from(node: StmtAssign) -> Self {
+        AnyNode::StmtAssign(node)
+    }
+}
+
+impl From<StmtAugAssign> for AnyNode {
+    fn from(node: StmtAugAssign) -> Self {
+        AnyNode::StmtAugAssign(node)
+    }
+}
+
+impl From<StmtAnnAssign> for AnyNode {
+    fn from(node: StmtAnnAssign) -> Self {
+        AnyNode::StmtAnnAssign(node)
+    }
+}
+
+impl From<StmtFor> for AnyNode {
+    fn from(node: StmtFor) -> Self {
+        AnyNode::StmtFor(node)
+    }
+}
+
+impl From<StmtAsyncFor> for AnyNode {
+    fn from(node: StmtAsyncFor) -> Self {
+        AnyNode::StmtAsyncFor(node)
+    }
+}
+
+impl From<StmtWhile> for AnyNode {
+    fn from(node: StmtWhile) -> Self {
+        AnyNode::StmtWhile(node)
+    }
+}
+
+impl From<StmtIf> for AnyNode {
+    fn from(node: StmtIf) -> Self {
+        AnyNode::StmtIf(node)
+    }
+}
+
+impl From<StmtWith> for AnyNode {
+    fn from(node: StmtWith) -> Self {
+        AnyNode::StmtWith(node)
+    }
+}
+
+impl From<StmtAsyncWith> for AnyNode {
+    fn from(node: StmtAsyncWith) -> Self {
+        AnyNode::StmtAsyncWith(node)
+    }
+}
+
+impl From<StmtMatch> for AnyNode {
+    fn from(node: StmtMatch) -> Self {
+        AnyNode::StmtMatch(node)
+    }
+}
+
+impl From<StmtRaise> for AnyNode {
+    fn from(node: StmtRaise) -> Self {
+        AnyNode::StmtRaise(node)
+    }
+}
+
+impl From<StmtTry> for AnyNode {
+    fn from(node: StmtTry) -> Self {
+        AnyNode::StmtTry(node)
+    }
+}
+
+impl From<StmtTryStar> for AnyNode {
+    fn from(node: StmtTryStar) -> Self {
+        AnyNode::StmtTryStar(node)
+    }
+}
+
+impl From<StmtAssert> for AnyNode {
+    fn from(node: StmtAssert) -> Self {
+        AnyNode::StmtAssert(node)
+    }
+}
+
+impl From<StmtImport> for AnyNode {
+    fn from(node: StmtImport) -> Self {
+        AnyNode::StmtImport(node)
+    }
+}
+
+impl From<StmtImportFrom> for AnyNode {
+    fn from(node: StmtImportFrom) -> Self {
+        AnyNode::StmtImportFrom(node)
+    }
+}
+
+impl From<StmtGlobal> for AnyNode {
+    fn from(node: StmtGlobal) -> Self {
+        AnyNode::StmtGlobal(node)
+    }
+}
+
+impl From<StmtNonlocal> for AnyNode {
+    fn from(node: StmtNonlocal) -> Self {
+        AnyNode::StmtNonlocal(node)
+    }
+}
+
+impl From<StmtExpr> for AnyNode {
+    fn from(node: StmtExpr) -> Self {
+        AnyNode::StmtExpr(node)
+    }
+}
+
+impl From<StmtPass> for AnyNode {
+    fn from(node: StmtPass) -> Self {
+        AnyNode::StmtPass(node)
+    }
+}
+
+impl From<StmtBreak> for AnyNode {
+    fn from(node: StmtBreak) -> Self {
+        AnyNode::StmtBreak(node)
+    }
+}
+
+impl From<StmtContinue> for AnyNode {
+    fn from(node: StmtContinue) -> Self {
+        AnyNode::StmtContinue(node)
+    }
+}
+
+impl From<ExprBoolOp> for AnyNode {
+    fn from(node: ExprBoolOp) -> Self {
+        AnyNode::ExprBoolOp(node)
+    }
+}
+
+impl From<ExprNamedExpr> for AnyNode {
+    fn from(node: ExprNamedExpr) -> Self {
+        AnyNode::ExprNamedExpr(node)
+    }
+}
+
+impl From<ExprBinOp> for AnyNode {
+    fn from(node: ExprBinOp) -> Self {
+        AnyNode::ExprBinOp(node)
+    }
+}
+
+impl From<ExprUnaryOp> for AnyNode {
+    fn from(node: ExprUnaryOp) -> Self {
+        AnyNode::ExprUnaryOp(node)
+    }
+}
+
+impl From<ExprLambda> for AnyNode {
+    fn from(node: ExprLambda) -> Self {
+        AnyNode::ExprLambda(node)
+    }
+}
+
+impl From<ExprIfExp> for AnyNode {
+    fn from(node: ExprIfExp) -> Self {
+        AnyNode::ExprIfExp(node)
+    }
+}
+
+impl From<ExprDict> for AnyNode {
+    fn from(node: ExprDict) -> Self {
+        AnyNode::ExprDict(node)
+    }
+}
+
+impl From<ExprSet> for AnyNode {
+    fn from(node: ExprSet) -> Self {
+        AnyNode::ExprSet(node)
+    }
+}
+
+impl From<ExprListComp> for AnyNode {
+    fn from(node: ExprListComp) -> Self {
+        AnyNode::ExprListComp(node)
+    }
+}
+
+impl From<ExprSetComp> for AnyNode {
+    fn from(node: ExprSetComp) -> Self {
+        AnyNode::ExprSetComp(node)
+    }
+}
+
+impl From<ExprDictComp> for AnyNode {
+    fn from(node: ExprDictComp) -> Self {
+        AnyNode::ExprDictComp(node)
+    }
+}
+
+impl From<ExprGeneratorExp> for AnyNode {
+    fn from(node: ExprGeneratorExp) -> Self {
+        AnyNode::ExprGeneratorExp(node)
+    }
+}
+
+impl From<ExprAwait> for AnyNode {
+    fn from(node: ExprAwait) -> Self {
+        AnyNode::ExprAwait(node)
+    }
+}
+
+impl From<ExprYield> for AnyNode {
+    fn from(node: ExprYield) -> Self {
+        AnyNode::ExprYield(node)
+    }
+}
+
+impl From<ExprYieldFrom> for AnyNode {
+    fn from(node: ExprYieldFrom) -> Self {
+        AnyNode::ExprYieldFrom(node)
+    }
+}
+
+impl From<ExprCompare> for AnyNode {
+    fn from(node: ExprCompare) -> Self {
+        AnyNode::ExprCompare(node)
+    }
+}
+
+impl From<ExprCall> for AnyNode {
+    fn from(node: ExprCall) -> Self {
+        AnyNode::ExprCall(node)
+    }
+}
+
+impl From<ExprFormattedValue> for AnyNode {
+    fn from(node: ExprFormattedValue) -> Self {
+        AnyNode::ExprFormattedValue(node)
+    }
+}
+
+impl From<ExprJoinedStr> for AnyNode {
+    fn from(node: ExprJoinedStr) -> Self {
+        AnyNode::ExprJoinedStr(node)
+    }
+}
+
+impl From<ExprConstant> for AnyNode {
+    fn from(node: ExprConstant) -> Self {
+        AnyNode::ExprConstant(node)
+    }
+}
+
+impl From<ExprAttribute> for AnyNode {
+    fn from(node: ExprAttribute) -> Self {
+        AnyNode::ExprAttribute(node)
+    }
+}
+
+impl From<ExprSubscript> for AnyNode {
+    fn from(node: ExprSubscript) -> Self {
+        AnyNode::ExprSubscript(node)
+    }
+}
+
+impl From<ExprStarred> for AnyNode {
+    fn from(node: ExprStarred) -> Self {
+        AnyNode::ExprStarred(node)
+    }
+}
+
+impl From<ExprName> for AnyNode {
+    fn from(node: ExprName) -> Self {
+        AnyNode::ExprName(node)
+    }
+}
+
+impl From<ExprList> for AnyNode {
+    fn from(node: ExprList) -> Self {
+        AnyNode::ExprList(node)
+    }
+}
+
+impl From<ExprTuple> for AnyNode {
+    fn from(node: ExprTuple) -> Self {
+        AnyNode::ExprTuple(node)
+    }
+}
+
+impl From<ExprSlice> for AnyNode {
+    fn from(node: ExprSlice) -> Self {
+        AnyNode::ExprSlice(node)
+    }
+}
+
+impl From<ExcepthandlerExceptHandler> for AnyNode {
+    fn from(node: ExcepthandlerExceptHandler) -> Self {
+        AnyNode::ExcepthandlerExceptHandler(node)
+    }
+}
+
+impl From<PatternMatchValue> for AnyNode {
+    fn from(node: PatternMatchValue) -> Self {
+        AnyNode::PatternMatchValue(node)
+    }
+}
+
+impl From<PatternMatchSingleton> for AnyNode {
+    fn from(node: PatternMatchSingleton) -> Self {
+        AnyNode::PatternMatchSingleton(node)
+    }
+}
+
+impl From<PatternMatchSequence> for AnyNode {
+    fn from(node: PatternMatchSequence) -> Self {
+        AnyNode::PatternMatchSequence(node)
+    }
+}
+
+impl From<PatternMatchMapping> for AnyNode {
+    fn from(node: PatternMatchMapping) -> Self {
+        AnyNode::PatternMatchMapping(node)
+    }
+}
+
+impl From<PatternMatchClass> for AnyNode {
+    fn from(node: PatternMatchClass) -> Self {
+        AnyNode::PatternMatchClass(node)
+    }
+}
+
+impl From<PatternMatchStar> for AnyNode {
+    fn from(node: PatternMatchStar) -> Self {
+        AnyNode::PatternMatchStar(node)
+    }
+}
+
+impl From<PatternMatchAs> for AnyNode {
+    fn from(node: PatternMatchAs) -> Self {
+        AnyNode::PatternMatchAs(node)
+    }
+}
+
+impl From<PatternMatchOr> for AnyNode {
+    fn from(node: PatternMatchOr) -> Self {
+        AnyNode::PatternMatchOr(node)
+    }
+}
+
+impl From<TypeIgnoreTypeIgnore> for AnyNode {
+    fn from(node: TypeIgnoreTypeIgnore) -> Self {
+        AnyNode::TypeIgnoreTypeIgnore(node)
+    }
+}
+
+impl From<Comprehension> for AnyNode {
+    fn from(node: Comprehension) -> Self {
+        AnyNode::Comprehension(node)
+    }
+}
+impl From<Arguments> for AnyNode {
+    fn from(node: Arguments) -> Self {
+        AnyNode::Arguments(node)
+    }
+}
+impl From<Arg> for AnyNode {
+    fn from(node: Arg) -> Self {
+        AnyNode::Arg(node)
+    }
+}
+impl From<Keyword> for AnyNode {
+    fn from(node: Keyword) -> Self {
+        AnyNode::Keyword(node)
+    }
+}
+impl From<Alias> for AnyNode {
+    fn from(node: Alias) -> Self {
+        AnyNode::Alias(node)
+    }
+}
+impl From<Withitem> for AnyNode {
+    fn from(node: Withitem) -> Self {
+        AnyNode::Withitem(node)
+    }
+}
+impl From<MatchCase> for AnyNode {
+    fn from(node: MatchCase) -> Self {
+        AnyNode::MatchCase(node)
+    }
+}
+
+impl Ranged for AnyNode {
+    fn range(&self) -> TextRange {
+        match self {
+            AnyNode::ModModule(node) => node.range(),
+            AnyNode::ModInteractive(node) => node.range(),
+            AnyNode::ModExpression(node) => node.range(),
+            AnyNode::ModFunctionType(node) => node.range(),
+            AnyNode::StmtFunctionDef(node) => node.range(),
+            AnyNode::StmtAsyncFunctionDef(node) => node.range(),
+            AnyNode::StmtClassDef(node) => node.range(),
+            AnyNode::StmtReturn(node) => node.range(),
+            AnyNode::StmtDelete(node) => node.range(),
+            AnyNode::StmtAssign(node) => node.range(),
+            AnyNode::StmtAugAssign(node) => node.range(),
+            AnyNode::StmtAnnAssign(node) => node.range(),
+            AnyNode::StmtFor(node) => node.range(),
+            AnyNode::StmtAsyncFor(node) => node.range(),
+            AnyNode::StmtWhile(node) => node.range(),
+            AnyNode::StmtIf(node) => node.range(),
+            AnyNode::StmtWith(node) => node.range(),
+            AnyNode::StmtAsyncWith(node) => node.range(),
+            AnyNode::StmtMatch(node) => node.range(),
+            AnyNode::StmtRaise(node) => node.range(),
+            AnyNode::StmtTry(node) => node.range(),
+            AnyNode::StmtTryStar(node) => node.range(),
+            AnyNode::StmtAssert(node) => node.range(),
+            AnyNode::StmtImport(node) => node.range(),
+            AnyNode::StmtImportFrom(node) => node.range(),
+            AnyNode::StmtGlobal(node) => node.range(),
+            AnyNode::StmtNonlocal(node) => node.range(),
+            AnyNode::StmtExpr(node) => node.range(),
+            AnyNode::StmtPass(node) => node.range(),
+            AnyNode::StmtBreak(node) => node.range(),
+            AnyNode::StmtContinue(node) => node.range(),
+            AnyNode::ExprBoolOp(node) => node.range(),
+            AnyNode::ExprNamedExpr(node) => node.range(),
+            AnyNode::ExprBinOp(node) => node.range(),
+            AnyNode::ExprUnaryOp(node) => node.range(),
+            AnyNode::ExprLambda(node) => node.range(),
+            AnyNode::ExprIfExp(node) => node.range(),
+            AnyNode::ExprDict(node) => node.range(),
+            AnyNode::ExprSet(node) => node.range(),
+            AnyNode::ExprListComp(node) => node.range(),
+            AnyNode::ExprSetComp(node) => node.range(),
+            AnyNode::ExprDictComp(node) => node.range(),
+            AnyNode::ExprGeneratorExp(node) => node.range(),
+            AnyNode::ExprAwait(node) => node.range(),
+            AnyNode::ExprYield(node) => node.range(),
+            AnyNode::ExprYieldFrom(node) => node.range(),
+            AnyNode::ExprCompare(node) => node.range(),
+            AnyNode::ExprCall(node) => node.range(),
+            AnyNode::ExprFormattedValue(node) => node.range(),
+            AnyNode::ExprJoinedStr(node) => node.range(),
+            AnyNode::ExprConstant(node) => node.range(),
+            AnyNode::ExprAttribute(node) => node.range(),
+            AnyNode::ExprSubscript(node) => node.range(),
+            AnyNode::ExprStarred(node) => node.range(),
+            AnyNode::ExprName(node) => node.range(),
+            AnyNode::ExprList(node) => node.range(),
+            AnyNode::ExprTuple(node) => node.range(),
+            AnyNode::ExprSlice(node) => node.range(),
+            AnyNode::ExcepthandlerExceptHandler(node) => node.range(),
+            AnyNode::PatternMatchValue(node) => node.range(),
+            AnyNode::PatternMatchSingleton(node) => node.range(),
+            AnyNode::PatternMatchSequence(node) => node.range(),
+            AnyNode::PatternMatchMapping(node) => node.range(),
+            AnyNode::PatternMatchClass(node) => node.range(),
+            AnyNode::PatternMatchStar(node) => node.range(),
+            AnyNode::PatternMatchAs(node) => node.range(),
+            AnyNode::PatternMatchOr(node) => node.range(),
+            AnyNode::TypeIgnoreTypeIgnore(node) => node.range(),
+            AnyNode::Comprehension(node) => node.range(),
+            AnyNode::Arguments(node) => node.range(),
+            AnyNode::Arg(node) => node.range(),
+            AnyNode::Keyword(node) => node.range(),
+            AnyNode::Alias(node) => node.range(),
+            AnyNode::Withitem(node) => node.range(),
+            AnyNode::MatchCase(node) => node.range(),
+        }
+    }
+}
+
+#[derive(Copy, Clone, Debug, is_macro::Is, PartialEq)]
+pub enum AnyNodeRef<'a> {
+    ModModule(&'a ModModule<TextRange>),
+    ModInteractive(&'a ModInteractive<TextRange>),
+    ModExpression(&'a ModExpression<TextRange>),
+    ModFunctionType(&'a ModFunctionType<TextRange>),
+    StmtFunctionDef(&'a StmtFunctionDef<TextRange>),
+    StmtAsyncFunctionDef(&'a StmtAsyncFunctionDef<TextRange>),
+    StmtClassDef(&'a StmtClassDef<TextRange>),
+    StmtReturn(&'a StmtReturn<TextRange>),
+    StmtDelete(&'a StmtDelete<TextRange>),
+    StmtAssign(&'a StmtAssign<TextRange>),
+    StmtAugAssign(&'a StmtAugAssign<TextRange>),
+    StmtAnnAssign(&'a StmtAnnAssign<TextRange>),
+    StmtFor(&'a StmtFor<TextRange>),
+    StmtAsyncFor(&'a StmtAsyncFor<TextRange>),
+    StmtWhile(&'a StmtWhile<TextRange>),
+    StmtIf(&'a StmtIf<TextRange>),
+    StmtWith(&'a StmtWith<TextRange>),
+    StmtAsyncWith(&'a StmtAsyncWith<TextRange>),
+    StmtMatch(&'a StmtMatch<TextRange>),
+    StmtRaise(&'a StmtRaise<TextRange>),
+    StmtTry(&'a StmtTry<TextRange>),
+    StmtTryStar(&'a StmtTryStar<TextRange>),
+    StmtAssert(&'a StmtAssert<TextRange>),
+    StmtImport(&'a StmtImport<TextRange>),
+    StmtImportFrom(&'a StmtImportFrom<TextRange>),
+    StmtGlobal(&'a StmtGlobal<TextRange>),
+    StmtNonlocal(&'a StmtNonlocal<TextRange>),
+    StmtExpr(&'a StmtExpr<TextRange>),
+    StmtPass(&'a StmtPass<TextRange>),
+    StmtBreak(&'a StmtBreak<TextRange>),
+    StmtContinue(&'a StmtContinue<TextRange>),
+    ExprBoolOp(&'a ExprBoolOp<TextRange>),
+    ExprNamedExpr(&'a ExprNamedExpr<TextRange>),
+    ExprBinOp(&'a ExprBinOp<TextRange>),
+    ExprUnaryOp(&'a ExprUnaryOp<TextRange>),
+    ExprLambda(&'a ExprLambda<TextRange>),
+    ExprIfExp(&'a ExprIfExp<TextRange>),
+    ExprDict(&'a ExprDict<TextRange>),
+    ExprSet(&'a ExprSet<TextRange>),
+    ExprListComp(&'a ExprListComp<TextRange>),
+    ExprSetComp(&'a ExprSetComp<TextRange>),
+    ExprDictComp(&'a ExprDictComp<TextRange>),
+    ExprGeneratorExp(&'a ExprGeneratorExp<TextRange>),
+    ExprAwait(&'a ExprAwait<TextRange>),
+    ExprYield(&'a ExprYield<TextRange>),
+    ExprYieldFrom(&'a ExprYieldFrom<TextRange>),
+    ExprCompare(&'a ExprCompare<TextRange>),
+    ExprCall(&'a ExprCall<TextRange>),
+    ExprFormattedValue(&'a ExprFormattedValue<TextRange>),
+    ExprJoinedStr(&'a ExprJoinedStr<TextRange>),
+    ExprConstant(&'a ExprConstant<TextRange>),
+    ExprAttribute(&'a ExprAttribute<TextRange>),
+    ExprSubscript(&'a ExprSubscript<TextRange>),
+    ExprStarred(&'a ExprStarred<TextRange>),
+    ExprName(&'a ExprName<TextRange>),
+    ExprList(&'a ExprList<TextRange>),
+    ExprTuple(&'a ExprTuple<TextRange>),
+    ExprSlice(&'a ExprSlice<TextRange>),
+    ExcepthandlerExceptHandler(&'a ExcepthandlerExceptHandler<TextRange>),
+    PatternMatchValue(&'a PatternMatchValue<TextRange>),
+    PatternMatchSingleton(&'a PatternMatchSingleton<TextRange>),
+    PatternMatchSequence(&'a PatternMatchSequence<TextRange>),
+    PatternMatchMapping(&'a PatternMatchMapping<TextRange>),
+    PatternMatchClass(&'a PatternMatchClass<TextRange>),
+    PatternMatchStar(&'a PatternMatchStar<TextRange>),
+    PatternMatchAs(&'a PatternMatchAs<TextRange>),
+    PatternMatchOr(&'a PatternMatchOr<TextRange>),
+    TypeIgnoreTypeIgnore(&'a TypeIgnoreTypeIgnore<TextRange>),
+    Comprehension(&'a Comprehension<TextRange>),
+    Arguments(&'a Arguments<TextRange>),
+    Arg(&'a Arg<TextRange>),
+    Keyword(&'a Keyword<TextRange>),
+    Alias(&'a Alias<TextRange>),
+    Withitem(&'a Withitem<TextRange>),
+    MatchCase(&'a MatchCase<TextRange>),
+}
+
+impl AnyNodeRef<'_> {
+    pub fn as_ptr(&self) -> NonNull<()> {
+        match self {
+            AnyNodeRef::ModModule(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ModInteractive(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ModExpression(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ModFunctionType(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtFunctionDef(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtAsyncFunctionDef(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtClassDef(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtReturn(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtDelete(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtAssign(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtAugAssign(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtAnnAssign(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtFor(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtAsyncFor(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtWhile(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtIf(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtWith(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtAsyncWith(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtMatch(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtRaise(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtTry(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtTryStar(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtAssert(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtImport(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtImportFrom(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtGlobal(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtNonlocal(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtExpr(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtPass(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtBreak(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::StmtContinue(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprBoolOp(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprNamedExpr(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprBinOp(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprUnaryOp(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprLambda(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprIfExp(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprDict(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprSet(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprListComp(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprSetComp(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprDictComp(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprGeneratorExp(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprAwait(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprYield(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprYieldFrom(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprCompare(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprCall(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprFormattedValue(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprJoinedStr(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprConstant(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprAttribute(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprSubscript(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprStarred(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprName(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprList(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprTuple(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExprSlice(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::ExcepthandlerExceptHandler(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::PatternMatchValue(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::PatternMatchSingleton(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::PatternMatchSequence(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::PatternMatchMapping(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::PatternMatchClass(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::PatternMatchStar(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::PatternMatchAs(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::PatternMatchOr(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::TypeIgnoreTypeIgnore(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::Comprehension(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::Arguments(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::Arg(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::Keyword(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::Alias(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::Withitem(node) => NonNull::from(*node).cast(),
+            AnyNodeRef::MatchCase(node) => NonNull::from(*node).cast(),
+        }
+    }
+
+    /// Compares two any node refs by their pointers (referential equality).
+    pub fn ptr_eq(self, other: AnyNodeRef) -> bool {
+        self.as_ptr().eq(&other.as_ptr())
+    }
+
+    /// Returns the node's [`kind`](NodeKind) that has no data associated and is [`Copy`].
+    pub const fn kind(self) -> NodeKind {
+        match self {
+            AnyNodeRef::ModModule(_) => NodeKind::ModModule,
+            AnyNodeRef::ModInteractive(_) => NodeKind::ModInteractive,
+            AnyNodeRef::ModExpression(_) => NodeKind::ModExpression,
+            AnyNodeRef::ModFunctionType(_) => NodeKind::ModFunctionType,
+            AnyNodeRef::StmtFunctionDef(_) => NodeKind::StmtFunctionDef,
+            AnyNodeRef::StmtAsyncFunctionDef(_) => NodeKind::StmtAsyncFunctionDef,
+            AnyNodeRef::StmtClassDef(_) => NodeKind::StmtClassDef,
+            AnyNodeRef::StmtReturn(_) => NodeKind::StmtReturn,
+            AnyNodeRef::StmtDelete(_) => NodeKind::StmtDelete,
+            AnyNodeRef::StmtAssign(_) => NodeKind::StmtAssign,
+            AnyNodeRef::StmtAugAssign(_) => NodeKind::StmtAugAssign,
+            AnyNodeRef::StmtAnnAssign(_) => NodeKind::StmtAnnAssign,
+            AnyNodeRef::StmtFor(_) => NodeKind::StmtFor,
+            AnyNodeRef::StmtAsyncFor(_) => NodeKind::StmtAsyncFor,
+            AnyNodeRef::StmtWhile(_) => NodeKind::StmtWhile,
+            AnyNodeRef::StmtIf(_) => NodeKind::StmtIf,
+            AnyNodeRef::StmtWith(_) => NodeKind::StmtWith,
+            AnyNodeRef::StmtAsyncWith(_) => NodeKind::StmtAsyncWith,
+            AnyNodeRef::StmtMatch(_) => NodeKind::StmtMatch,
+            AnyNodeRef::StmtRaise(_) => NodeKind::StmtRaise,
+            AnyNodeRef::StmtTry(_) => NodeKind::StmtTry,
+            AnyNodeRef::StmtTryStar(_) => NodeKind::StmtTryStar,
+            AnyNodeRef::StmtAssert(_) => NodeKind::StmtAssert,
+            AnyNodeRef::StmtImport(_) => NodeKind::StmtImport,
+            AnyNodeRef::StmtImportFrom(_) => NodeKind::StmtImportFrom,
+            AnyNodeRef::StmtGlobal(_) => NodeKind::StmtGlobal,
+            AnyNodeRef::StmtNonlocal(_) => NodeKind::StmtNonlocal,
+            AnyNodeRef::StmtExpr(_) => NodeKind::StmtExpr,
+            AnyNodeRef::StmtPass(_) => NodeKind::StmtPass,
+            AnyNodeRef::StmtBreak(_) => NodeKind::StmtBreak,
+            AnyNodeRef::StmtContinue(_) => NodeKind::StmtContinue,
+            AnyNodeRef::ExprBoolOp(_) => NodeKind::ExprBoolOp,
+            AnyNodeRef::ExprNamedExpr(_) => NodeKind::ExprNamedExpr,
+            AnyNodeRef::ExprBinOp(_) => NodeKind::ExprBinOp,
+            AnyNodeRef::ExprUnaryOp(_) => NodeKind::ExprUnaryOp,
+            AnyNodeRef::ExprLambda(_) => NodeKind::ExprLambda,
+            AnyNodeRef::ExprIfExp(_) => NodeKind::ExprIfExp,
+            AnyNodeRef::ExprDict(_) => NodeKind::ExprDict,
+            AnyNodeRef::ExprSet(_) => NodeKind::ExprSet,
+            AnyNodeRef::ExprListComp(_) => NodeKind::ExprListComp,
+            AnyNodeRef::ExprSetComp(_) => NodeKind::ExprSetComp,
+            AnyNodeRef::ExprDictComp(_) => NodeKind::ExprDictComp,
+            AnyNodeRef::ExprGeneratorExp(_) => NodeKind::ExprGeneratorExp,
+            AnyNodeRef::ExprAwait(_) => NodeKind::ExprAwait,
+            AnyNodeRef::ExprYield(_) => NodeKind::ExprYield,
+            AnyNodeRef::ExprYieldFrom(_) => NodeKind::ExprYieldFrom,
+            AnyNodeRef::ExprCompare(_) => NodeKind::ExprCompare,
+            AnyNodeRef::ExprCall(_) => NodeKind::ExprCall,
+            AnyNodeRef::ExprFormattedValue(_) => NodeKind::ExprFormattedValue,
+            AnyNodeRef::ExprJoinedStr(_) => NodeKind::ExprJoinedStr,
+            AnyNodeRef::ExprConstant(_) => NodeKind::ExprConstant,
+            AnyNodeRef::ExprAttribute(_) => NodeKind::ExprAttribute,
+            AnyNodeRef::ExprSubscript(_) => NodeKind::ExprSubscript,
+            AnyNodeRef::ExprStarred(_) => NodeKind::ExprStarred,
+            AnyNodeRef::ExprName(_) => NodeKind::ExprName,
+            AnyNodeRef::ExprList(_) => NodeKind::ExprList,
+            AnyNodeRef::ExprTuple(_) => NodeKind::ExprTuple,
+            AnyNodeRef::ExprSlice(_) => NodeKind::ExprSlice,
+            AnyNodeRef::ExcepthandlerExceptHandler(_) => NodeKind::ExcepthandlerExceptHandler,
+            AnyNodeRef::PatternMatchValue(_) => NodeKind::PatternMatchValue,
+            AnyNodeRef::PatternMatchSingleton(_) => NodeKind::PatternMatchSingleton,
+            AnyNodeRef::PatternMatchSequence(_) => NodeKind::PatternMatchSequence,
+            AnyNodeRef::PatternMatchMapping(_) => NodeKind::PatternMatchMapping,
+            AnyNodeRef::PatternMatchClass(_) => NodeKind::PatternMatchClass,
+            AnyNodeRef::PatternMatchStar(_) => NodeKind::PatternMatchStar,
+            AnyNodeRef::PatternMatchAs(_) => NodeKind::PatternMatchAs,
+            AnyNodeRef::PatternMatchOr(_) => NodeKind::PatternMatchOr,
+            AnyNodeRef::TypeIgnoreTypeIgnore(_) => NodeKind::TypeIgnoreTypeIgnore,
+            AnyNodeRef::Comprehension(_) => NodeKind::Comprehension,
+            AnyNodeRef::Arguments(_) => NodeKind::Arguments,
+            AnyNodeRef::Arg(_) => NodeKind::Arg,
+            AnyNodeRef::Keyword(_) => NodeKind::Keyword,
+            AnyNodeRef::Alias(_) => NodeKind::Alias,
+            AnyNodeRef::Withitem(_) => NodeKind::Withitem,
+            AnyNodeRef::MatchCase(_) => NodeKind::MatchCase,
+        }
+    }
+
+    pub const fn is_statement(self) -> bool {
+        match self {
+            AnyNodeRef::StmtFunctionDef(_)
+            | AnyNodeRef::StmtAsyncFunctionDef(_)
+            | AnyNodeRef::StmtClassDef(_)
+            | AnyNodeRef::StmtReturn(_)
+            | AnyNodeRef::StmtDelete(_)
+            | AnyNodeRef::StmtAssign(_)
+            | AnyNodeRef::StmtAugAssign(_)
+            | AnyNodeRef::StmtAnnAssign(_)
+            | AnyNodeRef::StmtFor(_)
+            | AnyNodeRef::StmtAsyncFor(_)
+            | AnyNodeRef::StmtWhile(_)
+            | AnyNodeRef::StmtIf(_)
+            | AnyNodeRef::StmtWith(_)
+            | AnyNodeRef::StmtAsyncWith(_)
+            | AnyNodeRef::StmtMatch(_)
+            | AnyNodeRef::StmtRaise(_)
+            | AnyNodeRef::StmtTry(_)
+            | AnyNodeRef::StmtTryStar(_)
+            | AnyNodeRef::StmtAssert(_)
+            | AnyNodeRef::StmtImport(_)
+            | AnyNodeRef::StmtImportFrom(_)
+            | AnyNodeRef::StmtGlobal(_)
+            | AnyNodeRef::StmtNonlocal(_)
+            | AnyNodeRef::StmtExpr(_)
+            | AnyNodeRef::StmtPass(_)
+            | AnyNodeRef::StmtBreak(_)
+            | AnyNodeRef::StmtContinue(_) => true,
+
+            AnyNodeRef::ModModule(_)
+            | AnyNodeRef::ModInteractive(_)
+            | AnyNodeRef::ModExpression(_)
+            | AnyNodeRef::ModFunctionType(_)
+            | AnyNodeRef::ExprBoolOp(_)
+            | AnyNodeRef::ExprNamedExpr(_)
+            | AnyNodeRef::ExprBinOp(_)
+            | AnyNodeRef::ExprUnaryOp(_)
+            | AnyNodeRef::ExprLambda(_)
+            | AnyNodeRef::ExprIfExp(_)
+            | AnyNodeRef::ExprDict(_)
+            | AnyNodeRef::ExprSet(_)
+            | AnyNodeRef::ExprListComp(_)
+            | AnyNodeRef::ExprSetComp(_)
+            | AnyNodeRef::ExprDictComp(_)
+            | AnyNodeRef::ExprGeneratorExp(_)
+            | AnyNodeRef::ExprAwait(_)
+            | AnyNodeRef::ExprYield(_)
+            | AnyNodeRef::ExprYieldFrom(_)
+            | AnyNodeRef::ExprCompare(_)
+            | AnyNodeRef::ExprCall(_)
+            | AnyNodeRef::ExprFormattedValue(_)
+            | AnyNodeRef::ExprJoinedStr(_)
+            | AnyNodeRef::ExprConstant(_)
+            | AnyNodeRef::ExprAttribute(_)
+            | AnyNodeRef::ExprSubscript(_)
+            | AnyNodeRef::ExprStarred(_)
+            | AnyNodeRef::ExprName(_)
+            | AnyNodeRef::ExprList(_)
+            | AnyNodeRef::ExprTuple(_)
+            | AnyNodeRef::ExprSlice(_)
+            | AnyNodeRef::ExcepthandlerExceptHandler(_)
+            | AnyNodeRef::PatternMatchValue(_)
+            | AnyNodeRef::PatternMatchSingleton(_)
+            | AnyNodeRef::PatternMatchSequence(_)
+            | AnyNodeRef::PatternMatchMapping(_)
+            | AnyNodeRef::PatternMatchClass(_)
+            | AnyNodeRef::PatternMatchStar(_)
+            | AnyNodeRef::PatternMatchAs(_)
+            | AnyNodeRef::PatternMatchOr(_)
+            | AnyNodeRef::TypeIgnoreTypeIgnore(_)
+            | AnyNodeRef::Comprehension(_)
+            | AnyNodeRef::Arguments(_)
+            | AnyNodeRef::Arg(_)
+            | AnyNodeRef::Keyword(_)
+            | AnyNodeRef::Alias(_)
+            | AnyNodeRef::Withitem(_)
+            | AnyNodeRef::MatchCase(_) => false,
+        }
+    }
+
+    pub const fn is_expression(self) -> bool {
+        match self {
+            AnyNodeRef::ExprBoolOp(_)
+            | AnyNodeRef::ExprNamedExpr(_)
+            | AnyNodeRef::ExprBinOp(_)
+            | AnyNodeRef::ExprUnaryOp(_)
+            | AnyNodeRef::ExprLambda(_)
+            | AnyNodeRef::ExprIfExp(_)
+            | AnyNodeRef::ExprDict(_)
+            | AnyNodeRef::ExprSet(_)
+            | AnyNodeRef::ExprListComp(_)
+            | AnyNodeRef::ExprSetComp(_)
+            | AnyNodeRef::ExprDictComp(_)
+            | AnyNodeRef::ExprGeneratorExp(_)
+            | AnyNodeRef::ExprAwait(_)
+            | AnyNodeRef::ExprYield(_)
+            | AnyNodeRef::ExprYieldFrom(_)
+            | AnyNodeRef::ExprCompare(_)
+            | AnyNodeRef::ExprCall(_)
+            | AnyNodeRef::ExprFormattedValue(_)
+            | AnyNodeRef::ExprJoinedStr(_)
+            | AnyNodeRef::ExprConstant(_)
+            | AnyNodeRef::ExprAttribute(_)
+            | AnyNodeRef::ExprSubscript(_)
+            | AnyNodeRef::ExprStarred(_)
+            | AnyNodeRef::ExprName(_)
+            | AnyNodeRef::ExprList(_)
+            | AnyNodeRef::ExprTuple(_)
+            | AnyNodeRef::ExprSlice(_) => true,
+
+            AnyNodeRef::ModModule(_)
+            | AnyNodeRef::ModInteractive(_)
+            | AnyNodeRef::ModExpression(_)
+            | AnyNodeRef::ModFunctionType(_)
+            | AnyNodeRef::StmtFunctionDef(_)
+            | AnyNodeRef::StmtAsyncFunctionDef(_)
+            | AnyNodeRef::StmtClassDef(_)
+            | AnyNodeRef::StmtReturn(_)
+            | AnyNodeRef::StmtDelete(_)
+            | AnyNodeRef::StmtAssign(_)
+            | AnyNodeRef::StmtAugAssign(_)
+            | AnyNodeRef::StmtAnnAssign(_)
+            | AnyNodeRef::StmtFor(_)
+            | AnyNodeRef::StmtAsyncFor(_)
+            | AnyNodeRef::StmtWhile(_)
+            | AnyNodeRef::StmtIf(_)
+            | AnyNodeRef::StmtWith(_)
+            | AnyNodeRef::StmtAsyncWith(_)
+            | AnyNodeRef::StmtMatch(_)
+            | AnyNodeRef::StmtRaise(_)
+            | AnyNodeRef::StmtTry(_)
+            | AnyNodeRef::StmtTryStar(_)
+            | AnyNodeRef::StmtAssert(_)
+            | AnyNodeRef::StmtImport(_)
+            | AnyNodeRef::StmtImportFrom(_)
+            | AnyNodeRef::StmtGlobal(_)
+            | AnyNodeRef::StmtNonlocal(_)
+            | AnyNodeRef::StmtExpr(_)
+            | AnyNodeRef::StmtPass(_)
+            | AnyNodeRef::StmtBreak(_)
+            | AnyNodeRef::StmtContinue(_)
+            | AnyNodeRef::ExcepthandlerExceptHandler(_)
+            | AnyNodeRef::PatternMatchValue(_)
+            | AnyNodeRef::PatternMatchSingleton(_)
+            | AnyNodeRef::PatternMatchSequence(_)
+            | AnyNodeRef::PatternMatchMapping(_)
+            | AnyNodeRef::PatternMatchClass(_)
+            | AnyNodeRef::PatternMatchStar(_)
+            | AnyNodeRef::PatternMatchAs(_)
+            | AnyNodeRef::PatternMatchOr(_)
+            | AnyNodeRef::TypeIgnoreTypeIgnore(_)
+            | AnyNodeRef::Comprehension(_)
+            | AnyNodeRef::Arguments(_)
+            | AnyNodeRef::Arg(_)
+            | AnyNodeRef::Keyword(_)
+            | AnyNodeRef::Alias(_)
+            | AnyNodeRef::Withitem(_)
+            | AnyNodeRef::MatchCase(_) => false,
+        }
+    }
+
+    pub const fn is_module(self) -> bool {
+        match self {
+            AnyNodeRef::ModModule(_)
+            | AnyNodeRef::ModInteractive(_)
+            | AnyNodeRef::ModExpression(_)
+            | AnyNodeRef::ModFunctionType(_) => true,
+
+            AnyNodeRef::StmtFunctionDef(_)
+            | AnyNodeRef::StmtAsyncFunctionDef(_)
+            | AnyNodeRef::StmtClassDef(_)
+            | AnyNodeRef::StmtReturn(_)
+            | AnyNodeRef::StmtDelete(_)
+            | AnyNodeRef::StmtAssign(_)
+            | AnyNodeRef::StmtAugAssign(_)
+            | AnyNodeRef::StmtAnnAssign(_)
+            | AnyNodeRef::StmtFor(_)
+            | AnyNodeRef::StmtAsyncFor(_)
+            | AnyNodeRef::StmtWhile(_)
+            | AnyNodeRef::StmtIf(_)
+            | AnyNodeRef::StmtWith(_)
+            | AnyNodeRef::StmtAsyncWith(_)
+            | AnyNodeRef::StmtMatch(_)
+            | AnyNodeRef::StmtRaise(_)
+            | AnyNodeRef::StmtTry(_)
+            | AnyNodeRef::StmtTryStar(_)
+            | AnyNodeRef::StmtAssert(_)
+            | AnyNodeRef::StmtImport(_)
+            | AnyNodeRef::StmtImportFrom(_)
+            | AnyNodeRef::StmtGlobal(_)
+            | AnyNodeRef::StmtNonlocal(_)
+            | AnyNodeRef::StmtExpr(_)
+            | AnyNodeRef::StmtPass(_)
+            | AnyNodeRef::StmtBreak(_)
+            | AnyNodeRef::StmtContinue(_)
+            | AnyNodeRef::ExprBoolOp(_)
+            | AnyNodeRef::ExprNamedExpr(_)
+            | AnyNodeRef::ExprBinOp(_)
+            | AnyNodeRef::ExprUnaryOp(_)
+            | AnyNodeRef::ExprLambda(_)
+            | AnyNodeRef::ExprIfExp(_)
+            | AnyNodeRef::ExprDict(_)
+            | AnyNodeRef::ExprSet(_)
+            | AnyNodeRef::ExprListComp(_)
+            | AnyNodeRef::ExprSetComp(_)
+            | AnyNodeRef::ExprDictComp(_)
+            | AnyNodeRef::ExprGeneratorExp(_)
+            | AnyNodeRef::ExprAwait(_)
+            | AnyNodeRef::ExprYield(_)
+            | AnyNodeRef::ExprYieldFrom(_)
+            | AnyNodeRef::ExprCompare(_)
+            | AnyNodeRef::ExprCall(_)
+            | AnyNodeRef::ExprFormattedValue(_)
+            | AnyNodeRef::ExprJoinedStr(_)
+            | AnyNodeRef::ExprConstant(_)
+            | AnyNodeRef::ExprAttribute(_)
+            | AnyNodeRef::ExprSubscript(_)
+            | AnyNodeRef::ExprStarred(_)
+            | AnyNodeRef::ExprName(_)
+            | AnyNodeRef::ExprList(_)
+            | AnyNodeRef::ExprTuple(_)
+            | AnyNodeRef::ExprSlice(_)
+            | AnyNodeRef::ExcepthandlerExceptHandler(_)
+            | AnyNodeRef::PatternMatchValue(_)
+            | AnyNodeRef::PatternMatchSingleton(_)
+            | AnyNodeRef::PatternMatchSequence(_)
+            | AnyNodeRef::PatternMatchMapping(_)
+            | AnyNodeRef::PatternMatchClass(_)
+            | AnyNodeRef::PatternMatchStar(_)
+            | AnyNodeRef::PatternMatchAs(_)
+            | AnyNodeRef::PatternMatchOr(_)
+            | AnyNodeRef::TypeIgnoreTypeIgnore(_)
+            | AnyNodeRef::Comprehension(_)
+            | AnyNodeRef::Arguments(_)
+            | AnyNodeRef::Arg(_)
+            | AnyNodeRef::Keyword(_)
+            | AnyNodeRef::Alias(_)
+            | AnyNodeRef::Withitem(_)
+            | AnyNodeRef::MatchCase(_) => false,
+        }
+    }
+
+    pub const fn is_pattern(self) -> bool {
+        match self {
+            AnyNodeRef::PatternMatchValue(_)
+            | AnyNodeRef::PatternMatchSingleton(_)
+            | AnyNodeRef::PatternMatchSequence(_)
+            | AnyNodeRef::PatternMatchMapping(_)
+            | AnyNodeRef::PatternMatchClass(_)
+            | AnyNodeRef::PatternMatchStar(_)
+            | AnyNodeRef::PatternMatchAs(_)
+            | AnyNodeRef::PatternMatchOr(_) => true,
+
+            AnyNodeRef::ModModule(_)
+            | AnyNodeRef::ModInteractive(_)
+            | AnyNodeRef::ModExpression(_)
+            | AnyNodeRef::ModFunctionType(_)
+            | AnyNodeRef::StmtFunctionDef(_)
+            | AnyNodeRef::StmtAsyncFunctionDef(_)
+            | AnyNodeRef::StmtClassDef(_)
+            | AnyNodeRef::StmtReturn(_)
+            | AnyNodeRef::StmtDelete(_)
+            | AnyNodeRef::StmtAssign(_)
+            | AnyNodeRef::StmtAugAssign(_)
+            | AnyNodeRef::StmtAnnAssign(_)
+            | AnyNodeRef::StmtFor(_)
+            | AnyNodeRef::StmtAsyncFor(_)
+            | AnyNodeRef::StmtWhile(_)
+            | AnyNodeRef::StmtIf(_)
+            | AnyNodeRef::StmtWith(_)
+            | AnyNodeRef::StmtAsyncWith(_)
+            | AnyNodeRef::StmtMatch(_)
+            | AnyNodeRef::StmtRaise(_)
+            | AnyNodeRef::StmtTry(_)
+            | AnyNodeRef::StmtTryStar(_)
+            | AnyNodeRef::StmtAssert(_)
+            | AnyNodeRef::StmtImport(_)
+            | AnyNodeRef::StmtImportFrom(_)
+            | AnyNodeRef::StmtGlobal(_)
+            | AnyNodeRef::StmtNonlocal(_)
+            | AnyNodeRef::StmtExpr(_)
+            | AnyNodeRef::StmtPass(_)
+            | AnyNodeRef::StmtBreak(_)
+            | AnyNodeRef::StmtContinue(_)
+            | AnyNodeRef::ExprBoolOp(_)
+            | AnyNodeRef::ExprNamedExpr(_)
+            | AnyNodeRef::ExprBinOp(_)
+            | AnyNodeRef::ExprUnaryOp(_)
+            | AnyNodeRef::ExprLambda(_)
+            | AnyNodeRef::ExprIfExp(_)
+            | AnyNodeRef::ExprDict(_)
+            | AnyNodeRef::ExprSet(_)
+            | AnyNodeRef::ExprListComp(_)
+            | AnyNodeRef::ExprSetComp(_)
+            | AnyNodeRef::ExprDictComp(_)
+            | AnyNodeRef::ExprGeneratorExp(_)
+            | AnyNodeRef::ExprAwait(_)
+            | AnyNodeRef::ExprYield(_)
+            | AnyNodeRef::ExprYieldFrom(_)
+            | AnyNodeRef::ExprCompare(_)
+            | AnyNodeRef::ExprCall(_)
+            | AnyNodeRef::ExprFormattedValue(_)
+            | AnyNodeRef::ExprJoinedStr(_)
+            | AnyNodeRef::ExprConstant(_)
+            | AnyNodeRef::ExprAttribute(_)
+            | AnyNodeRef::ExprSubscript(_)
+            | AnyNodeRef::ExprStarred(_)
+            | AnyNodeRef::ExprName(_)
+            | AnyNodeRef::ExprList(_)
+            | AnyNodeRef::ExprTuple(_)
+            | AnyNodeRef::ExprSlice(_)
+            | AnyNodeRef::ExcepthandlerExceptHandler(_)
+            | AnyNodeRef::TypeIgnoreTypeIgnore(_)
+            | AnyNodeRef::Comprehension(_)
+            | AnyNodeRef::Arguments(_)
+            | AnyNodeRef::Arg(_)
+            | AnyNodeRef::Keyword(_)
+            | AnyNodeRef::Alias(_)
+            | AnyNodeRef::Withitem(_)
+            | AnyNodeRef::MatchCase(_) => false,
+        }
+    }
+
+    pub const fn is_except_handler(self) -> bool {
+        match self {
+            AnyNodeRef::ExcepthandlerExceptHandler(_) => true,
+
+            AnyNodeRef::ModModule(_)
+            | AnyNodeRef::ModInteractive(_)
+            | AnyNodeRef::ModExpression(_)
+            | AnyNodeRef::ModFunctionType(_)
+            | AnyNodeRef::StmtFunctionDef(_)
+            | AnyNodeRef::StmtAsyncFunctionDef(_)
+            | AnyNodeRef::StmtClassDef(_)
+            | AnyNodeRef::StmtReturn(_)
+            | AnyNodeRef::StmtDelete(_)
+            | AnyNodeRef::StmtAssign(_)
+            | AnyNodeRef::StmtAugAssign(_)
+            | AnyNodeRef::StmtAnnAssign(_)
+            | AnyNodeRef::StmtFor(_)
+            | AnyNodeRef::StmtAsyncFor(_)
+            | AnyNodeRef::StmtWhile(_)
+            | AnyNodeRef::StmtIf(_)
+            | AnyNodeRef::StmtWith(_)
+            | AnyNodeRef::StmtAsyncWith(_)
+            | AnyNodeRef::StmtMatch(_)
+            | AnyNodeRef::StmtRaise(_)
+            | AnyNodeRef::StmtTry(_)
+            | AnyNodeRef::StmtTryStar(_)
+            | AnyNodeRef::StmtAssert(_)
+            | AnyNodeRef::StmtImport(_)
+            | AnyNodeRef::StmtImportFrom(_)
+            | AnyNodeRef::StmtGlobal(_)
+            | AnyNodeRef::StmtNonlocal(_)
+            | AnyNodeRef::StmtExpr(_)
+            | AnyNodeRef::StmtPass(_)
+            | AnyNodeRef::StmtBreak(_)
+            | AnyNodeRef::StmtContinue(_)
+            | AnyNodeRef::ExprBoolOp(_)
+            | AnyNodeRef::ExprNamedExpr(_)
+            | AnyNodeRef::ExprBinOp(_)
+            | AnyNodeRef::ExprUnaryOp(_)
+            | AnyNodeRef::ExprLambda(_)
+            | AnyNodeRef::ExprIfExp(_)
+            | AnyNodeRef::ExprDict(_)
+            | AnyNodeRef::ExprSet(_)
+            | AnyNodeRef::ExprListComp(_)
+            | AnyNodeRef::ExprSetComp(_)
+            | AnyNodeRef::ExprDictComp(_)
+            | AnyNodeRef::ExprGeneratorExp(_)
+            | AnyNodeRef::ExprAwait(_)
+            | AnyNodeRef::ExprYield(_)
+            | AnyNodeRef::ExprYieldFrom(_)
+            | AnyNodeRef::ExprCompare(_)
+            | AnyNodeRef::ExprCall(_)
+            | AnyNodeRef::ExprFormattedValue(_)
+            | AnyNodeRef::ExprJoinedStr(_)
+            | AnyNodeRef::ExprConstant(_)
+            | AnyNodeRef::ExprAttribute(_)
+            | AnyNodeRef::ExprSubscript(_)
+            | AnyNodeRef::ExprStarred(_)
+            | AnyNodeRef::ExprName(_)
+            | AnyNodeRef::ExprList(_)
+            | AnyNodeRef::ExprTuple(_)
+            | AnyNodeRef::ExprSlice(_)
+            | AnyNodeRef::PatternMatchValue(_)
+            | AnyNodeRef::PatternMatchSingleton(_)
+            | AnyNodeRef::PatternMatchSequence(_)
+            | AnyNodeRef::PatternMatchMapping(_)
+            | AnyNodeRef::PatternMatchClass(_)
+            | AnyNodeRef::PatternMatchStar(_)
+            | AnyNodeRef::PatternMatchAs(_)
+            | AnyNodeRef::PatternMatchOr(_)
+            | AnyNodeRef::TypeIgnoreTypeIgnore(_)
+            | AnyNodeRef::Comprehension(_)
+            | AnyNodeRef::Arguments(_)
+            | AnyNodeRef::Arg(_)
+            | AnyNodeRef::Keyword(_)
+            | AnyNodeRef::Alias(_)
+            | AnyNodeRef::Withitem(_)
+            | AnyNodeRef::MatchCase(_) => false,
+        }
+    }
+
+    pub const fn is_type_ignore(self) -> bool {
+        match self {
+            AnyNodeRef::TypeIgnoreTypeIgnore(_) => true,
+
+            AnyNodeRef::ModModule(_)
+            | AnyNodeRef::ModInteractive(_)
+            | AnyNodeRef::ModExpression(_)
+            | AnyNodeRef::ModFunctionType(_)
+            | AnyNodeRef::StmtFunctionDef(_)
+            | AnyNodeRef::StmtAsyncFunctionDef(_)
+            | AnyNodeRef::StmtClassDef(_)
+            | AnyNodeRef::StmtReturn(_)
+            | AnyNodeRef::StmtDelete(_)
+            | AnyNodeRef::StmtAssign(_)
+            | AnyNodeRef::StmtAugAssign(_)
+            | AnyNodeRef::StmtAnnAssign(_)
+            | AnyNodeRef::StmtFor(_)
+            | AnyNodeRef::StmtAsyncFor(_)
+            | AnyNodeRef::StmtWhile(_)
+            | AnyNodeRef::StmtIf(_)
+            | AnyNodeRef::StmtWith(_)
+            | AnyNodeRef::StmtAsyncWith(_)
+            | AnyNodeRef::StmtMatch(_)
+            | AnyNodeRef::StmtRaise(_)
+            | AnyNodeRef::StmtTry(_)
+            | AnyNodeRef::StmtTryStar(_)
+            | AnyNodeRef::StmtAssert(_)
+            | AnyNodeRef::StmtImport(_)
+            | AnyNodeRef::StmtImportFrom(_)
+            | AnyNodeRef::StmtGlobal(_)
+            | AnyNodeRef::StmtNonlocal(_)
+            | AnyNodeRef::StmtExpr(_)
+            | AnyNodeRef::StmtPass(_)
+            | AnyNodeRef::StmtBreak(_)
+            | AnyNodeRef::StmtContinue(_)
+            | AnyNodeRef::ExprBoolOp(_)
+            | AnyNodeRef::ExprNamedExpr(_)
+            | AnyNodeRef::ExprBinOp(_)
+            | AnyNodeRef::ExprUnaryOp(_)
+            | AnyNodeRef::ExprLambda(_)
+            | AnyNodeRef::ExprIfExp(_)
+            | AnyNodeRef::ExprDict(_)
+            | AnyNodeRef::ExprSet(_)
+            | AnyNodeRef::ExprListComp(_)
+            | AnyNodeRef::ExprSetComp(_)
+            | AnyNodeRef::ExprDictComp(_)
+            | AnyNodeRef::ExprGeneratorExp(_)
+            | AnyNodeRef::ExprAwait(_)
+            | AnyNodeRef::ExprYield(_)
+            | AnyNodeRef::ExprYieldFrom(_)
+            | AnyNodeRef::ExprCompare(_)
+            | AnyNodeRef::ExprCall(_)
+            | AnyNodeRef::ExprFormattedValue(_)
+            | AnyNodeRef::ExprJoinedStr(_)
+            | AnyNodeRef::ExprConstant(_)
+            | AnyNodeRef::ExprAttribute(_)
+            | AnyNodeRef::ExprSubscript(_)
+            | AnyNodeRef::ExprStarred(_)
+            | AnyNodeRef::ExprName(_)
+            | AnyNodeRef::ExprList(_)
+            | AnyNodeRef::ExprTuple(_)
+            | AnyNodeRef::ExprSlice(_)
+            | AnyNodeRef::PatternMatchValue(_)
+            | AnyNodeRef::PatternMatchSingleton(_)
+            | AnyNodeRef::PatternMatchSequence(_)
+            | AnyNodeRef::PatternMatchMapping(_)
+            | AnyNodeRef::PatternMatchClass(_)
+            | AnyNodeRef::PatternMatchStar(_)
+            | AnyNodeRef::PatternMatchAs(_)
+            | AnyNodeRef::PatternMatchOr(_)
+            | AnyNodeRef::ExcepthandlerExceptHandler(_)
+            | AnyNodeRef::Comprehension(_)
+            | AnyNodeRef::Arguments(_)
+            | AnyNodeRef::Arg(_)
+            | AnyNodeRef::Keyword(_)
+            | AnyNodeRef::Alias(_)
+            | AnyNodeRef::Withitem(_)
+            | AnyNodeRef::MatchCase(_) => false,
+        }
+    }
+}
+
+impl<'a> From<&'a ModModule> for AnyNodeRef<'a> {
+    fn from(node: &'a ModModule) -> Self {
+        AnyNodeRef::ModModule(node)
+    }
+}
+
+impl<'a> From<&'a ModInteractive> for AnyNodeRef<'a> {
+    fn from(node: &'a ModInteractive) -> Self {
+        AnyNodeRef::ModInteractive(node)
+    }
+}
+
+impl<'a> From<&'a ModExpression> for AnyNodeRef<'a> {
+    fn from(node: &'a ModExpression) -> Self {
+        AnyNodeRef::ModExpression(node)
+    }
+}
+
+impl<'a> From<&'a ModFunctionType> for AnyNodeRef<'a> {
+    fn from(node: &'a ModFunctionType) -> Self {
+        AnyNodeRef::ModFunctionType(node)
+    }
+}
+
+impl<'a> From<&'a StmtFunctionDef> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtFunctionDef) -> Self {
+        AnyNodeRef::StmtFunctionDef(node)
+    }
+}
+
+impl<'a> From<&'a StmtAsyncFunctionDef> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtAsyncFunctionDef) -> Self {
+        AnyNodeRef::StmtAsyncFunctionDef(node)
+    }
+}
+
+impl<'a> From<&'a StmtClassDef> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtClassDef) -> Self {
+        AnyNodeRef::StmtClassDef(node)
+    }
+}
+
+impl<'a> From<&'a StmtReturn> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtReturn) -> Self {
+        AnyNodeRef::StmtReturn(node)
+    }
+}
+
+impl<'a> From<&'a StmtDelete> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtDelete) -> Self {
+        AnyNodeRef::StmtDelete(node)
+    }
+}
+
+impl<'a> From<&'a StmtAssign> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtAssign) -> Self {
+        AnyNodeRef::StmtAssign(node)
+    }
+}
+
+impl<'a> From<&'a StmtAugAssign> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtAugAssign) -> Self {
+        AnyNodeRef::StmtAugAssign(node)
+    }
+}
+
+impl<'a> From<&'a StmtAnnAssign> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtAnnAssign) -> Self {
+        AnyNodeRef::StmtAnnAssign(node)
+    }
+}
+
+impl<'a> From<&'a StmtFor> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtFor) -> Self {
+        AnyNodeRef::StmtFor(node)
+    }
+}
+
+impl<'a> From<&'a StmtAsyncFor> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtAsyncFor) -> Self {
+        AnyNodeRef::StmtAsyncFor(node)
+    }
+}
+
+impl<'a> From<&'a StmtWhile> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtWhile) -> Self {
+        AnyNodeRef::StmtWhile(node)
+    }
+}
+
+impl<'a> From<&'a StmtIf> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtIf) -> Self {
+        AnyNodeRef::StmtIf(node)
+    }
+}
+
+impl<'a> From<&'a StmtWith> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtWith) -> Self {
+        AnyNodeRef::StmtWith(node)
+    }
+}
+
+impl<'a> From<&'a StmtAsyncWith> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtAsyncWith) -> Self {
+        AnyNodeRef::StmtAsyncWith(node)
+    }
+}
+
+impl<'a> From<&'a StmtMatch> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtMatch) -> Self {
+        AnyNodeRef::StmtMatch(node)
+    }
+}
+
+impl<'a> From<&'a StmtRaise> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtRaise) -> Self {
+        AnyNodeRef::StmtRaise(node)
+    }
+}
+
+impl<'a> From<&'a StmtTry> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtTry) -> Self {
+        AnyNodeRef::StmtTry(node)
+    }
+}
+
+impl<'a> From<&'a StmtTryStar> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtTryStar) -> Self {
+        AnyNodeRef::StmtTryStar(node)
+    }
+}
+
+impl<'a> From<&'a StmtAssert> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtAssert) -> Self {
+        AnyNodeRef::StmtAssert(node)
+    }
+}
+
+impl<'a> From<&'a StmtImport> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtImport) -> Self {
+        AnyNodeRef::StmtImport(node)
+    }
+}
+
+impl<'a> From<&'a StmtImportFrom> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtImportFrom) -> Self {
+        AnyNodeRef::StmtImportFrom(node)
+    }
+}
+
+impl<'a> From<&'a StmtGlobal> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtGlobal) -> Self {
+        AnyNodeRef::StmtGlobal(node)
+    }
+}
+
+impl<'a> From<&'a StmtNonlocal> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtNonlocal) -> Self {
+        AnyNodeRef::StmtNonlocal(node)
+    }
+}
+
+impl<'a> From<&'a StmtExpr> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtExpr) -> Self {
+        AnyNodeRef::StmtExpr(node)
+    }
+}
+
+impl<'a> From<&'a StmtPass> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtPass) -> Self {
+        AnyNodeRef::StmtPass(node)
+    }
+}
+
+impl<'a> From<&'a StmtBreak> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtBreak) -> Self {
+        AnyNodeRef::StmtBreak(node)
+    }
+}
+
+impl<'a> From<&'a StmtContinue> for AnyNodeRef<'a> {
+    fn from(node: &'a StmtContinue) -> Self {
+        AnyNodeRef::StmtContinue(node)
+    }
+}
+
+impl<'a> From<&'a ExprBoolOp> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprBoolOp) -> Self {
+        AnyNodeRef::ExprBoolOp(node)
+    }
+}
+
+impl<'a> From<&'a ExprNamedExpr> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprNamedExpr) -> Self {
+        AnyNodeRef::ExprNamedExpr(node)
+    }
+}
+
+impl<'a> From<&'a ExprBinOp> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprBinOp) -> Self {
+        AnyNodeRef::ExprBinOp(node)
+    }
+}
+
+impl<'a> From<&'a ExprUnaryOp> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprUnaryOp) -> Self {
+        AnyNodeRef::ExprUnaryOp(node)
+    }
+}
+
+impl<'a> From<&'a ExprLambda> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprLambda) -> Self {
+        AnyNodeRef::ExprLambda(node)
+    }
+}
+
+impl<'a> From<&'a ExprIfExp> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprIfExp) -> Self {
+        AnyNodeRef::ExprIfExp(node)
+    }
+}
+
+impl<'a> From<&'a ExprDict> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprDict) -> Self {
+        AnyNodeRef::ExprDict(node)
+    }
+}
+
+impl<'a> From<&'a ExprSet> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprSet) -> Self {
+        AnyNodeRef::ExprSet(node)
+    }
+}
+
+impl<'a> From<&'a ExprListComp> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprListComp) -> Self {
+        AnyNodeRef::ExprListComp(node)
+    }
+}
+
+impl<'a> From<&'a ExprSetComp> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprSetComp) -> Self {
+        AnyNodeRef::ExprSetComp(node)
+    }
+}
+
+impl<'a> From<&'a ExprDictComp> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprDictComp) -> Self {
+        AnyNodeRef::ExprDictComp(node)
+    }
+}
+
+impl<'a> From<&'a ExprGeneratorExp> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprGeneratorExp) -> Self {
+        AnyNodeRef::ExprGeneratorExp(node)
+    }
+}
+
+impl<'a> From<&'a ExprAwait> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprAwait) -> Self {
+        AnyNodeRef::ExprAwait(node)
+    }
+}
+
+impl<'a> From<&'a ExprYield> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprYield) -> Self {
+        AnyNodeRef::ExprYield(node)
+    }
+}
+
+impl<'a> From<&'a ExprYieldFrom> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprYieldFrom) -> Self {
+        AnyNodeRef::ExprYieldFrom(node)
+    }
+}
+
+impl<'a> From<&'a ExprCompare> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprCompare) -> Self {
+        AnyNodeRef::ExprCompare(node)
+    }
+}
+
+impl<'a> From<&'a ExprCall> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprCall) -> Self {
+        AnyNodeRef::ExprCall(node)
+    }
+}
+
+impl<'a> From<&'a ExprFormattedValue> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprFormattedValue) -> Self {
+        AnyNodeRef::ExprFormattedValue(node)
+    }
+}
+
+impl<'a> From<&'a ExprJoinedStr> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprJoinedStr) -> Self {
+        AnyNodeRef::ExprJoinedStr(node)
+    }
+}
+
+impl<'a> From<&'a ExprConstant> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprConstant) -> Self {
+        AnyNodeRef::ExprConstant(node)
+    }
+}
+
+impl<'a> From<&'a ExprAttribute> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprAttribute) -> Self {
+        AnyNodeRef::ExprAttribute(node)
+    }
+}
+
+impl<'a> From<&'a ExprSubscript> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprSubscript) -> Self {
+        AnyNodeRef::ExprSubscript(node)
+    }
+}
+
+impl<'a> From<&'a ExprStarred> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprStarred) -> Self {
+        AnyNodeRef::ExprStarred(node)
+    }
+}
+
+impl<'a> From<&'a ExprName> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprName) -> Self {
+        AnyNodeRef::ExprName(node)
+    }
+}
+
+impl<'a> From<&'a ExprList> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprList) -> Self {
+        AnyNodeRef::ExprList(node)
+    }
+}
+
+impl<'a> From<&'a ExprTuple> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprTuple) -> Self {
+        AnyNodeRef::ExprTuple(node)
+    }
+}
+
+impl<'a> From<&'a ExprSlice> for AnyNodeRef<'a> {
+    fn from(node: &'a ExprSlice) -> Self {
+        AnyNodeRef::ExprSlice(node)
+    }
+}
+
+impl<'a> From<&'a ExcepthandlerExceptHandler> for AnyNodeRef<'a> {
+    fn from(node: &'a ExcepthandlerExceptHandler) -> Self {
+        AnyNodeRef::ExcepthandlerExceptHandler(node)
+    }
+}
+
+impl<'a> From<&'a PatternMatchValue> for AnyNodeRef<'a> {
+    fn from(node: &'a PatternMatchValue) -> Self {
+        AnyNodeRef::PatternMatchValue(node)
+    }
+}
+
+impl<'a> From<&'a PatternMatchSingleton> for AnyNodeRef<'a> {
+    fn from(node: &'a PatternMatchSingleton) -> Self {
+        AnyNodeRef::PatternMatchSingleton(node)
+    }
+}
+
+impl<'a> From<&'a PatternMatchSequence> for AnyNodeRef<'a> {
+    fn from(node: &'a PatternMatchSequence) -> Self {
+        AnyNodeRef::PatternMatchSequence(node)
+    }
+}
+
+impl<'a> From<&'a PatternMatchMapping> for AnyNodeRef<'a> {
+    fn from(node: &'a PatternMatchMapping) -> Self {
+        AnyNodeRef::PatternMatchMapping(node)
+    }
+}
+
+impl<'a> From<&'a PatternMatchClass> for AnyNodeRef<'a> {
+    fn from(node: &'a PatternMatchClass) -> Self {
+        AnyNodeRef::PatternMatchClass(node)
+    }
+}
+
+impl<'a> From<&'a PatternMatchStar> for AnyNodeRef<'a> {
+    fn from(node: &'a PatternMatchStar) -> Self {
+        AnyNodeRef::PatternMatchStar(node)
+    }
+}
+
+impl<'a> From<&'a PatternMatchAs> for AnyNodeRef<'a> {
+    fn from(node: &'a PatternMatchAs) -> Self {
+        AnyNodeRef::PatternMatchAs(node)
+    }
+}
+
+impl<'a> From<&'a PatternMatchOr> for AnyNodeRef<'a> {
+    fn from(node: &'a PatternMatchOr) -> Self {
+        AnyNodeRef::PatternMatchOr(node)
+    }
+}
+
+impl<'a> From<&'a TypeIgnoreTypeIgnore> for AnyNodeRef<'a> {
+    fn from(node: &'a TypeIgnoreTypeIgnore) -> Self {
+        AnyNodeRef::TypeIgnoreTypeIgnore(node)
+    }
+}
+
+impl<'a> From<&'a Stmt> for AnyNodeRef<'a> {
+    fn from(stmt: &'a Stmt) -> Self {
+        match stmt {
+            Stmt::FunctionDef(node) => AnyNodeRef::StmtFunctionDef(node),
+            Stmt::AsyncFunctionDef(node) => AnyNodeRef::StmtAsyncFunctionDef(node),
+            Stmt::ClassDef(node) => AnyNodeRef::StmtClassDef(node),
+            Stmt::Return(node) => AnyNodeRef::StmtReturn(node),
+            Stmt::Delete(node) => AnyNodeRef::StmtDelete(node),
+            Stmt::Assign(node) => AnyNodeRef::StmtAssign(node),
+            Stmt::AugAssign(node) => AnyNodeRef::StmtAugAssign(node),
+            Stmt::AnnAssign(node) => AnyNodeRef::StmtAnnAssign(node),
+            Stmt::For(node) => AnyNodeRef::StmtFor(node),
+            Stmt::AsyncFor(node) => AnyNodeRef::StmtAsyncFor(node),
+            Stmt::While(node) => AnyNodeRef::StmtWhile(node),
+            Stmt::If(node) => AnyNodeRef::StmtIf(node),
+            Stmt::With(node) => AnyNodeRef::StmtWith(node),
+            Stmt::AsyncWith(node) => AnyNodeRef::StmtAsyncWith(node),
+            Stmt::Match(node) => AnyNodeRef::StmtMatch(node),
+            Stmt::Raise(node) => AnyNodeRef::StmtRaise(node),
+            Stmt::Try(node) => AnyNodeRef::StmtTry(node),
+            Stmt::TryStar(node) => AnyNodeRef::StmtTryStar(node),
+            Stmt::Assert(node) => AnyNodeRef::StmtAssert(node),
+            Stmt::Import(node) => AnyNodeRef::StmtImport(node),
+            Stmt::ImportFrom(node) => AnyNodeRef::StmtImportFrom(node),
+            Stmt::Global(node) => AnyNodeRef::StmtGlobal(node),
+            Stmt::Nonlocal(node) => AnyNodeRef::StmtNonlocal(node),
+            Stmt::Expr(node) => AnyNodeRef::StmtExpr(node),
+            Stmt::Pass(node) => AnyNodeRef::StmtPass(node),
+            Stmt::Break(node) => AnyNodeRef::StmtBreak(node),
+            Stmt::Continue(node) => AnyNodeRef::StmtContinue(node),
+        }
+    }
+}
+
+impl<'a> From<&'a Expr> for AnyNodeRef<'a> {
+    fn from(expr: &'a Expr) -> Self {
+        match expr {
+            Expr::BoolOp(node) => AnyNodeRef::ExprBoolOp(node),
+            Expr::NamedExpr(node) => AnyNodeRef::ExprNamedExpr(node),
+            Expr::BinOp(node) => AnyNodeRef::ExprBinOp(node),
+            Expr::UnaryOp(node) => AnyNodeRef::ExprUnaryOp(node),
+            Expr::Lambda(node) => AnyNodeRef::ExprLambda(node),
+            Expr::IfExp(node) => AnyNodeRef::ExprIfExp(node),
+            Expr::Dict(node) => AnyNodeRef::ExprDict(node),
+            Expr::Set(node) => AnyNodeRef::ExprSet(node),
+            Expr::ListComp(node) => AnyNodeRef::ExprListComp(node),
+            Expr::SetComp(node) => AnyNodeRef::ExprSetComp(node),
+            Expr::DictComp(node) => AnyNodeRef::ExprDictComp(node),
+            Expr::GeneratorExp(node) => AnyNodeRef::ExprGeneratorExp(node),
+            Expr::Await(node) => AnyNodeRef::ExprAwait(node),
+            Expr::Yield(node) => AnyNodeRef::ExprYield(node),
+            Expr::YieldFrom(node) => AnyNodeRef::ExprYieldFrom(node),
+            Expr::Compare(node) => AnyNodeRef::ExprCompare(node),
+            Expr::Call(node) => AnyNodeRef::ExprCall(node),
+            Expr::FormattedValue(node) => AnyNodeRef::ExprFormattedValue(node),
+            Expr::JoinedStr(node) => AnyNodeRef::ExprJoinedStr(node),
+            Expr::Constant(node) => AnyNodeRef::ExprConstant(node),
+            Expr::Attribute(node) => AnyNodeRef::ExprAttribute(node),
+            Expr::Subscript(node) => AnyNodeRef::ExprSubscript(node),
+            Expr::Starred(node) => AnyNodeRef::ExprStarred(node),
+            Expr::Name(node) => AnyNodeRef::ExprName(node),
+            Expr::List(node) => AnyNodeRef::ExprList(node),
+            Expr::Tuple(node) => AnyNodeRef::ExprTuple(node),
+            Expr::Slice(node) => AnyNodeRef::ExprSlice(node),
+        }
+    }
+}
+
+impl<'a> From<&'a Mod> for AnyNodeRef<'a> {
+    fn from(module: &'a Mod) -> Self {
+        match module {
+            Mod::Module(node) => AnyNodeRef::ModModule(node),
+            Mod::Interactive(node) => AnyNodeRef::ModInteractive(node),
+            Mod::Expression(node) => AnyNodeRef::ModExpression(node),
+            Mod::FunctionType(node) => AnyNodeRef::ModFunctionType(node),
+        }
+    }
+}
+
+impl<'a> From<&'a Pattern> for AnyNodeRef<'a> {
+    fn from(pattern: &'a Pattern) -> Self {
+        match pattern {
+            Pattern::MatchValue(node) => AnyNodeRef::PatternMatchValue(node),
+            Pattern::MatchSingleton(node) => AnyNodeRef::PatternMatchSingleton(node),
+            Pattern::MatchSequence(node) => AnyNodeRef::PatternMatchSequence(node),
+            Pattern::MatchMapping(node) => AnyNodeRef::PatternMatchMapping(node),
+            Pattern::MatchClass(node) => AnyNodeRef::PatternMatchClass(node),
+            Pattern::MatchStar(node) => AnyNodeRef::PatternMatchStar(node),
+            Pattern::MatchAs(node) => AnyNodeRef::PatternMatchAs(node),
+            Pattern::MatchOr(node) => AnyNodeRef::PatternMatchOr(node),
+        }
+    }
+}
+
+impl<'a> From<&'a Excepthandler> for AnyNodeRef<'a> {
+    fn from(handler: &'a Excepthandler) -> Self {
+        match handler {
+            Excepthandler::ExceptHandler(handler) => {
+                AnyNodeRef::ExcepthandlerExceptHandler(handler)
+            }
+        }
+    }
+}
+
+impl<'a> From<&'a TypeIgnore> for AnyNodeRef<'a> {
+    fn from(ignore: &'a TypeIgnore) -> Self {
+        match ignore {
+            TypeIgnore::TypeIgnore(ignore) => AnyNodeRef::TypeIgnoreTypeIgnore(ignore),
+        }
+    }
+}
+
+impl<'a> From<&'a Comprehension> for AnyNodeRef<'a> {
+    fn from(node: &'a Comprehension) -> Self {
+        AnyNodeRef::Comprehension(node)
+    }
+}
+impl<'a> From<&'a Arguments> for AnyNodeRef<'a> {
+    fn from(node: &'a Arguments) -> Self {
+        AnyNodeRef::Arguments(node)
+    }
+}
+impl<'a> From<&'a Arg> for AnyNodeRef<'a> {
+    fn from(node: &'a Arg) -> Self {
+        AnyNodeRef::Arg(node)
+    }
+}
+impl<'a> From<&'a Keyword> for AnyNodeRef<'a> {
+    fn from(node: &'a Keyword) -> Self {
+        AnyNodeRef::Keyword(node)
+    }
+}
+impl<'a> From<&'a Alias> for AnyNodeRef<'a> {
+    fn from(node: &'a Alias) -> Self {
+        AnyNodeRef::Alias(node)
+    }
+}
+impl<'a> From<&'a Withitem> for AnyNodeRef<'a> {
+    fn from(node: &'a Withitem) -> Self {
+        AnyNodeRef::Withitem(node)
+    }
+}
+impl<'a> From<&'a MatchCase> for AnyNodeRef<'a> {
+    fn from(node: &'a MatchCase) -> Self {
+        AnyNodeRef::MatchCase(node)
+    }
+}
+
+impl Ranged for AnyNodeRef<'_> {
+    fn range(&self) -> TextRange {
+        match self {
+            AnyNodeRef::ModModule(node) => node.range(),
+            AnyNodeRef::ModInteractive(node) => node.range(),
+            AnyNodeRef::ModExpression(node) => node.range(),
+            AnyNodeRef::ModFunctionType(node) => node.range(),
+            AnyNodeRef::StmtFunctionDef(node) => node.range(),
+            AnyNodeRef::StmtAsyncFunctionDef(node) => node.range(),
+            AnyNodeRef::StmtClassDef(node) => node.range(),
+            AnyNodeRef::StmtReturn(node) => node.range(),
+            AnyNodeRef::StmtDelete(node) => node.range(),
+            AnyNodeRef::StmtAssign(node) => node.range(),
+            AnyNodeRef::StmtAugAssign(node) => node.range(),
+            AnyNodeRef::StmtAnnAssign(node) => node.range(),
+            AnyNodeRef::StmtFor(node) => node.range(),
+            AnyNodeRef::StmtAsyncFor(node) => node.range(),
+            AnyNodeRef::StmtWhile(node) => node.range(),
+            AnyNodeRef::StmtIf(node) => node.range(),
+            AnyNodeRef::StmtWith(node) => node.range(),
+            AnyNodeRef::StmtAsyncWith(node) => node.range(),
+            AnyNodeRef::StmtMatch(node) => node.range(),
+            AnyNodeRef::StmtRaise(node) => node.range(),
+            AnyNodeRef::StmtTry(node) => node.range(),
+            AnyNodeRef::StmtTryStar(node) => node.range(),
+            AnyNodeRef::StmtAssert(node) => node.range(),
+            AnyNodeRef::StmtImport(node) => node.range(),
+            AnyNodeRef::StmtImportFrom(node) => node.range(),
+            AnyNodeRef::StmtGlobal(node) => node.range(),
+            AnyNodeRef::StmtNonlocal(node) => node.range(),
+            AnyNodeRef::StmtExpr(node) => node.range(),
+            AnyNodeRef::StmtPass(node) => node.range(),
+            AnyNodeRef::StmtBreak(node) => node.range(),
+            AnyNodeRef::StmtContinue(node) => node.range(),
+            AnyNodeRef::ExprBoolOp(node) => node.range(),
+            AnyNodeRef::ExprNamedExpr(node) => node.range(),
+            AnyNodeRef::ExprBinOp(node) => node.range(),
+            AnyNodeRef::ExprUnaryOp(node) => node.range(),
+            AnyNodeRef::ExprLambda(node) => node.range(),
+            AnyNodeRef::ExprIfExp(node) => node.range(),
+            AnyNodeRef::ExprDict(node) => node.range(),
+            AnyNodeRef::ExprSet(node) => node.range(),
+            AnyNodeRef::ExprListComp(node) => node.range(),
+            AnyNodeRef::ExprSetComp(node) => node.range(),
+            AnyNodeRef::ExprDictComp(node) => node.range(),
+            AnyNodeRef::ExprGeneratorExp(node) => node.range(),
+            AnyNodeRef::ExprAwait(node) => node.range(),
+            AnyNodeRef::ExprYield(node) => node.range(),
+            AnyNodeRef::ExprYieldFrom(node) => node.range(),
+            AnyNodeRef::ExprCompare(node) => node.range(),
+            AnyNodeRef::ExprCall(node) => node.range(),
+            AnyNodeRef::ExprFormattedValue(node) => node.range(),
+            AnyNodeRef::ExprJoinedStr(node) => node.range(),
+            AnyNodeRef::ExprConstant(node) => node.range(),
+            AnyNodeRef::ExprAttribute(node) => node.range(),
+            AnyNodeRef::ExprSubscript(node) => node.range(),
+            AnyNodeRef::ExprStarred(node) => node.range(),
+            AnyNodeRef::ExprName(node) => node.range(),
+            AnyNodeRef::ExprList(node) => node.range(),
+            AnyNodeRef::ExprTuple(node) => node.range(),
+            AnyNodeRef::ExprSlice(node) => node.range(),
+            AnyNodeRef::ExcepthandlerExceptHandler(node) => node.range(),
+            AnyNodeRef::PatternMatchValue(node) => node.range(),
+            AnyNodeRef::PatternMatchSingleton(node) => node.range(),
+            AnyNodeRef::PatternMatchSequence(node) => node.range(),
+            AnyNodeRef::PatternMatchMapping(node) => node.range(),
+            AnyNodeRef::PatternMatchClass(node) => node.range(),
+            AnyNodeRef::PatternMatchStar(node) => node.range(),
+            AnyNodeRef::PatternMatchAs(node) => node.range(),
+            AnyNodeRef::PatternMatchOr(node) => node.range(),
+            AnyNodeRef::TypeIgnoreTypeIgnore(node) => node.range(),
+            AnyNodeRef::Comprehension(node) => node.range(),
+            AnyNodeRef::Arguments(node) => node.range(),
+            AnyNodeRef::Arg(node) => node.range(),
+            AnyNodeRef::Keyword(node) => node.range(),
+            AnyNodeRef::Alias(node) => node.range(),
+            AnyNodeRef::Withitem(node) => node.range(),
+            AnyNodeRef::MatchCase(node) => node.range(),
+        }
+    }
+}
+
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
+pub enum NodeKind {
+    ModModule,
+    ModInteractive,
+    ModExpression,
+    ModFunctionType,
+    StmtFunctionDef,
+    StmtAsyncFunctionDef,
+    StmtClassDef,
+    StmtReturn,
+    StmtDelete,
+    StmtAssign,
+    StmtAugAssign,
+    StmtAnnAssign,
+    StmtFor,
+    StmtAsyncFor,
+    StmtWhile,
+    StmtIf,
+    StmtWith,
+    StmtAsyncWith,
+    StmtMatch,
+    StmtRaise,
+    StmtTry,
+    StmtTryStar,
+    StmtAssert,
+    StmtImport,
+    StmtImportFrom,
+    StmtGlobal,
+    StmtNonlocal,
+    StmtExpr,
+    StmtPass,
+    StmtBreak,
+    StmtContinue,
+    ExprBoolOp,
+    ExprNamedExpr,
+    ExprBinOp,
+    ExprUnaryOp,
+    ExprLambda,
+    ExprIfExp,
+    ExprDict,
+    ExprSet,
+    ExprListComp,
+    ExprSetComp,
+    ExprDictComp,
+    ExprGeneratorExp,
+    ExprAwait,
+    ExprYield,
+    ExprYieldFrom,
+    ExprCompare,
+    ExprCall,
+    ExprFormattedValue,
+    ExprJoinedStr,
+    ExprConstant,
+    ExprAttribute,
+    ExprSubscript,
+    ExprStarred,
+    ExprName,
+    ExprList,
+    ExprTuple,
+    ExprSlice,
+    ExcepthandlerExceptHandler,
+    PatternMatchValue,
+    PatternMatchSingleton,
+    PatternMatchSequence,
+    PatternMatchMapping,
+    PatternMatchClass,
+    PatternMatchStar,
+    PatternMatchAs,
+    PatternMatchOr,
+    TypeIgnoreTypeIgnore,
+    Comprehension,
+    Arguments,
+    Arg,
+    Keyword,
+    Alias,
+    Withitem,
+    MatchCase,
+}
diff --git a/crates/ruff_python_ast/src/prelude.rs b/crates/ruff_python_ast/src/prelude.rs
new file mode 100644
index 0000000000000..76505ecd015cc
--- /dev/null
+++ b/crates/ruff_python_ast/src/prelude.rs
@@ -0,0 +1,2 @@
+pub use crate::node::AstNode;
+pub use rustpython_ast::*;
diff --git a/crates/ruff_python_ast/src/relocate.rs b/crates/ruff_python_ast/src/relocate.rs
index a618105f1a446..b05b170ec421e 100644
--- a/crates/ruff_python_ast/src/relocate.rs
+++ b/crates/ruff_python_ast/src/relocate.rs
@@ -1,41 +1,61 @@
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::{Expr, ExprKind, Keyword};
+use rustpython_parser::ast::{self, Expr, Keyword};
 
 fn relocate_keyword(keyword: &mut Keyword, location: TextRange) {
-    keyword.range = location;
-    relocate_expr(&mut keyword.node.value, location);
+    relocate_expr(&mut keyword.value, location);
 }
 
 /// Change an expression's location (recursively) to match a desired, fixed
 /// location.
 pub fn relocate_expr(expr: &mut Expr, location: TextRange) {
-    expr.range = location;
-    match &mut expr.node {
-        ExprKind::BoolOp { values, .. } => {
+    match expr {
+        Expr::BoolOp(ast::ExprBoolOp { values, range, .. }) => {
+            *range = location;
             for expr in values {
                 relocate_expr(expr, location);
             }
         }
-        ExprKind::NamedExpr { target, value } => {
+        Expr::NamedExpr(ast::ExprNamedExpr {
+            target,
+            value,
+            range,
+        }) => {
+            *range = location;
             relocate_expr(target, location);
             relocate_expr(value, location);
         }
-        ExprKind::BinOp { left, right, .. } => {
+        Expr::BinOp(ast::ExprBinOp {
+            left, right, range, ..
+        }) => {
+            *range = location;
             relocate_expr(left, location);
             relocate_expr(right, location);
         }
-        ExprKind::UnaryOp { operand, .. } => {
+        Expr::UnaryOp(ast::ExprUnaryOp { operand, range, .. }) => {
+            *range = location;
             relocate_expr(operand, location);
         }
-        ExprKind::Lambda { body, .. } => {
+        Expr::Lambda(ast::ExprLambda { body, range, .. }) => {
+            *range = location;
             relocate_expr(body, location);
         }
-        ExprKind::IfExp { test, body, orelse } => {
+        Expr::IfExp(ast::ExprIfExp {
+            test,
+            body,
+            orelse,
+            range,
+        }) => {
+            *range = location;
             relocate_expr(test, location);
             relocate_expr(body, location);
             relocate_expr(orelse, location);
         }
-        ExprKind::Dict { keys, values } => {
+        Expr::Dict(ast::ExprDict {
+            keys,
+            values,
+            range,
+        }) => {
+            *range = location;
             for expr in keys.iter_mut().flatten() {
                 relocate_expr(expr, location);
             }
@@ -43,44 +63,64 @@ pub fn relocate_expr(expr: &mut Expr, location: TextRange) {
                 relocate_expr(expr, location);
             }
         }
-        ExprKind::Set { elts } => {
+        Expr::Set(ast::ExprSet { elts, range }) => {
+            *range = location;
             for expr in elts {
                 relocate_expr(expr, location);
             }
         }
-        ExprKind::ListComp { elt, .. } => {
+        Expr::ListComp(ast::ExprListComp { elt, range, .. }) => {
+            *range = location;
             relocate_expr(elt, location);
         }
-        ExprKind::SetComp { elt, .. } => {
+        Expr::SetComp(ast::ExprSetComp { elt, range, .. }) => {
+            *range = location;
             relocate_expr(elt, location);
         }
-        ExprKind::DictComp { key, value, .. } => {
+        Expr::DictComp(ast::ExprDictComp {
+            key, value, range, ..
+        }) => {
+            *range = location;
             relocate_expr(key, location);
             relocate_expr(value, location);
         }
-        ExprKind::GeneratorExp { elt, .. } => {
+        Expr::GeneratorExp(ast::ExprGeneratorExp { elt, range, .. }) => {
+            *range = location;
             relocate_expr(elt, location);
         }
-        ExprKind::Await { value } => relocate_expr(value, location),
-        ExprKind::Yield { value } => {
+        Expr::Await(ast::ExprAwait { value, range }) => {
+            *range = location;
+            relocate_expr(value, location);
+        }
+        Expr::Yield(ast::ExprYield { value, range }) => {
+            *range = location;
             if let Some(expr) = value {
                 relocate_expr(expr, location);
             }
         }
-        ExprKind::YieldFrom { value } => relocate_expr(value, location),
-        ExprKind::Compare {
-            left, comparators, ..
-        } => {
+        Expr::YieldFrom(ast::ExprYieldFrom { value, range }) => {
+            *range = location;
+            relocate_expr(value, location);
+        }
+        Expr::Compare(ast::ExprCompare {
+            left,
+            comparators,
+            range,
+            ..
+        }) => {
+            *range = location;
             relocate_expr(left, location);
             for expr in comparators {
                 relocate_expr(expr, location);
             }
         }
-        ExprKind::Call {
+        Expr::Call(ast::ExprCall {
             func,
             args,
             keywords,
-        } => {
+            range,
+        }) => {
+            *range = location;
             relocate_expr(func, location);
             for expr in args {
                 relocate_expr(expr, location);
@@ -89,42 +129,67 @@ pub fn relocate_expr(expr: &mut Expr, location: TextRange) {
                 relocate_keyword(keyword, location);
             }
         }
-        ExprKind::FormattedValue {
-            value, format_spec, ..
-        } => {
+        Expr::FormattedValue(ast::ExprFormattedValue {
+            value,
+            format_spec,
+            range,
+            ..
+        }) => {
+            *range = location;
             relocate_expr(value, location);
             if let Some(expr) = format_spec {
                 relocate_expr(expr, location);
             }
         }
-        ExprKind::JoinedStr { values } => {
+        Expr::JoinedStr(ast::ExprJoinedStr { values, range }) => {
+            *range = location;
             for expr in values {
                 relocate_expr(expr, location);
             }
         }
-        ExprKind::Constant { .. } => {}
-        ExprKind::Attribute { value, .. } => {
+        Expr::Constant(ast::ExprConstant { range, .. }) => {
+            *range = location;
+        }
+        Expr::Attribute(ast::ExprAttribute { value, range, .. }) => {
+            *range = location;
             relocate_expr(value, location);
         }
-        ExprKind::Subscript { value, slice, .. } => {
+        Expr::Subscript(ast::ExprSubscript {
+            value,
+            slice,
+            range,
+            ..
+        }) => {
+            *range = location;
             relocate_expr(value, location);
             relocate_expr(slice, location);
         }
-        ExprKind::Starred { value, .. } => {
+        Expr::Starred(ast::ExprStarred { value, range, .. }) => {
+            *range = location;
             relocate_expr(value, location);
         }
-        ExprKind::Name { .. } => {}
-        ExprKind::List { elts, .. } => {
+        Expr::Name(ast::ExprName { range, .. }) => {
+            *range = location;
+        }
+        Expr::List(ast::ExprList { elts, range, .. }) => {
+            *range = location;
             for expr in elts {
                 relocate_expr(expr, location);
             }
         }
-        ExprKind::Tuple { elts, .. } => {
+        Expr::Tuple(ast::ExprTuple { elts, range, .. }) => {
+            *range = location;
             for expr in elts {
                 relocate_expr(expr, location);
             }
         }
-        ExprKind::Slice { lower, upper, step } => {
+        Expr::Slice(ast::ExprSlice {
+            lower,
+            upper,
+            step,
+            range,
+        }) => {
+            *range = location;
             if let Some(expr) = lower {
                 relocate_expr(expr, location);
             }
diff --git a/crates/ruff_python_ast/src/source_code/comment_ranges.rs b/crates/ruff_python_ast/src/source_code/comment_ranges.rs
new file mode 100644
index 0000000000000..cbbb414b54263
--- /dev/null
+++ b/crates/ruff_python_ast/src/source_code/comment_ranges.rs
@@ -0,0 +1,51 @@
+use std::fmt::{Debug, Formatter};
+use std::ops::Deref;
+
+use ruff_text_size::TextRange;
+use rustpython_parser::Tok;
+
+/// Stores the ranges of comments sorted by [`TextRange::start`] in increasing order. No two ranges are overlapping.
+#[derive(Clone)]
+pub struct CommentRanges {
+    raw: Vec<TextRange>,
+}
+
+impl Deref for CommentRanges {
+    type Target = [TextRange];
+
+    fn deref(&self) -> &Self::Target {
+        self.raw.as_slice()
+    }
+}
+
+impl Debug for CommentRanges {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_tuple("CommentRanges").field(&self.raw).finish()
+    }
+}
+
+impl<'a> IntoIterator for &'a CommentRanges {
+    type Item = &'a TextRange;
+    type IntoIter = std::slice::Iter<'a, TextRange>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.raw.iter()
+    }
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct CommentRangesBuilder {
+    ranges: Vec<TextRange>,
+}
+
+impl CommentRangesBuilder {
+    pub fn visit_token(&mut self, token: &Tok, range: TextRange) {
+        if token.is_comment() {
+            self.ranges.push(range);
+        }
+    }
+
+    pub fn finish(self) -> CommentRanges {
+        CommentRanges { raw: self.ranges }
+    }
+}
diff --git a/crates/ruff_python_ast/src/source_code/generator.rs b/crates/ruff_python_ast/src/source_code/generator.rs
index f1e4bf7f8459b..7c3e1efde429a 100644
--- a/crates/ruff_python_ast/src/source_code/generator.rs
+++ b/crates/ruff_python_ast/src/source_code/generator.rs
@@ -2,63 +2,61 @@
 
 use std::ops::Deref;
 
+use rustpython_literal::escape::{AsciiEscape, Escape, UnicodeEscape};
 use rustpython_parser::ast::{
-    Alias, Arg, Arguments, Boolop, Cmpop, Comprehension, Constant, Excepthandler,
-    ExcepthandlerKind, Expr, ExprKind, MatchCase, Operator, Pattern, PatternKind, Stmt, StmtKind,
-    Suite, Withitem,
+    self, Alias, Arg, Arguments, Boolop, Cmpop, Comprehension, Constant, ConversionFlag,
+    Excepthandler, Expr, Identifier, MatchCase, Operator, Pattern, Stmt, Suite, Withitem,
 };
-use rustpython_parser::ConversionFlag;
 
-use crate::newlines::LineEnding;
-use ruff_rustpython::vendor::{bytes, str};
+use ruff_newlines::LineEnding;
 
 use crate::source_code::stylist::{Indentation, Quote, Stylist};
 
 mod precedence {
-    pub const ASSIGN: u8 = 3;
-    pub const ANN_ASSIGN: u8 = 5;
-    pub const AUG_ASSIGN: u8 = 5;
-    pub const EXPR: u8 = 5;
-    pub const YIELD: u8 = 7;
-    pub const YIELD_FROM: u8 = 7;
-    pub const IF: u8 = 9;
-    pub const FOR: u8 = 9;
-    pub const ASYNC_FOR: u8 = 9;
-    pub const WHILE: u8 = 9;
-    pub const RETURN: u8 = 11;
-    pub const SLICE: u8 = 13;
-    pub const SUBSCRIPT: u8 = 13;
-    pub const COMPREHENSION_TARGET: u8 = 19;
-    pub const TUPLE: u8 = 19;
-    pub const FORMATTED_VALUE: u8 = 19;
-    pub const COMMA: u8 = 21;
-    pub const NAMED_EXPR: u8 = 23;
-    pub const ASSERT: u8 = 23;
-    pub const LAMBDA: u8 = 27;
-    pub const IF_EXP: u8 = 27;
-    pub const COMPREHENSION: u8 = 29;
-    pub const OR: u8 = 31;
-    pub const AND: u8 = 33;
-    pub const NOT: u8 = 35;
-    pub const CMP: u8 = 37;
-    pub const BIT_OR: u8 = 39;
-    pub const BIT_XOR: u8 = 41;
-    pub const BIT_AND: u8 = 43;
-    pub const LSHIFT: u8 = 45;
-    pub const RSHIFT: u8 = 45;
-    pub const ADD: u8 = 47;
-    pub const SUB: u8 = 47;
-    pub const MULT: u8 = 49;
-    pub const DIV: u8 = 49;
-    pub const MOD: u8 = 49;
-    pub const FLOORDIV: u8 = 49;
-    pub const MAT_MULT: u8 = 49;
-    pub const INVERT: u8 = 53;
-    pub const UADD: u8 = 53;
-    pub const USUB: u8 = 53;
-    pub const POW: u8 = 55;
-    pub const AWAIT: u8 = 57;
-    pub const MAX: u8 = 63;
+    pub(crate) const ASSIGN: u8 = 3;
+    pub(crate) const ANN_ASSIGN: u8 = 5;
+    pub(crate) const AUG_ASSIGN: u8 = 5;
+    pub(crate) const EXPR: u8 = 5;
+    pub(crate) const YIELD: u8 = 7;
+    pub(crate) const YIELD_FROM: u8 = 7;
+    pub(crate) const IF: u8 = 9;
+    pub(crate) const FOR: u8 = 9;
+    pub(crate) const ASYNC_FOR: u8 = 9;
+    pub(crate) const WHILE: u8 = 9;
+    pub(crate) const RETURN: u8 = 11;
+    pub(crate) const SLICE: u8 = 13;
+    pub(crate) const SUBSCRIPT: u8 = 13;
+    pub(crate) const COMPREHENSION_TARGET: u8 = 19;
+    pub(crate) const TUPLE: u8 = 19;
+    pub(crate) const FORMATTED_VALUE: u8 = 19;
+    pub(crate) const COMMA: u8 = 21;
+    pub(crate) const NAMED_EXPR: u8 = 23;
+    pub(crate) const ASSERT: u8 = 23;
+    pub(crate) const LAMBDA: u8 = 27;
+    pub(crate) const IF_EXP: u8 = 27;
+    pub(crate) const COMPREHENSION: u8 = 29;
+    pub(crate) const OR: u8 = 31;
+    pub(crate) const AND: u8 = 33;
+    pub(crate) const NOT: u8 = 35;
+    pub(crate) const CMP: u8 = 37;
+    pub(crate) const BIT_OR: u8 = 39;
+    pub(crate) const BIT_XOR: u8 = 41;
+    pub(crate) const BIT_AND: u8 = 43;
+    pub(crate) const LSHIFT: u8 = 45;
+    pub(crate) const RSHIFT: u8 = 45;
+    pub(crate) const ADD: u8 = 47;
+    pub(crate) const SUB: u8 = 47;
+    pub(crate) const MULT: u8 = 49;
+    pub(crate) const DIV: u8 = 49;
+    pub(crate) const MOD: u8 = 49;
+    pub(crate) const FLOORDIV: u8 = 49;
+    pub(crate) const MAT_MULT: u8 = 49;
+    pub(crate) const INVERT: u8 = 53;
+    pub(crate) const UADD: u8 = 53;
+    pub(crate) const USUB: u8 = 53;
+    pub(crate) const POW: u8 = 55;
+    pub(crate) const AWAIT: u8 = 57;
+    pub(crate) const MAX: u8 = 63;
 }
 
 pub struct Generator<'a> {
@@ -103,8 +101,22 @@ impl<'a> Generator<'a> {
         }
     }
 
-    pub fn generate(self) -> String {
-        self.buffer
+    /// Generate source code from a [`Stmt`].
+    pub fn stmt(mut self, stmt: &Stmt) -> String {
+        self.unparse_stmt(stmt);
+        self.generate()
+    }
+
+    /// Generate source code from an [`Expr`].
+    pub fn expr(mut self, expr: &Expr) -> String {
+        self.unparse_expr(expr, 0);
+        self.generate()
+    }
+
+    /// Generate source code from a [`Constant`].
+    pub fn constant(mut self, constant: &Constant) -> String {
+        self.unparse_constant(constant);
+        self.generate()
     }
 
     fn newline(&mut self) {
@@ -120,11 +132,11 @@ impl<'a> Generator<'a> {
     }
 
     fn body<U>(&mut self, stmts: &[Stmt<U>]) {
-        self.indent_depth += 1;
+        self.indent_depth = self.indent_depth.saturating_add(1);
         for stmt in stmts {
             self.unparse_stmt(stmt);
         }
-        self.indent_depth -= 1;
+        self.indent_depth = self.indent_depth.saturating_sub(1);
     }
 
     fn p(&mut self, s: &str) {
@@ -137,6 +149,26 @@ impl<'a> Generator<'a> {
         self.buffer += s;
     }
 
+    fn p_id(&mut self, s: &Identifier) {
+        self.p(s.as_str());
+    }
+
+    fn p_bytes_repr(&mut self, s: &[u8]) {
+        let escape = AsciiEscape::with_preferred_quote(s, self.quote.into());
+        if let Some(len) = escape.layout().len {
+            self.buffer.reserve(len);
+        }
+        escape.bytes_repr().write(&mut self.buffer).unwrap(); // write to string doesn't fail
+    }
+
+    fn p_str_repr(&mut self, s: &str) {
+        let escape = UnicodeEscape::with_preferred_quote(s, self.quote.into());
+        if let Some(len) = escape.layout().len {
+            self.buffer.reserve(len);
+        }
+        escape.str_repr().write(&mut self.buffer).unwrap(); // write to string doesn't fail
+    }
+
     fn p_if(&mut self, cond: bool, s: &str) {
         if cond {
             self.p(s);
@@ -147,13 +179,17 @@ impl<'a> Generator<'a> {
         self.p_if(!std::mem::take(first), s);
     }
 
-    pub fn unparse_suite<U>(&mut self, suite: &Suite<U>) {
+    pub(crate) fn generate(self) -> String {
+        self.buffer
+    }
+
+    pub(crate) fn unparse_suite<U>(&mut self, suite: &Suite<U>) {
         for stmt in suite {
             self.unparse_stmt(stmt);
         }
     }
 
-    pub fn unparse_stmt<U>(&mut self, ast: &Stmt<U>) {
+    pub(crate) fn unparse_stmt<U>(&mut self, ast: &Stmt<U>) {
         macro_rules! statement {
             ($body:block) => {{
                 self.newline();
@@ -163,26 +199,25 @@ impl<'a> Generator<'a> {
             }};
         }
 
-        match &ast.node {
-            StmtKind::FunctionDef {
+        match ast {
+            Stmt::FunctionDef(ast::StmtFunctionDef {
                 name,
                 args,
                 body,
                 returns,
                 decorator_list,
                 ..
-            } => {
+            }) => {
                 self.newlines(if self.indent_depth == 0 { 2 } else { 1 });
+                for decorator in decorator_list {
+                    statement!({
+                        self.p("@");
+                        self.unparse_expr(decorator, precedence::MAX);
+                    });
+                }
                 statement!({
-                    for decorator in decorator_list {
-                        statement!({
-                            self.p("@");
-                            self.unparse_expr(decorator, precedence::MAX);
-                        });
-                    }
-                    self.newline();
                     self.p("def ");
-                    self.p(name);
+                    self.p_id(name);
                     self.p("(");
                     self.unparse_args(args);
                     self.p(")");
@@ -197,24 +232,24 @@ impl<'a> Generator<'a> {
                     self.newlines(2);
                 }
             }
-            StmtKind::AsyncFunctionDef {
+            Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef {
                 name,
                 args,
                 body,
                 returns,
                 decorator_list,
                 ..
-            } => {
+            }) => {
                 self.newlines(if self.indent_depth == 0 { 2 } else { 1 });
+                for decorator in decorator_list {
+                    statement!({
+                        self.p("@");
+                        self.unparse_expr(decorator, precedence::MAX);
+                    });
+                }
                 statement!({
-                    for decorator in decorator_list {
-                        statement!({
-                            self.unparse_expr(decorator, precedence::MAX);
-                        });
-                    }
-                    self.newline();
                     self.p("async def ");
-                    self.p(name);
+                    self.p_id(name);
                     self.p("(");
                     self.unparse_args(args);
                     self.p(")");
@@ -229,24 +264,24 @@ impl<'a> Generator<'a> {
                     self.newlines(2);
                 }
             }
-            StmtKind::ClassDef {
+            Stmt::ClassDef(ast::StmtClassDef {
                 name,
                 bases,
                 keywords,
                 body,
                 decorator_list,
-                ..
-            } => {
+                range: _range,
+            }) => {
                 self.newlines(if self.indent_depth == 0 { 2 } else { 1 });
+                for decorator in decorator_list {
+                    statement!({
+                        self.p("@");
+                        self.unparse_expr(decorator, precedence::MAX);
+                    });
+                }
                 statement!({
-                    for decorator in decorator_list {
-                        statement!({
-                            self.unparse_expr(decorator, precedence::MAX);
-                        });
-                    }
-                    self.newline();
                     self.p("class ");
-                    self.p(name);
+                    self.p_id(name);
                     let mut first = true;
                     for base in bases {
                         self.p_if(first, "(");
@@ -256,13 +291,13 @@ impl<'a> Generator<'a> {
                     for keyword in keywords {
                         self.p_if(first, "(");
                         self.p_delim(&mut first, ", ");
-                        if let Some(arg) = &keyword.node.arg {
-                            self.p(arg);
+                        if let Some(arg) = &keyword.arg {
+                            self.p_id(arg);
                             self.p("=");
                         } else {
                             self.p("**");
                         }
-                        self.unparse_expr(&keyword.node.value, precedence::MAX);
+                        self.unparse_expr(&keyword.value, precedence::MAX);
                     }
                     self.p_if(!first, ")");
                     self.p(":");
@@ -272,7 +307,10 @@ impl<'a> Generator<'a> {
                     self.newlines(2);
                 }
             }
-            StmtKind::Return { value } => {
+            Stmt::Return(ast::StmtReturn {
+                value,
+                range: _range,
+            }) => {
                 statement!({
                     if let Some(expr) = value {
                         self.p("return ");
@@ -282,7 +320,10 @@ impl<'a> Generator<'a> {
                     }
                 });
             }
-            StmtKind::Delete { targets } => {
+            Stmt::Delete(ast::StmtDelete {
+                targets,
+                range: _range,
+            }) => {
                 statement!({
                     self.p("del ");
                     let mut first = true;
@@ -292,7 +333,7 @@ impl<'a> Generator<'a> {
                     }
                 });
             }
-            StmtKind::Assign { targets, value, .. } => {
+            Stmt::Assign(ast::StmtAssign { targets, value, .. }) => {
                 statement!({
                     for target in targets {
                         self.unparse_expr(target, precedence::ASSIGN);
@@ -301,7 +342,12 @@ impl<'a> Generator<'a> {
                     self.unparse_expr(value, precedence::ASSIGN);
                 });
             }
-            StmtKind::AugAssign { target, op, value } => {
+            Stmt::AugAssign(ast::StmtAugAssign {
+                target,
+                op,
+                value,
+                range: _range,
+            }) => {
                 statement!({
                     self.unparse_expr(target, precedence::AUG_ASSIGN);
                     self.p(" ");
@@ -324,14 +370,15 @@ impl<'a> Generator<'a> {
                     self.unparse_expr(value, precedence::AUG_ASSIGN);
                 });
             }
-            StmtKind::AnnAssign {
+            Stmt::AnnAssign(ast::StmtAnnAssign {
                 target,
                 annotation,
                 value,
                 simple,
-            } => {
+                range: _range,
+            }) => {
                 statement!({
-                    let need_parens = matches!(target.node, ExprKind::Name { .. }) && simple == &0;
+                    let need_parens = matches!(target.as_ref(), Expr::Name(_)) && !simple;
                     self.p_if(need_parens, "(");
                     self.unparse_expr(target, precedence::ANN_ASSIGN);
                     self.p_if(need_parens, ")");
@@ -343,13 +390,13 @@ impl<'a> Generator<'a> {
                     }
                 });
             }
-            StmtKind::For {
+            Stmt::For(ast::StmtFor {
                 target,
                 iter,
                 body,
                 orelse,
                 ..
-            } => {
+            }) => {
                 statement!({
                     self.p("for ");
                     self.unparse_expr(target, precedence::FOR);
@@ -365,13 +412,13 @@ impl<'a> Generator<'a> {
                     self.body(orelse);
                 }
             }
-            StmtKind::AsyncFor {
+            Stmt::AsyncFor(ast::StmtAsyncFor {
                 target,
                 iter,
                 body,
                 orelse,
                 ..
-            } => {
+            }) => {
                 statement!({
                     self.p("async for ");
                     self.unparse_expr(target, precedence::ASYNC_FOR);
@@ -387,7 +434,12 @@ impl<'a> Generator<'a> {
                     self.body(orelse);
                 }
             }
-            StmtKind::While { test, body, orelse } => {
+            Stmt::While(ast::StmtWhile {
+                test,
+                body,
+                orelse,
+                range: _range,
+            }) => {
                 statement!({
                     self.p("while ");
                     self.unparse_expr(test, precedence::WHILE);
@@ -401,7 +453,12 @@ impl<'a> Generator<'a> {
                     self.body(orelse);
                 }
             }
-            StmtKind::If { test, body, orelse } => {
+            Stmt::If(ast::StmtIf {
+                test,
+                body,
+                orelse,
+                range: _range,
+            }) => {
                 statement!({
                     self.p("if ");
                     self.unparse_expr(test, precedence::IF);
@@ -409,10 +466,16 @@ impl<'a> Generator<'a> {
                 });
                 self.body(body);
 
-                let mut orelse_: &Vec<Stmt<U>> = orelse;
+                let mut orelse_: &[Stmt<U>] = orelse;
                 loop {
-                    if orelse_.len() == 1 && matches!(orelse_[0].node, StmtKind::If { .. }) {
-                        if let StmtKind::If { body, test, orelse } = &orelse_[0].node {
+                    if orelse_.len() == 1 && matches!(orelse_[0], Stmt::If(_)) {
+                        if let Stmt::If(ast::StmtIf {
+                            body,
+                            test,
+                            orelse,
+                            range: _range,
+                        }) = &orelse_[0]
+                        {
                             statement!({
                                 self.p("elif ");
                                 self.unparse_expr(test, precedence::IF);
@@ -432,7 +495,7 @@ impl<'a> Generator<'a> {
                     }
                 }
             }
-            StmtKind::With { items, body, .. } => {
+            Stmt::With(ast::StmtWith { items, body, .. }) => {
                 statement!({
                     self.p("with ");
                     let mut first = true;
@@ -444,7 +507,7 @@ impl<'a> Generator<'a> {
                 });
                 self.body(body);
             }
-            StmtKind::AsyncWith { items, body, .. } => {
+            Stmt::AsyncWith(ast::StmtAsyncWith { items, body, .. }) => {
                 statement!({
                     self.p("async with ");
                     let mut first = true;
@@ -456,21 +519,29 @@ impl<'a> Generator<'a> {
                 });
                 self.body(body);
             }
-            StmtKind::Match { subject, cases } => {
+            Stmt::Match(ast::StmtMatch {
+                subject,
+                cases,
+                range: _range,
+            }) => {
                 statement!({
                     self.p("match ");
                     self.unparse_expr(subject, precedence::MAX);
                     self.p(":");
                 });
                 for case in cases {
-                    self.indent_depth += 1;
+                    self.indent_depth = self.indent_depth.saturating_add(1);
                     statement!({
                         self.unparse_match_case(case);
                     });
-                    self.indent_depth -= 1;
+                    self.indent_depth = self.indent_depth.saturating_sub(1);
                 }
             }
-            StmtKind::Raise { exc, cause } => {
+            Stmt::Raise(ast::StmtRaise {
+                exc,
+                cause,
+                range: _range,
+            }) => {
                 statement!({
                     self.p("raise");
                     if let Some(exc) = exc {
@@ -483,12 +554,13 @@ impl<'a> Generator<'a> {
                     }
                 });
             }
-            StmtKind::Try {
+            Stmt::Try(ast::StmtTry {
                 body,
                 handlers,
                 orelse,
                 finalbody,
-            } => {
+                range: _range,
+            }) => {
                 statement!({
                     self.p("try:");
                 });
@@ -513,12 +585,13 @@ impl<'a> Generator<'a> {
                     self.body(finalbody);
                 }
             }
-            StmtKind::TryStar {
+            Stmt::TryStar(ast::StmtTryStar {
                 body,
                 handlers,
                 orelse,
                 finalbody,
-            } => {
+                range: _range,
+            }) => {
                 statement!({
                     self.p("try:");
                 });
@@ -543,7 +616,11 @@ impl<'a> Generator<'a> {
                     self.body(finalbody);
                 }
             }
-            StmtKind::Assert { test, msg } => {
+            Stmt::Assert(ast::StmtAssert {
+                test,
+                msg,
+                range: _range,
+            }) => {
                 statement!({
                     self.p("assert ");
                     self.unparse_expr(test, precedence::ASSERT);
@@ -553,7 +630,10 @@ impl<'a> Generator<'a> {
                     }
                 });
             }
-            StmtKind::Import { names } => {
+            Stmt::Import(ast::StmtImport {
+                names,
+                range: _range,
+            }) => {
                 statement!({
                     self.p("import ");
                     let mut first = true;
@@ -563,18 +643,19 @@ impl<'a> Generator<'a> {
                     }
                 });
             }
-            StmtKind::ImportFrom {
+            Stmt::ImportFrom(ast::StmtImportFrom {
                 module,
                 names,
                 level,
-            } => {
+                range: _range,
+            }) => {
                 statement!({
                     self.p("from ");
                     if let Some(level) = level {
-                        self.p(&".".repeat(*level));
+                        self.p(&".".repeat(level.to_usize()));
                     }
                     if let Some(module) = module {
-                        self.p(module);
+                        self.p_id(module);
                     }
                     self.p(" import ");
                     let mut first = true;
@@ -584,42 +665,51 @@ impl<'a> Generator<'a> {
                     }
                 });
             }
-            StmtKind::Global { names } => {
+            Stmt::Global(ast::StmtGlobal {
+                names,
+                range: _range,
+            }) => {
                 statement!({
                     self.p("global ");
                     let mut first = true;
                     for name in names {
                         self.p_delim(&mut first, ", ");
-                        self.p(name);
+                        self.p_id(name);
                     }
                 });
             }
-            StmtKind::Nonlocal { names } => {
+            Stmt::Nonlocal(ast::StmtNonlocal {
+                names,
+                range: _range,
+            }) => {
                 statement!({
                     self.p("nonlocal ");
                     let mut first = true;
                     for name in names {
                         self.p_delim(&mut first, ", ");
-                        self.p(name);
+                        self.p_id(name);
                     }
                 });
             }
-            StmtKind::Expr { value } => {
+            Stmt::Expr(ast::StmtExpr {
+                value,
+                range: _range,
+            }) => {
                 statement!({
                     self.unparse_expr(value, precedence::EXPR);
                 });
             }
-            StmtKind::Pass => {
+            Stmt::Pass(_) => {
                 statement!({
                     self.p("pass");
                 });
             }
-            StmtKind::Break => {
+            Stmt::Break(_) => {
                 statement!({
                     self.p("break");
                 });
             }
-            StmtKind::Continue => {
+            Stmt::Continue(_) => {
                 statement!({
                     self.p("continue");
                 });
@@ -628,8 +718,13 @@ impl<'a> Generator<'a> {
     }
 
     fn unparse_excepthandler<U>(&mut self, ast: &Excepthandler<U>, star: bool) {
-        match &ast.node {
-            ExcepthandlerKind::ExceptHandler { type_, name, body } => {
+        match ast {
+            Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler {
+                type_,
+                name,
+                body,
+                range: _range,
+            }) => {
                 self.p("except");
                 if star {
                     self.p("*");
@@ -640,7 +735,7 @@ impl<'a> Generator<'a> {
                 }
                 if let Some(name) = name {
                     self.p(" as ");
-                    self.p(name);
+                    self.p_id(name);
                 }
                 self.p(":");
                 self.body(body);
@@ -649,14 +744,23 @@ impl<'a> Generator<'a> {
     }
 
     fn unparse_pattern<U>(&mut self, ast: &Pattern<U>) {
-        match &ast.node {
-            PatternKind::MatchValue { value } => {
+        match ast {
+            Pattern::MatchValue(ast::PatternMatchValue {
+                value,
+                range: _range,
+            }) => {
                 self.unparse_expr(value, precedence::MAX);
             }
-            PatternKind::MatchSingleton { value } => {
+            Pattern::MatchSingleton(ast::PatternMatchSingleton {
+                value,
+                range: _range,
+            }) => {
                 self.unparse_constant(value);
             }
-            PatternKind::MatchSequence { patterns } => {
+            Pattern::MatchSequence(ast::PatternMatchSequence {
+                patterns,
+                range: _range,
+            }) => {
                 self.p("[");
                 let mut first = true;
                 for pattern in patterns {
@@ -665,11 +769,12 @@ impl<'a> Generator<'a> {
                 }
                 self.p("]");
             }
-            PatternKind::MatchMapping {
+            Pattern::MatchMapping(ast::PatternMatchMapping {
                 keys,
                 patterns,
                 rest,
-            } => {
+                range: _range,
+            }) => {
                 self.p("{");
                 let mut first = true;
                 for (key, pattern) in keys.iter().zip(patterns) {
@@ -681,31 +786,41 @@ impl<'a> Generator<'a> {
                 if let Some(rest) = rest {
                     self.p_delim(&mut first, ", ");
                     self.p("**");
-                    self.p(rest);
+                    self.p_id(rest);
                 }
                 self.p("}");
             }
-            PatternKind::MatchClass { .. } => {}
-            PatternKind::MatchStar { name } => {
+            Pattern::MatchClass(_) => {}
+            Pattern::MatchStar(ast::PatternMatchStar {
+                name,
+                range: _range,
+            }) => {
                 self.p("*");
                 if let Some(name) = name {
-                    self.p(name);
+                    self.p_id(name);
                 } else {
                     self.p("_");
                 }
             }
-            PatternKind::MatchAs { pattern, name } => {
+            Pattern::MatchAs(ast::PatternMatchAs {
+                pattern,
+                name,
+                range: _range,
+            }) => {
                 if let Some(pattern) = pattern {
                     self.unparse_pattern(pattern);
                     self.p(" as ");
                 }
                 if let Some(name) = name {
-                    self.p(name);
+                    self.p_id(name);
                 } else {
                     self.p("_");
                 }
             }
-            PatternKind::MatchOr { patterns } => {
+            Pattern::MatchOr(ast::PatternMatchOr {
+                patterns,
+                range: _range,
+            }) => {
                 let mut first = true;
                 for pattern in patterns {
                     self.p_delim(&mut first, " | ");
@@ -726,7 +841,7 @@ impl<'a> Generator<'a> {
         self.body(&ast.body);
     }
 
-    pub fn unparse_expr<U>(&mut self, ast: &Expr<U>, level: u8) {
+    pub(crate) fn unparse_expr<U>(&mut self, ast: &Expr<U>, level: u8) {
         macro_rules! opprec {
             ($opty:ident, $x:expr, $enu:path, $($var:ident($op:literal, $prec:ident)),*$(,)?) => {
                 match $x {
@@ -749,8 +864,12 @@ impl<'a> Generator<'a> {
                 ret
             }};
         }
-        match &ast.node {
-            ExprKind::BoolOp { op, values } => {
+        match ast {
+            Expr::BoolOp(ast::ExprBoolOp {
+                op,
+                values,
+                range: _range,
+            }) => {
                 let (op, prec) = opprec!(bin, op, Boolop, And("and", AND), Or("or", OR));
                 group_if!(prec, {
                     let mut first = true;
@@ -760,14 +879,23 @@ impl<'a> Generator<'a> {
                     }
                 });
             }
-            ExprKind::NamedExpr { target, value } => {
+            Expr::NamedExpr(ast::ExprNamedExpr {
+                target,
+                value,
+                range: _range,
+            }) => {
                 group_if!(precedence::NAMED_EXPR, {
                     self.unparse_expr(target, precedence::NAMED_EXPR);
                     self.p(" := ");
                     self.unparse_expr(value, precedence::NAMED_EXPR + 1);
                 });
             }
-            ExprKind::BinOp { left, op, right } => {
+            Expr::BinOp(ast::ExprBinOp {
+                left,
+                op,
+                right,
+                range: _range,
+            }) => {
                 let rassoc = matches!(op, Operator::Pow);
                 let (op, prec) = opprec!(
                     bin,
@@ -793,7 +921,11 @@ impl<'a> Generator<'a> {
                     self.unparse_expr(right, prec + u8::from(!rassoc));
                 });
             }
-            ExprKind::UnaryOp { op, operand } => {
+            Expr::UnaryOp(ast::ExprUnaryOp {
+                op,
+                operand,
+                range: _range,
+            }) => {
                 let (op, prec) = opprec!(
                     un,
                     op,
@@ -808,7 +940,11 @@ impl<'a> Generator<'a> {
                     self.unparse_expr(operand, prec);
                 });
             }
-            ExprKind::Lambda { args, body } => {
+            Expr::Lambda(ast::ExprLambda {
+                args,
+                body,
+                range: _range,
+            }) => {
                 group_if!(precedence::LAMBDA, {
                     let npos = args.args.len() + args.posonlyargs.len();
                     self.p(if npos > 0 { "lambda " } else { "lambda" });
@@ -817,7 +953,12 @@ impl<'a> Generator<'a> {
                     self.unparse_expr(body, precedence::LAMBDA);
                 });
             }
-            ExprKind::IfExp { test, body, orelse } => {
+            Expr::IfExp(ast::ExprIfExp {
+                test,
+                body,
+                orelse,
+                range: _range,
+            }) => {
                 group_if!(precedence::IF_EXP, {
                     self.unparse_expr(body, precedence::IF_EXP + 1);
                     self.p(" if ");
@@ -826,7 +967,11 @@ impl<'a> Generator<'a> {
                     self.unparse_expr(orelse, precedence::IF_EXP);
                 });
             }
-            ExprKind::Dict { keys, values } => {
+            Expr::Dict(ast::ExprDict {
+                keys,
+                values,
+                range: _range,
+            }) => {
                 self.p("{");
                 let mut first = true;
                 for (k, v) in keys.iter().zip(values) {
@@ -842,7 +987,10 @@ impl<'a> Generator<'a> {
                 }
                 self.p("}");
             }
-            ExprKind::Set { elts } => {
+            Expr::Set(ast::ExprSet {
+                elts,
+                range: _range,
+            }) => {
                 if elts.is_empty() {
                     self.p("set()");
                 } else {
@@ -855,23 +1003,32 @@ impl<'a> Generator<'a> {
                     self.p("}");
                 }
             }
-            ExprKind::ListComp { elt, generators } => {
+            Expr::ListComp(ast::ExprListComp {
+                elt,
+                generators,
+                range: _range,
+            }) => {
                 self.p("[");
                 self.unparse_expr(elt, precedence::MAX);
                 self.unparse_comp(generators);
                 self.p("]");
             }
-            ExprKind::SetComp { elt, generators } => {
+            Expr::SetComp(ast::ExprSetComp {
+                elt,
+                generators,
+                range: _range,
+            }) => {
                 self.p("{");
                 self.unparse_expr(elt, precedence::MAX);
                 self.unparse_comp(generators);
                 self.p("}");
             }
-            ExprKind::DictComp {
+            Expr::DictComp(ast::ExprDictComp {
                 key,
                 value,
                 generators,
-            } => {
+                range: _range,
+            }) => {
                 self.p("{");
                 self.unparse_expr(key, precedence::MAX);
                 self.p(": ");
@@ -879,19 +1036,29 @@ impl<'a> Generator<'a> {
                 self.unparse_comp(generators);
                 self.p("}");
             }
-            ExprKind::GeneratorExp { elt, generators } => {
+            Expr::GeneratorExp(ast::ExprGeneratorExp {
+                elt,
+                generators,
+                range: _range,
+            }) => {
                 self.p("(");
                 self.unparse_expr(elt, precedence::COMMA);
                 self.unparse_comp(generators);
                 self.p(")");
             }
-            ExprKind::Await { value } => {
+            Expr::Await(ast::ExprAwait {
+                value,
+                range: _range,
+            }) => {
                 group_if!(precedence::AWAIT, {
                     self.p("await ");
                     self.unparse_expr(value, precedence::MAX);
                 });
             }
-            ExprKind::Yield { value } => {
+            Expr::Yield(ast::ExprYield {
+                value,
+                range: _range,
+            }) => {
                 group_if!(precedence::YIELD, {
                     self.p("yield");
                     if let Some(value) = value {
@@ -900,17 +1067,21 @@ impl<'a> Generator<'a> {
                     }
                 });
             }
-            ExprKind::YieldFrom { value } => {
+            Expr::YieldFrom(ast::ExprYieldFrom {
+                value,
+                range: _range,
+            }) => {
                 group_if!(precedence::YIELD_FROM, {
                     self.p("yield from ");
                     self.unparse_expr(value, precedence::MAX);
                 });
             }
-            ExprKind::Compare {
+            Expr::Compare(ast::ExprCompare {
                 left,
                 ops,
                 comparators,
-            } => {
+                range: _range,
+            }) => {
                 group_if!(precedence::CMP, {
                     let new_lvl = precedence::CMP + 1;
                     self.unparse_expr(left, new_lvl);
@@ -932,18 +1103,20 @@ impl<'a> Generator<'a> {
                     }
                 });
             }
-            ExprKind::Call {
+            Expr::Call(ast::ExprCall {
                 func,
                 args,
                 keywords,
-            } => {
+                range: _range,
+            }) => {
                 self.unparse_expr(func, precedence::MAX);
                 self.p("(");
                 if let (
-                    [Expr {
-                        node: ExprKind::GeneratorExp { elt, generators },
-                        ..
-                    }],
+                    [Expr::GeneratorExp(ast::ExprGeneratorExp {
+                        elt,
+                        generators,
+                        range: _range,
+                    })],
                     [],
                 ) = (&**args, &**keywords)
                 {
@@ -958,35 +1131,45 @@ impl<'a> Generator<'a> {
                     }
                     for kw in keywords {
                         self.p_delim(&mut first, ", ");
-                        if let Some(arg) = &kw.node.arg {
-                            self.p(arg);
+                        if let Some(arg) = &kw.arg {
+                            self.p_id(arg);
                             self.p("=");
-                            self.unparse_expr(&kw.node.value, precedence::COMMA);
+                            self.unparse_expr(&kw.value, precedence::COMMA);
                         } else {
                             self.p("**");
-                            self.unparse_expr(&kw.node.value, precedence::MAX);
+                            self.unparse_expr(&kw.value, precedence::MAX);
                         }
                     }
                 }
                 self.p(")");
             }
-            ExprKind::FormattedValue {
+            Expr::FormattedValue(ast::ExprFormattedValue {
                 value,
                 conversion,
                 format_spec,
-            } => self.unparse_formatted(value, *conversion, format_spec.as_deref()),
-            ExprKind::JoinedStr { values } => self.unparse_joinedstr(values, false),
-            ExprKind::Constant { value, kind } => {
+                range: _range,
+            }) => self.unparse_formatted(value, *conversion, format_spec.as_deref()),
+            Expr::JoinedStr(ast::ExprJoinedStr {
+                values,
+                range: _range,
+            }) => {
+                self.unparse_joinedstr(values, false);
+            }
+            Expr::Constant(ast::ExprConstant {
+                value,
+                kind,
+                range: _range,
+            }) => {
                 if let Some(kind) = kind {
                     self.p(kind);
                 }
                 self.unparse_constant(value);
             }
-            ExprKind::Attribute { value, attr, .. } => {
-                if let ExprKind::Constant {
+            Expr::Attribute(ast::ExprAttribute { value, attr, .. }) => {
+                if let Expr::Constant(ast::ExprConstant {
                     value: Constant::Int(_),
                     ..
-                } = &value.node
+                }) = value.as_ref()
                 {
                     self.p("(");
                     self.unparse_expr(value, precedence::MAX);
@@ -995,20 +1178,20 @@ impl<'a> Generator<'a> {
                     self.unparse_expr(value, precedence::MAX);
                     self.p(".");
                 };
-                self.p(attr);
+                self.p_id(attr);
             }
-            ExprKind::Subscript { value, slice, .. } => {
+            Expr::Subscript(ast::ExprSubscript { value, slice, .. }) => {
                 self.unparse_expr(value, precedence::MAX);
                 self.p("[");
                 self.unparse_expr(slice, precedence::SUBSCRIPT);
                 self.p("]");
             }
-            ExprKind::Starred { value, .. } => {
+            Expr::Starred(ast::ExprStarred { value, .. }) => {
                 self.p("*");
                 self.unparse_expr(value, precedence::MAX);
             }
-            ExprKind::Name { id, .. } => self.p(id),
-            ExprKind::List { elts, .. } => {
+            Expr::Name(ast::ExprName { id, .. }) => self.p_id(id),
+            Expr::List(ast::ExprList { elts, .. }) => {
                 self.p("[");
                 let mut first = true;
                 for elt in elts {
@@ -1017,7 +1200,7 @@ impl<'a> Generator<'a> {
                 }
                 self.p("]");
             }
-            ExprKind::Tuple { elts, .. } => {
+            Expr::Tuple(ast::ExprTuple { elts, .. }) => {
                 if elts.is_empty() {
                     self.p("()");
                 } else {
@@ -1031,7 +1214,12 @@ impl<'a> Generator<'a> {
                     });
                 }
             }
-            ExprKind::Slice { lower, upper, step } => {
+            Expr::Slice(ast::ExprSlice {
+                lower,
+                upper,
+                step,
+                range: _range,
+            }) => {
                 if let Some(lower) = lower {
                     self.unparse_expr(lower, precedence::SLICE);
                 }
@@ -1047,15 +1235,15 @@ impl<'a> Generator<'a> {
         }
     }
 
-    pub fn unparse_constant(&mut self, constant: &Constant) {
+    pub(crate) fn unparse_constant(&mut self, constant: &Constant) {
         assert_eq!(f64::MAX_10_EXP, 308);
         let inf_str = "1e309";
         match constant {
             Constant::Bytes(b) => {
-                self.p(&bytes::repr(b, self.quote.into()));
+                self.p_bytes_repr(b);
             }
             Constant::Str(s) => {
-                self.p(&format!("{}", str::repr(s, self.quote.into())));
+                self.p_str_repr(s);
             }
             Constant::None => self.p("None"),
             Constant::Bool(b) => self.p(if *b { "True" } else { "False" }),
@@ -1081,7 +1269,7 @@ impl<'a> Generator<'a> {
                 if fp.is_infinite() {
                     self.p(inf_str);
                 } else {
-                    self.p(&rustpython_common::float_ops::to_string(*fp));
+                    self.p(&rustpython_literal::float::to_string(*fp));
                 }
             }
             Constant::Complex { real, imag } => {
@@ -1139,8 +1327,8 @@ impl<'a> Generator<'a> {
     }
 
     fn unparse_arg<U>(&mut self, arg: &Arg<U>) {
-        self.p(&arg.node.arg);
-        if let Some(ann) = &arg.node.annotation {
+        self.p_id(&arg.arg);
+        if let Some(ann) = &arg.annotation {
             self.p(": ");
             self.unparse_expr(ann, precedence::COMMA);
         }
@@ -1148,7 +1336,7 @@ impl<'a> Generator<'a> {
 
     fn unparse_comp<U>(&mut self, generators: &[Comprehension<U>]) {
         for comp in generators {
-            self.p(if comp.is_async > 0 {
+            self.p(if comp.is_async {
                 " async for "
             } else {
                 " for "
@@ -1169,7 +1357,12 @@ impl<'a> Generator<'a> {
         }
     }
 
-    fn unparse_formatted<U>(&mut self, val: &Expr<U>, conversion: usize, spec: Option<&Expr<U>>) {
+    fn unparse_formatted<U>(
+        &mut self,
+        val: &Expr<U>,
+        conversion: ConversionFlag,
+        spec: Option<&Expr<U>>,
+    ) {
         let mut generator = Generator::new(self.indent, self.quote, self.line_ending);
         generator.unparse_expr(val, precedence::FORMATTED_VALUE);
         let brace = if generator.buffer.starts_with('{') {
@@ -1181,7 +1374,7 @@ impl<'a> Generator<'a> {
         self.p(brace);
         self.buffer += &generator.buffer;
 
-        if conversion != ConversionFlag::None as usize {
+        if !conversion.is_none() {
             self.p("!");
             #[allow(clippy::cast_possible_truncation)]
             self.p(&format!("{}", conversion as u8 as char));
@@ -1196,20 +1389,26 @@ impl<'a> Generator<'a> {
     }
 
     fn unparse_fstring_elem<U>(&mut self, expr: &Expr<U>, is_spec: bool) {
-        match &expr.node {
-            ExprKind::Constant { value, .. } => {
+        match expr {
+            Expr::Constant(ast::ExprConstant { value, .. }) => {
                 if let Constant::Str(s) = value {
                     self.unparse_fstring_str(s);
                 } else {
                     unreachable!()
                 }
             }
-            ExprKind::JoinedStr { values } => self.unparse_joinedstr(values, is_spec),
-            ExprKind::FormattedValue {
+            Expr::JoinedStr(ast::ExprJoinedStr {
+                values,
+                range: _range,
+            }) => {
+                self.unparse_joinedstr(values, is_spec);
+            }
+            Expr::FormattedValue(ast::ExprFormattedValue {
                 value,
                 conversion,
                 format_spec,
-            } => self.unparse_formatted(value, *conversion, format_spec.as_deref()),
+                range: _range,
+            }) => self.unparse_formatted(value, *conversion, format_spec.as_deref()),
             _ => unreachable!(),
         }
     }
@@ -1234,15 +1433,15 @@ impl<'a> Generator<'a> {
             );
             generator.unparse_fstring_body(values, is_spec);
             let body = &generator.buffer;
-            self.p(&format!("{}", str::repr(body, self.quote.into())));
+            self.p_str_repr(body);
         }
     }
 
     fn unparse_alias<U>(&mut self, alias: &Alias<U>) {
-        self.p(&alias.node.name);
-        if let Some(asname) = &alias.node.asname {
+        self.p_id(&alias.name);
+        if let Some(asname) = &alias.asname {
             self.p(" as ");
-            self.p(asname);
+            self.p_id(asname);
         }
     }
 
@@ -1257,8 +1456,10 @@ impl<'a> Generator<'a> {
 
 #[cfg(test)]
 mod tests {
-    use crate::newlines::LineEnding;
-    use rustpython_parser as parser;
+    use rustpython_ast::Suite;
+    use rustpython_parser::Parse;
+
+    use ruff_newlines::LineEnding;
 
     use crate::source_code::stylist::{Indentation, Quote};
     use crate::source_code::Generator;
@@ -1267,7 +1468,7 @@ mod tests {
         let indentation = Indentation::default();
         let quote = Quote::default();
         let line_ending = LineEnding::default();
-        let program = parser::parse_program(contents, "<filename>").unwrap();
+        let program = Suite::parse(contents, "<filename>").unwrap();
         let stmt = program.first().unwrap();
         let mut generator = Generator::new(&indentation, quote, line_ending);
         generator.unparse_stmt(stmt);
@@ -1280,7 +1481,7 @@ mod tests {
         line_ending: LineEnding,
         contents: &str,
     ) -> String {
-        let program = parser::parse_program(contents, "<filename>").unwrap();
+        let program = Suite::parse(contents, "<filename>").unwrap();
         let stmt = program.first().unwrap();
         let mut generator = Generator::new(indentation, quote, line_ending);
         generator.unparse_stmt(stmt);
@@ -1412,6 +1613,29 @@ except* Exception as e:
         );
         assert_eq!(round_trip(r#"x = (1, 2, 3)"#), r#"x = 1, 2, 3"#);
         assert_eq!(round_trip(r#"-(1) + ~(2) + +(3)"#), r#"-1 + ~2 + +3"#);
+        assert_round_trip!(
+            r#"def f():
+
+    def f():
+        pass"#
+        );
+        assert_round_trip!(
+            r#"@foo
+def f():
+
+    @foo
+    def f():
+        pass"#
+        );
+
+        assert_round_trip!(
+            r#"@foo
+class Foo:
+
+    @foo
+    def f():
+        pass"#
+        );
     }
 
     #[test]
diff --git a/crates/ruff_python_ast/src/source_code/indexer.rs b/crates/ruff_python_ast/src/source_code/indexer.rs
index f6a954fb30738..6cfdf693ca825 100644
--- a/crates/ruff_python_ast/src/source_code/indexer.rs
+++ b/crates/ruff_python_ast/src/source_code/indexer.rs
@@ -1,14 +1,15 @@
 //! Struct used to index source code, to enable efficient lookup of tokens that
 //! are omitted from the AST (e.g., commented lines).
 
-use crate::source_code::Locator;
 use ruff_text_size::{TextRange, TextSize};
 use rustpython_parser::lexer::LexResult;
-use rustpython_parser::Tok;
+use rustpython_parser::{StringKind, Tok};
+
+use crate::source_code::comment_ranges::{CommentRanges, CommentRangesBuilder};
+use crate::source_code::Locator;
 
 pub struct Indexer {
-    /// Stores the ranges of comments sorted by [`TextRange::start`] in increasing order. No two ranges are overlapping.
-    comment_ranges: Vec<TextRange>,
+    comment_ranges: CommentRanges,
 
     /// Stores the start offset of continuation lines.
     continuation_lines: Vec<TextSize>,
@@ -16,15 +17,20 @@ pub struct Indexer {
     /// The range of all triple quoted strings in the source document. The ranges are sorted by their
     /// [`TextRange::start`] position in increasing order. No two ranges are overlapping.
     triple_quoted_string_ranges: Vec<TextRange>,
+
+    /// The range of all f-string in the source document. The ranges are sorted by their
+    /// [`TextRange::start`] position in increasing order. No two ranges are overlapping.
+    f_string_ranges: Vec<TextRange>,
 }
 
 impl Indexer {
     pub fn from_tokens(tokens: &[LexResult], locator: &Locator) -> Self {
         assert!(TextSize::try_from(locator.contents().len()).is_ok());
 
-        let mut commented_lines = Vec::new();
+        let mut comment_ranges_builder = CommentRangesBuilder::default();
         let mut continuation_lines = Vec::new();
-        let mut string_ranges = Vec::new();
+        let mut triple_quoted_string_ranges = Vec::new();
+        let mut f_string_ranges = Vec::new();
         // Token, end
         let mut prev_end = TextSize::default();
         let mut prev_token: Option<&Tok> = None;
@@ -35,17 +41,17 @@ impl Indexer {
 
             // Get the trivia between the previous and the current token and detect any newlines.
             // This is necessary because `RustPython` doesn't emit `[Tok::Newline]` tokens
-            // between any two tokens that form a continuation nor multiple newlines in a row.
-            // That's why we have to extract the newlines "manually".
+            // between any two tokens that form a continuation. That's why we have to extract the
+            // newlines "manually".
             for (index, text) in trivia.match_indices(['\n', '\r']) {
                 if text == "\r" && trivia.as_bytes().get(index + 1) == Some(&b'\n') {
                     continue;
                 }
 
-                // Newlines after a comment or new-line never form a continuation.
+                // Newlines after a newline never form a continuation.
                 if !matches!(
                     prev_token,
-                    Some(Tok::Newline | Tok::NonLogicalNewline | Tok::Comment(..)) | None
+                    Some(Tok::Newline | Tok::NonLogicalNewline) | None
                 ) {
                     continuation_lines.push(line_start);
                 }
@@ -57,17 +63,24 @@ impl Indexer {
                 }
             }
 
+            comment_ranges_builder.visit_token(tok, *range);
+
             match tok {
-                Tok::Comment(..) => {
-                    commented_lines.push(*range);
-                }
                 Tok::Newline | Tok::NonLogicalNewline => {
                     line_start = range.end();
                 }
                 Tok::String {
                     triple_quoted: true,
                     ..
-                } => string_ranges.push(*range),
+                } => {
+                    triple_quoted_string_ranges.push(*range);
+                }
+                Tok::String {
+                    kind: StringKind::FString | StringKind::RawFString,
+                    ..
+                } => {
+                    f_string_ranges.push(*range);
+                }
                 _ => {}
             }
 
@@ -75,14 +88,15 @@ impl Indexer {
             prev_end = range.end();
         }
         Self {
-            comment_ranges: commented_lines,
+            comment_ranges: comment_ranges_builder.finish(),
             continuation_lines,
-            triple_quoted_string_ranges: string_ranges,
+            triple_quoted_string_ranges,
+            f_string_ranges,
         }
     }
 
     /// Returns the byte offset ranges of comments
-    pub fn comment_ranges(&self) -> &[TextRange] {
+    pub fn comment_ranges(&self) -> &CommentRanges {
         &self.comment_ranges
     }
 
@@ -91,16 +105,43 @@ impl Indexer {
         &self.continuation_lines
     }
 
-    /// Return a slice of all ranges that include a triple-quoted string. The ranges are sorted by
-    /// [`TextRange::start`] in increasing order. No two ranges are overlapping.
-    pub fn triple_quoted_string_ranges(&self) -> &[TextRange] {
-        &self.triple_quoted_string_ranges
-    }
-
+    /// Returns `true` if the given offset is part of a continuation line.
     pub fn is_continuation(&self, offset: TextSize, locator: &Locator) -> bool {
         let line_start = locator.line_start(offset);
         self.continuation_lines.binary_search(&line_start).is_ok()
     }
+
+    /// Return the [`TextRange`] of the triple-quoted-string containing a given offset.
+    pub fn triple_quoted_string_range(&self, offset: TextSize) -> Option<TextRange> {
+        let Ok(string_range_index) = self.triple_quoted_string_ranges.binary_search_by(|range| {
+            if offset < range.start() {
+                std::cmp::Ordering::Greater
+            } else if range.contains(offset) {
+                std::cmp::Ordering::Equal
+            } else {
+                std::cmp::Ordering::Less
+            }
+        }) else {
+            return None;
+        };
+        Some(self.triple_quoted_string_ranges[string_range_index])
+    }
+
+    /// Return the [`TextRange`] of the f-string containing a given offset.
+    pub fn f_string_range(&self, offset: TextSize) -> Option<TextRange> {
+        let Ok(string_range_index) = self.f_string_ranges.binary_search_by(|range| {
+            if offset < range.start() {
+                std::cmp::Ordering::Greater
+            } else if range.contains(offset) {
+                std::cmp::Ordering::Equal
+            } else {
+                std::cmp::Ordering::Less
+            }
+        }) else {
+            return None;
+        };
+        Some(self.f_string_ranges[string_range_index])
+    }
 }
 
 #[cfg(test)]
@@ -197,7 +238,7 @@ import os
         let contents = r#""this is a single-quoted string""#;
         let lxr: Vec<LexResult> = lexer::lex(contents, Mode::Module).collect();
         let indexer = Indexer::from_tokens(lxr.as_slice(), &Locator::new(contents));
-        assert_eq!(indexer.triple_quoted_string_ranges(), []);
+        assert_eq!(indexer.triple_quoted_string_ranges, []);
 
         let contents = r#"
             """
@@ -207,7 +248,7 @@ import os
         let lxr: Vec<LexResult> = lexer::lex(contents, Mode::Module).collect();
         let indexer = Indexer::from_tokens(lxr.as_slice(), &Locator::new(contents));
         assert_eq!(
-            indexer.triple_quoted_string_ranges(),
+            indexer.triple_quoted_string_ranges,
             [TextRange::new(TextSize::from(13), TextSize::from(71))]
         );
 
@@ -219,7 +260,7 @@ import os
         let lxr: Vec<LexResult> = lexer::lex(contents, Mode::Module).collect();
         let indexer = Indexer::from_tokens(lxr.as_slice(), &Locator::new(contents));
         assert_eq!(
-            indexer.triple_quoted_string_ranges(),
+            indexer.triple_quoted_string_ranges,
             [TextRange::new(TextSize::from(13), TextSize::from(107))]
         );
 
@@ -236,7 +277,7 @@ import os
         let lxr: Vec<LexResult> = lexer::lex(contents, Mode::Module).collect();
         let indexer = Indexer::from_tokens(lxr.as_slice(), &Locator::new(contents));
         assert_eq!(
-            indexer.triple_quoted_string_ranges(),
+            indexer.triple_quoted_string_ranges,
             &[
                 TextRange::new(TextSize::from(13), TextSize::from(85)),
                 TextRange::new(TextSize::from(98), TextSize::from(161))
diff --git a/crates/ruff_python_ast/src/source_code/line_index.rs b/crates/ruff_python_ast/src/source_code/line_index.rs
index 71e1b7139dbc9..1096f1d1bf3f8 100644
--- a/crates/ruff_python_ast/src/source_code/line_index.rs
+++ b/crates/ruff_python_ast/src/source_code/line_index.rs
@@ -1,13 +1,15 @@
-use crate::source_code::SourceLocation;
-use ruff_text_size::{TextLen, TextRange, TextSize};
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
 use std::fmt;
 use std::fmt::{Debug, Formatter};
 use std::num::NonZeroUsize;
 use std::ops::Deref;
 use std::sync::Arc;
 
+use ruff_text_size::{TextLen, TextRange, TextSize};
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Serialize};
+
+use crate::source_code::SourceLocation;
+
 /// Index for fast [byte offset](TextSize) to [`SourceLocation`] conversions.
 ///
 /// Cloning a [`LineIndex`] is cheap because it only requires bumping a reference count.
@@ -295,8 +297,8 @@ impl OneIndexed {
     }
 }
 
-impl std::fmt::Display for OneIndexed {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+impl fmt::Display for OneIndexed {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         std::fmt::Debug::fmt(&self.0.get(), f)
     }
 }
@@ -312,9 +314,10 @@ const fn unwrap<T: Copy>(option: Option<T>) -> T {
 
 #[cfg(test)]
 mod tests {
+    use ruff_text_size::TextSize;
+
     use crate::source_code::line_index::LineIndex;
     use crate::source_code::{OneIndexed, SourceLocation};
-    use ruff_text_size::TextSize;
 
     #[test]
     fn ascii_index() {
diff --git a/crates/ruff_python_ast/src/source_code/locator.rs b/crates/ruff_python_ast/src/source_code/locator.rs
index 6a56e75584251..cf4faedc81b8e 100644
--- a/crates/ruff_python_ast/src/source_code/locator.rs
+++ b/crates/ruff_python_ast/src/source_code/locator.rs
@@ -1,11 +1,14 @@
 //! Struct used to efficiently slice source code at (row, column) Locations.
 
-use crate::newlines::find_newline;
-use crate::source_code::{LineIndex, OneIndexed, SourceCode, SourceLocation};
+use std::ops::Add;
+
 use memchr::{memchr2, memrchr2};
 use once_cell::unsync::OnceCell;
 use ruff_text_size::{TextLen, TextRange, TextSize};
-use std::ops::Add;
+
+use ruff_newlines::find_newline;
+
+use crate::source_code::{LineIndex, OneIndexed, SourceCode, SourceLocation};
 
 pub struct Locator<'a> {
     contents: &'a str,
diff --git a/crates/ruff_python_ast/src/source_code/mod.rs b/crates/ruff_python_ast/src/source_code/mod.rs
index 591162f49177e..acd988c02e5ac 100644
--- a/crates/ruff_python_ast/src/source_code/mod.rs
+++ b/crates/ruff_python_ast/src/source_code/mod.rs
@@ -1,26 +1,31 @@
+use std::cmp::Ordering;
+use std::fmt::{Debug, Formatter};
+use std::sync::Arc;
+
+use ruff_text_size::{TextRange, TextSize};
+use rustpython_parser::{ast, lexer, Mode, Parse, ParseError};
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Serialize};
+
+pub use comment_ranges::{CommentRanges, CommentRangesBuilder};
+pub use generator::Generator;
+pub use indexer::Indexer;
+pub use locator::Locator;
+pub use stylist::{Quote, Stylist};
+
+pub use crate::source_code::line_index::{LineIndex, OneIndexed};
+
+mod comment_ranges;
 mod generator;
 mod indexer;
 mod line_index;
 mod locator;
 mod stylist;
 
-pub use crate::source_code::line_index::{LineIndex, OneIndexed};
-pub use generator::Generator;
-pub use indexer::Indexer;
-pub use locator::Locator;
-use ruff_text_size::{TextRange, TextSize};
-use rustpython_parser as parser;
-use rustpython_parser::{lexer, Mode, ParseError};
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
-use std::fmt::{Debug, Formatter};
-use std::sync::Arc;
-pub use stylist::Stylist;
-
 /// Run round-trip source code generation on a given Python code.
 pub fn round_trip(code: &str, source_path: &str) -> Result<String, ParseError> {
     let locator = Locator::new(code);
-    let python_ast = parser::parse_program(code, source_path)?;
+    let python_ast = ast::Suite::parse(code, source_path)?;
     let tokens: Vec<_> = lexer::lex(code, Mode::Module).collect();
     let stylist = Stylist::from_tokens(&tokens, &locator);
     let mut generator: Generator = (&stylist).into();
@@ -204,6 +209,23 @@ impl SourceFile {
     }
 }
 
+impl PartialOrd for SourceFile {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Ord for SourceFile {
+    fn cmp(&self, other: &Self) -> Ordering {
+        // Short circuit if these are the same source files
+        if Arc::ptr_eq(&self.inner, &other.inner) {
+            Ordering::Equal
+        } else {
+            self.inner.name.cmp(&other.inner.name)
+        }
+    }
+}
+
 struct SourceFileInner {
     name: Box<str>,
     code: Box<str>,
@@ -225,6 +247,15 @@ pub struct SourceLocation {
     pub column: OneIndexed,
 }
 
+impl Default for SourceLocation {
+    fn default() -> Self {
+        Self {
+            row: OneIndexed::MIN,
+            column: OneIndexed::MIN,
+        }
+    }
+}
+
 impl Debug for SourceLocation {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("SourceLocation")
diff --git a/crates/ruff_python_ast/src/source_code/stylist.rs b/crates/ruff_python_ast/src/source_code/stylist.rs
index 0c4535161833a..e0c09ad31a41b 100644
--- a/crates/ruff_python_ast/src/source_code/stylist.rs
+++ b/crates/ruff_python_ast/src/source_code/stylist.rs
@@ -4,12 +4,11 @@ use std::fmt;
 use std::ops::Deref;
 
 use once_cell::unsync::OnceCell;
+use ruff_newlines::{find_newline, LineEnding};
+use rustpython_literal::escape::Quote as StrQuote;
 use rustpython_parser::lexer::LexResult;
 use rustpython_parser::Tok;
 
-use crate::newlines::{find_newline, LineEnding};
-use ruff_rustpython::vendor;
-
 use crate::source_code::Locator;
 use crate::str::leading_quote;
 
@@ -110,11 +109,11 @@ impl From<Quote> for char {
     }
 }
 
-impl From<Quote> for vendor::str::Quote {
+impl From<Quote> for StrQuote {
     fn from(val: Quote) -> Self {
         match val {
-            Quote::Single => vendor::str::Quote::Single,
-            Quote::Double => vendor::str::Quote::Double,
+            Quote::Single => StrQuote::Single,
+            Quote::Double => StrQuote::Double,
         }
     }
 }
@@ -164,10 +163,11 @@ impl Deref for Indentation {
 
 #[cfg(test)]
 mod tests {
-    use crate::newlines::{find_newline, LineEnding};
     use rustpython_parser::lexer::lex;
     use rustpython_parser::Mode;
 
+    use ruff_newlines::{find_newline, LineEnding};
+
     use crate::source_code::stylist::{Indentation, Quote};
     use crate::source_code::{Locator, Stylist};
 
diff --git a/crates/ruff_python_ast/src/statement_visitor.rs b/crates/ruff_python_ast/src/statement_visitor.rs
new file mode 100644
index 0000000000000..805da33b42541
--- /dev/null
+++ b/crates/ruff_python_ast/src/statement_visitor.rs
@@ -0,0 +1,113 @@
+//! Specialized AST visitor trait and walk functions that only visit statements.
+
+use rustpython_parser::ast::{self, Excepthandler, MatchCase, Stmt};
+
+/// A trait for AST visitors that only need to visit statements.
+pub trait StatementVisitor<'a> {
+    fn visit_body(&mut self, body: &'a [Stmt]) {
+        walk_body(self, body);
+    }
+    fn visit_stmt(&mut self, stmt: &'a Stmt) {
+        walk_stmt(self, stmt);
+    }
+    fn visit_excepthandler(&mut self, excepthandler: &'a Excepthandler) {
+        walk_excepthandler(self, excepthandler);
+    }
+    fn visit_match_case(&mut self, match_case: &'a MatchCase) {
+        walk_match_case(self, match_case);
+    }
+}
+
+pub fn walk_body<'a, V: StatementVisitor<'a> + ?Sized>(visitor: &mut V, body: &'a [Stmt]) {
+    for stmt in body {
+        visitor.visit_stmt(stmt);
+    }
+}
+
+pub fn walk_stmt<'a, V: StatementVisitor<'a> + ?Sized>(visitor: &mut V, stmt: &'a Stmt) {
+    match stmt {
+        Stmt::FunctionDef(ast::StmtFunctionDef { body, .. }) => {
+            visitor.visit_body(body);
+        }
+        Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef { body, .. }) => {
+            visitor.visit_body(body);
+        }
+        Stmt::For(ast::StmtFor { body, orelse, .. }) => {
+            visitor.visit_body(body);
+            visitor.visit_body(orelse);
+        }
+        Stmt::ClassDef(ast::StmtClassDef { body, .. }) => {
+            visitor.visit_body(body);
+        }
+        Stmt::AsyncFor(ast::StmtAsyncFor { body, orelse, .. }) => {
+            visitor.visit_body(body);
+            visitor.visit_body(orelse);
+        }
+        Stmt::While(ast::StmtWhile { body, orelse, .. }) => {
+            visitor.visit_body(body);
+            visitor.visit_body(orelse);
+        }
+        Stmt::If(ast::StmtIf { body, orelse, .. }) => {
+            visitor.visit_body(body);
+            visitor.visit_body(orelse);
+        }
+        Stmt::With(ast::StmtWith { body, .. }) => {
+            visitor.visit_body(body);
+        }
+        Stmt::AsyncWith(ast::StmtAsyncWith { body, .. }) => {
+            visitor.visit_body(body);
+        }
+        Stmt::Match(ast::StmtMatch { cases, .. }) => {
+            for match_case in cases {
+                visitor.visit_match_case(match_case);
+            }
+        }
+        Stmt::Try(ast::StmtTry {
+            body,
+            handlers,
+            orelse,
+            finalbody,
+            range: _range,
+        }) => {
+            visitor.visit_body(body);
+            for excepthandler in handlers {
+                visitor.visit_excepthandler(excepthandler);
+            }
+            visitor.visit_body(orelse);
+            visitor.visit_body(finalbody);
+        }
+        Stmt::TryStar(ast::StmtTryStar {
+            body,
+            handlers,
+            orelse,
+            finalbody,
+            range: _range,
+        }) => {
+            visitor.visit_body(body);
+            for excepthandler in handlers {
+                visitor.visit_excepthandler(excepthandler);
+            }
+            visitor.visit_body(orelse);
+            visitor.visit_body(finalbody);
+        }
+        _ => {}
+    }
+}
+
+pub fn walk_excepthandler<'a, V: StatementVisitor<'a> + ?Sized>(
+    visitor: &mut V,
+    excepthandler: &'a Excepthandler,
+) {
+    match excepthandler {
+        Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler { body, .. }) => {
+            visitor.visit_body(body);
+        }
+    }
+}
+
+pub fn walk_match_case<'a, V: StatementVisitor<'a> + ?Sized>(
+    visitor: &mut V,
+    match_case: &'a MatchCase,
+) {
+    visitor.visit_body(&match_case.body);
+}
diff --git a/crates/ruff_python_ast/src/token_kind.rs b/crates/ruff_python_ast/src/token_kind.rs
index b465e39860824..7b460eba20a91 100644
--- a/crates/ruff_python_ast/src/token_kind.rs
+++ b/crates/ruff_python_ast/src/token_kind.rs
@@ -167,9 +167,14 @@ pub enum TokenKind {
 }
 
 impl TokenKind {
+    #[inline]
+    pub const fn is_newline(&self) -> bool {
+        matches!(self, TokenKind::Newline | TokenKind::NonLogicalNewline)
+    }
+
     #[inline]
     pub const fn is_unary(&self) -> bool {
-        matches!(self, TokenKind::Plus | TokenKind::Minus | TokenKind::Star)
+        matches!(self, TokenKind::Plus | TokenKind::Minus)
     }
 
     #[inline]
@@ -236,6 +241,7 @@ impl TokenKind {
                 | TokenKind::Percent
                 | TokenKind::Lbrace
                 | TokenKind::Rbrace
+                | TokenKind::EqEqual
                 | TokenKind::NotEqual
                 | TokenKind::LessEqual
                 | TokenKind::GreaterEqual
diff --git a/crates/ruff_python_ast/src/types.rs b/crates/ruff_python_ast/src/types.rs
index 6ed092d6844f8..7596cfae44425 100644
--- a/crates/ruff_python_ast/src/types.rs
+++ b/crates/ruff_python_ast/src/types.rs
@@ -70,3 +70,15 @@ impl<'a> From<&RefEquality<'a, Expr>> for &'a Expr {
         r.0
     }
 }
+
+impl<'a> From<RefEquality<'a, Stmt>> for &'a Stmt {
+    fn from(r: RefEquality<'a, Stmt>) -> Self {
+        r.0
+    }
+}
+
+impl<'a> From<RefEquality<'a, Expr>> for &'a Expr {
+    fn from(r: RefEquality<'a, Expr>) -> Self {
+        r.0
+    }
+}
diff --git a/crates/ruff_python_ast/src/typing.rs b/crates/ruff_python_ast/src/typing.rs
index 5c5128e80845d..dacf74e078ec4 100644
--- a/crates/ruff_python_ast/src/typing.rs
+++ b/crates/ruff_python_ast/src/typing.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use ruff_text_size::{TextLen, TextRange};
-use rustpython_parser as parser;
 use rustpython_parser::ast::Expr;
+use rustpython_parser::Parse;
 
 use crate::relocate::relocate_expr;
 use crate::source_code::Locator;
@@ -35,7 +35,7 @@ pub fn parse_type_annotation(
         // isn't the case, e.g., for implicit concatenations, or for annotations that contain
         // escaped quotes.
         let leading_quote = str::leading_quote(expression).unwrap();
-        let expr = parser::parse_expression_located(
+        let expr = Expr::parse_starts_at(
             value,
             "<filename>",
             range.start() + leading_quote.text_len(),
@@ -43,7 +43,7 @@ pub fn parse_type_annotation(
         Ok((expr, AnnotationKind::Simple))
     } else {
         // Otherwise, consider this a "complex" annotation.
-        let mut expr = parser::parse_expression(value, "<filename>")?;
+        let mut expr = Expr::parse(value, "<filename>")?;
         relocate_expr(&mut expr, range);
         Ok((expr, AnnotationKind::Complex))
     }
diff --git a/crates/ruff_python_ast/src/visitor.rs b/crates/ruff_python_ast/src/visitor.rs
index f82ee38ea8608..17c03664449c3 100644
--- a/crates/ruff_python_ast/src/visitor.rs
+++ b/crates/ruff_python_ast/src/visitor.rs
@@ -1,9 +1,19 @@
+//! AST visitor trait and walk functions.
+
+pub mod preorder;
+
 use rustpython_parser::ast::{
-    Alias, Arg, Arguments, Boolop, Cmpop, Comprehension, Constant, Excepthandler,
-    ExcepthandlerKind, Expr, ExprContext, ExprKind, Keyword, MatchCase, Operator, Pattern,
-    PatternKind, Stmt, StmtKind, Unaryop, Withitem,
+    self, Alias, Arg, Arguments, Boolop, Cmpop, Comprehension, Constant, Excepthandler, Expr,
+    ExprContext, Keyword, MatchCase, Operator, Pattern, Stmt, Unaryop, Withitem,
 };
 
+/// A trait for AST visitors. Visits all nodes in the AST recursively in evaluation-order.
+///
+/// Prefer [`crate::statement_visitor::StatementVisitor`] for visitors that only need to visit
+/// statements.
+///
+/// Use the [`PreorderVisitor`](self::preorder::PreorderVisitor) if you want to visit the nodes
+/// in pre-order rather than evaluation order.
 pub trait Visitor<'a> {
     fn visit_stmt(&mut self, stmt: &'a Stmt) {
         walk_stmt(self, stmt);
@@ -74,14 +84,14 @@ pub fn walk_body<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, body: &'a [Stmt])
 }
 
 pub fn walk_stmt<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, stmt: &'a Stmt) {
-    match &stmt.node {
-        StmtKind::FunctionDef {
+    match stmt {
+        Stmt::FunctionDef(ast::StmtFunctionDef {
             args,
             body,
             decorator_list,
             returns,
             ..
-        } => {
+        }) => {
             visitor.visit_arguments(args);
             for expr in decorator_list {
                 visitor.visit_expr(expr);
@@ -91,13 +101,13 @@ pub fn walk_stmt<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, stmt: &'a Stmt) {
             }
             visitor.visit_body(body);
         }
-        StmtKind::AsyncFunctionDef {
+        Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef {
             args,
             body,
             decorator_list,
             returns,
             ..
-        } => {
+        }) => {
             visitor.visit_arguments(args);
             for expr in decorator_list {
                 visitor.visit_expr(expr);
@@ -107,13 +117,13 @@ pub fn walk_stmt<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, stmt: &'a Stmt) {
             }
             visitor.visit_body(body);
         }
-        StmtKind::ClassDef {
+        Stmt::ClassDef(ast::StmtClassDef {
             bases,
             keywords,
             body,
             decorator_list,
             ..
-        } => {
+        }) => {
             for expr in bases {
                 visitor.visit_expr(expr);
             }
@@ -125,92 +135,121 @@ pub fn walk_stmt<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, stmt: &'a Stmt) {
             }
             visitor.visit_body(body);
         }
-        StmtKind::Return { value } => {
+        Stmt::Return(ast::StmtReturn {
+            value,
+            range: _range,
+        }) => {
             if let Some(expr) = value {
                 visitor.visit_expr(expr);
             }
         }
-        StmtKind::Delete { targets } => {
+        Stmt::Delete(ast::StmtDelete {
+            targets,
+            range: _range,
+        }) => {
             for expr in targets {
                 visitor.visit_expr(expr);
             }
         }
-        StmtKind::Assign { targets, value, .. } => {
+        Stmt::Assign(ast::StmtAssign { targets, value, .. }) => {
             visitor.visit_expr(value);
             for expr in targets {
                 visitor.visit_expr(expr);
             }
         }
-        StmtKind::AugAssign { target, op, value } => {
+        Stmt::AugAssign(ast::StmtAugAssign {
+            target,
+            op,
+            value,
+            range: _range,
+        }) => {
             visitor.visit_expr(target);
             visitor.visit_operator(op);
             visitor.visit_expr(value);
         }
-        StmtKind::AnnAssign {
+        Stmt::AnnAssign(ast::StmtAnnAssign {
             target,
             annotation,
             value,
             ..
-        } => {
+        }) => {
             visitor.visit_annotation(annotation);
             if let Some(expr) = value {
                 visitor.visit_expr(expr);
             }
             visitor.visit_expr(target);
         }
-        StmtKind::For {
+        Stmt::For(ast::StmtFor {
             target,
             iter,
             body,
             orelse,
             ..
-        } => {
+        }) => {
             visitor.visit_expr(iter);
             visitor.visit_expr(target);
             visitor.visit_body(body);
             visitor.visit_body(orelse);
         }
-        StmtKind::AsyncFor {
+        Stmt::AsyncFor(ast::StmtAsyncFor {
             target,
             iter,
             body,
             orelse,
             ..
-        } => {
+        }) => {
             visitor.visit_expr(iter);
             visitor.visit_expr(target);
             visitor.visit_body(body);
             visitor.visit_body(orelse);
         }
-        StmtKind::While { test, body, orelse } => {
+        Stmt::While(ast::StmtWhile {
+            test,
+            body,
+            orelse,
+            range: _range,
+        }) => {
             visitor.visit_expr(test);
             visitor.visit_body(body);
             visitor.visit_body(orelse);
         }
-        StmtKind::If { test, body, orelse } => {
+        Stmt::If(ast::StmtIf {
+            test,
+            body,
+            orelse,
+            range: _range,
+        }) => {
             visitor.visit_expr(test);
             visitor.visit_body(body);
             visitor.visit_body(orelse);
         }
-        StmtKind::With { items, body, .. } => {
+        Stmt::With(ast::StmtWith { items, body, .. }) => {
             for withitem in items {
                 visitor.visit_withitem(withitem);
             }
             visitor.visit_body(body);
         }
-        StmtKind::AsyncWith { items, body, .. } => {
+        Stmt::AsyncWith(ast::StmtAsyncWith { items, body, .. }) => {
             for withitem in items {
                 visitor.visit_withitem(withitem);
             }
             visitor.visit_body(body);
         }
-        StmtKind::Match { subject, cases } => {
+        Stmt::Match(ast::StmtMatch {
+            subject,
+            cases,
+            range: _range,
+        }) => {
             visitor.visit_expr(subject);
             for match_case in cases {
                 visitor.visit_match_case(match_case);
             }
         }
-        StmtKind::Raise { exc, cause } => {
+        Stmt::Raise(ast::StmtRaise {
+            exc,
+            cause,
+            range: _range,
+        }) => {
             if let Some(expr) = exc {
                 visitor.visit_expr(expr);
             };
@@ -218,12 +257,13 @@ pub fn walk_stmt<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, stmt: &'a Stmt) {
                 visitor.visit_expr(expr);
             };
         }
-        StmtKind::Try {
+        Stmt::Try(ast::StmtTry {
             body,
             handlers,
             orelse,
             finalbody,
-        } => {
+            range: _range,
+        }) => {
             visitor.visit_body(body);
             for excepthandler in handlers {
                 visitor.visit_excepthandler(excepthandler);
@@ -231,12 +271,13 @@ pub fn walk_stmt<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, stmt: &'a Stmt) {
             visitor.visit_body(orelse);
             visitor.visit_body(finalbody);
         }
-        StmtKind::TryStar {
+        Stmt::TryStar(ast::StmtTryStar {
             body,
             handlers,
             orelse,
             finalbody,
-        } => {
+            range: _range,
+        }) => {
             visitor.visit_body(body);
             for excepthandler in handlers {
                 visitor.visit_excepthandler(excepthandler);
@@ -244,62 +285,100 @@ pub fn walk_stmt<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, stmt: &'a Stmt) {
             visitor.visit_body(orelse);
             visitor.visit_body(finalbody);
         }
-        StmtKind::Assert { test, msg } => {
+        Stmt::Assert(ast::StmtAssert {
+            test,
+            msg,
+            range: _range,
+        }) => {
             visitor.visit_expr(test);
             if let Some(expr) = msg {
                 visitor.visit_expr(expr);
             }
         }
-        StmtKind::Import { names } => {
+        Stmt::Import(ast::StmtImport {
+            names,
+            range: _range,
+        }) => {
             for alias in names {
                 visitor.visit_alias(alias);
             }
         }
-        StmtKind::ImportFrom { names, .. } => {
+        Stmt::ImportFrom(ast::StmtImportFrom { names, .. }) => {
             for alias in names {
                 visitor.visit_alias(alias);
             }
         }
-        StmtKind::Global { .. } => {}
-        StmtKind::Nonlocal { .. } => {}
-        StmtKind::Expr { value } => visitor.visit_expr(value),
-        StmtKind::Pass => {}
-        StmtKind::Break => {}
-        StmtKind::Continue => {}
+        Stmt::Global(_) => {}
+        Stmt::Nonlocal(_) => {}
+        Stmt::Expr(ast::StmtExpr {
+            value,
+            range: _range,
+        }) => visitor.visit_expr(value),
+        Stmt::Pass(_) | Stmt::Break(_) | Stmt::Continue(_) => {}
     }
 }
 
 pub fn walk_expr<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, expr: &'a Expr) {
-    match &expr.node {
-        ExprKind::BoolOp { op, values } => {
+    match expr {
+        Expr::BoolOp(ast::ExprBoolOp {
+            op,
+            values,
+            range: _range,
+        }) => {
             visitor.visit_boolop(op);
             for expr in values {
                 visitor.visit_expr(expr);
             }
         }
-        ExprKind::NamedExpr { target, value } => {
+        Expr::NamedExpr(ast::ExprNamedExpr {
+            target,
+            value,
+            range: _range,
+        }) => {
             visitor.visit_expr(value);
             visitor.visit_expr(target);
         }
-        ExprKind::BinOp { left, op, right } => {
+        Expr::BinOp(ast::ExprBinOp {
+            left,
+            op,
+            right,
+            range: _range,
+        }) => {
             visitor.visit_expr(left);
             visitor.visit_operator(op);
             visitor.visit_expr(right);
         }
-        ExprKind::UnaryOp { op, operand } => {
+        Expr::UnaryOp(ast::ExprUnaryOp {
+            op,
+            operand,
+            range: _range,
+        }) => {
             visitor.visit_unaryop(op);
             visitor.visit_expr(operand);
         }
-        ExprKind::Lambda { args, body } => {
+        Expr::Lambda(ast::ExprLambda {
+            args,
+            body,
+            range: _range,
+        }) => {
             visitor.visit_arguments(args);
             visitor.visit_expr(body);
         }
-        ExprKind::IfExp { test, body, orelse } => {
+        Expr::IfExp(ast::ExprIfExp {
+            test,
+            body,
+            orelse,
+            range: _range,
+        }) => {
             visitor.visit_expr(test);
             visitor.visit_expr(body);
             visitor.visit_expr(orelse);
         }
-        ExprKind::Dict { keys, values } => {
+        Expr::Dict(ast::ExprDict {
+            keys,
+            values,
+            range: _range,
+        }) => {
             for expr in keys.iter().flatten() {
                 visitor.visit_expr(expr);
             }
@@ -307,52 +386,78 @@ pub fn walk_expr<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, expr: &'a Expr) {
                 visitor.visit_expr(expr);
             }
         }
-        ExprKind::Set { elts } => {
+        Expr::Set(ast::ExprSet {
+            elts,
+            range: _range,
+        }) => {
             for expr in elts {
                 visitor.visit_expr(expr);
             }
         }
-        ExprKind::ListComp { elt, generators } => {
+        Expr::ListComp(ast::ExprListComp {
+            elt,
+            generators,
+            range: _range,
+        }) => {
             for comprehension in generators {
                 visitor.visit_comprehension(comprehension);
             }
             visitor.visit_expr(elt);
         }
-        ExprKind::SetComp { elt, generators } => {
+        Expr::SetComp(ast::ExprSetComp {
+            elt,
+            generators,
+            range: _range,
+        }) => {
             for comprehension in generators {
                 visitor.visit_comprehension(comprehension);
             }
             visitor.visit_expr(elt);
         }
-        ExprKind::DictComp {
+        Expr::DictComp(ast::ExprDictComp {
             key,
             value,
             generators,
-        } => {
+            range: _range,
+        }) => {
             for comprehension in generators {
                 visitor.visit_comprehension(comprehension);
             }
             visitor.visit_expr(key);
             visitor.visit_expr(value);
         }
-        ExprKind::GeneratorExp { elt, generators } => {
+        Expr::GeneratorExp(ast::ExprGeneratorExp {
+            elt,
+            generators,
+            range: _range,
+        }) => {
             for comprehension in generators {
                 visitor.visit_comprehension(comprehension);
             }
             visitor.visit_expr(elt);
         }
-        ExprKind::Await { value } => visitor.visit_expr(value),
-        ExprKind::Yield { value } => {
+        Expr::Await(ast::ExprAwait {
+            value,
+            range: _range,
+        }) => visitor.visit_expr(value),
+        Expr::Yield(ast::ExprYield {
+            value,
+            range: _range,
+        }) => {
             if let Some(expr) = value {
                 visitor.visit_expr(expr);
             }
         }
-        ExprKind::YieldFrom { value } => visitor.visit_expr(value),
-        ExprKind::Compare {
+        Expr::YieldFrom(ast::ExprYieldFrom {
+            value,
+            range: _range,
+        }) => visitor.visit_expr(value),
+        Expr::Compare(ast::ExprCompare {
             left,
             ops,
             comparators,
-        } => {
+            range: _range,
+        }) => {
             visitor.visit_expr(left);
             for cmpop in ops {
                 visitor.visit_cmpop(cmpop);
@@ -361,11 +466,12 @@ pub fn walk_expr<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, expr: &'a Expr) {
                 visitor.visit_expr(expr);
             }
         }
-        ExprKind::Call {
+        Expr::Call(ast::ExprCall {
             func,
             args,
             keywords,
-        } => {
+            range: _range,
+        }) => {
             visitor.visit_expr(func);
             for expr in args {
                 visitor.visit_expr(expr);
@@ -374,49 +480,74 @@ pub fn walk_expr<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, expr: &'a Expr) {
                 visitor.visit_keyword(keyword);
             }
         }
-        ExprKind::FormattedValue {
+        Expr::FormattedValue(ast::ExprFormattedValue {
             value, format_spec, ..
-        } => {
+        }) => {
             visitor.visit_expr(value);
             if let Some(expr) = format_spec {
                 visitor.visit_format_spec(expr);
             }
         }
-        ExprKind::JoinedStr { values } => {
+        Expr::JoinedStr(ast::ExprJoinedStr {
+            values,
+            range: _range,
+        }) => {
             for expr in values {
                 visitor.visit_expr(expr);
             }
         }
-        ExprKind::Constant { value, .. } => visitor.visit_constant(value),
-        ExprKind::Attribute { value, ctx, .. } => {
+        Expr::Constant(ast::ExprConstant { value, .. }) => visitor.visit_constant(value),
+        Expr::Attribute(ast::ExprAttribute { value, ctx, .. }) => {
             visitor.visit_expr(value);
             visitor.visit_expr_context(ctx);
         }
-        ExprKind::Subscript { value, slice, ctx } => {
+        Expr::Subscript(ast::ExprSubscript {
+            value,
+            slice,
+            ctx,
+            range: _range,
+        }) => {
             visitor.visit_expr(value);
             visitor.visit_expr(slice);
             visitor.visit_expr_context(ctx);
         }
-        ExprKind::Starred { value, ctx } => {
+        Expr::Starred(ast::ExprStarred {
+            value,
+            ctx,
+            range: _range,
+        }) => {
             visitor.visit_expr(value);
             visitor.visit_expr_context(ctx);
         }
-        ExprKind::Name { ctx, .. } => {
+        Expr::Name(ast::ExprName { ctx, .. }) => {
             visitor.visit_expr_context(ctx);
         }
-        ExprKind::List { elts, ctx } => {
+        Expr::List(ast::ExprList {
+            elts,
+            ctx,
+            range: _range,
+        }) => {
             for expr in elts {
                 visitor.visit_expr(expr);
             }
             visitor.visit_expr_context(ctx);
         }
-        ExprKind::Tuple { elts, ctx } => {
+        Expr::Tuple(ast::ExprTuple {
+            elts,
+            ctx,
+            range: _range,
+        }) => {
             for expr in elts {
                 visitor.visit_expr(expr);
             }
             visitor.visit_expr_context(ctx);
         }
-        ExprKind::Slice { lower, upper, step } => {
+        Expr::Slice(ast::ExprSlice {
+            lower,
+            upper,
+            step,
+            range: _range,
+        }) => {
             if let Some(expr) = lower {
                 visitor.visit_expr(expr);
             }
@@ -453,8 +584,8 @@ pub fn walk_excepthandler<'a, V: Visitor<'a> + ?Sized>(
     visitor: &mut V,
     excepthandler: &'a Excepthandler,
 ) {
-    match &excepthandler.node {
-        ExcepthandlerKind::ExceptHandler { type_, body, .. } => {
+    match excepthandler {
+        Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler { type_, body, .. }) => {
             if let Some(expr) = type_ {
                 visitor.visit_expr(expr);
             }
@@ -488,13 +619,13 @@ pub fn walk_arguments<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, arguments: &
 }
 
 pub fn walk_arg<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, arg: &'a Arg) {
-    if let Some(expr) = &arg.node.annotation {
+    if let Some(expr) = &arg.annotation {
         visitor.visit_annotation(expr);
     }
 }
 
 pub fn walk_keyword<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, keyword: &'a Keyword) {
-    visitor.visit_expr(&keyword.node.value);
+    visitor.visit_expr(&keyword.value);
 }
 
 pub fn walk_withitem<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, withitem: &'a Withitem) {
@@ -513,15 +644,26 @@ pub fn walk_match_case<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, match_case:
 }
 
 pub fn walk_pattern<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, pattern: &'a Pattern) {
-    match &pattern.node {
-        PatternKind::MatchValue { value } => visitor.visit_expr(value),
-        PatternKind::MatchSingleton { value } => visitor.visit_constant(value),
-        PatternKind::MatchSequence { patterns } => {
+    match pattern {
+        Pattern::MatchValue(ast::PatternMatchValue {
+            value,
+            range: _range,
+        }) => visitor.visit_expr(value),
+        Pattern::MatchSingleton(ast::PatternMatchSingleton {
+            value,
+            range: _range,
+        }) => {
+            visitor.visit_constant(value);
+        }
+        Pattern::MatchSequence(ast::PatternMatchSequence {
+            patterns,
+            range: _range,
+        }) => {
             for pattern in patterns {
                 visitor.visit_pattern(pattern);
             }
         }
-        PatternKind::MatchMapping { keys, patterns, .. } => {
+        Pattern::MatchMapping(ast::PatternMatchMapping { keys, patterns, .. }) => {
             for expr in keys {
                 visitor.visit_expr(expr);
             }
@@ -529,12 +671,12 @@ pub fn walk_pattern<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, pattern: &'a P
                 visitor.visit_pattern(pattern);
             }
         }
-        PatternKind::MatchClass {
+        Pattern::MatchClass(ast::PatternMatchClass {
             cls,
             patterns,
             kwd_patterns,
             ..
-        } => {
+        }) => {
             visitor.visit_expr(cls);
             for pattern in patterns {
                 visitor.visit_pattern(pattern);
@@ -544,13 +686,16 @@ pub fn walk_pattern<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, pattern: &'a P
                 visitor.visit_pattern(pattern);
             }
         }
-        PatternKind::MatchStar { .. } => {}
-        PatternKind::MatchAs { pattern, .. } => {
+        Pattern::MatchStar(_) => {}
+        Pattern::MatchAs(ast::PatternMatchAs { pattern, .. }) => {
             if let Some(pattern) = pattern {
                 visitor.visit_pattern(pattern);
             }
         }
-        PatternKind::MatchOr { patterns } => {
+        Pattern::MatchOr(ast::PatternMatchOr {
+            patterns,
+            range: _range,
+        }) => {
             for pattern in patterns {
                 visitor.visit_pattern(pattern);
             }
diff --git a/crates/ruff_python_ast/src/visitor/preorder.rs b/crates/ruff_python_ast/src/visitor/preorder.rs
new file mode 100644
index 0000000000000..3aeb4e3ad3fb2
--- /dev/null
+++ b/crates/ruff_python_ast/src/visitor/preorder.rs
@@ -0,0 +1,1147 @@
+use crate::prelude::*;
+
+/// Visitor that traverses all nodes recursively in pre-order.
+pub trait PreorderVisitor<'a> {
+    fn visit_mod(&mut self, module: &'a Mod) {
+        walk_module(self, module);
+    }
+
+    fn visit_stmt(&mut self, stmt: &'a Stmt) {
+        walk_stmt(self, stmt);
+    }
+
+    fn visit_annotation(&mut self, expr: &'a Expr) {
+        walk_expr(self, expr);
+    }
+
+    fn visit_expr(&mut self, expr: &'a Expr) {
+        walk_expr(self, expr);
+    }
+
+    fn visit_constant(&mut self, constant: &'a Constant) {
+        walk_constant(self, constant);
+    }
+
+    fn visit_boolop(&mut self, boolop: &'a Boolop) {
+        walk_boolop(self, boolop);
+    }
+
+    fn visit_operator(&mut self, operator: &'a Operator) {
+        walk_operator(self, operator);
+    }
+
+    fn visit_unaryop(&mut self, unaryop: &'a Unaryop) {
+        walk_unaryop(self, unaryop);
+    }
+
+    fn visit_cmpop(&mut self, cmpop: &'a Cmpop) {
+        walk_cmpop(self, cmpop);
+    }
+
+    fn visit_comprehension(&mut self, comprehension: &'a Comprehension) {
+        walk_comprehension(self, comprehension);
+    }
+
+    fn visit_excepthandler(&mut self, excepthandler: &'a Excepthandler) {
+        walk_excepthandler(self, excepthandler);
+    }
+
+    fn visit_format_spec(&mut self, format_spec: &'a Expr) {
+        walk_expr(self, format_spec);
+    }
+
+    fn visit_arguments(&mut self, arguments: &'a Arguments) {
+        walk_arguments(self, arguments);
+    }
+
+    fn visit_arg(&mut self, arg: &'a Arg) {
+        walk_arg(self, arg);
+    }
+
+    fn visit_keyword(&mut self, keyword: &'a Keyword) {
+        walk_keyword(self, keyword);
+    }
+
+    fn visit_alias(&mut self, alias: &'a Alias) {
+        walk_alias(self, alias);
+    }
+
+    fn visit_withitem(&mut self, withitem: &'a Withitem) {
+        walk_withitem(self, withitem);
+    }
+
+    fn visit_match_case(&mut self, match_case: &'a MatchCase) {
+        walk_match_case(self, match_case);
+    }
+
+    fn visit_pattern(&mut self, pattern: &'a Pattern) {
+        walk_pattern(self, pattern);
+    }
+
+    fn visit_body(&mut self, body: &'a [Stmt]) {
+        walk_body(self, body);
+    }
+
+    fn visit_type_ignore(&mut self, type_ignore: &'a TypeIgnore) {
+        walk_type_ignore(self, type_ignore);
+    }
+}
+
+pub fn walk_module<'a, V>(visitor: &mut V, module: &'a Mod)
+where
+    V: PreorderVisitor<'a> + ?Sized,
+{
+    match module {
+        Mod::Module(ModModule {
+            body,
+            range: _,
+            type_ignores,
+        }) => {
+            visitor.visit_body(body);
+            for ignore in type_ignores {
+                visitor.visit_type_ignore(ignore);
+            }
+        }
+        Mod::Interactive(ModInteractive { body, range: _ }) => visitor.visit_body(body),
+        Mod::Expression(ModExpression { body, range: _ }) => visitor.visit_expr(body),
+        Mod::FunctionType(ModFunctionType {
+            range: _,
+            argtypes,
+            returns,
+        }) => {
+            for arg_type in argtypes {
+                visitor.visit_expr(arg_type);
+            }
+
+            visitor.visit_expr(returns);
+        }
+    }
+}
+
+pub fn walk_body<'a, V>(visitor: &mut V, body: &'a [Stmt])
+where
+    V: PreorderVisitor<'a> + ?Sized,
+{
+    for stmt in body {
+        visitor.visit_stmt(stmt);
+    }
+}
+
+pub fn walk_stmt<'a, V>(visitor: &mut V, stmt: &'a Stmt)
+where
+    V: PreorderVisitor<'a> + ?Sized,
+{
+    match stmt {
+        Stmt::Expr(StmtExpr {
+            value,
+            range: _range,
+        }) => visitor.visit_expr(value),
+
+        Stmt::FunctionDef(StmtFunctionDef {
+            args,
+            body,
+            decorator_list,
+            returns,
+            ..
+        })
+        | Stmt::AsyncFunctionDef(StmtAsyncFunctionDef {
+            args,
+            body,
+            decorator_list,
+            returns,
+            ..
+        }) => {
+            for expr in decorator_list {
+                visitor.visit_expr(expr);
+            }
+
+            visitor.visit_arguments(args);
+
+            for expr in returns {
+                visitor.visit_annotation(expr);
+            }
+
+            visitor.visit_body(body);
+        }
+
+        Stmt::ClassDef(StmtClassDef {
+            bases,
+            keywords,
+            body,
+            decorator_list,
+            ..
+        }) => {
+            for expr in decorator_list {
+                visitor.visit_expr(expr);
+            }
+
+            for expr in bases {
+                visitor.visit_expr(expr);
+            }
+
+            for keyword in keywords {
+                visitor.visit_keyword(keyword);
+            }
+
+            visitor.visit_body(body);
+        }
+
+        Stmt::Return(StmtReturn {
+            value,
+            range: _range,
+        }) => {
+            if let Some(expr) = value {
+                visitor.visit_expr(expr);
+            }
+        }
+
+        Stmt::Delete(StmtDelete {
+            targets,
+            range: _range,
+        }) => {
+            for expr in targets {
+                visitor.visit_expr(expr);
+            }
+        }
+
+        Stmt::Assign(StmtAssign {
+            targets,
+            value,
+            range: _,
+            type_comment: _,
+        }) => {
+            for expr in targets {
+                visitor.visit_expr(expr);
+            }
+
+            visitor.visit_expr(value);
+        }
+
+        Stmt::AugAssign(StmtAugAssign {
+            target,
+            op,
+            value,
+            range: _range,
+        }) => {
+            visitor.visit_expr(target);
+            visitor.visit_operator(op);
+            visitor.visit_expr(value);
+        }
+
+        Stmt::AnnAssign(StmtAnnAssign {
+            target,
+            annotation,
+            value,
+            range: _,
+            simple: _,
+        }) => {
+            visitor.visit_expr(target);
+            visitor.visit_annotation(annotation);
+            if let Some(expr) = value {
+                visitor.visit_expr(expr);
+            }
+        }
+
+        Stmt::For(StmtFor {
+            target,
+            iter,
+            body,
+            orelse,
+            ..
+        })
+        | Stmt::AsyncFor(StmtAsyncFor {
+            target,
+            iter,
+            body,
+            orelse,
+            ..
+        }) => {
+            visitor.visit_expr(target);
+            visitor.visit_expr(iter);
+            visitor.visit_body(body);
+            visitor.visit_body(orelse);
+        }
+
+        Stmt::While(StmtWhile {
+            test,
+            body,
+            orelse,
+            range: _range,
+        }) => {
+            visitor.visit_expr(test);
+            visitor.visit_body(body);
+            visitor.visit_body(orelse);
+        }
+
+        Stmt::If(StmtIf {
+            test,
+            body,
+            orelse,
+            range: _range,
+        }) => {
+            visitor.visit_expr(test);
+            visitor.visit_body(body);
+            visitor.visit_body(orelse);
+        }
+
+        Stmt::With(StmtWith {
+            items,
+            body,
+            type_comment: _,
+            range: _,
+        })
+        | Stmt::AsyncWith(StmtAsyncWith {
+            items,
+            body,
+            type_comment: _,
+            range: _,
+        }) => {
+            for withitem in items {
+                visitor.visit_withitem(withitem);
+            }
+            visitor.visit_body(body);
+        }
+
+        Stmt::Match(StmtMatch {
+            subject,
+            cases,
+            range: _range,
+        }) => {
+            visitor.visit_expr(subject);
+            for match_case in cases {
+                visitor.visit_match_case(match_case);
+            }
+        }
+
+        Stmt::Raise(StmtRaise {
+            exc,
+            cause,
+            range: _range,
+        }) => {
+            if let Some(expr) = exc {
+                visitor.visit_expr(expr);
+            };
+            if let Some(expr) = cause {
+                visitor.visit_expr(expr);
+            };
+        }
+
+        Stmt::Try(StmtTry {
+            body,
+            handlers,
+            orelse,
+            finalbody,
+            range: _range,
+        })
+        | Stmt::TryStar(StmtTryStar {
+            body,
+            handlers,
+            orelse,
+            finalbody,
+            range: _range,
+        }) => {
+            visitor.visit_body(body);
+            for excepthandler in handlers {
+                visitor.visit_excepthandler(excepthandler);
+            }
+            visitor.visit_body(orelse);
+            visitor.visit_body(finalbody);
+        }
+
+        Stmt::Assert(StmtAssert {
+            test,
+            msg,
+            range: _range,
+        }) => {
+            visitor.visit_expr(test);
+            if let Some(expr) = msg {
+                visitor.visit_expr(expr);
+            }
+        }
+
+        Stmt::Import(StmtImport {
+            names,
+            range: _range,
+        }) => {
+            for alias in names {
+                visitor.visit_alias(alias);
+            }
+        }
+
+        Stmt::ImportFrom(StmtImportFrom {
+            range: _,
+            module: _,
+            names,
+            level: _,
+        }) => {
+            for alias in names {
+                visitor.visit_alias(alias);
+            }
+        }
+
+        Stmt::Pass(_)
+        | Stmt::Break(_)
+        | Stmt::Continue(_)
+        | Stmt::Global(_)
+        | Stmt::Nonlocal(_) => {}
+    }
+}
+
+pub fn walk_expr<'a, V>(visitor: &mut V, expr: &'a Expr)
+where
+    V: PreorderVisitor<'a> + ?Sized,
+{
+    match expr {
+        Expr::BoolOp(ExprBoolOp {
+            op,
+            values,
+            range: _range,
+        }) => match values.as_slice() {
+            [left, rest @ ..] => {
+                visitor.visit_expr(left);
+                visitor.visit_boolop(op);
+                for expr in rest {
+                    visitor.visit_expr(expr);
+                }
+            }
+            [] => {
+                visitor.visit_boolop(op);
+            }
+        },
+
+        Expr::NamedExpr(ExprNamedExpr {
+            target,
+            value,
+            range: _range,
+        }) => {
+            visitor.visit_expr(target);
+            visitor.visit_expr(value);
+        }
+
+        Expr::BinOp(ExprBinOp {
+            left,
+            op,
+            right,
+            range: _range,
+        }) => {
+            visitor.visit_expr(left);
+            visitor.visit_operator(op);
+            visitor.visit_expr(right);
+        }
+
+        Expr::UnaryOp(ExprUnaryOp {
+            op,
+            operand,
+            range: _range,
+        }) => {
+            visitor.visit_unaryop(op);
+            visitor.visit_expr(operand);
+        }
+
+        Expr::Lambda(ExprLambda {
+            args,
+            body,
+            range: _range,
+        }) => {
+            visitor.visit_arguments(args);
+            visitor.visit_expr(body);
+        }
+
+        Expr::IfExp(ExprIfExp {
+            test,
+            body,
+            orelse,
+            range: _range,
+        }) => {
+            visitor.visit_expr(test);
+            visitor.visit_expr(body);
+            visitor.visit_expr(orelse);
+        }
+
+        Expr::Dict(ExprDict {
+            keys,
+            values,
+            range: _range,
+        }) => {
+            for (key, value) in keys.iter().zip(values) {
+                if let Some(key) = key {
+                    visitor.visit_expr(key);
+                }
+                visitor.visit_expr(value);
+            }
+        }
+
+        Expr::Set(ExprSet {
+            elts,
+            range: _range,
+        }) => {
+            for expr in elts {
+                visitor.visit_expr(expr);
+            }
+        }
+
+        Expr::ListComp(ExprListComp {
+            elt,
+            generators,
+            range: _range,
+        }) => {
+            visitor.visit_expr(elt);
+            for comprehension in generators {
+                visitor.visit_comprehension(comprehension);
+            }
+        }
+
+        Expr::SetComp(ExprSetComp {
+            elt,
+            generators,
+            range: _range,
+        }) => {
+            visitor.visit_expr(elt);
+            for comprehension in generators {
+                visitor.visit_comprehension(comprehension);
+            }
+        }
+
+        Expr::DictComp(ExprDictComp {
+            key,
+            value,
+            generators,
+            range: _range,
+        }) => {
+            visitor.visit_expr(key);
+            visitor.visit_expr(value);
+
+            for comprehension in generators {
+                visitor.visit_comprehension(comprehension);
+            }
+        }
+
+        Expr::GeneratorExp(ExprGeneratorExp {
+            elt,
+            generators,
+            range: _range,
+        }) => {
+            visitor.visit_expr(elt);
+            for comprehension in generators {
+                visitor.visit_comprehension(comprehension);
+            }
+        }
+
+        Expr::Await(ExprAwait {
+            value,
+            range: _range,
+        })
+        | Expr::YieldFrom(ExprYieldFrom {
+            value,
+            range: _range,
+        }) => visitor.visit_expr(value),
+
+        Expr::Yield(ExprYield {
+            value,
+            range: _range,
+        }) => {
+            if let Some(expr) = value {
+                visitor.visit_expr(expr);
+            }
+        }
+
+        Expr::Compare(ExprCompare {
+            left,
+            ops,
+            comparators,
+            range: _range,
+        }) => {
+            visitor.visit_expr(left);
+
+            for (op, comparator) in ops.iter().zip(comparators) {
+                visitor.visit_cmpop(op);
+                visitor.visit_expr(comparator);
+            }
+        }
+
+        Expr::Call(ExprCall {
+            func,
+            args,
+            keywords,
+            range: _range,
+        }) => {
+            visitor.visit_expr(func);
+            for expr in args {
+                visitor.visit_expr(expr);
+            }
+            for keyword in keywords {
+                visitor.visit_keyword(keyword);
+            }
+        }
+
+        Expr::FormattedValue(ExprFormattedValue {
+            value, format_spec, ..
+        }) => {
+            visitor.visit_expr(value);
+
+            if let Some(expr) = format_spec {
+                visitor.visit_format_spec(expr);
+            }
+        }
+
+        Expr::JoinedStr(ExprJoinedStr {
+            values,
+            range: _range,
+        }) => {
+            for expr in values {
+                visitor.visit_expr(expr);
+            }
+        }
+
+        Expr::Constant(ExprConstant {
+            value,
+            range: _,
+            kind: _,
+        }) => visitor.visit_constant(value),
+
+        Expr::Attribute(ExprAttribute {
+            value,
+            attr: _,
+            ctx: _,
+            range: _,
+        }) => {
+            visitor.visit_expr(value);
+        }
+
+        Expr::Subscript(ExprSubscript {
+            value,
+            slice,
+            ctx: _,
+            range: _range,
+        }) => {
+            visitor.visit_expr(value);
+            visitor.visit_expr(slice);
+        }
+        Expr::Starred(ExprStarred {
+            value,
+            ctx: _,
+            range: _range,
+        }) => {
+            visitor.visit_expr(value);
+        }
+
+        Expr::Name(ExprName {
+            id: _,
+            ctx: _,
+            range: _,
+        }) => {}
+
+        Expr::List(ExprList {
+            elts,
+            ctx: _,
+            range: _range,
+        }) => {
+            for expr in elts {
+                visitor.visit_expr(expr);
+            }
+        }
+        Expr::Tuple(ExprTuple {
+            elts,
+            ctx: _,
+            range: _range,
+        }) => {
+            for expr in elts {
+                visitor.visit_expr(expr);
+            }
+        }
+
+        Expr::Slice(ExprSlice {
+            lower,
+            upper,
+            step,
+            range: _range,
+        }) => {
+            if let Some(expr) = lower {
+                visitor.visit_expr(expr);
+            }
+            if let Some(expr) = upper {
+                visitor.visit_expr(expr);
+            }
+            if let Some(expr) = step {
+                visitor.visit_expr(expr);
+            }
+        }
+    }
+}
+
+pub fn walk_constant<'a, V>(visitor: &mut V, constant: &'a Constant)
+where
+    V: PreorderVisitor<'a> + ?Sized,
+{
+    if let Constant::Tuple(constants) = constant {
+        for constant in constants {
+            visitor.visit_constant(constant);
+        }
+    }
+}
+
+pub fn walk_comprehension<'a, V>(visitor: &mut V, comprehension: &'a Comprehension)
+where
+    V: PreorderVisitor<'a> + ?Sized,
+{
+    visitor.visit_expr(&comprehension.target);
+    visitor.visit_expr(&comprehension.iter);
+
+    for expr in &comprehension.ifs {
+        visitor.visit_expr(expr);
+    }
+}
+
+pub fn walk_excepthandler<'a, V>(visitor: &mut V, excepthandler: &'a Excepthandler)
+where
+    V: PreorderVisitor<'a> + ?Sized,
+{
+    match excepthandler {
+        Excepthandler::ExceptHandler(ExcepthandlerExceptHandler {
+            range: _,
+            type_,
+            name: _,
+            body,
+        }) => {
+            if let Some(expr) = type_ {
+                visitor.visit_expr(expr);
+            }
+            visitor.visit_body(body);
+        }
+    }
+}
+
+pub fn walk_arguments<'a, V>(visitor: &mut V, arguments: &'a Arguments)
+where
+    V: PreorderVisitor<'a> + ?Sized,
+{
+    let non_default_args_len =
+        arguments.posonlyargs.len() + arguments.args.len() - arguments.defaults.len();
+
+    let mut args_iter = arguments.posonlyargs.iter().chain(&arguments.args);
+
+    for _ in 0..non_default_args_len {
+        visitor.visit_arg(args_iter.next().unwrap());
+    }
+
+    for (arg, default) in args_iter.zip(&arguments.defaults) {
+        visitor.visit_arg(arg);
+        visitor.visit_expr(default);
+    }
+
+    if let Some(arg) = &arguments.vararg {
+        visitor.visit_arg(arg);
+    }
+
+    let non_default_kwargs_len = arguments.kwonlyargs.len() - arguments.kw_defaults.len();
+    let mut kwargsonly_iter = arguments.kwonlyargs.iter();
+
+    for _ in 0..non_default_kwargs_len {
+        visitor.visit_arg(kwargsonly_iter.next().unwrap());
+    }
+
+    for (arg, default) in kwargsonly_iter.zip(&arguments.kw_defaults) {
+        visitor.visit_arg(arg);
+        visitor.visit_expr(default);
+    }
+
+    if let Some(arg) = &arguments.kwarg {
+        visitor.visit_arg(arg);
+    }
+}
+
+pub fn walk_arg<'a, V>(visitor: &mut V, arg: &'a Arg)
+where
+    V: PreorderVisitor<'a> + ?Sized,
+{
+    if let Some(expr) = &arg.annotation {
+        visitor.visit_annotation(expr);
+    }
+}
+
+#[inline]
+pub fn walk_keyword<'a, V>(visitor: &mut V, keyword: &'a Keyword)
+where
+    V: PreorderVisitor<'a> + ?Sized,
+{
+    visitor.visit_expr(&keyword.value);
+}
+
+pub fn walk_withitem<'a, V>(visitor: &mut V, withitem: &'a Withitem)
+where
+    V: PreorderVisitor<'a> + ?Sized,
+{
+    visitor.visit_expr(&withitem.context_expr);
+
+    if let Some(expr) = &withitem.optional_vars {
+        visitor.visit_expr(expr);
+    }
+}
+
+pub fn walk_match_case<'a, V>(visitor: &mut V, match_case: &'a MatchCase)
+where
+    V: PreorderVisitor<'a> + ?Sized,
+{
+    visitor.visit_pattern(&match_case.pattern);
+    if let Some(expr) = &match_case.guard {
+        visitor.visit_expr(expr);
+    }
+    visitor.visit_body(&match_case.body);
+}
+
+pub fn walk_pattern<'a, V>(visitor: &mut V, pattern: &'a Pattern)
+where
+    V: PreorderVisitor<'a> + ?Sized,
+{
+    match pattern {
+        Pattern::MatchValue(PatternMatchValue {
+            value,
+            range: _range,
+        }) => visitor.visit_expr(value),
+
+        Pattern::MatchSingleton(PatternMatchSingleton {
+            value,
+            range: _range,
+        }) => {
+            visitor.visit_constant(value);
+        }
+
+        Pattern::MatchSequence(PatternMatchSequence {
+            patterns,
+            range: _range,
+        }) => {
+            for pattern in patterns {
+                visitor.visit_pattern(pattern);
+            }
+        }
+
+        Pattern::MatchMapping(PatternMatchMapping {
+            keys,
+            patterns,
+            range: _,
+            rest: _,
+        }) => {
+            for (key, pattern) in keys.iter().zip(patterns) {
+                visitor.visit_expr(key);
+                visitor.visit_pattern(pattern);
+            }
+        }
+
+        Pattern::MatchClass(PatternMatchClass {
+            cls,
+            patterns,
+            kwd_attrs: _,
+            kwd_patterns,
+            range: _,
+        }) => {
+            visitor.visit_expr(cls);
+            for pattern in patterns {
+                visitor.visit_pattern(pattern);
+            }
+
+            for pattern in kwd_patterns {
+                visitor.visit_pattern(pattern);
+            }
+        }
+
+        Pattern::MatchStar(_) => {}
+
+        Pattern::MatchAs(PatternMatchAs {
+            pattern,
+            range: _,
+            name: _,
+        }) => {
+            if let Some(pattern) = pattern {
+                visitor.visit_pattern(pattern);
+            }
+        }
+
+        Pattern::MatchOr(PatternMatchOr {
+            patterns,
+            range: _range,
+        }) => {
+            for pattern in patterns {
+                visitor.visit_pattern(pattern);
+            }
+        }
+    }
+}
+
+#[inline]
+pub fn walk_type_ignore<'a, V>(_visitor: &mut V, _type_ignore: &'a TypeIgnore)
+where
+    V: PreorderVisitor<'a> + ?Sized,
+{
+}
+
+pub fn walk_boolop<'a, V>(_visitor: &mut V, _boolop: &'a Boolop)
+where
+    V: PreorderVisitor<'a> + ?Sized,
+{
+}
+
+#[inline]
+pub fn walk_operator<'a, V>(_visitor: &mut V, _operator: &'a Operator)
+where
+    V: PreorderVisitor<'a> + ?Sized,
+{
+}
+
+#[inline]
+pub fn walk_unaryop<'a, V>(_visitor: &mut V, _unaryop: &'a Unaryop)
+where
+    V: PreorderVisitor<'a> + ?Sized,
+{
+}
+
+#[inline]
+pub fn walk_cmpop<'a, V>(_visitor: &mut V, _cmpop: &'a Cmpop)
+where
+    V: PreorderVisitor<'a> + ?Sized,
+{
+}
+
+#[inline]
+pub fn walk_alias<'a, V>(_visitor: &mut V, _alias: &'a Alias)
+where
+    V: PreorderVisitor<'a> + ?Sized,
+{
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::node::AnyNodeRef;
+    use crate::visitor::preorder::{
+        walk_alias, walk_arg, walk_arguments, walk_comprehension, walk_excepthandler, walk_expr,
+        walk_keyword, walk_match_case, walk_module, walk_pattern, walk_stmt, walk_type_ignore,
+        walk_withitem, Alias, Arg, Arguments, Boolop, Cmpop, Comprehension, Constant,
+        Excepthandler, Expr, Keyword, MatchCase, Mod, Operator, Pattern, PreorderVisitor, Stmt,
+        String, TypeIgnore, Unaryop, Withitem,
+    };
+    use insta::assert_snapshot;
+    use rustpython_parser::lexer::lex;
+    use rustpython_parser::{parse_tokens, Mode};
+    use std::fmt::{Debug, Write};
+
+    #[test]
+    fn function_arguments() {
+        let source = r#"def a(b, c,/, d, e = 20, *args, named=5, other=20, **kwargs): pass"#;
+
+        let trace = trace_preorder_visitation(source);
+
+        assert_snapshot!(trace);
+    }
+
+    #[test]
+    fn function_positional_only_with_default() {
+        let source = r#"def a(b, c = 34,/, e = 20, *args): pass"#;
+
+        let trace = trace_preorder_visitation(source);
+
+        assert_snapshot!(trace);
+    }
+
+    #[test]
+    fn compare() {
+        let source = r#"4 < x < 5"#;
+
+        let trace = trace_preorder_visitation(source);
+
+        assert_snapshot!(trace);
+    }
+
+    #[test]
+    fn list_comprehension() {
+        let source = "[x for x in numbers]";
+
+        let trace = trace_preorder_visitation(source);
+
+        assert_snapshot!(trace);
+    }
+
+    #[test]
+    fn dict_comprehension() {
+        let source = "{x: x**2 for x in numbers}";
+
+        let trace = trace_preorder_visitation(source);
+
+        assert_snapshot!(trace);
+    }
+
+    #[test]
+    fn set_comprehension() {
+        let source = "{x for x in numbers}";
+
+        let trace = trace_preorder_visitation(source);
+
+        assert_snapshot!(trace);
+    }
+
+    #[test]
+    fn match_class_pattern() {
+        let source = r#"
+match x:
+    case Point2D(0, 0):
+        ...
+    case Point3D(x=0, y=0, z=0):
+        ...
+"#;
+
+        let trace = trace_preorder_visitation(source);
+
+        assert_snapshot!(trace);
+    }
+
+    #[test]
+    fn decorators() {
+        let source = r#"
+@decorator
+def a():
+    pass
+
+@test
+class A:
+    pass
+"#;
+
+        let trace = trace_preorder_visitation(source);
+
+        assert_snapshot!(trace);
+    }
+
+    fn trace_preorder_visitation(source: &str) -> String {
+        let tokens = lex(source, Mode::Module);
+        let parsed = parse_tokens(tokens, Mode::Module, "test.py").unwrap();
+
+        let mut visitor = RecordVisitor::default();
+        visitor.visit_mod(&parsed);
+
+        visitor.output
+    }
+
+    /// Emits a `tree` with a node for every visited AST node (labelled by the AST node's kind)
+    /// and leafs for attributes.
+    #[derive(Default)]
+    struct RecordVisitor {
+        depth: usize,
+        output: String,
+    }
+
+    impl RecordVisitor {
+        fn enter_node<'a, T>(&mut self, node: T)
+        where
+            T: Into<AnyNodeRef<'a>>,
+        {
+            self.emit(&node.into().kind());
+            self.depth += 1;
+        }
+
+        fn exit_node(&mut self) {
+            self.depth -= 1;
+        }
+
+        fn emit(&mut self, text: &dyn Debug) {
+            for _ in 0..self.depth {
+                self.output.push_str("  ");
+            }
+
+            writeln!(self.output, "- {text:?}").unwrap();
+        }
+    }
+
+    impl PreorderVisitor<'_> for RecordVisitor {
+        fn visit_mod(&mut self, module: &Mod) {
+            self.enter_node(module);
+            walk_module(self, module);
+            self.exit_node();
+        }
+
+        fn visit_stmt(&mut self, stmt: &Stmt) {
+            self.enter_node(stmt);
+            walk_stmt(self, stmt);
+            self.exit_node();
+        }
+
+        fn visit_annotation(&mut self, expr: &Expr) {
+            self.enter_node(expr);
+            walk_expr(self, expr);
+            self.exit_node();
+        }
+        fn visit_expr(&mut self, expr: &Expr) {
+            self.enter_node(expr);
+            walk_expr(self, expr);
+            self.exit_node();
+        }
+        fn visit_constant(&mut self, constant: &Constant) {
+            self.emit(&constant);
+        }
+        fn visit_boolop(&mut self, boolop: &Boolop) {
+            self.emit(&boolop);
+        }
+        fn visit_operator(&mut self, operator: &Operator) {
+            self.emit(&operator);
+        }
+        fn visit_unaryop(&mut self, unaryop: &Unaryop) {
+            self.emit(&unaryop);
+        }
+        fn visit_cmpop(&mut self, cmpop: &Cmpop) {
+            self.emit(&cmpop);
+        }
+
+        fn visit_comprehension(&mut self, comprehension: &Comprehension) {
+            self.enter_node(comprehension);
+            walk_comprehension(self, comprehension);
+            self.exit_node();
+        }
+        fn visit_excepthandler(&mut self, excepthandler: &Excepthandler) {
+            self.enter_node(excepthandler);
+            walk_excepthandler(self, excepthandler);
+            self.exit_node();
+        }
+        fn visit_format_spec(&mut self, format_spec: &Expr) {
+            self.enter_node(format_spec);
+            walk_expr(self, format_spec);
+            self.exit_node();
+        }
+        fn visit_arguments(&mut self, arguments: &Arguments) {
+            self.enter_node(arguments);
+            walk_arguments(self, arguments);
+            self.exit_node();
+        }
+        fn visit_arg(&mut self, arg: &Arg) {
+            self.enter_node(arg);
+            walk_arg(self, arg);
+            self.exit_node();
+        }
+        fn visit_keyword(&mut self, keyword: &Keyword) {
+            self.enter_node(keyword);
+            walk_keyword(self, keyword);
+            self.exit_node();
+        }
+        fn visit_alias(&mut self, alias: &Alias) {
+            self.enter_node(alias);
+            walk_alias(self, alias);
+            self.exit_node();
+        }
+        fn visit_withitem(&mut self, withitem: &Withitem) {
+            self.enter_node(withitem);
+            walk_withitem(self, withitem);
+            self.exit_node();
+        }
+        fn visit_match_case(&mut self, match_case: &MatchCase) {
+            self.enter_node(match_case);
+            walk_match_case(self, match_case);
+            self.exit_node();
+        }
+        fn visit_pattern(&mut self, pattern: &Pattern) {
+            self.enter_node(pattern);
+            walk_pattern(self, pattern);
+            self.exit_node();
+        }
+        fn visit_type_ignore(&mut self, type_ignore: &TypeIgnore) {
+            self.enter_node(type_ignore);
+            walk_type_ignore(self, type_ignore);
+            self.exit_node();
+        }
+    }
+}
diff --git a/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__compare.snap b/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__compare.snap
new file mode 100644
index 0000000000000..5dcd49066c3d4
--- /dev/null
+++ b/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__compare.snap
@@ -0,0 +1,15 @@
+---
+source: crates/ruff_python_ast/src/visitor/preorder.rs
+expression: trace
+---
+- ModModule
+  - StmtExpr
+    - ExprCompare
+      - ExprConstant
+        - Int(4)
+      - Lt
+      - ExprName
+      - Lt
+      - ExprConstant
+        - Int(5)
+
diff --git a/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__decorators.snap b/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__decorators.snap
new file mode 100644
index 0000000000000..10f29da98843b
--- /dev/null
+++ b/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__decorators.snap
@@ -0,0 +1,13 @@
+---
+source: crates/ruff_python_ast/src/visitor/preorder.rs
+expression: trace
+---
+- ModModule
+  - StmtFunctionDef
+    - ExprName
+    - Arguments
+    - StmtPass
+  - StmtClassDef
+    - ExprName
+    - StmtPass
+
diff --git a/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__dict_comprehension.snap b/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__dict_comprehension.snap
new file mode 100644
index 0000000000000..7d65127545aa8
--- /dev/null
+++ b/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__dict_comprehension.snap
@@ -0,0 +1,17 @@
+---
+source: crates/ruff_python_ast/src/visitor/preorder.rs
+expression: trace
+---
+- ModModule
+  - StmtExpr
+    - ExprDictComp
+      - ExprName
+      - ExprBinOp
+        - ExprName
+        - Pow
+        - ExprConstant
+          - Int(2)
+      - Comprehension
+        - ExprName
+        - ExprName
+
diff --git a/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__function_arguments.snap b/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__function_arguments.snap
new file mode 100644
index 0000000000000..2a5db80b60c37
--- /dev/null
+++ b/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__function_arguments.snap
@@ -0,0 +1,23 @@
+---
+source: crates/ruff_python_ast/src/visitor/preorder.rs
+expression: trace
+---
+- ModModule
+  - StmtFunctionDef
+    - Arguments
+      - Arg
+      - Arg
+      - Arg
+      - Arg
+      - ExprConstant
+        - Int(20)
+      - Arg
+      - Arg
+      - ExprConstant
+        - Int(5)
+      - Arg
+      - ExprConstant
+        - Int(20)
+      - Arg
+    - StmtPass
+
diff --git a/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__function_positional_only_with_default.snap b/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__function_positional_only_with_default.snap
new file mode 100644
index 0000000000000..c312544b512fa
--- /dev/null
+++ b/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__function_positional_only_with_default.snap
@@ -0,0 +1,17 @@
+---
+source: crates/ruff_python_ast/src/visitor/preorder.rs
+expression: trace
+---
+- ModModule
+  - StmtFunctionDef
+    - Arguments
+      - Arg
+      - Arg
+      - ExprConstant
+        - Int(34)
+      - Arg
+      - ExprConstant
+        - Int(20)
+      - Arg
+    - StmtPass
+
diff --git a/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__list_comprehension.snap b/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__list_comprehension.snap
new file mode 100644
index 0000000000000..75b37c975f091
--- /dev/null
+++ b/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__list_comprehension.snap
@@ -0,0 +1,12 @@
+---
+source: crates/ruff_python_ast/src/visitor/preorder.rs
+expression: trace
+---
+- ModModule
+  - StmtExpr
+    - ExprListComp
+      - ExprName
+      - Comprehension
+        - ExprName
+        - ExprName
+
diff --git a/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__match_class_pattern.snap b/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__match_class_pattern.snap
new file mode 100644
index 0000000000000..0d009a6dce9b4
--- /dev/null
+++ b/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__match_class_pattern.snap
@@ -0,0 +1,35 @@
+---
+source: crates/ruff_python_ast/src/visitor/preorder.rs
+expression: trace
+---
+- ModModule
+  - StmtMatch
+    - ExprName
+    - MatchCase
+      - PatternMatchClass
+        - ExprName
+        - PatternMatchValue
+          - ExprConstant
+            - Int(0)
+        - PatternMatchValue
+          - ExprConstant
+            - Int(0)
+      - StmtExpr
+        - ExprConstant
+          - Ellipsis
+    - MatchCase
+      - PatternMatchClass
+        - ExprName
+        - PatternMatchValue
+          - ExprConstant
+            - Int(0)
+        - PatternMatchValue
+          - ExprConstant
+            - Int(0)
+        - PatternMatchValue
+          - ExprConstant
+            - Int(0)
+      - StmtExpr
+        - ExprConstant
+          - Ellipsis
+
diff --git a/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__set_comprehension.snap b/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__set_comprehension.snap
new file mode 100644
index 0000000000000..b6b68d0d93c88
--- /dev/null
+++ b/crates/ruff_python_ast/src/visitor/snapshots/ruff_python_ast__visitor__preorder__tests__set_comprehension.snap
@@ -0,0 +1,12 @@
+---
+source: crates/ruff_python_ast/src/visitor/preorder.rs
+expression: trace
+---
+- ModModule
+  - StmtExpr
+    - ExprSetComp
+      - ExprName
+      - Comprehension
+        - ExprName
+        - ExprName
+
diff --git a/crates/ruff_python_ast/src/whitespace.rs b/crates/ruff_python_ast/src/whitespace.rs
index 8893c2d087b0b..0fd47276e2839 100644
--- a/crates/ruff_python_ast/src/whitespace.rs
+++ b/crates/ruff_python_ast/src/whitespace.rs
@@ -1,12 +1,21 @@
-use ruff_text_size::TextRange;
-use rustpython_parser::ast::Located;
+use ruff_text_size::{TextRange, TextSize};
+use rustpython_parser::ast::Ranged;
 
 use crate::source_code::Locator;
 
 /// Extract the leading indentation from a line.
-pub fn indentation<'a, T>(locator: &'a Locator, located: &Located<T>) -> Option<&'a str> {
-    let line_start = locator.line_start(located.start());
-    let indentation = &locator.contents()[TextRange::new(line_start, located.start())];
+#[inline]
+pub fn indentation<'a, T>(locator: &'a Locator, located: &T) -> Option<&'a str>
+where
+    T: Ranged,
+{
+    indentation_at_offset(locator, located.start())
+}
+
+/// Extract the leading indentation from a line.
+pub fn indentation_at_offset<'a>(locator: &'a Locator, offset: TextSize) -> Option<&'a str> {
+    let line_start = locator.line_start(offset);
+    let indentation = &locator.contents()[TextRange::new(line_start, offset)];
 
     if indentation.chars().all(char::is_whitespace) {
         Some(indentation)
@@ -35,3 +44,14 @@ pub fn clean(indentation: &str) -> String {
         .map(|char| if char.is_whitespace() { char } else { ' ' })
         .collect()
 }
+
+/// Returns `true` for [whitespace](https://docs.python.org/3/reference/lexical_analysis.html#whitespace-between-tokens)
+/// or new-line characters.
+pub const fn is_python_whitespace(c: char) -> bool {
+    matches!(
+        c,
+        ' ' | '\n' | '\t' | '\r' |
+        // Form-feed
+        '\x0C'
+    )
+}
diff --git a/crates/ruff_python_formatter/Cargo.toml b/crates/ruff_python_formatter/Cargo.toml
index 4ca22b16b8132..15e3d215a4907 100644
--- a/crates/ruff_python_formatter/Cargo.toml
+++ b/crates/ruff_python_formatter/Cargo.toml
@@ -7,17 +7,17 @@ rust-version = { workspace = true }
 
 [dependencies]
 ruff_formatter = { path = "../ruff_formatter" }
+ruff_newlines = { path = "../ruff_newlines" }
 ruff_python_ast = { path = "../ruff_python_ast" }
-ruff_rustpython = { path = "../ruff_rustpython" }
 ruff_text_size = { workspace = true }
 
 anyhow = { workspace = true }
 clap = { workspace = true }
+countme = "3.0.1"
 is-macro = { workspace = true }
 itertools = { workspace = true }
 once_cell = { workspace = true }
 rustc-hash = { workspace = true }
-rustpython-common = { workspace = true }
 rustpython-parser = { workspace = true }
 
 [dev-dependencies]
diff --git a/crates/ruff_python_formatter/Docs.md b/crates/ruff_python_formatter/Docs.md
new file mode 100644
index 0000000000000..326dd33b81dd8
--- /dev/null
+++ b/crates/ruff_python_formatter/Docs.md
@@ -0,0 +1,8 @@
+# Rust Python Formatter
+
+For the formatter, we would like to implement `Format` from the rust_formatter crate for all AST
+nodes, defined in the rustpython_parser crate. This violates rust's orphan rules. We therefore
+generate in `generate.py` a newtype for each AST node with implementations of `FormatNodeRule`,
+`FormatRule`, `AsFormat` and `IntoFormat` on it.
+
+![excalidraw showing the relationships between the different types](orphan_rules_in_the_formatter.svg)
diff --git a/crates/ruff_python_formatter/generate.py b/crates/ruff_python_formatter/generate.py
new file mode 100644
index 0000000000000..272b0e73160b4
--- /dev/null
+++ b/crates/ruff_python_formatter/generate.py
@@ -0,0 +1,152 @@
+"""See Docs.md"""
+
+# %%
+
+import re
+from collections import defaultdict
+from pathlib import Path
+from subprocess import check_output
+
+
+def rustfmt(code: str) -> str:
+    return check_output(["rustfmt", "--emit=stdout"], input=code, text=True)
+
+
+# %%
+# Read nodes
+
+root = Path(
+    check_output(["git", "rev-parse", "--show-toplevel"], text=True).strip(),
+)
+nodes_file = (
+    root.joinpath("crates")
+    .joinpath("ruff_python_ast")
+    .joinpath("src")
+    .joinpath("node.rs")
+    .read_text()
+)
+node_lines = (
+    nodes_file.split("pub enum AnyNode {")[1].split("}")[0].strip().splitlines()
+)
+nodes = [node_line.split("(")[1].split("<")[0] for node_line in node_lines]
+print(nodes)
+
+# %%
+# Generate newtypes with dummy FormatNodeRule implementations
+
+out = (
+    root.joinpath("crates")
+    .joinpath("ruff_python_formatter")
+    .joinpath("src")
+    .joinpath("generated.rs")
+)
+src = root.joinpath("crates").joinpath("ruff_python_formatter").joinpath("src")
+
+nodes_grouped = defaultdict(list)
+# We rename because mod is a keyword in rust
+groups = {
+    "mod": "module",
+    "expr": "expression",
+    "stmt": "statement",
+    "pattern": "pattern",
+    "other": "other",
+}
+
+
+def group_for_node(node: str) -> str:
+    for group in groups:
+        if node.startswith(group.title()):
+            return group
+    else:
+        return "other"
+
+
+def to_camel_case(node: str) -> str:
+    """Converts PascalCase to camel_case"""
+    return re.sub("([A-Z])", r"_\1", node).lower().lstrip("_")
+
+
+for node in nodes:
+    nodes_grouped[group_for_node(node)].append(node)
+
+for group, group_nodes in nodes_grouped.items():
+    # These conflict with the manually content of the mod.rs files
+    # src.joinpath(groups[group]).mkdir(exist_ok=True)
+    # mod_section = "\n".join(
+    #     f"pub(crate) mod {to_camel_case(node)};" for node in group_nodes
+    # )
+    # src.joinpath(groups[group]).joinpath("mod.rs").write_text(rustfmt(mod_section))
+    for node in group_nodes:
+        code = f"""
+            use crate::{{verbatim_text, FormatNodeRule, PyFormatter}};
+            use ruff_formatter::{{write, Buffer, FormatResult}};
+            use rustpython_parser::ast::{node};
+
+            #[derive(Default)]
+            pub struct Format{node};
+
+            impl FormatNodeRule<{node}> for Format{node} {{
+                fn fmt_fields(&self, item: &{node}, f: &mut PyFormatter) -> FormatResult<()> {{
+                    write!(f, [verbatim_text(item.range)])
+                }}
+            }}
+            """.strip()  # noqa: E501
+        src.joinpath(groups[group]).joinpath(f"{to_camel_case(node)}.rs").write_text(
+            rustfmt(code)
+        )
+
+# %%
+# Generate `FormatRule`, `AsFormat` and `IntoFormat`
+
+generated = """//! This is a generated file. Don't modify it by hand! Run `scripts/generate.py` to re-generate the file.
+use crate::context::PyFormatContext;
+use crate::{AsFormat, FormatNodeRule, IntoFormat};
+use ruff_formatter::formatter::Formatter;
+use ruff_formatter::{FormatOwnedWithRule, FormatRefWithRule, FormatResult, FormatRule};
+use rustpython_parser::ast;
+"""  # noqa: E501
+for node in nodes:
+    text = f"""
+        impl FormatRule<ast::{node}, PyFormatContext<'_>>
+            for crate::{groups[group_for_node(node)]}::{to_camel_case(node)}::Format{node}
+        {{
+            #[inline]
+            fn fmt(
+                &self,
+                node: &ast::{node},
+                f: &mut Formatter<PyFormatContext<'_>>,
+            ) -> FormatResult<()> {{
+                FormatNodeRule::<ast::{node}>::fmt(self, node, f)
+            }}
+        }}
+        impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::{node} {{
+            type Format<'a> = FormatRefWithRule<
+                'a,
+                ast::{node},
+                crate::{groups[group_for_node(node)]}::{to_camel_case(node)}::Format{node},
+                PyFormatContext<'ast>,
+            >;
+            fn format(&self) -> Self::Format<'_> {{
+                FormatRefWithRule::new(
+                    self,
+                    crate::{groups[group_for_node(node)]}::{to_camel_case(node)}::Format{node}::default(),
+                )
+            }}
+        }}
+        impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::{node} {{
+            type Format = FormatOwnedWithRule<
+                ast::{node},
+                crate::{groups[group_for_node(node)]}::{to_camel_case(node)}::Format{node},
+                PyFormatContext<'ast>,
+            >;
+            fn into_format(self) -> Self::Format {{
+                FormatOwnedWithRule::new(
+                    self,
+                    crate::{groups[group_for_node(node)]}::{to_camel_case(node)}::Format{node}::default(),
+                )
+            }}
+        }}
+    """  # noqa: E501
+    generated += text
+
+out.write_text(rustfmt(generated))
diff --git a/crates/ruff_python_formatter/orphan_rules_in_the_formatter.svg b/crates/ruff_python_formatter/orphan_rules_in_the_formatter.svg
new file mode 100644
index 0000000000000..437ba37b3048d
--- /dev/null
+++ b/crates/ruff_python_formatter/orphan_rules_in_the_formatter.svg
@@ -0,0 +1,16 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 904.4493713378906 1205.5499755859375" width="904.4493713378906" height="1205.5499755859375">
+  <!-- svg-source:excalidraw -->
+  
+  <defs>
+    <style class="style-fonts">
+      @font-face {
+        font-family: "Virgil";
+        src: url("https://excalidraw.com/Virgil.woff2");
+      }
+      @font-face {
+        font-family: "Cascadia";
+        src: url("https://excalidraw.com/Cascadia.woff2");
+      }
+    </style>
+  </defs>
+  <rect x="0" y="0" width="904.4493713378906" height="1205.5499755859375" fill="#ffffff"></rect><g transform="translate(75.99053955078125 415.4000122070313) rotate(0 52.734375 12)"><text x="0" y="0" font-family="Cascadia, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">JsonArray</text></g><g transform="translate(52.790618896484375 761.9999877929688) rotate(0 82.03125 12)"><text x="0" y="0" font-family="Cascadia, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">FormatNodeRule</text></g><g transform="translate(544.5905456542969 459.9999877929688) rotate(0 111.328125 12)"><text x="0" y="0" font-family="Cascadia, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">FormatOwnedWithRule</text></g><g transform="translate(54.690582275390625 651.4999267578125) rotate(0 88.8519287109375 12.136557610241823)"><text x="0" y="0" font-family="Cascadia, Segoe UI Emoji" font-size="20.227596017069697px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">FormatJsonArray</text></g><g transform="translate(600.4999694824219 240.7000610351563) rotate(0 34.22996520996094 12.5)"><text x="0" y="0" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">Format</text></g><g stroke-linecap="round"><g transform="translate(637.8446647951721 397.70000000000005) rotate(0 -1.834013788772154 -58.84758057445288)"><path d="M-0.33 -1.09 C-0.75 -20.52, -2.56 -97.43, -3.34 -116.61" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 7"></path></g><g transform="translate(637.8446647951721 397.70000000000005) rotate(0 -1.834013788772154 -58.84758057445288)"><path d="M5.97 -87.4 C4.52 -96.74, 2.68 -102.63, -4.49 -116.68" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 5"></path></g><g transform="translate(637.8446647951721 397.70000000000005) rotate(0 -1.834013788772154 -58.84758057445288)"><path d="M-14.54 -86.77 C-11.21 -96.2, -8.27 -102.24, -4.49 -116.68" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 5"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(133.78520379737517 688.3253637475933) rotate(0 -0.08251605632852943 31.547004500122625)"><path d="M0.12 -1.09 C0.06 9.8, -0.3 53.2, -0.28 64.18" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 7"></path></g><g transform="translate(133.78520379737517 688.3253637475933) rotate(0 -0.08251605632852943 31.547004500122625)"><path d="M-12.25 35.07 C-6.99 44.58, -2.79 53.51, 1.44 65.21" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 5"></path></g><g transform="translate(133.78520379737517 688.3253637475933) rotate(0 -0.08251605632852943 31.547004500122625)"><path d="M8.27 35.15 C7.22 44.66, 5.1 53.56, 1.44 65.21" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 5"></path></g></g><mask></mask><g transform="translate(548.5718688964844 412.29997558593755) rotate(0 99.609375 12)"><text x="0" y="0" font-family="Cascadia, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">FormatRefWithRule</text></g><g transform="translate(173.49996948242188 197.9000122070313) rotate(0 46.21995544433594 12.5)"><text x="0" y="0" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">AsFormat</text></g><g stroke-linecap="round"><g transform="translate(379.2999572753906 98.69999237060551) rotate(0 -4.2395088180899165 397.3698763117194)"><path d="M-0.67 -0.83 C-1.88 131.8, -6.37 662.91, -7.81 795.57" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 7"></path></g></g><mask></mask><g transform="translate(571.2999572753906 94.10000915527348) rotate(0 49.64994812011719 12.5)"><text x="0" y="0" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">Formatter</text></g><g transform="translate(137.29995727539062 94.89999694824223) rotate(0 86.74990844726562 12.5)"><text x="0" y="0" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">Python Formatter</text></g><g transform="translate(170.6799774169922 237.20000000000005) rotate(0 55.539947509765625 12.5)"><text x="0" y="0" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">IntoFormat</text></g><g stroke-linecap="round"><g transform="translate(539.8374268938372 497.0520881963365) rotate(0 -150.8179816883952 75.17975331683893)"><path d="M0.66 1.04 C-11.86 16.71, -25.77 70.18, -76.27 94.9 C-126.76 119.61, -264.46 140.51, -302.3 149.32" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="8 9"></path></g><g transform="translate(539.8374268938372 497.0520881963365) rotate(0 -150.8179816883952 75.17975331683893)"><path d="M-274.88 134.28 C-282.07 138.56, -285.3 140.1, -302.99 150.04" stroke="#1e1e1e" stroke-width="1.5" fill="none"></path></g><g transform="translate(539.8374268938372 497.0520881963365) rotate(0 -150.8179816883952 75.17975331683893)"><path d="M-270.93 154.42 C-279.09 154.54, -283.14 151.91, -302.99 150.04" stroke="#1e1e1e" stroke-width="1.5" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(532.3000183105469 470.7974845151837) rotate(0 -213.30347040037128 12.346450118467985)"><path d="M0.18 -0.33 C-64.04 6.73, -314.56 45.23, -384.68 42.32 C-454.81 39.41, -414.8 -7.76, -420.57 -17.78" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="8 9"></path></g><g transform="translate(532.3000183105469 470.7974845151837) rotate(0 -213.30347040037128 12.346450118467985)"><path d="M-415.89 10.95 C-418.46 0.91, -420.79 -7.3, -422.45 -15.8" stroke="#1e1e1e" stroke-width="1.5" fill="none"></path></g><g transform="translate(532.3000183105469 470.7974845151837) rotate(0 -213.30347040037128 12.346450118467985)"><path d="M-436.1 7.4 C-431.61 -1.43, -426.88 -8.4, -422.45 -15.8" stroke="#1e1e1e" stroke-width="1.5" fill="none"></path></g></g><mask></mask><g transform="translate(611.0999450683594 656.9000122070313) rotate(0 54.789939880371094 12.5)"><text x="0" y="0" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">FormatRule</text></g><g transform="translate(42.990570068359375 802.2) rotate(0 116.6734619140625 21)"><text x="0" y="0" font-family="Helvetica, Segoe UI Emoji" font-size="18.26086956521739px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">Like FormatRule, but with</text><text x="0" y="20.999999999999996" font-family="Helvetica, Segoe UI Emoji" font-size="18.26086956521739px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">language specific extensions</text></g><g transform="translate(344.1499328613281 920.5499755859375) rotate(0 275.14971923828125 137.5)"><text x="0" y="0" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">Alternative:</text><text x="0" y="25" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge"></text><text x="0" y="50" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">struct FormatJsonArray&lt;'a&gt;(pub(crate) &amp;'a JsonArray);</text><text x="0" y="75" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">struct IntoFormatJsonArray&lt;'a&gt;(pub(crate) JsonArray);</text><text x="0" y="100" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge"></text><text x="0" y="125" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">impl Format for FormatJsonArray();</text><text x="0" y="150" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge"></text><text x="0" y="175" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">write!(f, [FormatJsonArray(array)])</text><text x="0" y="200" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge"></text><text x="0" y="225" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">Inspiration</text><text x="0" y="250" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">PathBuf::display() -&gt; Display</text></g><g transform="translate(160.74057006835938 287.45000000000005) rotate(0 90.5859375 34.5)"><text x="0" y="0" font-family="Helvetica, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">We put this in</text><text x="0" y="23" font-family="Helvetica, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">every downstream</text><text x="0" y="46" font-family="Helvetica, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">crate to get .format()</text></g><g stroke-linecap="round"><g transform="translate(129.0656606945479 410.20000000000005) rotate(0 5.555782686903626 -87.19060253774916)"><path d="M-1.19 -0.23 C-4.09 -17.48, -21.69 -75.66, -16.71 -104.65 C-11.72 -133.64, 21.24 -162.3, 28.7 -174.16" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 7"></path></g><g transform="translate(129.0656606945479 410.20000000000005) rotate(0 5.555782686903626 -87.19060253774916)"><path d="M18.32 -144.01 C21.44 -154.67, 27.99 -165.87, 27.93 -174.69" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 5"></path></g><g transform="translate(129.0656606945479 410.20000000000005) rotate(0 5.555782686903626 -87.19060253774916)"><path d="M2.48 -157.05 C11.13 -162.9, 23.34 -169.45, 27.93 -174.69" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 5"></path></g></g><mask></mask><g transform="translate(563.1905212402344 694.3998901367188) rotate(0 116.71875 11.5)"><text x="0" y="0" font-family="Helvetica, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">has JsonArray type param</text></g><g transform="translate(560.5905456542969 507.9999877929688) rotate(0 103.9404296875 34.5)"><text x="0" y="0" font-family="Helvetica, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">Gets FormatJsonArray,</text><text x="0" y="23" font-family="Helvetica, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">knows about JsonArray</text><text x="0" y="46" font-family="Helvetica, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">through FormatRule</text></g><g stroke-linecap="round"><g transform="translate(152.23770286887884 943.2390276446938) rotate(0 71.14746363013984 0.19196166910330703)"><path d="M-0.39 -0.74 C23.37 -0.66, 118.65 1.11, 142.68 1.13" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 7"></path></g><g transform="translate(152.23770286887884 943.2390276446938) rotate(0 71.14746363013984 0.19196166910330703)"><path d="M113.14 10.14 C124.15 8.94, 130.09 3.22, 142.75 0.46" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 5"></path></g><g transform="translate(152.23770286887884 943.2390276446938) rotate(0 71.14746363013984 0.19196166910330703)"><path d="M113.36 -10.38 C124.41 -5.15, 130.29 -4.45, 142.75 0.46" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 5"></path></g></g><mask></mask><g transform="translate(11.89996337890625 929.9000732421875) rotate(0 49.099945068359375 12.5)"><text x="0" y="0" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">implements</text></g><g transform="translate(10 984.000048828125) rotate(0 50.45994567871094 12.5)"><text x="0" y="0" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">references</text></g><g stroke-linecap="round"><g transform="translate(145.49996948242188 991.500048828125) rotate(0 70.99407679885627 0.5776236892631914)"><path d="M0.04 0.87 C23.74 0.76, 118.44 0.54, 141.95 0.29" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="8 9"></path></g><g transform="translate(145.49996948242188 991.500048828125) rotate(0 70.99407679885627 0.5776236892631914)"><path d="M115.27 10.8 C123.16 6.46, 129.44 3.36, 140.72 0.87" stroke="#1e1e1e" stroke-width="1.5" fill="none"></path></g><g transform="translate(145.49996948242188 991.500048828125) rotate(0 70.99407679885627 0.5776236892631914)"><path d="M115.15 -9.72 C123.24 -8.36, 129.55 -5.75, 140.72 0.87" stroke="#1e1e1e" stroke-width="1.5" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(244.800018310547 660.1415946656541) rotate(0 175.60834839195007 2.9824651267731213)"><path d="M-1.05 1.18 C57.48 2.15, 293.55 4.13, 352.27 4.78" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 7"></path></g><g transform="translate(244.800018310547 660.1415946656541) rotate(0 175.60834839195007 2.9824651267731213)"><path d="M325.95 16.72 C335.57 11.35, 347.18 6.06, 352.43 5.46" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 5"></path></g><g transform="translate(244.800018310547 660.1415946656541) rotate(0 175.60834839195007 2.9824651267731213)"><path d="M326.15 -3.8 C335.51 -1.15, 347.05 1.58, 352.43 5.46" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 5"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(543.9374786452586 692.4997829756555) rotate(0 -160.05633398630698 50.095879988414936)"><path d="M-0.47 1.17 C-14.29 16.92, -29.17 79.09, -82.52 93.79 C-135.86 108.49, -280.99 89.97, -320.55 89.37 M1.48 0.74 C-12.02 16.21, -26.58 77.03, -80.42 92.04 C-134.26 107.04, -281.73 91.4, -321.59 90.76" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(543.9374786452586 692.4997829756555) rotate(0 -160.05633398630698 50.095879988414936)"><path d="M-290.91 80.16 C-301.3 84.02, -311.77 87.95, -319.96 90.66 M-293.77 81.26 C-304.25 84.76, -312.75 87.84, -321.61 89.84" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(543.9374786452586 692.4997829756555) rotate(0 -160.05633398630698 50.095879988414936)"><path d="M-292.08 100.65 C-301.96 97.7, -312.04 94.83, -319.96 90.66 M-294.94 101.75 C-304.91 97.83, -312.98 93.47, -321.61 89.84" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g transform="translate(490.3000183105469 797.1000244140625) rotate(0 22.379974365234375 12.5)"><text x="0" y="0" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">calls</text></g><g transform="translate(377.2405700683594 371.45000000000005) rotate(0 36.1376953125 11.5)"><text x="0" y="0" font-family="Helvetica, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">our goal</text></g><g transform="translate(15.990570068359375 10) rotate(0 399.2080078125 20.69999999999999)"><text x="0" y="0" font-family="Helvetica, Segoe UI Emoji" font-size="36px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="text-before-edge">Getting Around the Orphan Rules in the Formatter</text></g><g stroke-linecap="round"><g transform="translate(187.74057006835938 431.6180634988329) rotate(0 201.1074482795829 -91.68550953275175)"><path d="M1.08 -0.29 C36.99 -12.67, 149.56 -42.86, 216.38 -73.33 C283.21 -103.79, 371.24 -164.81, 402.03 -183.08 M0.19 -1.49 C36.37 -13.8, 151.59 -42.11, 218.51 -72.14 C285.42 -102.16, 371.2 -163.38, 401.67 -181.63" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(187.74057006835938 431.6180634988329) rotate(0 201.1074482795829 -91.68550953275175)"><path d="M383.05 -159.59 C389.13 -165.66, 397.53 -176.24, 402.33 -183.01 M383.9 -158.14 C391.1 -166.01, 396.54 -174.61, 401.06 -180.85" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(187.74057006835938 431.6180634988329) rotate(0 201.1074482795829 -91.68550953275175)"><path d="M371.93 -176.83 C382.35 -176.46, 394.97 -180.51, 402.33 -183.01 M372.78 -175.38 C383.86 -176.9, 393.34 -179.23, 401.06 -180.85" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask></svg>
\ No newline at end of file
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/binary_expression.py b/crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/binary_expression.py
new file mode 100644
index 0000000000000..90042fa065a66
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/binary_expression.py
@@ -0,0 +1,43 @@
+(aaaaaaaa
+    + # trailing operator comment
+    b # trailing right comment
+)
+
+
+(aaaaaaaa # trailing left comment
+    +  # trailing operator comment
+    # leading right comment
+    b
+)
+
+
+# Black breaks the right side first for the following expressions:
+aaaaaaaaaaaaaa + caaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaal(argument1, argument2, argument3)
+aaaaaaaaaaaaaa + [bbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccc, dddddddddddddddd, eeeeeee]
+aaaaaaaaaaaaaa + (bbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccc, dddddddddddddddd, eeeeeee)
+aaaaaaaaaaaaaa + { key1:bbbbbbbbbbbbbbbbbbbbbb, key2: ccccccccccccccccccccc, key3: dddddddddddddddd, key4: eeeeeee }
+aaaaaaaaaaaaaa + { bbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccc, dddddddddddddddd, eeeeeee }
+aaaaaaaaaaaaaa + [a for x in bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ]
+aaaaaaaaaaaaaa + (a for x in bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb )
+aaaaaaaaaaaaaa + {a for x in bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb}
+
+# Wraps it in parentheses if it needs to break both left and right
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + [
+    bbbbbbbbbbbbbbbbbbbbbb,
+    ccccccccccccccccccccc,
+    dddddddddddddddd,
+    eee
+] # comment
+
+
+
+# But only for expressions that have a statement parent.
+not (aaaaaaaaaaaaaa + {a for x in bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb})
+[a + [bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb] in c ]
+
+
+# leading comment
+(
+    # comment
+    content + b
+)
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/while.py b/crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/while.py
new file mode 100644
index 0000000000000..79c0d09c8c491
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/while.py
@@ -0,0 +1,30 @@
+while 34: # trailing test comment
+    pass # trailing last statement comment
+
+    # trailing while body comment
+
+# leading else comment
+
+else: # trailing else comment
+    pass
+
+    # trailing else body comment
+
+
+while aVeryLongConditionThatSpillsOverToTheNextLineBecauseItIsExtremelyLongAndGoesOnAndOnAndOnAndOnAndOnAndOnAndOnAndOnAndOn: # trailing comment
+    pass
+
+else:
+    ...
+
+while (
+    some_condition(unformatted, args) and anotherCondition or aThirdCondition
+):  # comment
+    print("Do something")
+
+
+while (
+    some_condition(unformatted, args) # trailing some condition
+    and anotherCondition or aThirdCondition  # trailing third condition
+):  # comment
+    print("Do something")
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/ruff/trivia.py b/crates/ruff_python_formatter/resources/test/fixtures/ruff/trivia.py
new file mode 100644
index 0000000000000..fcf6002e3fc7d
--- /dev/null
+++ b/crates/ruff_python_formatter/resources/test/fixtures/ruff/trivia.py
@@ -0,0 +1,32 @@
+
+# Removes the line above
+
+a = 10  # Keeps the line above
+
+# Separated by one line from `a` and `b`
+
+b = 20
+# Adds two lines after `b`
+class Test:
+    def a(self):
+        pass
+        # trailing comment
+
+# two lines before, one line after
+
+c = 30
+
+while a == 10:
+    ...
+
+    # trailing comment with one line before
+
+# one line before this leading comment
+
+d = 40
+
+while b == 20:
+    ...
+    # no empty line before
+
+e = 50  # one empty line before
diff --git a/crates/ruff_python_formatter/src/attachment.rs b/crates/ruff_python_formatter/src/attachment.rs
deleted file mode 100644
index 55d6072a96278..0000000000000
--- a/crates/ruff_python_formatter/src/attachment.rs
+++ /dev/null
@@ -1,125 +0,0 @@
-use crate::cst::visitor;
-use crate::cst::visitor::Visitor;
-use crate::cst::{
-    Alias, Arg, Body, BoolOp, CmpOp, Excepthandler, Expr, Keyword, Operator, Pattern, SliceIndex,
-    Stmt, UnaryOp,
-};
-use crate::trivia::{decorate_trivia, TriviaIndex, TriviaToken};
-
-struct AttachmentVisitor {
-    index: TriviaIndex,
-}
-
-impl<'a> Visitor<'a> for AttachmentVisitor {
-    fn visit_body(&mut self, body: &'a mut Body) {
-        let trivia = self.index.body.remove(&body.id());
-        if let Some(comments) = trivia {
-            body.trivia.extend(comments);
-        }
-        visitor::walk_body(self, body);
-    }
-
-    fn visit_stmt(&mut self, stmt: &'a mut Stmt) {
-        let trivia = self.index.stmt.remove(&stmt.id());
-        if let Some(comments) = trivia {
-            stmt.trivia.extend(comments);
-        }
-        visitor::walk_stmt(self, stmt);
-    }
-
-    fn visit_expr(&mut self, expr: &'a mut Expr) {
-        let trivia = self.index.expr.remove(&expr.id());
-        if let Some(comments) = trivia {
-            expr.trivia.extend(comments);
-        }
-        visitor::walk_expr(self, expr);
-    }
-
-    fn visit_alias(&mut self, alias: &'a mut Alias) {
-        let trivia = self.index.alias.remove(&alias.id());
-        if let Some(comments) = trivia {
-            alias.trivia.extend(comments);
-        }
-        visitor::walk_alias(self, alias);
-    }
-
-    fn visit_arg(&mut self, arg: &'a mut Arg) {
-        let trivia = self.index.arg.remove(&arg.id());
-        if let Some(comments) = trivia {
-            arg.trivia.extend(comments);
-        }
-        visitor::walk_arg(self, arg);
-    }
-
-    fn visit_excepthandler(&mut self, excepthandler: &'a mut Excepthandler) {
-        let trivia = self.index.excepthandler.remove(&excepthandler.id());
-        if let Some(comments) = trivia {
-            excepthandler.trivia.extend(comments);
-        }
-        visitor::walk_excepthandler(self, excepthandler);
-    }
-
-    fn visit_keyword(&mut self, keyword: &'a mut Keyword) {
-        let trivia = self.index.keyword.remove(&keyword.id());
-        if let Some(comments) = trivia {
-            keyword.trivia.extend(comments);
-        }
-        visitor::walk_keyword(self, keyword);
-    }
-
-    fn visit_bool_op(&mut self, bool_op: &'a mut BoolOp) {
-        let trivia = self.index.bool_op.remove(&bool_op.id());
-        if let Some(comments) = trivia {
-            bool_op.trivia.extend(comments);
-        }
-        visitor::walk_bool_op(self, bool_op);
-    }
-
-    fn visit_unary_op(&mut self, unary_op: &'a mut UnaryOp) {
-        let trivia = self.index.unary_op.remove(&unary_op.id());
-        if let Some(comments) = trivia {
-            unary_op.trivia.extend(comments);
-        }
-        visitor::walk_unary_op(self, unary_op);
-    }
-
-    fn visit_cmp_op(&mut self, cmp_op: &'a mut CmpOp) {
-        let trivia = self.index.cmp_op.remove(&cmp_op.id());
-        if let Some(comments) = trivia {
-            cmp_op.trivia.extend(comments);
-        }
-        visitor::walk_cmp_op(self, cmp_op);
-    }
-
-    fn visit_operator(&mut self, operator: &'a mut Operator) {
-        let trivia = self.index.operator.remove(&operator.id());
-        if let Some(comments) = trivia {
-            operator.trivia.extend(comments);
-        }
-        visitor::walk_operator(self, operator);
-    }
-
-    fn visit_slice_index(&mut self, slice_index: &'a mut SliceIndex) {
-        let trivia = self.index.slice_index.remove(&slice_index.id());
-        if let Some(comments) = trivia {
-            slice_index.trivia.extend(comments);
-        }
-        visitor::walk_slice_index(self, slice_index);
-    }
-
-    fn visit_pattern(&mut self, pattern: &'a mut Pattern) {
-        let trivia = self.index.pattern.remove(&pattern.id());
-        if let Some(comments) = trivia {
-            pattern.trivia.extend(comments);
-        }
-        visitor::walk_pattern(self, pattern);
-    }
-}
-
-pub fn attach(python_cst: &mut [Stmt], trivia: Vec<TriviaToken>) {
-    let index = decorate_trivia(trivia, python_cst);
-    let mut visitor = AttachmentVisitor { index };
-    for stmt in python_cst {
-        visitor.visit_stmt(stmt);
-    }
-}
diff --git a/crates/ruff_python_formatter/src/builders.rs b/crates/ruff_python_formatter/src/builders.rs
new file mode 100644
index 0000000000000..36ea6d6b2aa27
--- /dev/null
+++ b/crates/ruff_python_formatter/src/builders.rs
@@ -0,0 +1,239 @@
+use crate::context::NodeLevel;
+use crate::prelude::*;
+use crate::trivia::{lines_after, skip_trailing_trivia};
+use ruff_formatter::write;
+use ruff_text_size::TextSize;
+use rustpython_parser::ast::Ranged;
+
+/// Provides Python specific extensions to [`Formatter`].
+pub(crate) trait PyFormatterExtensions<'ast, 'buf> {
+    /// Creates a joiner that inserts the appropriate number of empty lines between two nodes, depending on the
+    /// line breaks that separate the two nodes in the source document. The `level` customizes the maximum allowed
+    /// empty lines between any two nodes. Separates any two nodes by at least a hard line break.
+    ///
+    /// * [`NodeLevel::Module`]: Up to two empty lines
+    /// * [`NodeLevel::CompoundStatement`]: Up to one empty line
+    /// * [`NodeLevel::Expression`]: No empty lines
+    fn join_nodes<'fmt>(&'fmt mut self, level: NodeLevel) -> JoinNodesBuilder<'fmt, 'ast, 'buf>;
+}
+
+impl<'buf, 'ast> PyFormatterExtensions<'ast, 'buf> for PyFormatter<'ast, 'buf> {
+    fn join_nodes<'fmt>(&'fmt mut self, level: NodeLevel) -> JoinNodesBuilder<'fmt, 'ast, 'buf> {
+        JoinNodesBuilder::new(self, level)
+    }
+}
+
+#[must_use = "must eventually call `finish()` on the builder."]
+pub(crate) struct JoinNodesBuilder<'fmt, 'ast, 'buf> {
+    fmt: &'fmt mut PyFormatter<'ast, 'buf>,
+    result: FormatResult<()>,
+    last_end: Option<TextSize>,
+    node_level: NodeLevel,
+}
+
+impl<'fmt, 'ast, 'buf> JoinNodesBuilder<'fmt, 'ast, 'buf> {
+    fn new(fmt: &'fmt mut PyFormatter<'ast, 'buf>, level: NodeLevel) -> Self {
+        Self {
+            fmt,
+            result: Ok(()),
+            last_end: None,
+            node_level: level,
+        }
+    }
+
+    /// Writes a `node`, inserting the appropriate number of line breaks depending on the number of
+    /// line breaks that were present in the source document. Uses `content` to format the `node`.
+    pub(crate) fn entry<T>(&mut self, node: &T, content: &dyn Format<PyFormatContext<'ast>>)
+    where
+        T: Ranged,
+    {
+        let node_level = self.node_level;
+
+        self.result = self.result.and_then(|_| {
+            if let Some(last_end) = self.last_end.replace(node.end()) {
+                let source = self.fmt.context().contents();
+                let count_lines = |offset| {
+                    // It's necessary to skip any trailing line comment because RustPython doesn't include trailing comments
+                    // in the node's range
+                    // ```python
+                    // a # The range of `a` ends right before this comment
+                    //
+                    // b
+                    // ```
+                    //
+                    // Simply using `lines_after` doesn't work if a statement has a trailing comment because
+                    // it then counts the lines between the statement and the trailing comment, which is
+                    // always 0. This is why it skips any trailing trivia (trivia that's on the same line)
+                    // and counts the lines after.
+                    let after_trailing_trivia = skip_trailing_trivia(offset, source);
+                    lines_after(after_trailing_trivia, source)
+                };
+
+                match node_level {
+                    NodeLevel::TopLevel => match count_lines(last_end) {
+                        0 | 1 => hard_line_break().fmt(self.fmt),
+                        2 => empty_line().fmt(self.fmt),
+                        _ => write!(self.fmt, [empty_line(), empty_line()]),
+                    },
+                    NodeLevel::CompoundStatement => match count_lines(last_end) {
+                        0 | 1 => hard_line_break().fmt(self.fmt),
+                        _ => empty_line().fmt(self.fmt),
+                    },
+                    NodeLevel::Expression => hard_line_break().fmt(self.fmt),
+                }?;
+            }
+
+            content.fmt(self.fmt)
+        });
+    }
+
+    /// Writes a sequence of node with their content tuples, inserting the appropriate number of line breaks between any two of them
+    /// depending on the number of line breaks that exist in the source document.
+    #[allow(unused)]
+    pub(crate) fn entries<T, F, I>(&mut self, entries: I) -> &mut Self
+    where
+        T: Ranged,
+        F: Format<PyFormatContext<'ast>>,
+        I: IntoIterator<Item = (T, F)>,
+    {
+        for (node, content) in entries {
+            self.entry(&node, &content);
+        }
+
+        self
+    }
+
+    /// Writes a sequence of nodes, using their [`AsFormat`] implementation to format the content.
+    /// Inserts the appropriate number of line breaks between any two nodes, depending on the number of
+    /// line breaks in the source document.
+    #[allow(unused)]
+    pub(crate) fn nodes<'a, T, I>(&mut self, nodes: I) -> &mut Self
+    where
+        T: Ranged + AsFormat<PyFormatContext<'ast>> + 'a,
+        I: IntoIterator<Item = &'a T>,
+    {
+        for node in nodes {
+            self.entry(node, &node.format());
+        }
+
+        self
+    }
+
+    /// Writes a single entry using the specified separator to separate the entry from a previous entry.
+    pub(crate) fn entry_with_separator<T>(
+        &mut self,
+        separator: &dyn Format<PyFormatContext<'ast>>,
+        content: &dyn Format<PyFormatContext<'ast>>,
+        node: &T,
+    ) where
+        T: Ranged,
+    {
+        self.result = self.result.and_then(|_| {
+            if self.last_end.is_some() {
+                separator.fmt(self.fmt)?;
+            }
+
+            self.last_end = Some(node.end());
+
+            content.fmt(self.fmt)
+        });
+    }
+
+    /// Finishes the joiner and gets the format result.
+    pub(crate) fn finish(&mut self) -> FormatResult<()> {
+        self.result
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::comments::Comments;
+    use crate::context::{NodeLevel, PyFormatContext};
+    use crate::prelude::*;
+    use ruff_formatter::format;
+    use ruff_formatter::SimpleFormatOptions;
+    use rustpython_parser::ast::ModModule;
+    use rustpython_parser::Parse;
+
+    fn format_ranged(level: NodeLevel) -> String {
+        let source = r#"
+a = 10
+
+
+
+three_leading_newlines = 80
+
+
+two_leading_newlines = 20
+
+one_leading_newline = 10
+no_leading_newline = 30
+"#;
+
+        let module = ModModule::parse(source, "test.py").unwrap();
+
+        let context =
+            PyFormatContext::new(SimpleFormatOptions::default(), source, Comments::default());
+
+        let test_formatter =
+            format_with(|f: &mut PyFormatter| f.join_nodes(level).nodes(&module.body).finish());
+
+        let formatted = format!(context, [test_formatter]).unwrap();
+        let printed = formatted.print().unwrap();
+
+        printed.as_code().to_string()
+    }
+
+    // Keeps up to two empty lines
+    #[test]
+    fn ranged_builder_top_level() {
+        let printed = format_ranged(NodeLevel::TopLevel);
+
+        assert_eq!(
+            &printed,
+            r#"NOT_YET_IMPLEMENTED_StmtAssign
+
+
+NOT_YET_IMPLEMENTED_StmtAssign
+
+
+NOT_YET_IMPLEMENTED_StmtAssign
+
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign"#
+        );
+    }
+
+    // Should keep at most one empty level
+    #[test]
+    fn ranged_builder_statement_level() {
+        let printed = format_ranged(NodeLevel::CompoundStatement);
+
+        assert_eq!(
+            &printed,
+            r#"NOT_YET_IMPLEMENTED_StmtAssign
+
+NOT_YET_IMPLEMENTED_StmtAssign
+
+NOT_YET_IMPLEMENTED_StmtAssign
+
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign"#
+        );
+    }
+
+    // Removes all empty lines
+    #[test]
+    fn ranged_builder_parenthesized_level() {
+        let printed = format_ranged(NodeLevel::Expression);
+
+        assert_eq!(
+            &printed,
+            r#"NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign"#
+        );
+    }
+}
diff --git a/crates/ruff_python_formatter/src/cli.rs b/crates/ruff_python_formatter/src/cli.rs
index 87d7dc06aa7a8..f605e6640768a 100644
--- a/crates/ruff_python_formatter/src/cli.rs
+++ b/crates/ruff_python_formatter/src/cli.rs
@@ -1,11 +1,75 @@
+#![allow(clippy::print_stdout)]
+
 use std::path::PathBuf;
 
-use clap::{command, Parser};
+use anyhow::{bail, Context, Result};
+use clap::{command, Parser, ValueEnum};
+use rustpython_parser::lexer::lex;
+use rustpython_parser::{parse_tokens, Mode};
+
+use ruff_formatter::SourceCode;
+use ruff_python_ast::source_code::CommentRangesBuilder;
+
+use crate::format_node;
+
+#[derive(ValueEnum, Clone, Debug)]
+pub enum Emit {
+    /// Write back to the original files
+    Files,
+    /// Write to stdout
+    Stdout,
+}
 
 #[derive(Parser)]
 #[command(author, version, about, long_about = None)]
 pub struct Cli {
-    /// Python file to round-trip.
-    #[arg(required = true)]
-    pub file: PathBuf,
+    /// Python files to format. If there are none, stdin will be used. `-` as stdin is not supported
+    pub files: Vec<PathBuf>,
+    #[clap(long)]
+    pub emit: Option<Emit>,
+    /// Run in 'check' mode. Exits with 0 if input is formatted correctly. Exits with 1 and prints
+    /// a diff if formatting is required.
+    #[clap(long)]
+    pub check: bool,
+    #[clap(long)]
+    pub print_ir: bool,
+    #[clap(long)]
+    pub print_comments: bool,
+}
+
+pub fn format_and_debug_print(input: &str, cli: &Cli) -> Result<String> {
+    let mut tokens = Vec::new();
+    let mut comment_ranges = CommentRangesBuilder::default();
+
+    for result in lex(input, Mode::Module) {
+        let (token, range) = match result {
+            Ok((token, range)) => (token, range),
+            Err(err) => bail!("Source contains syntax errors {err:?}"),
+        };
+
+        comment_ranges.visit_token(&token, range);
+        tokens.push(Ok((token, range)));
+    }
+
+    let comment_ranges = comment_ranges.finish();
+
+    // Parse the AST.
+    let python_ast = parse_tokens(tokens, Mode::Module, "<filename>")
+        .with_context(|| "Syntax error in input")?;
+
+    let formatted = format_node(&python_ast, &comment_ranges, input)?;
+    if cli.print_ir {
+        println!("{}", formatted.document().display(SourceCode::new(input)));
+    }
+    if cli.print_comments {
+        println!(
+            "{:?}",
+            formatted.context().comments().debug(SourceCode::new(input))
+        );
+    }
+    Ok(formatted
+        .print()
+        .with_context(|| "Failed to print the formatter IR")?
+        .as_code()
+        .to_string())
 }
diff --git a/crates/ruff_python_formatter/src/comments/debug.rs b/crates/ruff_python_formatter/src/comments/debug.rs
new file mode 100644
index 0000000000000..6e37ac5ff6c7b
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/debug.rs
@@ -0,0 +1,241 @@
+use crate::comments::node_key::NodeRefEqualityKey;
+use crate::comments::{CommentsMap, SourceComment};
+use itertools::Itertools;
+use ruff_formatter::SourceCode;
+use ruff_python_ast::prelude::*;
+use std::fmt::{Debug, Formatter, Write};
+
+/// Prints a debug representation of [`SourceComment`] that includes the comment's text
+pub(crate) struct DebugComment<'a> {
+    comment: &'a SourceComment,
+    source_code: SourceCode<'a>,
+}
+
+impl<'a> DebugComment<'a> {
+    pub(super) fn new(comment: &'a SourceComment, source_code: SourceCode<'a>) -> Self {
+        Self {
+            comment,
+            source_code,
+        }
+    }
+}
+
+impl Debug for DebugComment<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        let mut strut = f.debug_struct("SourceComment");
+
+        strut
+            .field("text", &self.comment.slice.text(self.source_code))
+            .field("position", &self.comment.position);
+
+        #[cfg(debug_assertions)]
+        strut.field("formatted", &self.comment.formatted.get());
+
+        strut.finish()
+    }
+}
+
+/// Pretty-printed debug representation of [`Comments`].
+pub(crate) struct DebugComments<'a> {
+    comments: &'a CommentsMap<'a>,
+    source_code: SourceCode<'a>,
+}
+
+impl<'a> DebugComments<'a> {
+    pub(super) fn new(comments: &'a CommentsMap, source_code: SourceCode<'a>) -> Self {
+        Self {
+            comments,
+            source_code,
+        }
+    }
+}
+
+impl Debug for DebugComments<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        let mut map = f.debug_map();
+
+        for node in self.comments.keys().sorted_by_key(|key| key.node().start()) {
+            map.entry(
+                &NodeKindWithSource {
+                    key: *node,
+                    source: self.source_code,
+                },
+                &DebugNodeComments {
+                    comments: self.comments,
+                    source_code: self.source_code,
+                    key: *node,
+                },
+            );
+        }
+
+        map.finish()
+    }
+}
+
+/// Prints the source code up to the first new line character. Truncates the text if it exceeds 40 characters.
+struct NodeKindWithSource<'a> {
+    key: NodeRefEqualityKey<'a>,
+    source: SourceCode<'a>,
+}
+
+impl Debug for NodeKindWithSource<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        struct TruncatedSource<'a>(&'a str);
+
+        impl Debug for TruncatedSource<'_> {
+            fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+                f.write_char('`')?;
+                let first_line = if let Some(line_end_pos) = self.0.find(['\n', '\r']) {
+                    &self.0[..line_end_pos]
+                } else {
+                    self.0
+                };
+
+                if first_line.len() > 40 {
+                    let (head, rest) = first_line.split_at(27);
+
+                    f.write_str(head)?;
+                    f.write_str("...")?;
+
+                    // Take the last 10 characters
+                    let tail = &rest[rest.len().saturating_sub(10)..];
+                    f.write_str(tail)?;
+                } else {
+                    f.write_str(first_line)?;
+                }
+
+                if first_line.len() < self.0.len() {
+                    f.write_str("\u{23ce}")?;
+                }
+
+                f.write_char('`')
+            }
+        }
+
+        let kind = self.key.node().kind();
+        let source = self.source.slice(self.key.node().range()).text(self.source);
+
+        f.debug_struct("Node")
+            .field("kind", &kind)
+            .field("range", &self.key.node().range())
+            .field("source", &TruncatedSource(source))
+            .finish()
+    }
+}
+
+struct DebugNodeComments<'a> {
+    comments: &'a CommentsMap<'a>,
+    source_code: SourceCode<'a>,
+    key: NodeRefEqualityKey<'a>,
+}
+
+impl Debug for DebugNodeComments<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_map()
+            .entry(
+                &"leading",
+                &DebugNodeCommentSlice {
+                    node_comments: self.comments.leading(&self.key),
+                    source_code: self.source_code,
+                },
+            )
+            .entry(
+                &"dangling",
+                &DebugNodeCommentSlice {
+                    node_comments: self.comments.dangling(&self.key),
+                    source_code: self.source_code,
+                },
+            )
+            .entry(
+                &"trailing",
+                &DebugNodeCommentSlice {
+                    node_comments: self.comments.trailing(&self.key),
+                    source_code: self.source_code,
+                },
+            )
+            .finish()
+    }
+}
+
+struct DebugNodeCommentSlice<'a> {
+    node_comments: &'a [SourceComment],
+    source_code: SourceCode<'a>,
+}
+
+impl Debug for DebugNodeCommentSlice<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        let mut list = f.debug_list();
+
+        for comment in self.node_comments {
+            list.entry(&comment.debug(self.source_code));
+        }
+
+        list.finish()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::comments::map::MultiMap;
+    use crate::comments::{CommentTextPosition, Comments, CommentsMap, SourceComment};
+    use insta::assert_debug_snapshot;
+    use ruff_formatter::SourceCode;
+    use ruff_python_ast::node::AnyNode;
+    use ruff_text_size::{TextRange, TextSize};
+    use rustpython_parser::ast::{StmtBreak, StmtContinue};
+
+    #[test]
+    fn debug() {
+        let continue_statement = AnyNode::from(StmtContinue {
+            range: TextRange::default(),
+        });
+
+        let break_statement = AnyNode::from(StmtBreak {
+            range: TextRange::default(),
+        });
+
+        let source = r#"# leading comment
+continue; # trailing
+# break leading
+break;
+"#;
+
+        let source_code = SourceCode::new(source);
+
+        let mut comments_map: CommentsMap = MultiMap::new();
+
+        comments_map.push_leading(
+            continue_statement.as_ref().into(),
+            SourceComment {
+                slice: source_code.slice(TextRange::at(TextSize::new(0), TextSize::new(17))),
+                #[cfg(debug_assertions)]
+                formatted: std::cell::Cell::new(false),
+                position: CommentTextPosition::OwnLine,
+            },
+        );
+
+        comments_map.push_trailing(
+            continue_statement.as_ref().into(),
+            SourceComment {
+                slice: source_code.slice(TextRange::at(TextSize::new(28), TextSize::new(10))),
+                #[cfg(debug_assertions)]
+                formatted: std::cell::Cell::new(false),
+                position: CommentTextPosition::EndOfLine,
+            },
+        );
+
+        comments_map.push_leading(
+            break_statement.as_ref().into(),
+            SourceComment {
+                slice: source_code.slice(TextRange::at(TextSize::new(39), TextSize::new(15))),
+                #[cfg(debug_assertions)]
+                formatted: std::cell::Cell::new(false),
+                position: CommentTextPosition::OwnLine,
+            },
+        );
+
+        let comments = Comments::new(comments_map);
+
+        assert_debug_snapshot!(comments.debug(source_code));
+    }
+}
diff --git a/crates/ruff_python_formatter/src/comments/format.rs b/crates/ruff_python_formatter/src/comments/format.rs
new file mode 100644
index 0000000000000..44e77de3d4f08
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/format.rs
@@ -0,0 +1,313 @@
+use crate::comments::SourceComment;
+use crate::context::NodeLevel;
+use crate::prelude::*;
+use crate::trivia::{lines_after, lines_before};
+use ruff_formatter::{format_args, write, FormatError, SourceCode};
+use ruff_python_ast::node::AnyNodeRef;
+use ruff_python_ast::prelude::AstNode;
+use ruff_text_size::{TextLen, TextRange, TextSize};
+use rustpython_parser::ast::Ranged;
+
+/// Formats the leading comments of a node.
+pub(crate) fn leading_node_comments<T>(node: &T) -> FormatLeadingComments
+where
+    T: AstNode,
+{
+    FormatLeadingComments::Node(node.as_any_node_ref())
+}
+
+/// Formats the passed comments as leading comments
+pub(crate) const fn leading_comments(comments: &[SourceComment]) -> FormatLeadingComments {
+    FormatLeadingComments::Comments(comments)
+}
+
+#[derive(Copy, Clone, Debug)]
+pub(crate) enum FormatLeadingComments<'a> {
+    Node(AnyNodeRef<'a>),
+    Comments(&'a [SourceComment]),
+}
+
+impl Format<PyFormatContext<'_>> for FormatLeadingComments<'_> {
+    fn fmt(&self, f: &mut PyFormatter) -> FormatResult<()> {
+        let comments = f.context().comments().clone();
+
+        let leading_comments = match self {
+            FormatLeadingComments::Node(node) => comments.leading_comments(*node),
+            FormatLeadingComments::Comments(comments) => comments,
+        };
+
+        for comment in leading_comments {
+            let slice = comment.slice();
+
+            let lines_after_comment = lines_after(slice.end(), f.context().contents());
+            write!(
+                f,
+                [format_comment(comment), empty_lines(lines_after_comment)]
+            )?;
+
+            comment.mark_formatted();
+        }
+
+        Ok(())
+    }
+}
+
+/// Formats the leading `comments` of an alternate branch and ensures that it preserves the right
+/// number of empty lines before. The `last_node` is the last node of the preceding body.
+///
+/// For example, `last_node` is the last statement in the if body when formatting the leading
+/// comments of the `else` branch.
+pub(crate) fn leading_alternate_branch_comments<'a, T>(
+    comments: &'a [SourceComment],
+    last_node: Option<T>,
+) -> FormatLeadingAlternateBranchComments<'a>
+where
+    T: Into<AnyNodeRef<'a>>,
+{
+    FormatLeadingAlternateBranchComments {
+        comments,
+        last_node: last_node.map(std::convert::Into::into),
+    }
+}
+
+pub(crate) struct FormatLeadingAlternateBranchComments<'a> {
+    comments: &'a [SourceComment],
+    last_node: Option<AnyNodeRef<'a>>,
+}
+
+impl Format<PyFormatContext<'_>> for FormatLeadingAlternateBranchComments<'_> {
+    fn fmt(&self, f: &mut Formatter<PyFormatContext<'_>>) -> FormatResult<()> {
+        if let Some(first_leading) = self.comments.first() {
+            // Leading comments only preserves the lines after the comment but not before.
+            // Insert the necessary lines.
+            if lines_before(first_leading.slice().start(), f.context().contents()) > 1 {
+                write!(f, [empty_line()])?;
+            }
+
+            write!(f, [leading_comments(self.comments)])?;
+        } else if let Some(last_preceding) = self.last_node {
+            // The leading comments formatting ensures that it preserves the right amount of lines after
+            // We need to take care of this ourselves, if there's no leading `else` comment.
+            if lines_after(last_preceding.end(), f.context().contents()) > 1 {
+                write!(f, [empty_line()])?;
+            }
+        }
+
+        Ok(())
+    }
+}
+
+/// Formats the trailing comments of `node`
+pub(crate) fn trailing_node_comments<T>(node: &T) -> FormatTrailingComments
+where
+    T: AstNode,
+{
+    FormatTrailingComments::Node(node.as_any_node_ref())
+}
+
+/// Formats the passed comments as trailing comments
+pub(crate) fn trailing_comments(comments: &[SourceComment]) -> FormatTrailingComments {
+    FormatTrailingComments::Comments(comments)
+}
+
+pub(crate) enum FormatTrailingComments<'a> {
+    Node(AnyNodeRef<'a>),
+    Comments(&'a [SourceComment]),
+}
+
+impl Format<PyFormatContext<'_>> for FormatTrailingComments<'_> {
+    fn fmt(&self, f: &mut Formatter<PyFormatContext<'_>>) -> FormatResult<()> {
+        let comments = f.context().comments().clone();
+
+        let trailing_comments = match self {
+            FormatTrailingComments::Node(node) => comments.trailing_comments(*node),
+            FormatTrailingComments::Comments(comments) => comments,
+        };
+
+        let mut has_trailing_own_line_comment = false;
+
+        for trailing in trailing_comments {
+            let slice = trailing.slice();
+
+            has_trailing_own_line_comment |= trailing.position().is_own_line();
+
+            if has_trailing_own_line_comment {
+                let lines_before_comment = lines_before(slice.start(), f.context().contents());
+
+                // A trailing comment at the end of a body or list
+                // ```python
+                // def test():
+                //      pass
+                //
+                //      # Some comment
+                // ```
+                write!(
+                    f,
+                    [
+                        line_suffix(&format_with(|f| {
+                            write!(
+                                f,
+                                [empty_lines(lines_before_comment), format_comment(trailing)]
+                            )
+                        })),
+                        expand_parent()
+                    ]
+                )?;
+            } else {
+                write!(
+                    f,
+                    [
+                        line_suffix(&format_args![space(), space(), format_comment(trailing)]),
+                        expand_parent()
+                    ]
+                )?;
+            }
+
+            trailing.mark_formatted();
+        }
+
+        Ok(())
+    }
+}
+
+/// Formats the dangling comments of `node`.
+pub(crate) fn dangling_node_comments<T>(node: &T) -> FormatDanglingComments
+where
+    T: AstNode,
+{
+    FormatDanglingComments::Node(node.as_any_node_ref())
+}
+
+pub(crate) fn dangling_comments(comments: &[SourceComment]) -> FormatDanglingComments {
+    FormatDanglingComments::Comments(comments)
+}
+
+pub(crate) enum FormatDanglingComments<'a> {
+    Node(AnyNodeRef<'a>),
+    Comments(&'a [SourceComment]),
+}
+
+impl Format<PyFormatContext<'_>> for FormatDanglingComments<'_> {
+    fn fmt(&self, f: &mut Formatter<PyFormatContext>) -> FormatResult<()> {
+        let comments = f.context().comments().clone();
+
+        let dangling_comments = match self {
+            Self::Comments(comments) => comments,
+            Self::Node(node) => comments.dangling_comments(*node),
+        };
+
+        let mut first = true;
+        for comment in dangling_comments {
+            if first && comment.position().is_end_of_line() {
+                write!(f, [space(), space()])?;
+            }
+
+            write!(
+                f,
+                [
+                    format_comment(comment),
+                    empty_lines(lines_after(comment.slice().end(), f.context().contents()))
+                ]
+            )?;
+
+            comment.mark_formatted();
+
+            first = false;
+        }
+
+        Ok(())
+    }
+}
+
+/// Formats the content of the passed comment.
+///
+/// * Adds a whitespace between `#` and the comment text except if the first character is a `#`, `:`, `'`, or `!`
+/// * Replaces non breaking whitespaces with regular whitespaces except if in front of a `types:` comment
+const fn format_comment(comment: &SourceComment) -> FormatComment {
+    FormatComment { comment }
+}
+
+struct FormatComment<'a> {
+    comment: &'a SourceComment,
+}
+
+impl Format<PyFormatContext<'_>> for FormatComment<'_> {
+    fn fmt(&self, f: &mut Formatter<PyFormatContext<'_>>) -> FormatResult<()> {
+        let slice = self.comment.slice();
+        let comment_text = slice.text(SourceCode::new(f.context().contents()));
+
+        let trimmed = comment_text.trim_end();
+        let trailing_whitespace_len = comment_text.text_len() - trimmed.text_len();
+
+        let Some(content) = trimmed.strip_prefix('#') else {
+            return Err(FormatError::SyntaxError);
+        };
+
+        // Fast path for correctly formatted comments:
+        // * Start with a `#` and are followed by a space
+        // * Have no trailing whitespace.
+        if trailing_whitespace_len == TextSize::new(0) && content.starts_with(' ') {
+            return source_text_slice(slice.range(), ContainsNewlines::No).fmt(f);
+        }
+
+        write!(f, [source_position(slice.start()), text("#")])?;
+
+        // Starts with a non breaking space
+        let start_offset =
+            if content.starts_with('\u{A0}') && !content.trim_start().starts_with("type:") {
+                // Replace non-breaking space with a space (if not followed by a normal space)
+                "#\u{A0}".text_len()
+            } else {
+                '#'.text_len()
+            };
+
+        // Add a space between the `#` and the text if the source contains none.
+        if !content.is_empty() && !content.starts_with([' ', '!', ':', '#', '\'']) {
+            write!(f, [space()])?;
+        }
+
+        let start = slice.start() + start_offset;
+        let end = slice.range().end() - trailing_whitespace_len;
+
+        write!(
+            f,
+            [
+                source_text_slice(TextRange::new(start, end), ContainsNewlines::No),
+                source_position(slice.end())
+            ]
+        )
+    }
+}
+
+// Helper that inserts the appropriate number of empty lines before a comment, depending on the node level.
+// Top level: Up to two empty lines
+// parenthesized: A single empty line
+// other: Up to a single empty line
+const fn empty_lines(lines: u32) -> FormatEmptyLines {
+    FormatEmptyLines { lines }
+}
+
+#[derive(Copy, Clone, Debug)]
+struct FormatEmptyLines {
+    lines: u32,
+}
+
+impl Format<PyFormatContext<'_>> for FormatEmptyLines {
+    fn fmt(&self, f: &mut Formatter<PyFormatContext>) -> FormatResult<()> {
+        match f.context().node_level() {
+            NodeLevel::TopLevel => match self.lines {
+                0 | 1 => write!(f, [hard_line_break()]),
+                2 => write!(f, [empty_line()]),
+                _ => write!(f, [empty_line(), empty_line()]),
+            },
+
+            NodeLevel::CompoundStatement => match self.lines {
+                0 | 1 => write!(f, [hard_line_break()]),
+                _ => write!(f, [empty_line()]),
+            },
+
+            // Remove all whitespace in parenthesized expressions
+            NodeLevel::Expression => write!(f, [hard_line_break()]),
+        }
+    }
+}
diff --git a/crates/ruff_python_formatter/src/comments/map.rs b/crates/ruff_python_formatter/src/comments/map.rs
new file mode 100644
index 0000000000000..9bef831903d0c
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/map.rs
@@ -0,0 +1,988 @@
+use countme::Count;
+use rustc_hash::FxHashMap;
+use std::fmt::{Debug, Formatter};
+use std::iter::FusedIterator;
+use std::num::NonZeroU32;
+use std::ops::Range;
+
+/// An optimized multi-map implementation for storing *leading*, *dangling*, and *trailing* parts for a key.
+/// The inserted parts are stored in insertion-order.
+///
+/// A naive implementation using three multimaps, one to store the *leading*, another for the *dangling* parts,
+/// and a third for the *trailing* parts, requires between `keys < allocations < keys * 3` vec allocations.
+///
+/// This map implementation optimises for the use case where:
+/// * Parts belonging to the same key are inserted together. For example, all parts for the key `a` are inserted
+///   before inserting any parts for the key `b`.
+/// * The parts per key are inserted in the following order: *leading*, *dangling*, and then the *trailing* parts.
+///
+/// Parts inserted in the above mentioned order are stored in a `Vec` shared by all keys to reduce the number
+/// of allocations and increased cache locality. The implementation falls back to storing the *leading*,
+/// *dangling*, and *trailing* parts of a key in dedicated `Vec`s if the parts aren't inserted in the before mentioned order.
+/// Out of order insertions come with a slight performance penalty due to:
+/// * It requiring up to three [Vec] allocations, one for the *leading*, *dangling*, and *trailing* parts.
+/// * It requires copying already inserted parts for that key (by cloning) into the newly allocated [Vec]s.
+/// * The resolving of each part for that key requires an extra level of indirection.
+///
+/// ## Limitations
+/// The map supports storing up to `u32::MAX - 1` parts. Inserting the `u32::MAX`nth part panics.
+///
+/// ## Comments
+///
+/// Storing the *leading*, *dangling*, and *trailing* comments is an exemplary use case for this map implementation because
+/// it is generally desired to keep the comments in the same order as they appear in the source document.
+/// This translates to inserting the comments per node and for every node in 1) *leading*, 2) *dangling*, 3) *trailing* order (the order this map optimises for).
+///
+/// Running Rome's formatter on real world use cases showed that more than 99.99% of comments get inserted in
+/// the described order.
+///
+/// The size limitation isn't a concern for comments because Ruff supports source documents with a size up to 4GB (`u32::MAX`)
+/// and every comment has at least a size of 2 bytes:
+/// * 1 byte for the start sequence, e.g. `#`
+/// * 1 byte for the end sequence, e.g. `\n`
+///
+/// Meaning, the upper bound for comments is `u32::MAX / 2`.
+#[derive(Clone)]
+pub(super) struct MultiMap<K, V> {
+    /// Lookup table to retrieve the entry for a key.
+    index: FxHashMap<K, Entry>,
+
+    /// Flat array storing all the parts that have been inserted in order.
+    parts: Vec<V>,
+
+    /// Vector containing the *leading*, *dangling*, and *trailing* vectors for out of order entries.
+    ///
+    /// The length of `out_of_order` is a multiple of 3 where:
+    /// * `index % 3 == 0`: *Leading* parts
+    /// * `index % 3 == 1`: *Dangling* parts
+    /// * `index % 3 == 2`: *Trailing* parts
+    out_of_order_parts: Vec<Vec<V>>,
+}
+
+impl<K: std::hash::Hash + Eq, V> MultiMap<K, V> {
+    pub(super) fn new() -> Self {
+        Self {
+            index: FxHashMap::default(),
+            parts: Vec::new(),
+            out_of_order_parts: Vec::new(),
+        }
+    }
+
+    /// Pushes a *leading* part for `key`.
+    pub(super) fn push_leading(&mut self, key: K, part: V)
+    where
+        V: Clone,
+    {
+        match self.index.get_mut(&key) {
+            None => {
+                let start = self.parts.len();
+                self.parts.push(part);
+
+                self.index.insert(
+                    key,
+                    Entry::InOrder(InOrderEntry::leading(start..self.parts.len())),
+                );
+            }
+
+            // Has only *leading* parts and no elements have been pushed since
+            Some(Entry::InOrder(entry))
+                if entry.trailing_start.is_none() && self.parts.len() == entry.range().end =>
+            {
+                self.parts.push(part);
+                entry.increment_leading_range();
+            }
+
+            Some(Entry::OutOfOrder(entry)) => {
+                let leading = &mut self.out_of_order_parts[entry.leading_index()];
+                leading.push(part);
+            }
+
+            Some(entry) => {
+                let out_of_order =
+                    Self::entry_to_out_of_order(entry, &self.parts, &mut self.out_of_order_parts);
+                self.out_of_order_parts[out_of_order.leading_index()].push(part);
+            }
+        }
+    }
+
+    /// Pushes a *dangling* part for `key`
+    pub(super) fn push_dangling(&mut self, key: K, part: V)
+    where
+        V: Clone,
+    {
+        match self.index.get_mut(&key) {
+            None => {
+                let start = self.parts.len();
+                self.parts.push(part);
+
+                self.index.insert(
+                    key,
+                    Entry::InOrder(InOrderEntry::dangling(start..self.parts.len())),
+                );
+            }
+
+            // Has leading and dangling comments and no new parts have been inserted since.
+            Some(Entry::InOrder(entry))
+                if entry.trailing_end.is_none() && self.parts.len() == entry.range().end =>
+            {
+                self.parts.push(part);
+                entry.increment_dangling_range();
+            }
+
+            Some(Entry::OutOfOrder(entry)) => {
+                let dangling = &mut self.out_of_order_parts[entry.dangling_index()];
+                dangling.push(part);
+            }
+
+            Some(entry) => {
+                let out_of_order =
+                    Self::entry_to_out_of_order(entry, &self.parts, &mut self.out_of_order_parts);
+                self.out_of_order_parts[out_of_order.dangling_index()].push(part);
+            }
+        }
+    }
+
+    /// Pushes a *trailing* part for `key`.
+    pub(super) fn push_trailing(&mut self, key: K, part: V)
+    where
+        V: Clone,
+    {
+        match self.index.get_mut(&key) {
+            None => {
+                let start = self.parts.len();
+                self.parts.push(part);
+
+                self.index.insert(
+                    key,
+                    Entry::InOrder(InOrderEntry::trailing(start..self.parts.len())),
+                );
+            }
+
+            // No new parts have been inserted since
+            Some(Entry::InOrder(entry)) if entry.range().end == self.parts.len() => {
+                self.parts.push(part);
+                entry.increment_trailing_range();
+            }
+
+            Some(Entry::OutOfOrder(entry)) => {
+                let trailing = &mut self.out_of_order_parts[entry.trailing_index()];
+                trailing.push(part);
+            }
+
+            Some(entry) => {
+                let out_of_order =
+                    Self::entry_to_out_of_order(entry, &self.parts, &mut self.out_of_order_parts);
+                self.out_of_order_parts[out_of_order.trailing_index()].push(part);
+            }
+        }
+    }
+
+    /// Slow path for converting an in-order entry to an out-of order entry.
+    /// Copies over all parts into the `out_of_order` vec.
+    #[cold]
+    fn entry_to_out_of_order<'a>(
+        entry: &'a mut Entry,
+        parts: &[V],
+        out_of_order: &mut Vec<Vec<V>>,
+    ) -> &'a mut OutOfOrderEntry
+    where
+        V: Clone,
+    {
+        match entry {
+            Entry::InOrder(in_order) => {
+                let index = out_of_order.len();
+
+                out_of_order.push(parts[in_order.leading_range()].to_vec());
+                out_of_order.push(parts[in_order.dangling_range()].to_vec());
+                out_of_order.push(parts[in_order.trailing_range()].to_vec());
+
+                *entry = Entry::OutOfOrder(OutOfOrderEntry {
+                    leading_index: index,
+                    _count: Count::new(),
+                });
+
+                match entry {
+                    Entry::InOrder(_) => unreachable!(),
+                    Entry::OutOfOrder(out_of_order) => out_of_order,
+                }
+            }
+            Entry::OutOfOrder(entry) => entry,
+        }
+    }
+
+    pub(super) fn keys(&self) -> Keys<'_, K> {
+        Keys {
+            inner: self.index.keys(),
+        }
+    }
+
+    /// Returns the *leading* parts of `key` in insertion-order.
+    pub(super) fn leading(&self, key: &K) -> &[V] {
+        match self.index.get(key) {
+            None => &[],
+            Some(Entry::InOrder(in_order)) => &self.parts[in_order.leading_range()],
+            Some(Entry::OutOfOrder(entry)) => &self.out_of_order_parts[entry.leading_index()],
+        }
+    }
+
+    /// Returns the *dangling* parts of `key` in insertion-order.
+    pub(super) fn dangling(&self, key: &K) -> &[V] {
+        match self.index.get(key) {
+            None => &[],
+            Some(Entry::InOrder(in_order)) => &self.parts[in_order.dangling_range()],
+            Some(Entry::OutOfOrder(entry)) => &self.out_of_order_parts[entry.dangling_index()],
+        }
+    }
+
+    /// Returns the *trailing* parts of `key` in insertion order.
+    pub(super) fn trailing(&self, key: &K) -> &[V] {
+        match self.index.get(key) {
+            None => &[],
+            Some(Entry::InOrder(in_order)) => &self.parts[in_order.trailing_range()],
+            Some(Entry::OutOfOrder(entry)) => &self.out_of_order_parts[entry.trailing_index()],
+        }
+    }
+
+    /// Returns `true` if `key` has any *leading*, *dangling*, or *trailing* parts.
+    pub(super) fn has(&self, key: &K) -> bool {
+        self.index.get(key).is_some()
+    }
+
+    /// Returns an iterator over the *leading*, *dangling*, and *trailing* parts of `key`.
+    pub(super) fn parts(&self, key: &K) -> PartsIterator<V> {
+        match self.index.get(key) {
+            None => PartsIterator::Slice([].iter()),
+            Some(entry) => PartsIterator::from_entry(entry, self),
+        }
+    }
+
+    /// Returns an iterator over the parts of all keys.
+    #[allow(unused)]
+    pub(super) fn all_parts(&self) -> impl Iterator<Item = &V> {
+        self.index
+            .values()
+            .flat_map(|entry| PartsIterator::from_entry(entry, self))
+    }
+}
+
+impl<K: std::hash::Hash + Eq, V> Default for MultiMap<K, V> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl<K, V> Debug for MultiMap<K, V>
+where
+    K: Debug,
+    V: Debug,
+{
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        let mut builder = f.debug_map();
+
+        for (key, entry) in &self.index {
+            builder.entry(&key, &DebugEntry { entry, map: self });
+        }
+
+        builder.finish()
+    }
+}
+
+/// Iterates over all *leading*, *dangling*, and *trailing* parts of a key.
+pub(super) enum PartsIterator<'a, V> {
+    /// The slice into the [CommentsMap::parts] [Vec] if this is an in-order entry or the *trailing* parts
+    /// of an out-of-order entry.
+    Slice(std::slice::Iter<'a, V>),
+
+    /// Iterator over the *leading* parts of an out-of-order entry. Returns the *dangling* parts, and then the
+    /// *trailing* parts once the *leading* iterator is fully consumed.
+    Leading {
+        leading: std::slice::Iter<'a, V>,
+        dangling: &'a [V],
+        trailing: &'a [V],
+    },
+
+    /// Iterator over the *dangling* parts of an out-of-order entry. Returns the *trailing* parts
+    /// once the *leading* iterator is fully consumed.
+    Dangling {
+        dangling: std::slice::Iter<'a, V>,
+        trailing: &'a [V],
+    },
+}
+
+impl<'a, V> PartsIterator<'a, V> {
+    fn from_entry<K>(entry: &Entry, map: &'a MultiMap<K, V>) -> Self {
+        match entry {
+            Entry::InOrder(entry) => PartsIterator::Slice(map.parts[entry.range()].iter()),
+            Entry::OutOfOrder(entry) => PartsIterator::Leading {
+                leading: map.out_of_order_parts[entry.leading_index()].iter(),
+                dangling: &map.out_of_order_parts[entry.dangling_index()],
+                trailing: &map.out_of_order_parts[entry.trailing_index()],
+            },
+        }
+    }
+}
+
+impl<'a, V> Iterator for PartsIterator<'a, V> {
+    type Item = &'a V;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        match self {
+            PartsIterator::Slice(inner) => inner.next(),
+
+            PartsIterator::Leading {
+                leading,
+                dangling,
+                trailing,
+            } => match leading.next() {
+                Some(next) => Some(next),
+                None if !dangling.is_empty() => {
+                    let mut dangling_iterator = dangling.iter();
+                    let next = dangling_iterator.next().unwrap();
+                    *self = PartsIterator::Dangling {
+                        dangling: dangling_iterator,
+                        trailing,
+                    };
+                    Some(next)
+                }
+                None => {
+                    let mut trailing_iterator = trailing.iter();
+                    let next = trailing_iterator.next();
+                    *self = PartsIterator::Slice(trailing_iterator);
+                    next
+                }
+            },
+
+            PartsIterator::Dangling { dangling, trailing } => dangling.next().or_else(|| {
+                let mut trailing_iterator = trailing.iter();
+                let next = trailing_iterator.next();
+                *self = PartsIterator::Slice(trailing_iterator);
+                next
+            }),
+        }
+    }
+
+    fn fold<B, F>(self, init: B, f: F) -> B
+    where
+        F: FnMut(B, Self::Item) -> B,
+    {
+        match self {
+            PartsIterator::Slice(slice) => slice.fold(init, f),
+            PartsIterator::Leading {
+                leading,
+                dangling,
+                trailing,
+            } => leading
+                .chain(dangling.iter())
+                .chain(trailing.iter())
+                .fold(init, f),
+            PartsIterator::Dangling { dangling, trailing } => {
+                dangling.chain(trailing.iter()).fold(init, f)
+            }
+        }
+    }
+
+    fn all<F>(&mut self, f: F) -> bool
+    where
+        F: FnMut(Self::Item) -> bool,
+    {
+        match self {
+            PartsIterator::Slice(slice) => slice.all(f),
+            PartsIterator::Leading {
+                leading,
+                dangling,
+                trailing,
+            } => leading.chain(dangling.iter()).chain(trailing.iter()).all(f),
+            PartsIterator::Dangling { dangling, trailing } => {
+                dangling.chain(trailing.iter()).all(f)
+            }
+        }
+    }
+
+    fn any<F>(&mut self, f: F) -> bool
+    where
+        F: FnMut(Self::Item) -> bool,
+    {
+        match self {
+            PartsIterator::Slice(slice) => slice.any(f),
+            PartsIterator::Leading {
+                leading,
+                dangling,
+                trailing,
+            } => leading.chain(dangling.iter()).chain(trailing.iter()).any(f),
+            PartsIterator::Dangling { dangling, trailing } => {
+                dangling.chain(trailing.iter()).any(f)
+            }
+        }
+    }
+
+    fn find<P>(&mut self, predicate: P) -> Option<Self::Item>
+    where
+        P: FnMut(&Self::Item) -> bool,
+    {
+        match self {
+            PartsIterator::Slice(slice) => slice.find(predicate),
+            PartsIterator::Leading {
+                leading,
+                dangling,
+                trailing,
+            } => leading
+                .chain(dangling.iter())
+                .chain(trailing.iter())
+                .find(predicate),
+            PartsIterator::Dangling { dangling, trailing } => {
+                dangling.chain(trailing.iter()).find(predicate)
+            }
+        }
+    }
+
+    fn find_map<B, F>(&mut self, f: F) -> Option<B>
+    where
+        F: FnMut(Self::Item) -> Option<B>,
+    {
+        match self {
+            PartsIterator::Slice(slice) => slice.find_map(f),
+            PartsIterator::Leading {
+                leading,
+                dangling,
+                trailing,
+            } => leading
+                .chain(dangling.iter())
+                .chain(trailing.iter())
+                .find_map(f),
+            PartsIterator::Dangling { dangling, trailing } => {
+                dangling.chain(trailing.iter()).find_map(f)
+            }
+        }
+    }
+
+    fn position<P>(&mut self, predicate: P) -> Option<usize>
+    where
+        P: FnMut(Self::Item) -> bool,
+    {
+        match self {
+            PartsIterator::Slice(slice) => slice.position(predicate),
+            PartsIterator::Leading {
+                leading,
+                dangling,
+                trailing,
+            } => leading
+                .chain(dangling.iter())
+                .chain(trailing.iter())
+                .position(predicate),
+            PartsIterator::Dangling { dangling, trailing } => {
+                dangling.chain(trailing.iter()).position(predicate)
+            }
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        match self {
+            PartsIterator::Slice(slice) => slice.size_hint(),
+            PartsIterator::Leading {
+                leading,
+                dangling,
+                trailing,
+            } => {
+                let len = leading.len() + dangling.len() + trailing.len();
+
+                (len, Some(len))
+            }
+            PartsIterator::Dangling { dangling, trailing } => {
+                let len = dangling.len() + trailing.len();
+                (len, Some(len))
+            }
+        }
+    }
+
+    fn count(self) -> usize {
+        self.size_hint().0
+    }
+
+    fn last(self) -> Option<Self::Item> {
+        match self {
+            PartsIterator::Slice(slice) => slice.last(),
+            PartsIterator::Leading {
+                leading,
+                dangling,
+                trailing,
+            } => trailing
+                .last()
+                .or_else(|| dangling.last())
+                .or_else(|| leading.last()),
+            PartsIterator::Dangling { dangling, trailing } => {
+                trailing.last().or_else(|| dangling.last())
+            }
+        }
+    }
+}
+
+impl<V> ExactSizeIterator for PartsIterator<'_, V> {}
+
+impl<V> FusedIterator for PartsIterator<'_, V> {}
+
+#[derive(Clone, Debug)]
+enum Entry {
+    InOrder(InOrderEntry),
+    OutOfOrder(OutOfOrderEntry),
+}
+
+struct DebugEntry<'a, K, V> {
+    entry: &'a Entry,
+    map: &'a MultiMap<K, V>,
+}
+
+impl<K, V> Debug for DebugEntry<'_, K, V>
+where
+    K: Debug,
+    V: Debug,
+{
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        let leading = match self.entry {
+            Entry::OutOfOrder(entry) => {
+                self.map.out_of_order_parts[entry.leading_index()].as_slice()
+            }
+            Entry::InOrder(entry) => &self.map.parts[entry.leading_range()],
+        };
+
+        let dangling = match self.entry {
+            Entry::OutOfOrder(entry) => {
+                self.map.out_of_order_parts[entry.dangling_index()].as_slice()
+            }
+            Entry::InOrder(entry) => &self.map.parts[entry.dangling_range()],
+        };
+
+        let trailing = match self.entry {
+            Entry::OutOfOrder(entry) => {
+                self.map.out_of_order_parts[entry.trailing_index()].as_slice()
+            }
+            Entry::InOrder(entry) => &self.map.parts[entry.trailing_range()],
+        };
+
+        let mut list = f.debug_list();
+
+        list.entries(leading.iter().map(DebugValue::Leading));
+        list.entries(dangling.iter().map(DebugValue::Dangling));
+        list.entries(trailing.iter().map(DebugValue::Trailing));
+
+        list.finish()
+    }
+}
+
+enum DebugValue<'a, V> {
+    Leading(&'a V),
+    Dangling(&'a V),
+    Trailing(&'a V),
+}
+
+impl<V> Debug for DebugValue<'_, V>
+where
+    V: Debug,
+{
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            DebugValue::Leading(leading) => f.debug_tuple("Leading").field(leading).finish(),
+            DebugValue::Dangling(dangling) => f.debug_tuple("Dangling").field(dangling).finish(),
+            DebugValue::Trailing(trailing) => f.debug_tuple("Trailing").field(trailing).finish(),
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+struct InOrderEntry {
+    /// Index into the [MultiMap::parts] vector where the leading parts of this entry start
+    leading_start: PartIndex,
+
+    /// Index into the [MultiMap::parts] vector where the dangling parts (and, thus, the leading parts end) start.
+    dangling_start: PartIndex,
+
+    /// Index into the [MultiMap::parts] vector where the trailing parts (and, thus, the dangling parts end) of this entry start
+    trailing_start: Option<PartIndex>,
+
+    /// Index into the [MultiMap::parts] vector where the trailing parts of this entry end
+    trailing_end: Option<PartIndex>,
+
+    _count: Count<InOrderEntry>,
+}
+
+impl InOrderEntry {
+    fn leading(range: Range<usize>) -> Self {
+        InOrderEntry {
+            leading_start: PartIndex::from_len(range.start),
+            dangling_start: PartIndex::from_len(range.end),
+            trailing_start: None,
+            trailing_end: None,
+            _count: Count::new(),
+        }
+    }
+
+    fn dangling(range: Range<usize>) -> Self {
+        let start = PartIndex::from_len(range.start);
+        InOrderEntry {
+            leading_start: start,
+            dangling_start: start,
+            trailing_start: Some(PartIndex::from_len(range.end)),
+            trailing_end: None,
+            _count: Count::new(),
+        }
+    }
+
+    fn trailing(range: Range<usize>) -> Self {
+        let start = PartIndex::from_len(range.start);
+        InOrderEntry {
+            leading_start: start,
+            dangling_start: start,
+            trailing_start: Some(start),
+            trailing_end: Some(PartIndex::from_len(range.end)),
+            _count: Count::new(),
+        }
+    }
+
+    fn increment_leading_range(&mut self) {
+        assert!(
+            self.trailing_start.is_none(),
+            "Can't extend the leading range for an in order entry with dangling comments."
+        );
+
+        self.dangling_start.increment();
+    }
+
+    fn increment_dangling_range(&mut self) {
+        assert!(
+            self.trailing_end.is_none(),
+            "Can't extend the dangling range for an in order entry with trailing comments."
+        );
+
+        match &mut self.trailing_start {
+            Some(start) => start.increment(),
+            None => self.trailing_start = Some(self.dangling_start.incremented()),
+        }
+    }
+
+    fn increment_trailing_range(&mut self) {
+        match (self.trailing_start, &mut self.trailing_end) {
+            // Already has some trailing comments
+            (Some(_), Some(end)) => end.increment(),
+            // Has dangling comments only
+            (Some(start), None) => self.trailing_end = Some(start.incremented()),
+            // Has leading comments only
+            (None, None) => {
+                self.trailing_start = Some(self.dangling_start);
+                self.trailing_end = Some(self.dangling_start.incremented());
+            }
+            (None, Some(_)) => {
+                unreachable!()
+            }
+        }
+    }
+
+    fn leading_range(&self) -> Range<usize> {
+        self.leading_start.value()..self.dangling_start.value()
+    }
+
+    fn dangling_range(&self) -> Range<usize> {
+        match self.trailing_start {
+            None => self.dangling_start.value()..self.dangling_start.value(),
+            Some(trailing_start) => self.dangling_start.value()..trailing_start.value(),
+        }
+    }
+
+    fn trailing_range(&self) -> Range<usize> {
+        match (self.trailing_start, self.trailing_end) {
+            (Some(trailing_start), Some(trailing_end)) => {
+                trailing_start.value()..trailing_end.value()
+            }
+            // Only dangling comments
+            (Some(trailing_start), None) => trailing_start.value()..trailing_start.value(),
+            (None, Some(_)) => {
+                panic!("Trailing end shouldn't be set if trailing start is none");
+            }
+            (None, None) => self.dangling_start.value()..self.dangling_start.value(),
+        }
+    }
+
+    fn range(&self) -> Range<usize> {
+        self.leading_start.value()
+            ..self
+                .trailing_end
+                .or(self.trailing_start)
+                .unwrap_or(self.dangling_start)
+                .value()
+    }
+}
+
+#[derive(Clone, Debug)]
+struct OutOfOrderEntry {
+    /// Index into the [MultiMap::out_of_order] vector at which offset the leaading vec is stored.
+    leading_index: usize,
+    _count: Count<OutOfOrderEntry>,
+}
+
+impl OutOfOrderEntry {
+    const fn leading_index(&self) -> usize {
+        self.leading_index
+    }
+
+    const fn dangling_index(&self) -> usize {
+        self.leading_index + 1
+    }
+
+    const fn trailing_index(&self) -> usize {
+        self.leading_index + 2
+    }
+}
+
+/// Index into the [`MultiMap::parts`] vector.
+///
+/// Stores the index as a [`NonZeroU32`], starting at 1 instead of 0 so that
+/// `size_of::<PartIndex>() == size_of::<Option<PartIndex>>()`.
+///
+/// This means, that only `u32 - 1` parts can be stored. This should be sufficient for storing comments
+/// because: Comments have length of two or more bytes because they consist of a start and end character sequence (`#` + new line, `/*` and `*/`).
+/// Thus, a document with length `u32` can have at most `u32::MAX / 2` comment-parts.
+#[repr(transparent)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
+struct PartIndex(NonZeroU32);
+
+impl PartIndex {
+    fn from_len(value: usize) -> Self {
+        assert!(value < u32::MAX as usize);
+        // SAFETY:
+        // * The `value < u32::MAX` guarantees that the add doesn't overflow.
+        // * The `+ 1` guarantees that the index is not zero
+        #[allow(unsafe_code, clippy::cast_possible_truncation)]
+        Self(unsafe { std::num::NonZeroU32::new_unchecked((value as u32) + 1) })
+    }
+
+    fn value(self) -> usize {
+        (u32::from(self.0) - 1) as usize
+    }
+
+    fn increment(&mut self) {
+        *self = self.incremented();
+    }
+
+    fn incremented(self) -> PartIndex {
+        PartIndex(NonZeroU32::new(self.0.get() + 1).unwrap())
+    }
+}
+
+/// Iterator over the keys of a comments multi map
+pub(super) struct Keys<'a, K> {
+    inner: std::collections::hash_map::Keys<'a, K, Entry>,
+}
+
+impl<'a, K> Iterator for Keys<'a, K> {
+    type Item = &'a K;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.inner.next()
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.inner.size_hint()
+    }
+}
+
+impl<K> ExactSizeIterator for Keys<'_, K> {}
+impl<K> FusedIterator for Keys<'_, K> {}
+
+#[cfg(test)]
+mod tests {
+    use crate::comments::map::MultiMap;
+
+    static EMPTY: [i32; 0] = [];
+
+    #[test]
+    fn leading_dangling_trailing() {
+        let mut map = MultiMap::new();
+
+        map.push_leading("a", 1);
+        map.push_dangling("a", 2);
+        map.push_dangling("a", 3);
+        map.push_trailing("a", 4);
+
+        assert_eq!(map.parts, vec![1, 2, 3, 4]);
+
+        assert_eq!(map.leading(&"a"), &[1]);
+        assert_eq!(map.dangling(&"a"), &[2, 3]);
+        assert_eq!(map.trailing(&"a"), &[4]);
+
+        assert!(map.has(&"a"));
+
+        assert_eq!(
+            map.parts(&"a").copied().collect::<Vec<_>>(),
+            vec![1, 2, 3, 4]
+        );
+    }
+
+    #[test]
+    fn dangling_trailing() {
+        let mut map = MultiMap::new();
+
+        map.push_dangling("a", 1);
+        map.push_dangling("a", 2);
+        map.push_trailing("a", 3);
+
+        assert_eq!(map.parts, vec![1, 2, 3]);
+
+        assert_eq!(map.leading(&"a"), &EMPTY);
+        assert_eq!(map.dangling(&"a"), &[1, 2]);
+        assert_eq!(map.trailing(&"a"), &[3]);
+
+        assert!(map.has(&"a"));
+
+        assert_eq!(map.parts(&"a").copied().collect::<Vec<_>>(), vec![1, 2, 3]);
+    }
+
+    #[test]
+    fn trailing() {
+        let mut map = MultiMap::new();
+
+        map.push_trailing("a", 1);
+        map.push_trailing("a", 2);
+
+        assert_eq!(map.parts, vec![1, 2]);
+
+        assert_eq!(map.leading(&"a"), &EMPTY);
+        assert_eq!(map.dangling(&"a"), &EMPTY);
+        assert_eq!(map.trailing(&"a"), &[1, 2]);
+
+        assert!(map.has(&"a"));
+
+        assert_eq!(map.parts(&"a").copied().collect::<Vec<_>>(), vec![1, 2]);
+    }
+
+    #[test]
+    fn empty() {
+        let map = MultiMap::<&str, i32>::default();
+
+        assert_eq!(map.parts, Vec::<i32>::new());
+
+        assert_eq!(map.leading(&"a"), &EMPTY);
+        assert_eq!(map.dangling(&"a"), &EMPTY);
+        assert_eq!(map.trailing(&"a"), &EMPTY);
+
+        assert!(!map.has(&"a"));
+
+        assert_eq!(
+            map.parts(&"a").copied().collect::<Vec<_>>(),
+            Vec::<i32>::new()
+        );
+    }
+
+    #[test]
+    fn multiple_keys() {
+        let mut map = MultiMap::new();
+
+        map.push_leading("a", 1);
+        map.push_dangling("b", 2);
+        map.push_trailing("c", 3);
+        map.push_leading("d", 4);
+        map.push_dangling("d", 5);
+        map.push_trailing("d", 6);
+
+        assert_eq!(map.parts, &[1, 2, 3, 4, 5, 6]);
+
+        assert_eq!(map.leading(&"a"), &[1]);
+        assert_eq!(map.dangling(&"a"), &EMPTY);
+        assert_eq!(map.trailing(&"a"), &EMPTY);
+        assert_eq!(map.parts(&"a").copied().collect::<Vec<_>>(), vec![1]);
+
+        assert_eq!(map.leading(&"b"), &EMPTY);
+        assert_eq!(map.dangling(&"b"), &[2]);
+        assert_eq!(map.trailing(&"b"), &EMPTY);
+        assert_eq!(map.parts(&"b").copied().collect::<Vec<_>>(), vec![2]);
+
+        assert_eq!(map.leading(&"c"), &EMPTY);
+        assert_eq!(map.dangling(&"c"), &EMPTY);
+        assert_eq!(map.trailing(&"c"), &[3]);
+        assert_eq!(map.parts(&"c").copied().collect::<Vec<_>>(), vec![3]);
+
+        assert_eq!(map.leading(&"d"), &[4]);
+        assert_eq!(map.dangling(&"d"), &[5]);
+        assert_eq!(map.trailing(&"d"), &[6]);
+        assert_eq!(map.parts(&"d").copied().collect::<Vec<_>>(), vec![4, 5, 6]);
+    }
+
+    #[test]
+    fn dangling_leading() {
+        let mut map = MultiMap::new();
+
+        map.push_dangling("a", 1);
+        map.push_leading("a", 2);
+        map.push_dangling("a", 3);
+        map.push_trailing("a", 4);
+
+        assert_eq!(map.leading(&"a"), [2]);
+        assert_eq!(map.dangling(&"a"), [1, 3]);
+        assert_eq!(map.trailing(&"a"), [4]);
+
+        assert_eq!(
+            map.parts(&"a").copied().collect::<Vec<_>>(),
+            vec![2, 1, 3, 4]
+        );
+
+        assert!(map.has(&"a"));
+    }
+
+    #[test]
+    fn trailing_leading() {
+        let mut map = MultiMap::new();
+
+        map.push_trailing("a", 1);
+        map.push_leading("a", 2);
+        map.push_dangling("a", 3);
+        map.push_trailing("a", 4);
+
+        assert_eq!(map.leading(&"a"), [2]);
+        assert_eq!(map.dangling(&"a"), [3]);
+        assert_eq!(map.trailing(&"a"), [1, 4]);
+
+        assert_eq!(
+            map.parts(&"a").copied().collect::<Vec<_>>(),
+            vec![2, 3, 1, 4]
+        );
+
+        assert!(map.has(&"a"));
+    }
+
+    #[test]
+    fn trailing_dangling() {
+        let mut map = MultiMap::new();
+
+        map.push_trailing("a", 1);
+        map.push_dangling("a", 2);
+        map.push_trailing("a", 3);
+
+        assert_eq!(map.leading(&"a"), &EMPTY);
+        assert_eq!(map.dangling(&"a"), &[2]);
+        assert_eq!(map.trailing(&"a"), &[1, 3]);
+
+        assert_eq!(map.parts(&"a").copied().collect::<Vec<_>>(), vec![2, 1, 3]);
+
+        assert!(map.has(&"a"));
+    }
+
+    #[test]
+    fn keys_out_of_order() {
+        let mut map = MultiMap::new();
+
+        map.push_leading("a", 1);
+        map.push_dangling("b", 2);
+        map.push_leading("a", 3);
+
+        map.push_trailing("c", 4);
+        map.push_dangling("b", 5);
+
+        map.push_leading("d", 6);
+        map.push_trailing("c", 7);
+
+        assert_eq!(map.leading(&"a"), &[1, 3]);
+        assert_eq!(map.dangling(&"b"), &[2, 5]);
+        assert_eq!(map.trailing(&"c"), &[4, 7]);
+
+        assert!(map.has(&"a"));
+        assert!(map.has(&"b"));
+        assert!(map.has(&"c"));
+    }
+}
diff --git a/crates/ruff_python_formatter/src/comments/mod.rs b/crates/ruff_python_formatter/src/comments/mod.rs
new file mode 100644
index 0000000000000..6822efb461b23
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/mod.rs
@@ -0,0 +1,888 @@
+//! Types for extracting and representing comments of a syntax tree.
+//!
+//! Most programming languages support comments allowing programmers to document their programs.
+//! Comments are different from other syntax because programming languages allow comments in almost any position,
+//! giving programmers great flexibility on where they can write comments:
+//!
+//! ```javascript
+//! /**
+//!  * Documentation comment
+//!  */
+//! async /* comment */ function Test () // line comment
+//! {/*inline*/}
+//! ```
+//!
+//! This flexibility makes formatting comments challenging because:
+//! * The formatter must consistently place comments so that re-formatting the output yields the same result,
+//!   and does not create invalid syntax (line comments).
+//! * It is essential that formatters place comments close to the syntax the programmer intended to document.
+//!   However, the lack of rules regarding where comments are allowed and what syntax they document requires
+//!   the use of heuristics to infer the documented syntax.
+//!
+//! This module tries to strike a balance between placing comments as closely as possible to their source location
+//! and reducing the complexity of formatting comments. It does so by associating comments per node rather than a token.
+//! This greatly reduces the combinations of possible comment positions, but turns out to be, in practice,
+//! sufficiently precise to keep comments close to their source location.
+//!
+//! Luckily, Python doesn't support inline comments, which simplifying the problem significantly.
+//!
+//! ## Node comments
+//!
+//! Comments are associated per node but get further distinguished on their location related to that node:
+//!
+//! ### Leading Comments
+//!
+//! A comment at the start of a node
+//!
+//! ```python
+//! # Leading comment of the statement
+//! print("test");
+//!
+//! [   # Leading comment of a
+//!     a
+//! ];
+//! ```
+//!
+//! ### Dangling Comments
+//!
+//! A comment that is neither at the start nor the end of a node.
+//!
+//! ```python
+//! [
+//!     # I'm between two brackets. There are no nodes
+//! ];
+//! ```
+//!
+//! ### Trailing Comments
+//!
+//! A comment at the end of a node.
+//!
+//! ```python
+//! [
+//!     a, # trailing comment of a
+//!     b, c
+//! ];
+//! ```
+//!
+//! ## Limitations
+//! Limiting the placement of comments to leading, dangling, or trailing node comments reduces complexity inside the formatter but means,
+//! that the formatter's possibility of where comments can be formatted depends on the AST structure.
+//!
+//! For example, *`RustPython`* doesn't create a node for the `/` operator separating positional only arguments from the other arguments.
+//!
+//! ```python
+//! def test(
+//!     a,
+//!     /, # The following arguments are positional or named arguments
+//!     b
+//! ):
+//!     pass
+//! ```
+//!
+//! Because *`RustPython`* doesn't create a Node for the `/` argument, it is impossible to associate any
+//! comments with it. Meaning, the default behaviour is to associate the `# The following ...` comment
+//! with the `b` argument, which is incorrect. This limitation can be worked around by implementing
+//! a custom rule to associate comments for `/` as *dangling comments* of the `Arguments` node and then
+//! implement custom formatting inside of the arguments formatter.
+//!
+//! It is possible to add an additional optional label to [`SourceComment`] If ever the need arises to distinguish two *dangling comments* in the formatting logic,
+
+use rustpython_parser::ast::Mod;
+use std::fmt::Debug;
+use std::rc::Rc;
+
+mod debug;
+mod format;
+mod map;
+mod node_key;
+mod placement;
+mod visitor;
+
+use crate::comments::debug::{DebugComment, DebugComments};
+use crate::comments::map::MultiMap;
+use crate::comments::node_key::NodeRefEqualityKey;
+use crate::comments::visitor::CommentsVisitor;
+pub(crate) use format::{
+    dangling_comments, dangling_node_comments, leading_alternate_branch_comments,
+    leading_node_comments, trailing_comments, trailing_node_comments,
+};
+use ruff_formatter::{SourceCode, SourceCodeSlice};
+use ruff_python_ast::node::AnyNodeRef;
+use ruff_python_ast::source_code::CommentRanges;
+
+/// A comment in the source document.
+#[derive(Debug, Clone)]
+pub(crate) struct SourceComment {
+    /// The location of the comment in the source document.
+    slice: SourceCodeSlice,
+
+    /// Whether the comment has been formatted or not.
+    #[cfg(debug_assertions)]
+    formatted: std::cell::Cell<bool>,
+
+    position: CommentTextPosition,
+}
+
+impl SourceComment {
+    /// Returns the location of the comment in the original source code.
+    /// Allows retrieving the text of the comment.
+    pub(crate) fn slice(&self) -> &SourceCodeSlice {
+        &self.slice
+    }
+
+    pub(crate) fn position(&self) -> CommentTextPosition {
+        self.position
+    }
+
+    #[cfg(not(debug_assertions))]
+    #[inline(always)]
+    pub(crate) fn mark_formatted(&self) {}
+
+    /// Marks the comment as formatted
+    #[cfg(debug_assertions)]
+    pub(crate) fn mark_formatted(&self) {
+        self.formatted.set(true);
+    }
+}
+
+impl SourceComment {
+    /// Returns a nice debug representation that prints the source code for every comment (and not just the range).
+    pub(crate) fn debug<'a>(&'a self, source_code: SourceCode<'a>) -> DebugComment<'a> {
+        DebugComment::new(self, source_code)
+    }
+}
+
+/// The position of a comment in the source text.
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
+pub(crate) enum CommentTextPosition {
+    /// A comment that is on the same line as the preceding token and is separated by at least one line break from the following token.
+    ///
+    /// # Examples
+    ///
+    /// ## End of line
+    ///
+    /// ```python
+    /// a; # comment
+    /// b;
+    /// ```
+    ///
+    /// `# comment` is an end of line comments because it is separated by at least one line break from the following token `b`.
+    /// Comments that not only end, but also start on a new line are [`OwnLine`](CommentTextPosition::OwnLine) comments.
+    EndOfLine,
+
+    /// A Comment that is separated by at least one line break from the preceding token.
+    ///
+    /// # Examples
+    ///
+    /// ```python
+    /// a;
+    /// # comment
+    /// b;
+    /// ```
+    ///
+    /// `# comment` line comments because they are separated by one line break from the preceding token `a`.
+    OwnLine,
+}
+
+impl CommentTextPosition {
+    pub(crate) const fn is_own_line(self) -> bool {
+        matches!(self, CommentTextPosition::OwnLine)
+    }
+
+    pub(crate) const fn is_end_of_line(self) -> bool {
+        matches!(self, CommentTextPosition::EndOfLine)
+    }
+}
+
+type CommentsMap<'a> = MultiMap<NodeRefEqualityKey<'a>, SourceComment>;
+
+/// The comments of a syntax tree stored by node.
+///
+/// Cloning `comments` is cheap as it only involves bumping a reference counter.
+#[derive(Clone, Default)]
+pub(crate) struct Comments<'a> {
+    /// The implementation uses an [Rc] so that [Comments] has a lifetime independent from the [crate::Formatter].
+    /// Independent lifetimes are necessary to support the use case where a (formattable object)[crate::Format]
+    /// iterates over all comments, and writes them into the [crate::Formatter] (mutably borrowing the [crate::Formatter] and in turn its context).
+    ///
+    /// ```block
+    /// for leading in f.context().comments().leading_comments(node) {
+    ///     ^
+    ///     |- Borrows comments
+    ///   write!(f, [comment(leading.piece.text())])?;
+    ///          ^
+    ///          |- Mutably borrows the formatter, state, context, and comments (if comments aren't cloned)
+    /// }
+    /// ```
+    ///
+    /// The use of an `Rc` solves this problem because we can cheaply clone `comments` before iterating.
+    ///
+    /// ```block
+    /// let comments = f.context().comments().clone();
+    /// for leading in comments.leading_comments(node) {
+    ///     write!(f, [comment(leading.piece.text())])?;
+    /// }
+    /// ```
+    data: Rc<CommentsData<'a>>,
+}
+
+#[allow(unused)]
+// TODO(micha): Remove after using the new comments infrastructure in the formatter.
+impl<'a> Comments<'a> {
+    fn new(comments: CommentsMap<'a>) -> Self {
+        Self {
+            data: Rc::new(CommentsData { comments }),
+        }
+    }
+
+    /// Extracts the comments from the AST.
+    pub(crate) fn from_ast(
+        root: &'a Mod,
+        source_code: SourceCode<'a>,
+        comment_ranges: &'a CommentRanges,
+    ) -> Self {
+        let map = if comment_ranges.is_empty() {
+            CommentsMap::new()
+        } else {
+            CommentsVisitor::new(source_code, comment_ranges).visit(root)
+        };
+
+        Self::new(map)
+    }
+
+    #[inline]
+    pub(crate) fn has_comments(&self, node: AnyNodeRef) -> bool {
+        self.data.comments.has(&NodeRefEqualityKey::from_ref(node))
+    }
+
+    /// Returns `true` if the given `node` has any [leading comments](self#leading-comments).
+    #[inline]
+    pub(crate) fn has_leading_comments(&self, node: AnyNodeRef) -> bool {
+        !self.leading_comments(node).is_empty()
+    }
+
+    /// Returns the `node`'s [leading comments](self#leading-comments).
+    #[inline]
+    pub(crate) fn leading_comments(&self, node: AnyNodeRef<'a>) -> &[SourceComment] {
+        self.data
+            .comments
+            .leading(&NodeRefEqualityKey::from_ref(node))
+    }
+
+    /// Returns `true` if node has any [dangling comments](self#dangling-comments).
+    pub(crate) fn has_dangling_comments(&self, node: AnyNodeRef<'a>) -> bool {
+        !self.dangling_comments(node).is_empty()
+    }
+
+    /// Returns the [dangling comments](self#dangling-comments) of `node`
+    pub(crate) fn dangling_comments(&self, node: AnyNodeRef<'a>) -> &[SourceComment] {
+        self.data
+            .comments
+            .dangling(&NodeRefEqualityKey::from_ref(node))
+    }
+
+    /// Returns the `node`'s [trailing comments](self#trailing-comments).
+    #[inline]
+    pub(crate) fn trailing_comments(&self, node: AnyNodeRef<'a>) -> &[SourceComment] {
+        self.data
+            .comments
+            .trailing(&NodeRefEqualityKey::from_ref(node))
+    }
+
+    /// Returns `true` if the given `node` has any [trailing comments](self#trailing-comments).
+    #[inline]
+    pub(crate) fn has_trailing_comments(&self, node: AnyNodeRef) -> bool {
+        !self.trailing_comments(node).is_empty()
+    }
+
+    /// Returns an iterator over the [leading](self#leading-comments) and [trailing comments](self#trailing-comments) of `node`.
+    pub(crate) fn leading_trailing_comments(
+        &self,
+        node: AnyNodeRef<'a>,
+    ) -> impl Iterator<Item = &SourceComment> {
+        self.leading_comments(node)
+            .iter()
+            .chain(self.trailing_comments(node).iter())
+    }
+
+    /// Returns an iterator over the [leading](self#leading-comments), [dangling](self#dangling-comments), and [trailing](self#trailing) comments of `node`.
+    pub(crate) fn leading_dangling_trailing_comments(
+        &self,
+        node: AnyNodeRef<'a>,
+    ) -> impl Iterator<Item = &SourceComment> {
+        self.data
+            .comments
+            .parts(&NodeRefEqualityKey::from_ref(node))
+    }
+
+    #[inline(always)]
+    #[cfg(not(debug_assertions))]
+    pub(crate) fn assert_formatted_all_comments(&self, _source_code: SourceCode) {}
+
+    #[cfg(debug_assertions)]
+    pub(crate) fn assert_formatted_all_comments(&self, source_code: SourceCode) {
+        use std::fmt::Write;
+
+        let mut output = String::new();
+        let unformatted_comments = self
+            .data
+            .comments
+            .all_parts()
+            .filter(|c| !c.formatted.get());
+
+        for comment in unformatted_comments {
+            // SAFETY: Writing to a string never fails.
+            writeln!(output, "{:#?}", comment.debug(source_code)).unwrap();
+        }
+
+        assert!(
+            output.is_empty(),
+            "The following comments have not been formatted.\n{output}"
+        );
+    }
+
+    /// Returns an object that implements [Debug] for nicely printing the [`Comments`].
+    pub(crate) fn debug(&'a self, source_code: SourceCode<'a>) -> DebugComments<'a> {
+        DebugComments::new(&self.data.comments, source_code)
+    }
+}
+
+#[derive(Default)]
+struct CommentsData<'a> {
+    comments: CommentsMap<'a>,
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::comments::Comments;
+    use insta::assert_debug_snapshot;
+    use ruff_formatter::SourceCode;
+    use ruff_python_ast::prelude::*;
+    use ruff_python_ast::source_code::{CommentRanges, CommentRangesBuilder};
+    use rustpython_parser::lexer::lex;
+    use rustpython_parser::{parse_tokens, Mode};
+
+    struct CommentsTestCase<'a> {
+        module: Mod,
+        comment_ranges: CommentRanges,
+        source_code: SourceCode<'a>,
+    }
+
+    impl<'a> CommentsTestCase<'a> {
+        fn from_code(code: &'a str) -> Self {
+            let source_code = SourceCode::new(code);
+            let tokens: Vec<_> = lex(code, Mode::Module).collect();
+
+            let mut comment_ranges = CommentRangesBuilder::default();
+
+            for (token, range) in tokens.iter().flatten() {
+                comment_ranges.visit_token(token, *range);
+            }
+
+            let comment_ranges = comment_ranges.finish();
+
+            let parsed = parse_tokens(tokens.into_iter(), Mode::Module, "test.py")
+                .expect("Expect source to be valid Python");
+
+            CommentsTestCase {
+                source_code,
+                module: parsed,
+                comment_ranges,
+            }
+        }
+
+        fn to_comments(&self) -> Comments {
+            Comments::from_ast(&self.module, self.source_code, &self.comment_ranges)
+        }
+    }
+
+    #[test]
+    fn base_test() {
+        let source = r#"
+# Function Leading comment
+def test(x, y):
+    if x == y: # if statement end of line comment
+        print("Equal")
+
+    # Leading comment
+    elif x < y:
+        print("Less")
+    else:
+        print("Greater")
+
+# own line comment
+
+test(10, 20)
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn only_comments() {
+        let source = r#"
+# Some comment
+
+# another comment
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn empty_file() {
+        let source = r#""#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn dangling_comment() {
+        let source = r#"
+def test(
+        # Some comment
+    ):
+    pass
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn parenthesized_expression() {
+        let source = r#"
+a = ( # Trailing comment
+    10 + # More comments
+     3
+    )
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn parenthesized_trailing_comment() {
+        let source = r#"(
+    a
+    # comment
+)
+"#;
+
+        let test_case = CommentsTestCase::from_code(source);
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn trailing_function_comment() {
+        let source = r#"
+def test(x, y):
+    if x == y:
+        pass
+    elif x < y:
+        print("Less")
+    else:
+        print("Greater")
+
+        # trailing `else` comment
+
+    # Trailing `if` statement comment
+
+def other(y, z):
+    if y == z:
+        pass
+            # Trailing `if` comment
+      # Trailing `other` function comment
+
+test(10, 20)
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn trailing_comment_after_single_statement_body() {
+        let source = r#"
+if x == y: pass
+
+    # Test
+print("test")
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn if_elif_else_comments() {
+        let source = r#"
+if x == y:
+    pass # trailing `pass` comment
+    # Root `if` trailing comment
+
+# Leading elif comment
+elif x < y:
+    pass
+    # `elif` trailing comment
+# Leading else comment
+else:
+    pass
+    # `else` trailing comment
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn if_elif_if_else_comments() {
+        let source = r#"
+if x == y:
+    pass
+elif x < y:
+    if x < 10:
+        pass
+    # `elif` trailing comment
+# Leading else comment
+else:
+    pass
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn try_except_finally_else() {
+        let source = r#"
+try:
+    pass
+    # trailing try comment
+# leading handler comment
+except Exception as ex:
+    pass
+    # Trailing except comment
+# leading else comment
+else:
+    pass
+    # trailing else comment
+# leading finally comment
+finally:
+    print("Finally!")
+    # Trailing finally comment
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn try_except() {
+        let source = r#"
+def test():
+    try:
+        pass
+        # trailing try comment
+    # leading handler comment
+    except Exception as ex:
+        pass
+        # Trailing except comment
+
+    # Trailing function comment
+
+print("Next statement");
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    // Issue: Match cases
+    #[test]
+    fn match_cases() {
+        let source = r#"def make_point_3d(pt):
+    match pt:
+        # Leading `case(x, y)` comment
+        case (x, y):
+            return Point3d(x, y, 0)
+            # Trailing `case(x, y) comment
+        # Leading `case (x, y, z)` comment
+        case (x, y, z):
+            if x < y:
+                print("if")
+            else:
+                print("else")
+                # Trailing else comment
+            # trailing case comment
+        case Point2d(x, y):
+            return Point3d(x, y, 0)
+        case _:
+            raise TypeError("not a point we support")
+            # Trailing last case comment
+        # Trailing match comment
+    # After match comment
+
+    print("other")
+        "#;
+
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn leading_most_outer() {
+        let source = r#"
+# leading comment
+x
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    // Comment should be attached to the statement
+    #[test]
+    fn trailing_most_outer() {
+        let source = r#"
+x # trailing comment
+y # trailing last node
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn trailing_most_outer_nested() {
+        let source = r#"
+x + (
+    3 # trailing comment
+) # outer
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn trailing_after_comma() {
+        let source = r#"
+def test(
+    a, # Trailing comment for argument `a`
+    b,
+): pass
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn positional_argument_only_comment() {
+        let source = r#"
+def test(
+    a, # trailing positional comment
+    # Positional arguments only after here
+    /, # trailing positional argument comment.
+    # leading b comment
+    b,
+): pass
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn positional_argument_only_leading_comma_comment() {
+        let source = r#"
+def test(
+    a # trailing positional comment
+    # Positional arguments only after here
+    ,/, # trailing positional argument comment.
+    # leading b comment
+    b,
+): pass
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn positional_argument_only_comment_without_following_node() {
+        let source = r#"
+def test(
+    a, # trailing positional comment
+    # Positional arguments only after here
+    /, # trailing positional argument comment.
+    # Trailing on new line
+): pass
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn non_positional_arguments_with_defaults() {
+        let source = r#"
+def test(
+    a=10 # trailing positional comment
+    # Positional arguments only after here
+    ,/, # trailing positional argument comment.
+    # leading comment for b
+    b=20
+): pass
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn non_positional_arguments_slash_on_same_line() {
+        let source = r#"
+def test(a=10,/, # trailing positional argument comment.
+    # leading comment for b
+    b=20
+): pass
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn binary_expression_left_operand_comment() {
+        let source = r#"
+a = (
+    5
+    # trailing left comment
+    +
+    # leading right comment
+    3
+)
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn binary_expression_left_operand_trailing_end_of_line_comment() {
+        let source = r#"
+a = (
+    5 # trailing left comment
+    + # trailing operator comment
+    # leading right comment
+    3
+)
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn nested_binary_expression() {
+        let source = r#"
+a = (
+    (5 # trailing left comment
+        *
+        2)
+    + # trailing operator comment
+    # leading right comment
+    3
+)
+"#;
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn while_trailing_end_of_line_comment() {
+        let source = r#"while True:
+    if something.changed:
+        do.stuff()  # trailing comment
+"#;
+
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+
+    #[test]
+    fn while_trailing_else_end_of_line_comment() {
+        let source = r#"while True:
+    pass
+else: # trailing comment
+    pass
+"#;
+
+        let test_case = CommentsTestCase::from_code(source);
+
+        let comments = test_case.to_comments();
+
+        assert_debug_snapshot!(comments.debug(test_case.source_code));
+    }
+}
diff --git a/crates/ruff_python_formatter/src/comments/node_key.rs b/crates/ruff_python_formatter/src/comments/node_key.rs
new file mode 100644
index 0000000000000..38e8f026c79c7
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/node_key.rs
@@ -0,0 +1,94 @@
+use ruff_python_ast::node::AnyNodeRef;
+use std::fmt::{Debug, Formatter};
+use std::hash::{Hash, Hasher};
+
+/// Used as key into the [`MultiMap`] storing the comments per node by [`Comments`].
+///
+/// Implements equality and hashing based on the address of the [`AnyNodeRef`] to get fast and cheap
+/// hashing/equality comparison.
+#[derive(Copy, Clone)]
+pub(super) struct NodeRefEqualityKey<'a> {
+    node: AnyNodeRef<'a>,
+}
+
+impl<'a> NodeRefEqualityKey<'a> {
+    /// Creates a key for a node reference.
+    pub(super) const fn from_ref(node: AnyNodeRef<'a>) -> Self {
+        Self { node }
+    }
+
+    /// Returns the underlying node.
+    pub(super) fn node(&self) -> AnyNodeRef {
+        self.node
+    }
+}
+
+impl Debug for NodeRefEqualityKey<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        self.node.fmt(f)
+    }
+}
+
+impl PartialEq for NodeRefEqualityKey<'_> {
+    fn eq(&self, other: &Self) -> bool {
+        self.node.ptr_eq(other.node)
+    }
+}
+
+impl Eq for NodeRefEqualityKey<'_> {}
+
+impl Hash for NodeRefEqualityKey<'_> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.node.as_ptr().hash(state);
+    }
+}
+
+impl<'a> From<AnyNodeRef<'a>> for NodeRefEqualityKey<'a> {
+    fn from(value: AnyNodeRef<'a>) -> Self {
+        NodeRefEqualityKey::from_ref(value)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::comments::node_key::NodeRefEqualityKey;
+    use ruff_python_ast::node::AnyNodeRef;
+    use ruff_text_size::TextRange;
+    use rustpython_parser::ast::StmtContinue;
+    use std::collections::hash_map::DefaultHasher;
+    use std::hash::{Hash, Hasher};
+
+    fn hash(key: NodeRefEqualityKey) -> u64 {
+        let mut h = DefaultHasher::default();
+        key.hash(&mut h);
+        h.finish()
+    }
+
+    #[test]
+    fn equality() {
+        let continue_statement = StmtContinue {
+            range: TextRange::default(),
+        };
+
+        let ref_a = NodeRefEqualityKey::from_ref(AnyNodeRef::from(&continue_statement));
+        let ref_b = NodeRefEqualityKey::from_ref(AnyNodeRef::from(&continue_statement));
+
+        assert_eq!(ref_a, ref_b);
+        assert_eq!(hash(ref_a), hash(ref_b));
+    }
+
+    #[test]
+    fn inequality() {
+        let continue_statement = StmtContinue {
+            range: TextRange::default(),
+        };
+
+        let boxed = Box::new(continue_statement.clone());
+
+        let ref_a = NodeRefEqualityKey::from_ref(AnyNodeRef::from(&continue_statement));
+        let ref_b = NodeRefEqualityKey::from_ref(AnyNodeRef::from(boxed.as_ref()));
+
+        assert_ne!(ref_a, ref_b);
+        assert_ne!(hash(ref_a), hash(ref_b));
+    }
+}
diff --git a/crates/ruff_python_formatter/src/comments/placement.rs b/crates/ruff_python_formatter/src/comments/placement.rs
new file mode 100644
index 0000000000000..c90d446b25563
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/placement.rs
@@ -0,0 +1,864 @@
+use crate::comments::visitor::{CommentPlacement, DecoratedComment};
+
+use crate::comments::CommentTextPosition;
+use crate::trivia::find_first_non_trivia_character_in_range;
+use ruff_python_ast::node::AnyNodeRef;
+use ruff_python_ast::source_code::Locator;
+use ruff_python_ast::whitespace;
+use ruff_text_size::{TextLen, TextRange, TextSize};
+use rustpython_parser::ast::Ranged;
+use std::cmp::Ordering;
+
+/// Implements the custom comment placement logic.
+pub(super) fn place_comment<'a>(
+    comment: DecoratedComment<'a>,
+    locator: &Locator,
+) -> CommentPlacement<'a> {
+    handle_in_between_excepthandlers_or_except_handler_and_else_or_finally_comment(comment, locator)
+        .or_else(|comment| handle_match_comment(comment, locator))
+        .or_else(|comment| handle_in_between_bodies_own_line_comment(comment, locator))
+        .or_else(|comment| handle_in_between_bodies_end_of_line_comment(comment, locator))
+        .or_else(|comment| handle_trailing_body_comment(comment, locator))
+        .or_else(handle_trailing_end_of_line_body_comment)
+        .or_else(|comment| handle_trailing_end_of_line_condition_comment(comment, locator))
+        .or_else(|comment| handle_positional_only_arguments_separator_comment(comment, locator))
+        .or_else(|comment| {
+            handle_trailing_binary_expression_left_or_operator_comment(comment, locator)
+        })
+}
+
+/// Handles leading comments in front of a match case or a trailing comment of the `match` statement.
+/// ```python
+/// match pt:
+///     # Leading `case(x, y)` comment
+///     case (x, y):
+///         return Point3d(x, y, 0)
+///     # Leading `case (x, y, z)` comment
+///     case _:
+/// ```
+fn handle_match_comment<'a>(
+    comment: DecoratedComment<'a>,
+    locator: &Locator,
+) -> CommentPlacement<'a> {
+    // Must be an own line comment after the last statement in a match case
+    if comment.text_position().is_end_of_line() || comment.following_node().is_some() {
+        return CommentPlacement::Default(comment);
+    }
+
+    // Get the enclosing match case
+    let Some(match_case) = comment.enclosing_node().match_case() else {
+        return CommentPlacement::Default(comment)
+    };
+
+    // And its parent match statement.
+    let Some(match_stmt) = comment
+        .enclosing_parent()
+        .and_then(AnyNodeRef::stmt_match) else {
+        return CommentPlacement::Default(comment)
+    };
+
+    // Get the next sibling (sibling traversal would be really nice)
+    let current_case_index = match_stmt
+        .cases
+        .iter()
+        .position(|case| case == match_case)
+        .expect("Expected case to belong to parent match statement.");
+
+    let next_case = match_stmt.cases.get(current_case_index + 1);
+
+    let comment_indentation =
+        whitespace::indentation_at_offset(locator, comment.slice().range().start())
+            .map(str::len)
+            .unwrap_or_default();
+    let match_case_indentation = whitespace::indentation(locator, match_case).unwrap().len();
+
+    if let Some(next_case) = next_case {
+        // The comment's indentation is less or equal to the `case` indention and there's a following
+        // `case` arm.
+        // ```python
+        // match pt:
+        //     case (x, y):
+        //         return Point3d(x, y, 0)
+        //     # Leading `case (x, y, z)` comment
+        //     case _:
+        //         pass
+        // ```
+        // Attach the `comment` as leading comment to the next case.
+        if comment_indentation <= match_case_indentation {
+            CommentPlacement::leading(next_case.into(), comment)
+        } else {
+            // Otherwise, delegate to `handle_trailing_body_comment`
+            // ```python
+            // match pt:
+            //     case (x, y):
+            //         return Point3d(x, y, 0)
+            //         # Trailing case body comment
+            //     case _:
+            //         pass
+            // ```
+            CommentPlacement::Default(comment)
+        }
+    } else {
+        // Comment after the last statement in a match case...
+        let match_stmt_indentation = whitespace::indentation(locator, match_stmt)
+            .unwrap_or_default()
+            .len();
+
+        if comment_indentation <= match_case_indentation
+            && comment_indentation > match_stmt_indentation
+        {
+            // The comment's indent matches the `case` indent (or is larger than the `match`'s indent).
+            // ```python
+            // match pt:
+            //     case (x, y):
+            //         return Point3d(x, y, 0)
+            //     case _:
+            //         pass
+            //     # Trailing match comment
+            // ```
+            // This is a trailing comment of the last case.
+            CommentPlacement::trailing(match_case.into(), comment)
+        } else {
+            // Delegate to `handle_trailing_body_comment` because it's either a trailing indent
+            // for the last statement in the `case` body or a comment for the parent of the `match`
+            //
+            // ```python
+            // match pt:
+            //     case (x, y):
+            //         return Point3d(x, y, 0)
+            //     case _:
+            //         pass
+            //         # trailing case comment
+            // ```
+            CommentPlacement::Default(comment)
+        }
+    }
+}
+
+/// Handles comments between excepthandlers and between the last except handler and any following `else` or `finally` block.
+fn handle_in_between_excepthandlers_or_except_handler_and_else_or_finally_comment<'a>(
+    comment: DecoratedComment<'a>,
+    locator: &Locator,
+) -> CommentPlacement<'a> {
+    if comment.text_position().is_end_of_line() || comment.following_node().is_none() {
+        return CommentPlacement::Default(comment);
+    }
+
+    if let Some(AnyNodeRef::ExcepthandlerExceptHandler(except_handler)) = comment.preceding_node() {
+        // it now depends on the indentation level of the comment if it is a leading comment for e.g.
+        // the following `elif` or indeed a trailing comment of the previous body's last statement.
+        let comment_indentation =
+            whitespace::indentation_at_offset(locator, comment.slice().range().start())
+                .map(str::len)
+                .unwrap_or_default();
+
+        if let Some(except_indentation) =
+            whitespace::indentation(locator, except_handler).map(str::len)
+        {
+            return if comment_indentation <= except_indentation {
+                // It has equal, or less indent than the `except` handler. It must be a comment
+                // of the following `finally` or `else` block
+                //
+                // ```python
+                // try:
+                //     pass
+                // except Exception:
+                //     print("noop")
+                // # leading
+                // finally:
+                //     pass
+                // ```
+                // Attach it to the `try` statement.
+                CommentPlacement::dangling(comment.enclosing_node(), comment)
+            } else {
+                // Delegate to `handle_trailing_body_comment`
+                CommentPlacement::Default(comment)
+            };
+        }
+    }
+
+    CommentPlacement::Default(comment)
+}
+
+/// Handles own line comments between the last statement and the first statement of two bodies.
+///
+/// ```python
+/// if x == y:
+///     pass
+///     # This should be a trailing comment of `pass` and not a leading comment of the `print`
+///     # in the `else` branch
+/// else:
+///     print("I have no comments")
+/// ```
+fn handle_in_between_bodies_own_line_comment<'a>(
+    comment: DecoratedComment<'a>,
+    locator: &Locator,
+) -> CommentPlacement<'a> {
+    if !comment.text_position().is_own_line() {
+        return CommentPlacement::Default(comment);
+    }
+
+    // The comment must be between two statements...
+    if let (Some(preceding), Some(following)) = (comment.preceding_node(), comment.following_node())
+    {
+        // ...and the following statement must be the first statement in an alternate body of the parent...
+        if !is_first_statement_in_enclosing_alternate_body(following, comment.enclosing_node()) {
+            // ```python
+            // if test:
+            //     a
+            //     # comment
+            //     b
+            // ```
+            return CommentPlacement::Default(comment);
+        }
+
+        // it now depends on the indentation level of the comment if it is a leading comment for e.g.
+        // the following `elif` or indeed a trailing comment of the previous body's last statement.
+        let comment_indentation =
+            whitespace::indentation_at_offset(locator, comment.slice().range().start())
+                .map(str::len)
+                .unwrap_or_default();
+
+        if let Some(preceding_indentation) =
+            whitespace::indentation(locator, &preceding).map(str::len)
+        {
+            return if comment_indentation >= preceding_indentation {
+                // `# comment` has the same or a larger indent than the `pass` statement.
+                // It likely is a trailing comment of the `pass` statement.
+                // ```python
+                // if x == y:
+                //     pass
+                //     # comment
+                // else:
+                //     print("noop")
+                // ```
+                CommentPlacement::trailing(preceding, comment)
+            } else {
+                // Otherwise it has less indent than the previous statement. Meaning that it is a leading comment
+                // of the following block.
+                //
+                // ```python
+                // if x == y:
+                //     pass
+                // # I'm a leading comment of the `elif` statement.
+                // elif:
+                //     print("nooop")
+                // ```
+                if following.is_stmt_if() || following.is_except_handler() {
+                    // The `elif` or except handlers have their own body to which we can attach the leading comment
+                    CommentPlacement::leading(following, comment)
+                } else {
+                    // There are no bodies for the "else" branch and other bodies that are represented as a `Vec<Stmt>`.
+                    // This means, there's no good place to attach the comments to.
+                    // That's why we make these dangling comments and format them  manually
+                    // in the enclosing node's formatting logic. For `try`, it's the formatters responsibility
+                    // to correctly identify the comments for the `finally` and `orelse` block by looking
+                    // at the comment's range.
+                    //
+                    // ```python
+                    // if x == y:
+                    //     pass
+                    // # I'm a leading comment of the `else` branch but there's no `else` node.
+                    // else:
+                    //     print("nooop")
+                    // ```
+                    CommentPlacement::dangling(comment.enclosing_node(), comment)
+                }
+            };
+        }
+    }
+
+    CommentPlacement::Default(comment)
+}
+
+/// Handles end of line comments comments between the last statement and the first statement of two bodies.
+///
+/// ```python
+/// if x == y:
+///     pass # trailing comment of pass
+/// else: # trailing comment of `else`
+///     print("I have no comments")
+/// ```
+fn handle_in_between_bodies_end_of_line_comment<'a>(
+    comment: DecoratedComment<'a>,
+    locator: &Locator,
+) -> CommentPlacement<'a> {
+    if !comment.text_position().is_end_of_line() {
+        return CommentPlacement::Default(comment);
+    }
+
+    // The comment must be between two statements...
+    if let (Some(preceding), Some(following)) = (comment.preceding_node(), comment.following_node())
+    {
+        // ...and the following statement must be the first statement in an alternate body of the parent...
+        if !is_first_statement_in_enclosing_alternate_body(following, comment.enclosing_node()) {
+            // ```python
+            // if test:
+            //     a
+            //     # comment
+            //     b
+            // ```
+            return CommentPlacement::Default(comment);
+        }
+
+        if !locator.contains_line_break(TextRange::new(preceding.end(), comment.slice().start())) {
+            // Trailing comment of the preceding statement
+            // ```python
+            // while test:
+            //     a # comment
+            // else:
+            //     b
+            // ```
+            CommentPlacement::trailing(preceding, comment)
+        } else if following.is_stmt_if() || following.is_except_handler() {
+            // The `elif` or except handlers have their own body to which we can attach the trailing comment
+            // ```python
+            // if test:
+            //     a
+            // elif c: # comment
+            //     b
+            // ```
+            CommentPlacement::trailing(following, comment)
+        } else {
+            // There are no bodies for the "else" branch and other bodies that are represented as a `Vec<Stmt>`.
+            // This means, there's no good place to attach the comments to.
+            // Make this a dangling comments and manually format the comment in
+            // in the enclosing node's formatting logic. For `try`, it's the formatters responsibility
+            // to correctly identify the comments for the `finally` and `orelse` block by looking
+            // at the comment's range.
+            //
+            // ```python
+            // while x == y:
+            //     pass
+            // else: # trailing
+            //     print("nooop")
+            // ```
+            CommentPlacement::dangling(comment.enclosing_node(), comment)
+        }
+    } else {
+        CommentPlacement::Default(comment)
+    }
+}
+
+/// Handles trailing comments at the end of a body block (or any other block that is indented).
+/// ```python
+/// def test():
+///     pass
+///     # This is a trailing comment that belongs to the function `test`
+///     # and not to the next statement.
+///
+/// print("I have no comments")
+/// ```
+fn handle_trailing_body_comment<'a>(
+    comment: DecoratedComment<'a>,
+    locator: &Locator,
+) -> CommentPlacement<'a> {
+    if comment.text_position().is_end_of_line() {
+        return CommentPlacement::Default(comment);
+    }
+
+    // Only do something if the preceding node has a body (has indented statements).
+    let Some(last_child) = comment.preceding_node().and_then(last_child_in_body) else {
+        return CommentPlacement::Default(comment);
+    };
+
+    let Some(comment_indentation) = whitespace::indentation_at_offset(locator, comment.slice().range().start()) else {
+        // The comment can't be a comment for the previous block if it isn't indented..
+        return CommentPlacement::Default(comment);
+    };
+
+    // We only care about the length because indentations with mixed spaces and tabs are only valid if
+    // the indent-level doesn't depend on the tab width (the indent level must be the same if the tab width is 1 or 8).
+    let comment_indentation_len = comment_indentation.len();
+
+    let mut current_child = last_child;
+    let mut parent_body = comment.preceding_node();
+    let mut grand_parent_body = None;
+
+    loop {
+        let child_indentation = whitespace::indentation(locator, &current_child)
+            .map(str::len)
+            .unwrap_or_default();
+
+        match comment_indentation_len.cmp(&child_indentation) {
+            Ordering::Less => {
+                break if let Some(parent_block) = grand_parent_body {
+                    // Comment belongs to the parent block.
+                    // ```python
+                    // if test:
+                    //      if other:
+                    //          pass
+                    //        # comment
+                    // ```
+                    CommentPlacement::trailing(parent_block, comment)
+                } else {
+                    // The comment does not belong to this block.
+                    // ```python
+                    // if test:
+                    //      pass
+                    // # comment
+                    // ```
+                    CommentPlacement::Default(comment)
+                };
+            }
+            Ordering::Equal => {
+                // The comment belongs to this block.
+                // ```python
+                // if test:
+                //     pass
+                //     # comment
+                // ```
+                break CommentPlacement::trailing(current_child, comment);
+            }
+            Ordering::Greater => {
+                if let Some(nested_child) = last_child_in_body(current_child) {
+                    // The comment belongs to the inner block.
+                    // ```python
+                    // def a():
+                    //     if test:
+                    //         pass
+                    //         # comment
+                    // ```
+                    // Comment belongs to the `if`'s inner body
+                    grand_parent_body = parent_body;
+                    parent_body = Some(current_child);
+                    current_child = nested_child;
+                } else {
+                    // The comment belongs to this block.
+                    // ```python
+                    // if test:
+                    //     pass
+                    //         # comment
+                    // ```
+                    break CommentPlacement::trailing(current_child, comment);
+                }
+            }
+        }
+    }
+}
+
+/// Handles end of line comments of the last statement in an indented body:
+///
+/// ```python
+/// while True:
+///     if something.changed:
+///         do.stuff()  # trailing comment
+/// ```
+fn handle_trailing_end_of_line_body_comment(comment: DecoratedComment<'_>) -> CommentPlacement<'_> {
+    // Must be an end of line comment
+    if comment.text_position().is_own_line() {
+        return CommentPlacement::Default(comment);
+    }
+
+    // Must be *after* a statement
+    let Some(preceding) = comment.preceding_node() else {
+        return CommentPlacement::Default(comment);
+    };
+
+    // Recursively get the last child of statements with a body.
+    let last_children = std::iter::successors(last_child_in_body(preceding), |parent| {
+        last_child_in_body(*parent)
+    });
+
+    if let Some(last_child) = last_children.last() {
+        CommentPlacement::trailing(last_child, comment)
+    } else {
+        // End of line comment of a statement that has no body. This is not what we're looking for.
+        // ```python
+        // a # trailing comment
+        // b
+        //  ```
+        CommentPlacement::Default(comment)
+    }
+}
+
+/// Handles end of line comments after the `:` of a condition
+///
+/// ```python
+/// while True: # comment
+///     pass
+/// ```
+///
+/// It attaches the comment as dangling comment to the enclosing `while` statement.
+fn handle_trailing_end_of_line_condition_comment<'a>(
+    comment: DecoratedComment<'a>,
+    locator: &Locator,
+) -> CommentPlacement<'a> {
+    use ruff_python_ast::prelude::*;
+
+    // Must be an end of line comment
+    if comment.text_position().is_own_line() {
+        return CommentPlacement::Default(comment);
+    }
+
+    // Must be between the condition expression and the first body element
+    let (Some(preceding), Some(following)) = (comment.preceding_node(), comment.following_node()) else {
+        return CommentPlacement::Default(comment);
+    };
+
+    let expression_before_colon = match comment.enclosing_node() {
+        AnyNodeRef::StmtIf(StmtIf { test: expr, .. })
+        | AnyNodeRef::StmtWhile(StmtWhile { test: expr, .. })
+        | AnyNodeRef::StmtFor(StmtFor { iter: expr, .. })
+        | AnyNodeRef::StmtAsyncFor(StmtAsyncFor { iter: expr, .. }) => {
+            Some(AnyNodeRef::from(expr.as_ref()))
+        }
+
+        AnyNodeRef::StmtWith(StmtWith { items, .. })
+        | AnyNodeRef::StmtAsyncWith(StmtAsyncWith { items, .. }) => {
+            items.last().map(AnyNodeRef::from)
+        }
+        _ => None,
+    };
+
+    let Some(last_before_colon) = expression_before_colon else {
+        return CommentPlacement::Default(comment);
+    };
+
+    // If the preceding is the node before the `colon`
+    // `while true:` The node before the `colon` is the `true` constant.
+    if preceding.ptr_eq(last_before_colon) {
+        let mut start = preceding.end();
+        while let Some((offset, c)) = find_first_non_trivia_character_in_range(
+            TextRange::new(start, following.start()),
+            locator.contents(),
+        ) {
+            match c {
+                ':' => {
+                    if comment.slice().start() > offset {
+                        // Comment comes after the colon
+                        // ```python
+                        // while a: # comment
+                        //      ...
+                        // ```
+                        return CommentPlacement::dangling(comment.enclosing_node(), comment);
+                    }
+
+                    // Comment comes before the colon
+                    // ```python
+                    // while (
+                    //  a # comment
+                    // ):
+                    //      ...
+                    // ```
+                    break;
+                }
+                ')' => {
+                    // Skip over any closing parentheses
+                    start = offset + ')'.text_len();
+                }
+                _ => {
+                    unreachable!("Only ')' or ':' should follow the condition")
+                }
+            }
+        }
+    }
+
+    CommentPlacement::Default(comment)
+}
+
+/// Attaches comments for the positional-only arguments separator `/` as trailing comments to the
+/// enclosing [`Arguments`] node.
+///
+/// ```python
+/// def test(
+///     a,
+///     # Positional arguments only after here
+///     /, # trailing positional argument comment.
+///     b,
+/// ): pass
+/// ```
+fn handle_positional_only_arguments_separator_comment<'a>(
+    comment: DecoratedComment<'a>,
+    locator: &Locator,
+) -> CommentPlacement<'a> {
+    let AnyNodeRef::Arguments(arguments) = comment.enclosing_node() else {
+        return CommentPlacement::Default(comment);
+    };
+
+    // Using the `/` without any leading arguments is a syntax error.
+    let Some(last_argument_or_default) = comment.preceding_node() else {
+        return CommentPlacement::Default(comment);
+    };
+
+    let is_last_positional_argument = are_same_optional(last_argument_or_default, arguments.posonlyargs.last())
+            // If the preceding node is the default for the last positional argument
+            // ```python
+            // def test(a=10, /, b): pass
+            // ```
+            || arguments
+                .defaults
+                .iter()
+                .position(|default| AnyNodeRef::from(default).ptr_eq(last_argument_or_default))
+                == Some(arguments.posonlyargs.len().saturating_sub(1));
+
+    if !is_last_positional_argument {
+        return CommentPlacement::Default(comment);
+    }
+
+    let trivia_end = comment
+        .following_node()
+        .map_or(arguments.end(), |following| following.start());
+    let trivia_range = TextRange::new(last_argument_or_default.end(), trivia_end);
+
+    if let Some(slash_offset) = find_pos_only_slash_offset(trivia_range, locator) {
+        let comment_start = comment.slice().range().start();
+        let is_slash_comment = match comment.text_position() {
+            CommentTextPosition::EndOfLine => {
+                let preceding_end_line = locator.line_end(last_argument_or_default.end());
+                let slash_comments_start = preceding_end_line.min(slash_offset);
+
+                comment_start >= slash_comments_start
+                    && locator.line_end(slash_offset) > comment_start
+            }
+            CommentTextPosition::OwnLine => comment_start < slash_offset,
+        };
+
+        if is_slash_comment {
+            CommentPlacement::dangling(comment.enclosing_node(), comment)
+        } else {
+            CommentPlacement::Default(comment)
+        }
+    } else {
+        // Should not happen, but let's go with it
+        CommentPlacement::Default(comment)
+    }
+}
+
+/// Handles comments between the left side and the operator of a binary expression (trailing comments of the left),
+/// and trailing end-of-line comments that are on the same line as the operator.
+///
+///```python
+/// a = (
+///     5 # trailing left comment
+///     + # trailing operator comment
+///     # leading right comment
+///     3
+/// )
+/// ```
+fn handle_trailing_binary_expression_left_or_operator_comment<'a>(
+    comment: DecoratedComment<'a>,
+    locator: &Locator,
+) -> CommentPlacement<'a> {
+    let Some(binary_expression) = comment.enclosing_node().expr_bin_op() else {
+        return CommentPlacement::Default(comment);
+    };
+
+    // Only if there's a preceding node (in which case, the preceding node is `left`).
+    if comment.preceding_node().is_none() || comment.following_node().is_none() {
+        return CommentPlacement::Default(comment);
+    }
+
+    let mut between_operands_range = TextRange::new(
+        binary_expression.left.end(),
+        binary_expression.right.start(),
+    );
+
+    let operator_offset = loop {
+        match find_first_non_trivia_character_in_range(between_operands_range, locator.contents()) {
+            // Skip over closing parens
+            Some((offset, ')')) => {
+                between_operands_range =
+                    TextRange::new(offset + TextSize::new(1), between_operands_range.end());
+            }
+            Some((offset, _)) => break offset,
+            None => return CommentPlacement::Default(comment),
+        }
+    };
+
+    let comment_range = comment.slice().range();
+
+    if comment_range.end() < operator_offset {
+        // ```python
+        // a = (
+        //      5
+        //      # comment
+        //      +
+        //      3
+        // )
+        // ```
+        CommentPlacement::trailing(AnyNodeRef::from(binary_expression.left.as_ref()), comment)
+    } else if comment.text_position().is_end_of_line() {
+        // Is the operator on its own line.
+        if locator.contains_line_break(TextRange::new(
+            binary_expression.left.end(),
+            operator_offset,
+        )) && locator.contains_line_break(TextRange::new(
+            operator_offset,
+            binary_expression.right.start(),
+        )) {
+            // ```python
+            // a = (
+            //      5
+            //      + # comment
+            //      3
+            // )
+            // ```
+            CommentPlacement::dangling(binary_expression.into(), comment)
+        } else {
+            // ```python
+            // a = (
+            //      5
+            //      +
+            //      3 # comment
+            // )
+            // ```
+            // OR
+            // ```python
+            // a = (
+            //      5 # comment
+            //      +
+            //      3
+            // )
+            // ```
+            CommentPlacement::Default(comment)
+        }
+    } else {
+        // ```python
+        // a = (
+        //      5
+        //      +
+        //      # comment
+        //      3
+        // )
+        // ```
+        CommentPlacement::Default(comment)
+    }
+}
+
+/// Finds the offset of the `/` that separates the positional only and arguments from the other arguments.
+/// Returns `None` if the positional only separator `/` isn't present in the specified range.
+fn find_pos_only_slash_offset(
+    between_arguments_range: TextRange,
+    locator: &Locator,
+) -> Option<TextSize> {
+    // First find the comma separating the two arguments
+    find_first_non_trivia_character_in_range(between_arguments_range, locator.contents()).and_then(
+        |(comma_offset, comma)| {
+            debug_assert_eq!(comma, ',');
+
+            // Then find the position of the `/` operator
+            find_first_non_trivia_character_in_range(
+                TextRange::new(
+                    comma_offset + TextSize::new(1),
+                    between_arguments_range.end(),
+                ),
+                locator.contents(),
+            )
+            .map(|(offset, c)| {
+                debug_assert_eq!(c, '/');
+                offset
+            })
+        },
+    )
+}
+
+/// Returns `true` if `right` is `Some` and `left` and `right` are referentially equal.
+fn are_same_optional<'a, T>(left: AnyNodeRef, right: Option<T>) -> bool
+where
+    T: Into<AnyNodeRef<'a>>,
+{
+    right.map_or(false, |right| left.ptr_eq(right.into()))
+}
+
+fn last_child_in_body(node: AnyNodeRef) -> Option<AnyNodeRef> {
+    use ruff_python_ast::prelude::*;
+
+    let body = match node {
+        AnyNodeRef::StmtFunctionDef(StmtFunctionDef { body, .. })
+        | AnyNodeRef::StmtAsyncFunctionDef(StmtAsyncFunctionDef { body, .. })
+        | AnyNodeRef::StmtClassDef(StmtClassDef { body, .. })
+        | AnyNodeRef::StmtWith(StmtWith { body, .. })
+        | AnyNodeRef::StmtAsyncWith(StmtAsyncWith { body, .. })
+        | AnyNodeRef::MatchCase(MatchCase { body, .. })
+        | AnyNodeRef::ExcepthandlerExceptHandler(ExcepthandlerExceptHandler { body, .. }) => body,
+
+        AnyNodeRef::StmtIf(StmtIf { body, orelse, .. })
+        | AnyNodeRef::StmtFor(StmtFor { body, orelse, .. })
+        | AnyNodeRef::StmtAsyncFor(StmtAsyncFor { body, orelse, .. })
+        | AnyNodeRef::StmtWhile(StmtWhile { body, orelse, .. }) => {
+            if orelse.is_empty() {
+                body
+            } else {
+                orelse
+            }
+        }
+
+        AnyNodeRef::StmtMatch(StmtMatch { cases, .. }) => {
+            return cases.last().map(AnyNodeRef::from)
+        }
+
+        AnyNodeRef::StmtTry(StmtTry {
+            body,
+            handlers,
+            orelse,
+            finalbody,
+            ..
+        })
+        | AnyNodeRef::StmtTryStar(StmtTryStar {
+            body,
+            handlers,
+            orelse,
+            finalbody,
+            ..
+        }) => {
+            if finalbody.is_empty() {
+                if orelse.is_empty() {
+                    if handlers.is_empty() {
+                        body
+                    } else {
+                        return handlers.last().map(AnyNodeRef::from);
+                    }
+                } else {
+                    orelse
+                }
+            } else {
+                finalbody
+            }
+        }
+
+        // Not a node that contains an indented child node.
+        _ => return None,
+    };
+
+    body.last().map(AnyNodeRef::from)
+}
+
+/// Returns `true` if `following` is the first statement in an alternate `body` (e.g. the else of an if statement) of the `enclosing` node.
+fn is_first_statement_in_enclosing_alternate_body(
+    following: AnyNodeRef,
+    enclosing: AnyNodeRef,
+) -> bool {
+    use ruff_python_ast::prelude::*;
+
+    match enclosing {
+        AnyNodeRef::StmtIf(StmtIf { orelse, .. })
+        | AnyNodeRef::StmtFor(StmtFor { orelse, .. })
+        | AnyNodeRef::StmtAsyncFor(StmtAsyncFor { orelse, .. })
+        | AnyNodeRef::StmtWhile(StmtWhile { orelse, .. }) => {
+            are_same_optional(following, orelse.first())
+        }
+
+        AnyNodeRef::StmtTry(StmtTry {
+            handlers,
+            orelse,
+            finalbody,
+            ..
+        })
+        | AnyNodeRef::StmtTryStar(StmtTryStar {
+            handlers,
+            orelse,
+            finalbody,
+            ..
+        }) => {
+            are_same_optional(following, handlers.first())
+                // Comments between the handlers and the `else`, or comments between the `handlers` and the `finally`
+                // are already handled by `handle_in_between_excepthandlers_or_except_handler_and_else_or_finally_comment`
+                || handlers.is_empty() && are_same_optional(following, orelse.first())
+                || (handlers.is_empty() || !orelse.is_empty())
+                && are_same_optional(following, finalbody.first())
+        }
+
+        _ => false,
+    }
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__debug__tests__debug.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__debug__tests__debug.snap
new file mode 100644
index 0000000000000..f4eaabf199b75
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__debug__tests__debug.snap
@@ -0,0 +1,42 @@
+---
+source: crates/ruff_python_formatter/src/comments/debug.rs
+expression: comments.debug(source_code)
+---
+{
+    Node {
+        kind: StmtContinue,
+        range: 0..0,
+        source: ``,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# leading comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# trailing",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: StmtBreak,
+        range: 0..0,
+        source: ``,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# break leading",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [],
+        "trailing": [],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__base_test.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__base_test.snap
new file mode 100644
index 0000000000000..ef24b1dbef9ed
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__base_test.snap
@@ -0,0 +1,66 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: StmtFunctionDef,
+        range: 28..212,
+        source: `def test(x, y):⏎`,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# Function Leading comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [],
+        "trailing": [],
+    },
+    Node {
+        kind: StmtIf,
+        range: 48..212,
+        source: `if x == y: # if statement e...ne comment⏎`,
+    }: {
+        "leading": [],
+        "dangling": [
+            SourceComment {
+                text: "# if statement end of line comment",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+        "trailing": [],
+    },
+    Node {
+        kind: StmtIf,
+        range: 144..212,
+        source: `elif x < y:⏎`,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# Leading comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [],
+        "trailing": [],
+    },
+    Node {
+        kind: StmtExpr,
+        range: 234..246,
+        source: `test(10, 20)`,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# own line comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [],
+        "trailing": [],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__binary_expression_left_operand_comment.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__binary_expression_left_operand_comment.snap
new file mode 100644
index 0000000000000..9fc7302a81fa3
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__binary_expression_left_operand_comment.snap
@@ -0,0 +1,36 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: ExprConstant,
+        range: 11..12,
+        source: `5`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# trailing left comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: ExprConstant,
+        range: 79..80,
+        source: `3`,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# leading right comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [],
+        "trailing": [],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__binary_expression_left_operand_trailing_end_of_line_comment.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__binary_expression_left_operand_trailing_end_of_line_comment.snap
new file mode 100644
index 0000000000000..f553e8b817c4a
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__binary_expression_left_operand_trailing_end_of_line_comment.snap
@@ -0,0 +1,51 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: ExprConstant,
+        range: 11..12,
+        source: `5`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# trailing left comment",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: ExprBinOp,
+        range: 11..104,
+        source: `5 # trailing left comment⏎`,
+    }: {
+        "leading": [],
+        "dangling": [
+            SourceComment {
+                text: "# trailing operator comment",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+        "trailing": [],
+    },
+    Node {
+        kind: ExprConstant,
+        range: 103..104,
+        source: `3`,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# leading right comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [],
+        "trailing": [],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__dangling_comment.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__dangling_comment.snap
new file mode 100644
index 0000000000000..58138c9524445
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__dangling_comment.snap
@@ -0,0 +1,21 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: Arguments,
+        range: 9..39,
+        source: `(⏎`,
+    }: {
+        "leading": [],
+        "dangling": [
+            SourceComment {
+                text: "# Some comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "trailing": [],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__empty_file.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__empty_file.snap
new file mode 100644
index 0000000000000..7ceb71b7a5ce3
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__empty_file.snap
@@ -0,0 +1,5 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__if_elif_else_comments.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__if_elif_else_comments.snap
new file mode 100644
index 0000000000000..af56bdb4b9e8c
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__if_elif_else_comments.snap
@@ -0,0 +1,77 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: StmtPass,
+        range: 16..20,
+        source: `pass`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# trailing `pass` comment",
+                position: EndOfLine,
+                formatted: false,
+            },
+            SourceComment {
+                text: "# Root `if` trailing comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: StmtIf,
+        range: 104..192,
+        source: `elif x < y:⏎`,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# Leading elif comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [
+            SourceComment {
+                text: "# Leading else comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "trailing": [],
+    },
+    Node {
+        kind: StmtPass,
+        range: 120..124,
+        source: `pass`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# `elif` trailing comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: StmtPass,
+        range: 188..192,
+        source: `pass`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# `else` trailing comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__if_elif_if_else_comments.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__if_elif_if_else_comments.snap
new file mode 100644
index 0000000000000..1aa79f4f4e14d
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__if_elif_if_else_comments.snap
@@ -0,0 +1,36 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: StmtIf,
+        range: 21..128,
+        source: `elif x < y:⏎`,
+    }: {
+        "leading": [],
+        "dangling": [
+            SourceComment {
+                text: "# Leading else comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "trailing": [],
+    },
+    Node {
+        kind: StmtIf,
+        range: 37..60,
+        source: `if x < 10:⏎`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# `elif` trailing comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__leading_most_outer.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__leading_most_outer.snap
new file mode 100644
index 0000000000000..9bef07f421983
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__leading_most_outer.snap
@@ -0,0 +1,21 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: StmtExpr,
+        range: 19..20,
+        source: `x`,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# leading comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [],
+        "trailing": [],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__match_cases.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__match_cases.snap
new file mode 100644
index 0000000000000..a7056aad31da9
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__match_cases.snap
@@ -0,0 +1,126 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: MatchCase,
+        range: 84..132,
+        source: `case (x, y):⏎`,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# Leading `case(x, y)` comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [],
+        "trailing": [],
+    },
+    Node {
+        kind: StmtReturn,
+        range: 109..132,
+        source: `return Point3d(x, y, 0)`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# Trailing `case(x, y) comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: MatchCase,
+        range: 227..340,
+        source: `case (x, y, z):⏎`,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# Leading `case (x, y, z)` comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [],
+        "trailing": [],
+    },
+    Node {
+        kind: StmtIf,
+        range: 255..340,
+        source: `if x < y:⏎`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# trailing case comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: StmtExpr,
+        range: 327..340,
+        source: `print("else")`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# Trailing else comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: MatchCase,
+        range: 489..550,
+        source: `case _:⏎`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# Trailing match comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: StmtRaise,
+        range: 509..550,
+        source: `raise TypeError("not a poin... support")`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# Trailing last case comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: StmtExpr,
+        range: 656..670,
+        source: `print("other")`,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# After match comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [],
+        "trailing": [],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__nested_binary_expression.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__nested_binary_expression.snap
new file mode 100644
index 0000000000000..8a70941d7aeea
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__nested_binary_expression.snap
@@ -0,0 +1,51 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: ExprBinOp,
+        range: 11..126,
+        source: `(5 # trailing left comment⏎`,
+    }: {
+        "leading": [],
+        "dangling": [
+            SourceComment {
+                text: "# trailing operator comment",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+        "trailing": [],
+    },
+    Node {
+        kind: ExprConstant,
+        range: 12..13,
+        source: `5`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# trailing left comment",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: ExprConstant,
+        range: 125..126,
+        source: `3`,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# leading right comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [],
+        "trailing": [],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__non_positional_arguments_slash_on_same_line.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__non_positional_arguments_slash_on_same_line.snap
new file mode 100644
index 0000000000000..be52d27533501
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__non_positional_arguments_slash_on_same_line.snap
@@ -0,0 +1,36 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: Arguments,
+        range: 10..94,
+        source: `a=10,/, # trailing position...t comment.⏎`,
+    }: {
+        "leading": [],
+        "dangling": [
+            SourceComment {
+                text: "# trailing positional argument comment.",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+        "trailing": [],
+    },
+    Node {
+        kind: Arg,
+        range: 90..91,
+        source: `b`,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# leading comment for b",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [],
+        "trailing": [],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__non_positional_arguments_with_defaults.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__non_positional_arguments_with_defaults.snap
new file mode 100644
index 0000000000000..8205830fb2495
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__non_positional_arguments_with_defaults.snap
@@ -0,0 +1,56 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: Arguments,
+        range: 15..177,
+        source: `a=10 # trailing positional comment⏎`,
+    }: {
+        "leading": [],
+        "dangling": [
+            SourceComment {
+                text: "# Positional arguments only after here",
+                position: OwnLine,
+                formatted: false,
+            },
+            SourceComment {
+                text: "# trailing positional argument comment.",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+        "trailing": [],
+    },
+    Node {
+        kind: ExprConstant,
+        range: 17..19,
+        source: `10`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# trailing positional comment",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: Arg,
+        range: 173..174,
+        source: `b`,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# leading comment for b",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [],
+        "trailing": [],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__only_comments.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__only_comments.snap
new file mode 100644
index 0000000000000..c47111355741d
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__only_comments.snap
@@ -0,0 +1,26 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: ModModule,
+        range: 0..0,
+        source: ``,
+    }: {
+        "leading": [],
+        "dangling": [
+            SourceComment {
+                text: "# Some comment",
+                position: OwnLine,
+                formatted: false,
+            },
+            SourceComment {
+                text: "# another comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "trailing": [],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__parenthesized_expression.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__parenthesized_expression.snap
new file mode 100644
index 0000000000000..e9dbfbf2214d2
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__parenthesized_expression.snap
@@ -0,0 +1,36 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: ExprName,
+        range: 1..2,
+        source: `a`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# Trailing comment",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: ExprConstant,
+        range: 30..32,
+        source: `10`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# More comments",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__parenthesized_trailing_comment.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__parenthesized_trailing_comment.snap
new file mode 100644
index 0000000000000..73aa8104d9654
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__parenthesized_trailing_comment.snap
@@ -0,0 +1,21 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: ExprName,
+        range: 6..7,
+        source: `a`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__positional_argument_only_comment.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__positional_argument_only_comment.snap
new file mode 100644
index 0000000000000..1ad30c1b16e90
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__positional_argument_only_comment.snap
@@ -0,0 +1,56 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: Arg,
+        range: 15..16,
+        source: `a`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# trailing positional comment",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: Arguments,
+        range: 15..168,
+        source: `a, # trailing positional comment⏎`,
+    }: {
+        "leading": [],
+        "dangling": [
+            SourceComment {
+                text: "# Positional arguments only after here",
+                position: OwnLine,
+                formatted: false,
+            },
+            SourceComment {
+                text: "# trailing positional argument comment.",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+        "trailing": [],
+    },
+    Node {
+        kind: Arg,
+        range: 166..167,
+        source: `b`,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# leading b comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [],
+        "trailing": [],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__positional_argument_only_comment_without_following_node.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__positional_argument_only_comment_without_following_node.snap
new file mode 100644
index 0000000000000..2c0b4a41c6fe1
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__positional_argument_only_comment_without_following_node.snap
@@ -0,0 +1,57 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: Arg,
+        range: 15..16,
+        source: `a`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# trailing positional comment",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: Arguments,
+        range: 15..97,
+        source: `a, # trailing positional comment⏎`,
+    }: {
+        "leading": [],
+        "dangling": [
+            SourceComment {
+                text: "# Positional arguments only after here",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "trailing": [
+            SourceComment {
+                text: "# trailing positional argument comment.",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: StmtPass,
+        range: 168..172,
+        source: `pass`,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# Trailing on new line",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [],
+        "trailing": [],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__positional_argument_only_leading_comma_comment.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__positional_argument_only_leading_comma_comment.snap
new file mode 100644
index 0000000000000..0fcc52791886e
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__positional_argument_only_leading_comma_comment.snap
@@ -0,0 +1,56 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: Arg,
+        range: 15..16,
+        source: `a`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# trailing positional comment",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: Arguments,
+        range: 15..168,
+        source: `a # trailing positional comment⏎`,
+    }: {
+        "leading": [],
+        "dangling": [
+            SourceComment {
+                text: "# Positional arguments only after here",
+                position: OwnLine,
+                formatted: false,
+            },
+            SourceComment {
+                text: "# trailing positional argument comment.",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+        "trailing": [],
+    },
+    Node {
+        kind: Arg,
+        range: 166..167,
+        source: `b`,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# leading b comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [],
+        "trailing": [],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__trailing_after_comma.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__trailing_after_comma.snap
new file mode 100644
index 0000000000000..030b63f38b2af
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__trailing_after_comma.snap
@@ -0,0 +1,21 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: Arg,
+        range: 15..16,
+        source: `a`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# Trailing comment for argument `a`",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__trailing_comment_after_single_statement_body.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__trailing_comment_after_single_statement_body.snap
new file mode 100644
index 0000000000000..62b0b6652b643
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__trailing_comment_after_single_statement_body.snap
@@ -0,0 +1,21 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: StmtPass,
+        range: 12..16,
+        source: `pass`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# Test",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__trailing_function_comment.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__trailing_function_comment.snap
new file mode 100644
index 0000000000000..005e4fcf8d40f
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__trailing_function_comment.snap
@@ -0,0 +1,66 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: StmtIf,
+        range: 21..117,
+        source: `if x == y:⏎`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# Trailing `if` statement comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: StmtExpr,
+        range: 101..117,
+        source: `print("Greater")`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# trailing `else` comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: StmtFunctionDef,
+        range: 193..237,
+        source: `def other(y, z):⏎`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# Trailing `other` function comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: StmtPass,
+        range: 233..237,
+        source: `pass`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# Trailing `if` comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__trailing_most_outer.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__trailing_most_outer.snap
new file mode 100644
index 0000000000000..bb9a65c48007e
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__trailing_most_outer.snap
@@ -0,0 +1,36 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: StmtExpr,
+        range: 1..2,
+        source: `x`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# trailing comment",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: StmtExpr,
+        range: 22..23,
+        source: `y`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# trailing last node",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__trailing_most_outer_nested.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__trailing_most_outer_nested.snap
new file mode 100644
index 0000000000000..278320eb58151
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__trailing_most_outer_nested.snap
@@ -0,0 +1,36 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: StmtExpr,
+        range: 1..33,
+        source: `x + (⏎`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# outer",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: ExprConstant,
+        range: 11..12,
+        source: `3`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# trailing comment",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__try_except.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__try_except.snap
new file mode 100644
index 0000000000000..1bcf35e95c2a8
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__try_except.snap
@@ -0,0 +1,66 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: StmtTry,
+        range: 17..136,
+        source: `try:⏎`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# Trailing function comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: StmtPass,
+        range: 30..34,
+        source: `pass`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# trailing try comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: ExcepthandlerExceptHandler,
+        range: 100..136,
+        source: `except Exception as ex:⏎`,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# leading handler comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [],
+        "trailing": [],
+    },
+    Node {
+        kind: StmtPass,
+        range: 132..136,
+        source: `pass`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# Trailing except comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__try_except_finally_else.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__try_except_finally_else.snap
new file mode 100644
index 0000000000000..d5b6bbcb7f43e
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__try_except_finally_else.snap
@@ -0,0 +1,101 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: StmtTry,
+        range: 1..253,
+        source: `try:⏎`,
+    }: {
+        "leading": [],
+        "dangling": [
+            SourceComment {
+                text: "# leading else comment",
+                position: OwnLine,
+                formatted: false,
+            },
+            SourceComment {
+                text: "# leading finally comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "trailing": [],
+    },
+    Node {
+        kind: StmtPass,
+        range: 10..14,
+        source: `pass`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# trailing try comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: ExcepthandlerExceptHandler,
+        range: 68..100,
+        source: `except Exception as ex:⏎`,
+    }: {
+        "leading": [
+            SourceComment {
+                text: "# leading handler comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+        "dangling": [],
+        "trailing": [],
+    },
+    Node {
+        kind: StmtPass,
+        range: 96..100,
+        source: `pass`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# Trailing except comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: StmtPass,
+        range: 164..168,
+        source: `pass`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# trailing else comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+    Node {
+        kind: StmtExpr,
+        range: 236..253,
+        source: `print("Finally!")`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# Trailing finally comment",
+                position: OwnLine,
+                formatted: false,
+            },
+        ],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__while_trailing_else_end_of_line_comment.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__while_trailing_else_end_of_line_comment.snap
new file mode 100644
index 0000000000000..33cd36edc402c
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__while_trailing_else_end_of_line_comment.snap
@@ -0,0 +1,21 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: StmtWhile,
+        range: 0..54,
+        source: `while True:⏎`,
+    }: {
+        "leading": [],
+        "dangling": [
+            SourceComment {
+                text: "# trailing comment",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+        "trailing": [],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__while_trailing_end_of_line_comment.snap b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__while_trailing_end_of_line_comment.snap
new file mode 100644
index 0000000000000..41e845c4b41e3
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/snapshots/ruff_python_formatter__comments__tests__while_trailing_end_of_line_comment.snap
@@ -0,0 +1,21 @@
+---
+source: crates/ruff_python_formatter/src/comments/mod.rs
+expression: comments.debug(test_case.source_code)
+---
+{
+    Node {
+        kind: StmtExpr,
+        range: 46..56,
+        source: `do.stuff()`,
+    }: {
+        "leading": [],
+        "dangling": [],
+        "trailing": [
+            SourceComment {
+                text: "# trailing comment",
+                position: EndOfLine,
+                formatted: false,
+            },
+        ],
+    },
+}
diff --git a/crates/ruff_python_formatter/src/comments/visitor.rs b/crates/ruff_python_formatter/src/comments/visitor.rs
new file mode 100644
index 0000000000000..fa1901a41cbcf
--- /dev/null
+++ b/crates/ruff_python_formatter/src/comments/visitor.rs
@@ -0,0 +1,696 @@
+use crate::comments::node_key::NodeRefEqualityKey;
+use crate::comments::placement::place_comment;
+use crate::comments::{CommentTextPosition, CommentsMap, SourceComment};
+use ruff_formatter::{SourceCode, SourceCodeSlice};
+use ruff_python_ast::node::AnyNodeRef;
+use ruff_python_ast::prelude::*;
+use ruff_python_ast::source_code::{CommentRanges, Locator};
+// The interface is designed to only export the members relevant for iterating nodes in
+// pre-order.
+#[allow(clippy::wildcard_imports)]
+use ruff_python_ast::visitor::preorder::*;
+use ruff_python_ast::whitespace::is_python_whitespace;
+use ruff_text_size::TextRange;
+use std::iter::Peekable;
+
+/// Visitor extracting the comments from an AST.
+#[derive(Debug, Clone)]
+pub(crate) struct CommentsVisitor<'a> {
+    builder: CommentsBuilder<'a>,
+    source_code: SourceCode<'a>,
+    parents: Vec<AnyNodeRef<'a>>,
+    preceding_node: Option<AnyNodeRef<'a>>,
+    comment_ranges: Peekable<std::slice::Iter<'a, TextRange>>,
+}
+
+impl<'a> CommentsVisitor<'a> {
+    pub(crate) fn new(source_code: SourceCode<'a>, comment_ranges: &'a CommentRanges) -> Self {
+        Self {
+            builder: CommentsBuilder::default(),
+            source_code,
+            parents: Vec::new(),
+            preceding_node: None,
+            comment_ranges: comment_ranges.iter().peekable(),
+        }
+    }
+
+    pub(super) fn visit(mut self, root: &'a Mod) -> CommentsMap<'a> {
+        self.visit_mod(root);
+
+        self.finish()
+    }
+
+    fn start_node<N>(&mut self, node: N) -> TraversalSignal
+    where
+        N: Into<AnyNodeRef<'a>>,
+    {
+        self.start_node_impl(node.into())
+    }
+
+    fn start_node_impl(&mut self, node: AnyNodeRef<'a>) -> TraversalSignal {
+        let node_range = node.range();
+
+        let enclosing_node = self.parents.last().copied().unwrap_or(node);
+
+        // Process all remaining comments that end before this node's start position.
+        // If the `preceding` node is set, then it process all comments ending after the `preceding` node
+        // and ending before this node's start position
+        while let Some(comment_range) = self.comment_ranges.peek().copied() {
+            // Exit if the comment is enclosed by this node or comes after it
+            if comment_range.end() > node_range.start() {
+                break;
+            }
+
+            let comment = DecoratedComment {
+                enclosing: enclosing_node,
+                preceding: self.preceding_node,
+                following: Some(node),
+                parent: self.parents.iter().rev().nth(1).copied(),
+                text_position: text_position(*comment_range, self.source_code),
+                slice: self.source_code.slice(*comment_range),
+            };
+
+            self.builder.add_comment(place_comment(
+                comment,
+                &Locator::new(self.source_code.as_str()),
+            ));
+            self.comment_ranges.next();
+        }
+
+        // From here on, we're inside of `node`, meaning, we're passed the preceding node.
+        self.preceding_node = None;
+        self.parents.push(node);
+
+        // Try to skip the subtree if
+        // * there are no comments
+        // * if the next comment comes after this node (meaning, this nodes subtree contains no comments)
+        self.comment_ranges
+            .peek()
+            .map_or(TraversalSignal::Skip, |next_comment| {
+                if node.range().contains(next_comment.start()) {
+                    TraversalSignal::Traverse
+                } else {
+                    TraversalSignal::Skip
+                }
+            })
+    }
+
+    fn finish_node<N>(&mut self, node: N)
+    where
+        N: Into<AnyNodeRef<'a>>,
+    {
+        self.finish_node_impl(node.into());
+    }
+
+    fn finish_node_impl(&mut self, node: AnyNodeRef<'a>) {
+        // We are leaving this node, pop it from the parent stack.
+        self.parents.pop();
+
+        let node_end = node.end();
+        let is_root = self.parents.is_empty();
+
+        // Process all comments that start after the `preceding` node and end before this node's end.
+        while let Some(comment_range) = self.comment_ranges.peek().copied() {
+            // If the comment starts after this node, break.
+            // If this is the root node and there are comments after the node, attach them to the root node
+            // anyway because there's no other node we can attach the comments to (RustPython should include the comments in the node's range)
+            if comment_range.start() >= node_end && !is_root {
+                break;
+            }
+
+            let comment = DecoratedComment {
+                enclosing: node,
+                preceding: self.preceding_node,
+                parent: self.parents.last().copied(),
+                following: None,
+                text_position: text_position(*comment_range, self.source_code),
+                slice: self.source_code.slice(*comment_range),
+            };
+
+            self.builder.add_comment(place_comment(
+                comment,
+                &Locator::new(self.source_code.as_str()),
+            ));
+
+            self.comment_ranges.next();
+        }
+
+        self.preceding_node = Some(node);
+    }
+
+    fn finish(self) -> CommentsMap<'a> {
+        self.builder.finish()
+    }
+}
+
+impl<'ast> PreorderVisitor<'ast> for CommentsVisitor<'ast> {
+    fn visit_mod(&mut self, module: &'ast Mod) {
+        if self.start_node(module).is_traverse() {
+            walk_module(self, module);
+        }
+        self.finish_node(module);
+    }
+
+    fn visit_stmt(&mut self, stmt: &'ast Stmt) {
+        if self.start_node(stmt).is_traverse() {
+            walk_stmt(self, stmt);
+        }
+        self.finish_node(stmt);
+    }
+
+    fn visit_annotation(&mut self, expr: &'ast Expr) {
+        if self.start_node(expr).is_traverse() {
+            walk_expr(self, expr);
+        }
+        self.finish_node(expr);
+    }
+
+    fn visit_expr(&mut self, expr: &'ast Expr) {
+        if self.start_node(expr).is_traverse() {
+            walk_expr(self, expr);
+        }
+        self.finish_node(expr);
+    }
+
+    fn visit_comprehension(&mut self, comprehension: &'ast Comprehension) {
+        if self.start_node(comprehension).is_traverse() {
+            walk_comprehension(self, comprehension);
+        }
+        self.finish_node(comprehension);
+    }
+
+    fn visit_excepthandler(&mut self, excepthandler: &'ast Excepthandler) {
+        if self.start_node(excepthandler).is_traverse() {
+            walk_excepthandler(self, excepthandler);
+        }
+        self.finish_node(excepthandler);
+    }
+
+    fn visit_format_spec(&mut self, format_spec: &'ast Expr) {
+        if self.start_node(format_spec).is_traverse() {
+            walk_expr(self, format_spec);
+        }
+        self.finish_node(format_spec);
+    }
+
+    fn visit_arguments(&mut self, arguments: &'ast Arguments) {
+        if self.start_node(arguments).is_traverse() {
+            walk_arguments(self, arguments);
+        }
+        self.finish_node(arguments);
+    }
+
+    fn visit_arg(&mut self, arg: &'ast Arg) {
+        if self.start_node(arg).is_traverse() {
+            walk_arg(self, arg);
+        }
+        self.finish_node(arg);
+    }
+
+    fn visit_keyword(&mut self, keyword: &'ast Keyword) {
+        if self.start_node(keyword).is_traverse() {
+            walk_keyword(self, keyword);
+        }
+        self.finish_node(keyword);
+    }
+
+    fn visit_alias(&mut self, alias: &'ast Alias) {
+        if self.start_node(alias).is_traverse() {
+            walk_alias(self, alias);
+        }
+        self.finish_node(alias);
+    }
+
+    fn visit_withitem(&mut self, withitem: &'ast Withitem) {
+        if self.start_node(withitem).is_traverse() {
+            walk_withitem(self, withitem);
+        }
+
+        self.finish_node(withitem);
+    }
+    fn visit_match_case(&mut self, match_case: &'ast MatchCase) {
+        if self.start_node(match_case).is_traverse() {
+            walk_match_case(self, match_case);
+        }
+        self.finish_node(match_case);
+    }
+
+    fn visit_pattern(&mut self, pattern: &'ast Pattern) {
+        if self.start_node(pattern).is_traverse() {
+            walk_pattern(self, pattern);
+        }
+        self.finish_node(pattern);
+    }
+}
+
+fn text_position(comment_range: TextRange, source_code: SourceCode) -> CommentTextPosition {
+    let before = &source_code.as_str()[TextRange::up_to(comment_range.start())];
+
+    for c in before.chars().rev() {
+        match c {
+            '\n' | '\r' => {
+                break;
+            }
+            c if is_python_whitespace(c) => continue,
+            _ => return CommentTextPosition::EndOfLine,
+        }
+    }
+
+    CommentTextPosition::OwnLine
+}
+
+/// A comment decorated with additional information about its surrounding context in the source document.
+///
+/// Used by [`CommentStyle::place_comment`] to determine if this should become a [leading](self#leading-comments), [dangling](self#dangling-comments), or [trailing](self#trailing-comments) comment.
+#[derive(Debug, Clone)]
+pub(super) struct DecoratedComment<'a> {
+    enclosing: AnyNodeRef<'a>,
+    preceding: Option<AnyNodeRef<'a>>,
+    following: Option<AnyNodeRef<'a>>,
+    parent: Option<AnyNodeRef<'a>>,
+    text_position: CommentTextPosition,
+    slice: SourceCodeSlice,
+}
+
+impl<'a> DecoratedComment<'a> {
+    /// The closest parent node that fully encloses the comment.
+    ///
+    /// A node encloses a comment when the comment is between two of its direct children (ignoring lists).
+    ///
+    /// # Examples
+    ///
+    /// ```python
+    /// [
+    ///     a,
+    ///     # comment
+    ///      b
+    /// ]
+    /// ```
+    ///
+    /// The enclosing node is the list expression and not the name `b` because
+    /// `a` and `b` are children of the list expression and `comment` is between the two nodes.
+    pub(super) fn enclosing_node(&self) -> AnyNodeRef<'a> {
+        self.enclosing
+    }
+
+    /// Returns the parent of the enclosing node, if any
+    pub(super) fn enclosing_parent(&self) -> Option<AnyNodeRef<'a>> {
+        self.parent
+    }
+
+    /// Returns the slice into the source code.
+    pub(super) fn slice(&self) -> &SourceCodeSlice {
+        &self.slice
+    }
+
+    /// Returns the comment's preceding node.
+    ///
+    /// The direct child node (ignoring lists) of the [`enclosing_node`](DecoratedComment::enclosing_node) that precedes this comment.
+    ///
+    /// Returns [None] if the [`enclosing_node`](DecoratedComment::enclosing_node) only consists of tokens or if
+    /// all preceding children of the [`enclosing_node`](DecoratedComment::enclosing_node) have been tokens.
+    ///
+    /// The Preceding node is guaranteed to be a sibling of [`following_node`](DecoratedComment::following_node).
+    ///
+    /// # Examples
+    ///
+    /// ## Preceding tokens only
+    ///
+    /// ```python
+    /// [
+    ///     # comment
+    /// ]
+    /// ```
+    /// Returns [None] because the comment has no preceding node, only a preceding `[` token.
+    ///
+    /// ## Preceding node
+    ///
+    /// ```python
+    /// a # comment
+    /// b
+    /// ```
+    ///
+    /// Returns `Some(a)` because `a` directly precedes the comment.
+    ///
+    /// ## Preceding token and node
+    ///
+    /// ```python
+    /// [
+    ///     a, # comment
+    ///     b
+    /// ]
+    /// ```
+    ///
+    ///  Returns `Some(a)` because `a` is the preceding node of `comment`. The presence of the `,` token
+    /// doesn't change that.
+    pub(super) fn preceding_node(&self) -> Option<AnyNodeRef<'a>> {
+        self.preceding
+    }
+
+    /// Returns the node following the comment.
+    ///
+    /// The direct child node (ignoring lists) of the [`enclosing_node`](DecoratedComment::enclosing_node) that follows this comment.
+    ///
+    /// Returns [None] if the [`enclosing_node`](DecoratedComment::enclosing_node) only consists of tokens or if
+    /// all children children of the [`enclosing_node`](DecoratedComment::enclosing_node) following this comment are tokens.
+    ///
+    /// The following node is guaranteed to be a sibling of [`preceding_node`](DecoratedComment::preceding_node).
+    ///
+    /// # Examples
+    ///
+    /// ## Following tokens only
+    ///
+    /// ```python
+    /// [
+    ///     # comment
+    /// ]
+    /// ```
+    ///
+    /// Returns [None] because there's no node following the comment, only the `]` token.
+    ///
+    /// ## Following node
+    ///
+    /// ```python
+    /// [ # comment
+    ///     a
+    /// ]
+    /// ```
+    ///
+    /// Returns `Some(a)` because `a` is the node directly following the comment.
+    ///
+    /// ## Following token and node
+    ///
+    /// ```python
+    /// [
+    ///     a # comment
+    ///     , b
+    /// ]
+    /// ```
+    ///
+    /// Returns `Some(b)` because the `b` identifier is the first node following `comment`.
+    ///
+    /// ## Following parenthesized expression
+    ///
+    /// ```python
+    /// (
+    ///     a
+    ///     # comment
+    /// )
+    /// b
+    /// ```
+    ///
+    /// Returns `None` because `comment` is enclosed inside the parenthesized expression and it has no children
+    /// following `# comment`.
+    pub(super) fn following_node(&self) -> Option<AnyNodeRef<'a>> {
+        self.following
+    }
+
+    /// The position of the comment in the text.
+    pub(super) fn text_position(&self) -> CommentTextPosition {
+        self.text_position
+    }
+}
+
+impl From<DecoratedComment<'_>> for SourceComment {
+    fn from(decorated: DecoratedComment) -> Self {
+        Self {
+            slice: decorated.slice,
+            position: decorated.text_position,
+            #[cfg(debug_assertions)]
+            formatted: std::cell::Cell::new(false),
+        }
+    }
+}
+
+#[derive(Debug)]
+pub(super) enum CommentPlacement<'a> {
+    /// Makes `comment` a [leading comment](self#leading-comments) of `node`.
+    Leading {
+        node: AnyNodeRef<'a>,
+        comment: SourceComment,
+    },
+    /// Makes `comment` a [trailing comment](self#trailing-comments) of `node`.
+    Trailing {
+        node: AnyNodeRef<'a>,
+        comment: SourceComment,
+    },
+
+    /// Makes `comment` a [dangling comment](self#dangling-comments) of `node`.
+    Dangling {
+        node: AnyNodeRef<'a>,
+        comment: SourceComment,
+    },
+
+    /// Uses the default heuristic to determine the placement of the comment.
+    ///
+    /// # End of line comments
+    ///
+    /// Makes the comment a...
+    ///
+    /// * [trailing comment] of the [`preceding_node`] if both the [`following_node`] and [`preceding_node`] are not [None]
+    ///     and the comment and [`preceding_node`] are only separated by a space (there's no token between the comment and [`preceding_node`]).
+    /// * [leading comment] of the [`following_node`] if the [`following_node`] is not [None]
+    /// * [trailing comment] of the [`preceding_node`] if the [`preceding_node`] is not [None]
+    /// * [dangling comment] of the [`enclosing_node`].
+    ///
+    /// ## Examples
+    /// ### Comment with preceding and following nodes
+    ///
+    /// ```python
+    /// [
+    ///     a, # comment
+    ///     b
+    /// ]
+    /// ```
+    ///
+    /// The comment becomes a [trailing comment] of the node `a`.
+    ///
+    /// ### Comment with preceding node only
+    ///
+    /// ```python
+    /// [
+    ///     a # comment
+    /// ]
+    /// ```
+    ///
+    /// The comment becomes a [trailing comment] of the node `a`.
+    ///
+    /// ### Comment with following node only
+    ///
+    /// ```python
+    /// [ # comment
+    ///     b
+    /// ]
+    /// ```
+    ///
+    /// The comment becomes a [leading comment] of the node `b`.
+    ///
+    /// ### Dangling comment
+    ///
+    /// ```python
+    /// [ # comment
+    /// ]
+    /// ```
+    ///
+    /// The comment becomes a [dangling comment] of the enclosing list expression because both the [`preceding_node`] and [`following_node`] are [None].
+    ///
+    /// # Own line comments
+    ///
+    /// Makes the comment a...
+    ///
+    /// * [leading comment] of the [`following_node`] if the [`following_node`] is not [None]
+    /// * or a [trailing comment] of the [`preceding_node`] if the [`preceding_node`] is not [None]
+    /// * or a [dangling comment] of the [`enclosing_node`].
+    ///
+    /// ## Examples
+    ///
+    /// ### Comment with leading and preceding nodes
+    ///
+    /// ```python
+    /// [
+    ///     a,
+    ///     # comment
+    ///     b
+    /// ]
+    /// ```
+    ///
+    /// The comment becomes a [leading comment] of the node `b`.
+    ///
+    /// ### Comment with preceding node only
+    ///
+    /// ```python
+    /// [
+    ///     a
+    ///     # comment
+    /// ]
+    /// ```
+    ///
+    /// The comment becomes a [trailing comment] of the node `a`.
+    ///
+    /// ### Comment with following node only
+    ///
+    /// ```python
+    /// [
+    ///     # comment
+    ///     b
+    /// ]
+    /// ```
+    ///
+    /// The comment becomes a [leading comment] of the node `b`.
+    ///
+    /// ### Dangling comment
+    ///
+    /// ```python
+    /// [
+    ///     # comment
+    /// ]
+    /// ```
+    ///
+    /// The comment becomes a [dangling comment] of the list expression because both [`preceding_node`] and [`following_node`] are [None].
+    ///
+    /// [`preceding_node`]: DecoratedComment::preceding_node
+    /// [`following_node`]: DecoratedComment::following_node
+    /// [`enclosing_node`]: DecoratedComment::enclosing_node_id
+    /// [trailing comment]: self#trailing-comments
+    /// [leading comment]: self#leading-comments
+    /// [dangling comment]: self#dangling-comments
+    Default(DecoratedComment<'a>),
+}
+
+impl<'a> CommentPlacement<'a> {
+    /// Makes `comment` a [leading comment](self#leading-comments) of `node`.
+    #[inline]
+    pub(super) fn leading(node: AnyNodeRef<'a>, comment: impl Into<SourceComment>) -> Self {
+        Self::Leading {
+            node,
+            comment: comment.into(),
+        }
+    }
+
+    /// Makes `comment` a [dangling comment](self::dangling-comments) of `node`.
+    pub(super) fn dangling(node: AnyNodeRef<'a>, comment: impl Into<SourceComment>) -> Self {
+        Self::Dangling {
+            node,
+            comment: comment.into(),
+        }
+    }
+
+    /// Makes `comment` a [trailing comment](self::trailing-comments) of `node`.
+    #[inline]
+    pub(super) fn trailing(node: AnyNodeRef<'a>, comment: impl Into<SourceComment>) -> Self {
+        Self::Trailing {
+            node,
+            comment: comment.into(),
+        }
+    }
+
+    /// Returns the placement if it isn't [`CommentPlacement::Default`], otherwise calls `f` and returns the result.
+    #[inline]
+    pub(super) fn or_else<F>(self, f: F) -> Self
+    where
+        F: FnOnce(DecoratedComment<'a>) -> CommentPlacement<'a>,
+    {
+        match self {
+            CommentPlacement::Default(comment) => f(comment),
+            placement => placement,
+        }
+    }
+}
+
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+enum TraversalSignal {
+    Traverse,
+    Skip,
+}
+
+impl TraversalSignal {
+    const fn is_traverse(self) -> bool {
+        matches!(self, TraversalSignal::Traverse)
+    }
+}
+
+#[derive(Clone, Debug, Default)]
+struct CommentsBuilder<'a> {
+    comments: CommentsMap<'a>,
+}
+
+impl<'a> CommentsBuilder<'a> {
+    fn add_comment(&mut self, placement: CommentPlacement<'a>) {
+        match placement {
+            CommentPlacement::Leading { node, comment } => {
+                self.push_leading_comment(node, comment);
+            }
+            CommentPlacement::Trailing { node, comment } => {
+                self.push_trailing_comment(node, comment);
+            }
+            CommentPlacement::Dangling { node, comment } => {
+                self.push_dangling_comment(node, comment);
+            }
+            CommentPlacement::Default(comment) => {
+                match comment.text_position() {
+                    CommentTextPosition::EndOfLine => {
+                        match (comment.preceding_node(), comment.following_node()) {
+                            (Some(preceding), Some(_)) => {
+                                // Attach comments with both preceding and following node to the preceding
+                                // because there's a line break separating it from the following node.
+                                // ```python
+                                // a; # comment
+                                // b
+                                // ```
+                                self.push_trailing_comment(preceding, comment);
+                            }
+                            (Some(preceding), None) => {
+                                self.push_trailing_comment(preceding, comment);
+                            }
+                            (None, Some(following)) => {
+                                self.push_leading_comment(following, comment);
+                            }
+                            (None, None) => {
+                                self.push_dangling_comment(comment.enclosing_node(), comment);
+                            }
+                        }
+                    }
+                    CommentTextPosition::OwnLine => {
+                        match (comment.preceding_node(), comment.following_node()) {
+                            // Following always wins for a leading comment
+                            // ```python
+                            // a
+                            // // python
+                            // b
+                            // ```
+                            // attach the comment to the `b` expression statement
+                            (_, Some(following)) => {
+                                self.push_leading_comment(following, comment);
+                            }
+                            (Some(preceding), None) => {
+                                self.push_trailing_comment(preceding, comment);
+                            }
+                            (None, None) => {
+                                self.push_dangling_comment(comment.enclosing_node(), comment);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    fn finish(self) -> CommentsMap<'a> {
+        self.comments
+    }
+
+    fn push_leading_comment(&mut self, node: AnyNodeRef<'a>, comment: impl Into<SourceComment>) {
+        self.comments
+            .push_leading(NodeRefEqualityKey::from_ref(node), comment.into());
+    }
+
+    fn push_dangling_comment(&mut self, node: AnyNodeRef<'a>, comment: impl Into<SourceComment>) {
+        self.comments
+            .push_dangling(NodeRefEqualityKey::from_ref(node), comment.into());
+    }
+
+    fn push_trailing_comment(&mut self, node: AnyNodeRef<'a>, comment: impl Into<SourceComment>) {
+        self.comments
+            .push_trailing(NodeRefEqualityKey::from_ref(node), comment.into());
+    }
+}
diff --git a/crates/ruff_python_formatter/src/context.rs b/crates/ruff_python_formatter/src/context.rs
index 3d516a4f7458c..074d5cc08d760 100644
--- a/crates/ruff_python_formatter/src/context.rs
+++ b/crates/ruff_python_formatter/src/context.rs
@@ -1,38 +1,86 @@
-use std::rc::Rc;
-
-use ruff_formatter::{FormatContext, SimpleFormatOptions};
+use crate::comments::Comments;
+use ruff_formatter::{FormatContext, SimpleFormatOptions, SourceCode};
 use ruff_python_ast::source_code::Locator;
+use std::fmt::{Debug, Formatter};
 
-pub struct ASTFormatContext<'a> {
+#[derive(Clone)]
+pub struct PyFormatContext<'a> {
     options: SimpleFormatOptions,
-    contents: Rc<str>,
-    locator: Locator<'a>,
+    contents: &'a str,
+    comments: Comments<'a>,
+    node_level: NodeLevel,
 }
 
-impl<'a> ASTFormatContext<'a> {
-    pub fn new(options: SimpleFormatOptions, locator: Locator<'a>) -> Self {
+impl<'a> PyFormatContext<'a> {
+    pub(crate) fn new(
+        options: SimpleFormatOptions,
+        contents: &'a str,
+        comments: Comments<'a>,
+    ) -> Self {
         Self {
             options,
-            contents: Rc::from(locator.contents()),
-            locator,
+            contents,
+            comments,
+            node_level: NodeLevel::TopLevel,
         }
     }
+
+    pub(crate) fn contents(&self) -> &'a str {
+        self.contents
+    }
+
+    #[allow(unused)]
+    pub(crate) fn locator(&self) -> Locator<'a> {
+        Locator::new(self.contents)
+    }
+
+    pub(crate) fn set_node_level(&mut self, level: NodeLevel) {
+        self.node_level = level;
+    }
+
+    pub(crate) fn node_level(&self) -> NodeLevel {
+        self.node_level
+    }
+
+    pub(crate) fn comments(&self) -> &Comments<'a> {
+        &self.comments
+    }
 }
 
-impl FormatContext for ASTFormatContext<'_> {
+impl FormatContext for PyFormatContext<'_> {
     type Options = SimpleFormatOptions;
 
     fn options(&self) -> &Self::Options {
         &self.options
     }
-}
 
-impl<'a> ASTFormatContext<'a> {
-    pub fn contents(&'a self) -> Rc<str> {
-        self.contents.clone()
+    fn source_code(&self) -> SourceCode {
+        SourceCode::new(self.contents)
     }
+}
 
-    pub fn locator(&'a self) -> &'a Locator {
-        &self.locator
+impl Debug for PyFormatContext<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("PyFormatContext")
+            .field("options", &self.options)
+            .field("comments", &self.comments.debug(self.source_code()))
+            .field("node_level", &self.node_level)
+            .field("source", &self.contents)
+            .finish()
     }
 }
+
+/// What's the enclosing level of the outer node.
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Default)]
+pub(crate) enum NodeLevel {
+    /// Formatting statements on the module level.
+    #[default]
+    TopLevel,
+
+    /// Formatting the body statements of a [compound statement](https://docs.python.org/3/reference/compound_stmts.html#compound-statements)
+    /// (`if`, `while`, `match`, etc.).
+    CompoundStatement,
+
+    /// Formatting nodes that are enclosed in a parenthesized expression.
+    Expression,
+}
diff --git a/crates/ruff_python_formatter/src/cst/helpers.rs b/crates/ruff_python_formatter/src/cst/helpers.rs
deleted file mode 100644
index 0770992463a8d..0000000000000
--- a/crates/ruff_python_formatter/src/cst/helpers.rs
+++ /dev/null
@@ -1,137 +0,0 @@
-use ruff_python_ast::source_code::Locator;
-use ruff_text_size::{TextLen, TextRange, TextSize};
-
-/// Return `true` if the given string is a radix literal (e.g., `0b101`).
-pub fn is_radix_literal(content: &str) -> bool {
-    content.starts_with("0b")
-        || content.starts_with("0o")
-        || content.starts_with("0x")
-        || content.starts_with("0B")
-        || content.starts_with("0O")
-        || content.starts_with("0X")
-}
-
-/// Find the first token in the given range that satisfies the given predicate.
-pub fn find_tok(
-    range: TextRange,
-    locator: &Locator,
-    f: impl Fn(rustpython_parser::Tok) -> bool,
-) -> TextRange {
-    for (tok, tok_range) in rustpython_parser::lexer::lex_located(
-        &locator.contents()[range],
-        rustpython_parser::Mode::Module,
-        range.start(),
-    )
-    .flatten()
-    {
-        if f(tok) {
-            return tok_range;
-        }
-    }
-    unreachable!("Failed to find token in range {:?}", range)
-}
-
-/// Expand the range of a compound statement.
-///
-/// `location` is the start of the compound statement (e.g., the `if` in `if x:`).
-/// `end_location` is the end of the last statement in the body.
-pub fn expand_indented_block(
-    location: TextSize,
-    end_location: TextSize,
-    locator: &Locator,
-) -> TextRange {
-    let contents = locator.contents();
-
-    // Find the colon, which indicates the end of the header.
-    let mut nesting = 0;
-    let mut colon = None;
-    for (tok, tok_range) in rustpython_parser::lexer::lex_located(
-        &contents[TextRange::new(location, end_location)],
-        rustpython_parser::Mode::Module,
-        location,
-    )
-    .flatten()
-    {
-        match tok {
-            rustpython_parser::Tok::Colon if nesting == 0 => {
-                colon = Some(tok_range.start());
-                break;
-            }
-            rustpython_parser::Tok::Lpar
-            | rustpython_parser::Tok::Lsqb
-            | rustpython_parser::Tok::Lbrace => nesting += 1,
-            rustpython_parser::Tok::Rpar
-            | rustpython_parser::Tok::Rsqb
-            | rustpython_parser::Tok::Rbrace => nesting -= 1,
-            _ => {}
-        }
-    }
-    let colon_location = colon.unwrap();
-
-    // From here, we have two options: simple statement or compound statement.
-    let indent = rustpython_parser::lexer::lex_located(
-        &contents[TextRange::new(colon_location, end_location)],
-        rustpython_parser::Mode::Module,
-        colon_location,
-    )
-    .flatten()
-    .find_map(|(tok, range)| match tok {
-        rustpython_parser::Tok::Indent => Some(range.end()),
-        _ => None,
-    });
-
-    let line_end = locator.line_end(end_location);
-    let Some(indent_end) = indent else {
-
-        // Simple statement: from the colon to the end of the line.
-        return TextRange::new(colon_location, line_end);
-    };
-
-    let indent_width = indent_end - locator.line_start(indent_end);
-
-    // Compound statement: from the colon to the end of the block.
-    // For each line that follows, check that there's no content up to the expected indent.
-    let mut offset = TextSize::default();
-    let mut line_offset = TextSize::default();
-    // Issue, body goes to far..  it includes the whole try including the catch
-
-    let rest = &contents[usize::from(line_end)..];
-    for (relative_offset, c) in rest.char_indices() {
-        if line_offset < indent_width && !c.is_whitespace() {
-            break; // Found end of block
-        }
-
-        match c {
-            '\n' | '\r' => {
-                // Ignore empty lines
-                if line_offset > TextSize::from(0) {
-                    offset = TextSize::try_from(relative_offset).unwrap() + TextSize::from(1);
-                }
-                line_offset = TextSize::from(0);
-            }
-            _ => {
-                line_offset += c.text_len();
-            }
-        }
-    }
-
-    // Reached end of file
-    let end = if line_offset >= indent_width {
-        contents.text_len()
-    } else {
-        line_end + offset
-    };
-
-    TextRange::new(colon_location, end)
-}
-
-/// Return true if the `orelse` block of an `if` statement is an `elif` statement.
-pub fn is_elif(orelse: &[rustpython_parser::ast::Stmt], locator: &Locator) -> bool {
-    if orelse.len() == 1 && matches!(orelse[0].node, rustpython_parser::ast::StmtKind::If { .. }) {
-        let contents = locator.after(orelse[0].start());
-        if contents.starts_with("elif") {
-            return true;
-        }
-    }
-    false
-}
diff --git a/crates/ruff_python_formatter/src/cst/mod.rs b/crates/ruff_python_formatter/src/cst/mod.rs
deleted file mode 100644
index 4731174fe5e36..0000000000000
--- a/crates/ruff_python_formatter/src/cst/mod.rs
+++ /dev/null
@@ -1,2139 +0,0 @@
-#![allow(clippy::derive_partial_eq_without_eq)]
-
-use std::iter;
-use std::ops::Deref;
-
-use itertools::Itertools;
-use ruff_text_size::{TextRange, TextSize};
-use rustpython_parser::ast::Constant;
-use rustpython_parser::{ast, Mode};
-
-use ruff_python_ast::source_code::Locator;
-
-use crate::cst::helpers::{expand_indented_block, find_tok, is_elif};
-use crate::trivia::{Parenthesize, Trivia};
-
-pub mod helpers;
-pub mod visitor;
-
-type Ident = String;
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct Located<T> {
-    pub range: TextRange,
-    pub node: T,
-    pub trivia: Vec<Trivia>,
-    pub parentheses: Parenthesize,
-}
-
-impl<T> Located<T> {
-    pub fn new(range: TextRange, node: T) -> Self {
-        Self {
-            range,
-            node,
-            trivia: Vec::new(),
-            parentheses: Parenthesize::Never,
-        }
-    }
-
-    pub const fn range(&self) -> TextRange {
-        self.range
-    }
-
-    pub const fn start(&self) -> TextSize {
-        self.range.start()
-    }
-
-    pub const fn end(&self) -> TextSize {
-        self.range.end()
-    }
-
-    pub fn add_trivia(&mut self, trivia: Trivia) {
-        self.trivia.push(trivia);
-    }
-
-    pub fn id(&self) -> usize {
-        std::ptr::addr_of!(self.node) as usize
-    }
-}
-
-impl<T> Deref for Located<T> {
-    type Target = T;
-    fn deref(&self) -> &Self::Target {
-        &self.node
-    }
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum ExprContext {
-    Load,
-    Store,
-    Del,
-}
-
-impl From<rustpython_parser::ast::ExprContext> for ExprContext {
-    fn from(context: rustpython_parser::ast::ExprContext) -> Self {
-        match context {
-            rustpython_parser::ast::ExprContext::Load => Self::Load,
-            rustpython_parser::ast::ExprContext::Store => Self::Store,
-            rustpython_parser::ast::ExprContext::Del => Self::Del,
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum BoolOpKind {
-    And,
-    Or,
-}
-
-impl From<&rustpython_parser::ast::Boolop> for BoolOpKind {
-    fn from(op: &rustpython_parser::ast::Boolop) -> Self {
-        match op {
-            rustpython_parser::ast::Boolop::And => Self::And,
-            rustpython_parser::ast::Boolop::Or => Self::Or,
-        }
-    }
-}
-
-pub type BoolOp = Located<BoolOpKind>;
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum OperatorKind {
-    Add,
-    Sub,
-    Mult,
-    MatMult,
-    Div,
-    Mod,
-    Pow,
-    LShift,
-    RShift,
-    BitOr,
-    BitXor,
-    BitAnd,
-    FloorDiv,
-}
-
-pub type Operator = Located<OperatorKind>;
-
-impl From<&rustpython_parser::ast::Operator> for OperatorKind {
-    fn from(op: &rustpython_parser::ast::Operator) -> Self {
-        match op {
-            rustpython_parser::ast::Operator::Add => Self::Add,
-            rustpython_parser::ast::Operator::Sub => Self::Sub,
-            rustpython_parser::ast::Operator::Mult => Self::Mult,
-            rustpython_parser::ast::Operator::MatMult => Self::MatMult,
-            rustpython_parser::ast::Operator::Div => Self::Div,
-            rustpython_parser::ast::Operator::Mod => Self::Mod,
-            rustpython_parser::ast::Operator::Pow => Self::Pow,
-            rustpython_parser::ast::Operator::LShift => Self::LShift,
-            rustpython_parser::ast::Operator::RShift => Self::RShift,
-            rustpython_parser::ast::Operator::BitOr => Self::BitOr,
-            rustpython_parser::ast::Operator::BitXor => Self::BitXor,
-            rustpython_parser::ast::Operator::BitAnd => Self::BitAnd,
-            rustpython_parser::ast::Operator::FloorDiv => Self::FloorDiv,
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum UnaryOpKind {
-    Invert,
-    Not,
-    UAdd,
-    USub,
-}
-
-pub type UnaryOp = Located<UnaryOpKind>;
-
-impl From<&rustpython_parser::ast::Unaryop> for UnaryOpKind {
-    fn from(op: &rustpython_parser::ast::Unaryop) -> Self {
-        match op {
-            rustpython_parser::ast::Unaryop::Invert => Self::Invert,
-            rustpython_parser::ast::Unaryop::Not => Self::Not,
-            rustpython_parser::ast::Unaryop::UAdd => Self::UAdd,
-            rustpython_parser::ast::Unaryop::USub => Self::USub,
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum CmpOpKind {
-    Eq,
-    NotEq,
-    Lt,
-    LtE,
-    Gt,
-    GtE,
-    Is,
-    IsNot,
-    In,
-    NotIn,
-}
-
-pub type CmpOp = Located<CmpOpKind>;
-
-impl From<&rustpython_parser::ast::Cmpop> for CmpOpKind {
-    fn from(op: &rustpython_parser::ast::Cmpop) -> Self {
-        match op {
-            rustpython_parser::ast::Cmpop::Eq => Self::Eq,
-            rustpython_parser::ast::Cmpop::NotEq => Self::NotEq,
-            rustpython_parser::ast::Cmpop::Lt => Self::Lt,
-            rustpython_parser::ast::Cmpop::LtE => Self::LtE,
-            rustpython_parser::ast::Cmpop::Gt => Self::Gt,
-            rustpython_parser::ast::Cmpop::GtE => Self::GtE,
-            rustpython_parser::ast::Cmpop::Is => Self::Is,
-            rustpython_parser::ast::Cmpop::IsNot => Self::IsNot,
-            rustpython_parser::ast::Cmpop::In => Self::In,
-            rustpython_parser::ast::Cmpop::NotIn => Self::NotIn,
-        }
-    }
-}
-
-pub type Body = Located<Vec<Stmt>>;
-
-impl From<(Vec<rustpython_parser::ast::Stmt>, &Locator<'_>)> for Body {
-    fn from((body, locator): (Vec<rustpython_parser::ast::Stmt>, &Locator)) -> Self {
-        Body {
-            range: body.first().unwrap().range(),
-            node: body
-                .into_iter()
-                .map(|node| (node, locator).into())
-                .collect(),
-            trivia: vec![],
-            parentheses: Parenthesize::Never,
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum StmtKind {
-    FunctionDef {
-        name: Ident,
-        args: Box<Arguments>,
-        body: Body,
-        decorator_list: Vec<Expr>,
-        returns: Option<Box<Expr>>,
-        type_comment: Option<String>,
-    },
-    AsyncFunctionDef {
-        name: Ident,
-        args: Box<Arguments>,
-        body: Body,
-        decorator_list: Vec<Expr>,
-        returns: Option<Box<Expr>>,
-        type_comment: Option<String>,
-    },
-    ClassDef {
-        name: Ident,
-        bases: Vec<Expr>,
-        keywords: Vec<Keyword>,
-        body: Body,
-        decorator_list: Vec<Expr>,
-    },
-    Return {
-        value: Option<Expr>,
-    },
-    Delete {
-        targets: Vec<Expr>,
-    },
-    Assign {
-        targets: Vec<Expr>,
-        value: Box<Expr>,
-        type_comment: Option<String>,
-    },
-    AugAssign {
-        target: Box<Expr>,
-        op: Operator,
-        value: Box<Expr>,
-    },
-    AnnAssign {
-        target: Box<Expr>,
-        annotation: Box<Expr>,
-        value: Option<Box<Expr>>,
-        simple: usize,
-    },
-    For {
-        target: Box<Expr>,
-        iter: Box<Expr>,
-        body: Body,
-        orelse: Option<Body>,
-        type_comment: Option<String>,
-    },
-    AsyncFor {
-        target: Box<Expr>,
-        iter: Box<Expr>,
-        body: Body,
-        orelse: Option<Body>,
-        type_comment: Option<String>,
-    },
-    While {
-        test: Box<Expr>,
-        body: Body,
-        orelse: Option<Body>,
-    },
-    If {
-        test: Box<Expr>,
-        body: Body,
-        orelse: Option<Body>,
-        is_elif: bool,
-    },
-    With {
-        items: Vec<Withitem>,
-        body: Body,
-        type_comment: Option<String>,
-    },
-    AsyncWith {
-        items: Vec<Withitem>,
-        body: Body,
-        type_comment: Option<String>,
-    },
-    Match {
-        subject: Box<Expr>,
-        cases: Vec<MatchCase>,
-    },
-    Raise {
-        exc: Option<Box<Expr>>,
-        cause: Option<Box<Expr>>,
-    },
-    Try {
-        body: Body,
-        handlers: Vec<Excepthandler>,
-        orelse: Option<Body>,
-        finalbody: Option<Body>,
-    },
-    TryStar {
-        body: Body,
-        handlers: Vec<Excepthandler>,
-        orelse: Option<Body>,
-        finalbody: Option<Body>,
-    },
-    Assert {
-        test: Box<Expr>,
-        msg: Option<Box<Expr>>,
-    },
-    Import {
-        names: Vec<Alias>,
-    },
-    ImportFrom {
-        module: Option<Ident>,
-        names: Vec<Alias>,
-        level: Option<usize>,
-    },
-    Global {
-        names: Vec<Ident>,
-    },
-    Nonlocal {
-        names: Vec<Ident>,
-    },
-    Expr {
-        value: Box<Expr>,
-    },
-    Pass,
-    Break,
-    Continue,
-}
-
-pub type Stmt = Located<StmtKind>;
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum ExprKind {
-    BoolOp {
-        ops: Vec<BoolOp>,
-        values: Vec<Expr>,
-    },
-    NamedExpr {
-        target: Box<Expr>,
-        value: Box<Expr>,
-    },
-    BinOp {
-        left: Box<Expr>,
-        op: Operator,
-        right: Box<Expr>,
-    },
-    UnaryOp {
-        op: UnaryOp,
-        operand: Box<Expr>,
-    },
-    Lambda {
-        args: Box<Arguments>,
-        body: Box<Expr>,
-    },
-    IfExp {
-        test: Box<Expr>,
-        body: Box<Expr>,
-        orelse: Box<Expr>,
-    },
-    Dict {
-        keys: Vec<Option<Expr>>,
-        values: Vec<Expr>,
-    },
-    Set {
-        elts: Vec<Expr>,
-    },
-    ListComp {
-        elt: Box<Expr>,
-        generators: Vec<Comprehension>,
-    },
-    SetComp {
-        elt: Box<Expr>,
-        generators: Vec<Comprehension>,
-    },
-    DictComp {
-        key: Box<Expr>,
-        value: Box<Expr>,
-        generators: Vec<Comprehension>,
-    },
-    GeneratorExp {
-        elt: Box<Expr>,
-        generators: Vec<Comprehension>,
-    },
-    Await {
-        value: Box<Expr>,
-    },
-    Yield {
-        value: Option<Box<Expr>>,
-    },
-    YieldFrom {
-        value: Box<Expr>,
-    },
-    Compare {
-        left: Box<Expr>,
-        ops: Vec<CmpOp>,
-        comparators: Vec<Expr>,
-    },
-    Call {
-        func: Box<Expr>,
-        args: Vec<Expr>,
-        keywords: Vec<Keyword>,
-    },
-    FormattedValue {
-        value: Box<Expr>,
-        conversion: usize,
-        format_spec: Option<Box<Expr>>,
-    },
-    JoinedStr {
-        values: Vec<Expr>,
-    },
-    Constant {
-        value: Constant,
-        kind: Option<String>,
-    },
-    Attribute {
-        value: Box<Expr>,
-        attr: Ident,
-        ctx: ExprContext,
-    },
-    Subscript {
-        value: Box<Expr>,
-        slice: Box<Expr>,
-        ctx: ExprContext,
-    },
-    Starred {
-        value: Box<Expr>,
-        ctx: ExprContext,
-    },
-    Name {
-        id: String,
-        ctx: ExprContext,
-    },
-    List {
-        elts: Vec<Expr>,
-        ctx: ExprContext,
-    },
-    Tuple {
-        elts: Vec<Expr>,
-        ctx: ExprContext,
-    },
-    Slice {
-        lower: SliceIndex,
-        upper: SliceIndex,
-        step: Option<SliceIndex>,
-    },
-}
-
-pub type Expr = Located<ExprKind>;
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct Comprehension {
-    pub target: Expr,
-    pub iter: Expr,
-    pub ifs: Vec<Expr>,
-    pub is_async: usize,
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum ExcepthandlerKind {
-    ExceptHandler {
-        type_: Option<Box<Expr>>,
-        name: Option<Ident>,
-        body: Body,
-    },
-}
-
-pub type Excepthandler = Located<ExcepthandlerKind>;
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum SliceIndexKind {
-    /// The index slot exists, but is empty.
-    Empty,
-    /// The index slot contains an expression.
-    Index { value: Box<Expr> },
-}
-
-pub type SliceIndex = Located<SliceIndexKind>;
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct Arguments {
-    pub posonlyargs: Vec<Arg>,
-    pub args: Vec<Arg>,
-    pub vararg: Option<Box<Arg>>,
-    pub kwonlyargs: Vec<Arg>,
-    pub kw_defaults: Vec<Expr>,
-    pub kwarg: Option<Box<Arg>>,
-    pub defaults: Vec<Expr>,
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct ArgData {
-    pub arg: Ident,
-    pub annotation: Option<Box<Expr>>,
-    pub type_comment: Option<String>,
-}
-
-pub type Arg = Located<ArgData>;
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct KeywordData {
-    pub arg: Option<Ident>,
-    pub value: Expr,
-}
-
-pub type Keyword = Located<KeywordData>;
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct AliasData {
-    pub name: Ident,
-    pub asname: Option<Ident>,
-}
-
-pub type Alias = Located<AliasData>;
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct Withitem {
-    pub context_expr: Expr,
-    pub optional_vars: Option<Box<Expr>>,
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct MatchCase {
-    pub pattern: Pattern,
-    pub guard: Option<Box<Expr>>,
-    pub body: Body,
-}
-
-#[allow(clippy::enum_variant_names)]
-#[derive(Clone, Debug, PartialEq)]
-pub enum PatternKind {
-    MatchValue {
-        value: Box<Expr>,
-    },
-    MatchSingleton {
-        value: Constant,
-    },
-    MatchSequence {
-        patterns: Vec<Pattern>,
-    },
-    MatchMapping {
-        keys: Vec<Expr>,
-        patterns: Vec<Pattern>,
-        rest: Option<Ident>,
-    },
-    MatchClass {
-        cls: Box<Expr>,
-        patterns: Vec<Pattern>,
-        kwd_attrs: Vec<Ident>,
-        kwd_patterns: Vec<Pattern>,
-    },
-    MatchStar {
-        name: Option<Ident>,
-    },
-    MatchAs {
-        pattern: Option<Box<Pattern>>,
-        name: Option<Ident>,
-    },
-    MatchOr {
-        patterns: Vec<Pattern>,
-    },
-}
-
-pub type Pattern = Located<PatternKind>;
-
-impl From<(rustpython_parser::ast::Alias, &Locator<'_>)> for Alias {
-    fn from((alias, _locator): (rustpython_parser::ast::Alias, &Locator)) -> Self {
-        Alias {
-            range: alias.range(),
-            node: AliasData {
-                name: alias.node.name,
-                asname: alias.node.asname,
-            },
-            trivia: vec![],
-            parentheses: Parenthesize::Never,
-        }
-    }
-}
-
-impl From<(rustpython_parser::ast::Withitem, &Locator<'_>)> for Withitem {
-    fn from((withitem, locator): (rustpython_parser::ast::Withitem, &Locator)) -> Self {
-        Withitem {
-            context_expr: (withitem.context_expr, locator).into(),
-            optional_vars: withitem
-                .optional_vars
-                .map(|v| Box::new((*v, locator).into())),
-        }
-    }
-}
-
-impl From<(rustpython_parser::ast::Excepthandler, &Locator<'_>)> for Excepthandler {
-    fn from((excepthandler, locator): (rustpython_parser::ast::Excepthandler, &Locator)) -> Self {
-        let rustpython_parser::ast::ExcepthandlerKind::ExceptHandler { type_, name, body } =
-            excepthandler.node;
-
-        // Find the start and end of the `body`.
-        let body = {
-            let body_range = expand_indented_block(
-                excepthandler.range.start(),
-                body.last().unwrap().end(),
-                locator,
-            );
-            Body {
-                range: body_range,
-                node: body
-                    .into_iter()
-                    .map(|node| (node, locator).into())
-                    .collect(),
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            }
-        };
-
-        Excepthandler {
-            range: TextRange::new(excepthandler.range.start(), body.end()),
-            node: ExcepthandlerKind::ExceptHandler {
-                type_: type_.map(|type_| Box::new((*type_, locator).into())),
-                name,
-                body,
-            },
-            trivia: vec![],
-            parentheses: Parenthesize::Never,
-        }
-    }
-}
-
-impl From<(rustpython_parser::ast::Pattern, &Locator<'_>)> for Pattern {
-    fn from((pattern, locator): (rustpython_parser::ast::Pattern, &Locator)) -> Self {
-        Pattern {
-            range: pattern.range(),
-            node: match pattern.node {
-                rustpython_parser::ast::PatternKind::MatchValue { value } => {
-                    PatternKind::MatchValue {
-                        value: Box::new((*value, locator).into()),
-                    }
-                }
-                rustpython_parser::ast::PatternKind::MatchSingleton { value } => {
-                    PatternKind::MatchSingleton { value }
-                }
-                rustpython_parser::ast::PatternKind::MatchSequence { patterns } => {
-                    PatternKind::MatchSequence {
-                        patterns: patterns
-                            .into_iter()
-                            .map(|pattern| (pattern, locator).into())
-                            .collect(),
-                    }
-                }
-                rustpython_parser::ast::PatternKind::MatchMapping {
-                    keys,
-                    patterns,
-                    rest,
-                } => PatternKind::MatchMapping {
-                    keys: keys.into_iter().map(|key| (key, locator).into()).collect(),
-                    patterns: patterns
-                        .into_iter()
-                        .map(|pattern| (pattern, locator).into())
-                        .collect(),
-                    rest,
-                },
-                rustpython_parser::ast::PatternKind::MatchClass {
-                    cls,
-                    patterns,
-                    kwd_attrs,
-                    kwd_patterns,
-                } => PatternKind::MatchClass {
-                    cls: Box::new((*cls, locator).into()),
-                    patterns: patterns
-                        .into_iter()
-                        .map(|pattern| (pattern, locator).into())
-                        .collect(),
-                    kwd_attrs,
-                    kwd_patterns: kwd_patterns
-                        .into_iter()
-                        .map(|pattern| (pattern, locator).into())
-                        .collect(),
-                },
-                rustpython_parser::ast::PatternKind::MatchStar { name } => {
-                    PatternKind::MatchStar { name }
-                }
-                rustpython_parser::ast::PatternKind::MatchAs { pattern, name } => {
-                    PatternKind::MatchAs {
-                        pattern: pattern.map(|pattern| Box::new((*pattern, locator).into())),
-                        name,
-                    }
-                }
-                rustpython_parser::ast::PatternKind::MatchOr { patterns } => PatternKind::MatchOr {
-                    patterns: patterns
-                        .into_iter()
-                        .map(|pattern| (pattern, locator).into())
-                        .collect(),
-                },
-            },
-            trivia: vec![],
-            parentheses: Parenthesize::Never,
-        }
-    }
-}
-
-impl From<(rustpython_parser::ast::MatchCase, &Locator<'_>)> for MatchCase {
-    fn from((match_case, locator): (rustpython_parser::ast::MatchCase, &Locator)) -> Self {
-        // Find the start and end of the `body`.
-        let body = {
-            let body_range = expand_indented_block(
-                match_case.pattern.start(),
-                match_case.body.last().unwrap().end(),
-                locator,
-            );
-            Body {
-                range: body_range,
-                node: match_case
-                    .body
-                    .into_iter()
-                    .map(|node| (node, locator).into())
-                    .collect(),
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            }
-        };
-
-        MatchCase {
-            pattern: (match_case.pattern, locator).into(),
-            guard: match_case
-                .guard
-                .map(|guard| Box::new((*guard, locator).into())),
-            body,
-        }
-    }
-}
-
-impl From<(rustpython_parser::ast::Stmt, &Locator<'_>)> for Stmt {
-    fn from((stmt, locator): (rustpython_parser::ast::Stmt, &Locator)) -> Self {
-        match stmt.node {
-            rustpython_parser::ast::StmtKind::Expr { value } => Stmt {
-                range: stmt.range,
-                node: StmtKind::Expr {
-                    value: Box::new((*value, locator).into()),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::StmtKind::Pass => Stmt {
-                range: stmt.range,
-                node: StmtKind::Pass,
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::StmtKind::Return { value } => Stmt {
-                range: stmt.range,
-                node: StmtKind::Return {
-                    value: value.map(|v| (*v, locator).into()),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::StmtKind::Assign {
-                targets,
-                value,
-                type_comment,
-            } => Stmt {
-                range: stmt.range,
-                node: StmtKind::Assign {
-                    targets: targets
-                        .into_iter()
-                        .map(|node| (node, locator).into())
-                        .collect(),
-                    value: Box::new((*value, locator).into()),
-                    type_comment,
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::StmtKind::ClassDef {
-                name,
-                bases,
-                keywords,
-                body,
-                decorator_list,
-            } => {
-                // Find the start and end of the `body`.
-                let body = {
-                    let body_range = expand_indented_block(
-                        stmt.range.start(),
-                        body.last().unwrap().end(),
-                        locator,
-                    );
-                    Body {
-                        range: body_range,
-                        node: body
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        trivia: vec![],
-                        parentheses: Parenthesize::Never,
-                    }
-                };
-
-                Stmt {
-                    range: TextRange::new(stmt.range.start(), body.end()),
-                    node: StmtKind::ClassDef {
-                        name,
-                        bases: bases
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        keywords: keywords
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        body,
-                        decorator_list: decorator_list
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                    },
-                    trivia: vec![],
-                    parentheses: Parenthesize::Never,
-                }
-            }
-            rustpython_parser::ast::StmtKind::If { test, body, orelse } => {
-                // Find the start and end of the `body`.
-                let body = {
-                    let body_range = expand_indented_block(
-                        stmt.range.start(),
-                        body.last().unwrap().end(),
-                        locator,
-                    );
-                    Body {
-                        range: body_range,
-                        node: body
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        trivia: vec![],
-                        parentheses: Parenthesize::Never,
-                    }
-                };
-
-                if orelse.is_empty() {
-                    // No `else` block.
-                    Stmt {
-                        range: TextRange::new(stmt.range.start(), body.end()),
-                        node: StmtKind::If {
-                            test: Box::new((*test, locator).into()),
-                            body,
-                            orelse: None,
-                            is_elif: false,
-                        },
-                        trivia: vec![],
-                        parentheses: Parenthesize::Never,
-                    }
-                } else {
-                    if is_elif(&orelse, locator) {
-                        // Find the start and end of the `elif`.
-                        let mut elif: Body = (orelse, locator).into();
-                        if let StmtKind::If { is_elif, .. } =
-                            &mut elif.node.first_mut().unwrap().node
-                        {
-                            *is_elif = true;
-                        };
-
-                        Stmt {
-                            range: TextRange::new(stmt.range.start(), elif.end()),
-                            node: StmtKind::If {
-                                test: Box::new((*test, locator).into()),
-                                body,
-                                orelse: Some(elif),
-                                is_elif: false,
-                            },
-                            trivia: vec![],
-                            parentheses: Parenthesize::Never,
-                        }
-                    } else {
-                        // Find the start and end of the `else`.
-                        let orelse_range = expand_indented_block(
-                            body.end(),
-                            orelse.last().unwrap().end(),
-                            locator,
-                        );
-                        let orelse = Body {
-                            range: orelse_range,
-                            node: orelse
-                                .into_iter()
-                                .map(|node| (node, locator).into())
-                                .collect(),
-                            trivia: vec![],
-                            parentheses: Parenthesize::Never,
-                        };
-
-                        Stmt {
-                            range: TextRange::new(stmt.range.start(), orelse.end()),
-                            node: StmtKind::If {
-                                test: Box::new((*test, locator).into()),
-                                body,
-                                orelse: Some(orelse),
-                                is_elif: false,
-                            },
-                            trivia: vec![],
-                            parentheses: Parenthesize::Never,
-                        }
-                    }
-                }
-            }
-            rustpython_parser::ast::StmtKind::Assert { test, msg } => Stmt {
-                range: stmt.range,
-                node: StmtKind::Assert {
-                    test: Box::new((*test, locator).into()),
-                    msg: msg.map(|node| Box::new((*node, locator).into())),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::StmtKind::FunctionDef {
-                name,
-                args,
-                body,
-                decorator_list,
-                returns,
-                type_comment,
-            } => {
-                // Find the start and end of the `body`.
-                let body = {
-                    let body_range = expand_indented_block(
-                        stmt.range.start(),
-                        body.last().unwrap().end(),
-                        locator,
-                    );
-                    Body {
-                        range: body_range,
-                        node: body
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        trivia: vec![],
-                        parentheses: Parenthesize::Never,
-                    }
-                };
-
-                Stmt {
-                    range: TextRange::new(
-                        decorator_list
-                            .first()
-                            .map_or(stmt.range.start(), ast::Located::start),
-                        body.end(),
-                    ),
-                    node: StmtKind::FunctionDef {
-                        name,
-                        args: Box::new((*args, locator).into()),
-                        body,
-                        decorator_list: decorator_list
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        returns: returns.map(|r| Box::new((*r, locator).into())),
-                        type_comment,
-                    },
-                    trivia: vec![],
-                    parentheses: Parenthesize::Never,
-                }
-            }
-            rustpython_parser::ast::StmtKind::AsyncFunctionDef {
-                name,
-                args,
-                body,
-                decorator_list,
-                returns,
-                type_comment,
-            } => {
-                // Find the start and end of the `body`.
-                let body = {
-                    let body_range = expand_indented_block(
-                        stmt.range.start(),
-                        body.last().unwrap().end(),
-                        locator,
-                    );
-                    Body {
-                        range: body_range,
-                        node: body
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        trivia: vec![],
-                        parentheses: Parenthesize::Never,
-                    }
-                };
-
-                Stmt {
-                    range: TextRange::new(
-                        decorator_list
-                            .first()
-                            .map_or(stmt.range.start(), |expr| expr.range.start()),
-                        body.end(),
-                    ),
-                    node: StmtKind::AsyncFunctionDef {
-                        name,
-                        args: Box::new((*args, locator).into()),
-                        body,
-                        decorator_list: decorator_list
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        returns: returns.map(|r| Box::new((*r, locator).into())),
-                        type_comment,
-                    },
-                    trivia: vec![],
-                    parentheses: Parenthesize::Never,
-                }
-            }
-            rustpython_parser::ast::StmtKind::Delete { targets } => Stmt {
-                range: stmt.range,
-                node: StmtKind::Delete {
-                    targets: targets
-                        .into_iter()
-                        .map(|node| (node, locator).into())
-                        .collect(),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::StmtKind::AugAssign { target, op, value } => Stmt {
-                range: stmt.range,
-                node: StmtKind::AugAssign {
-                    op: {
-                        let target_tok = match &op {
-                            rustpython_parser::ast::Operator::Add => {
-                                rustpython_parser::Tok::PlusEqual
-                            }
-                            rustpython_parser::ast::Operator::Sub => {
-                                rustpython_parser::Tok::MinusEqual
-                            }
-                            rustpython_parser::ast::Operator::Mult => {
-                                rustpython_parser::Tok::StarEqual
-                            }
-                            rustpython_parser::ast::Operator::MatMult => {
-                                rustpython_parser::Tok::AtEqual
-                            }
-                            rustpython_parser::ast::Operator::Div => {
-                                rustpython_parser::Tok::SlashEqual
-                            }
-                            rustpython_parser::ast::Operator::Mod => {
-                                rustpython_parser::Tok::PercentEqual
-                            }
-                            rustpython_parser::ast::Operator::Pow => {
-                                rustpython_parser::Tok::DoubleStarEqual
-                            }
-                            rustpython_parser::ast::Operator::LShift => {
-                                rustpython_parser::Tok::LeftShiftEqual
-                            }
-                            rustpython_parser::ast::Operator::RShift => {
-                                rustpython_parser::Tok::RightShiftEqual
-                            }
-                            rustpython_parser::ast::Operator::BitOr => {
-                                rustpython_parser::Tok::VbarEqual
-                            }
-                            rustpython_parser::ast::Operator::BitXor => {
-                                rustpython_parser::Tok::CircumflexEqual
-                            }
-                            rustpython_parser::ast::Operator::BitAnd => {
-                                rustpython_parser::Tok::AmperEqual
-                            }
-                            rustpython_parser::ast::Operator::FloorDiv => {
-                                rustpython_parser::Tok::DoubleSlashEqual
-                            }
-                        };
-                        let op_range =
-                            find_tok(TextRange::new(target.end(), value.end()), locator, |tok| {
-                                tok == target_tok
-                            });
-                        Operator::new(op_range, (&op).into())
-                    },
-                    target: Box::new((*target, locator).into()),
-                    value: Box::new((*value, locator).into()),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::StmtKind::AnnAssign {
-                target,
-                annotation,
-                value,
-                simple,
-            } => Stmt {
-                range: stmt.range,
-                node: StmtKind::AnnAssign {
-                    target: Box::new((*target, locator).into()),
-                    annotation: Box::new((*annotation, locator).into()),
-                    value: value.map(|node| Box::new((*node, locator).into())),
-                    simple,
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::StmtKind::For {
-                target,
-                iter,
-                body,
-                orelse,
-                type_comment,
-            } => {
-                // Find the start and end of the `body`.
-                let body = {
-                    let body_range = expand_indented_block(
-                        stmt.range.start(),
-                        body.last().unwrap().end(),
-                        locator,
-                    );
-                    Body {
-                        range: body_range,
-                        node: body
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        trivia: vec![],
-                        parentheses: Parenthesize::Never,
-                    }
-                };
-
-                // Find the start and end of the `orelse`.
-                let orelse = (!orelse.is_empty()).then(|| {
-                    let orelse_range =
-                        expand_indented_block(body.end(), orelse.last().unwrap().end(), locator);
-                    Body {
-                        range: orelse_range,
-                        node: orelse
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        trivia: vec![],
-                        parentheses: Parenthesize::Never,
-                    }
-                });
-
-                Stmt {
-                    range: TextRange::new(
-                        stmt.range.start(),
-                        orelse.as_ref().unwrap_or(&body).end(),
-                    ),
-                    node: StmtKind::For {
-                        target: Box::new((*target, locator).into()),
-                        iter: Box::new((*iter, locator).into()),
-                        body,
-                        orelse,
-                        type_comment,
-                    },
-                    trivia: vec![],
-                    parentheses: Parenthesize::Never,
-                }
-            }
-            rustpython_parser::ast::StmtKind::AsyncFor {
-                target,
-                iter,
-                body,
-                orelse,
-                type_comment,
-            } => {
-                // Find the start and end of the `body`.
-                let body = {
-                    let body_range = expand_indented_block(
-                        stmt.range.start(),
-                        body.last().unwrap().end(),
-                        locator,
-                    );
-                    Body {
-                        range: body_range,
-                        node: body
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        trivia: vec![],
-                        parentheses: Parenthesize::Never,
-                    }
-                };
-
-                // Find the start and end of the `orelse`.
-                let orelse = (!orelse.is_empty()).then(|| {
-                    let orelse_range =
-                        expand_indented_block(body.end(), orelse.last().unwrap().end(), locator);
-                    Body {
-                        range: orelse_range,
-                        node: orelse
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        trivia: vec![],
-                        parentheses: Parenthesize::Never,
-                    }
-                });
-
-                Stmt {
-                    range: TextRange::new(
-                        stmt.range.start(),
-                        orelse.as_ref().unwrap_or(&body).end(),
-                    ),
-                    node: StmtKind::AsyncFor {
-                        target: Box::new((*target, locator).into()),
-                        iter: Box::new((*iter, locator).into()),
-                        body,
-                        orelse,
-                        type_comment,
-                    },
-                    trivia: vec![],
-                    parentheses: Parenthesize::Never,
-                }
-            }
-            rustpython_parser::ast::StmtKind::While { test, body, orelse } => {
-                // Find the start and end of the `body`.
-                let body = {
-                    let body_range = expand_indented_block(
-                        stmt.range.start(),
-                        body.last().unwrap().end(),
-                        locator,
-                    );
-                    Body {
-                        range: body_range,
-                        node: body
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        trivia: vec![],
-                        parentheses: Parenthesize::Never,
-                    }
-                };
-
-                // Find the start and end of the `orelse`.
-                let orelse = (!orelse.is_empty()).then(|| {
-                    let orelse_range =
-                        expand_indented_block(body.end(), orelse.last().unwrap().end(), locator);
-                    Body {
-                        range: orelse_range,
-                        node: orelse
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        trivia: vec![],
-                        parentheses: Parenthesize::Never,
-                    }
-                });
-
-                Stmt {
-                    range: TextRange::new(
-                        stmt.range.start(),
-                        orelse.as_ref().unwrap_or(&body).end(),
-                    ),
-                    node: StmtKind::While {
-                        test: Box::new((*test, locator).into()),
-                        body,
-                        orelse,
-                    },
-                    trivia: vec![],
-                    parentheses: Parenthesize::Never,
-                }
-            }
-            rustpython_parser::ast::StmtKind::With {
-                items,
-                body,
-                type_comment,
-            } => {
-                // Find the start and end of the `body`.
-                let body = {
-                    let body_range = expand_indented_block(
-                        stmt.range.start(),
-                        body.last().unwrap().end(),
-                        locator,
-                    );
-                    Body {
-                        range: body_range,
-                        node: body
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        trivia: vec![],
-                        parentheses: Parenthesize::Never,
-                    }
-                };
-
-                Stmt {
-                    range: TextRange::new(stmt.range.start(), body.end()),
-                    node: StmtKind::With {
-                        items: items
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        body,
-                        type_comment,
-                    },
-                    trivia: vec![],
-                    parentheses: Parenthesize::Never,
-                }
-            }
-            rustpython_parser::ast::StmtKind::AsyncWith {
-                items,
-                body,
-                type_comment,
-            } => {
-                // Find the start and end of the `body`.
-                let body = {
-                    let body_range = expand_indented_block(
-                        stmt.range.start(),
-                        body.last().unwrap().end(),
-                        locator,
-                    );
-                    Body {
-                        range: body_range,
-                        node: body
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        trivia: vec![],
-                        parentheses: Parenthesize::Never,
-                    }
-                };
-
-                Stmt {
-                    range: TextRange::new(stmt.range.start(), body.end()),
-                    node: StmtKind::AsyncWith {
-                        items: items
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        body,
-                        type_comment,
-                    },
-                    trivia: vec![],
-                    parentheses: Parenthesize::Never,
-                }
-            }
-            rustpython_parser::ast::StmtKind::Match { subject, cases } => Stmt {
-                range: stmt.range,
-                node: StmtKind::Match {
-                    subject: Box::new((*subject, locator).into()),
-                    cases: cases
-                        .into_iter()
-                        .map(|node| (node, locator).into())
-                        .collect(),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::StmtKind::Raise { exc, cause } => Stmt {
-                range: stmt.range,
-                node: StmtKind::Raise {
-                    exc: exc.map(|exc| Box::new((*exc, locator).into())),
-                    cause: cause.map(|cause| Box::new((*cause, locator).into())),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::StmtKind::Try {
-                body,
-                handlers,
-                orelse,
-                finalbody,
-            } => {
-                // Find the start and end of the `body`.
-                let body = {
-                    let body_range = expand_indented_block(
-                        stmt.range.start(),
-                        body.last().unwrap().end(),
-                        locator,
-                    );
-                    Body {
-                        range: body_range,
-                        node: body
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        trivia: vec![],
-                        parentheses: Parenthesize::Never,
-                    }
-                };
-
-                let handlers: Vec<Excepthandler> = handlers
-                    .into_iter()
-                    .map(|node| (node, locator).into())
-                    .collect();
-
-                // Find the start and end of the `orelse`.
-                let orelse = (!orelse.is_empty()).then(|| {
-                    let orelse_range = expand_indented_block(
-                        handlers.last().map_or(body.end(), Located::end),
-                        orelse.last().unwrap().end(),
-                        locator,
-                    );
-                    Body {
-                        range: orelse_range,
-                        node: orelse
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        trivia: vec![],
-                        parentheses: Parenthesize::Never,
-                    }
-                });
-
-                // Find the start and end of the `finalbody`.
-                let finalbody = (!finalbody.is_empty()).then(|| {
-                    let finalbody_range = expand_indented_block(
-                        orelse.as_ref().map_or(
-                            handlers.last().map_or(body.end(), Located::end),
-                            Located::end,
-                        ),
-                        finalbody.last().unwrap().end(),
-                        locator,
-                    );
-                    Body {
-                        range: finalbody_range,
-                        node: finalbody
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        trivia: vec![],
-                        parentheses: Parenthesize::Never,
-                    }
-                });
-
-                let end_location = finalbody.as_ref().map_or(
-                    orelse.as_ref().map_or(
-                        handlers.last().map_or(body.end(), Located::end),
-                        Located::end,
-                    ),
-                    Located::end,
-                );
-
-                Stmt {
-                    range: TextRange::new(stmt.range.start(), end_location),
-                    node: StmtKind::Try {
-                        body,
-                        handlers,
-                        orelse,
-                        finalbody,
-                    },
-                    trivia: vec![],
-                    parentheses: Parenthesize::Never,
-                }
-            }
-            rustpython_parser::ast::StmtKind::TryStar {
-                body,
-                handlers,
-                orelse,
-                finalbody,
-            } => {
-                // Find the start and end of the `body`.
-                let body = {
-                    let body_range = expand_indented_block(
-                        stmt.range.start(),
-                        body.last().unwrap().end(),
-                        locator,
-                    );
-                    Body {
-                        range: body_range,
-                        node: body
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        trivia: vec![],
-                        parentheses: Parenthesize::Never,
-                    }
-                };
-
-                let handlers: Vec<Excepthandler> = handlers
-                    .into_iter()
-                    .map(|node| (node, locator).into())
-                    .collect();
-
-                // Find the start and end of the `orelse`.
-                let orelse = (!orelse.is_empty()).then(|| {
-                    let orelse_range = expand_indented_block(
-                        handlers.last().map_or(body.end(), Located::end),
-                        orelse.last().unwrap().end(),
-                        locator,
-                    );
-                    Body {
-                        range: orelse_range,
-                        node: orelse
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        trivia: vec![],
-                        parentheses: Parenthesize::Never,
-                    }
-                });
-
-                // Find the start and end of the `finalbody`.
-                let finalbody = (!finalbody.is_empty()).then(|| {
-                    let finalbody_range = expand_indented_block(
-                        orelse.as_ref().map_or(
-                            handlers.last().map_or(body.end(), Located::end),
-                            Located::end,
-                        ),
-                        finalbody.last().unwrap().end(),
-                        locator,
-                    );
-                    Body {
-                        range: finalbody_range,
-                        node: finalbody
-                            .into_iter()
-                            .map(|node| (node, locator).into())
-                            .collect(),
-                        trivia: vec![],
-                        parentheses: Parenthesize::Never,
-                    }
-                });
-
-                let end_location = finalbody.as_ref().map_or(
-                    orelse.as_ref().map_or(
-                        handlers.last().map_or(body.end(), Located::end),
-                        Located::end,
-                    ),
-                    Located::end,
-                );
-
-                Stmt {
-                    range: TextRange::new(stmt.range.start(), end_location),
-                    node: StmtKind::TryStar {
-                        body,
-                        handlers,
-                        orelse,
-                        finalbody,
-                    },
-                    trivia: vec![],
-                    parentheses: Parenthesize::Never,
-                }
-            }
-            rustpython_parser::ast::StmtKind::Import { names } => Stmt {
-                range: stmt.range,
-                node: StmtKind::Import {
-                    names: names
-                        .into_iter()
-                        .map(|node| (node, locator).into())
-                        .collect(),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::StmtKind::ImportFrom {
-                module,
-                names,
-                level,
-            } => Stmt {
-                range: stmt.range,
-                node: StmtKind::ImportFrom {
-                    module,
-                    names: names
-                        .into_iter()
-                        .map(|node| (node, locator).into())
-                        .collect(),
-                    level,
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::StmtKind::Global { names } => Stmt {
-                range: stmt.range,
-                node: StmtKind::Global { names },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::StmtKind::Nonlocal { names } => Stmt {
-                range: stmt.range,
-                node: StmtKind::Nonlocal { names },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::StmtKind::Break => Stmt {
-                range: stmt.range,
-                node: StmtKind::Break,
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::StmtKind::Continue => Stmt {
-                range: stmt.range,
-                node: StmtKind::Continue,
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-        }
-    }
-}
-
-impl From<(rustpython_parser::ast::Keyword, &Locator<'_>)> for Keyword {
-    fn from((keyword, locator): (rustpython_parser::ast::Keyword, &Locator)) -> Self {
-        Keyword {
-            range: keyword.range(),
-            node: KeywordData {
-                arg: keyword.node.arg,
-                value: (keyword.node.value, locator).into(),
-            },
-            trivia: vec![],
-            parentheses: Parenthesize::Never,
-        }
-    }
-}
-
-impl From<(rustpython_parser::ast::Arg, &Locator<'_>)> for Arg {
-    fn from((arg, locator): (rustpython_parser::ast::Arg, &Locator)) -> Self {
-        Arg {
-            range: arg.range(),
-            node: ArgData {
-                arg: arg.node.arg,
-                annotation: arg
-                    .node
-                    .annotation
-                    .map(|node| Box::new((*node, locator).into())),
-                type_comment: arg.node.type_comment,
-            },
-            trivia: vec![],
-            parentheses: Parenthesize::Never,
-        }
-    }
-}
-
-impl From<(rustpython_parser::ast::Arguments, &Locator<'_>)> for Arguments {
-    fn from((arguments, locator): (rustpython_parser::ast::Arguments, &Locator)) -> Self {
-        Arguments {
-            posonlyargs: arguments
-                .posonlyargs
-                .into_iter()
-                .map(|node| (node, locator).into())
-                .collect(),
-            args: arguments
-                .args
-                .into_iter()
-                .map(|node| (node, locator).into())
-                .collect(),
-            vararg: arguments
-                .vararg
-                .map(|node| Box::new((*node, locator).into())),
-            kwonlyargs: arguments
-                .kwonlyargs
-                .into_iter()
-                .map(|node| (node, locator).into())
-                .collect(),
-            kw_defaults: arguments
-                .kw_defaults
-                .into_iter()
-                .map(|node| (node, locator).into())
-                .collect(),
-            kwarg: arguments
-                .kwarg
-                .map(|node| Box::new((*node, locator).into())),
-            defaults: arguments
-                .defaults
-                .into_iter()
-                .map(|node| (node, locator).into())
-                .collect(),
-        }
-    }
-}
-
-impl From<(rustpython_parser::ast::Comprehension, &Locator<'_>)> for Comprehension {
-    fn from((comprehension, locator): (rustpython_parser::ast::Comprehension, &Locator)) -> Self {
-        Comprehension {
-            target: (comprehension.target, locator).into(),
-            iter: (comprehension.iter, locator).into(),
-            ifs: comprehension
-                .ifs
-                .into_iter()
-                .map(|node| (node, locator).into())
-                .collect(),
-            is_async: comprehension.is_async,
-        }
-    }
-}
-
-impl From<(rustpython_parser::ast::Expr, &Locator<'_>)> for Expr {
-    fn from((expr, locator): (rustpython_parser::ast::Expr, &Locator)) -> Self {
-        match expr.node {
-            rustpython_parser::ast::ExprKind::Name { id, ctx } => Expr {
-                range: expr.range,
-                node: ExprKind::Name {
-                    id,
-                    ctx: ctx.into(),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::BoolOp { op, values } => Expr {
-                range: expr.range,
-                node: ExprKind::BoolOp {
-                    ops: values
-                        .iter()
-                        .tuple_windows()
-                        .map(|(left, right)| {
-                            let target_tok = match &op {
-                                rustpython_parser::ast::Boolop::And => rustpython_parser::Tok::And,
-                                rustpython_parser::ast::Boolop::Or => rustpython_parser::Tok::Or,
-                            };
-                            let op_range = find_tok(
-                                TextRange::new(left.end(), right.start()),
-                                locator,
-                                |tok| tok == target_tok,
-                            );
-                            BoolOp::new(op_range, (&op).into())
-                        })
-                        .collect(),
-                    values: values
-                        .into_iter()
-                        .map(|node| (node, locator).into())
-                        .collect(),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::NamedExpr { target, value } => Expr {
-                range: expr.range,
-                node: ExprKind::NamedExpr {
-                    target: Box::new((*target, locator).into()),
-                    value: Box::new((*value, locator).into()),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::BinOp { left, op, right } => Expr {
-                range: expr.range,
-                node: ExprKind::BinOp {
-                    op: {
-                        let target_tok = match &op {
-                            rustpython_parser::ast::Operator::Add => rustpython_parser::Tok::Plus,
-                            rustpython_parser::ast::Operator::Sub => rustpython_parser::Tok::Minus,
-                            rustpython_parser::ast::Operator::Mult => rustpython_parser::Tok::Star,
-                            rustpython_parser::ast::Operator::MatMult => rustpython_parser::Tok::At,
-                            rustpython_parser::ast::Operator::Div => rustpython_parser::Tok::Slash,
-                            rustpython_parser::ast::Operator::Mod => {
-                                rustpython_parser::Tok::Percent
-                            }
-                            rustpython_parser::ast::Operator::Pow => {
-                                rustpython_parser::Tok::DoubleStar
-                            }
-                            rustpython_parser::ast::Operator::LShift => {
-                                rustpython_parser::Tok::LeftShift
-                            }
-                            rustpython_parser::ast::Operator::RShift => {
-                                rustpython_parser::Tok::RightShift
-                            }
-                            rustpython_parser::ast::Operator::BitOr => rustpython_parser::Tok::Vbar,
-                            rustpython_parser::ast::Operator::BitXor => {
-                                rustpython_parser::Tok::CircumFlex
-                            }
-                            rustpython_parser::ast::Operator::BitAnd => {
-                                rustpython_parser::Tok::Amper
-                            }
-                            rustpython_parser::ast::Operator::FloorDiv => {
-                                rustpython_parser::Tok::DoubleSlash
-                            }
-                        };
-                        let op_range =
-                            find_tok(TextRange::new(left.end(), right.start()), locator, |tok| {
-                                tok == target_tok
-                            });
-                        Operator::new(op_range, (&op).into())
-                    },
-                    left: Box::new((*left, locator).into()),
-                    right: Box::new((*right, locator).into()),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::UnaryOp { op, operand } => Expr {
-                range: expr.range,
-                node: ExprKind::UnaryOp {
-                    op: {
-                        let target_tok = match &op {
-                            rustpython_parser::ast::Unaryop::Invert => {
-                                rustpython_parser::Tok::Tilde
-                            }
-                            rustpython_parser::ast::Unaryop::Not => rustpython_parser::Tok::Not,
-                            rustpython_parser::ast::Unaryop::UAdd => rustpython_parser::Tok::Plus,
-                            rustpython_parser::ast::Unaryop::USub => rustpython_parser::Tok::Minus,
-                        };
-                        let op_range = find_tok(
-                            TextRange::new(expr.range.start(), operand.start()),
-                            locator,
-                            |tok| tok == target_tok,
-                        );
-                        UnaryOp::new(op_range, (&op).into())
-                    },
-                    operand: Box::new((*operand, locator).into()),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::Lambda { args, body } => Expr {
-                range: expr.range,
-                node: ExprKind::Lambda {
-                    args: Box::new((*args, locator).into()),
-                    body: Box::new((*body, locator).into()),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::IfExp { test, body, orelse } => Expr {
-                range: expr.range,
-                node: ExprKind::IfExp {
-                    test: Box::new((*test, locator).into()),
-                    body: Box::new((*body, locator).into()),
-                    orelse: Box::new((*orelse, locator).into()),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::Dict { keys, values } => Expr {
-                range: expr.range,
-                node: ExprKind::Dict {
-                    keys: keys
-                        .into_iter()
-                        .map(|key| key.map(|node| (node, locator).into()))
-                        .collect(),
-                    values: values
-                        .into_iter()
-                        .map(|node| (node, locator).into())
-                        .collect(),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::Set { elts } => Expr {
-                range: expr.range,
-                node: ExprKind::Set {
-                    elts: elts
-                        .into_iter()
-                        .map(|node| (node, locator).into())
-                        .collect(),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::ListComp { elt, generators } => Expr {
-                range: expr.range,
-                node: ExprKind::ListComp {
-                    elt: Box::new((*elt, locator).into()),
-                    generators: generators
-                        .into_iter()
-                        .map(|node| (node, locator).into())
-                        .collect(),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::SetComp { elt, generators } => Expr {
-                range: expr.range,
-                node: ExprKind::SetComp {
-                    elt: Box::new((*elt, locator).into()),
-                    generators: generators
-                        .into_iter()
-                        .map(|node| (node, locator).into())
-                        .collect(),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::DictComp {
-                key,
-                value,
-                generators,
-            } => Expr {
-                range: expr.range,
-                node: ExprKind::DictComp {
-                    key: Box::new((*key, locator).into()),
-                    value: Box::new((*value, locator).into()),
-                    generators: generators
-                        .into_iter()
-                        .map(|node| (node, locator).into())
-                        .collect(),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::GeneratorExp { elt, generators } => Expr {
-                range: expr.range,
-                node: ExprKind::GeneratorExp {
-                    elt: Box::new((*elt, locator).into()),
-                    generators: generators
-                        .into_iter()
-                        .map(|node| (node, locator).into())
-                        .collect(),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::Await { value } => Expr {
-                range: expr.range,
-                node: ExprKind::Await {
-                    value: Box::new((*value, locator).into()),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::Yield { value } => Expr {
-                range: expr.range,
-                node: ExprKind::Yield {
-                    value: value.map(|v| Box::new((*v, locator).into())),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::YieldFrom { value } => Expr {
-                range: expr.range,
-                node: ExprKind::YieldFrom {
-                    value: Box::new((*value, locator).into()),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::Compare {
-                left,
-                ops,
-                comparators,
-            } => Expr {
-                range: expr.range,
-                node: ExprKind::Compare {
-                    ops: iter::once(left.as_ref())
-                        .chain(comparators.iter())
-                        .tuple_windows()
-                        .zip(ops.into_iter())
-                        .map(|((left, right), op)| {
-                            let target_tok = match &op {
-                                rustpython_parser::ast::Cmpop::Eq => {
-                                    rustpython_parser::Tok::EqEqual
-                                }
-                                rustpython_parser::ast::Cmpop::NotEq => {
-                                    rustpython_parser::Tok::NotEqual
-                                }
-                                rustpython_parser::ast::Cmpop::Lt => rustpython_parser::Tok::Less,
-                                rustpython_parser::ast::Cmpop::LtE => {
-                                    rustpython_parser::Tok::LessEqual
-                                }
-                                rustpython_parser::ast::Cmpop::Gt => {
-                                    rustpython_parser::Tok::Greater
-                                }
-                                rustpython_parser::ast::Cmpop::GtE => {
-                                    rustpython_parser::Tok::GreaterEqual
-                                }
-                                rustpython_parser::ast::Cmpop::Is => rustpython_parser::Tok::Is,
-                                // TODO(charlie): Break this into two tokens.
-                                rustpython_parser::ast::Cmpop::IsNot => rustpython_parser::Tok::Is,
-                                rustpython_parser::ast::Cmpop::In => rustpython_parser::Tok::In,
-                                // TODO(charlie): Break this into two tokens.
-                                rustpython_parser::ast::Cmpop::NotIn => rustpython_parser::Tok::In,
-                            };
-                            let op_range = find_tok(
-                                TextRange::new(left.end(), right.start()),
-                                locator,
-                                |tok| tok == target_tok,
-                            );
-                            CmpOp::new(op_range, (&op).into())
-                        })
-                        .collect(),
-                    left: Box::new((*left, locator).into()),
-                    comparators: comparators
-                        .into_iter()
-                        .map(|node| (node, locator).into())
-                        .collect(),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::Call {
-                func,
-                args,
-                keywords,
-            } => Expr {
-                range: expr.range,
-                node: ExprKind::Call {
-                    func: Box::new((*func, locator).into()),
-                    args: args
-                        .into_iter()
-                        .map(|node| (node, locator).into())
-                        .collect(),
-                    keywords: keywords
-                        .into_iter()
-                        .map(|node| (node, locator).into())
-                        .collect(),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::FormattedValue {
-                value,
-                conversion,
-                format_spec,
-            } => Expr {
-                range: expr.range,
-                node: ExprKind::FormattedValue {
-                    value: Box::new((*value, locator).into()),
-                    conversion,
-                    format_spec: format_spec.map(|f| Box::new((*f, locator).into())),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::JoinedStr { values } => Expr {
-                range: expr.range,
-                node: ExprKind::JoinedStr {
-                    values: values
-                        .into_iter()
-                        .map(|node| (node, locator).into())
-                        .collect(),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::Constant { value, kind } => Expr {
-                range: expr.range,
-                node: ExprKind::Constant { value, kind },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::Attribute { value, attr, ctx } => Expr {
-                range: expr.range,
-                node: ExprKind::Attribute {
-                    value: Box::new((*value, locator).into()),
-                    attr,
-                    ctx: ctx.into(),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::Subscript { value, slice, ctx } => Expr {
-                range: expr.range,
-                node: ExprKind::Subscript {
-                    value: Box::new((*value, locator).into()),
-                    slice: Box::new((*slice, locator).into()),
-                    ctx: ctx.into(),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::Starred { value, ctx } => Expr {
-                range: expr.range,
-                node: ExprKind::Starred {
-                    value: Box::new((*value, locator).into()),
-                    ctx: ctx.into(),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::List { elts, ctx } => Expr {
-                range: expr.range,
-                node: ExprKind::List {
-                    elts: elts
-                        .into_iter()
-                        .map(|node| (node, locator).into())
-                        .collect(),
-                    ctx: ctx.into(),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::Tuple { elts, ctx } => Expr {
-                range: expr.range,
-                node: ExprKind::Tuple {
-                    elts: elts
-                        .into_iter()
-                        .map(|node| (node, locator).into())
-                        .collect(),
-                    ctx: ctx.into(),
-                },
-                trivia: vec![],
-                parentheses: Parenthesize::Never,
-            },
-            rustpython_parser::ast::ExprKind::Slice { lower, upper, step } => {
-                // Locate the colon tokens, which indicate the number of index segments.
-                let tokens = rustpython_parser::lexer::lex_located(
-                    &locator.contents()[expr.range],
-                    Mode::Module,
-                    expr.range.start(),
-                );
-
-                // Find the first and (if it exists) second colon in the slice, avoiding any
-                // semicolons within nested slices, and any lambda expressions.
-                let mut first_colon = None;
-                let mut second_colon = None;
-                let mut lambda = 0;
-                let mut nesting = 0;
-                for (tok, range) in tokens.flatten() {
-                    match tok {
-                        rustpython_parser::Tok::Lambda if nesting == 0 => lambda += 1,
-                        rustpython_parser::Tok::Colon if nesting == 0 => {
-                            if lambda > 0 {
-                                lambda -= 1;
-                            } else {
-                                if first_colon.is_none() {
-                                    first_colon = Some(range.start());
-                                } else {
-                                    second_colon = Some(range.start());
-                                    break;
-                                }
-                            }
-                        }
-                        rustpython_parser::Tok::Lpar
-                        | rustpython_parser::Tok::Lsqb
-                        | rustpython_parser::Tok::Lbrace => nesting += 1,
-                        rustpython_parser::Tok::Rpar
-                        | rustpython_parser::Tok::Rsqb
-                        | rustpython_parser::Tok::Rbrace => nesting -= 1,
-                        _ => {}
-                    }
-                }
-
-                let lower = SliceIndex::new(
-                    TextRange::new(expr.range.start(), first_colon.unwrap()),
-                    lower.map_or(SliceIndexKind::Empty, |node| SliceIndexKind::Index {
-                        value: Box::new((*node, locator).into()),
-                    }),
-                );
-                let upper = SliceIndex::new(
-                    TextRange::new(
-                        first_colon.unwrap(),
-                        second_colon.unwrap_or(expr.range.end()),
-                    ),
-                    upper.map_or(SliceIndexKind::Empty, |node| SliceIndexKind::Index {
-                        value: Box::new((*node, locator).into()),
-                    }),
-                );
-                let step = second_colon.map(|second_colon| {
-                    SliceIndex::new(
-                        TextRange::new(second_colon, expr.range.end()),
-                        step.map_or(SliceIndexKind::Empty, |node| SliceIndexKind::Index {
-                            value: Box::new((*node, locator).into()),
-                        }),
-                    )
-                });
-
-                Expr {
-                    range: expr.range,
-                    node: ExprKind::Slice { lower, upper, step },
-                    trivia: vec![],
-                    parentheses: Parenthesize::Never,
-                }
-            }
-        }
-    }
-}
diff --git a/crates/ruff_python_formatter/src/cst/visitor.rs b/crates/ruff_python_formatter/src/cst/visitor.rs
deleted file mode 100644
index 389794b803f43..0000000000000
--- a/crates/ruff_python_formatter/src/cst/visitor.rs
+++ /dev/null
@@ -1,617 +0,0 @@
-use rustpython_parser::ast::Constant;
-
-use crate::cst::{
-    Alias, Arg, Arguments, Body, BoolOp, CmpOp, Comprehension, Excepthandler, ExcepthandlerKind,
-    Expr, ExprContext, ExprKind, Keyword, MatchCase, Operator, Pattern, PatternKind, SliceIndex,
-    SliceIndexKind, Stmt, StmtKind, UnaryOp, Withitem,
-};
-
-pub trait Visitor<'a> {
-    fn visit_stmt(&mut self, stmt: &'a mut Stmt) {
-        walk_stmt(self, stmt);
-    }
-    fn visit_annotation(&mut self, expr: &'a mut Expr) {
-        walk_expr(self, expr);
-    }
-    fn visit_expr(&mut self, expr: &'a mut Expr) {
-        walk_expr(self, expr);
-    }
-    fn visit_constant(&mut self, constant: &'a mut Constant) {
-        walk_constant(self, constant);
-    }
-    fn visit_expr_context(&mut self, expr_context: &'a mut ExprContext) {
-        walk_expr_context(self, expr_context);
-    }
-    fn visit_bool_op(&mut self, bool_op: &'a mut BoolOp) {
-        walk_bool_op(self, bool_op);
-    }
-    fn visit_operator(&mut self, operator: &'a mut Operator) {
-        walk_operator(self, operator);
-    }
-    fn visit_unary_op(&mut self, unary_op: &'a mut UnaryOp) {
-        walk_unary_op(self, unary_op);
-    }
-    fn visit_cmp_op(&mut self, cmp_op: &'a mut CmpOp) {
-        walk_cmp_op(self, cmp_op);
-    }
-    fn visit_comprehension(&mut self, comprehension: &'a mut Comprehension) {
-        walk_comprehension(self, comprehension);
-    }
-    fn visit_excepthandler(&mut self, excepthandler: &'a mut Excepthandler) {
-        walk_excepthandler(self, excepthandler);
-    }
-    fn visit_slice_index(&mut self, slice_index: &'a mut SliceIndex) {
-        walk_slice_index(self, slice_index);
-    }
-    fn visit_format_spec(&mut self, format_spec: &'a mut Expr) {
-        walk_expr(self, format_spec);
-    }
-    fn visit_arguments(&mut self, arguments: &'a mut Arguments) {
-        walk_arguments(self, arguments);
-    }
-    fn visit_arg(&mut self, arg: &'a mut Arg) {
-        walk_arg(self, arg);
-    }
-    fn visit_keyword(&mut self, keyword: &'a mut Keyword) {
-        walk_keyword(self, keyword);
-    }
-    fn visit_alias(&mut self, alias: &'a mut Alias) {
-        walk_alias(self, alias);
-    }
-    fn visit_withitem(&mut self, withitem: &'a mut Withitem) {
-        walk_withitem(self, withitem);
-    }
-    fn visit_match_case(&mut self, match_case: &'a mut MatchCase) {
-        walk_match_case(self, match_case);
-    }
-    fn visit_pattern(&mut self, pattern: &'a mut Pattern) {
-        walk_pattern(self, pattern);
-    }
-    fn visit_body(&mut self, body: &'a mut Body) {
-        walk_body(self, body);
-    }
-}
-
-pub fn walk_body<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, body: &'a mut Body) {
-    for stmt in &mut body.node {
-        visitor.visit_stmt(stmt);
-    }
-}
-
-pub fn walk_stmt<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, stmt: &'a mut Stmt) {
-    match &mut stmt.node {
-        StmtKind::FunctionDef {
-            args,
-            body,
-            decorator_list,
-            returns,
-            ..
-        } => {
-            visitor.visit_arguments(args);
-            for expr in decorator_list {
-                visitor.visit_expr(expr);
-            }
-            for expr in returns {
-                visitor.visit_annotation(expr);
-            }
-            visitor.visit_body(body);
-        }
-        StmtKind::AsyncFunctionDef {
-            args,
-            body,
-            decorator_list,
-            returns,
-            ..
-        } => {
-            visitor.visit_arguments(args);
-            for expr in decorator_list {
-                visitor.visit_expr(expr);
-            }
-            for expr in returns {
-                visitor.visit_annotation(expr);
-            }
-            visitor.visit_body(body);
-        }
-        StmtKind::ClassDef {
-            bases,
-            keywords,
-            body,
-            decorator_list,
-            ..
-        } => {
-            for expr in bases {
-                visitor.visit_expr(expr);
-            }
-            for keyword in keywords {
-                visitor.visit_keyword(keyword);
-            }
-            for expr in decorator_list {
-                visitor.visit_expr(expr);
-            }
-            visitor.visit_body(body);
-        }
-        StmtKind::Return { value } => {
-            if let Some(expr) = value {
-                visitor.visit_expr(expr);
-            }
-        }
-        StmtKind::Delete { targets } => {
-            for expr in targets {
-                visitor.visit_expr(expr);
-            }
-        }
-        StmtKind::Assign { targets, value, .. } => {
-            visitor.visit_expr(value);
-            for expr in targets {
-                visitor.visit_expr(expr);
-            }
-        }
-        StmtKind::AugAssign { target, op, value } => {
-            visitor.visit_expr(target);
-            visitor.visit_operator(op);
-            visitor.visit_expr(value);
-        }
-        StmtKind::AnnAssign {
-            target,
-            annotation,
-            value,
-            ..
-        } => {
-            visitor.visit_annotation(annotation);
-            if let Some(expr) = value {
-                visitor.visit_expr(expr);
-            }
-            visitor.visit_expr(target);
-        }
-        StmtKind::For {
-            target,
-            iter,
-            body,
-            orelse,
-            ..
-        } => {
-            visitor.visit_expr(iter);
-            visitor.visit_expr(target);
-            visitor.visit_body(body);
-            if let Some(orelse) = orelse {
-                visitor.visit_body(orelse);
-            }
-        }
-        StmtKind::AsyncFor {
-            target,
-            iter,
-            body,
-            orelse,
-            ..
-        } => {
-            visitor.visit_expr(iter);
-            visitor.visit_expr(target);
-            visitor.visit_body(body);
-            if let Some(orelse) = orelse {
-                visitor.visit_body(orelse);
-            }
-        }
-        StmtKind::While { test, body, orelse } => {
-            visitor.visit_expr(test);
-            visitor.visit_body(body);
-            if let Some(orelse) = orelse {
-                visitor.visit_body(orelse);
-            }
-        }
-        StmtKind::If {
-            test, body, orelse, ..
-        } => {
-            visitor.visit_expr(test);
-            visitor.visit_body(body);
-            if let Some(orelse) = orelse {
-                visitor.visit_body(orelse);
-            }
-        }
-        StmtKind::With { items, body, .. } => {
-            for withitem in items {
-                visitor.visit_withitem(withitem);
-            }
-            visitor.visit_body(body);
-        }
-        StmtKind::AsyncWith { items, body, .. } => {
-            for withitem in items {
-                visitor.visit_withitem(withitem);
-            }
-            visitor.visit_body(body);
-        }
-        StmtKind::Match { subject, cases } => {
-            visitor.visit_expr(subject);
-            for match_case in cases {
-                visitor.visit_match_case(match_case);
-            }
-        }
-        StmtKind::Raise { exc, cause } => {
-            if let Some(expr) = exc {
-                visitor.visit_expr(expr);
-            };
-            if let Some(expr) = cause {
-                visitor.visit_expr(expr);
-            };
-        }
-        StmtKind::Try {
-            body,
-            handlers,
-            orelse,
-            finalbody,
-        } => {
-            visitor.visit_body(body);
-            for excepthandler in handlers {
-                visitor.visit_excepthandler(excepthandler);
-            }
-            if let Some(orelse) = orelse {
-                visitor.visit_body(orelse);
-            }
-            if let Some(finalbody) = finalbody {
-                visitor.visit_body(finalbody);
-            }
-        }
-        StmtKind::TryStar {
-            body,
-            handlers,
-            orelse,
-            finalbody,
-        } => {
-            visitor.visit_body(body);
-            for excepthandler in handlers {
-                visitor.visit_excepthandler(excepthandler);
-            }
-            if let Some(orelse) = orelse {
-                visitor.visit_body(orelse);
-            }
-            if let Some(finalbody) = finalbody {
-                visitor.visit_body(finalbody);
-            }
-        }
-        StmtKind::Assert { test, msg } => {
-            visitor.visit_expr(test);
-            if let Some(expr) = msg {
-                visitor.visit_expr(expr);
-            }
-        }
-        StmtKind::Import { names } => {
-            for alias in names {
-                visitor.visit_alias(alias);
-            }
-        }
-        StmtKind::ImportFrom { names, .. } => {
-            for alias in names {
-                visitor.visit_alias(alias);
-            }
-        }
-        StmtKind::Global { .. } => {}
-        StmtKind::Nonlocal { .. } => {}
-        StmtKind::Expr { value } => visitor.visit_expr(value),
-        StmtKind::Pass => {}
-        StmtKind::Break => {}
-        StmtKind::Continue => {}
-    }
-}
-
-pub fn walk_expr<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, expr: &'a mut Expr) {
-    match &mut expr.node {
-        ExprKind::BoolOp { ops, values } => {
-            for op in ops {
-                visitor.visit_bool_op(op);
-            }
-            for value in values {
-                visitor.visit_expr(value);
-            }
-        }
-        ExprKind::NamedExpr { target, value } => {
-            visitor.visit_expr(target);
-            visitor.visit_expr(value);
-        }
-        ExprKind::BinOp { left, op, right } => {
-            visitor.visit_expr(left);
-            visitor.visit_operator(op);
-            visitor.visit_expr(right);
-        }
-        ExprKind::UnaryOp { op, operand } => {
-            visitor.visit_unary_op(op);
-            visitor.visit_expr(operand);
-        }
-        ExprKind::Lambda { args, body } => {
-            visitor.visit_arguments(args);
-            visitor.visit_expr(body);
-        }
-        ExprKind::IfExp { test, body, orelse } => {
-            visitor.visit_expr(test);
-            visitor.visit_expr(body);
-            visitor.visit_expr(orelse);
-        }
-        ExprKind::Dict { keys, values } => {
-            for expr in keys.iter_mut().flatten() {
-                visitor.visit_expr(expr);
-            }
-            for expr in values {
-                visitor.visit_expr(expr);
-            }
-        }
-        ExprKind::Set { elts } => {
-            for expr in elts {
-                visitor.visit_expr(expr);
-            }
-        }
-        ExprKind::ListComp { elt, generators } => {
-            for comprehension in generators {
-                visitor.visit_comprehension(comprehension);
-            }
-            visitor.visit_expr(elt);
-        }
-        ExprKind::SetComp { elt, generators } => {
-            for comprehension in generators {
-                visitor.visit_comprehension(comprehension);
-            }
-            visitor.visit_expr(elt);
-        }
-        ExprKind::DictComp {
-            key,
-            value,
-            generators,
-        } => {
-            for comprehension in generators {
-                visitor.visit_comprehension(comprehension);
-            }
-            visitor.visit_expr(key);
-            visitor.visit_expr(value);
-        }
-        ExprKind::GeneratorExp { elt, generators } => {
-            for comprehension in generators {
-                visitor.visit_comprehension(comprehension);
-            }
-            visitor.visit_expr(elt);
-        }
-        ExprKind::Await { value } => visitor.visit_expr(value),
-        ExprKind::Yield { value } => {
-            if let Some(expr) = value {
-                visitor.visit_expr(expr);
-            }
-        }
-        ExprKind::YieldFrom { value } => visitor.visit_expr(value),
-        ExprKind::Compare {
-            left,
-            ops,
-            comparators,
-        } => {
-            visitor.visit_expr(left);
-            for cmpop in ops {
-                visitor.visit_cmp_op(cmpop);
-            }
-            for expr in comparators {
-                visitor.visit_expr(expr);
-            }
-        }
-        ExprKind::Call {
-            func,
-            args,
-            keywords,
-        } => {
-            visitor.visit_expr(func);
-            for expr in args {
-                visitor.visit_expr(expr);
-            }
-            for keyword in keywords {
-                visitor.visit_keyword(keyword);
-            }
-        }
-        ExprKind::FormattedValue {
-            value, format_spec, ..
-        } => {
-            visitor.visit_expr(value);
-            if let Some(expr) = format_spec {
-                visitor.visit_format_spec(expr);
-            }
-        }
-        ExprKind::JoinedStr { values } => {
-            for expr in values {
-                visitor.visit_expr(expr);
-            }
-        }
-        ExprKind::Constant { value, .. } => visitor.visit_constant(value),
-        ExprKind::Attribute { value, ctx, .. } => {
-            visitor.visit_expr(value);
-            visitor.visit_expr_context(ctx);
-        }
-        ExprKind::Subscript { value, slice, ctx } => {
-            visitor.visit_expr(value);
-            visitor.visit_expr(slice);
-            visitor.visit_expr_context(ctx);
-        }
-        ExprKind::Starred { value, ctx } => {
-            visitor.visit_expr(value);
-            visitor.visit_expr_context(ctx);
-        }
-        ExprKind::Name { ctx, .. } => {
-            visitor.visit_expr_context(ctx);
-        }
-        ExprKind::List { elts, ctx } => {
-            for expr in elts {
-                visitor.visit_expr(expr);
-            }
-            visitor.visit_expr_context(ctx);
-        }
-        ExprKind::Tuple { elts, ctx } => {
-            for expr in elts {
-                visitor.visit_expr(expr);
-            }
-            visitor.visit_expr_context(ctx);
-        }
-        ExprKind::Slice { lower, upper, step } => {
-            visitor.visit_slice_index(lower);
-            visitor.visit_slice_index(upper);
-            if let Some(expr) = step {
-                visitor.visit_slice_index(expr);
-            }
-        }
-    }
-}
-
-pub fn walk_constant<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, constant: &'a mut Constant) {
-    if let Constant::Tuple(constants) = constant {
-        for constant in constants {
-            visitor.visit_constant(constant);
-        }
-    }
-}
-
-pub fn walk_comprehension<'a, V: Visitor<'a> + ?Sized>(
-    visitor: &mut V,
-    comprehension: &'a mut Comprehension,
-) {
-    visitor.visit_expr(&mut comprehension.iter);
-    visitor.visit_expr(&mut comprehension.target);
-    for expr in &mut comprehension.ifs {
-        visitor.visit_expr(expr);
-    }
-}
-
-pub fn walk_excepthandler<'a, V: Visitor<'a> + ?Sized>(
-    visitor: &mut V,
-    excepthandler: &'a mut Excepthandler,
-) {
-    match &mut excepthandler.node {
-        ExcepthandlerKind::ExceptHandler { type_, body, .. } => {
-            if let Some(expr) = type_ {
-                visitor.visit_expr(expr);
-            }
-            visitor.visit_body(body);
-        }
-    }
-}
-
-pub fn walk_slice_index<'a, V: Visitor<'a> + ?Sized>(
-    visitor: &mut V,
-    slice_index: &'a mut SliceIndex,
-) {
-    match &mut slice_index.node {
-        SliceIndexKind::Empty => {}
-        SliceIndexKind::Index { value } => {
-            visitor.visit_expr(value);
-        }
-    }
-}
-
-pub fn walk_arguments<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, arguments: &'a mut Arguments) {
-    for arg in &mut arguments.posonlyargs {
-        visitor.visit_arg(arg);
-    }
-    for arg in &mut arguments.args {
-        visitor.visit_arg(arg);
-    }
-    if let Some(arg) = &mut arguments.vararg {
-        visitor.visit_arg(arg);
-    }
-    for arg in &mut arguments.kwonlyargs {
-        visitor.visit_arg(arg);
-    }
-    for expr in &mut arguments.kw_defaults {
-        visitor.visit_expr(expr);
-    }
-    if let Some(arg) = &mut arguments.kwarg {
-        visitor.visit_arg(arg);
-    }
-    for expr in &mut arguments.defaults {
-        visitor.visit_expr(expr);
-    }
-}
-
-pub fn walk_arg<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, arg: &'a mut Arg) {
-    if let Some(expr) = &mut arg.node.annotation {
-        visitor.visit_annotation(expr);
-    }
-}
-
-pub fn walk_keyword<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, keyword: &'a mut Keyword) {
-    visitor.visit_expr(&mut keyword.node.value);
-}
-
-pub fn walk_withitem<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, withitem: &'a mut Withitem) {
-    visitor.visit_expr(&mut withitem.context_expr);
-    if let Some(expr) = &mut withitem.optional_vars {
-        visitor.visit_expr(expr);
-    }
-}
-
-pub fn walk_match_case<'a, V: Visitor<'a> + ?Sized>(
-    visitor: &mut V,
-    match_case: &'a mut MatchCase,
-) {
-    visitor.visit_pattern(&mut match_case.pattern);
-    if let Some(expr) = &mut match_case.guard {
-        visitor.visit_expr(expr);
-    }
-    visitor.visit_body(&mut match_case.body);
-}
-
-pub fn walk_pattern<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, pattern: &'a mut Pattern) {
-    match &mut pattern.node {
-        PatternKind::MatchValue { value } => visitor.visit_expr(value),
-        PatternKind::MatchSingleton { value } => visitor.visit_constant(value),
-        PatternKind::MatchSequence { patterns } => {
-            for pattern in patterns {
-                visitor.visit_pattern(pattern);
-            }
-        }
-        PatternKind::MatchMapping { keys, patterns, .. } => {
-            for expr in keys {
-                visitor.visit_expr(expr);
-            }
-            for pattern in patterns {
-                visitor.visit_pattern(pattern);
-            }
-        }
-        PatternKind::MatchClass {
-            cls,
-            patterns,
-            kwd_patterns,
-            ..
-        } => {
-            visitor.visit_expr(cls);
-            for pattern in patterns {
-                visitor.visit_pattern(pattern);
-            }
-
-            for pattern in kwd_patterns {
-                visitor.visit_pattern(pattern);
-            }
-        }
-        PatternKind::MatchStar { .. } => {}
-        PatternKind::MatchAs { pattern, .. } => {
-            if let Some(pattern) = pattern {
-                visitor.visit_pattern(pattern);
-            }
-        }
-        PatternKind::MatchOr { patterns } => {
-            for pattern in patterns {
-                visitor.visit_pattern(pattern);
-            }
-        }
-    }
-}
-
-#[allow(unused_variables)]
-pub fn walk_expr_context<'a, V: Visitor<'a> + ?Sized>(
-    visitor: &mut V,
-    expr_context: &'a mut ExprContext,
-) {
-}
-
-#[allow(unused_variables)]
-pub fn walk_bool_op<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, bool_op: &'a mut BoolOp) {}
-
-#[allow(unused_variables)]
-pub fn walk_operator<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, operator: &'a mut Operator) {}
-
-#[allow(unused_variables)]
-pub fn walk_unary_op<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, unary_op: &'a mut UnaryOp) {}
-
-#[allow(unused_variables)]
-pub fn walk_cmp_op<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, cmp_op: &'a mut CmpOp) {}
-
-#[allow(unused_variables)]
-pub fn walk_alias<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, alias: &'a mut Alias) {}
diff --git a/crates/ruff_python_formatter/src/expression/expr_attribute.rs b/crates/ruff_python_formatter/src/expression/expr_attribute.rs
new file mode 100644
index 0000000000000..6c8e8962b21bb
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_attribute.rs
@@ -0,0 +1,21 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprAttribute;
+
+#[derive(Default)]
+pub struct FormatExprAttribute;
+
+impl FormatNodeRule<ExprAttribute> for FormatExprAttribute {
+    fn fmt_fields(&self, item: &ExprAttribute, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprAttribute {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        default_expression_needs_parentheses(self.into(), parenthesize, source)
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_await.rs b/crates/ruff_python_formatter/src/expression/expr_await.rs
new file mode 100644
index 0000000000000..82c8e307e1e50
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_await.rs
@@ -0,0 +1,21 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprAwait;
+
+#[derive(Default)]
+pub struct FormatExprAwait;
+
+impl FormatNodeRule<ExprAwait> for FormatExprAwait {
+    fn fmt_fields(&self, item: &ExprAwait, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprAwait {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        default_expression_needs_parentheses(self.into(), parenthesize, source)
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_bin_op.rs b/crates/ruff_python_formatter/src/expression/expr_bin_op.rs
new file mode 100644
index 0000000000000..76cf01ad4b257
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_bin_op.rs
@@ -0,0 +1,215 @@
+use crate::comments::trailing_comments;
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parenthesize,
+};
+use crate::expression::Parentheses;
+use crate::prelude::*;
+use crate::FormatNodeRule;
+use ruff_formatter::{
+    format_args, write, FormatOwnedWithRule, FormatRefWithRule, FormatRuleWithOptions,
+};
+use ruff_python_ast::node::AstNode;
+use rustpython_parser::ast::{
+    Constant, Expr, ExprAttribute, ExprBinOp, ExprConstant, ExprUnaryOp, Operator, Unaryop,
+};
+
+#[derive(Default)]
+pub struct FormatExprBinOp {
+    parentheses: Option<Parentheses>,
+}
+
+impl FormatRuleWithOptions<ExprBinOp, PyFormatContext<'_>> for FormatExprBinOp {
+    type Options = Option<Parentheses>;
+
+    fn with_options(mut self, options: Self::Options) -> Self {
+        self.parentheses = options;
+        self
+    }
+}
+
+impl FormatNodeRule<ExprBinOp> for FormatExprBinOp {
+    fn fmt_fields(&self, item: &ExprBinOp, f: &mut PyFormatter) -> FormatResult<()> {
+        let ExprBinOp {
+            left,
+            right,
+            op,
+            range: _,
+        } = item;
+
+        let should_break_right = self.parentheses == Some(Parentheses::Custom);
+
+        if should_break_right {
+            let left = left.format().memoized();
+            let right = right.format().memoized();
+
+            write!(
+                f,
+                [best_fitting![
+                    // The whole expression on a single line
+                    format_args![left, space(), op.format(), space(), right],
+                    // Break the right, but keep the left flat
+                    format_args![
+                        left,
+                        space(),
+                        op.format(),
+                        space(),
+                        group(&right).should_expand(true),
+                    ],
+                    // Break after the operator, try to keep the right flat, otherwise expand it
+                    format_args![
+                        text("("),
+                        block_indent(&format_args![
+                            left,
+                            hard_line_break(),
+                            op.format(),
+                            space(),
+                            group(&right),
+                        ]),
+                        text(")")
+                    ],
+                ]]
+            )
+        } else {
+            let comments = f.context().comments().clone();
+            let operator_comments = comments.dangling_comments(item.as_any_node_ref());
+            let needs_space = !is_simple_power_expression(item);
+
+            let before_operator_space = if needs_space {
+                soft_line_break_or_space()
+            } else {
+                soft_line_break()
+            };
+
+            write!(
+                f,
+                [
+                    left.format(),
+                    before_operator_space,
+                    op.format(),
+                    trailing_comments(operator_comments),
+                ]
+            )?;
+
+            // Format the operator on its own line if the operator has trailing comments and the right side has leading comments.
+            if !operator_comments.is_empty() && comments.has_leading_comments(right.as_ref().into())
+            {
+                write!(f, [hard_line_break()])?;
+            } else if needs_space {
+                write!(f, [space()])?;
+            }
+
+            write!(f, [group(&right.format())])
+        }
+    }
+
+    fn fmt_dangling_comments(&self, _node: &ExprBinOp, _f: &mut PyFormatter) -> FormatResult<()> {
+        // Handled inside of `fmt_fields`
+        Ok(())
+    }
+}
+
+const fn is_simple_power_expression(expr: &ExprBinOp) -> bool {
+    expr.op.is_pow() && is_simple_power_operand(&expr.left) && is_simple_power_operand(&expr.right)
+}
+
+/// Return `true` if an [`Expr`] adheres to [Black's definition](https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#line-breaks-binary-operators)
+/// of a non-complex expression, in the context of a power operation.
+const fn is_simple_power_operand(expr: &Expr) -> bool {
+    match expr {
+        Expr::UnaryOp(ExprUnaryOp {
+            op: Unaryop::Not, ..
+        }) => false,
+        Expr::Constant(ExprConstant {
+            value: Constant::Complex { .. } | Constant::Float(_) | Constant::Int(_),
+            ..
+        }) => true,
+        Expr::Name(_) => true,
+        Expr::UnaryOp(ExprUnaryOp { operand, .. }) => is_simple_power_operand(operand),
+        Expr::Attribute(ExprAttribute { value, .. }) => is_simple_power_operand(value),
+        _ => false,
+    }
+}
+
+#[derive(Copy, Clone)]
+pub struct FormatOperator;
+
+impl<'ast> AsFormat<PyFormatContext<'ast>> for Operator {
+    type Format<'a> = FormatRefWithRule<'a, Operator, FormatOperator, PyFormatContext<'ast>>;
+
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(self, FormatOperator)
+    }
+}
+
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for Operator {
+    type Format = FormatOwnedWithRule<Operator, FormatOperator, PyFormatContext<'ast>>;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(self, FormatOperator)
+    }
+}
+
+impl FormatRule<Operator, PyFormatContext<'_>> for FormatOperator {
+    fn fmt(&self, item: &Operator, f: &mut Formatter<PyFormatContext<'_>>) -> FormatResult<()> {
+        let operator = match item {
+            Operator::Add => "+",
+            Operator::Sub => "-",
+            Operator::Mult => "*",
+            Operator::MatMult => "@",
+            Operator::Div => "/",
+            Operator::Mod => "%",
+            Operator::Pow => "**",
+            Operator::LShift => "<<",
+            Operator::RShift => ">>",
+            Operator::BitOr => "|",
+            Operator::BitXor => "^",
+            Operator::BitAnd => "&",
+            Operator::FloorDiv => "//",
+        };
+
+        text(operator).fmt(f)
+    }
+}
+
+impl NeedsParentheses for ExprBinOp {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        match default_expression_needs_parentheses(self.into(), parenthesize, source) {
+            Parentheses::Optional => {
+                if should_binary_break_right_side_first(self) {
+                    Parentheses::Custom
+                } else {
+                    Parentheses::Optional
+                }
+            }
+            parentheses => parentheses,
+        }
+    }
+}
+
+pub(super) fn should_binary_break_right_side_first(expr: &ExprBinOp) -> bool {
+    use ruff_python_ast::prelude::*;
+
+    if expr.left.is_bin_op_expr() {
+        false
+    } else {
+        match expr.right.as_ref() {
+            Expr::Tuple(ExprTuple {
+                elts: expressions, ..
+            })
+            | Expr::List(ExprList {
+                elts: expressions, ..
+            })
+            | Expr::Set(ExprSet {
+                elts: expressions, ..
+            })
+            | Expr::Dict(ExprDict {
+                values: expressions,
+                ..
+            }) => !expressions.is_empty(),
+            Expr::Call(ExprCall { args, keywords, .. }) => !args.is_empty() && !keywords.is_empty(),
+            Expr::ListComp(_) | Expr::SetComp(_) | Expr::DictComp(_) | Expr::GeneratorExp(_) => {
+                true
+            }
+            _ => false,
+        }
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_bool_op.rs b/crates/ruff_python_formatter/src/expression/expr_bool_op.rs
new file mode 100644
index 0000000000000..9ec98d7722bd8
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_bool_op.rs
@@ -0,0 +1,21 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprBoolOp;
+
+#[derive(Default)]
+pub struct FormatExprBoolOp;
+
+impl FormatNodeRule<ExprBoolOp> for FormatExprBoolOp {
+    fn fmt_fields(&self, item: &ExprBoolOp, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprBoolOp {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        default_expression_needs_parentheses(self.into(), parenthesize, source)
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_call.rs b/crates/ruff_python_formatter/src/expression/expr_call.rs
new file mode 100644
index 0000000000000..ae3513e50f6c3
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_call.rs
@@ -0,0 +1,24 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprCall;
+
+#[derive(Default)]
+pub struct FormatExprCall;
+
+impl FormatNodeRule<ExprCall> for FormatExprCall {
+    fn fmt_fields(&self, item: &ExprCall, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprCall {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        match default_expression_needs_parentheses(self.into(), parenthesize, source) {
+            Parentheses::Optional => Parentheses::Never,
+            parentheses => parentheses,
+        }
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_compare.rs b/crates/ruff_python_formatter/src/expression/expr_compare.rs
new file mode 100644
index 0000000000000..14333cfd5187c
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_compare.rs
@@ -0,0 +1,21 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprCompare;
+
+#[derive(Default)]
+pub struct FormatExprCompare;
+
+impl FormatNodeRule<ExprCompare> for FormatExprCompare {
+    fn fmt_fields(&self, item: &ExprCompare, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprCompare {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        default_expression_needs_parentheses(self.into(), parenthesize, source)
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_constant.rs b/crates/ruff_python_formatter/src/expression/expr_constant.rs
new file mode 100644
index 0000000000000..0b4d3d96afdae
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_constant.rs
@@ -0,0 +1,21 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprConstant;
+
+#[derive(Default)]
+pub struct FormatExprConstant;
+
+impl FormatNodeRule<ExprConstant> for FormatExprConstant {
+    fn fmt_fields(&self, item: &ExprConstant, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprConstant {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        default_expression_needs_parentheses(self.into(), parenthesize, source)
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_dict.rs b/crates/ruff_python_formatter/src/expression/expr_dict.rs
new file mode 100644
index 0000000000000..c44db9b39c6e9
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_dict.rs
@@ -0,0 +1,24 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprDict;
+
+#[derive(Default)]
+pub struct FormatExprDict;
+
+impl FormatNodeRule<ExprDict> for FormatExprDict {
+    fn fmt_fields(&self, item: &ExprDict, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprDict {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        match default_expression_needs_parentheses(self.into(), parenthesize, source) {
+            Parentheses::Optional => Parentheses::Never,
+            parentheses => parentheses,
+        }
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_dict_comp.rs b/crates/ruff_python_formatter/src/expression/expr_dict_comp.rs
new file mode 100644
index 0000000000000..9d35e5ee1f77c
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_dict_comp.rs
@@ -0,0 +1,24 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprDictComp;
+
+#[derive(Default)]
+pub struct FormatExprDictComp;
+
+impl FormatNodeRule<ExprDictComp> for FormatExprDictComp {
+    fn fmt_fields(&self, item: &ExprDictComp, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprDictComp {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        match default_expression_needs_parentheses(self.into(), parenthesize, source) {
+            Parentheses::Optional => Parentheses::Never,
+            parentheses => parentheses,
+        }
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_formatted_value.rs b/crates/ruff_python_formatter/src/expression/expr_formatted_value.rs
new file mode 100644
index 0000000000000..9578106113eb0
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_formatted_value.rs
@@ -0,0 +1,21 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprFormattedValue;
+
+#[derive(Default)]
+pub struct FormatExprFormattedValue;
+
+impl FormatNodeRule<ExprFormattedValue> for FormatExprFormattedValue {
+    fn fmt_fields(&self, item: &ExprFormattedValue, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprFormattedValue {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        default_expression_needs_parentheses(self.into(), parenthesize, source)
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_generator_exp.rs b/crates/ruff_python_formatter/src/expression/expr_generator_exp.rs
new file mode 100644
index 0000000000000..c62fdfb0704f2
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_generator_exp.rs
@@ -0,0 +1,24 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprGeneratorExp;
+
+#[derive(Default)]
+pub struct FormatExprGeneratorExp;
+
+impl FormatNodeRule<ExprGeneratorExp> for FormatExprGeneratorExp {
+    fn fmt_fields(&self, item: &ExprGeneratorExp, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprGeneratorExp {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        match default_expression_needs_parentheses(self.into(), parenthesize, source) {
+            Parentheses::Optional => Parentheses::Never,
+            parentheses => parentheses,
+        }
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_if_exp.rs b/crates/ruff_python_formatter/src/expression/expr_if_exp.rs
new file mode 100644
index 0000000000000..7357abd3a9f00
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_if_exp.rs
@@ -0,0 +1,21 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprIfExp;
+
+#[derive(Default)]
+pub struct FormatExprIfExp;
+
+impl FormatNodeRule<ExprIfExp> for FormatExprIfExp {
+    fn fmt_fields(&self, item: &ExprIfExp, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprIfExp {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        default_expression_needs_parentheses(self.into(), parenthesize, source)
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_joined_str.rs b/crates/ruff_python_formatter/src/expression/expr_joined_str.rs
new file mode 100644
index 0000000000000..86194c9b2b308
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_joined_str.rs
@@ -0,0 +1,21 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprJoinedStr;
+
+#[derive(Default)]
+pub struct FormatExprJoinedStr;
+
+impl FormatNodeRule<ExprJoinedStr> for FormatExprJoinedStr {
+    fn fmt_fields(&self, item: &ExprJoinedStr, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprJoinedStr {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        default_expression_needs_parentheses(self.into(), parenthesize, source)
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_lambda.rs b/crates/ruff_python_formatter/src/expression/expr_lambda.rs
new file mode 100644
index 0000000000000..7106feefc6889
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_lambda.rs
@@ -0,0 +1,21 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprLambda;
+
+#[derive(Default)]
+pub struct FormatExprLambda;
+
+impl FormatNodeRule<ExprLambda> for FormatExprLambda {
+    fn fmt_fields(&self, item: &ExprLambda, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprLambda {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        default_expression_needs_parentheses(self.into(), parenthesize, source)
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_list.rs b/crates/ruff_python_formatter/src/expression/expr_list.rs
new file mode 100644
index 0000000000000..869542621e7cf
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_list.rs
@@ -0,0 +1,66 @@
+use crate::comments::dangling_comments;
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::prelude::*;
+use crate::FormatNodeRule;
+use ruff_formatter::{format_args, write};
+use rustpython_parser::ast::ExprList;
+
+#[derive(Default)]
+pub struct FormatExprList;
+
+impl FormatNodeRule<ExprList> for FormatExprList {
+    fn fmt_fields(&self, item: &ExprList, f: &mut PyFormatter) -> FormatResult<()> {
+        let ExprList {
+            range: _,
+            elts,
+            ctx: _,
+        } = item;
+
+        let items = format_with(|f| {
+            let mut iter = elts.iter();
+
+            if let Some(first) = iter.next() {
+                write!(f, [first.format()])?;
+            }
+
+            for item in iter {
+                write!(f, [text(","), soft_line_break_or_space(), item.format()])?;
+            }
+
+            if !elts.is_empty() {
+                write!(f, [if_group_breaks(&text(","))])?;
+            }
+
+            Ok(())
+        });
+
+        let comments = f.context().comments().clone();
+        let dangling = comments.dangling_comments(item.into());
+
+        write!(
+            f,
+            [group(&format_args![
+                text("["),
+                dangling_comments(dangling),
+                soft_block_indent(&items),
+                text("]")
+            ])]
+        )
+    }
+
+    fn fmt_dangling_comments(&self, _node: &ExprList, _f: &mut PyFormatter) -> FormatResult<()> {
+        // Handled as part of `fmt_fields`
+        Ok(())
+    }
+}
+
+impl NeedsParentheses for ExprList {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        match default_expression_needs_parentheses(self.into(), parenthesize, source) {
+            Parentheses::Optional => Parentheses::Never,
+            parentheses => parentheses,
+        }
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_list_comp.rs b/crates/ruff_python_formatter/src/expression/expr_list_comp.rs
new file mode 100644
index 0000000000000..e91c16f532db1
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_list_comp.rs
@@ -0,0 +1,24 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprListComp;
+
+#[derive(Default)]
+pub struct FormatExprListComp;
+
+impl FormatNodeRule<ExprListComp> for FormatExprListComp {
+    fn fmt_fields(&self, item: &ExprListComp, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprListComp {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        match default_expression_needs_parentheses(self.into(), parenthesize, source) {
+            Parentheses::Optional => Parentheses::Never,
+            parentheses => parentheses,
+        }
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_name.rs b/crates/ruff_python_formatter/src/expression/expr_name.rs
new file mode 100644
index 0000000000000..57ad099c38c78
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_name.rs
@@ -0,0 +1,60 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::prelude::*;
+use crate::FormatNodeRule;
+use ruff_formatter::{write, FormatContext};
+use rustpython_parser::ast::ExprName;
+
+#[derive(Default)]
+pub struct FormatExprName;
+
+impl FormatNodeRule<ExprName> for FormatExprName {
+    fn fmt_fields(&self, item: &ExprName, f: &mut PyFormatter) -> FormatResult<()> {
+        let ExprName { id, range, ctx: _ } = item;
+
+        debug_assert_eq!(
+            id.as_str(),
+            f.context()
+                .source_code()
+                .slice(*range)
+                .text(f.context().source_code())
+        );
+
+        write!(f, [source_text_slice(*range, ContainsNewlines::No)])
+    }
+}
+
+impl NeedsParentheses for ExprName {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        default_expression_needs_parentheses(self.into(), parenthesize, source)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use ruff_text_size::{TextRange, TextSize};
+    use rustpython_parser::ast::{ModModule, Ranged};
+    use rustpython_parser::Parse;
+
+    #[test]
+    fn name_range_with_comments() {
+        let source = ModModule::parse("a # comment", "file.py").unwrap();
+
+        let expression_statement = source
+            .body
+            .first()
+            .expect("Expected non-empty body")
+            .as_expr_stmt()
+            .unwrap();
+        let name = expression_statement
+            .value
+            .as_name_expr()
+            .expect("Expected name expression");
+
+        assert_eq!(
+            name.range(),
+            TextRange::at(TextSize::new(0), TextSize::new(1))
+        );
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_named_expr.rs b/crates/ruff_python_formatter/src/expression/expr_named_expr.rs
new file mode 100644
index 0000000000000..4cf013217d0cc
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_named_expr.rs
@@ -0,0 +1,21 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprNamedExpr;
+
+#[derive(Default)]
+pub struct FormatExprNamedExpr;
+
+impl FormatNodeRule<ExprNamedExpr> for FormatExprNamedExpr {
+    fn fmt_fields(&self, item: &ExprNamedExpr, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprNamedExpr {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        default_expression_needs_parentheses(self.into(), parenthesize, source)
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_set.rs b/crates/ruff_python_formatter/src/expression/expr_set.rs
new file mode 100644
index 0000000000000..4184c85472855
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_set.rs
@@ -0,0 +1,24 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprSet;
+
+#[derive(Default)]
+pub struct FormatExprSet;
+
+impl FormatNodeRule<ExprSet> for FormatExprSet {
+    fn fmt_fields(&self, item: &ExprSet, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprSet {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        match default_expression_needs_parentheses(self.into(), parenthesize, source) {
+            Parentheses::Optional => Parentheses::Never,
+            parentheses => parentheses,
+        }
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_set_comp.rs b/crates/ruff_python_formatter/src/expression/expr_set_comp.rs
new file mode 100644
index 0000000000000..df3405a2c9d1e
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_set_comp.rs
@@ -0,0 +1,24 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprSetComp;
+
+#[derive(Default)]
+pub struct FormatExprSetComp;
+
+impl FormatNodeRule<ExprSetComp> for FormatExprSetComp {
+    fn fmt_fields(&self, item: &ExprSetComp, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprSetComp {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        match default_expression_needs_parentheses(self.into(), parenthesize, source) {
+            Parentheses::Optional => Parentheses::Never,
+            parentheses => parentheses,
+        }
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_slice.rs b/crates/ruff_python_formatter/src/expression/expr_slice.rs
new file mode 100644
index 0000000000000..5c08f110d4144
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_slice.rs
@@ -0,0 +1,21 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprSlice;
+
+#[derive(Default)]
+pub struct FormatExprSlice;
+
+impl FormatNodeRule<ExprSlice> for FormatExprSlice {
+    fn fmt_fields(&self, item: &ExprSlice, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprSlice {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        default_expression_needs_parentheses(self.into(), parenthesize, source)
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_starred.rs b/crates/ruff_python_formatter/src/expression/expr_starred.rs
new file mode 100644
index 0000000000000..c06a64aaa3f49
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_starred.rs
@@ -0,0 +1,21 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprStarred;
+
+#[derive(Default)]
+pub struct FormatExprStarred;
+
+impl FormatNodeRule<ExprStarred> for FormatExprStarred {
+    fn fmt_fields(&self, item: &ExprStarred, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprStarred {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        default_expression_needs_parentheses(self.into(), parenthesize, source)
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_subscript.rs b/crates/ruff_python_formatter/src/expression/expr_subscript.rs
new file mode 100644
index 0000000000000..dc02ae90b77ca
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_subscript.rs
@@ -0,0 +1,21 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprSubscript;
+
+#[derive(Default)]
+pub struct FormatExprSubscript;
+
+impl FormatNodeRule<ExprSubscript> for FormatExprSubscript {
+    fn fmt_fields(&self, item: &ExprSubscript, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprSubscript {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        default_expression_needs_parentheses(self.into(), parenthesize, source)
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_tuple.rs b/crates/ruff_python_formatter/src/expression/expr_tuple.rs
new file mode 100644
index 0000000000000..c0880077194b4
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_tuple.rs
@@ -0,0 +1,24 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprTuple;
+
+#[derive(Default)]
+pub struct FormatExprTuple;
+
+impl FormatNodeRule<ExprTuple> for FormatExprTuple {
+    fn fmt_fields(&self, item: &ExprTuple, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprTuple {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        match default_expression_needs_parentheses(self.into(), parenthesize, source) {
+            Parentheses::Optional => Parentheses::Never,
+            parentheses => parentheses,
+        }
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_unary_op.rs b/crates/ruff_python_formatter/src/expression/expr_unary_op.rs
new file mode 100644
index 0000000000000..8df9831255e35
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_unary_op.rs
@@ -0,0 +1,21 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprUnaryOp;
+
+#[derive(Default)]
+pub struct FormatExprUnaryOp;
+
+impl FormatNodeRule<ExprUnaryOp> for FormatExprUnaryOp {
+    fn fmt_fields(&self, item: &ExprUnaryOp, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprUnaryOp {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        default_expression_needs_parentheses(self.into(), parenthesize, source)
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_yield.rs b/crates/ruff_python_formatter/src/expression/expr_yield.rs
new file mode 100644
index 0000000000000..7e9f27f5da42d
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_yield.rs
@@ -0,0 +1,21 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprYield;
+
+#[derive(Default)]
+pub struct FormatExprYield;
+
+impl FormatNodeRule<ExprYield> for FormatExprYield {
+    fn fmt_fields(&self, item: &ExprYield, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprYield {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        default_expression_needs_parentheses(self.into(), parenthesize, source)
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_yield_from.rs b/crates/ruff_python_formatter/src/expression/expr_yield_from.rs
new file mode 100644
index 0000000000000..5ed9bd6354667
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/expr_yield_from.rs
@@ -0,0 +1,21 @@
+use crate::expression::parentheses::{
+    default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
+};
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExprYieldFrom;
+
+#[derive(Default)]
+pub struct FormatExprYieldFrom;
+
+impl FormatNodeRule<ExprYieldFrom> for FormatExprYieldFrom {
+    fn fmt_fields(&self, item: &ExprYieldFrom, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
+
+impl NeedsParentheses for ExprYieldFrom {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        default_expression_needs_parentheses(self.into(), parenthesize, source)
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/mod.rs b/crates/ruff_python_formatter/src/expression/mod.rs
new file mode 100644
index 0000000000000..a8059c8b7489e
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/mod.rs
@@ -0,0 +1,166 @@
+use crate::context::NodeLevel;
+use crate::expression::parentheses::{NeedsParentheses, Parentheses, Parenthesize};
+use crate::prelude::*;
+use ruff_formatter::{
+    format_args, write, FormatOwnedWithRule, FormatRefWithRule, FormatRule, FormatRuleWithOptions,
+};
+use rustpython_parser::ast::Expr;
+
+pub(crate) mod expr_attribute;
+pub(crate) mod expr_await;
+pub(crate) mod expr_bin_op;
+pub(crate) mod expr_bool_op;
+pub(crate) mod expr_call;
+pub(crate) mod expr_compare;
+pub(crate) mod expr_constant;
+pub(crate) mod expr_dict;
+pub(crate) mod expr_dict_comp;
+pub(crate) mod expr_formatted_value;
+pub(crate) mod expr_generator_exp;
+pub(crate) mod expr_if_exp;
+pub(crate) mod expr_joined_str;
+pub(crate) mod expr_lambda;
+pub(crate) mod expr_list;
+pub(crate) mod expr_list_comp;
+pub(crate) mod expr_name;
+pub(crate) mod expr_named_expr;
+pub(crate) mod expr_set;
+pub(crate) mod expr_set_comp;
+pub(crate) mod expr_slice;
+pub(crate) mod expr_starred;
+pub(crate) mod expr_subscript;
+pub(crate) mod expr_tuple;
+pub(crate) mod expr_unary_op;
+pub(crate) mod expr_yield;
+pub(crate) mod expr_yield_from;
+pub(crate) mod parentheses;
+
+#[derive(Default)]
+pub struct FormatExpr {
+    parenthesize: Parenthesize,
+}
+
+impl FormatRuleWithOptions<Expr, PyFormatContext<'_>> for FormatExpr {
+    type Options = Parenthesize;
+
+    fn with_options(mut self, options: Self::Options) -> Self {
+        self.parenthesize = options;
+        self
+    }
+}
+
+impl FormatRule<Expr, PyFormatContext<'_>> for FormatExpr {
+    fn fmt(&self, item: &Expr, f: &mut PyFormatter) -> FormatResult<()> {
+        let parentheses = item.needs_parentheses(self.parenthesize, f.context().contents());
+
+        let format_expr = format_with(|f| match item {
+            Expr::BoolOp(expr) => expr.format().fmt(f),
+            Expr::NamedExpr(expr) => expr.format().fmt(f),
+            Expr::BinOp(expr) => expr.format().with_options(Some(parentheses)).fmt(f),
+            Expr::UnaryOp(expr) => expr.format().fmt(f),
+            Expr::Lambda(expr) => expr.format().fmt(f),
+            Expr::IfExp(expr) => expr.format().fmt(f),
+            Expr::Dict(expr) => expr.format().fmt(f),
+            Expr::Set(expr) => expr.format().fmt(f),
+            Expr::ListComp(expr) => expr.format().fmt(f),
+            Expr::SetComp(expr) => expr.format().fmt(f),
+            Expr::DictComp(expr) => expr.format().fmt(f),
+            Expr::GeneratorExp(expr) => expr.format().fmt(f),
+            Expr::Await(expr) => expr.format().fmt(f),
+            Expr::Yield(expr) => expr.format().fmt(f),
+            Expr::YieldFrom(expr) => expr.format().fmt(f),
+            Expr::Compare(expr) => expr.format().fmt(f),
+            Expr::Call(expr) => expr.format().fmt(f),
+            Expr::FormattedValue(expr) => expr.format().fmt(f),
+            Expr::JoinedStr(expr) => expr.format().fmt(f),
+            Expr::Constant(expr) => expr.format().fmt(f),
+            Expr::Attribute(expr) => expr.format().fmt(f),
+            Expr::Subscript(expr) => expr.format().fmt(f),
+            Expr::Starred(expr) => expr.format().fmt(f),
+            Expr::Name(expr) => expr.format().fmt(f),
+            Expr::List(expr) => expr.format().fmt(f),
+            Expr::Tuple(expr) => expr.format().fmt(f),
+            Expr::Slice(expr) => expr.format().fmt(f),
+        });
+
+        let saved_level = f.context().node_level();
+        f.context_mut().set_node_level(NodeLevel::Expression);
+
+        let result = match parentheses {
+            Parentheses::Always => {
+                write!(
+                    f,
+                    [group(&format_args![
+                        text("("),
+                        soft_block_indent(&format_expr),
+                        text(")")
+                    ])]
+                )
+            }
+            // Add optional parentheses. Ignore if the item renders parentheses itself.
+            Parentheses::Optional => {
+                write!(
+                    f,
+                    [group(&format_args![
+                        if_group_breaks(&text("(")),
+                        soft_block_indent(&format_expr),
+                        if_group_breaks(&text(")"))
+                    ])]
+                )
+            }
+            Parentheses::Custom | Parentheses::Never => Format::fmt(&format_expr, f),
+        };
+
+        f.context_mut().set_node_level(saved_level);
+
+        result
+    }
+}
+
+impl NeedsParentheses for Expr {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses {
+        match self {
+            Expr::BoolOp(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::NamedExpr(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::BinOp(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::UnaryOp(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::Lambda(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::IfExp(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::Dict(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::Set(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::ListComp(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::SetComp(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::DictComp(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::GeneratorExp(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::Await(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::Yield(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::YieldFrom(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::Compare(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::Call(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::FormattedValue(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::JoinedStr(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::Constant(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::Attribute(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::Subscript(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::Starred(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::Name(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::List(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::Tuple(expr) => expr.needs_parentheses(parenthesize, source),
+            Expr::Slice(expr) => expr.needs_parentheses(parenthesize, source),
+        }
+    }
+}
+
+impl<'ast> AsFormat<PyFormatContext<'ast>> for Expr {
+    type Format<'a> = FormatRefWithRule<'a, Expr, FormatExpr, PyFormatContext<'ast>>;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(self, FormatExpr::default())
+    }
+}
+
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for Expr {
+    type Format = FormatOwnedWithRule<Expr, FormatExpr, PyFormatContext<'ast>>;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(self, FormatExpr::default())
+    }
+}
diff --git a/crates/ruff_python_formatter/src/expression/parentheses.rs b/crates/ruff_python_formatter/src/expression/parentheses.rs
new file mode 100644
index 0000000000000..7cebc3ebbbb80
--- /dev/null
+++ b/crates/ruff_python_formatter/src/expression/parentheses.rs
@@ -0,0 +1,93 @@
+use crate::trivia::{
+    find_first_non_trivia_character_after, find_first_non_trivia_character_before,
+};
+use ruff_python_ast::node::AnyNodeRef;
+
+pub(crate) trait NeedsParentheses {
+    fn needs_parentheses(&self, parenthesize: Parenthesize, source: &str) -> Parentheses;
+}
+
+pub(super) fn default_expression_needs_parentheses(
+    node: AnyNodeRef,
+    parenthesize: Parenthesize,
+    source: &str,
+) -> Parentheses {
+    debug_assert!(
+        node.is_expression(),
+        "Should only be called for expressions"
+    );
+
+    // `Optional` or `Preserve` and expression has parentheses in source code.
+    if !parenthesize.is_if_breaks() && is_expression_parenthesized(node, source) {
+        Parentheses::Always
+    }
+    // `Optional` or `IfBreaks`: Add parentheses if the expression doesn't fit on a line
+    else if !parenthesize.is_preserve() {
+        Parentheses::Optional
+    } else {
+        //`Preserve` and expression has no parentheses in the source code
+        Parentheses::Never
+    }
+}
+
+/// Configures if the expression should be parenthesized.
+#[derive(Copy, Clone, Debug, Default)]
+pub enum Parenthesize {
+    /// Parenthesize the expression if it has parenthesis in the source.
+    #[default]
+    Preserve,
+
+    /// Parenthesizes the expression if it doesn't fit on a line OR if the expression is parenthesized in the source code.
+    Optional,
+
+    /// Parenthesizes the expression only if it doesn't fit on a line.
+    IfBreaks,
+}
+
+impl Parenthesize {
+    const fn is_if_breaks(self) -> bool {
+        matches!(self, Parenthesize::IfBreaks)
+    }
+
+    const fn is_preserve(self) -> bool {
+        matches!(self, Parenthesize::Preserve)
+    }
+}
+
+/// Whether it is necessary to add parentheses around an expression.
+/// This is different from [`Parenthesize`] in that it is the resolved representation: It takes into account
+/// whether there are parentheses in the source code or not.
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
+pub enum Parentheses {
+    /// Always create parentheses
+    Always,
+
+    /// Only add parentheses when necessary because the expression breaks over multiple lines.
+    Optional,
+
+    /// Custom handling by the node's formatter implementation
+    Custom,
+
+    /// Never add parentheses
+    Never,
+}
+
+fn is_expression_parenthesized(expr: AnyNodeRef, contents: &str) -> bool {
+    use rustpython_parser::ast::Ranged;
+
+    debug_assert!(
+        expr.is_expression(),
+        "Should only be called for expressions"
+    );
+
+    // Search backwards to avoid ambiguity with `(a, )` and because it's faster
+    matches!(
+        find_first_non_trivia_character_after(expr.end(), contents),
+        Some((_, ')'))
+    )
+        // Search forwards to confirm that this is not a nested expression `(5 + d * 3)`
+        && matches!(
+        find_first_non_trivia_character_before(expr.start(), contents),
+        Some((_, '('))
+    )
+}
diff --git a/crates/ruff_python_formatter/src/format/alias.rs b/crates/ruff_python_formatter/src/format/alias.rs
deleted file mode 100644
index 5a11247a555bd..0000000000000
--- a/crates/ruff_python_formatter/src/format/alias.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use ruff_formatter::prelude::*;
-use ruff_formatter::write;
-use ruff_text_size::TextSize;
-
-use crate::context::ASTFormatContext;
-use crate::cst::Alias;
-use crate::format::comments::end_of_line_comments;
-use crate::shared_traits::AsFormat;
-
-pub struct FormatAlias<'a> {
-    item: &'a Alias,
-}
-
-impl AsFormat<ASTFormatContext<'_>> for Alias {
-    type Format<'a> = FormatAlias<'a>;
-
-    fn format(&self) -> Self::Format<'_> {
-        FormatAlias { item: self }
-    }
-}
-
-impl Format<ASTFormatContext<'_>> for FormatAlias<'_> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext>) -> FormatResult<()> {
-        let alias = self.item;
-
-        write!(f, [dynamic_text(&alias.node.name, TextSize::default())])?;
-        if let Some(asname) = &alias.node.asname {
-            write!(f, [text(" as ")])?;
-            write!(f, [dynamic_text(asname, TextSize::default())])?;
-        }
-
-        write!(f, [end_of_line_comments(alias)])?;
-
-        Ok(())
-    }
-}
diff --git a/crates/ruff_python_formatter/src/format/arg.rs b/crates/ruff_python_formatter/src/format/arg.rs
deleted file mode 100644
index c4609901fe518..0000000000000
--- a/crates/ruff_python_formatter/src/format/arg.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-use ruff_formatter::prelude::*;
-use ruff_formatter::write;
-use ruff_text_size::TextSize;
-
-use crate::context::ASTFormatContext;
-use crate::cst::Arg;
-use crate::format::comments::end_of_line_comments;
-use crate::shared_traits::AsFormat;
-
-pub struct FormatArg<'a> {
-    item: &'a Arg,
-}
-
-impl AsFormat<ASTFormatContext<'_>> for Arg {
-    type Format<'a> = FormatArg<'a>;
-
-    fn format(&self) -> Self::Format<'_> {
-        FormatArg { item: self }
-    }
-}
-
-impl Format<ASTFormatContext<'_>> for FormatArg<'_> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext>) -> FormatResult<()> {
-        let arg = self.item;
-
-        write!(f, [dynamic_text(&arg.node.arg, TextSize::default())])?;
-        if let Some(annotation) = &arg.node.annotation {
-            write!(f, [text(": ")])?;
-            write!(f, [annotation.format()])?;
-        }
-        write!(f, [end_of_line_comments(arg)])?;
-
-        Ok(())
-    }
-}
diff --git a/crates/ruff_python_formatter/src/format/arguments.rs b/crates/ruff_python_formatter/src/format/arguments.rs
deleted file mode 100644
index d2a83f7d880b3..0000000000000
--- a/crates/ruff_python_formatter/src/format/arguments.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-use ruff_formatter::prelude::*;
-use ruff_formatter::{format_args, write, Format};
-
-use crate::context::ASTFormatContext;
-use crate::cst::Arguments;
-use crate::shared_traits::AsFormat;
-
-pub struct FormatArguments<'a> {
-    item: &'a Arguments,
-}
-
-impl AsFormat<ASTFormatContext<'_>> for Arguments {
-    type Format<'a> = FormatArguments<'a>;
-
-    fn format(&self) -> Self::Format<'_> {
-        FormatArguments { item: self }
-    }
-}
-
-impl Format<ASTFormatContext<'_>> for FormatArguments<'_> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext<'_>>) -> FormatResult<()> {
-        let args = self.item;
-
-        let mut first = true;
-
-        let defaults_start = args.posonlyargs.len() + args.args.len() - args.defaults.len();
-        for (i, arg) in args.posonlyargs.iter().chain(&args.args).enumerate() {
-            if !std::mem::take(&mut first) {
-                write!(f, [text(",")])?;
-                write!(f, [soft_line_break_or_space()])?;
-            }
-
-            write!(
-                f,
-                [group(&format_args![format_with(|f| {
-                    write!(f, [arg.format()])?;
-                    if let Some(i) = i.checked_sub(defaults_start) {
-                        if arg.node.annotation.is_some() {
-                            write!(f, [space()])?;
-                            write!(f, [text("=")])?;
-                            write!(f, [space()])?;
-                        } else {
-                            write!(f, [text("=")])?;
-                        }
-                        write!(f, [args.defaults[i].format()])?;
-                    }
-                    Ok(())
-                })])]
-            )?;
-
-            if i + 1 == args.posonlyargs.len() {
-                if !std::mem::take(&mut first) {
-                    write!(f, [text(",")])?;
-                    write!(f, [soft_line_break_or_space()])?;
-                }
-                write!(f, [text("/")])?;
-            }
-        }
-
-        if let Some(vararg) = &args.vararg {
-            if !std::mem::take(&mut first) {
-                write!(f, [text(",")])?;
-                write!(f, [soft_line_break_or_space()])?;
-            }
-            first = false;
-
-            write!(f, [text("*")])?;
-            write!(f, [vararg.format()])?;
-        } else if !args.kwonlyargs.is_empty() {
-            if !std::mem::take(&mut first) {
-                write!(f, [text(",")])?;
-                write!(f, [soft_line_break_or_space()])?;
-            }
-            first = false;
-
-            write!(f, [text("*")])?;
-        }
-
-        let defaults_start = args.kwonlyargs.len() - args.kw_defaults.len();
-        for (i, kwarg) in args.kwonlyargs.iter().enumerate() {
-            if !std::mem::take(&mut first) {
-                write!(f, [text(",")])?;
-                write!(f, [soft_line_break_or_space()])?;
-            }
-
-            write!(
-                f,
-                [group(&format_args![format_with(|f| {
-                    write!(f, [kwarg.format()])?;
-                    if let Some(default) = i
-                        .checked_sub(defaults_start)
-                        .and_then(|i| args.kw_defaults.get(i))
-                    {
-                        if kwarg.node.annotation.is_some() {
-                            write!(f, [space()])?;
-                            write!(f, [text("=")])?;
-                            write!(f, [space()])?;
-                        } else {
-                            write!(f, [text("=")])?;
-                        }
-                        write!(f, [default.format()])?;
-                    }
-                    Ok(())
-                })])]
-            )?;
-        }
-        if let Some(kwarg) = &args.kwarg {
-            if !std::mem::take(&mut first) {
-                write!(f, [text(",")])?;
-                write!(f, [soft_line_break_or_space()])?;
-            }
-
-            write!(f, [text("**")])?;
-            write!(f, [kwarg.format()])?;
-        }
-
-        if !first {
-            write!(f, [if_group_breaks(&text(","))])?;
-        }
-
-        Ok(())
-    }
-}
diff --git a/crates/ruff_python_formatter/src/format/bool_op.rs b/crates/ruff_python_formatter/src/format/bool_op.rs
deleted file mode 100644
index eb705f0d47402..0000000000000
--- a/crates/ruff_python_formatter/src/format/bool_op.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use ruff_formatter::prelude::*;
-use ruff_formatter::write;
-
-use crate::context::ASTFormatContext;
-use crate::cst::{BoolOp, BoolOpKind};
-use crate::format::comments::{end_of_line_comments, leading_comments, trailing_comments};
-use crate::shared_traits::AsFormat;
-
-pub struct FormatBoolOp<'a> {
-    item: &'a BoolOp,
-}
-
-impl AsFormat<ASTFormatContext<'_>> for BoolOp {
-    type Format<'a> = FormatBoolOp<'a>;
-
-    fn format(&self) -> Self::Format<'_> {
-        FormatBoolOp { item: self }
-    }
-}
-
-impl Format<ASTFormatContext<'_>> for FormatBoolOp<'_> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext>) -> FormatResult<()> {
-        let bool_op = self.item;
-        write!(f, [leading_comments(bool_op)])?;
-        write!(
-            f,
-            [text(match bool_op.node {
-                BoolOpKind::And => "and",
-                BoolOpKind::Or => "or",
-            })]
-        )?;
-        write!(f, [end_of_line_comments(bool_op)])?;
-        write!(f, [trailing_comments(bool_op)])?;
-        Ok(())
-    }
-}
diff --git a/crates/ruff_python_formatter/src/format/builders.rs b/crates/ruff_python_formatter/src/format/builders.rs
deleted file mode 100644
index 31b156c109db0..0000000000000
--- a/crates/ruff_python_formatter/src/format/builders.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use ruff_formatter::prelude::*;
-use ruff_formatter::{write, Format};
-use ruff_text_size::{TextRange, TextSize};
-
-use crate::context::ASTFormatContext;
-use crate::cst::{Body, Stmt};
-use crate::shared_traits::AsFormat;
-use crate::trivia::{Relationship, TriviaKind};
-
-#[derive(Copy, Clone)]
-pub struct Block<'a> {
-    body: &'a Body,
-}
-
-impl Format<ASTFormatContext<'_>> for Block<'_> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext<'_>>) -> FormatResult<()> {
-        for (i, stmt) in self.body.node.iter().enumerate() {
-            if i > 0 {
-                write!(f, [hard_line_break()])?;
-            }
-            write!(f, [stmt.format()])?;
-        }
-
-        for trivia in &self.body.trivia {
-            if matches!(trivia.relationship, Relationship::Dangling) {
-                match trivia.kind {
-                    TriviaKind::EmptyLine => {
-                        write!(f, [empty_line()])?;
-                    }
-                    TriviaKind::OwnLineComment(range) => {
-                        write!(f, [literal(range), hard_line_break()])?;
-                    }
-                    _ => {}
-                }
-            }
-        }
-
-        Ok(())
-    }
-}
-
-#[inline]
-pub fn block(body: &Body) -> Block {
-    Block { body }
-}
-
-#[derive(Copy, Clone)]
-pub struct Statements<'a> {
-    suite: &'a [Stmt],
-}
-
-impl Format<ASTFormatContext<'_>> for Statements<'_> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext<'_>>) -> FormatResult<()> {
-        for (i, stmt) in self.suite.iter().enumerate() {
-            if i > 0 {
-                write!(f, [hard_line_break()])?;
-            }
-            write!(f, [stmt.format()])?;
-        }
-        Ok(())
-    }
-}
-
-pub fn statements(suite: &[Stmt]) -> Statements {
-    Statements { suite }
-}
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct Literal {
-    range: TextRange,
-}
-
-impl Format<ASTFormatContext<'_>> for Literal {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext<'_>>) -> FormatResult<()> {
-        let text = f.context().contents();
-
-        f.write_element(FormatElement::StaticTextSlice {
-            text,
-            range: self.range,
-        })
-    }
-}
-
-#[inline]
-pub const fn literal(range: TextRange) -> Literal {
-    Literal { range }
-}
-
-pub(crate) const fn join_names(names: &[String]) -> JoinNames {
-    JoinNames { names }
-}
-
-pub(crate) struct JoinNames<'a> {
-    names: &'a [String],
-}
-
-impl<Context> Format<Context> for JoinNames<'_> {
-    fn fmt(&self, f: &mut Formatter<Context>) -> FormatResult<()> {
-        let mut join = f.join_with(text(", "));
-        for name in self.names {
-            join.entry(&dynamic_text(name, TextSize::default()));
-        }
-        join.finish()
-    }
-}
diff --git a/crates/ruff_python_formatter/src/format/cmp_op.rs b/crates/ruff_python_formatter/src/format/cmp_op.rs
deleted file mode 100644
index fe90676fc4441..0000000000000
--- a/crates/ruff_python_formatter/src/format/cmp_op.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use ruff_formatter::prelude::*;
-use ruff_formatter::write;
-
-use crate::context::ASTFormatContext;
-use crate::cst::{CmpOp, CmpOpKind};
-use crate::format::comments::{end_of_line_comments, leading_comments, trailing_comments};
-use crate::shared_traits::AsFormat;
-
-pub struct FormatCmpOp<'a> {
-    item: &'a CmpOp,
-}
-
-impl AsFormat<ASTFormatContext<'_>> for CmpOp {
-    type Format<'a> = FormatCmpOp<'a>;
-
-    fn format(&self) -> Self::Format<'_> {
-        FormatCmpOp { item: self }
-    }
-}
-
-impl Format<ASTFormatContext<'_>> for FormatCmpOp<'_> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext>) -> FormatResult<()> {
-        let cmp_op = self.item;
-        write!(f, [leading_comments(cmp_op)])?;
-        write!(
-            f,
-            [text(match cmp_op.node {
-                CmpOpKind::Eq => "==",
-                CmpOpKind::NotEq => "!=",
-                CmpOpKind::Lt => "<",
-                CmpOpKind::LtE => "<=",
-                CmpOpKind::Gt => ">",
-                CmpOpKind::GtE => ">=",
-                CmpOpKind::Is => "is",
-                CmpOpKind::IsNot => "is not",
-                CmpOpKind::In => "in",
-                CmpOpKind::NotIn => "not in",
-            })]
-        )?;
-        write!(f, [end_of_line_comments(cmp_op)])?;
-        write!(f, [trailing_comments(cmp_op)])?;
-        Ok(())
-    }
-}
diff --git a/crates/ruff_python_formatter/src/format/comments.rs b/crates/ruff_python_formatter/src/format/comments.rs
deleted file mode 100644
index 9d7b3cc42bfb9..0000000000000
--- a/crates/ruff_python_formatter/src/format/comments.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-use ruff_formatter::prelude::*;
-use ruff_formatter::{write, Format};
-
-use crate::context::ASTFormatContext;
-use crate::cst::Located;
-use crate::format::builders::literal;
-use crate::trivia::TriviaKind;
-
-#[derive(Debug)]
-pub struct LeadingComments<'a, T> {
-    item: &'a Located<T>,
-}
-
-impl<T> Format<ASTFormatContext<'_>> for LeadingComments<'_, T> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext<'_>>) -> FormatResult<()> {
-        for trivia in &self.item.trivia {
-            if trivia.relationship.is_leading() {
-                match trivia.kind {
-                    TriviaKind::EmptyLine => {
-                        write!(f, [empty_line()])?;
-                    }
-                    TriviaKind::OwnLineComment(range) => {
-                        write!(f, [literal(range), hard_line_break()])?;
-                    }
-                    _ => {}
-                }
-            }
-        }
-        Ok(())
-    }
-}
-
-#[inline]
-pub const fn leading_comments<T>(item: &Located<T>) -> LeadingComments<'_, T> {
-    LeadingComments { item }
-}
-
-#[derive(Debug)]
-pub struct TrailingComments<'a, T> {
-    item: &'a Located<T>,
-}
-
-impl<T> Format<ASTFormatContext<'_>> for TrailingComments<'_, T> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext<'_>>) -> FormatResult<()> {
-        for trivia in &self.item.trivia {
-            if trivia.relationship.is_trailing() {
-                match trivia.kind {
-                    TriviaKind::EmptyLine => {
-                        write!(f, [empty_line()])?;
-                    }
-                    TriviaKind::OwnLineComment(range) => {
-                        write!(f, [literal(range), hard_line_break()])?;
-                    }
-                    _ => {}
-                }
-            }
-        }
-        Ok(())
-    }
-}
-
-#[inline]
-pub const fn trailing_comments<T>(item: &Located<T>) -> TrailingComments<'_, T> {
-    TrailingComments { item }
-}
-
-#[derive(Debug)]
-pub struct EndOfLineComments<'a, T> {
-    item: &'a Located<T>,
-}
-
-impl<T> Format<ASTFormatContext<'_>> for EndOfLineComments<'_, T> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext<'_>>) -> FormatResult<()> {
-        let mut first = true;
-        for range in self
-            .item
-            .trivia
-            .iter()
-            .filter_map(|trivia| trivia.kind.end_of_line_comment())
-        {
-            if std::mem::take(&mut first) {
-                write!(f, [line_suffix(&text("  "))])?;
-            }
-            write!(f, [line_suffix(&literal(range))])?;
-        }
-        Ok(())
-    }
-}
-
-#[inline]
-pub const fn end_of_line_comments<T>(item: &Located<T>) -> EndOfLineComments<'_, T> {
-    EndOfLineComments { item }
-}
-
-#[derive(Debug)]
-pub struct DanglingComments<'a, T> {
-    item: &'a Located<T>,
-}
-
-impl<T> Format<ASTFormatContext<'_>> for DanglingComments<'_, T> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext<'_>>) -> FormatResult<()> {
-        for trivia in &self.item.trivia {
-            if trivia.relationship.is_dangling() {
-                if let TriviaKind::OwnLineComment(range) = trivia.kind {
-                    write!(f, [hard_line_break()])?;
-                    write!(f, [literal(range)])?;
-                    write!(f, [hard_line_break()])?;
-                }
-            }
-        }
-        Ok(())
-    }
-}
-
-#[inline]
-pub const fn dangling_comments<T>(item: &Located<T>) -> DanglingComments<'_, T> {
-    DanglingComments { item }
-}
diff --git a/crates/ruff_python_formatter/src/format/comprehension.rs b/crates/ruff_python_formatter/src/format/comprehension.rs
deleted file mode 100644
index ab02bd3d3e372..0000000000000
--- a/crates/ruff_python_formatter/src/format/comprehension.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use ruff_formatter::prelude::*;
-use ruff_formatter::write;
-
-use crate::context::ASTFormatContext;
-use crate::cst::Comprehension;
-use crate::shared_traits::AsFormat;
-
-pub struct FormatComprehension<'a> {
-    item: &'a Comprehension,
-}
-
-impl AsFormat<ASTFormatContext<'_>> for Comprehension {
-    type Format<'a> = FormatComprehension<'a>;
-
-    fn format(&self) -> Self::Format<'_> {
-        FormatComprehension { item: self }
-    }
-}
-
-impl Format<ASTFormatContext<'_>> for FormatComprehension<'_> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext<'_>>) -> FormatResult<()> {
-        let comprehension = self.item;
-
-        write!(f, [soft_line_break_or_space()])?;
-        if comprehension.is_async > 0 {
-            write!(f, [text("async")])?;
-            write!(f, [space()])?;
-        }
-        write!(f, [text("for")])?;
-        write!(f, [space()])?;
-        // TODO(charlie): If this is an unparenthesized tuple, we need to avoid expanding it.
-        // Should this be set on the context?
-        write!(f, [group(&comprehension.target.format())])?;
-        write!(f, [space()])?;
-        write!(f, [text("in")])?;
-        write!(f, [space()])?;
-        write!(f, [group(&comprehension.iter.format())])?;
-        for if_clause in &comprehension.ifs {
-            write!(f, [soft_line_break_or_space()])?;
-            write!(f, [text("if")])?;
-            write!(f, [space()])?;
-            write!(f, [if_clause.format()])?;
-        }
-
-        Ok(())
-    }
-}
diff --git a/crates/ruff_python_formatter/src/format/excepthandler.rs b/crates/ruff_python_formatter/src/format/excepthandler.rs
deleted file mode 100644
index 898ab100be804..0000000000000
--- a/crates/ruff_python_formatter/src/format/excepthandler.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use ruff_formatter::prelude::*;
-use ruff_formatter::write;
-use ruff_text_size::TextSize;
-
-use crate::context::ASTFormatContext;
-use crate::cst::{Excepthandler, ExcepthandlerKind};
-use crate::format::builders::block;
-use crate::format::comments::end_of_line_comments;
-use crate::shared_traits::AsFormat;
-
-pub struct FormatExcepthandler<'a> {
-    item: &'a Excepthandler,
-}
-
-impl AsFormat<ASTFormatContext<'_>> for Excepthandler {
-    type Format<'a> = FormatExcepthandler<'a>;
-
-    fn format(&self) -> Self::Format<'_> {
-        FormatExcepthandler { item: self }
-    }
-}
-
-impl Format<ASTFormatContext<'_>> for FormatExcepthandler<'_> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext>) -> FormatResult<()> {
-        let excepthandler = self.item;
-        let ExcepthandlerKind::ExceptHandler { type_, name, body } = &excepthandler.node;
-
-        write!(f, [text("except")])?;
-        if let Some(type_) = &type_ {
-            write!(f, [space(), type_.format()])?;
-            if let Some(name) = &name {
-                write!(
-                    f,
-                    [
-                        space(),
-                        text("as"),
-                        space(),
-                        dynamic_text(name, TextSize::default()),
-                    ]
-                )?;
-            }
-        }
-        write!(f, [text(":")])?;
-        write!(f, [end_of_line_comments(excepthandler)])?;
-
-        write!(f, [block_indent(&block(body))])?;
-
-        Ok(())
-    }
-}
diff --git a/crates/ruff_python_formatter/src/format/expr.rs b/crates/ruff_python_formatter/src/format/expr.rs
deleted file mode 100644
index 80f82cc15a32d..0000000000000
--- a/crates/ruff_python_formatter/src/format/expr.rs
+++ /dev/null
@@ -1,903 +0,0 @@
-#![allow(unused_variables, clippy::too_many_arguments)]
-
-use rustpython_parser::ast::Constant;
-
-use ruff_formatter::prelude::*;
-use ruff_formatter::{format_args, write};
-use ruff_text_size::TextSize;
-
-use crate::context::ASTFormatContext;
-use crate::cst::{
-    Arguments, BoolOp, CmpOp, Comprehension, Expr, ExprKind, Keyword, Operator, OperatorKind,
-    SliceIndex, SliceIndexKind, UnaryOp, UnaryOpKind,
-};
-use crate::format::builders::literal;
-use crate::format::comments::{dangling_comments, end_of_line_comments, leading_comments};
-use crate::format::helpers::{is_self_closing, is_simple_power, is_simple_slice};
-use crate::format::numbers::{complex_literal, float_literal, int_literal};
-use crate::format::strings::string_literal;
-use crate::shared_traits::AsFormat;
-use crate::trivia::{Parenthesize, TriviaKind};
-
-pub struct FormatExpr<'a> {
-    item: &'a Expr,
-}
-
-fn format_starred(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    value: &Expr,
-) -> FormatResult<()> {
-    write!(f, [text("*"), value.format()])?;
-    write!(f, [end_of_line_comments(expr)])?;
-    Ok(())
-}
-
-fn format_name(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    _id: &str,
-) -> FormatResult<()> {
-    write!(f, [literal(expr.range())])?;
-    write!(f, [end_of_line_comments(expr)])?;
-    Ok(())
-}
-
-fn format_subscript(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    value: &Expr,
-    slice: &Expr,
-) -> FormatResult<()> {
-    write!(f, [value.format()])?;
-    write!(f, [text("[")])?;
-    write!(
-        f,
-        [group(&format_args![soft_block_indent(&format_with(|f| {
-            write!(f, [slice.format()])?;
-
-            // Apply any dangling comments.
-            for trivia in &expr.trivia {
-                if trivia.relationship.is_dangling() {
-                    if let TriviaKind::OwnLineComment(range) = trivia.kind {
-                        write!(f, [expand_parent()])?;
-                        write!(f, [hard_line_break()])?;
-                        write!(f, [literal(range)])?;
-                    }
-                }
-            }
-
-            Ok(())
-        }))])]
-    )?;
-    write!(f, [text("]")])?;
-    write!(f, [end_of_line_comments(expr)])?;
-    Ok(())
-}
-
-fn format_tuple(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    elts: &[Expr],
-) -> FormatResult<()> {
-    // If we're already parenthesized, avoid adding any "mandatory" parentheses.
-    // TODO(charlie): We also need to parenthesize tuples on the right-hand side of an
-    // assignment if the target is exploded. And sometimes the tuple gets exploded, like
-    // if the LHS is an exploded list? Lots of edge cases here.
-    if elts.len() == 1 {
-        write!(
-            f,
-            [group(&format_args![soft_block_indent(&format_with(|f| {
-                write!(f, [elts[0].format()])?;
-                write!(f, [text(",")])?;
-                Ok(())
-            }))])]
-        )?;
-    } else if !elts.is_empty() {
-        write!(
-            f,
-            [group(&format_with(
-                |f: &mut Formatter<ASTFormatContext<'_>>| {
-                    if expr.parentheses.is_if_expanded() {
-                        write!(f, [if_group_breaks(&text("("))])?;
-                    }
-                    if matches!(
-                        expr.parentheses,
-                        Parenthesize::IfExpanded | Parenthesize::Always
-                    ) {
-                        write!(
-                            f,
-                            [soft_block_indent(&format_with(
-                                |f: &mut Formatter<ASTFormatContext<'_>>| {
-                                    let magic_trailing_comma = expr
-                                        .trivia
-                                        .iter()
-                                        .any(|c| c.kind.is_magic_trailing_comma());
-                                    let is_unbroken =
-                                        !f.context().locator().contains_line_break(expr.range());
-                                    if magic_trailing_comma {
-                                        write!(f, [expand_parent()])?;
-                                    }
-                                    for (i, elt) in elts.iter().enumerate() {
-                                        write!(f, [elt.format()])?;
-                                        if i < elts.len() - 1 {
-                                            write!(f, [text(",")])?;
-                                            write!(f, [soft_line_break_or_space()])?;
-                                        } else {
-                                            if magic_trailing_comma || is_unbroken {
-                                                write!(f, [if_group_breaks(&text(","))])?;
-                                            }
-                                        }
-                                    }
-                                    Ok(())
-                                }
-                            ))]
-                        )?;
-                    } else {
-                        let magic_trailing_comma =
-                            expr.trivia.iter().any(|c| c.kind.is_magic_trailing_comma());
-                        let is_unbroken = !f.context().locator().contains_line_break(expr.range());
-                        if magic_trailing_comma {
-                            write!(f, [expand_parent()])?;
-                        }
-                        for (i, elt) in elts.iter().enumerate() {
-                            write!(f, [elt.format()])?;
-                            if i < elts.len() - 1 {
-                                write!(f, [text(",")])?;
-                                write!(f, [soft_line_break_or_space()])?;
-                            } else {
-                                if magic_trailing_comma || is_unbroken {
-                                    write!(f, [if_group_breaks(&text(","))])?;
-                                }
-                            }
-                        }
-                    }
-                    if expr.parentheses.is_if_expanded() {
-                        write!(f, [if_group_breaks(&text(")"))])?;
-                    }
-                    Ok(())
-                }
-            ))]
-        )?;
-    }
-    Ok(())
-}
-
-fn format_slice(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    lower: &SliceIndex,
-    upper: &SliceIndex,
-    step: Option<&SliceIndex>,
-) -> FormatResult<()> {
-    // https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#slices
-    let lower_is_simple = if let SliceIndexKind::Index { value } = &lower.node {
-        is_simple_slice(value)
-    } else {
-        true
-    };
-    let upper_is_simple = if let SliceIndexKind::Index { value } = &upper.node {
-        is_simple_slice(value)
-    } else {
-        true
-    };
-    let step_is_simple = step.map_or(true, |step| {
-        if let SliceIndexKind::Index { value } = &step.node {
-            is_simple_slice(value)
-        } else {
-            true
-        }
-    });
-    let is_simple = lower_is_simple && upper_is_simple && step_is_simple;
-
-    write!(
-        f,
-        [group(&format_with(|f| {
-            if let SliceIndexKind::Index { value } = &lower.node {
-                write!(f, [value.format()])?;
-            }
-
-            write!(f, [dangling_comments(lower)])?;
-
-            if matches!(lower.node, SliceIndexKind::Index { .. }) {
-                if !is_simple {
-                    write!(f, [space()])?;
-                }
-            }
-            write!(f, [text(":")])?;
-            write!(f, [end_of_line_comments(lower)])?;
-
-            if let SliceIndexKind::Index { value } = &upper.node {
-                if !is_simple {
-                    write!(f, [space()])?;
-                }
-                write!(f, [if_group_breaks(&soft_line_break())])?;
-                write!(f, [value.format()])?;
-            }
-
-            write!(f, [dangling_comments(upper)])?;
-            write!(f, [end_of_line_comments(upper)])?;
-
-            if let Some(step) = step {
-                if matches!(upper.node, SliceIndexKind::Index { .. }) {
-                    if !is_simple {
-                        write!(f, [space()])?;
-                    }
-                }
-                write!(f, [text(":")])?;
-
-                if let SliceIndexKind::Index { value } = &step.node {
-                    if !is_simple {
-                        write!(f, [space()])?;
-                    }
-                    write!(f, [if_group_breaks(&soft_line_break())])?;
-                    write!(f, [value.format()])?;
-                }
-
-                write!(f, [dangling_comments(step)])?;
-                write!(f, [end_of_line_comments(step)])?;
-            }
-            Ok(())
-        }))]
-    )?;
-
-    write!(f, [end_of_line_comments(expr)])?;
-
-    Ok(())
-}
-
-fn format_formatted_value(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    value: &Expr,
-    _conversion: usize,
-    format_spec: Option<&Expr>,
-) -> FormatResult<()> {
-    write!(f, [text("!")])?;
-    write!(f, [value.format()])?;
-    if let Some(format_spec) = format_spec {
-        write!(f, [text(":")])?;
-        write!(f, [format_spec.format()])?;
-    }
-    Ok(())
-}
-
-fn format_list(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    elts: &[Expr],
-) -> FormatResult<()> {
-    write!(f, [text("[")])?;
-    if !elts.is_empty() {
-        let magic_trailing_comma = expr.trivia.iter().any(|c| c.kind.is_magic_trailing_comma());
-        write!(
-            f,
-            [group(&format_args![soft_block_indent(&format_with(|f| {
-                if magic_trailing_comma {
-                    write!(f, [expand_parent()])?;
-                }
-                for (i, elt) in elts.iter().enumerate() {
-                    write!(f, [elt.format()])?;
-                    if i < elts.len() - 1 {
-                        write!(f, [text(",")])?;
-                        write!(f, [soft_line_break_or_space()])?;
-                    } else {
-                        write!(f, [if_group_breaks(&text(","))])?;
-                    }
-                }
-                Ok(())
-            }))])]
-        )?;
-    }
-    write!(f, [text("]")])?;
-    write!(f, [end_of_line_comments(expr)])?;
-    Ok(())
-}
-
-fn format_set(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    elts: &[Expr],
-) -> FormatResult<()> {
-    if elts.is_empty() {
-        write!(f, [text("set()")])?;
-        Ok(())
-    } else {
-        write!(f, [text("{")])?;
-        if !elts.is_empty() {
-            let magic_trailing_comma = expr.trivia.iter().any(|c| c.kind.is_magic_trailing_comma());
-            write!(
-                f,
-                [group(&format_args![soft_block_indent(&format_with(|f| {
-                    if magic_trailing_comma {
-                        write!(f, [expand_parent()])?;
-                    }
-                    for (i, elt) in elts.iter().enumerate() {
-                        write!(f, [group(&format_args![elt.format()])])?;
-                        if i < elts.len() - 1 {
-                            write!(f, [text(",")])?;
-                            write!(f, [soft_line_break_or_space()])?;
-                        } else {
-                            if magic_trailing_comma {
-                                write!(f, [if_group_breaks(&text(","))])?;
-                            }
-                        }
-                    }
-                    Ok(())
-                }))])]
-            )?;
-        }
-        write!(f, [text("}")])?;
-        Ok(())
-    }
-}
-
-fn format_call(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    func: &Expr,
-    args: &[Expr],
-    keywords: &[Keyword],
-) -> FormatResult<()> {
-    write!(f, [func.format()])?;
-    if args.is_empty() && keywords.is_empty() {
-        write!(f, [text("(")])?;
-        write!(f, [text(")")])?;
-        write!(f, [end_of_line_comments(expr)])?;
-    } else {
-        write!(f, [text("(")])?;
-        write!(f, [end_of_line_comments(expr)])?;
-
-        let magic_trailing_comma = expr.trivia.iter().any(|c| c.kind.is_magic_trailing_comma());
-        write!(
-            f,
-            [group(&format_args![soft_block_indent(&format_with(|f| {
-                if magic_trailing_comma {
-                    write!(f, [expand_parent()])?;
-                }
-
-                for (i, arg) in args.iter().enumerate() {
-                    write!(f, [group(&format_args![arg.format()])])?;
-                    if i < args.len() - 1 || !keywords.is_empty() {
-                        write!(f, [text(",")])?;
-                        write!(f, [soft_line_break_or_space()])?;
-                    } else {
-                        if magic_trailing_comma || (args.len() + keywords.len() > 1) {
-                            write!(f, [if_group_breaks(&text(","))])?;
-                        }
-                    }
-                }
-                for (i, keyword) in keywords.iter().enumerate() {
-                    write!(
-                        f,
-                        [group(&format_args![&format_with(|f| {
-                            write!(f, [keyword.format()])?;
-                            Ok(())
-                        })])]
-                    )?;
-                    if i < keywords.len() - 1 {
-                        write!(f, [text(",")])?;
-                        write!(f, [soft_line_break_or_space()])?;
-                    } else {
-                        if magic_trailing_comma || (args.len() + keywords.len() > 1) {
-                            write!(f, [if_group_breaks(&text(","))])?;
-                        }
-                    }
-                }
-
-                write!(f, [dangling_comments(expr)])?;
-
-                Ok(())
-            }))])]
-        )?;
-        write!(f, [text(")")])?;
-    }
-    Ok(())
-}
-
-fn format_list_comp(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    elt: &Expr,
-    generators: &[Comprehension],
-) -> FormatResult<()> {
-    write!(f, [text("[")])?;
-    write!(
-        f,
-        [group(&format_args![soft_block_indent(&format_with(|f| {
-            write!(f, [elt.format()])?;
-            for generator in generators {
-                write!(f, [generator.format()])?;
-            }
-            Ok(())
-        }))])]
-    )?;
-    write!(f, [text("]")])?;
-    Ok(())
-}
-
-fn format_set_comp(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    elt: &Expr,
-    generators: &[Comprehension],
-) -> FormatResult<()> {
-    write!(f, [text("{")])?;
-    write!(
-        f,
-        [group(&format_args![soft_block_indent(&format_with(|f| {
-            write!(f, [elt.format()])?;
-            for generator in generators {
-                write!(f, [generator.format()])?;
-            }
-            Ok(())
-        }))])]
-    )?;
-    write!(f, [text("}")])?;
-    Ok(())
-}
-
-fn format_dict_comp(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    key: &Expr,
-    value: &Expr,
-    generators: &[Comprehension],
-) -> FormatResult<()> {
-    write!(f, [text("{")])?;
-    write!(
-        f,
-        [group(&format_args![soft_block_indent(&format_with(|f| {
-            write!(f, [key.format()])?;
-            write!(f, [text(":")])?;
-            write!(f, [space()])?;
-            write!(f, [value.format()])?;
-            for generator in generators {
-                write!(f, [generator.format()])?;
-            }
-            Ok(())
-        }))])]
-    )?;
-    write!(f, [text("}")])?;
-    Ok(())
-}
-
-fn format_generator_exp(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    elt: &Expr,
-    generators: &[Comprehension],
-) -> FormatResult<()> {
-    write!(
-        f,
-        [group(&format_args![soft_block_indent(&format_with(|f| {
-            write!(f, [elt.format()])?;
-            for generator in generators {
-                write!(f, [generator.format()])?;
-            }
-            Ok(())
-        }))])]
-    )?;
-    Ok(())
-}
-
-fn format_await(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    value: &Expr,
-) -> FormatResult<()> {
-    write!(f, [text("await")])?;
-    write!(f, [space()])?;
-    if is_self_closing(value) {
-        write!(f, [group(&format_args![value.format()])])?;
-    } else {
-        write!(
-            f,
-            [group(&format_args![
-                if_group_breaks(&text("(")),
-                soft_block_indent(&format_args![value.format()]),
-                if_group_breaks(&text(")")),
-            ])]
-        )?;
-    }
-    Ok(())
-}
-
-fn format_yield(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    value: Option<&Expr>,
-) -> FormatResult<()> {
-    write!(f, [text("yield")])?;
-    if let Some(value) = value {
-        write!(f, [space()])?;
-        if is_self_closing(value) {
-            write!(f, [group(&format_args![value.format()])])?;
-        } else {
-            write!(
-                f,
-                [group(&format_args![
-                    if_group_breaks(&text("(")),
-                    soft_block_indent(&format_args![value.format()]),
-                    if_group_breaks(&text(")")),
-                ])]
-            )?;
-        }
-    }
-    Ok(())
-}
-
-fn format_yield_from(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    value: &Expr,
-) -> FormatResult<()> {
-    write!(
-        f,
-        [group(&format_args![soft_block_indent(&format_with(|f| {
-            write!(f, [text("yield")])?;
-            write!(f, [space()])?;
-            write!(f, [text("from")])?;
-            write!(f, [space()])?;
-            if is_self_closing(value) {
-                write!(f, [value.format()])?;
-            } else {
-                write!(
-                    f,
-                    [group(&format_args![
-                        if_group_breaks(&text("(")),
-                        soft_block_indent(&format_args![value.format()]),
-                        if_group_breaks(&text(")")),
-                    ])]
-                )?;
-            }
-            Ok(())
-        })),])]
-    )?;
-    Ok(())
-}
-
-fn format_compare(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    left: &Expr,
-    ops: &[CmpOp],
-    comparators: &[Expr],
-) -> FormatResult<()> {
-    write!(f, [group(&format_args![left.format()])])?;
-    for (i, op) in ops.iter().enumerate() {
-        write!(f, [soft_line_break_or_space()])?;
-        write!(f, [op.format()])?;
-        write!(f, [space()])?;
-        write!(f, [group(&format_args![comparators[i].format()])])?;
-    }
-
-    write!(f, [end_of_line_comments(expr)])?;
-
-    Ok(())
-}
-
-fn format_joined_str(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    _values: &[Expr],
-) -> FormatResult<()> {
-    write!(f, [literal(expr.range())])?;
-    write!(f, [end_of_line_comments(expr)])?;
-    Ok(())
-}
-
-fn format_constant(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    constant: &Constant,
-    _kind: Option<&str>,
-) -> FormatResult<()> {
-    match constant {
-        Constant::Ellipsis => write!(f, [text("...")])?,
-        Constant::None => write!(f, [text("None")])?,
-        Constant::Bool(value) => {
-            if *value {
-                write!(f, [text("True")])?;
-            } else {
-                write!(f, [text("False")])?;
-            }
-        }
-        Constant::Int(_) => write!(f, [int_literal(expr.range())])?,
-        Constant::Float(_) => write!(f, [float_literal(expr.range())])?,
-        Constant::Str(_) => write!(f, [string_literal(expr)])?,
-        Constant::Bytes(_) => write!(f, [string_literal(expr)])?,
-        Constant::Complex { .. } => write!(f, [complex_literal(expr.range())])?,
-        Constant::Tuple(_) => unreachable!("Constant::Tuple should be handled by format_tuple"),
-    }
-    write!(f, [end_of_line_comments(expr)])?;
-    Ok(())
-}
-
-fn format_dict(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    keys: &[Option<Expr>],
-    values: &[Expr],
-) -> FormatResult<()> {
-    write!(f, [text("{")])?;
-    if !keys.is_empty() {
-        let magic_trailing_comma = expr.trivia.iter().any(|c| c.kind.is_magic_trailing_comma());
-        write!(
-            f,
-            [soft_block_indent(&format_with(|f| {
-                if magic_trailing_comma {
-                    write!(f, [expand_parent()])?;
-                }
-                for (i, (k, v)) in keys.iter().zip(values).enumerate() {
-                    if let Some(k) = k {
-                        write!(f, [k.format()])?;
-                        write!(f, [text(":")])?;
-                        write!(f, [space()])?;
-                        if is_self_closing(v) {
-                            write!(f, [v.format()])?;
-                        } else {
-                            write!(
-                                f,
-                                [group(&format_args![
-                                    if_group_breaks(&text("(")),
-                                    soft_block_indent(&format_args![v.format()]),
-                                    if_group_breaks(&text(")")),
-                                ])]
-                            )?;
-                        }
-                    } else {
-                        write!(f, [text("**")])?;
-                        if is_self_closing(v) {
-                            write!(f, [v.format()])?;
-                        } else {
-                            write!(
-                                f,
-                                [group(&format_args![
-                                    if_group_breaks(&text("(")),
-                                    soft_block_indent(&format_args![v.format()]),
-                                    if_group_breaks(&text(")")),
-                                ])]
-                            )?;
-                        }
-                    }
-                    if i < keys.len() - 1 {
-                        write!(f, [text(",")])?;
-                        write!(f, [soft_line_break_or_space()])?;
-                    } else {
-                        write!(f, [if_group_breaks(&text(","))])?;
-                    }
-                }
-                Ok(())
-            }))]
-        )?;
-    }
-    write!(f, [text("}")])?;
-    Ok(())
-}
-
-fn format_attribute(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    value: &Expr,
-    attr: &str,
-) -> FormatResult<()> {
-    write!(f, [value.format()])?;
-    write!(f, [text(".")])?;
-    write!(f, [dynamic_text(attr, TextSize::default())])?;
-    write!(f, [end_of_line_comments(expr)])?;
-    Ok(())
-}
-
-fn format_named_expr(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    target: &Expr,
-    value: &Expr,
-) -> FormatResult<()> {
-    write!(f, [target.format()])?;
-    write!(f, [text(":=")])?;
-    write!(f, [space()])?;
-    write!(f, [group(&format_args![value.format()])])?;
-    write!(f, [end_of_line_comments(expr)])?;
-    Ok(())
-}
-
-fn format_bool_op(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    ops: &[BoolOp],
-    values: &[Expr],
-) -> FormatResult<()> {
-    write!(f, [group(&format_args![values[0].format()])])?;
-    for (op, value) in ops.iter().zip(&values[1..]) {
-        write!(f, [soft_line_break_or_space()])?;
-        write!(f, [op.format()])?;
-        write!(f, [space()])?;
-        write!(f, [group(&format_args![value.format()])])?;
-    }
-    write!(f, [end_of_line_comments(expr)])?;
-    Ok(())
-}
-
-fn format_bin_op(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    left: &Expr,
-    op: &Operator,
-    right: &Expr,
-) -> FormatResult<()> {
-    // https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#line-breaks-binary-operators
-    let is_simple =
-        matches!(op.node, OperatorKind::Pow) && is_simple_power(left) && is_simple_power(right);
-    write!(f, [left.format()])?;
-    if !is_simple {
-        write!(f, [soft_line_break_or_space()])?;
-    }
-    write!(f, [op.format()])?;
-    if !is_simple {
-        write!(f, [space()])?;
-    }
-    write!(f, [group(&right.format())])?;
-    write!(f, [end_of_line_comments(expr)])?;
-    Ok(())
-}
-
-fn format_unary_op(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    op: &UnaryOp,
-    operand: &Expr,
-) -> FormatResult<()> {
-    write!(f, [op.format()])?;
-    // TODO(charlie): Do this in the normalization pass.
-    if !matches!(op.node, UnaryOpKind::Not)
-        && matches!(
-            operand.node,
-            ExprKind::BoolOp { .. } | ExprKind::Compare { .. } | ExprKind::BinOp { .. }
-        )
-    {
-        let parenthesized = operand.parentheses.is_always();
-        if !parenthesized {
-            write!(f, [text("(")])?;
-        }
-        write!(f, [operand.format()])?;
-        if !parenthesized {
-            write!(f, [text(")")])?;
-        }
-    } else {
-        write!(f, [operand.format()])?;
-    }
-    write!(f, [end_of_line_comments(expr)])?;
-    Ok(())
-}
-
-fn format_lambda(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    args: &Arguments,
-    body: &Expr,
-) -> FormatResult<()> {
-    write!(f, [text("lambda")])?;
-    if !args.args.is_empty() || args.kwarg.is_some() || args.vararg.is_some() {
-        write!(f, [space()])?;
-        write!(f, [args.format()])?;
-    }
-    write!(f, [text(":")])?;
-    write!(f, [space()])?;
-    write!(f, [body.format()])?;
-    write!(f, [end_of_line_comments(expr)])?;
-    Ok(())
-}
-
-fn format_if_exp(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    expr: &Expr,
-    test: &Expr,
-    body: &Expr,
-    orelse: &Expr,
-) -> FormatResult<()> {
-    write!(f, [group(&format_args![body.format()])])?;
-    write!(f, [soft_line_break_or_space()])?;
-    write!(f, [text("if")])?;
-    write!(f, [space()])?;
-    write!(f, [group(&format_args![test.format()])])?;
-    write!(f, [soft_line_break_or_space()])?;
-    write!(f, [text("else")])?;
-    write!(f, [space()])?;
-    write!(f, [group(&format_args![orelse.format()])])?;
-    Ok(())
-}
-
-impl Format<ASTFormatContext<'_>> for FormatExpr<'_> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext<'_>>) -> FormatResult<()> {
-        if self.item.parentheses.is_always() {
-            write!(f, [text("(")])?;
-        }
-
-        write!(f, [leading_comments(self.item)])?;
-
-        match &self.item.node {
-            ExprKind::BoolOp { ops, values } => format_bool_op(f, self.item, ops, values),
-            ExprKind::NamedExpr { target, value } => format_named_expr(f, self.item, target, value),
-            ExprKind::BinOp { left, op, right } => format_bin_op(f, self.item, left, op, right),
-            ExprKind::UnaryOp { op, operand } => format_unary_op(f, self.item, op, operand),
-            ExprKind::Lambda { args, body } => format_lambda(f, self.item, args, body),
-            ExprKind::IfExp { test, body, orelse } => {
-                format_if_exp(f, self.item, test, body, orelse)
-            }
-            ExprKind::Dict { keys, values } => format_dict(f, self.item, keys, values),
-            ExprKind::Set { elts, .. } => format_set(f, self.item, elts),
-            ExprKind::ListComp { elt, generators } => {
-                format_list_comp(f, self.item, elt, generators)
-            }
-            ExprKind::SetComp { elt, generators } => format_set_comp(f, self.item, elt, generators),
-            ExprKind::DictComp {
-                key,
-                value,
-                generators,
-            } => format_dict_comp(f, self.item, key, value, generators),
-            ExprKind::GeneratorExp { elt, generators } => {
-                format_generator_exp(f, self.item, elt, generators)
-            }
-            ExprKind::Await { value } => format_await(f, self.item, value),
-            ExprKind::Yield { value } => format_yield(f, self.item, value.as_deref()),
-            ExprKind::YieldFrom { value } => format_yield_from(f, self.item, value),
-            ExprKind::Compare {
-                left,
-                ops,
-                comparators,
-            } => format_compare(f, self.item, left, ops, comparators),
-            ExprKind::Call {
-                func,
-                args,
-                keywords,
-            } => format_call(f, self.item, func, args, keywords),
-            ExprKind::JoinedStr { values } => format_joined_str(f, self.item, values),
-            ExprKind::Constant { value, kind } => {
-                format_constant(f, self.item, value, kind.as_deref())
-            }
-            ExprKind::Attribute { value, attr, .. } => format_attribute(f, self.item, value, attr),
-            ExprKind::Subscript { value, slice, .. } => {
-                format_subscript(f, self.item, value, slice)
-            }
-            ExprKind::Starred { value, .. } => format_starred(f, self.item, value),
-            ExprKind::Name { id, .. } => format_name(f, self.item, id),
-            ExprKind::List { elts, .. } => format_list(f, self.item, elts),
-            ExprKind::Tuple { elts, .. } => format_tuple(f, self.item, elts),
-            ExprKind::Slice { lower, upper, step } => {
-                format_slice(f, self.item, lower, upper, step.as_ref())
-            }
-            ExprKind::FormattedValue {
-                value,
-                conversion,
-                format_spec,
-            } => format_formatted_value(f, self.item, value, *conversion, format_spec.as_deref()),
-        }?;
-
-        // Any trailing comments come on the lines after.
-        for trivia in &self.item.trivia {
-            if trivia.relationship.is_trailing() {
-                if let TriviaKind::OwnLineComment(range) = trivia.kind {
-                    write!(f, [expand_parent()])?;
-                    write!(f, [literal(range)])?;
-                    write!(f, [hard_line_break()])?;
-                }
-            }
-        }
-
-        if self.item.parentheses.is_always() {
-            write!(f, [text(")")])?;
-        }
-
-        Ok(())
-    }
-}
-
-impl AsFormat<ASTFormatContext<'_>> for Expr {
-    type Format<'a> = FormatExpr<'a>;
-
-    fn format(&self) -> Self::Format<'_> {
-        FormatExpr { item: self }
-    }
-}
diff --git a/crates/ruff_python_formatter/src/format/helpers.rs b/crates/ruff_python_formatter/src/format/helpers.rs
deleted file mode 100644
index bd5bc1ff646ec..0000000000000
--- a/crates/ruff_python_formatter/src/format/helpers.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-use crate::cst::{Expr, ExprKind, UnaryOpKind};
-
-pub fn is_self_closing(expr: &Expr) -> bool {
-    match &expr.node {
-        ExprKind::Tuple { .. }
-        | ExprKind::List { .. }
-        | ExprKind::Set { .. }
-        | ExprKind::Dict { .. }
-        | ExprKind::ListComp { .. }
-        | ExprKind::SetComp { .. }
-        | ExprKind::DictComp { .. }
-        | ExprKind::GeneratorExp { .. }
-        | ExprKind::Call { .. }
-        | ExprKind::Name { .. }
-        | ExprKind::Constant { .. }
-        | ExprKind::Subscript { .. } => true,
-        ExprKind::Lambda { body, .. } => is_self_closing(body),
-        ExprKind::BinOp { left, right, .. } => {
-            matches!(left.node, ExprKind::Constant { .. } | ExprKind::Name { .. })
-                && matches!(
-                    right.node,
-                    ExprKind::Tuple { .. }
-                        | ExprKind::List { .. }
-                        | ExprKind::Set { .. }
-                        | ExprKind::Dict { .. }
-                        | ExprKind::ListComp { .. }
-                        | ExprKind::SetComp { .. }
-                        | ExprKind::DictComp { .. }
-                        | ExprKind::GeneratorExp { .. }
-                        | ExprKind::Call { .. }
-                        | ExprKind::Subscript { .. }
-                )
-        }
-        ExprKind::BoolOp { values, .. } => values.last().map_or(false, |expr| {
-            matches!(
-                expr.node,
-                ExprKind::Tuple { .. }
-                    | ExprKind::List { .. }
-                    | ExprKind::Set { .. }
-                    | ExprKind::Dict { .. }
-                    | ExprKind::ListComp { .. }
-                    | ExprKind::SetComp { .. }
-                    | ExprKind::DictComp { .. }
-                    | ExprKind::GeneratorExp { .. }
-                    | ExprKind::Call { .. }
-                    | ExprKind::Subscript { .. }
-            )
-        }),
-        ExprKind::UnaryOp { operand, .. } => is_self_closing(operand),
-        _ => false,
-    }
-}
-
-/// Return `true` if an [`Expr`] adheres to Black's definition of a non-complex
-/// expression, in the context of a slice operation.
-pub fn is_simple_slice(expr: &Expr) -> bool {
-    match &expr.node {
-        ExprKind::UnaryOp { op, operand } => {
-            if matches!(op.node, UnaryOpKind::Not) {
-                false
-            } else {
-                is_simple_slice(operand)
-            }
-        }
-        ExprKind::Constant { .. } => true,
-        ExprKind::Name { .. } => true,
-        _ => false,
-    }
-}
-
-/// Return `true` if an [`Expr`] adheres to Black's definition of a non-complex
-/// expression, in the context of a power operation.
-pub fn is_simple_power(expr: &Expr) -> bool {
-    match &expr.node {
-        ExprKind::UnaryOp { op, operand } => {
-            if matches!(op.node, UnaryOpKind::Not) {
-                false
-            } else {
-                is_simple_slice(operand)
-            }
-        }
-        ExprKind::Constant { .. } => true,
-        ExprKind::Name { .. } => true,
-        ExprKind::Attribute { value, .. } => is_simple_power(value),
-        _ => false,
-    }
-}
diff --git a/crates/ruff_python_formatter/src/format/keyword.rs b/crates/ruff_python_formatter/src/format/keyword.rs
deleted file mode 100644
index 0aa533bdfcf92..0000000000000
--- a/crates/ruff_python_formatter/src/format/keyword.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use ruff_formatter::prelude::*;
-use ruff_formatter::write;
-use ruff_text_size::TextSize;
-
-use crate::context::ASTFormatContext;
-use crate::cst::Keyword;
-use crate::format::comments::{end_of_line_comments, leading_comments, trailing_comments};
-use crate::shared_traits::AsFormat;
-
-pub struct FormatKeyword<'a> {
-    item: &'a Keyword,
-}
-
-impl AsFormat<ASTFormatContext<'_>> for Keyword {
-    type Format<'a> = FormatKeyword<'a>;
-
-    fn format(&self) -> Self::Format<'_> {
-        FormatKeyword { item: self }
-    }
-}
-
-impl Format<ASTFormatContext<'_>> for FormatKeyword<'_> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext>) -> FormatResult<()> {
-        let keyword = self.item;
-
-        write!(f, [leading_comments(keyword)])?;
-        if let Some(arg) = &keyword.node.arg {
-            write!(f, [dynamic_text(arg, TextSize::default())])?;
-            write!(f, [text("=")])?;
-            write!(f, [keyword.node.value.format()])?;
-        } else {
-            write!(f, [text("**")])?;
-            write!(f, [keyword.node.value.format()])?;
-        }
-        write!(f, [end_of_line_comments(keyword)])?;
-        write!(f, [trailing_comments(keyword)])?;
-
-        Ok(())
-    }
-}
diff --git a/crates/ruff_python_formatter/src/format/match_case.rs b/crates/ruff_python_formatter/src/format/match_case.rs
deleted file mode 100644
index 6161e0f7645d9..0000000000000
--- a/crates/ruff_python_formatter/src/format/match_case.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use ruff_formatter::prelude::*;
-use ruff_formatter::write;
-
-use crate::context::ASTFormatContext;
-use crate::cst::MatchCase;
-use crate::format::builders::block;
-use crate::format::comments::{end_of_line_comments, leading_comments};
-use crate::shared_traits::AsFormat;
-
-pub struct FormatMatchCase<'a> {
-    item: &'a MatchCase,
-}
-
-impl AsFormat<ASTFormatContext<'_>> for MatchCase {
-    type Format<'a> = FormatMatchCase<'a>;
-
-    fn format(&self) -> Self::Format<'_> {
-        FormatMatchCase { item: self }
-    }
-}
-
-impl Format<ASTFormatContext<'_>> for FormatMatchCase<'_> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext>) -> FormatResult<()> {
-        let MatchCase {
-            pattern,
-            guard,
-            body,
-        } = self.item;
-
-        write!(f, [leading_comments(pattern)])?;
-
-        write!(f, [text("case")])?;
-        write!(f, [space(), pattern.format()])?;
-        if let Some(guard) = &guard {
-            write!(f, [space(), text("if"), space(), guard.format()])?;
-        }
-        write!(f, [text(":")])?;
-
-        write!(f, [end_of_line_comments(body)])?;
-        write!(f, [block_indent(&block(body))])?;
-
-        Ok(())
-    }
-}
diff --git a/crates/ruff_python_formatter/src/format/mod.rs b/crates/ruff_python_formatter/src/format/mod.rs
deleted file mode 100644
index 2263a33ba30f0..0000000000000
--- a/crates/ruff_python_formatter/src/format/mod.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-mod alias;
-mod arg;
-mod arguments;
-mod bool_op;
-pub mod builders;
-mod cmp_op;
-mod comments;
-mod comprehension;
-mod excepthandler;
-mod expr;
-mod helpers;
-mod keyword;
-mod match_case;
-mod numbers;
-mod operator;
-mod pattern;
-mod stmt;
-mod strings;
-mod unary_op;
-mod withitem;
diff --git a/crates/ruff_python_formatter/src/format/numbers.rs b/crates/ruff_python_formatter/src/format/numbers.rs
deleted file mode 100644
index 84066e62a39fe..0000000000000
--- a/crates/ruff_python_formatter/src/format/numbers.rs
+++ /dev/null
@@ -1,195 +0,0 @@
-use std::ops::{Add, Sub};
-
-use ruff_formatter::prelude::*;
-use ruff_formatter::{write, Format};
-use ruff_text_size::{TextRange, TextSize};
-
-use crate::context::ASTFormatContext;
-use crate::format::builders::literal;
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-struct FloatAtom {
-    range: TextRange,
-}
-
-impl Format<ASTFormatContext<'_>> for FloatAtom {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext<'_>>) -> FormatResult<()> {
-        let contents = f.context().contents();
-
-        let content = &contents[self.range];
-        if let Some(dot_index) = content.find('.') {
-            let integer = &content[..dot_index];
-            let fractional = &content[dot_index + 1..];
-
-            if integer.is_empty() {
-                write!(f, [text("0")])?;
-            } else {
-                write!(
-                    f,
-                    [literal(TextRange::new(
-                        self.range.start(),
-                        self.range
-                            .start()
-                            .add(TextSize::try_from(dot_index).unwrap())
-                    ))]
-                )?;
-            }
-
-            write!(f, [text(".")])?;
-
-            if fractional.is_empty() {
-                write!(f, [text("0")])?;
-            } else {
-                write!(
-                    f,
-                    [literal(TextRange::new(
-                        self.range
-                            .start()
-                            .add(TextSize::try_from(dot_index + 1).unwrap()),
-                        self.range.end()
-                    ))]
-                )?;
-            }
-        } else {
-            write!(f, [literal(self.range)])?;
-        }
-
-        Ok(())
-    }
-}
-
-#[inline]
-const fn float_atom(range: TextRange) -> FloatAtom {
-    FloatAtom { range }
-}
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct FloatLiteral {
-    range: TextRange,
-}
-
-impl Format<ASTFormatContext<'_>> for FloatLiteral {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext<'_>>) -> FormatResult<()> {
-        let contents = f.context().contents();
-
-        let content = &contents[self.range];
-
-        // Scientific notation
-        if let Some(exponent_index) = content.find('e').or_else(|| content.find('E')) {
-            // Write the base.
-            write!(
-                f,
-                [float_atom(TextRange::new(
-                    self.range.start(),
-                    self.range
-                        .start()
-                        .add(TextSize::try_from(exponent_index).unwrap())
-                ))]
-            )?;
-
-            write!(f, [text("e")])?;
-
-            // Write the exponent, omitting the sign if it's positive.
-            let plus = content[exponent_index + 1..].starts_with('+');
-            write!(
-                f,
-                [literal(TextRange::new(
-                    self.range
-                        .start()
-                        .add(TextSize::try_from(exponent_index + 1 + usize::from(plus)).unwrap()),
-                    self.range.end()
-                ))]
-            )?;
-        } else {
-            write!(f, [float_atom(self.range)])?;
-        }
-
-        Ok(())
-    }
-}
-
-#[inline]
-pub const fn float_literal(range: TextRange) -> FloatLiteral {
-    FloatLiteral { range }
-}
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct IntLiteral {
-    range: TextRange,
-}
-
-impl Format<ASTFormatContext<'_>> for IntLiteral {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext<'_>>) -> FormatResult<()> {
-        let contents = f.context().contents();
-
-        for prefix in ["0b", "0B", "0o", "0O", "0x", "0X"] {
-            let content = &contents[self.range];
-            if content.starts_with(prefix) {
-                // In each case, the prefix must be lowercase, while the suffix must be uppercase.
-                let prefix = &content[..prefix.len()];
-                let suffix = &content[prefix.len()..];
-
-                if prefix.bytes().any(|b| b.is_ascii_uppercase())
-                    || suffix.bytes().any(|b| b.is_ascii_lowercase())
-                {
-                    // Write out the fixed version.
-                    write!(
-                        f,
-                        [
-                            dynamic_text(&prefix.to_lowercase(), TextSize::default()),
-                            dynamic_text(&suffix.to_uppercase(), TextSize::default())
-                        ]
-                    )?;
-                } else {
-                    // Use the existing source.
-                    write!(f, [literal(self.range)])?;
-                }
-
-                return Ok(());
-            }
-        }
-
-        write!(f, [literal(self.range)])?;
-
-        Ok(())
-    }
-}
-
-#[inline]
-pub const fn int_literal(range: TextRange) -> IntLiteral {
-    IntLiteral { range }
-}
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct ComplexLiteral {
-    range: TextRange,
-}
-
-impl Format<ASTFormatContext<'_>> for ComplexLiteral {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext<'_>>) -> FormatResult<()> {
-        let contents = f.context().contents();
-        let content = &contents[self.range];
-
-        if content.ends_with('j') {
-            write!(f, [literal(self.range)])?;
-        } else if content.ends_with('J') {
-            write!(
-                f,
-                [literal(TextRange::new(
-                    self.range.start(),
-                    self.range.end().sub(TextSize::from(1))
-                ))]
-            )?;
-            write!(f, [text("j")])?;
-        } else {
-            unreachable!("expected complex literal to end with j or J");
-        }
-
-        Ok(())
-    }
-}
-
-#[inline]
-pub const fn complex_literal(range: TextRange) -> ComplexLiteral {
-    ComplexLiteral { range }
-}
diff --git a/crates/ruff_python_formatter/src/format/operator.rs b/crates/ruff_python_formatter/src/format/operator.rs
deleted file mode 100644
index 2ebfad9093961..0000000000000
--- a/crates/ruff_python_formatter/src/format/operator.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use ruff_formatter::prelude::*;
-use ruff_formatter::write;
-
-use crate::context::ASTFormatContext;
-use crate::cst::{Operator, OperatorKind};
-use crate::format::comments::{end_of_line_comments, leading_comments, trailing_comments};
-use crate::shared_traits::AsFormat;
-
-pub struct FormatOperator<'a> {
-    item: &'a Operator,
-}
-
-impl AsFormat<ASTFormatContext<'_>> for Operator {
-    type Format<'a> = FormatOperator<'a>;
-
-    fn format(&self) -> Self::Format<'_> {
-        FormatOperator { item: self }
-    }
-}
-
-impl Format<ASTFormatContext<'_>> for FormatOperator<'_> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext<'_>>) -> FormatResult<()> {
-        let operator = self.item;
-        write!(f, [leading_comments(operator)])?;
-        write!(
-            f,
-            [text(match operator.node {
-                OperatorKind::Add => "+",
-                OperatorKind::Sub => "-",
-                OperatorKind::Mult => "*",
-                OperatorKind::MatMult => "@",
-                OperatorKind::Div => "/",
-                OperatorKind::Mod => "%",
-                OperatorKind::Pow => "**",
-                OperatorKind::LShift => "<<",
-                OperatorKind::RShift => ">>",
-                OperatorKind::BitOr => "|",
-                OperatorKind::BitXor => "^",
-                OperatorKind::BitAnd => "&",
-                OperatorKind::FloorDiv => "//",
-            })]
-        )?;
-        write!(f, [end_of_line_comments(operator)])?;
-        write!(f, [trailing_comments(operator)])?;
-        Ok(())
-    }
-}
diff --git a/crates/ruff_python_formatter/src/format/pattern.rs b/crates/ruff_python_formatter/src/format/pattern.rs
deleted file mode 100644
index f17921bbbf554..0000000000000
--- a/crates/ruff_python_formatter/src/format/pattern.rs
+++ /dev/null
@@ -1,159 +0,0 @@
-use rustpython_parser::ast::Constant;
-
-use ruff_formatter::prelude::*;
-use ruff_formatter::write;
-use ruff_text_size::TextSize;
-
-use crate::context::ASTFormatContext;
-use crate::cst::{Pattern, PatternKind};
-use crate::shared_traits::AsFormat;
-
-pub struct FormatPattern<'a> {
-    item: &'a Pattern,
-}
-
-impl AsFormat<ASTFormatContext<'_>> for Pattern {
-    type Format<'a> = FormatPattern<'a>;
-
-    fn format(&self) -> Self::Format<'_> {
-        FormatPattern { item: self }
-    }
-}
-
-impl Format<ASTFormatContext<'_>> for FormatPattern<'_> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext>) -> FormatResult<()> {
-        let pattern = self.item;
-
-        match &pattern.node {
-            PatternKind::MatchValue { value } => {
-                write!(f, [value.format()])?;
-            }
-            PatternKind::MatchSingleton { value } => match value {
-                Constant::None => write!(f, [text("None")])?,
-                Constant::Bool(value) => {
-                    if *value {
-                        write!(f, [text("True")])?;
-                    } else {
-                        write!(f, [text("False")])?;
-                    }
-                }
-                _ => unreachable!("singleton pattern must be None or bool"),
-            },
-            PatternKind::MatchSequence { patterns } => {
-                write!(f, [text("[")])?;
-                if let Some(pattern) = patterns.first() {
-                    write!(f, [pattern.format()])?;
-                }
-                for pattern in patterns.iter().skip(1) {
-                    write!(f, [text(","), space(), pattern.format()])?;
-                }
-                write!(f, [text("]")])?;
-            }
-            PatternKind::MatchMapping {
-                keys,
-                patterns,
-                rest,
-            } => {
-                write!(f, [text("{")])?;
-                if let Some(pattern) = patterns.first() {
-                    write!(f, [keys[0].format(), text(":"), space(), pattern.format()])?;
-                }
-                for (key, pattern) in keys.iter().skip(1).zip(patterns.iter().skip(1)) {
-                    write!(
-                        f,
-                        [
-                            text(","),
-                            space(),
-                            key.format(),
-                            text(":"),
-                            space(),
-                            pattern.format()
-                        ]
-                    )?;
-                }
-                if let Some(rest) = &rest {
-                    write!(
-                        f,
-                        [
-                            text(","),
-                            space(),
-                            text("**"),
-                            space(),
-                            dynamic_text(rest, TextSize::default())
-                        ]
-                    )?;
-                }
-                write!(f, [text("}")])?;
-            }
-            PatternKind::MatchClass {
-                cls,
-                patterns,
-                kwd_attrs,
-                kwd_patterns,
-            } => {
-                write!(f, [cls.format()])?;
-                if !patterns.is_empty() {
-                    write!(f, [text("(")])?;
-                    if let Some(pattern) = patterns.first() {
-                        write!(f, [pattern.format()])?;
-                    }
-                    for pattern in patterns.iter().skip(1) {
-                        write!(f, [text(","), space(), pattern.format()])?;
-                    }
-                    write!(f, [text(")")])?;
-                }
-                if !kwd_attrs.is_empty() {
-                    write!(f, [text("(")])?;
-                    if let Some(attr) = kwd_attrs.first() {
-                        write!(f, [dynamic_text(attr, TextSize::default())])?;
-                    }
-                    for attr in kwd_attrs.iter().skip(1) {
-                        write!(
-                            f,
-                            [text(","), space(), dynamic_text(attr, TextSize::default())]
-                        )?;
-                    }
-                    write!(f, [text(")")])?;
-                }
-                if !kwd_patterns.is_empty() {
-                    write!(f, [text("(")])?;
-                    if let Some(pattern) = kwd_patterns.first() {
-                        write!(f, [pattern.format()])?;
-                    }
-                    for pattern in kwd_patterns.iter().skip(1) {
-                        write!(f, [text(","), space(), pattern.format()])?;
-                    }
-                    write!(f, [text(")")])?;
-                }
-            }
-            PatternKind::MatchStar { name } => {
-                if let Some(name) = &name {
-                    write!(f, [text("*"), dynamic_text(name, TextSize::default())])?;
-                } else {
-                    write!(f, [text("*_")])?;
-                }
-            }
-            PatternKind::MatchAs { pattern, name } => {
-                if let Some(pattern) = &pattern {
-                    write!(f, [pattern.format()])?;
-                    write!(f, [space()])?;
-                    write!(f, [text("as")])?;
-                    write!(f, [space()])?;
-                }
-                if let Some(name) = &name {
-                    write!(f, [dynamic_text(name, TextSize::default())])?;
-                } else {
-                    write!(f, [text("_")])?;
-                }
-            }
-            PatternKind::MatchOr { patterns } => {
-                write!(f, [patterns[0].format()])?;
-                for pattern in patterns.iter().skip(1) {
-                    write!(f, [space(), text("|"), space(), pattern.format()])?;
-                }
-            }
-        }
-
-        Ok(())
-    }
-}
diff --git a/crates/ruff_python_formatter/src/format/stmt.rs b/crates/ruff_python_formatter/src/format/stmt.rs
deleted file mode 100644
index 40fcfbc9d15e4..0000000000000
--- a/crates/ruff_python_formatter/src/format/stmt.rs
+++ /dev/null
@@ -1,960 +0,0 @@
-#![allow(unused_variables, clippy::too_many_arguments)]
-
-use ruff_formatter::prelude::*;
-use ruff_formatter::{format_args, write};
-use ruff_text_size::TextSize;
-
-use crate::context::ASTFormatContext;
-use crate::cst::{
-    Alias, Arguments, Body, Excepthandler, Expr, ExprKind, Keyword, MatchCase, Operator, Stmt,
-    StmtKind, Withitem,
-};
-use crate::format::builders::{block, join_names};
-use crate::format::comments::{end_of_line_comments, leading_comments, trailing_comments};
-use crate::format::helpers::is_self_closing;
-use crate::shared_traits::AsFormat;
-
-fn format_break(f: &mut Formatter<ASTFormatContext<'_>>, stmt: &Stmt) -> FormatResult<()> {
-    write!(f, [text("break")])?;
-    write!(f, [end_of_line_comments(stmt)])?;
-    Ok(())
-}
-
-fn format_pass(f: &mut Formatter<ASTFormatContext<'_>>, stmt: &Stmt) -> FormatResult<()> {
-    write!(f, [text("pass")])?;
-    write!(f, [end_of_line_comments(stmt)])?;
-    Ok(())
-}
-
-fn format_continue(f: &mut Formatter<ASTFormatContext<'_>>, stmt: &Stmt) -> FormatResult<()> {
-    write!(f, [text("continue")])?;
-    write!(f, [end_of_line_comments(stmt)])?;
-    Ok(())
-}
-
-fn format_global(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    stmt: &Stmt,
-    names: &[String],
-) -> FormatResult<()> {
-    write!(f, [text("global")])?;
-    if !names.is_empty() {
-        write!(f, [space(), join_names(names)])?;
-    }
-    write!(f, [end_of_line_comments(stmt)])?;
-    Ok(())
-}
-
-fn format_nonlocal(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    stmt: &Stmt,
-    names: &[String],
-) -> FormatResult<()> {
-    write!(f, [text("nonlocal")])?;
-    if !names.is_empty() {
-        write!(f, [space(), join_names(names)])?;
-    }
-    write!(f, [end_of_line_comments(stmt)])?;
-    Ok(())
-}
-
-fn format_delete(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    stmt: &Stmt,
-    targets: &[Expr],
-) -> FormatResult<()> {
-    write!(f, [text("del")])?;
-    match targets.len() {
-        0 => {}
-        1 => write!(f, [space(), targets[0].format()])?,
-        _ => {
-            write!(
-                f,
-                [
-                    space(),
-                    group(&format_args![
-                        if_group_breaks(&text("(")),
-                        soft_block_indent(&format_with(|f| {
-                            for (i, target) in targets.iter().enumerate() {
-                                write!(f, [target.format()])?;
-
-                                if i < targets.len() - 1 {
-                                    write!(f, [text(","), soft_line_break_or_space()])?;
-                                } else {
-                                    write!(f, [if_group_breaks(&text(","))])?;
-                                }
-                            }
-                            Ok(())
-                        })),
-                        if_group_breaks(&text(")")),
-                    ])
-                ]
-            )?;
-        }
-    }
-    write!(f, [end_of_line_comments(stmt)])?;
-    Ok(())
-}
-
-fn format_class_def(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    name: &str,
-    bases: &[Expr],
-    keywords: &[Keyword],
-    body: &Body,
-    decorator_list: &[Expr],
-) -> FormatResult<()> {
-    for decorator in decorator_list {
-        write!(f, [text("@"), decorator.format(), hard_line_break()])?;
-    }
-
-    write!(f, [leading_comments(body)])?;
-
-    write!(
-        f,
-        [
-            text("class"),
-            space(),
-            dynamic_text(name, TextSize::default())
-        ]
-    )?;
-
-    if !bases.is_empty() || !keywords.is_empty() {
-        let format_bases = format_with(|f| {
-            for (i, expr) in bases.iter().enumerate() {
-                write!(f, [expr.format()])?;
-
-                if i < bases.len() - 1 || !keywords.is_empty() {
-                    write!(f, [text(","), soft_line_break_or_space()])?;
-                } else {
-                    write!(f, [if_group_breaks(&text(","))])?;
-                }
-
-                for (i, keyword) in keywords.iter().enumerate() {
-                    write!(f, [keyword.format()])?;
-                    if i < keywords.len() - 1 {
-                        write!(f, [text(","), soft_line_break_or_space()])?;
-                    } else {
-                        write!(f, [if_group_breaks(&text(","))])?;
-                    }
-                }
-            }
-            Ok(())
-        });
-
-        write!(
-            f,
-            [
-                text("("),
-                group(&soft_block_indent(&format_bases)),
-                text(")")
-            ]
-        )?;
-    }
-
-    write!(f, [end_of_line_comments(body)])?;
-    write!(f, [text(":"), block_indent(&block(body))])
-}
-
-fn format_func_def(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    stmt: &Stmt,
-    name: &str,
-    args: &Arguments,
-    returns: Option<&Expr>,
-    body: &Body,
-    decorator_list: &[Expr],
-    async_: bool,
-) -> FormatResult<()> {
-    for decorator in decorator_list {
-        write!(f, [text("@"), decorator.format(), hard_line_break()])?;
-    }
-
-    write!(f, [leading_comments(body)])?;
-
-    if async_ {
-        write!(f, [text("async"), space()])?;
-    }
-    write!(
-        f,
-        [
-            text("def"),
-            space(),
-            dynamic_text(name, TextSize::default()),
-            text("("),
-            group(&soft_block_indent(&format_with(|f| {
-                if stmt.trivia.iter().any(|c| c.kind.is_magic_trailing_comma()) {
-                    write!(f, [expand_parent()])?;
-                }
-                write!(f, [args.format()])
-            }))),
-            text(")")
-        ]
-    )?;
-
-    if let Some(returns) = returns {
-        write!(f, [text(" -> "), returns.format()])?;
-    }
-
-    write!(f, [text(":")])?;
-    write!(f, [end_of_line_comments(body)])?;
-    write!(f, [block_indent(&block(body))])?;
-
-    Ok(())
-}
-
-fn format_assign(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    stmt: &Stmt,
-    targets: &[Expr],
-    value: &Expr,
-) -> FormatResult<()> {
-    write!(f, [targets[0].format()])?;
-
-    for target in &targets[1..] {
-        // TODO(charlie): This doesn't match Black's behavior. We need to parenthesize
-        // this expression sometimes.
-        write!(f, [text(" = "), target.format()])?;
-    }
-    write!(f, [text(" = ")])?;
-    if is_self_closing(value) {
-        write!(f, [group(&value.format())])?;
-    } else {
-        write!(
-            f,
-            [group(&format_args![
-                if_group_breaks(&text("(")),
-                soft_block_indent(&value.format()),
-                if_group_breaks(&text(")")),
-            ])]
-        )?;
-    }
-
-    write!(f, [end_of_line_comments(stmt)])?;
-
-    Ok(())
-}
-
-fn format_aug_assign(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    stmt: &Stmt,
-    target: &Expr,
-    op: &Operator,
-    value: &Expr,
-) -> FormatResult<()> {
-    write!(f, [target.format()])?;
-    write!(f, [text(" "), op.format(), text("=")])?;
-    if is_self_closing(value) {
-        write!(f, [space(), group(&value.format())])?;
-    } else {
-        write!(
-            f,
-            [
-                space(),
-                group(&format_args![
-                    if_group_breaks(&text("(")),
-                    soft_block_indent(&value.format()),
-                    if_group_breaks(&text(")")),
-                ])
-            ]
-        )?;
-    }
-    write!(f, [end_of_line_comments(stmt)])?;
-    Ok(())
-}
-
-fn format_ann_assign(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    stmt: &Stmt,
-    target: &Expr,
-    annotation: &Expr,
-    value: Option<&Expr>,
-    simple: usize,
-) -> FormatResult<()> {
-    let need_parens = matches!(target.node, ExprKind::Name { .. }) && simple == 0;
-    if need_parens {
-        write!(f, [text("(")])?;
-    }
-    write!(f, [target.format()])?;
-    if need_parens {
-        write!(f, [text(")")])?;
-    }
-    write!(f, [text(": "), annotation.format()])?;
-
-    if let Some(value) = value {
-        write!(
-            f,
-            [
-                space(),
-                text("="),
-                space(),
-                group(&format_args![
-                    if_group_breaks(&text("(")),
-                    soft_block_indent(&value.format()),
-                    if_group_breaks(&text(")")),
-                ])
-            ]
-        )?;
-    }
-
-    Ok(())
-}
-
-fn format_for(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    stmt: &Stmt,
-    target: &Expr,
-    iter: &Expr,
-    body: &Body,
-    orelse: Option<&Body>,
-    _type_comment: Option<&str>,
-    async_: bool,
-) -> FormatResult<()> {
-    if async_ {
-        write!(f, [text("async"), space()])?;
-    }
-    write!(
-        f,
-        [
-            text("for"),
-            space(),
-            group(&target.format()),
-            space(),
-            text("in"),
-            space(),
-            group(&iter.format()),
-            text(":"),
-            end_of_line_comments(body),
-            block_indent(&block(body))
-        ]
-    )?;
-    if let Some(orelse) = orelse {
-        write!(
-            f,
-            [
-                text("else:"),
-                end_of_line_comments(orelse),
-                block_indent(&block(orelse))
-            ]
-        )?;
-    }
-    Ok(())
-}
-
-fn format_while(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    stmt: &Stmt,
-    test: &Expr,
-    body: &Body,
-    orelse: Option<&Body>,
-) -> FormatResult<()> {
-    write!(f, [text("while"), space()])?;
-    if is_self_closing(test) {
-        write!(f, [test.format()])?;
-    } else {
-        write!(
-            f,
-            [group(&format_args![
-                if_group_breaks(&text("(")),
-                soft_block_indent(&test.format()),
-                if_group_breaks(&text(")")),
-            ])]
-        )?;
-    }
-    write!(
-        f,
-        [
-            text(":"),
-            end_of_line_comments(body),
-            block_indent(&block(body))
-        ]
-    )?;
-    if let Some(orelse) = orelse {
-        write!(
-            f,
-            [
-                text("else:"),
-                end_of_line_comments(orelse),
-                block_indent(&block(orelse))
-            ]
-        )?;
-    }
-    Ok(())
-}
-
-fn format_if(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    test: &Expr,
-    body: &Body,
-    orelse: Option<&Body>,
-    is_elif: bool,
-) -> FormatResult<()> {
-    if is_elif {
-        write!(f, [text("elif"), space()])?;
-    } else {
-        write!(f, [text("if"), space()])?;
-    }
-    if is_self_closing(test) {
-        write!(f, [test.format()])?;
-    } else {
-        write!(
-            f,
-            [group(&format_args![
-                if_group_breaks(&text("(")),
-                soft_block_indent(&test.format()),
-                if_group_breaks(&text(")")),
-            ])]
-        )?;
-    }
-    write!(
-        f,
-        [
-            text(":"),
-            end_of_line_comments(body),
-            block_indent(&block(body))
-        ]
-    )?;
-    if let Some(orelse) = orelse {
-        if orelse.node.len() == 1 {
-            if let StmtKind::If {
-                test,
-                body,
-                orelse,
-                is_elif: true,
-            } = &orelse.node[0].node
-            {
-                format_if(f, test, body, orelse.as_ref(), true)?;
-            } else {
-                write!(
-                    f,
-                    [
-                        text("else:"),
-                        end_of_line_comments(orelse),
-                        block_indent(&block(orelse))
-                    ]
-                )?;
-            }
-        } else {
-            write!(
-                f,
-                [
-                    text("else:"),
-                    end_of_line_comments(orelse),
-                    block_indent(&block(orelse))
-                ]
-            )?;
-        }
-    }
-    Ok(())
-}
-
-fn format_match(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    stmt: &Stmt,
-    subject: &Expr,
-    cases: &[MatchCase],
-) -> FormatResult<()> {
-    write!(
-        f,
-        [
-            text("match"),
-            space(),
-            subject.format(),
-            text(":"),
-            end_of_line_comments(stmt),
-        ]
-    )?;
-    for case in cases {
-        write!(f, [block_indent(&case.format())])?;
-    }
-    Ok(())
-}
-
-fn format_raise(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    stmt: &Stmt,
-    exc: Option<&Expr>,
-    cause: Option<&Expr>,
-) -> FormatResult<()> {
-    write!(f, [text("raise")])?;
-    if let Some(exc) = exc {
-        write!(f, [space(), exc.format()])?;
-        if let Some(cause) = cause {
-            write!(f, [space(), text("from"), space(), cause.format()])?;
-        }
-    }
-    Ok(())
-}
-
-fn format_return(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    stmt: &Stmt,
-    value: Option<&Expr>,
-) -> FormatResult<()> {
-    write!(f, [text("return")])?;
-    if let Some(value) = value {
-        write!(f, [space(), value.format()])?;
-    }
-
-    write!(f, [end_of_line_comments(stmt)])?;
-
-    Ok(())
-}
-
-fn format_try(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    stmt: &Stmt,
-    body: &Body,
-    handlers: &[Excepthandler],
-    orelse: Option<&Body>,
-    finalbody: Option<&Body>,
-) -> FormatResult<()> {
-    write!(
-        f,
-        [
-            text("try:"),
-            end_of_line_comments(body),
-            block_indent(&block(body))
-        ]
-    )?;
-    for handler in handlers {
-        write!(f, [handler.format()])?;
-    }
-    if let Some(orelse) = orelse {
-        write!(f, [text("else:")])?;
-        write!(f, [end_of_line_comments(orelse)])?;
-        write!(f, [block_indent(&block(orelse))])?;
-    }
-    if let Some(finalbody) = finalbody {
-        write!(f, [text("finally:")])?;
-        write!(f, [end_of_line_comments(finalbody)])?;
-        write!(f, [block_indent(&block(finalbody))])?;
-    }
-    Ok(())
-}
-
-fn format_try_star(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    stmt: &Stmt,
-    body: &Body,
-    handlers: &[Excepthandler],
-    orelse: Option<&Body>,
-    finalbody: Option<&Body>,
-) -> FormatResult<()> {
-    write!(
-        f,
-        [
-            text("try:"),
-            end_of_line_comments(body),
-            block_indent(&block(body))
-        ]
-    )?;
-    for handler in handlers {
-        // TODO(charlie): Include `except*`.
-        write!(f, [handler.format()])?;
-    }
-    if let Some(orelse) = orelse {
-        write!(
-            f,
-            [
-                text("else:"),
-                end_of_line_comments(orelse),
-                block_indent(&block(orelse))
-            ]
-        )?;
-    }
-    if let Some(finalbody) = finalbody {
-        write!(
-            f,
-            [
-                text("finally:"),
-                end_of_line_comments(finalbody),
-                block_indent(&block(finalbody))
-            ]
-        )?;
-    }
-    Ok(())
-}
-
-fn format_assert(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    stmt: &Stmt,
-    test: &Expr,
-    msg: Option<&Expr>,
-) -> FormatResult<()> {
-    write!(f, [text("assert"), space()])?;
-    write!(
-        f,
-        [group(&format_args![
-            if_group_breaks(&text("(")),
-            soft_block_indent(&test.format()),
-            if_group_breaks(&text(")")),
-        ])]
-    )?;
-    if let Some(msg) = msg {
-        write!(
-            f,
-            [
-                text(","),
-                space(),
-                group(&format_args![
-                    if_group_breaks(&text("(")),
-                    soft_block_indent(&msg.format()),
-                    if_group_breaks(&text(")")),
-                ])
-            ]
-        )?;
-    }
-    Ok(())
-}
-
-fn format_import(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    stmt: &Stmt,
-    names: &[Alias],
-) -> FormatResult<()> {
-    write!(
-        f,
-        [
-            text("import"),
-            space(),
-            group(&format_args![
-                if_group_breaks(&text("(")),
-                soft_block_indent(&format_with(|f| {
-                    for (i, name) in names.iter().enumerate() {
-                        write!(f, [name.format()])?;
-                        if i < names.len() - 1 {
-                            write!(f, [text(","), soft_line_break_or_space()])?;
-                        } else {
-                            write!(f, [if_group_breaks(&text(","))])?;
-                        }
-                    }
-                    Ok(())
-                })),
-                if_group_breaks(&text(")")),
-            ])
-        ]
-    )
-}
-
-fn format_import_from(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    stmt: &Stmt,
-    module: Option<&str>,
-    names: &[Alias],
-    level: Option<usize>,
-) -> FormatResult<()> {
-    write!(f, [text("from")])?;
-    write!(f, [space()])?;
-
-    if let Some(level) = level {
-        for _ in 0..level {
-            write!(f, [text(".")])?;
-        }
-    }
-    if let Some(module) = module {
-        write!(f, [dynamic_text(module, TextSize::default())])?;
-    }
-    write!(f, [space()])?;
-
-    write!(f, [text("import")])?;
-    write!(f, [space()])?;
-
-    if names.iter().any(|name| name.node.name == "*") {
-        write!(f, [text("*")])?;
-    } else {
-        let magic_trailing_comma = stmt.trivia.iter().any(|c| c.kind.is_magic_trailing_comma());
-        write!(
-            f,
-            [group(&format_args![
-                if_group_breaks(&text("(")),
-                soft_block_indent(&format_with(|f| {
-                    if magic_trailing_comma {
-                        write!(f, [expand_parent()])?;
-                    }
-                    for (i, name) in names.iter().enumerate() {
-                        write!(f, [name.format()])?;
-                        if i < names.len() - 1 {
-                            write!(f, [text(",")])?;
-                            write!(f, [soft_line_break_or_space()])?;
-                        } else {
-                            write!(f, [if_group_breaks(&text(","))])?;
-                        }
-                    }
-                    Ok(())
-                })),
-                if_group_breaks(&text(")")),
-            ])]
-        )?;
-    }
-
-    write!(f, [end_of_line_comments(stmt)])?;
-
-    Ok(())
-}
-
-fn format_expr(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    stmt: &Stmt,
-    expr: &Expr,
-) -> FormatResult<()> {
-    if stmt.parentheses.is_always() {
-        write!(
-            f,
-            [group(&format_args![
-                text("("),
-                soft_block_indent(&format_args![expr.format()]),
-                text(")"),
-            ])]
-        )?;
-    } else if is_self_closing(expr) {
-        write!(f, [group(&format_args![expr.format()])])?;
-    } else {
-        write!(
-            f,
-            [group(&format_args![
-                if_group_breaks(&text("(")),
-                soft_block_indent(&format_args![expr.format()]),
-                if_group_breaks(&text(")")),
-            ])]
-        )?;
-    }
-
-    write!(f, [end_of_line_comments(stmt)])?;
-
-    Ok(())
-}
-
-fn format_with_(
-    f: &mut Formatter<ASTFormatContext<'_>>,
-    stmt: &Stmt,
-    items: &[Withitem],
-    body: &Body,
-    type_comment: Option<&str>,
-    async_: bool,
-) -> FormatResult<()> {
-    if async_ {
-        write!(f, [text("async"), space()])?;
-    }
-    write!(
-        f,
-        [
-            text("with"),
-            space(),
-            group(&format_args![
-                if_group_breaks(&text("(")),
-                soft_block_indent(&format_with(|f| {
-                    for (i, item) in items.iter().enumerate() {
-                        write!(f, [item.format()])?;
-                        if i < items.len() - 1 {
-                            write!(f, [text(","), soft_line_break_or_space()])?;
-                        } else {
-                            write!(f, [if_group_breaks(&text(","))])?;
-                        }
-                    }
-                    Ok(())
-                })),
-                if_group_breaks(&text(")")),
-            ]),
-            text(":"),
-            end_of_line_comments(body),
-            block_indent(&block(body))
-        ]
-    )?;
-    Ok(())
-}
-
-pub struct FormatStmt<'a> {
-    item: &'a Stmt,
-}
-
-impl Format<ASTFormatContext<'_>> for FormatStmt<'_> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext<'_>>) -> FormatResult<()> {
-        write!(f, [leading_comments(self.item)])?;
-
-        match &self.item.node {
-            StmtKind::Pass => format_pass(f, self.item),
-            StmtKind::Break => format_break(f, self.item),
-            StmtKind::Continue => format_continue(f, self.item),
-            StmtKind::Global { names } => format_global(f, self.item, names),
-            StmtKind::Nonlocal { names } => format_nonlocal(f, self.item, names),
-            StmtKind::FunctionDef {
-                name,
-                args,
-                body,
-                decorator_list,
-                returns,
-                ..
-            } => format_func_def(
-                f,
-                self.item,
-                name,
-                args,
-                returns.as_deref(),
-                body,
-                decorator_list,
-                false,
-            ),
-            StmtKind::AsyncFunctionDef {
-                name,
-                args,
-                body,
-                decorator_list,
-                returns,
-                ..
-            } => format_func_def(
-                f,
-                self.item,
-                name,
-                args,
-                returns.as_deref(),
-                body,
-                decorator_list,
-                true,
-            ),
-            StmtKind::ClassDef {
-                name,
-                bases,
-                keywords,
-                body,
-                decorator_list,
-            } => format_class_def(f, name, bases, keywords, body, decorator_list),
-            StmtKind::Return { value } => format_return(f, self.item, value.as_ref()),
-            StmtKind::Delete { targets } => format_delete(f, self.item, targets),
-            StmtKind::Assign { targets, value, .. } => format_assign(f, self.item, targets, value),
-            StmtKind::AugAssign { target, op, value } => {
-                format_aug_assign(f, self.item, target, op, value)
-            }
-            StmtKind::AnnAssign {
-                target,
-                annotation,
-                value,
-                simple,
-            } => format_ann_assign(f, self.item, target, annotation, value.as_deref(), *simple),
-            StmtKind::For {
-                target,
-                iter,
-                body,
-                orelse,
-                type_comment,
-            } => format_for(
-                f,
-                self.item,
-                target,
-                iter,
-                body,
-                orelse.as_ref(),
-                type_comment.as_deref(),
-                false,
-            ),
-            StmtKind::AsyncFor {
-                target,
-                iter,
-                body,
-                orelse,
-                type_comment,
-            } => format_for(
-                f,
-                self.item,
-                target,
-                iter,
-                body,
-                orelse.as_ref(),
-                type_comment.as_deref(),
-                true,
-            ),
-            StmtKind::While { test, body, orelse } => {
-                format_while(f, self.item, test, body, orelse.as_ref())
-            }
-            StmtKind::If {
-                test,
-                body,
-                orelse,
-                is_elif,
-            } => format_if(f, test, body, orelse.as_ref(), *is_elif),
-            StmtKind::With {
-                items,
-                body,
-                type_comment,
-            } => format_with_(
-                f,
-                self.item,
-                items,
-                body,
-                type_comment.as_ref().map(String::as_str),
-                false,
-            ),
-            StmtKind::AsyncWith {
-                items,
-                body,
-                type_comment,
-            } => format_with_(
-                f,
-                self.item,
-                items,
-                body,
-                type_comment.as_ref().map(String::as_str),
-                true,
-            ),
-            StmtKind::Match { subject, cases } => format_match(f, self.item, subject, cases),
-            StmtKind::Raise { exc, cause } => {
-                format_raise(f, self.item, exc.as_deref(), cause.as_deref())
-            }
-            StmtKind::Try {
-                body,
-                handlers,
-                orelse,
-                finalbody,
-            } => format_try(
-                f,
-                self.item,
-                body,
-                handlers,
-                orelse.as_ref(),
-                finalbody.as_ref(),
-            ),
-            StmtKind::TryStar {
-                body,
-                handlers,
-                orelse,
-                finalbody,
-            } => format_try_star(
-                f,
-                self.item,
-                body,
-                handlers,
-                orelse.as_ref(),
-                finalbody.as_ref(),
-            ),
-            StmtKind::Assert { test, msg } => {
-                format_assert(f, self.item, test, msg.as_ref().map(|expr| &**expr))
-            }
-            StmtKind::Import { names } => format_import(f, self.item, names),
-            StmtKind::ImportFrom {
-                module,
-                names,
-                level,
-            } => format_import_from(
-                f,
-                self.item,
-                module.as_ref().map(String::as_str),
-                names,
-                *level,
-            ),
-            StmtKind::Expr { value } => format_expr(f, self.item, value),
-        }?;
-
-        write!(f, [hard_line_break()])?;
-        write!(f, [trailing_comments(self.item)])?;
-
-        Ok(())
-    }
-}
-
-impl AsFormat<ASTFormatContext<'_>> for Stmt {
-    type Format<'a> = FormatStmt<'a>;
-
-    fn format(&self) -> Self::Format<'_> {
-        FormatStmt { item: self }
-    }
-}
diff --git a/crates/ruff_python_formatter/src/format/strings.rs b/crates/ruff_python_formatter/src/format/strings.rs
deleted file mode 100644
index c0088248320a3..0000000000000
--- a/crates/ruff_python_formatter/src/format/strings.rs
+++ /dev/null
@@ -1,249 +0,0 @@
-use rustpython_parser::{Mode, Tok};
-
-use ruff_formatter::prelude::*;
-use ruff_formatter::{write, Format};
-use ruff_python_ast::str::{leading_quote, trailing_quote};
-use ruff_text_size::{TextRange, TextSize};
-
-use crate::context::ASTFormatContext;
-use crate::cst::Expr;
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct StringLiteralPart {
-    range: TextRange,
-}
-
-impl Format<ASTFormatContext<'_>> for StringLiteralPart {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext<'_>>) -> FormatResult<()> {
-        let contents = f.context().contents();
-
-        // Extract leading and trailing quotes.
-        let contents = &contents[self.range];
-        let leading_quote = leading_quote(contents).unwrap();
-        let trailing_quote = trailing_quote(contents).unwrap();
-        let body = &contents[leading_quote.len()..contents.len() - trailing_quote.len()];
-
-        // Determine the correct quote style.
-        // TODO(charlie): Make this parameterizable.
-        let mut squotes: usize = 0;
-        let mut dquotes: usize = 0;
-        for char in body.chars() {
-            if char == '\'' {
-                squotes += 1;
-            } else if char == '"' {
-                dquotes += 1;
-            }
-        }
-
-        // Retain raw prefixes.
-        let mut is_raw = false;
-        if leading_quote.contains('r') {
-            is_raw = true;
-            f.write_element(FormatElement::StaticText { text: "r" })?;
-        } else if leading_quote.contains('R') {
-            is_raw = true;
-            f.write_element(FormatElement::StaticText { text: "R" })?;
-        }
-
-        // Normalize bytes literals to use b"...".
-        if leading_quote.contains('b') || leading_quote.contains('B') {
-            f.write_element(FormatElement::StaticText { text: "b" })?;
-        }
-
-        // TODO(charlie): Avoid allocating if there's nothing to escape. In other words, if we can
-        // use the string body directly, do so!
-        if trailing_quote.len() == 1 {
-            // Single-quoted string.
-            if dquotes == 0 || squotes > 0 {
-                // If the body doesn't contain any double quotes, or it contains both single and
-                // double quotes, use double quotes.
-                f.write_element(FormatElement::StaticText { text: "\"" })?;
-                f.write_element(FormatElement::DynamicText {
-                    text: if is_raw {
-                        body.into()
-                    } else {
-                        double_escape(body).into()
-                    },
-                    source_position: TextSize::default(),
-                })?;
-                f.write_element(FormatElement::StaticText { text: "\"" })?;
-                Ok(())
-            } else {
-                f.write_element(FormatElement::StaticText { text: "'" })?;
-                f.write_element(FormatElement::DynamicText {
-                    text: if is_raw {
-                        body.into()
-                    } else {
-                        single_escape(body).into()
-                    },
-                    source_position: TextSize::default(),
-                })?;
-                f.write_element(FormatElement::StaticText { text: "'" })?;
-                Ok(())
-            }
-        } else if trailing_quote.len() == 3 {
-            // Triple-quoted string.
-            if body.starts_with("\"\"\"") || body.ends_with('"') {
-                // We only need to use single quotes if the string body starts with three or more
-                // double quotes, or ends with a double quote. Converting to double quotes in those
-                // cases would cause a syntax error.
-                f.write_element(FormatElement::StaticText { text: "'''" })?;
-                f.write_element(FormatElement::DynamicText {
-                    text: body.to_string().into_boxed_str(),
-                    source_position: TextSize::default(),
-                })?;
-                f.write_element(FormatElement::StaticText { text: "'''" })?;
-                Ok(())
-            } else {
-                f.write_element(FormatElement::StaticText { text: "\"\"\"" })?;
-                f.write_element(FormatElement::DynamicText {
-                    text: body.to_string().into_boxed_str(),
-                    source_position: TextSize::default(),
-                })?;
-                f.write_element(FormatElement::StaticText { text: "\"\"\"" })?;
-                Ok(())
-            }
-        } else {
-            unreachable!("Invalid quote length: {}", trailing_quote.len());
-        }
-    }
-}
-
-#[inline]
-pub const fn string_literal_part(range: TextRange) -> StringLiteralPart {
-    StringLiteralPart { range }
-}
-
-#[derive(Debug, Copy, Clone)]
-pub struct StringLiteral<'a> {
-    expr: &'a Expr,
-}
-
-impl Format<ASTFormatContext<'_>> for StringLiteral<'_> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext<'_>>) -> FormatResult<()> {
-        let expr = self.expr;
-
-        // TODO(charlie): This tokenization needs to happen earlier, so that we can attach
-        // comments to individual string literals.
-        let contents = f.context().locator().slice(expr.range());
-        let elts = rustpython_parser::lexer::lex_located(contents, Mode::Module, expr.start())
-            .flatten()
-            .filter_map(|(tok, range)| {
-                if matches!(tok, Tok::String { .. }) {
-                    Some(range)
-                } else {
-                    None
-                }
-            })
-            .collect::<Vec<_>>();
-        write!(
-            f,
-            [group(&format_with(|f| {
-                if expr.parentheses.is_if_expanded() {
-                    write!(f, [if_group_breaks(&text("("))])?;
-                }
-                for (i, elt) in elts.iter().enumerate() {
-                    write!(f, [string_literal_part(*elt)])?;
-                    if i < elts.len() - 1 {
-                        write!(f, [soft_line_break_or_space()])?;
-                    }
-                }
-                if expr.parentheses.is_if_expanded() {
-                    write!(f, [if_group_breaks(&text(")"))])?;
-                }
-                Ok(())
-            }))]
-        )?;
-        Ok(())
-    }
-}
-
-#[inline]
-pub const fn string_literal(expr: &Expr) -> StringLiteral {
-    StringLiteral { expr }
-}
-
-/// Escape a string body to be used in a string literal with double quotes.
-fn double_escape(text: &str) -> String {
-    let mut escaped = String::with_capacity(text.len());
-    let mut chars = text.chars().peekable();
-    while let Some(ch) = chars.next() {
-        if ch == '\\' {
-            let Some(next) = chars.peek() else {
-                break;
-            };
-            if *next == '\'' {
-                chars.next();
-                escaped.push('\'');
-            } else if *next == '"' {
-                chars.next();
-                escaped.push('\\');
-                escaped.push('"');
-            } else if *next == '\\' {
-                chars.next();
-                escaped.push('\\');
-                escaped.push(ch);
-            } else {
-                escaped.push(ch);
-            }
-        } else if ch == '"' {
-            escaped.push('\\');
-            escaped.push('"');
-        } else {
-            escaped.push(ch);
-        }
-    }
-    escaped
-}
-
-/// Escape a string body to be used in a string literal with single quotes.
-fn single_escape(text: &str) -> String {
-    let mut escaped = String::with_capacity(text.len());
-    let mut chars = text.chars().peekable();
-    while let Some(ch) = chars.next() {
-        if ch == '\\' {
-            let Some(next) = chars.peek() else {
-                break;
-            };
-            if *next == '"' {
-                chars.next();
-                escaped.push('"');
-            } else if *next == '\'' {
-                chars.next();
-                escaped.push('\\');
-                escaped.push('\'');
-            } else if *next == '\\' {
-                chars.next();
-                escaped.push('\\');
-                escaped.push(ch);
-            } else {
-                escaped.push(ch);
-            }
-        } else if ch == '\'' {
-            escaped.push('\\');
-            escaped.push('\'');
-        } else {
-            escaped.push(ch);
-        }
-    }
-    escaped
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_double_escape() {
-        assert_eq!(double_escape(r#"It\'s mine"#), r#"It's mine"#);
-        assert_eq!(double_escape(r#"It\'s "mine""#), r#"It's \"mine\""#);
-        assert_eq!(double_escape(r#"It\\'s mine"#), r#"It\\'s mine"#);
-    }
-
-    #[test]
-    fn test_single_escape() {
-        assert_eq!(single_escape(r#"It's mine"#), r#"It\'s mine"#);
-        assert_eq!(single_escape(r#"It\'s "mine""#), r#"It\'s "mine""#);
-        assert_eq!(single_escape(r#"It\\'s mine"#), r#"It\\\'s mine"#);
-    }
-}
diff --git a/crates/ruff_python_formatter/src/format/unary_op.rs b/crates/ruff_python_formatter/src/format/unary_op.rs
deleted file mode 100644
index 5e51d251c2a8b..0000000000000
--- a/crates/ruff_python_formatter/src/format/unary_op.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use ruff_formatter::prelude::*;
-use ruff_formatter::write;
-
-use crate::context::ASTFormatContext;
-use crate::cst::{UnaryOp, UnaryOpKind};
-use crate::shared_traits::AsFormat;
-
-pub struct FormatUnaryOp<'a> {
-    item: &'a UnaryOp,
-}
-
-impl AsFormat<ASTFormatContext<'_>> for UnaryOp {
-    type Format<'a> = FormatUnaryOp<'a>;
-
-    fn format(&self) -> Self::Format<'_> {
-        FormatUnaryOp { item: self }
-    }
-}
-
-impl Format<ASTFormatContext<'_>> for FormatUnaryOp<'_> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext>) -> FormatResult<()> {
-        let unary_op = self.item;
-        write!(
-            f,
-            [
-                text(match unary_op.node {
-                    UnaryOpKind::Invert => "~",
-                    UnaryOpKind::Not => "not",
-                    UnaryOpKind::UAdd => "+",
-                    UnaryOpKind::USub => "-",
-                }),
-                matches!(unary_op.node, UnaryOpKind::Not).then_some(space())
-            ]
-        )?;
-        Ok(())
-    }
-}
diff --git a/crates/ruff_python_formatter/src/format/withitem.rs b/crates/ruff_python_formatter/src/format/withitem.rs
deleted file mode 100644
index 50c309f86d576..0000000000000
--- a/crates/ruff_python_formatter/src/format/withitem.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use ruff_formatter::prelude::*;
-use ruff_formatter::write;
-
-use crate::context::ASTFormatContext;
-use crate::cst::Withitem;
-use crate::shared_traits::AsFormat;
-
-pub struct FormatWithitem<'a> {
-    item: &'a Withitem,
-}
-
-impl AsFormat<ASTFormatContext<'_>> for Withitem {
-    type Format<'a> = FormatWithitem<'a>;
-
-    fn format(&self) -> Self::Format<'_> {
-        FormatWithitem { item: self }
-    }
-}
-
-impl Format<ASTFormatContext<'_>> for FormatWithitem<'_> {
-    fn fmt(&self, f: &mut Formatter<ASTFormatContext>) -> FormatResult<()> {
-        let withitem = self.item;
-
-        write!(f, [withitem.context_expr.format()])?;
-        if let Some(optional_vars) = &withitem.optional_vars {
-            write!(f, [space(), text("as"), space()])?;
-            write!(f, [optional_vars.format()])?;
-        }
-
-        Ok(())
-    }
-}
diff --git a/crates/ruff_python_formatter/src/generated.rs b/crates/ruff_python_formatter/src/generated.rs
new file mode 100644
index 0000000000000..3aeaccfe3fb51
--- /dev/null
+++ b/crates/ruff_python_formatter/src/generated.rs
@@ -0,0 +1,2860 @@
+//! This is a generated file. Don't modify it by hand! Run `scripts/generate.py` to re-generate the file.
+use crate::context::PyFormatContext;
+use crate::{AsFormat, FormatNodeRule, IntoFormat};
+use ruff_formatter::formatter::Formatter;
+use ruff_formatter::{FormatOwnedWithRule, FormatRefWithRule, FormatResult, FormatRule};
+use rustpython_parser::ast;
+
+impl FormatRule<ast::ModModule, PyFormatContext<'_>>
+    for crate::module::mod_module::FormatModModule
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ModModule,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ModModule>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ModModule {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ModModule,
+        crate::module::mod_module::FormatModModule,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(self, crate::module::mod_module::FormatModModule::default())
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ModModule {
+    type Format = FormatOwnedWithRule<
+        ast::ModModule,
+        crate::module::mod_module::FormatModModule,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(self, crate::module::mod_module::FormatModModule::default())
+    }
+}
+
+impl FormatRule<ast::ModInteractive, PyFormatContext<'_>>
+    for crate::module::mod_interactive::FormatModInteractive
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ModInteractive,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ModInteractive>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ModInteractive {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ModInteractive,
+        crate::module::mod_interactive::FormatModInteractive,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::module::mod_interactive::FormatModInteractive::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ModInteractive {
+    type Format = FormatOwnedWithRule<
+        ast::ModInteractive,
+        crate::module::mod_interactive::FormatModInteractive,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::module::mod_interactive::FormatModInteractive::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ModExpression, PyFormatContext<'_>>
+    for crate::module::mod_expression::FormatModExpression
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ModExpression,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ModExpression>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ModExpression {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ModExpression,
+        crate::module::mod_expression::FormatModExpression,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::module::mod_expression::FormatModExpression::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ModExpression {
+    type Format = FormatOwnedWithRule<
+        ast::ModExpression,
+        crate::module::mod_expression::FormatModExpression,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::module::mod_expression::FormatModExpression::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ModFunctionType, PyFormatContext<'_>>
+    for crate::module::mod_function_type::FormatModFunctionType
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ModFunctionType,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ModFunctionType>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ModFunctionType {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ModFunctionType,
+        crate::module::mod_function_type::FormatModFunctionType,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::module::mod_function_type::FormatModFunctionType::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ModFunctionType {
+    type Format = FormatOwnedWithRule<
+        ast::ModFunctionType,
+        crate::module::mod_function_type::FormatModFunctionType,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::module::mod_function_type::FormatModFunctionType::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtFunctionDef, PyFormatContext<'_>>
+    for crate::statement::stmt_function_def::FormatStmtFunctionDef
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtFunctionDef,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtFunctionDef>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtFunctionDef {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtFunctionDef,
+        crate::statement::stmt_function_def::FormatStmtFunctionDef,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_function_def::FormatStmtFunctionDef::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtFunctionDef {
+    type Format = FormatOwnedWithRule<
+        ast::StmtFunctionDef,
+        crate::statement::stmt_function_def::FormatStmtFunctionDef,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_function_def::FormatStmtFunctionDef::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtAsyncFunctionDef, PyFormatContext<'_>>
+    for crate::statement::stmt_async_function_def::FormatStmtAsyncFunctionDef
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtAsyncFunctionDef,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtAsyncFunctionDef>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtAsyncFunctionDef {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtAsyncFunctionDef,
+        crate::statement::stmt_async_function_def::FormatStmtAsyncFunctionDef,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_async_function_def::FormatStmtAsyncFunctionDef::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtAsyncFunctionDef {
+    type Format = FormatOwnedWithRule<
+        ast::StmtAsyncFunctionDef,
+        crate::statement::stmt_async_function_def::FormatStmtAsyncFunctionDef,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_async_function_def::FormatStmtAsyncFunctionDef::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtClassDef, PyFormatContext<'_>>
+    for crate::statement::stmt_class_def::FormatStmtClassDef
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtClassDef,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtClassDef>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtClassDef {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtClassDef,
+        crate::statement::stmt_class_def::FormatStmtClassDef,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_class_def::FormatStmtClassDef::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtClassDef {
+    type Format = FormatOwnedWithRule<
+        ast::StmtClassDef,
+        crate::statement::stmt_class_def::FormatStmtClassDef,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_class_def::FormatStmtClassDef::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtReturn, PyFormatContext<'_>>
+    for crate::statement::stmt_return::FormatStmtReturn
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtReturn,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtReturn>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtReturn {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtReturn,
+        crate::statement::stmt_return::FormatStmtReturn,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_return::FormatStmtReturn::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtReturn {
+    type Format = FormatOwnedWithRule<
+        ast::StmtReturn,
+        crate::statement::stmt_return::FormatStmtReturn,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_return::FormatStmtReturn::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtDelete, PyFormatContext<'_>>
+    for crate::statement::stmt_delete::FormatStmtDelete
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtDelete,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtDelete>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtDelete {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtDelete,
+        crate::statement::stmt_delete::FormatStmtDelete,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_delete::FormatStmtDelete::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtDelete {
+    type Format = FormatOwnedWithRule<
+        ast::StmtDelete,
+        crate::statement::stmt_delete::FormatStmtDelete,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_delete::FormatStmtDelete::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtAssign, PyFormatContext<'_>>
+    for crate::statement::stmt_assign::FormatStmtAssign
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtAssign,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtAssign>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtAssign {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtAssign,
+        crate::statement::stmt_assign::FormatStmtAssign,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_assign::FormatStmtAssign::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtAssign {
+    type Format = FormatOwnedWithRule<
+        ast::StmtAssign,
+        crate::statement::stmt_assign::FormatStmtAssign,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_assign::FormatStmtAssign::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtAugAssign, PyFormatContext<'_>>
+    for crate::statement::stmt_aug_assign::FormatStmtAugAssign
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtAugAssign,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtAugAssign>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtAugAssign {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtAugAssign,
+        crate::statement::stmt_aug_assign::FormatStmtAugAssign,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_aug_assign::FormatStmtAugAssign::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtAugAssign {
+    type Format = FormatOwnedWithRule<
+        ast::StmtAugAssign,
+        crate::statement::stmt_aug_assign::FormatStmtAugAssign,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_aug_assign::FormatStmtAugAssign::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtAnnAssign, PyFormatContext<'_>>
+    for crate::statement::stmt_ann_assign::FormatStmtAnnAssign
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtAnnAssign,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtAnnAssign>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtAnnAssign {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtAnnAssign,
+        crate::statement::stmt_ann_assign::FormatStmtAnnAssign,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_ann_assign::FormatStmtAnnAssign::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtAnnAssign {
+    type Format = FormatOwnedWithRule<
+        ast::StmtAnnAssign,
+        crate::statement::stmt_ann_assign::FormatStmtAnnAssign,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_ann_assign::FormatStmtAnnAssign::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtFor, PyFormatContext<'_>> for crate::statement::stmt_for::FormatStmtFor {
+    #[inline]
+    fn fmt(&self, node: &ast::StmtFor, f: &mut Formatter<PyFormatContext<'_>>) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtFor>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtFor {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtFor,
+        crate::statement::stmt_for::FormatStmtFor,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(self, crate::statement::stmt_for::FormatStmtFor::default())
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtFor {
+    type Format = FormatOwnedWithRule<
+        ast::StmtFor,
+        crate::statement::stmt_for::FormatStmtFor,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(self, crate::statement::stmt_for::FormatStmtFor::default())
+    }
+}
+
+impl FormatRule<ast::StmtAsyncFor, PyFormatContext<'_>>
+    for crate::statement::stmt_async_for::FormatStmtAsyncFor
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtAsyncFor,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtAsyncFor>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtAsyncFor {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtAsyncFor,
+        crate::statement::stmt_async_for::FormatStmtAsyncFor,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_async_for::FormatStmtAsyncFor::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtAsyncFor {
+    type Format = FormatOwnedWithRule<
+        ast::StmtAsyncFor,
+        crate::statement::stmt_async_for::FormatStmtAsyncFor,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_async_for::FormatStmtAsyncFor::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtWhile, PyFormatContext<'_>>
+    for crate::statement::stmt_while::FormatStmtWhile
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtWhile,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtWhile>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtWhile {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtWhile,
+        crate::statement::stmt_while::FormatStmtWhile,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_while::FormatStmtWhile::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtWhile {
+    type Format = FormatOwnedWithRule<
+        ast::StmtWhile,
+        crate::statement::stmt_while::FormatStmtWhile,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_while::FormatStmtWhile::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtIf, PyFormatContext<'_>> for crate::statement::stmt_if::FormatStmtIf {
+    #[inline]
+    fn fmt(&self, node: &ast::StmtIf, f: &mut Formatter<PyFormatContext<'_>>) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtIf>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtIf {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtIf,
+        crate::statement::stmt_if::FormatStmtIf,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(self, crate::statement::stmt_if::FormatStmtIf::default())
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtIf {
+    type Format = FormatOwnedWithRule<
+        ast::StmtIf,
+        crate::statement::stmt_if::FormatStmtIf,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(self, crate::statement::stmt_if::FormatStmtIf::default())
+    }
+}
+
+impl FormatRule<ast::StmtWith, PyFormatContext<'_>>
+    for crate::statement::stmt_with::FormatStmtWith
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtWith,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtWith>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtWith {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtWith,
+        crate::statement::stmt_with::FormatStmtWith,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(self, crate::statement::stmt_with::FormatStmtWith::default())
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtWith {
+    type Format = FormatOwnedWithRule<
+        ast::StmtWith,
+        crate::statement::stmt_with::FormatStmtWith,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(self, crate::statement::stmt_with::FormatStmtWith::default())
+    }
+}
+
+impl FormatRule<ast::StmtAsyncWith, PyFormatContext<'_>>
+    for crate::statement::stmt_async_with::FormatStmtAsyncWith
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtAsyncWith,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtAsyncWith>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtAsyncWith {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtAsyncWith,
+        crate::statement::stmt_async_with::FormatStmtAsyncWith,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_async_with::FormatStmtAsyncWith::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtAsyncWith {
+    type Format = FormatOwnedWithRule<
+        ast::StmtAsyncWith,
+        crate::statement::stmt_async_with::FormatStmtAsyncWith,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_async_with::FormatStmtAsyncWith::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtMatch, PyFormatContext<'_>>
+    for crate::statement::stmt_match::FormatStmtMatch
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtMatch,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtMatch>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtMatch {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtMatch,
+        crate::statement::stmt_match::FormatStmtMatch,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_match::FormatStmtMatch::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtMatch {
+    type Format = FormatOwnedWithRule<
+        ast::StmtMatch,
+        crate::statement::stmt_match::FormatStmtMatch,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_match::FormatStmtMatch::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtRaise, PyFormatContext<'_>>
+    for crate::statement::stmt_raise::FormatStmtRaise
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtRaise,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtRaise>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtRaise {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtRaise,
+        crate::statement::stmt_raise::FormatStmtRaise,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_raise::FormatStmtRaise::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtRaise {
+    type Format = FormatOwnedWithRule<
+        ast::StmtRaise,
+        crate::statement::stmt_raise::FormatStmtRaise,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_raise::FormatStmtRaise::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtTry, PyFormatContext<'_>> for crate::statement::stmt_try::FormatStmtTry {
+    #[inline]
+    fn fmt(&self, node: &ast::StmtTry, f: &mut Formatter<PyFormatContext<'_>>) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtTry>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtTry {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtTry,
+        crate::statement::stmt_try::FormatStmtTry,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(self, crate::statement::stmt_try::FormatStmtTry::default())
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtTry {
+    type Format = FormatOwnedWithRule<
+        ast::StmtTry,
+        crate::statement::stmt_try::FormatStmtTry,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(self, crate::statement::stmt_try::FormatStmtTry::default())
+    }
+}
+
+impl FormatRule<ast::StmtTryStar, PyFormatContext<'_>>
+    for crate::statement::stmt_try_star::FormatStmtTryStar
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtTryStar,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtTryStar>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtTryStar {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtTryStar,
+        crate::statement::stmt_try_star::FormatStmtTryStar,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_try_star::FormatStmtTryStar::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtTryStar {
+    type Format = FormatOwnedWithRule<
+        ast::StmtTryStar,
+        crate::statement::stmt_try_star::FormatStmtTryStar,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_try_star::FormatStmtTryStar::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtAssert, PyFormatContext<'_>>
+    for crate::statement::stmt_assert::FormatStmtAssert
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtAssert,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtAssert>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtAssert {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtAssert,
+        crate::statement::stmt_assert::FormatStmtAssert,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_assert::FormatStmtAssert::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtAssert {
+    type Format = FormatOwnedWithRule<
+        ast::StmtAssert,
+        crate::statement::stmt_assert::FormatStmtAssert,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_assert::FormatStmtAssert::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtImport, PyFormatContext<'_>>
+    for crate::statement::stmt_import::FormatStmtImport
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtImport,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtImport>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtImport {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtImport,
+        crate::statement::stmt_import::FormatStmtImport,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_import::FormatStmtImport::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtImport {
+    type Format = FormatOwnedWithRule<
+        ast::StmtImport,
+        crate::statement::stmt_import::FormatStmtImport,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_import::FormatStmtImport::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtImportFrom, PyFormatContext<'_>>
+    for crate::statement::stmt_import_from::FormatStmtImportFrom
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtImportFrom,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtImportFrom>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtImportFrom {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtImportFrom,
+        crate::statement::stmt_import_from::FormatStmtImportFrom,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_import_from::FormatStmtImportFrom::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtImportFrom {
+    type Format = FormatOwnedWithRule<
+        ast::StmtImportFrom,
+        crate::statement::stmt_import_from::FormatStmtImportFrom,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_import_from::FormatStmtImportFrom::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtGlobal, PyFormatContext<'_>>
+    for crate::statement::stmt_global::FormatStmtGlobal
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtGlobal,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtGlobal>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtGlobal {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtGlobal,
+        crate::statement::stmt_global::FormatStmtGlobal,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_global::FormatStmtGlobal::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtGlobal {
+    type Format = FormatOwnedWithRule<
+        ast::StmtGlobal,
+        crate::statement::stmt_global::FormatStmtGlobal,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_global::FormatStmtGlobal::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtNonlocal, PyFormatContext<'_>>
+    for crate::statement::stmt_nonlocal::FormatStmtNonlocal
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtNonlocal,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtNonlocal>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtNonlocal {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtNonlocal,
+        crate::statement::stmt_nonlocal::FormatStmtNonlocal,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_nonlocal::FormatStmtNonlocal::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtNonlocal {
+    type Format = FormatOwnedWithRule<
+        ast::StmtNonlocal,
+        crate::statement::stmt_nonlocal::FormatStmtNonlocal,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_nonlocal::FormatStmtNonlocal::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtExpr, PyFormatContext<'_>>
+    for crate::statement::stmt_expr::FormatStmtExpr
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtExpr,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtExpr>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtExpr {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtExpr,
+        crate::statement::stmt_expr::FormatStmtExpr,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(self, crate::statement::stmt_expr::FormatStmtExpr::default())
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtExpr {
+    type Format = FormatOwnedWithRule<
+        ast::StmtExpr,
+        crate::statement::stmt_expr::FormatStmtExpr,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(self, crate::statement::stmt_expr::FormatStmtExpr::default())
+    }
+}
+
+impl FormatRule<ast::StmtPass, PyFormatContext<'_>>
+    for crate::statement::stmt_pass::FormatStmtPass
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtPass,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtPass>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtPass {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtPass,
+        crate::statement::stmt_pass::FormatStmtPass,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(self, crate::statement::stmt_pass::FormatStmtPass::default())
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtPass {
+    type Format = FormatOwnedWithRule<
+        ast::StmtPass,
+        crate::statement::stmt_pass::FormatStmtPass,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(self, crate::statement::stmt_pass::FormatStmtPass::default())
+    }
+}
+
+impl FormatRule<ast::StmtBreak, PyFormatContext<'_>>
+    for crate::statement::stmt_break::FormatStmtBreak
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtBreak,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtBreak>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtBreak {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtBreak,
+        crate::statement::stmt_break::FormatStmtBreak,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_break::FormatStmtBreak::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtBreak {
+    type Format = FormatOwnedWithRule<
+        ast::StmtBreak,
+        crate::statement::stmt_break::FormatStmtBreak,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_break::FormatStmtBreak::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::StmtContinue, PyFormatContext<'_>>
+    for crate::statement::stmt_continue::FormatStmtContinue
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::StmtContinue,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::StmtContinue>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::StmtContinue {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::StmtContinue,
+        crate::statement::stmt_continue::FormatStmtContinue,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::statement::stmt_continue::FormatStmtContinue::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::StmtContinue {
+    type Format = FormatOwnedWithRule<
+        ast::StmtContinue,
+        crate::statement::stmt_continue::FormatStmtContinue,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::statement::stmt_continue::FormatStmtContinue::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprBoolOp, PyFormatContext<'_>>
+    for crate::expression::expr_bool_op::FormatExprBoolOp
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprBoolOp,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprBoolOp>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprBoolOp {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprBoolOp,
+        crate::expression::expr_bool_op::FormatExprBoolOp,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_bool_op::FormatExprBoolOp::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprBoolOp {
+    type Format = FormatOwnedWithRule<
+        ast::ExprBoolOp,
+        crate::expression::expr_bool_op::FormatExprBoolOp,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_bool_op::FormatExprBoolOp::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprNamedExpr, PyFormatContext<'_>>
+    for crate::expression::expr_named_expr::FormatExprNamedExpr
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprNamedExpr,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprNamedExpr>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprNamedExpr {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprNamedExpr,
+        crate::expression::expr_named_expr::FormatExprNamedExpr,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_named_expr::FormatExprNamedExpr::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprNamedExpr {
+    type Format = FormatOwnedWithRule<
+        ast::ExprNamedExpr,
+        crate::expression::expr_named_expr::FormatExprNamedExpr,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_named_expr::FormatExprNamedExpr::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprBinOp, PyFormatContext<'_>>
+    for crate::expression::expr_bin_op::FormatExprBinOp
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprBinOp,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprBinOp>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprBinOp {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprBinOp,
+        crate::expression::expr_bin_op::FormatExprBinOp,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_bin_op::FormatExprBinOp::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprBinOp {
+    type Format = FormatOwnedWithRule<
+        ast::ExprBinOp,
+        crate::expression::expr_bin_op::FormatExprBinOp,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_bin_op::FormatExprBinOp::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprUnaryOp, PyFormatContext<'_>>
+    for crate::expression::expr_unary_op::FormatExprUnaryOp
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprUnaryOp,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprUnaryOp>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprUnaryOp {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprUnaryOp,
+        crate::expression::expr_unary_op::FormatExprUnaryOp,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_unary_op::FormatExprUnaryOp::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprUnaryOp {
+    type Format = FormatOwnedWithRule<
+        ast::ExprUnaryOp,
+        crate::expression::expr_unary_op::FormatExprUnaryOp,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_unary_op::FormatExprUnaryOp::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprLambda, PyFormatContext<'_>>
+    for crate::expression::expr_lambda::FormatExprLambda
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprLambda,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprLambda>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprLambda {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprLambda,
+        crate::expression::expr_lambda::FormatExprLambda,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_lambda::FormatExprLambda::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprLambda {
+    type Format = FormatOwnedWithRule<
+        ast::ExprLambda,
+        crate::expression::expr_lambda::FormatExprLambda,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_lambda::FormatExprLambda::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprIfExp, PyFormatContext<'_>>
+    for crate::expression::expr_if_exp::FormatExprIfExp
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprIfExp,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprIfExp>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprIfExp {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprIfExp,
+        crate::expression::expr_if_exp::FormatExprIfExp,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_if_exp::FormatExprIfExp::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprIfExp {
+    type Format = FormatOwnedWithRule<
+        ast::ExprIfExp,
+        crate::expression::expr_if_exp::FormatExprIfExp,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_if_exp::FormatExprIfExp::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprDict, PyFormatContext<'_>>
+    for crate::expression::expr_dict::FormatExprDict
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprDict,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprDict>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprDict {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprDict,
+        crate::expression::expr_dict::FormatExprDict,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_dict::FormatExprDict::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprDict {
+    type Format = FormatOwnedWithRule<
+        ast::ExprDict,
+        crate::expression::expr_dict::FormatExprDict,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_dict::FormatExprDict::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprSet, PyFormatContext<'_>> for crate::expression::expr_set::FormatExprSet {
+    #[inline]
+    fn fmt(&self, node: &ast::ExprSet, f: &mut Formatter<PyFormatContext<'_>>) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprSet>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprSet {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprSet,
+        crate::expression::expr_set::FormatExprSet,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(self, crate::expression::expr_set::FormatExprSet::default())
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprSet {
+    type Format = FormatOwnedWithRule<
+        ast::ExprSet,
+        crate::expression::expr_set::FormatExprSet,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(self, crate::expression::expr_set::FormatExprSet::default())
+    }
+}
+
+impl FormatRule<ast::ExprListComp, PyFormatContext<'_>>
+    for crate::expression::expr_list_comp::FormatExprListComp
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprListComp,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprListComp>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprListComp {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprListComp,
+        crate::expression::expr_list_comp::FormatExprListComp,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_list_comp::FormatExprListComp::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprListComp {
+    type Format = FormatOwnedWithRule<
+        ast::ExprListComp,
+        crate::expression::expr_list_comp::FormatExprListComp,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_list_comp::FormatExprListComp::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprSetComp, PyFormatContext<'_>>
+    for crate::expression::expr_set_comp::FormatExprSetComp
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprSetComp,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprSetComp>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprSetComp {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprSetComp,
+        crate::expression::expr_set_comp::FormatExprSetComp,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_set_comp::FormatExprSetComp::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprSetComp {
+    type Format = FormatOwnedWithRule<
+        ast::ExprSetComp,
+        crate::expression::expr_set_comp::FormatExprSetComp,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_set_comp::FormatExprSetComp::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprDictComp, PyFormatContext<'_>>
+    for crate::expression::expr_dict_comp::FormatExprDictComp
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprDictComp,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprDictComp>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprDictComp {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprDictComp,
+        crate::expression::expr_dict_comp::FormatExprDictComp,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_dict_comp::FormatExprDictComp::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprDictComp {
+    type Format = FormatOwnedWithRule<
+        ast::ExprDictComp,
+        crate::expression::expr_dict_comp::FormatExprDictComp,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_dict_comp::FormatExprDictComp::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprGeneratorExp, PyFormatContext<'_>>
+    for crate::expression::expr_generator_exp::FormatExprGeneratorExp
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprGeneratorExp,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprGeneratorExp>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprGeneratorExp {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprGeneratorExp,
+        crate::expression::expr_generator_exp::FormatExprGeneratorExp,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_generator_exp::FormatExprGeneratorExp::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprGeneratorExp {
+    type Format = FormatOwnedWithRule<
+        ast::ExprGeneratorExp,
+        crate::expression::expr_generator_exp::FormatExprGeneratorExp,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_generator_exp::FormatExprGeneratorExp::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprAwait, PyFormatContext<'_>>
+    for crate::expression::expr_await::FormatExprAwait
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprAwait,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprAwait>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprAwait {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprAwait,
+        crate::expression::expr_await::FormatExprAwait,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_await::FormatExprAwait::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprAwait {
+    type Format = FormatOwnedWithRule<
+        ast::ExprAwait,
+        crate::expression::expr_await::FormatExprAwait,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_await::FormatExprAwait::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprYield, PyFormatContext<'_>>
+    for crate::expression::expr_yield::FormatExprYield
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprYield,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprYield>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprYield {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprYield,
+        crate::expression::expr_yield::FormatExprYield,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_yield::FormatExprYield::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprYield {
+    type Format = FormatOwnedWithRule<
+        ast::ExprYield,
+        crate::expression::expr_yield::FormatExprYield,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_yield::FormatExprYield::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprYieldFrom, PyFormatContext<'_>>
+    for crate::expression::expr_yield_from::FormatExprYieldFrom
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprYieldFrom,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprYieldFrom>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprYieldFrom {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprYieldFrom,
+        crate::expression::expr_yield_from::FormatExprYieldFrom,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_yield_from::FormatExprYieldFrom::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprYieldFrom {
+    type Format = FormatOwnedWithRule<
+        ast::ExprYieldFrom,
+        crate::expression::expr_yield_from::FormatExprYieldFrom,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_yield_from::FormatExprYieldFrom::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprCompare, PyFormatContext<'_>>
+    for crate::expression::expr_compare::FormatExprCompare
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprCompare,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprCompare>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprCompare {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprCompare,
+        crate::expression::expr_compare::FormatExprCompare,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_compare::FormatExprCompare::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprCompare {
+    type Format = FormatOwnedWithRule<
+        ast::ExprCompare,
+        crate::expression::expr_compare::FormatExprCompare,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_compare::FormatExprCompare::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprCall, PyFormatContext<'_>>
+    for crate::expression::expr_call::FormatExprCall
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprCall,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprCall>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprCall {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprCall,
+        crate::expression::expr_call::FormatExprCall,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_call::FormatExprCall::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprCall {
+    type Format = FormatOwnedWithRule<
+        ast::ExprCall,
+        crate::expression::expr_call::FormatExprCall,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_call::FormatExprCall::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprFormattedValue, PyFormatContext<'_>>
+    for crate::expression::expr_formatted_value::FormatExprFormattedValue
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprFormattedValue,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprFormattedValue>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprFormattedValue {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprFormattedValue,
+        crate::expression::expr_formatted_value::FormatExprFormattedValue,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_formatted_value::FormatExprFormattedValue::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprFormattedValue {
+    type Format = FormatOwnedWithRule<
+        ast::ExprFormattedValue,
+        crate::expression::expr_formatted_value::FormatExprFormattedValue,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_formatted_value::FormatExprFormattedValue::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprJoinedStr, PyFormatContext<'_>>
+    for crate::expression::expr_joined_str::FormatExprJoinedStr
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprJoinedStr,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprJoinedStr>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprJoinedStr {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprJoinedStr,
+        crate::expression::expr_joined_str::FormatExprJoinedStr,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_joined_str::FormatExprJoinedStr::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprJoinedStr {
+    type Format = FormatOwnedWithRule<
+        ast::ExprJoinedStr,
+        crate::expression::expr_joined_str::FormatExprJoinedStr,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_joined_str::FormatExprJoinedStr::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprConstant, PyFormatContext<'_>>
+    for crate::expression::expr_constant::FormatExprConstant
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprConstant,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprConstant>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprConstant {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprConstant,
+        crate::expression::expr_constant::FormatExprConstant,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_constant::FormatExprConstant::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprConstant {
+    type Format = FormatOwnedWithRule<
+        ast::ExprConstant,
+        crate::expression::expr_constant::FormatExprConstant,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_constant::FormatExprConstant::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprAttribute, PyFormatContext<'_>>
+    for crate::expression::expr_attribute::FormatExprAttribute
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprAttribute,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprAttribute>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprAttribute {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprAttribute,
+        crate::expression::expr_attribute::FormatExprAttribute,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_attribute::FormatExprAttribute::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprAttribute {
+    type Format = FormatOwnedWithRule<
+        ast::ExprAttribute,
+        crate::expression::expr_attribute::FormatExprAttribute,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_attribute::FormatExprAttribute::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprSubscript, PyFormatContext<'_>>
+    for crate::expression::expr_subscript::FormatExprSubscript
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprSubscript,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprSubscript>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprSubscript {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprSubscript,
+        crate::expression::expr_subscript::FormatExprSubscript,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_subscript::FormatExprSubscript::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprSubscript {
+    type Format = FormatOwnedWithRule<
+        ast::ExprSubscript,
+        crate::expression::expr_subscript::FormatExprSubscript,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_subscript::FormatExprSubscript::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprStarred, PyFormatContext<'_>>
+    for crate::expression::expr_starred::FormatExprStarred
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprStarred,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprStarred>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprStarred {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprStarred,
+        crate::expression::expr_starred::FormatExprStarred,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_starred::FormatExprStarred::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprStarred {
+    type Format = FormatOwnedWithRule<
+        ast::ExprStarred,
+        crate::expression::expr_starred::FormatExprStarred,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_starred::FormatExprStarred::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprName, PyFormatContext<'_>>
+    for crate::expression::expr_name::FormatExprName
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprName,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprName>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprName {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprName,
+        crate::expression::expr_name::FormatExprName,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_name::FormatExprName::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprName {
+    type Format = FormatOwnedWithRule<
+        ast::ExprName,
+        crate::expression::expr_name::FormatExprName,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_name::FormatExprName::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprList, PyFormatContext<'_>>
+    for crate::expression::expr_list::FormatExprList
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprList,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprList>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprList {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprList,
+        crate::expression::expr_list::FormatExprList,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_list::FormatExprList::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprList {
+    type Format = FormatOwnedWithRule<
+        ast::ExprList,
+        crate::expression::expr_list::FormatExprList,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_list::FormatExprList::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprTuple, PyFormatContext<'_>>
+    for crate::expression::expr_tuple::FormatExprTuple
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprTuple,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprTuple>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprTuple {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprTuple,
+        crate::expression::expr_tuple::FormatExprTuple,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_tuple::FormatExprTuple::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprTuple {
+    type Format = FormatOwnedWithRule<
+        ast::ExprTuple,
+        crate::expression::expr_tuple::FormatExprTuple,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_tuple::FormatExprTuple::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExprSlice, PyFormatContext<'_>>
+    for crate::expression::expr_slice::FormatExprSlice
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExprSlice,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExprSlice>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExprSlice {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExprSlice,
+        crate::expression::expr_slice::FormatExprSlice,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::expression::expr_slice::FormatExprSlice::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExprSlice {
+    type Format = FormatOwnedWithRule<
+        ast::ExprSlice,
+        crate::expression::expr_slice::FormatExprSlice,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::expression::expr_slice::FormatExprSlice::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::ExcepthandlerExceptHandler, PyFormatContext<'_>>
+    for crate::other::excepthandler_except_handler::FormatExcepthandlerExceptHandler
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::ExcepthandlerExceptHandler,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::ExcepthandlerExceptHandler>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::ExcepthandlerExceptHandler {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::ExcepthandlerExceptHandler,
+        crate::other::excepthandler_except_handler::FormatExcepthandlerExceptHandler,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::other::excepthandler_except_handler::FormatExcepthandlerExceptHandler::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::ExcepthandlerExceptHandler {
+    type Format = FormatOwnedWithRule<
+        ast::ExcepthandlerExceptHandler,
+        crate::other::excepthandler_except_handler::FormatExcepthandlerExceptHandler,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::other::excepthandler_except_handler::FormatExcepthandlerExceptHandler::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::PatternMatchValue, PyFormatContext<'_>>
+    for crate::pattern::pattern_match_value::FormatPatternMatchValue
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::PatternMatchValue,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::PatternMatchValue>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::PatternMatchValue {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::PatternMatchValue,
+        crate::pattern::pattern_match_value::FormatPatternMatchValue,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::pattern::pattern_match_value::FormatPatternMatchValue::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::PatternMatchValue {
+    type Format = FormatOwnedWithRule<
+        ast::PatternMatchValue,
+        crate::pattern::pattern_match_value::FormatPatternMatchValue,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::pattern::pattern_match_value::FormatPatternMatchValue::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::PatternMatchSingleton, PyFormatContext<'_>>
+    for crate::pattern::pattern_match_singleton::FormatPatternMatchSingleton
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::PatternMatchSingleton,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::PatternMatchSingleton>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::PatternMatchSingleton {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::PatternMatchSingleton,
+        crate::pattern::pattern_match_singleton::FormatPatternMatchSingleton,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::pattern::pattern_match_singleton::FormatPatternMatchSingleton::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::PatternMatchSingleton {
+    type Format = FormatOwnedWithRule<
+        ast::PatternMatchSingleton,
+        crate::pattern::pattern_match_singleton::FormatPatternMatchSingleton,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::pattern::pattern_match_singleton::FormatPatternMatchSingleton::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::PatternMatchSequence, PyFormatContext<'_>>
+    for crate::pattern::pattern_match_sequence::FormatPatternMatchSequence
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::PatternMatchSequence,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::PatternMatchSequence>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::PatternMatchSequence {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::PatternMatchSequence,
+        crate::pattern::pattern_match_sequence::FormatPatternMatchSequence,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::pattern::pattern_match_sequence::FormatPatternMatchSequence::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::PatternMatchSequence {
+    type Format = FormatOwnedWithRule<
+        ast::PatternMatchSequence,
+        crate::pattern::pattern_match_sequence::FormatPatternMatchSequence,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::pattern::pattern_match_sequence::FormatPatternMatchSequence::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::PatternMatchMapping, PyFormatContext<'_>>
+    for crate::pattern::pattern_match_mapping::FormatPatternMatchMapping
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::PatternMatchMapping,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::PatternMatchMapping>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::PatternMatchMapping {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::PatternMatchMapping,
+        crate::pattern::pattern_match_mapping::FormatPatternMatchMapping,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::pattern::pattern_match_mapping::FormatPatternMatchMapping::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::PatternMatchMapping {
+    type Format = FormatOwnedWithRule<
+        ast::PatternMatchMapping,
+        crate::pattern::pattern_match_mapping::FormatPatternMatchMapping,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::pattern::pattern_match_mapping::FormatPatternMatchMapping::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::PatternMatchClass, PyFormatContext<'_>>
+    for crate::pattern::pattern_match_class::FormatPatternMatchClass
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::PatternMatchClass,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::PatternMatchClass>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::PatternMatchClass {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::PatternMatchClass,
+        crate::pattern::pattern_match_class::FormatPatternMatchClass,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::pattern::pattern_match_class::FormatPatternMatchClass::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::PatternMatchClass {
+    type Format = FormatOwnedWithRule<
+        ast::PatternMatchClass,
+        crate::pattern::pattern_match_class::FormatPatternMatchClass,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::pattern::pattern_match_class::FormatPatternMatchClass::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::PatternMatchStar, PyFormatContext<'_>>
+    for crate::pattern::pattern_match_star::FormatPatternMatchStar
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::PatternMatchStar,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::PatternMatchStar>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::PatternMatchStar {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::PatternMatchStar,
+        crate::pattern::pattern_match_star::FormatPatternMatchStar,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::pattern::pattern_match_star::FormatPatternMatchStar::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::PatternMatchStar {
+    type Format = FormatOwnedWithRule<
+        ast::PatternMatchStar,
+        crate::pattern::pattern_match_star::FormatPatternMatchStar,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::pattern::pattern_match_star::FormatPatternMatchStar::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::PatternMatchAs, PyFormatContext<'_>>
+    for crate::pattern::pattern_match_as::FormatPatternMatchAs
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::PatternMatchAs,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::PatternMatchAs>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::PatternMatchAs {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::PatternMatchAs,
+        crate::pattern::pattern_match_as::FormatPatternMatchAs,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::pattern::pattern_match_as::FormatPatternMatchAs::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::PatternMatchAs {
+    type Format = FormatOwnedWithRule<
+        ast::PatternMatchAs,
+        crate::pattern::pattern_match_as::FormatPatternMatchAs,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::pattern::pattern_match_as::FormatPatternMatchAs::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::PatternMatchOr, PyFormatContext<'_>>
+    for crate::pattern::pattern_match_or::FormatPatternMatchOr
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::PatternMatchOr,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::PatternMatchOr>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::PatternMatchOr {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::PatternMatchOr,
+        crate::pattern::pattern_match_or::FormatPatternMatchOr,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::pattern::pattern_match_or::FormatPatternMatchOr::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::PatternMatchOr {
+    type Format = FormatOwnedWithRule<
+        ast::PatternMatchOr,
+        crate::pattern::pattern_match_or::FormatPatternMatchOr,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::pattern::pattern_match_or::FormatPatternMatchOr::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::TypeIgnoreTypeIgnore, PyFormatContext<'_>>
+    for crate::other::type_ignore_type_ignore::FormatTypeIgnoreTypeIgnore
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::TypeIgnoreTypeIgnore,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::TypeIgnoreTypeIgnore>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::TypeIgnoreTypeIgnore {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::TypeIgnoreTypeIgnore,
+        crate::other::type_ignore_type_ignore::FormatTypeIgnoreTypeIgnore,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::other::type_ignore_type_ignore::FormatTypeIgnoreTypeIgnore::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::TypeIgnoreTypeIgnore {
+    type Format = FormatOwnedWithRule<
+        ast::TypeIgnoreTypeIgnore,
+        crate::other::type_ignore_type_ignore::FormatTypeIgnoreTypeIgnore,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::other::type_ignore_type_ignore::FormatTypeIgnoreTypeIgnore::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::Comprehension, PyFormatContext<'_>>
+    for crate::other::comprehension::FormatComprehension
+{
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::Comprehension,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::Comprehension>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::Comprehension {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::Comprehension,
+        crate::other::comprehension::FormatComprehension,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(
+            self,
+            crate::other::comprehension::FormatComprehension::default(),
+        )
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::Comprehension {
+    type Format = FormatOwnedWithRule<
+        ast::Comprehension,
+        crate::other::comprehension::FormatComprehension,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(
+            self,
+            crate::other::comprehension::FormatComprehension::default(),
+        )
+    }
+}
+
+impl FormatRule<ast::Arguments, PyFormatContext<'_>> for crate::other::arguments::FormatArguments {
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::Arguments,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::Arguments>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::Arguments {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::Arguments,
+        crate::other::arguments::FormatArguments,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(self, crate::other::arguments::FormatArguments::default())
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::Arguments {
+    type Format = FormatOwnedWithRule<
+        ast::Arguments,
+        crate::other::arguments::FormatArguments,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(self, crate::other::arguments::FormatArguments::default())
+    }
+}
+
+impl FormatRule<ast::Arg, PyFormatContext<'_>> for crate::other::arg::FormatArg {
+    #[inline]
+    fn fmt(&self, node: &ast::Arg, f: &mut Formatter<PyFormatContext<'_>>) -> FormatResult<()> {
+        FormatNodeRule::<ast::Arg>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::Arg {
+    type Format<'a> =
+        FormatRefWithRule<'a, ast::Arg, crate::other::arg::FormatArg, PyFormatContext<'ast>>;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(self, crate::other::arg::FormatArg::default())
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::Arg {
+    type Format =
+        FormatOwnedWithRule<ast::Arg, crate::other::arg::FormatArg, PyFormatContext<'ast>>;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(self, crate::other::arg::FormatArg::default())
+    }
+}
+
+impl FormatRule<ast::Keyword, PyFormatContext<'_>> for crate::other::keyword::FormatKeyword {
+    #[inline]
+    fn fmt(&self, node: &ast::Keyword, f: &mut Formatter<PyFormatContext<'_>>) -> FormatResult<()> {
+        FormatNodeRule::<ast::Keyword>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::Keyword {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::Keyword,
+        crate::other::keyword::FormatKeyword,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(self, crate::other::keyword::FormatKeyword::default())
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::Keyword {
+    type Format = FormatOwnedWithRule<
+        ast::Keyword,
+        crate::other::keyword::FormatKeyword,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(self, crate::other::keyword::FormatKeyword::default())
+    }
+}
+
+impl FormatRule<ast::Alias, PyFormatContext<'_>> for crate::other::alias::FormatAlias {
+    #[inline]
+    fn fmt(&self, node: &ast::Alias, f: &mut Formatter<PyFormatContext<'_>>) -> FormatResult<()> {
+        FormatNodeRule::<ast::Alias>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::Alias {
+    type Format<'a> =
+        FormatRefWithRule<'a, ast::Alias, crate::other::alias::FormatAlias, PyFormatContext<'ast>>;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(self, crate::other::alias::FormatAlias::default())
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::Alias {
+    type Format =
+        FormatOwnedWithRule<ast::Alias, crate::other::alias::FormatAlias, PyFormatContext<'ast>>;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(self, crate::other::alias::FormatAlias::default())
+    }
+}
+
+impl FormatRule<ast::Withitem, PyFormatContext<'_>> for crate::other::withitem::FormatWithitem {
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::Withitem,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::Withitem>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::Withitem {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::Withitem,
+        crate::other::withitem::FormatWithitem,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(self, crate::other::withitem::FormatWithitem::default())
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::Withitem {
+    type Format = FormatOwnedWithRule<
+        ast::Withitem,
+        crate::other::withitem::FormatWithitem,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(self, crate::other::withitem::FormatWithitem::default())
+    }
+}
+
+impl FormatRule<ast::MatchCase, PyFormatContext<'_>> for crate::other::match_case::FormatMatchCase {
+    #[inline]
+    fn fmt(
+        &self,
+        node: &ast::MatchCase,
+        f: &mut Formatter<PyFormatContext<'_>>,
+    ) -> FormatResult<()> {
+        FormatNodeRule::<ast::MatchCase>::fmt(self, node, f)
+    }
+}
+impl<'ast> AsFormat<PyFormatContext<'ast>> for ast::MatchCase {
+    type Format<'a> = FormatRefWithRule<
+        'a,
+        ast::MatchCase,
+        crate::other::match_case::FormatMatchCase,
+        PyFormatContext<'ast>,
+    >;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(self, crate::other::match_case::FormatMatchCase::default())
+    }
+}
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for ast::MatchCase {
+    type Format = FormatOwnedWithRule<
+        ast::MatchCase,
+        crate::other::match_case::FormatMatchCase,
+        PyFormatContext<'ast>,
+    >;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(self, crate::other::match_case::FormatMatchCase::default())
+    }
+}
diff --git a/crates/ruff_python_formatter/src/lib.rs b/crates/ruff_python_formatter/src/lib.rs
index 90ceed1c1aa72..c0fbaca55ce8f 100644
--- a/crates/ruff_python_formatter/src/lib.rs
+++ b/crates/ruff_python_formatter/src/lib.rs
@@ -1,60 +1,205 @@
-use anyhow::Result;
-use rustpython_parser::lexer::LexResult;
+use anyhow::{anyhow, Context, Result};
+use ruff_formatter::prelude::*;
+use ruff_formatter::{format, write};
+use ruff_formatter::{Formatted, IndentStyle, Printed, SimpleFormatOptions, SourceCode};
+use ruff_python_ast::node::{AnyNodeRef, AstNode, NodeKind};
+use ruff_python_ast::source_code::{CommentRanges, CommentRangesBuilder, Locator};
+use ruff_text_size::{TextLen, TextRange};
+use rustpython_parser::ast::{Mod, Ranged};
+use rustpython_parser::lexer::lex;
+use rustpython_parser::{parse_tokens, Mode};
+use std::borrow::Cow;
+
+use crate::comments::{
+    dangling_node_comments, leading_node_comments, trailing_node_comments, Comments,
+};
+use crate::context::PyFormatContext;
+
+pub(crate) mod builders;
+pub mod cli;
+mod comments;
+pub(crate) mod context;
+pub(crate) mod expression;
+mod generated;
+pub(crate) mod module;
+pub(crate) mod other;
+pub(crate) mod pattern;
+mod prelude;
+pub(crate) mod statement;
+mod trivia;
+
+include!("../../ruff_formatter/shared_traits.rs");
+
+/// 'ast is the lifetime of the source code (input), 'buf is the lifetime of the buffer (output)
+pub(crate) type PyFormatter<'ast, 'buf> = Formatter<'buf, PyFormatContext<'ast>>;
+
+/// Rule for formatting a JavaScript [`AstNode`].
+pub(crate) trait FormatNodeRule<N>
+where
+    N: AstNode,
+{
+    fn fmt(&self, node: &N, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [source_position(node.start())])?;
+        self.fmt_leading_comments(node, f)?;
+        self.fmt_node(node, f)?;
+        self.fmt_dangling_comments(node, f)?;
+        self.fmt_trailing_comments(node, f)?;
+        write!(f, [source_position(node.end())])
+    }
 
-use ruff_formatter::{format, Formatted, IndentStyle, SimpleFormatOptions};
-use ruff_python_ast::source_code::Locator;
+    /// Formats the node without comments. Ignores any suppression comments.
+    fn fmt_node(&self, node: &N, f: &mut PyFormatter) -> FormatResult<()> {
+        self.fmt_fields(node, f)?;
 
-use crate::attachment::attach;
-use crate::context::ASTFormatContext;
-use crate::cst::Stmt;
-use crate::newlines::normalize_newlines;
-use crate::parentheses::normalize_parentheses;
+        Ok(())
+    }
 
-mod attachment;
-pub mod cli;
-pub mod context;
-mod cst;
-mod format;
-mod newlines;
-mod parentheses;
-pub mod shared_traits;
-pub mod trivia;
+    /// Formats the node's fields.
+    fn fmt_fields(&self, item: &N, f: &mut PyFormatter) -> FormatResult<()>;
 
-pub fn fmt(contents: &str) -> Result<Formatted<ASTFormatContext>> {
-    // Create a reusable locator.
-    let locator = Locator::new(contents);
+    /// Formats the [leading comments](comments#leading-comments) of the node.
+    ///
+    /// You may want to override this method if you want to manually handle the formatting of comments
+    /// inside of the `fmt_fields` method or customize the formatting of the leading comments.
+    fn fmt_leading_comments(&self, node: &N, f: &mut PyFormatter) -> FormatResult<()> {
+        leading_node_comments(node).fmt(f)
+    }
+
+    /// Formats the [dangling comments](comments#dangling-comments) of the node.
+    ///
+    /// You should override this method if the node handled by this rule can have dangling comments because the
+    /// default implementation formats the dangling comments at the end of the node, which isn't ideal but ensures that
+    /// no comments are dropped.
+    ///
+    /// A node can have dangling comments if all its children are tokens or if all node childrens are optional.
+    fn fmt_dangling_comments(&self, node: &N, f: &mut PyFormatter) -> FormatResult<()> {
+        dangling_node_comments(node).fmt(f)
+    }
+
+    /// Formats the [trailing comments](comments#trailing-comments) of the node.
+    ///
+    /// You may want to override this method if you want to manually handle the formatting of comments
+    /// inside of the `fmt_fields` method or customize the formatting of the trailing comments.
+    fn fmt_trailing_comments(&self, node: &N, f: &mut PyFormatter) -> FormatResult<()> {
+        trailing_node_comments(node).fmt(f)
+    }
+}
 
-    // Tokenize once.
-    let tokens: Vec<LexResult> = ruff_rustpython::tokenize(contents);
+pub fn format_module(contents: &str) -> Result<Printed> {
+    // Tokenize once
+    let mut tokens = Vec::new();
+    let mut comment_ranges = CommentRangesBuilder::default();
 
-    // Extract trivia.
-    let trivia = trivia::extract_trivia_tokens(&tokens, contents);
+    for result in lex(contents, Mode::Module) {
+        let (token, range) = match result {
+            Ok((token, range)) => (token, range),
+            Err(err) => return Err(anyhow!("Source contains syntax errors {err:?}")),
+        };
+
+        comment_ranges.visit_token(&token, range);
+        tokens.push(Ok((token, range)));
+    }
+
+    let comment_ranges = comment_ranges.finish();
 
     // Parse the AST.
-    let python_ast = ruff_rustpython::parse_program_tokens(tokens, "<filename>")?;
+    let python_ast = parse_tokens(tokens, Mode::Module, "<filename>")
+        .with_context(|| "Syntax error in input")?;
+
+    let formatted = format_node(&python_ast, &comment_ranges, contents)?;
+
+    formatted
+        .print()
+        .with_context(|| "Failed to print the formatter IR")
+}
 
-    // Convert to a CST.
-    let mut python_cst: Vec<Stmt> = python_ast
-        .into_iter()
-        .map(|stmt| (stmt, &locator).into())
-        .collect();
+pub fn format_node<'a>(
+    root: &'a Mod,
+    comment_ranges: &'a CommentRanges,
+    source: &'a str,
+) -> FormatResult<Formatted<PyFormatContext<'a>>> {
+    let comments = Comments::from_ast(root, SourceCode::new(source), comment_ranges);
 
-    // Attach trivia.
-    attach(&mut python_cst, trivia);
-    normalize_newlines(&mut python_cst);
-    normalize_parentheses(&mut python_cst, &locator);
+    let locator = Locator::new(source);
 
     format!(
-        ASTFormatContext::new(
+        PyFormatContext::new(
             SimpleFormatOptions {
                 indent_style: IndentStyle::Space(4),
                 line_width: 88.try_into().unwrap(),
             },
-            locator,
+            locator.contents(),
+            comments,
         ),
-        [format::builders::statements(&python_cst)]
+        [root.format()]
     )
-    .map_err(Into::into)
+}
+
+pub(crate) struct NotYetImplemented(NodeKind);
+
+/// Formats a placeholder for nodes that have not yet been implemented
+pub(crate) fn not_yet_implemented<'a, T>(node: T) -> NotYetImplemented
+where
+    T: Into<AnyNodeRef<'a>>,
+{
+    NotYetImplemented(node.into().kind())
+}
+
+impl Format<PyFormatContext<'_>> for NotYetImplemented {
+    fn fmt(&self, f: &mut PyFormatter) -> FormatResult<()> {
+        let text = std::format!("NOT_YET_IMPLEMENTED_{:?}", self.0);
+
+        f.write_element(FormatElement::Tag(Tag::StartVerbatim(
+            tag::VerbatimKind::Verbatim {
+                length: text.text_len(),
+            },
+        )))?;
+
+        f.write_element(FormatElement::DynamicText {
+            text: Box::from(text),
+        })?;
+
+        f.write_element(FormatElement::Tag(Tag::EndVerbatim))?;
+        Ok(())
+    }
+}
+
+pub(crate) struct VerbatimText(TextRange);
+
+#[allow(unused)]
+pub(crate) fn verbatim_text<T>(item: &T) -> VerbatimText
+where
+    T: Ranged,
+{
+    VerbatimText(item.range())
+}
+
+impl Format<PyFormatContext<'_>> for VerbatimText {
+    fn fmt(&self, f: &mut PyFormatter) -> FormatResult<()> {
+        f.write_element(FormatElement::Tag(Tag::StartVerbatim(
+            tag::VerbatimKind::Verbatim {
+                length: self.0.len(),
+            },
+        )))?;
+
+        match normalize_newlines(f.context().locator().slice(self.0), ['\r']) {
+            Cow::Borrowed(_) => {
+                write!(f, [source_text_slice(self.0, ContainsNewlines::Detect)])?;
+            }
+            Cow::Owned(cleaned) => {
+                write!(
+                    f,
+                    [
+                        dynamic_text(&cleaned, Some(self.0.start())),
+                        source_position(self.0.end())
+                    ]
+                )?;
+            }
+        }
+
+        f.write_element(FormatElement::Tag(Tag::EndVerbatim))?;
+        Ok(())
+    }
 }
 
 #[cfg(test)]
@@ -64,32 +209,71 @@ mod tests {
     use std::path::Path;
 
     use anyhow::Result;
+    use insta::assert_snapshot;
+    use rustpython_parser::lexer::lex;
+    use rustpython_parser::{parse_tokens, Mode};
     use similar::TextDiff;
 
+    use ruff_python_ast::source_code::CommentRangesBuilder;
     use ruff_testing_macros::fixture;
 
-    use crate::fmt;
+    use crate::{format_module, format_node};
+
+    /// Very basic test intentionally kept very similar to the CLI
+    #[test]
+    fn basic() -> Result<()> {
+        let input = r#"
+# preceding
+if    True:
+    print( "hi" )
+# trailing
+"#;
+        let expected = r#"# preceding
+NOT_YET_IMPLEMENTED_StmtIf
+# trailing
+"#;
+        let actual = format_module(input)?.as_code().to_string();
+        assert_eq!(expected, actual);
+        Ok(())
+    }
 
-    #[fixture(
-        pattern = "resources/test/fixtures/black/**/*.py",
-        // Excluded tests because they reach unreachable when attaching tokens
-        exclude = [
-            "*comments8.py",
-        ])
-    ]
+    #[fixture(pattern = "resources/test/fixtures/black/**/*.py")]
     #[test]
     fn black_test(input_path: &Path) -> Result<()> {
         let content = fs::read_to_string(input_path)?;
 
-        let formatted = fmt(&content)?;
+        let printed = format_module(&content)?;
 
         let expected_path = input_path.with_extension("py.expect");
         let expected_output = fs::read_to_string(&expected_path)
             .unwrap_or_else(|_| panic!("Expected Black output file '{expected_path:?}' to exist"));
 
-        let printed = formatted.print()?;
         let formatted_code = printed.as_code();
 
+        let reformatted = format_module(formatted_code).unwrap_or_else(|err| {
+            panic!(
+                "Formatted code resulted introduced a syntax error {err:#?}. Code:\n{formatted_code}"
+            )
+        });
+
+        if reformatted.as_code() != formatted_code {
+            let diff = TextDiff::from_lines(formatted_code, reformatted.as_code())
+                .unified_diff()
+                .header("Formatted once", "Formatted twice")
+                .to_string();
+            panic!(
+                r#"Reformatting the formatted code a second time resulted in formatting changes.
+{diff}
+
+Formatted once:
+{formatted_code}
+
+Formatted twice:
+{}"#,
+                reformatted.as_code()
+            );
+        }
+
         if formatted_code == expected_output {
             // Black and Ruff formatting matches. Delete any existing snapshot files because the Black output
             // already perfectly captures the expected output.
@@ -149,33 +333,166 @@ mod tests {
         Ok(())
     }
 
+    #[fixture(pattern = "resources/test/fixtures/ruff/**/*.py")]
+    #[test]
+    fn ruff_test(input_path: &Path) -> Result<()> {
+        let content = fs::read_to_string(input_path)?;
+
+        let printed = format_module(&content)?;
+        let formatted_code = printed.as_code();
+
+        let reformatted =
+            format_module(formatted_code).unwrap_or_else(|err| panic!("Expected formatted code to be valid syntax but it contains syntax errors: {err}\n{formatted_code}"));
+
+        if reformatted.as_code() != formatted_code {
+            let diff = TextDiff::from_lines(formatted_code, reformatted.as_code())
+                .unified_diff()
+                .header("Formatted once", "Formatted twice")
+                .to_string();
+            panic!(
+                r#"Reformatting the formatted code a second time resulted in formatting changes.
+{diff}
+
+Formatted once:
+{formatted_code}
+
+Formatted twice:
+{}"#,
+                reformatted.as_code()
+            );
+        }
+
+        let snapshot = format!(
+            r#"## Input
+{}
+
+## Output
+{}"#,
+            CodeFrame::new("py", &content),
+            CodeFrame::new("py", formatted_code)
+        );
+        assert_snapshot!(snapshot);
+
+        Ok(())
+    }
+
     /// Use this test to debug the formatting of some snipped
     #[ignore]
     #[test]
     fn quick_test() {
-        let src = r#"
-{
-    k: v for k, v in a_very_long_variable_name_that_exceeds_the_line_length_by_far_keep_going
-}
+        let src = r#"AAAAAAAAAAAAA = AAAAAAAAAAAAA  # type: ignore
+
+call_to_some_function_asdf(
+    foo,
+    [AAAAAAAAAAAAAAAAAAAAAAA, AAAAAAAAAAAAAAAAAAAAAAA, AAAAAAAAAAAAAAAAAAAAAAA, BBBBBBBBBBBB],  # type: ignore
+)
 "#;
-        let formatted = fmt(src).unwrap();
+        // Tokenize once
+        let mut tokens = Vec::new();
+        let mut comment_ranges = CommentRangesBuilder::default();
+
+        for result in lex(src, Mode::Module) {
+            let (token, range) = result.unwrap();
+            comment_ranges.visit_token(&token, range);
+            tokens.push(Ok((token, range)));
+        }
+
+        let comment_ranges = comment_ranges.finish();
+
+        // Parse the AST.
+        let python_ast = parse_tokens(tokens, Mode::Module, "<filename>").unwrap();
+
+        let formatted = format_node(&python_ast, &comment_ranges, src).unwrap();
 
         // Uncomment the `dbg` to print the IR.
         // Use `dbg_write!(f, []) instead of `write!(f, [])` in your formatting code to print some IR
         // inside of a `Format` implementation
-        // dbg!(formatted.document());
+        // dbg!(formatted
+        //     .document()
+        //     .display(formatted.context().source_code()));
 
         let printed = formatted.print().unwrap();
 
         assert_eq!(
             printed.as_code(),
-            r#"{
-    k: v
-    for k, v in a_very_long_variable_name_that_exceeds_the_line_length_by_far_keep_going
-}"#
+            r#"while True:
+    if something.changed:
+        do.stuff()  # trailing comment
+"#
         );
     }
 
+    #[test]
+    fn string_processing() {
+        use crate::prelude::*;
+        use ruff_formatter::{format, format_args, write};
+
+        struct FormatString<'a>(&'a str);
+
+        impl Format<SimpleFormatContext> for FormatString<'_> {
+            fn fmt(
+                &self,
+                f: &mut ruff_formatter::formatter::Formatter<SimpleFormatContext>,
+            ) -> FormatResult<()> {
+                let format_str = format_with(|f| {
+                    write!(f, [text("\"")])?;
+
+                    let mut words = self.0.split_whitespace().peekable();
+                    let mut fill = f.fill();
+
+                    let separator = format_with(|f| {
+                        group(&format_args![
+                            if_group_breaks(&text("\"")),
+                            soft_line_break_or_space(),
+                            if_group_breaks(&text("\" "))
+                        ])
+                        .fmt(f)
+                    });
+
+                    while let Some(word) = words.next() {
+                        let is_last = words.peek().is_none();
+                        let format_word = format_with(|f| {
+                            write!(f, [dynamic_text(word, None)])?;
+
+                            if is_last {
+                                write!(f, [text("\"")])?;
+                            }
+
+                            Ok(())
+                        });
+
+                        fill.entry(&separator, &format_word);
+                    }
+
+                    fill.finish()
+                });
+
+                write!(
+                    f,
+                    [group(&format_args![
+                        if_group_breaks(&text("(")),
+                        soft_block_indent(&format_str),
+                        if_group_breaks(&text(")"))
+                    ])]
+                )
+            }
+        }
+
+        // 77 after g group (leading quote)
+        let fits =
+            r#"aaaaaaaaaa bbbbbbbbbb cccccccccc dddddddddd eeeeeeeeee ffffffffff gggggggggg h"#;
+        let breaks =
+            r#"aaaaaaaaaa bbbbbbbbbb cccccccccc dddddddddd eeeeeeeeee ffffffffff gggggggggg hh"#;
+
+        let output = format!(
+            SimpleFormatContext::default(),
+            [FormatString(fits), hard_line_break(), FormatString(breaks)]
+        )
+        .expect("Formatting to succeed");
+
+        assert_snapshot!(output.print().expect("Printing to succeed").as_code());
+    }
+
     struct Header<'a> {
         title: &'a str,
     }
diff --git a/crates/ruff_python_formatter/src/main.rs b/crates/ruff_python_formatter/src/main.rs
index 1f38d0c59e849..63b789888cc99 100644
--- a/crates/ruff_python_formatter/src/main.rs
+++ b/crates/ruff_python_formatter/src/main.rs
@@ -1,17 +1,53 @@
-use std::fs;
+use std::io::{stdout, Read, Write};
+use std::{fs, io};
 
-use anyhow::Result;
+use anyhow::{bail, Context, Result};
 use clap::Parser as ClapParser;
 
-use ruff_python_formatter::cli::Cli;
-use ruff_python_formatter::fmt;
+use ruff_python_formatter::cli::{format_and_debug_print, Cli, Emit};
 
+/// Read a `String` from `stdin`.
+pub(crate) fn read_from_stdin() -> Result<String> {
+    let mut buffer = String::new();
+    io::stdin().lock().read_to_string(&mut buffer)?;
+    Ok(buffer)
+}
+
+#[allow(clippy::print_stdout)]
 fn main() -> Result<()> {
-    let cli = Cli::parse();
-    let contents = fs::read_to_string(cli.file)?;
-    #[allow(clippy::print_stdout)]
-    {
-        println!("{}", fmt(&contents)?.print()?.as_code());
+    let cli: Cli = Cli::parse();
+
+    if cli.files.is_empty() {
+        if !matches!(cli.emit, None | Some(Emit::Stdout)) {
+            bail!(
+                "Can only write to stdout when formatting from stdin, but you asked for {:?}",
+                cli.emit
+            );
+        }
+        let input = read_from_stdin()?;
+        let formatted = format_and_debug_print(&input, &cli)?;
+        if cli.check {
+            if formatted == input {
+                return Ok(());
+            }
+            bail!("Content not correctly formatted")
+        }
+        stdout().lock().write_all(formatted.as_bytes())?;
+    } else {
+        for file in &cli.files {
+            let input = fs::read_to_string(file)
+                .with_context(|| format!("Could not read {}: ", file.display()))?;
+            let formatted = format_and_debug_print(&input, &cli)?;
+            match cli.emit {
+                Some(Emit::Stdout) => stdout().lock().write_all(formatted.as_bytes())?,
+                None | Some(Emit::Files) => {
+                    fs::write(file, formatted.as_bytes()).with_context(|| {
+                        format!("Could not write to {}, exiting", file.display())
+                    })?;
+                }
+            }
+        }
     }
+
     Ok(())
 }
diff --git a/crates/ruff_python_formatter/src/module/mod.rs b/crates/ruff_python_formatter/src/module/mod.rs
new file mode 100644
index 0000000000000..6036af394244c
--- /dev/null
+++ b/crates/ruff_python_formatter/src/module/mod.rs
@@ -0,0 +1,37 @@
+use crate::context::PyFormatContext;
+use crate::{AsFormat, IntoFormat, PyFormatter};
+use ruff_formatter::{Format, FormatOwnedWithRule, FormatRefWithRule, FormatResult, FormatRule};
+use rustpython_parser::ast::Mod;
+
+pub(crate) mod mod_expression;
+pub(crate) mod mod_function_type;
+pub(crate) mod mod_interactive;
+pub(crate) mod mod_module;
+
+#[derive(Default)]
+pub struct FormatMod;
+
+impl FormatRule<Mod, PyFormatContext<'_>> for FormatMod {
+    fn fmt(&self, item: &Mod, f: &mut PyFormatter) -> FormatResult<()> {
+        match item {
+            Mod::Module(x) => x.format().fmt(f),
+            Mod::Interactive(x) => x.format().fmt(f),
+            Mod::Expression(x) => x.format().fmt(f),
+            Mod::FunctionType(x) => x.format().fmt(f),
+        }
+    }
+}
+
+impl<'ast> AsFormat<PyFormatContext<'ast>> for Mod {
+    type Format<'a> = FormatRefWithRule<'a, Mod, FormatMod, PyFormatContext<'ast>>;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(self, FormatMod::default())
+    }
+}
+
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for Mod {
+    type Format = FormatOwnedWithRule<Mod, FormatMod, PyFormatContext<'ast>>;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(self, FormatMod::default())
+    }
+}
diff --git a/crates/ruff_python_formatter/src/module/mod_expression.rs b/crates/ruff_python_formatter/src/module/mod_expression.rs
new file mode 100644
index 0000000000000..d7a8c40db643d
--- /dev/null
+++ b/crates/ruff_python_formatter/src/module/mod_expression.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ModExpression;
+
+#[derive(Default)]
+pub struct FormatModExpression;
+
+impl FormatNodeRule<ModExpression> for FormatModExpression {
+    fn fmt_fields(&self, item: &ModExpression, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/module/mod_function_type.rs b/crates/ruff_python_formatter/src/module/mod_function_type.rs
new file mode 100644
index 0000000000000..822d7d955338c
--- /dev/null
+++ b/crates/ruff_python_formatter/src/module/mod_function_type.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ModFunctionType;
+
+#[derive(Default)]
+pub struct FormatModFunctionType;
+
+impl FormatNodeRule<ModFunctionType> for FormatModFunctionType {
+    fn fmt_fields(&self, item: &ModFunctionType, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/module/mod_interactive.rs b/crates/ruff_python_formatter/src/module/mod_interactive.rs
new file mode 100644
index 0000000000000..2477a1b18d53e
--- /dev/null
+++ b/crates/ruff_python_formatter/src/module/mod_interactive.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ModInteractive;
+
+#[derive(Default)]
+pub struct FormatModInteractive;
+
+impl FormatNodeRule<ModInteractive> for FormatModInteractive {
+    fn fmt_fields(&self, item: &ModInteractive, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/module/mod_module.rs b/crates/ruff_python_formatter/src/module/mod_module.rs
new file mode 100644
index 0000000000000..0d0fee7c00a5f
--- /dev/null
+++ b/crates/ruff_python_formatter/src/module/mod_module.rs
@@ -0,0 +1,28 @@
+use crate::statement::suite::SuiteLevel;
+use crate::{AsFormat, FormatNodeRule, PyFormatter};
+use ruff_formatter::prelude::hard_line_break;
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ModModule;
+
+#[derive(Default)]
+pub struct FormatModModule;
+
+impl FormatNodeRule<ModModule> for FormatModModule {
+    fn fmt_fields(&self, item: &ModModule, f: &mut PyFormatter) -> FormatResult<()> {
+        let ModModule {
+            range: _,
+            body,
+            type_ignores,
+        } = item;
+        // https://docs.python.org/3/library/ast.html#ast-helpers
+        debug_assert!(type_ignores.is_empty());
+        write!(
+            f,
+            [
+                body.format().with_options(SuiteLevel::TopLevel),
+                // Trailing newline at the end of the file
+                hard_line_break()
+            ]
+        )
+    }
+}
diff --git a/crates/ruff_python_formatter/src/newlines.rs b/crates/ruff_python_formatter/src/newlines.rs
deleted file mode 100644
index 29164bec1ebb4..0000000000000
--- a/crates/ruff_python_formatter/src/newlines.rs
+++ /dev/null
@@ -1,370 +0,0 @@
-use rustpython_parser::ast::Constant;
-
-use crate::cst::visitor;
-use crate::cst::visitor::Visitor;
-use crate::cst::{
-    Alias, Arg, BoolOp, CmpOp, Excepthandler, ExcepthandlerKind, Expr, ExprKind, Keyword, Operator,
-    Pattern, SliceIndex, Stmt, StmtKind, UnaryOp,
-};
-use crate::trivia::{Relationship, Trivia, TriviaKind};
-
-#[derive(Debug, Copy, Clone)]
-enum Depth {
-    TopLevel,
-    Nested,
-}
-
-impl Depth {
-    fn max_newlines(self) -> usize {
-        match self {
-            Self::TopLevel => 2,
-            Self::Nested => 1,
-        }
-    }
-}
-
-#[derive(Debug, Copy, Clone)]
-enum Scope {
-    Module,
-    Class,
-    Function,
-}
-
-#[derive(Debug, Copy, Clone)]
-enum Trailer {
-    None,
-    ClassDef,
-    FunctionDef,
-    Import,
-    Docstring,
-    Generic,
-    CompoundStatement,
-}
-
-struct StmtNormalizer {
-    depth: Depth,
-    trailer: Trailer,
-    scope: Scope,
-}
-
-impl<'a> Visitor<'a> for StmtNormalizer {
-    fn visit_stmt(&mut self, stmt: &'a mut Stmt) {
-        // Remove any runs of empty lines greater than two in a row.
-        let mut count = 0;
-        stmt.trivia.retain(|c| {
-            if c.kind.is_empty_line() && c.relationship.is_leading() {
-                count += 1;
-                count <= self.depth.max_newlines()
-            } else {
-                count = 0;
-                true
-            }
-        });
-
-        if matches!(self.trailer, Trailer::None)
-            || (matches!(self.trailer, Trailer::CompoundStatement)
-                && !matches!(
-                    stmt.node,
-                    StmtKind::FunctionDef { .. }
-                        | StmtKind::AsyncFunctionDef { .. }
-                        | StmtKind::ClassDef { .. }
-                ))
-        {
-            // If this is the first statement in the block, remove any leading empty lines, with the
-            // exception being functions and classes defined within compound statements (e.g., as
-            // the first statement in an `if` body).
-            let mut seen_non_empty = false;
-            stmt.trivia.retain(|c| {
-                if seen_non_empty {
-                    true
-                } else {
-                    if c.kind.is_empty_line() && c.relationship.is_leading() {
-                        false
-                    } else {
-                        seen_non_empty = true;
-                        true
-                    }
-                }
-            });
-        } else {
-            // If the previous statement was a function or similar, ensure we have the
-            // appropriate number of lines to start.
-            let required_newlines = match self.trailer {
-                Trailer::FunctionDef | Trailer::ClassDef => self.depth.max_newlines(),
-                Trailer::Docstring if matches!(self.scope, Scope::Class) => 1,
-                Trailer::Import => usize::from(!matches!(
-                    stmt.node,
-                    StmtKind::Import { .. } | StmtKind::ImportFrom { .. }
-                )),
-                _ => 0,
-            };
-            let present_newlines = stmt
-                .trivia
-                .iter()
-                .take_while(|c| c.kind.is_empty_line() && c.relationship.is_leading())
-                .count();
-            if present_newlines < required_newlines {
-                for _ in 0..(required_newlines - present_newlines) {
-                    stmt.trivia.insert(
-                        0,
-                        Trivia {
-                            kind: TriviaKind::EmptyLine,
-                            relationship: Relationship::Leading,
-                        },
-                    );
-                }
-            }
-
-            // If the current statement is a function or similar, Ensure we have an
-            // appropriate number of lines above.
-            if matches!(
-                stmt.node,
-                StmtKind::FunctionDef { .. }
-                    | StmtKind::AsyncFunctionDef { .. }
-                    | StmtKind::ClassDef { .. }
-            ) {
-                let num_to_insert = self.depth.max_newlines()
-                    - stmt
-                        .trivia
-                        .iter()
-                        .take_while(|c| c.kind.is_empty_line() && c.relationship.is_leading())
-                        .count();
-                for _ in 0..num_to_insert {
-                    stmt.trivia.insert(
-                        0,
-                        Trivia {
-                            kind: TriviaKind::EmptyLine,
-                            relationship: Relationship::Leading,
-                        },
-                    );
-                }
-            }
-        }
-
-        let prev_scope = self.scope;
-        let prev_depth = self.depth;
-
-        match &mut stmt.node {
-            StmtKind::FunctionDef { body, .. } | StmtKind::AsyncFunctionDef { body, .. } => {
-                self.depth = Depth::Nested;
-                self.scope = Scope::Function;
-                self.trailer = Trailer::None;
-                self.visit_body(body);
-                self.trailer = Trailer::FunctionDef;
-            }
-            StmtKind::ClassDef { body, .. } => {
-                self.depth = Depth::Nested;
-                self.scope = Scope::Class;
-                self.trailer = Trailer::None;
-                self.visit_body(body);
-                self.trailer = Trailer::ClassDef;
-            }
-            StmtKind::While { body, orelse, .. }
-            | StmtKind::For { body, orelse, .. }
-            | StmtKind::AsyncFor { body, orelse, .. } => {
-                self.depth = Depth::Nested;
-                self.trailer = Trailer::CompoundStatement;
-                self.visit_body(body);
-
-                if let Some(orelse) = orelse {
-                    // If the previous body ended with a function or class definition, we need to
-                    // insert an empty line before the else block. Since the `else` itself isn't
-                    // a statement, we need to insert it into the last statement of the body.
-                    if matches!(self.trailer, Trailer::ClassDef | Trailer::FunctionDef) {
-                        body.trivia.push(Trivia {
-                            kind: TriviaKind::EmptyLine,
-                            relationship: Relationship::Dangling,
-                        });
-                    }
-
-                    self.depth = Depth::Nested;
-                    self.trailer = Trailer::CompoundStatement;
-                    self.visit_body(orelse);
-                }
-            }
-            StmtKind::If { body, orelse, .. } => {
-                self.depth = Depth::Nested;
-                self.trailer = Trailer::CompoundStatement;
-                self.visit_body(body);
-
-                if let Some(orelse) = orelse {
-                    if matches!(self.trailer, Trailer::ClassDef | Trailer::FunctionDef) {
-                        body.trivia.push(Trivia {
-                            kind: TriviaKind::EmptyLine,
-                            relationship: Relationship::Dangling,
-                        });
-                    }
-
-                    self.depth = Depth::Nested;
-                    self.trailer = Trailer::CompoundStatement;
-                    self.visit_body(orelse);
-                }
-            }
-            StmtKind::With { body, .. } | StmtKind::AsyncWith { body, .. } => {
-                self.depth = Depth::Nested;
-                self.trailer = Trailer::CompoundStatement;
-                self.visit_body(body);
-            }
-            // StmtKind::Match { .. } => {}
-            StmtKind::Try {
-                body,
-                handlers,
-                orelse,
-                finalbody,
-            }
-            | StmtKind::TryStar {
-                body,
-                handlers,
-                orelse,
-                finalbody,
-            } => {
-                self.depth = Depth::Nested;
-                self.trailer = Trailer::CompoundStatement;
-                self.visit_body(body);
-
-                let mut prev = &mut body.trivia;
-
-                for handler in handlers {
-                    if matches!(self.trailer, Trailer::ClassDef | Trailer::FunctionDef) {
-                        prev.push(Trivia {
-                            kind: TriviaKind::EmptyLine,
-                            relationship: Relationship::Dangling,
-                        });
-                    }
-
-                    self.depth = Depth::Nested;
-                    self.trailer = Trailer::CompoundStatement;
-                    let ExcepthandlerKind::ExceptHandler { body, .. } = &mut handler.node;
-                    self.visit_body(body);
-                    prev = &mut body.trivia;
-                }
-
-                if let Some(orelse) = orelse {
-                    if matches!(self.trailer, Trailer::ClassDef | Trailer::FunctionDef) {
-                        prev.push(Trivia {
-                            kind: TriviaKind::EmptyLine,
-                            relationship: Relationship::Dangling,
-                        });
-                    }
-
-                    self.depth = Depth::Nested;
-                    self.trailer = Trailer::CompoundStatement;
-                    self.visit_body(orelse);
-                    prev = &mut body.trivia;
-                }
-
-                if let Some(finalbody) = finalbody {
-                    if matches!(self.trailer, Trailer::ClassDef | Trailer::FunctionDef) {
-                        prev.push(Trivia {
-                            kind: TriviaKind::EmptyLine,
-                            relationship: Relationship::Dangling,
-                        });
-                    }
-
-                    self.depth = Depth::Nested;
-                    self.trailer = Trailer::CompoundStatement;
-                    self.visit_body(finalbody);
-                }
-            }
-            _ => {
-                self.trailer = match &stmt.node {
-                    StmtKind::Expr { value, .. }
-                        if matches!(self.scope, Scope::Class | Scope::Function)
-                            && matches!(self.trailer, Trailer::None) =>
-                    {
-                        if let ExprKind::Constant {
-                            value: Constant::Str(..),
-                            ..
-                        } = &value.node
-                        {
-                            Trailer::Docstring
-                        } else {
-                            Trailer::Generic
-                        }
-                    }
-                    StmtKind::Import { .. } | StmtKind::ImportFrom { .. } => Trailer::Import,
-                    _ => Trailer::Generic,
-                };
-                visitor::walk_stmt(self, stmt);
-            }
-        }
-
-        self.depth = prev_depth;
-        self.scope = prev_scope;
-    }
-}
-
-struct ExprNormalizer;
-
-impl<'a> Visitor<'a> for ExprNormalizer {
-    fn visit_expr(&mut self, expr: &'a mut Expr) {
-        expr.trivia.retain(|c| !c.kind.is_empty_line());
-        visitor::walk_expr(self, expr);
-    }
-
-    fn visit_alias(&mut self, alias: &'a mut Alias) {
-        alias.trivia.retain(|c| !c.kind.is_empty_line());
-        visitor::walk_alias(self, alias);
-    }
-
-    fn visit_arg(&mut self, arg: &'a mut Arg) {
-        arg.trivia.retain(|c| !c.kind.is_empty_line());
-        visitor::walk_arg(self, arg);
-    }
-
-    fn visit_excepthandler(&mut self, excepthandler: &'a mut Excepthandler) {
-        excepthandler.trivia.retain(|c| !c.kind.is_empty_line());
-        visitor::walk_excepthandler(self, excepthandler);
-    }
-
-    fn visit_keyword(&mut self, keyword: &'a mut Keyword) {
-        keyword.trivia.retain(|c| !c.kind.is_empty_line());
-        visitor::walk_keyword(self, keyword);
-    }
-
-    fn visit_bool_op(&mut self, bool_op: &'a mut BoolOp) {
-        bool_op.trivia.retain(|c| !c.kind.is_empty_line());
-        visitor::walk_bool_op(self, bool_op);
-    }
-
-    fn visit_unary_op(&mut self, unary_op: &'a mut UnaryOp) {
-        unary_op.trivia.retain(|c| !c.kind.is_empty_line());
-        visitor::walk_unary_op(self, unary_op);
-    }
-
-    fn visit_cmp_op(&mut self, cmp_op: &'a mut CmpOp) {
-        cmp_op.trivia.retain(|c| !c.kind.is_empty_line());
-        visitor::walk_cmp_op(self, cmp_op);
-    }
-
-    fn visit_operator(&mut self, operator: &'a mut Operator) {
-        operator.trivia.retain(|c| !c.kind.is_empty_line());
-        visitor::walk_operator(self, operator);
-    }
-
-    fn visit_slice_index(&mut self, slice_index: &'a mut SliceIndex) {
-        slice_index.trivia.retain(|c| !c.kind.is_empty_line());
-        visitor::walk_slice_index(self, slice_index);
-    }
-
-    fn visit_pattern(&mut self, pattern: &'a mut Pattern) {
-        pattern.trivia.retain(|c| !c.kind.is_empty_line());
-        visitor::walk_pattern(self, pattern);
-    }
-}
-
-pub fn normalize_newlines(python_cst: &mut [Stmt]) {
-    let mut normalizer = StmtNormalizer {
-        depth: Depth::TopLevel,
-        trailer: Trailer::None,
-        scope: Scope::Module,
-    };
-    for stmt in python_cst.iter_mut() {
-        normalizer.visit_stmt(stmt);
-    }
-
-    let mut normalizer = ExprNormalizer;
-    for stmt in python_cst.iter_mut() {
-        normalizer.visit_stmt(stmt);
-    }
-}
diff --git a/crates/ruff_python_formatter/src/other/alias.rs b/crates/ruff_python_formatter/src/other/alias.rs
new file mode 100644
index 0000000000000..8a1501e09c66b
--- /dev/null
+++ b/crates/ruff_python_formatter/src/other/alias.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::Alias;
+
+#[derive(Default)]
+pub struct FormatAlias;
+
+impl FormatNodeRule<Alias> for FormatAlias {
+    fn fmt_fields(&self, item: &Alias, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/other/arg.rs b/crates/ruff_python_formatter/src/other/arg.rs
new file mode 100644
index 0000000000000..44bb3e85e46de
--- /dev/null
+++ b/crates/ruff_python_formatter/src/other/arg.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::Arg;
+
+#[derive(Default)]
+pub struct FormatArg;
+
+impl FormatNodeRule<Arg> for FormatArg {
+    fn fmt_fields(&self, item: &Arg, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/other/arguments.rs b/crates/ruff_python_formatter/src/other/arguments.rs
new file mode 100644
index 0000000000000..ee0d7b872f7b8
--- /dev/null
+++ b/crates/ruff_python_formatter/src/other/arguments.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::Arguments;
+
+#[derive(Default)]
+pub struct FormatArguments;
+
+impl FormatNodeRule<Arguments> for FormatArguments {
+    fn fmt_fields(&self, item: &Arguments, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/other/comprehension.rs b/crates/ruff_python_formatter/src/other/comprehension.rs
new file mode 100644
index 0000000000000..edf64d8bee9dd
--- /dev/null
+++ b/crates/ruff_python_formatter/src/other/comprehension.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::Comprehension;
+
+#[derive(Default)]
+pub struct FormatComprehension;
+
+impl FormatNodeRule<Comprehension> for FormatComprehension {
+    fn fmt_fields(&self, item: &Comprehension, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/other/excepthandler_except_handler.rs b/crates/ruff_python_formatter/src/other/excepthandler_except_handler.rs
new file mode 100644
index 0000000000000..a5826413fc0dc
--- /dev/null
+++ b/crates/ruff_python_formatter/src/other/excepthandler_except_handler.rs
@@ -0,0 +1,16 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::ExcepthandlerExceptHandler;
+
+#[derive(Default)]
+pub struct FormatExcepthandlerExceptHandler;
+
+impl FormatNodeRule<ExcepthandlerExceptHandler> for FormatExcepthandlerExceptHandler {
+    fn fmt_fields(
+        &self,
+        item: &ExcepthandlerExceptHandler,
+        f: &mut PyFormatter,
+    ) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/other/keyword.rs b/crates/ruff_python_formatter/src/other/keyword.rs
new file mode 100644
index 0000000000000..7998efc47cb02
--- /dev/null
+++ b/crates/ruff_python_formatter/src/other/keyword.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::Keyword;
+
+#[derive(Default)]
+pub struct FormatKeyword;
+
+impl FormatNodeRule<Keyword> for FormatKeyword {
+    fn fmt_fields(&self, item: &Keyword, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/other/match_case.rs b/crates/ruff_python_formatter/src/other/match_case.rs
new file mode 100644
index 0000000000000..f4b79d19601f9
--- /dev/null
+++ b/crates/ruff_python_formatter/src/other/match_case.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::MatchCase;
+
+#[derive(Default)]
+pub struct FormatMatchCase;
+
+impl FormatNodeRule<MatchCase> for FormatMatchCase {
+    fn fmt_fields(&self, item: &MatchCase, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/other/mod.rs b/crates/ruff_python_formatter/src/other/mod.rs
new file mode 100644
index 0000000000000..3ca3d592d266d
--- /dev/null
+++ b/crates/ruff_python_formatter/src/other/mod.rs
@@ -0,0 +1,9 @@
+pub(crate) mod alias;
+pub(crate) mod arg;
+pub(crate) mod arguments;
+pub(crate) mod comprehension;
+pub(crate) mod excepthandler_except_handler;
+pub(crate) mod keyword;
+pub(crate) mod match_case;
+pub(crate) mod type_ignore_type_ignore;
+pub(crate) mod withitem;
diff --git a/crates/ruff_python_formatter/src/other/type_ignore_type_ignore.rs b/crates/ruff_python_formatter/src/other/type_ignore_type_ignore.rs
new file mode 100644
index 0000000000000..b622a705e38e8
--- /dev/null
+++ b/crates/ruff_python_formatter/src/other/type_ignore_type_ignore.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::TypeIgnoreTypeIgnore;
+
+#[derive(Default)]
+pub struct FormatTypeIgnoreTypeIgnore;
+
+impl FormatNodeRule<TypeIgnoreTypeIgnore> for FormatTypeIgnoreTypeIgnore {
+    fn fmt_fields(&self, item: &TypeIgnoreTypeIgnore, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/other/withitem.rs b/crates/ruff_python_formatter/src/other/withitem.rs
new file mode 100644
index 0000000000000..7edf9ea116f18
--- /dev/null
+++ b/crates/ruff_python_formatter/src/other/withitem.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::Withitem;
+
+#[derive(Default)]
+pub struct FormatWithitem;
+
+impl FormatNodeRule<Withitem> for FormatWithitem {
+    fn fmt_fields(&self, item: &Withitem, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/parentheses.rs b/crates/ruff_python_formatter/src/parentheses.rs
deleted file mode 100644
index 752c7cfdf23f7..0000000000000
--- a/crates/ruff_python_formatter/src/parentheses.rs
+++ /dev/null
@@ -1,199 +0,0 @@
-use rustpython_parser::ast::Constant;
-
-use ruff_python_ast::source_code::Locator;
-
-use crate::cst::helpers::is_radix_literal;
-use crate::cst::visitor;
-use crate::cst::visitor::Visitor;
-use crate::cst::{Expr, ExprKind, Stmt, StmtKind};
-use crate::trivia::Parenthesize;
-
-/// Modify an [`Expr`] to infer parentheses, rather than respecting any user-provided trivia.
-fn use_inferred_parens(expr: &mut Expr) {
-    // Remove parentheses, unless it's a generator expression, in which case, keep them.
-    if !matches!(expr.node, ExprKind::GeneratorExp { .. }) {
-        expr.trivia.retain(|trivia| !trivia.kind.is_parentheses());
-    }
-
-    // If it's a tuple, add parentheses if it's a singleton; otherwise, we only need parentheses
-    // if the tuple expands.
-    if let ExprKind::Tuple { elts, .. } = &expr.node {
-        expr.parentheses = if elts.len() > 1 {
-            Parenthesize::IfExpanded
-        } else {
-            Parenthesize::Always
-        };
-    }
-}
-
-struct ParenthesesNormalizer<'a> {
-    locator: &'a Locator<'a>,
-}
-
-impl<'a> Visitor<'a> for ParenthesesNormalizer<'_> {
-    fn visit_stmt(&mut self, stmt: &'a mut Stmt) {
-        // Always remove parentheses around statements, unless it's an expression statement,
-        // in which case, remove parentheses around the expression.
-        let before = stmt.trivia.len();
-        stmt.trivia.retain(|trivia| !trivia.kind.is_parentheses());
-        let after = stmt.trivia.len();
-        if let StmtKind::Expr { value } = &mut stmt.node {
-            if before != after {
-                stmt.parentheses = Parenthesize::Always;
-                value.parentheses = Parenthesize::Never;
-            }
-        }
-
-        // In a variety of contexts, remove parentheses around sub-expressions. Right now, the
-        // pattern is consistent (and repeated), but it may not end up that way.
-        // https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#parentheses
-        match &mut stmt.node {
-            StmtKind::FunctionDef { .. } => {}
-            StmtKind::AsyncFunctionDef { .. } => {}
-            StmtKind::ClassDef { .. } => {}
-            StmtKind::Return { value } => {
-                if let Some(value) = value {
-                    use_inferred_parens(value);
-                }
-            }
-            StmtKind::Delete { .. } => {}
-            StmtKind::Assign { targets, value, .. } => {
-                for target in targets {
-                    use_inferred_parens(target);
-                }
-                use_inferred_parens(value);
-            }
-            StmtKind::AugAssign { value, .. } => {
-                use_inferred_parens(value);
-            }
-            StmtKind::AnnAssign { value, .. } => {
-                if let Some(value) = value {
-                    use_inferred_parens(value);
-                }
-            }
-            StmtKind::For { target, iter, .. } | StmtKind::AsyncFor { target, iter, .. } => {
-                use_inferred_parens(target);
-                if !matches!(iter.node, ExprKind::Tuple { .. }) {
-                    use_inferred_parens(iter);
-                }
-            }
-            StmtKind::While { test, .. } => {
-                use_inferred_parens(test);
-            }
-            StmtKind::If { test, .. } => {
-                use_inferred_parens(test);
-            }
-            StmtKind::With { .. } => {}
-            StmtKind::AsyncWith { .. } => {}
-            StmtKind::Match { .. } => {}
-            StmtKind::Raise { .. } => {}
-            StmtKind::Try { .. } => {}
-            StmtKind::TryStar { .. } => {}
-            StmtKind::Assert { test, msg } => {
-                use_inferred_parens(test);
-                if let Some(msg) = msg {
-                    use_inferred_parens(msg);
-                }
-            }
-            StmtKind::Import { .. } => {}
-            StmtKind::ImportFrom { .. } => {}
-            StmtKind::Global { .. } => {}
-            StmtKind::Nonlocal { .. } => {}
-            StmtKind::Expr { .. } => {}
-            StmtKind::Pass => {}
-            StmtKind::Break => {}
-            StmtKind::Continue => {}
-        }
-
-        visitor::walk_stmt(self, stmt);
-    }
-
-    fn visit_expr(&mut self, expr: &'a mut Expr) {
-        // Always retain parentheses around expressions.
-        let before = expr.trivia.len();
-        expr.trivia.retain(|trivia| !trivia.kind.is_parentheses());
-        let after = expr.trivia.len();
-        if before != after {
-            expr.parentheses = Parenthesize::Always;
-        }
-
-        match &mut expr.node {
-            ExprKind::BoolOp { .. } => {}
-            ExprKind::NamedExpr { .. } => {}
-            ExprKind::BinOp { .. } => {}
-            ExprKind::UnaryOp { .. } => {}
-            ExprKind::Lambda { .. } => {}
-            ExprKind::IfExp { .. } => {}
-            ExprKind::Dict { .. } => {}
-            ExprKind::Set { .. } => {}
-            ExprKind::ListComp { .. } => {}
-            ExprKind::SetComp { .. } => {}
-            ExprKind::DictComp { .. } => {}
-            ExprKind::GeneratorExp { .. } => {}
-            ExprKind::Await { .. } => {}
-            ExprKind::Yield { .. } => {}
-            ExprKind::YieldFrom { .. } => {}
-            ExprKind::Compare { .. } => {}
-            ExprKind::Call { .. } => {}
-            ExprKind::FormattedValue { .. } => {}
-            ExprKind::JoinedStr { .. } => {}
-            ExprKind::Constant { .. } => {}
-            ExprKind::Attribute { value, .. } => {
-                if matches!(
-                    value.node,
-                    ExprKind::Constant {
-                        value: Constant::Float(..),
-                        ..
-                    },
-                ) {
-                    value.parentheses = Parenthesize::Always;
-                } else if matches!(
-                    value.node,
-                    ExprKind::Constant {
-                        value: Constant::Int(..),
-                        ..
-                    },
-                ) {
-                    // TODO(charlie): Encode this in the AST via separate node types.
-                    if !is_radix_literal(self.locator.slice(value.range())) {
-                        value.parentheses = Parenthesize::Always;
-                    }
-                }
-            }
-            ExprKind::Subscript { value, slice, .. } => {
-                // If the slice isn't manually parenthesized, ensure that we _never_ parenthesize
-                // the value.
-                if !slice
-                    .trivia
-                    .iter()
-                    .any(|trivia| trivia.kind.is_parentheses())
-                {
-                    value.parentheses = Parenthesize::Never;
-                }
-            }
-            ExprKind::Starred { .. } => {}
-            ExprKind::Name { .. } => {}
-            ExprKind::List { .. } => {}
-            ExprKind::Tuple { .. } => {}
-            ExprKind::Slice { .. } => {}
-        }
-
-        visitor::walk_expr(self, expr);
-    }
-}
-
-/// Normalize parentheses in a Python CST.
-///
-/// It's not always possible to determine the correct parentheses to use during formatting
-/// from the node (and trivia) alone; sometimes, we need to know the parent node. This
-/// visitor normalizes parentheses via a top-down traversal, which simplifies the formatting
-/// code later on.
-///
-/// TODO(charlie): It's weird that we have both `TriviaKind::Parentheses` (which aren't used
-/// during formatting) and `Parenthesize` (which are used during formatting).
-pub fn normalize_parentheses(python_cst: &mut [Stmt], locator: &Locator) {
-    let mut normalizer = ParenthesesNormalizer { locator };
-    for stmt in python_cst {
-        normalizer.visit_stmt(stmt);
-    }
-}
diff --git a/crates/ruff_python_formatter/src/pattern/mod.rs b/crates/ruff_python_formatter/src/pattern/mod.rs
new file mode 100644
index 0000000000000..992f90a49da18
--- /dev/null
+++ b/crates/ruff_python_formatter/src/pattern/mod.rs
@@ -0,0 +1,8 @@
+pub(crate) mod pattern_match_as;
+pub(crate) mod pattern_match_class;
+pub(crate) mod pattern_match_mapping;
+pub(crate) mod pattern_match_or;
+pub(crate) mod pattern_match_sequence;
+pub(crate) mod pattern_match_singleton;
+pub(crate) mod pattern_match_star;
+pub(crate) mod pattern_match_value;
diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_as.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_as.rs
new file mode 100644
index 0000000000000..3f67d87b93e23
--- /dev/null
+++ b/crates/ruff_python_formatter/src/pattern/pattern_match_as.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::PatternMatchAs;
+
+#[derive(Default)]
+pub struct FormatPatternMatchAs;
+
+impl FormatNodeRule<PatternMatchAs> for FormatPatternMatchAs {
+    fn fmt_fields(&self, item: &PatternMatchAs, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_class.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_class.rs
new file mode 100644
index 0000000000000..a64f4b22075c3
--- /dev/null
+++ b/crates/ruff_python_formatter/src/pattern/pattern_match_class.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::PatternMatchClass;
+
+#[derive(Default)]
+pub struct FormatPatternMatchClass;
+
+impl FormatNodeRule<PatternMatchClass> for FormatPatternMatchClass {
+    fn fmt_fields(&self, item: &PatternMatchClass, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_mapping.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_mapping.rs
new file mode 100644
index 0000000000000..b3fca1d5d4166
--- /dev/null
+++ b/crates/ruff_python_formatter/src/pattern/pattern_match_mapping.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::PatternMatchMapping;
+
+#[derive(Default)]
+pub struct FormatPatternMatchMapping;
+
+impl FormatNodeRule<PatternMatchMapping> for FormatPatternMatchMapping {
+    fn fmt_fields(&self, item: &PatternMatchMapping, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_or.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_or.rs
new file mode 100644
index 0000000000000..487e884ec885d
--- /dev/null
+++ b/crates/ruff_python_formatter/src/pattern/pattern_match_or.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::PatternMatchOr;
+
+#[derive(Default)]
+pub struct FormatPatternMatchOr;
+
+impl FormatNodeRule<PatternMatchOr> for FormatPatternMatchOr {
+    fn fmt_fields(&self, item: &PatternMatchOr, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_sequence.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_sequence.rs
new file mode 100644
index 0000000000000..c2fa31ecf948e
--- /dev/null
+++ b/crates/ruff_python_formatter/src/pattern/pattern_match_sequence.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::PatternMatchSequence;
+
+#[derive(Default)]
+pub struct FormatPatternMatchSequence;
+
+impl FormatNodeRule<PatternMatchSequence> for FormatPatternMatchSequence {
+    fn fmt_fields(&self, item: &PatternMatchSequence, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_singleton.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_singleton.rs
new file mode 100644
index 0000000000000..352098e9d1e75
--- /dev/null
+++ b/crates/ruff_python_formatter/src/pattern/pattern_match_singleton.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::PatternMatchSingleton;
+
+#[derive(Default)]
+pub struct FormatPatternMatchSingleton;
+
+impl FormatNodeRule<PatternMatchSingleton> for FormatPatternMatchSingleton {
+    fn fmt_fields(&self, item: &PatternMatchSingleton, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_star.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_star.rs
new file mode 100644
index 0000000000000..17340ae840245
--- /dev/null
+++ b/crates/ruff_python_formatter/src/pattern/pattern_match_star.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::PatternMatchStar;
+
+#[derive(Default)]
+pub struct FormatPatternMatchStar;
+
+impl FormatNodeRule<PatternMatchStar> for FormatPatternMatchStar {
+    fn fmt_fields(&self, item: &PatternMatchStar, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_value.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_value.rs
new file mode 100644
index 0000000000000..9a57fbd15a0eb
--- /dev/null
+++ b/crates/ruff_python_formatter/src/pattern/pattern_match_value.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::PatternMatchValue;
+
+#[derive(Default)]
+pub struct FormatPatternMatchValue;
+
+impl FormatNodeRule<PatternMatchValue> for FormatPatternMatchValue {
+    fn fmt_fields(&self, item: &PatternMatchValue, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/prelude.rs b/crates/ruff_python_formatter/src/prelude.rs
new file mode 100644
index 0000000000000..7382684dba647
--- /dev/null
+++ b/crates/ruff_python_formatter/src/prelude.rs
@@ -0,0 +1,7 @@
+#[allow(unused_imports)]
+pub(crate) use crate::{
+    builders::PyFormatterExtensions, AsFormat, FormattedIterExt as _, IntoFormat, PyFormatContext,
+    PyFormatter,
+};
+#[allow(unused_imports)]
+pub(crate) use ruff_formatter::prelude::*;
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__attribute_access_on_number_literals_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__attribute_access_on_number_literals_py.snap
new file mode 100644
index 0000000000000..cf7719b9a4b39
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__attribute_access_on_number_literals_py.snap
@@ -0,0 +1,135 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: snapshot
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/simple_cases/attribute_access_on_number_literals.py
+---
+## Input
+
+```py
+x = 123456789 .bit_count()
+x = (123456).__abs__()
+x = .1.is_integer()
+x = 1. .imag
+x = 1E+1.imag
+x = 1E-1.real
+x = 123456789.123456789.hex()
+x = 123456789.123456789E123456789 .real
+x = 123456789E123456789 .conjugate()
+x = 123456789J.real
+x = 123456789.123456789J.__add__(0b1011.bit_length())
+x = 0XB1ACC.conjugate()
+x = 0B1011 .conjugate()
+x = 0O777 .real
+x = 0.000000006  .hex()
+x = -100.0000J
+
+if 10 .real:
+    ...
+
+y = 100[no]
+y = 100(no)
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,22 +1,21 @@
+-x = (123456789).bit_count()
+-x = (123456).__abs__()
+-x = (0.1).is_integer()
+-x = (1.0).imag
+-x = (1e1).imag
+-x = (1e-1).real
+-x = (123456789.123456789).hex()
+-x = (123456789.123456789e123456789).real
+-x = (123456789e123456789).conjugate()
+-x = 123456789j.real
+-x = 123456789.123456789j.__add__(0b1011.bit_length())
+-x = 0xB1ACC.conjugate()
+-x = 0b1011.conjugate()
+-x = 0o777.real
+-x = (0.000000006).hex()
+-x = -100.0000j
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
+ 
+-if (10).real:
+-    ...
++NOT_YET_IMPLEMENTED_StmtIf
+ 
+-y = 100[no]
+-y = 100(no)
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
+```
+
+## Ruff Output
+
+```py
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+
+NOT_YET_IMPLEMENTED_StmtIf
+
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+```
+
+## Black Output
+
+```py
+x = (123456789).bit_count()
+x = (123456).__abs__()
+x = (0.1).is_integer()
+x = (1.0).imag
+x = (1e1).imag
+x = (1e-1).real
+x = (123456789.123456789).hex()
+x = (123456789.123456789e123456789).real
+x = (123456789e123456789).conjugate()
+x = 123456789j.real
+x = 123456789.123456789j.__add__(0b1011.bit_length())
+x = 0xB1ACC.conjugate()
+x = 0b1011.conjugate()
+x = 0o777.real
+x = (0.000000006).hex()
+x = -100.0000j
+
+if (10).real:
+    ...
+
+y = 100[no]
+y = 100(no)
+```
+
+
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__beginning_backslash_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__beginning_backslash_py.snap
new file mode 100644
index 0000000000000..d45080f5bf2f7
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__beginning_backslash_py.snap
@@ -0,0 +1,40 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: snapshot
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/simple_cases/beginning_backslash.py
+---
+## Input
+
+```py
+\
+
+
+
+
+
+print("hello, world")
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1 +1 @@
+-print("hello, world")
++NOT_YET_IMPLEMENTED_ExprCall
+```
+
+## Ruff Output
+
+```py
+NOT_YET_IMPLEMENTED_ExprCall
+```
+
+## Black Output
+
+```py
+print("hello, world")
+```
+
+
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__bracketmatch_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__bracketmatch_py.snap
new file mode 100644
index 0000000000000..12e5e46d59f3c
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__bracketmatch_py.snap
@@ -0,0 +1,49 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: snapshot
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/simple_cases/bracketmatch.py
+---
+## Input
+
+```py
+for ((x in {}) or {})['a'] in x:
+    pass
+pem_spam = lambda l, spam = {
+    "x": 3
+}: not spam.get(l.strip())
+lambda x=lambda y={1: 3}: y['x':lambda y: {1: 2}]: x
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,4 +1,3 @@
+-for ((x in {}) or {})["a"] in x:
+-    pass
+-pem_spam = lambda l, spam={"x": 3}: not spam.get(l.strip())
+-lambda x=lambda y={1: 3}: y["x" : lambda y: {1: 2}]: x
++NOT_YET_IMPLEMENTED_StmtFor
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_ExprLambda
+```
+
+## Ruff Output
+
+```py
+NOT_YET_IMPLEMENTED_StmtFor
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_ExprLambda
+```
+
+## Black Output
+
+```py
+for ((x in {}) or {})["a"] in x:
+    pass
+pem_spam = lambda l, spam={"x": 3}: not spam.get(l.strip())
+lambda x=lambda y={1: 3}: y["x" : lambda y: {1: 2}]: x
+```
+
+
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__class_blank_parentheses_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__class_blank_parentheses_py.snap
new file mode 100644
index 0000000000000..12aa367c1f17c
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__class_blank_parentheses_py.snap
@@ -0,0 +1,134 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: snapshot
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/simple_cases/class_blank_parentheses.py
+---
+## Input
+
+```py
+class SimpleClassWithBlankParentheses():
+    pass
+class ClassWithSpaceParentheses ( ):
+    first_test_data = 90
+    second_test_data = 100
+    def test_func(self):
+        return None
+class ClassWithEmptyFunc(object):
+
+    def func_with_blank_parentheses():
+        return 5
+
+
+def public_func_with_blank_parentheses():
+    return None
+def class_under_the_func_with_blank_parentheses():
+    class InsideFunc():
+        pass
+class NormalClass (
+):
+    def func_for_testing(self, first, second):
+        sum = first + second
+        return sum
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,30 +1,16 @@
+-class SimpleClassWithBlankParentheses:
+-    pass
+-
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+-class ClassWithSpaceParentheses:
+-    first_test_data = 90
+-    second_test_data = 100
+ 
+-    def test_func(self):
+-        return None
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+ 
+-class ClassWithEmptyFunc(object):
+-    def func_with_blank_parentheses():
+-        return 5
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+ 
+-def public_func_with_blank_parentheses():
+-    return None
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def class_under_the_func_with_blank_parentheses():
+-    class InsideFunc:
+-        pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-class NormalClass:
+-    def func_for_testing(self, first, second):
+-        sum = first + second
+-        return sum
++NOT_YET_IMPLEMENTED_StmtClassDef
+```
+
+## Ruff Output
+
+```py
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtFunctionDef
+
+
+NOT_YET_IMPLEMENTED_StmtFunctionDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+```
+
+## Black Output
+
+```py
+class SimpleClassWithBlankParentheses:
+    pass
+
+
+class ClassWithSpaceParentheses:
+    first_test_data = 90
+    second_test_data = 100
+
+    def test_func(self):
+        return None
+
+
+class ClassWithEmptyFunc(object):
+    def func_with_blank_parentheses():
+        return 5
+
+
+def public_func_with_blank_parentheses():
+    return None
+
+
+def class_under_the_func_with_blank_parentheses():
+    class InsideFunc:
+        pass
+
+
+class NormalClass:
+    def func_for_testing(self, first, second):
+        sum = first + second
+        return sum
+```
+
+
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__class_methods_new_line_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__class_methods_new_line_py.snap
new file mode 100644
index 0000000000000..ecb8824ed1495
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__class_methods_new_line_py.snap
@@ -0,0 +1,541 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: snapshot
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/simple_cases/class_methods_new_line.py
+---
+## Input
+
+```py
+class ClassSimplest:
+    pass
+class ClassWithSingleField:
+    a = 1
+class ClassWithJustTheDocstring:
+    """Just a docstring."""
+class ClassWithInit:
+    def __init__(self):
+        pass
+class ClassWithTheDocstringAndInit:
+    """Just a docstring."""
+    def __init__(self):
+        pass
+class ClassWithInitAndVars:
+    cls_var = 100
+    def __init__(self):
+        pass
+class ClassWithInitAndVarsAndDocstring:
+    """Test class"""
+    cls_var = 100
+    def __init__(self):
+        pass
+class ClassWithDecoInit:
+    @deco
+    def __init__(self):
+        pass
+class ClassWithDecoInitAndVars:
+    cls_var = 100
+    @deco
+    def __init__(self):
+        pass
+class ClassWithDecoInitAndVarsAndDocstring:
+    """Test class"""
+    cls_var = 100
+    @deco
+    def __init__(self):
+        pass
+class ClassSimplestWithInner:
+    class Inner:
+        pass
+class ClassSimplestWithInnerWithDocstring:
+    class Inner:
+        """Just a docstring."""
+        def __init__(self):
+            pass
+class ClassWithSingleFieldWithInner:
+    a = 1
+    class Inner:
+        pass
+class ClassWithJustTheDocstringWithInner:
+    """Just a docstring."""
+    class Inner:
+        pass
+class ClassWithInitWithInner:
+    class Inner:
+        pass
+    def __init__(self):
+        pass
+class ClassWithInitAndVarsWithInner:
+    cls_var = 100
+    class Inner:
+        pass
+    def __init__(self):
+        pass
+class ClassWithInitAndVarsAndDocstringWithInner:
+    """Test class"""
+    cls_var = 100
+    class Inner:
+        pass
+    def __init__(self):
+        pass
+class ClassWithDecoInitWithInner:
+    class Inner:
+        pass
+    @deco
+    def __init__(self):
+        pass
+class ClassWithDecoInitAndVarsWithInner:
+    cls_var = 100
+    class Inner:
+        pass
+    @deco
+    def __init__(self):
+        pass
+class ClassWithDecoInitAndVarsAndDocstringWithInner:
+    """Test class"""
+    cls_var = 100
+    class Inner:
+        pass
+    @deco
+    def __init__(self):
+        pass
+class ClassWithDecoInitAndVarsAndDocstringWithInner2:
+    """Test class"""
+    class Inner:
+        pass
+    cls_var = 100
+    @deco
+    def __init__(self):
+        pass
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,165 +1,61 @@
+-class ClassSimplest:
+-    pass
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+ 
+-class ClassWithSingleField:
+-    a = 1
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+ 
+-class ClassWithJustTheDocstring:
+-    """Just a docstring."""
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+ 
+-class ClassWithInit:
+-    def __init__(self):
+-        pass
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+ 
+-class ClassWithTheDocstringAndInit:
+-    """Just a docstring."""
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+-    def __init__(self):
+-        pass
+ 
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+-class ClassWithInitAndVars:
+-    cls_var = 100
+ 
+-    def __init__(self):
+-        pass
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+ 
+-class ClassWithInitAndVarsAndDocstring:
+-    """Test class"""
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+-    cls_var = 100
+ 
+-    def __init__(self):
+-        pass
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+ 
+-class ClassWithDecoInit:
+-    @deco
+-    def __init__(self):
+-        pass
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+ 
+-class ClassWithDecoInitAndVars:
+-    cls_var = 100
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+-    @deco
+-    def __init__(self):
+-        pass
+ 
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+-class ClassWithDecoInitAndVarsAndDocstring:
+-    """Test class"""
+ 
+-    cls_var = 100
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+-    @deco
+-    def __init__(self):
+-        pass
+ 
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+-class ClassSimplestWithInner:
+-    class Inner:
+-        pass
+ 
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+-class ClassSimplestWithInnerWithDocstring:
+-    class Inner:
+-        """Just a docstring."""
+ 
+-        def __init__(self):
+-            pass
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+ 
+-class ClassWithSingleFieldWithInner:
+-    a = 1
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+-    class Inner:
+-        pass
+ 
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+-class ClassWithJustTheDocstringWithInner:
+-    """Just a docstring."""
+ 
+-    class Inner:
+-        pass
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+ 
+-class ClassWithInitWithInner:
+-    class Inner:
+-        pass
+-
+-    def __init__(self):
+-        pass
+-
+-
+-class ClassWithInitAndVarsWithInner:
+-    cls_var = 100
+-
+-    class Inner:
+-        pass
+-
+-    def __init__(self):
+-        pass
+-
+-
+-class ClassWithInitAndVarsAndDocstringWithInner:
+-    """Test class"""
+-
+-    cls_var = 100
+-
+-    class Inner:
+-        pass
+-
+-    def __init__(self):
+-        pass
+-
+-
+-class ClassWithDecoInitWithInner:
+-    class Inner:
+-        pass
+-
+-    @deco
+-    def __init__(self):
+-        pass
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+ 
+-class ClassWithDecoInitAndVarsWithInner:
+-    cls_var = 100
+-
+-    class Inner:
+-        pass
+-
+-    @deco
+-    def __init__(self):
+-        pass
+-
+-
+-class ClassWithDecoInitAndVarsAndDocstringWithInner:
+-    """Test class"""
+-
+-    cls_var = 100
+-
+-    class Inner:
+-        pass
+-
+-    @deco
+-    def __init__(self):
+-        pass
+-
+-
+-class ClassWithDecoInitAndVarsAndDocstringWithInner2:
+-    """Test class"""
+-
+-    class Inner:
+-        pass
+-
+-    cls_var = 100
+-
+-    @deco
+-    def __init__(self):
+-        pass
++NOT_YET_IMPLEMENTED_StmtClassDef
+```
+
+## Ruff Output
+
+```py
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+```
+
+## Black Output
+
+```py
+class ClassSimplest:
+    pass
+
+
+class ClassWithSingleField:
+    a = 1
+
+
+class ClassWithJustTheDocstring:
+    """Just a docstring."""
+
+
+class ClassWithInit:
+    def __init__(self):
+        pass
+
+
+class ClassWithTheDocstringAndInit:
+    """Just a docstring."""
+
+    def __init__(self):
+        pass
+
+
+class ClassWithInitAndVars:
+    cls_var = 100
+
+    def __init__(self):
+        pass
+
+
+class ClassWithInitAndVarsAndDocstring:
+    """Test class"""
+
+    cls_var = 100
+
+    def __init__(self):
+        pass
+
+
+class ClassWithDecoInit:
+    @deco
+    def __init__(self):
+        pass
+
+
+class ClassWithDecoInitAndVars:
+    cls_var = 100
+
+    @deco
+    def __init__(self):
+        pass
+
+
+class ClassWithDecoInitAndVarsAndDocstring:
+    """Test class"""
+
+    cls_var = 100
+
+    @deco
+    def __init__(self):
+        pass
+
+
+class ClassSimplestWithInner:
+    class Inner:
+        pass
+
+
+class ClassSimplestWithInnerWithDocstring:
+    class Inner:
+        """Just a docstring."""
+
+        def __init__(self):
+            pass
+
+
+class ClassWithSingleFieldWithInner:
+    a = 1
+
+    class Inner:
+        pass
+
+
+class ClassWithJustTheDocstringWithInner:
+    """Just a docstring."""
+
+    class Inner:
+        pass
+
+
+class ClassWithInitWithInner:
+    class Inner:
+        pass
+
+    def __init__(self):
+        pass
+
+
+class ClassWithInitAndVarsWithInner:
+    cls_var = 100
+
+    class Inner:
+        pass
+
+    def __init__(self):
+        pass
+
+
+class ClassWithInitAndVarsAndDocstringWithInner:
+    """Test class"""
+
+    cls_var = 100
+
+    class Inner:
+        pass
+
+    def __init__(self):
+        pass
+
+
+class ClassWithDecoInitWithInner:
+    class Inner:
+        pass
+
+    @deco
+    def __init__(self):
+        pass
+
+
+class ClassWithDecoInitAndVarsWithInner:
+    cls_var = 100
+
+    class Inner:
+        pass
+
+    @deco
+    def __init__(self):
+        pass
+
+
+class ClassWithDecoInitAndVarsAndDocstringWithInner:
+    """Test class"""
+
+    cls_var = 100
+
+    class Inner:
+        pass
+
+    @deco
+    def __init__(self):
+        pass
+
+
+class ClassWithDecoInitAndVarsAndDocstringWithInner2:
+    """Test class"""
+
+    class Inner:
+        pass
+
+    cls_var = 100
+
+    @deco
+    def __init__(self):
+        pass
+```
+
+
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__collections_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__collections_py.snap
new file mode 100644
index 0000000000000..f19784f0d6b59
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__collections_py.snap
@@ -0,0 +1,377 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: snapshot
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/simple_cases/collections.py
+---
+## Input
+
+```py
+import core, time, a
+
+from . import A, B, C
+
+# keeps existing trailing comma
+from foo import (
+    bar,
+)
+
+# also keeps existing structure
+from foo import (
+    baz,
+    qux,
+)
+
+# `as` works as well
+from foo import (
+    xyzzy as magic,
+)
+
+a = {1,2,3,}
+b = {
+1,2,
+     3}
+c = {
+    1,
+    2,
+    3,
+}
+x = 1,
+y = narf(),
+nested = {(1,2,3),(4,5,6),}
+nested_no_trailing_comma = {(1,2,3),(4,5,6)}
+nested_long_lines = ["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb", "cccccccccccccccccccccccccccccccccccccccc", (1, 2, 3), "dddddddddddddddddddddddddddddddddddddddd"]
+{"oneple": (1,),}
+{"oneple": (1,)}
+['ls', 'lsoneple/%s' % (foo,)]
+x = {"oneple": (1,)}
+y = {"oneple": (1,),}
+assert False, ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa wraps %s" % bar)
+
+# looping over a 1-tuple should also not get wrapped
+for x in (1,):
+    pass
+for (x,) in (1,), (2,), (3,):
+    pass
+
+[1, 2, 3,]
+
+division_result_tuple = (6/2,)
+print("foo %r", (foo.bar,))
+
+if True:
+    IGNORED_TYPES_FOR_ATTRIBUTE_CHECKING = (
+        Config.IGNORED_TYPES_FOR_ATTRIBUTE_CHECKING
+        | {pylons.controllers.WSGIController}
+    )
+
+if True:
+    ec2client.get_waiter('instance_stopped').wait(
+        InstanceIds=[instance.id],
+        WaiterConfig={
+            'Delay': 5,
+        })
+    ec2client.get_waiter("instance_stopped").wait(
+        InstanceIds=[instance.id],
+        WaiterConfig={"Delay": 5,},
+    )
+    ec2client.get_waiter("instance_stopped").wait(
+        InstanceIds=[instance.id], WaiterConfig={"Delay": 5,},
+    )
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,99 +1,48 @@
+-import core, time, a
++NOT_YET_IMPLEMENTED_StmtImport
+ 
+-from . import A, B, C
++NOT_YET_IMPLEMENTED_StmtImportFrom
+ 
+ # keeps existing trailing comma
+-from foo import (
+-    bar,
+-)
++NOT_YET_IMPLEMENTED_StmtImportFrom
+ 
+ # also keeps existing structure
+-from foo import (
+-    baz,
+-    qux,
+-)
++NOT_YET_IMPLEMENTED_StmtImportFrom
+ 
+ # `as` works as well
+-from foo import (
+-    xyzzy as magic,
+-)
++NOT_YET_IMPLEMENTED_StmtImportFrom
+ 
+-a = {
+-    1,
+-    2,
+-    3,
+-}
+-b = {1, 2, 3}
+-c = {
+-    1,
+-    2,
+-    3,
+-}
+-x = (1,)
+-y = (narf(),)
+-nested = {
+-    (1, 2, 3),
+-    (4, 5, 6),
+-}
+-nested_no_trailing_comma = {(1, 2, 3), (4, 5, 6)}
+-nested_long_lines = [
+-    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+-    "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+-    "cccccccccccccccccccccccccccccccccccccccc",
+-    (1, 2, 3),
+-    "dddddddddddddddddddddddddddddddddddddddd",
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_ExprDict
++NOT_YET_IMPLEMENTED_ExprDict
++[
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant
++    % NOT_YET_IMPLEMENTED_ExprTuple,
+ ]
+-{
+-    "oneple": (1,),
+-}
+-{"oneple": (1,)}
+-["ls", "lsoneple/%s" % (foo,)]
+-x = {"oneple": (1,)}
+-y = {
+-    "oneple": (1,),
+-}
+-assert False, (
+-    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa wraps %s"
+-    % bar
+-)
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssert
+ 
+ # looping over a 1-tuple should also not get wrapped
+-for x in (1,):
+-    pass
+-for (x,) in (1,), (2,), (3,):
+-    pass
++NOT_YET_IMPLEMENTED_StmtFor
++NOT_YET_IMPLEMENTED_StmtFor
+ 
+ [
+-    1,
+-    2,
+-    3,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
+ ]
+ 
+-division_result_tuple = (6 / 2,)
+-print("foo %r", (foo.bar,))
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_ExprCall
+ 
+-if True:
+-    IGNORED_TYPES_FOR_ATTRIBUTE_CHECKING = (
+-        Config.IGNORED_TYPES_FOR_ATTRIBUTE_CHECKING
+-        | {pylons.controllers.WSGIController}
+-    )
++NOT_YET_IMPLEMENTED_StmtIf
+ 
+-if True:
+-    ec2client.get_waiter("instance_stopped").wait(
+-        InstanceIds=[instance.id],
+-        WaiterConfig={
+-            "Delay": 5,
+-        },
+-    )
+-    ec2client.get_waiter("instance_stopped").wait(
+-        InstanceIds=[instance.id],
+-        WaiterConfig={
+-            "Delay": 5,
+-        },
+-    )
+-    ec2client.get_waiter("instance_stopped").wait(
+-        InstanceIds=[instance.id],
+-        WaiterConfig={
+-            "Delay": 5,
+-        },
+-    )
++NOT_YET_IMPLEMENTED_StmtIf
+```
+
+## Ruff Output
+
+```py
+NOT_YET_IMPLEMENTED_StmtImport
+
+NOT_YET_IMPLEMENTED_StmtImportFrom
+
+# keeps existing trailing comma
+NOT_YET_IMPLEMENTED_StmtImportFrom
+
+# also keeps existing structure
+NOT_YET_IMPLEMENTED_StmtImportFrom
+
+# `as` works as well
+NOT_YET_IMPLEMENTED_StmtImportFrom
+
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_ExprDict
+NOT_YET_IMPLEMENTED_ExprDict
+[
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant
+    % NOT_YET_IMPLEMENTED_ExprTuple,
+]
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssert
+
+# looping over a 1-tuple should also not get wrapped
+NOT_YET_IMPLEMENTED_StmtFor
+NOT_YET_IMPLEMENTED_StmtFor
+
+[
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+]
+
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_ExprCall
+
+NOT_YET_IMPLEMENTED_StmtIf
+
+NOT_YET_IMPLEMENTED_StmtIf
+```
+
+## Black Output
+
+```py
+import core, time, a
+
+from . import A, B, C
+
+# keeps existing trailing comma
+from foo import (
+    bar,
+)
+
+# also keeps existing structure
+from foo import (
+    baz,
+    qux,
+)
+
+# `as` works as well
+from foo import (
+    xyzzy as magic,
+)
+
+a = {
+    1,
+    2,
+    3,
+}
+b = {1, 2, 3}
+c = {
+    1,
+    2,
+    3,
+}
+x = (1,)
+y = (narf(),)
+nested = {
+    (1, 2, 3),
+    (4, 5, 6),
+}
+nested_no_trailing_comma = {(1, 2, 3), (4, 5, 6)}
+nested_long_lines = [
+    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+    "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+    "cccccccccccccccccccccccccccccccccccccccc",
+    (1, 2, 3),
+    "dddddddddddddddddddddddddddddddddddddddd",
+]
+{
+    "oneple": (1,),
+}
+{"oneple": (1,)}
+["ls", "lsoneple/%s" % (foo,)]
+x = {"oneple": (1,)}
+y = {
+    "oneple": (1,),
+}
+assert False, (
+    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa wraps %s"
+    % bar
+)
+
+# looping over a 1-tuple should also not get wrapped
+for x in (1,):
+    pass
+for (x,) in (1,), (2,), (3,):
+    pass
+
+[
+    1,
+    2,
+    3,
+]
+
+division_result_tuple = (6 / 2,)
+print("foo %r", (foo.bar,))
+
+if True:
+    IGNORED_TYPES_FOR_ATTRIBUTE_CHECKING = (
+        Config.IGNORED_TYPES_FOR_ATTRIBUTE_CHECKING
+        | {pylons.controllers.WSGIController}
+    )
+
+if True:
+    ec2client.get_waiter("instance_stopped").wait(
+        InstanceIds=[instance.id],
+        WaiterConfig={
+            "Delay": 5,
+        },
+    )
+    ec2client.get_waiter("instance_stopped").wait(
+        InstanceIds=[instance.id],
+        WaiterConfig={
+            "Delay": 5,
+        },
+    )
+    ec2client.get_waiter("instance_stopped").wait(
+        InstanceIds=[instance.id],
+        WaiterConfig={
+            "Delay": 5,
+        },
+    )
+```
+
+
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comment_after_escaped_newline_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comment_after_escaped_newline_py.snap
index 92e670eafabb9..906a9362924ba 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comment_after_escaped_newline_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comment_after_escaped_newline_py.snap
@@ -22,30 +22,24 @@ def bobtwo(): \
 ```diff
 --- Black
 +++ Ruff
-@@ -1,6 +1,8 @@
+@@ -1,6 +1,4 @@
 -def bob():  # pylint: disable=W9016
-+def bob():
-+    # pylint: disable=W9016
-     pass
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
 -def bobtwo():  # some comment here
-+def bobtwo():
-+    # some comment here
-     pass
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Ruff Output
 
 ```py
-def bob():
-    # pylint: disable=W9016
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def bobtwo():
-    # some comment here
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments2_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments2_py.snap
index 67f21723d4f5f..8b8b88686f5e1 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments2_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments2_py.snap
@@ -178,75 +178,186 @@ instruction()#comment with bad spacing
 ```diff
 --- Black
 +++ Ruff
-@@ -72,7 +72,11 @@
-             body,
-             parameters.children[-1],  # )2
-         ]
+@@ -1,165 +1,23 @@
+-from com.my_lovely_company.my_lovely_team.my_lovely_project.my_lovely_component import (
+-    MyLovelyCompanyTeamProjectComponent,  # NOT DRY
+-)
+-from com.my_lovely_company.my_lovely_team.my_lovely_project.my_lovely_component import (
+-    MyLovelyCompanyTeamProjectComponent as component,  # DRY
+-)
++NOT_YET_IMPLEMENTED_StmtImportFrom
++NOT_YET_IMPLEMENTED_StmtImportFrom
+ 
+ # Please keep __all__ alphabetized within each category.
+ 
+-__all__ = [
+-    # Super-special typing primitives.
+-    "Any",
+-    "Callable",
+-    "ClassVar",
+-    # ABCs (from collections.abc).
+-    "AbstractSet",  # collections.abc.Set.
+-    "ByteString",
+-    "Container",
+-    # Concrete collection types.
+-    "Counter",
+-    "Deque",
+-    "Dict",
+-    "DefaultDict",
+-    "List",
+-    "Set",
+-    "FrozenSet",
+-    "NamedTuple",  # Not really a type.
+-    "Generator",
+-]
++NOT_YET_IMPLEMENTED_StmtAssign
+ 
+-not_shareables = [
+-    # singletons
+-    True,
+-    False,
+-    NotImplemented,
+-    ...,
+-    # builtin types and objects
+-    type,
+-    object,
+-    object(),
+-    Exception(),
+-    42,
+-    100.0,
+-    "spam",
+-    # user-defined types and objects
+-    Cheese,
+-    Cheese("Wensleydale"),
+-    SubBytes(b"spam"),
+-]
++NOT_YET_IMPLEMENTED_StmtAssign
+ 
+-if "PYTHON" in os.environ:
+-    add_compiler(compiler_from_env())
+-else:
+-    # for compiler in compilers.values():
+-    # add_compiler(compiler)
+-    add_compiler(compilers[(7.0, 32)])
+-    # add_compiler(compilers[(7.1, 64)])
++NOT_YET_IMPLEMENTED_StmtIf
+ 
+ 
+ # Comment before function.
+-def inline_comments_in_brackets_ruin_everything():
+-    if typedargslist:
+-        parameters.children = [children[0], body, children[-1]]  # (1  # )1
+-        parameters.children = [
+-            children[0],
+-            body,
+-            children[-1],  # type: ignore
+-        ]
+-    else:
+-        parameters.children = [
+-            parameters.children[0],  # (2 what if this was actually long
+-            body,
+-            parameters.children[-1],  # )2
+-        ]
 -        parameters.children = [parameters.what_if_this_was_actually_long.children[0], body, parameters.children[-1]]  # type: ignore
-+        parameters.children = [
-+            parameters.what_if_this_was_actually_long.children[0],
-+            body,
-+            parameters.children[-1],
-+        ]  # type: ignore
-     if (
-         self._proc is not None
-         # has the child process finished?
-@@ -103,35 +107,35 @@
-     ############################################################################
+-    if (
+-        self._proc is not None
+-        # has the child process finished?
+-        and self._returncode is None
+-        # the child process has finished, but the
+-        # transport hasn't been notified yet?
+-        and self._proc.poll() is None
+-    ):
+-        pass
+-    # no newline before or after
+-    short = [
+-        # one
+-        1,
+-        # two
+-        2,
+-    ]
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+-    # no newline after
+-    call(
+-        arg1,
+-        arg2,
+-        """
+-short
+-""",
+-        arg3=True,
+-    )
  
-     call2(
+-    ############################################################################
+-
+-    call2(
 -        # short
-+        #short
-         arg1,
+-        arg1,
 -        # but
-+        #but
-         arg2,
+-        arg2,
 -        # multiline
-+        #multiline
-         """
- short
- """,
-         # yup
-         arg3=True,
-     )
+-        """
+-short
+-""",
+-        # yup
+-        arg3=True,
+-    )
 -    lcomp = [
 -        element for element in collection if element is not None  # yup  # yup  # right
 -    ]
-+    lcomp = [element for element in collection if element is not None]  # yup  # yup  # right
-     lcomp2 = [
-         # hello
-         element
+-    lcomp2 = [
+-        # hello
+-        element
 -        # yup
 -        for element in collection
 -        # right
 -        if element is not None
-+        for # yup
-+        element in collection
-+        if # right
-+        element
-+        is not None
-     ]
-     lcomp3 = [
-         # This one is actually too long to fit in a single line.
-         element.split("\n", 1)[0]
+-    ]
+-    lcomp3 = [
+-        # This one is actually too long to fit in a single line.
+-        element.split("\n", 1)[0]
 -        # yup
 -        for element in collection.select_elements()
 -        # right
 -        if element is not None
-+        for # yup
-+        element in collection.select_elements()
-+        if # right
-+        element
-+        is not None
-     ]
-     while True:
-         if False:
-@@ -167,7 +171,7 @@
+-    ]
+-    while True:
+-        if False:
+-            continue
++NOT_YET_IMPLEMENTED_StmtAssign  # type: Final
+ 
+-            # and round and round we go
+-        # and round and round we go
+ 
+-    # let's return
+-    return Node(
+-        syms.simple_stmt,
+-        [Node(statement, result), Leaf(token.NEWLINE, "\n")],  # FIXME: \r\n?
+-    )
+-
+-
+-CONFIG_FILES = (
+-    [
+-        CONFIG_FILE,
+-    ]
+-    + SHARED_CONFIG_FILES
+-    + USER_CONFIG_FILES
+-)  # type: Final
+-
+-
+-class Test:
+-    def _init_host(self, parsed) -> None:
+-        if parsed.hostname is None or not parsed.hostname.strip():  # type: ignore
+-            pass
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+ 
+ #######################
+@@ -167,7 +25,7 @@
  #######################
  
  
 -instruction()  # comment with bad spacing
-+instruction()  #comment with bad spacing
++NOT_YET_IMPLEMENTED_ExprCall  # comment with bad spacing
  
  # END COMMENTS
  # MORE END COMMENTS
@@ -255,172 +366,26 @@ instruction()#comment with bad spacing
 ## Ruff Output
 
 ```py
-from com.my_lovely_company.my_lovely_team.my_lovely_project.my_lovely_component import (
-    MyLovelyCompanyTeamProjectComponent,  # NOT DRY
-)
-from com.my_lovely_company.my_lovely_team.my_lovely_project.my_lovely_component import (
-    MyLovelyCompanyTeamProjectComponent as component,  # DRY
-)
+NOT_YET_IMPLEMENTED_StmtImportFrom
+NOT_YET_IMPLEMENTED_StmtImportFrom
 
 # Please keep __all__ alphabetized within each category.
 
-__all__ = [
-    # Super-special typing primitives.
-    "Any",
-    "Callable",
-    "ClassVar",
-    # ABCs (from collections.abc).
-    "AbstractSet",  # collections.abc.Set.
-    "ByteString",
-    "Container",
-    # Concrete collection types.
-    "Counter",
-    "Deque",
-    "Dict",
-    "DefaultDict",
-    "List",
-    "Set",
-    "FrozenSet",
-    "NamedTuple",  # Not really a type.
-    "Generator",
-]
+NOT_YET_IMPLEMENTED_StmtAssign
 
-not_shareables = [
-    # singletons
-    True,
-    False,
-    NotImplemented,
-    ...,
-    # builtin types and objects
-    type,
-    object,
-    object(),
-    Exception(),
-    42,
-    100.0,
-    "spam",
-    # user-defined types and objects
-    Cheese,
-    Cheese("Wensleydale"),
-    SubBytes(b"spam"),
-]
+NOT_YET_IMPLEMENTED_StmtAssign
 
-if "PYTHON" in os.environ:
-    add_compiler(compiler_from_env())
-else:
-    # for compiler in compilers.values():
-    # add_compiler(compiler)
-    add_compiler(compilers[(7.0, 32)])
-    # add_compiler(compilers[(7.1, 64)])
+NOT_YET_IMPLEMENTED_StmtIf
 
 
 # Comment before function.
-def inline_comments_in_brackets_ruin_everything():
-    if typedargslist:
-        parameters.children = [children[0], body, children[-1]]  # (1  # )1
-        parameters.children = [
-            children[0],
-            body,
-            children[-1],  # type: ignore
-        ]
-    else:
-        parameters.children = [
-            parameters.children[0],  # (2 what if this was actually long
-            body,
-            parameters.children[-1],  # )2
-        ]
-        parameters.children = [
-            parameters.what_if_this_was_actually_long.children[0],
-            body,
-            parameters.children[-1],
-        ]  # type: ignore
-    if (
-        self._proc is not None
-        # has the child process finished?
-        and self._returncode is None
-        # the child process has finished, but the
-        # transport hasn't been notified yet?
-        and self._proc.poll() is None
-    ):
-        pass
-    # no newline before or after
-    short = [
-        # one
-        1,
-        # two
-        2,
-    ]
-
-    # no newline after
-    call(
-        arg1,
-        arg2,
-        """
-short
-""",
-        arg3=True,
-    )
-
-    ############################################################################
-
-    call2(
-        #short
-        arg1,
-        #but
-        arg2,
-        #multiline
-        """
-short
-""",
-        # yup
-        arg3=True,
-    )
-    lcomp = [element for element in collection if element is not None]  # yup  # yup  # right
-    lcomp2 = [
-        # hello
-        element
-        for # yup
-        element in collection
-        if # right
-        element
-        is not None
-    ]
-    lcomp3 = [
-        # This one is actually too long to fit in a single line.
-        element.split("\n", 1)[0]
-        for # yup
-        element in collection.select_elements()
-        if # right
-        element
-        is not None
-    ]
-    while True:
-        if False:
-            continue
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-            # and round and round we go
-        # and round and round we go
 
-    # let's return
-    return Node(
-        syms.simple_stmt,
-        [Node(statement, result), Leaf(token.NEWLINE, "\n")],  # FIXME: \r\n?
-    )
+NOT_YET_IMPLEMENTED_StmtAssign  # type: Final
 
 
-CONFIG_FILES = (
-    [
-        CONFIG_FILE,
-    ]
-    + SHARED_CONFIG_FILES
-    + USER_CONFIG_FILES
-)  # type: Final
-
-
-class Test:
-    def _init_host(self, parsed) -> None:
-        if parsed.hostname is None or not parsed.hostname.strip():  # type: ignore
-            pass
+NOT_YET_IMPLEMENTED_StmtClassDef
 
 
 #######################
@@ -428,7 +393,7 @@ class Test:
 #######################
 
 
-instruction()  #comment with bad spacing
+NOT_YET_IMPLEMENTED_ExprCall  # comment with bad spacing
 
 # END COMMENTS
 # MORE END COMMENTS
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments3_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments3_py.snap
index 69439b5d70397..d0e6f55613457 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments3_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments3_py.snap
@@ -61,22 +61,55 @@ def func():
 ```diff
 --- Black
 +++ Ruff
-@@ -9,10 +9,11 @@
-     lcomp3 = [
-         # This one is actually too long to fit in a single line.
-         element.split("\n", 1)[0]
+@@ -2,47 +2,7 @@
+ 
+ 
+ # %%
+-def func():
+-    x = """
+-    a really long string
+-    """
+-    lcomp3 = [
+-        # This one is actually too long to fit in a single line.
+-        element.split("\n", 1)[0]
 -        # yup
 -        for element in collection.select_elements()
 -        # right
 -        if element is not None
-+        for # yup
-+        element in collection.select_elements()
-+        if # right
-+        element
-+        is not None
-     ]
-     # Capture each of the exceptions in the MultiError along with each of their causes and contexts
-     if isinstance(exc_value, MultiError):
+-    ]
+-    # Capture each of the exceptions in the MultiError along with each of their causes and contexts
+-    if isinstance(exc_value, MultiError):
+-        embedded = []
+-        for exc in exc_value.exceptions:
+-            if exc not in _seen:
+-                embedded.append(
+-                    # This should be left alone (before)
+-                    traceback.TracebackException.from_exception(
+-                        exc,
+-                        limit=limit,
+-                        lookup_lines=lookup_lines,
+-                        capture_locals=capture_locals,
+-                        # copy the set of _seen exceptions so that duplicates
+-                        # shared between sub-exceptions are not omitted
+-                        _seen=set(_seen),
+-                    )
+-                    # This should be left alone (after)
+-                )
+-
+-    # everything is fine if the expression isn't nested
+-    traceback.TracebackException.from_exception(
+-        exc,
+-        limit=limit,
+-        lookup_lines=lookup_lines,
+-        capture_locals=capture_locals,
+-        # copy the set of _seen exceptions so that duplicates
+-        # shared between sub-exceptions are not omitted
+-        _seen=set(_seen),
+-    )
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+ # %%
 ```
 
 ## Ruff Output
@@ -86,48 +119,7 @@ def func():
 
 
 # %%
-def func():
-    x = """
-    a really long string
-    """
-    lcomp3 = [
-        # This one is actually too long to fit in a single line.
-        element.split("\n", 1)[0]
-        for # yup
-        element in collection.select_elements()
-        if # right
-        element
-        is not None
-    ]
-    # Capture each of the exceptions in the MultiError along with each of their causes and contexts
-    if isinstance(exc_value, MultiError):
-        embedded = []
-        for exc in exc_value.exceptions:
-            if exc not in _seen:
-                embedded.append(
-                    # This should be left alone (before)
-                    traceback.TracebackException.from_exception(
-                        exc,
-                        limit=limit,
-                        lookup_lines=lookup_lines,
-                        capture_locals=capture_locals,
-                        # copy the set of _seen exceptions so that duplicates
-                        # shared between sub-exceptions are not omitted
-                        _seen=set(_seen),
-                    )
-                    # This should be left alone (after)
-                )
-
-    # everything is fine if the expression isn't nested
-    traceback.TracebackException.from_exception(
-        exc,
-        limit=limit,
-        lookup_lines=lookup_lines,
-        capture_locals=capture_locals,
-        # copy the set of _seen exceptions so that duplicates
-        # shared between sub-exceptions are not omitted
-        _seen=set(_seen),
-    )
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # %%
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments4_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments4_py.snap
index d246955bc6bef..a4d31f142354d 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments4_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments4_py.snap
@@ -107,84 +107,69 @@ def foo3(list_a, list_b):
 ```diff
 --- Black
 +++ Ruff
-@@ -10,39 +10,50 @@
-     @pytest.mark.parametrize(
-         ("post_data", "message"),
-         [
+@@ -1,94 +1,14 @@
+-from com.my_lovely_company.my_lovely_team.my_lovely_project.my_lovely_component import (
+-    MyLovelyCompanyTeamProjectComponent,  # NOT DRY
+-)
+-from com.my_lovely_company.my_lovely_team.my_lovely_project.my_lovely_component import (
+-    MyLovelyCompanyTeamProjectComponent as component,  # DRY
+-)
++NOT_YET_IMPLEMENTED_StmtImportFrom
++NOT_YET_IMPLEMENTED_StmtImportFrom
+ 
+ 
+-class C:
+-    @pytest.mark.parametrize(
+-        ("post_data", "message"),
+-        [
 -            # metadata_version errors.
 -            (
-+            (# metadata_version errors.
-                 {},
-                 "None is an invalid value for Metadata-Version. Error: This field is"
-                 " required. see"
-                 " https://packaging.python.org/specifications/core-metadata",
-             ),
-             (
+-                {},
+-                "None is an invalid value for Metadata-Version. Error: This field is"
+-                " required. see"
+-                " https://packaging.python.org/specifications/core-metadata",
+-            ),
+-            (
 -                {"metadata_version": "-1"},
-+                {
-+                    "metadata_version": "-1",
-+                },
-                 "'-1' is an invalid value for Metadata-Version. Error: Unknown Metadata"
-                 " Version see"
-                 " https://packaging.python.org/specifications/core-metadata",
-             ),
+-                "'-1' is an invalid value for Metadata-Version. Error: Unknown Metadata"
+-                " Version see"
+-                " https://packaging.python.org/specifications/core-metadata",
+-            ),
 -            # name errors.
 -            (
 -                {"metadata_version": "1.2"},
-+            (# name errors.
-+                {
-+                    "metadata_version": "1.2",
-+                },
-                 "'' is an invalid value for Name. Error: This field is required. see"
-                 " https://packaging.python.org/specifications/core-metadata",
-             ),
-             (
+-                "'' is an invalid value for Name. Error: This field is required. see"
+-                " https://packaging.python.org/specifications/core-metadata",
+-            ),
+-            (
 -                {"metadata_version": "1.2", "name": "foo-"},
-+                {
-+                    "metadata_version": "1.2",
-+                    "name": "foo-",
-+                },
-                 "'foo-' is an invalid value for Name. Error: Must start and end with a"
-                 " letter or numeral and contain only ascii numeric and '.', '_' and"
-                 " '-'. see https://packaging.python.org/specifications/core-metadata",
-             ),
+-                "'foo-' is an invalid value for Name. Error: Must start and end with a"
+-                " letter or numeral and contain only ascii numeric and '.', '_' and"
+-                " '-'. see https://packaging.python.org/specifications/core-metadata",
+-            ),
 -            # version errors.
 -            (
 -                {"metadata_version": "1.2", "name": "example"},
-+            (# version errors.
-+                {
-+                    "metadata_version": "1.2",
-+                    "name": "example",
-+                },
-                 "'' is an invalid value for Version. Error: This field is required. see"
-                 " https://packaging.python.org/specifications/core-metadata",
-             ),
-             (
+-                "'' is an invalid value for Version. Error: This field is required. see"
+-                " https://packaging.python.org/specifications/core-metadata",
+-            ),
+-            (
 -                {"metadata_version": "1.2", "name": "example", "version": "dog"},
-+                {
-+                    "metadata_version": "1.2",
-+                    "name": "example",
-+                    "version": "dog",
-+                },
-                 "'dog' is an invalid value for Version. Error: Must start and end with"
-                 " a letter or numeral and contain only ascii numeric and '.', '_' and"
-                 " '-'. see https://packaging.python.org/specifications/core-metadata",
-@@ -50,45 +61,34 @@
-         ],
-     )
-     def test_fails_invalid_post_data(
+-                "'dog' is an invalid value for Version. Error: Must start and end with"
+-                " a letter or numeral and contain only ascii numeric and '.', '_' and"
+-                " '-'. see https://packaging.python.org/specifications/core-metadata",
+-            ),
+-        ],
+-    )
+-    def test_fails_invalid_post_data(
 -        self, pyramid_config, db_request, post_data, message
-+        self,
-+        pyramid_config,
-+        db_request,
-+        post_data,
-+        message,
-     ):
-         pyramid_config.testing_securitypolicy(userid=1)
-         db_request.POST = MultiDict(post_data)
+-    ):
+-        pyramid_config.testing_securitypolicy(userid=1)
+-        db_request.POST = MultiDict(post_data)
++NOT_YET_IMPLEMENTED_StmtClassDef
  
  
- def foo(list_a, list_b):
+-def foo(list_a, list_b):
 -    results = (
 -        User.query.filter(User.foo == "bar")
 -        .filter(  # Because foo.
@@ -197,16 +182,12 @@ def foo3(list_a, list_b):
 -        .with_for_update(key_share=True)
 -        .all()
 -    )
-+    results = User.query.filter(User.foo == "bar").filter(  # Because foo.
-+        db.or_(User.field_a.astext.in_(list_a), User.field_b.astext.in_(list_b))
-+    ).filter(User.xyz.is_(None)).filter(
-+        db.not_(User.is_pending.astext.cast(db.Boolean).is_(True))
-+    ).order_by(User.created_at.desc()).with_for_update(key_share=True).all()
-     return results
+-    return results
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def foo2(list_a, list_b):
-     # Standalone comment reasonably placed.
+-def foo2(list_a, list_b):
+-    # Standalone comment reasonably placed.
 -    return (
 -        User.query.filter(User.foo == "bar")
 -        .filter(
@@ -214,12 +195,10 @@ def foo3(list_a, list_b):
 -        )
 -        .filter(User.xyz.is_(None))
 -    )
-+    return User.query.filter(User.foo == "bar").filter(
-+        db.or_(User.field_a.astext.in_(list_a), User.field_b.astext.in_(list_b))
-+    ).filter(User.xyz.is_(None))
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def foo3(list_a, list_b):
+-def foo3(list_a, list_b):
 -    return (
 -        # Standalone comment but weirdly placed.
 -        User.query.filter(User.foo == "bar")
@@ -228,109 +207,26 @@ def foo3(list_a, list_b):
 -        )
 -        .filter(User.xyz.is_(None))
 -    )
-+    return # Standalone comment but weirdly placed.
-+    User.query.filter(User.foo == "bar").filter(
-+        db.or_(User.field_a.astext.in_(list_a), User.field_b.astext.in_(list_b))
-+    ).filter(User.xyz.is_(None))
++NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Ruff Output
 
 ```py
-from com.my_lovely_company.my_lovely_team.my_lovely_project.my_lovely_component import (
-    MyLovelyCompanyTeamProjectComponent,  # NOT DRY
-)
-from com.my_lovely_company.my_lovely_team.my_lovely_project.my_lovely_component import (
-    MyLovelyCompanyTeamProjectComponent as component,  # DRY
-)
+NOT_YET_IMPLEMENTED_StmtImportFrom
+NOT_YET_IMPLEMENTED_StmtImportFrom
 
 
-class C:
-    @pytest.mark.parametrize(
-        ("post_data", "message"),
-        [
-            (# metadata_version errors.
-                {},
-                "None is an invalid value for Metadata-Version. Error: This field is"
-                " required. see"
-                " https://packaging.python.org/specifications/core-metadata",
-            ),
-            (
-                {
-                    "metadata_version": "-1",
-                },
-                "'-1' is an invalid value for Metadata-Version. Error: Unknown Metadata"
-                " Version see"
-                " https://packaging.python.org/specifications/core-metadata",
-            ),
-            (# name errors.
-                {
-                    "metadata_version": "1.2",
-                },
-                "'' is an invalid value for Name. Error: This field is required. see"
-                " https://packaging.python.org/specifications/core-metadata",
-            ),
-            (
-                {
-                    "metadata_version": "1.2",
-                    "name": "foo-",
-                },
-                "'foo-' is an invalid value for Name. Error: Must start and end with a"
-                " letter or numeral and contain only ascii numeric and '.', '_' and"
-                " '-'. see https://packaging.python.org/specifications/core-metadata",
-            ),
-            (# version errors.
-                {
-                    "metadata_version": "1.2",
-                    "name": "example",
-                },
-                "'' is an invalid value for Version. Error: This field is required. see"
-                " https://packaging.python.org/specifications/core-metadata",
-            ),
-            (
-                {
-                    "metadata_version": "1.2",
-                    "name": "example",
-                    "version": "dog",
-                },
-                "'dog' is an invalid value for Version. Error: Must start and end with"
-                " a letter or numeral and contain only ascii numeric and '.', '_' and"
-                " '-'. see https://packaging.python.org/specifications/core-metadata",
-            ),
-        ],
-    )
-    def test_fails_invalid_post_data(
-        self,
-        pyramid_config,
-        db_request,
-        post_data,
-        message,
-    ):
-        pyramid_config.testing_securitypolicy(userid=1)
-        db_request.POST = MultiDict(post_data)
+NOT_YET_IMPLEMENTED_StmtClassDef
 
 
-def foo(list_a, list_b):
-    results = User.query.filter(User.foo == "bar").filter(  # Because foo.
-        db.or_(User.field_a.astext.in_(list_a), User.field_b.astext.in_(list_b))
-    ).filter(User.xyz.is_(None)).filter(
-        db.not_(User.is_pending.astext.cast(db.Boolean).is_(True))
-    ).order_by(User.created_at.desc()).with_for_update(key_share=True).all()
-    return results
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def foo2(list_a, list_b):
-    # Standalone comment reasonably placed.
-    return User.query.filter(User.foo == "bar").filter(
-        db.or_(User.field_a.astext.in_(list_a), User.field_b.astext.in_(list_b))
-    ).filter(User.xyz.is_(None))
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def foo3(list_a, list_b):
-    return # Standalone comment but weirdly placed.
-    User.query.filter(User.foo == "bar").filter(
-        db.or_(User.field_a.astext.in_(list_a), User.field_b.astext.in_(list_b))
-    ).filter(User.xyz.is_(None))
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments5_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments5_py.snap
index 32a6cb310cf47..49eb42254a735 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments5_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments5_py.snap
@@ -86,101 +86,124 @@ if __name__ == "__main__":
 ```diff
 --- Black
 +++ Ruff
-@@ -23,7 +23,6 @@
- try:
-     with open(some_other_file) as w:
-         w.write(data)
+@@ -1,61 +1,33 @@
+-while True:
+-    if something.changed:
+-        do.stuff()  # trailing comment
+-        # Comment belongs to the `if` block.
++while NOT_YET_IMPLEMENTED_ExprConstant:
++    NOT_YET_IMPLEMENTED_StmtIf
+     # This one belongs to the `while` block.
+ 
+     # Should this one, too?  I guess so.
+ 
+ # This one is properly standalone now.
+ 
+-for i in range(100):
+-    # first we do this
+-    if i % 33 == 0:
+-        break
++NOT_YET_IMPLEMENTED_StmtFor
+ 
+-    # then we do this
+-    print(i)
+-    # and finally we loop around
++NOT_YET_IMPLEMENTED_StmtWith
+ 
+-with open(some_temp_file) as f:
+-    data = f.read()
+-
+-try:
+-    with open(some_other_file) as w:
+-        w.write(data)
++NOT_YET_IMPLEMENTED_StmtTry
+ 
+-except OSError:
+-    print("problems")
 -
- except OSError:
-     print("problems")
+-import sys
++NOT_YET_IMPLEMENTED_StmtImport
+ 
+ 
+ # leading function comment
+-def wat():
+-    ...
+-    # trailing function comment
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+ # SECTION COMMENT
  
-@@ -41,18 +40,18 @@
  
  # leading 1
- @deco1
+-@deco1
 -# leading 2
 -@deco2(with_args=True)
 -# leading 3
 -@deco3
-+@# leading 2
-+deco2(with_args=True)
-+@# leading 3
-+deco3
- def decorated1():
-     ...
+-def decorated1():
+-    ...
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
  # leading 1
- @deco1
+-@deco1
 -# leading 2
 -@deco2(with_args=True)
-+@# leading 2
-+deco2(with_args=True)
- # leading function comment
- def decorated1():
-     ...
+-# leading function comment
+-def decorated1():
+-    ...
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+ # Note: this is fixed in
+@@ -65,9 +37,7 @@
+ 
+ 
+ # This comment should be split from `some_instruction` by two lines but isn't.
+-def g():
+-    ...
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-if __name__ == "__main__":
+-    main()
++NOT_YET_IMPLEMENTED_StmtIf
 ```
 
 ## Ruff Output
 
 ```py
-while True:
-    if something.changed:
-        do.stuff()  # trailing comment
-        # Comment belongs to the `if` block.
+while NOT_YET_IMPLEMENTED_ExprConstant:
+    NOT_YET_IMPLEMENTED_StmtIf
     # This one belongs to the `while` block.
 
     # Should this one, too?  I guess so.
 
 # This one is properly standalone now.
 
-for i in range(100):
-    # first we do this
-    if i % 33 == 0:
-        break
+NOT_YET_IMPLEMENTED_StmtFor
 
-    # then we do this
-    print(i)
-    # and finally we loop around
+NOT_YET_IMPLEMENTED_StmtWith
 
-with open(some_temp_file) as f:
-    data = f.read()
+NOT_YET_IMPLEMENTED_StmtTry
 
-try:
-    with open(some_other_file) as w:
-        w.write(data)
-except OSError:
-    print("problems")
-
-import sys
+NOT_YET_IMPLEMENTED_StmtImport
 
 
 # leading function comment
-def wat():
-    ...
-    # trailing function comment
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # SECTION COMMENT
 
 
 # leading 1
-@deco1
-@# leading 2
-deco2(with_args=True)
-@# leading 3
-deco3
-def decorated1():
-    ...
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # leading 1
-@deco1
-@# leading 2
-deco2(with_args=True)
-# leading function comment
-def decorated1():
-    ...
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # Note: this is fixed in
@@ -190,12 +213,10 @@ some_instruction
 
 
 # This comment should be split from `some_instruction` by two lines but isn't.
-def g():
-    ...
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-if __name__ == "__main__":
-    main()
+NOT_YET_IMPLEMENTED_StmtIf
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments6_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments6_py.snap
index 5f3625babfc8b..509f24610cab4 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments6_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments6_py.snap
@@ -131,203 +131,178 @@ aaaaaaaaaaaaa, bbbbbbbbb = map(list, map(itertools.chain.from_iterable, zip(*ite
 ```diff
 --- Black
 +++ Ruff
-@@ -31,8 +31,8 @@
- def f(
-     arg,  # type: int
-     *args,  # type: *Any
+@@ -1,118 +1,35 @@
+-from typing import Any, Tuple
++NOT_YET_IMPLEMENTED_StmtImportFrom
+ 
+ 
+-def f(
+-    a,  # type: int
+-):
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+ # test type comments
+-def f(a, b, c, d, e, f, g, h, i):
+-    # type: (int, int, int, int, int, int, int, int, int) -> None
+-    pass
+-
+-
+-def f(
+-    a,  # type: int
+-    b,  # type: int
+-    c,  # type: int
+-    d,  # type: int
+-    e,  # type: int
+-    f,  # type: int
+-    g,  # type: int
+-    h,  # type: int
+-    i,  # type: int
+-):
+-    # type: (...) -> None
+-    pass
+-
+-
+-def f(
+-    arg,  # type: int
+-    *args,  # type: *Any
 -    default=False,  # type: bool
 -    **kwargs,  # type: **Any
-+    default=False,  # type: bool  # type: **Any
-+    **kwargs,
- ):
-     # type: (...) -> None
-     pass
-@@ -49,9 +49,7 @@
-     element = 0  # type: int
-     another_element = 1  # type: float
-     another_element_with_long_name = 2  # type: int
+-):
+-    # type: (...) -> None
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def f(
+-    a,  # type: int
+-    b,  # type: int
+-    c,  # type: int
+-    d,  # type: int
+-):
+-    # type: (...) -> None
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+-    element = 0  # type: int
+-    another_element = 1  # type: float
+-    another_element_with_long_name = 2  # type: int
 -    another_really_really_long_element_with_a_unnecessarily_long_name_to_describe_what_it_does_enterprise_style = (
 -        3
 -    )  # type: int
-+    another_really_really_long_element_with_a_unnecessarily_long_name_to_describe_what_it_does_enterprise_style = 3  # type: int
-     an_element_with_a_long_value = calls() or more_calls() and more()  # type: bool
+-    an_element_with_a_long_value = calls() or more_calls() and more()  # type: bool
+ 
+-    tup = (
+-        another_element,
+-        another_really_really_long_element_with_a_unnecessarily_long_name_to_describe_what_it_does_enterprise_style,
+-    )  # type: Tuple[int, int]
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+-    a = (
+-        element
+-        + another_element
+-        + another_element_with_long_name
+-        + element
+-        + another_element
+-        + another_element_with_long_name
+-    )  # type: int
+ 
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+-def f(
+-    x,  # not a type comment
+-    y,  # type: int
+-):
+-    # type: (...) -> None
+-    pass
+ 
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
-     tup = (
-@@ -100,19 +98,33 @@
-     )
+-def f(
+-    x,  # not a type comment
+-):  # type: (int) -> None
+-    pass
  
-     c = call(
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+-def func(
+-    a=some_list[0],  # type: int
+-):  # type: () -> int
+-    c = call(
+-        0.0123,
+-        0.0456,
+-        0.0789,
+-        0.0123,
+-        0.0456,
+-        0.0789,
+-        0.0123,
+-        0.0456,
+-        0.0789,
+-        a[-1],  # type: ignore
+-    )
+ 
+-    c = call(
 -        "aaaaaaaa", "aaaaaaaa", "aaaaaaaa", "aaaaaaaa", "aaaaaaaa", "aaaaaaaa", "aaaaaaaa"  # type: ignore
-+        "aaaaaaaa",
-+        "aaaaaaaa",
-+        "aaaaaaaa",
-+        "aaaaaaaa",
-+        "aaaaaaaa",
-+        "aaaaaaaa",
-+        "aaaaaaaa",  # type: ignore
-     )
+-    )
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
 -result = (  # aaa
 -    "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 -)
-+result = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"  # aaa
++NOT_YET_IMPLEMENTED_StmtAssign
  
 -AAAAAAAAAAAAA = [AAAAAAAAAAAAA] + SHARED_AAAAAAAAAAAAA + USER_AAAAAAAAAAAAA + AAAAAAAAAAAAA  # type: ignore
-+AAAAAAAAAAAAA = (
-+    [AAAAAAAAAAAAA]
-+    + SHARED_AAAAAAAAAAAAA
-+    + USER_AAAAAAAAAAAAA
-+    + AAAAAAAAAAAAA
-+)  # type: ignore
++NOT_YET_IMPLEMENTED_StmtAssign  # type: ignore
  
- call_to_some_function_asdf(
-     foo,
+-call_to_some_function_asdf(
+-    foo,
 -    [AAAAAAAAAAAAAAAAAAAAAAA, AAAAAAAAAAAAAAAAAAAAAAA, AAAAAAAAAAAAAAAAAAAAAAA, BBBBBBBBBBBB],  # type: ignore
-+    [
-+        AAAAAAAAAAAAAAAAAAAAAAA,
-+        AAAAAAAAAAAAAAAAAAAAAAA,
-+        AAAAAAAAAAAAAAAAAAAAAAA,
-+        BBBBBBBBBBBB,
-+    ],  # type: ignore
- )
+-)
++NOT_YET_IMPLEMENTED_ExprCall
  
- aaaaaaaaaaaaa, bbbbbbbbb = map(list, map(itertools.chain.from_iterable, zip(*items)))  # type: ignore[arg-type]
+-aaaaaaaaaaaaa, bbbbbbbbb = map(list, map(itertools.chain.from_iterable, zip(*items)))  # type: ignore[arg-type]
++NOT_YET_IMPLEMENTED_StmtAssign  # type: ignore[arg-type]
 ```
 
 ## Ruff Output
 
 ```py
-from typing import Any, Tuple
+NOT_YET_IMPLEMENTED_StmtImportFrom
 
 
-def f(
-    a,  # type: int
-):
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # test type comments
-def f(a, b, c, d, e, f, g, h, i):
-    # type: (int, int, int, int, int, int, int, int, int) -> None
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def f(
-    a,  # type: int
-    b,  # type: int
-    c,  # type: int
-    d,  # type: int
-    e,  # type: int
-    f,  # type: int
-    g,  # type: int
-    h,  # type: int
-    i,  # type: int
-):
-    # type: (...) -> None
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def f(
-    arg,  # type: int
-    *args,  # type: *Any
-    default=False,  # type: bool  # type: **Any
-    **kwargs,
-):
-    # type: (...) -> None
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def f(
-    a,  # type: int
-    b,  # type: int
-    c,  # type: int
-    d,  # type: int
-):
-    # type: (...) -> None
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-    element = 0  # type: int
-    another_element = 1  # type: float
-    another_element_with_long_name = 2  # type: int
-    another_really_really_long_element_with_a_unnecessarily_long_name_to_describe_what_it_does_enterprise_style = 3  # type: int
-    an_element_with_a_long_value = calls() or more_calls() and more()  # type: bool
-
-    tup = (
-        another_element,
-        another_really_really_long_element_with_a_unnecessarily_long_name_to_describe_what_it_does_enterprise_style,
-    )  # type: Tuple[int, int]
-
-    a = (
-        element
-        + another_element
-        + another_element_with_long_name
-        + element
-        + another_element
-        + another_element_with_long_name
-    )  # type: int
-
-
-def f(
-    x,  # not a type comment
-    y,  # type: int
-):
-    # type: (...) -> None
-    pass
 
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-def f(
-    x,  # not a type comment
-):  # type: (int) -> None
-    pass
 
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-def func(
-    a=some_list[0],  # type: int
-):  # type: () -> int
-    c = call(
-        0.0123,
-        0.0456,
-        0.0789,
-        0.0123,
-        0.0456,
-        0.0789,
-        0.0123,
-        0.0456,
-        0.0789,
-        a[-1],  # type: ignore
-    )
 
-    c = call(
-        "aaaaaaaa",
-        "aaaaaaaa",
-        "aaaaaaaa",
-        "aaaaaaaa",
-        "aaaaaaaa",
-        "aaaaaaaa",
-        "aaaaaaaa",  # type: ignore
-    )
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-result = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"  # aaa
+NOT_YET_IMPLEMENTED_StmtAssign
 
-AAAAAAAAAAAAA = (
-    [AAAAAAAAAAAAA]
-    + SHARED_AAAAAAAAAAAAA
-    + USER_AAAAAAAAAAAAA
-    + AAAAAAAAAAAAA
-)  # type: ignore
+NOT_YET_IMPLEMENTED_StmtAssign  # type: ignore
 
-call_to_some_function_asdf(
-    foo,
-    [
-        AAAAAAAAAAAAAAAAAAAAAAA,
-        AAAAAAAAAAAAAAAAAAAAAAA,
-        AAAAAAAAAAAAAAAAAAAAAAA,
-        BBBBBBBBBBBB,
-    ],  # type: ignore
-)
+NOT_YET_IMPLEMENTED_ExprCall
 
-aaaaaaaaaaaaa, bbbbbbbbb = map(list, map(itertools.chain.from_iterable, zip(*items)))  # type: ignore[arg-type]
+NOT_YET_IMPLEMENTED_StmtAssign  # type: ignore[arg-type]
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments9_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments9_py.snap
index 53ba320c7370c..6b73d2f41db04 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments9_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments9_py.snap
@@ -152,96 +152,195 @@ def bar():
 ```diff
 --- Black
 +++ Ruff
-@@ -35,9 +35,10 @@
+@@ -1,161 +1,90 @@
+ # Test for https://github.com/psf/black/issues/246.
  
+-some = statement
++NOT_YET_IMPLEMENTED_StmtAssign
  
- some = statement
+ 
+ # This comment should be split from the statement above by two lines.
+-def function():
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-some = statement
++NOT_YET_IMPLEMENTED_StmtAssign
+ 
+ 
+ # This multiline comments section
+ # should be split from the statement
+ # above by two lines.
+-def function():
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-some = statement
++NOT_YET_IMPLEMENTED_StmtAssign
+ 
+ 
+ # This comment should be split from the statement above by two lines.
+-async def async_function():
+-    pass
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
+ 
+ 
+-some = statement
++NOT_YET_IMPLEMENTED_StmtAssign
+ 
+ 
+ # This comment should be split from the statement above by two lines.
+-class MyClass:
+-    pass
++NOT_YET_IMPLEMENTED_StmtClassDef
 +
 +
++NOT_YET_IMPLEMENTED_StmtAssign
+ 
+ 
+-some = statement
  # This should be stick to the statement above
  
 -
  # This should be split from the above by two lines
- class MyClassWithComplexLeadingComments:
-     pass
-@@ -57,11 +58,11 @@
+-class MyClassWithComplexLeadingComments:
+-    pass
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+ 
+-class ClassWithDocstring:
+-    """A docstring."""
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+ 
+ # Leading comment after a class with just a docstring
+-class MyClassAfterAnotherClassWithDocstring:
+-    pass
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+ 
+-some = statement
++NOT_YET_IMPLEMENTED_StmtAssign
+ 
  
  # leading 1
- @deco1
+-@deco1
 -# leading 2
-+@# leading 2
- # leading 2 extra
+-# leading 2 extra
 -@deco2(with_args=True)
 -# leading 3
 -@deco3
-+deco2(with_args=True)
-+@# leading 3
-+deco3
- # leading 4
- def decorated():
-     pass
-@@ -72,11 +73,10 @@
+-# leading 4
+-def decorated():
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-some = statement
++NOT_YET_IMPLEMENTED_StmtAssign
+ 
  
  # leading 1
- @deco1
+-@deco1
 -# leading 2
 -@deco2(with_args=True)
 -
 -# leading 3 that already has an empty line
 -@deco3
-+@# leading 2
-+deco2(with_args=True)
-+@# leading 3 that already has an empty line
-+deco3
- # leading 4
- def decorated_with_split_leading_comments():
-     pass
-@@ -87,10 +87,10 @@
+-# leading 4
+-def decorated_with_split_leading_comments():
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-some = statement
++NOT_YET_IMPLEMENTED_StmtAssign
+ 
  
  # leading 1
- @deco1
+-@deco1
 -# leading 2
 -@deco2(with_args=True)
 -# leading 3
 -@deco3
-+@# leading 2
-+deco2(with_args=True)
-+@# leading 3
-+deco3
+-
+-# leading 4 that already has an empty line
+-def decorated_with_split_leading_comments():
+-    pass
+-
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- # leading 4 that already has an empty line
- def decorated_with_split_leading_comments():
-@@ -99,6 +99,7 @@
+-def main():
+-    if a:
+-        # Leading comment before inline function
+-        def inline():
+-            pass
  
- def main():
-     if a:
-+
-         # Leading comment before inline function
-         def inline():
-             pass
-@@ -108,12 +109,14 @@
-             pass
+-        # Another leading comment
+-        def another_inline():
+-            pass
+-
+-    else:
+-        # More leading comments
+-        def inline_after_else():
+-            pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
-     else:
-+
-         # More leading comments
-         def inline_after_else():
-             pass
  
+-if a:
+-    # Leading comment before "top-level inline" function
+-    def top_level_quote_inline():
+-        pass
++NOT_YET_IMPLEMENTED_StmtIf
  
- if a:
-+
-     # Leading comment before "top-level inline" function
-     def top_level_quote_inline():
-         pass
-@@ -123,6 +126,7 @@
-         pass
+-    # Another leading comment
+-    def another_top_level_quote_inline_inline():
+-        pass
  
- else:
-+
-     # More leading comments
-     def top_level_quote_inline_after_else():
-         pass
+-else:
+-    # More leading comments
+-    def top_level_quote_inline_after_else():
+-        pass
+-
+-
+-class MyClass:
+-    # First method has no empty lines between bare class def.
+-    # More comments.
+-    def first_method(self):
+-        pass
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+ 
+ # Regression test for https://github.com/psf/black/issues/3454.
+-def foo():
+-    pass
+-    # Trailing comment that belongs to this function
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-@decorator1
+-@decorator2  # fmt: skip
+-def bar():
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+ # Regression test for https://github.com/psf/black/issues/3454.
+-def foo():
+-    pass
+-    # Trailing comment that belongs to this function.
+-    # NOTE this comment only has one empty line below, and the formatter
+-    # should enforce two blank lines.
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-@decorator1
+-# A standalone comment
+-def bar():
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Ruff Output
@@ -249,169 +348,94 @@ def bar():
 ```py
 # Test for https://github.com/psf/black/issues/246.
 
-some = statement
+NOT_YET_IMPLEMENTED_StmtAssign
 
 
 # This comment should be split from the statement above by two lines.
-def function():
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-some = statement
+NOT_YET_IMPLEMENTED_StmtAssign
 
 
 # This multiline comments section
 # should be split from the statement
 # above by two lines.
-def function():
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-some = statement
+NOT_YET_IMPLEMENTED_StmtAssign
 
 
 # This comment should be split from the statement above by two lines.
-async def async_function():
-    pass
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
-some = statement
+NOT_YET_IMPLEMENTED_StmtAssign
 
 
 # This comment should be split from the statement above by two lines.
-class MyClass:
-    pass
+NOT_YET_IMPLEMENTED_StmtClassDef
 
 
-some = statement
+NOT_YET_IMPLEMENTED_StmtAssign
 
 
 # This should be stick to the statement above
 
 # This should be split from the above by two lines
-class MyClassWithComplexLeadingComments:
-    pass
+NOT_YET_IMPLEMENTED_StmtClassDef
 
 
-class ClassWithDocstring:
-    """A docstring."""
+NOT_YET_IMPLEMENTED_StmtClassDef
 
 
 # Leading comment after a class with just a docstring
-class MyClassAfterAnotherClassWithDocstring:
-    pass
+NOT_YET_IMPLEMENTED_StmtClassDef
 
 
-some = statement
+NOT_YET_IMPLEMENTED_StmtAssign
 
 
 # leading 1
-@deco1
-@# leading 2
-# leading 2 extra
-deco2(with_args=True)
-@# leading 3
-deco3
-# leading 4
-def decorated():
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-some = statement
+NOT_YET_IMPLEMENTED_StmtAssign
 
 
 # leading 1
-@deco1
-@# leading 2
-deco2(with_args=True)
-@# leading 3 that already has an empty line
-deco3
-# leading 4
-def decorated_with_split_leading_comments():
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-some = statement
+NOT_YET_IMPLEMENTED_StmtAssign
 
 
 # leading 1
-@deco1
-@# leading 2
-deco2(with_args=True)
-@# leading 3
-deco3
-
-# leading 4 that already has an empty line
-def decorated_with_split_leading_comments():
-    pass
-
-
-def main():
-    if a:
-
-        # Leading comment before inline function
-        def inline():
-            pass
-
-        # Another leading comment
-        def another_inline():
-            pass
-
-    else:
-
-        # More leading comments
-        def inline_after_else():
-            pass
-
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-if a:
 
-    # Leading comment before "top-level inline" function
-    def top_level_quote_inline():
-        pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-    # Another leading comment
-    def another_top_level_quote_inline_inline():
-        pass
 
-else:
+NOT_YET_IMPLEMENTED_StmtIf
 
-    # More leading comments
-    def top_level_quote_inline_after_else():
-        pass
 
-
-class MyClass:
-    # First method has no empty lines between bare class def.
-    # More comments.
-    def first_method(self):
-        pass
+NOT_YET_IMPLEMENTED_StmtClassDef
 
 
 # Regression test for https://github.com/psf/black/issues/3454.
-def foo():
-    pass
-    # Trailing comment that belongs to this function
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-@decorator1
-@decorator2  # fmt: skip
-def bar():
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # Regression test for https://github.com/psf/black/issues/3454.
-def foo():
-    pass
-    # Trailing comment that belongs to this function.
-    # NOTE this comment only has one empty line below, and the formatter
-    # should enforce two blank lines.
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-@decorator1
-# A standalone comment
-def bar():
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments_non_breaking_space_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments_non_breaking_space_py.snap
index 7c88e6c3a23aa..ffa63a0b945d9 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments_non_breaking_space_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments_non_breaking_space_py.snap
@@ -32,67 +32,53 @@ def function(a:int=42):
 ```diff
 --- Black
 +++ Ruff
-@@ -1,23 +1,22 @@
- from .config import (
-     ConfigTypeAttributes,
-     Int,
+@@ -1,23 +1,11 @@
+-from .config import (
+-    ConfigTypeAttributes,
+-    Int,
 -    Path,  # String,
 -    # DEFAULT_TYPE_ATTRIBUTES,
-+    Path,  # String,
- )
+-)
++NOT_YET_IMPLEMENTED_StmtImportFrom
  
 -result = 1  # A simple comment
 -result = (1,)  # Another one
-+result = 1  # A simple comment
-+result = (1,)  # Another one
++NOT_YET_IMPLEMENTED_StmtAssign  # A simple comment
++NOT_YET_IMPLEMENTED_StmtAssign  # Another one
  
 -result = 1  #  type: ignore
 -result = 1  # This comment is talking about type: ignore
 -square = Square(4)  #  type: Optional[Square]
-+result = 1  # type: ignore
-+result = 1  # This comment is talking about type: ignore
-+square = Square(4)  # type: Optional[Square]
++NOT_YET_IMPLEMENTED_StmtAssign  #  type: ignore
++NOT_YET_IMPLEMENTED_StmtAssign  # This comment is talking about type: ignore
++NOT_YET_IMPLEMENTED_StmtAssign  #  type: Optional[Square]
  
  
- def function(a: int = 42):
+-def function(a: int = 42):
 -    """This docstring is already formatted
 -    a
 -    b
-+    """ This docstring is already formatted
-+       a
-+       b
-     """
+-    """
 -    #    There's a NBSP + 3 spaces before
-+    #    There's a NBSP + 3 spaces before
-     #    And 4 spaces on the next line
-     pass
+-    #    And 4 spaces on the next line
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Ruff Output
 
 ```py
-from .config import (
-    ConfigTypeAttributes,
-    Int,
-    Path,  # String,
-)
+NOT_YET_IMPLEMENTED_StmtImportFrom
 
-result = 1  # A simple comment
-result = (1,)  # Another one
+NOT_YET_IMPLEMENTED_StmtAssign  # A simple comment
+NOT_YET_IMPLEMENTED_StmtAssign  # Another one
 
-result = 1  # type: ignore
-result = 1  # This comment is talking about type: ignore
-square = Square(4)  # type: Optional[Square]
+NOT_YET_IMPLEMENTED_StmtAssign  #  type: ignore
+NOT_YET_IMPLEMENTED_StmtAssign  # This comment is talking about type: ignore
+NOT_YET_IMPLEMENTED_StmtAssign  #  type: Optional[Square]
 
 
-def function(a: int = 42):
-    """ This docstring is already formatted
-       a
-       b
-    """
-    #    There's a NBSP + 3 spaces before
-    #    And 4 spaces on the next line
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments_py.snap
index b28ec301262e0..c4d66559744dc 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments_py.snap
@@ -109,7 +109,107 @@ async def wat():
 ```diff
 --- Black
 +++ Ruff
-@@ -93,4 +93,4 @@
+@@ -4,93 +4,42 @@
+ #
+ # Has many lines. Many, many lines.
+ # Many, many, many lines.
+-"""Module docstring.
++NOT_YET_IMPLEMENTED_ExprConstant
+ 
+-Possibly also many, many lines.
+-"""
++NOT_YET_IMPLEMENTED_StmtImport
++NOT_YET_IMPLEMENTED_StmtImport
+ 
+-import os.path
+-import sys
+-
+-import a
+-from b.c import X  # some noqa comment
++NOT_YET_IMPLEMENTED_StmtImport
++NOT_YET_IMPLEMENTED_StmtImportFrom  # some noqa comment
+ 
+-try:
+-    import fast
+-except ImportError:
+-    import slow as fast
+-
+-
+-# Some comment before a function.
+-y = 1
++NOT_YET_IMPLEMENTED_StmtTry
++NOT_YET_IMPLEMENTED_StmtAssign
+ (
+     # some strings
+     y  # type: ignore
+ )
+-
+ 
+-def function(default=None):
+-    """Docstring comes first.
+ 
+-    Possibly many lines.
+-    """
+-    # FIXME: Some comment about why this function is crap but still in production.
+-    import inner_imports
+-
+-    if inner_imports.are_evil():
+-        # Explains why we have this if.
+-        # In great detail indeed.
+-        x = X()
+-        return x.method1()  # type: ignore
+-
+-    # This return is also commented for some reason.
+-    return default
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+ # Explains why we use global state.
+-GLOBAL_STATE = {"a": a(1), "b": a(2), "c": a(3)}
++NOT_YET_IMPLEMENTED_StmtAssign
+ 
+ 
+ # Another comment!
+ # This time two lines.
+-
+ 
+-class Foo:
+-    """Docstring for class Foo.  Example from Sphinx docs."""
+ 
+-    #: Doc comment for class attribute Foo.bar.
+-    #: It can have multiple lines.
+-    bar = 1
+-
+-    flox = 1.5  #: Doc comment for Foo.flox. One line only.
+-
+-    baz = 2
+-    """Docstring for class attribute Foo.baz."""
+-
+-    def __init__(self):
+-        #: Doc comment for instance attribute qux.
+-        self.qux = 3
+-
+-        self.spam = 4
+-        """Docstring for instance attribute spam."""
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+ 
+ #' <h1>This is pweave!</h1>
+ 
+ 
+-@fast(really=True)
+-async def wat():
+-    # This comment, for some reason \
+-    # contains a trailing backslash.
+-    async with X.open_async() as x:  # Some more comments
+-        result = await x.method1()
+-    # Comment after ending a block.
+-    if result:
+-        print("A OK", file=sys.stdout)
+-        # Comment between things.
+-        print()
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
+ 
  
  # Some closing comments.
  # Maybe Vim or Emacs directives for formatting.
@@ -127,91 +227,40 @@ async def wat():
 #
 # Has many lines. Many, many lines.
 # Many, many, many lines.
-"""Module docstring.
+NOT_YET_IMPLEMENTED_ExprConstant
 
-Possibly also many, many lines.
-"""
-
-import os.path
-import sys
-
-import a
-from b.c import X  # some noqa comment
-
-try:
-    import fast
-except ImportError:
-    import slow as fast
+NOT_YET_IMPLEMENTED_StmtImport
+NOT_YET_IMPLEMENTED_StmtImport
 
+NOT_YET_IMPLEMENTED_StmtImport
+NOT_YET_IMPLEMENTED_StmtImportFrom  # some noqa comment
 
-# Some comment before a function.
-y = 1
+NOT_YET_IMPLEMENTED_StmtTry
+NOT_YET_IMPLEMENTED_StmtAssign
 (
     # some strings
     y  # type: ignore
 )
 
 
-def function(default=None):
-    """Docstring comes first.
-
-    Possibly many lines.
-    """
-    # FIXME: Some comment about why this function is crap but still in production.
-    import inner_imports
-
-    if inner_imports.are_evil():
-        # Explains why we have this if.
-        # In great detail indeed.
-        x = X()
-        return x.method1()  # type: ignore
-
-    # This return is also commented for some reason.
-    return default
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # Explains why we use global state.
-GLOBAL_STATE = {"a": a(1), "b": a(2), "c": a(3)}
+NOT_YET_IMPLEMENTED_StmtAssign
 
 
 # Another comment!
 # This time two lines.
 
 
-class Foo:
-    """Docstring for class Foo.  Example from Sphinx docs."""
-
-    #: Doc comment for class attribute Foo.bar.
-    #: It can have multiple lines.
-    bar = 1
-
-    flox = 1.5  #: Doc comment for Foo.flox. One line only.
-
-    baz = 2
-    """Docstring for class attribute Foo.baz."""
-
-    def __init__(self):
-        #: Doc comment for instance attribute qux.
-        self.qux = 3
-
-        self.spam = 4
-        """Docstring for instance attribute spam."""
+NOT_YET_IMPLEMENTED_StmtClassDef
 
 
 #' <h1>This is pweave!</h1>
 
 
-@fast(really=True)
-async def wat():
-    # This comment, for some reason \
-    # contains a trailing backslash.
-    async with X.open_async() as x:  # Some more comments
-        result = await x.method1()
-    # Comment after ending a block.
-    if result:
-        print("A OK", file=sys.stdout)
-        # Comment between things.
-        print()
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
 # Some closing comments.
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__composition_no_trailing_comma_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__composition_no_trailing_comma_py.snap
index b2ee4e01ad945..b45f26eec303a 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__composition_no_trailing_comma_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__composition_no_trailing_comma_py.snap
@@ -194,64 +194,68 @@ class C:
 ```diff
 --- Black
 +++ Ruff
-@@ -2,7 +2,8 @@
-     def test(self) -> None:
-         with patch("black.out", print):
-             self.assertEqual(
+@@ -1,181 +1 @@
+-class C:
+-    def test(self) -> None:
+-        with patch("black.out", print):
+-            self.assertEqual(
 -                unstyle(str(report)), "1 file reformatted, 1 file failed to reformat."
-+                unstyle(str(report)),
-+                "1 file reformatted, 1 file failed to reformat.",
-             )
-             self.assertEqual(
-                 unstyle(str(report)),
-@@ -25,11 +26,8 @@
-                     # Rule 2
-                     and i % 3 == 0
-                 ):
+-            )
+-            self.assertEqual(
+-                unstyle(str(report)),
+-                "1 file reformatted, 1 file left unchanged, 1 file failed to reformat.",
+-            )
+-            self.assertEqual(
+-                unstyle(str(report)),
+-                "2 files reformatted, 1 file left unchanged, 1 file failed to"
+-                " reformat.",
+-            )
+-            self.assertEqual(
+-                unstyle(str(report)),
+-                "2 files reformatted, 2 files left unchanged, 2 files failed to"
+-                " reformat.",
+-            )
+-            for i in (a,):
+-                if (
+-                    # Rule 1
+-                    i % 2 == 0
+-                    # Rule 2
+-                    and i % 3 == 0
+-                ):
 -                    while (
 -                        # Just a comment
 -                        call()
 -                        # Another
 -                    ):
-+                    while # Just a comment
-+                    call():
-                         print(i)
-         xxxxxxxxxxxxxxxx = Yyyy2YyyyyYyyyyy(
-             push_manager=context.request.resource_manager,
-@@ -39,116 +37,140 @@
-             # Only send the first n items.
-             items=items[:num_items]
-         )
+-                        print(i)
+-        xxxxxxxxxxxxxxxx = Yyyy2YyyyyYyyyyy(
+-            push_manager=context.request.resource_manager,
+-            max_items_to_push=num_items,
+-            batch_size=Yyyy2YyyyYyyyyYyyy.FULL_SIZE,
+-        ).push(
+-            # Only send the first n items.
+-            items=items[:num_items]
+-        )
 -        return (
 -            'Utterly failed doctest test for %s\n   File "%s", line %s, in %s\n\n%s'
 -            % (test.name, test.filename, lineno, lname, err)
 -        )
-+        return 'Utterly failed doctest test for %s\n   File "%s", line %s, in %s\n\n%s'
-+        % (test.name, test.filename, lineno, lname, err)
- 
-     def omitting_trailers(self) -> None:
-         get_collection(
+-
+-    def omitting_trailers(self) -> None:
+-        get_collection(
 -            hey_this_is_a_very_long_call, it_has_funny_attributes, really=True
-+            hey_this_is_a_very_long_call,
-+            it_has_funny_attributes,
-+            really=True,
-         )[OneLevelIndex]
-         get_collection(
+-        )[OneLevelIndex]
+-        get_collection(
 -            hey_this_is_a_very_long_call, it_has_funny_attributes, really=True
-+            hey_this_is_a_very_long_call,
-+            it_has_funny_attributes,
-+            really=True,
-         )[OneLevelIndex][TwoLevelIndex][ThreeLevelIndex][FourLevelIndex]
-         d[0][1][2][3][4][5][6][7][8][9][10][11][12][13][14][15][16][17][18][19][20][21][
-             22
-         ]
+-        )[OneLevelIndex][TwoLevelIndex][ThreeLevelIndex][FourLevelIndex]
+-        d[0][1][2][3][4][5][6][7][8][9][10][11][12][13][14][15][16][17][18][19][20][21][
+-            22
+-        ]
 -        assignment = (
 -            some.rather.elaborate.rule() and another.rule.ending_with.index[123]
 -        )
-+        assignment = some.rather.elaborate.rule()
-+        and another.rule.ending_with.index[123]
- 
-     def easy_asserts(self) -> None:
+-
+-    def easy_asserts(self) -> None:
 -        assert {
 -            key1: value1,
 -            key2: value2,
@@ -263,21 +267,7 @@ class C:
 -            key8: value8,
 -            key9: value9,
 -        } == expected, "Not what we expected"
-+        assert (
-+            {
-+                key1: value1,
-+                key2: value2,
-+                key3: value3,
-+                key4: value4,
-+                key5: value5,
-+                key6: value6,
-+                key7: value7,
-+                key8: value8,
-+                key9: value9,
-+            }
-+            == expected
-+        ), "Not what we expected"
- 
+-
 -        assert expected == {
 -            key1: value1,
 -            key2: value2,
@@ -289,21 +279,7 @@ class C:
 -            key8: value8,
 -            key9: value9,
 -        }, "Not what we expected"
-+        assert (
-+            expected
-+            == {
-+                key1: value1,
-+                key2: value2,
-+                key3: value3,
-+                key4: value4,
-+                key5: value5,
-+                key6: value6,
-+                key7: value7,
-+                key8: value8,
-+                key9: value9,
-+            }
-+        ), "Not what we expected"
- 
+-
 -        assert expected == {
 -            key1: value1,
 -            key2: value2,
@@ -315,22 +291,8 @@ class C:
 -            key8: value8,
 -            key9: value9,
 -        }
-+        assert (
-+            expected
-+            == {
-+                key1: value1,
-+                key2: value2,
-+                key3: value3,
-+                key4: value4,
-+                key5: value5,
-+                key6: value6,
-+                key7: value7,
-+                key8: value8,
-+                key9: value9,
-+            }
-+        )
- 
-     def tricky_asserts(self) -> None:
+-
+-    def tricky_asserts(self) -> None:
 -        assert {
 -            key1: value1,
 -            key2: value2,
@@ -343,25 +305,8 @@ class C:
 -            key9: value9,
 -        } == expected(
 -            value, is_going_to_be="too long to fit in a single line", srsly=True
-+        assert (
-+            {
-+                key1: value1,
-+                key2: value2,
-+                key3: value3,
-+                key4: value4,
-+                key5: value5,
-+                key6: value6,
-+                key7: value7,
-+                key8: value8,
-+                key9: value9,
-+            }
-+            == expected(
-+                value,
-+                is_going_to_be="too long to fit in a single line",
-+                srsly=True,
-+            )
-         ), "Not what we expected"
- 
+-        ), "Not what we expected"
+-
 -        assert {
 -            key1: value1,
 -            key2: value2,
@@ -375,21 +320,7 @@ class C:
 -        } == expected, (
 -            "Not what we expected and the message is too long to fit in one line"
 -        )
-+        assert (
-+            {
-+                key1: value1,
-+                key2: value2,
-+                key3: value3,
-+                key4: value4,
-+                key5: value5,
-+                key6: value6,
-+                key7: value7,
-+                key8: value8,
-+                key9: value9,
-+            }
-+            == expected
-+        ), "Not what we expected and the message is too long to fit in one line"
- 
+-
 -        assert expected(
 -            value, is_going_to_be="too long to fit in a single line", srsly=True
 -        ) == {
@@ -403,25 +334,7 @@ class C:
 -            key8: value8,
 -            key9: value9,
 -        }, "Not what we expected"
-+        assert (
-+            expected(
-+                value,
-+                is_going_to_be="too long to fit in a single line",
-+                srsly=True,
-+            )
-+            == {
-+                key1: value1,
-+                key2: value2,
-+                key3: value3,
-+                key4: value4,
-+                key5: value5,
-+                key6: value6,
-+                key7: value7,
-+                key8: value8,
-+                key9: value9,
-+            }
-+        ), "Not what we expected"
- 
+-
 -        assert expected == {
 -            key1: value1,
 -            key2: value2,
@@ -433,242 +346,43 @@ class C:
 -            key8: value8,
 -            key9: value9,
 -        }, (
-+        assert (
-+            expected
-+            == {
-+                key1: value1,
-+                key2: value2,
-+                key3: value3,
-+                key4: value4,
-+                key5: value5,
-+                key6: value6,
-+                key7: value7,
-+                key8: value8,
-+                key9: value9,
-+            }
-+        ), (
-             "Not what we expected and the message is too long to fit in one line"
-             " because it's too long"
-         )
-@@ -161,9 +183,8 @@
-                       8 STORE_ATTR               0 (x)
-                      10 LOAD_CONST               0 (None)
-                      12 RETURN_VALUE
+-            "Not what we expected and the message is too long to fit in one line"
+-            " because it's too long"
+-        )
+-
+-        dis_c_instance_method = """\
+-        %3d           0 LOAD_FAST                1 (x)
+-                      2 LOAD_CONST               1 (1)
+-                      4 COMPARE_OP               2 (==)
+-                      6 LOAD_FAST                0 (self)
+-                      8 STORE_ATTR               0 (x)
+-                     10 LOAD_CONST               0 (None)
+-                     12 RETURN_VALUE
 -        """ % (
 -            _C.__init__.__code__.co_firstlineno + 1,
 -        )
-+        """
-+        % (_C.__init__.__code__.co_firstlineno + 1,)
- 
-         assert (
-             expectedexpectedexpectedexpectedexpectedexpectedexpectedexpectedexpect
+-
+-        assert (
+-            expectedexpectedexpectedexpectedexpectedexpectedexpectedexpectedexpect
+-            == {
+-                key1: value1,
+-                key2: value2,
+-                key3: value3,
+-                key4: value4,
+-                key5: value5,
+-                key6: value6,
+-                key7: value7,
+-                key8: value8,
+-                key9: value9,
+-            }
+-        )
++NOT_YET_IMPLEMENTED_StmtClassDef
 ```
 
 ## Ruff Output
 
 ```py
-class C:
-    def test(self) -> None:
-        with patch("black.out", print):
-            self.assertEqual(
-                unstyle(str(report)),
-                "1 file reformatted, 1 file failed to reformat.",
-            )
-            self.assertEqual(
-                unstyle(str(report)),
-                "1 file reformatted, 1 file left unchanged, 1 file failed to reformat.",
-            )
-            self.assertEqual(
-                unstyle(str(report)),
-                "2 files reformatted, 1 file left unchanged, 1 file failed to"
-                " reformat.",
-            )
-            self.assertEqual(
-                unstyle(str(report)),
-                "2 files reformatted, 2 files left unchanged, 2 files failed to"
-                " reformat.",
-            )
-            for i in (a,):
-                if (
-                    # Rule 1
-                    i % 2 == 0
-                    # Rule 2
-                    and i % 3 == 0
-                ):
-                    while # Just a comment
-                    call():
-                        print(i)
-        xxxxxxxxxxxxxxxx = Yyyy2YyyyyYyyyyy(
-            push_manager=context.request.resource_manager,
-            max_items_to_push=num_items,
-            batch_size=Yyyy2YyyyYyyyyYyyy.FULL_SIZE,
-        ).push(
-            # Only send the first n items.
-            items=items[:num_items]
-        )
-        return 'Utterly failed doctest test for %s\n   File "%s", line %s, in %s\n\n%s'
-        % (test.name, test.filename, lineno, lname, err)
-
-    def omitting_trailers(self) -> None:
-        get_collection(
-            hey_this_is_a_very_long_call,
-            it_has_funny_attributes,
-            really=True,
-        )[OneLevelIndex]
-        get_collection(
-            hey_this_is_a_very_long_call,
-            it_has_funny_attributes,
-            really=True,
-        )[OneLevelIndex][TwoLevelIndex][ThreeLevelIndex][FourLevelIndex]
-        d[0][1][2][3][4][5][6][7][8][9][10][11][12][13][14][15][16][17][18][19][20][21][
-            22
-        ]
-        assignment = some.rather.elaborate.rule()
-        and another.rule.ending_with.index[123]
-
-    def easy_asserts(self) -> None:
-        assert (
-            {
-                key1: value1,
-                key2: value2,
-                key3: value3,
-                key4: value4,
-                key5: value5,
-                key6: value6,
-                key7: value7,
-                key8: value8,
-                key9: value9,
-            }
-            == expected
-        ), "Not what we expected"
-
-        assert (
-            expected
-            == {
-                key1: value1,
-                key2: value2,
-                key3: value3,
-                key4: value4,
-                key5: value5,
-                key6: value6,
-                key7: value7,
-                key8: value8,
-                key9: value9,
-            }
-        ), "Not what we expected"
-
-        assert (
-            expected
-            == {
-                key1: value1,
-                key2: value2,
-                key3: value3,
-                key4: value4,
-                key5: value5,
-                key6: value6,
-                key7: value7,
-                key8: value8,
-                key9: value9,
-            }
-        )
-
-    def tricky_asserts(self) -> None:
-        assert (
-            {
-                key1: value1,
-                key2: value2,
-                key3: value3,
-                key4: value4,
-                key5: value5,
-                key6: value6,
-                key7: value7,
-                key8: value8,
-                key9: value9,
-            }
-            == expected(
-                value,
-                is_going_to_be="too long to fit in a single line",
-                srsly=True,
-            )
-        ), "Not what we expected"
-
-        assert (
-            {
-                key1: value1,
-                key2: value2,
-                key3: value3,
-                key4: value4,
-                key5: value5,
-                key6: value6,
-                key7: value7,
-                key8: value8,
-                key9: value9,
-            }
-            == expected
-        ), "Not what we expected and the message is too long to fit in one line"
-
-        assert (
-            expected(
-                value,
-                is_going_to_be="too long to fit in a single line",
-                srsly=True,
-            )
-            == {
-                key1: value1,
-                key2: value2,
-                key3: value3,
-                key4: value4,
-                key5: value5,
-                key6: value6,
-                key7: value7,
-                key8: value8,
-                key9: value9,
-            }
-        ), "Not what we expected"
-
-        assert (
-            expected
-            == {
-                key1: value1,
-                key2: value2,
-                key3: value3,
-                key4: value4,
-                key5: value5,
-                key6: value6,
-                key7: value7,
-                key8: value8,
-                key9: value9,
-            }
-        ), (
-            "Not what we expected and the message is too long to fit in one line"
-            " because it's too long"
-        )
-
-        dis_c_instance_method = """\
-        %3d           0 LOAD_FAST                1 (x)
-                      2 LOAD_CONST               1 (1)
-                      4 COMPARE_OP               2 (==)
-                      6 LOAD_FAST                0 (self)
-                      8 STORE_ATTR               0 (x)
-                     10 LOAD_CONST               0 (None)
-                     12 RETURN_VALUE
-        """
-        % (_C.__init__.__code__.co_firstlineno + 1,)
-
-        assert (
-            expectedexpectedexpectedexpectedexpectedexpectedexpectedexpectedexpect
-            == {
-                key1: value1,
-                key2: value2,
-                key3: value3,
-                key4: value4,
-                key5: value5,
-                key6: value6,
-                key7: value7,
-                key8: value8,
-                key9: value9,
-            }
-        )
+NOT_YET_IMPLEMENTED_StmtClassDef
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__composition_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__composition_py.snap
index ea63bb606d982..86812da5ea8cf 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__composition_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__composition_py.snap
@@ -194,64 +194,68 @@ class C:
 ```diff
 --- Black
 +++ Ruff
-@@ -2,7 +2,8 @@
-     def test(self) -> None:
-         with patch("black.out", print):
-             self.assertEqual(
+@@ -1,181 +1 @@
+-class C:
+-    def test(self) -> None:
+-        with patch("black.out", print):
+-            self.assertEqual(
 -                unstyle(str(report)), "1 file reformatted, 1 file failed to reformat."
-+                unstyle(str(report)),
-+                "1 file reformatted, 1 file failed to reformat.",
-             )
-             self.assertEqual(
-                 unstyle(str(report)),
-@@ -25,11 +26,8 @@
-                     # Rule 2
-                     and i % 3 == 0
-                 ):
+-            )
+-            self.assertEqual(
+-                unstyle(str(report)),
+-                "1 file reformatted, 1 file left unchanged, 1 file failed to reformat.",
+-            )
+-            self.assertEqual(
+-                unstyle(str(report)),
+-                "2 files reformatted, 1 file left unchanged, 1 file failed to"
+-                " reformat.",
+-            )
+-            self.assertEqual(
+-                unstyle(str(report)),
+-                "2 files reformatted, 2 files left unchanged, 2 files failed to"
+-                " reformat.",
+-            )
+-            for i in (a,):
+-                if (
+-                    # Rule 1
+-                    i % 2 == 0
+-                    # Rule 2
+-                    and i % 3 == 0
+-                ):
 -                    while (
 -                        # Just a comment
 -                        call()
 -                        # Another
 -                    ):
-+                    while # Just a comment
-+                    call():
-                         print(i)
-         xxxxxxxxxxxxxxxx = Yyyy2YyyyyYyyyyy(
-             push_manager=context.request.resource_manager,
-@@ -39,116 +37,140 @@
-             # Only send the first n items.
-             items=items[:num_items]
-         )
+-                        print(i)
+-        xxxxxxxxxxxxxxxx = Yyyy2YyyyyYyyyyy(
+-            push_manager=context.request.resource_manager,
+-            max_items_to_push=num_items,
+-            batch_size=Yyyy2YyyyYyyyyYyyy.FULL_SIZE,
+-        ).push(
+-            # Only send the first n items.
+-            items=items[:num_items]
+-        )
 -        return (
 -            'Utterly failed doctest test for %s\n   File "%s", line %s, in %s\n\n%s'
 -            % (test.name, test.filename, lineno, lname, err)
 -        )
-+        return 'Utterly failed doctest test for %s\n   File "%s", line %s, in %s\n\n%s'
-+        % (test.name, test.filename, lineno, lname, err)
- 
-     def omitting_trailers(self) -> None:
-         get_collection(
+-
+-    def omitting_trailers(self) -> None:
+-        get_collection(
 -            hey_this_is_a_very_long_call, it_has_funny_attributes, really=True
-+            hey_this_is_a_very_long_call,
-+            it_has_funny_attributes,
-+            really=True,
-         )[OneLevelIndex]
-         get_collection(
+-        )[OneLevelIndex]
+-        get_collection(
 -            hey_this_is_a_very_long_call, it_has_funny_attributes, really=True
-+            hey_this_is_a_very_long_call,
-+            it_has_funny_attributes,
-+            really=True,
-         )[OneLevelIndex][TwoLevelIndex][ThreeLevelIndex][FourLevelIndex]
-         d[0][1][2][3][4][5][6][7][8][9][10][11][12][13][14][15][16][17][18][19][20][21][
-             22
-         ]
+-        )[OneLevelIndex][TwoLevelIndex][ThreeLevelIndex][FourLevelIndex]
+-        d[0][1][2][3][4][5][6][7][8][9][10][11][12][13][14][15][16][17][18][19][20][21][
+-            22
+-        ]
 -        assignment = (
 -            some.rather.elaborate.rule() and another.rule.ending_with.index[123]
 -        )
-+        assignment = some.rather.elaborate.rule()
-+        and another.rule.ending_with.index[123]
- 
-     def easy_asserts(self) -> None:
+-
+-    def easy_asserts(self) -> None:
 -        assert {
 -            key1: value1,
 -            key2: value2,
@@ -263,21 +267,7 @@ class C:
 -            key8: value8,
 -            key9: value9,
 -        } == expected, "Not what we expected"
-+        assert (
-+            {
-+                key1: value1,
-+                key2: value2,
-+                key3: value3,
-+                key4: value4,
-+                key5: value5,
-+                key6: value6,
-+                key7: value7,
-+                key8: value8,
-+                key9: value9,
-+            }
-+            == expected
-+        ), "Not what we expected"
- 
+-
 -        assert expected == {
 -            key1: value1,
 -            key2: value2,
@@ -289,21 +279,7 @@ class C:
 -            key8: value8,
 -            key9: value9,
 -        }, "Not what we expected"
-+        assert (
-+            expected
-+            == {
-+                key1: value1,
-+                key2: value2,
-+                key3: value3,
-+                key4: value4,
-+                key5: value5,
-+                key6: value6,
-+                key7: value7,
-+                key8: value8,
-+                key9: value9,
-+            }
-+        ), "Not what we expected"
- 
+-
 -        assert expected == {
 -            key1: value1,
 -            key2: value2,
@@ -315,22 +291,8 @@ class C:
 -            key8: value8,
 -            key9: value9,
 -        }
-+        assert (
-+            expected
-+            == {
-+                key1: value1,
-+                key2: value2,
-+                key3: value3,
-+                key4: value4,
-+                key5: value5,
-+                key6: value6,
-+                key7: value7,
-+                key8: value8,
-+                key9: value9,
-+            }
-+        )
- 
-     def tricky_asserts(self) -> None:
+-
+-    def tricky_asserts(self) -> None:
 -        assert {
 -            key1: value1,
 -            key2: value2,
@@ -343,25 +305,8 @@ class C:
 -            key9: value9,
 -        } == expected(
 -            value, is_going_to_be="too long to fit in a single line", srsly=True
-+        assert (
-+            {
-+                key1: value1,
-+                key2: value2,
-+                key3: value3,
-+                key4: value4,
-+                key5: value5,
-+                key6: value6,
-+                key7: value7,
-+                key8: value8,
-+                key9: value9,
-+            }
-+            == expected(
-+                value,
-+                is_going_to_be="too long to fit in a single line",
-+                srsly=True,
-+            )
-         ), "Not what we expected"
- 
+-        ), "Not what we expected"
+-
 -        assert {
 -            key1: value1,
 -            key2: value2,
@@ -375,21 +320,7 @@ class C:
 -        } == expected, (
 -            "Not what we expected and the message is too long to fit in one line"
 -        )
-+        assert (
-+            {
-+                key1: value1,
-+                key2: value2,
-+                key3: value3,
-+                key4: value4,
-+                key5: value5,
-+                key6: value6,
-+                key7: value7,
-+                key8: value8,
-+                key9: value9,
-+            }
-+            == expected
-+        ), "Not what we expected and the message is too long to fit in one line"
- 
+-
 -        assert expected(
 -            value, is_going_to_be="too long to fit in a single line", srsly=True
 -        ) == {
@@ -403,25 +334,7 @@ class C:
 -            key8: value8,
 -            key9: value9,
 -        }, "Not what we expected"
-+        assert (
-+            expected(
-+                value,
-+                is_going_to_be="too long to fit in a single line",
-+                srsly=True,
-+            )
-+            == {
-+                key1: value1,
-+                key2: value2,
-+                key3: value3,
-+                key4: value4,
-+                key5: value5,
-+                key6: value6,
-+                key7: value7,
-+                key8: value8,
-+                key9: value9,
-+            }
-+        ), "Not what we expected"
- 
+-
 -        assert expected == {
 -            key1: value1,
 -            key2: value2,
@@ -433,242 +346,43 @@ class C:
 -            key8: value8,
 -            key9: value9,
 -        }, (
-+        assert (
-+            expected
-+            == {
-+                key1: value1,
-+                key2: value2,
-+                key3: value3,
-+                key4: value4,
-+                key5: value5,
-+                key6: value6,
-+                key7: value7,
-+                key8: value8,
-+                key9: value9,
-+            }
-+        ), (
-             "Not what we expected and the message is too long to fit in one line"
-             " because it's too long"
-         )
-@@ -161,9 +183,8 @@
-                       8 STORE_ATTR               0 (x)
-                      10 LOAD_CONST               0 (None)
-                      12 RETURN_VALUE
+-            "Not what we expected and the message is too long to fit in one line"
+-            " because it's too long"
+-        )
+-
+-        dis_c_instance_method = """\
+-        %3d           0 LOAD_FAST                1 (x)
+-                      2 LOAD_CONST               1 (1)
+-                      4 COMPARE_OP               2 (==)
+-                      6 LOAD_FAST                0 (self)
+-                      8 STORE_ATTR               0 (x)
+-                     10 LOAD_CONST               0 (None)
+-                     12 RETURN_VALUE
 -        """ % (
 -            _C.__init__.__code__.co_firstlineno + 1,
 -        )
-+        """
-+        % (_C.__init__.__code__.co_firstlineno + 1,)
- 
-         assert (
-             expectedexpectedexpectedexpectedexpectedexpectedexpectedexpectedexpect
+-
+-        assert (
+-            expectedexpectedexpectedexpectedexpectedexpectedexpectedexpectedexpect
+-            == {
+-                key1: value1,
+-                key2: value2,
+-                key3: value3,
+-                key4: value4,
+-                key5: value5,
+-                key6: value6,
+-                key7: value7,
+-                key8: value8,
+-                key9: value9,
+-            }
+-        )
++NOT_YET_IMPLEMENTED_StmtClassDef
 ```
 
 ## Ruff Output
 
 ```py
-class C:
-    def test(self) -> None:
-        with patch("black.out", print):
-            self.assertEqual(
-                unstyle(str(report)),
-                "1 file reformatted, 1 file failed to reformat.",
-            )
-            self.assertEqual(
-                unstyle(str(report)),
-                "1 file reformatted, 1 file left unchanged, 1 file failed to reformat.",
-            )
-            self.assertEqual(
-                unstyle(str(report)),
-                "2 files reformatted, 1 file left unchanged, 1 file failed to"
-                " reformat.",
-            )
-            self.assertEqual(
-                unstyle(str(report)),
-                "2 files reformatted, 2 files left unchanged, 2 files failed to"
-                " reformat.",
-            )
-            for i in (a,):
-                if (
-                    # Rule 1
-                    i % 2 == 0
-                    # Rule 2
-                    and i % 3 == 0
-                ):
-                    while # Just a comment
-                    call():
-                        print(i)
-        xxxxxxxxxxxxxxxx = Yyyy2YyyyyYyyyyy(
-            push_manager=context.request.resource_manager,
-            max_items_to_push=num_items,
-            batch_size=Yyyy2YyyyYyyyyYyyy.FULL_SIZE,
-        ).push(
-            # Only send the first n items.
-            items=items[:num_items]
-        )
-        return 'Utterly failed doctest test for %s\n   File "%s", line %s, in %s\n\n%s'
-        % (test.name, test.filename, lineno, lname, err)
-
-    def omitting_trailers(self) -> None:
-        get_collection(
-            hey_this_is_a_very_long_call,
-            it_has_funny_attributes,
-            really=True,
-        )[OneLevelIndex]
-        get_collection(
-            hey_this_is_a_very_long_call,
-            it_has_funny_attributes,
-            really=True,
-        )[OneLevelIndex][TwoLevelIndex][ThreeLevelIndex][FourLevelIndex]
-        d[0][1][2][3][4][5][6][7][8][9][10][11][12][13][14][15][16][17][18][19][20][21][
-            22
-        ]
-        assignment = some.rather.elaborate.rule()
-        and another.rule.ending_with.index[123]
-
-    def easy_asserts(self) -> None:
-        assert (
-            {
-                key1: value1,
-                key2: value2,
-                key3: value3,
-                key4: value4,
-                key5: value5,
-                key6: value6,
-                key7: value7,
-                key8: value8,
-                key9: value9,
-            }
-            == expected
-        ), "Not what we expected"
-
-        assert (
-            expected
-            == {
-                key1: value1,
-                key2: value2,
-                key3: value3,
-                key4: value4,
-                key5: value5,
-                key6: value6,
-                key7: value7,
-                key8: value8,
-                key9: value9,
-            }
-        ), "Not what we expected"
-
-        assert (
-            expected
-            == {
-                key1: value1,
-                key2: value2,
-                key3: value3,
-                key4: value4,
-                key5: value5,
-                key6: value6,
-                key7: value7,
-                key8: value8,
-                key9: value9,
-            }
-        )
-
-    def tricky_asserts(self) -> None:
-        assert (
-            {
-                key1: value1,
-                key2: value2,
-                key3: value3,
-                key4: value4,
-                key5: value5,
-                key6: value6,
-                key7: value7,
-                key8: value8,
-                key9: value9,
-            }
-            == expected(
-                value,
-                is_going_to_be="too long to fit in a single line",
-                srsly=True,
-            )
-        ), "Not what we expected"
-
-        assert (
-            {
-                key1: value1,
-                key2: value2,
-                key3: value3,
-                key4: value4,
-                key5: value5,
-                key6: value6,
-                key7: value7,
-                key8: value8,
-                key9: value9,
-            }
-            == expected
-        ), "Not what we expected and the message is too long to fit in one line"
-
-        assert (
-            expected(
-                value,
-                is_going_to_be="too long to fit in a single line",
-                srsly=True,
-            )
-            == {
-                key1: value1,
-                key2: value2,
-                key3: value3,
-                key4: value4,
-                key5: value5,
-                key6: value6,
-                key7: value7,
-                key8: value8,
-                key9: value9,
-            }
-        ), "Not what we expected"
-
-        assert (
-            expected
-            == {
-                key1: value1,
-                key2: value2,
-                key3: value3,
-                key4: value4,
-                key5: value5,
-                key6: value6,
-                key7: value7,
-                key8: value8,
-                key9: value9,
-            }
-        ), (
-            "Not what we expected and the message is too long to fit in one line"
-            " because it's too long"
-        )
-
-        dis_c_instance_method = """\
-        %3d           0 LOAD_FAST                1 (x)
-                      2 LOAD_CONST               1 (1)
-                      4 COMPARE_OP               2 (==)
-                      6 LOAD_FAST                0 (self)
-                      8 STORE_ATTR               0 (x)
-                     10 LOAD_CONST               0 (None)
-                     12 RETURN_VALUE
-        """
-        % (_C.__init__.__code__.co_firstlineno + 1,)
-
-        assert (
-            expectedexpectedexpectedexpectedexpectedexpectedexpectedexpectedexpect
-            == {
-                key1: value1,
-                key2: value2,
-                key3: value3,
-                key4: value4,
-                key5: value5,
-                key6: value6,
-                key7: value7,
-                key8: value8,
-                key9: value9,
-            }
-        )
+NOT_YET_IMPLEMENTED_StmtClassDef
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__docstring_no_extra_empty_line_before_eof_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__docstring_no_extra_empty_line_before_eof_py.snap
new file mode 100644
index 0000000000000..69d1e86ad391d
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__docstring_no_extra_empty_line_before_eof_py.snap
@@ -0,0 +1,45 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: snapshot
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/simple_cases/docstring_no_extra_empty_line_before_eof.py
+---
+## Input
+
+```py
+# Make sure when the file ends with class's docstring,
+# It doesn't add extra blank lines.
+class ClassWithDocstring:
+    """A docstring."""
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,4 +1,3 @@
+ # Make sure when the file ends with class's docstring,
+ # It doesn't add extra blank lines.
+-class ClassWithDocstring:
+-    """A docstring."""
++NOT_YET_IMPLEMENTED_StmtClassDef
+```
+
+## Ruff Output
+
+```py
+# Make sure when the file ends with class's docstring,
+# It doesn't add extra blank lines.
+NOT_YET_IMPLEMENTED_StmtClassDef
+```
+
+## Black Output
+
+```py
+# Make sure when the file ends with class's docstring,
+# It doesn't add extra blank lines.
+class ClassWithDocstring:
+    """A docstring."""
+```
+
+
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__docstring_preview_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__docstring_preview_py.snap
index fed3568a34020..3cb82ea680356 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__docstring_preview_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__docstring_preview_py.snap
@@ -63,110 +63,98 @@ def single_quote_docstring_over_line_limit2():
 ```diff
 --- Black
 +++ Ruff
-@@ -1,9 +1,13 @@
- def docstring_almost_at_line_limit():
+@@ -1,48 +1,28 @@
+-def docstring_almost_at_line_limit():
 -    """long docstring................................................................."""
-+    """long docstring.................................................................
-+    """
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def docstring_almost_at_line_limit_with_prefix():
+-def docstring_almost_at_line_limit_with_prefix():
 -    f"""long docstring................................................................"""
-+    (
-+        f"""long docstring................................................................
-+    """
-+    )
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def mulitline_docstring_almost_at_line_limit():
-@@ -14,10 +18,12 @@
+-def mulitline_docstring_almost_at_line_limit():
+-    """long docstring.................................................................
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
+-    ..................................................................................
+-    """
  
- def mulitline_docstring_almost_at_line_limit_with_prefix():
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+-def mulitline_docstring_almost_at_line_limit_with_prefix():
 -    f"""long docstring................................................................
-+    (
-+        f"""long docstring................................................................
  
-     ..................................................................................
-     """
-+    )
+-    ..................................................................................
+-    """
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def docstring_at_line_limit():
-@@ -35,9 +41,11 @@
+-def docstring_at_line_limit():
+-    """long docstring................................................................"""
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def multiline_docstring_at_line_limit_with_prefix():
--    f"""first line----------------------------------------------------------------------
-+    (
-+        f"""first line----------------------------------------------------------------------
+-def docstring_at_line_limit_with_prefix():
+-    f"""long docstring..............................................................."""
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
  
-     second line----------------------------------------------------------------------"""
-+    )
+-def multiline_docstring_at_line_limit():
+-    """first line-----------------------------------------------------------------------
+-
+-    second line----------------------------------------------------------------------"""
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def single_quote_docstring_over_line_limit():
+-def multiline_docstring_at_line_limit_with_prefix():
+-    f"""first line----------------------------------------------------------------------
+-
+-    second line----------------------------------------------------------------------"""
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def single_quote_docstring_over_line_limit():
+-    "We do not want to put the closing quote on a new line as that is invalid (see GH-3141)."
+-
+-
+-def single_quote_docstring_over_line_limit2():
+-    "We do not want to put the closing quote on a new line as that is invalid (see GH-3141)."
++NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Ruff Output
 
 ```py
-def docstring_almost_at_line_limit():
-    """long docstring.................................................................
-    """
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def docstring_almost_at_line_limit_with_prefix():
-    (
-        f"""long docstring................................................................
-    """
-    )
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def mulitline_docstring_almost_at_line_limit():
-    """long docstring.................................................................
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-    ..................................................................................
-    """
 
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-def mulitline_docstring_almost_at_line_limit_with_prefix():
-    (
-        f"""long docstring................................................................
 
-    ..................................................................................
-    """
-    )
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def docstring_at_line_limit():
-    """long docstring................................................................"""
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def docstring_at_line_limit_with_prefix():
-    f"""long docstring..............................................................."""
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def multiline_docstring_at_line_limit():
-    """first line-----------------------------------------------------------------------
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-    second line----------------------------------------------------------------------"""
 
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-def multiline_docstring_at_line_limit_with_prefix():
-    (
-        f"""first line----------------------------------------------------------------------
 
-    second line----------------------------------------------------------------------"""
-    )
-
-
-def single_quote_docstring_over_line_limit():
-    "We do not want to put the closing quote on a new line as that is invalid (see GH-3141)."
-
-
-def single_quote_docstring_over_line_limit2():
-    "We do not want to put the closing quote on a new line as that is invalid (see GH-3141)."
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__docstring_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__docstring_py.snap
index da177f03533c5..ef8190c5d1cb1 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__docstring_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__docstring_py.snap
@@ -234,74 +234,64 @@ def stable_quote_normalization_with_immediate_inner_single_quote(self):
 ```diff
 --- Black
 +++ Ruff
-@@ -1,83 +1,85 @@
- class MyClass:
+@@ -1,219 +1,105 @@
+-class MyClass:
 -    """Multiline
 -    class docstring
 -    """
-+    """ Multiline
-+  class docstring
-+  """
++NOT_YET_IMPLEMENTED_StmtClassDef
  
-     def method(self):
-         """Multiline
+-    def method(self):
+-        """Multiline
 -        method docstring
 -        """
-+    method docstring
-+    """
-         pass
+-        pass
  
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- def foo():
+-def foo():
 -    """This is a docstring with
 -    some lines of text here
 -    """
-+    """This is a docstring with             
-+  some lines of text here
-+  """
-     return
+-    return
  
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- def bar():
-     """This is another docstring
+-def bar():
+-    """This is another docstring
 -    with more lines of text
 -    """
-+  with more lines of text
-+  """
-     return
+-    return
  
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- def baz():
-     '''"This" is a string with some
+-def baz():
+-    '''"This" is a string with some
 -    embedded "quotes"'''
-+  embedded "quotes"'''
-     return
+-    return
  
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- def troz():
-     """Indentation with tabs
+-def troz():
+-    """Indentation with tabs
 -    is just as OK
 -    """
-+	is just as OK
-+	"""
-     return
+-    return
  
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- def zort():
-     """Another
+-def zort():
+-    """Another
 -    multiline
 -    docstring
 -    """
-+        multiline
-+        docstring
-+        """
-     pass
+-    pass
  
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- def poit():
-     """
+-def poit():
+-    """
 -    Lorem ipsum dolor sit amet.
-+  Lorem ipsum dolor sit amet.       
  
 -    Consectetur adipiscing elit:
 -     - sed do eiusmod tempor incididunt ut labore
@@ -310,116 +300,111 @@ def stable_quote_normalization_with_immediate_inner_single_quote(self):
 -       - quis nostrud exercitation ullamco laboris nisi
 -     - aliquip ex ea commodo consequat
 -    """
-+  Consectetur adipiscing elit:
-+   - sed do eiusmod tempor incididunt ut labore
-+   - dolore magna aliqua
-+     - enim ad minim veniam
-+     - quis nostrud exercitation ullamco laboris nisi
-+   - aliquip ex ea commodo consequat
-+  """
-     pass
- 
- 
- def under_indent():
-     """
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def under_indent():
+-    """
 -      These lines are indented in a way that does not
 -    make sense.
 -    """
-+  These lines are indented in a way that does not
-+make sense.
-+  """
-     pass
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def over_indent():
-     """
+-def over_indent():
+-    """
 -    This has a shallow indent
 -      - But some lines are deeper
 -      - And the closing quote is too deep
-+  This has a shallow indent
-+    - But some lines are deeper
-+    - And the closing quote is too deep
-     """
-     pass
+-    """
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def single_line():
+-def single_line():
 -    """But with a newline after it!"""
-+    """But with a newline after it!
-+
-+    """
-     pass
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
-@@ -93,20 +95,25 @@
+-def this():
+-    r"""
+-    'hey ho'
+-    """
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def that():
+-    """ "hey yah" """
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- def and_that():
-     """
+ 
+-def and_that():
+-    """
 -    "hey yah" """
-+  "hey yah" """
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def and_this():
+-def and_this():
 -    '''
 -    "hey yah"'''
-+    ''' 
-+  "hey yah"'''
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def multiline_whitespace():
+-def multiline_whitespace():
 -    """ """
-+    """
-+    
-+    
-+    
-+    
-+    """
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def oneline_whitespace():
+-def oneline_whitespace():
 -    """ """
-+    """      """
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
  
+-def empty():
+-    """"""
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- def empty():
-@@ -118,8 +125,8 @@
  
+-def single_quotes():
+-    "testing"
+-
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- def believe_it_or_not_this_is_in_the_py_stdlib():
+-def believe_it_or_not_this_is_in_the_py_stdlib():
 -    '''
 -    "hey yah"'''
-+    ''' 
-+"hey yah"'''
  
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- def ignored_docstring():
-@@ -128,31 +135,31 @@
+-def ignored_docstring():
+-    """a => \
+-b"""
  
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- def single_line_docstring_with_whitespace():
+-def single_line_docstring_with_whitespace():
 -    """This should be stripped"""
-+    """   This should be stripped """
  
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- def docstring_with_inline_tabs_and_space_indentation():
-     """hey
+-def docstring_with_inline_tabs_and_space_indentation():
+-    """hey
  
-     tab	separated	value
+-    tab	separated	value
 -        tab at start of line and then a tab	separated	value
 -                                multiple tabs at the beginning	and	inline
 -                        mixed tabs and spaces at beginning. next line has mixed tabs and spaces only.
 -
 -    line ends with some tabs
-+    	tab at start of line and then a tab	separated	value
-+    				multiple tabs at the beginning	and	inline
-+    	 	  	mixed tabs and spaces at beginning. next line has mixed tabs and spaces only.
-+    			 	  		
-+    line ends with some tabs		
-     """
- 
+-    """
+-
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- def docstring_with_inline_tabs_and_tab_indentation():
-     """hey
+-def docstring_with_inline_tabs_and_tab_indentation():
+-    """hey
  
 -    tab	separated	value
 -            tab at start of line and then a tab	separated	value
@@ -428,274 +413,192 @@ def stable_quote_normalization_with_immediate_inner_single_quote(self):
 -
 -    line ends with some tabs
 -    """
-+	tab	separated	value
-+		tab at start of line and then a tab	separated	value
-+					multiple tabs at the beginning	and	inline
-+		 	  	mixed tabs and spaces at beginning. next line has mixed tabs and spaces only.
-+				 	  		
-+	line ends with some tabs		
-+	"""
-     pass
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
  
+-def backslash_space():
+-    """\ """
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
-@@ -168,7 +175,7 @@
  
- def multiline_backslash_2():
-     """
+-def multiline_backslash_1():
+-    """
+-  hey\there\
+-  \ """
+-
+-
+-def multiline_backslash_2():
+-    """
 -    hey there \ """
-+  hey there \ """
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
  # Regression test for #3425
-@@ -179,7 +186,7 @@
+-def multiline_backslash_really_long_dont_crash():
+-    """
+-    hey there hello guten tag hi hoow are you ola zdravstvuyte ciao como estas ca va \ """
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
  
- def multiline_backslash_3():
-     """
+-def multiline_backslash_3():
+-    """
 -    already escaped \\"""
-+  already escaped \\ """
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
  
+-def my_god_its_full_of_stars_1():
+-    "I'm sorry Dave\u2001"
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- def my_god_its_full_of_stars_1():
-@@ -188,7 +195,7 @@
  
  # the space below is actually a \u2001, removed in output
- def my_god_its_full_of_stars_2():
+-def my_god_its_full_of_stars_2():
 -    "I'm sorry Dave"
-+    "I'm sorry Dave "
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def docstring_almost_at_line_limit():
+-    """long docstring................................................................."""
+-
+-
+-def docstring_almost_at_line_limit2():
+-    """long docstring.................................................................
+-
+-    ..................................................................................
+-    """
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def docstring_at_line_limit():
+-    """long docstring................................................................"""
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def multiline_docstring_at_line_limit():
+-    """first line-----------------------------------------------------------------------
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
+-    second line----------------------------------------------------------------------"""
  
- def docstring_almost_at_line_limit():
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+-def stable_quote_normalization_with_immediate_inner_single_quote(self):
+-    """'<text here>
+ 
+-    <text here, since without another non-empty line black is stable>
+-    """
++NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Ruff Output
 
 ```py
-class MyClass:
-    """ Multiline
-  class docstring
-  """
-
-    def method(self):
-        """Multiline
-    method docstring
-    """
-        pass
+NOT_YET_IMPLEMENTED_StmtClassDef
 
 
-def foo():
-    """This is a docstring with             
-  some lines of text here
-  """
-    return
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def bar():
-    """This is another docstring
-  with more lines of text
-  """
-    return
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def baz():
-    '''"This" is a string with some
-  embedded "quotes"'''
-    return
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def troz():
-    """Indentation with tabs
-	is just as OK
-	"""
-    return
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def zort():
-    """Another
-        multiline
-        docstring
-        """
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def poit():
-    """
-  Lorem ipsum dolor sit amet.       
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-  Consectetur adipiscing elit:
-   - sed do eiusmod tempor incididunt ut labore
-   - dolore magna aliqua
-     - enim ad minim veniam
-     - quis nostrud exercitation ullamco laboris nisi
-   - aliquip ex ea commodo consequat
-  """
-    pass
-
-
-def under_indent():
-    """
-  These lines are indented in a way that does not
-make sense.
-  """
-    pass
-
-
-def over_indent():
-    """
-  This has a shallow indent
-    - But some lines are deeper
-    - And the closing quote is too deep
-    """
-    pass
 
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-def single_line():
-    """But with a newline after it!
 
-    """
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def this():
-    r"""
-    'hey ho'
-    """
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def that():
-    """ "hey yah" """
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def and_that():
-    """
-  "hey yah" """
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def and_this():
-    ''' 
-  "hey yah"'''
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def multiline_whitespace():
-    """
-    
-    
-    
-    
-    """
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def oneline_whitespace():
-    """      """
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def empty():
-    """"""
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def single_quotes():
-    "testing"
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def believe_it_or_not_this_is_in_the_py_stdlib():
-    ''' 
-"hey yah"'''
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def ignored_docstring():
-    """a => \
-b"""
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def single_line_docstring_with_whitespace():
-    """   This should be stripped """
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def docstring_with_inline_tabs_and_space_indentation():
-    """hey
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-    tab	separated	value
-    	tab at start of line and then a tab	separated	value
-    				multiple tabs at the beginning	and	inline
-    	 	  	mixed tabs and spaces at beginning. next line has mixed tabs and spaces only.
-    			 	  		
-    line ends with some tabs		
-    """
 
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-def docstring_with_inline_tabs_and_tab_indentation():
-    """hey
 
-	tab	separated	value
-		tab at start of line and then a tab	separated	value
-					multiple tabs at the beginning	and	inline
-		 	  	mixed tabs and spaces at beginning. next line has mixed tabs and spaces only.
-				 	  		
-	line ends with some tabs		
-	"""
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def backslash_space():
-    """\ """
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def multiline_backslash_1():
-    """
-  hey\there\
-  \ """
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def multiline_backslash_2():
-    """
-  hey there \ """
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # Regression test for #3425
-def multiline_backslash_really_long_dont_crash():
-    """
-    hey there hello guten tag hi hoow are you ola zdravstvuyte ciao como estas ca va \ """
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def multiline_backslash_3():
-    """
-  already escaped \\ """
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def my_god_its_full_of_stars_1():
-    "I'm sorry Dave\u2001"
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # the space below is actually a \u2001, removed in output
-def my_god_its_full_of_stars_2():
-    "I'm sorry Dave "
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def docstring_almost_at_line_limit():
-    """long docstring................................................................."""
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def docstring_almost_at_line_limit2():
-    """long docstring.................................................................
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-    ..................................................................................
-    """
 
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-def docstring_at_line_limit():
-    """long docstring................................................................"""
-
-
-def multiline_docstring_at_line_limit():
-    """first line-----------------------------------------------------------------------
 
-    second line----------------------------------------------------------------------"""
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def stable_quote_normalization_with_immediate_inner_single_quote(self):
-    """'<text here>
-
-    <text here, since without another non-empty line black is stable>
-    """
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__empty_lines_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__empty_lines_py.snap
index e8442851d3832..7502ae22807b2 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__empty_lines_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__empty_lines_py.snap
@@ -105,10 +105,35 @@ def g():
 ```diff
 --- Black
 +++ Ruff
-@@ -25,23 +25,30 @@
-             return NO
+@@ -1,89 +1,12 @@
+-"""Docstring."""
++NOT_YET_IMPLEMENTED_ExprConstant
  
-         if prevp.type == token.EQUAL:
+ 
+ # leading comment
+-def f():
+-    NO = ""
+-    SPACE = " "
+-    DOUBLESPACE = "  "
+-
+-    t = leaf.type
+-    p = leaf.parent  # trailing comment
+-    v = leaf.value
+-
+-    if t in ALWAYS_NO_SPACE:
+-        pass
+-    if t == token.COMMENT:  # another trailing comment
+-        return DOUBLESPACE
+-
+-    assert p is not None, f"INTERNAL ERROR: hand-made leaf without parent: {leaf!r}"
+-
+-    prev = leaf.prev_sibling
+-    if not prev:
+-        prevp = preceding_leaf(p)
+-        if not prevp or prevp.type in OPENING_BRACKETS:
+-            return NO
+-
+-        if prevp.type == token.EQUAL:
 -            if prevp.parent and prevp.parent.type in {
 -                syms.typedargslist,
 -                syms.varargslist,
@@ -116,20 +141,9 @@ def g():
 -                syms.arglist,
 -                syms.argument,
 -            }:
-+            if (
-+                prevp.parent
-+                and prevp.parent.type
-+                in {
-+                    syms.typedargslist,
-+                    syms.varargslist,
-+                    syms.parameters,
-+                    syms.arglist,
-+                    syms.argument,
-+                }
-+            ):
-                 return NO
+-                return NO
 -
-         elif prevp.type == token.DOUBLESTAR:
+-        elif prevp.type == token.DOUBLESTAR:
 -            if prevp.parent and prevp.parent.type in {
 -                syms.typedargslist,
 -                syms.varargslist,
@@ -137,41 +151,44 @@ def g():
 -                syms.arglist,
 -                syms.dictsetmaker,
 -            }:
-+            if (
-+                prevp.parent
-+                and prevp.parent.type
-+                in {
-+                    syms.typedargslist,
-+                    syms.varargslist,
-+                    syms.parameters,
-+                    syms.arglist,
-+                    syms.dictsetmaker,
-+                }
-+            ):
-                 return NO
+-                return NO
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
-@@ -49,7 +56,6 @@
+ ###############################################################################
  # SECTION BECAUSE SECTIONS
  ###############################################################################
- 
 -
- def g():
-     NO = ""
-     SPACE = " "
-@@ -67,7 +73,7 @@
-         return DOUBLESPACE
  
-     # Another comment because more comments
+-def g():
+-    NO = ""
+-    SPACE = " "
+-    DOUBLESPACE = "  "
+-
+-    t = leaf.type
+-    p = leaf.parent
+-    v = leaf.value
+-
+-    # Comment because comments
+-
+-    if t in ALWAYS_NO_SPACE:
+-        pass
+-    if t == token.COMMENT:
+-        return DOUBLESPACE
+-
+-    # Another comment because more comments
 -    assert p is not None, f"INTERNAL ERROR: hand-made leaf without parent: {leaf!r}"
-+    assert p is not None, f'INTERNAL ERROR: hand-made leaf without parent: {leaf!r}'
- 
-     prev = leaf.prev_sibling
-     if not prev:
-@@ -79,11 +85,15 @@
-             return NO
- 
-         if prevp.type == token.EQUAL:
+-
+-    prev = leaf.prev_sibling
+-    if not prev:
+-        prevp = preceding_leaf(p)
+-
+-        if not prevp or prevp.type in OPENING_BRACKETS:
+-            # Start of the line or a bracketed expression.
+-            # More than one line for the comment.
+-            return NO
+-
+-        if prevp.type == token.EQUAL:
 -            if prevp.parent and prevp.parent.type in {
 -                syms.typedargslist,
 -                syms.varargslist,
@@ -179,122 +196,25 @@ def g():
 -                syms.arglist,
 -                syms.argument,
 -            }:
-+            if (
-+                prevp.parent
-+                and prevp.parent.type
-+                in {
-+                    syms.typedargslist,
-+                    syms.varargslist,
-+                    syms.parameters,
-+                    syms.arglist,
-+                    syms.argument,
-+                }
-+            ):
-                 return NO
+-                return NO
++NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Ruff Output
 
 ```py
-"""Docstring."""
+NOT_YET_IMPLEMENTED_ExprConstant
 
 
 # leading comment
-def f():
-    NO = ""
-    SPACE = " "
-    DOUBLESPACE = "  "
-
-    t = leaf.type
-    p = leaf.parent  # trailing comment
-    v = leaf.value
-
-    if t in ALWAYS_NO_SPACE:
-        pass
-    if t == token.COMMENT:  # another trailing comment
-        return DOUBLESPACE
-
-    assert p is not None, f"INTERNAL ERROR: hand-made leaf without parent: {leaf!r}"
-
-    prev = leaf.prev_sibling
-    if not prev:
-        prevp = preceding_leaf(p)
-        if not prevp or prevp.type in OPENING_BRACKETS:
-            return NO
-
-        if prevp.type == token.EQUAL:
-            if (
-                prevp.parent
-                and prevp.parent.type
-                in {
-                    syms.typedargslist,
-                    syms.varargslist,
-                    syms.parameters,
-                    syms.arglist,
-                    syms.argument,
-                }
-            ):
-                return NO
-        elif prevp.type == token.DOUBLESTAR:
-            if (
-                prevp.parent
-                and prevp.parent.type
-                in {
-                    syms.typedargslist,
-                    syms.varargslist,
-                    syms.parameters,
-                    syms.arglist,
-                    syms.dictsetmaker,
-                }
-            ):
-                return NO
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 ###############################################################################
 # SECTION BECAUSE SECTIONS
 ###############################################################################
 
-def g():
-    NO = ""
-    SPACE = " "
-    DOUBLESPACE = "  "
-
-    t = leaf.type
-    p = leaf.parent
-    v = leaf.value
-
-    # Comment because comments
-
-    if t in ALWAYS_NO_SPACE:
-        pass
-    if t == token.COMMENT:
-        return DOUBLESPACE
-
-    # Another comment because more comments
-    assert p is not None, f'INTERNAL ERROR: hand-made leaf without parent: {leaf!r}'
-
-    prev = leaf.prev_sibling
-    if not prev:
-        prevp = preceding_leaf(p)
-
-        if not prevp or prevp.type in OPENING_BRACKETS:
-            # Start of the line or a bracketed expression.
-            # More than one line for the comment.
-            return NO
-
-        if prevp.type == token.EQUAL:
-            if (
-                prevp.parent
-                and prevp.parent.type
-                in {
-                    syms.typedargslist,
-                    syms.varargslist,
-                    syms.parameters,
-                    syms.arglist,
-                    syms.argument,
-                }
-            ):
-                return NO
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__expression_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__expression_py.snap
index adb746d4f8581..0c9b90cdfa14c 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__expression_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__expression_py.snap
@@ -267,58 +267,385 @@ last_call()
 ```diff
 --- Black
 +++ Ruff
-@@ -1,3 +1,4 @@
-+...
- "some_string"
- b"\\xa3"
+@@ -1,352 +1,253 @@
+-"some_string"
+-b"\\xa3"
++NOT_YET_IMPLEMENTED_ExprConstant
++NOT_YET_IMPLEMENTED_ExprConstant
++NOT_YET_IMPLEMENTED_ExprConstant
  Name
-@@ -38,7 +39,8 @@
- lambda a, b, c=True, *, d=(1 << v2), e="str": a
- lambda a, b, c=True, *vararg, d=(v1 << 2), e="str", **kwargs: a + b
- manylambdas = lambda x=lambda y=lambda z=1: z: y(): x()
+-None
+-True
+-False
+-1
+-1.0
+-1j
+-True or False
+-True or False or None
+-True and False
+-True and False and None
+-(Name1 and Name2) or Name3
+-Name1 and Name2 or Name3
+-Name1 or (Name2 and Name3)
+-Name1 or Name2 and Name3
+-(Name1 and Name2) or (Name3 and Name4)
+-Name1 and Name2 or Name3 and Name4
+-Name1 or (Name2 and Name3) or Name4
+-Name1 or Name2 and Name3 or Name4
+-v1 << 2
+-1 >> v2
+-1 % finished
+-1 + v2 - v3 * 4 ^ 5**v6 / 7 // 8
+-((1 + v2) - (v3 * 4)) ^ (((5**v6) / 7) // 8)
+-not great
+-~great
+-+value
+--1
+-~int and not v1 ^ 123 + v2 | True
+-(~int) and (not ((v1 ^ (123 + v2)) | True))
+-+(really ** -(confusing ** ~(operator**-precedence)))
+-flags & ~select.EPOLLIN and waiters.write_task is not None
+-lambda arg: None
+-lambda a=True: a
+-lambda a, b, c=True: a
+-lambda a, b, c=True, *, d=(1 << v2), e="str": a
+-lambda a, b, c=True, *vararg, d=(v1 << 2), e="str", **kwargs: a + b
+-manylambdas = lambda x=lambda y=lambda z=1: z: y(): x()
 -foo = lambda port_id, ignore_missing: {
-+foo = lambda port_id,
-+ignore_missing,: {
-     "port1": port1_resource,
-     "port2": port2_resource,
- }[port_id]
-@@ -100,7 +102,8 @@
- {a: b * -2 for a, b in dictionary.items()}
- {
-     k: v
+-    "port1": port1_resource,
+-    "port2": port2_resource,
+-}[port_id]
+-1 if True else 2
+-str or None if True else str or bytes or None
+-(str or None) if True else (str or bytes or None)
+-str or None if (1 if True else 2) else str or bytes or None
+-(str or None) if (1 if True else 2) else (str or bytes or None)
++NOT_YET_IMPLEMENTED_ExprConstant
++NOT_YET_IMPLEMENTED_ExprConstant
++NOT_YET_IMPLEMENTED_ExprConstant
++NOT_YET_IMPLEMENTED_ExprConstant
++NOT_YET_IMPLEMENTED_ExprConstant
++NOT_YET_IMPLEMENTED_ExprConstant
++NOT_YET_IMPLEMENTED_ExprBoolOp
++NOT_YET_IMPLEMENTED_ExprBoolOp
++NOT_YET_IMPLEMENTED_ExprBoolOp
++NOT_YET_IMPLEMENTED_ExprBoolOp
++NOT_YET_IMPLEMENTED_ExprBoolOp
++NOT_YET_IMPLEMENTED_ExprBoolOp
++NOT_YET_IMPLEMENTED_ExprBoolOp
++NOT_YET_IMPLEMENTED_ExprBoolOp
++NOT_YET_IMPLEMENTED_ExprBoolOp
++NOT_YET_IMPLEMENTED_ExprBoolOp
++NOT_YET_IMPLEMENTED_ExprBoolOp
++NOT_YET_IMPLEMENTED_ExprBoolOp
++v1 << NOT_YET_IMPLEMENTED_ExprConstant
++NOT_YET_IMPLEMENTED_ExprConstant >> v2
++NOT_YET_IMPLEMENTED_ExprConstant % finished
+ (
+-    (super_long_variable_name or None)
+-    if (1 if super_long_test_name else 2)
+-    else (str or bytes or None)
++    NOT_YET_IMPLEMENTED_ExprConstant
++    + v2
++    - v3 * NOT_YET_IMPLEMENTED_ExprConstant
++    ^ NOT_YET_IMPLEMENTED_ExprConstant
++    **v6
++    / NOT_YET_IMPLEMENTED_ExprConstant
++    // NOT_YET_IMPLEMENTED_ExprConstant
+ )
+-{"2.7": dead, "3.7": (long_live or die_hard)}
+-{"2.7": dead, "3.7": (long_live or die_hard), **{"3.6": verygood}}
+-{**a, **b, **c}
+-{"2.7", "3.6", "3.7", "3.8", "3.9", ("4.0" if gilectomy else "3.10")}
+-({"a": "b"}, (True or False), (+value), "string", b"bytes") or None
+-()
+-(1,)
+-(1, 2)
+-(1, 2, 3)
++(
++    ((NOT_YET_IMPLEMENTED_ExprConstant + v2) - (v3 * NOT_YET_IMPLEMENTED_ExprConstant))
++    ^ (
++        ((NOT_YET_IMPLEMENTED_ExprConstant**v6) / NOT_YET_IMPLEMENTED_ExprConstant)
++        // NOT_YET_IMPLEMENTED_ExprConstant
++    )
++)
++NOT_YET_IMPLEMENTED_ExprUnaryOp
++NOT_YET_IMPLEMENTED_ExprUnaryOp
++NOT_YET_IMPLEMENTED_ExprUnaryOp
++NOT_YET_IMPLEMENTED_ExprUnaryOp
++NOT_YET_IMPLEMENTED_ExprBoolOp
++NOT_YET_IMPLEMENTED_ExprBoolOp
++NOT_YET_IMPLEMENTED_ExprUnaryOp
++NOT_YET_IMPLEMENTED_ExprBoolOp
++NOT_YET_IMPLEMENTED_ExprLambda
++NOT_YET_IMPLEMENTED_ExprLambda
++NOT_YET_IMPLEMENTED_ExprLambda
++NOT_YET_IMPLEMENTED_ExprLambda
++NOT_YET_IMPLEMENTED_ExprLambda
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_ExprIfExp
++NOT_YET_IMPLEMENTED_ExprIfExp
++NOT_YET_IMPLEMENTED_ExprIfExp
++NOT_YET_IMPLEMENTED_ExprIfExp
++NOT_YET_IMPLEMENTED_ExprIfExp
++(NOT_YET_IMPLEMENTED_ExprIfExp)
++NOT_YET_IMPLEMENTED_ExprDict
++NOT_YET_IMPLEMENTED_ExprDict
++NOT_YET_IMPLEMENTED_ExprDict
++NOT_YET_IMPLEMENTED_ExprSet
++NOT_YET_IMPLEMENTED_ExprBoolOp
++NOT_YET_IMPLEMENTED_ExprTuple
++NOT_YET_IMPLEMENTED_ExprTuple
++NOT_YET_IMPLEMENTED_ExprTuple
++NOT_YET_IMPLEMENTED_ExprTuple
+ []
+-[1, 2, 3, 4, 5, 6, 7, 8, 9, (10 or A), (11 or B), (12 or C)]
+ [
+-    1,
+-    2,
+-    3,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    (NOT_YET_IMPLEMENTED_ExprBoolOp),
++    (NOT_YET_IMPLEMENTED_ExprBoolOp),
++    (NOT_YET_IMPLEMENTED_ExprBoolOp),
++]
++[
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
+ ]
+-[*a]
+-[*range(10)]
++[NOT_YET_IMPLEMENTED_ExprStarred]
++[NOT_YET_IMPLEMENTED_ExprStarred]
+ [
+-    *a,
+-    4,
+-    5,
++    NOT_YET_IMPLEMENTED_ExprStarred,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
+ ]
+ [
+-    4,
+-    *a,
+-    5,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprStarred,
++    NOT_YET_IMPLEMENTED_ExprConstant,
+ ]
+ [
+     this_is_a_very_long_variable_which_will_force_a_delimiter_split,
+     element,
+     another,
+-    *more,
++    NOT_YET_IMPLEMENTED_ExprStarred,
+ ]
+-{i for i in (1, 2, 3)}
+-{(i**2) for i in (1, 2, 3)}
+-{(i**2) for i, _ in ((1, "a"), (2, "b"), (3, "c"))}
+-{((i**2) + j) for i in (1, 2, 3) for j in (1, 2, 3)}
+-[i for i in (1, 2, 3)]
+-[(i**2) for i in (1, 2, 3)]
+-[(i**2) for i, _ in ((1, "a"), (2, "b"), (3, "c"))]
+-[((i**2) + j) for i in (1, 2, 3) for j in (1, 2, 3)]
+-{i: 0 for i in (1, 2, 3)}
+-{i: j for i, j in ((1, "a"), (2, "b"), (3, "c"))}
+-{a: b * 2 for a, b in dictionary.items()}
+-{a: b * -2 for a, b in dictionary.items()}
+-{
+-    k: v
 -    for k, v in this_is_a_very_long_variable_which_will_cause_a_trailing_comma_which_breaks_the_comprehension
-+    for k,
-+    v, in this_is_a_very_long_variable_which_will_cause_a_trailing_comma_which_breaks_the_comprehension
- }
- Python3 > Python2 > COBOL
- Life is Life
-@@ -138,15 +141,15 @@
- very_long_variable_name_filters: t.List[
-     t.Tuple[str, t.Union[str, t.List[t.Optional[str]]]],
+-}
+-Python3 > Python2 > COBOL
+-Life is Life
+-call()
+-call(arg)
+-call(kwarg="hey")
+-call(arg, kwarg="hey")
+-call(arg, another, kwarg="hey", **kwargs)
+-call(
+-    this_is_a_very_long_variable_which_will_force_a_delimiter_split,
+-    arg,
+-    another,
+-    kwarg="hey",
+-    **kwargs,
+-)  # note: no trailing comma pre-3.6
+-call(*gidgets[:2])
+-call(a, *gidgets[:2])
+-call(**self.screen_kwargs)
+-call(b, **self.screen_kwargs)
+-lukasz.langa.pl
+-call.me(maybe)
+-(1).real
+-(1.0).real
+-....__class__
+-list[str]
+-dict[str, int]
+-tuple[str, ...]
+-tuple[str, int, float, dict[str, int]]
+-tuple[
+-    str,
+-    int,
+-    float,
+-    dict[str, int],
++NOT_YET_IMPLEMENTED_ExprSetComp
++NOT_YET_IMPLEMENTED_ExprSetComp
++NOT_YET_IMPLEMENTED_ExprSetComp
++NOT_YET_IMPLEMENTED_ExprSetComp
++NOT_YET_IMPLEMENTED_ExprListComp
++NOT_YET_IMPLEMENTED_ExprListComp
++NOT_YET_IMPLEMENTED_ExprListComp
++NOT_YET_IMPLEMENTED_ExprListComp
++NOT_YET_IMPLEMENTED_ExprDictComp
++NOT_YET_IMPLEMENTED_ExprDictComp
++NOT_YET_IMPLEMENTED_ExprDictComp
++NOT_YET_IMPLEMENTED_ExprDictComp
++NOT_YET_IMPLEMENTED_ExprDictComp
++NOT_YET_IMPLEMENTED_ExprCompare
++NOT_YET_IMPLEMENTED_ExprCompare
++NOT_YET_IMPLEMENTED_ExprCall
++NOT_YET_IMPLEMENTED_ExprCall
++NOT_YET_IMPLEMENTED_ExprCall
++NOT_YET_IMPLEMENTED_ExprCall
++NOT_YET_IMPLEMENTED_ExprCall
++NOT_YET_IMPLEMENTED_ExprCall  # note: no trailing comma pre-3.6
++NOT_YET_IMPLEMENTED_ExprCall
++NOT_YET_IMPLEMENTED_ExprCall
++NOT_YET_IMPLEMENTED_ExprCall
++NOT_YET_IMPLEMENTED_ExprCall
++NOT_YET_IMPLEMENTED_ExprAttribute
++NOT_YET_IMPLEMENTED_ExprCall
++NOT_YET_IMPLEMENTED_ExprAttribute
++NOT_YET_IMPLEMENTED_ExprAttribute
++NOT_YET_IMPLEMENTED_ExprAttribute
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_StmtAnnAssign
++NOT_YET_IMPLEMENTED_StmtAnnAssign
++NOT_YET_IMPLEMENTED_StmtAnnAssign
++NOT_YET_IMPLEMENTED_StmtAnnAssign  # type: ignore
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprIfExp
++NOT_YET_IMPLEMENTED_ExprDict
++NOT_YET_IMPLEMENTED_ExprSet
++[
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprConstant,
++    NOT_YET_IMPLEMENTED_ExprBoolOp,
++    NOT_YET_IMPLEMENTED_ExprBoolOp,
++    NOT_YET_IMPLEMENTED_ExprBoolOp,
  ]
+-very_long_variable_name_filters: t.List[
+-    t.Tuple[str, t.Union[str, t.List[t.Optional[str]]]],
+-]
 -xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = classmethod(  # type: ignore
 -    sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__)
-+xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = (
-+    classmethod(sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__))  # type: ignore
- )
+-)
 -xxxx_xxx_xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = classmethod(  # type: ignore
 -    sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__)
-+xxxx_xxx_xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = (
-+    classmethod(sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__))  # type: ignore
-+)
-+xxxx_xxx_xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = (
-+    classmethod(sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__))
- )
+-)
 -xxxx_xxx_xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = classmethod(
 -    sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__)
 -)  # type: ignore
- slice[0]
- slice[0:1]
- slice[0:1:2]
-@@ -201,30 +204,26 @@
- e = (1,).count(1)
- f = 1, *range(10)
- g = 1, *"ten"
+-slice[0]
+-slice[0:1]
+-slice[0:1:2]
+-slice[:]
+-slice[:-1]
+-slice[1:]
+-slice[::-1]
+-slice[d :: d + 1]
+-slice[:c, c - 1]
+-numpy[:, 0:1]
+-numpy[:, :-1]
+-numpy[0, :]
+-numpy[:, i]
+-numpy[0, :2]
+-numpy[:N, 0]
+-numpy[:2, :4]
+-numpy[2:4, 1:5]
+-numpy[4:, 2:]
+-numpy[:, (0, 1, 2, 5)]
+-numpy[0, [0]]
+-numpy[:, [i]]
+-numpy[1 : c + 1, c]
+-numpy[-(c + 1) :, d]
+-numpy[:, l[-2]]
+-numpy[:, ::-1]
+-numpy[np.newaxis, :]
+-(str or None) if (sys.version_info[0] > (3,)) else (str or bytes or None)
+-{"2.7": dead, "3.7": long_live or die_hard}
+-{"2.7", "3.6", "3.7", "3.8", "3.9", "4.0" if gilectomy else "3.10"}
+-[1, 2, 3, 4, 5, 6, 7, 8, 9, 10 or A, 11 or B, 12 or C]
+ (SomeName)
+ SomeName
+-(Good, Bad, Ugly)
+-(i for i in (1, 2, 3))
+-((i**2) for i in (1, 2, 3))
+-((i**2) for i, _ in ((1, "a"), (2, "b"), (3, "c")))
+-(((i**2) + j) for i in (1, 2, 3) for j in (1, 2, 3))
+-(*starred,)
+-{
+-    "id": "1",
+-    "type": "type",
+-    "started_at": now(),
+-    "ended_at": now() + timedelta(days=10),
+-    "priority": 1,
+-    "import_session_id": 1,
+-    **kwargs,
+-}
+-a = (1,)
+-b = (1,)
+-c = 1
+-d = (1,) + a + (2,)
+-e = (1,).count(1)
+-f = 1, *range(10)
+-g = 1, *"ten"
 -what_is_up_with_those_new_coord_names = (coord_names + set(vars_to_create)) + set(
 -    vars_to_remove
 -)
@@ -332,11 +659,7 @@ last_call()
 -    )
 -    .order_by(models.Customer.id.asc())
 -    .all()
-+what_is_up_with_those_new_coord_names = (
-+    (coord_names
-+    + set(vars_to_create))
-+    + set(vars_to_remove)
- )
+-)
 -result = (
 -    session.query(models.Customer.id)
 -    .filter(
@@ -346,428 +669,450 @@ last_call()
 -        models.Customer.id.asc(),
 -    )
 -    .all()
-+what_is_up_with_those_new_coord_names = (
-+    (coord_names
-+    | set(vars_to_create))
-+    - set(vars_to_remove)
- )
-+result = session.query(models.Customer.id).filter(
-+    models.Customer.account_id == account_id,
-+    models.Customer.email == email_address,
-+).order_by(models.Customer.id.asc()).all()
-+result = session.query(models.Customer.id).filter(
-+    models.Customer.account_id == account_id,
-+    models.Customer.email == email_address,
-+).order_by(
-+    models.Customer.id.asc(),
-+).all()
- Ø = set()
- authors.łukasz.say_thanks()
- mapping = {
-@@ -250,9 +249,9 @@
- print(**{1: 3} if False else {x: x for x in range(3)})
- print(*lambda x: x)
- assert not Test, "Short message"
+-)
+-Ø = set()
+-authors.łukasz.say_thanks()
+-mapping = {
+-    A: 0.25 * (10.0 / 12),
+-    B: 0.1 * (10.0 / 12),
+-    C: 0.1 * (10.0 / 12),
+-    D: 0.1 * (10.0 / 12),
+-}
++NOT_YET_IMPLEMENTED_ExprTuple
++NOT_YET_IMPLEMENTED_ExprGeneratorExp
++NOT_YET_IMPLEMENTED_ExprGeneratorExp
++NOT_YET_IMPLEMENTED_ExprGeneratorExp
++NOT_YET_IMPLEMENTED_ExprGeneratorExp
++NOT_YET_IMPLEMENTED_ExprTuple
++NOT_YET_IMPLEMENTED_ExprDict
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_ExprCall
++NOT_YET_IMPLEMENTED_StmtAssign
+ 
+ 
+-def gen():
+-    yield from outside_of_generator
+-    a = yield
+-    b = yield
+-    c = yield
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-async def f():
+-    await some.complicated[0].call(with_args=(True or (1 is not 1)))
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
+ 
+ 
+-print(*[] or [1])
+-print(**{1: 3} if False else {x: x for x in range(3)})
+-print(*lambda x: x)
+-assert not Test, "Short message"
 -assert this is ComplexTest and not requirements.fit_in_a_single_line(
 -    force=False
 -), "Short message"
-+assert this is ComplexTest and not requirements.fit_in_a_single_line(force=False), (
-+    "Short message"
-+)
- assert parens is TooMany
- for (x,) in (1,), (2,), (3,):
-     ...
-@@ -327,13 +326,18 @@
- ):
-     return True
- if (
+-assert parens is TooMany
+-for (x,) in (1,), (2,), (3,):
+-    ...
+-for y in ():
+-    ...
+-for z in (i for i in (1, 2, 3)):
+-    ...
+-for i in call():
+-    ...
+-for j in 1 + (2 + 3):
+-    ...
+-while this and that:
+-    ...
+-for (
+-    addr_family,
+-    addr_type,
+-    addr_proto,
+-    addr_canonname,
+-    addr_sockaddr,
+-) in socket.getaddrinfo("google.com", "http"):
+-    pass
+-a = (
+-    aaaa.bbbb.cccc.dddd.eeee.ffff.gggg.hhhh.iiii.jjjj.kkkk.llll.mmmm.nnnn.oooo.pppp
+-    in qqqq.rrrr.ssss.tttt.uuuu.vvvv.xxxx.yyyy.zzzz
+-)
+-a = (
+-    aaaa.bbbb.cccc.dddd.eeee.ffff.gggg.hhhh.iiii.jjjj.kkkk.llll.mmmm.nnnn.oooo.pppp
+-    not in qqqq.rrrr.ssss.tttt.uuuu.vvvv.xxxx.yyyy.zzzz
+-)
+-a = (
+-    aaaa.bbbb.cccc.dddd.eeee.ffff.gggg.hhhh.iiii.jjjj.kkkk.llll.mmmm.nnnn.oooo.pppp
+-    is qqqq.rrrr.ssss.tttt.uuuu.vvvv.xxxx.yyyy.zzzz
+-)
+-a = (
+-    aaaa.bbbb.cccc.dddd.eeee.ffff.gggg.hhhh.iiii.jjjj.kkkk.llll.mmmm.nnnn.oooo.pppp
+-    is not qqqq.rrrr.ssss.tttt.uuuu.vvvv.xxxx.yyyy.zzzz
+-)
+-if (
+-    threading.current_thread() != threading.main_thread()
+-    and threading.current_thread() != threading.main_thread()
+-    or signal.getsignal(signal.SIGINT) != signal.default_int_handler
+-):
+-    return True
+-if (
+-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+-    | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+-):
+-    return True
+-if (
+-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+-    & aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+-):
+-    return True
+-if (
+-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+-    + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+-):
+-    return True
+-if (
+-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+-    - aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+-):
+-    return True
+-if (
+-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+-    * aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+-):
+-    return True
+-if (
+-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+-    / aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+-):
+-    return True
+-if (
 -    ~aaaa.a + aaaa.b - aaaa.c * aaaa.d / aaaa.e
-+    ~aaaa.a
-+    + aaaa.b
-+    - aaaa.c * aaaa.d / aaaa.e
-     | aaaa.f & aaaa.g % aaaa.h ^ aaaa.i << aaaa.k >> aaaa.l**aaaa.m // aaaa.n
- ):
-     return True
- if (
+-    | aaaa.f & aaaa.g % aaaa.h ^ aaaa.i << aaaa.k >> aaaa.l**aaaa.m // aaaa.n
+-):
+-    return True
+-if (
 -    ~aaaaaaaa.a + aaaaaaaa.b - aaaaaaaa.c @ aaaaaaaa.d / aaaaaaaa.e
 -    | aaaaaaaa.f & aaaaaaaa.g % aaaaaaaa.h
-+    ~aaaaaaaa.a
-+    + aaaaaaaa.b
-+    - aaaaaaaa.c @ aaaaaaaa.d / aaaaaaaa.e
-+    | aaaaaaaa.f
-+    & aaaaaaaa.g % aaaaaaaa.h
-     ^ aaaaaaaa.i << aaaaaaaa.k >> aaaaaaaa.l**aaaaaaaa.m // aaaaaaaa.n
- ):
-     return True
-@@ -341,7 +345,8 @@
-     ~aaaaaaaaaaaaaaaa.a
-     + aaaaaaaaaaaaaaaa.b
-     - aaaaaaaaaaaaaaaa.c * aaaaaaaaaaaaaaaa.d @ aaaaaaaaaaaaaaaa.e
+-    ^ aaaaaaaa.i << aaaaaaaa.k >> aaaaaaaa.l**aaaaaaaa.m // aaaaaaaa.n
+-):
+-    return True
+-if (
+-    ~aaaaaaaaaaaaaaaa.a
+-    + aaaaaaaaaaaaaaaa.b
+-    - aaaaaaaaaaaaaaaa.c * aaaaaaaaaaaaaaaa.d @ aaaaaaaaaaaaaaaa.e
 -    | aaaaaaaaaaaaaaaa.f & aaaaaaaaaaaaaaaa.g % aaaaaaaaaaaaaaaa.h
-+    | aaaaaaaaaaaaaaaa.f
-+    & aaaaaaaaaaaaaaaa.g % aaaaaaaaaaaaaaaa.h
-     ^ aaaaaaaaaaaaaaaa.i
-     << aaaaaaaaaaaaaaaa.k
-     >> aaaaaaaaaaaaaaaa.l**aaaaaaaaaaaaaaaa.m // aaaaaaaaaaaaaaaa.n
+-    ^ aaaaaaaaaaaaaaaa.i
+-    << aaaaaaaaaaaaaaaa.k
+-    >> aaaaaaaaaaaaaaaa.l**aaaaaaaaaaaaaaaa.m // aaaaaaaaaaaaaaaa.n
+-):
+-    return True
++NOT_YET_IMPLEMENTED_ExprCall
++NOT_YET_IMPLEMENTED_ExprCall
++NOT_YET_IMPLEMENTED_ExprCall
++NOT_YET_IMPLEMENTED_StmtAssert
++NOT_YET_IMPLEMENTED_StmtAssert
++NOT_YET_IMPLEMENTED_StmtAssert
++NOT_YET_IMPLEMENTED_StmtFor
++NOT_YET_IMPLEMENTED_StmtFor
++NOT_YET_IMPLEMENTED_StmtFor
++NOT_YET_IMPLEMENTED_StmtFor
++NOT_YET_IMPLEMENTED_StmtFor
++while NOT_YET_IMPLEMENTED_ExprBoolOp:
++    NOT_YET_IMPLEMENTED_ExprConstant
++NOT_YET_IMPLEMENTED_StmtFor
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtIf
++NOT_YET_IMPLEMENTED_StmtIf
++NOT_YET_IMPLEMENTED_StmtIf
++NOT_YET_IMPLEMENTED_StmtIf
++NOT_YET_IMPLEMENTED_StmtIf
++NOT_YET_IMPLEMENTED_StmtIf
++NOT_YET_IMPLEMENTED_StmtIf
++NOT_YET_IMPLEMENTED_StmtIf
++NOT_YET_IMPLEMENTED_StmtIf
++NOT_YET_IMPLEMENTED_StmtIf
+ (
+     aaaaaaaaaaaaaaaa
+     + aaaaaaaaaaaaaaaa
+@@ -363,8 +264,9 @@
+ bbbb >> bbbb * bbbb
+ (
+     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+-    ^ bbbb.a & aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
++    ^ NOT_YET_IMPLEMENTED_ExprAttribute
++    & aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+     ^ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ )
+-last_call()
++NOT_YET_IMPLEMENTED_ExprCall
+ # standalone comment at ENDMARKER
 ```
 
 ## Ruff Output
 
 ```py
-...
-"some_string"
-b"\\xa3"
+NOT_YET_IMPLEMENTED_ExprConstant
+NOT_YET_IMPLEMENTED_ExprConstant
+NOT_YET_IMPLEMENTED_ExprConstant
 Name
-None
-True
-False
-1
-1.0
-1j
-True or False
-True or False or None
-True and False
-True and False and None
-(Name1 and Name2) or Name3
-Name1 and Name2 or Name3
-Name1 or (Name2 and Name3)
-Name1 or Name2 and Name3
-(Name1 and Name2) or (Name3 and Name4)
-Name1 and Name2 or Name3 and Name4
-Name1 or (Name2 and Name3) or Name4
-Name1 or Name2 and Name3 or Name4
-v1 << 2
-1 >> v2
-1 % finished
-1 + v2 - v3 * 4 ^ 5**v6 / 7 // 8
-((1 + v2) - (v3 * 4)) ^ (((5**v6) / 7) // 8)
-not great
-~great
-+value
--1
-~int and not v1 ^ 123 + v2 | True
-(~int) and (not ((v1 ^ (123 + v2)) | True))
-+(really ** -(confusing ** ~(operator**-precedence)))
-flags & ~select.EPOLLIN and waiters.write_task is not None
-lambda arg: None
-lambda a=True: a
-lambda a, b, c=True: a
-lambda a, b, c=True, *, d=(1 << v2), e="str": a
-lambda a, b, c=True, *vararg, d=(v1 << 2), e="str", **kwargs: a + b
-manylambdas = lambda x=lambda y=lambda z=1: z: y(): x()
-foo = lambda port_id,
-ignore_missing,: {
-    "port1": port1_resource,
-    "port2": port2_resource,
-}[port_id]
-1 if True else 2
-str or None if True else str or bytes or None
-(str or None) if True else (str or bytes or None)
-str or None if (1 if True else 2) else str or bytes or None
-(str or None) if (1 if True else 2) else (str or bytes or None)
+NOT_YET_IMPLEMENTED_ExprConstant
+NOT_YET_IMPLEMENTED_ExprConstant
+NOT_YET_IMPLEMENTED_ExprConstant
+NOT_YET_IMPLEMENTED_ExprConstant
+NOT_YET_IMPLEMENTED_ExprConstant
+NOT_YET_IMPLEMENTED_ExprConstant
+NOT_YET_IMPLEMENTED_ExprBoolOp
+NOT_YET_IMPLEMENTED_ExprBoolOp
+NOT_YET_IMPLEMENTED_ExprBoolOp
+NOT_YET_IMPLEMENTED_ExprBoolOp
+NOT_YET_IMPLEMENTED_ExprBoolOp
+NOT_YET_IMPLEMENTED_ExprBoolOp
+NOT_YET_IMPLEMENTED_ExprBoolOp
+NOT_YET_IMPLEMENTED_ExprBoolOp
+NOT_YET_IMPLEMENTED_ExprBoolOp
+NOT_YET_IMPLEMENTED_ExprBoolOp
+NOT_YET_IMPLEMENTED_ExprBoolOp
+NOT_YET_IMPLEMENTED_ExprBoolOp
+v1 << NOT_YET_IMPLEMENTED_ExprConstant
+NOT_YET_IMPLEMENTED_ExprConstant >> v2
+NOT_YET_IMPLEMENTED_ExprConstant % finished
 (
-    (super_long_variable_name or None)
-    if (1 if super_long_test_name else 2)
-    else (str or bytes or None)
+    NOT_YET_IMPLEMENTED_ExprConstant
+    + v2
+    - v3 * NOT_YET_IMPLEMENTED_ExprConstant
+    ^ NOT_YET_IMPLEMENTED_ExprConstant
+    **v6
+    / NOT_YET_IMPLEMENTED_ExprConstant
+    // NOT_YET_IMPLEMENTED_ExprConstant
 )
-{"2.7": dead, "3.7": (long_live or die_hard)}
-{"2.7": dead, "3.7": (long_live or die_hard), **{"3.6": verygood}}
-{**a, **b, **c}
-{"2.7", "3.6", "3.7", "3.8", "3.9", ("4.0" if gilectomy else "3.10")}
-({"a": "b"}, (True or False), (+value), "string", b"bytes") or None
-()
-(1,)
-(1, 2)
-(1, 2, 3)
+(
+    ((NOT_YET_IMPLEMENTED_ExprConstant + v2) - (v3 * NOT_YET_IMPLEMENTED_ExprConstant))
+    ^ (
+        ((NOT_YET_IMPLEMENTED_ExprConstant**v6) / NOT_YET_IMPLEMENTED_ExprConstant)
+        // NOT_YET_IMPLEMENTED_ExprConstant
+    )
+)
+NOT_YET_IMPLEMENTED_ExprUnaryOp
+NOT_YET_IMPLEMENTED_ExprUnaryOp
+NOT_YET_IMPLEMENTED_ExprUnaryOp
+NOT_YET_IMPLEMENTED_ExprUnaryOp
+NOT_YET_IMPLEMENTED_ExprBoolOp
+NOT_YET_IMPLEMENTED_ExprBoolOp
+NOT_YET_IMPLEMENTED_ExprUnaryOp
+NOT_YET_IMPLEMENTED_ExprBoolOp
+NOT_YET_IMPLEMENTED_ExprLambda
+NOT_YET_IMPLEMENTED_ExprLambda
+NOT_YET_IMPLEMENTED_ExprLambda
+NOT_YET_IMPLEMENTED_ExprLambda
+NOT_YET_IMPLEMENTED_ExprLambda
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_ExprIfExp
+NOT_YET_IMPLEMENTED_ExprIfExp
+NOT_YET_IMPLEMENTED_ExprIfExp
+NOT_YET_IMPLEMENTED_ExprIfExp
+NOT_YET_IMPLEMENTED_ExprIfExp
+(NOT_YET_IMPLEMENTED_ExprIfExp)
+NOT_YET_IMPLEMENTED_ExprDict
+NOT_YET_IMPLEMENTED_ExprDict
+NOT_YET_IMPLEMENTED_ExprDict
+NOT_YET_IMPLEMENTED_ExprSet
+NOT_YET_IMPLEMENTED_ExprBoolOp
+NOT_YET_IMPLEMENTED_ExprTuple
+NOT_YET_IMPLEMENTED_ExprTuple
+NOT_YET_IMPLEMENTED_ExprTuple
+NOT_YET_IMPLEMENTED_ExprTuple
 []
-[1, 2, 3, 4, 5, 6, 7, 8, 9, (10 or A), (11 or B), (12 or C)]
 [
-    1,
-    2,
-    3,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    (NOT_YET_IMPLEMENTED_ExprBoolOp),
+    (NOT_YET_IMPLEMENTED_ExprBoolOp),
+    (NOT_YET_IMPLEMENTED_ExprBoolOp),
 ]
-[*a]
-[*range(10)]
 [
-    *a,
-    4,
-    5,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
 ]
+[NOT_YET_IMPLEMENTED_ExprStarred]
+[NOT_YET_IMPLEMENTED_ExprStarred]
 [
-    4,
-    *a,
-    5,
+    NOT_YET_IMPLEMENTED_ExprStarred,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
 ]
 [
-    this_is_a_very_long_variable_which_will_force_a_delimiter_split,
-    element,
-    another,
-    *more,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprStarred,
+    NOT_YET_IMPLEMENTED_ExprConstant,
 ]
-{i for i in (1, 2, 3)}
-{(i**2) for i in (1, 2, 3)}
-{(i**2) for i, _ in ((1, "a"), (2, "b"), (3, "c"))}
-{((i**2) + j) for i in (1, 2, 3) for j in (1, 2, 3)}
-[i for i in (1, 2, 3)]
-[(i**2) for i in (1, 2, 3)]
-[(i**2) for i, _ in ((1, "a"), (2, "b"), (3, "c"))]
-[((i**2) + j) for i in (1, 2, 3) for j in (1, 2, 3)]
-{i: 0 for i in (1, 2, 3)}
-{i: j for i, j in ((1, "a"), (2, "b"), (3, "c"))}
-{a: b * 2 for a, b in dictionary.items()}
-{a: b * -2 for a, b in dictionary.items()}
-{
-    k: v
-    for k,
-    v, in this_is_a_very_long_variable_which_will_cause_a_trailing_comma_which_breaks_the_comprehension
-}
-Python3 > Python2 > COBOL
-Life is Life
-call()
-call(arg)
-call(kwarg="hey")
-call(arg, kwarg="hey")
-call(arg, another, kwarg="hey", **kwargs)
-call(
+[
     this_is_a_very_long_variable_which_will_force_a_delimiter_split,
-    arg,
+    element,
     another,
-    kwarg="hey",
-    **kwargs,
-)  # note: no trailing comma pre-3.6
-call(*gidgets[:2])
-call(a, *gidgets[:2])
-call(**self.screen_kwargs)
-call(b, **self.screen_kwargs)
-lukasz.langa.pl
-call.me(maybe)
-(1).real
-(1.0).real
-....__class__
-list[str]
-dict[str, int]
-tuple[str, ...]
-tuple[str, int, float, dict[str, int]]
-tuple[
-    str,
-    int,
-    float,
-    dict[str, int],
+    NOT_YET_IMPLEMENTED_ExprStarred,
 ]
-very_long_variable_name_filters: t.List[
-    t.Tuple[str, t.Union[str, t.List[t.Optional[str]]]],
+NOT_YET_IMPLEMENTED_ExprSetComp
+NOT_YET_IMPLEMENTED_ExprSetComp
+NOT_YET_IMPLEMENTED_ExprSetComp
+NOT_YET_IMPLEMENTED_ExprSetComp
+NOT_YET_IMPLEMENTED_ExprListComp
+NOT_YET_IMPLEMENTED_ExprListComp
+NOT_YET_IMPLEMENTED_ExprListComp
+NOT_YET_IMPLEMENTED_ExprListComp
+NOT_YET_IMPLEMENTED_ExprDictComp
+NOT_YET_IMPLEMENTED_ExprDictComp
+NOT_YET_IMPLEMENTED_ExprDictComp
+NOT_YET_IMPLEMENTED_ExprDictComp
+NOT_YET_IMPLEMENTED_ExprDictComp
+NOT_YET_IMPLEMENTED_ExprCompare
+NOT_YET_IMPLEMENTED_ExprCompare
+NOT_YET_IMPLEMENTED_ExprCall
+NOT_YET_IMPLEMENTED_ExprCall
+NOT_YET_IMPLEMENTED_ExprCall
+NOT_YET_IMPLEMENTED_ExprCall
+NOT_YET_IMPLEMENTED_ExprCall
+NOT_YET_IMPLEMENTED_ExprCall  # note: no trailing comma pre-3.6
+NOT_YET_IMPLEMENTED_ExprCall
+NOT_YET_IMPLEMENTED_ExprCall
+NOT_YET_IMPLEMENTED_ExprCall
+NOT_YET_IMPLEMENTED_ExprCall
+NOT_YET_IMPLEMENTED_ExprAttribute
+NOT_YET_IMPLEMENTED_ExprCall
+NOT_YET_IMPLEMENTED_ExprAttribute
+NOT_YET_IMPLEMENTED_ExprAttribute
+NOT_YET_IMPLEMENTED_ExprAttribute
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_StmtAnnAssign
+NOT_YET_IMPLEMENTED_StmtAnnAssign
+NOT_YET_IMPLEMENTED_StmtAnnAssign
+NOT_YET_IMPLEMENTED_StmtAnnAssign  # type: ignore
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprIfExp
+NOT_YET_IMPLEMENTED_ExprDict
+NOT_YET_IMPLEMENTED_ExprSet
+[
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprConstant,
+    NOT_YET_IMPLEMENTED_ExprBoolOp,
+    NOT_YET_IMPLEMENTED_ExprBoolOp,
+    NOT_YET_IMPLEMENTED_ExprBoolOp,
 ]
-xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = (
-    classmethod(sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__))  # type: ignore
-)
-xxxx_xxx_xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = (
-    classmethod(sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__))  # type: ignore
-)
-xxxx_xxx_xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = (
-    classmethod(sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__))
-)
-slice[0]
-slice[0:1]
-slice[0:1:2]
-slice[:]
-slice[:-1]
-slice[1:]
-slice[::-1]
-slice[d :: d + 1]
-slice[:c, c - 1]
-numpy[:, 0:1]
-numpy[:, :-1]
-numpy[0, :]
-numpy[:, i]
-numpy[0, :2]
-numpy[:N, 0]
-numpy[:2, :4]
-numpy[2:4, 1:5]
-numpy[4:, 2:]
-numpy[:, (0, 1, 2, 5)]
-numpy[0, [0]]
-numpy[:, [i]]
-numpy[1 : c + 1, c]
-numpy[-(c + 1) :, d]
-numpy[:, l[-2]]
-numpy[:, ::-1]
-numpy[np.newaxis, :]
-(str or None) if (sys.version_info[0] > (3,)) else (str or bytes or None)
-{"2.7": dead, "3.7": long_live or die_hard}
-{"2.7", "3.6", "3.7", "3.8", "3.9", "4.0" if gilectomy else "3.10"}
-[1, 2, 3, 4, 5, 6, 7, 8, 9, 10 or A, 11 or B, 12 or C]
 (SomeName)
 SomeName
-(Good, Bad, Ugly)
-(i for i in (1, 2, 3))
-((i**2) for i in (1, 2, 3))
-((i**2) for i, _ in ((1, "a"), (2, "b"), (3, "c")))
-(((i**2) + j) for i in (1, 2, 3) for j in (1, 2, 3))
-(*starred,)
-{
-    "id": "1",
-    "type": "type",
-    "started_at": now(),
-    "ended_at": now() + timedelta(days=10),
-    "priority": 1,
-    "import_session_id": 1,
-    **kwargs,
-}
-a = (1,)
-b = (1,)
-c = 1
-d = (1,) + a + (2,)
-e = (1,).count(1)
-f = 1, *range(10)
-g = 1, *"ten"
-what_is_up_with_those_new_coord_names = (
-    (coord_names
-    + set(vars_to_create))
-    + set(vars_to_remove)
-)
-what_is_up_with_those_new_coord_names = (
-    (coord_names
-    | set(vars_to_create))
-    - set(vars_to_remove)
-)
-result = session.query(models.Customer.id).filter(
-    models.Customer.account_id == account_id,
-    models.Customer.email == email_address,
-).order_by(models.Customer.id.asc()).all()
-result = session.query(models.Customer.id).filter(
-    models.Customer.account_id == account_id,
-    models.Customer.email == email_address,
-).order_by(
-    models.Customer.id.asc(),
-).all()
-Ø = set()
-authors.łukasz.say_thanks()
-mapping = {
-    A: 0.25 * (10.0 / 12),
-    B: 0.1 * (10.0 / 12),
-    C: 0.1 * (10.0 / 12),
-    D: 0.1 * (10.0 / 12),
-}
+NOT_YET_IMPLEMENTED_ExprTuple
+NOT_YET_IMPLEMENTED_ExprGeneratorExp
+NOT_YET_IMPLEMENTED_ExprGeneratorExp
+NOT_YET_IMPLEMENTED_ExprGeneratorExp
+NOT_YET_IMPLEMENTED_ExprGeneratorExp
+NOT_YET_IMPLEMENTED_ExprTuple
+NOT_YET_IMPLEMENTED_ExprDict
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_ExprCall
+NOT_YET_IMPLEMENTED_StmtAssign
 
 
-def gen():
-    yield from outside_of_generator
-    a = yield
-    b = yield
-    c = yield
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-async def f():
-    await some.complicated[0].call(with_args=(True or (1 is not 1)))
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
-print(*[] or [1])
-print(**{1: 3} if False else {x: x for x in range(3)})
-print(*lambda x: x)
-assert not Test, "Short message"
-assert this is ComplexTest and not requirements.fit_in_a_single_line(force=False), (
-    "Short message"
-)
-assert parens is TooMany
-for (x,) in (1,), (2,), (3,):
-    ...
-for y in ():
-    ...
-for z in (i for i in (1, 2, 3)):
-    ...
-for i in call():
-    ...
-for j in 1 + (2 + 3):
-    ...
-while this and that:
-    ...
-for (
-    addr_family,
-    addr_type,
-    addr_proto,
-    addr_canonname,
-    addr_sockaddr,
-) in socket.getaddrinfo("google.com", "http"):
-    pass
-a = (
-    aaaa.bbbb.cccc.dddd.eeee.ffff.gggg.hhhh.iiii.jjjj.kkkk.llll.mmmm.nnnn.oooo.pppp
-    in qqqq.rrrr.ssss.tttt.uuuu.vvvv.xxxx.yyyy.zzzz
-)
-a = (
-    aaaa.bbbb.cccc.dddd.eeee.ffff.gggg.hhhh.iiii.jjjj.kkkk.llll.mmmm.nnnn.oooo.pppp
-    not in qqqq.rrrr.ssss.tttt.uuuu.vvvv.xxxx.yyyy.zzzz
-)
-a = (
-    aaaa.bbbb.cccc.dddd.eeee.ffff.gggg.hhhh.iiii.jjjj.kkkk.llll.mmmm.nnnn.oooo.pppp
-    is qqqq.rrrr.ssss.tttt.uuuu.vvvv.xxxx.yyyy.zzzz
-)
-a = (
-    aaaa.bbbb.cccc.dddd.eeee.ffff.gggg.hhhh.iiii.jjjj.kkkk.llll.mmmm.nnnn.oooo.pppp
-    is not qqqq.rrrr.ssss.tttt.uuuu.vvvv.xxxx.yyyy.zzzz
-)
-if (
-    threading.current_thread() != threading.main_thread()
-    and threading.current_thread() != threading.main_thread()
-    or signal.getsignal(signal.SIGINT) != signal.default_int_handler
-):
-    return True
-if (
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-):
-    return True
-if (
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    & aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-):
-    return True
-if (
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-):
-    return True
-if (
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    - aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-):
-    return True
-if (
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    * aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-):
-    return True
-if (
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    / aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-):
-    return True
-if (
-    ~aaaa.a
-    + aaaa.b
-    - aaaa.c * aaaa.d / aaaa.e
-    | aaaa.f & aaaa.g % aaaa.h ^ aaaa.i << aaaa.k >> aaaa.l**aaaa.m // aaaa.n
-):
-    return True
-if (
-    ~aaaaaaaa.a
-    + aaaaaaaa.b
-    - aaaaaaaa.c @ aaaaaaaa.d / aaaaaaaa.e
-    | aaaaaaaa.f
-    & aaaaaaaa.g % aaaaaaaa.h
-    ^ aaaaaaaa.i << aaaaaaaa.k >> aaaaaaaa.l**aaaaaaaa.m // aaaaaaaa.n
-):
-    return True
-if (
-    ~aaaaaaaaaaaaaaaa.a
-    + aaaaaaaaaaaaaaaa.b
-    - aaaaaaaaaaaaaaaa.c * aaaaaaaaaaaaaaaa.d @ aaaaaaaaaaaaaaaa.e
-    | aaaaaaaaaaaaaaaa.f
-    & aaaaaaaaaaaaaaaa.g % aaaaaaaaaaaaaaaa.h
-    ^ aaaaaaaaaaaaaaaa.i
-    << aaaaaaaaaaaaaaaa.k
-    >> aaaaaaaaaaaaaaaa.l**aaaaaaaaaaaaaaaa.m // aaaaaaaaaaaaaaaa.n
-):
-    return True
+NOT_YET_IMPLEMENTED_ExprCall
+NOT_YET_IMPLEMENTED_ExprCall
+NOT_YET_IMPLEMENTED_ExprCall
+NOT_YET_IMPLEMENTED_StmtAssert
+NOT_YET_IMPLEMENTED_StmtAssert
+NOT_YET_IMPLEMENTED_StmtAssert
+NOT_YET_IMPLEMENTED_StmtFor
+NOT_YET_IMPLEMENTED_StmtFor
+NOT_YET_IMPLEMENTED_StmtFor
+NOT_YET_IMPLEMENTED_StmtFor
+NOT_YET_IMPLEMENTED_StmtFor
+while NOT_YET_IMPLEMENTED_ExprBoolOp:
+    NOT_YET_IMPLEMENTED_ExprConstant
+NOT_YET_IMPLEMENTED_StmtFor
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtIf
+NOT_YET_IMPLEMENTED_StmtIf
+NOT_YET_IMPLEMENTED_StmtIf
+NOT_YET_IMPLEMENTED_StmtIf
+NOT_YET_IMPLEMENTED_StmtIf
+NOT_YET_IMPLEMENTED_StmtIf
+NOT_YET_IMPLEMENTED_StmtIf
+NOT_YET_IMPLEMENTED_StmtIf
+NOT_YET_IMPLEMENTED_StmtIf
+NOT_YET_IMPLEMENTED_StmtIf
 (
     aaaaaaaaaaaaaaaa
     + aaaaaaaaaaaaaaaa
@@ -784,10 +1129,11 @@ aaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaa
 bbbb >> bbbb * bbbb
 (
     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    ^ bbbb.a & aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+    ^ NOT_YET_IMPLEMENTED_ExprAttribute
+    & aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     ^ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 )
-last_call()
+NOT_YET_IMPLEMENTED_ExprCall
 # standalone comment at ENDMARKER
 ```
 
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff2_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff2_py.snap
index dff3ec9ad894d..1aa29e0f8a412 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff2_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff2_py.snap
@@ -53,57 +53,56 @@ def test_calculate_fades():
 ```diff
 --- Black
 +++ Ruff
-@@ -3,38 +3,42 @@
- TmSt = 1
- TmEx = 2
+@@ -1,40 +1,26 @@
+-import pytest
++NOT_YET_IMPLEMENTED_StmtImport
  
+-TmSt = 1
+-TmEx = 2
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
 +
+ 
  # fmt: off
  
  # Test data:
  #   Position, Volume, State, TmSt/TmEx/None, [call, [arg1...]]
  
 -@pytest.mark.parametrize('test', [
--
++NOT_YET_IMPLEMENTED_StmtFunctionDef
++
++
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
 -    # Test don't manage the volume
-+@pytest.mark.parametrize(
-+    "test",
-     [
+-    [
 -        ('stuff', 'in')
-+        # Test don't manage the volume
-+        [("stuff", "in")],
-     ],
+-    ],
 -])
-+)
- def test_fader(test):
-     pass
+-def test_fader(test):
+-    pass
  
-+
- def check_fader(test):
-+    pass
+-def check_fader(test):
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
 -    pass
  
- def verify_fader(test):
+-def verify_fader(test):
 -  # misaligned comment
-+    # misaligned comment
-     pass
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
-+
- def verify_fader(test):
-     """Hey, ho."""
-     assert test.passed()
+-def verify_fader(test):
+-    """Hey, ho."""
+-    assert test.passed()
  
-+
- def test_calculate_fades():
-     calcs = [
+-def test_calculate_fades():
+-    calcs = [
 -        # one is zero/none
 -        (0, 4, 0, 0, 10,        0, 0, 6, 10),
 -        (None, 4, 0, 0, 10,     0, 0, 6, 10),
-+        (# one is zero/none
-+        0, 4, 0, 0, 10, 0, 0, 6, 10),
-+        (None, 4, 0, 0, 10, 0, 0, 6, 10),
-     ]
+-    ]
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  # fmt: on
 ```
@@ -111,10 +110,10 @@ def test_calculate_fades():
 ## Ruff Output
 
 ```py
-import pytest
+NOT_YET_IMPLEMENTED_StmtImport
 
-TmSt = 1
-TmEx = 2
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
 
 
 # fmt: off
@@ -122,37 +121,19 @@ TmEx = 2
 # Test data:
 #   Position, Volume, State, TmSt/TmEx/None, [call, [arg1...]]
 
-@pytest.mark.parametrize(
-    "test",
-    [
-        # Test don't manage the volume
-        [("stuff", "in")],
-    ],
-)
-def test_fader(test):
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def check_fader(test):
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def verify_fader(test):
-    # misaligned comment
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def verify_fader(test):
-    """Hey, ho."""
-    assert test.passed()
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def test_calculate_fades():
-    calcs = [
-        (# one is zero/none
-        0, 4, 0, 0, 10, 0, 0, 6, 10),
-        (None, 4, 0, 0, 10, 0, 0, 6, 10),
-    ]
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 # fmt: on
 ```
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff3_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff3_py.snap
index 44a115b964146..b732da756071e 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff3_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff3_py.snap
@@ -30,53 +30,39 @@ x = [
 ```diff
 --- Black
 +++ Ruff
-@@ -1,14 +1,18 @@
+@@ -1,15 +1,9 @@
  # fmt: off
- x = [
+-x = [
 -    1, 2,
 -    3, 4,
-+    1,
-+    2,
-+    3,
-+    4,
- ]
+-]
++NOT_YET_IMPLEMENTED_StmtAssign
  # fmt: on
  
  # fmt: off
- x = [
+-x = [
 -    1, 2,
 -    3, 4,
-+    1,
-+    2,
-+    3,
-+    4,
- ]
+-]
++NOT_YET_IMPLEMENTED_StmtAssign
  # fmt: on
  
+-x = [1, 2, 3, 4]
++NOT_YET_IMPLEMENTED_StmtAssign
 ```
 
 ## Ruff Output
 
 ```py
 # fmt: off
-x = [
-    1,
-    2,
-    3,
-    4,
-]
+NOT_YET_IMPLEMENTED_StmtAssign
 # fmt: on
 
 # fmt: off
-x = [
-    1,
-    2,
-    3,
-    4,
-]
+NOT_YET_IMPLEMENTED_StmtAssign
 # fmt: on
 
-x = [1, 2, 3, 4]
+NOT_YET_IMPLEMENTED_StmtAssign
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff4_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff4_py.snap
index 68ffcf8c4e5be..6deb07e8166d9 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff4_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff4_py.snap
@@ -26,52 +26,39 @@ def f(): pass
 ```diff
 --- Black
 +++ Ruff
-@@ -1,8 +1,12 @@
+@@ -1,20 +1,5 @@
  # fmt: off
 -@test([
 -    1, 2,
 -    3, 4,
 -])
-+@test(
-+    [
-+        1,
-+        2,
-+        3,
-+        4,
-+    ]
-+)
- # fmt: on
- def f():
-     pass
+-# fmt: on
+-def f():
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-@test(
+-    [
+-        1,
+-        2,
+-        3,
+-        4,
+-    ]
+-)
+-def f():
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Ruff Output
 
 ```py
 # fmt: off
-@test(
-    [
-        1,
-        2,
-        3,
-        4,
-    ]
-)
-# fmt: on
-def f():
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-@test(
-    [
-        1,
-        2,
-        3,
-        4,
-    ]
-)
-def f():
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff5_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff5_py.snap
index 00bdc220b3c42..b01fb338f6189 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff5_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff5_py.snap
@@ -97,172 +97,136 @@ elif   unformatted:
 ```diff
 --- Black
 +++ Ruff
-@@ -3,10 +3,8 @@
-     entry_points={
-         # fmt: off
-         "console_scripts": [
+@@ -1,87 +1,29 @@
+ # Regression test for https://github.com/psf/black/issues/3129.
+-setup(
+-    entry_points={
+-        # fmt: off
+-        "console_scripts": [
 -            "foo-bar"
 -            "=foo.bar.:main",
 -        # fmt: on
 -            ]  # Includes an formatted indentation.
-+            "foo-bar" "=foo.bar.:main",
-+        ],  # Includes an formatted indentation.
-     },
- )
+-    },
+-)
++NOT_YET_IMPLEMENTED_ExprCall
+ 
+ 
+ # Regression test for https://github.com/psf/black/issues/2015.
+-run(
+-    # fmt: off
+-    [
+-        "ls",
+-        "-la",
+-    ]
+-    # fmt: on
+-    + path,
+-    check=True,
+-)
++NOT_YET_IMPLEMENTED_ExprCall
+ 
  
-@@ -27,9 +25,8 @@
  # Regression test for https://github.com/psf/black/issues/3026.
- def test_func():
-     # yapf: disable
+-def test_func():
+-    # yapf: disable
 -    if  unformatted(  args  ):
-+    if unformatted(args):
-         return True
+-        return True
 -    # yapf: enable
-     elif b:
-         return True
+-    elif b:
+-        return True
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
-@@ -39,10 +36,10 @@
+-    return False
+ 
+-
  # Regression test for https://github.com/psf/black/issues/2567.
- if True:
-     # fmt: off
+-if True:
+-    # fmt: off
 -    for _ in range( 1 ):
 -    # fmt: on
 -        print ( "This won't be formatted" )
 -    print ( "This won't be formatted either" )
-+    for _ in range(1):
-+        # fmt: on
-+        print("This won't be formatted")
-+    print("This won't be formatted either")
- else:
-     print("This will be formatted")
+-else:
+-    print("This will be formatted")
++NOT_YET_IMPLEMENTED_StmtIf
  
-@@ -52,14 +49,11 @@
-     async def call(param):
-         if param:
-             # fmt: off
+ 
+ # Regression test for https://github.com/psf/black/issues/3184.
+-class A:
+-    async def call(param):
+-        if param:
+-            # fmt: off
 -            if param[0:4] in (
 -                "ABCD", "EFGH"
 -            )  :
-+            if param[0:4] in ("ABCD", "EFGH"):
-                 # fmt: on
+-                # fmt: on
 -                print ( "This won't be formatted" )
 -
-+                print("This won't be formatted")
-             elif param[0:4] in ("ZZZZ",):
+-            elif param[0:4] in ("ZZZZ",):
 -                print ( "This won't be formatted either" )
-+                print("This won't be formatted either")
+-
+-        print("This will be formatted")
++NOT_YET_IMPLEMENTED_StmtClassDef
  
-         print("This will be formatted")
  
-@@ -68,20 +62,19 @@
- class Named(t.Protocol):
-     # fmt: off
-     @property
+ # Regression test for https://github.com/psf/black/issues/2985.
+-class Named(t.Protocol):
+-    # fmt: off
+-    @property
 -    def  this_wont_be_formatted ( self ) -> str: ...
-+    def this_wont_be_formatted(self) -> str:
-+        ...
++NOT_YET_IMPLEMENTED_StmtClassDef
  
  
- class Factory(t.Protocol):
-     def this_will_be_formatted(self, **kwargs) -> Named:
-         ...
--
-     # fmt: on
+-class Factory(t.Protocol):
+-    def this_will_be_formatted(self, **kwargs) -> Named:
+-        ...
++NOT_YET_IMPLEMENTED_StmtClassDef
  
+-    # fmt: on
+-
  
  # Regression test for https://github.com/psf/black/issues/3436.
- if x:
-     return x
+-if x:
+-    return x
 -# fmt: off
 -elif   unformatted:
-+elif unformatted:
-     # fmt: on
-     will_be_formatted()
+-    # fmt: on
+-    will_be_formatted()
++NOT_YET_IMPLEMENTED_StmtIf
 ```
 
 ## Ruff Output
 
 ```py
 # Regression test for https://github.com/psf/black/issues/3129.
-setup(
-    entry_points={
-        # fmt: off
-        "console_scripts": [
-            "foo-bar" "=foo.bar.:main",
-        ],  # Includes an formatted indentation.
-    },
-)
+NOT_YET_IMPLEMENTED_ExprCall
 
 
 # Regression test for https://github.com/psf/black/issues/2015.
-run(
-    # fmt: off
-    [
-        "ls",
-        "-la",
-    ]
-    # fmt: on
-    + path,
-    check=True,
-)
+NOT_YET_IMPLEMENTED_ExprCall
 
 
 # Regression test for https://github.com/psf/black/issues/3026.
-def test_func():
-    # yapf: disable
-    if unformatted(args):
-        return True
-    elif b:
-        return True
-
-    return False
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # Regression test for https://github.com/psf/black/issues/2567.
-if True:
-    # fmt: off
-    for _ in range(1):
-        # fmt: on
-        print("This won't be formatted")
-    print("This won't be formatted either")
-else:
-    print("This will be formatted")
+NOT_YET_IMPLEMENTED_StmtIf
 
 
 # Regression test for https://github.com/psf/black/issues/3184.
-class A:
-    async def call(param):
-        if param:
-            # fmt: off
-            if param[0:4] in ("ABCD", "EFGH"):
-                # fmt: on
-                print("This won't be formatted")
-            elif param[0:4] in ("ZZZZ",):
-                print("This won't be formatted either")
-
-        print("This will be formatted")
+NOT_YET_IMPLEMENTED_StmtClassDef
 
 
 # Regression test for https://github.com/psf/black/issues/2985.
-class Named(t.Protocol):
-    # fmt: off
-    @property
-    def this_wont_be_formatted(self) -> str:
-        ...
+NOT_YET_IMPLEMENTED_StmtClassDef
 
 
-class Factory(t.Protocol):
-    def this_will_be_formatted(self, **kwargs) -> Named:
-        ...
-    # fmt: on
+NOT_YET_IMPLEMENTED_StmtClassDef
 
 
 # Regression test for https://github.com/psf/black/issues/3436.
-if x:
-    return x
-elif unformatted:
-    # fmt: on
-    will_be_formatted()
+NOT_YET_IMPLEMENTED_StmtIf
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff_py.snap
index ac5e1e5c4d034..6b67c58b5d68f 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff_py.snap
@@ -199,28 +199,35 @@ d={'a':1,
 ```diff
 --- Black
 +++ Ruff
-@@ -5,39 +5,53 @@
- from third_party import X, Y, Z
+@@ -1,224 +1,73 @@
+ #!/usr/bin/env python3
+-import asyncio
+-import sys
++NOT_YET_IMPLEMENTED_StmtImport
++NOT_YET_IMPLEMENTED_StmtImport
  
- from library import some_connection, some_decorator
-+# fmt: off
-+from third_party import X, Y, Z
+-from third_party import X, Y, Z
++NOT_YET_IMPLEMENTED_StmtImportFrom
  
--# fmt: off
+-from library import some_connection, some_decorator
+-
++NOT_YET_IMPLEMENTED_StmtImportFrom
+ # fmt: off
 -from third_party import (X,
 -                         Y, Z)
++NOT_YET_IMPLEMENTED_StmtImportFrom
  # fmt: on
 -f"trigger 3.6 mode"
-+f'trigger 3.6 mode'
++NOT_YET_IMPLEMENTED_ExprJoinedStr
 +
 +
  # Comment 1
  
  # Comment 2
--
  
+-
  # fmt: off
- def func_no_args():
+-def func_no_args():
 -  a; b; c
 -  if True: raise RuntimeError
 -  if False: ...
@@ -229,200 +236,242 @@ d={'a':1,
 -    continue
 -  exec('new-style exec', {}, {})
 -  return None
-+    a
-+    b
-+    c
-+    if True:
-+        raise RuntimeError
-+    if False:
-+        ...
-+    for i in range(10):
-+        print(i)
-+        continue
-+    exec("new-style exec", {}, {})
-+    return None
-+
-+
- async def coroutine(arg, exec=False):
+-async def coroutine(arg, exec=False):
 - 'Single-line docstring. Multiline is harder to reformat.'
 - async with some_connection() as conn:
 -     await conn.do_what_i_mean('SELECT bobby, tables FROM xkcd', timeout=2)
 - await asyncio.sleep(1)
-+    "Single-line docstring. Multiline is harder to reformat."
-+    async with some_connection() as conn:
-+        await conn.do_what_i_mean("SELECT bobby, tables FROM xkcd", timeout=2)
-+    await asyncio.sleep(1)
-+
-+
- @asyncio.coroutine
+-@asyncio.coroutine
 -@some_decorator(
 -with_args=True,
 -many_args=[1,2,3]
 -)
 -def function_signature_stress_test(number:int,no_annotation=None,text:str='default',* ,debug:bool=False,**kwargs) -> str:
 - return text[number:-1]
-+@some_decorator(with_args=True, many_args=[1, 2, 3])
-+def function_signature_stress_test(
-+    number: int,
-+    no_annotation=None,
-+    text: str = "default",
-+    *,
-+    debug: bool = False,
-+    **kwargs,
-+) -> str:
-+    return text[number:-1]
-+
-+
- # fmt: on
- def spaces(a=1, b=(), c=[], d={}, e=True, f=-1, g=1 if False else 2, h="", i=r""):
-     offset = attr.ib(default=attr.Factory(lambda: _r.uniform(1, 2)))
-@@ -64,55 +78,55 @@
+-# fmt: on
+-def spaces(a=1, b=(), c=[], d={}, e=True, f=-1, g=1 if False else 2, h="", i=r""):
+-    offset = attr.ib(default=attr.Factory(lambda: _r.uniform(1, 2)))
+-    assert task._cancel_stack[: len(old_stack)] == old_stack
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- something = {
-     # fmt: off
+ 
+-def spaces_types(
+-    a: int = 1,
+-    b: tuple = (),
+-    c: list = [],
+-    d: dict = {},
+-    e: bool = True,
+-    f: int = -1,
+-    g: int = 1 if False else 2,
+-    h: str = "",
+-    i: str = r"",
+-):
+-    ...
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
+ 
+ 
+-def spaces2(result=_core.Value(None)):
+-    ...
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-something = {
+-    # fmt: off
 -    key: 'value',
-+    key: "value",
- }
+-}
++# fmt: on
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def subscriptlist():
-     atom[
-         # fmt: off
+-def subscriptlist():
+-    atom[
+-        # fmt: off
 -        'some big and',
 -        'complex subscript',
-+        "some big and",
-+        "complex subscript",
-         # fmt: on
+-        # fmt: on
 -        goes + here,
-+        goes
-+        + here,
-         andhere,
-     ]
+-        andhere,
+-    ]
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def import_as_names():
-     # fmt: off
+-def import_as_names():
+-    # fmt: off
 -    from hello import a,        b
 -    'unformatted'
-+    from hello import a, b
-+
-+    "unformatted"
-     # fmt: on
+-    # fmt: on
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def testlist_star_expr():
-     # fmt: off
+-def testlist_star_expr():
+-    # fmt: off
 -    a , b = *hello
 -    'unformatted'
-+    a, b = *hello
-+    "unformatted"
-     # fmt: on
+-    # fmt: on
++NOT_YET_IMPLEMENTED_StmtAssign
  
  
- def yield_expr():
-     # fmt: off
-     yield hello
+-def yield_expr():
+-    # fmt: off
+-    yield hello
 -    'unformatted'
-+    "unformatted"
-     # fmt: on
-     "formatted"
-     # fmt: off
+-    # fmt: on
+-    "formatted"
+-    # fmt: off
 -    ( yield hello )
 -    'unformatted'
-+    (yield hello)
-+    "unformatted"
-     # fmt: on
+-    # fmt: on
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def example(session):
-     # fmt: off
+-def example(session):
+-    # fmt: off
 -    result = session\
 -        .query(models.Customer.id)\
 -        .filter(models.Customer.account_id == account_id,
 -                models.Customer.email == email_address)\
 -        .order_by(models.Customer.id.asc())\
 -        .all()
-+    result = session.query(models.Customer.id).filter(
-+        models.Customer.account_id == account_id,
-+        models.Customer.email == email_address,
-+    ).order_by(models.Customer.id.asc()).all()
-     # fmt: on
+-    # fmt: on
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
-@@ -123,7 +137,7 @@
-     """
-     # fmt: off
+-def off_and_on_without_data():
+-    """All comments here are technically on the same prefix.
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+-    The comments between will be formatted. This is a known limitation.
+-    """
+-    # fmt: off
  
 -    # hey, that won't work
-+    #hey, that won't work
- 
-     # fmt: on
-     pass
-@@ -133,10 +147,10 @@
-     """Another known limitation."""
-     # fmt: on
-     # fmt: off
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+-    # fmt: on
+-    pass
+ 
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+-def on_and_off_broken():
+-    """Another known limitation."""
+-    # fmt: on
+-    # fmt: off
 -    this=should.not_be.formatted()
 -    and_=indeed . it  is  not  formatted
 -    because . the . handling . inside . generate_ignored_nodes()
 -    now . considers . multiple . fmt . directives . within . one . prefix
-+    this = should.not_be.formatted()
-+    and_ = indeed.it is not formatted
-+    because.the.handling.inside.generate_ignored_nodes()
-+    now.considers.multiple.fmt.directives.within.one.prefix
-     # fmt: on
-     # fmt: off
-     # ...but comments still get reformatted even though they should not be
-@@ -154,9 +168,7 @@
-             )
-         )
-         # fmt: off
+-    # fmt: on
+-    # fmt: off
+-    # ...but comments still get reformatted even though they should not be
+-    # fmt: on
+ 
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+-def long_lines():
+-    if True:
+-        typedargslist.extend(
+-            gen_annotated_params(
+-                ast_args.kwonlyargs,
+-                ast_args.kw_defaults,
+-                parameters,
+-                implicit_default=True,
+-            )
+-        )
+-        # fmt: off
 -        a = (
 -            unnecessary_bracket()
 -        )
-+        a = unnecessary_bracket()
-         # fmt: on
-     _type_comment_re = re.compile(
-         r"""
-@@ -179,7 +191,8 @@
-         $
-         """,
-         # fmt: off
+-        # fmt: on
+-    _type_comment_re = re.compile(
+-        r"""
+-        ^
+-        [\t ]*
+-        \#[ ]type:[ ]*
+-        (?P<type>
+-            [^#\t\n]+?
+-        )
+-        (?<!ignore)     # note: this will force the non-greedy + in <type> to match
+-                        # a trailing space which is why we need the silliness below
+-        (?<!ignore[ ]{1})(?<!ignore[ ]{2})(?<!ignore[ ]{3})(?<!ignore[ ]{4})
+-        (?<!ignore[ ]{5})(?<!ignore[ ]{6})(?<!ignore[ ]{7})(?<!ignore[ ]{8})
+-        (?<!ignore[ ]{9})(?<!ignore[ ]{10})
+-        [\t ]*
+-        (?P<nl>
+-            (?:\#[^\n]*)?
+-            \n?
+-        )
+-        $
+-        """,
+-        # fmt: off
 -        re.MULTILINE|re.VERBOSE
-+        re.MULTILINE
-+        | re.VERBOSE,
-         # fmt: on
-     )
- 
-@@ -217,8 +230,7 @@
-     xxxxxxxxxx_xxxxxxxxxxx_xxxxxxx_xxxxxxxxx=5,
- )
+-        # fmt: on
+-    )
+ 
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+-def single_literal_yapf_disable():
+-    """Black does not support this."""
+-    BAZ = {(1, 2, 3, 4), (5, 6, 7, 8), (9, 10, 11, 12)}  # yapf: disable
+ 
++NOT_YET_IMPLEMENTED_StmtFunctionDef
++
++
++NOT_YET_IMPLEMENTED_StmtFunctionDef
++
+ 
+-cfg.rule(
+-    "Default",
+-    "address",
+-    xxxx_xxxx=["xxx-xxxxxx-xxxxxxxxxx"],
+-    xxxxxx="xx_xxxxx",
+-    xxxxxxx="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+-    xxxxxxxxx_xxxx=True,
+-    xxxxxxxx_xxxxxxxxxx=False,
+-    xxxxxx_xxxxxx=2,
+-    xxxxxx_xxxxx_xxxxxxxx=70,
+-    xxxxxx_xxxxxx_xxxxx=True,
+-    # fmt: off
+-    xxxxxxx_xxxxxxxxxxxx={
+-        "xxxxxxxx": {
+-            "xxxxxx": False,
+-            "xxxxxxx": False,
+-            "xxxx_xxxxxx": "xxxxx",
+-        },
+-        "xxxxxxxx-xxxxx": {
+-            "xxxxxx": False,
+-            "xxxxxxx": True,
+-            "xxxx_xxxxxx": "xxxxxx",
+-        },
+-    },
+-    # fmt: on
+-    xxxxxxxxxx_xxxxxxxxxxx_xxxxxxx_xxxxxxxxx=5,
+-)
++NOT_YET_IMPLEMENTED_ExprCall
  # fmt: off
 -yield  'hello'
-+yield "hello"
++NOT_YET_IMPLEMENTED_ExprYield
  # No formatting to the end of the file
 -l=[1,2,3]
 -d={'a':1,
 -   'b':2}
-+l = [1, 2, 3]
-+d = {"a": 1, "b": 2}
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
 ```
 
 ## Ruff Output
 
 ```py
 #!/usr/bin/env python3
-import asyncio
-import sys
+NOT_YET_IMPLEMENTED_StmtImport
+NOT_YET_IMPLEMENTED_StmtImport
 
-from third_party import X, Y, Z
+NOT_YET_IMPLEMENTED_StmtImportFrom
 
-from library import some_connection, some_decorator
+NOT_YET_IMPLEMENTED_StmtImportFrom
 # fmt: off
-from third_party import X, Y, Z
-
+NOT_YET_IMPLEMENTED_StmtImportFrom
 # fmt: on
-f'trigger 3.6 mode'
+NOT_YET_IMPLEMENTED_ExprJoinedStr
 
 
 # Comment 1
@@ -430,223 +479,61 @@ f'trigger 3.6 mode'
 # Comment 2
 
 # fmt: off
-def func_no_args():
-    a
-    b
-    c
-    if True:
-        raise RuntimeError
-    if False:
-        ...
-    for i in range(10):
-        print(i)
-        continue
-    exec("new-style exec", {}, {})
-    return None
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-async def coroutine(arg, exec=False):
-    "Single-line docstring. Multiline is harder to reformat."
-    async with some_connection() as conn:
-        await conn.do_what_i_mean("SELECT bobby, tables FROM xkcd", timeout=2)
-    await asyncio.sleep(1)
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
-@asyncio.coroutine
-@some_decorator(with_args=True, many_args=[1, 2, 3])
-def function_signature_stress_test(
-    number: int,
-    no_annotation=None,
-    text: str = "default",
-    *,
-    debug: bool = False,
-    **kwargs,
-) -> str:
-    return text[number:-1]
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # fmt: on
-def spaces(a=1, b=(), c=[], d={}, e=True, f=-1, g=1 if False else 2, h="", i=r""):
-    offset = attr.ib(default=attr.Factory(lambda: _r.uniform(1, 2)))
-    assert task._cancel_stack[: len(old_stack)] == old_stack
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def spaces_types(
-    a: int = 1,
-    b: tuple = (),
-    c: list = [],
-    d: dict = {},
-    e: bool = True,
-    f: int = -1,
-    g: int = 1 if False else 2,
-    h: str = "",
-    i: str = r"",
-):
-    ...
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def spaces2(result=_core.Value(None)):
-    ...
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-something = {
-    # fmt: off
-    key: "value",
-}
+NOT_YET_IMPLEMENTED_StmtAssign
 
 
-def subscriptlist():
-    atom[
-        # fmt: off
-        "some big and",
-        "complex subscript",
-        # fmt: on
-        goes
-        + here,
-        andhere,
-    ]
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def import_as_names():
-    # fmt: off
-    from hello import a, b
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-    "unformatted"
-    # fmt: on
 
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-def testlist_star_expr():
-    # fmt: off
-    a, b = *hello
-    "unformatted"
-    # fmt: on
 
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-def yield_expr():
-    # fmt: off
-    yield hello
-    "unformatted"
-    # fmt: on
-    "formatted"
-    # fmt: off
-    (yield hello)
-    "unformatted"
-    # fmt: on
 
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-def example(session):
-    # fmt: off
-    result = session.query(models.Customer.id).filter(
-        models.Customer.account_id == account_id,
-        models.Customer.email == email_address,
-    ).order_by(models.Customer.id.asc()).all()
-    # fmt: on
 
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-def off_and_on_without_data():
-    """All comments here are technically on the same prefix.
 
-    The comments between will be formatted. This is a known limitation.
-    """
-    # fmt: off
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-    #hey, that won't work
 
-    # fmt: on
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def on_and_off_broken():
-    """Another known limitation."""
-    # fmt: on
-    # fmt: off
-    this = should.not_be.formatted()
-    and_ = indeed.it is not formatted
-    because.the.handling.inside.generate_ignored_nodes()
-    now.considers.multiple.fmt.directives.within.one.prefix
-    # fmt: on
-    # fmt: off
-    # ...but comments still get reformatted even though they should not be
-    # fmt: on
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def long_lines():
-    if True:
-        typedargslist.extend(
-            gen_annotated_params(
-                ast_args.kwonlyargs,
-                ast_args.kw_defaults,
-                parameters,
-                implicit_default=True,
-            )
-        )
-        # fmt: off
-        a = unnecessary_bracket()
-        # fmt: on
-    _type_comment_re = re.compile(
-        r"""
-        ^
-        [\t ]*
-        \#[ ]type:[ ]*
-        (?P<type>
-            [^#\t\n]+?
-        )
-        (?<!ignore)     # note: this will force the non-greedy + in <type> to match
-                        # a trailing space which is why we need the silliness below
-        (?<!ignore[ ]{1})(?<!ignore[ ]{2})(?<!ignore[ ]{3})(?<!ignore[ ]{4})
-        (?<!ignore[ ]{5})(?<!ignore[ ]{6})(?<!ignore[ ]{7})(?<!ignore[ ]{8})
-        (?<!ignore[ ]{9})(?<!ignore[ ]{10})
-        [\t ]*
-        (?P<nl>
-            (?:\#[^\n]*)?
-            \n?
-        )
-        $
-        """,
-        # fmt: off
-        re.MULTILINE
-        | re.VERBOSE,
-        # fmt: on
-    )
-
-
-def single_literal_yapf_disable():
-    """Black does not support this."""
-    BAZ = {(1, 2, 3, 4), (5, 6, 7, 8), (9, 10, 11, 12)}  # yapf: disable
-
-
-cfg.rule(
-    "Default",
-    "address",
-    xxxx_xxxx=["xxx-xxxxxx-xxxxxxxxxx"],
-    xxxxxx="xx_xxxxx",
-    xxxxxxx="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
-    xxxxxxxxx_xxxx=True,
-    xxxxxxxx_xxxxxxxxxx=False,
-    xxxxxx_xxxxxx=2,
-    xxxxxx_xxxxx_xxxxxxxx=70,
-    xxxxxx_xxxxxx_xxxxx=True,
-    # fmt: off
-    xxxxxxx_xxxxxxxxxxxx={
-        "xxxxxxxx": {
-            "xxxxxx": False,
-            "xxxxxxx": False,
-            "xxxx_xxxxxx": "xxxxx",
-        },
-        "xxxxxxxx-xxxxx": {
-            "xxxxxx": False,
-            "xxxxxxx": True,
-            "xxxx_xxxxxx": "xxxxxx",
-        },
-    },
-    # fmt: on
-    xxxxxxxxxx_xxxxxxxxxxx_xxxxxxx_xxxxxxxxx=5,
-)
+NOT_YET_IMPLEMENTED_ExprCall
 # fmt: off
-yield "hello"
+NOT_YET_IMPLEMENTED_ExprYield
 # No formatting to the end of the file
-l = [1, 2, 3]
-d = {"a": 1, "b": 2}
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip2_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip2_py.snap
index 2bd8d5bf4fd67..91d954035a359 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip2_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip2_py.snap
@@ -16,39 +16,29 @@ l3 = ["I have", "trailing comma", "so I should be braked",]
 ```diff
 --- Black
 +++ Ruff
-@@ -3,7 +3,11 @@
-     "into multiple lines",
-     "because it is way too long",
- ]
+@@ -1,11 +1,3 @@
+-l1 = [
+-    "This list should be broken up",
+-    "into multiple lines",
+-    "because it is way too long",
+-]
 -l2 = ["But this list shouldn't", "even though it also has", "way too many characters in it"]  # fmt: skip
-+l2 = [
-+    "But this list shouldn't",
-+    "even though it also has",
-+    "way too many characters in it",
-+]  # fmt: skip
- l3 = [
-     "I have",
-     "trailing comma",
+-l3 = [
+-    "I have",
+-    "trailing comma",
+-    "so I should be braked",
+-]
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign  # fmt: skip
++NOT_YET_IMPLEMENTED_StmtAssign
 ```
 
 ## Ruff Output
 
 ```py
-l1 = [
-    "This list should be broken up",
-    "into multiple lines",
-    "because it is way too long",
-]
-l2 = [
-    "But this list shouldn't",
-    "even though it also has",
-    "way too many characters in it",
-]  # fmt: skip
-l3 = [
-    "I have",
-    "trailing comma",
-    "so I should be braked",
-]
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign  # fmt: skip
+NOT_YET_IMPLEMENTED_StmtAssign
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip3_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip3_py.snap
index 2e54d4b721446..afe9c07c0634a 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip3_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip3_py.snap
@@ -20,31 +20,34 @@ f = ["This is a very long line that should be formatted into a clearer line ", "
 ```diff
 --- Black
 +++ Ruff
-@@ -1,7 +1,7 @@
- a = 3
+@@ -1,10 +1,7 @@
+-a = 3
++NOT_YET_IMPLEMENTED_StmtAssign
  # fmt: off
 -b,    c = 1, 2
 -d =    6  # fmt: skip
-+b, c = 1, 2
-+d = 6  # fmt: skip
- e = 5
+-e = 5
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign  # fmt: skip
++NOT_YET_IMPLEMENTED_StmtAssign
  # fmt: on
- f = [
+-f = [
+-    "This is a very long line that should be formatted into a clearer line ",
+-    "by rearranging.",
+-]
++NOT_YET_IMPLEMENTED_StmtAssign
 ```
 
 ## Ruff Output
 
 ```py
-a = 3
+NOT_YET_IMPLEMENTED_StmtAssign
 # fmt: off
-b, c = 1, 2
-d = 6  # fmt: skip
-e = 5
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign  # fmt: skip
+NOT_YET_IMPLEMENTED_StmtAssign
 # fmt: on
-f = [
-    "This is a very long line that should be formatted into a clearer line ",
-    "by rearranging.",
-]
+NOT_YET_IMPLEMENTED_StmtAssign
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip4_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip4_py.snap
new file mode 100644
index 0000000000000..a1c0e29da9648
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip4_py.snap
@@ -0,0 +1,51 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: snapshot
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/simple_cases/fmtskip4.py
+---
+## Input
+
+```py
+a =   2
+# fmt: skip
+l = [1, 2, 3,]
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,7 +1,3 @@
+-a = 2
++NOT_YET_IMPLEMENTED_StmtAssign
+ # fmt: skip
+-l = [
+-    1,
+-    2,
+-    3,
+-]
++NOT_YET_IMPLEMENTED_StmtAssign
+```
+
+## Ruff Output
+
+```py
+NOT_YET_IMPLEMENTED_StmtAssign
+# fmt: skip
+NOT_YET_IMPLEMENTED_StmtAssign
+```
+
+## Black Output
+
+```py
+a = 2
+# fmt: skip
+l = [
+    1,
+    2,
+    3,
+]
+```
+
+
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip5_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip5_py.snap
index 96710762110d5..e371421151387 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip5_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip5_py.snap
@@ -22,27 +22,25 @@ else:
 ```diff
 --- Black
 +++ Ruff
-@@ -1,9 +1,5 @@
- a, b, c = 3, 4, 5
+@@ -1,9 +1,2 @@
+-a, b, c = 3, 4, 5
 -if (
 -    a == 3
 -    and b    != 9  # fmt: skip
 -    and c is not None
 -):
-+if a == 3 and b != 9 and c is not None:  # fmt: skip
-     print("I'm good!")
- else:
-     print("I'm bad")
+-    print("I'm good!")
+-else:
+-    print("I'm bad")
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtIf
 ```
 
 ## Ruff Output
 
 ```py
-a, b, c = 3, 4, 5
-if a == 3 and b != 9 and c is not None:  # fmt: skip
-    print("I'm good!")
-else:
-    print("I'm bad")
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtIf
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip6_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip6_py.snap
new file mode 100644
index 0000000000000..ea2bbeca77b83
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip6_py.snap
@@ -0,0 +1,46 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: snapshot
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/simple_cases/fmtskip6.py
+---
+## Input
+
+```py
+class A:
+    def f(self):
+        for line in range(10):
+            if True:
+                pass  # fmt: skip
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,5 +1 @@
+-class A:
+-    def f(self):
+-        for line in range(10):
+-            if True:
+-                pass  # fmt: skip
++NOT_YET_IMPLEMENTED_StmtClassDef
+```
+
+## Ruff Output
+
+```py
+NOT_YET_IMPLEMENTED_StmtClassDef
+```
+
+## Black Output
+
+```py
+class A:
+    def f(self):
+        for line in range(10):
+            if True:
+                pass  # fmt: skip
+```
+
+
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip7_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip7_py.snap
index caacad9a0e874..976f778505fe4 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip7_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip7_py.snap
@@ -18,22 +18,23 @@ d = "thisisasuperlongstringthisisasuperlongstringthisisasuperlongstringthisisasu
 --- Black
 +++ Ruff
 @@ -1,4 +1,4 @@
- a = "this is some code"
+-a = "this is some code"
 -b =     5  # fmt:skip
 -c = 9  # fmt: skip
 -d = "thisisasuperlongstringthisisasuperlongstringthisisasuperlongstringthisisasuperlongstring"  # fmt:skip
-+b = 5  #fmt:skip
-+c = 9  #fmt: skip
-+d = "thisisasuperlongstringthisisasuperlongstringthisisasuperlongstringthisisasuperlongstring"  #fmt:skip
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign  # fmt:skip
++NOT_YET_IMPLEMENTED_StmtAssign  # fmt: skip
++NOT_YET_IMPLEMENTED_StmtAssign  # fmt:skip
 ```
 
 ## Ruff Output
 
 ```py
-a = "this is some code"
-b = 5  #fmt:skip
-c = 9  #fmt: skip
-d = "thisisasuperlongstringthisisasuperlongstringthisisasuperlongstringthisisasuperlongstring"  #fmt:skip
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign  # fmt:skip
+NOT_YET_IMPLEMENTED_StmtAssign  # fmt: skip
+NOT_YET_IMPLEMENTED_StmtAssign  # fmt:skip
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip8_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip8_py.snap
index 98e84a118fbeb..ef64a5e6efb24 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip8_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip8_py.snap
@@ -75,152 +75,118 @@ async def test_async_with():
 ```diff
 --- Black
 +++ Ruff
-@@ -1,62 +1,62 @@
+@@ -1,62 +1,33 @@
  # Make sure a leading comment is not removed.
 -def some_func(  unformatted,  args  ):  # fmt: skip
-+def some_func(unformatted, args):  # fmt: skip
-     print("I am some_func")
-     return 0
-     # Make sure this comment is not removed.
+-    print("I am some_func")
+-    return 0
+-    # Make sure this comment is not removed.
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
  # Make sure a leading comment is not removed.
 -async def some_async_func(  unformatted,   args):  # fmt: skip
-+async def some_async_func(unformatted, args):  # fmt: skip
-     print("I am some_async_func")
-     await asyncio.sleep(1)
+-    print("I am some_async_func")
+-    await asyncio.sleep(1)
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
  
  
  # Make sure a leading comment is not removed.
 -class SomeClass(  Unformatted,  SuperClasses  ):  # fmt: skip
 -    def some_method(  self,  unformatted,  args  ):  # fmt: skip
-+class SomeClass(Unformatted, SuperClasses):  # fmt: skip
-+    def some_method(self, unformatted, args):  # fmt: skip
-         print("I am some_method")
-         return 0
+-        print("I am some_method")
+-        return 0
++NOT_YET_IMPLEMENTED_StmtClassDef
  
 -    async def some_async_method(  self,  unformatted,  args  ):  # fmt: skip
-+    async def some_async_method(self, unformatted, args):  # fmt: skip
-         print("I am some_async_method")
-         await asyncio.sleep(1)
- 
+-        print("I am some_async_method")
+-        await asyncio.sleep(1)
  
+-
  # Make sure a leading comment is not removed.
 -if  unformatted_call(  args  ):  # fmt: skip
-+if unformatted_call(args):  # fmt: skip
-     print("First branch")
-     # Make sure this is not removed.
+-    print("First branch")
+-    # Make sure this is not removed.
 -elif  another_unformatted_call(  args  ):  # fmt: skip
-+elif another_unformatted_call(args):  # fmt: skip
-     print("Second branch")
+-    print("Second branch")
 -else  :  # fmt: skip
-+else:  # fmt: skip
-     print("Last branch")
+-    print("Last branch")
++NOT_YET_IMPLEMENTED_StmtIf  # fmt: skip
  
  
 -while  some_condition(  unformatted,  args  ):  # fmt: skip
-+while some_condition(unformatted, args):  # fmt: skip
-     print("Do something")
+-    print("Do something")
++while NOT_YET_IMPLEMENTED_ExprCall:  # fmt: skip
++    NOT_YET_IMPLEMENTED_ExprCall
  
  
 -for  i  in  some_iter(  unformatted,  args  ):  # fmt: skip
-+for i in some_iter(unformatted, args):  # fmt: skip
-     print("Do something")
+-    print("Do something")
++NOT_YET_IMPLEMENTED_StmtFor  # fmt: skip
  
  
- async def test_async_for():
+-async def test_async_for():
 -    async  for  i  in  some_async_iter(  unformatted,  args  ):  # fmt: skip
-+    async for i in some_async_iter(unformatted, args):  # fmt: skip
-         print("Do something")
+-        print("Do something")
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
  
  
 -try  :  # fmt: skip
-+try:  # fmt: skip
-     some_call()
+-    some_call()
 -except  UnformattedError  as  ex:  # fmt: skip
-+except UnformattedError as ex:
-     handle_exception()
+-    handle_exception()
 -finally  :  # fmt: skip
-+finally:  # fmt: skip
-     finally_call()
+-    finally_call()
++NOT_YET_IMPLEMENTED_StmtTry
  
  
 -with  give_me_context(  unformatted,  args  ):  # fmt: skip
-+with give_me_context(unformatted, args):  # fmt: skip
-     print("Do something")
+-    print("Do something")
++NOT_YET_IMPLEMENTED_StmtWith  # fmt: skip
  
  
- async def test_async_with():
+-async def test_async_with():
 -    async  with  give_me_async_context(  unformatted,  args  ):  # fmt: skip
-+    async with give_me_async_context(unformatted, args):  # fmt: skip
-         print("Do something")
+-        print("Do something")
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 ```
 
 ## Ruff Output
 
 ```py
 # Make sure a leading comment is not removed.
-def some_func(unformatted, args):  # fmt: skip
-    print("I am some_func")
-    return 0
-    # Make sure this comment is not removed.
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # Make sure a leading comment is not removed.
-async def some_async_func(unformatted, args):  # fmt: skip
-    print("I am some_async_func")
-    await asyncio.sleep(1)
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
 # Make sure a leading comment is not removed.
-class SomeClass(Unformatted, SuperClasses):  # fmt: skip
-    def some_method(self, unformatted, args):  # fmt: skip
-        print("I am some_method")
-        return 0
-
-    async def some_async_method(self, unformatted, args):  # fmt: skip
-        print("I am some_async_method")
-        await asyncio.sleep(1)
+NOT_YET_IMPLEMENTED_StmtClassDef
 
 
 # Make sure a leading comment is not removed.
-if unformatted_call(args):  # fmt: skip
-    print("First branch")
-    # Make sure this is not removed.
-elif another_unformatted_call(args):  # fmt: skip
-    print("Second branch")
-else:  # fmt: skip
-    print("Last branch")
+NOT_YET_IMPLEMENTED_StmtIf  # fmt: skip
 
 
-while some_condition(unformatted, args):  # fmt: skip
-    print("Do something")
+while NOT_YET_IMPLEMENTED_ExprCall:  # fmt: skip
+    NOT_YET_IMPLEMENTED_ExprCall
 
 
-for i in some_iter(unformatted, args):  # fmt: skip
-    print("Do something")
+NOT_YET_IMPLEMENTED_StmtFor  # fmt: skip
 
 
-async def test_async_for():
-    async for i in some_async_iter(unformatted, args):  # fmt: skip
-        print("Do something")
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
-try:  # fmt: skip
-    some_call()
-except UnformattedError as ex:
-    handle_exception()
-finally:  # fmt: skip
-    finally_call()
+NOT_YET_IMPLEMENTED_StmtTry
 
 
-with give_me_context(unformatted, args):  # fmt: skip
-    print("Do something")
+NOT_YET_IMPLEMENTED_StmtWith  # fmt: skip
 
 
-async def test_async_with():
-    async with give_me_async_context(unformatted, args):  # fmt: skip
-        print("Do something")
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip_py.snap
index c4deeaed9cd65..83514e6333697 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip_py.snap
@@ -17,18 +17,20 @@ d = 5
 --- Black
 +++ Ruff
 @@ -1,3 +1,3 @@
- a, b = 1, 2
+-a, b = 1, 2
 -c =    6  # fmt: skip
-+c = 6  # fmt: skip
- d = 5
+-d = 5
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign  # fmt: skip
++NOT_YET_IMPLEMENTED_StmtAssign
 ```
 
 ## Ruff Output
 
 ```py
-a, b = 1, 2
-c = 6  # fmt: skip
-d = 5
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign  # fmt: skip
+NOT_YET_IMPLEMENTED_StmtAssign
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fstring_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fstring_py.snap
index 7dd7584af584a..d442a2cf0f8ac 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fstring_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fstring_py.snap
@@ -22,28 +22,39 @@ f'Hello \'{tricky + "example"}\''
 ```diff
 --- Black
 +++ Ruff
-@@ -1,6 +1,6 @@
- f"f-string without formatted values is just a string"
- f"{{NOT a formatted value}}"
+@@ -1,9 +1,9 @@
+-f"f-string without formatted values is just a string"
+-f"{{NOT a formatted value}}"
 -f'{{NOT \'a\' "formatted" "value"}}'
-+f"{{NOT 'a' \"formatted\" \"value\"}}"
- f"some f-string with {a} {few():.2f} {formatted.values!r}"
- f'some f-string with {a} {few(""):.2f} {formatted.values!r}'
- f"{f'''{'nested'} inner'''} outer"
+-f"some f-string with {a} {few():.2f} {formatted.values!r}"
+-f'some f-string with {a} {few(""):.2f} {formatted.values!r}'
+-f"{f'''{'nested'} inner'''} outer"
+-f"\"{f'{nested} inner'}\" outer"
+-f"space between opening braces: { {a for a in (1, 2, 3)}}"
+-f'Hello \'{tricky + "example"}\''
++NOT_YET_IMPLEMENTED_ExprJoinedStr
++NOT_YET_IMPLEMENTED_ExprJoinedStr
++NOT_YET_IMPLEMENTED_ExprJoinedStr
++NOT_YET_IMPLEMENTED_ExprJoinedStr
++NOT_YET_IMPLEMENTED_ExprJoinedStr
++NOT_YET_IMPLEMENTED_ExprJoinedStr
++NOT_YET_IMPLEMENTED_ExprJoinedStr
++NOT_YET_IMPLEMENTED_ExprJoinedStr
++NOT_YET_IMPLEMENTED_ExprJoinedStr
 ```
 
 ## Ruff Output
 
 ```py
-f"f-string without formatted values is just a string"
-f"{{NOT a formatted value}}"
-f"{{NOT 'a' \"formatted\" \"value\"}}"
-f"some f-string with {a} {few():.2f} {formatted.values!r}"
-f'some f-string with {a} {few(""):.2f} {formatted.values!r}'
-f"{f'''{'nested'} inner'''} outer"
-f"\"{f'{nested} inner'}\" outer"
-f"space between opening braces: { {a for a in (1, 2, 3)}}"
-f'Hello \'{tricky + "example"}\''
+NOT_YET_IMPLEMENTED_ExprJoinedStr
+NOT_YET_IMPLEMENTED_ExprJoinedStr
+NOT_YET_IMPLEMENTED_ExprJoinedStr
+NOT_YET_IMPLEMENTED_ExprJoinedStr
+NOT_YET_IMPLEMENTED_ExprJoinedStr
+NOT_YET_IMPLEMENTED_ExprJoinedStr
+NOT_YET_IMPLEMENTED_ExprJoinedStr
+NOT_YET_IMPLEMENTED_ExprJoinedStr
+NOT_YET_IMPLEMENTED_ExprJoinedStr
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function2_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function2_py.snap
index 19a5d4092f4fe..7222c21c5e187 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function2_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function2_py.snap
@@ -66,87 +66,94 @@ with hmm_but_this_should_get_two_preceding_newlines():
 ```diff
 --- Black
 +++ Ruff
-@@ -5,7 +5,8 @@
-     with cache_dir():
-         if something:
-             result = CliRunner().invoke(
+@@ -1,65 +1,12 @@
+-def f(
+-    a,
+-    **kwargs,
+-) -> A:
+-    with cache_dir():
+-        if something:
+-            result = CliRunner().invoke(
 -                black.main, [str(src1), str(src2), "--diff", "--check"]
-+                black.main,
-+                [str(src1), str(src2), "--diff", "--check"],
-             )
-     limited.append(-limited.pop())  # negate top
-     return A(
+-            )
+-    limited.append(-limited.pop())  # negate top
+-    return A(
+-        very_long_argument_name1=very_long_value_for_the_argument,
+-        very_long_argument_name2=-very.long.value.for_the_argument,
+-        **kwargs,
+-    )
+-
+-
+-def g():
+-    "Docstring."
+-
+-    def inner():
+-        pass
+-
+-    print("Inner defs should breathe a little.")
+-
+-
+-def h():
+-    def inner():
+-        pass
+-
+-    print("Inner defs should breathe a little.")
+-
+-
+-if os.name == "posix":
+-    import termios
+-
+-    def i_should_be_followed_by_only_one_newline():
+-        pass
+-
+-elif os.name == "nt":
+-    try:
+-        import msvcrt
+-
+-        def i_should_be_followed_by_only_one_newline():
+-            pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+-    except ImportError:
+ 
+-        def i_should_be_followed_by_only_one_newline():
+-            pass
+-
+-elif False:
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+-    class IHopeYouAreHavingALovelyDay:
+-        def __call__(self):
+-            print("i_should_be_followed_by_only_one_newline")
+ 
+-else:
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+-    def foo():
+-        pass
+ 
++NOT_YET_IMPLEMENTED_StmtIf
+ 
+-with hmm_but_this_should_get_two_preceding_newlines():
+-    pass
++NOT_YET_IMPLEMENTED_StmtWith
 ```
 
 ## Ruff Output
 
 ```py
-def f(
-    a,
-    **kwargs,
-) -> A:
-    with cache_dir():
-        if something:
-            result = CliRunner().invoke(
-                black.main,
-                [str(src1), str(src2), "--diff", "--check"],
-            )
-    limited.append(-limited.pop())  # negate top
-    return A(
-        very_long_argument_name1=very_long_value_for_the_argument,
-        very_long_argument_name2=-very.long.value.for_the_argument,
-        **kwargs,
-    )
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def g():
-    "Docstring."
-
-    def inner():
-        pass
-
-    print("Inner defs should breathe a little.")
-
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-def h():
-    def inner():
-        pass
 
-    print("Inner defs should breathe a little.")
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-if os.name == "posix":
-    import termios
+NOT_YET_IMPLEMENTED_StmtIf
 
-    def i_should_be_followed_by_only_one_newline():
-        pass
-
-elif os.name == "nt":
-    try:
-        import msvcrt
-
-        def i_should_be_followed_by_only_one_newline():
-            pass
-
-    except ImportError:
-
-        def i_should_be_followed_by_only_one_newline():
-            pass
-
-elif False:
-
-    class IHopeYouAreHavingALovelyDay:
-        def __call__(self):
-            print("i_should_be_followed_by_only_one_newline")
-
-else:
-
-    def foo():
-        pass
-
-
-with hmm_but_this_should_get_two_preceding_newlines():
-    pass
+NOT_YET_IMPLEMENTED_StmtWith
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function_py.snap
index aacde3d87b9be..97bb06f0cdcc7 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function_py.snap
@@ -108,25 +108,88 @@ def __await__(): return (yield)
 ```diff
 --- Black
 +++ Ruff
-@@ -6,7 +6,7 @@
+@@ -1,148 +1,41 @@
+ #!/usr/bin/env python3
+-import asyncio
+-import sys
++NOT_YET_IMPLEMENTED_StmtImport
++NOT_YET_IMPLEMENTED_StmtImport
  
- from library import some_connection, some_decorator
+-from third_party import X, Y, Z
++NOT_YET_IMPLEMENTED_StmtImportFrom
+ 
+-from library import some_connection, some_decorator
++NOT_YET_IMPLEMENTED_StmtImportFrom
++NOT_YET_IMPLEMENTED_ExprJoinedStr
  
 -f"trigger 3.6 mode"
-+f'trigger 3.6 mode'
+-
+ 
+-def func_no_args():
+-    a
+-    b
+-    c
+-    if True:
+-        raise RuntimeError
+-    if False:
+-        ...
+-    for i in range(10):
+-        print(i)
+-        continue
+-    exec("new-style exec", {}, {})
+-    return None
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-async def coroutine(arg, exec=False):
+-    "Single-line docstring. Multiline is harder to reformat."
+-    async with some_connection() as conn:
+-        await conn.do_what_i_mean("SELECT bobby, tables FROM xkcd", timeout=2)
+-    await asyncio.sleep(1)
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
+ 
  
+-@asyncio.coroutine
+-@some_decorator(with_args=True, many_args=[1, 2, 3])
+-def function_signature_stress_test(
+-    number: int,
+-    no_annotation=None,
+-    text: str = "default",
+-    *,
+-    debug: bool = False,
+-    **kwargs,
+-) -> str:
+-    return text[number:-1]
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- def func_no_args():
-@@ -64,19 +64,15 @@
  
+-def spaces(a=1, b=(), c=[], d={}, e=True, f=-1, g=1 if False else 2, h="", i=r""):
+-    offset = attr.ib(default=attr.Factory(lambda: _r.uniform(10000, 200000)))
+-    assert task._cancel_stack[: len(old_stack)] == old_stack
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- def spaces2(result=_core.Value(None)):
+ 
+-def spaces_types(
+-    a: int = 1,
+-    b: tuple = (),
+-    c: list = [],
+-    d: dict = {},
+-    e: bool = True,
+-    f: int = -1,
+-    g: int = 1 if False else 2,
+-    h: str = "",
+-    i: str = r"",
+-):
+-    ...
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def spaces2(result=_core.Value(None)):
 -    assert fut is self._read_fut, (fut, self._read_fut)
-+    assert fut is self._read_fut, fut, self._read_fut
-+
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def example(session):
+-def example(session):
 -    result = (
 -        session.query(models.Customer.id)
 -        .filter(
@@ -136,178 +199,126 @@ def __await__(): return (yield)
 -        .order_by(models.Customer.id.asc())
 -        .all()
 -    )
-+    result = session.query(models.Customer.id).filter(
-+        models.Customer.account_id == account_id,
-+        models.Customer.email == email_address,
-+    ).order_by(models.Customer.id.asc()).all()
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def long_lines():
+-    if True:
+-        typedargslist.extend(
+-            gen_annotated_params(
+-                ast_args.kwonlyargs,
+-                ast_args.kw_defaults,
+-                parameters,
+-                implicit_default=True,
+-            )
+-        )
+-        typedargslist.extend(
+-            gen_annotated_params(
+-                ast_args.kwonlyargs,
+-                ast_args.kw_defaults,
+-                parameters,
+-                implicit_default=True,
+-                # trailing standalone comment
+-            )
+-        )
+-    _type_comment_re = re.compile(
+-        r"""
+-        ^
+-        [\t ]*
+-        \#[ ]type:[ ]*
+-        (?P<type>
+-            [^#\t\n]+?
+-        )
+-        (?<!ignore)     # note: this will force the non-greedy + in <type> to match
+-                        # a trailing space which is why we need the silliness below
+-        (?<!ignore[ ]{1})(?<!ignore[ ]{2})(?<!ignore[ ]{3})(?<!ignore[ ]{4})
+-        (?<!ignore[ ]{5})(?<!ignore[ ]{6})(?<!ignore[ ]{7})(?<!ignore[ ]{8})
+-        (?<!ignore[ ]{9})(?<!ignore[ ]{10})
+-        [\t ]*
+-        (?P<nl>
+-            (?:\#[^\n]*)?
+-            \n?
+-        )
+-        $
+-        """,
+-        re.MULTILINE | re.VERBOSE,
+-    )
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def trailing_comma():
+-    mapping = {
+-        A: 0.25 * (10.0 / 12),
+-        B: 0.1 * (10.0 / 12),
+-        C: 0.1 * (10.0 / 12),
+-        D: 0.1 * (10.0 / 12),
+-    }
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def long_lines():
-@@ -135,14 +131,13 @@
-     a,
-     **kwargs,
- ) -> A:
+-def f(
+-    a,
+-    **kwargs,
+-) -> A:
 -    return (
-+    return
-         yield from A(
-             very_long_argument_name1=very_long_value_for_the_argument,
-             very_long_argument_name2=very_long_value_for_the_argument,
-             **kwargs,
-         )
+-        yield from A(
+-            very_long_argument_name1=very_long_value_for_the_argument,
+-            very_long_argument_name2=very_long_value_for_the_argument,
+-            **kwargs,
+-        )
 -    )
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def __await__():
+-def __await__():
 -    return (yield)
-+    return yield
++NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Ruff Output
 
 ```py
 #!/usr/bin/env python3
-import asyncio
-import sys
-
-from third_party import X, Y, Z
-
-from library import some_connection, some_decorator
+NOT_YET_IMPLEMENTED_StmtImport
+NOT_YET_IMPLEMENTED_StmtImport
 
-f'trigger 3.6 mode'
+NOT_YET_IMPLEMENTED_StmtImportFrom
 
+NOT_YET_IMPLEMENTED_StmtImportFrom
+NOT_YET_IMPLEMENTED_ExprJoinedStr
 
-def func_no_args():
-    a
-    b
-    c
-    if True:
-        raise RuntimeError
-    if False:
-        ...
-    for i in range(10):
-        print(i)
-        continue
-    exec("new-style exec", {}, {})
-    return None
 
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-async def coroutine(arg, exec=False):
-    "Single-line docstring. Multiline is harder to reformat."
-    async with some_connection() as conn:
-        await conn.do_what_i_mean("SELECT bobby, tables FROM xkcd", timeout=2)
-    await asyncio.sleep(1)
 
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
-@asyncio.coroutine
-@some_decorator(with_args=True, many_args=[1, 2, 3])
-def function_signature_stress_test(
-    number: int,
-    no_annotation=None,
-    text: str = "default",
-    *,
-    debug: bool = False,
-    **kwargs,
-) -> str:
-    return text[number:-1]
 
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-def spaces(a=1, b=(), c=[], d={}, e=True, f=-1, g=1 if False else 2, h="", i=r""):
-    offset = attr.ib(default=attr.Factory(lambda: _r.uniform(10000, 200000)))
-    assert task._cancel_stack[: len(old_stack)] == old_stack
 
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-def spaces_types(
-    a: int = 1,
-    b: tuple = (),
-    c: list = [],
-    d: dict = {},
-    e: bool = True,
-    f: int = -1,
-    g: int = 1 if False else 2,
-    h: str = "",
-    i: str = r"",
-):
-    ...
 
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
-def spaces2(result=_core.Value(None)):
-    assert fut is self._read_fut, fut, self._read_fut
 
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def example(session):
-    result = session.query(models.Customer.id).filter(
-        models.Customer.account_id == account_id,
-        models.Customer.email == email_address,
-    ).order_by(models.Customer.id.asc()).all()
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def long_lines():
-    if True:
-        typedargslist.extend(
-            gen_annotated_params(
-                ast_args.kwonlyargs,
-                ast_args.kw_defaults,
-                parameters,
-                implicit_default=True,
-            )
-        )
-        typedargslist.extend(
-            gen_annotated_params(
-                ast_args.kwonlyargs,
-                ast_args.kw_defaults,
-                parameters,
-                implicit_default=True,
-                # trailing standalone comment
-            )
-        )
-    _type_comment_re = re.compile(
-        r"""
-        ^
-        [\t ]*
-        \#[ ]type:[ ]*
-        (?P<type>
-            [^#\t\n]+?
-        )
-        (?<!ignore)     # note: this will force the non-greedy + in <type> to match
-                        # a trailing space which is why we need the silliness below
-        (?<!ignore[ ]{1})(?<!ignore[ ]{2})(?<!ignore[ ]{3})(?<!ignore[ ]{4})
-        (?<!ignore[ ]{5})(?<!ignore[ ]{6})(?<!ignore[ ]{7})(?<!ignore[ ]{8})
-        (?<!ignore[ ]{9})(?<!ignore[ ]{10})
-        [\t ]*
-        (?P<nl>
-            (?:\#[^\n]*)?
-            \n?
-        )
-        $
-        """,
-        re.MULTILINE | re.VERBOSE,
-    )
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def trailing_comma():
-    mapping = {
-        A: 0.25 * (10.0 / 12),
-        B: 0.1 * (10.0 / 12),
-        C: 0.1 * (10.0 / 12),
-        D: 0.1 * (10.0 / 12),
-    }
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def f(
-    a,
-    **kwargs,
-) -> A:
-    return
-        yield from A(
-            very_long_argument_name1=very_long_value_for_the_argument,
-            very_long_argument_name2=very_long_value_for_the_argument,
-            **kwargs,
-        )
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def __await__():
-    return yield
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function_trailing_comma_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function_trailing_comma_py.snap
index b1b1d3dab322c..6161c5951da63 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function_trailing_comma_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function_trailing_comma_py.snap
@@ -74,28 +74,77 @@ some_module.some_function(
 ```diff
 --- Black
 +++ Ruff
-@@ -52,53 +52,52 @@
-         pass
+@@ -1,114 +1,31 @@
+-def f(
+-    a,
+-):
+-    d = {
+-        "key": "value",
+-    }
+-    tup = (1,)
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def f2(
+-    a,
+-    b,
+-):
+-    d = {
+-        "key": "value",
+-        "key2": "value2",
+-    }
+-    tup = (
+-        1,
+-        2,
+-    )
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def f(
+-    a: int = 1,
+-):
+-    call(
+-        arg={
+-            "explode": "this",
+-        }
+-    )
+-    call2(
+-        arg=[1, 2, 3],
+-    )
+-    x = {
+-        "a": 1,
+-        "b": 2,
+-    }["a"]
+-    if (
+-        a
+-        == {
+-            "a": 1,
+-            "b": 2,
+-            "c": 3,
+-            "d": 4,
+-            "e": 5,
+-            "f": 6,
+-            "g": 7,
+-            "h": 8,
+-        }["a"]
+-    ):
+-        pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
 -def xxxxxxxxxxxxxxxxxxxxxxxxxxxx() -> (
 -    Set["xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"]
 -):
-+def xxxxxxxxxxxxxxxxxxxxxxxxxxxx() -> Set[
-+    "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-+]:
-     json = {
-         "k": {
-             "k2": {
-                 "k3": [
-                     1,
+-    json = {
+-        "k": {
+-            "k2": {
+-                "k3": [
+-                    1,
 -                ]
 -            }
 -        }
-+                ],
-+            },
-+        },
-     }
+-    }
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
  # The type annotation shouldn't get a trailing comma since that would change its type.
@@ -103,167 +152,89 @@ some_module.some_function(
 -def some_function_with_a_really_long_name() -> (
 -    returning_a_deeply_nested_import_of_a_type_i_suppose
 -):
-+def some_function_with_a_really_long_name() -> returning_a_deeply_nested_import_of_a_type_i_suppose:
-     pass
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def some_method_with_a_really_long_name(
+-def some_method_with_a_really_long_name(
 -    very_long_parameter_so_yeah: str, another_long_parameter: int
-+    very_long_parameter_so_yeah: str,
-+    another_long_parameter: int,
- ) -> another_case_of_returning_a_deeply_nested_import_of_a_type_i_suppose_cause_why_not:
-     pass
+-) -> another_case_of_returning_a_deeply_nested_import_of_a_type_i_suppose_cause_why_not:
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
 -def func() -> (
 -    also_super_long_type_annotation_that_may_cause_an_AST_related_crash_in_black(
 -        this_shouldn_t_get_a_trailing_comma_too
 -    )
-+def func() -> also_super_long_type_annotation_that_may_cause_an_AST_related_crash_in_black(
-+    this_shouldn_t_get_a_trailing_comma_too
- ):
-     pass
+-):
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
 -def func() -> (
 -    also_super_long_type_annotation_that_may_cause_an_AST_related_crash_in_black(
 -        this_shouldn_t_get_a_trailing_comma_too
 -    )
-+def func() -> also_super_long_type_annotation_that_may_cause_an_AST_related_crash_in_black(
-+    this_shouldn_t_get_a_trailing_comma_too
- ):
-     pass
+-):
+-    pass
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
  # Make sure inner one-element tuple won't explode
- some_module.some_function(
+-some_module.some_function(
 -    argument1, (one_element_tuple,), argument4, argument5, argument6
-+    argument1,
-+    (one_element_tuple,),
-+    argument4,
-+    argument5,
-+    argument6,
- )
+-)
++NOT_YET_IMPLEMENTED_ExprCall
  
  # Inner trailing comma causes outer to explode
+-some_module.some_function(
+-    argument1,
+-    (
+-        one,
+-        two,
+-    ),
+-    argument4,
+-    argument5,
+-    argument6,
+-)
++NOT_YET_IMPLEMENTED_ExprCall
 ```
 
 ## Ruff Output
 
 ```py
-def f(
-    a,
-):
-    d = {
-        "key": "value",
-    }
-    tup = (1,)
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def f2(
-    a,
-    b,
-):
-    d = {
-        "key": "value",
-        "key2": "value2",
-    }
-    tup = (
-        1,
-        2,
-    )
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def f(
-    a: int = 1,
-):
-    call(
-        arg={
-            "explode": "this",
-        }
-    )
-    call2(
-        arg=[1, 2, 3],
-    )
-    x = {
-        "a": 1,
-        "b": 2,
-    }["a"]
-    if (
-        a
-        == {
-            "a": 1,
-            "b": 2,
-            "c": 3,
-            "d": 4,
-            "e": 5,
-            "f": 6,
-            "g": 7,
-            "h": 8,
-        }["a"]
-    ):
-        pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def xxxxxxxxxxxxxxxxxxxxxxxxxxxx() -> Set[
-    "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-]:
-    json = {
-        "k": {
-            "k2": {
-                "k3": [
-                    1,
-                ],
-            },
-        },
-    }
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # The type annotation shouldn't get a trailing comma since that would change its type.
 # Relevant bug report: https://github.com/psf/black/issues/2381.
-def some_function_with_a_really_long_name() -> returning_a_deeply_nested_import_of_a_type_i_suppose:
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def some_method_with_a_really_long_name(
-    very_long_parameter_so_yeah: str,
-    another_long_parameter: int,
-) -> another_case_of_returning_a_deeply_nested_import_of_a_type_i_suppose_cause_why_not:
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def func() -> also_super_long_type_annotation_that_may_cause_an_AST_related_crash_in_black(
-    this_shouldn_t_get_a_trailing_comma_too
-):
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def func() -> also_super_long_type_annotation_that_may_cause_an_AST_related_crash_in_black(
-    this_shouldn_t_get_a_trailing_comma_too
-):
-    pass
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # Make sure inner one-element tuple won't explode
-some_module.some_function(
-    argument1,
-    (one_element_tuple,),
-    argument4,
-    argument5,
-    argument6,
-)
+NOT_YET_IMPLEMENTED_ExprCall
 
 # Inner trailing comma causes outer to explode
-some_module.some_function(
-    argument1,
-    (
-        one,
-        two,
-    ),
-    argument4,
-    argument5,
-    argument6,
-)
+NOT_YET_IMPLEMENTED_ExprCall
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__import_spacing_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__import_spacing_py.snap
new file mode 100644
index 0000000000000..5a7d0cf00baf2
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__import_spacing_py.snap
@@ -0,0 +1,258 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: snapshot
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/simple_cases/import_spacing.py
+---
+## Input
+
+```py
+"""The asyncio package, tracking PEP 3156."""
+
+# flake8: noqa
+
+from logging import (
+    WARNING
+)
+from logging import (
+    ERROR,
+)
+import sys
+
+# This relies on each of the submodules having an __all__ variable.
+from .base_events import *
+from .coroutines import *
+from .events import *  # comment here
+
+from .futures import *
+from .locks import *  # comment here
+from .protocols import *
+
+from ..runners import *  # comment here
+from ..queues import *
+from ..streams import *
+
+from some_library import (
+    Just, Enough, Libraries, To, Fit, In, This, Nice, Split, Which, We, No, Longer, Use
+)
+from name_of_a_company.extremely_long_project_name.component.ttypes import CuteLittleServiceHandlerFactoryyy
+from name_of_a_company.extremely_long_project_name.extremely_long_component_name.ttypes import *
+
+from .a.b.c.subprocess import *
+from . import (tasks)
+from . import (A, B, C)
+from . import SomeVeryLongNameAndAllOfItsAdditionalLetters1, \
+              SomeVeryLongNameAndAllOfItsAdditionalLetters2
+
+__all__ = (
+    base_events.__all__
+    + coroutines.__all__
+    + events.__all__
+    + futures.__all__
+    + locks.__all__
+    + protocols.__all__
+    + runners.__all__
+    + queues.__all__
+    + streams.__all__
+    + tasks.__all__
+)
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,64 +1,31 @@
+-"""The asyncio package, tracking PEP 3156."""
++NOT_YET_IMPLEMENTED_ExprConstant
+ 
+ # flake8: noqa
+ 
+-from logging import WARNING
+-from logging import (
+-    ERROR,
+-)
+-import sys
++NOT_YET_IMPLEMENTED_StmtImportFrom
++NOT_YET_IMPLEMENTED_StmtImportFrom
++NOT_YET_IMPLEMENTED_StmtImport
+ 
+ # This relies on each of the submodules having an __all__ variable.
+-from .base_events import *
+-from .coroutines import *
+-from .events import *  # comment here
++NOT_YET_IMPLEMENTED_StmtImportFrom
++NOT_YET_IMPLEMENTED_StmtImportFrom
++NOT_YET_IMPLEMENTED_StmtImportFrom  # comment here
+ 
+-from .futures import *
+-from .locks import *  # comment here
+-from .protocols import *
++NOT_YET_IMPLEMENTED_StmtImportFrom
++NOT_YET_IMPLEMENTED_StmtImportFrom  # comment here
++NOT_YET_IMPLEMENTED_StmtImportFrom
+ 
+-from ..runners import *  # comment here
+-from ..queues import *
+-from ..streams import *
++NOT_YET_IMPLEMENTED_StmtImportFrom  # comment here
++NOT_YET_IMPLEMENTED_StmtImportFrom
++NOT_YET_IMPLEMENTED_StmtImportFrom
+ 
+-from some_library import (
+-    Just,
+-    Enough,
+-    Libraries,
+-    To,
+-    Fit,
+-    In,
+-    This,
+-    Nice,
+-    Split,
+-    Which,
+-    We,
+-    No,
+-    Longer,
+-    Use,
+-)
+-from name_of_a_company.extremely_long_project_name.component.ttypes import (
+-    CuteLittleServiceHandlerFactoryyy,
+-)
+-from name_of_a_company.extremely_long_project_name.extremely_long_component_name.ttypes import *
++NOT_YET_IMPLEMENTED_StmtImportFrom
++NOT_YET_IMPLEMENTED_StmtImportFrom
++NOT_YET_IMPLEMENTED_StmtImportFrom
+ 
+-from .a.b.c.subprocess import *
+-from . import tasks
+-from . import A, B, C
+-from . import (
+-    SomeVeryLongNameAndAllOfItsAdditionalLetters1,
+-    SomeVeryLongNameAndAllOfItsAdditionalLetters2,
+-)
++NOT_YET_IMPLEMENTED_StmtImportFrom
++NOT_YET_IMPLEMENTED_StmtImportFrom
++NOT_YET_IMPLEMENTED_StmtImportFrom
++NOT_YET_IMPLEMENTED_StmtImportFrom
+ 
+-__all__ = (
+-    base_events.__all__
+-    + coroutines.__all__
+-    + events.__all__
+-    + futures.__all__
+-    + locks.__all__
+-    + protocols.__all__
+-    + runners.__all__
+-    + queues.__all__
+-    + streams.__all__
+-    + tasks.__all__
+-)
++NOT_YET_IMPLEMENTED_StmtAssign
+```
+
+## Ruff Output
+
+```py
+NOT_YET_IMPLEMENTED_ExprConstant
+
+# flake8: noqa
+
+NOT_YET_IMPLEMENTED_StmtImportFrom
+NOT_YET_IMPLEMENTED_StmtImportFrom
+NOT_YET_IMPLEMENTED_StmtImport
+
+# This relies on each of the submodules having an __all__ variable.
+NOT_YET_IMPLEMENTED_StmtImportFrom
+NOT_YET_IMPLEMENTED_StmtImportFrom
+NOT_YET_IMPLEMENTED_StmtImportFrom  # comment here
+
+NOT_YET_IMPLEMENTED_StmtImportFrom
+NOT_YET_IMPLEMENTED_StmtImportFrom  # comment here
+NOT_YET_IMPLEMENTED_StmtImportFrom
+
+NOT_YET_IMPLEMENTED_StmtImportFrom  # comment here
+NOT_YET_IMPLEMENTED_StmtImportFrom
+NOT_YET_IMPLEMENTED_StmtImportFrom
+
+NOT_YET_IMPLEMENTED_StmtImportFrom
+NOT_YET_IMPLEMENTED_StmtImportFrom
+NOT_YET_IMPLEMENTED_StmtImportFrom
+
+NOT_YET_IMPLEMENTED_StmtImportFrom
+NOT_YET_IMPLEMENTED_StmtImportFrom
+NOT_YET_IMPLEMENTED_StmtImportFrom
+NOT_YET_IMPLEMENTED_StmtImportFrom
+
+NOT_YET_IMPLEMENTED_StmtAssign
+```
+
+## Black Output
+
+```py
+"""The asyncio package, tracking PEP 3156."""
+
+# flake8: noqa
+
+from logging import WARNING
+from logging import (
+    ERROR,
+)
+import sys
+
+# This relies on each of the submodules having an __all__ variable.
+from .base_events import *
+from .coroutines import *
+from .events import *  # comment here
+
+from .futures import *
+from .locks import *  # comment here
+from .protocols import *
+
+from ..runners import *  # comment here
+from ..queues import *
+from ..streams import *
+
+from some_library import (
+    Just,
+    Enough,
+    Libraries,
+    To,
+    Fit,
+    In,
+    This,
+    Nice,
+    Split,
+    Which,
+    We,
+    No,
+    Longer,
+    Use,
+)
+from name_of_a_company.extremely_long_project_name.component.ttypes import (
+    CuteLittleServiceHandlerFactoryyy,
+)
+from name_of_a_company.extremely_long_project_name.extremely_long_component_name.ttypes import *
+
+from .a.b.c.subprocess import *
+from . import tasks
+from . import A, B, C
+from . import (
+    SomeVeryLongNameAndAllOfItsAdditionalLetters1,
+    SomeVeryLongNameAndAllOfItsAdditionalLetters2,
+)
+
+__all__ = (
+    base_events.__all__
+    + coroutines.__all__
+    + events.__all__
+    + futures.__all__
+    + locks.__all__
+    + protocols.__all__
+    + runners.__all__
+    + queues.__all__
+    + streams.__all__
+    + tasks.__all__
+)
+```
+
+
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__one_element_subscript_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__one_element_subscript_py.snap
new file mode 100644
index 0000000000000..8fc82df191d24
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__one_element_subscript_py.snap
@@ -0,0 +1,103 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: snapshot
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/simple_cases/one_element_subscript.py
+---
+## Input
+
+```py
+# We should not treat the trailing comma
+# in a single-element subscript.
+a: tuple[int,]
+b = tuple[int,]
+
+# The magic comma still applies to multi-element subscripts.
+c: tuple[int, int,]
+d = tuple[int, int,]
+
+# Magic commas still work as expected for non-subscripts.
+small_list = [1,]
+list_of_types = [tuple[int,],]
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,22 +1,12 @@
+ # We should not treat the trailing comma
+ # in a single-element subscript.
+-a: tuple[int,]
+-b = tuple[int,]
++NOT_YET_IMPLEMENTED_StmtAnnAssign
++NOT_YET_IMPLEMENTED_StmtAssign
+ 
+ # The magic comma still applies to multi-element subscripts.
+-c: tuple[
+-    int,
+-    int,
+-]
+-d = tuple[
+-    int,
+-    int,
+-]
++NOT_YET_IMPLEMENTED_StmtAnnAssign
++NOT_YET_IMPLEMENTED_StmtAssign
+ 
+ # Magic commas still work as expected for non-subscripts.
+-small_list = [
+-    1,
+-]
+-list_of_types = [
+-    tuple[int,],
+-]
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
+```
+
+## Ruff Output
+
+```py
+# We should not treat the trailing comma
+# in a single-element subscript.
+NOT_YET_IMPLEMENTED_StmtAnnAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+
+# The magic comma still applies to multi-element subscripts.
+NOT_YET_IMPLEMENTED_StmtAnnAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+
+# Magic commas still work as expected for non-subscripts.
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+```
+
+## Black Output
+
+```py
+# We should not treat the trailing comma
+# in a single-element subscript.
+a: tuple[int,]
+b = tuple[int,]
+
+# The magic comma still applies to multi-element subscripts.
+c: tuple[
+    int,
+    int,
+]
+d = tuple[
+    int,
+    int,
+]
+
+# Magic commas still work as expected for non-subscripts.
+small_list = [
+    1,
+]
+list_of_types = [
+    tuple[int,],
+]
+```
+
+
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__power_op_spacing_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__power_op_spacing_py.snap
new file mode 100644
index 0000000000000..4fdf08fcb6131
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__power_op_spacing_py.snap
@@ -0,0 +1,309 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: snapshot
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/simple_cases/power_op_spacing.py
+---
+## Input
+
+```py
+def function(**kwargs):
+    t = a**2 + b**3
+    return t ** 2
+
+
+def function_replace_spaces(**kwargs):
+    t = a **2 + b** 3 + c ** 4
+
+
+def function_dont_replace_spaces():
+    {**a, **b, **c}
+
+
+a = 5**~4
+b = 5 ** f()
+c = -(5**2)
+d = 5 ** f["hi"]
+e = lazy(lambda **kwargs: 5)
+f = f() ** 5
+g = a.b**c.d
+h = 5 ** funcs.f()
+i = funcs.f() ** 5
+j = super().name ** 5
+k = [(2**idx, value) for idx, value in pairs]
+l = mod.weights_[0] == pytest.approx(0.95**100, abs=0.001)
+m = [([2**63], [1, 2**63])]
+n = count <= 10**5
+o = settings(max_examples=10**6)
+p = {(k, k**2): v**2 for k, v in pairs}
+q = [10**i for i in range(6)]
+r = x**y
+
+a = 5.0**~4.0
+b = 5.0 ** f()
+c = -(5.0**2.0)
+d = 5.0 ** f["hi"]
+e = lazy(lambda **kwargs: 5)
+f = f() ** 5.0
+g = a.b**c.d
+h = 5.0 ** funcs.f()
+i = funcs.f() ** 5.0
+j = super().name ** 5.0
+k = [(2.0**idx, value) for idx, value in pairs]
+l = mod.weights_[0] == pytest.approx(0.95**100, abs=0.001)
+m = [([2.0**63.0], [1.0, 2**63.0])]
+n = count <= 10**5.0
+o = settings(max_examples=10**6.0)
+p = {(k, k**2): v**2.0 for k, v in pairs}
+q = [10.5**i for i in range(6)]
+
+
+# WE SHOULD DEFINITELY NOT EAT THESE COMMENTS (https://github.com/psf/black/issues/2873)
+if hasattr(view, "sum_of_weights"):
+    return np.divide(  # type: ignore[no-any-return]
+        view.variance,  # type: ignore[union-attr]
+        view.sum_of_weights,  # type: ignore[union-attr]
+        out=np.full(view.sum_of_weights.shape, np.nan),  # type: ignore[union-attr]
+        where=view.sum_of_weights**2 > view.sum_of_weights_squared,  # type: ignore[union-attr]
+    )
+
+return np.divide(
+    where=view.sum_of_weights_of_weight_long**2 > view.sum_of_weights_squared,  # type: ignore
+)
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,63 +1,51 @@
+-def function(**kwargs):
+-    t = a**2 + b**3
+-    return t**2
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def function_replace_spaces(**kwargs):
+-    t = a**2 + b**3 + c**4
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def function_dont_replace_spaces():
+-    {**a, **b, **c}
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-a = 5**~4
+-b = 5 ** f()
+-c = -(5**2)
+-d = 5 ** f["hi"]
+-e = lazy(lambda **kwargs: 5)
+-f = f() ** 5
+-g = a.b**c.d
+-h = 5 ** funcs.f()
+-i = funcs.f() ** 5
+-j = super().name ** 5
+-k = [(2**idx, value) for idx, value in pairs]
+-l = mod.weights_[0] == pytest.approx(0.95**100, abs=0.001)
+-m = [([2**63], [1, 2**63])]
+-n = count <= 10**5
+-o = settings(max_examples=10**6)
+-p = {(k, k**2): v**2 for k, v in pairs}
+-q = [10**i for i in range(6)]
+-r = x**y
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
+ 
+-a = 5.0**~4.0
+-b = 5.0 ** f()
+-c = -(5.0**2.0)
+-d = 5.0 ** f["hi"]
+-e = lazy(lambda **kwargs: 5)
+-f = f() ** 5.0
+-g = a.b**c.d
+-h = 5.0 ** funcs.f()
+-i = funcs.f() ** 5.0
+-j = super().name ** 5.0
+-k = [(2.0**idx, value) for idx, value in pairs]
+-l = mod.weights_[0] == pytest.approx(0.95**100, abs=0.001)
+-m = [([2.0**63.0], [1.0, 2**63.0])]
+-n = count <= 10**5.0
+-o = settings(max_examples=10**6.0)
+-p = {(k, k**2): v**2.0 for k, v in pairs}
+-q = [10.5**i for i in range(6)]
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
+ 
+ 
+ # WE SHOULD DEFINITELY NOT EAT THESE COMMENTS (https://github.com/psf/black/issues/2873)
+-if hasattr(view, "sum_of_weights"):
+-    return np.divide(  # type: ignore[no-any-return]
+-        view.variance,  # type: ignore[union-attr]
+-        view.sum_of_weights,  # type: ignore[union-attr]
+-        out=np.full(view.sum_of_weights.shape, np.nan),  # type: ignore[union-attr]
+-        where=view.sum_of_weights**2 > view.sum_of_weights_squared,  # type: ignore[union-attr]
+-    )
++NOT_YET_IMPLEMENTED_StmtIf
+ 
+-return np.divide(
+-    where=view.sum_of_weights_of_weight_long**2 > view.sum_of_weights_squared,  # type: ignore
+-)
++NOT_YET_IMPLEMENTED_StmtReturn
+```
+
+## Ruff Output
+
+```py
+NOT_YET_IMPLEMENTED_StmtFunctionDef
+
+
+NOT_YET_IMPLEMENTED_StmtFunctionDef
+
+
+NOT_YET_IMPLEMENTED_StmtFunctionDef
+
+
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+
+
+# WE SHOULD DEFINITELY NOT EAT THESE COMMENTS (https://github.com/psf/black/issues/2873)
+NOT_YET_IMPLEMENTED_StmtIf
+
+NOT_YET_IMPLEMENTED_StmtReturn
+```
+
+## Black Output
+
+```py
+def function(**kwargs):
+    t = a**2 + b**3
+    return t**2
+
+
+def function_replace_spaces(**kwargs):
+    t = a**2 + b**3 + c**4
+
+
+def function_dont_replace_spaces():
+    {**a, **b, **c}
+
+
+a = 5**~4
+b = 5 ** f()
+c = -(5**2)
+d = 5 ** f["hi"]
+e = lazy(lambda **kwargs: 5)
+f = f() ** 5
+g = a.b**c.d
+h = 5 ** funcs.f()
+i = funcs.f() ** 5
+j = super().name ** 5
+k = [(2**idx, value) for idx, value in pairs]
+l = mod.weights_[0] == pytest.approx(0.95**100, abs=0.001)
+m = [([2**63], [1, 2**63])]
+n = count <= 10**5
+o = settings(max_examples=10**6)
+p = {(k, k**2): v**2 for k, v in pairs}
+q = [10**i for i in range(6)]
+r = x**y
+
+a = 5.0**~4.0
+b = 5.0 ** f()
+c = -(5.0**2.0)
+d = 5.0 ** f["hi"]
+e = lazy(lambda **kwargs: 5)
+f = f() ** 5.0
+g = a.b**c.d
+h = 5.0 ** funcs.f()
+i = funcs.f() ** 5.0
+j = super().name ** 5.0
+k = [(2.0**idx, value) for idx, value in pairs]
+l = mod.weights_[0] == pytest.approx(0.95**100, abs=0.001)
+m = [([2.0**63.0], [1.0, 2**63.0])]
+n = count <= 10**5.0
+o = settings(max_examples=10**6.0)
+p = {(k, k**2): v**2.0 for k, v in pairs}
+q = [10.5**i for i in range(6)]
+
+
+# WE SHOULD DEFINITELY NOT EAT THESE COMMENTS (https://github.com/psf/black/issues/2873)
+if hasattr(view, "sum_of_weights"):
+    return np.divide(  # type: ignore[no-any-return]
+        view.variance,  # type: ignore[union-attr]
+        view.sum_of_weights,  # type: ignore[union-attr]
+        out=np.full(view.sum_of_weights.shape, np.nan),  # type: ignore[union-attr]
+        where=view.sum_of_weights**2 > view.sum_of_weights_squared,  # type: ignore[union-attr]
+    )
+
+return np.divide(
+    where=view.sum_of_weights_of_weight_long**2 > view.sum_of_weights_squared,  # type: ignore
+)
+```
+
+
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__prefer_rhs_split_reformatted_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__prefer_rhs_split_reformatted_py.snap
new file mode 100644
index 0000000000000..28e6705329d0e
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__prefer_rhs_split_reformatted_py.snap
@@ -0,0 +1,93 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: snapshot
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/simple_cases/prefer_rhs_split_reformatted.py
+---
+## Input
+
+```py
+# Test cases separate from `prefer_rhs_split.py` that contains unformatted source.
+
+# Left hand side fits in a single line but will still be exploded by the
+# magic trailing comma.
+first_value, (m1, m2,), third_value = xxxxxx_yyyyyy_zzzzzz_wwwwww_uuuuuuu_vvvvvvvvvvv(
+    arg1,
+    arg2,
+)
+
+# Make when when the left side of assignment plus the opening paren "... = (" is
+# exactly line length limit + 1, it won't be split like that.
+xxxxxxxxx_yyy_zzzzzzzz[xx.xxxxxx(x_yyy_zzzzzz.xxxxx[0]), x_yyy_zzzzzz.xxxxxx(xxxx=1)] = 1
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -2,20 +2,8 @@
+ 
+ # Left hand side fits in a single line but will still be exploded by the
+ # magic trailing comma.
+-(
+-    first_value,
+-    (
+-        m1,
+-        m2,
+-    ),
+-    third_value,
+-) = xxxxxx_yyyyyy_zzzzzz_wwwwww_uuuuuuu_vvvvvvvvvvv(
+-    arg1,
+-    arg2,
+-)
++NOT_YET_IMPLEMENTED_StmtAssign
+ 
+ # Make when when the left side of assignment plus the opening paren "... = (" is
+ # exactly line length limit + 1, it won't be split like that.
+-xxxxxxxxx_yyy_zzzzzzzz[
+-    xx.xxxxxx(x_yyy_zzzzzz.xxxxx[0]), x_yyy_zzzzzz.xxxxxx(xxxx=1)
+-] = 1
++NOT_YET_IMPLEMENTED_StmtAssign
+```
+
+## Ruff Output
+
+```py
+# Test cases separate from `prefer_rhs_split.py` that contains unformatted source.
+
+# Left hand side fits in a single line but will still be exploded by the
+# magic trailing comma.
+NOT_YET_IMPLEMENTED_StmtAssign
+
+# Make when when the left side of assignment plus the opening paren "... = (" is
+# exactly line length limit + 1, it won't be split like that.
+NOT_YET_IMPLEMENTED_StmtAssign
+```
+
+## Black Output
+
+```py
+# Test cases separate from `prefer_rhs_split.py` that contains unformatted source.
+
+# Left hand side fits in a single line but will still be exploded by the
+# magic trailing comma.
+(
+    first_value,
+    (
+        m1,
+        m2,
+    ),
+    third_value,
+) = xxxxxx_yyyyyy_zzzzzz_wwwwww_uuuuuuu_vvvvvvvvvvv(
+    arg1,
+    arg2,
+)
+
+# Make when when the left side of assignment plus the opening paren "... = (" is
+# exactly line length limit + 1, it won't be split like that.
+xxxxxxxxx_yyy_zzzzzzzz[
+    xx.xxxxxx(x_yyy_zzzzzz.xxxxx[0]), x_yyy_zzzzzz.xxxxxx(xxxx=1)
+] = 1
+```
+
+
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_await_parens_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_await_parens_py.snap
index 644787aaabd06..2d1804fc958a1 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_await_parens_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_await_parens_py.snap
@@ -94,42 +94,51 @@ async def main():
 ```diff
 --- Black
 +++ Ruff
-@@ -8,59 +8,63 @@
+@@ -1,93 +1,60 @@
+-import asyncio
++NOT_YET_IMPLEMENTED_StmtImport
+ 
+ 
+ # Control example
+-async def main():
+-    await asyncio.sleep(1)
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
+ 
  
  # Remove brackets for short coroutine/task
- async def main():
+-async def main():
 -    await asyncio.sleep(1)
-+    await (asyncio.sleep(1))
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
  
  
- async def main():
+-async def main():
 -    await asyncio.sleep(1)
-+    await (asyncio.sleep(1))
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
  
  
- async def main():
+-async def main():
 -    await asyncio.sleep(1)
-+    await (asyncio.sleep(1))
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
  
  
  # Check comments
- async def main():
+-async def main():
 -    await asyncio.sleep(1)  # Hello
-+    await (asyncio.sleep(1))
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
  
  
- async def main():
+-async def main():
 -    await asyncio.sleep(1)  # Hello
-+    await (asyncio.sleep(1))  # Hello
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
  
  
- async def main():
+-async def main():
 -    await asyncio.sleep(1)  # Hello
-+    await (asyncio.sleep(1))  # Hello
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
  
  
  # Long lines
- async def main():
+-async def main():
 -    await asyncio.gather(
 -        asyncio.sleep(1),
 -        asyncio.sleep(1),
@@ -138,21 +147,12 @@ async def main():
 -        asyncio.sleep(1),
 -        asyncio.sleep(1),
 -        asyncio.sleep(1),
-+    (
-+        await asyncio.gather(
-+            asyncio.sleep(1),
-+            asyncio.sleep(1),
-+            asyncio.sleep(1),
-+            asyncio.sleep(1),
-+            asyncio.sleep(1),
-+            asyncio.sleep(1),
-+            asyncio.sleep(1),
-+        )
-     )
+-    )
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
  
  
  # Same as above but with magic trailing comma in function
- async def main():
+-async def main():
 -    await asyncio.gather(
 -        asyncio.sleep(1),
 -        asyncio.sleep(1),
@@ -161,142 +161,116 @@ async def main():
 -        asyncio.sleep(1),
 -        asyncio.sleep(1),
 -        asyncio.sleep(1),
-+    (
-+        await asyncio.gather(
-+            asyncio.sleep(1),
-+            asyncio.sleep(1),
-+            asyncio.sleep(1),
-+            asyncio.sleep(1),
-+            asyncio.sleep(1),
-+            asyncio.sleep(1),
-+            asyncio.sleep(1),
-+        )
-     )
+-    )
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
  
  
  # Cr@zY Br@ck3Tz
- async def main():
+-async def main():
 -    await black(1)
-+    await (black(1))
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
  
  
  # Keep brackets around non power operations and nested awaits
-@@ -82,11 +86,11 @@
+-async def main():
+-    await (set_of_tasks | other_set)
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
+ 
+ 
+-async def main():
+-    await (await asyncio.sleep(1))
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
+ 
+ 
+ # It's awaits all the way down...
+-async def main():
+-    await (await x)
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
+ 
+ 
+-async def main():
+-    await (yield x)
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
  
  
- async def main():
+-async def main():
 -    await (await asyncio.sleep(1))
-+    await (await (asyncio.sleep(1)))
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
  
  
- async def main():
+-async def main():
 -    await (await (await (await (await asyncio.sleep(1)))))
-+    await (await (await (await (await (asyncio.sleep(1))))))
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
  
  
- async def main():
+-async def main():
+-    await (yield)
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 ```
 
 ## Ruff Output
 
 ```py
-import asyncio
+NOT_YET_IMPLEMENTED_StmtImport
 
 
 # Control example
-async def main():
-    await asyncio.sleep(1)
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
 # Remove brackets for short coroutine/task
-async def main():
-    await (asyncio.sleep(1))
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
-async def main():
-    await (asyncio.sleep(1))
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
-async def main():
-    await (asyncio.sleep(1))
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
 # Check comments
-async def main():
-    await (asyncio.sleep(1))
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
-async def main():
-    await (asyncio.sleep(1))  # Hello
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
-async def main():
-    await (asyncio.sleep(1))  # Hello
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
 # Long lines
-async def main():
-    (
-        await asyncio.gather(
-            asyncio.sleep(1),
-            asyncio.sleep(1),
-            asyncio.sleep(1),
-            asyncio.sleep(1),
-            asyncio.sleep(1),
-            asyncio.sleep(1),
-            asyncio.sleep(1),
-        )
-    )
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
 # Same as above but with magic trailing comma in function
-async def main():
-    (
-        await asyncio.gather(
-            asyncio.sleep(1),
-            asyncio.sleep(1),
-            asyncio.sleep(1),
-            asyncio.sleep(1),
-            asyncio.sleep(1),
-            asyncio.sleep(1),
-            asyncio.sleep(1),
-        )
-    )
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
 # Cr@zY Br@ck3Tz
-async def main():
-    await (black(1))
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
 # Keep brackets around non power operations and nested awaits
-async def main():
-    await (set_of_tasks | other_set)
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
-async def main():
-    await (await asyncio.sleep(1))
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
 # It's awaits all the way down...
-async def main():
-    await (await x)
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
-async def main():
-    await (yield x)
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
-async def main():
-    await (await (asyncio.sleep(1)))
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
-async def main():
-    await (await (await (await (await (asyncio.sleep(1))))))
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
-async def main():
-    await (yield)
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_except_parens_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_except_parens_py.snap
index 2d8aa71163539..21fdd1942d4a4 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_except_parens_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_except_parens_py.snap
@@ -48,71 +48,69 @@ except (some.really.really.really.looooooooooooooooooooooooooooooooong.module.ov
 ```diff
 --- Black
 +++ Ruff
-@@ -1,7 +1,7 @@
+@@ -1,42 +1,9 @@
  # These brackets are redundant, therefore remove.
- try:
-     a.something
+-try:
+-    a.something
 -except AttributeError as err:
-+except (AttributeError) as err:
-     raise err
- 
- # This is tuple of exceptions.
-@@ -21,9 +21,7 @@
- # Test long variants.
- try:
-     a.something
+-    raise err
+-
+-# This is tuple of exceptions.
+-# Although this could be replaced with just the exception,
+-# we do not remove brackets to preserve AST.
+-try:
+-    a.something
+-except (AttributeError,) as err:
+-    raise err
+-
+-# This is a tuple of exceptions. Do not remove brackets.
+-try:
+-    a.something
+-except (AttributeError, ValueError) as err:
+-    raise err
+-
+-# Test long variants.
+-try:
+-    a.something
 -except (
 -    some.really.really.really.looooooooooooooooooooooooooooooooong.module.over89.chars.Error
 -) as err:
-+except (some.really.really.really.looooooooooooooooooooooooooooooooong.module.over89.chars.Error) as err:
-     raise err
+-    raise err
++NOT_YET_IMPLEMENTED_StmtTry
++NOT_YET_IMPLEMENTED_StmtTry
++NOT_YET_IMPLEMENTED_StmtTry
++NOT_YET_IMPLEMENTED_StmtTry
+ 
+-try:
+-    a.something
+-except (
+-    some.really.really.really.looooooooooooooooooooooooooooooooong.module.over89.chars.Error,
+-) as err:
+-    raise err
++NOT_YET_IMPLEMENTED_StmtTry
  
- try:
+-try:
+-    a.something
+-except (
+-    some.really.really.really.looooooooooooooooooooooooooooooooong.module.over89.chars.Error,
+-    some.really.really.really.looooooooooooooooooooooooooooooooong.module.over89.chars.Error,
+-) as err:
+-    raise err
++NOT_YET_IMPLEMENTED_StmtTry
 ```
 
 ## Ruff Output
 
 ```py
 # These brackets are redundant, therefore remove.
-try:
-    a.something
-except (AttributeError) as err:
-    raise err
+NOT_YET_IMPLEMENTED_StmtTry
+NOT_YET_IMPLEMENTED_StmtTry
+NOT_YET_IMPLEMENTED_StmtTry
+NOT_YET_IMPLEMENTED_StmtTry
 
-# This is tuple of exceptions.
-# Although this could be replaced with just the exception,
-# we do not remove brackets to preserve AST.
-try:
-    a.something
-except (AttributeError,) as err:
-    raise err
+NOT_YET_IMPLEMENTED_StmtTry
 
-# This is a tuple of exceptions. Do not remove brackets.
-try:
-    a.something
-except (AttributeError, ValueError) as err:
-    raise err
-
-# Test long variants.
-try:
-    a.something
-except (some.really.really.really.looooooooooooooooooooooooooooooooong.module.over89.chars.Error) as err:
-    raise err
-
-try:
-    a.something
-except (
-    some.really.really.really.looooooooooooooooooooooooooooooooong.module.over89.chars.Error,
-) as err:
-    raise err
-
-try:
-    a.something
-except (
-    some.really.really.really.looooooooooooooooooooooooooooooooong.module.over89.chars.Error,
-    some.really.really.really.looooooooooooooooooooooooooooooooong.module.over89.chars.Error,
-) as err:
-    raise err
+NOT_YET_IMPLEMENTED_StmtTry
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_for_brackets_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_for_brackets_py.snap
index 544ca7ed1fff6..dbdfdc6508a8a 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_for_brackets_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_for_brackets_py.snap
@@ -32,47 +32,57 @@ for (((((k, v))))) in d.items():
 ```diff
 --- Black
 +++ Ruff
-@@ -17,9 +17,7 @@
- for (
-     k,
-     v,
+@@ -1,27 +1,13 @@
+ # Only remove tuple brackets after `for`
+-for k, v in d.items():
+-    print(k, v)
++NOT_YET_IMPLEMENTED_StmtFor
+ 
+ # Don't touch tuple brackets after `in`
+-for module in (core, _unicodefun):
+-    if hasattr(module, "_verify_python3_env"):
+-        module._verify_python3_env = lambda: None
++NOT_YET_IMPLEMENTED_StmtFor
+ 
+ # Brackets remain for long for loop lines
+-for (
+-    why_would_anyone_choose_to_name_a_loop_variable_with_a_name_this_long,
+-    i_dont_know_but_we_should_still_check_the_behaviour_if_they_do,
+-) in d.items():
+-    print(k, v)
++NOT_YET_IMPLEMENTED_StmtFor
+ 
+-for (
+-    k,
+-    v,
 -) in (
 -    dfkasdjfldsjflkdsjflkdsjfdslkfjldsjfgkjdshgkljjdsfldgkhsdofudsfudsofajdslkfjdslkfjldisfjdffjsdlkfjdlkjjkdflskadjldkfjsalkfjdasj.items()
 -):
-+) in dfkasdjfldsjflkdsjflkdsjfdslkfjldsjfgkjdshgkljjdsfldgkhsdofudsfudsofajdslkfjdslkfjldisfjdffjsdlkfjdlkjjkdflskadjldkfjsalkfjdasj.items():
-     print(k, v)
+-    print(k, v)
++NOT_YET_IMPLEMENTED_StmtFor
  
  # Test deeply nested brackets
+-for k, v in d.items():
+-    print(k, v)
++NOT_YET_IMPLEMENTED_StmtFor
 ```
 
 ## Ruff Output
 
 ```py
 # Only remove tuple brackets after `for`
-for k, v in d.items():
-    print(k, v)
+NOT_YET_IMPLEMENTED_StmtFor
 
 # Don't touch tuple brackets after `in`
-for module in (core, _unicodefun):
-    if hasattr(module, "_verify_python3_env"):
-        module._verify_python3_env = lambda: None
+NOT_YET_IMPLEMENTED_StmtFor
 
 # Brackets remain for long for loop lines
-for (
-    why_would_anyone_choose_to_name_a_loop_variable_with_a_name_this_long,
-    i_dont_know_but_we_should_still_check_the_behaviour_if_they_do,
-) in d.items():
-    print(k, v)
+NOT_YET_IMPLEMENTED_StmtFor
 
-for (
-    k,
-    v,
-) in dfkasdjfldsjflkdsjflkdsjfdslkfjldsjfgkjdshgkljjdsfldgkhsdofudsfudsofajdslkfjdslkfjldisfjdffjsdlkfjdlkjjkdflskadjldkfjsalkfjdasj.items():
-    print(k, v)
+NOT_YET_IMPLEMENTED_StmtFor
 
 # Test deeply nested brackets
-for k, v in d.items():
-    print(k, v)
+NOT_YET_IMPLEMENTED_StmtFor
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_newline_after_code_block_open_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_newline_after_code_block_open_py.snap
new file mode 100644
index 0000000000000..65e0869219ae4
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_newline_after_code_block_open_py.snap
@@ -0,0 +1,371 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: snapshot
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/simple_cases/remove_newline_after_code_block_open.py
+---
+## Input
+
+```py
+import random
+
+
+def foo1():
+
+    print("The newline above me should be deleted!")
+
+
+def foo2():
+
+
+
+    print("All the newlines above me should be deleted!")
+
+
+def foo3():
+
+    print("No newline above me!")
+
+    print("There is a newline above me, and that's OK!")
+
+
+def foo4():
+
+    # There is a comment here
+
+    print("The newline above me should not be deleted!")
+
+
+class Foo:
+    def bar(self):
+
+        print("The newline above me should be deleted!")
+
+
+for i in range(5):
+
+    print(f"{i}) The line above me should be removed!")
+
+
+for i in range(5):
+
+
+
+    print(f"{i}) The lines above me should be removed!")
+
+
+for i in range(5):
+
+    for j in range(7):
+
+        print(f"{i}) The lines above me should be removed!")
+
+
+if random.randint(0, 3) == 0:
+
+    print("The new line above me is about to be removed!")
+
+
+if random.randint(0, 3) == 0:
+
+
+
+
+    print("The new lines above me is about to be removed!")
+
+
+if random.randint(0, 3) == 0:
+    if random.uniform(0, 1) > 0.5:
+        print("Two lines above me are about to be removed!")
+
+
+while True:
+
+    print("The newline above me should be deleted!")
+
+
+while True:
+
+
+
+    print("The newlines above me should be deleted!")
+
+
+while True:
+
+    while False:
+
+        print("The newlines above me should be deleted!")
+
+
+with open("/path/to/file.txt", mode="w") as file:
+
+    file.write("The new line above me is about to be removed!")
+
+
+with open("/path/to/file.txt", mode="w") as file:
+
+
+
+    file.write("The new lines above me is about to be removed!")
+
+
+with open("/path/to/file.txt", mode="r") as read_file:
+
+    with open("/path/to/output_file.txt", mode="w") as write_file:
+
+        write_file.writelines(read_file.readlines())
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,78 +1,56 @@
+-import random
++NOT_YET_IMPLEMENTED_StmtImport
+ 
+ 
+-def foo1():
+-    print("The newline above me should be deleted!")
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def foo2():
+-    print("All the newlines above me should be deleted!")
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def foo3():
+-    print("No newline above me!")
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+-    print("There is a newline above me, and that's OK!")
+ 
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+-def foo4():
+-    # There is a comment here
+ 
+-    print("The newline above me should not be deleted!")
++NOT_YET_IMPLEMENTED_StmtClassDef
+ 
+ 
+-class Foo:
+-    def bar(self):
+-        print("The newline above me should be deleted!")
++NOT_YET_IMPLEMENTED_StmtFor
+ 
+ 
+-for i in range(5):
+-    print(f"{i}) The line above me should be removed!")
++NOT_YET_IMPLEMENTED_StmtFor
+ 
+ 
+-for i in range(5):
+-    print(f"{i}) The lines above me should be removed!")
++NOT_YET_IMPLEMENTED_StmtFor
+ 
+ 
+-for i in range(5):
+-    for j in range(7):
+-        print(f"{i}) The lines above me should be removed!")
++NOT_YET_IMPLEMENTED_StmtIf
+ 
+ 
+-if random.randint(0, 3) == 0:
+-    print("The new line above me is about to be removed!")
+-
+-
+-if random.randint(0, 3) == 0:
+-    print("The new lines above me is about to be removed!")
++NOT_YET_IMPLEMENTED_StmtIf
+ 
+ 
+-if random.randint(0, 3) == 0:
+-    if random.uniform(0, 1) > 0.5:
+-        print("Two lines above me are about to be removed!")
++NOT_YET_IMPLEMENTED_StmtIf
+ 
+ 
+-while True:
+-    print("The newline above me should be deleted!")
++while NOT_YET_IMPLEMENTED_ExprConstant:
++    NOT_YET_IMPLEMENTED_ExprCall
+ 
+ 
+-while True:
+-    print("The newlines above me should be deleted!")
++while NOT_YET_IMPLEMENTED_ExprConstant:
++    NOT_YET_IMPLEMENTED_ExprCall
+ 
+ 
+-while True:
+-    while False:
+-        print("The newlines above me should be deleted!")
++while NOT_YET_IMPLEMENTED_ExprConstant:
++    while NOT_YET_IMPLEMENTED_ExprConstant:
++        NOT_YET_IMPLEMENTED_ExprCall
+ 
+ 
+-with open("/path/to/file.txt", mode="w") as file:
+-    file.write("The new line above me is about to be removed!")
++NOT_YET_IMPLEMENTED_StmtWith
+ 
+ 
+-with open("/path/to/file.txt", mode="w") as file:
+-    file.write("The new lines above me is about to be removed!")
++NOT_YET_IMPLEMENTED_StmtWith
+ 
+ 
+-with open("/path/to/file.txt", mode="r") as read_file:
+-    with open("/path/to/output_file.txt", mode="w") as write_file:
+-        write_file.writelines(read_file.readlines())
++NOT_YET_IMPLEMENTED_StmtWith
+```
+
+## Ruff Output
+
+```py
+NOT_YET_IMPLEMENTED_StmtImport
+
+
+NOT_YET_IMPLEMENTED_StmtFunctionDef
+
+
+NOT_YET_IMPLEMENTED_StmtFunctionDef
+
+
+NOT_YET_IMPLEMENTED_StmtFunctionDef
+
+
+NOT_YET_IMPLEMENTED_StmtFunctionDef
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtFor
+
+
+NOT_YET_IMPLEMENTED_StmtFor
+
+
+NOT_YET_IMPLEMENTED_StmtFor
+
+
+NOT_YET_IMPLEMENTED_StmtIf
+
+
+NOT_YET_IMPLEMENTED_StmtIf
+
+
+NOT_YET_IMPLEMENTED_StmtIf
+
+
+while NOT_YET_IMPLEMENTED_ExprConstant:
+    NOT_YET_IMPLEMENTED_ExprCall
+
+
+while NOT_YET_IMPLEMENTED_ExprConstant:
+    NOT_YET_IMPLEMENTED_ExprCall
+
+
+while NOT_YET_IMPLEMENTED_ExprConstant:
+    while NOT_YET_IMPLEMENTED_ExprConstant:
+        NOT_YET_IMPLEMENTED_ExprCall
+
+
+NOT_YET_IMPLEMENTED_StmtWith
+
+
+NOT_YET_IMPLEMENTED_StmtWith
+
+
+NOT_YET_IMPLEMENTED_StmtWith
+```
+
+## Black Output
+
+```py
+import random
+
+
+def foo1():
+    print("The newline above me should be deleted!")
+
+
+def foo2():
+    print("All the newlines above me should be deleted!")
+
+
+def foo3():
+    print("No newline above me!")
+
+    print("There is a newline above me, and that's OK!")
+
+
+def foo4():
+    # There is a comment here
+
+    print("The newline above me should not be deleted!")
+
+
+class Foo:
+    def bar(self):
+        print("The newline above me should be deleted!")
+
+
+for i in range(5):
+    print(f"{i}) The line above me should be removed!")
+
+
+for i in range(5):
+    print(f"{i}) The lines above me should be removed!")
+
+
+for i in range(5):
+    for j in range(7):
+        print(f"{i}) The lines above me should be removed!")
+
+
+if random.randint(0, 3) == 0:
+    print("The new line above me is about to be removed!")
+
+
+if random.randint(0, 3) == 0:
+    print("The new lines above me is about to be removed!")
+
+
+if random.randint(0, 3) == 0:
+    if random.uniform(0, 1) > 0.5:
+        print("Two lines above me are about to be removed!")
+
+
+while True:
+    print("The newline above me should be deleted!")
+
+
+while True:
+    print("The newlines above me should be deleted!")
+
+
+while True:
+    while False:
+        print("The newlines above me should be deleted!")
+
+
+with open("/path/to/file.txt", mode="w") as file:
+    file.write("The new line above me is about to be removed!")
+
+
+with open("/path/to/file.txt", mode="w") as file:
+    file.write("The new lines above me is about to be removed!")
+
+
+with open("/path/to/file.txt", mode="r") as read_file:
+    with open("/path/to/output_file.txt", mode="w") as write_file:
+        write_file.writelines(read_file.readlines())
+```
+
+
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_parens_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_parens_py.snap
index b17e75d81dcef..e0a4c09c34a82 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_parens_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_parens_py.snap
@@ -68,127 +68,148 @@ def example8():
 ```diff
 --- Black
 +++ Ruff
-@@ -1,18 +1,14 @@
- x = 1
- x = 1.2
+@@ -1,85 +1,37 @@
+-x = 1
+-x = 1.2
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
  
 -data = (
 -    "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 -).encode()
-+data = ("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").encode()
++NOT_YET_IMPLEMENTED_StmtAssign
  
  
- async def show_status():
-     while True:
-         try:
-             if report_host:
+-async def show_status():
+-    while True:
+-        try:
+-            if report_host:
 -                data = (
 -                    f"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 -                ).encode()
-+                data = (f"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").encode()
-         except Exception as e:
-             pass
+-        except Exception as e:
+-            pass
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
  
-@@ -30,15 +26,11 @@
  
+-def example():
+-    return "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- def example2():
+ 
+-def example1():
+-    return 1111111111111111111111111111111111111111111111111111111111111111111111111111111111111
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def example1point5():
+-    return 1111111111111111111111111111111111111111111111111111111111111111111111111111111111111
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def example2():
 -    return (
 -        "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 -    )
-+    return "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def example3():
+-def example3():
 -    return (
 -        1111111111111111111111111111111111111111111111111111111111111111111111111111111
 -    )
-+    return 1111111111111111111111111111111111111111111111111111111111111111111111111111111
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def example4():
+-    return True
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
  
+-def example5():
+-    return ()
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
- def example4():
+ 
+-def example6():
+-    return {a: a for a in [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17]}
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def example7():
+-    return {
+-        a: a
+-        for a in [
+-            1,
+-            2,
+-            3,
+-            4,
+-            5,
+-            6,
+-            7,
+-            8,
+-            9,
+-            10,
+-            11,
+-            12,
+-            13,
+-            14,
+-            15,
+-            16,
+-            17,
+-            18,
+-            19,
+-            20000000000000000000,
+-        ]
+-    }
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def example8():
+-    return None
++NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Ruff Output
 
 ```py
-x = 1
-x = 1.2
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
 
-data = ("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").encode()
+NOT_YET_IMPLEMENTED_StmtAssign
 
 
-async def show_status():
-    while True:
-        try:
-            if report_host:
-                data = (f"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").encode()
-        except Exception as e:
-            pass
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
 
 
-def example():
-    return "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def example1():
-    return 1111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def example1point5():
-    return 1111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def example2():
-    return "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def example3():
-    return 1111111111111111111111111111111111111111111111111111111111111111111111111111111
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def example4():
-    return True
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def example5():
-    return ()
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def example6():
-    return {a: a for a in [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17]}
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def example7():
-    return {
-        a: a
-        for a in [
-            1,
-            2,
-            3,
-            4,
-            5,
-            6,
-            7,
-            8,
-            9,
-            10,
-            11,
-            12,
-            13,
-            14,
-            15,
-            16,
-            17,
-            18,
-            19,
-            20000000000000000000,
-        ]
-    }
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def example8():
-    return None
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__return_annotation_brackets_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__return_annotation_brackets_py.snap
index 99dada1ae2f6e..b5fb72b427638 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__return_annotation_brackets_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__return_annotation_brackets_py.snap
@@ -101,115 +101,123 @@ def foo() -> tuple[int, int, int,]:
 ```diff
 --- Black
 +++ Ruff
-@@ -1,52 +1,53 @@
+@@ -1,120 +1,65 @@
  # Control
- def double(a: int) -> int:
+-def double(a: int) -> int:
 -    return 2 * a
-+    return 2
-+    * a
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
  # Remove the brackets
- def double(a: int) -> int:
+-def double(a: int) -> int:
 -    return 2 * a
-+    return 2
-+    * a
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
  # Some newline variations
- def double(a: int) -> int:
+-def double(a: int) -> int:
 -    return 2 * a
-+    return 2
-+    * a
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def double(a: int) -> int:
+-def double(a: int) -> int:
 -    return 2 * a
-+    return 2
-+    * a
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def double(a: int) -> int:
+-def double(a: int) -> int:
 -    return 2 * a
-+    return 2
-+    * a
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
  # Don't lose the comments
- def double(a: int) -> int:  # Hello
+-def double(a: int) -> int:  # Hello
 -    return 2 * a
-+    return 2
-+    * a
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
 -def double(a: int) -> int:  # Hello
 -    return 2 * a
-+def double(a: int) -> int:
-+    return 2
-+    * a
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
  # Really long annotations
 -def foo() -> (
 -    intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds
 -):
-+def foo() -> intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds:
-     return 2
+-    return 2
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
 -def foo() -> (
 -    intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds
 -):
-+def foo() -> intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds:
-     return 2
+-    return 2
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
 -def foo() -> (
 -    intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds
 -    | intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds
 -):
-+def foo() -> intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds
-+| intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds:
-     return 2
+-    return 2
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
  
+-def foo(
+-    a: int,
+-    b: int,
+-    c: int,
+-) -> intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds:
+-    return 2
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
-@@ -62,10 +63,8 @@
-     a: int,
-     b: int,
-     c: int,
+ 
+-def foo(
+-    a: int,
+-    b: int,
+-    c: int,
 -) -> (
 -    intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds
 -    | intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds
 -):
-+) -> intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds
-+| intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds:
-     return 2
+-    return 2
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+ # Split args but no need to split return
+-def foo(
+-    a: int,
+-    b: int,
+-    c: int,
+-) -> int:
+-    return 2
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
-@@ -81,16 +80,16 @@
  # Deeply nested brackets
  # with *interesting* spacing
- def double(a: int) -> int:
+-def double(a: int) -> int:
 -    return 2 * a
-+    return 2
-+    * a
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
- def double(a: int) -> int:
+-def double(a: int) -> int:
 -    return 2 * a
-+    return 2
-+    * a
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
 -def foo() -> (
 -    intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds
 -):
-+def foo() -> intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds:
-     return 2
+-    return 2
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
-@@ -99,22 +98,18 @@
-     return 2
+ # Return type with commas
+-def foo() -> tuple[int, int, int]:
+-    return 2
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
 -def foo() -> (
@@ -219,12 +227,8 @@ def foo() -> tuple[int, int, int,]:
 -        loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong,
 -    ]
 -):
-+def foo() -> tuple[
-+    loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong,
-+    loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong,
-+    loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong,
-+]:
-     return 2
+-    return 2
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
  # Magic trailing comma example
@@ -235,132 +239,78 @@ def foo() -> tuple[int, int, int,]:
 -        int,
 -    ]
 -):
-+def foo() -> tuple[
-+    int,
-+    int,
-+    int,
-+]:
-     return 2
+-    return 2
++NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Ruff Output
 
 ```py
 # Control
-def double(a: int) -> int:
-    return 2
-    * a
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # Remove the brackets
-def double(a: int) -> int:
-    return 2
-    * a
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # Some newline variations
-def double(a: int) -> int:
-    return 2
-    * a
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def double(a: int) -> int:
-    return 2
-    * a
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def double(a: int) -> int:
-    return 2
-    * a
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # Don't lose the comments
-def double(a: int) -> int:  # Hello
-    return 2
-    * a
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def double(a: int) -> int:
-    return 2
-    * a
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # Really long annotations
-def foo() -> intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds:
-    return 2
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def foo() -> intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds:
-    return 2
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def foo() -> intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds
-| intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds:
-    return 2
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def foo(
-    a: int,
-    b: int,
-    c: int,
-) -> intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds:
-    return 2
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def foo(
-    a: int,
-    b: int,
-    c: int,
-) -> intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds
-| intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds:
-    return 2
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # Split args but no need to split return
-def foo(
-    a: int,
-    b: int,
-    c: int,
-) -> int:
-    return 2
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # Deeply nested brackets
 # with *interesting* spacing
-def double(a: int) -> int:
-    return 2
-    * a
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def double(a: int) -> int:
-    return 2
-    * a
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def foo() -> intsdfsafafafdfdsasdfsfsdfasdfafdsafdfdsfasdskdsdsfdsafdsafsdfdasfffsfdsfdsafafhdskfhdsfjdslkfdlfsdkjhsdfjkdshfkljds:
-    return 2
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # Return type with commas
-def foo() -> tuple[int, int, int]:
-    return 2
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def foo() -> tuple[
-    loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong,
-    loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong,
-    loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong,
-]:
-    return 2
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # Magic trailing comma example
-def foo() -> tuple[
-    int,
-    int,
-    int,
-]:
-    return 2
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__skip_magic_trailing_comma_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__skip_magic_trailing_comma_py.snap
index 8bd41e4df11e1..8e328ab3892dd 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__skip_magic_trailing_comma_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__skip_magic_trailing_comma_py.snap
@@ -60,146 +60,75 @@ func(
 ```diff
 --- Black
 +++ Ruff
-@@ -3,23 +3,61 @@
- b = tuple[int,]
+@@ -1,25 +1,25 @@
+ # We should not remove the trailing comma in a single-element subscript.
+-a: tuple[int,]
+-b = tuple[int,]
++NOT_YET_IMPLEMENTED_StmtAnnAssign
++NOT_YET_IMPLEMENTED_StmtAssign
  
  # But commas in multiple element subscripts should be removed.
 -c: tuple[int, int]
 -d = tuple[int, int]
-+c: tuple[
-+    int,
-+    int,
-+]
-+d = tuple[
-+    int,
-+    int,
-+]
++NOT_YET_IMPLEMENTED_StmtAnnAssign
++NOT_YET_IMPLEMENTED_StmtAssign
  
  # Remove commas for non-subscripts.
 -small_list = [1]
 -list_of_types = [tuple[int,]]
 -small_set = {1}
 -set_of_types = {tuple[int,]}
-+small_list = [
-+    1,
-+]
-+list_of_types = [
-+    tuple[int,],
-+]
-+small_set = {
-+    1,
-+}
-+set_of_types = {
-+    tuple[int,],
-+}
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
  
  # Except single element tuples
- small_tuple = (1,)
+-small_tuple = (1,)
++NOT_YET_IMPLEMENTED_StmtAssign
  
  # Trailing commas in multiple chained non-nested parens.
 -zero(one).two(three).four(five)
-+zero(
-+    one,
-+).two(
-+    three,
-+).four(
-+    five,
-+)
++NOT_YET_IMPLEMENTED_ExprCall
  
 -func1(arg1).func2(arg2).func3(arg3).func4(arg4).func5(arg5)
-+func1(arg1).func2(
-+    arg2,
-+).func3(arg3).func4(
-+    arg4,
-+).func5(arg5)
++NOT_YET_IMPLEMENTED_ExprCall
  
 -(a, b, c, d) = func1(arg1) and func2(arg2)
-+(
-+    a,
-+    b,
-+    c,
-+    d,
-+) = func1(arg1) and func2(arg2)
++NOT_YET_IMPLEMENTED_StmtAssign
  
 -func(argument1, (one, two), argument4, argument5, argument6)
-+func(
-+    argument1,
-+    (
-+        one,
-+        two,
-+    ),
-+    argument4,
-+    argument5,
-+    argument6,
-+)
++NOT_YET_IMPLEMENTED_ExprCall
 ```
 
 ## Ruff Output
 
 ```py
 # We should not remove the trailing comma in a single-element subscript.
-a: tuple[int,]
-b = tuple[int,]
+NOT_YET_IMPLEMENTED_StmtAnnAssign
+NOT_YET_IMPLEMENTED_StmtAssign
 
 # But commas in multiple element subscripts should be removed.
-c: tuple[
-    int,
-    int,
-]
-d = tuple[
-    int,
-    int,
-]
+NOT_YET_IMPLEMENTED_StmtAnnAssign
+NOT_YET_IMPLEMENTED_StmtAssign
 
 # Remove commas for non-subscripts.
-small_list = [
-    1,
-]
-list_of_types = [
-    tuple[int,],
-]
-small_set = {
-    1,
-}
-set_of_types = {
-    tuple[int,],
-}
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
 
 # Except single element tuples
-small_tuple = (1,)
+NOT_YET_IMPLEMENTED_StmtAssign
 
 # Trailing commas in multiple chained non-nested parens.
-zero(
-    one,
-).two(
-    three,
-).four(
-    five,
-)
+NOT_YET_IMPLEMENTED_ExprCall
 
-func1(arg1).func2(
-    arg2,
-).func3(arg3).func4(
-    arg4,
-).func5(arg5)
+NOT_YET_IMPLEMENTED_ExprCall
 
-(
-    a,
-    b,
-    c,
-    d,
-) = func1(arg1) and func2(arg2)
+NOT_YET_IMPLEMENTED_StmtAssign
 
-func(
-    argument1,
-    (
-        one,
-        two,
-    ),
-    argument4,
-    argument5,
-    argument6,
-)
+NOT_YET_IMPLEMENTED_ExprCall
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__slices_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__slices_py.snap
new file mode 100644
index 0000000000000..c862c14f5e659
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__slices_py.snap
@@ -0,0 +1,276 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: snapshot
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/simple_cases/slices.py
+---
+## Input
+
+```py
+slice[a.b : c.d]
+slice[d :: d + 1]
+slice[d + 1 :: d]
+slice[d::d]
+slice[0]
+slice[-1]
+slice[:-1]
+slice[::-1]
+slice[:c, c - 1]
+slice[c, c + 1, d::]
+slice[ham[c::d] :: 1]
+slice[ham[cheese**2 : -1] : 1 : 1, ham[1:2]]
+slice[:-1:]
+slice[lambda: None : lambda: None]
+slice[lambda x, y, *args, really=2, **kwargs: None :, None::]
+slice[1 or 2 : True and False]
+slice[not so_simple : 1 < val <= 10]
+slice[(1 for i in range(42)) : x]
+slice[:: [i for i in range(42)]]
+
+
+async def f():
+    slice[await x : [i async for i in arange(42)] : 42]
+
+
+# These are from PEP-8:
+ham[1:9], ham[1:9:3], ham[:9:3], ham[1::3], ham[1:9:]
+ham[lower:upper], ham[lower:upper:], ham[lower::step]
+# ham[lower+offset : upper+offset]
+ham[: upper_fn(x) : step_fn(x)], ham[:: step_fn(x)]
+ham[lower + offset : upper + offset]
+
+slice[::, ::]
+slice[
+    # A
+    :
+    # B
+    :
+    # C
+]
+slice[
+    # A
+    1:
+    # B
+    2:
+    # C
+    3
+]
+
+slice[
+    # A
+    1
+    + 2 :
+    # B
+    3 :
+    # C
+    4
+]
+x[
+    1:  # A
+    2:  # B
+    3  # C
+]
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,59 +1,37 @@
+-slice[a.b : c.d]
+-slice[d :: d + 1]
+-slice[d + 1 :: d]
+-slice[d::d]
+-slice[0]
+-slice[-1]
+-slice[:-1]
+-slice[::-1]
+-slice[:c, c - 1]
+-slice[c, c + 1, d::]
+-slice[ham[c::d] :: 1]
+-slice[ham[cheese**2 : -1] : 1 : 1, ham[1:2]]
+-slice[:-1:]
+-slice[lambda: None : lambda: None]
+-slice[lambda x, y, *args, really=2, **kwargs: None :, None::]
+-slice[1 or 2 : True and False]
+-slice[not so_simple : 1 < val <= 10]
+-slice[(1 for i in range(42)) : x]
+-slice[:: [i for i in range(42)]]
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
+ 
+ 
+-async def f():
+-    slice[await x : [i async for i in arange(42)] : 42]
++NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
+ 
+ 
+ # These are from PEP-8:
+-ham[1:9], ham[1:9:3], ham[:9:3], ham[1::3], ham[1:9:]
+-ham[lower:upper], ham[lower:upper:], ham[lower::step]
++NOT_YET_IMPLEMENTED_ExprTuple
++NOT_YET_IMPLEMENTED_ExprTuple
+ # ham[lower+offset : upper+offset]
+-ham[: upper_fn(x) : step_fn(x)], ham[:: step_fn(x)]
+-ham[lower + offset : upper + offset]
++NOT_YET_IMPLEMENTED_ExprTuple
++NOT_YET_IMPLEMENTED_ExprSubscript
+ 
+-slice[::, ::]
+-slice[
+-    # A
+-    :
+-    # B
+-    :
+-    # C
+-]
+-slice[
+-    # A
+-    1:
+-    # B
+-    2:
+-    # C
+-    3
+-]
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
+ 
+-slice[
+-    # A
+-    1
+-    + 2 :
+-    # B
+-    3 :
+-    # C
+-    4
+-]
+-x[1:2:3]  # A  # B  # C
++NOT_YET_IMPLEMENTED_ExprSubscript
++NOT_YET_IMPLEMENTED_ExprSubscript
+```
+
+## Ruff Output
+
+```py
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+
+
+NOT_YET_IMPLEMENTED_StmtAsyncFunctionDef
+
+
+# These are from PEP-8:
+NOT_YET_IMPLEMENTED_ExprTuple
+NOT_YET_IMPLEMENTED_ExprTuple
+# ham[lower+offset : upper+offset]
+NOT_YET_IMPLEMENTED_ExprTuple
+NOT_YET_IMPLEMENTED_ExprSubscript
+
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+
+NOT_YET_IMPLEMENTED_ExprSubscript
+NOT_YET_IMPLEMENTED_ExprSubscript
+```
+
+## Black Output
+
+```py
+slice[a.b : c.d]
+slice[d :: d + 1]
+slice[d + 1 :: d]
+slice[d::d]
+slice[0]
+slice[-1]
+slice[:-1]
+slice[::-1]
+slice[:c, c - 1]
+slice[c, c + 1, d::]
+slice[ham[c::d] :: 1]
+slice[ham[cheese**2 : -1] : 1 : 1, ham[1:2]]
+slice[:-1:]
+slice[lambda: None : lambda: None]
+slice[lambda x, y, *args, really=2, **kwargs: None :, None::]
+slice[1 or 2 : True and False]
+slice[not so_simple : 1 < val <= 10]
+slice[(1 for i in range(42)) : x]
+slice[:: [i for i in range(42)]]
+
+
+async def f():
+    slice[await x : [i async for i in arange(42)] : 42]
+
+
+# These are from PEP-8:
+ham[1:9], ham[1:9:3], ham[:9:3], ham[1::3], ham[1:9:]
+ham[lower:upper], ham[lower:upper:], ham[lower::step]
+# ham[lower+offset : upper+offset]
+ham[: upper_fn(x) : step_fn(x)], ham[:: step_fn(x)]
+ham[lower + offset : upper + offset]
+
+slice[::, ::]
+slice[
+    # A
+    :
+    # B
+    :
+    # C
+]
+slice[
+    # A
+    1:
+    # B
+    2:
+    # C
+    3
+]
+
+slice[
+    # A
+    1
+    + 2 :
+    # B
+    3 :
+    # C
+    4
+]
+x[1:2:3]  # A  # B  # C
+```
+
+
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__string_prefixes_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__string_prefixes_py.snap
index f2f517943447d..b0a462f74da35 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__string_prefixes_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__string_prefixes_py.snap
@@ -33,21 +33,36 @@ def docstring_multiline():
 ```diff
 --- Black
 +++ Ruff
-@@ -1,12 +1,12 @@
+@@ -1,20 +1,16 @@
  #!/usr/bin/env python3
  
- name = "Łukasz"
+-name = "Łukasz"
 -(f"hello {name}", f"hello {name}")
-+(f"hello {name}", F"hello {name}")
- (b"", b"")
- ("", "")
- (r"", R"")
+-(b"", b"")
+-("", "")
+-(r"", R"")
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_ExprTuple
++NOT_YET_IMPLEMENTED_ExprTuple
++NOT_YET_IMPLEMENTED_ExprTuple
++NOT_YET_IMPLEMENTED_ExprTuple
  
 -(rf"", rf"", Rf"", Rf"", rf"", rf"", Rf"", Rf"")
-+(rf"", fr"", Rf"", fR"", rF"", Fr"", RF"", FR"")
- (rb"", rb"", Rb"", Rb"", rb"", rb"", Rb"", Rb"")
+-(rb"", rb"", Rb"", Rb"", rb"", rb"", Rb"", Rb"")
++NOT_YET_IMPLEMENTED_ExprTuple
++NOT_YET_IMPLEMENTED_ExprTuple
  
  
+-def docstring_singleline():
+-    R"""2020 was one hell of a year. The good news is that we were able to"""
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+-def docstring_multiline():
+-    R"""
+-    clear out all of the issues opened in that time :p
+-    """
++NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Ruff Output
@@ -55,24 +70,20 @@ def docstring_multiline():
 ```py
 #!/usr/bin/env python3
 
-name = "Łukasz"
-(f"hello {name}", F"hello {name}")
-(b"", b"")
-("", "")
-(r"", R"")
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_ExprTuple
+NOT_YET_IMPLEMENTED_ExprTuple
+NOT_YET_IMPLEMENTED_ExprTuple
+NOT_YET_IMPLEMENTED_ExprTuple
 
-(rf"", fr"", Rf"", fR"", rF"", Fr"", RF"", FR"")
-(rb"", rb"", Rb"", Rb"", rb"", rb"", Rb"", Rb"")
+NOT_YET_IMPLEMENTED_ExprTuple
+NOT_YET_IMPLEMENTED_ExprTuple
 
 
-def docstring_singleline():
-    R"""2020 was one hell of a year. The good news is that we were able to"""
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-def docstring_multiline():
-    R"""
-    clear out all of the issues opened in that time :p
-    """
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__torture_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__torture_py.snap
index f59b077951ccc..68d336c517eba 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__torture_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__torture_py.snap
@@ -42,13 +42,14 @@ assert (
 ```diff
 --- Black
 +++ Ruff
-@@ -1,21 +1,23 @@
+@@ -1,58 +1,20 @@
  importA
  (
-     ()
+-    ()
 -    << 0
 -    ** 101234234242352525425252352352525234890264906820496920680926538059059209922523523525
-+    << 0**101234234242352525425252352352525234890264906820496920680926538059059209922523523525
++    NOT_YET_IMPLEMENTED_ExprTuple
++    << NOT_YET_IMPLEMENTED_ExprConstant**NOT_YET_IMPLEMENTED_ExprConstant
  )  #
  
 -assert sort_by_dependency(
@@ -62,68 +63,52 @@ assert (
 -        "3b": set(),
 -    }
 -) == ["2a", "2b", "2", "3a", "3b", "3", "1"]
-+assert (
-+    sort_by_dependency(
-+        {
-+            "1": {"2", "3"},
-+            "2": {"2a", "2b"},
-+            "3": {"3a", "3b"},
-+            "2a": set(),
-+            "2b": set(),
-+            "3a": set(),
-+            "3b": set(),
-+        }
-+    )
-+    == ["2a", "2b", "2", "3a", "3b", "3", "1"]
-+)
++NOT_YET_IMPLEMENTED_StmtAssert
  
  importA
- 0
-@@ -25,13 +27,12 @@
- class A:
-     def foo(self):
-         for _ in range(10):
+-0
+-0 ^ 0  #
++NOT_YET_IMPLEMENTED_ExprConstant
++NOT_YET_IMPLEMENTED_ExprConstant ^ NOT_YET_IMPLEMENTED_ExprConstant  #
+ 
+ 
+-class A:
+-    def foo(self):
+-        for _ in range(10):
 -            aaaaaaaaaaaaaaaaaaa = bbbbbbbbbbbbbbb.cccccccccc(
 -                xxxxxxxxxxxx
 -            )  # pylint: disable=no-member
-+            aaaaaaaaaaaaaaaaaaa = bbbbbbbbbbbbbbb.cccccccccc(xxxxxxxxxxxx)  # pylint: disable=no-member
++NOT_YET_IMPLEMENTED_StmtClassDef
  
  
- def test(self, othr):
+-def test(self, othr):
 -    return 1 == 2 and (
-+    return 1 == 2
-+    and (
-         name,
-         description,
-         self.default,
-@@ -40,7 +41,8 @@
-         self.parameters,
-         self.meta_data,
-         self.schedule,
+-        name,
+-        description,
+-        self.default,
+-        self.selected,
+-        self.auto_generated,
+-        self.parameters,
+-        self.meta_data,
+-        self.schedule,
 -    ) == (
-+    )
-+    == (
-         name,
-         description,
-         othr.default,
-@@ -52,7 +54,13 @@
-     )
+-        name,
+-        description,
+-        othr.default,
+-        othr.selected,
+-        othr.auto_generated,
+-        othr.parameters,
+-        othr.meta_data,
+-        othr.schedule,
+-    )
++NOT_YET_IMPLEMENTED_StmtFunctionDef
  
  
 -assert a_function(
 -    very_long_arguments_that_surpass_the_limit,
 -    which_is_eighty_eight_in_this_case_plus_a_bit_more,
 -) == {"x": "this need to pass the line limit as well", "b": "but only by a little bit"}
-+assert (
-+    a_function(
-+        very_long_arguments_that_surpass_the_limit,
-+        which_is_eighty_eight_in_this_case_plus_a_bit_more,
-+    )
-+    == {
-+        "x": "this need to pass the line limit as well",
-+        "b": "but only by a little bit",
-+    }
-+)
++NOT_YET_IMPLEMENTED_StmtAssert
 ```
 
 ## Ruff Output
@@ -131,70 +116,24 @@ assert (
 ```py
 importA
 (
-    ()
-    << 0**101234234242352525425252352352525234890264906820496920680926538059059209922523523525
+    NOT_YET_IMPLEMENTED_ExprTuple
+    << NOT_YET_IMPLEMENTED_ExprConstant**NOT_YET_IMPLEMENTED_ExprConstant
 )  #
 
-assert (
-    sort_by_dependency(
-        {
-            "1": {"2", "3"},
-            "2": {"2a", "2b"},
-            "3": {"3a", "3b"},
-            "2a": set(),
-            "2b": set(),
-            "3a": set(),
-            "3b": set(),
-        }
-    )
-    == ["2a", "2b", "2", "3a", "3b", "3", "1"]
-)
+NOT_YET_IMPLEMENTED_StmtAssert
 
 importA
-0
-0 ^ 0  #
+NOT_YET_IMPLEMENTED_ExprConstant
+NOT_YET_IMPLEMENTED_ExprConstant ^ NOT_YET_IMPLEMENTED_ExprConstant  #
 
 
-class A:
-    def foo(self):
-        for _ in range(10):
-            aaaaaaaaaaaaaaaaaaa = bbbbbbbbbbbbbbb.cccccccccc(xxxxxxxxxxxx)  # pylint: disable=no-member
+NOT_YET_IMPLEMENTED_StmtClassDef
 
 
-def test(self, othr):
-    return 1 == 2
-    and (
-        name,
-        description,
-        self.default,
-        self.selected,
-        self.auto_generated,
-        self.parameters,
-        self.meta_data,
-        self.schedule,
-    )
-    == (
-        name,
-        description,
-        othr.default,
-        othr.selected,
-        othr.auto_generated,
-        othr.parameters,
-        othr.meta_data,
-        othr.schedule,
-    )
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
-assert (
-    a_function(
-        very_long_arguments_that_surpass_the_limit,
-        which_is_eighty_eight_in_this_case_plus_a_bit_more,
-    )
-    == {
-        "x": "this need to pass the line limit as well",
-        "b": "but only by a little bit",
-    }
-)
+NOT_YET_IMPLEMENTED_StmtAssert
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens1_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens1_py.snap
index 3511af0fc9490..dd2cf4c4ade42 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens1_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens1_py.snap
@@ -38,88 +38,59 @@ class A:
 ```diff
 --- Black
 +++ Ruff
-@@ -1,7 +1,6 @@
+@@ -1,34 +1,9 @@
 -if e1234123412341234.winerror not in (
 -    _winapi.ERROR_SEM_TIMEOUT,
 -    _winapi.ERROR_PIPE_BUSY,
 -) or _check_timeout(t):
-+if e1234123412341234.winerror
-+not in (_winapi.ERROR_SEM_TIMEOUT, _winapi.ERROR_PIPE_BUSY)
-+or _check_timeout(t):
-     pass
+-    pass
++NOT_YET_IMPLEMENTED_StmtIf
  
- if x:
-@@ -21,14 +20,20 @@
-             "Your password must contain at least %(min_length)d character.",
-             "Your password must contain at least %(min_length)d characters.",
-             self.min_length,
+-if x:
+-    if y:
+-        new_id = (
+-            max(
+-                Vegetable.objects.order_by("-id")[0].id,
+-                Mineral.objects.order_by("-id")[0].id,
+-            )
+-            + 1
+-        )
++NOT_YET_IMPLEMENTED_StmtIf
+ 
+ 
+-class X:
+-    def get_help_text(self):
+-        return ngettext(
+-            "Your password must contain at least %(min_length)d character.",
+-            "Your password must contain at least %(min_length)d characters.",
+-            self.min_length,
 -        ) % {"min_length": self.min_length}
-+        )
-+        % {"min_length": self.min_length}
++NOT_YET_IMPLEMENTED_StmtClassDef
  
  
- class A:
-     def b(self):
+-class A:
+-    def b(self):
 -        if self.connection.mysql_is_mariadb and (
 -            10,
 -            4,
 -            3,
 -        ) < self.connection.mysql_version < (10, 5, 2):
-+        if (
-+            self.connection.mysql_is_mariadb
-+            and (
-+                10,
-+                4,
-+                3,
-+            )
-+            < self.connection.mysql_version
-+            < (10, 5, 2)
-+        ):
-             pass
+-            pass
++NOT_YET_IMPLEMENTED_StmtClassDef
 ```
 
 ## Ruff Output
 
 ```py
-if e1234123412341234.winerror
-not in (_winapi.ERROR_SEM_TIMEOUT, _winapi.ERROR_PIPE_BUSY)
-or _check_timeout(t):
-    pass
+NOT_YET_IMPLEMENTED_StmtIf
 
-if x:
-    if y:
-        new_id = (
-            max(
-                Vegetable.objects.order_by("-id")[0].id,
-                Mineral.objects.order_by("-id")[0].id,
-            )
-            + 1
-        )
+NOT_YET_IMPLEMENTED_StmtIf
 
 
-class X:
-    def get_help_text(self):
-        return ngettext(
-            "Your password must contain at least %(min_length)d character.",
-            "Your password must contain at least %(min_length)d characters.",
-            self.min_length,
-        )
-        % {"min_length": self.min_length}
+NOT_YET_IMPLEMENTED_StmtClassDef
 
 
-class A:
-    def b(self):
-        if (
-            self.connection.mysql_is_mariadb
-            and (
-                10,
-                4,
-                3,
-            )
-            < self.connection.mysql_version
-            < (10, 5, 2)
-        ):
-            pass
+NOT_YET_IMPLEMENTED_StmtClassDef
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens2_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens2_py.snap
index edc16d0dce1ff..6512172b1d9b2 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens2_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens2_py.snap
@@ -16,27 +16,20 @@ if (e123456.get_tk_patchlevel() >= (8, 6, 0, 'final') or
 ```diff
 --- Black
 +++ Ruff
-@@ -1,6 +1,5 @@
+@@ -1,6 +1 @@
 -if e123456.get_tk_patchlevel() >= (8, 6, 0, "final") or (
 -    8,
 -    5,
 -    8,
 -) <= get_tk_patchlevel() < (8, 6):
-+if (
-+    e123456.get_tk_patchlevel() >= (8, 6, 0, "final")
-+    or (8, 5, 8) <= get_tk_patchlevel() < (8, 6)
-+):
-     pass
+-    pass
++NOT_YET_IMPLEMENTED_StmtIf
 ```
 
 ## Ruff Output
 
 ```py
-if (
-    e123456.get_tk_patchlevel() >= (8, 6, 0, "final")
-    or (8, 5, 8) <= get_tk_patchlevel() < (8, 6)
-):
-    pass
+NOT_YET_IMPLEMENTED_StmtIf
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens3_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens3_py.snap
index c7af64f403b9c..cd0d0a2216529 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens3_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens3_py.snap
@@ -21,27 +21,22 @@ if True:
 ```diff
 --- Black
 +++ Ruff
-@@ -5,4 +5,5 @@
-                 "qweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweas "
-                 + "qweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqwegqweasdzxcqweasdzxc.",
-                 "qweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqwe",
+@@ -1,8 +1 @@
+-if True:
+-    if True:
+-        if True:
+-            return _(
+-                "qweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweas "
+-                + "qweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqwegqweasdzxcqweasdzxc.",
+-                "qweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqwe",
 -            ) % {"reported_username": reported_username, "report_reason": report_reason}
-+            )
-+            % {"reported_username": reported_username, "report_reason": report_reason}
++NOT_YET_IMPLEMENTED_StmtIf
 ```
 
 ## Ruff Output
 
 ```py
-if True:
-    if True:
-        if True:
-            return _(
-                "qweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweas "
-                + "qweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqwegqweasdzxcqweasdzxc.",
-                "qweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqwe",
-            )
-            % {"reported_username": reported_username, "report_reason": report_reason}
+NOT_YET_IMPLEMENTED_StmtIf
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_commas_in_leading_parts_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_commas_in_leading_parts_py.snap
index c32d073085182..4e8beee76633a 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_commas_in_leading_parts_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_commas_in_leading_parts_py.snap
@@ -46,78 +46,89 @@ assert xxxxxxxxx.xxxxxxxxx.xxxxxxxxx(
 ```diff
 --- Black
 +++ Ruff
-@@ -20,9 +20,7 @@
-     b,
-     c,
-     d,
+@@ -1,50 +1,20 @@
+-zero(
+-    one,
+-).two(
+-    three,
+-).four(
+-    five,
+-)
++NOT_YET_IMPLEMENTED_ExprCall
+ 
+-func1(arg1).func2(
+-    arg2,
+-).func3(arg3).func4(
+-    arg4,
+-).func5(arg5)
++NOT_YET_IMPLEMENTED_ExprCall
+ 
+ # Inner one-element tuple shouldn't explode
+-func1(arg1).func2(arg1, (one_tuple,)).func3(arg3)
++NOT_YET_IMPLEMENTED_ExprCall
+ 
+-(
+-    a,
+-    b,
+-    c,
+-    d,
 -) = func1(
 -    arg1
 -) and func2(arg2)
-+) = func1(arg1) and func2(arg2)
++NOT_YET_IMPLEMENTED_StmtAssign
  
  
  # Example from https://github.com/psf/black/issues/3229
-@@ -43,8 +41,6 @@
- )
+-def refresh_token(self, device_family, refresh_token, api_key):
+-    return self.orchestration.refresh_token(
+-        data={
+-            "refreshToken": refresh_token,
+-        },
+-        api_key=api_key,
+-    )["extensions"]["sdk"]["token"]
++NOT_YET_IMPLEMENTED_StmtFunctionDef
+ 
+ 
+ # Edge case where a bug in a working-in-progress version of
+ # https://github.com/psf/black/pull/3370 causes an infinite recursion.
+-assert (
+-    long_module.long_class.long_func().another_func()
+-    == long_module.long_class.long_func()["some_key"].another_func(arg1)
+-)
++NOT_YET_IMPLEMENTED_StmtAssert
  
  # Regression test for https://github.com/psf/black/issues/3414.
 -assert xxxxxxxxx.xxxxxxxxx.xxxxxxxxx(
 -    xxxxxxxxx
 -).xxxxxxxxxxxxxxxxxx(), (
-+assert xxxxxxxxx.xxxxxxxxx.xxxxxxxxx(xxxxxxxxx).xxxxxxxxxxxxxxxxxx(), (
-     "xxx {xxxxxxxxx} xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
- )
+-    "xxx {xxxxxxxxx} xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+-)
++NOT_YET_IMPLEMENTED_StmtAssert
 ```
 
 ## Ruff Output
 
 ```py
-zero(
-    one,
-).two(
-    three,
-).four(
-    five,
-)
+NOT_YET_IMPLEMENTED_ExprCall
 
-func1(arg1).func2(
-    arg2,
-).func3(arg3).func4(
-    arg4,
-).func5(arg5)
+NOT_YET_IMPLEMENTED_ExprCall
 
 # Inner one-element tuple shouldn't explode
-func1(arg1).func2(arg1, (one_tuple,)).func3(arg3)
+NOT_YET_IMPLEMENTED_ExprCall
 
-(
-    a,
-    b,
-    c,
-    d,
-) = func1(arg1) and func2(arg2)
+NOT_YET_IMPLEMENTED_StmtAssign
 
 
 # Example from https://github.com/psf/black/issues/3229
-def refresh_token(self, device_family, refresh_token, api_key):
-    return self.orchestration.refresh_token(
-        data={
-            "refreshToken": refresh_token,
-        },
-        api_key=api_key,
-    )["extensions"]["sdk"]["token"]
+NOT_YET_IMPLEMENTED_StmtFunctionDef
 
 
 # Edge case where a bug in a working-in-progress version of
 # https://github.com/psf/black/pull/3370 causes an infinite recursion.
-assert (
-    long_module.long_class.long_func().another_func()
-    == long_module.long_class.long_func()["some_key"].another_func(arg1)
-)
+NOT_YET_IMPLEMENTED_StmtAssert
 
 # Regression test for https://github.com/psf/black/issues/3414.
-assert xxxxxxxxx.xxxxxxxxx.xxxxxxxxx(xxxxxxxxx).xxxxxxxxxxxxxxxxxx(), (
-    "xxx {xxxxxxxxx} xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-)
+NOT_YET_IMPLEMENTED_StmtAssert
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__tricky_unicode_symbols_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__tricky_unicode_symbols_py.snap
new file mode 100644
index 0000000000000..c288ae7783a58
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__tricky_unicode_symbols_py.snap
@@ -0,0 +1,73 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: snapshot
+input_file: crates/ruff_python_formatter/resources/test/fixtures/black/simple_cases/tricky_unicode_symbols.py
+---
+## Input
+
+```py
+ä = 1
+µ = 2
+蟒 = 3
+x󠄀 = 4
+មុ = 1
+Q̇_per_meter = 4
+
+A᧚ = 3
+A፩ = 8
+```
+
+## Black Differences
+
+```diff
+--- Black
++++ Ruff
+@@ -1,9 +1,9 @@
+-ä = 1
+-µ = 2
+-蟒 = 3
+-x󠄀 = 4
+-មុ = 1
+-Q̇_per_meter = 4
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
+ 
+-A᧚ = 3
+-A፩ = 8
++NOT_YET_IMPLEMENTED_StmtAssign
++NOT_YET_IMPLEMENTED_StmtAssign
+```
+
+## Ruff Output
+
+```py
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+```
+
+## Black Output
+
+```py
+ä = 1
+µ = 2
+蟒 = 3
+x󠄀 = 4
+មុ = 1
+Q̇_per_meter = 4
+
+A᧚ = 3
+A፩ = 8
+```
+
+
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__tupleassign_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__tupleassign_py.snap
index d5bdb5382dc11..6a0ef755cd56c 100644
--- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__tupleassign_py.snap
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__tupleassign_py.snap
@@ -20,32 +20,34 @@ this_will_be_wrapped_in_parens, = struct.unpack(b"12345678901234567890")
 ```diff
 --- Black
 +++ Ruff
-@@ -4,7 +4,7 @@
-     sdfjsdfjlksdljkfsdlkf,
-     sdfsdjfklsdfjlksdljkf,
-     sdsfsdfjskdflsfsdf,
+@@ -1,12 +1,7 @@
+ # This is a standalone comment.
+-(
+-    sdfjklsdfsjldkflkjsf,
+-    sdfjsdfjlksdljkfsdlkf,
+-    sdfsdjfklsdfjlksdljkf,
+-    sdsfsdfjskdflsfsdf,
 -) = (1, 2, 3)
-+) = 1, 2, 3
++NOT_YET_IMPLEMENTED_StmtAssign
  
  # This is as well.
- (this_will_be_wrapped_in_parens,) = struct.unpack(b"12345678901234567890")
+-(this_will_be_wrapped_in_parens,) = struct.unpack(b"12345678901234567890")
++NOT_YET_IMPLEMENTED_StmtAssign
+ 
+-(a,) = call()
++NOT_YET_IMPLEMENTED_StmtAssign
 ```
 
 ## Ruff Output
 
 ```py
 # This is a standalone comment.
-(
-    sdfjklsdfsjldkflkjsf,
-    sdfjsdfjlksdljkfsdlkf,
-    sdfsdjfklsdfjlksdljkf,
-    sdsfsdfjskdflsfsdf,
-) = 1, 2, 3
+NOT_YET_IMPLEMENTED_StmtAssign
 
 # This is as well.
-(this_will_be_wrapped_in_parens,) = struct.unpack(b"12345678901234567890")
+NOT_YET_IMPLEMENTED_StmtAssign
 
-(a,) = call()
+NOT_YET_IMPLEMENTED_StmtAssign
 ```
 
 ## Black Output
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__expression__binary_expression_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__expression__binary_expression_py.snap
new file mode 100644
index 0000000000000..15d11d8aa0649
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__expression__binary_expression_py.snap
@@ -0,0 +1,105 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: snapshot
+---
+## Input
+```py
+(aaaaaaaa
+    + # trailing operator comment
+    b # trailing right comment
+)
+
+
+(aaaaaaaa # trailing left comment
+    +  # trailing operator comment
+    # leading right comment
+    b
+)
+
+
+# Black breaks the right side first for the following expressions:
+aaaaaaaaaaaaaa + caaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaal(argument1, argument2, argument3)
+aaaaaaaaaaaaaa + [bbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccc, dddddddddddddddd, eeeeeee]
+aaaaaaaaaaaaaa + (bbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccc, dddddddddddddddd, eeeeeee)
+aaaaaaaaaaaaaa + { key1:bbbbbbbbbbbbbbbbbbbbbb, key2: ccccccccccccccccccccc, key3: dddddddddddddddd, key4: eeeeeee }
+aaaaaaaaaaaaaa + { bbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccc, dddddddddddddddd, eeeeeee }
+aaaaaaaaaaaaaa + [a for x in bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ]
+aaaaaaaaaaaaaa + (a for x in bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb )
+aaaaaaaaaaaaaa + {a for x in bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb}
+
+# Wraps it in parentheses if it needs to break both left and right
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + [
+    bbbbbbbbbbbbbbbbbbbbbb,
+    ccccccccccccccccccccc,
+    dddddddddddddddd,
+    eee
+] # comment
+
+
+
+# But only for expressions that have a statement parent.
+not (aaaaaaaaaaaaaa + {a for x in bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb})
+[a + [bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb] in c ]
+
+
+# leading comment
+(
+    # comment
+    content + b
+)
+```
+
+
+
+## Output
+```py
+(
+    aaaaaaaa
+    + b  # trailing operator comment  # trailing right comment
+)
+
+
+(
+    aaaaaaaa  # trailing left comment
+    +  # trailing operator comment
+    # leading right comment
+    b
+)
+
+
+# Black breaks the right side first for the following expressions:
+aaaaaaaaaaaaaa + NOT_YET_IMPLEMENTED_ExprCall
+aaaaaaaaaaaaaa + [
+    bbbbbbbbbbbbbbbbbbbbbb,
+    ccccccccccccccccccccc,
+    dddddddddddddddd,
+    eeeeeee,
+]
+aaaaaaaaaaaaaa + NOT_YET_IMPLEMENTED_ExprTuple
+aaaaaaaaaaaaaa + NOT_YET_IMPLEMENTED_ExprDict
+aaaaaaaaaaaaaa + NOT_YET_IMPLEMENTED_ExprSet
+aaaaaaaaaaaaaa + NOT_YET_IMPLEMENTED_ExprListComp
+aaaaaaaaaaaaaa + NOT_YET_IMPLEMENTED_ExprGeneratorExp
+aaaaaaaaaaaaaa + NOT_YET_IMPLEMENTED_ExprSetComp
+
+# Wraps it in parentheses if it needs to break both left and right
+(
+    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+    + [bbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccc, dddddddddddddddd, eee]
+)  # comment
+
+
+# But only for expressions that have a statement parent.
+NOT_YET_IMPLEMENTED_ExprUnaryOp
+[NOT_YET_IMPLEMENTED_ExprCompare]
+
+
+# leading comment
+(
+    # comment
+    content
+    + b
+)
+```
+
+
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__statement__while_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__statement__while_py.snap
new file mode 100644
index 0000000000000..d9a6a35769266
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__statement__while_py.snap
@@ -0,0 +1,74 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: snapshot
+---
+## Input
+```py
+while 34: # trailing test comment
+    pass # trailing last statement comment
+
+    # trailing while body comment
+
+# leading else comment
+
+else: # trailing else comment
+    pass
+
+    # trailing else body comment
+
+
+while aVeryLongConditionThatSpillsOverToTheNextLineBecauseItIsExtremelyLongAndGoesOnAndOnAndOnAndOnAndOnAndOnAndOnAndOnAndOn: # trailing comment
+    pass
+
+else:
+    ...
+
+while (
+    some_condition(unformatted, args) and anotherCondition or aThirdCondition
+):  # comment
+    print("Do something")
+
+
+while (
+    some_condition(unformatted, args) # trailing some condition
+    and anotherCondition or aThirdCondition  # trailing third condition
+):  # comment
+    print("Do something")
+```
+
+
+
+## Output
+```py
+while NOT_YET_IMPLEMENTED_ExprConstant:  # trailing test comment
+    NOT_YET_IMPLEMENTED_StmtPass  # trailing last statement comment
+
+    # trailing while body comment
+
+# leading else comment
+
+else:  # trailing else comment
+    NOT_YET_IMPLEMENTED_StmtPass
+
+    # trailing else body comment
+
+
+while (
+    aVeryLongConditionThatSpillsOverToTheNextLineBecauseItIsExtremelyLongAndGoesOnAndOnAndOnAndOnAndOnAndOnAndOnAndOnAndOn
+):  # trailing comment
+    NOT_YET_IMPLEMENTED_StmtPass
+
+else:
+    NOT_YET_IMPLEMENTED_ExprConstant
+
+while NOT_YET_IMPLEMENTED_ExprBoolOp:  # comment
+    NOT_YET_IMPLEMENTED_ExprCall
+
+
+while (
+    NOT_YET_IMPLEMENTED_ExprBoolOp  # trailing third condition
+):  # comment
+    NOT_YET_IMPLEMENTED_ExprCall
+```
+
+
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__trivia_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__trivia_py.snap
new file mode 100644
index 0000000000000..7364029b2720b
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__trivia_py.snap
@@ -0,0 +1,78 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: snapshot
+---
+## Input
+```py
+
+# Removes the line above
+
+a = 10  # Keeps the line above
+
+# Separated by one line from `a` and `b`
+
+b = 20
+# Adds two lines after `b`
+class Test:
+    def a(self):
+        pass
+        # trailing comment
+
+# two lines before, one line after
+
+c = 30
+
+while a == 10:
+    ...
+
+    # trailing comment with one line before
+
+# one line before this leading comment
+
+d = 40
+
+while b == 20:
+    ...
+    # no empty line before
+
+e = 50  # one empty line before
+```
+
+
+
+## Output
+```py
+# Removes the line above
+
+NOT_YET_IMPLEMENTED_StmtAssign  # Keeps the line above
+
+# Separated by one line from `a` and `b`
+
+NOT_YET_IMPLEMENTED_StmtAssign
+
+
+# Adds two lines after `b`
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+# two lines before, one line after
+
+NOT_YET_IMPLEMENTED_StmtAssign
+
+while NOT_YET_IMPLEMENTED_ExprCompare:
+    NOT_YET_IMPLEMENTED_ExprConstant
+
+    # trailing comment with one line before
+
+# one line before this leading comment
+
+NOT_YET_IMPLEMENTED_StmtAssign
+
+while NOT_YET_IMPLEMENTED_ExprCompare:
+    NOT_YET_IMPLEMENTED_ExprConstant
+    # no empty line before
+
+NOT_YET_IMPLEMENTED_StmtAssign  # one empty line before
+```
+
+
diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__string_processing.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__string_processing.snap
new file mode 100644
index 0000000000000..fca7f8344e669
--- /dev/null
+++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__string_processing.snap
@@ -0,0 +1,9 @@
+---
+source: crates/ruff_python_formatter/src/lib.rs
+expression: "output.print().expect(\"Printing to succeed\").as_code()"
+---
+"aaaaaaaaaa bbbbbbbbbb cccccccccc dddddddddd eeeeeeeeee ffffffffff gggggggggg h"
+(
+	"aaaaaaaaaa bbbbbbbbbb cccccccccc dddddddddd eeeeeeeeee ffffffffff gggggggggg"
+	" hh"
+)
diff --git a/crates/ruff_python_formatter/src/statement/mod.rs b/crates/ruff_python_formatter/src/statement/mod.rs
new file mode 100644
index 0000000000000..42a18d1d3eae8
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/mod.rs
@@ -0,0 +1,83 @@
+use crate::prelude::*;
+use ruff_formatter::{FormatOwnedWithRule, FormatRefWithRule};
+use rustpython_parser::ast::Stmt;
+
+pub(crate) mod stmt_ann_assign;
+pub(crate) mod stmt_assert;
+pub(crate) mod stmt_assign;
+pub(crate) mod stmt_async_for;
+pub(crate) mod stmt_async_function_def;
+pub(crate) mod stmt_async_with;
+pub(crate) mod stmt_aug_assign;
+pub(crate) mod stmt_break;
+pub(crate) mod stmt_class_def;
+pub(crate) mod stmt_continue;
+pub(crate) mod stmt_delete;
+pub(crate) mod stmt_expr;
+pub(crate) mod stmt_for;
+pub(crate) mod stmt_function_def;
+pub(crate) mod stmt_global;
+pub(crate) mod stmt_if;
+pub(crate) mod stmt_import;
+pub(crate) mod stmt_import_from;
+pub(crate) mod stmt_match;
+pub(crate) mod stmt_nonlocal;
+pub(crate) mod stmt_pass;
+pub(crate) mod stmt_raise;
+pub(crate) mod stmt_return;
+pub(crate) mod stmt_try;
+pub(crate) mod stmt_try_star;
+pub(crate) mod stmt_while;
+pub(crate) mod stmt_with;
+pub(crate) mod suite;
+
+#[derive(Default)]
+pub struct FormatStmt;
+
+impl FormatRule<Stmt, PyFormatContext<'_>> for FormatStmt {
+    fn fmt(&self, item: &Stmt, f: &mut PyFormatter) -> FormatResult<()> {
+        match item {
+            Stmt::FunctionDef(x) => x.format().fmt(f),
+            Stmt::AsyncFunctionDef(x) => x.format().fmt(f),
+            Stmt::ClassDef(x) => x.format().fmt(f),
+            Stmt::Return(x) => x.format().fmt(f),
+            Stmt::Delete(x) => x.format().fmt(f),
+            Stmt::Assign(x) => x.format().fmt(f),
+            Stmt::AugAssign(x) => x.format().fmt(f),
+            Stmt::AnnAssign(x) => x.format().fmt(f),
+            Stmt::For(x) => x.format().fmt(f),
+            Stmt::AsyncFor(x) => x.format().fmt(f),
+            Stmt::While(x) => x.format().fmt(f),
+            Stmt::If(x) => x.format().fmt(f),
+            Stmt::With(x) => x.format().fmt(f),
+            Stmt::AsyncWith(x) => x.format().fmt(f),
+            Stmt::Match(x) => x.format().fmt(f),
+            Stmt::Raise(x) => x.format().fmt(f),
+            Stmt::Try(x) => x.format().fmt(f),
+            Stmt::TryStar(x) => x.format().fmt(f),
+            Stmt::Assert(x) => x.format().fmt(f),
+            Stmt::Import(x) => x.format().fmt(f),
+            Stmt::ImportFrom(x) => x.format().fmt(f),
+            Stmt::Global(x) => x.format().fmt(f),
+            Stmt::Nonlocal(x) => x.format().fmt(f),
+            Stmt::Expr(x) => x.format().fmt(f),
+            Stmt::Pass(x) => x.format().fmt(f),
+            Stmt::Break(x) => x.format().fmt(f),
+            Stmt::Continue(x) => x.format().fmt(f),
+        }
+    }
+}
+
+impl<'ast> AsFormat<PyFormatContext<'ast>> for Stmt {
+    type Format<'a> = FormatRefWithRule<'a, Stmt, FormatStmt, PyFormatContext<'ast>>;
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(self, FormatStmt::default())
+    }
+}
+
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for Stmt {
+    type Format = FormatOwnedWithRule<Stmt, FormatStmt, PyFormatContext<'ast>>;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(self, FormatStmt::default())
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_ann_assign.rs b/crates/ruff_python_formatter/src/statement/stmt_ann_assign.rs
new file mode 100644
index 0000000000000..645808d940875
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_ann_assign.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtAnnAssign;
+
+#[derive(Default)]
+pub struct FormatStmtAnnAssign;
+
+impl FormatNodeRule<StmtAnnAssign> for FormatStmtAnnAssign {
+    fn fmt_fields(&self, item: &StmtAnnAssign, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_assert.rs b/crates/ruff_python_formatter/src/statement/stmt_assert.rs
new file mode 100644
index 0000000000000..1631051c4ee7e
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_assert.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtAssert;
+
+#[derive(Default)]
+pub struct FormatStmtAssert;
+
+impl FormatNodeRule<StmtAssert> for FormatStmtAssert {
+    fn fmt_fields(&self, item: &StmtAssert, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_assign.rs b/crates/ruff_python_formatter/src/statement/stmt_assign.rs
new file mode 100644
index 0000000000000..92fce60ad5594
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_assign.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtAssign;
+
+#[derive(Default)]
+pub struct FormatStmtAssign;
+
+impl FormatNodeRule<StmtAssign> for FormatStmtAssign {
+    fn fmt_fields(&self, item: &StmtAssign, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_async_for.rs b/crates/ruff_python_formatter/src/statement/stmt_async_for.rs
new file mode 100644
index 0000000000000..2718289fb8e4f
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_async_for.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtAsyncFor;
+
+#[derive(Default)]
+pub struct FormatStmtAsyncFor;
+
+impl FormatNodeRule<StmtAsyncFor> for FormatStmtAsyncFor {
+    fn fmt_fields(&self, item: &StmtAsyncFor, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_async_function_def.rs b/crates/ruff_python_formatter/src/statement/stmt_async_function_def.rs
new file mode 100644
index 0000000000000..c81a5f0eaa7df
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_async_function_def.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtAsyncFunctionDef;
+
+#[derive(Default)]
+pub struct FormatStmtAsyncFunctionDef;
+
+impl FormatNodeRule<StmtAsyncFunctionDef> for FormatStmtAsyncFunctionDef {
+    fn fmt_fields(&self, item: &StmtAsyncFunctionDef, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_async_with.rs b/crates/ruff_python_formatter/src/statement/stmt_async_with.rs
new file mode 100644
index 0000000000000..0555642a10024
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_async_with.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtAsyncWith;
+
+#[derive(Default)]
+pub struct FormatStmtAsyncWith;
+
+impl FormatNodeRule<StmtAsyncWith> for FormatStmtAsyncWith {
+    fn fmt_fields(&self, item: &StmtAsyncWith, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_aug_assign.rs b/crates/ruff_python_formatter/src/statement/stmt_aug_assign.rs
new file mode 100644
index 0000000000000..8db5a6a8d4222
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_aug_assign.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtAugAssign;
+
+#[derive(Default)]
+pub struct FormatStmtAugAssign;
+
+impl FormatNodeRule<StmtAugAssign> for FormatStmtAugAssign {
+    fn fmt_fields(&self, item: &StmtAugAssign, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_break.rs b/crates/ruff_python_formatter/src/statement/stmt_break.rs
new file mode 100644
index 0000000000000..f3e9af3ca22ba
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_break.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtBreak;
+
+#[derive(Default)]
+pub struct FormatStmtBreak;
+
+impl FormatNodeRule<StmtBreak> for FormatStmtBreak {
+    fn fmt_fields(&self, item: &StmtBreak, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_class_def.rs b/crates/ruff_python_formatter/src/statement/stmt_class_def.rs
new file mode 100644
index 0000000000000..5c2f8db3ab2f1
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_class_def.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtClassDef;
+
+#[derive(Default)]
+pub struct FormatStmtClassDef;
+
+impl FormatNodeRule<StmtClassDef> for FormatStmtClassDef {
+    fn fmt_fields(&self, item: &StmtClassDef, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_continue.rs b/crates/ruff_python_formatter/src/statement/stmt_continue.rs
new file mode 100644
index 0000000000000..b216ba7c46715
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_continue.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtContinue;
+
+#[derive(Default)]
+pub struct FormatStmtContinue;
+
+impl FormatNodeRule<StmtContinue> for FormatStmtContinue {
+    fn fmt_fields(&self, item: &StmtContinue, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_delete.rs b/crates/ruff_python_formatter/src/statement/stmt_delete.rs
new file mode 100644
index 0000000000000..0a75dcd0167fe
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_delete.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtDelete;
+
+#[derive(Default)]
+pub struct FormatStmtDelete;
+
+impl FormatNodeRule<StmtDelete> for FormatStmtDelete {
+    fn fmt_fields(&self, item: &StmtDelete, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_expr.rs b/crates/ruff_python_formatter/src/statement/stmt_expr.rs
new file mode 100644
index 0000000000000..ffb86ee9df204
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_expr.rs
@@ -0,0 +1,15 @@
+use crate::expression::parentheses::Parenthesize;
+use crate::prelude::*;
+use crate::FormatNodeRule;
+use rustpython_parser::ast::StmtExpr;
+
+#[derive(Default)]
+pub struct FormatStmtExpr;
+
+impl FormatNodeRule<StmtExpr> for FormatStmtExpr {
+    fn fmt_fields(&self, item: &StmtExpr, f: &mut PyFormatter) -> FormatResult<()> {
+        let StmtExpr { value, .. } = item;
+
+        value.format().with_options(Parenthesize::Optional).fmt(f)
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_for.rs b/crates/ruff_python_formatter/src/statement/stmt_for.rs
new file mode 100644
index 0000000000000..b943de7cc1378
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_for.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtFor;
+
+#[derive(Default)]
+pub struct FormatStmtFor;
+
+impl FormatNodeRule<StmtFor> for FormatStmtFor {
+    fn fmt_fields(&self, item: &StmtFor, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_function_def.rs b/crates/ruff_python_formatter/src/statement/stmt_function_def.rs
new file mode 100644
index 0000000000000..e39f24f2ac2f8
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_function_def.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtFunctionDef;
+
+#[derive(Default)]
+pub struct FormatStmtFunctionDef;
+
+impl FormatNodeRule<StmtFunctionDef> for FormatStmtFunctionDef {
+    fn fmt_fields(&self, item: &StmtFunctionDef, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_global.rs b/crates/ruff_python_formatter/src/statement/stmt_global.rs
new file mode 100644
index 0000000000000..ae0da78e2ed06
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_global.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtGlobal;
+
+#[derive(Default)]
+pub struct FormatStmtGlobal;
+
+impl FormatNodeRule<StmtGlobal> for FormatStmtGlobal {
+    fn fmt_fields(&self, item: &StmtGlobal, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_if.rs b/crates/ruff_python_formatter/src/statement/stmt_if.rs
new file mode 100644
index 0000000000000..bbef308f492c2
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_if.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtIf;
+
+#[derive(Default)]
+pub struct FormatStmtIf;
+
+impl FormatNodeRule<StmtIf> for FormatStmtIf {
+    fn fmt_fields(&self, item: &StmtIf, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_import.rs b/crates/ruff_python_formatter/src/statement/stmt_import.rs
new file mode 100644
index 0000000000000..2585dfade7c35
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_import.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtImport;
+
+#[derive(Default)]
+pub struct FormatStmtImport;
+
+impl FormatNodeRule<StmtImport> for FormatStmtImport {
+    fn fmt_fields(&self, item: &StmtImport, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_import_from.rs b/crates/ruff_python_formatter/src/statement/stmt_import_from.rs
new file mode 100644
index 0000000000000..bdae4d56bab37
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_import_from.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtImportFrom;
+
+#[derive(Default)]
+pub struct FormatStmtImportFrom;
+
+impl FormatNodeRule<StmtImportFrom> for FormatStmtImportFrom {
+    fn fmt_fields(&self, item: &StmtImportFrom, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_match.rs b/crates/ruff_python_formatter/src/statement/stmt_match.rs
new file mode 100644
index 0000000000000..22d76a6676216
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_match.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtMatch;
+
+#[derive(Default)]
+pub struct FormatStmtMatch;
+
+impl FormatNodeRule<StmtMatch> for FormatStmtMatch {
+    fn fmt_fields(&self, item: &StmtMatch, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_nonlocal.rs b/crates/ruff_python_formatter/src/statement/stmt_nonlocal.rs
new file mode 100644
index 0000000000000..459a60b057694
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_nonlocal.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtNonlocal;
+
+#[derive(Default)]
+pub struct FormatStmtNonlocal;
+
+impl FormatNodeRule<StmtNonlocal> for FormatStmtNonlocal {
+    fn fmt_fields(&self, item: &StmtNonlocal, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_pass.rs b/crates/ruff_python_formatter/src/statement/stmt_pass.rs
new file mode 100644
index 0000000000000..f8a04e01632c3
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_pass.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtPass;
+
+#[derive(Default)]
+pub struct FormatStmtPass;
+
+impl FormatNodeRule<StmtPass> for FormatStmtPass {
+    fn fmt_fields(&self, item: &StmtPass, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_raise.rs b/crates/ruff_python_formatter/src/statement/stmt_raise.rs
new file mode 100644
index 0000000000000..47372372a5686
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_raise.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtRaise;
+
+#[derive(Default)]
+pub struct FormatStmtRaise;
+
+impl FormatNodeRule<StmtRaise> for FormatStmtRaise {
+    fn fmt_fields(&self, item: &StmtRaise, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_return.rs b/crates/ruff_python_formatter/src/statement/stmt_return.rs
new file mode 100644
index 0000000000000..02da2a73d041a
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_return.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtReturn;
+
+#[derive(Default)]
+pub struct FormatStmtReturn;
+
+impl FormatNodeRule<StmtReturn> for FormatStmtReturn {
+    fn fmt_fields(&self, item: &StmtReturn, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_try.rs b/crates/ruff_python_formatter/src/statement/stmt_try.rs
new file mode 100644
index 0000000000000..35afc066697da
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_try.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtTry;
+
+#[derive(Default)]
+pub struct FormatStmtTry;
+
+impl FormatNodeRule<StmtTry> for FormatStmtTry {
+    fn fmt_fields(&self, item: &StmtTry, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_try_star.rs b/crates/ruff_python_formatter/src/statement/stmt_try_star.rs
new file mode 100644
index 0000000000000..aa4d45c444f60
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_try_star.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtTryStar;
+
+#[derive(Default)]
+pub struct FormatStmtTryStar;
+
+impl FormatNodeRule<StmtTryStar> for FormatStmtTryStar {
+    fn fmt_fields(&self, item: &StmtTryStar, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_while.rs b/crates/ruff_python_formatter/src/statement/stmt_while.rs
new file mode 100644
index 0000000000000..1ed71397fd341
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_while.rs
@@ -0,0 +1,68 @@
+use crate::comments::{leading_alternate_branch_comments, trailing_comments};
+use crate::expression::parentheses::Parenthesize;
+use crate::prelude::*;
+use crate::FormatNodeRule;
+use ruff_formatter::write;
+use ruff_python_ast::node::AstNode;
+use rustpython_parser::ast::{Ranged, Stmt, StmtWhile};
+
+#[derive(Default)]
+pub struct FormatStmtWhile;
+
+impl FormatNodeRule<StmtWhile> for FormatStmtWhile {
+    fn fmt_fields(&self, item: &StmtWhile, f: &mut PyFormatter) -> FormatResult<()> {
+        let StmtWhile {
+            range: _,
+            test,
+            body,
+            orelse,
+        } = item;
+
+        let comments = f.context().comments().clone();
+        let dangling_comments = comments.dangling_comments(item.as_any_node_ref());
+
+        let body_start = body.first().map_or(test.end(), Stmt::start);
+        let or_else_comments_start =
+            dangling_comments.partition_point(|comment| comment.slice().end() < body_start);
+
+        let (trailing_condition_comments, or_else_comments) =
+            dangling_comments.split_at(or_else_comments_start);
+
+        write!(
+            f,
+            [
+                text("while"),
+                space(),
+                test.format().with_options(Parenthesize::IfBreaks),
+                text(":"),
+                trailing_comments(trailing_condition_comments),
+                block_indent(&body.format())
+            ]
+        )?;
+
+        if !orelse.is_empty() {
+            // Split between leading comments before the `else` keyword and end of line comments at the end of
+            // the `else:` line.
+            let trailing_start =
+                or_else_comments.partition_point(|comment| comment.position().is_own_line());
+            let (leading, trailing) = or_else_comments.split_at(trailing_start);
+
+            write!(
+                f,
+                [
+                    leading_alternate_branch_comments(leading, body.last()),
+                    text("else:"),
+                    trailing_comments(trailing),
+                    block_indent(&orelse.format())
+                ]
+            )?;
+        }
+
+        Ok(())
+    }
+
+    fn fmt_dangling_comments(&self, _node: &StmtWhile, _f: &mut PyFormatter) -> FormatResult<()> {
+        // Handled in `fmt_fields`
+        Ok(())
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/stmt_with.rs b/crates/ruff_python_formatter/src/statement/stmt_with.rs
new file mode 100644
index 0000000000000..a68ee33113688
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/stmt_with.rs
@@ -0,0 +1,12 @@
+use crate::{not_yet_implemented, FormatNodeRule, PyFormatter};
+use ruff_formatter::{write, Buffer, FormatResult};
+use rustpython_parser::ast::StmtWith;
+
+#[derive(Default)]
+pub struct FormatStmtWith;
+
+impl FormatNodeRule<StmtWith> for FormatStmtWith {
+    fn fmt_fields(&self, item: &StmtWith, f: &mut PyFormatter) -> FormatResult<()> {
+        write!(f, [not_yet_implemented(item)])
+    }
+}
diff --git a/crates/ruff_python_formatter/src/statement/suite.rs b/crates/ruff_python_formatter/src/statement/suite.rs
new file mode 100644
index 0000000000000..3d943ba647e78
--- /dev/null
+++ b/crates/ruff_python_formatter/src/statement/suite.rs
@@ -0,0 +1,286 @@
+use crate::context::NodeLevel;
+use crate::prelude::*;
+use crate::trivia::lines_before;
+use ruff_formatter::{
+    format_args, write, FormatOwnedWithRule, FormatRefWithRule, FormatRuleWithOptions,
+};
+use rustpython_parser::ast::{Ranged, Stmt, Suite};
+
+/// Level at which the [`Suite`] appears in the source code.
+#[derive(Copy, Clone, Debug)]
+pub enum SuiteLevel {
+    /// Statements at the module level / top level
+    TopLevel,
+
+    /// Statements in a nested body
+    Nested,
+}
+
+impl SuiteLevel {
+    const fn is_nested(self) -> bool {
+        matches!(self, SuiteLevel::Nested)
+    }
+}
+
+#[derive(Debug)]
+pub struct FormatSuite {
+    level: SuiteLevel,
+}
+
+impl Default for FormatSuite {
+    fn default() -> Self {
+        FormatSuite {
+            level: SuiteLevel::Nested,
+        }
+    }
+}
+
+impl FormatRule<Suite, PyFormatContext<'_>> for FormatSuite {
+    fn fmt(&self, statements: &Suite, f: &mut PyFormatter) -> FormatResult<()> {
+        let node_level = match self.level {
+            SuiteLevel::TopLevel => NodeLevel::TopLevel,
+            SuiteLevel::Nested => NodeLevel::CompoundStatement,
+        };
+
+        let comments = f.context().comments().clone();
+        let source = f.context().contents();
+
+        let saved_level = f.context().node_level();
+        f.context_mut().set_node_level(node_level);
+
+        let mut joiner = f.join_nodes(node_level);
+
+        let mut iter = statements.iter();
+        let Some(first) = iter.next() else {
+            return Ok(())
+        };
+
+        // First entry has never any separator, doesn't matter which one we take;
+        joiner.entry(first, &first.format());
+
+        let mut last = first;
+        let mut is_last_function_or_class_definition = is_class_or_function_definition(first);
+
+        for statement in iter {
+            let is_current_function_or_class_definition =
+                is_class_or_function_definition(statement);
+
+            if is_last_function_or_class_definition || is_current_function_or_class_definition {
+                match self.level {
+                    SuiteLevel::TopLevel => {
+                        joiner.entry_with_separator(
+                            &format_args![empty_line(), empty_line()],
+                            &statement.format(),
+                            statement,
+                        );
+                    }
+                    SuiteLevel::Nested => {
+                        joiner.entry_with_separator(&empty_line(), &statement.format(), statement);
+                    }
+                }
+            } else if is_compound_statement(last) {
+                // Handles the case where a body has trailing comments. The issue is that RustPython does not include
+                // the comments in the range of the suite. This means, the body ends right after the last statement in the body.
+                // ```python
+                // def test():
+                //      ...
+                //      # The body of `test` ends right after `...` and before this comment
+                //
+                // # leading comment
+                //
+                //
+                // a = 10
+                // ```
+                // Using `lines_after` for the node doesn't work because it would count the lines after the `...`
+                // which is 0 instead of 1, the number of lines between the trailing comment and
+                // the leading comment. This is why the suite handling counts the lines before the
+                // start of the next statement or before the first leading comments for compound statements.
+                let separator = format_with(|f| {
+                    let start = if let Some(first_leading) =
+                        comments.leading_comments(statement.into()).first()
+                    {
+                        first_leading.slice().start()
+                    } else {
+                        statement.start()
+                    };
+
+                    match lines_before(start, source) {
+                        0 | 1 => hard_line_break().fmt(f),
+                        2 => empty_line().fmt(f),
+                        3.. => {
+                            if self.level.is_nested() {
+                                empty_line().fmt(f)
+                            } else {
+                                write!(f, [empty_line(), empty_line()])
+                            }
+                        }
+                    }
+                });
+
+                joiner.entry_with_separator(&separator, &statement.format(), statement);
+            } else {
+                joiner.entry(statement, &statement.format());
+            }
+
+            is_last_function_or_class_definition = is_current_function_or_class_definition;
+            last = statement;
+        }
+
+        let result = joiner.finish();
+
+        f.context_mut().set_node_level(saved_level);
+
+        result
+    }
+}
+
+const fn is_class_or_function_definition(stmt: &Stmt) -> bool {
+    matches!(
+        stmt,
+        Stmt::FunctionDef(_) | Stmt::AsyncFunctionDef(_) | Stmt::ClassDef(_)
+    )
+}
+
+const fn is_compound_statement(stmt: &Stmt) -> bool {
+    matches!(
+        stmt,
+        Stmt::FunctionDef(_)
+            | Stmt::AsyncFunctionDef(_)
+            | Stmt::ClassDef(_)
+            | Stmt::While(_)
+            | Stmt::For(_)
+            | Stmt::AsyncFor(_)
+            | Stmt::Match(_)
+            | Stmt::With(_)
+            | Stmt::AsyncWith(_)
+            | Stmt::If(_)
+            | Stmt::Try(_)
+            | Stmt::TryStar(_)
+    )
+}
+
+impl FormatRuleWithOptions<Suite, PyFormatContext<'_>> for FormatSuite {
+    type Options = SuiteLevel;
+
+    fn with_options(mut self, options: Self::Options) -> Self {
+        self.level = options;
+        self
+    }
+}
+
+impl<'ast> AsFormat<PyFormatContext<'ast>> for Suite {
+    type Format<'a> = FormatRefWithRule<'a, Suite, FormatSuite, PyFormatContext<'ast>>;
+
+    fn format(&self) -> Self::Format<'_> {
+        FormatRefWithRule::new(self, FormatSuite::default())
+    }
+}
+
+impl<'ast> IntoFormat<PyFormatContext<'ast>> for Suite {
+    type Format = FormatOwnedWithRule<Suite, FormatSuite, PyFormatContext<'ast>>;
+    fn into_format(self) -> Self::Format {
+        FormatOwnedWithRule::new(self, FormatSuite::default())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::comments::Comments;
+    use crate::prelude::*;
+    use crate::statement::suite::SuiteLevel;
+    use ruff_formatter::{format, SimpleFormatOptions};
+    use rustpython_parser::ast::Suite;
+    use rustpython_parser::Parse;
+
+    fn format_suite(level: SuiteLevel) -> String {
+        let source = r#"
+a = 10
+
+
+
+three_leading_newlines = 80
+
+
+two_leading_newlines = 20
+
+one_leading_newline = 10
+no_leading_newline = 30
+class InTheMiddle:
+    pass
+trailing_statement = 1
+def func():
+    pass
+def trailing_func():
+    pass
+"#;
+
+        let statements = Suite::parse(source, "test.py").unwrap();
+
+        let context =
+            PyFormatContext::new(SimpleFormatOptions::default(), source, Comments::default());
+
+        let test_formatter =
+            format_with(|f: &mut PyFormatter| statements.format().with_options(level).fmt(f));
+
+        let formatted = format!(context, [test_formatter]).unwrap();
+        let printed = formatted.print().unwrap();
+
+        printed.as_code().to_string()
+    }
+
+    #[test]
+    fn top_level() {
+        let formatted = format_suite(SuiteLevel::TopLevel);
+
+        assert_eq!(
+            formatted,
+            r#"NOT_YET_IMPLEMENTED_StmtAssign
+
+
+NOT_YET_IMPLEMENTED_StmtAssign
+
+
+NOT_YET_IMPLEMENTED_StmtAssign
+
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+
+NOT_YET_IMPLEMENTED_StmtAssign
+
+
+NOT_YET_IMPLEMENTED_StmtFunctionDef
+
+
+NOT_YET_IMPLEMENTED_StmtFunctionDef"#
+        );
+    }
+
+    #[test]
+    fn nested_level() {
+        let formatted = format_suite(SuiteLevel::Nested);
+
+        assert_eq!(
+            formatted,
+            r#"NOT_YET_IMPLEMENTED_StmtAssign
+
+NOT_YET_IMPLEMENTED_StmtAssign
+
+NOT_YET_IMPLEMENTED_StmtAssign
+
+NOT_YET_IMPLEMENTED_StmtAssign
+NOT_YET_IMPLEMENTED_StmtAssign
+
+NOT_YET_IMPLEMENTED_StmtClassDef
+
+NOT_YET_IMPLEMENTED_StmtAssign
+
+NOT_YET_IMPLEMENTED_StmtFunctionDef
+
+NOT_YET_IMPLEMENTED_StmtFunctionDef"#
+        );
+    }
+}
diff --git a/crates/ruff_python_formatter/src/trivia.rs b/crates/ruff_python_formatter/src/trivia.rs
index 7f553e50bff0a..c06caf01357ee 100644
--- a/crates/ruff_python_formatter/src/trivia.rs
+++ b/crates/ruff_python_formatter/src/trivia.rs
@@ -1,1058 +1,254 @@
-use ruff_text_size::{TextRange, TextSize};
-use rustc_hash::FxHashMap;
-use rustpython_parser::lexer::LexResult;
-use rustpython_parser::Tok;
-use std::ops::Add;
-
-use crate::cst::{
-    Alias, Arg, Body, BoolOp, CmpOp, Excepthandler, ExcepthandlerKind, Expr, ExprKind, Keyword,
-    Operator, Pattern, PatternKind, SliceIndex, SliceIndexKind, Stmt, StmtKind, UnaryOp,
-};
-
-#[derive(Clone, Copy, Debug)]
-pub enum Node<'a> {
-    Alias(&'a Alias),
-    Arg(&'a Arg),
-    Body(&'a Body),
-    BoolOp(&'a BoolOp),
-    CmpOp(&'a CmpOp),
-    Excepthandler(&'a Excepthandler),
-    Expr(&'a Expr),
-    Keyword(&'a Keyword),
-    Mod(&'a [Stmt]),
-    Operator(&'a Operator),
-    Pattern(&'a Pattern),
-    SliceIndex(&'a SliceIndex),
-    Stmt(&'a Stmt),
-    UnaryOp(&'a UnaryOp),
-}
-
-impl Node<'_> {
-    pub fn id(&self) -> usize {
-        match self {
-            Node::Alias(node) => node.id(),
-            Node::Arg(node) => node.id(),
-            Node::Body(node) => node.id(),
-            Node::BoolOp(node) => node.id(),
-            Node::CmpOp(node) => node.id(),
-            Node::Excepthandler(node) => node.id(),
-            Node::Expr(node) => node.id(),
-            Node::Keyword(node) => node.id(),
-            Node::Mod(nodes) => nodes as *const _ as usize,
-            Node::Operator(node) => node.id(),
-            Node::Pattern(node) => node.id(),
-            Node::SliceIndex(node) => node.id(),
-            Node::Stmt(node) => node.id(),
-            Node::UnaryOp(node) => node.id(),
-        }
-    }
-
-    pub fn start(&self) -> TextSize {
-        match self {
-            Node::Alias(node) => node.start(),
-            Node::Arg(node) => node.start(),
-            Node::Body(node) => node.start(),
-            Node::BoolOp(node) => node.start(),
-            Node::CmpOp(node) => node.start(),
-            Node::Excepthandler(node) => node.start(),
-            Node::Expr(node) => node.start(),
-            Node::Keyword(node) => node.start(),
-            Node::Mod(..) => unreachable!("Node::Mod cannot be a child node"),
-            Node::Operator(node) => node.start(),
-            Node::Pattern(node) => node.start(),
-            Node::SliceIndex(node) => node.start(),
-            Node::Stmt(node) => node.start(),
-            Node::UnaryOp(node) => node.start(),
-        }
-    }
-
-    pub fn end(&self) -> TextSize {
-        match self {
-            Node::Alias(node) => node.end(),
-            Node::Arg(node) => node.end(),
-            Node::Body(node) => node.end(),
-            Node::BoolOp(node) => node.end(),
-            Node::CmpOp(node) => node.end(),
-            Node::Excepthandler(node) => node.end(),
-            Node::Expr(node) => node.end(),
-            Node::Keyword(node) => node.end(),
-            Node::Mod(..) => unreachable!("Node::Mod cannot be a child node"),
-            Node::Operator(node) => node.end(),
-            Node::Pattern(node) => node.end(),
-            Node::SliceIndex(node) => node.end(),
-            Node::Stmt(node) => node.end(),
-            Node::UnaryOp(node) => node.end(),
+use ruff_python_ast::whitespace::is_python_whitespace;
+use ruff_text_size::{TextLen, TextRange, TextSize};
+
+/// Searches for the first non-trivia character in `range`.
+///
+/// The search skips over any whitespace and comments.
+///
+/// Returns `Some` if the range contains any non-trivia character. The first item is the absolute offset
+/// of the character, the second item the non-trivia character.
+///
+/// Returns `None` if the range is empty or only contains trivia (whitespace or comments).
+pub(crate) fn find_first_non_trivia_character_in_range(
+    range: TextRange,
+    code: &str,
+) -> Option<(TextSize, char)> {
+    let rest = &code[range];
+    let mut char_iter = rest.chars();
+
+    while let Some(c) = char_iter.next() {
+        match c {
+            '#' => {
+                // We're now inside of a comment. Skip all content until the end of the line
+                for c in char_iter.by_ref() {
+                    if matches!(c, '\n' | '\r') {
+                        break;
+                    }
+                }
+            }
+            c => {
+                if !is_python_whitespace(c) {
+                    let index = range.start() + rest.text_len()
+                        - char_iter.as_str().text_len()
+                        - c.text_len();
+                    return Some((index, c));
+                }
+            }
         }
     }
-}
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum TriviaTokenKind {
-    OwnLineComment,
-    EndOfLineComment,
-    MagicTrailingComma,
-    EmptyLine,
-    Parentheses,
+    None
 }
 
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct TriviaToken {
-    pub range: TextRange,
-    pub kind: TriviaTokenKind,
+pub(crate) fn find_first_non_trivia_character_after(
+    offset: TextSize,
+    code: &str,
+) -> Option<(TextSize, char)> {
+    find_first_non_trivia_character_in_range(TextRange::new(offset, code.text_len()), code)
 }
 
-impl TriviaToken {
-    pub const fn start(&self) -> TextSize {
-        self.range.start()
-    }
+pub(crate) fn find_first_non_trivia_character_before(
+    offset: TextSize,
+    code: &str,
+) -> Option<(TextSize, char)> {
+    let head = &code[TextRange::up_to(offset)];
+    let mut char_iter = head.chars();
 
-    pub const fn end(&self) -> TextSize {
-        self.range.end()
-    }
-}
+    while let Some(c) = char_iter.next_back() {
+        match c {
+            c if is_python_whitespace(c) => {
+                continue;
+            }
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq, is_macro::Is)]
-pub enum TriviaKind {
-    /// A Comment that is separated by at least one line break from the
-    /// preceding token.
-    ///
-    /// # Examples
-    ///
-    /// ```ignore
-    /// a = 1
-    /// # This is an own-line comment.
-    /// b = 2
-    /// ```
-    OwnLineComment(TextRange),
-    /// A comment that is on the same line as the preceding token.
-    ///
-    /// # Examples
-    ///
-    /// ## End of line
-    ///
-    /// ```ignore
-    /// a = 1  # This is an end-of-line comment.
-    /// b = 2
-    /// ```
-    EndOfLineComment(TextRange),
-    MagicTrailingComma,
-    EmptyLine,
-    Parentheses,
-}
+            // Empty comment
+            '#' => continue,
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq, is_macro::Is)]
-pub enum Relationship {
-    Leading,
-    Trailing,
-    Dangling,
-}
+            non_trivia_character => {
+                // Non trivia character but we don't know if it is a comment or not. Consume all characters
+                // until the start of the line and track if the last non-whitespace character was a `#`.
+                let mut is_comment = false;
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq, is_macro::Is)]
-pub enum Parenthesize {
-    /// Always parenthesize the statement or expression.
-    Always,
-    /// Never parenthesize the statement or expression.
-    Never,
-    /// Parenthesize the statement or expression if it expands.
-    IfExpanded,
-}
+                let first_non_trivia_offset = char_iter.as_str().text_len();
 
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct Trivia {
-    pub kind: TriviaKind,
-    pub relationship: Relationship,
-}
+                while let Some(c) = char_iter.next_back() {
+                    match c {
+                        '#' => {
+                            is_comment = true;
+                        }
+                        '\n' | '\r' => {
+                            if !is_comment {
+                                return Some((first_non_trivia_offset, non_trivia_character));
+                            }
+                        }
 
-impl Trivia {
-    pub fn from_token(token: &TriviaToken, relationship: Relationship) -> Self {
-        match token.kind {
-            TriviaTokenKind::MagicTrailingComma => Self {
-                kind: TriviaKind::MagicTrailingComma,
-                relationship,
-            },
-            TriviaTokenKind::EmptyLine => Self {
-                kind: TriviaKind::EmptyLine,
-                relationship,
-            },
-            TriviaTokenKind::OwnLineComment => Self {
-                kind: TriviaKind::OwnLineComment(token.range),
-                relationship,
-            },
-            TriviaTokenKind::EndOfLineComment => Self {
-                kind: TriviaKind::EndOfLineComment(token.range),
-                relationship,
-            },
-            TriviaTokenKind::Parentheses => Self {
-                kind: TriviaKind::Parentheses,
-                relationship,
-            },
+                        c => {
+                            if !is_python_whitespace(c) {
+                                is_comment = false;
+                            }
+                        }
+                    }
+                }
+            }
         }
     }
-}
-
-pub fn extract_trivia_tokens(lxr: &[LexResult], text: &str) -> Vec<TriviaToken> {
-    let mut tokens = vec![];
-    let mut prev_end = TextSize::default();
-    let mut prev_tok: Option<(&Tok, TextRange)> = None;
-    let mut prev_semantic_tok: Option<(&Tok, TextRange)> = None;
-    let mut parens = vec![];
 
-    for (tok, range) in lxr.iter().flatten() {
-        // Add empty lines.
-        let trivia = &text[TextRange::new(prev_end, range.start())];
-        let bytes = trivia.as_bytes();
-
-        let mut bytes_iter = bytes.iter().enumerate();
+    None
+}
 
-        let mut after_new_line =
-            matches!(prev_tok, Some((Tok::Newline | Tok::NonLogicalNewline, _)));
+/// Returns the number of newlines between `offset` and the first non whitespace character in the source code.
+pub(crate) fn lines_before(offset: TextSize, code: &str) -> u32 {
+    let head = &code[TextRange::up_to(offset)];
+    let mut newlines = 0u32;
 
-        while let Some((index, byte)) = bytes_iter.next() {
-            let len = match byte {
-                b'\r' if bytes.get(index + 1) == Some(&b'\n') => {
-                    bytes_iter.next();
-                    TextSize::from(2)
-                }
-                b'\n' | b'\r' => TextSize::from(1),
-                _ => {
-                    // Must be whitespace or the parser would generate a token
+    for (index, c) in head.char_indices().rev() {
+        match c {
+            '\n' => {
+                if head.as_bytes()[index.saturating_sub(1)] == b'\r' {
                     continue;
                 }
-            };
-
-            if after_new_line {
-                let new_line_start = prev_end.add(TextSize::try_from(index).unwrap());
-                tokens.push(TriviaToken {
-                    range: TextRange::new(new_line_start, new_line_start.add(len)),
-                    kind: TriviaTokenKind::EmptyLine,
-                });
-            } else {
-                after_new_line = true;
+                newlines += 1;
             }
-        }
-
-        // Add comments.
-        if let Tok::Comment(_) = tok {
-            tokens.push(TriviaToken {
-                range: *range,
-                // Used to use prev_non-newline_tok
-                kind: if after_new_line || prev_tok.is_none() {
-                    TriviaTokenKind::OwnLineComment
-                } else {
-                    TriviaTokenKind::EndOfLineComment
-                },
-            });
-        }
-
-        // Add magic trailing commas.
-        if matches!(
-            tok,
-            Tok::Rpar | Tok::Rsqb | Tok::Rbrace | Tok::Equal | Tok::Newline
-        ) {
-            if let Some((prev_tok, prev_range)) = prev_semantic_tok {
-                if prev_tok == &Tok::Comma {
-                    tokens.push(TriviaToken {
-                        range: prev_range,
-                        kind: TriviaTokenKind::MagicTrailingComma,
-                    });
-                }
-            }
-        }
 
-        if matches!(tok, Tok::Lpar) {
-            if prev_tok.map_or(true, |(prev_tok, _)| {
-                !matches!(
-                    prev_tok,
-                    Tok::Name { .. }
-                        | Tok::Int { .. }
-                        | Tok::Float { .. }
-                        | Tok::Complex { .. }
-                        | Tok::String { .. }
-                )
-            }) {
-                parens.push((range.start(), true));
-            } else {
-                parens.push((range.start(), false));
+            '\r' => {
+                newlines += 1;
             }
-        } else if matches!(tok, Tok::Rpar) {
-            let (start, explicit) = parens.pop().unwrap();
-            if explicit {
-                tokens.push(TriviaToken {
-                    range: TextRange::new(start, range.end()),
-                    kind: TriviaTokenKind::Parentheses,
-                });
-            }
-        }
 
-        prev_tok = Some((tok, *range));
+            c if is_python_whitespace(c) => continue,
 
-        // Track the most recent semantic token.
-        if !matches!(
-            tok,
-            Tok::Newline | Tok::NonLogicalNewline | Tok::Comment(..)
-        ) {
-            prev_semantic_tok = Some((tok, *range));
+            _ => break,
         }
-
-        prev_end = range.end();
     }
-    tokens
+
+    newlines
 }
 
-fn sorted_child_nodes_inner<'a>(node: Node<'a>, result: &mut Vec<Node<'a>>) {
-    match node {
-        Node::Mod(nodes) => {
-            for stmt in nodes.iter() {
-                result.push(Node::Stmt(stmt));
-            }
-        }
-        Node::Body(body) => {
-            result.extend(body.iter().map(Node::Stmt));
-        }
-        Node::Stmt(stmt) => match &stmt.node {
-            StmtKind::Return { value } => {
-                if let Some(value) = value {
-                    result.push(Node::Expr(value));
-                }
-            }
-            StmtKind::Expr { value } => {
-                result.push(Node::Expr(value));
-            }
-            StmtKind::Pass => {}
-            StmtKind::Assign { targets, value, .. } => {
-                for target in targets {
-                    result.push(Node::Expr(target));
-                }
-                result.push(Node::Expr(value));
-            }
-            StmtKind::FunctionDef {
-                args,
-                body,
-                decorator_list,
-                returns,
-                ..
-            }
-            | StmtKind::AsyncFunctionDef {
-                args,
-                body,
-                decorator_list,
-                returns,
-                ..
-            } => {
-                for decorator in decorator_list {
-                    result.push(Node::Expr(decorator));
-                }
-                for arg in &args.posonlyargs {
-                    result.push(Node::Arg(arg));
-                }
-                for arg in &args.args {
-                    result.push(Node::Arg(arg));
-                }
-                if let Some(arg) = &args.vararg {
-                    result.push(Node::Arg(arg));
-                }
-                for arg in &args.kwonlyargs {
-                    result.push(Node::Arg(arg));
-                }
-                if let Some(arg) = &args.kwarg {
-                    result.push(Node::Arg(arg));
-                }
-                for expr in &args.defaults {
-                    result.push(Node::Expr(expr));
-                }
-                for expr in &args.kw_defaults {
-                    result.push(Node::Expr(expr));
-                }
-                if let Some(returns) = returns {
-                    result.push(Node::Expr(returns));
-                }
-                result.push(Node::Body(body));
-            }
-            StmtKind::ClassDef {
-                bases,
-                keywords,
-                body,
-                decorator_list,
-                ..
-            } => {
-                for decorator in decorator_list {
-                    result.push(Node::Expr(decorator));
-                }
-                for base in bases {
-                    result.push(Node::Expr(base));
-                }
-                for keyword in keywords {
-                    result.push(Node::Keyword(keyword));
-                }
-                result.push(Node::Body(body));
-            }
-            StmtKind::Delete { targets } => {
-                for target in targets {
-                    result.push(Node::Expr(target));
-                }
-            }
-            StmtKind::AugAssign { target, op, value } => {
-                result.push(Node::Expr(target));
-                result.push(Node::Operator(op));
-                result.push(Node::Expr(value));
-            }
-            StmtKind::AnnAssign {
-                target,
-                annotation,
-                value,
-                ..
-            } => {
-                result.push(Node::Expr(target));
-                result.push(Node::Expr(annotation));
-                if let Some(value) = value {
-                    result.push(Node::Expr(value));
-                }
-            }
-            StmtKind::For {
-                target,
-                iter,
-                body,
-                orelse,
-                ..
-            }
-            | StmtKind::AsyncFor {
-                target,
-                iter,
-                body,
-                orelse,
-                ..
-            } => {
-                result.push(Node::Expr(target));
-                result.push(Node::Expr(iter));
-                result.push(Node::Body(body));
-                if let Some(orelse) = orelse {
-                    result.push(Node::Body(orelse));
-                }
-            }
-            StmtKind::While { test, body, orelse } => {
-                result.push(Node::Expr(test));
-                result.push(Node::Body(body));
-                if let Some(orelse) = orelse {
-                    result.push(Node::Body(orelse));
-                }
-            }
-            StmtKind::If {
-                test, body, orelse, ..
-            } => {
-                result.push(Node::Expr(test));
-                result.push(Node::Body(body));
-                if let Some(orelse) = orelse {
-                    result.push(Node::Body(orelse));
-                }
-            }
-            StmtKind::With { items, body, .. } | StmtKind::AsyncWith { items, body, .. } => {
-                for item in items {
-                    result.push(Node::Expr(&item.context_expr));
-                    if let Some(expr) = &item.optional_vars {
-                        result.push(Node::Expr(expr));
-                    }
-                }
-                result.push(Node::Body(body));
-            }
-            StmtKind::Match { subject, cases } => {
-                result.push(Node::Expr(subject));
-                for case in cases {
-                    result.push(Node::Pattern(&case.pattern));
-                    if let Some(expr) = &case.guard {
-                        result.push(Node::Expr(expr));
-                    }
-                    result.push(Node::Body(&case.body));
-                }
-            }
-            StmtKind::Raise { exc, cause } => {
-                if let Some(exc) = exc {
-                    result.push(Node::Expr(exc));
-                }
-                if let Some(cause) = cause {
-                    result.push(Node::Expr(cause));
-                }
-            }
-            StmtKind::Assert { test, msg } => {
-                result.push(Node::Expr(test));
-                if let Some(msg) = msg {
-                    result.push(Node::Expr(msg));
-                }
-            }
-            StmtKind::Break => {}
-            StmtKind::Continue => {}
-            StmtKind::Try {
-                body,
-                handlers,
-                orelse,
-                finalbody,
-            }
-            | StmtKind::TryStar {
-                body,
-                handlers,
-                orelse,
-                finalbody,
-            } => {
-                result.push(Node::Body(body));
-                for handler in handlers {
-                    result.push(Node::Excepthandler(handler));
-                }
-                if let Some(orelse) = orelse {
-                    result.push(Node::Body(orelse));
-                }
-                if let Some(finalbody) = finalbody {
-                    result.push(Node::Body(finalbody));
-                }
-            }
-            StmtKind::Import { names } => {
-                for name in names {
-                    result.push(Node::Alias(name));
-                }
-            }
-            StmtKind::ImportFrom { names, .. } => {
-                for name in names {
-                    result.push(Node::Alias(name));
-                }
-            }
-            StmtKind::Global { .. } => {}
-            StmtKind::Nonlocal { .. } => {}
-        },
-        Node::Arg(arg) => {
-            if let Some(annotation) = &arg.node.annotation {
-                result.push(Node::Expr(annotation));
-            }
-        }
-        Node::Expr(expr) => match &expr.node {
-            ExprKind::BoolOp { ops, values } => {
-                result.push(Node::Expr(&values[0]));
-                for (op, value) in ops.iter().zip(&values[1..]) {
-                    result.push(Node::BoolOp(op));
-                    result.push(Node::Expr(value));
-                }
-            }
-            ExprKind::NamedExpr { target, value } => {
-                result.push(Node::Expr(target));
-                result.push(Node::Expr(value));
-            }
-            ExprKind::BinOp { left, op, right } => {
-                result.push(Node::Expr(left));
-                result.push(Node::Operator(op));
-                result.push(Node::Expr(right));
-            }
-            ExprKind::UnaryOp { op, operand } => {
-                result.push(Node::UnaryOp(op));
-                result.push(Node::Expr(operand));
-            }
-            ExprKind::Lambda { body, args, .. } => {
-                for expr in &args.defaults {
-                    result.push(Node::Expr(expr));
-                }
-                for expr in &args.kw_defaults {
-                    result.push(Node::Expr(expr));
-                }
-                result.push(Node::Expr(body));
-            }
-            ExprKind::IfExp { test, body, orelse } => {
-                result.push(Node::Expr(body));
-                result.push(Node::Expr(test));
-                result.push(Node::Expr(orelse));
-            }
-            ExprKind::Dict { keys, values } => {
-                for key in keys.iter().flatten() {
-                    result.push(Node::Expr(key));
-                }
-                for value in values {
-                    result.push(Node::Expr(value));
-                }
-            }
-            ExprKind::Set { elts } => {
-                for elt in elts {
-                    result.push(Node::Expr(elt));
-                }
-            }
-            ExprKind::ListComp { elt, generators } => {
-                result.push(Node::Expr(elt));
-                for generator in generators {
-                    result.push(Node::Expr(&generator.target));
-                    result.push(Node::Expr(&generator.iter));
-                    for expr in &generator.ifs {
-                        result.push(Node::Expr(expr));
-                    }
-                }
-            }
-            ExprKind::SetComp { elt, generators } => {
-                result.push(Node::Expr(elt));
-                for generator in generators {
-                    result.push(Node::Expr(&generator.target));
-                    result.push(Node::Expr(&generator.iter));
-                    for expr in &generator.ifs {
-                        result.push(Node::Expr(expr));
-                    }
-                }
-            }
-            ExprKind::DictComp {
-                key,
-                value,
-                generators,
-            } => {
-                result.push(Node::Expr(key));
-                result.push(Node::Expr(value));
-                for generator in generators {
-                    result.push(Node::Expr(&generator.target));
-                    result.push(Node::Expr(&generator.iter));
-                    for expr in &generator.ifs {
-                        result.push(Node::Expr(expr));
-                    }
-                }
-            }
-            ExprKind::GeneratorExp { elt, generators } => {
-                result.push(Node::Expr(elt));
-                for generator in generators {
-                    result.push(Node::Expr(&generator.target));
-                    result.push(Node::Expr(&generator.iter));
-                    for expr in &generator.ifs {
-                        result.push(Node::Expr(expr));
-                    }
-                }
-            }
-            ExprKind::Await { value } => {
-                result.push(Node::Expr(value));
-            }
-            ExprKind::Yield { value } => {
-                if let Some(value) = value {
-                    result.push(Node::Expr(value));
-                }
-            }
-            ExprKind::YieldFrom { value } => {
-                result.push(Node::Expr(value));
-            }
-            ExprKind::Compare {
-                left,
-                ops,
-                comparators,
-            } => {
-                result.push(Node::Expr(left));
-                for (op, comparator) in ops.iter().zip(comparators) {
-                    result.push(Node::CmpOp(op));
-                    result.push(Node::Expr(comparator));
-                }
-            }
-            ExprKind::Call {
-                func,
-                args,
-                keywords,
-            } => {
-                result.push(Node::Expr(func));
-                for arg in args {
-                    result.push(Node::Expr(arg));
-                }
-                for keyword in keywords {
-                    result.push(Node::Keyword(keyword));
-                }
-            }
-            ExprKind::FormattedValue {
-                value, format_spec, ..
-            } => {
-                result.push(Node::Expr(value));
-                if let Some(format_spec) = format_spec {
-                    result.push(Node::Expr(format_spec));
-                }
-            }
-            ExprKind::JoinedStr { values } => {
-                for value in values {
-                    result.push(Node::Expr(value));
-                }
-            }
-            ExprKind::Constant { .. } => {}
-            ExprKind::Attribute { value, .. } => {
-                result.push(Node::Expr(value));
-            }
-            ExprKind::Subscript { value, slice, .. } => {
-                result.push(Node::Expr(value));
-                result.push(Node::Expr(slice));
-            }
-            ExprKind::Starred { value, .. } => {
-                result.push(Node::Expr(value));
-            }
+/// Counts the empty lines between `offset` and the first non-whitespace character.
+pub(crate) fn lines_after(offset: TextSize, code: &str) -> u32 {
+    let rest = &code[usize::from(offset)..];
+    let mut newlines = 0;
 
-            ExprKind::Name { .. } => {}
-            ExprKind::List { elts, .. } => {
-                for elt in elts {
-                    result.push(Node::Expr(elt));
-                }
+    for (index, c) in rest.char_indices() {
+        match c {
+            '\n' => {
+                newlines += 1;
             }
-            ExprKind::Tuple { elts, .. } => {
-                for elt in elts {
-                    result.push(Node::Expr(elt));
-                }
-            }
-            ExprKind::Slice { lower, upper, step } => {
-                result.push(Node::SliceIndex(lower));
-                result.push(Node::SliceIndex(upper));
-                if let Some(step) = step {
-                    result.push(Node::SliceIndex(step));
-                }
+            '\r' if rest.as_bytes().get(index + 1).copied() == Some(b'\n') => {
+                continue;
             }
-        },
-        Node::Keyword(keyword) => {
-            result.push(Node::Expr(&keyword.node.value));
-        }
-        Node::Alias(..) => {}
-        Node::Excepthandler(excepthandler) => {
-            let ExcepthandlerKind::ExceptHandler { type_, body, .. } = &excepthandler.node;
-            if let Some(type_) = type_ {
-                result.push(Node::Expr(type_));
+            '\r' => {
+                newlines += 1;
             }
-            result.push(Node::Body(body));
+            c if is_python_whitespace(c) => continue,
+            _ => break,
         }
-        Node::SliceIndex(slice_index) => {
-            if let SliceIndexKind::Index { value } = &slice_index.node {
-                result.push(Node::Expr(value));
-            }
-        }
-        Node::Pattern(pattern) => match &pattern.node {
-            PatternKind::MatchValue { value } => {
-                result.push(Node::Expr(value));
-            }
-            PatternKind::MatchSingleton { .. } => {}
-            PatternKind::MatchSequence { patterns } => {
-                for pattern in patterns {
-                    result.push(Node::Pattern(pattern));
-                }
-            }
-            PatternKind::MatchMapping { keys, patterns, .. } => {
-                for (key, pattern) in keys.iter().zip(patterns.iter()) {
-                    result.push(Node::Expr(key));
-                    result.push(Node::Pattern(pattern));
-                }
-            }
-            PatternKind::MatchClass {
-                cls,
-                patterns,
-                kwd_patterns,
-                ..
-            } => {
-                result.push(Node::Expr(cls));
-                for pattern in patterns {
-                    result.push(Node::Pattern(pattern));
-                }
-                for pattern in kwd_patterns {
-                    result.push(Node::Pattern(pattern));
-                }
-            }
-            PatternKind::MatchStar { .. } => {}
-            PatternKind::MatchAs { pattern, .. } => {
-                if let Some(pattern) = pattern {
-                    result.push(Node::Pattern(pattern));
-                }
-            }
-            PatternKind::MatchOr { patterns } => {
-                for pattern in patterns {
-                    result.push(Node::Pattern(pattern));
-                }
-            }
-        },
-        Node::BoolOp(..) => {}
-        Node::UnaryOp(..) => {}
-        Node::Operator(..) => {}
-        Node::CmpOp(..) => {}
     }
-}
-
-pub fn sorted_child_nodes(node: Node) -> Vec<Node> {
-    let mut result = Vec::new();
-    sorted_child_nodes_inner(node, &mut result);
 
-    result
+    newlines
 }
 
-pub fn decorate_token<'a>(
-    token: &TriviaToken,
-    node: Node<'a>,
-    enclosing_node: Option<Node<'a>>,
-    enclosed_node: Option<Node<'a>>,
-    cache: &mut FxHashMap<usize, Vec<Node<'a>>>,
-) -> (
-    Option<Node<'a>>,
-    Option<Node<'a>>,
-    Option<Node<'a>>,
-    Option<Node<'a>>,
-) {
-    let child_nodes = cache
-        .entry(node.id())
-        .or_insert_with(|| sorted_child_nodes(node));
+/// Returns the position after skipping any trailing trivia up to, but not including the newline character.
+pub(crate) fn skip_trailing_trivia(offset: TextSize, code: &str) -> TextSize {
+    let rest = &code[usize::from(offset)..];
+    let mut iter = rest.char_indices();
 
-    let mut preceding_node = None;
-    let mut following_node = None;
-    let mut enclosed_node = enclosed_node;
+    while let Some((relative_offset, c)) = iter.next() {
+        match c {
+            '\n' | '\r' => return offset + TextSize::try_from(relative_offset).unwrap(),
+            '#' => {
+                // Skip the comment
+                let newline_offset = iter
+                    .as_str()
+                    .find(['\n', '\r'])
+                    .unwrap_or(iter.as_str().len());
 
-    let mut left = 0;
-    let mut right = child_nodes.len();
-
-    while left < right {
-        let middle = (left + right) / 2;
-        let child = child_nodes[middle];
-        let start = child.start();
-        let end = child.end();
-
-        if let Some(existing) = &enclosed_node {
-            // Special-case: if we're dealing with a statement that's a single expression,
-            // we want to treat the expression as the enclosed node.
-            let existing_start = existing.start();
-            let existing_end = existing.end();
-            if start == existing_start && end == existing_end {
-                enclosed_node = Some(child);
-            }
-        } else {
-            if token.start() <= start && token.end() >= end {
-                enclosed_node = Some(child);
+                return offset
+                    + TextSize::try_from(relative_offset + '#'.len_utf8() + newline_offset)
+                        .unwrap();
             }
+            c if is_python_whitespace(c) => continue,
+            _ => return offset + TextSize::try_from(relative_offset).unwrap(),
         }
+    }
 
-        // The comment is completely contained by this child node.
-        if token.start() >= start && token.end() <= end {
-            return decorate_token(token, child, Some(child), enclosed_node, cache);
-        }
+    offset + rest.text_len()
+}
 
-        if end <= token.start() {
-            // This child node falls completely before the comment.
-            // Because we will never consider this node or any nodes
-            // before it again, this node must be the closest preceding
-            // node we have encountered so far.
-            preceding_node = Some(child);
-            left = middle + 1;
-            continue;
-        }
+#[cfg(test)]
+mod tests {
+    use crate::trivia::{lines_after, lines_before};
+    use ruff_text_size::TextSize;
 
-        if token.end() <= start {
-            // This child node falls completely after the comment.
-            // Because we will never consider this node or any nodes after
-            // it again, this node must be the closest following node we
-            // have encountered so far.
-            following_node = Some(child);
-            right = middle;
-            continue;
-        }
+    #[test]
+    fn lines_before_empty_string() {
+        assert_eq!(lines_before(TextSize::new(0), ""), 0);
+    }
 
-        return (None, None, None, enclosed_node);
+    #[test]
+    fn lines_before_in_the_middle_of_a_line() {
+        assert_eq!(lines_before(TextSize::new(4), "a = 20"), 0);
     }
 
-    (
-        preceding_node,
-        following_node,
-        enclosing_node,
-        enclosed_node,
-    )
-}
+    #[test]
+    fn lines_before_on_a_new_line() {
+        assert_eq!(lines_before(TextSize::new(7), "a = 20\nb = 10"), 1);
+    }
 
-#[derive(Debug, Default)]
-pub struct TriviaIndex {
-    pub alias: FxHashMap<usize, Vec<Trivia>>,
-    pub arg: FxHashMap<usize, Vec<Trivia>>,
-    pub body: FxHashMap<usize, Vec<Trivia>>,
-    pub bool_op: FxHashMap<usize, Vec<Trivia>>,
-    pub cmp_op: FxHashMap<usize, Vec<Trivia>>,
-    pub excepthandler: FxHashMap<usize, Vec<Trivia>>,
-    pub expr: FxHashMap<usize, Vec<Trivia>>,
-    pub keyword: FxHashMap<usize, Vec<Trivia>>,
-    pub operator: FxHashMap<usize, Vec<Trivia>>,
-    pub pattern: FxHashMap<usize, Vec<Trivia>>,
-    pub slice_index: FxHashMap<usize, Vec<Trivia>>,
-    pub stmt: FxHashMap<usize, Vec<Trivia>>,
-    pub unary_op: FxHashMap<usize, Vec<Trivia>>,
-}
+    #[test]
+    fn lines_before_multiple_leading_newlines() {
+        assert_eq!(lines_before(TextSize::new(9), "a = 20\n\r\nb = 10"), 2);
+    }
 
-fn add_comment(comment: Trivia, node: &Node, trivia: &mut TriviaIndex) {
-    match node {
-        Node::Alias(node) => {
-            trivia
-                .alias
-                .entry(node.id())
-                .or_insert_with(Vec::new)
-                .push(comment);
-        }
-        Node::Arg(node) => {
-            trivia
-                .arg
-                .entry(node.id())
-                .or_insert_with(Vec::new)
-                .push(comment);
-        }
-        Node::Body(node) => {
-            trivia
-                .body
-                .entry(node.id())
-                .or_insert_with(Vec::new)
-                .push(comment);
-        }
-        Node::BoolOp(node) => {
-            trivia
-                .bool_op
-                .entry(node.id())
-                .or_insert_with(Vec::new)
-                .push(comment);
-        }
-        Node::CmpOp(node) => {
-            trivia
-                .cmp_op
-                .entry(node.id())
-                .or_insert_with(Vec::new)
-                .push(comment);
-        }
-        Node::Excepthandler(node) => {
-            trivia
-                .excepthandler
-                .entry(node.id())
-                .or_insert_with(Vec::new)
-                .push(comment);
-        }
-        Node::Expr(node) => {
-            trivia
-                .expr
-                .entry(node.id())
-                .or_insert_with(Vec::new)
-                .push(comment);
-        }
-        Node::Keyword(node) => {
-            trivia
-                .keyword
-                .entry(node.id())
-                .or_insert_with(Vec::new)
-                .push(comment);
-        }
-        Node::Operator(node) => {
-            trivia
-                .operator
-                .entry(node.id())
-                .or_insert_with(Vec::new)
-                .push(comment);
-        }
-        Node::Pattern(node) => {
-            trivia
-                .pattern
-                .entry(node.id())
-                .or_insert_with(Vec::new)
-                .push(comment);
-        }
-        Node::SliceIndex(node) => {
-            trivia
-                .slice_index
-                .entry(node.id())
-                .or_insert_with(Vec::new)
-                .push(comment);
-        }
-        Node::Stmt(node) => {
-            trivia
-                .stmt
-                .entry(node.id())
-                .or_insert_with(Vec::new)
-                .push(comment);
-        }
-        Node::UnaryOp(node) => {
-            trivia
-                .unary_op
-                .entry(node.id())
-                .or_insert_with(Vec::new)
-                .push(comment);
-        }
-        Node::Mod(_) => {}
+    #[test]
+    fn lines_before_with_comment_offset() {
+        assert_eq!(lines_before(TextSize::new(8), "a = 20\n# a comment"), 0);
     }
-}
 
-pub fn decorate_trivia(tokens: Vec<TriviaToken>, python_ast: &[Stmt]) -> TriviaIndex {
-    let mut stack = vec![];
-    let mut cache = FxHashMap::default();
-    for token in &tokens {
-        let (preceding_node, following_node, enclosing_node, enclosed_node) =
-            decorate_token(token, Node::Mod(python_ast), None, None, &mut cache);
+    #[test]
+    fn lines_before_with_trailing_comment() {
+        assert_eq!(
+            lines_before(TextSize::new(22), "a = 20 # some comment\nb = 10"),
+            1
+        );
+    }
 
-        stack.push((
-            preceding_node,
-            following_node,
-            enclosing_node,
-            enclosed_node,
-        ));
+    #[test]
+    fn lines_before_with_comment_only_line() {
+        assert_eq!(
+            lines_before(TextSize::new(22), "a = 20\n# some comment\nb = 10"),
+            1
+        );
     }
 
-    let mut trivia_index = TriviaIndex::default();
+    #[test]
+    fn lines_after_empty_string() {
+        assert_eq!(lines_after(TextSize::new(0), ""), 0);
+    }
 
-    for (index, token) in tokens.into_iter().enumerate() {
-        let (preceding_node, following_node, enclosing_node, enclosed_node) = &stack[index];
-        match token.kind {
-            TriviaTokenKind::EmptyLine | TriviaTokenKind::OwnLineComment => {
-                if let Some(following_node) = following_node {
-                    // Always a leading comment.
-                    add_comment(
-                        Trivia::from_token(&token, Relationship::Leading),
-                        following_node,
-                        &mut trivia_index,
-                    );
-                } else if let Some(enclosing_node) = enclosing_node {
-                    // TODO(charlie): Prettier puts this `else if` after `preceding_note`.
-                    add_comment(
-                        Trivia::from_token(&token, Relationship::Dangling),
-                        enclosing_node,
-                        &mut trivia_index,
-                    );
-                } else if let Some(preceding_node) = preceding_node {
-                    add_comment(
-                        Trivia::from_token(&token, Relationship::Trailing),
-                        preceding_node,
-                        &mut trivia_index,
-                    );
-                } else {
-                    unreachable!("Attach token to the ast: {:?}", token);
-                }
-            }
-            TriviaTokenKind::EndOfLineComment => {
-                if let Some(preceding_node) = preceding_node {
-                    // There is content before this comment on the same line, but
-                    // none after it, so prefer a trailing comment of the previous node.
-                    add_comment(
-                        Trivia::from_token(&token, Relationship::Trailing),
-                        preceding_node,
-                        &mut trivia_index,
-                    );
-                } else if let Some(enclosing_node) = enclosing_node {
-                    // TODO(charlie): Prettier puts this later, and uses `Relationship::Dangling`.
-                    add_comment(
-                        Trivia::from_token(&token, Relationship::Trailing),
-                        enclosing_node,
-                        &mut trivia_index,
-                    );
-                } else if let Some(following_node) = following_node {
-                    add_comment(
-                        Trivia::from_token(&token, Relationship::Leading),
-                        following_node,
-                        &mut trivia_index,
-                    );
-                } else {
-                    unreachable!("Attach token to the ast: {:?}", token);
-                }
-            }
-            TriviaTokenKind::MagicTrailingComma => {
-                if let Some(enclosing_node) = enclosing_node {
-                    add_comment(
-                        Trivia::from_token(&token, Relationship::Trailing),
-                        enclosing_node,
-                        &mut trivia_index,
-                    );
-                } else {
-                    unreachable!("Attach token to the ast: {:?}", token);
-                }
-            }
-            TriviaTokenKind::Parentheses => {
-                if let Some(enclosed_node) = enclosed_node {
-                    add_comment(
-                        Trivia::from_token(&token, Relationship::Leading),
-                        enclosed_node,
-                        &mut trivia_index,
-                    );
-                } else {
-                    unreachable!("Attach token to the ast: {:?}", token);
-                }
-            }
-        }
+    #[test]
+    fn lines_after_in_the_middle_of_a_line() {
+        assert_eq!(lines_after(TextSize::new(4), "a = 20"), 0);
     }
 
-    trivia_index
+    #[test]
+    fn lines_after_before_a_new_line() {
+        assert_eq!(lines_after(TextSize::new(6), "a = 20\nb = 10"), 1);
+    }
+
+    #[test]
+    fn lines_after_multiple_newlines() {
+        assert_eq!(lines_after(TextSize::new(6), "a = 20\n\r\nb = 10"), 2);
+    }
+
+    #[test]
+    fn lines_after_before_comment_offset() {
+        assert_eq!(lines_after(TextSize::new(7), "a = 20 # a comment\n"), 0);
+    }
+
+    #[test]
+    fn lines_after_with_comment_only_line() {
+        assert_eq!(
+            lines_after(TextSize::new(6), "a = 20\n# some comment\nb = 10"),
+            1
+        );
+    }
 }
diff --git a/crates/ruff_python_semantic/Cargo.toml b/crates/ruff_python_semantic/Cargo.toml
index 87ac6230c070c..3716d2c10323d 100644
--- a/crates/ruff_python_semantic/Cargo.toml
+++ b/crates/ruff_python_semantic/Cargo.toml
@@ -11,10 +11,12 @@ rust-version = { workspace = true }
 ruff_python_ast = { path = "../ruff_python_ast" }
 ruff_python_stdlib = { path = "../ruff_python_stdlib" }
 ruff_text_size = { workspace = true }
+ruff_index = { path = "../ruff_index" }
 
 bitflags = { workspace = true }
 is-macro = { workspace = true }
 nohash-hasher = { workspace = true }
+num-traits = { workspace = true }
 rustc-hash = { workspace = true }
 rustpython-parser = { workspace = true }
 smallvec = { workspace = true }
diff --git a/crates/ruff_python_semantic/src/analyze/branch_detection.rs b/crates/ruff_python_semantic/src/analyze/branch_detection.rs
new file mode 100644
index 0000000000000..7d1f1c228434a
--- /dev/null
+++ b/crates/ruff_python_semantic/src/analyze/branch_detection.rs
@@ -0,0 +1,100 @@
+use std::cmp::Ordering;
+
+use rustpython_parser::ast::{self, Excepthandler, Stmt};
+
+use crate::node::{NodeId, Nodes};
+
+/// Return the common ancestor of `left` and `right` below `stop`, or `None`.
+fn common_ancestor(
+    left: NodeId,
+    right: NodeId,
+    stop: Option<NodeId>,
+    node_tree: &Nodes,
+) -> Option<NodeId> {
+    if stop.map_or(false, |stop| left == stop || right == stop) {
+        return None;
+    }
+
+    if left == right {
+        return Some(left);
+    }
+
+    let left_depth = node_tree.depth(left);
+    let right_depth = node_tree.depth(right);
+
+    match left_depth.cmp(&right_depth) {
+        Ordering::Less => {
+            let right = node_tree.parent_id(right)?;
+            common_ancestor(left, right, stop, node_tree)
+        }
+        Ordering::Equal => {
+            let left = node_tree.parent_id(left)?;
+            let right = node_tree.parent_id(right)?;
+            common_ancestor(left, right, stop, node_tree)
+        }
+        Ordering::Greater => {
+            let left = node_tree.parent_id(left)?;
+            common_ancestor(left, right, stop, node_tree)
+        }
+    }
+}
+
+/// Return the alternative branches for a given node.
+fn alternatives(stmt: &Stmt) -> Vec<Vec<&Stmt>> {
+    match stmt {
+        Stmt::If(ast::StmtIf { body, .. }) => vec![body.iter().collect()],
+        Stmt::Try(ast::StmtTry {
+            body,
+            handlers,
+            orelse,
+            ..
+        })
+        | Stmt::TryStar(ast::StmtTryStar {
+            body,
+            handlers,
+            orelse,
+            ..
+        }) => vec![body.iter().chain(orelse.iter()).collect()]
+            .into_iter()
+            .chain(handlers.iter().map(|handler| {
+                let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler { body, .. }) =
+                    handler;
+                body.iter().collect()
+            }))
+            .collect(),
+        Stmt::Match(ast::StmtMatch { cases, .. }) => cases
+            .iter()
+            .map(|case| case.body.iter().collect())
+            .collect(),
+        _ => vec![],
+    }
+}
+
+/// Return `true` if `stmt` is a descendent of any of the nodes in `ancestors`.
+fn descendant_of<'a>(
+    stmt: NodeId,
+    ancestors: &[&'a Stmt],
+    stop: NodeId,
+    node_tree: &Nodes<'a>,
+) -> bool {
+    ancestors.iter().any(|ancestor| {
+        node_tree.node_id(ancestor).map_or(false, |ancestor| {
+            common_ancestor(stmt, ancestor, Some(stop), node_tree).is_some()
+        })
+    })
+}
+
+/// Return `true` if `left` and `right` are on different branches of an `if` or
+/// `try` statement.
+pub fn different_forks(left: NodeId, right: NodeId, node_tree: &Nodes) -> bool {
+    if let Some(ancestor) = common_ancestor(left, right, None, node_tree) {
+        for items in alternatives(node_tree[ancestor]) {
+            let l = descendant_of(left, &items, ancestor, node_tree);
+            let r = descendant_of(right, &items, ancestor, node_tree);
+            if l ^ r {
+                return true;
+            }
+        }
+    }
+    false
+}
diff --git a/crates/ruff_python_semantic/src/analyze/function_type.rs b/crates/ruff_python_semantic/src/analyze/function_type.rs
index 1df2f34a07f62..8d90e1edd7b6b 100644
--- a/crates/ruff_python_semantic/src/analyze/function_type.rs
+++ b/crates/ruff_python_semantic/src/analyze/function_type.rs
@@ -3,7 +3,7 @@ use rustpython_parser::ast::Expr;
 use ruff_python_ast::call_path::from_qualified_name;
 use ruff_python_ast::helpers::map_callable;
 
-use crate::context::Context;
+use crate::model::SemanticModel;
 use crate::scope::{Scope, ScopeKind};
 
 const CLASS_METHODS: [&str; 3] = ["__new__", "__init_subclass__", "__class_getitem__"];
@@ -19,7 +19,7 @@ pub enum FunctionType {
 
 /// Classify a function based on its scope, name, and decorators.
 pub fn classify(
-    ctx: &Context,
+    model: &SemanticModel,
     scope: &Scope,
     name: &str,
     decorator_list: &[Expr],
@@ -32,7 +32,8 @@ pub fn classify(
     if decorator_list.iter().any(|expr| {
         // The method is decorated with a static method decorator (like
         // `@staticmethod`).
-        ctx.resolve_call_path(map_callable(expr))
+        model
+            .resolve_call_path(map_callable(expr))
             .map_or(false, |call_path| {
                 call_path.as_slice() == ["", "staticmethod"]
                     || staticmethod_decorators
@@ -45,7 +46,7 @@ pub fn classify(
         // Special-case class method, like `__new__`.
         || scope.bases.iter().any(|expr| {
             // The class itself extends a known metaclass, so all methods are class methods.
-            ctx.resolve_call_path(map_callable(expr)).map_or(false, |call_path| {
+            model.resolve_call_path(map_callable(expr)).map_or(false, |call_path| {
                 METACLASS_BASES
                     .iter()
                     .any(|(module, member)| call_path.as_slice() == [*module, *member])
@@ -53,7 +54,7 @@ pub fn classify(
         })
         || decorator_list.iter().any(|expr| {
             // The method is decorated with a class method decorator (like `@classmethod`).
-            ctx.resolve_call_path(map_callable(expr)).map_or(false, |call_path| {
+            model.resolve_call_path(map_callable(expr)).map_or(false, |call_path| {
                 call_path.as_slice() == ["", "classmethod"] ||
                 classmethod_decorators
                     .iter()
diff --git a/crates/ruff_python_semantic/src/analyze/logging.rs b/crates/ruff_python_semantic/src/analyze/logging.rs
index 95851055c7a25..9dd4079ed626a 100644
--- a/crates/ruff_python_semantic/src/analyze/logging.rs
+++ b/crates/ruff_python_semantic/src/analyze/logging.rs
@@ -1,8 +1,9 @@
-use rustpython_parser::ast::{Expr, ExprKind};
+use rustpython_parser::ast::{self, Constant, Expr, Keyword};
 
 use ruff_python_ast::call_path::collect_call_path;
+use ruff_python_ast::helpers::find_keyword;
 
-use crate::context::Context;
+use crate::model::SemanticModel;
 
 /// Return `true` if the given `Expr` is a potential logging call. Matches
 /// `logging.error`, `logger.error`, `self.logger.error`, etc., but not
@@ -16,10 +17,10 @@ use crate::context::Context;
 /// # This is detected to be a logger candidate
 /// bar.error()
 /// ```
-pub fn is_logger_candidate(context: &Context, func: &Expr) -> bool {
-    if let ExprKind::Attribute { value, .. } = &func.node {
-        let Some(call_path) = (if let Some(call_path) = context.resolve_call_path(value) {
-            if call_path.first().map_or(false, |module| *module == "logging") {
+pub fn is_logger_candidate(func: &Expr, model: &SemanticModel) -> bool {
+    if let Expr::Attribute(ast::ExprAttribute { value, .. }) = func {
+        let Some(call_path) = (if let Some(call_path) = model.resolve_call_path(value) {
+            if call_path.first().map_or(false, |module| *module == "logging") || call_path.as_slice() == ["flask", "current_app", "logger"] {
                 Some(call_path)
             } else {
                 None
@@ -37,3 +38,31 @@ pub fn is_logger_candidate(context: &Context, func: &Expr) -> bool {
     }
     false
 }
+
+/// If the keywords to a  logging call contain `exc_info=True` or `exc_info=sys.exc_info()`,
+/// return the `Keyword` for `exc_info`.
+pub fn exc_info<'a>(keywords: &'a [Keyword], model: &SemanticModel) -> Option<&'a Keyword> {
+    let exc_info = find_keyword(keywords, "exc_info")?;
+
+    // Ex) `logging.error("...", exc_info=True)`
+    if matches!(
+        exc_info.value,
+        Expr::Constant(ast::ExprConstant {
+            value: Constant::Bool(true),
+            ..
+        })
+    ) {
+        return Some(exc_info);
+    }
+
+    // Ex) `logging.error("...", exc_info=sys.exc_info())`
+    if let Expr::Call(ast::ExprCall { func, .. }) = &exc_info.value {
+        if model.resolve_call_path(func).map_or(false, |call_path| {
+            call_path.as_slice() == ["sys", "exc_info"]
+        }) {
+            return Some(exc_info);
+        }
+    }
+
+    None
+}
diff --git a/crates/ruff_python_semantic/src/analyze/mod.rs b/crates/ruff_python_semantic/src/analyze/mod.rs
index 7298cbc87ab45..f8cb0664802c6 100644
--- a/crates/ruff_python_semantic/src/analyze/mod.rs
+++ b/crates/ruff_python_semantic/src/analyze/mod.rs
@@ -1,4 +1,6 @@
+pub mod branch_detection;
 pub mod function_type;
 pub mod logging;
+pub mod type_inference;
 pub mod typing;
 pub mod visibility;
diff --git a/crates/ruff_python_semantic/src/analyze/type_inference.rs b/crates/ruff_python_semantic/src/analyze/type_inference.rs
new file mode 100644
index 0000000000000..e040fe2805472
--- /dev/null
+++ b/crates/ruff_python_semantic/src/analyze/type_inference.rs
@@ -0,0 +1,96 @@
+//! Analysis rules to perform basic type inference on individual expressions.
+
+use rustpython_parser::ast;
+use rustpython_parser::ast::{Constant, Expr};
+
+/// An extremely simple type inference system for individual expressions.
+///
+/// This system can only represent and infer the types of simple data types
+/// such as strings, integers, floats, and containers. It cannot infer the
+/// types of variables or expressions that are not statically known from
+/// individual AST nodes alone.
+#[derive(Debug, Copy, Clone)]
+pub enum PythonType {
+    /// A string literal, such as `"hello"`.
+    String,
+    /// A bytes literal, such as `b"hello"`.
+    Bytes,
+    /// An integer literal, such as `1` or `0x1`.
+    Integer,
+    /// A floating-point literal, such as `1.0` or `1e10`.
+    Float,
+    /// A complex literal, such as `1j` or `1+1j`.
+    Complex,
+    /// A boolean literal, such as `True` or `False`.
+    Bool,
+    /// A `None` literal, such as `None`.
+    None,
+    /// An ellipsis literal, such as `...`.
+    Ellipsis,
+    /// A dictionary literal, such as `{}` or `{"a": 1}`.
+    Dict,
+    /// A list literal, such as `[]` or `[i for i in range(3)]`.
+    List,
+    /// A set literal, such as `set()` or `{i for i in range(3)}`.
+    Set,
+    /// A tuple literal, such as `()` or `(1, 2, 3)`.
+    Tuple,
+    /// A generator expression, such as `(x for x in range(10))`.
+    Generator,
+    /// An unknown type, such as a variable or function call.
+    Unknown,
+}
+
+impl From<&Expr> for PythonType {
+    fn from(expr: &Expr) -> Self {
+        match expr {
+            Expr::NamedExpr(ast::ExprNamedExpr { value, .. }) => (&**value).into(),
+            Expr::UnaryOp(ast::ExprUnaryOp { operand, .. }) => (&**operand).into(),
+            Expr::Dict(_) => PythonType::Dict,
+            Expr::DictComp(_) => PythonType::Dict,
+            Expr::Set(_) => PythonType::Set,
+            Expr::SetComp(_) => PythonType::Set,
+            Expr::List(_) => PythonType::List,
+            Expr::ListComp(_) => PythonType::List,
+            Expr::Tuple(_) => PythonType::Tuple,
+            Expr::GeneratorExp(_) => PythonType::Generator,
+            Expr::JoinedStr(_) => PythonType::String,
+            Expr::BinOp(ast::ExprBinOp { left, op, .. }) => {
+                // Ex) "a" % "b"
+                if op.is_mod() {
+                    if matches!(
+                        left.as_ref(),
+                        Expr::Constant(ast::ExprConstant {
+                            value: Constant::Str(..),
+                            ..
+                        })
+                    ) {
+                        return PythonType::String;
+                    }
+                    if matches!(
+                        left.as_ref(),
+                        Expr::Constant(ast::ExprConstant {
+                            value: Constant::Bytes(..),
+                            ..
+                        })
+                    ) {
+                        return PythonType::Bytes;
+                    }
+                }
+                PythonType::Unknown
+            }
+            Expr::Constant(ast::ExprConstant { value, .. }) => match value {
+                Constant::Str(_) => PythonType::String,
+                Constant::Int(_) => PythonType::Integer,
+                Constant::Float(_) => PythonType::Float,
+                Constant::Bool(_) => PythonType::Bool,
+                Constant::Complex { .. } => PythonType::Complex,
+                Constant::None => PythonType::None,
+                Constant::Ellipsis => PythonType::Ellipsis,
+                Constant::Bytes(_) => PythonType::Bytes,
+                Constant::Tuple(_) => PythonType::Tuple,
+            },
+            _ => PythonType::Unknown,
+        }
+    }
+}
diff --git a/crates/ruff_python_semantic/src/analyze/typing.rs b/crates/ruff_python_semantic/src/analyze/typing.rs
index 850e1c03bc6eb..694e97e650f99 100644
--- a/crates/ruff_python_semantic/src/analyze/typing.rs
+++ b/crates/ruff_python_semantic/src/analyze/typing.rs
@@ -1,12 +1,14 @@
-use rustpython_parser::ast::{Constant, Expr, ExprKind, Operator};
+//! Analysis rules for the `typing` module.
 
-use ruff_python_ast::call_path::{from_unqualified_name, CallPath};
+use rustpython_parser::ast::{self, Constant, Expr, Operator};
+
+use num_traits::identities::Zero;
+use ruff_python_ast::call_path::{from_qualified_name, from_unqualified_name, CallPath};
 use ruff_python_stdlib::typing::{
-    IMMUTABLE_GENERIC_TYPES, IMMUTABLE_TYPES, PEP_585_BUILTINS_ELIGIBLE, PEP_593_SUBSCRIPTS,
-    SUBSCRIPTS,
+    IMMUTABLE_GENERIC_TYPES, IMMUTABLE_TYPES, PEP_585_GENERICS, PEP_593_SUBSCRIPTS, SUBSCRIPTS,
 };
 
-use crate::context::Context;
+use crate::model::SemanticModel;
 
 #[derive(Copy, Clone)]
 pub enum Callable {
@@ -27,109 +29,224 @@ pub enum SubscriptKind {
 
 pub fn match_annotated_subscript<'a>(
     expr: &Expr,
-    context: &Context,
+    semantic_model: &SemanticModel,
     typing_modules: impl Iterator<Item = &'a str>,
+    extend_generics: &[String],
 ) -> Option<SubscriptKind> {
-    if !matches!(
-        expr.node,
-        ExprKind::Name { .. } | ExprKind::Attribute { .. }
-    ) {
+    if !matches!(expr, Expr::Name(_) | Expr::Attribute(_)) {
         return None;
     }
 
-    context.resolve_call_path(expr).and_then(|call_path| {
-        if SUBSCRIPTS.contains(&call_path.as_slice()) {
-            return Some(SubscriptKind::AnnotatedSubscript);
-        }
-        if PEP_593_SUBSCRIPTS.contains(&call_path.as_slice()) {
-            return Some(SubscriptKind::PEP593AnnotatedSubscript);
-        }
+    semantic_model
+        .resolve_call_path(expr)
+        .and_then(|call_path| {
+            if SUBSCRIPTS.contains(&call_path.as_slice())
+                || extend_generics
+                    .iter()
+                    .map(|target| from_qualified_name(target))
+                    .any(|target| call_path == target)
+            {
+                return Some(SubscriptKind::AnnotatedSubscript);
+            }
+            if PEP_593_SUBSCRIPTS.contains(&call_path.as_slice()) {
+                return Some(SubscriptKind::PEP593AnnotatedSubscript);
+            }
 
-        for module in typing_modules {
-            let module_call_path: CallPath = from_unqualified_name(module);
-            if call_path.starts_with(&module_call_path) {
-                for subscript in SUBSCRIPTS.iter() {
-                    if call_path.last() == subscript.last() {
-                        return Some(SubscriptKind::AnnotatedSubscript);
+            for module in typing_modules {
+                let module_call_path: CallPath = from_unqualified_name(module);
+                if call_path.starts_with(&module_call_path) {
+                    for subscript in SUBSCRIPTS.iter() {
+                        if call_path.last() == subscript.last() {
+                            return Some(SubscriptKind::AnnotatedSubscript);
+                        }
                     }
-                }
-                for subscript in PEP_593_SUBSCRIPTS.iter() {
-                    if call_path.last() == subscript.last() {
-                        return Some(SubscriptKind::PEP593AnnotatedSubscript);
+                    for subscript in PEP_593_SUBSCRIPTS.iter() {
+                        if call_path.last() == subscript.last() {
+                            return Some(SubscriptKind::PEP593AnnotatedSubscript);
+                        }
                     }
                 }
             }
+
+            None
+        })
+}
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub enum ModuleMember {
+    /// A builtin symbol, like `"list"`.
+    BuiltIn(&'static str),
+    /// A module member, like `("collections", "deque")`.
+    Member(&'static str, &'static str),
+}
+
+impl std::fmt::Display for ModuleMember {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        match self {
+            ModuleMember::BuiltIn(name) => std::write!(f, "{name}"),
+            ModuleMember::Member(module, member) => std::write!(f, "{module}.{member}"),
         }
+    }
+}
+
+/// Returns the PEP 585 standard library generic variant for a `typing` module reference, if such
+/// a variant exists.
+pub fn to_pep585_generic(expr: &Expr, semantic_model: &SemanticModel) -> Option<ModuleMember> {
+    semantic_model
+        .resolve_call_path(expr)
+        .and_then(|call_path| {
+            let [module, name] = call_path.as_slice() else {
+            return None;
+        };
+            PEP_585_GENERICS.iter().find_map(
+                |((from_module, from_member), (to_module, to_member))| {
+                    if module == from_module && name == from_member {
+                        if to_module.is_empty() {
+                            Some(ModuleMember::BuiltIn(to_member))
+                        } else {
+                            Some(ModuleMember::Member(to_module, to_member))
+                        }
+                    } else {
+                        None
+                    }
+                },
+            )
+        })
+}
 
-        None
-    })
+/// Return whether a given expression uses a PEP 585 standard library generic.
+pub fn is_pep585_generic(expr: &Expr, model: &SemanticModel) -> bool {
+    if let Some(call_path) = model.resolve_call_path(expr) {
+        let [module, name] = call_path.as_slice() else {
+            return false;
+        };
+        for (_, (to_module, to_member)) in PEP_585_GENERICS {
+            if module == to_module && name == to_member {
+                return true;
+            }
+        }
+    }
+    false
 }
 
-/// Returns `true` if `Expr` represents a reference to a typing object with a
-/// PEP 585 built-in.
-pub fn is_pep585_builtin(expr: &Expr, context: &Context) -> bool {
-    context.resolve_call_path(expr).map_or(false, |call_path| {
-        PEP_585_BUILTINS_ELIGIBLE.contains(&call_path.as_slice())
-    })
+#[derive(Debug, Copy, Clone)]
+pub enum Pep604Operator {
+    /// The union operator, e.g., `Union[str, int]`, expressible as `str | int` after PEP 604.
+    Union,
+    /// The union operator, e.g., `Optional[str]`, expressible as `str | None` after PEP 604.
+    Optional,
 }
 
-pub fn is_immutable_annotation(context: &Context, expr: &Expr) -> bool {
-    match &expr.node {
-        ExprKind::Name { .. } | ExprKind::Attribute { .. } => {
-            context.resolve_call_path(expr).map_or(false, |call_path| {
-                IMMUTABLE_TYPES
-                    .iter()
-                    .chain(IMMUTABLE_GENERIC_TYPES)
-                    .any(|target| call_path.as_slice() == *target)
-            })
+/// Return the PEP 604 operator variant to which the given subscript [`Expr`] corresponds, if any.
+pub fn to_pep604_operator(
+    value: &Expr,
+    slice: &Expr,
+    semantic_model: &SemanticModel,
+) -> Option<Pep604Operator> {
+    /// Returns `true` if any argument in the slice is a string.
+    fn any_arg_is_str(slice: &Expr) -> bool {
+        match slice {
+            Expr::Constant(ast::ExprConstant {
+                value: Constant::Str(_),
+                ..
+            }) => true,
+            Expr::Tuple(ast::ExprTuple { elts, .. }) => elts.iter().any(any_arg_is_str),
+            _ => false,
+        }
+    }
+
+    // If any of the _arguments_ are forward references, we can't use PEP 604.
+    // Ex) `Union["str", "int"]` can't be converted to `"str" | "int"`.
+    if any_arg_is_str(slice) {
+        return None;
+    }
+
+    semantic_model
+        .resolve_call_path(value)
+        .as_ref()
+        .and_then(|call_path| {
+            if semantic_model.match_typing_call_path(call_path, "Optional") {
+                Some(Pep604Operator::Optional)
+            } else if semantic_model.match_typing_call_path(call_path, "Union") {
+                Some(Pep604Operator::Union)
+            } else {
+                None
+            }
+        })
+}
+
+/// Return `true` if `Expr` represents a reference to a type annotation that resolves to an
+/// immutable type.
+pub fn is_immutable_annotation(semantic_model: &SemanticModel, expr: &Expr) -> bool {
+    match expr {
+        Expr::Name(_) | Expr::Attribute(_) => {
+            semantic_model
+                .resolve_call_path(expr)
+                .map_or(false, |call_path| {
+                    IMMUTABLE_TYPES
+                        .iter()
+                        .chain(IMMUTABLE_GENERIC_TYPES)
+                        .any(|target| call_path.as_slice() == *target)
+                })
         }
-        ExprKind::Subscript { value, slice, .. } => {
-            context.resolve_call_path(value).map_or(false, |call_path| {
+        Expr::Subscript(ast::ExprSubscript { value, slice, .. }) => semantic_model
+            .resolve_call_path(value)
+            .map_or(false, |call_path| {
                 if IMMUTABLE_GENERIC_TYPES
                     .iter()
                     .any(|target| call_path.as_slice() == *target)
                 {
                     true
                 } else if call_path.as_slice() == ["typing", "Union"] {
-                    if let ExprKind::Tuple { elts, .. } = &slice.node {
-                        elts.iter().all(|elt| is_immutable_annotation(context, elt))
+                    if let Expr::Tuple(ast::ExprTuple { elts, .. }) = slice.as_ref() {
+                        elts.iter()
+                            .all(|elt| is_immutable_annotation(semantic_model, elt))
                     } else {
                         false
                     }
                 } else if call_path.as_slice() == ["typing", "Optional"] {
-                    is_immutable_annotation(context, slice)
+                    is_immutable_annotation(semantic_model, slice)
                 } else if call_path.as_slice() == ["typing", "Annotated"] {
-                    if let ExprKind::Tuple { elts, .. } = &slice.node {
+                    if let Expr::Tuple(ast::ExprTuple { elts, .. }) = slice.as_ref() {
                         elts.first()
-                            .map_or(false, |elt| is_immutable_annotation(context, elt))
+                            .map_or(false, |elt| is_immutable_annotation(semantic_model, elt))
                     } else {
                         false
                     }
                 } else {
                     false
                 }
-            })
-        }
-        ExprKind::BinOp {
+            }),
+        Expr::BinOp(ast::ExprBinOp {
             left,
             op: Operator::BitOr,
             right,
-        } => is_immutable_annotation(context, left) && is_immutable_annotation(context, right),
-        ExprKind::Constant {
+            range: _range,
+        }) => {
+            is_immutable_annotation(semantic_model, left)
+                && is_immutable_annotation(semantic_model, right)
+        }
+        Expr::Constant(ast::ExprConstant {
             value: Constant::None,
             ..
-        } => true,
+        }) => true,
         _ => false,
     }
 }
 
 const IMMUTABLE_FUNCS: &[&[&str]] = &[
-    &["", "tuple"],
+    &["", "bool"],
+    &["", "complex"],
+    &["", "float"],
     &["", "frozenset"],
+    &["", "int"],
+    &["", "str"],
+    &["", "tuple"],
     &["datetime", "date"],
     &["datetime", "datetime"],
     &["datetime", "timedelta"],
     &["decimal", "Decimal"],
+    &["fractions", "Fraction"],
     &["operator", "attrgetter"],
     &["operator", "itemgetter"],
     &["operator", "methodcaller"],
@@ -138,17 +255,59 @@ const IMMUTABLE_FUNCS: &[&[&str]] = &[
     &["re", "compile"],
 ];
 
+/// Return `true` if `func` is a function that returns an immutable object.
 pub fn is_immutable_func(
-    context: &Context,
+    semantic_model: &SemanticModel,
     func: &Expr,
     extend_immutable_calls: &[CallPath],
 ) -> bool {
-    context.resolve_call_path(func).map_or(false, |call_path| {
-        IMMUTABLE_FUNCS
-            .iter()
-            .any(|target| call_path.as_slice() == *target)
-            || extend_immutable_calls
+    semantic_model
+        .resolve_call_path(func)
+        .map_or(false, |call_path| {
+            IMMUTABLE_FUNCS
                 .iter()
-                .any(|target| call_path == *target)
-    })
+                .any(|target| call_path.as_slice() == *target)
+                || extend_immutable_calls
+                    .iter()
+                    .any(|target| call_path == *target)
+        })
+}
+
+/// Return `true` if [`Expr`] is a guard for a type-checking block.
+pub fn is_type_checking_block(stmt: &ast::StmtIf, semantic_model: &SemanticModel) -> bool {
+    let ast::StmtIf { test, .. } = stmt;
+
+    // Ex) `if False:`
+    if matches!(
+        test.as_ref(),
+        Expr::Constant(ast::ExprConstant {
+            value: Constant::Bool(false),
+            ..
+        })
+    ) {
+        return true;
+    }
+
+    // Ex) `if 0:`
+    if let Expr::Constant(ast::ExprConstant {
+        value: Constant::Int(value),
+        ..
+    }) = test.as_ref()
+    {
+        if value.is_zero() {
+            return true;
+        }
+    }
+
+    // Ex) `if typing.TYPE_CHECKING:`
+    if semantic_model
+        .resolve_call_path(test)
+        .map_or(false, |call_path| {
+            call_path.as_slice() == ["typing", "TYPE_CHECKING"]
+        })
+    {
+        return true;
+    }
+
+    false
 }
diff --git a/crates/ruff_python_semantic/src/analyze/visibility.rs b/crates/ruff_python_semantic/src/analyze/visibility.rs
index 3d707de69f326..dd921a8d2606a 100644
--- a/crates/ruff_python_semantic/src/analyze/visibility.rs
+++ b/crates/ruff_python_semantic/src/analyze/visibility.rs
@@ -1,35 +1,23 @@
 use std::path::Path;
 
-use rustpython_parser::ast::{Expr, Stmt, StmtKind};
+use rustpython_parser::ast::{self, Expr, Stmt};
 
 use ruff_python_ast::call_path::{collect_call_path, CallPath};
 use ruff_python_ast::helpers::map_callable;
 
-use crate::context::Context;
+use crate::model::SemanticModel;
 
-#[derive(Debug, Clone, Copy)]
-pub enum Modifier {
-    Module,
-    Class,
-    Function,
-}
-
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, is_macro::Is)]
 pub enum Visibility {
     Public,
     Private,
 }
 
-#[derive(Debug, Clone, Copy)]
-pub struct VisibleScope {
-    pub modifier: Modifier,
-    pub visibility: Visibility,
-}
-
 /// Returns `true` if a function is a "static method".
-pub fn is_staticmethod(ctx: &Context, decorator_list: &[Expr]) -> bool {
+pub fn is_staticmethod(model: &SemanticModel, decorator_list: &[Expr]) -> bool {
     decorator_list.iter().any(|expr| {
-        ctx.resolve_call_path(map_callable(expr))
+        model
+            .resolve_call_path(map_callable(expr))
             .map_or(false, |call_path| {
                 call_path.as_slice() == ["", "staticmethod"]
             })
@@ -37,9 +25,10 @@ pub fn is_staticmethod(ctx: &Context, decorator_list: &[Expr]) -> bool {
 }
 
 /// Returns `true` if a function is a "class method".
-pub fn is_classmethod(ctx: &Context, decorator_list: &[Expr]) -> bool {
+pub fn is_classmethod(model: &SemanticModel, decorator_list: &[Expr]) -> bool {
     decorator_list.iter().any(|expr| {
-        ctx.resolve_call_path(map_callable(expr))
+        model
+            .resolve_call_path(map_callable(expr))
             .map_or(false, |call_path| {
                 call_path.as_slice() == ["", "classmethod"]
             })
@@ -47,26 +36,35 @@ pub fn is_classmethod(ctx: &Context, decorator_list: &[Expr]) -> bool {
 }
 
 /// Returns `true` if a function definition is an `@overload`.
-pub fn is_overload(ctx: &Context, decorator_list: &[Expr]) -> bool {
+pub fn is_overload(model: &SemanticModel, decorator_list: &[Expr]) -> bool {
     decorator_list
         .iter()
-        .any(|expr| ctx.match_typing_expr(map_callable(expr), "overload"))
+        .any(|expr| model.match_typing_expr(map_callable(expr), "overload"))
 }
 
 /// Returns `true` if a function definition is an `@override` (PEP 698).
-pub fn is_override(ctx: &Context, decorator_list: &[Expr]) -> bool {
+pub fn is_override(model: &SemanticModel, decorator_list: &[Expr]) -> bool {
     decorator_list
         .iter()
-        .any(|expr| ctx.match_typing_expr(map_callable(expr), "override"))
+        .any(|expr| model.match_typing_expr(map_callable(expr), "override"))
 }
 
-/// Returns `true` if a function definition is an `@abstractmethod`.
-pub fn is_abstract(ctx: &Context, decorator_list: &[Expr]) -> bool {
+/// Returns `true` if a function definition is an abstract method based on its decorators.
+pub fn is_abstract(model: &SemanticModel, decorator_list: &[Expr]) -> bool {
     decorator_list.iter().any(|expr| {
-        ctx.resolve_call_path(map_callable(expr))
+        model
+            .resolve_call_path(map_callable(expr))
             .map_or(false, |call_path| {
-                call_path.as_slice() == ["abc", "abstractmethod"]
-                    || call_path.as_slice() == ["abc", "abstractproperty"]
+                matches!(
+                    call_path.as_slice(),
+                    [
+                        "abc",
+                        "abstractmethod"
+                            | "abstractclassmethod"
+                            | "abstractstaticmethod"
+                            | "abstractproperty"
+                    ]
+                )
             })
     })
 }
@@ -74,9 +72,14 @@ pub fn is_abstract(ctx: &Context, decorator_list: &[Expr]) -> bool {
 /// Returns `true` if a function definition is a `@property`.
 /// `extra_properties` can be used to check additional non-standard
 /// `@property`-like decorators.
-pub fn is_property(ctx: &Context, decorator_list: &[Expr], extra_properties: &[CallPath]) -> bool {
+pub fn is_property(
+    model: &SemanticModel,
+    decorator_list: &[Expr],
+    extra_properties: &[CallPath],
+) -> bool {
     decorator_list.iter().any(|expr| {
-        ctx.resolve_call_path(map_callable(expr))
+        model
+            .resolve_call_path(map_callable(expr))
             .map_or(false, |call_path| {
                 call_path.as_slice() == ["", "property"]
                     || call_path.as_slice() == ["functools", "cached_property"]
@@ -86,6 +89,14 @@ pub fn is_property(ctx: &Context, decorator_list: &[Expr], extra_properties: &[C
             })
     })
 }
+
+/// Returns `true` if a class is an `final`.
+pub fn is_final(model: &SemanticModel, decorator_list: &[Expr]) -> bool {
+    decorator_list
+        .iter()
+        .any(|expr| model.match_typing_expr(map_callable(expr), "final"))
+}
+
 /// Returns `true` if a function is a "magic method".
 pub fn is_magic(name: &str) -> bool {
     name.starts_with("__") && name.ends_with("__")
@@ -130,31 +141,48 @@ fn stem(path: &str) -> &str {
     }
 }
 
-/// Return the `Visibility` of the Python file at `Path` based on its name.
-pub fn module_visibility(module_path: Option<&[String]>, path: &Path) -> Visibility {
-    if let Some(module_path) = module_path {
-        if module_path.iter().any(|m| is_private_module(m)) {
-            return Visibility::Private;
-        }
-    } else {
-        // When module_path is None, path is a script outside a package, so just
-        // check to see if the module name itself is private.
-        // Ex) `_foo.py` (but not `__init__.py`)
-        let mut components = path.iter().rev();
-        if let Some(filename) = components.next() {
-            let module_name = filename.to_string_lossy();
-            let module_name = stem(&module_name);
-            if is_private_module(module_name) {
-                return Visibility::Private;
+/// A Python module can either be defined as a module path (i.e., the dot-separated path to the
+/// module) or, if the module can't be resolved, as a file path (i.e., the path to the file defining
+/// the module).
+#[derive(Debug)]
+pub enum ModuleSource<'a> {
+    /// A module path is a dot-separated path to the module.
+    Path(&'a [String]),
+    /// A file path is the path to the file defining the module, often a script outside of a
+    /// package.
+    File(&'a Path),
+}
+
+impl ModuleSource<'_> {
+    /// Return the `Visibility` of the module.
+    pub(crate) fn to_visibility(&self) -> Visibility {
+        match self {
+            Self::Path(path) => {
+                if path.iter().any(|m| is_private_module(m)) {
+                    return Visibility::Private;
+                }
+            }
+            Self::File(path) => {
+                // Check to see if the filename itself indicates private visibility.
+                // Ex) `_foo.py` (but not `__init__.py`)
+                let mut components = path.iter().rev();
+                if let Some(filename) = components.next() {
+                    let module_name = filename.to_string_lossy();
+                    let module_name = stem(&module_name);
+                    if is_private_module(module_name) {
+                        return Visibility::Private;
+                    }
+                }
             }
         }
+        Visibility::Public
     }
-    Visibility::Public
 }
 
-pub fn function_visibility(stmt: &Stmt) -> Visibility {
-    match &stmt.node {
-        StmtKind::FunctionDef { name, .. } | StmtKind::AsyncFunctionDef { name, .. } => {
+pub(crate) fn function_visibility(stmt: &Stmt) -> Visibility {
+    match stmt {
+        Stmt::FunctionDef(ast::StmtFunctionDef { name, .. })
+        | Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef { name, .. }) => {
             if name.starts_with('_') {
                 Visibility::Private
             } else {
@@ -165,18 +193,18 @@ pub fn function_visibility(stmt: &Stmt) -> Visibility {
     }
 }
 
-pub fn method_visibility(stmt: &Stmt) -> Visibility {
-    match &stmt.node {
-        StmtKind::FunctionDef {
+pub(crate) fn method_visibility(stmt: &Stmt) -> Visibility {
+    match stmt {
+        Stmt::FunctionDef(ast::StmtFunctionDef {
             name,
             decorator_list,
             ..
-        }
-        | StmtKind::AsyncFunctionDef {
+        })
+        | Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef {
             name,
             decorator_list,
             ..
-        } => {
+        }) => {
             // Is this a setter or deleter?
             if decorator_list.iter().any(|expr| {
                 collect_call_path(expr).map_or(false, |call_path| {
@@ -203,9 +231,9 @@ pub fn method_visibility(stmt: &Stmt) -> Visibility {
     }
 }
 
-pub fn class_visibility(stmt: &Stmt) -> Visibility {
-    match &stmt.node {
-        StmtKind::ClassDef { name, .. } => {
+pub(crate) fn class_visibility(stmt: &Stmt) -> Visibility {
+    match stmt {
+        Stmt::ClassDef(ast::StmtClassDef { name, .. }) => {
             if name.starts_with('_') {
                 Visibility::Private
             } else {
diff --git a/crates/ruff_python_semantic/src/binding.rs b/crates/ruff_python_semantic/src/binding.rs
index 9c50cfd132a1c..6d30793aa4528 100644
--- a/crates/ruff_python_semantic/src/binding.rs
+++ b/crates/ruff_python_semantic/src/binding.rs
@@ -1,101 +1,84 @@
-use std::num::TryFromIntError;
-use std::ops::{Deref, Index, IndexMut};
+use std::ops::{Deref, DerefMut};
 
 use bitflags::bitflags;
 use ruff_text_size::TextRange;
-use rustpython_parser::ast::Stmt;
+use rustpython_parser::ast::Ranged;
 
-use ruff_python_ast::types::RefEquality;
+use ruff_index::{newtype_index, IndexSlice, IndexVec};
+use ruff_python_ast::helpers;
+use ruff_python_ast::source_code::Locator;
 
-use crate::scope::ScopeId;
+use crate::context::ExecutionContext;
+use crate::model::SemanticModel;
+use crate::node::NodeId;
+use crate::reference::ReferenceId;
 
 #[derive(Debug, Clone)]
 pub struct Binding<'a> {
     pub kind: BindingKind<'a>,
     pub range: TextRange,
-    /// The context in which the binding was created.
+    /// The context in which the [`Binding`] was created.
     pub context: ExecutionContext,
     /// The statement in which the [`Binding`] was defined.
-    pub source: Option<RefEquality<'a, Stmt>>,
-    /// Tuple of (scope index, range) indicating the scope and range at which
-    /// the binding was last used in a runtime context.
-    pub runtime_usage: Option<(ScopeId, TextRange)>,
-    /// Tuple of (scope index, range) indicating the scope and range at which
-    /// the binding was last used in a typing-time context.
-    pub typing_usage: Option<(ScopeId, TextRange)>,
-    /// Tuple of (scope index, range) indicating the scope and range at which
-    /// the binding was last used in a synthetic context. This is used for
-    /// (e.g.) `__future__` imports, explicit re-exports, and other bindings
-    /// that should be considered used even if they're never referenced.
-    pub synthetic_usage: Option<(ScopeId, TextRange)>,
-    /// The exceptions that were handled when the binding was defined.
+    pub source: Option<NodeId>,
+    /// The references to the [`Binding`].
+    pub references: Vec<ReferenceId>,
+    /// The exceptions that were handled when the [`Binding`] was defined.
     pub exceptions: Exceptions,
+    /// Flags for the [`Binding`].
+    pub flags: BindingFlags,
 }
 
 impl<'a> Binding<'a> {
-    pub fn mark_used(&mut self, scope: ScopeId, range: TextRange, context: ExecutionContext) {
-        match context {
-            ExecutionContext::Runtime => self.runtime_usage = Some((scope, range)),
-            ExecutionContext::Typing => self.typing_usage = Some((scope, range)),
-        }
+    /// Return `true` if this [`Binding`] is used.
+    pub fn is_used(&self) -> bool {
+        !self.references.is_empty()
     }
 
-    pub const fn used(&self) -> bool {
-        self.runtime_usage.is_some()
-            || self.synthetic_usage.is_some()
-            || self.typing_usage.is_some()
+    /// Returns an iterator over all references for the current [`Binding`].
+    pub fn references(&self) -> impl Iterator<Item = ReferenceId> + '_ {
+        self.references.iter().copied()
     }
 
-    pub const fn is_definition(&self) -> bool {
-        matches!(
-            self.kind,
-            BindingKind::ClassDefinition
-                | BindingKind::FunctionDefinition
-                | BindingKind::Builtin
-                | BindingKind::FutureImportation
-                | BindingKind::Importation(..)
-                | BindingKind::FromImportation(..)
-                | BindingKind::SubmoduleImportation(..)
-        )
+    /// Return `true` if this [`Binding`] represents an explicit re-export
+    /// (e.g., `import FastAPI as FastAPI`).
+    pub const fn is_explicit_export(&self) -> bool {
+        self.flags.contains(BindingFlags::EXPLICIT_EXPORT)
     }
 
+    /// Return `true` if this binding redefines the given binding.
     pub fn redefines(&self, existing: &'a Binding) -> bool {
         match &self.kind {
-            BindingKind::Importation(Importation { full_name, .. }) => {
+            BindingKind::Importation(Importation { qualified_name }) => {
                 if let BindingKind::SubmoduleImportation(SubmoduleImportation {
-                    full_name: existing,
-                    ..
+                    qualified_name: existing,
                 }) = &existing.kind
                 {
-                    return full_name == existing;
+                    return qualified_name == existing;
                 }
             }
-            BindingKind::FromImportation(FromImportation { full_name, .. }) => {
+            BindingKind::FromImportation(FromImportation { qualified_name }) => {
                 if let BindingKind::SubmoduleImportation(SubmoduleImportation {
-                    full_name: existing,
-                    ..
+                    qualified_name: existing,
                 }) = &existing.kind
                 {
-                    return full_name == existing;
+                    return qualified_name == existing;
                 }
             }
-            BindingKind::SubmoduleImportation(SubmoduleImportation { full_name, .. }) => {
+            BindingKind::SubmoduleImportation(SubmoduleImportation { qualified_name }) => {
                 match &existing.kind {
                     BindingKind::Importation(Importation {
-                        full_name: existing,
-                        ..
+                        qualified_name: existing,
                     })
                     | BindingKind::SubmoduleImportation(SubmoduleImportation {
-                        full_name: existing,
-                        ..
+                        qualified_name: existing,
                     }) => {
-                        return full_name == existing;
+                        return qualified_name == existing;
                     }
                     BindingKind::FromImportation(FromImportation {
-                        full_name: existing,
-                        ..
+                        qualified_name: existing,
                     }) => {
-                        return full_name == existing;
+                        return qualified_name == existing;
                     }
                     _ => {}
                 }
@@ -108,7 +91,85 @@ impl<'a> Binding<'a> {
             }
             _ => {}
         }
-        existing.is_definition()
+        matches!(
+            existing.kind,
+            BindingKind::ClassDefinition
+                | BindingKind::FunctionDefinition
+                | BindingKind::Builtin
+                | BindingKind::Importation(..)
+                | BindingKind::FromImportation(..)
+                | BindingKind::SubmoduleImportation(..)
+        )
+    }
+
+    /// Returns the fully-qualified symbol name, if this symbol was imported from another module.
+    pub fn qualified_name(&self) -> Option<&str> {
+        match &self.kind {
+            BindingKind::Importation(Importation { qualified_name }) => Some(qualified_name),
+            BindingKind::FromImportation(FromImportation { qualified_name }) => {
+                Some(qualified_name)
+            }
+            BindingKind::SubmoduleImportation(SubmoduleImportation { qualified_name }) => {
+                Some(qualified_name)
+            }
+            _ => None,
+        }
+    }
+
+    /// Returns the fully-qualified name of the module from which this symbol was imported, if this
+    /// symbol was imported from another module.
+    pub fn module_name(&self) -> Option<&str> {
+        match &self.kind {
+            BindingKind::Importation(Importation { qualified_name })
+            | BindingKind::SubmoduleImportation(SubmoduleImportation { qualified_name }) => {
+                Some(qualified_name.split('.').next().unwrap_or(qualified_name))
+            }
+            BindingKind::FromImportation(FromImportation { qualified_name }) => Some(
+                qualified_name
+                    .rsplit_once('.')
+                    .map_or(qualified_name, |(module, _)| module),
+            ),
+            _ => None,
+        }
+    }
+
+    /// Returns the appropriate visual range for highlighting this binding.
+    pub fn trimmed_range(&self, semantic_model: &SemanticModel, locator: &Locator) -> TextRange {
+        match self.kind {
+            BindingKind::ClassDefinition | BindingKind::FunctionDefinition => {
+                self.source.map_or(self.range, |source| {
+                    helpers::identifier_range(semantic_model.stmts[source], locator)
+                })
+            }
+            _ => self.range,
+        }
+    }
+
+    /// Returns the range of the binding's parent.
+    pub fn parent_range(&self, semantic_model: &SemanticModel) -> Option<TextRange> {
+        self.source
+            .map(|node_id| semantic_model.stmts[node_id])
+            .and_then(|parent| {
+                if parent.is_import_from_stmt() {
+                    Some(parent.range())
+                } else {
+                    None
+                }
+            })
+    }
+}
+
+bitflags! {
+    /// Flags on a [`Binding`].
+    #[derive(Debug, Default, Copy, Clone, Eq, PartialEq)]
+    pub struct BindingFlags: u8 {
+        /// The binding represents an explicit re-export.
+        ///
+        /// For example, the binding could be `FastAPI` in:
+        /// ```python
+        /// import FastAPI as FastAPI
+        /// ```
+        const EXPLICIT_EXPORT = 1 << 0;
     }
 }
 
@@ -117,16 +178,8 @@ impl<'a> Binding<'a> {
 /// Using a `u32` to identify [Binding]s should is sufficient because Ruff only supports documents with a
 /// size smaller than or equal to `u32::max`. A document with the size of `u32::max` must have fewer than `u32::max`
 /// bindings because bindings must be separated by whitespace (and have an assignment).
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
-pub struct BindingId(u32);
-
-impl TryFrom<usize> for BindingId {
-    type Error = TryFromIntError;
-
-    fn try_from(value: usize) -> Result<Self, Self::Error> {
-        Ok(Self(u32::try_from(value)?))
-    }
-}
+#[newtype_index]
+pub struct BindingId;
 
 impl nohash_hasher::IsEnabled for BindingId {}
 
@@ -134,60 +187,44 @@ impl nohash_hasher::IsEnabled for BindingId {}
 ///
 /// Bindings are indexed by [`BindingId`]
 #[derive(Debug, Clone, Default)]
-pub struct Bindings<'a>(Vec<Binding<'a>>);
+pub struct Bindings<'a>(IndexVec<BindingId, Binding<'a>>);
 
 impl<'a> Bindings<'a> {
     /// Pushes a new binding and returns its id
     pub fn push(&mut self, binding: Binding<'a>) -> BindingId {
-        let id = self.next_id();
-        self.0.push(binding);
-        id
+        self.0.push(binding)
     }
 
     /// Returns the id that will be assigned when pushing the next binding
     pub fn next_id(&self) -> BindingId {
-        BindingId::try_from(self.0.len()).unwrap()
-    }
-}
-
-impl<'a> Index<BindingId> for Bindings<'a> {
-    type Output = Binding<'a>;
-
-    fn index(&self, index: BindingId) -> &Self::Output {
-        &self.0[usize::from(index)]
-    }
-}
-
-impl<'a> IndexMut<BindingId> for Bindings<'a> {
-    fn index_mut(&mut self, index: BindingId) -> &mut Self::Output {
-        &mut self.0[usize::from(index)]
+        self.0.next_index()
     }
 }
 
 impl<'a> Deref for Bindings<'a> {
-    type Target = [Binding<'a>];
+    type Target = IndexSlice<BindingId, Binding<'a>>;
 
     fn deref(&self) -> &Self::Target {
         &self.0
     }
 }
 
-impl<'a> FromIterator<Binding<'a>> for Bindings<'a> {
-    fn from_iter<T: IntoIterator<Item = Binding<'a>>>(iter: T) -> Self {
-        Self(Vec::from_iter(iter))
+impl<'a> DerefMut for Bindings<'a> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
     }
 }
 
-impl From<BindingId> for usize {
-    fn from(value: BindingId) -> Self {
-        value.0 as usize
+impl<'a> FromIterator<Binding<'a>> for Bindings<'a> {
+    fn from_iter<T: IntoIterator<Item = Binding<'a>>>(iter: T) -> Self {
+        Self(IndexVec::from_iter(iter))
     }
 }
 
 #[derive(Debug, Clone)]
 pub struct StarImportation<'a> {
     /// The level of the import. `None` or `Some(0)` indicate an absolute import.
-    pub level: Option<usize>,
+    pub level: Option<u32>,
     /// The module being imported. `None` indicates a wildcard import.
     pub module: Option<&'a str>,
 }
@@ -214,38 +251,35 @@ pub struct Export<'a> {
     pub names: Vec<&'a str>,
 }
 
+/// A binding for an `import`, keyed on the name to which the import is bound.
+/// Ex) `import foo` would be keyed on "foo".
+/// Ex) `import foo as bar` would be keyed on "bar".
 #[derive(Clone, Debug)]
 pub struct Importation<'a> {
-    /// The name to which the import is bound.
-    /// Given `import foo`, `name` would be "foo".
-    /// Given `import foo as bar`, `name` would be "bar".
-    pub name: &'a str,
     /// The full name of the module being imported.
-    /// Given `import foo`, `full_name` would be "foo".
-    /// Given `import foo as bar`, `full_name` would be "foo".
-    pub full_name: &'a str,
+    /// Ex) Given `import foo`, `qualified_name` would be "foo".
+    /// Ex) Given `import foo as bar`, `qualified_name` would be "foo".
+    pub qualified_name: &'a str,
 }
 
+/// A binding for a member imported from a module, keyed on the name to which the member is bound.
+/// Ex) `from foo import bar` would be keyed on "bar".
+/// Ex) `from foo import bar as baz` would be keyed on "baz".
 #[derive(Clone, Debug)]
-pub struct FromImportation<'a> {
-    /// The name to which the import is bound.
-    /// Given `from foo import bar`, `name` would be "bar".
-    /// Given `from foo import bar as baz`, `name` would be "baz".
-    pub name: &'a str,
-    /// The full name of the module being imported.
-    /// Given `from foo import bar`, `full_name` would be "foo.bar".
-    /// Given `from foo import bar as baz`, `full_name` would be "foo.bar".
-    pub full_name: String,
+pub struct FromImportation {
+    /// The full name of the member being imported.
+    /// Ex) Given `from foo import bar`, `qualified_name` would be "foo.bar".
+    /// Ex) Given `from foo import bar as baz`, `qualified_name` would be "foo.bar".
+    pub qualified_name: String,
 }
 
+/// A binding for a submodule imported from a module, keyed on the name of the parent module.
+/// Ex) `import foo.bar` would be keyed on "foo".
 #[derive(Clone, Debug)]
 pub struct SubmoduleImportation<'a> {
-    /// The parent module imported by the submodule import.
-    /// Given `import foo.bar`, `module` would be "foo".
-    pub name: &'a str,
     /// The full name of the submodule being imported.
-    /// Given `import foo.bar`, `full_name` would be "foo.bar".
-    pub full_name: &'a str,
+    /// Ex) Given `import foo.bar`, `qualified_name` would be "foo.bar".
+    pub qualified_name: &'a str,
 }
 
 #[derive(Clone, Debug, is_macro::Is)]
@@ -264,7 +298,7 @@ pub enum BindingKind<'a> {
     Export(Export<'a>),
     FutureImportation,
     Importation(Importation<'a>),
-    FromImportation(FromImportation<'a>),
+    FromImportation(FromImportation),
     SubmoduleImportation(SubmoduleImportation<'a>),
 }
 
@@ -276,9 +310,3 @@ bitflags! {
         const IMPORT_ERROR = 0b0000_0100;
     }
 }
-
-#[derive(Copy, Debug, Clone)]
-pub enum ExecutionContext {
-    Runtime,
-    Typing,
-}
diff --git a/crates/ruff_python_semantic/src/context.rs b/crates/ruff_python_semantic/src/context.rs
index 661bd7a88bbfe..6742b68219229 100644
--- a/crates/ruff_python_semantic/src/context.rs
+++ b/crates/ruff_python_semantic/src/context.rs
@@ -1,427 +1,7 @@
-use std::path::Path;
-
-use nohash_hasher::{BuildNoHashHasher, IntMap};
-use rustc_hash::FxHashMap;
-use rustpython_parser::ast::{Expr, Stmt};
-use smallvec::smallvec;
-
-use ruff_python_ast::call_path::{collect_call_path, from_unqualified_name, CallPath};
-use ruff_python_ast::helpers::from_relative_import;
-use ruff_python_ast::types::RefEquality;
-use ruff_python_ast::typing::AnnotationKind;
-use ruff_python_stdlib::path::is_python_stub_file;
-use ruff_python_stdlib::typing::TYPING_EXTENSIONS;
-
-use crate::analyze::visibility::{module_visibility, Modifier, VisibleScope};
-use crate::binding::{
-    Binding, BindingId, BindingKind, Bindings, Exceptions, ExecutionContext, FromImportation,
-    Importation, SubmoduleImportation,
-};
-use crate::scope::{Scope, ScopeId, ScopeKind, Scopes};
-
-#[allow(clippy::struct_excessive_bools)]
-pub struct Context<'a> {
-    pub typing_modules: &'a [String],
-    pub module_path: Option<Vec<String>>,
-    // Retain all scopes and parent nodes, along with a stack of indices to track which are active
-    // at various points in time.
-    pub parents: Vec<RefEquality<'a, Stmt>>,
-    pub depths: FxHashMap<RefEquality<'a, Stmt>, usize>,
-    pub child_to_parent: FxHashMap<RefEquality<'a, Stmt>, RefEquality<'a, Stmt>>,
-    // A stack of all bindings created in any scope, at any point in execution.
-    pub bindings: Bindings<'a>,
-    // Map from binding index to indexes of bindings that shadow it in other scopes.
-    pub shadowed_bindings:
-        std::collections::HashMap<BindingId, Vec<BindingId>, BuildNoHashHasher<BindingId>>,
-    pub exprs: Vec<RefEquality<'a, Expr>>,
-    pub scopes: Scopes<'a>,
-    pub scope_id: ScopeId,
-    pub dead_scopes: Vec<ScopeId>,
-    // Body iteration; used to peek at siblings.
-    pub body: &'a [Stmt],
-    pub body_index: usize,
-    // Internal, derivative state.
-    pub visible_scope: VisibleScope,
-    pub in_annotation: bool,
-    pub in_type_definition: bool,
-    pub in_deferred_string_type_definition: Option<AnnotationKind>,
-    pub in_deferred_type_definition: bool,
-    pub in_exception_handler: bool,
-    pub in_f_string: bool,
-    pub in_boolean_test: bool,
-    pub in_literal: bool,
-    pub in_subscript: bool,
-    pub in_type_checking_block: bool,
-    pub seen_import_boundary: bool,
-    pub futures_allowed: bool,
-    pub annotations_future_enabled: bool,
-    pub handled_exceptions: Vec<Exceptions>,
-}
-
-impl<'a> Context<'a> {
-    pub fn new(
-        typing_modules: &'a [String],
-        path: &'a Path,
-        module_path: Option<Vec<String>>,
-    ) -> Self {
-        let visibility = module_visibility(module_path.as_deref(), path);
-        Self {
-            typing_modules,
-            module_path,
-            parents: Vec::default(),
-            depths: FxHashMap::default(),
-            child_to_parent: FxHashMap::default(),
-            bindings: Bindings::default(),
-            shadowed_bindings: IntMap::default(),
-            exprs: Vec::default(),
-            scopes: Scopes::default(),
-            scope_id: ScopeId::global(),
-            dead_scopes: Vec::default(),
-            body: &[],
-            body_index: 0,
-            visible_scope: VisibleScope {
-                modifier: Modifier::Module,
-                visibility,
-            },
-            in_annotation: false,
-            in_type_definition: false,
-            in_deferred_string_type_definition: None,
-            in_deferred_type_definition: false,
-            in_exception_handler: false,
-            in_f_string: false,
-            in_boolean_test: false,
-            in_literal: false,
-            in_subscript: false,
-            in_type_checking_block: false,
-            seen_import_boundary: false,
-            futures_allowed: true,
-            annotations_future_enabled: is_python_stub_file(path),
-            handled_exceptions: Vec::default(),
-        }
-    }
-
-    /// Return `true` if the `Expr` is a reference to `typing.${target}`.
-    pub fn match_typing_expr(&self, expr: &Expr, target: &str) -> bool {
-        self.resolve_call_path(expr).map_or(false, |call_path| {
-            self.match_typing_call_path(&call_path, target)
-        })
-    }
-
-    /// Return `true` if the call path is a reference to `typing.${target}`.
-    pub fn match_typing_call_path(&self, call_path: &CallPath, target: &str) -> bool {
-        if call_path.as_slice() == ["typing", target] {
-            return true;
-        }
-
-        if TYPING_EXTENSIONS.contains(target) {
-            if call_path.as_slice() == ["typing_extensions", target] {
-                return true;
-            }
-        }
-
-        if self.typing_modules.iter().any(|module| {
-            let mut module: CallPath = from_unqualified_name(module);
-            module.push(target);
-            *call_path == module
-        }) {
-            return true;
-        }
-
-        false
-    }
-
-    /// Return the current `Binding` for a given `name`.
-    pub fn find_binding(&self, member: &str) -> Option<&Binding> {
-        self.scopes()
-            .find_map(|scope| scope.get(member))
-            .map(|index| &self.bindings[*index])
-    }
-
-    /// Return `true` if `member` is bound as a builtin.
-    pub fn is_builtin(&self, member: &str) -> bool {
-        self.find_binding(member)
-            .map_or(false, |binding| binding.kind.is_builtin())
-    }
-
-    /// Resolves the [`Expr`] to a fully-qualified symbol-name, if `value` resolves to an imported
-    /// or builtin symbol.
-    ///
-    /// E.g., given:
-    ///
-    ///
-    /// ```python
-    /// from sys import version_info as python_version
-    /// print(python_version)
-    /// ```
-    ///
-    /// ...then `resolve_call_path(${python_version})` will resolve to `sys.version_info`.
-    pub fn resolve_call_path<'b>(&'a self, value: &'b Expr) -> Option<CallPath<'a>>
-    where
-        'b: 'a,
-    {
-        let Some(call_path) = collect_call_path(value) else {
-            return None;
-        };
-        let Some(head) = call_path.first() else {
-            return None;
-        };
-        let Some(binding) = self.find_binding(head) else {
-            return None;
-        };
-        match &binding.kind {
-            BindingKind::Importation(Importation {
-                full_name: name, ..
-            })
-            | BindingKind::SubmoduleImportation(SubmoduleImportation { name, .. }) => {
-                if name.starts_with('.') {
-                    if let Some(module) = &self.module_path {
-                        let mut source_path = from_relative_import(module, name);
-                        if source_path.is_empty() {
-                            None
-                        } else {
-                            source_path.extend(call_path.into_iter().skip(1));
-                            Some(source_path)
-                        }
-                    } else {
-                        None
-                    }
-                } else {
-                    let mut source_path: CallPath = from_unqualified_name(name);
-                    source_path.extend(call_path.into_iter().skip(1));
-                    Some(source_path)
-                }
-            }
-            BindingKind::FromImportation(FromImportation {
-                full_name: name, ..
-            }) => {
-                if name.starts_with('.') {
-                    if let Some(module) = &self.module_path {
-                        let mut source_path = from_relative_import(module, name);
-                        if source_path.is_empty() {
-                            None
-                        } else {
-                            source_path.extend(call_path.into_iter().skip(1));
-                            Some(source_path)
-                        }
-                    } else {
-                        None
-                    }
-                } else {
-                    let mut source_path: CallPath = from_unqualified_name(name);
-                    source_path.extend(call_path.into_iter().skip(1));
-                    Some(source_path)
-                }
-            }
-            BindingKind::Builtin => {
-                let mut source_path: CallPath = smallvec![];
-                source_path.push("");
-                source_path.extend(call_path);
-                Some(source_path)
-            }
-            _ => None,
-        }
-    }
-
-    /// Given a `module` and `member`, return the fully-qualified name of the binding in the current
-    /// scope, if it exists.
-    ///
-    /// E.g., given:
-    ///
-    /// ```python
-    /// from sys import version_info as python_version
-    /// print(python_version)
-    /// ```
-    ///
-    /// ...then `resolve_qualified_import_name("sys", "version_info")` will return
-    /// `Some("python_version")`.
-    pub fn resolve_qualified_import_name(
-        &self,
-        module: &str,
-        member: &str,
-    ) -> Option<(&Stmt, String)> {
-        self.scopes().enumerate().find_map(|(scope_index, scope)| {
-            scope.binding_ids().find_map(|binding_index| {
-                let binding = &self.bindings[*binding_index];
-                match &binding.kind {
-                    // Ex) Given `module="sys"` and `object="exit"`:
-                    // `import sys`         -> `sys.exit`
-                    // `import sys as sys2` -> `sys2.exit`
-                    BindingKind::Importation(Importation { name, full_name }) => {
-                        if full_name == &module {
-                            // Verify that `sys` isn't bound in an inner scope.
-                            if self
-                                .scopes()
-                                .take(scope_index)
-                                .all(|scope| scope.get(name).is_none())
-                            {
-                                return Some((
-                                    binding.source.as_ref().unwrap().into(),
-                                    format!("{name}.{member}"),
-                                ));
-                            }
-                        }
-                    }
-                    // Ex) Given `module="os.path"` and `object="join"`:
-                    // `from os.path import join`          -> `join`
-                    // `from os.path import join as join2` -> `join2`
-                    BindingKind::FromImportation(FromImportation { name, full_name }) => {
-                        if let Some((target_module, target_member)) = full_name.split_once('.') {
-                            if target_module == module && target_member == member {
-                                // Verify that `join` isn't bound in an inner scope.
-                                if self
-                                    .scopes()
-                                    .take(scope_index)
-                                    .all(|scope| scope.get(name).is_none())
-                                {
-                                    return Some((
-                                        binding.source.as_ref().unwrap().into(),
-                                        (*name).to_string(),
-                                    ));
-                                }
-                            }
-                        }
-                    }
-                    // Ex) Given `module="os"` and `object="name"`:
-                    // `import os.path ` -> `os.name`
-                    BindingKind::SubmoduleImportation(SubmoduleImportation { name, .. }) => {
-                        if name == &module {
-                            // Verify that `os` isn't bound in an inner scope.
-                            if self
-                                .scopes()
-                                .take(scope_index)
-                                .all(|scope| scope.get(name).is_none())
-                            {
-                                return Some((
-                                    binding.source.as_ref().unwrap().into(),
-                                    format!("{name}.{member}"),
-                                ));
-                            }
-                        }
-                    }
-                    // Non-imports.
-                    _ => {}
-                }
-                None
-            })
-        })
-    }
-
-    pub fn push_parent(&mut self, parent: &'a Stmt) {
-        let num_existing = self.parents.len();
-        self.parents.push(RefEquality(parent));
-        self.depths.insert(self.parents[num_existing], num_existing);
-        if num_existing > 0 {
-            self.child_to_parent
-                .insert(self.parents[num_existing], self.parents[num_existing - 1]);
-        }
-    }
-
-    pub fn pop_parent(&mut self) {
-        self.parents.pop().expect("Attempted to pop without parent");
-    }
-
-    pub fn push_expr(&mut self, expr: &'a Expr) {
-        self.exprs.push(RefEquality(expr));
-    }
-
-    pub fn pop_expr(&mut self) {
-        self.exprs
-            .pop()
-            .expect("Attempted to pop without expression");
-    }
-
-    /// Push a [`Scope`] with the given [`ScopeKind`] onto the stack.
-    pub fn push_scope(&mut self, kind: ScopeKind<'a>) {
-        let id = self.scopes.push_scope(kind, self.scope_id);
-        self.scope_id = id;
-    }
-
-    /// Pop the current [`Scope`] off the stack.
-    pub fn pop_scope(&mut self) {
-        self.dead_scopes.push(self.scope_id);
-        self.scope_id = self.scopes[self.scope_id]
-            .parent
-            .expect("Attempted to pop without scope");
-    }
-
-    /// Return the current `Stmt`.
-    pub fn current_stmt(&self) -> &RefEquality<'a, Stmt> {
-        self.parents.iter().rev().next().expect("No parent found")
-    }
-
-    /// Return the parent `Stmt` of the current `Stmt`, if any.
-    pub fn current_stmt_parent(&self) -> Option<&RefEquality<'a, Stmt>> {
-        self.parents.iter().rev().nth(1)
-    }
-
-    /// Return the parent `Expr` of the current `Expr`.
-    pub fn current_expr_parent(&self) -> Option<&RefEquality<'a, Expr>> {
-        self.exprs.iter().rev().nth(1)
-    }
-
-    /// Return the grandparent `Expr` of the current `Expr`.
-    pub fn current_expr_grandparent(&self) -> Option<&RefEquality<'a, Expr>> {
-        self.exprs.iter().rev().nth(2)
-    }
-
-    /// Return an [`Iterator`] over the current `Expr` parents.
-    pub fn expr_ancestors(&self) -> impl Iterator<Item = &RefEquality<'a, Expr>> {
-        self.exprs.iter().rev().skip(1)
-    }
-
-    /// Return the `Stmt` that immediately follows the current `Stmt`, if any.
-    pub fn current_sibling_stmt(&self) -> Option<&'a Stmt> {
-        self.body.get(self.body_index + 1)
-    }
-
-    /// Returns a reference to the global scope
-    pub fn global_scope(&self) -> &Scope<'a> {
-        self.scopes.global()
-    }
-
-    /// Returns a mutable reference to the global scope
-    pub fn global_scope_mut(&mut self) -> &mut Scope<'a> {
-        self.scopes.global_mut()
-    }
-
-    /// Returns the current top most scope.
-    pub fn scope(&self) -> &Scope<'a> {
-        &self.scopes[self.scope_id]
-    }
-
-    /// Returns a mutable reference to the current top most scope.
-    pub fn scope_mut(&mut self) -> &mut Scope<'a> {
-        &mut self.scopes[self.scope_id]
-    }
-
-    /// Returns an iterator over all scopes, starting from the current scope.
-    pub fn scopes(&self) -> impl Iterator<Item = &Scope> {
-        self.scopes.ancestors(self.scope_id)
-    }
-
-    /// Returns `true` if the context is in an exception handler.
-    pub const fn in_exception_handler(&self) -> bool {
-        self.in_exception_handler
-    }
-
-    /// Return the [`ExecutionContext`] of the current scope.
-    pub const fn execution_context(&self) -> ExecutionContext {
-        if self.in_type_checking_block
-            || self.in_annotation
-            || self.in_deferred_string_type_definition.is_some()
-        {
-            ExecutionContext::Typing
-        } else {
-            ExecutionContext::Runtime
-        }
-    }
-
-    /// Return the union of all handled exceptions as an [`Exceptions`] bitflag.
-    pub fn exceptions(&self) -> Exceptions {
-        let mut exceptions = Exceptions::empty();
-        for exception in &self.handled_exceptions {
-            exceptions.insert(*exception);
-        }
-        exceptions
-    }
+#[derive(Debug, Copy, Clone, is_macro::Is)]
+pub enum ExecutionContext {
+    /// The reference occurs in a runtime context.
+    Runtime,
+    /// The reference occurs in a typing-only context.
+    Typing,
 }
diff --git a/crates/ruff_python_semantic/src/definition.rs b/crates/ruff_python_semantic/src/definition.rs
new file mode 100644
index 0000000000000..df75490f5ed05
--- /dev/null
+++ b/crates/ruff_python_semantic/src/definition.rs
@@ -0,0 +1,226 @@
+//! Definitions within a Python program. In this context, a "definition" is any named entity that
+//! can be documented, such as a module, class, or function.
+
+use std::fmt::Debug;
+use std::ops::Deref;
+
+use ruff_index::{newtype_index, IndexSlice, IndexVec};
+use rustpython_parser::ast::{self, Stmt};
+
+use crate::analyze::visibility::{
+    class_visibility, function_visibility, method_visibility, ModuleSource, Visibility,
+};
+
+/// Id uniquely identifying a definition in a program.
+#[newtype_index]
+pub struct DefinitionId;
+
+impl DefinitionId {
+    /// Returns the ID for the module definition.
+    #[inline]
+    pub const fn module() -> Self {
+        DefinitionId::from_u32(0)
+    }
+}
+
+#[derive(Debug)]
+pub enum ModuleKind {
+    /// A Python file that represents a module within a package.
+    Module,
+    /// A Python file that represents the root of a package (i.e., an `__init__.py` file).
+    Package,
+}
+
+/// A Python module.
+#[derive(Debug)]
+pub struct Module<'a> {
+    pub kind: ModuleKind,
+    pub source: ModuleSource<'a>,
+    pub python_ast: &'a [Stmt],
+}
+
+impl<'a> Module<'a> {
+    pub fn path(&self) -> Option<&'a [String]> {
+        if let ModuleSource::Path(path) = self.source {
+            Some(path)
+        } else {
+            None
+        }
+    }
+}
+
+#[derive(Debug, Copy, Clone)]
+pub enum MemberKind {
+    /// A class definition within a program.
+    Class,
+    /// A nested class definition within a program.
+    NestedClass,
+    /// A function definition within a program.
+    Function,
+    /// A nested function definition within a program.
+    NestedFunction,
+    /// A method definition within a program.
+    Method,
+}
+
+/// A member of a Python module.
+#[derive(Debug)]
+pub struct Member<'a> {
+    pub kind: MemberKind,
+    pub parent: DefinitionId,
+    pub stmt: &'a Stmt,
+}
+
+impl<'a> Member<'a> {
+    fn name(&self) -> &'a str {
+        match &self.stmt {
+            Stmt::FunctionDef(ast::StmtFunctionDef { name, .. }) => name,
+            Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef { name, .. }) => name,
+            Stmt::ClassDef(ast::StmtClassDef { name, .. }) => name,
+            _ => unreachable!("Unexpected member kind: {:?}", self.kind),
+        }
+    }
+}
+
+/// A definition within a Python program.
+#[derive(Debug)]
+pub enum Definition<'a> {
+    Module(Module<'a>),
+    Member(Member<'a>),
+}
+
+impl Definition<'_> {
+    /// Returns `true` if the [`Definition`] is a method definition.
+    pub const fn is_method(&self) -> bool {
+        matches!(
+            self,
+            Definition::Member(Member {
+                kind: MemberKind::Method,
+                ..
+            })
+        )
+    }
+}
+
+/// The definitions within a Python program indexed by [`DefinitionId`].
+#[derive(Debug, Default)]
+pub struct Definitions<'a>(IndexVec<DefinitionId, Definition<'a>>);
+
+impl<'a> Definitions<'a> {
+    pub fn for_module(definition: Module<'a>) -> Self {
+        Self(IndexVec::from_raw(vec![Definition::Module(definition)]))
+    }
+
+    /// Pushes a new member definition and returns its unique id.
+    ///
+    /// Members are assumed to be pushed in traversal order, such that parents are pushed before
+    /// their children.
+    pub fn push_member(&mut self, member: Member<'a>) -> DefinitionId {
+        self.0.push(Definition::Member(member))
+    }
+
+    /// Resolve the visibility of each definition in the collection.
+    pub fn resolve(self, exports: Option<&[&str]>) -> ContextualizedDefinitions<'a> {
+        let mut definitions: IndexVec<DefinitionId, ContextualizedDefinition<'a>> =
+            IndexVec::with_capacity(self.len());
+
+        for definition in self {
+            // Determine the visibility of the next definition, taking into account its parent's
+            // visibility.
+            let visibility = {
+                match &definition {
+                    Definition::Module(module) => module.source.to_visibility(),
+                    Definition::Member(member) => match member.kind {
+                        MemberKind::Class => {
+                            let parent = &definitions[member.parent];
+                            if parent.visibility.is_private()
+                                || exports
+                                    .map_or(false, |exports| !exports.contains(&member.name()))
+                            {
+                                Visibility::Private
+                            } else {
+                                class_visibility(member.stmt)
+                            }
+                        }
+                        MemberKind::NestedClass => {
+                            let parent = &definitions[member.parent];
+                            if parent.visibility.is_private()
+                                || matches!(
+                                    parent.definition,
+                                    Definition::Member(Member {
+                                        kind: MemberKind::Function
+                                            | MemberKind::NestedFunction
+                                            | MemberKind::Method,
+                                        ..
+                                    })
+                                )
+                            {
+                                Visibility::Private
+                            } else {
+                                class_visibility(member.stmt)
+                            }
+                        }
+                        MemberKind::Function => {
+                            let parent = &definitions[member.parent];
+                            if parent.visibility.is_private()
+                                || exports
+                                    .map_or(false, |exports| !exports.contains(&member.name()))
+                            {
+                                Visibility::Private
+                            } else {
+                                function_visibility(member.stmt)
+                            }
+                        }
+                        MemberKind::NestedFunction => Visibility::Private,
+                        MemberKind::Method => {
+                            let parent = &definitions[member.parent];
+                            if parent.visibility.is_private() {
+                                Visibility::Private
+                            } else {
+                                method_visibility(member.stmt)
+                            }
+                        }
+                    },
+                }
+            };
+            definitions.push(ContextualizedDefinition {
+                definition,
+                visibility,
+            });
+        }
+
+        ContextualizedDefinitions(definitions.raw)
+    }
+}
+
+impl<'a> Deref for Definitions<'a> {
+    type Target = IndexSlice<DefinitionId, Definition<'a>>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl<'a> IntoIterator for Definitions<'a> {
+    type Item = Definition<'a>;
+    type IntoIter = std::vec::IntoIter<Self::Item>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.into_iter()
+    }
+}
+
+/// A [`Definition`] in a Python program with its resolved [`Visibility`].
+pub struct ContextualizedDefinition<'a> {
+    pub definition: Definition<'a>,
+    pub visibility: Visibility,
+}
+
+/// A collection of [`Definition`] structs in a Python program with resolved [`Visibility`].
+pub struct ContextualizedDefinitions<'a>(Vec<ContextualizedDefinition<'a>>);
+
+impl<'a> ContextualizedDefinitions<'a> {
+    pub fn iter(&self) -> impl Iterator<Item = &ContextualizedDefinition<'a>> {
+        self.0.iter()
+    }
+}
diff --git a/crates/ruff_python_semantic/src/globals.rs b/crates/ruff_python_semantic/src/globals.rs
new file mode 100644
index 0000000000000..dd4b2c460a5fa
--- /dev/null
+++ b/crates/ruff_python_semantic/src/globals.rs
@@ -0,0 +1,89 @@
+//! When building a semantic model, we often need to know which names in a given scope are declared
+//! as `global`. This module provides data structures for storing and querying the set of `global`
+//! names in a given scope.
+
+use std::ops::Index;
+
+use ruff_text_size::TextRange;
+use rustc_hash::FxHashMap;
+use rustpython_parser::ast;
+use rustpython_parser::ast::Stmt;
+
+use ruff_index::{newtype_index, IndexVec};
+use ruff_python_ast::statement_visitor::{walk_stmt, StatementVisitor};
+
+/// Id uniquely identifying the set of global names for a given scope.
+#[newtype_index]
+pub struct GlobalsId;
+
+#[derive(Debug, Default)]
+pub(crate) struct GlobalsArena<'a>(IndexVec<GlobalsId, Globals<'a>>);
+
+impl<'a> GlobalsArena<'a> {
+    /// Inserts a new set of global names into the global names arena and returns its unique id.
+    pub(crate) fn push(&mut self, globals: Globals<'a>) -> GlobalsId {
+        self.0.push(globals)
+    }
+}
+
+impl<'a> Index<GlobalsId> for GlobalsArena<'a> {
+    type Output = Globals<'a>;
+
+    #[inline]
+    fn index(&self, index: GlobalsId) -> &Self::Output {
+        &self.0[index]
+    }
+}
+
+/// The set of global names for a given scope, represented as a map from the name of the global to
+/// the range of the declaration in the source code.
+#[derive(Debug)]
+pub struct Globals<'a>(FxHashMap<&'a str, TextRange>);
+
+impl<'a> Globals<'a> {
+    /// Extracts the set of global names from a given scope, or return `None` if the scope does not
+    /// contain any `global` declarations.
+    pub fn from_body(body: &'a [Stmt]) -> Option<Self> {
+        let mut builder = GlobalsVisitor::new();
+        builder.visit_body(body);
+        builder.finish()
+    }
+
+    pub fn get(&self, name: &str) -> Option<&TextRange> {
+        self.0.get(name)
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = (&&'a str, &TextRange)> + '_ {
+        self.0.iter()
+    }
+}
+
+/// Extracts the set of global names from a given scope.
+#[derive(Debug)]
+struct GlobalsVisitor<'a>(FxHashMap<&'a str, TextRange>);
+
+impl<'a> GlobalsVisitor<'a> {
+    fn new() -> Self {
+        Self(FxHashMap::default())
+    }
+
+    fn finish(self) -> Option<Globals<'a>> {
+        (!self.0.is_empty()).then_some(Globals(self.0))
+    }
+}
+
+impl<'a> StatementVisitor<'a> for GlobalsVisitor<'a> {
+    fn visit_stmt(&mut self, stmt: &'a Stmt) {
+        match stmt {
+            Stmt::Global(ast::StmtGlobal { names, range }) => {
+                for name in names {
+                    self.0.insert(name.as_str(), *range);
+                }
+            }
+            Stmt::FunctionDef(_) | Stmt::AsyncFunctionDef(_) | Stmt::ClassDef(_) => {
+                // Don't recurse.
+            }
+            _ => walk_stmt(self, stmt),
+        }
+    }
+}
diff --git a/crates/ruff_python_semantic/src/lib.rs b/crates/ruff_python_semantic/src/lib.rs
index f6c8f3fd46f48..e876f26181c4f 100644
--- a/crates/ruff_python_semantic/src/lib.rs
+++ b/crates/ruff_python_semantic/src/lib.rs
@@ -1,4 +1,9 @@
 pub mod analyze;
 pub mod binding;
 pub mod context;
+pub mod definition;
+pub mod globals;
+pub mod model;
+pub mod node;
+pub mod reference;
 pub mod scope;
diff --git a/crates/ruff_python_semantic/src/model.rs b/crates/ruff_python_semantic/src/model.rs
new file mode 100644
index 0000000000000..949a461f21996
--- /dev/null
+++ b/crates/ruff_python_semantic/src/model.rs
@@ -0,0 +1,1058 @@
+use std::collections::HashMap;
+use std::path::Path;
+
+use bitflags::bitflags;
+use nohash_hasher::{BuildNoHashHasher, IntMap};
+use ruff_text_size::TextRange;
+use rustpython_parser::ast::{Expr, Ranged, Stmt};
+use smallvec::smallvec;
+
+use ruff_python_ast::call_path::{collect_call_path, from_unqualified_name, CallPath};
+use ruff_python_ast::helpers::from_relative_import;
+use ruff_python_stdlib::path::is_python_stub_file;
+use ruff_python_stdlib::typing::TYPING_EXTENSIONS;
+
+use crate::binding::{
+    Binding, BindingFlags, BindingId, BindingKind, Bindings, Exceptions, FromImportation,
+    Importation, SubmoduleImportation,
+};
+use crate::context::ExecutionContext;
+use crate::definition::{Definition, DefinitionId, Definitions, Member, Module};
+use crate::globals::{Globals, GlobalsArena};
+use crate::node::{NodeId, Nodes};
+use crate::reference::References;
+use crate::scope::{Scope, ScopeId, ScopeKind, Scopes};
+
+/// A semantic model for a Python module, to enable querying the module's semantic information.
+pub struct SemanticModel<'a> {
+    pub typing_modules: &'a [String],
+    pub module_path: Option<&'a [String]>,
+    // Stack of all visited statements, along with the identifier of the current statement.
+    pub stmts: Nodes<'a>,
+    pub stmt_id: Option<NodeId>,
+    // Stack of current expressions.
+    pub exprs: Vec<&'a Expr>,
+    // Stack of all scopes, along with the identifier of the current scope.
+    pub scopes: Scopes<'a>,
+    pub scope_id: ScopeId,
+    pub dead_scopes: Vec<ScopeId>,
+    // Stack of all definitions created in any scope, at any point in execution, along with the
+    // identifier of the current definition.
+    pub definitions: Definitions<'a>,
+    pub definition_id: DefinitionId,
+    // A stack of all bindings created in any scope, at any point in execution.
+    pub bindings: Bindings<'a>,
+    // Stack of all references created in any scope, at any point in execution.
+    pub references: References,
+    // Arena of global bindings.
+    globals: GlobalsArena<'a>,
+    // Map from binding index to indexes of bindings that shadow it in other scopes.
+    pub shadowed_bindings: HashMap<BindingId, BindingId, BuildNoHashHasher<BindingId>>,
+    // Body iteration; used to peek at siblings.
+    pub body: &'a [Stmt],
+    pub body_index: usize,
+    // Internal, derivative state.
+    pub flags: SemanticModelFlags,
+    pub handled_exceptions: Vec<Exceptions>,
+}
+
+impl<'a> SemanticModel<'a> {
+    pub fn new(typing_modules: &'a [String], path: &'a Path, module: Module<'a>) -> Self {
+        Self {
+            typing_modules,
+            module_path: module.path(),
+            stmts: Nodes::default(),
+            stmt_id: None,
+            exprs: Vec::default(),
+            scopes: Scopes::default(),
+            scope_id: ScopeId::global(),
+            dead_scopes: Vec::default(),
+            definitions: Definitions::for_module(module),
+            definition_id: DefinitionId::module(),
+            bindings: Bindings::default(),
+            references: References::default(),
+            globals: GlobalsArena::default(),
+            shadowed_bindings: IntMap::default(),
+            body: &[],
+            body_index: 0,
+            flags: SemanticModelFlags::new(path),
+            handled_exceptions: Vec::default(),
+        }
+    }
+
+    /// Return `true` if the `Expr` is a reference to `typing.${target}`.
+    pub fn match_typing_expr(&self, expr: &Expr, target: &str) -> bool {
+        self.resolve_call_path(expr).map_or(false, |call_path| {
+            self.match_typing_call_path(&call_path, target)
+        })
+    }
+
+    /// Return `true` if the call path is a reference to `typing.${target}`.
+    pub fn match_typing_call_path(&self, call_path: &CallPath, target: &str) -> bool {
+        if call_path.as_slice() == ["typing", target] {
+            return true;
+        }
+
+        if call_path.as_slice() == ["_typeshed", target] {
+            return true;
+        }
+
+        if TYPING_EXTENSIONS.contains(target) {
+            if call_path.as_slice() == ["typing_extensions", target] {
+                return true;
+            }
+        }
+
+        if self.typing_modules.iter().any(|module| {
+            let mut module: CallPath = from_unqualified_name(module);
+            module.push(target);
+            *call_path == module
+        }) {
+            return true;
+        }
+
+        false
+    }
+
+    /// Create a new [`Binding`] for a builtin.
+    pub fn push_builtin(&mut self) -> BindingId {
+        self.bindings.push(Binding {
+            range: TextRange::default(),
+            kind: BindingKind::Builtin,
+            references: Vec::new(),
+            flags: BindingFlags::empty(),
+            source: None,
+            context: ExecutionContext::Runtime,
+            exceptions: Exceptions::empty(),
+        })
+    }
+
+    /// Create a new [`Binding`] for the given `name` and `range`.
+    pub fn push_binding(
+        &mut self,
+        range: TextRange,
+        kind: BindingKind<'a>,
+        flags: BindingFlags,
+    ) -> BindingId {
+        self.bindings.push(Binding {
+            range,
+            kind,
+            flags,
+            references: Vec::new(),
+            source: self.stmt_id,
+            context: self.execution_context(),
+            exceptions: self.exceptions(),
+        })
+    }
+
+    /// Return the current [`Binding`] for a given `name`.
+    pub fn find_binding(&self, member: &str) -> Option<&Binding> {
+        self.scopes()
+            .find_map(|scope| scope.get(member))
+            .map(|binding_id| &self.bindings[binding_id])
+    }
+
+    /// Return the [`Binding`] that the given [`BindingId`] shadows, if any.
+    ///
+    /// Note that this will only return bindings that are shadowed by a binding in a parent scope.
+    pub fn shadowed_binding(&self, binding_id: BindingId) -> Option<&Binding> {
+        self.shadowed_bindings
+            .get(&binding_id)
+            .copied()
+            .map(|id| &self.bindings[id])
+    }
+
+    /// Return `true` if `member` is bound as a builtin.
+    pub fn is_builtin(&self, member: &str) -> bool {
+        self.find_binding(member)
+            .map_or(false, |binding| binding.kind.is_builtin())
+    }
+
+    /// Return `true` if `member` is unbound.
+    pub fn is_unbound(&self, member: &str) -> bool {
+        self.find_binding(member)
+            .map_or(true, |binding| binding.kind.is_builtin())
+    }
+
+    /// Resolve a reference to the given symbol.
+    pub fn resolve_reference(&mut self, symbol: &str, range: TextRange) -> ResolvedReference {
+        // PEP 563 indicates that if a forward reference can be resolved in the module scope, we
+        // should prefer it over local resolutions.
+        if self.in_forward_reference() {
+            if let Some(binding_id) = self.scopes.global().get(symbol) {
+                // Mark the binding as used.
+                let context = self.execution_context();
+                let reference_id = self.references.push(ScopeId::global(), range, context);
+                self.bindings[binding_id].references.push(reference_id);
+
+                // Mark any submodule aliases as used.
+                if let Some(binding_id) =
+                    self.resolve_submodule(symbol, ScopeId::global(), binding_id)
+                {
+                    let reference_id = self.references.push(ScopeId::global(), range, context);
+                    self.bindings[binding_id].references.push(reference_id);
+                }
+
+                return ResolvedReference::Resolved(binding_id);
+            }
+        }
+
+        let mut seen_function = false;
+        let mut import_starred = false;
+        for (index, scope_id) in self.scopes.ancestor_ids(self.scope_id).enumerate() {
+            let scope = &self.scopes[scope_id];
+            if scope.kind.is_class() {
+                // Allow usages of `__class__` within methods, e.g.:
+                //
+                // ```python
+                // class Foo:
+                //     def __init__(self):
+                //         print(__class__)
+                // ```
+                if seen_function && matches!(symbol, "__class__") {
+                    return ResolvedReference::ImplicitGlobal;
+                }
+                if index > 0 {
+                    continue;
+                }
+            }
+
+            if let Some(binding_id) = scope.get(symbol) {
+                // Mark the binding as used.
+                let context = self.execution_context();
+                let reference_id = self.references.push(self.scope_id, range, context);
+                self.bindings[binding_id].references.push(reference_id);
+
+                // Mark any submodule aliases as used.
+                if let Some(binding_id) = self.resolve_submodule(symbol, scope_id, binding_id) {
+                    let reference_id = self.references.push(self.scope_id, range, context);
+                    self.bindings[binding_id].references.push(reference_id);
+                }
+
+                // But if it's a type annotation, don't treat it as resolved, unless we're in a
+                // forward reference. For example, given:
+                //
+                // ```python
+                // name: str
+                // print(name)
+                // ```
+                //
+                // The `name` in `print(name)` should be treated as unresolved, but the `name` in
+                // `name: str` should be treated as used.
+                if !self.in_forward_reference() && self.bindings[binding_id].kind.is_annotation() {
+                    continue;
+                }
+
+                return ResolvedReference::Resolved(binding_id);
+            }
+
+            // Allow usages of `__module__` and `__qualname__` within class scopes, e.g.:
+            //
+            // ```python
+            // class Foo:
+            //     print(__qualname__)
+            // ```
+            //
+            // Intentionally defer this check to _after_ the standard `scope.get` logic, so that
+            // we properly attribute reads to overridden class members, e.g.:
+            //
+            // ```python
+            // class Foo:
+            //     __qualname__ = "Bar"
+            //     print(__qualname__)
+            // ```
+            if index == 0 && scope.kind.is_class() {
+                if matches!(symbol, "__module__" | "__qualname__") {
+                    return ResolvedReference::ImplicitGlobal;
+                }
+            }
+
+            seen_function |= scope.kind.is_any_function();
+            import_starred = import_starred || scope.uses_star_imports();
+        }
+
+        if import_starred {
+            ResolvedReference::StarImport
+        } else {
+            ResolvedReference::NotFound
+        }
+    }
+
+    /// Given a `BindingId`, return the `BindingId` of the submodule import that it aliases.
+    fn resolve_submodule(
+        &self,
+        symbol: &str,
+        scope_id: ScopeId,
+        binding_id: BindingId,
+    ) -> Option<BindingId> {
+        // If the name of a submodule import is the same as an alias of another import, and the
+        // alias is used, then the submodule import should be marked as used too.
+        //
+        // For example, mark `pyarrow.csv` as used in:
+        //
+        // ```python
+        // import pyarrow as pa
+        // import pyarrow.csv
+        // print(pa.csv.read_csv("test.csv"))
+        // ```
+        let qualified_name = self.bindings[binding_id].qualified_name()?;
+        let has_alias = qualified_name
+            .split('.')
+            .last()
+            .map(|segment| segment != symbol)
+            .unwrap_or_default();
+        if !has_alias {
+            return None;
+        }
+
+        self.scopes[scope_id].get(qualified_name)
+    }
+
+    /// Resolves the [`Expr`] to a fully-qualified symbol-name, if `value` resolves to an imported
+    /// or builtin symbol.
+    ///
+    /// E.g., given:
+    ///
+    ///
+    /// ```python
+    /// from sys import version_info as python_version
+    /// print(python_version)
+    /// ```
+    ///
+    /// ...then `resolve_call_path(${python_version})` will resolve to `sys.version_info`.
+    pub fn resolve_call_path(&'a self, value: &'a Expr) -> Option<CallPath<'a>> {
+        let call_path = collect_call_path(value)?;
+        let head = call_path.first()?;
+        let binding = self.find_binding(head)?;
+        match &binding.kind {
+            BindingKind::Importation(Importation {
+                qualified_name: name,
+            }) => {
+                if name.starts_with('.') {
+                    let mut source_path = from_relative_import(self.module_path?, name);
+                    if source_path.is_empty() {
+                        None
+                    } else {
+                        source_path.extend(call_path.into_iter().skip(1));
+                        Some(source_path)
+                    }
+                } else {
+                    let mut source_path: CallPath = from_unqualified_name(name);
+                    source_path.extend(call_path.into_iter().skip(1));
+                    Some(source_path)
+                }
+            }
+            BindingKind::SubmoduleImportation(SubmoduleImportation {
+                qualified_name: name,
+            }) => {
+                let name = name.split('.').next().unwrap_or(name);
+                let mut source_path: CallPath = from_unqualified_name(name);
+                source_path.extend(call_path.into_iter().skip(1));
+                Some(source_path)
+            }
+            BindingKind::FromImportation(FromImportation {
+                qualified_name: name,
+            }) => {
+                if name.starts_with('.') {
+                    let mut source_path = from_relative_import(self.module_path?, name);
+                    if source_path.is_empty() {
+                        None
+                    } else {
+                        source_path.extend(call_path.into_iter().skip(1));
+                        Some(source_path)
+                    }
+                } else {
+                    let mut source_path: CallPath = from_unqualified_name(name);
+                    source_path.extend(call_path.into_iter().skip(1));
+                    Some(source_path)
+                }
+            }
+            BindingKind::Builtin => {
+                let mut source_path: CallPath = smallvec![];
+                source_path.push("");
+                source_path.extend(call_path);
+                Some(source_path)
+            }
+            _ => None,
+        }
+    }
+
+    /// Given a `module` and `member`, return the fully-qualified name of the binding in the current
+    /// scope, if it exists.
+    ///
+    /// E.g., given:
+    ///
+    /// ```python
+    /// from sys import version_info as python_version
+    /// print(python_version)
+    /// ```
+    ///
+    /// ...then `resolve_qualified_import_name("sys", "version_info")` will return
+    /// `Some("python_version")`.
+    pub fn resolve_qualified_import_name(
+        &self,
+        module: &str,
+        member: &str,
+    ) -> Option<ImportedName> {
+        self.scopes().enumerate().find_map(|(scope_index, scope)| {
+            scope.bindings().find_map(|(name, binding_id)| {
+                let binding = &self.bindings[binding_id];
+                match &binding.kind {
+                    // Ex) Given `module="sys"` and `object="exit"`:
+                    // `import sys`         -> `sys.exit`
+                    // `import sys as sys2` -> `sys2.exit`
+                    BindingKind::Importation(Importation { qualified_name }) => {
+                        if qualified_name == &module {
+                            if let Some(source) = binding.source {
+                                // Verify that `sys` isn't bound in an inner scope.
+                                if self
+                                    .scopes()
+                                    .take(scope_index)
+                                    .all(|scope| scope.get(name).is_none())
+                                {
+                                    return Some(ImportedName {
+                                        name: format!("{name}.{member}"),
+                                        range: self.stmts[source].range(),
+                                        context: binding.context,
+                                    });
+                                }
+                            }
+                        }
+                    }
+                    // Ex) Given `module="os.path"` and `object="join"`:
+                    // `from os.path import join`          -> `join`
+                    // `from os.path import join as join2` -> `join2`
+                    BindingKind::FromImportation(FromImportation { qualified_name }) => {
+                        if let Some((target_module, target_member)) = qualified_name.split_once('.')
+                        {
+                            if target_module == module && target_member == member {
+                                if let Some(source) = binding.source {
+                                    // Verify that `join` isn't bound in an inner scope.
+                                    if self
+                                        .scopes()
+                                        .take(scope_index)
+                                        .all(|scope| scope.get(name).is_none())
+                                    {
+                                        return Some(ImportedName {
+                                            name: (*name).to_string(),
+                                            range: self.stmts[source].range(),
+                                            context: binding.context,
+                                        });
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    // Ex) Given `module="os"` and `object="name"`:
+                    // `import os.path ` -> `os.name`
+                    BindingKind::SubmoduleImportation(SubmoduleImportation { .. }) => {
+                        if name == module {
+                            if let Some(source) = binding.source {
+                                // Verify that `os` isn't bound in an inner scope.
+                                if self
+                                    .scopes()
+                                    .take(scope_index)
+                                    .all(|scope| scope.get(name).is_none())
+                                {
+                                    return Some(ImportedName {
+                                        name: format!("{name}.{member}"),
+                                        range: self.stmts[source].range(),
+                                        context: binding.context,
+                                    });
+                                }
+                            }
+                        }
+                    }
+                    // Non-imports.
+                    _ => {}
+                }
+                None
+            })
+        })
+    }
+
+    /// Push a [`Stmt`] onto the stack.
+    pub fn push_stmt(&mut self, stmt: &'a Stmt) {
+        self.stmt_id = Some(self.stmts.insert(stmt, self.stmt_id));
+    }
+
+    /// Pop the current [`Stmt`] off the stack.
+    pub fn pop_stmt(&mut self) {
+        let node_id = self.stmt_id.expect("Attempted to pop without statement");
+        self.stmt_id = self.stmts.parent_id(node_id);
+    }
+
+    /// Push an [`Expr`] onto the stack.
+    pub fn push_expr(&mut self, expr: &'a Expr) {
+        self.exprs.push(expr);
+    }
+
+    /// Pop the current [`Expr`] off the stack.
+    pub fn pop_expr(&mut self) {
+        self.exprs
+            .pop()
+            .expect("Attempted to pop without expression");
+    }
+
+    /// Push a [`Scope`] with the given [`ScopeKind`] onto the stack.
+    pub fn push_scope(&mut self, kind: ScopeKind<'a>) {
+        let id = self.scopes.push_scope(kind, self.scope_id);
+        self.scope_id = id;
+    }
+
+    /// Pop the current [`Scope`] off the stack.
+    pub fn pop_scope(&mut self) {
+        self.dead_scopes.push(self.scope_id);
+        self.scope_id = self.scopes[self.scope_id]
+            .parent
+            .expect("Attempted to pop without scope");
+    }
+
+    /// Push a [`Member`] onto the stack.
+    pub fn push_definition(&mut self, definition: Member<'a>) {
+        self.definition_id = self.definitions.push_member(definition);
+    }
+
+    /// Pop the current [`Member`] off the stack.
+    pub fn pop_definition(&mut self) {
+        let Definition::Member(member) = &self.definitions[self.definition_id] else {
+            panic!("Attempted to pop without member definition");
+        };
+        self.definition_id = member.parent;
+    }
+
+    /// Return the current `Stmt`.
+    pub fn stmt(&self) -> &'a Stmt {
+        let node_id = self.stmt_id.expect("No current statement");
+        self.stmts[node_id]
+    }
+
+    /// Return the parent `Stmt` of the current `Stmt`, if any.
+    pub fn stmt_parent(&self) -> Option<&'a Stmt> {
+        let node_id = self.stmt_id.expect("No current statement");
+        let parent_id = self.stmts.parent_id(node_id)?;
+        Some(self.stmts[parent_id])
+    }
+
+    /// Return the current `Expr`.
+    pub fn expr(&self) -> Option<&'a Expr> {
+        self.exprs.iter().last().copied()
+    }
+
+    /// Return the parent `Expr` of the current `Expr`.
+    pub fn expr_parent(&self) -> Option<&'a Expr> {
+        self.exprs.iter().rev().nth(1).copied()
+    }
+
+    /// Return the grandparent `Expr` of the current `Expr`.
+    pub fn expr_grandparent(&self) -> Option<&'a Expr> {
+        self.exprs.iter().rev().nth(2).copied()
+    }
+
+    /// Return an [`Iterator`] over the current `Expr` parents.
+    pub fn expr_ancestors(&self) -> impl Iterator<Item = &&Expr> {
+        self.exprs.iter().rev().skip(1)
+    }
+
+    /// Return the `Stmt` that immediately follows the current `Stmt`, if any.
+    pub fn sibling_stmt(&self) -> Option<&'a Stmt> {
+        self.body.get(self.body_index + 1)
+    }
+
+    /// Returns a reference to the global scope
+    pub fn global_scope(&self) -> &Scope<'a> {
+        self.scopes.global()
+    }
+
+    /// Returns a mutable reference to the global scope
+    pub fn global_scope_mut(&mut self) -> &mut Scope<'a> {
+        self.scopes.global_mut()
+    }
+
+    /// Returns the current top most scope.
+    pub fn scope(&self) -> &Scope<'a> {
+        &self.scopes[self.scope_id]
+    }
+
+    /// Returns a mutable reference to the current top most scope.
+    pub fn scope_mut(&mut self) -> &mut Scope<'a> {
+        &mut self.scopes[self.scope_id]
+    }
+
+    /// Returns an iterator over all scopes, starting from the current scope.
+    pub fn scopes(&self) -> impl Iterator<Item = &Scope> {
+        self.scopes.ancestors(self.scope_id)
+    }
+
+    /// Returns an iterator over all parent statements.
+    pub fn parents(&self) -> impl Iterator<Item = &Stmt> + '_ {
+        let node_id = self.stmt_id.expect("No current statement");
+        self.stmts.ancestor_ids(node_id).map(|id| self.stmts[id])
+    }
+
+    /// Set the [`Globals`] for the current [`Scope`].
+    pub fn set_globals(&mut self, globals: Globals<'a>) {
+        // If any global bindings don't already exist in the global scope, add them.
+        for (name, range) in globals.iter() {
+            if self.global_scope().get(name).map_or(true, |binding_id| {
+                self.bindings[binding_id].kind.is_annotation()
+            }) {
+                let id = self.bindings.push(Binding {
+                    kind: BindingKind::Assignment,
+                    range: *range,
+                    references: Vec::new(),
+                    source: self.stmt_id,
+                    context: self.execution_context(),
+                    exceptions: self.exceptions(),
+                    flags: BindingFlags::empty(),
+                });
+                self.global_scope_mut().add(name, id);
+            }
+        }
+
+        self.scopes[self.scope_id].set_globals_id(self.globals.push(globals));
+    }
+
+    /// Return the [`TextRange`] at which a name is declared as global in the current [`Scope`].
+    pub fn global(&self, name: &str) -> Option<TextRange> {
+        let global_id = self.scopes[self.scope_id].globals_id()?;
+        self.globals[global_id].get(name).copied()
+    }
+
+    /// Return `true` if the given [`ScopeId`] matches that of the current scope.
+    pub fn is_current_scope(&self, scope_id: ScopeId) -> bool {
+        self.scope_id == scope_id
+    }
+
+    /// Return `true` if the model is at the top level of the module (i.e., in the module scope,
+    /// and not nested within any statements).
+    pub fn at_top_level(&self) -> bool {
+        self.scope_id.is_global()
+            && self
+                .stmt_id
+                .map_or(true, |stmt_id| self.stmts.parent_id(stmt_id).is_none())
+    }
+
+    /// Return `true` if the model is in an async context.
+    pub fn in_async_context(&self) -> bool {
+        for scope in self.scopes() {
+            if scope.kind.is_async_function() {
+                return true;
+            }
+            if scope.kind.is_function() {
+                return false;
+            }
+        }
+        false
+    }
+
+    /// Returns `true` if the given [`BindingId`] is used.
+    pub fn is_used(&self, binding_id: BindingId) -> bool {
+        self.bindings[binding_id].is_used()
+    }
+
+    /// Add a reference to the given [`BindingId`] in the local scope.
+    pub fn add_local_reference(
+        &mut self,
+        binding_id: BindingId,
+        range: TextRange,
+        context: ExecutionContext,
+    ) {
+        let reference_id = self.references.push(self.scope_id, range, context);
+        self.bindings[binding_id].references.push(reference_id);
+    }
+
+    /// Add a reference to the given [`BindingId`] in the global scope.
+    pub fn add_global_reference(
+        &mut self,
+        binding_id: BindingId,
+        range: TextRange,
+        context: ExecutionContext,
+    ) {
+        let reference_id = self.references.push(ScopeId::global(), range, context);
+        self.bindings[binding_id].references.push(reference_id);
+    }
+
+    /// Return the [`ExecutionContext`] of the current scope.
+    pub const fn execution_context(&self) -> ExecutionContext {
+        if self.in_type_checking_block()
+            || self.in_annotation()
+            || self.in_complex_string_type_definition()
+            || self.in_simple_string_type_definition()
+        {
+            ExecutionContext::Typing
+        } else {
+            ExecutionContext::Runtime
+        }
+    }
+
+    /// Return the union of all handled exceptions as an [`Exceptions`] bitflag.
+    pub fn exceptions(&self) -> Exceptions {
+        let mut exceptions = Exceptions::empty();
+        for exception in &self.handled_exceptions {
+            exceptions.insert(*exception);
+        }
+        exceptions
+    }
+
+    /// Generate a [`Snapshot`] of the current context.
+    pub fn snapshot(&self) -> Snapshot {
+        Snapshot {
+            scope_id: self.scope_id,
+            stmt_id: self.stmt_id,
+            definition_id: self.definition_id,
+            flags: self.flags,
+        }
+    }
+
+    /// Restore the context to the given [`Snapshot`].
+    pub fn restore(&mut self, snapshot: Snapshot) {
+        let Snapshot {
+            scope_id,
+            stmt_id,
+            definition_id,
+            flags,
+        } = snapshot;
+        self.scope_id = scope_id;
+        self.stmt_id = stmt_id;
+        self.definition_id = definition_id;
+        self.flags = flags;
+    }
+
+    /// Return `true` if the context is in a type annotation.
+    pub const fn in_annotation(&self) -> bool {
+        self.flags.contains(SemanticModelFlags::ANNOTATION)
+    }
+
+    /// Return `true` if the context is in a type definition.
+    pub const fn in_type_definition(&self) -> bool {
+        self.flags.contains(SemanticModelFlags::TYPE_DEFINITION)
+    }
+
+    /// Return `true` if the context is in a "simple" string type definition.
+    pub const fn in_simple_string_type_definition(&self) -> bool {
+        self.flags
+            .contains(SemanticModelFlags::SIMPLE_STRING_TYPE_DEFINITION)
+    }
+
+    /// Return `true` if the context is in a "complex" string type definition.
+    pub const fn in_complex_string_type_definition(&self) -> bool {
+        self.flags
+            .contains(SemanticModelFlags::COMPLEX_STRING_TYPE_DEFINITION)
+    }
+
+    /// Return `true` if the context is in a `__future__` type definition.
+    pub const fn in_future_type_definition(&self) -> bool {
+        self.flags
+            .contains(SemanticModelFlags::FUTURE_TYPE_DEFINITION)
+    }
+
+    /// Return `true` if the context is in any kind of deferred type definition.
+    pub const fn in_deferred_type_definition(&self) -> bool {
+        self.in_simple_string_type_definition()
+            || self.in_complex_string_type_definition()
+            || self.in_future_type_definition()
+    }
+
+    /// Return `true` if the context is in a forward type reference.
+    ///
+    /// Includes deferred string types, and future types in annotations.
+    ///
+    /// ## Examples
+    /// ```python
+    /// from __future__ import annotations
+    ///
+    /// from threading import Thread
+    ///
+    ///
+    /// x: Thread  # Forward reference
+    /// cast("Thread", x)  # Forward reference
+    /// cast(Thread, x)  # Non-forward reference
+    /// ```
+    pub const fn in_forward_reference(&self) -> bool {
+        self.in_simple_string_type_definition()
+            || self.in_complex_string_type_definition()
+            || (self.in_future_type_definition() && self.in_annotation())
+    }
+
+    /// Return `true` if the context is in an exception handler.
+    pub const fn in_exception_handler(&self) -> bool {
+        self.flags.contains(SemanticModelFlags::EXCEPTION_HANDLER)
+    }
+
+    /// Return `true` if the context is in an f-string.
+    pub const fn in_f_string(&self) -> bool {
+        self.flags.contains(SemanticModelFlags::F_STRING)
+    }
+
+    /// Return `true` if the context is in a nested f-string.
+    pub const fn in_nested_f_string(&self) -> bool {
+        self.flags.contains(SemanticModelFlags::NESTED_F_STRING)
+    }
+
+    /// Return `true` if the context is in boolean test.
+    pub const fn in_boolean_test(&self) -> bool {
+        self.flags.contains(SemanticModelFlags::BOOLEAN_TEST)
+    }
+
+    /// Return `true` if the context is in a `typing::Literal` annotation.
+    pub const fn in_literal(&self) -> bool {
+        self.flags.contains(SemanticModelFlags::LITERAL)
+    }
+
+    /// Return `true` if the context is in a subscript expression.
+    pub const fn in_subscript(&self) -> bool {
+        self.flags.contains(SemanticModelFlags::SUBSCRIPT)
+    }
+
+    /// Return `true` if the context is in a type-checking block.
+    pub const fn in_type_checking_block(&self) -> bool {
+        self.flags.contains(SemanticModelFlags::TYPE_CHECKING_BLOCK)
+    }
+
+    /// Return `true` if the context has traversed past the "top-of-file" import boundary.
+    pub const fn seen_import_boundary(&self) -> bool {
+        self.flags.contains(SemanticModelFlags::IMPORT_BOUNDARY)
+    }
+
+    /// Return `true` if the context has traverse past the `__future__` import boundary.
+    pub const fn seen_futures_boundary(&self) -> bool {
+        self.flags.contains(SemanticModelFlags::FUTURES_BOUNDARY)
+    }
+
+    /// Return `true` if `__future__`-style type annotations are enabled.
+    pub const fn future_annotations(&self) -> bool {
+        self.flags.contains(SemanticModelFlags::FUTURE_ANNOTATIONS)
+    }
+}
+
+bitflags! {
+    /// Flags indicating the current context of the analysis.
+    #[derive(Debug, Default, Copy, Clone, Eq, PartialEq)]
+    pub struct SemanticModelFlags: u16 {
+        /// The context is in a type annotation.
+        ///
+        /// For example, the context could be visiting `int` in:
+        /// ```python
+        /// x: int = 1
+        /// ```
+        const ANNOTATION = 1 << 0;
+
+        /// The context is in a type definition.
+        ///
+        /// For example, the context could be visiting `int` in:
+        /// ```python
+        /// from typing import NewType
+        ///
+        /// UserId = NewType("UserId", int)
+        /// ```
+        ///
+        /// All type annotations are also type definitions, but the converse is not true.
+        /// In our example, `int` is a type definition but not a type annotation, as it
+        /// doesn't appear in a type annotation context, but rather in a type definition.
+        const TYPE_DEFINITION = 1 << 1;
+
+        /// The context is in a (deferred) "simple" string type definition.
+        ///
+        /// For example, the context could be visiting `list[int]` in:
+        /// ```python
+        /// x: "list[int]" = []
+        /// ```
+        ///
+        /// "Simple" string type definitions are those that consist of a single string literal,
+        /// as opposed to an implicitly concatenated string literal.
+        const SIMPLE_STRING_TYPE_DEFINITION =  1 << 2;
+
+        /// The context is in a (deferred) "complex" string type definition.
+        ///
+        /// For example, the context could be visiting `list[int]` in:
+        /// ```python
+        /// x: ("list" "[int]") = []
+        /// ```
+        ///
+        /// "Complex" string type definitions are those that consist of a implicitly concatenated
+        /// string literals. These are uncommon but valid.
+        const COMPLEX_STRING_TYPE_DEFINITION = 1 << 3;
+
+        /// The context is in a (deferred) `__future__` type definition.
+        ///
+        /// For example, the context could be visiting `list[int]` in:
+        /// ```python
+        /// from __future__ import annotations
+        ///
+        /// x: list[int] = []
+        /// ```
+        ///
+        /// `__future__`-style type annotations are only enabled if the `annotations` feature
+        /// is enabled via `from __future__ import annotations`.
+        const FUTURE_TYPE_DEFINITION = 1 << 4;
+
+        /// The context is in an exception handler.
+        ///
+        /// For example, the context could be visiting `x` in:
+        /// ```python
+        /// try:
+        ///     ...
+        /// except Exception:
+        ///     x: int = 1
+        /// ```
+        const EXCEPTION_HANDLER = 1 << 5;
+
+        /// The context is in an f-string.
+        ///
+        /// For example, the context could be visiting `x` in:
+        /// ```python
+        /// f'{x}'
+        /// ```
+        const F_STRING = 1 << 6;
+
+        /// The context is in a nested f-string.
+        ///
+        /// For example, the context could be visiting `x` in:
+        /// ```python
+        /// f'{f"{x}"}'
+        /// ```
+        const NESTED_F_STRING = 1 << 7;
+
+        /// The context is in a boolean test.
+        ///
+        /// For example, the context could be visiting `x` in:
+        /// ```python
+        /// if x:
+        ///     ...
+        /// ```
+        ///
+        /// The implication is that the actual value returned by the current expression is
+        /// not used, only its truthiness.
+        const BOOLEAN_TEST = 1 << 8;
+
+        /// The context is in a `typing::Literal` annotation.
+        ///
+        /// For example, the context could be visiting any of `"A"`, `"B"`, or `"C"` in:
+        /// ```python
+        /// def f(x: Literal["A", "B", "C"]):
+        ///     ...
+        /// ```
+        const LITERAL = 1 << 9;
+
+        /// The context is in a subscript expression.
+        ///
+        /// For example, the context could be visiting `x["a"]` in:
+        /// ```python
+        /// x["a"]["b"]
+        /// ```
+        const SUBSCRIPT = 1 << 10;
+
+        /// The context is in a type-checking block.
+        ///
+        /// For example, the context could be visiting `x` in:
+        /// ```python
+        /// from typing import TYPE_CHECKING
+        ///
+        ///
+        /// if TYPE_CHECKING:
+        ///    x: int = 1
+        /// ```
+        const TYPE_CHECKING_BLOCK = 1 << 11;
+
+
+        /// The context has traversed past the "top-of-file" import boundary.
+        ///
+        /// For example, the context could be visiting `x` in:
+        /// ```python
+        /// import os
+        ///
+        /// def f() -> None:
+        ///     ...
+        ///
+        /// x: int = 1
+        /// ```
+        const IMPORT_BOUNDARY = 1 << 12;
+
+        /// The context has traversed past the `__future__` import boundary.
+        ///
+        /// For example, the context could be visiting `x` in:
+        /// ```python
+        /// from __future__ import annotations
+        ///
+        /// import os
+        ///
+        /// x: int = 1
+        /// ```
+        ///
+        /// Python considers it a syntax error to import from `__future__` after
+        /// any other non-`__future__`-importing statements.
+        const FUTURES_BOUNDARY = 1 << 13;
+
+        /// `__future__`-style type annotations are enabled in this context.
+        ///
+        /// For example, the context could be visiting `x` in:
+        /// ```python
+        /// from __future__ import annotations
+        ///
+        ///
+        /// def f(x: int) -> int:
+        ///   ...
+        /// ```
+        const FUTURE_ANNOTATIONS = 1 << 14;
+    }
+}
+
+impl SemanticModelFlags {
+    pub fn new(path: &Path) -> Self {
+        let mut flags = Self::default();
+        if is_python_stub_file(path) {
+            flags |= Self::FUTURE_ANNOTATIONS;
+        }
+        flags
+    }
+}
+
+/// A snapshot of the [`SemanticModel`] at a given point in the AST traversal.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct Snapshot {
+    scope_id: ScopeId,
+    stmt_id: Option<NodeId>,
+    definition_id: DefinitionId,
+    flags: SemanticModelFlags,
+}
+
+#[derive(Debug)]
+pub enum ResolvedReference {
+    /// The reference is resolved to a specific binding.
+    Resolved(BindingId),
+    /// The reference is resolved to a context-specific, implicit global (e.g., `__class__` within
+    /// a class scope).
+    ImplicitGlobal,
+    /// The reference is unresolved, but at least one of the containing scopes contains a star
+    /// import.
+    StarImport,
+    /// The reference is definitively unresolved.
+    NotFound,
+}
+
+#[derive(Debug)]
+pub struct ImportedName {
+    /// The name to which the imported symbol is bound.
+    name: String,
+    /// The range at which the symbol is imported.
+    range: TextRange,
+    /// The context in which the symbol is imported.
+    context: ExecutionContext,
+}
+
+impl ImportedName {
+    pub fn into_name(self) -> String {
+        self.name
+    }
+
+    pub const fn context(&self) -> ExecutionContext {
+        self.context
+    }
+}
+
+impl Ranged for ImportedName {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
diff --git a/crates/ruff_python_semantic/src/node.rs b/crates/ruff_python_semantic/src/node.rs
new file mode 100644
index 0000000000000..dd71fd5f1dcdc
--- /dev/null
+++ b/crates/ruff_python_semantic/src/node.rs
@@ -0,0 +1,97 @@
+use std::ops::{Index, IndexMut};
+
+use ruff_index::{newtype_index, IndexVec};
+use rustc_hash::FxHashMap;
+use rustpython_parser::ast::Stmt;
+
+use ruff_python_ast::types::RefEquality;
+
+/// Id uniquely identifying a statement in a program.
+///
+/// Using a `u32` is sufficient because Ruff only supports parsing documents with a size of max `u32::max`
+/// and it is impossible to have more statements than characters in the file. We use a `NonZeroU32` to
+/// take advantage of memory layout optimizations.
+#[newtype_index]
+#[derive(Ord, PartialOrd)]
+pub struct NodeId;
+
+/// A [`Node`] represents a statement in a program, along with a pointer to its parent (if any).
+#[derive(Debug)]
+struct Node<'a> {
+    /// The statement this node represents.
+    stmt: &'a Stmt,
+    /// The ID of the parent of this node, if any.
+    parent: Option<NodeId>,
+    /// The depth of this node in the tree.
+    depth: u32,
+}
+
+/// The nodes of a program indexed by [`NodeId`]
+#[derive(Debug, Default)]
+pub struct Nodes<'a> {
+    nodes: IndexVec<NodeId, Node<'a>>,
+    node_to_id: FxHashMap<RefEquality<'a, Stmt>, NodeId>,
+}
+
+impl<'a> Nodes<'a> {
+    /// Inserts a new node into the node tree and returns its unique id.
+    ///
+    /// Panics if a node with the same pointer already exists.
+    pub fn insert(&mut self, stmt: &'a Stmt, parent: Option<NodeId>) -> NodeId {
+        let next_id = self.nodes.next_index();
+        if let Some(existing_id) = self.node_to_id.insert(RefEquality(stmt), next_id) {
+            panic!("Node already exists with id {existing_id:?}");
+        }
+        self.nodes.push(Node {
+            stmt,
+            parent,
+            depth: parent.map_or(0, |parent| self.nodes[parent].depth + 1),
+        })
+    }
+
+    /// Returns the [`NodeId`] of the given node.
+    #[inline]
+    pub fn node_id(&self, node: &'a Stmt) -> Option<NodeId> {
+        self.node_to_id.get(&RefEquality(node)).copied()
+    }
+
+    /// Return the [`NodeId`] of the parent node.
+    #[inline]
+    pub fn parent_id(&self, node_id: NodeId) -> Option<NodeId> {
+        self.nodes[node_id].parent
+    }
+
+    /// Return the depth of the node.
+    #[inline]
+    pub fn depth(&self, node_id: NodeId) -> u32 {
+        self.nodes[node_id].depth
+    }
+
+    /// Returns an iterator over all [`NodeId`] ancestors, starting from the given [`NodeId`].
+    pub fn ancestor_ids(&self, node_id: NodeId) -> impl Iterator<Item = NodeId> + '_ {
+        std::iter::successors(Some(node_id), |&node_id| self.nodes[node_id].parent)
+    }
+
+    /// Return the parent of the given node.
+    pub fn parent(&self, node: &'a Stmt) -> Option<&'a Stmt> {
+        let node_id = self.node_to_id.get(&RefEquality(node))?;
+        let parent_id = self.nodes[*node_id].parent?;
+        Some(self[parent_id])
+    }
+}
+
+impl<'a> Index<NodeId> for Nodes<'a> {
+    type Output = &'a Stmt;
+
+    #[inline]
+    fn index(&self, index: NodeId) -> &Self::Output {
+        &self.nodes[index].stmt
+    }
+}
+
+impl<'a> IndexMut<NodeId> for Nodes<'a> {
+    #[inline]
+    fn index_mut(&mut self, index: NodeId) -> &mut Self::Output {
+        &mut self.nodes[index].stmt
+    }
+}
diff --git a/crates/ruff_python_semantic/src/reference.rs b/crates/ruff_python_semantic/src/reference.rs
new file mode 100644
index 0000000000000..cac8bb8f39c32
--- /dev/null
+++ b/crates/ruff_python_semantic/src/reference.rs
@@ -0,0 +1,59 @@
+use ruff_text_size::TextRange;
+
+use ruff_index::{newtype_index, IndexVec};
+
+use crate::context::ExecutionContext;
+use crate::scope::ScopeId;
+
+#[derive(Debug, Clone)]
+pub struct Reference {
+    /// The scope in which the reference is defined.
+    scope_id: ScopeId,
+    /// The range of the reference in the source code.
+    range: TextRange,
+    /// The context in which the reference occurs.
+    context: ExecutionContext,
+}
+
+impl Reference {
+    pub const fn scope_id(&self) -> ScopeId {
+        self.scope_id
+    }
+
+    pub const fn range(&self) -> TextRange {
+        self.range
+    }
+
+    pub const fn context(&self) -> ExecutionContext {
+        self.context
+    }
+}
+
+/// Id uniquely identifying a read reference in a program.
+#[newtype_index]
+pub struct ReferenceId;
+
+/// The references of a program indexed by [`ReferenceId`].
+#[derive(Debug, Default)]
+pub struct References(IndexVec<ReferenceId, Reference>);
+
+impl References {
+    /// Pushes a new read reference and returns its unique id.
+    pub fn push(
+        &mut self,
+        scope_id: ScopeId,
+        range: TextRange,
+        context: ExecutionContext,
+    ) -> ReferenceId {
+        self.0.push(Reference {
+            scope_id,
+            range,
+            context,
+        })
+    }
+
+    /// Returns the [`Reference`] with the given id.
+    pub fn resolve(&self, id: ReferenceId) -> &Reference {
+        &self.0[id]
+    }
+}
diff --git a/crates/ruff_python_semantic/src/scope.rs b/crates/ruff_python_semantic/src/scope.rs
index e1366de65aaa1..e56d4dafa8391 100644
--- a/crates/ruff_python_semantic/src/scope.rs
+++ b/crates/ruff_python_semantic/src/scope.rs
@@ -1,24 +1,33 @@
-use std::num::TryFromIntError;
-use std::ops::{Deref, Index, IndexMut};
+use bitflags::bitflags;
+use nohash_hasher::{BuildNoHashHasher, IntMap};
+use std::collections::HashMap;
+use std::ops::{Deref, DerefMut};
 
 use rustc_hash::FxHashMap;
-use rustpython_parser::ast::{Arguments, Expr, Keyword, Stmt};
+use rustpython_parser::ast;
+
+use ruff_index::{newtype_index, Idx, IndexSlice, IndexVec};
 
 use crate::binding::{BindingId, StarImportation};
+use crate::globals::GlobalsId;
 
 #[derive(Debug)]
 pub struct Scope<'a> {
     pub kind: ScopeKind<'a>,
     pub parent: Option<ScopeId>,
-    /// Whether this scope uses the `locals()` builtin.
-    pub uses_locals: bool,
     /// A list of star imports in this scope. These represent _module_ imports (e.g., `sys` in
     /// `from sys import *`), rather than individual bindings (e.g., individual members in `sys`).
     star_imports: Vec<StarImportation<'a>>,
-    /// A map from bound name to binding index, for current bindings.
+    /// A map from bound name to binding ID.
     bindings: FxHashMap<&'a str, BindingId>,
-    /// A map from bound name to binding index, for bindings that were shadowed later in the scope.
-    shadowed_bindings: FxHashMap<&'a str, Vec<BindingId>>,
+    /// A map from binding ID to binding ID that it shadows.
+    shadowed_bindings: HashMap<BindingId, BindingId, BuildNoHashHasher<BindingId>>,
+    /// A list of all names that have been deleted in this scope.
+    deleted_symbols: Vec<&'a str>,
+    /// Index into the globals arena, if the scope contains any globally-declared symbols.
+    globals_id: Option<GlobalsId>,
+    /// Flags for the [`Scope`].
+    flags: ScopeFlags,
 }
 
 impl<'a> Scope<'a> {
@@ -26,10 +35,12 @@ impl<'a> Scope<'a> {
         Scope {
             kind: ScopeKind::Module,
             parent: None,
-            uses_locals: false,
             star_imports: Vec::default(),
             bindings: FxHashMap::default(),
-            shadowed_bindings: FxHashMap::default(),
+            shadowed_bindings: IntMap::default(),
+            deleted_symbols: Vec::default(),
+            globals_id: None,
+            flags: ScopeFlags::empty(),
         }
     }
 
@@ -37,55 +48,65 @@ impl<'a> Scope<'a> {
         Scope {
             kind,
             parent: Some(parent),
-            uses_locals: false,
             star_imports: Vec::default(),
             bindings: FxHashMap::default(),
-            shadowed_bindings: FxHashMap::default(),
+            shadowed_bindings: IntMap::default(),
+            deleted_symbols: Vec::default(),
+            globals_id: None,
+            flags: ScopeFlags::empty(),
         }
     }
 
     /// Returns the [id](BindingId) of the binding bound to the given name.
-    pub fn get(&self, name: &str) -> Option<&BindingId> {
-        self.bindings.get(name)
+    pub fn get(&self, name: &str) -> Option<BindingId> {
+        self.bindings.get(name).copied()
     }
 
     /// Adds a new binding with the given name to this scope.
     pub fn add(&mut self, name: &'a str, id: BindingId) -> Option<BindingId> {
-        if let Some(id) = self.bindings.insert(name, id) {
-            self.shadowed_bindings.entry(name).or_default().push(id);
-            Some(id)
+        if let Some(shadowed) = self.bindings.insert(name, id) {
+            self.shadowed_bindings.insert(id, shadowed);
+            Some(shadowed)
         } else {
             None
         }
     }
 
-    /// Returns `true` if this scope defines a binding with the given name.
-    pub fn defines(&self, name: &str) -> bool {
+    /// Removes the binding with the given name.
+    pub fn delete(&mut self, name: &'a str) -> Option<BindingId> {
+        self.deleted_symbols.push(name);
+        self.bindings.remove(name)
+    }
+
+    /// Returns `true` if this scope has a binding with the given name.
+    pub fn has(&self, name: &str) -> bool {
         self.bindings.contains_key(name)
     }
 
-    /// Removes the binding with the given name
-    pub fn remove(&mut self, name: &str) -> Option<BindingId> {
-        self.bindings.remove(name)
+    /// Returns `true` if the scope declares a symbol with the given name.
+    ///
+    /// Unlike [`Scope::has`], the name may no longer be bound to a value (e.g., it could be
+    /// deleted).
+    pub fn declares(&self, name: &str) -> bool {
+        self.has(name) || self.deleted_symbols.contains(&name)
     }
 
     /// Returns the ids of all bindings defined in this scope.
-    pub fn binding_ids(&self) -> std::collections::hash_map::Values<&str, BindingId> {
-        self.bindings.values()
+    pub fn binding_ids(&self) -> impl Iterator<Item = BindingId> + '_ {
+        self.bindings.values().copied()
     }
 
     /// Returns a tuple of the name and id of all bindings defined in this scope.
-    pub fn bindings(&self) -> std::collections::hash_map::Iter<&'a str, BindingId> {
-        self.bindings.iter()
+    pub fn bindings(&self) -> impl Iterator<Item = (&str, BindingId)> + '_ {
+        self.bindings.iter().map(|(&name, &id)| (name, id))
     }
 
     /// Returns an iterator over all [bindings](BindingId) bound to the given name, including
     /// those that were shadowed by later bindings.
-    pub fn bindings_for_name(&self, name: &str) -> impl Iterator<Item = &BindingId> {
-        self.bindings
-            .get(name)
-            .into_iter()
-            .chain(self.shadowed_bindings.get(name).into_iter().flatten().rev())
+    pub fn bindings_for_name(&self, name: &str) -> impl Iterator<Item = BindingId> + '_ {
+        std::iter::successors(self.bindings.get(name).copied(), |id| {
+            self.shadowed_bindings.get(id).copied()
+        })
     }
 
     /// Adds a reference to a star import (e.g., `from sys import *`) to this scope.
@@ -102,88 +123,77 @@ impl<'a> Scope<'a> {
     pub fn star_imports(&self) -> impl Iterator<Item = &StarImportation<'a>> {
         self.star_imports.iter()
     }
-}
-
-/// Id uniquely identifying a scope in a program.
-///
-/// Using a `u32` is sufficient because Ruff only supports parsing documents with a size of max `u32::max`
-/// and it is impossible to have more scopes than characters in the file (because defining a function or class
-/// requires more than one character).
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Ord, PartialOrd)]
-pub struct ScopeId(u32);
 
-impl ScopeId {
-    /// Returns the ID for the global scope
-    #[inline]
-    pub const fn global() -> Self {
-        ScopeId(0)
+    /// Set the globals pointer for this scope.
+    pub fn set_globals_id(&mut self, globals: GlobalsId) {
+        self.globals_id = Some(globals);
     }
 
-    /// Returns `true` if this is the id of the global scope
-    pub const fn is_global(&self) -> bool {
-        self.0 == 0
+    /// Returns the globals pointer for this scope.
+    pub fn globals_id(&self) -> Option<GlobalsId> {
+        self.globals_id
     }
-}
 
-impl TryFrom<usize> for ScopeId {
-    type Error = TryFromIntError;
+    /// Sets the [`ScopeFlags::USES_LOCALS`] flag.
+    pub fn set_uses_locals(&mut self) {
+        self.flags.insert(ScopeFlags::USES_LOCALS);
+    }
 
-    fn try_from(value: usize) -> Result<Self, Self::Error> {
-        Ok(Self(u32::try_from(value)?))
+    /// Returns `true` if this scope uses locals (e.g., `locals()`).
+    pub const fn uses_locals(&self) -> bool {
+        self.flags.contains(ScopeFlags::USES_LOCALS)
     }
 }
 
-impl From<ScopeId> for usize {
-    fn from(value: ScopeId) -> Self {
-        value.0 as usize
+bitflags! {
+    /// Flags on a [`Scope`].
+    #[derive(Debug, Default, Copy, Clone, Eq, PartialEq)]
+    pub struct ScopeFlags: u8 {
+        /// The scope uses locals (e.g., `locals()`).
+        const USES_LOCALS = 1 << 0;
     }
 }
 
 #[derive(Debug, is_macro::Is)]
 pub enum ScopeKind<'a> {
-    Class(ClassDef<'a>),
-    Function(FunctionDef<'a>),
+    Class(&'a ast::StmtClassDef),
+    Function(&'a ast::StmtFunctionDef),
+    AsyncFunction(&'a ast::StmtAsyncFunctionDef),
     Generator,
     Module,
-    Lambda(Lambda<'a>),
+    Lambda(&'a ast::ExprLambda),
 }
 
-#[derive(Debug)]
-pub struct FunctionDef<'a> {
-    // Properties derived from StmtKind::FunctionDef.
-    pub name: &'a str,
-    pub args: &'a Arguments,
-    pub body: &'a [Stmt],
-    pub decorator_list: &'a [Expr],
-    // pub returns: Option<&'a Expr>,
-    // pub type_comment: Option<&'a str>,
-    // Scope-specific properties.
-    // TODO(charlie): Create AsyncFunctionDef to mirror the AST.
-    pub async_: bool,
-    pub globals: FxHashMap<&'a str, &'a Stmt>,
+impl ScopeKind<'_> {
+    pub const fn is_any_function(&self) -> bool {
+        matches!(self, ScopeKind::Function(_) | ScopeKind::AsyncFunction(_))
+    }
 }
 
-#[derive(Debug)]
-pub struct ClassDef<'a> {
-    // Properties derived from StmtKind::ClassDef.
-    pub name: &'a str,
-    pub bases: &'a [Expr],
-    pub keywords: &'a [Keyword],
-    // pub body: &'a [Stmt],
-    pub decorator_list: &'a [Expr],
-    // Scope-specific properties.
-    pub globals: FxHashMap<&'a str, &'a Stmt>,
-}
+/// Id uniquely identifying a scope in a program.
+///
+/// Using a `u32` is sufficient because Ruff only supports parsing documents with a size of max `u32::max`
+/// and it is impossible to have more scopes than characters in the file (because defining a function or class
+/// requires more than one character).
+#[newtype_index]
+pub struct ScopeId;
 
-#[derive(Debug)]
-pub struct Lambda<'a> {
-    pub args: &'a Arguments,
-    pub body: &'a Expr,
+impl ScopeId {
+    /// Returns the ID for the global scope
+    #[inline]
+    pub const fn global() -> Self {
+        ScopeId::from_u32(0)
+    }
+
+    /// Returns `true` if this is the id of the global scope
+    pub const fn is_global(&self) -> bool {
+        self.index() == 0
+    }
 }
 
 /// The scopes of a program indexed by [`ScopeId`]
 #[derive(Debug)]
-pub struct Scopes<'a>(Vec<Scope<'a>>);
+pub struct Scopes<'a>(IndexVec<ScopeId, Scope<'a>>);
 
 impl<'a> Scopes<'a> {
     /// Returns a reference to the global scope
@@ -198,7 +208,7 @@ impl<'a> Scopes<'a> {
 
     /// Pushes a new scope and returns its unique id
     pub fn push_scope(&mut self, kind: ScopeKind<'a>, parent: ScopeId) -> ScopeId {
-        let next_id = ScopeId::try_from(self.0.len()).unwrap();
+        let next_id = ScopeId::new(self.0.len());
         self.0.push(Scope::local(kind, parent));
         next_id
     }
@@ -218,27 +228,19 @@ impl<'a> Scopes<'a> {
 
 impl Default for Scopes<'_> {
     fn default() -> Self {
-        Self(vec![Scope::global()])
-    }
-}
-
-impl<'a> Index<ScopeId> for Scopes<'a> {
-    type Output = Scope<'a>;
-
-    fn index(&self, index: ScopeId) -> &Self::Output {
-        &self.0[usize::from(index)]
-    }
-}
-
-impl<'a> IndexMut<ScopeId> for Scopes<'a> {
-    fn index_mut(&mut self, index: ScopeId) -> &mut Self::Output {
-        &mut self.0[usize::from(index)]
+        Self(IndexVec::from_raw(vec![Scope::global()]))
     }
 }
 
 impl<'a> Deref for Scopes<'a> {
-    type Target = [Scope<'a>];
+    type Target = IndexSlice<ScopeId, Scope<'a>>;
     fn deref(&self) -> &Self::Target {
         &self.0
     }
 }
+
+impl<'a> DerefMut for Scopes<'a> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
diff --git a/crates/ruff_python_stdlib/src/path.rs b/crates/ruff_python_stdlib/src/path.rs
index 2c48f44c2d4ec..733c18bb3fcdd 100644
--- a/crates/ruff_python_stdlib/src/path.rs
+++ b/crates/ruff_python_stdlib/src/path.rs
@@ -6,6 +6,12 @@ pub fn is_python_file(path: &Path) -> bool {
         .map_or(false, |ext| ext == "py" || ext == "pyi")
 }
 
+/// Return `true` if the [`Path`] is named `pyproject.toml`.
+pub fn is_project_toml(path: &Path) -> bool {
+    path.file_name()
+        .map_or(false, |name| name == "pyproject.toml")
+}
+
 /// Return `true` if the [`Path`] appears to be that of a Python interface definition file (`.pyi`).
 pub fn is_python_stub_file(path: &Path) -> bool {
     path.extension().map_or(false, |ext| ext == "pyi")
diff --git a/crates/ruff_python_stdlib/src/typing.rs b/crates/ruff_python_stdlib/src/typing.rs
index 313ff0a8fd251..48895413f6fcc 100644
--- a/crates/ruff_python_stdlib/src/typing.rs
+++ b/crates/ruff_python_stdlib/src/typing.rs
@@ -187,15 +187,26 @@ pub const PEP_593_SUBSCRIPTS: &[&[&str]] = &[
     &["typing_extensions", "Annotated"],
 ];
 
+type ModuleMember = (&'static str, &'static str);
+
+type SymbolReplacement = (ModuleMember, ModuleMember);
+
 // See: https://peps.python.org/pep-0585/
-pub const PEP_585_BUILTINS_ELIGIBLE: &[&[&str]] = &[
-    &["typing", "Dict"],
-    &["typing", "FrozenSet"],
-    &["typing", "List"],
-    &["typing", "Set"],
-    &["typing", "Tuple"],
-    &["typing", "Type"],
-    &["typing_extensions", "Type"],
+pub const PEP_585_GENERICS: &[SymbolReplacement] = &[
+    (("typing", "Dict"), ("", "dict")),
+    (("typing", "FrozenSet"), ("", "frozenset")),
+    (("typing", "List"), ("", "list")),
+    (("typing", "Set"), ("", "set")),
+    (("typing", "Tuple"), ("", "tuple")),
+    (("typing", "Type"), ("", "type")),
+    (("typing_extensions", "Type"), ("", "type")),
+    (("typing", "Deque"), ("collections", "deque")),
+    (("typing_extensions", "Deque"), ("collections", "deque")),
+    (("typing", "DefaultDict"), ("collections", "defaultdict")),
+    (
+        ("typing_extensions", "DefaultDict"),
+        ("collections", "defaultdict"),
+    ),
 ];
 
 // See: https://github.com/JelleZijlstra/autotyping/blob/0adba5ba0eee33c1de4ad9d0c79acfd737321dd9/autotyping/autotyping.py#L69-L91
diff --git a/crates/ruff_rustpython/Cargo.toml b/crates/ruff_rustpython/Cargo.toml
index 3c4b893d07b07..e66ba4caa6bd8 100644
--- a/crates/ruff_rustpython/Cargo.toml
+++ b/crates/ruff_rustpython/Cargo.toml
@@ -9,6 +9,4 @@ rust-version = { workspace = true }
 
 [dependencies]
 anyhow = { workspace = true }
-once_cell = { workspace = true }
-rustpython-common = { workspace = true }
 rustpython-parser = { workspace = true }
diff --git a/crates/ruff_rustpython/src/lib.rs b/crates/ruff_rustpython/src/lib.rs
index a40a9db7390f9..c0fcd72e28081 100644
--- a/crates/ruff_rustpython/src/lib.rs
+++ b/crates/ruff_rustpython/src/lib.rs
@@ -1,10 +1,8 @@
 use rustpython_parser as parser;
-use rustpython_parser::ast::{Mod, Suite};
+use rustpython_parser::ast::{Mod, ModModule, Suite};
 use rustpython_parser::lexer::LexResult;
 use rustpython_parser::{lexer, Mode, ParseError};
 
-pub mod vendor;
-
 /// Collect tokens up to and including the first error.
 pub fn tokenize(contents: &str) -> Vec<LexResult> {
     let mut tokens: Vec<LexResult> = vec![];
@@ -24,7 +22,7 @@ pub fn parse_program_tokens(
     source_path: &str,
 ) -> anyhow::Result<Suite, ParseError> {
     parser::parse_tokens(lxr, Mode::Module, source_path).map(|top| match top {
-        Mod::Module { body, .. } => body,
+        Mod::Module(ModModule { body, .. }) => body,
         _ => unreachable!(),
     })
 }
diff --git a/crates/ruff_rustpython/src/vendor/bytes.rs b/crates/ruff_rustpython/src/vendor/bytes.rs
deleted file mode 100644
index f7f5cdb7ca9ea..0000000000000
--- a/crates/ruff_rustpython/src/vendor/bytes.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-//! Vendored from [bytes.rs in rustpython-common](https://github.com/RustPython/RustPython/blob/1d8269fb729c91fc56064e975172d3a11bd62d07/common/src/bytes.rs).
-//! The only changes we make are to remove dead code and make the default quote
-//! type configurable.
-
-use crate::vendor;
-use crate::vendor::str::Quote;
-
-pub fn repr(b: &[u8], quote: Quote) -> String {
-    repr_with(b, &[], "", quote)
-}
-
-pub fn repr_with(b: &[u8], prefixes: &[&str], suffix: &str, quote: Quote) -> String {
-    use std::fmt::Write;
-
-    let mut out_len = 0usize;
-    let mut squote = 0;
-    let mut dquote = 0;
-
-    for &ch in b {
-        let incr = match ch {
-            b'\'' => {
-                squote += 1;
-                1
-            }
-            b'"' => {
-                dquote += 1;
-                1
-            }
-            b'\\' | b'\t' | b'\r' | b'\n' => 2,
-            0x20..=0x7e => 1,
-            _ => 4, // \xHH
-        };
-        // TODO: OverflowError
-        out_len = out_len.checked_add(incr).unwrap();
-    }
-
-    let (quote, num_escaped_quotes) = vendor::str::choose_quotes_for_repr(squote, dquote, quote);
-    // we'll be adding backslashes in front of the existing inner quotes
-    out_len += num_escaped_quotes;
-
-    // 3 is for b prefix + outer quotes
-    out_len += 3 + prefixes.iter().map(|s| s.len()).sum::<usize>() + suffix.len();
-
-    let mut res = String::with_capacity(out_len);
-    res.extend(prefixes.iter().copied());
-    res.push('b');
-    res.push(quote);
-    for &ch in b {
-        match ch {
-            b'\t' => res.push_str("\\t"),
-            b'\n' => res.push_str("\\n"),
-            b'\r' => res.push_str("\\r"),
-            // printable ascii range
-            0x20..=0x7e => {
-                let ch = ch as char;
-                if ch == quote || ch == '\\' {
-                    res.push('\\');
-                }
-                res.push(ch);
-            }
-            _ => write!(res, "\\x{ch:02x}").unwrap(),
-        }
-    }
-    res.push(quote);
-    res.push_str(suffix);
-
-    res
-}
diff --git a/crates/ruff_rustpython/src/vendor/mod.rs b/crates/ruff_rustpython/src/vendor/mod.rs
deleted file mode 100644
index e852de30db32f..0000000000000
--- a/crates/ruff_rustpython/src/vendor/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod bytes;
-pub mod str;
diff --git a/crates/ruff_rustpython/src/vendor/str.rs b/crates/ruff_rustpython/src/vendor/str.rs
deleted file mode 100644
index 42920dda227b9..0000000000000
--- a/crates/ruff_rustpython/src/vendor/str.rs
+++ /dev/null
@@ -1,182 +0,0 @@
-//! Vendored from [str.rs in rustpython-common](https://github.com/RustPython/RustPython/blob/1d8269fb729c91fc56064e975172d3a11bd62d07/common/src/str.rs).
-//! The only changes we make are to remove dead code and make the default quote
-//! type configurable.
-
-use std::fmt;
-
-use once_cell::unsync::OnceCell;
-
-#[derive(Debug, Clone, Copy)]
-pub enum Quote {
-    Single,
-    Double,
-}
-
-/// Get a Display-able type that formats to the python `repr()` of the string
-/// value.
-#[inline]
-pub fn repr(s: &str, quote: Quote) -> Repr<'_> {
-    Repr {
-        s,
-        quote,
-        info: OnceCell::new(),
-    }
-}
-
-#[derive(Debug, Copy, Clone)]
-#[non_exhaustive]
-pub struct ReprOverflowError;
-
-impl fmt::Display for ReprOverflowError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str("string is too long to generate repr")
-    }
-}
-
-#[derive(Copy, Clone)]
-struct ReprInfo {
-    dquoted: bool,
-    out_len: usize,
-}
-
-impl ReprInfo {
-    fn get(s: &str, quote: Quote) -> Result<Self, ReprOverflowError> {
-        let mut out_len = 0usize;
-        let mut squote = 0;
-        let mut dquote = 0;
-
-        for ch in s.chars() {
-            let incr = match ch {
-                '\'' => {
-                    squote += 1;
-                    1
-                }
-                '"' => {
-                    dquote += 1;
-                    1
-                }
-                '\\' | '\t' | '\r' | '\n' => 2,
-                ch if ch < ' ' || ch as u32 == 0x7f => 4, // \xHH
-                ch if ch.is_ascii() => 1,
-                ch if rustpython_common::char::is_printable(ch) => {
-                    // max = std::cmp::max(ch, max);
-                    ch.len_utf8()
-                }
-                ch if (ch as u32) < 0x100 => 4,   // \xHH
-                ch if (ch as u32) < 0x10000 => 6, // \uHHHH
-                _ => 10,                          // \uHHHHHHHH
-            };
-            out_len += incr;
-            if out_len > std::isize::MAX as usize {
-                return Err(ReprOverflowError);
-            }
-        }
-
-        let (quote, num_escaped_quotes) = choose_quotes_for_repr(squote, dquote, quote);
-        // we'll be adding backslashes in front of the existing inner quotes
-        out_len += num_escaped_quotes;
-
-        // start and ending quotes
-        out_len += 2;
-
-        let dquoted = quote == '"';
-
-        Ok(ReprInfo { dquoted, out_len })
-    }
-}
-
-pub struct Repr<'a> {
-    s: &'a str,
-    // the quote type we prefer to use
-    quote: Quote,
-    // the tuple is dquouted, out_len
-    info: OnceCell<Result<ReprInfo, ReprOverflowError>>,
-}
-
-impl Repr<'_> {
-    fn get_info(&self) -> Result<ReprInfo, ReprOverflowError> {
-        *self.info.get_or_init(|| ReprInfo::get(self.s, self.quote))
-    }
-
-    fn _fmt<W: fmt::Write>(&self, repr: &mut W, info: ReprInfo) -> fmt::Result {
-        let s = self.s;
-        let in_len = s.len();
-        let ReprInfo { dquoted, out_len } = info;
-
-        let quote = if dquoted { '"' } else { '\'' };
-        // if we don't need to escape anything we can just copy
-        let unchanged = out_len == in_len;
-
-        repr.write_char(quote)?;
-        if unchanged {
-            repr.write_str(s)?;
-        } else {
-            for ch in s.chars() {
-                match ch {
-                    '\n' => repr.write_str("\\n"),
-                    '\t' => repr.write_str("\\t"),
-                    '\r' => repr.write_str("\\r"),
-                    // these 2 branches *would* be handled below, but we shouldn't have to do a
-                    // unicodedata lookup just for ascii characters
-                    '\x20'..='\x7e' => {
-                        // printable ascii range
-                        if ch == quote || ch == '\\' {
-                            repr.write_char('\\')?;
-                        }
-                        repr.write_char(ch)
-                    }
-                    ch if ch.is_ascii() => {
-                        write!(repr, "\\x{:02x}", ch as u8)
-                    }
-                    ch if rustpython_common::char::is_printable(ch) => repr.write_char(ch),
-                    '\0'..='\u{ff}' => {
-                        write!(repr, "\\x{:02x}", ch as u32)
-                    }
-                    '\0'..='\u{ffff}' => {
-                        write!(repr, "\\u{:04x}", ch as u32)
-                    }
-                    _ => {
-                        write!(repr, "\\U{:08x}", ch as u32)
-                    }
-                }?;
-            }
-        }
-        repr.write_char(quote)
-    }
-}
-
-impl fmt::Display for Repr<'_> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let info = self.get_info().unwrap();
-        self._fmt(f, info)
-    }
-}
-
-/// Returns the outer quotes to use and the number of quotes that need to be
-/// escaped.
-pub(crate) const fn choose_quotes_for_repr(
-    num_squotes: usize,
-    num_dquotes: usize,
-    quote: Quote,
-) -> (char, usize) {
-    match quote {
-        Quote::Single => {
-            // always use squote unless we have squotes but no dquotes
-            let use_dquote = num_squotes > 0 && num_dquotes == 0;
-            if use_dquote {
-                ('"', num_dquotes)
-            } else {
-                ('\'', num_squotes)
-            }
-        }
-        Quote::Double => {
-            // always use dquote unless we have dquotes but no squotes
-            let use_squote = num_dquotes > 0 && num_squotes == 0;
-            if use_squote {
-                ('\'', num_squotes)
-            } else {
-                ('"', num_dquotes)
-            }
-        }
-    }
-}
diff --git a/crates/ruff_testing_macros/Cargo.toml b/crates/ruff_testing_macros/Cargo.toml
index aeffa5946907b..215168923cfd5 100644
--- a/crates/ruff_testing_macros/Cargo.toml
+++ b/crates/ruff_testing_macros/Cargo.toml
@@ -13,4 +13,4 @@ proc-macro = true
 glob = { workspace = true }
 proc-macro2 = { workspace = true }
 quote = { workspace = true }
-syn = { workspace = true }
+syn = { workspace = true, features = ["extra-traits", "full"] }
diff --git a/crates/ruff_testing_macros/src/lib.rs b/crates/ruff_testing_macros/src/lib.rs
index 622da40057792..23815540a15c9 100644
--- a/crates/ruff_testing_macros/src/lib.rs
+++ b/crates/ruff_testing_macros/src/lib.rs
@@ -1,11 +1,12 @@
-use glob::{glob, Pattern};
 use proc_macro::TokenStream;
-use proc_macro2::Span;
-use quote::{format_ident, quote};
 use std::borrow::Cow;
 use std::collections::BTreeMap;
 use std::env;
 use std::path::{Component, PathBuf};
+
+use glob::{glob, Pattern};
+use proc_macro2::Span;
+use quote::{format_ident, quote};
 use syn::parse::{Parse, ParseStream};
 use syn::punctuated::Punctuated;
 use syn::spanned::Spanned;
diff --git a/crates/ruff_textwrap/Cargo.toml b/crates/ruff_textwrap/Cargo.toml
new file mode 100644
index 0000000000000..a5217c16cc88c
--- /dev/null
+++ b/crates/ruff_textwrap/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "ruff_textwrap"
+version = "0.0.0"
+publish = false
+edition = { workspace = true }
+rust-version = { workspace = true }
+
+[dependencies]
+ruff_newlines = { path = "../ruff_newlines" }
+ruff_text_size = { workspace = true }
diff --git a/crates/ruff_textwrap/src/lib.rs b/crates/ruff_textwrap/src/lib.rs
new file mode 100644
index 0000000000000..bd803851dfc1d
--- /dev/null
+++ b/crates/ruff_textwrap/src/lib.rs
@@ -0,0 +1,336 @@
+//! Functions related to adding and removing indentation from lines of
+//! text.
+
+use std::borrow::Cow;
+use std::cmp;
+
+use ruff_newlines::StrExt;
+
+/// Indent each line by the given prefix.
+///
+/// # Examples
+///
+/// ```
+/// use ruff_textwrap::indent;
+///
+/// assert_eq!(indent("First line.\nSecond line.\n", "  "),
+///            "  First line.\n  Second line.\n");
+/// ```
+///
+/// When indenting, trailing whitespace is stripped from the prefix.
+/// This means that empty lines remain empty afterwards:
+///
+/// ```
+/// use ruff_textwrap::indent;
+///
+/// assert_eq!(indent("First line.\n\n\nSecond line.\n", "  "),
+///            "  First line.\n\n\n  Second line.\n");
+/// ```
+///
+/// Notice how `"\n\n\n"` remained as `"\n\n\n"`.
+///
+/// This feature is useful when you want to indent text and have a
+/// space between your prefix and the text. In this case, you _don't_
+/// want a trailing space on empty lines:
+///
+/// ```
+/// use ruff_textwrap::indent;
+///
+/// assert_eq!(indent("foo = 123\n\nprint(foo)\n", "# "),
+///            "# foo = 123\n#\n# print(foo)\n");
+/// ```
+///
+/// Notice how `"\n\n"` became `"\n#\n"` instead of `"\n# \n"` which
+/// would have trailing whitespace.
+///
+/// Leading and trailing whitespace coming from the text itself is
+/// kept unchanged:
+///
+/// ```
+/// use ruff_textwrap::indent;
+///
+/// assert_eq!(indent(" \t  Foo   ", "->"), "-> \t  Foo   ");
+/// ```
+pub fn indent<'a>(text: &'a str, prefix: &str) -> Cow<'a, str> {
+    if prefix.is_empty() {
+        return Cow::Borrowed(text);
+    }
+
+    let mut result = String::with_capacity(text.len() + prefix.len());
+    let trimmed_prefix = prefix.trim_end();
+    for line in text.universal_newlines() {
+        if line.trim().is_empty() {
+            result.push_str(trimmed_prefix);
+        } else {
+            result.push_str(prefix);
+        }
+        result.push_str(line.as_full_str());
+    }
+    Cow::Owned(result)
+}
+
+/// Removes common leading whitespace from each line.
+///
+/// This function will look at each non-empty line and determine the
+/// maximum amount of whitespace that can be removed from all lines:
+///
+/// ```
+/// use ruff_textwrap::dedent;
+///
+/// assert_eq!(dedent("
+///     1st line
+///       2nd line
+///     3rd line
+/// "), "
+/// 1st line
+///   2nd line
+/// 3rd line
+/// ");
+/// ```
+pub fn dedent(text: &str) -> Cow<'_, str> {
+    // Find the minimum amount of leading whitespace on each line.
+    let prefix_len = text
+        .universal_newlines()
+        .fold(usize::MAX, |prefix_len, line| {
+            let leading_whitespace_len = line.len() - line.trim_start().len();
+            if leading_whitespace_len == line.len() {
+                // Skip empty lines.
+                prefix_len
+            } else {
+                cmp::min(prefix_len, leading_whitespace_len)
+            }
+        });
+
+    // If there is no common prefix, no need to dedent.
+    if prefix_len == usize::MAX {
+        return Cow::Borrowed(text);
+    }
+
+    // Remove the common prefix from each line.
+    let mut result = String::with_capacity(text.len());
+    for line in text.universal_newlines() {
+        if line.trim().is_empty() {
+            if let Some(line_ending) = line.line_ending() {
+                result.push_str(&line_ending);
+            }
+        } else {
+            result.push_str(&line.as_full_str()[prefix_len..]);
+        }
+    }
+    Cow::Owned(result)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn indent_empty() {
+        assert_eq!(indent("\n", "  "), "\n");
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn indent_nonempty() {
+        let text = [
+            "  foo\n",
+            "bar\n",
+            "  baz\n",
+        ].join("");
+        let expected = [
+            "//   foo\n",
+            "// bar\n",
+            "//   baz\n",
+        ].join("");
+        assert_eq!(indent(&text, "// "), expected);
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn indent_empty_line() {
+        let text = [
+            "  foo",
+            "bar",
+            "",
+            "  baz",
+        ].join("\n");
+        let expected = [
+            "//   foo",
+            "// bar",
+            "//",
+            "//   baz",
+        ].join("\n");
+        assert_eq!(indent(&text, "// "), expected);
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn indent_mixed_newlines() {
+        let text = [
+            "  foo\r\n",
+            "bar\n",
+            "  baz\r",
+        ].join("");
+        let expected = [
+            "//   foo\r\n",
+            "// bar\n",
+            "//   baz\r",
+        ].join("");
+        assert_eq!(indent(&text, "// "), expected);
+    }
+
+    #[test]
+    fn dedent_empty() {
+        assert_eq!(dedent(""), "");
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn dedent_multi_line() {
+        let x = [
+            "    foo",
+            "  bar",
+            "    baz",
+        ].join("\n");
+        let y = [
+            "  foo",
+            "bar",
+            "  baz"
+        ].join("\n");
+        assert_eq!(dedent(&x), y);
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn dedent_empty_line() {
+        let x = [
+            "    foo",
+            "  bar",
+            "   ",
+            "    baz"
+        ].join("\n");
+        let y = [
+            "  foo",
+            "bar",
+            "",
+            "  baz"
+        ].join("\n");
+        assert_eq!(dedent(&x), y);
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn dedent_blank_line() {
+        let x = [
+            "      foo",
+            "",
+            "        bar",
+            "          foo",
+            "          bar",
+            "          baz",
+        ].join("\n");
+        let y = [
+            "foo",
+            "",
+            "  bar",
+            "    foo",
+            "    bar",
+            "    baz",
+        ].join("\n");
+        assert_eq!(dedent(&x), y);
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn dedent_whitespace_line() {
+        let x = [
+            "      foo",
+            " ",
+            "        bar",
+            "          foo",
+            "          bar",
+            "          baz",
+        ].join("\n");
+        let y = [
+            "foo",
+            "",
+            "  bar",
+            "    foo",
+            "    bar",
+            "    baz",
+        ].join("\n");
+        assert_eq!(dedent(&x), y);
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn dedent_mixed_whitespace() {
+        let x = [
+            "\tfoo",
+            "  bar",
+        ].join("\n");
+        let y = [
+            "foo",
+            " bar",
+        ].join("\n");
+        assert_eq!(dedent(&x), y);
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn dedent_tabbed_whitespace() {
+        let x = [
+            "\t\tfoo",
+            "\t\t\tbar",
+        ].join("\n");
+        let y = [
+            "foo",
+            "\tbar",
+        ].join("\n");
+        assert_eq!(dedent(&x), y);
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn dedent_mixed_tabbed_whitespace() {
+        let x = [
+            "\t  \tfoo",
+            "\t  \t\tbar",
+        ].join("\n");
+        let y = [
+            "foo",
+            "\tbar",
+        ].join("\n");
+        assert_eq!(dedent(&x), y);
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn dedent_preserve_no_terminating_newline() {
+        let x = [
+            "  foo",
+            "    bar",
+        ].join("\n");
+        let y = [
+            "foo",
+            "  bar",
+        ].join("\n");
+        assert_eq!(dedent(&x), y);
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn dedent_mixed_newlines() {
+        let x = [
+            "    foo\r\n",
+            "  bar\n",
+            "    baz\r",
+        ].join("");
+        let y = [
+            "  foo\r\n",
+            "bar\n",
+            "  baz\r"
+        ].join("");
+        assert_eq!(dedent(&x), y);
+    }
+}
diff --git a/crates/ruff_wasm/Cargo.toml b/crates/ruff_wasm/Cargo.toml
index 556aef8e5bf72..7ad96d646bfbb 100644
--- a/crates/ruff_wasm/Cargo.toml
+++ b/crates/ruff_wasm/Cargo.toml
@@ -13,16 +13,14 @@ crate-type = ["cdylib", "rlib"]
 default = ["console_error_panic_hook"]
 
 [dependencies]
+ruff = { path = "../ruff" }
 ruff_diagnostics = { path = "../ruff_diagnostics" }
 ruff_python_ast = { path = "../ruff_python_ast" }
 ruff_rustpython = { path = "../ruff_rustpython" }
 
 console_error_panic_hook = { version = "0.1.7", optional = true }
-
 console_log = { version = "1.0.0" }
-getrandom = { version = "0.2.8", features = ["js"] }
 log = { workspace = true }
-ruff = { path = "../ruff" }
 rustpython-parser = { workspace = true }
 serde = { workspace = true }
 serde-wasm-bindgen = { version = "0.5.0" }
diff --git a/crates/ruff_wasm/src/lib.rs b/crates/ruff_wasm/src/lib.rs
index 9677084cfaa79..84566771dd9cb 100644
--- a/crates/ruff_wasm/src/lib.rs
+++ b/crates/ruff_wasm/src/lib.rs
@@ -5,14 +5,14 @@ use serde::{Deserialize, Serialize};
 use wasm_bindgen::prelude::*;
 
 use ruff::directives;
+use ruff::line_width::{LineLength, TabSize};
 use ruff::linter::{check_path, LinterResult};
 use ruff::registry::AsRule;
 use ruff::rules::{
     flake8_annotations, flake8_bandit, flake8_bugbear, flake8_builtins, flake8_comprehensions,
     flake8_errmsg, flake8_gettext, flake8_implicit_str_concat, flake8_import_conventions,
     flake8_pytest_style, flake8_quotes, flake8_self, flake8_tidy_imports, flake8_type_checking,
-    flake8_unused_arguments, isort, mccabe, pep8_naming, pycodestyle, pydocstyle, pylint,
-    pyupgrade,
+    flake8_unused_arguments, isort, mccabe, pep8_naming, pycodestyle, pydocstyle, pyflakes, pylint,
 };
 use ruff::settings::configuration::Configuration;
 use ruff::settings::options::Options;
@@ -97,11 +97,14 @@ pub fn defaultSettings() -> Result<JsValue, JsValue> {
         allowed_confusables: Some(Vec::default()),
         builtins: Some(Vec::default()),
         dummy_variable_rgx: Some(defaults::DUMMY_VARIABLE_RGX.as_str().to_string()),
+        extend_fixable: Some(Vec::default()),
         extend_ignore: Some(Vec::default()),
         extend_select: Some(Vec::default()),
+        extend_unfixable: Some(Vec::default()),
         external: Some(Vec::default()),
         ignore: Some(Vec::default()),
-        line_length: Some(defaults::LINE_LENGTH),
+        line_length: Some(LineLength::default()),
+        tab_size: Some(TabSize::default()),
         select: Some(defaults::PREFIXES.to_vec()),
         target_version: Some(defaults::TARGET_VERSION),
         // Ignore a bunch of options that don't make sense in a single-file editor.
@@ -110,6 +113,7 @@ pub fn defaultSettings() -> Result<JsValue, JsValue> {
         extend: None,
         extend_exclude: None,
         extend_include: None,
+        extend_per_file_ignores: None,
         fix: None,
         fix_only: None,
         fixable: None,
@@ -127,7 +131,6 @@ pub fn defaultSettings() -> Result<JsValue, JsValue> {
         task_tags: None,
         typing_modules: None,
         unfixable: None,
-        update_check: None,
         // Use default options for all plugins.
         flake8_annotations: Some(flake8_annotations::settings::Settings::default().into()),
         flake8_bandit: Some(flake8_bandit::settings::Settings::default().into()),
@@ -145,7 +148,7 @@ pub fn defaultSettings() -> Result<JsValue, JsValue> {
         flake8_import_conventions: Some(
             flake8_import_conventions::settings::Settings::default().into(),
         ),
-        flake8_tidy_imports: Some(flake8_tidy_imports::Settings::default().into()),
+        flake8_tidy_imports: Some(flake8_tidy_imports::settings::Settings::default().into()),
         flake8_type_checking: Some(flake8_type_checking::settings::Settings::default().into()),
         flake8_unused_arguments: Some(
             flake8_unused_arguments::settings::Settings::default().into(),
@@ -155,8 +158,8 @@ pub fn defaultSettings() -> Result<JsValue, JsValue> {
         pep8_naming: Some(pep8_naming::settings::Settings::default().into()),
         pycodestyle: Some(pycodestyle::settings::Settings::default().into()),
         pydocstyle: Some(pydocstyle::settings::Settings::default().into()),
+        pyflakes: Some(pyflakes::settings::Settings::default().into()),
         pylint: Some(pylint::settings::Settings::default().into()),
-        pyupgrade: Some(pyupgrade::settings::Settings::default().into()),
     })?)
 }
 
@@ -199,7 +202,6 @@ pub fn check(contents: &str, options: JsValue) -> Result<JsValue, JsValue> {
         &directives,
         &settings,
         flags::Noqa::Enabled,
-        flags::Autofix::Enabled,
     );
 
     let source_code = locator.to_source_code();
@@ -215,14 +217,10 @@ pub fn check(contents: &str, options: JsValue) -> Result<JsValue, JsValue> {
                 message: message.kind.body,
                 location: start_location,
                 end_location,
-                fix: if message.fix.is_empty() {
-                    None
-                } else {
-                    Some(ExpandedFix {
-                        message: message.kind.suggestion,
-                        edits: message.fix.into_edits(),
-                    })
-                },
+                fix: message.fix.map(|fix| ExpandedFix {
+                    message: message.kind.suggestion,
+                    edits: fix.into_edits(),
+                }),
             }
         })
         .collect();
diff --git a/crates/ruff_wasm/tests/api.rs b/crates/ruff_wasm/tests/api.rs
index 02d497515492f..fd2a70c4ffe23 100644
--- a/crates/ruff_wasm/tests/api.rs
+++ b/crates/ruff_wasm/tests/api.rs
@@ -1,12 +1,10 @@
 #![cfg(target_arch = "wasm32")]
 
-use js_sys;
-
-use wasm_bindgen_test::*;
+use wasm_bindgen_test::wasm_bindgen_test;
 
 use ruff::registry::Rule;
 use ruff_python_ast::source_code::{OneIndexed, SourceLocation};
-use ruff_wasm::*;
+use ruff_wasm::{check, ExpandedMessage};
 
 macro_rules! check {
     ($source:expr, $config:expr, $expected:expr) => {{
diff --git a/docs/configuration.md b/docs/configuration.md
index f9ad5e77127b8..f2805e731a962 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -25,6 +25,7 @@ exclude = [
     ".direnv",
     ".eggs",
     ".git",
+    ".git-rewrite",
     ".hg",
     ".mypy_cache",
     ".nox",
@@ -118,7 +119,8 @@ If you're wondering how to configure Ruff, here are some **recommended guideline
 ## Using `ruff.toml`
 
 As an alternative to `pyproject.toml`, Ruff will also respect a `ruff.toml` (or `.ruff.toml`) file,
-which implements an equivalent schema (though the `[tool.ruff]` hierarchy can be omitted).
+which implements an equivalent schema (though in the `ruff.toml` and `.ruff.toml` versions, the
+`[tool.ruff]` header is omitted).
 
 For example, the `pyproject.toml` described above would be represented via the following
 `ruff.toml` (or `.ruff.toml`):
@@ -231,13 +233,17 @@ Rule selection:
       --ignore <RULE_CODE>
           Comma-separated list of rule codes to disable
       --extend-select <RULE_CODE>
-          Like --select, but adds additional rule codes on top of the selected ones
+          Like --select, but adds additional rule codes on top of those already specified
       --per-file-ignores <PER_FILE_IGNORES>
           List of mappings from file pattern to code to exclude
+      --extend-per-file-ignores <EXTEND_PER_FILE_IGNORES>
+          Like `--per-file-ignores`, but adds additional ignores on top of those already specified
       --fixable <RULE_CODE>
           List of rule codes to treat as eligible for autofix. Only applicable when autofix itself is enabled (e.g., via `--fix`)
       --unfixable <RULE_CODE>
           List of rule codes to treat as ineligible for autofix. Only applicable when autofix itself is enabled (e.g., via `--fix`)
+      --extend-fixable <RULE_CODE>
+          Like --fixable, but adds additional rule codes on top of those already specified
 
 File selection:
       --exclude <FILE_PATTERN>         List of paths, used to omit files and/or directories from analysis
@@ -303,7 +309,7 @@ extend = "../pyproject.toml"
 line-length = 100
 ```
 
-All of the above rules apply equivalently to `ruff.toml` and `.ruff.toml`  files. If Ruff detects
+All of the above rules apply equivalently to `ruff.toml` and `.ruff.toml` files. If Ruff detects
 multiple configuration files in the same directory, the `.ruff.toml` file will take precedence over
 the `ruff.toml` file, and the `ruff.toml` file will take precedence over the `pyproject.toml` file.
 
@@ -437,7 +443,8 @@ By default, Ruff exits with the following status codes:
 
 - `0` if no violations were found, or if all present violations were fixed automatically.
 - `1` if violations were found.
-- `2` if Ruff terminates abnormally due to invalid configuration, invalid CLI options, or an internal error.
+- `2` if Ruff terminates abnormally due to invalid configuration, invalid CLI options, or an
+  internal error.
 
 This convention mirrors that of tools like ESLint, Prettier, and RuboCop.
 
diff --git a/docs/editor-integrations.md b/docs/editor-integrations.md
index 245c8474cd0f1..45b1e2da4928f 100644
--- a/docs/editor-integrations.md
+++ b/docs/editor-integrations.md
@@ -10,12 +10,12 @@ which supports autofix actions, import sorting, and more.
 ## Language Server Protocol (Official)
 
 Ruff supports the [Language Server Protocol](https://microsoft.github.io/language-server-protocol/)
-via the [`ruff-lsp`](https://github.com/charliermarsh/ruff-lsp) Python package, available on
+via the [`ruff-lsp`](https://github.com/astral-sh/ruff-lsp) Python package, available on
 [PyPI](https://pypi.org/project/ruff-lsp/).
 
-[`ruff-lsp`](https://github.com/charliermarsh/ruff-lsp) enables Ruff to be used with any editor that
-supports the Language Server Protocol, including [Neovim](https://github.com/charliermarsh/ruff-lsp#example-neovim),
-[Sublime Text](https://github.com/charliermarsh/ruff-lsp#example-sublime-text), Emacs, and more.
+[`ruff-lsp`](https://github.com/astral-sh/ruff-lsp) enables Ruff to be used with any editor that
+supports the Language Server Protocol, including [Neovim](https://github.com/astral-sh/ruff-lsp#example-neovim),
+[Sublime Text](https://github.com/astral-sh/ruff-lsp#example-sublime-text), Emacs, and more.
 
 For example, to use `ruff-lsp` with Neovim, install `ruff-lsp` from PyPI along with
 [`nvim-lspconfig`](https://github.com/neovim/nvim-lspconfig). Then, add something like the following
@@ -80,7 +80,7 @@ Upon successful installation, you should see Ruff's diagnostics surfaced directl
 
 ![Code Actions available in Neovim](https://user-images.githubusercontent.com/1309177/208278707-25fa37e4-079d-4597-ad35-b95dba066960.png)
 
-To use `ruff-lsp` with other editors, including Sublime Text and Helix, see the [`ruff-lsp` documentation](https://github.com/charliermarsh/ruff-lsp#installation-and-usage).
+To use `ruff-lsp` with other editors, including Sublime Text and Helix, see the [`ruff-lsp` documentation](https://github.com/astral-sh/ruff-lsp#installation-and-usage).
 
 ## Language Server Protocol (Unofficial)
 
@@ -122,10 +122,10 @@ require'lspconfig'.pylsp.setup {
 
 ## Vim & Neovim
 
-Ruff can be integrated into any editor that supports the Language Server Protocol via [`ruff-lsp`](https://github.com/charliermarsh/ruff-lsp)
+Ruff can be integrated into any editor that supports the Language Server Protocol via [`ruff-lsp`](https://github.com/astral-sh/ruff-lsp)
 (see: [Language Server Protocol](#language-server-protocol-official)), including Vim and Neovim.
 
-It's recommended that you use [`ruff-lsp`](https://github.com/charliermarsh/ruff-lsp), the
+It's recommended that you use [`ruff-lsp`](https://github.com/astral-sh/ruff-lsp), the
 officially supported LSP server for Ruff. To use `ruff-lsp` with Neovim, install `ruff-lsp` from
 PyPI along with [`nvim-lspconfig`](https://github.com/neovim/nvim-lspconfig). Then, add something
 like the following to your `init.lua`:
@@ -194,7 +194,16 @@ let g:ale_fixers = {
 </details>
 
 <details>
-<summary>Ruff can also be integrated via <a href="/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#efm"><code>efm</code></a> in just a <a href="/JafarAbdi/myconfigs/blob/6f0b6b2450e92ec8fc50422928cd22005b919110/efm-langserver/config.yaml#L14-L20">few lines</a>.</summary>
+<summary>
+Ruff can also be integrated via
+<a href="/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#efm">
+  <code>efm</code>
+</a>
+in just a
+<a href="/JafarAbdi/myconfigs/blob/6f0b6b2450e92ec8fc50422928cd22005b919110/efm-langserver/config.yaml#L14-L20">
+  few lines.
+</a>
+</summary>
 <br>
 
 ```yaml
@@ -211,7 +220,12 @@ tools:
 </details>
 
 <details>
-<summary>For neovim users using <a href="/jose-elias-alvarez/null-ls.nvim"><code>null-ls</code></a>, Ruff is already <a href="/jose-elias-alvarez/null-ls.nvim">integrated</a>.</summary>
+<summary>
+For neovim users using
+<a href="/jose-elias-alvarez/null-ls.nvim">
+  <code>null-ls</code>
+</a>, Ruff is already <a href="/jose-elias-alvarez/null-ls.nvim">integrated</a>.
+</summary>
 <br>
 
 ```lua
diff --git a/docs/faq.md b/docs/faq.md
index 4cb6e3c8fa8e6..3b4f3d0d90432 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -33,6 +33,7 @@ natively, including:
 - [eradicate](https://pypi.org/project/eradicate/)
 - [flake8-2020](https://pypi.org/project/flake8-2020/)
 - [flake8-annotations](https://pypi.org/project/flake8-annotations/)
+- [flake8-async](https://pypi.org/project/flake8-async)
 - [flake8-bandit](https://pypi.org/project/flake8-bandit/) ([#1646](https://github.com/charliermarsh/ruff/issues/1646))
 - [flake8-blind-except](https://pypi.org/project/flake8-blind-except/)
 - [flake8-boolean-trap](https://pypi.org/project/flake8-boolean-trap/)
@@ -63,14 +64,16 @@ natively, including:
 - [flake8-simplify](https://pypi.org/project/flake8-simplify/)
 - [flake8-super](https://pypi.org/project/flake8-super/)
 - [flake8-tidy-imports](https://pypi.org/project/flake8-tidy-imports/)
+- [flake8-todos](https://pypi.org/project/flake8-todos/)
 - [flake8-type-checking](https://pypi.org/project/flake8-type-checking/)
 - [flake8-use-pathlib](https://pypi.org/project/flake8-use-pathlib/)
+- [flynt](https://pypi.org/project/flynt/) ([#2102](https://github.com/charliermarsh/ruff/issues/2102))
 - [isort](https://pypi.org/project/isort/)
 - [mccabe](https://pypi.org/project/mccabe/)
 - [pandas-vet](https://pypi.org/project/pandas-vet/)
 - [pep8-naming](https://pypi.org/project/pep8-naming/)
 - [pydocstyle](https://pypi.org/project/pydocstyle/)
-- [pygrep-hooks](https://github.com/pre-commit/pygrep-hooks) ([#980](https://github.com/charliermarsh/ruff/issues/980))
+- [pygrep-hooks](https://github.com/pre-commit/pygrep-hooks)
 - [pyupgrade](https://pypi.org/project/pyupgrade/)
 - [tryceratops](https://pypi.org/project/tryceratops/)
 - [yesqa](https://github.com/asottile/yesqa)
@@ -131,6 +134,7 @@ Today, Ruff can be used to replace Flake8 when used with any of the following pl
 
 - [flake8-2020](https://pypi.org/project/flake8-2020/)
 - [flake8-annotations](https://pypi.org/project/flake8-annotations/)
+- [flake8-async](https://pypi.org/project/flake8-async)
 - [flake8-bandit](https://pypi.org/project/flake8-bandit/) ([#1646](https://github.com/charliermarsh/ruff/issues/1646))
 - [flake8-blind-except](https://pypi.org/project/flake8-blind-except/)
 - [flake8-boolean-trap](https://pypi.org/project/flake8-boolean-trap/)
@@ -160,8 +164,10 @@ Today, Ruff can be used to replace Flake8 when used with any of the following pl
 - [flake8-simplify](https://pypi.org/project/flake8-simplify/)
 - [flake8-super](https://pypi.org/project/flake8-super/)
 - [flake8-tidy-imports](https://pypi.org/project/flake8-tidy-imports/)
+- [flake8-todos](https://pypi.org/project/flake8-todos/)
 - [flake8-type-checking](https://pypi.org/project/flake8-type-checking/)
 - [flake8-use-pathlib](https://pypi.org/project/flake8-use-pathlib/)
+- [flynt](https://pypi.org/project/flynt/) ([#2102](https://github.com/charliermarsh/ruff/issues/2102))
 - [mccabe](https://pypi.org/project/mccabe/)
 - [pandas-vet](https://pypi.org/project/pandas-vet/)
 - [pep8-naming](https://pypi.org/project/pep8-naming/)
@@ -249,6 +255,52 @@ src = ["src", "tests"]
 known-first-party = ["my_module1", "my_module2"]
 ```
 
+## How does Ruff determine which of my imports are first-party, third-party, etc.?
+
+Ruff accepts a `src` option that in your `pyproject.toml`, `ruff.toml`, or `.ruff.toml` file, which
+specifies the directories that Ruff should consider when determining whether an import is
+first-party.
+
+For example, if you have a project with the following structure:
+
+```tree
+.
+├── pyproject.toml
+├── src
+│   ├── __init__.py
+│   ├── module1.py
+│   └── module2.py
+└── tests
+    ├── __init__.py
+    ├── test_module1.py
+    └── test_module2.py
+```
+
+When Ruff sees an import like `import module1`, it will then iterate over the `src` directories,
+looking for a corresponding Python module. You can configure Ruff to consider `src` and `tests` as
+first-party sources like so:
+
+```toml
+[tool.ruff]
+src = ["src", "tests"]
+```
+
+If the `src` field is omitted, Ruff will default to using the "project root" as the only
+first-party source. The "project root" is typically the directory containing your `pyproject.toml`,
+`ruff.toml`, or `.ruff.toml` file, unless a configuration file is provided on the command-line via
+the `--config` option, in which case, the current working directory is used as the project root.
+
+If your `pyproject.toml`, `ruff.toml`, or `.ruff.toml` extends another configuration file, Ruff
+will still use the "extended" configuration file's directory as the project root. For example, if
+you add a `ruff.toml` to the `tests` directory in the above example, you'll want to explicitly
+set the `src` option in the extended configuration file:
+
+```toml
+# tests/ruff.toml
+extend = "../pyproject.toml"
+src = ["../src", "../test"]
+```
+
 ## Does Ruff support Jupyter Notebooks?
 
 Ruff is integrated into [nbQA](https://github.com/nbQA-dev/nbQA), a tool for running linters and
@@ -267,7 +319,7 @@ Found 3 errors.
 
 ## Does Ruff support NumPy- or Google-style docstrings?
 
-Yes! To enable specific docstring convention, add the following to your `pyproject.toml`:
+Yes! To enforce a docstring convention, add the following to your `pyproject.toml`:
 
 ```toml
 [tool.ruff.pydocstyle]
@@ -278,7 +330,8 @@ For example, if you're coming from flake8-docstrings, and your originating confi
 `--docstring-convention=numpy`, you'd instead set `convention = "numpy"` in your `pyproject.toml`,
 as above.
 
-Alongside `convention`, you'll want to explicitly enable the `D` rule code prefix, like so:
+Alongside `convention`, you'll want to explicitly enable the `D` rule code prefix, since the `D`
+rules are not enabled by default:
 
 ```toml
 [tool.ruff]
@@ -292,6 +345,8 @@ convention = "google"
 
 Setting a `convention` force-disables any rules that are incompatible with that convention, no
 matter how they're provided, which avoids accidental incompatibilities and simplifies configuration.
+By default, no `convention` is set, and so the enabled rules are determined by the `select` setting
+alone.
 
 ## How can I tell what settings Ruff is using to check my code?
 
@@ -362,5 +417,5 @@ Ruff's color output is powered by the [`colored`](https://crates.io/crates/color
 attempts to automatically detect whether the output stream supports color. However, you can force
 colors off by setting the `NO_COLOR` environment variable to any value (e.g., `NO_COLOR=1`).
 
-[`colored`](https://crates.io/crates/colored) also supports the the `CLICOLOR` and `CLICOLOR_FORCE`
+[`colored`](https://crates.io/crates/colored) also supports the `CLICOLOR` and `CLICOLOR_FORCE`
 environment variables (see the [spec](https://bixense.com/clicolors/)).
diff --git a/docs/installation.md b/docs/installation.md
index 689d04c4b0536..259946f85180e 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -6,7 +6,8 @@ Ruff is available as [`ruff`](https://pypi.org/project/ruff/) on PyPI:
 pip install ruff
 ```
 
-For **macOS Homebrew** and **Linuxbrew** users, Ruff is also available as [`ruff`](https://formulae.brew.sh/formula/ruff) on Homebrew:
+For **macOS Homebrew** and **Linuxbrew** users, Ruff is also available as [`ruff`](https://formulae.brew.sh/formula/ruff)
+on Homebrew:
 
 ```shell
 brew install ruff
diff --git a/docs/requirements.txt b/docs/requirements.txt
index b5b1417243b46..647559a59e3f6 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +1,4 @@
 mkdocs~=1.4.2
 mkdocs-material~=9.0.6
 PyYAML~=6.0
+black==23.3.0
diff --git a/docs/tutorial.md b/docs/tutorial.md
index 84bd19637fc90..45488161f9ed9 100644
--- a/docs/tutorial.md
+++ b/docs/tutorial.md
@@ -240,9 +240,9 @@ This tutorial has focused on Ruff's command-line interface, but Ruff can also be
 [pre-commit](https://pre-commit.com) hook:
 
 ```yaml
-- repo: https://github.com/charliermarsh/ruff-pre-commit
+- repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: 'v0.0.265'
+  rev: v0.0.272
   hooks:
     - id: ruff
 ```
@@ -251,7 +251,7 @@ See [_Usage_](usage.md) for more.
 
 ## Editor Integrations
 
-Ruff can also be used as a [VS Code extension](https://github.com/charliermarsh/ruff-vscode) or
-alongside any other editor through the [Ruff LSP](https://github.com/charliermarsh/ruff-lsp).
+Ruff can also be used as a [VS Code extension](https://github.com/astral-sh/ruff-vscode) or
+alongside any other editor through the [Ruff LSP](https://github.com/astral-sh/ruff-lsp).
 
 See [_Editor Integrations_](editor-integrations.md).
diff --git a/docs/usage.md b/docs/usage.md
index a3bece0c2b5d8..4cb0310cc4bea 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -20,9 +20,9 @@ ruff check path/to/code/ --watch
 Ruff can also be used as a [pre-commit](https://pre-commit.com) hook:
 
 ```yaml
-- repo: https://github.com/charliermarsh/ruff-pre-commit
+- repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: 'v0.0.265'
+  rev: v0.0.272
   hooks:
     - id: ruff
 ```
@@ -30,9 +30,9 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com) hook:
 Or, to enable autofix:
 
 ```yaml
-- repo: https://github.com/charliermarsh/ruff-pre-commit
+- repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: 'v0.0.265'
+  rev: v0.0.272
   hooks:
     - id: ruff
       args: [ --fix, --exit-non-zero-on-fix ]
@@ -45,8 +45,8 @@ reformatting.
 
 ## VS Code
 
-Ruff can also be used as a [VS Code extension](https://github.com/charliermarsh/ruff-vscode) or
-alongside any other editor through the [Ruff LSP](https://github.com/charliermarsh/ruff-lsp).
+Ruff can also be used as a [VS Code extension](https://github.com/astral-sh/ruff-vscode) or
+alongside any other editor through the [Ruff LSP](https://github.com/astral-sh/ruff-lsp).
 
 ## GitHub Action
 
diff --git a/fuzz/.gitignore b/fuzz/.gitignore
new file mode 100644
index 0000000000000..0ee1bebe7f1f2
--- /dev/null
+++ b/fuzz/.gitignore
@@ -0,0 +1,2 @@
+artifacts/
+corpus/ruff_fix_validity
diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock
new file mode 100644
index 0000000000000..fb4e5f09a8566
--- /dev/null
+++ b/fuzz/Cargo.lock
@@ -0,0 +1,1965 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "Inflector"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
+
+[[package]]
+name = "aho-corasick"
+version = "0.7.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "annotate-snippets"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7021ce4924a3f25f802b2cccd1af585e39ea1a363a1aa2e72afe54b67a3a7a7"
+
+[[package]]
+name = "annotate-snippets"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3b9d411ecbaf79885c6df4d75fff75858d5995ff25385657a28af47e82f9c36"
+dependencies = [
+ "unicode-width",
+ "yansi-term",
+]
+
+[[package]]
+name = "anstream"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is-terminal",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
+dependencies = [
+ "anstyle",
+ "windows-sys",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+
+[[package]]
+name = "arbitrary"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e"
+dependencies = [
+ "derive_arbitrary",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi 0.1.19",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84"
+
+[[package]]
+name = "bstr"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+
+[[package]]
+name = "cc"
+version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+dependencies = [
+ "jobserver",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chic"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5b5db619f3556839cb2223ae86ff3f9a09da2c5013be42bc9af08c9589bf70c"
+dependencies = [
+ "annotate-snippets 0.6.1",
+]
+
+[[package]]
+name = "chrono"
+version = "0.4.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "time",
+ "wasm-bindgen",
+ "winapi",
+]
+
+[[package]]
+name = "clap"
+version = "4.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "401a4694d2bf92537b6867d94de48c4842089645fdcdf6c71865b175d836e9c2"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+ "once_cell",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72394f3339a76daf211e57d4bcb374410f3965dcc606dd0e03738c7888766980"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "bitflags 1.3.2",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
+[[package]]
+name = "colored"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
+dependencies = [
+ "atty",
+ "lazy_static",
+ "winapi",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+
+[[package]]
+name = "countme"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "derive_arbitrary"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys",
+]
+
+[[package]]
+name = "drop_bomb"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1"
+
+[[package]]
+name = "either"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+
+[[package]]
+name = "errno"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "fern"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "filetime"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "windows-sys",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "globset"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
+dependencies = [
+ "aho-corasick 0.7.20",
+ "bstr",
+ "fnv",
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+
+[[package]]
+name = "hexf-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "idna"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "ignore"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"
+dependencies = [
+ "globset",
+ "lazy_static",
+ "log",
+ "memchr",
+ "regex",
+ "same-file",
+ "thread_local",
+ "walkdir",
+ "winapi-util",
+]
+
+[[package]]
+name = "imperative"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f92123bf2fe0d9f1b5df1964727b970ca3b2d0203d47cf97fb1f36d856b6398"
+dependencies = [
+ "phf",
+ "rust-stemmers",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown",
+ "serde",
+]
+
+[[package]]
+name = "io-lifetimes"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
+dependencies = [
+ "hermit-abi 0.3.1",
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "is-macro"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a7d079e129b77477a49c5c4f1cfe9ce6c2c909ef52520693e8e811a714c7b20"
+dependencies = [
+ "Inflector",
+ "pmutil",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "is-terminal"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
+dependencies = [
+ "hermit-abi 0.3.1",
+ "io-lifetimes",
+ "rustix",
+ "windows-sys",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+
+[[package]]
+name = "jobserver"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lalrpop-util"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d"
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lexical-parse-float"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f"
+dependencies = [
+ "lexical-parse-integer",
+ "lexical-util",
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-parse-integer"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9"
+dependencies = [
+ "lexical-util",
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-util"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc"
+dependencies = [
+ "static_assertions",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.146"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
+
+[[package]]
+name = "libcst"
+version = "0.1.0"
+source = "git+https://github.com/charliermarsh/LibCST?rev=80e4c1399f95e5beb532fdd1e209ad2dbb470438#80e4c1399f95e5beb532fdd1e209ad2dbb470438"
+dependencies = [
+ "chic",
+ "itertools",
+ "libcst_derive",
+ "once_cell",
+ "paste",
+ "peg",
+ "regex",
+ "thiserror",
+]
+
+[[package]]
+name = "libcst_derive"
+version = "0.1.0"
+source = "git+https://github.com/charliermarsh/LibCST?rev=80e4c1399f95e5beb532fdd1e209ad2dbb470438#80e4c1399f95e5beb532fdd1e209ad2dbb470438"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "libfuzzer-sys"
+version = "0.4.6"
+source = "git+https://github.com/rust-fuzz/libfuzzer#1221c356e993b9f82d1ccd152f1c7636468758d2"
+dependencies = [
+ "arbitrary",
+ "cc",
+ "once_cell",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+
+[[package]]
+name = "log"
+version = "0.4.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
+
+[[package]]
+name = "matches"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
+
+[[package]]
+name = "memchr"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+
+[[package]]
+name = "natord"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c"
+
+[[package]]
+name = "nextest-workspace-hack"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d906846a98739ed9d73d66e62c2641eef8321f1734b7a1156ab045a0248fb2b3"
+
+[[package]]
+name = "nohash-hasher"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
+
+[[package]]
+name = "num-bigint"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "paste"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
+
+[[package]]
+name = "path-absolutize"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43eb3595c63a214e1b37b44f44b0a84900ef7ae0b4c5efce59e123d246d7a0de"
+dependencies = [
+ "path-dedot",
+]
+
+[[package]]
+name = "path-dedot"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d55e486337acb9973cdea3ec5638c1b3bcb22e573b2b7b41969e0c744d5a15e"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "pathdiff"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
+
+[[package]]
+name = "peg"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a07f2cafdc3babeebc087e499118343442b742cc7c31b4d054682cc598508554"
+dependencies = [
+ "peg-macros",
+ "peg-runtime",
+]
+
+[[package]]
+name = "peg-macros"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a90084dc05cf0428428e3d12399f39faad19b0909f64fb9170c9fdd6d9cd49b"
+dependencies = [
+ "peg-runtime",
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "peg-runtime"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739"
+
+[[package]]
+name = "pep440_rs"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe1d15693a11422cfa7d401b00dc9ae9fb8edbfbcb711a77130663f4ddf67650"
+dependencies = [
+ "lazy_static",
+ "regex",
+ "serde",
+ "tracing",
+ "unicode-width",
+]
+
+[[package]]
+name = "pep508_rs"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "969679a29dfdc8278a449f75b3dd45edf57e649bd59f7502429c2840751c46d8"
+dependencies = [
+ "once_cell",
+ "pep440_rs",
+ "regex",
+ "serde",
+ "thiserror",
+ "tracing",
+ "unicode-width",
+ "url",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+
+[[package]]
+name = "phf"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
+dependencies = [
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+
+[[package]]
+name = "pmutil"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "pyproject-toml"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f04dbbb336bd88583943c7cd973a32fed323578243a7569f40cb0c7da673321b"
+dependencies = [
+ "indexmap",
+ "pep440_rs",
+ "pep508_rs",
+ "serde",
+ "toml",
+]
+
+[[package]]
+name = "quick-junit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b909fe9bf2abb1e3d6a97c9189a37c8105c61d03dca9ce6aace023e7d682bd"
+dependencies = [
+ "chrono",
+ "indexmap",
+ "nextest-workspace-hack",
+ "quick-xml",
+ "thiserror",
+ "uuid",
+]
+
+[[package]]
+name = "quick-xml"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+dependencies = [
+ "getrandom",
+ "redox_syscall",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
+dependencies = [
+ "aho-corasick 1.0.2",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
+
+[[package]]
+name = "result-like"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccc7ce6435c33898517a30e85578cd204cbb696875efb93dec19a2d31294f810"
+dependencies = [
+ "result-like-derive",
+]
+
+[[package]]
+name = "result-like-derive"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fabf0a2e54f711c68c50d49f648a1a8a37adcb57353f518ac4df374f0788f42"
+dependencies = [
+ "pmutil",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "syn-ext",
+]
+
+[[package]]
+name = "ruff"
+version = "0.0.272"
+dependencies = [
+ "annotate-snippets 0.9.1",
+ "anyhow",
+ "bitflags 2.3.1",
+ "chrono",
+ "colored",
+ "dirs",
+ "fern",
+ "glob",
+ "globset",
+ "ignore",
+ "imperative",
+ "is-macro",
+ "itertools",
+ "libcst",
+ "log",
+ "natord",
+ "nohash-hasher",
+ "num-bigint",
+ "num-traits",
+ "once_cell",
+ "path-absolutize",
+ "pathdiff",
+ "pep440_rs",
+ "pyproject-toml",
+ "quick-junit",
+ "regex",
+ "result-like",
+ "ruff_cache",
+ "ruff_diagnostics",
+ "ruff_macros",
+ "ruff_newlines",
+ "ruff_python_ast",
+ "ruff_python_semantic",
+ "ruff_python_stdlib",
+ "ruff_rustpython",
+ "ruff_text_size",
+ "ruff_textwrap",
+ "rustc-hash",
+ "rustpython-format",
+ "rustpython-parser",
+ "semver",
+ "serde",
+ "serde_json",
+ "shellexpand",
+ "similar",
+ "smallvec",
+ "strum",
+ "strum_macros",
+ "thiserror",
+ "toml",
+ "typed-arena",
+ "unicode-width",
+ "unicode_names2",
+]
+
+[[package]]
+name = "ruff-fuzz"
+version = "0.0.0"
+dependencies = [
+ "arbitrary",
+ "libfuzzer-sys",
+ "ruff",
+ "ruff_python_ast",
+ "ruff_python_formatter",
+ "similar",
+]
+
+[[package]]
+name = "ruff_cache"
+version = "0.0.0"
+dependencies = [
+ "filetime",
+ "globset",
+ "itertools",
+ "regex",
+]
+
+[[package]]
+name = "ruff_diagnostics"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "log",
+ "ruff_text_size",
+ "serde",
+]
+
+[[package]]
+name = "ruff_formatter"
+version = "0.0.0"
+dependencies = [
+ "drop_bomb",
+ "ruff_text_size",
+ "rustc-hash",
+ "static_assertions",
+ "tracing",
+ "unicode-width",
+]
+
+[[package]]
+name = "ruff_index"
+version = "0.0.0"
+dependencies = [
+ "ruff_macros",
+]
+
+[[package]]
+name = "ruff_macros"
+version = "0.0.0"
+dependencies = [
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "ruff_textwrap",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "ruff_newlines"
+version = "0.0.0"
+dependencies = [
+ "memchr",
+ "ruff_text_size",
+]
+
+[[package]]
+name = "ruff_python_ast"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "bitflags 2.3.1",
+ "is-macro",
+ "itertools",
+ "log",
+ "memchr",
+ "num-bigint",
+ "num-traits",
+ "once_cell",
+ "ruff_newlines",
+ "ruff_text_size",
+ "rustc-hash",
+ "rustpython-ast",
+ "rustpython-literal",
+ "rustpython-parser",
+ "serde",
+ "smallvec",
+]
+
+[[package]]
+name = "ruff_python_formatter"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "clap",
+ "countme",
+ "is-macro",
+ "itertools",
+ "once_cell",
+ "ruff_formatter",
+ "ruff_newlines",
+ "ruff_python_ast",
+ "ruff_text_size",
+ "rustc-hash",
+ "rustpython-parser",
+]
+
+[[package]]
+name = "ruff_python_semantic"
+version = "0.0.0"
+dependencies = [
+ "bitflags 2.3.1",
+ "is-macro",
+ "nohash-hasher",
+ "num-traits",
+ "ruff_index",
+ "ruff_python_ast",
+ "ruff_python_stdlib",
+ "ruff_text_size",
+ "rustc-hash",
+ "rustpython-parser",
+ "smallvec",
+]
+
+[[package]]
+name = "ruff_python_stdlib"
+version = "0.0.0"
+dependencies = [
+ "once_cell",
+ "rustc-hash",
+]
+
+[[package]]
+name = "ruff_rustpython"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "rustpython-parser",
+]
+
+[[package]]
+name = "ruff_text_size"
+version = "0.0.0"
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd#7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "ruff_textwrap"
+version = "0.0.0"
+dependencies = [
+ "ruff_newlines",
+ "ruff_text_size",
+]
+
+[[package]]
+name = "rust-stemmers"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54"
+dependencies = [
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustix"
+version = "0.37.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
+dependencies = [
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
+[[package]]
+name = "rustpython-ast"
+version = "0.2.0"
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd#7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd"
+dependencies = [
+ "is-macro",
+ "num-bigint",
+ "rustpython-parser-core",
+ "static_assertions",
+]
+
+[[package]]
+name = "rustpython-format"
+version = "0.2.0"
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd#7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd"
+dependencies = [
+ "bitflags 2.3.1",
+ "itertools",
+ "num-bigint",
+ "num-traits",
+ "rustpython-literal",
+]
+
+[[package]]
+name = "rustpython-literal"
+version = "0.2.0"
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd#7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd"
+dependencies = [
+ "hexf-parse",
+ "is-macro",
+ "lexical-parse-float",
+ "num-traits",
+ "unic-ucd-category",
+]
+
+[[package]]
+name = "rustpython-parser"
+version = "0.2.0"
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd#7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd"
+dependencies = [
+ "anyhow",
+ "is-macro",
+ "itertools",
+ "lalrpop-util",
+ "log",
+ "num-bigint",
+ "num-traits",
+ "phf",
+ "phf_codegen",
+ "rustc-hash",
+ "rustpython-ast",
+ "rustpython-parser-core",
+ "tiny-keccak",
+ "unic-emoji-char",
+ "unic-ucd-ident",
+ "unicode_names2",
+]
+
+[[package]]
+name = "rustpython-parser-core"
+version = "0.2.0"
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd#7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd"
+dependencies = [
+ "is-macro",
+ "ruff_text_size",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+
+[[package]]
+name = "ryu"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
+
+[[package]]
+name = "serde"
+version = "1.0.163"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.163"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.96"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+dependencies = [
+ "indexmap",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "shellexpand"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b"
+dependencies = [
+ "dirs",
+]
+
+[[package]]
+name = "similar"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf"
+
+[[package]]
+name = "siphasher"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+
+[[package]]
+name = "smallvec"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "strum"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.24.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn-ext"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b86cb2b68c5b3c078cac02588bc23f3c04bb828c5d3aedd17980876ec6a7be6"
+dependencies = [
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "time"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
+dependencies = [
+ "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi",
+]
+
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "toml"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+dependencies = [
+ "cfg-if",
+ "log",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "typed-arena"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
+
+[[package]]
+name = "unic-char-property"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221"
+dependencies = [
+ "unic-char-range",
+]
+
+[[package]]
+name = "unic-char-range"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc"
+
+[[package]]
+name = "unic-common"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc"
+
+[[package]]
+name = "unic-emoji-char"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b07221e68897210270a38bde4babb655869637af0f69407f96053a34f76494d"
+dependencies = [
+ "unic-char-property",
+ "unic-char-range",
+ "unic-ucd-version",
+]
+
+[[package]]
+name = "unic-ucd-category"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b8d4591f5fcfe1bd4453baaf803c40e1b1e69ff8455c47620440b46efef91c0"
+dependencies = [
+ "matches",
+ "unic-char-property",
+ "unic-char-range",
+ "unic-ucd-version",
+]
+
+[[package]]
+name = "unic-ucd-ident"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987"
+dependencies = [
+ "unic-char-property",
+ "unic-char-range",
+ "unic-ucd-version",
+]
+
+[[package]]
+name = "unic-ucd-version"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4"
+dependencies = [
+ "unic-common",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+
+[[package]]
+name = "unicode_names2"
+version = "0.6.0"
+source = "git+https://github.com/youknowone/unicode_names2.git?rev=4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde#4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde"
+dependencies = [
+ "phf",
+]
+
+[[package]]
+name = "url"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
+[[package]]
+name = "uuid"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2"
+
+[[package]]
+name = "walkdir"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
+[[package]]
+name = "winnow"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "yansi-term"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1"
+dependencies = [
+ "winapi",
+]
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
new file mode 100644
index 0000000000000..2e00df5938822
--- /dev/null
+++ b/fuzz/Cargo.toml
@@ -0,0 +1,53 @@
+[package]
+name = "ruff-fuzz"
+version = "0.0.0"
+authors = [
+  "Charlie Marsh <charlie.r.marsh@gmail.com>",
+  "Addison Crump <research@addisoncrump.info>",
+]
+publish = false
+edition = "2021"
+
+[features]
+default = ["libfuzzer"]
+full-idempotency = []
+libfuzzer = ["libfuzzer-sys/link_libfuzzer"]
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+arbitrary = { version = "1.3.0", features = ["derive"] }
+libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer", default-features = false }
+ruff = { path = "../crates/ruff" }
+ruff_python_ast = { path = "../crates/ruff_python_ast" }
+ruff_python_formatter = { path = "../crates/ruff_python_formatter" }
+similar = { version = "2.2.1" }
+
+# Prevent this from interfering with workspaces
+[workspace]
+members = ["."]
+
+[[bin]]
+name = "ruff_parse_simple"
+path = "fuzz_targets/ruff_parse_simple.rs"
+
+[[bin]]
+name = "ruff_fix_validity"
+path = "fuzz_targets/ruff_fix_validity.rs"
+
+[[bin]]
+name = "ruff_parse_idempotency"
+path = "fuzz_targets/ruff_parse_idempotency.rs"
+
+[profile.release]
+opt-level = 3
+debug = true
+
+[profile.dev]
+opt-level = 3
+debug = true
+
+[profile.test]
+opt-level = 3
+debug = true
diff --git a/fuzz/README.md b/fuzz/README.md
new file mode 100644
index 0000000000000..42907fd9f18e4
--- /dev/null
+++ b/fuzz/README.md
@@ -0,0 +1,105 @@
+# ruff-fuzz
+
+Fuzzers and associated utilities for automatic testing of Ruff.
+
+## Usage
+
+To use the fuzzers provided in this directory, start by invoking:
+
+```bash
+./fuzz/init-fuzzers.sh
+```
+
+This will install [`cargo-fuzz`](https://github.com/rust-fuzz/cargo-fuzz) and optionally download a
+[dataset](https://zenodo.org/record/3628784) which improves the efficacy of the testing.
+The dataset may take several hours to download and clean, so if you're just looking to try out the
+fuzzers, skip the dataset download, though be warned that some features simply cannot be tested
+without it (very unlikely for the fuzzer to generate valid python code from "thin air").
+
+Once you have initialised the fuzzers, you can then execute any fuzzer with:
+
+```bash
+cargo fuzz run -s none name_of_fuzzer -- -timeout=1
+```
+
+You can view the names of the available fuzzers with `cargo fuzz list`.
+For specific details about how each fuzzer works, please read this document in its entirety.
+
+**IMPORTANT: You should run `./reinit-fuzzer.sh` after adding more file-based testcases.** This will
+allow the testing of new features that you've added unit tests for.
+
+### Debugging a crash
+
+Once you've found a crash, you'll need to debug it.
+The easiest first step in this process is to minimise the input such that the crash is still
+triggered with a smaller input.
+`cargo-fuzz` supports this out of the box with:
+
+```bash
+cargo fuzz tmin -s none name_of_fuzzer artifacts/name_of_fuzzer/crash-...
+```
+
+From here, you will need to analyse the input and potentially the behaviour of the program.
+The debugging process from here is unfortunately less well-defined, so you will need to apply some
+expertise here.
+Happy hunting!
+
+## A brief introduction to fuzzers
+
+Fuzzing, or fuzz testing, is the process of providing generated data to a program under test.
+The most common variety of fuzzers are mutational fuzzers; given a set of existing inputs (a
+"corpus"), it will attempt to slightly change (or "mutate") these inputs into new inputs that cover
+parts of the code that haven't yet been observed.
+Using this strategy, we can quite efficiently generate testcases which cover significant portions of
+the program, both with expected and unexpected data.
+[This is really quite effective for finding bugs.](https://github.com/rust-fuzz/trophy-case)
+
+The fuzzers here use [`cargo-fuzz`](https://github.com/rust-fuzz/cargo-fuzz), a utility which allows
+Rust to integrate with [libFuzzer](https://llvm.org/docs/LibFuzzer.html), the fuzzer library built
+into LLVM.
+Each source file present in [`fuzz_targets`](fuzz_targets) is a harness, which is, in effect, a unit
+test which can handle different inputs.
+When an input is provided to a harness, the harness processes this data and libFuzzer observes the
+code coverage and any special values used in comparisons over the course of the run.
+Special values are preserved for future mutations and inputs which cover new regions of code are
+added to the corpus.
+
+## Each fuzzer harness in detail
+
+Each fuzzer harness in [`fuzz_targets`](fuzz_targets) targets a different aspect of Ruff and tests
+them in different ways. While there is implementation-specific documentation in the source code
+itself, each harness is briefly described below.
+
+### `ruff_parse_simple`
+
+This fuzz harness does not perform any "smart" testing of Ruff; it merely checks that the parsing
+and unparsing of a particular input (what would normally be a source code file) does not crash.
+While this is unlikely to find any issues on its own, it executes very quickly and covers a large
+and diverse code region that may speed up the generation of inputs and therefore make a more
+valuable corpus quickly.
+It is particularly useful if you skip the dataset generation.
+
+### `ruff_parse_idempotency`
+
+This fuzz harness checks that Ruff's parser is idempotent in order to check that it is not
+incorrectly parsing or unparsing an input.
+It can be built in two modes: default (where it is only checked that the parser does not enter an
+unstable state) or full idempotency (the parser is checked to ensure that it will _always_ produce
+the same output after the first unparsing).
+Full idempotency mode can be used by enabling the `full-idempotency` feature when running the
+fuzzer, but this may be too strict of a restriction for initial testing.
+
+### `ruff_fix_validity`
+
+This fuzz harness checks that fixes applied by Ruff do not introduce new errors using the existing
+[`ruff::test::test_snippet`](../crates/ruff/src/test.rs) testing utility.
+It currently is only configured to use default settings, but may be extended in future versions to
+test non-default linter settings.
+
+## Experimental settings
+
+You can optionally use `--no-default-features --features libafl` to use the libafl fuzzer instead of
+libfuzzer.
+This fuzzer has experimental support, but can vastly improve fuzzer performance.
+If you are not already familiar with [LibAFL](https://github.com/AFLplusplus/LibAFL), this mode is
+not currently recommended.
diff --git a/fuzz/corpus/ruff_parse_idempotency b/fuzz/corpus/ruff_parse_idempotency
new file mode 120000
index 0000000000000..61e7ad4b4cd6f
--- /dev/null
+++ b/fuzz/corpus/ruff_parse_idempotency
@@ -0,0 +1 @@
+ruff_parse_simple
\ No newline at end of file
diff --git a/fuzz/corpus/ruff_parse_simple b/fuzz/corpus/ruff_parse_simple
new file mode 120000
index 0000000000000..018c02efec25c
--- /dev/null
+++ b/fuzz/corpus/ruff_parse_simple
@@ -0,0 +1 @@
+ruff_fix_validity/
\ No newline at end of file
diff --git a/fuzz/fuzz_targets/ruff_fix_validity.rs b/fuzz/fuzz_targets/ruff_fix_validity.rs
new file mode 100644
index 0000000000000..7f70cd1b12930
--- /dev/null
+++ b/fuzz/fuzz_targets/ruff_fix_validity.rs
@@ -0,0 +1,27 @@
+//! Fuzzer harness which actively tries to find testcases that cause Ruff to introduce errors into
+//! the resulting file.
+
+#![no_main]
+
+use libfuzzer_sys::{fuzz_target, Corpus};
+use ruff::settings::Settings;
+use std::sync::OnceLock;
+
+static SETTINGS: OnceLock<Settings> = OnceLock::new();
+
+fn do_fuzz(case: &[u8]) -> Corpus {
+    // throw away inputs which aren't utf-8
+    let Ok(code) = std::str::from_utf8(case) else { return Corpus::Reject; };
+
+    // the settings are immutable to test_snippet, so we avoid re-initialising here
+    let settings = SETTINGS.get_or_init(Settings::default);
+    ruff::test::set_max_iterations(usize::MAX);
+
+    // unlike in the test framework, where the number of iterations is well-defined, we are only
+    // looking for situations where a fix is bad; thus, we set the iterations to "infinite"
+    let _ = ruff::test::test_snippet(code, settings);
+
+    Corpus::Keep
+}
+
+fuzz_target!(|case: &[u8]| -> Corpus { do_fuzz(case) });
diff --git a/fuzz/fuzz_targets/ruff_parse_idempotency.rs b/fuzz/fuzz_targets/ruff_parse_idempotency.rs
new file mode 100644
index 0000000000000..ac4387e3b43ea
--- /dev/null
+++ b/fuzz/fuzz_targets/ruff_parse_idempotency.rs
@@ -0,0 +1,55 @@
+//! Fuzzer harness which searches for situations where the parser does not parse or unparse a
+//! particular source snippet consistently.
+
+#![no_main]
+
+use libfuzzer_sys::{fuzz_target, Corpus};
+use ruff_python_ast::source_code::round_trip;
+use similar::TextDiff;
+
+fn do_fuzz(case: &[u8]) -> Corpus {
+    let Ok(code) = std::str::from_utf8(case) else { return Corpus::Reject; };
+
+    // round trip it once to get a formatted version
+    if let Ok(first) = round_trip(code, "fuzzed-source.py") {
+        // round trip it a second time to get a case to compare against
+        if let Ok(second) = round_trip(&first, "fuzzed-source.py") {
+            if cfg!(feature = "full-idempotency") {
+                // potentially, we don't want to test for full idempotency, but just for unsteady states
+                // enable the "full-idempotency" feature when fuzzing for full idempotency
+                let diff = TextDiff::from_lines(&first, &second)
+                    .unified_diff()
+                    .header("Parsed once", "Parsed twice")
+                    .to_string();
+                assert_eq!(
+                    first, second,
+                    "\nIdempotency violation (orig => first => second); original: {:?}\ndiff:\n{}",
+                    code, diff
+                );
+            } else if first != second {
+                // by the third time we've round-tripped it, we shouldn't be introducing any more
+                // changes; if we do, then it's likely that we're in an unsteady parsing state
+                let third = round_trip(&second, "fuzzed-source.py")
+                    .expect("Couldn't round-trip the processed source.");
+                let diff = TextDiff::from_lines(&second, &third)
+                    .unified_diff()
+                    .header("Parsed twice", "Parsed three times")
+                    .to_string();
+                assert_eq!(
+                    second, third,
+                    "\nPotential unsteady state (orig => first => second => third); original: {:?}\ndiff:\n{}",
+                    code, diff
+                );
+            }
+        } else {
+            panic!(
+                "Unable to perform the second round trip!\nbefore: {:?}\nfirst: {:?}",
+                code, first
+            );
+        }
+    }
+
+    Corpus::Keep
+}
+
+fuzz_target!(|case: &[u8]| -> Corpus { do_fuzz(case) });
diff --git a/fuzz/fuzz_targets/ruff_parse_simple.rs b/fuzz/fuzz_targets/ruff_parse_simple.rs
new file mode 100644
index 0000000000000..e685f73857524
--- /dev/null
+++ b/fuzz/fuzz_targets/ruff_parse_simple.rs
@@ -0,0 +1,18 @@
+//! Fuzzer harness which merely explores the parse/unparse coverage space and tries to make it
+//! crash. On its own, this fuzzer is (hopefully) not going to find a crash.
+
+#![no_main]
+
+use libfuzzer_sys::{fuzz_target, Corpus};
+use ruff_python_ast::source_code::round_trip;
+
+fn do_fuzz(case: &[u8]) -> Corpus {
+    let Ok(code) = std::str::from_utf8(case) else { return Corpus::Reject; };
+
+    // just round-trip it once to trigger both parse and unparse
+    let _ = round_trip(code, "fuzzed-source.py");
+
+    Corpus::Keep
+}
+
+fuzz_target!(|case: &[u8]| -> Corpus { do_fuzz(case) });
diff --git a/fuzz/init-fuzzer.sh b/fuzz/init-fuzzer.sh
new file mode 100755
index 0000000000000..eb7e0265058d2
--- /dev/null
+++ b/fuzz/init-fuzzer.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# https://stackoverflow.com/a/246128/3549270
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+cd "$SCRIPT_DIR"
+
+if ! cargo fuzz --help >&/dev/null; then
+  cargo install --git https://github.com/rust-fuzz/cargo-fuzz.git
+fi
+
+if [ ! -d corpus/ruff_fix_validity ]; then
+  mkdir -p corpus/ruff_fix_validity
+  read -p "Would you like to build a corpus from a python source code dataset? (this will take a long time!) [Y/n] " -n 1 -r
+  echo
+  cd corpus/ruff_fix_validity
+  if [[ $REPLY =~ ^[Yy]$ ]]; then
+    curl -L 'https://zenodo.org/record/3628784/files/python-corpus.tar.gz?download=1' | tar xz
+  fi
+  cp -r "../../../crates/ruff/resources/test" .
+  cd -
+  cargo fuzz cmin -s none ruff_fix_validity
+fi
+
+echo "Done! You are ready to fuzz."
diff --git a/fuzz/reinit-fuzzer.sh b/fuzz/reinit-fuzzer.sh
new file mode 100755
index 0000000000000..a1acb8328fb65
--- /dev/null
+++ b/fuzz/reinit-fuzzer.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# https://stackoverflow.com/a/246128/3549270
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+cd "$SCRIPT_DIR"
+
+cd corpus/ruff_fix_validity
+if [[ $REPLY =~ ^[Yy]$ ]]; then
+  curl -L 'https://zenodo.org/record/3628784/files/python-corpus.tar.gz?download=1' | tar xz
+fi
+cp -r "../../../crates/ruff/resources/test" .
+cd -
+cargo fuzz cmin -s none ruff_fix_validity
+
+echo "Done! You are ready to fuzz."
diff --git a/playground/package-lock.json b/playground/package-lock.json
index 7b3d2508a922d..ab8de1f4fc77e 100644
--- a/playground/package-lock.json
+++ b/playground/package-lock.json
@@ -2746,9 +2746,9 @@
       "dev": true
     },
     "node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
       "dependencies": {
         "minimist": "^1.2.0"
@@ -5887,9 +5887,9 @@
       "dev": true
     },
     "json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
       "requires": {
         "minimist": "^1.2.0"
diff --git a/pyproject.toml b/pyproject.toml
index f5d66b8a7f7cb..2c9db23c271bd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,13 +1,11 @@
 [build-system]
-requires = ["maturin>=0.14.10,<0.15"]
-# We depend on >=0.14.10 because we specify name in
-# [package.metadata.maturin] in ruff_cli/Cargo.toml.
+requires = ["maturin>=1.0,<2.0"]
 
 build-backend = "maturin"
 
 [project]
 name = "ruff"
-version = "0.0.265"
+version = "0.0.272"
 description = "An extremely fast Python linter, written in Rust."
 authors = [{ name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" }]
 maintainers = [{ name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" }]
@@ -39,10 +37,33 @@ classifiers = [
   "Topic :: Software Development :: Libraries :: Python Modules",
   "Topic :: Software Development :: Quality Assurance",
 ]
-urls = { repository = "https://github.com/charliermarsh/ruff" }
+
+[project.urls]
+Repository = "https://github.com/charliermarsh/ruff"
+Documentation = "https://beta.ruff.rs/docs/"
+Changelog = "https://github.com/charliermarsh/ruff/releases"
 
 [tool.maturin]
 bindings = "bin"
 manifest-path = "crates/ruff_cli/Cargo.toml"
+module-name = "ruff"
 python-source = "python"
 strip = true
+exclude = [
+  "crates/ruff/resources/test/fixtures/**/*",
+  "crates/ruff/src/rules/*/snapshots/**/*"
+]
+
+[tool.ruff]
+extend-exclude = [
+  "crates/ruff/resources/",
+  "crates/ruff_python_formatter/resources/"
+]
+
+[tool.black]
+force-exclude = '''
+/(
+  | crates/ruff/resources
+  | crates/ruff_python_formatter/resources
+)/
+'''
diff --git a/ruff.schema.json b/ruff.schema.json
index a39b5d603dcd4..ec762028df6a1 100644
--- a/ruff.schema.json
+++ b/ruff.schema.json
@@ -66,6 +66,16 @@
         "type": "string"
       }
     },
+    "extend-fixable": {
+      "description": "A list of rule codes or prefixes to consider autofixable, in addition to those specified by `fixable`.",
+      "type": [
+        "array",
+        "null"
+      ],
+      "items": {
+        "$ref": "#/definitions/RuleSelector"
+      }
+    },
     "extend-include": {
       "description": "A list of file patterns to include when linting, in addition to those specified by `include`.\n\nInclusion are based on globs, and should be single-path patterns, like `*.pyw`, to include any file with the `.pyw` extension.\n\nFor more information on the glob syntax, refer to the [`globset` documentation](https://docs.rs/globset/latest/globset/#syntax).",
       "type": [
@@ -76,6 +86,19 @@
         "type": "string"
       }
     },
+    "extend-per-file-ignores": {
+      "description": "A list of mappings from file pattern to rule codes or prefixes to exclude, in addition to any rules excluded by `per-file-ignores`.",
+      "type": [
+        "object",
+        "null"
+      ],
+      "additionalProperties": {
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/RuleSelector"
+        }
+      }
+    },
     "extend-select": {
       "description": "A list of rule codes or prefixes to enable, in addition to those specified by `select`.",
       "type": [
@@ -286,7 +309,7 @@
       ]
     },
     "force-exclude": {
-      "description": "Whether to enforce `exclude` and `extend-exclude` patterns, even for paths that are passed to Ruff explicitly. Typically, Ruff will lint any paths passed in directly, even if they would typically be excluded. Setting `force-exclude = true` will cause Ruff to respect these exclusions unequivocally.\n\nThis is useful for [`pre-commit`](https://pre-commit.com/), which explicitly passes all changed files to the [`ruff-pre-commit`](https://github.com/charliermarsh/ruff-pre-commit) plugin, regardless of whether they're marked as excluded by Ruff's own settings.",
+      "description": "Whether to enforce `exclude` and `extend-exclude` patterns, even for paths that are passed to Ruff explicitly. Typically, Ruff will lint any paths passed in directly, even if they would typically be excluded. Setting `force-exclude = true` will cause Ruff to respect these exclusions unequivocally.\n\nThis is useful for [`pre-commit`](https://pre-commit.com/), which explicitly passes all changed files to the [`ruff-pre-commit`](https://github.com/astral-sh/ruff-pre-commit) plugin, regardless of whether they're marked as excluded by Ruff's own settings.",
       "type": [
         "boolean",
         "null"
@@ -343,12 +366,14 @@
     },
     "line-length": {
       "description": "The line length to use when enforcing long-lines violations (like `E501`).",
-      "type": [
-        "integer",
-        "null"
-      ],
-      "format": "uint",
-      "minimum": 0.0
+      "anyOf": [
+        {
+          "$ref": "#/definitions/LineLength"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "mccabe": {
       "description": "Options for the `mccabe` plugin.",
@@ -417,22 +442,22 @@
         }
       ]
     },
-    "pylint": {
-      "description": "Options for the `pylint` plugin.",
+    "pyflakes": {
+      "description": "Options for the `pyflakes` plugin.",
       "anyOf": [
         {
-          "$ref": "#/definitions/PylintOptions"
+          "$ref": "#/definitions/PyflakesOptions"
         },
         {
           "type": "null"
         }
       ]
     },
-    "pyupgrade": {
-      "description": "Options for the `pyupgrade` plugin.",
+    "pylint": {
+      "description": "Options for the `pylint` plugin.",
       "anyOf": [
         {
-          "$ref": "#/definitions/PyUpgradeOptions"
+          "$ref": "#/definitions/PylintOptions"
         },
         {
           "type": "null"
@@ -482,7 +507,7 @@
       ]
     },
     "src": {
-      "description": "The source code paths to consider, e.g., when resolving first- vs. third-party imports.\n\nAs an example: given a Python package structure like:\n\n```text my_package/ pyproject.toml src/ my_package/ __init__.py foo.py bar.py ```\n\nThe `src` directory should be included in the `src` option (e.g., `src = [\"src\"]`), such that when resolving imports, `my_package.foo` is considered a first-party import.\n\nThis field supports globs. For example, if you have a series of Python packages in a `python_modules` directory, `src = [\"python_modules/*\"]` would expand to incorporate all of the packages in that directory. User home directory and environment variables will also be expanded.",
+      "description": "The source code paths to consider, e.g., when resolving first- vs. third-party imports.\n\nAs an example: given a Python package structure like:\n\n```text my_package/ pyproject.toml src/ my_package/ __init__.py foo.py bar.py ```\n\nThe `src` directory should be included in the `src` option (e.g., `src = [\"src\"]`), such that when resolving imports, `my_package.foo` is considered a first-party import.\n\nWhen omitted, the `src` directory will typically default to the directory containing the nearest `pyproject.toml`, `ruff.toml`, or `.ruff.toml` file (the \"project root\"), unless a configuration file is explicitly provided (e.g., via the `--config` command-line flag).\n\nThis field supports globs. For example, if you have a series of Python packages in a `python_modules` directory, `src = [\"python_modules/*\"]` would expand to incorporate all of the packages in that directory. User home directory and environment variables will also be expanded.",
       "type": [
         "array",
         "null"
@@ -491,8 +516,19 @@
         "type": "string"
       }
     },
+    "tab-size": {
+      "description": "The tabulation size to calculate line length.",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/TabSize"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
     "target-version": {
-      "description": "The Python version to target, e.g., when considering automatic code upgrades, like rewriting type annotations.\n\nIf omitted, the target version will be inferred from the `project.requires-python` field in the relevant `pyproject.toml` (e.g., `requires-python = \">=3.8\"`), if present.",
+      "description": "The minimum Python version to target, e.g., when considering automatic code upgrades, like rewriting type annotations.\n\nIf omitted, and Ruff is configured via a `pyproject.toml` file, the target version will be inferred from its `project.requires-python` field (e.g., `requires-python = \">=3.8\"`). If Ruff is configured via `ruff.toml` or `.ruff.toml`, no such inference will be performed.",
       "anyOf": [
         {
           "$ref": "#/definitions/PythonVersion"
@@ -531,13 +567,6 @@
       "items": {
         "$ref": "#/definitions/RuleSelector"
       }
-    },
-    "update-check": {
-      "description": "Enable or disable automatic update checks (overridden by the `--update-check` and `--no-update-check` command-line flags).",
-      "type": [
-        "boolean",
-        "null"
-      ]
     }
   },
   "additionalProperties": false,
@@ -730,8 +759,10 @@
       "properties": {
         "extend-function-names": {
           "description": "Additional function names to consider as internationalization calls, in addition to those included in `function-names`.",
-          "default": [],
-          "type": "array",
+          "type": [
+            "array",
+            "null"
+          ],
           "items": {
             "type": "string"
           }
@@ -1269,6 +1300,12 @@
       },
       "additionalProperties": false
     },
+    "LineLength": {
+      "description": "The length of a line of text that is considered too long.",
+      "type": "integer",
+      "format": "uint",
+      "minimum": 0.0
+    },
     "McCabeOptions": {
       "type": "object",
       "properties": {
@@ -1342,19 +1379,6 @@
       },
       "additionalProperties": false
     },
-    "PyUpgradeOptions": {
-      "type": "object",
-      "properties": {
-        "keep-runtime-typing": {
-          "description": "Whether to avoid PEP 585 (`List[int]` -> `list[int]`) and PEP 604 (`Optional[str]` -> `str | None`) rewrites even if a file imports `from __future__ import annotations`. Note that this setting is only applicable when the target Python version is below 3.9 and 3.10 respectively, and enabling it is equivalent to disabling `use-pep585-annotation` (`UP006`) and `use-pep604-annotation` (`UP007`) entirely.",
-          "type": [
-            "boolean",
-            "null"
-          ]
-        }
-      },
-      "additionalProperties": false
-    },
     "Pycodestyle": {
       "type": "object",
       "properties": {
@@ -1367,12 +1391,14 @@
         },
         "max-doc-length": {
           "description": "The maximum line length to allow for line-length violations within documentation (`W505`), including standalone comments.",
-          "type": [
-            "integer",
-            "null"
-          ],
-          "format": "uint",
-          "minimum": 0.0
+          "anyOf": [
+            {
+              "$ref": "#/definitions/LineLength"
+            },
+            {
+              "type": "null"
+            }
+          ]
         }
       },
       "additionalProperties": false
@@ -1414,6 +1440,22 @@
       },
       "additionalProperties": false
     },
+    "PyflakesOptions": {
+      "type": "object",
+      "properties": {
+        "extend-generics": {
+          "description": "Additional functions or classes to consider generic, such that any subscripts should be treated as type annotation (e.g., `ForeignKey` in `django.db.models.ForeignKey[\"User\"]`.",
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "type": "string"
+          }
+        }
+      },
+      "additionalProperties": false
+    },
     "PylintOptions": {
       "type": "object",
       "properties": {
@@ -1521,6 +1563,10 @@
         "A001",
         "A002",
         "A003",
+        "AIR",
+        "AIR0",
+        "AIR00",
+        "AIR001",
         "ALL",
         "ANN",
         "ANN0",
@@ -1550,6 +1596,12 @@
         "ARG003",
         "ARG004",
         "ARG005",
+        "ASYNC",
+        "ASYNC1",
+        "ASYNC10",
+        "ASYNC100",
+        "ASYNC101",
+        "ASYNC102",
         "B",
         "B0",
         "B00",
@@ -1587,6 +1639,7 @@
         "B030",
         "B031",
         "B032",
+        "B033",
         "B9",
         "B90",
         "B904",
@@ -1711,6 +1764,37 @@
         "E1",
         "E10",
         "E101",
+        "E111",
+        "E112",
+        "E113",
+        "E114",
+        "E115",
+        "E116",
+        "E117",
+        "E201",
+        "E202",
+        "E203",
+        "E211",
+        "E221",
+        "E222",
+        "E223",
+        "E224",
+        "E225",
+        "E226",
+        "E227",
+        "E228",
+        "E231",
+        "E251",
+        "E252",
+        "E261",
+        "E262",
+        "E265",
+        "E266",
+        "E271",
+        "E272",
+        "E273",
+        "E274",
+        "E275",
         "E4",
         "E40",
         "E401",
@@ -1823,12 +1907,28 @@
         "F9",
         "F90",
         "F901",
+        "FA",
+        "FA1",
+        "FA10",
+        "FA100",
+        "FA102",
         "FBT",
         "FBT0",
         "FBT00",
         "FBT001",
         "FBT002",
         "FBT003",
+        "FIX",
+        "FIX0",
+        "FIX00",
+        "FIX001",
+        "FIX002",
+        "FIX003",
+        "FIX004",
+        "FLY",
+        "FLY0",
+        "FLY00",
+        "FLY002",
         "G",
         "G0",
         "G00",
@@ -1924,6 +2024,7 @@
         "PGH002",
         "PGH003",
         "PGH004",
+        "PGH005",
         "PIE",
         "PIE7",
         "PIE79",
@@ -1940,6 +2041,9 @@
         "PL",
         "PLC",
         "PLC0",
+        "PLC02",
+        "PLC020",
+        "PLC0208",
         "PLC04",
         "PLC041",
         "PLC0414",
@@ -1961,9 +2065,13 @@
         "PLE0116",
         "PLE0117",
         "PLE0118",
+        "PLE02",
+        "PLE024",
+        "PLE0241",
         "PLE03",
         "PLE030",
         "PLE0302",
+        "PLE0307",
         "PLE06",
         "PLE060",
         "PLE0604",
@@ -1984,6 +2092,9 @@
         "PLE15",
         "PLE150",
         "PLE1507",
+        "PLE17",
+        "PLE170",
+        "PLE1700",
         "PLE2",
         "PLE25",
         "PLE250",
@@ -2033,6 +2144,8 @@
         "PLW012",
         "PLW0120",
         "PLW0129",
+        "PLW013",
+        "PLW0131",
         "PLW04",
         "PLW040",
         "PLW0406",
@@ -2051,6 +2164,10 @@
         "PLW29",
         "PLW290",
         "PLW2901",
+        "PLW3",
+        "PLW33",
+        "PLW330",
+        "PLW3301",
         "PT",
         "PT0",
         "PT00",
@@ -2123,17 +2240,31 @@
         "PYI010",
         "PYI011",
         "PYI012",
+        "PYI013",
         "PYI014",
         "PYI015",
         "PYI016",
         "PYI02",
         "PYI020",
         "PYI021",
+        "PYI024",
+        "PYI025",
+        "PYI029",
         "PYI03",
+        "PYI032",
         "PYI033",
+        "PYI034",
+        "PYI035",
         "PYI04",
         "PYI042",
         "PYI043",
+        "PYI045",
+        "PYI048",
+        "PYI05",
+        "PYI050",
+        "PYI052",
+        "PYI053",
+        "PYI054",
         "Q",
         "Q0",
         "Q00",
@@ -2167,9 +2298,14 @@
         "RUF007",
         "RUF008",
         "RUF009",
+        "RUF01",
+        "RUF010",
         "RUF1",
         "RUF10",
         "RUF100",
+        "RUF2",
+        "RUF20",
+        "RUF200",
         "S",
         "S1",
         "S10",
@@ -2219,6 +2355,7 @@
         "S509",
         "S6",
         "S60",
+        "S601",
         "S602",
         "S603",
         "S604",
@@ -2226,6 +2363,7 @@
         "S606",
         "S607",
         "S608",
+        "S609",
         "S61",
         "S612",
         "S7",
@@ -2292,6 +2430,16 @@
         "TCH003",
         "TCH004",
         "TCH005",
+        "TD",
+        "TD0",
+        "TD00",
+        "TD001",
+        "TD002",
+        "TD003",
+        "TD004",
+        "TD005",
+        "TD006",
+        "TD007",
         "TID",
         "TID2",
         "TID25",
@@ -2311,6 +2459,7 @@
         "TRY30",
         "TRY300",
         "TRY301",
+        "TRY302",
         "TRY4",
         "TRY40",
         "TRY400",
@@ -2422,6 +2571,12 @@
         }
       ]
     },
+    "TabSize": {
+      "description": "The size of a tab.",
+      "type": "integer",
+      "format": "uint8",
+      "minimum": 0.0
+    },
     "Version": {
       "type": "string"
     }
diff --git a/rust-toolchain b/rust-toolchain
index 883d7d6539f18..bfe79d0bddb06 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-1.69
+1.70
diff --git a/scripts/Dockerfile.ecosystem b/scripts/Dockerfile.ecosystem
index 89198d79d812e..d671b20c1e6c0 100644
--- a/scripts/Dockerfile.ecosystem
+++ b/scripts/Dockerfile.ecosystem
@@ -15,13 +15,20 @@
 # ```
 # cargo build --target x86_64-unknown-linux-musl
 # docker buildx build -f scripts/Dockerfile.ecosystem -t ruff-ecosystem-checker --load .
-# docker run --rm ruff-ecosystem-checker
+# docker run --rm -v ./target/x86_64-unknown-linux-musl/debug/ruff:/app/ruff-new -v ./ruff-old:/app/ruff-old ruff-ecosystem-checker
+# ```
+# You can customize this, e.g. cache the git checkouts, a custom json file and a glibc build:
+# ```
+# docker run -v ./target/debug/ruff:/app/ruff-new -v ./ruff-old:/app/ruff-old -v ./target/checkouts:/app/checkouts \
+#   -v ./github_search.jsonl:/app/github_search.jsonl --rm ruff-ecosystem-checker \
+#   python check_ecosystem.py --verbose ruff-new ruff-old --projects github_search.jsonl --checkouts checkouts  \
+#   > target/ecosystem-ci.txt
 # ```
 
 FROM python:3.11
-RUN python -m venv .venv && .venv/bin/pip install ruff
+RUN mkdir /app
+WORKDIR /app
 ADD scripts/check_ecosystem.py check_ecosystem.py
 ADD github_search.jsonl github_search.jsonl
-ADD target/x86_64-unknown-linux-musl/debug/ruff ruff-new
 
-CMD ["python", "check_ecosystem.py", "--verbose", "--projects", "github_search.jsonl", "ruff-new", ".venv/bin/ruff"]
+CMD ["python", "check_ecosystem.py", "--verbose", "--projects", "github_search.jsonl", "ruff-new", "ruff-old"]
diff --git a/scripts/add_rule.py b/scripts/add_rule.py
index fe176a77421a3..3d1eb14c33e2a 100755
--- a/scripts/add_rule.py
+++ b/scripts/add_rule.py
@@ -46,13 +46,7 @@ def main(*, name: str, prefix: str, code: str, linter: str) -> None:
                 indent = get_indent(line)
                 filestem = f"{prefix}{code}" if linter != "pylint" else snake_case(name)
                 lines.append(
-                    f'{indent}#[test_case(Rule::{name}, Path::new("{filestem}.py");'
-                    f' "{prefix}{code}")]',
-                )
-                lines.sort(
-                    key=lambda line: line.split('Path::new("')[1]
-                    if linter != "pylint"
-                    else line.split(");")[1],
+                    f'{indent}#[test_case(Rule::{name}, Path::new("{filestem}.py"))]',
                 )
                 fp.write("\n".join(lines))
                 fp.write("\n")
@@ -76,7 +70,7 @@ def main(*, name: str, prefix: str, code: str, linter: str) -> None:
     contents = rules_mod.read_text()
     parts = contents.split("\n\n")
 
-    new_pub_use = f"pub use {rule_name_snake}::{{{rule_name_snake}, {name}}}"
+    new_pub_use = f"pub(crate) use {rule_name_snake}::{{{rule_name_snake}, {name}}}"
     new_mod = f"mod {rule_name_snake};"
 
     if len(parts) == 2:
@@ -105,11 +99,11 @@ def main(*, name: str, prefix: str, code: str, linter: str) -> None:
 
 #[violation]
 pub struct {name};
+
 impl Violation for {name} {{
     #[derive_message_formats]
     fn message(&self) -> String {{
-        todo!("implement message");
-        format!("TODO: write message")
+        format!("TODO: write message: {{}}", todo!("implement message"))
     }}
 }}
 """,
@@ -117,60 +111,10 @@ def main(*, name: str, prefix: str, code: str, linter: str) -> None:
         fp.write(
             f"""
 /// {prefix}{code}
-pub fn {rule_name_snake}(checker: &mut Checker) {{}}
+pub(crate) fn {rule_name_snake}(checker: &mut Checker) {{}}
 """,
         )
 
-    # Add the relevant code-to-violation pair to `src/registry.rs`.
-    content = (ROOT_DIR / "crates/ruff/src/registry.rs").read_text()
-
-    seen_macro = False
-    has_written = False
-    has_seen_linter = False
-    with (ROOT_DIR / "crates/ruff/src/registry.rs").open("w") as fp:
-        lines = []
-        for line in content.splitlines():
-            if has_written:
-                fp.write(line)
-                fp.write("\n")
-                continue
-
-            if line.startswith("ruff_macros::register_rules!"):
-                seen_macro = True
-                fp.write(line)
-                fp.write("\n")
-                continue
-
-            if not seen_macro:
-                fp.write(line)
-                fp.write("\n")
-                continue
-
-            if line.strip() == f"// {linter}":
-                indent = get_indent(line)
-                lines.append(f"{indent}rules::{dir_name(linter)}::rules::{name},")
-                has_seen_linter = True
-                fp.write(line)
-                fp.write("\n")
-                continue
-
-            if not has_seen_linter:
-                fp.write(line)
-                fp.write("\n")
-                continue
-
-            if not line.strip().startswith("// "):
-                lines.append(line)
-            else:
-                lines.sort()
-                fp.write("\n".join(lines))
-                fp.write("\n")
-                fp.write(line)
-                fp.write("\n")
-                has_written = True
-
-    assert has_written
-
     text = ""
     with (ROOT_DIR / "crates/ruff/src/codes.rs").open("r") as fp:
         while (line := next(fp)).strip() != f"// {linter}":
@@ -181,17 +125,16 @@ def main(*, name: str, prefix: str, code: str, linter: str) -> None:
         while (line := next(fp)).strip() != "":
             lines.append(line)
 
-        linter_variant = pascal_case(linter)
+        variant = pascal_case(linter)
+        rule = f"""rules::{linter.split(" ")[0]}::rules::{name}"""
         lines.append(
-            " " * 8 + f"""({linter_variant}, "{code}") => Rule::{name},\n""",
+            " " * 8
+            + f"""({variant}, "{code}") => (RuleGroup::Unspecified, {rule}),\n""",
         )
         lines.sort()
-
         text += "".join(lines)
         text += "\n"
-
         text += fp.read()
-
     with (ROOT_DIR / "crates/ruff/src/codes.rs").open("w") as fp:
         fp.write(text)
 
diff --git a/scripts/benchmarks/README.md b/scripts/benchmarks/README.md
index 18e66ef78cda2..d54171c0c2496 100644
--- a/scripts/benchmarks/README.md
+++ b/scripts/benchmarks/README.md
@@ -6,7 +6,8 @@ Utilities for benchmarking Ruff.
 
 Run `./scripts/benchmarks/run.sh` to clone the benchmarking target (CPython).
 
-If you're looking to benchmark Ruff against other tools, you'll also need to run `poetry install` to create a virtual environment with the required dependencies.
+If you're looking to benchmark Ruff against other tools, you'll also need to run `poetry install`
+to create a virtual environment with the required dependencies.
 
 ## Running Benchmarks
 
diff --git a/scripts/check_docs_formatted.py b/scripts/check_docs_formatted.py
new file mode 100755
index 0000000000000..34068a2e8038f
--- /dev/null
+++ b/scripts/check_docs_formatted.py
@@ -0,0 +1,247 @@
+#!/usr/bin/env python3
+"""Check code snippets in docs are formatted by black."""
+import argparse
+import os
+import re
+import textwrap
+from collections.abc import Sequence
+from pathlib import Path
+from re import Match
+
+import black
+from black.mode import Mode, TargetVersion
+from black.parsing import InvalidInput
+
+TARGET_VERSIONS = ["py37", "py38", "py39", "py310", "py311"]
+SNIPPED_RE = re.compile(
+    r"(?P<before>^(?P<indent> *)```\s*python\n)"
+    r"(?P<code>.*?)"
+    r"(?P<after>^(?P=indent)```\s*$)",
+    re.DOTALL | re.MULTILINE,
+)
+
+# For some rules, we don't want black to fix the formatting as this would "fix" the
+# example.
+KNOWN_FORMATTING_VIOLATIONS = [
+    "avoidable-escaped-quote",
+    "bad-quotes-docstring",
+    "bad-quotes-inline-string",
+    "bad-quotes-multiline-string",
+    "explicit-string-concatenation",
+    "indentation-with-invalid-multiple",
+    "line-too-long",
+    "missing-trailing-comma",
+    "multi-line-implicit-string-concatenation",
+    "multiple-leading-hashes-for-block-comment",
+    "multiple-spaces-after-keyword",
+    "multiple-spaces-after-operator",
+    "multiple-spaces-before-keyword",
+    "multiple-spaces-before-operator",
+    "multiple-statements-on-one-line-colon",
+    "multiple-statements-on-one-line-semicolon",
+    "no-indented-block-comment",
+    "no-space-after-block-comment",
+    "no-space-after-inline-comment",
+    "over-indented",
+    "prohibited-trailing-comma",
+    "too-few-spaces-before-inline-comment",
+    "trailing-comma-on-bare-tuple",
+    "unexpected-indentation-comment",
+    "useless-semicolon",
+    "whitespace-after-open-bracket",
+    "whitespace-before-close-bracket",
+    "whitespace-before-punctuation",
+]
+
+# For some docs, black is unable to parse the example code.
+KNOWN_PARSE_ERRORS = [
+    "blank-line-with-whitespace",
+    "indentation-with-invalid-multiple-comment",
+    "missing-newline-at-end-of-file",
+    "mixed-spaces-and-tabs",
+    "no-indented-block",
+    "tab-after-keyword",
+    "tab-after-operator",
+    "tab-before-keyword",
+    "tab-before-operator",
+    "trailing-whitespace",
+    "unexpected-indentation",
+]
+
+
+class CodeBlockError(Exception):
+    """A code block parse error."""
+
+
+def format_str(
+    src: str,
+    black_mode: black.FileMode,
+) -> tuple[str, Sequence[CodeBlockError]]:
+    """Format a single docs file string."""
+    errors: list[CodeBlockError] = []
+
+    def _snipped_match(match: Match[str]) -> str:
+        code = textwrap.dedent(match["code"])
+        try:
+            code = black.format_str(code, mode=black_mode)
+        except InvalidInput as e:
+            errors.append(CodeBlockError(e))
+
+        code = textwrap.indent(code, match["indent"])
+        return f'{match["before"]}{code}{match["after"]}'
+
+    src = SNIPPED_RE.sub(_snipped_match, src)
+    return src, errors
+
+
+def format_file(
+    file: Path,
+    black_mode: black.FileMode,
+    error_known: bool,
+    args: argparse.Namespace,
+) -> int:
+    """Check the formatting of a single docs file.
+
+    Returns the exit code for the script.
+    """
+    with file.open() as f:
+        contents = f.read()
+
+    if file.parent.name == "rules":
+        # Check contents contains "What it does" section
+        if "## What it does" not in contents:
+            print(f"Docs for `{file.name}` are missing the `What it does` section.")
+            return 1
+
+        # Check contents contains "Why is this bad?" section
+        if "## Why is this bad?" not in contents:
+            print(f"Docs for `{file.name}` are missing the `Why is this bad?` section.")
+            return 1
+
+    # Remove everything before the first example
+    contents = contents[contents.find("## Example") :]
+
+    # Remove everything after the last example
+    contents = contents[: contents.rfind("```")] + "```"
+
+    new_contents, errors = format_str(contents, black_mode)
+
+    if errors and not args.skip_errors and not error_known:
+        for error in errors:
+            rule_name = file.name.split(".")[0]
+            print(f"Docs parse error for `{rule_name}` docs: {error}")
+
+        return 2
+
+    if contents != new_contents:
+        rule_name = file.name.split(".")[0]
+        print(
+            f"Rule `{rule_name}` docs are not formatted. The example section "
+            f"should be rewritten to:",
+        )
+
+        # Add indentation so that snipped can be copied directly to docs
+        for line in new_contents.splitlines():
+            output_line = "///"
+            if len(line) > 0:
+                output_line = f"{output_line} {line}"
+
+            print(output_line)
+
+        print("\n")
+
+        return 1
+
+    return 0
+
+
+def main(argv: Sequence[str] | None = None) -> int:
+    """Check code snippets in docs are formatted by black."""
+    parser = argparse.ArgumentParser(
+        description="Check code snippets in docs are formatted by black.",
+    )
+    parser.add_argument("--skip-errors", action="store_true")
+    parser.add_argument("--generate-docs", action="store_true")
+    args = parser.parse_args(argv)
+
+    if args.generate_docs:
+        # Generate docs
+        from generate_mkdocs import main as generate_docs
+
+        generate_docs()
+
+    # Get static docs
+    static_docs = []
+    for file in os.listdir("docs"):
+        if file.endswith(".md"):
+            static_docs.append(Path("docs") / file)
+
+    # Check rules generated
+    if not Path("docs/rules").exists():
+        print("Please generate rules first.")
+        return 1
+
+    # Get generated rules
+    generated_docs = []
+    for file in os.listdir("docs/rules"):
+        if file.endswith(".md"):
+            generated_docs.append(Path("docs/rules") / file)
+
+    if len(generated_docs) == 0:
+        print("Please generate rules first.")
+        return 1
+
+    black_mode = Mode(
+        target_versions={TargetVersion[val.upper()] for val in TARGET_VERSIONS},
+    )
+
+    # Check known formatting violations and parse errors are sorted alphabetically and
+    # have no duplicates. This will reduce the diff when adding new violations
+
+    for known_list, file_string in [
+        (KNOWN_FORMATTING_VIOLATIONS, "formatting violations"),
+        (KNOWN_PARSE_ERRORS, "parse errors"),
+    ]:
+        if known_list != sorted(known_list):
+            print(
+                f"Known {file_string} is not sorted alphabetically. Please sort and "
+                f"re-run.",
+            )
+            return 1
+
+        duplicates = list({x for x in known_list if known_list.count(x) > 1})
+        if len(duplicates) > 0:
+            print(f"Known {file_string} has duplicates:")
+            print("\n".join([f"  - {x}" for x in duplicates]))
+            print("Please remove them and re-run.")
+            return 1
+
+    violations = 0
+    errors = 0
+    for file in [*static_docs, *generated_docs]:
+        rule_name = file.name.split(".")[0]
+        if rule_name in KNOWN_FORMATTING_VIOLATIONS:
+            continue
+
+        error_known = rule_name in KNOWN_PARSE_ERRORS
+
+        result = format_file(file, black_mode, error_known, args)
+        if result == 1:
+            violations += 1
+        elif result == 2 and not error_known:
+            errors += 1
+
+    if violations > 0:
+        print(f"Formatting violations identified: {violations}")
+
+    if errors > 0:
+        print(f"New code block parse errors identified: {errors}")
+
+    if violations > 0 or errors > 0:
+        return 1
+
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/scripts/check_ecosystem.py b/scripts/check_ecosystem.py
index 1a68bb917ebe1..d7afcb764b605 100755
--- a/scripts/check_ecosystem.py
+++ b/scripts/check_ecosystem.py
@@ -5,6 +5,7 @@
 
     scripts/check_ecosystem.py <path/to/ruff1> <path/to/ruff2>
 """
+from __future__ import annotations
 
 import argparse
 import asyncio
@@ -14,10 +15,12 @@
 import logging
 import re
 import tempfile
+import time
 from asyncio.subprocess import PIPE, create_subprocess_exec
-from contextlib import asynccontextmanager
+from contextlib import asynccontextmanager, nullcontext
 from pathlib import Path
-from typing import TYPE_CHECKING, NamedTuple, Optional, Self
+from signal import SIGINT, SIGTERM
+from typing import TYPE_CHECKING, NamedTuple, Self
 
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator, Iterator, Sequence
@@ -30,56 +33,64 @@ class Repository(NamedTuple):
 
     org: str
     repo: str
-    ref: Optional[str]
+    ref: str | None
     select: str = ""
     ignore: str = ""
     exclude: str = ""
+    # Generating fixes is slow and verbose
+    show_fixes: bool = False
 
     @asynccontextmanager
-    async def clone(self: Self) -> "AsyncIterator[Path]":
+    async def clone(self: Self, checkout_dir: Path) -> AsyncIterator[Path]:
         """Shallow clone this repository to a temporary directory."""
-        with tempfile.TemporaryDirectory() as tmpdir:
-            logger.debug(f"Cloning {self.org}/{self.repo}")
-            git_command = [
-                "git",
-                "clone",
-                "--config",
-                "advice.detachedHead=false",
-                "--quiet",
-                "--depth",
-                "1",
-                "--no-tags",
-            ]
-            if self.ref:
-                git_command.extend(["--branch", self.ref])
-
-            git_command.extend(
-                [
-                    f"https://github.com/{self.org}/{self.repo}",
-                    tmpdir,
-                ],
-            )
-
-            process = await create_subprocess_exec(*git_command)
-
-            await process.wait()
-
-            logger.debug(f"Finished cloning {self.org}/{self.repo}")
-
-            yield Path(tmpdir)
-
-
-REPOSITORIES = {
-    "airflow": Repository("apache", "airflow", "main", select="ALL"),
-    "bokeh": Repository("bokeh", "bokeh", "branch-3.2", select="ALL"),
-    "build": Repository("pypa", "build", "main"),
-    "cibuildwheel": Repository("pypa", "cibuildwheel", "main"),
-    "disnake": Repository("DisnakeDev", "disnake", "master"),
-    "scikit-build": Repository("scikit-build", "scikit-build", "main"),
-    "scikit-build-core": Repository("scikit-build", "scikit-build-core", "main"),
-    "typeshed": Repository("python", "typeshed", "main", select="PYI"),
-    "zulip": Repository("zulip", "zulip", "main", select="ALL"),
-}
+        if checkout_dir.exists():
+            logger.debug(f"Reusing {self.org}/{self.repo}")
+            yield Path(checkout_dir)
+            return
+
+        logger.debug(f"Cloning {self.org}/{self.repo}")
+        git_command = [
+            "git",
+            "clone",
+            "--config",
+            "advice.detachedHead=false",
+            "--quiet",
+            "--depth",
+            "1",
+            "--no-tags",
+        ]
+        if self.ref:
+            git_command.extend(["--branch", self.ref])
+
+        git_command.extend(
+            [
+                f"https://github.com/{self.org}/{self.repo}",
+                checkout_dir,
+            ],
+        )
+
+        process = await create_subprocess_exec(*git_command)
+
+        status_code = await process.wait()
+
+        logger.debug(
+            f"Finished cloning {self.org}/{self.repo} with status {status_code}",
+        )
+
+        yield Path(checkout_dir)
+
+
+REPOSITORIES: list[Repository] = [
+    Repository("apache", "airflow", "main", select="ALL"),
+    Repository("bokeh", "bokeh", "branch-3.2", select="ALL"),
+    Repository("pypa", "build", "main"),
+    Repository("pypa", "cibuildwheel", "main"),
+    Repository("DisnakeDev", "disnake", "master"),
+    Repository("scikit-build", "scikit-build", "main"),
+    Repository("scikit-build", "scikit-build-core", "main"),
+    Repository("python", "typeshed", "main", select="PYI"),
+    Repository("zulip", "zulip", "main", select="ALL"),
+]
 
 SUMMARY_LINE_RE = re.compile(r"^(Found \d+ error.*)|(.*potentially fixable with.*)$")
 
@@ -96,7 +107,8 @@ async def check(
     select: str = "",
     ignore: str = "",
     exclude: str = "",
-) -> "Sequence[str]":
+    show_fixes: bool = False,
+) -> Sequence[str]:
     """Run the given ruff binary against the specified path."""
     logger.debug(f"Checking {name} with {ruff}")
     ruff_args = ["check", "--no-cache", "--exit-zero"]
@@ -106,6 +118,10 @@ async def check(
         ruff_args.extend(["--ignore", ignore])
     if exclude:
         ruff_args.extend(["--exclude", exclude])
+    if show_fixes:
+        ruff_args.extend(["--show-fixes", "--ecosystem-ci"])
+
+    start = time.time()
     proc = await create_subprocess_exec(
         ruff.absolute(),
         *ruff_args,
@@ -114,10 +130,10 @@ async def check(
         stderr=PIPE,
         cwd=path,
     )
-
     result, err = await proc.communicate()
+    end = time.time()
 
-    logger.debug(f"Finished checking {name} with {ruff}")
+    logger.debug(f"Finished checking {name} with {ruff} in {end - start:.2f}")
 
     if proc.returncode != 0:
         raise RuffError(err.decode("utf8"))
@@ -141,7 +157,7 @@ def __bool__(self: Self) -> bool:
         """Return true if this diff is non-empty."""
         return bool(self.removed or self.added)
 
-    def __iter__(self: Self) -> "Iterator[str]":
+    def __iter__(self: Self) -> Iterator[str]:
         """Iterate through the changed lines in diff format."""
         for line in heapq.merge(sorted(self.removed), sorted(self.added)):
             if line in self.removed:
@@ -150,46 +166,65 @@ def __iter__(self: Self) -> "Iterator[str]":
                 yield f"+ {line}"
 
 
-async def compare(ruff1: Path, ruff2: Path, repo: Repository) -> Diff | None:
+async def compare(
+    ruff1: Path,
+    ruff2: Path,
+    repo: Repository,
+    checkouts: Path | None = None,
+) -> Diff | None:
     """Check a specific repository against two versions of ruff."""
     removed, added = set(), set()
 
-    async with repo.clone() as path:
-        try:
-            async with asyncio.TaskGroup() as tg:
-                check1 = tg.create_task(
-                    check(
-                        ruff=ruff1,
-                        path=path,
-                        name=f"{repo.org}/{repo.repo}",
-                        select=repo.select,
-                        ignore=repo.ignore,
-                        exclude=repo.exclude,
-                    ),
-                )
-                check2 = tg.create_task(
-                    check(
-                        ruff=ruff2,
-                        path=path,
-                        name=f"{repo.org}/{repo.repo}",
-                        select=repo.select,
-                        ignore=repo.ignore,
-                        exclude=repo.exclude,
-                    ),
-                )
-        except ExceptionGroup as e:
-            raise e.exceptions[0] from e
-
-        for line in difflib.ndiff(check1.result(), check2.result()):
-            if line.startswith("- "):
-                removed.add(line[2:])
-            elif line.startswith("+ "):
-                added.add(line[2:])
+    # Allows to keep the checkouts locations
+    if checkouts:
+        checkout_parent = checkouts.joinpath(repo.org)
+        # Don't create the repodir itself, we need that for checking for existing
+        # clones
+        checkout_parent.mkdir(exist_ok=True, parents=True)
+        location_context = nullcontext(checkout_parent)
+    else:
+        location_context = tempfile.TemporaryDirectory()
+
+    with location_context as checkout_parent:
+        checkout_dir = Path(checkout_parent).joinpath(repo.repo)
+        async with repo.clone(checkout_dir) as path:
+            try:
+                async with asyncio.TaskGroup() as tg:
+                    check1 = tg.create_task(
+                        check(
+                            ruff=ruff1,
+                            path=path,
+                            name=f"{repo.org}/{repo.repo}",
+                            select=repo.select,
+                            ignore=repo.ignore,
+                            exclude=repo.exclude,
+                            show_fixes=repo.show_fixes,
+                        ),
+                    )
+                    check2 = tg.create_task(
+                        check(
+                            ruff=ruff2,
+                            path=path,
+                            name=f"{repo.org}/{repo.repo}",
+                            select=repo.select,
+                            ignore=repo.ignore,
+                            exclude=repo.exclude,
+                            show_fixes=repo.show_fixes,
+                        ),
+                    )
+            except ExceptionGroup as e:
+                raise e.exceptions[0] from e
+
+            for line in difflib.ndiff(check1.result(), check2.result()):
+                if line.startswith("- "):
+                    removed.add(line[2:])
+                elif line.startswith("+ "):
+                    added.add(line[2:])
 
     return Diff(removed, added)
 
 
-def read_projects_jsonl(projects_jsonl: Path) -> dict[str, Repository]:
+def read_projects_jsonl(projects_jsonl: Path) -> dict[tuple[str, str], Repository]:
     """Read either of the two formats of https://github.com/akx/ruff-usage-aggregate."""
     repositories = {}
     for line in projects_jsonl.read_text().splitlines():
@@ -208,35 +243,47 @@ def read_projects_jsonl(projects_jsonl: Path) -> dict[str, Repository]:
                 # us the revision, but there's no way with git to just do
                 # `git clone --depth 1` with a specific ref.
                 # `ref = item["url"].split("?ref=")[1]` would be exact
-                repositories[repository["name"]] = Repository(
+                repositories[(repository["owner"], repository["repo"])] = Repository(
                     repository["owner"]["login"],
                     repository["name"],
                     None,
+                    select=repository.get("select"),
+                    ignore=repository.get("ignore"),
+                    exclude=repository.get("exclude"),
                 )
         else:
             assert "owner" in data, "Unknown ruff-usage-aggregate format"
             # Pick only the easier case for now.
             if data["path"] != "pyproject.toml":
                 continue
-            repositories[data["repo"]] = Repository(
+            repositories[(data["owner"], data["repo"])] = Repository(
                 data["owner"],
                 data["repo"],
                 data.get("ref"),
+                select=data.get("select"),
+                ignore=data.get("ignore"),
+                exclude=data.get("exclude"),
             )
     return repositories
 
 
-async def main(*, ruff1: Path, ruff2: Path, projects_jsonl: Optional[Path]) -> None:
+async def main(
+    *,
+    ruff1: Path,
+    ruff2: Path,
+    projects_jsonl: Path | None,
+    checkouts: Path | None = None,
+) -> None:
     """Check two versions of ruff against a corpus of open-source code."""
     if projects_jsonl:
         repositories = read_projects_jsonl(projects_jsonl)
     else:
-        repositories = REPOSITORIES
+        repositories = {(repo.org, repo.repo): repo for repo in REPOSITORIES}
 
     logger.debug(f"Checking {len(repositories)} projects")
 
     results = await asyncio.gather(
-        *[compare(ruff1, ruff2, repo) for repo in repositories.values()],
+        *[compare(ruff1, ruff2, repo, checkouts) for repo in repositories.values()],
         return_exceptions=True,
     )
 
@@ -255,16 +302,17 @@ async def main(*, ruff1: Path, ruff2: Path, projects_jsonl: Optional[Path]) -> N
     if total_removed == 0 and total_added == 0 and errors == 0:
         print("\u2705 ecosystem check detected no changes.")
     else:
+        rule_changes: dict[str, tuple[int, int]] = {}
         changes = f"(+{total_added}, -{total_removed}, {errors} error(s))"
 
         print(f"\u2139\ufe0f ecosystem check **detected changes**. {changes}")
         print()
 
-        for name, diff in diffs.items():
+        for (org, repo), diff in diffs.items():
             if isinstance(diff, Exception):
                 changes = "error"
-                print(f"<details><summary>{name} ({changes})</summary>")
-                repo = repositories[name]
+                print(f"<details><summary>{repo} ({changes})</summary>")
+                repo = repositories[(org, repo)]
                 print(
                     f"https://github.com/{repo.org}/{repo.repo} ref {repo.ref} "
                     f"select {repo.select} ignore {repo.ignore} exclude {repo.exclude}",
@@ -281,7 +329,7 @@ async def main(*, ruff1: Path, ruff2: Path, projects_jsonl: Optional[Path]) -> N
                 print("</details>")
             elif diff:
                 changes = f"+{len(diff.added)}, -{len(diff.removed)}"
-                print(f"<details><summary>{name} ({changes})</summary>")
+                print(f"<details><summary>{repo} ({changes})</summary>")
                 print("<p>")
                 print()
 
@@ -294,9 +342,47 @@ async def main(*, ruff1: Path, ruff2: Path, projects_jsonl: Optional[Path]) -> N
                 print()
                 print("</p>")
                 print("</details>")
+
+                # Count rule changes
+                for line in diff_str.splitlines():
+                    # Find rule change for current line or construction
+                    # + <rule>/<path>:<line>:<column>: <rule_code> <message>
+                    matches = re.search(r": ([A-Z]{1,3}[0-9]{3,4})", line)
+
+                    if matches is None:
+                        # Handle case where there are no regex matches e.g.
+                        # +                 "?application=AIRFLOW&authenticator=TEST_AUTH&role=TEST_ROLE&warehouse=TEST_WAREHOUSE" # noqa: E501, ERA001
+                        # Which was found in local testing
+                        continue
+
+                    rule_code = matches.group(1)
+
+                    # Get current additions and removals for this rule
+                    current_changes = rule_changes.get(rule_code, (0, 0))
+
+                    # Check if addition or removal depending on the first character
+                    if line[0] == "+":
+                        current_changes = (current_changes[0] + 1, current_changes[1])
+                    elif line[0] == "-":
+                        current_changes = (current_changes[0], current_changes[1] + 1)
+
+                    rule_changes[rule_code] = current_changes
+
             else:
                 continue
 
+        if len(rule_changes.keys()) > 0:
+            print(f"Rules changed: {len(rule_changes.keys())}")
+            print()
+            print("| Rule | Changes | Additions | Removals |")
+            print("| ---- | ------- | --------- | -------- |")
+            for rule, (additions, removals) in sorted(
+                rule_changes.items(),
+                key=lambda x: (x[1][0] + x[1][1]),
+                reverse=True,
+            ):
+                print(f"| {rule} | {additions + removals} | {additions} | {removals} |")
+
     logger.debug(f"Finished {len(repositories)} repositories")
 
 
@@ -314,6 +400,14 @@ async def main(*, ruff1: Path, ruff2: Path, projects_jsonl: Optional[Path]) -> N
             "Supports both github_search_*.jsonl and known-github-tomls.jsonl."
         ),
     )
+    parser.add_argument(
+        "--checkouts",
+        type=Path,
+        help=(
+            "Location for the git checkouts, in case you want to save them"
+            " (defaults to temporary directory)"
+        ),
+    )
     parser.add_argument(
         "-v",
         "--verbose",
@@ -336,4 +430,19 @@ async def main(*, ruff1: Path, ruff2: Path, projects_jsonl: Optional[Path]) -> N
     else:
         logging.basicConfig(level=logging.INFO)
 
-    asyncio.run(main(ruff1=args.ruff1, ruff2=args.ruff2, projects_jsonl=args.projects))
+    loop = asyncio.get_event_loop()
+    main_task = asyncio.ensure_future(
+        main(
+            ruff1=args.ruff1,
+            ruff2=args.ruff2,
+            projects_jsonl=args.projects,
+            checkouts=args.checkouts,
+        ),
+    )
+    # https://stackoverflow.com/a/58840987/3549270
+    for signal in [SIGINT, SIGTERM]:
+        loop.add_signal_handler(signal, main_task.cancel)
+    try:
+        loop.run_until_complete(main_task)
+    finally:
+        loop.close()
diff --git a/scripts/ecosystem_all_check.py b/scripts/ecosystem_all_check.py
new file mode 100644
index 0000000000000..9f509c57ac9c0
--- /dev/null
+++ b/scripts/ecosystem_all_check.py
@@ -0,0 +1,78 @@
+"""This is @konstin's scripts for checking an entire checkout of ~2.1k packages for
+panics, autofix errors and similar problems.
+
+It's a less elaborate, more hacky version of check_ecosystem.py
+"""
+
+import json
+import subprocess
+import sys
+from pathlib import Path
+from subprocess import CalledProcessError
+from typing import NamedTuple, Optional
+
+from tqdm import tqdm
+
+
+class Repository(NamedTuple):
+    """A GitHub repository at a specific ref."""
+
+    org: str
+    repo: str
+    ref: Optional[str]
+
+
+def main() -> None:
+    ruff_args = sys.argv[1:]
+    checkouts = Path("checkouts")
+    out_dir = Path("ecosystem_all_results")
+    github_search_json = Path("github_search.jsonl")
+    # Somehow it doesn't like plain ruff
+    ruff = Path.cwd().joinpath("ruff")
+
+    out_dir.mkdir(parents=True, exist_ok=True)
+
+    repositories = []
+    for line in github_search_json.read_text().splitlines():
+        item = json.loads(line)
+        # Pick only the easier case for now.
+        if item["path"] != "pyproject.toml":
+            continue
+        repositories.append(
+            Repository(
+                item["owner"],
+                item["repo"],
+                item.get("ref"),
+            ),
+        )
+
+    successes = 0
+    errors = 0
+    for repository in tqdm(repositories):
+        project_dir = checkouts.joinpath(repository.org).joinpath(repository.repo)
+        if not project_dir.is_dir():
+            tqdm.write(f"Missing {project_dir}")
+            errors += 1
+            continue
+
+        try:
+            output = subprocess.run(
+                [ruff, *ruff_args, "."],
+                cwd=project_dir,
+                capture_output=True,
+                text=True,
+            )
+        except CalledProcessError as e:
+            tqdm.write(f"Ruff failed on {project_dir}: {e}")
+            errors += 1
+            continue
+
+        org_repo = f"{repository.org}:{repository.repo}"
+        out_dir.joinpath(f"{org_repo}.stdout.txt").write_text(output.stdout)
+        out_dir.joinpath(f"{org_repo}.stderr.txt").write_text(output.stderr)
+        successes += 1
+    print(f"Success: {successes} Error {errors}")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/ecosystem_all_check.sh b/scripts/ecosystem_all_check.sh
new file mode 100755
index 0000000000000..315c52dc30c86
--- /dev/null
+++ b/scripts/ecosystem_all_check.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+# This is @konstin's setup for checking an entire checkout of ~3k packages for
+# panics, autofix errors and similar problems.
+#
+# We put this in a docker container because processing random scraped code from GitHub is
+# [kinda dangerous](https://moyix.blogspot.com/2022/09/someones-been-messing-with-my-subnormals.html)
+#
+# Usage:
+# ```
+# scripts/ecosystem_all_check.sh check --select RUF200
+# ```
+
+# https://stackoverflow.com/a/246128/3549270
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+time docker run --rm -it \
+  -w /app \
+  -v "${SCRIPT_DIR}/../target/checkouts:/app/checkouts" \
+  -v "${SCRIPT_DIR}/../target/ecosystem_all_results:/app/ecosystem_all_results" \
+  -v "${SCRIPT_DIR}/../target/x86_64-unknown-linux-musl/release/ruff:/app/ruff" \
+  -v "${SCRIPT_DIR}/../ecosystem_all.py:/app/ecosystem_all.py" \
+  -v "${SCRIPT_DIR}/../github_search.jsonl:/app/github_search.jsonl" \
+  -v "${SCRIPT_DIR}/../.venv-3.11:/app/.venv" \
+  -v "${SCRIPT_DIR}/ecosystem_all_check_entrypoint.sh:/app/ecosystem_all_check_entrypoint.sh" \
+  -v "${SCRIPT_DIR}/ecosystem_all_check.py:/app/ecosystem_all_check.py" \
+  python:3.11 ./ecosystem_all_check_entrypoint.sh "$@"
+
+# grep the autofix errors
+grep -R "the rule codes" "${SCRIPT_DIR}/../target/ecosystem_all_results" | sort > "${SCRIPT_DIR}/../target/autofix-errors.txt"
+# Make sure we didn't have an early exit
+echo "Done"
diff --git a/scripts/ecosystem_all_check_entrypoint.sh b/scripts/ecosystem_all_check_entrypoint.sh
new file mode 100755
index 0000000000000..edbd8dd36ce47
--- /dev/null
+++ b/scripts/ecosystem_all_check_entrypoint.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+# Wrapper for ecosystem_all_check.py
+
+if [ ! -d ".venv/bin" ]; then
+  python -m venv .venv
+  .venv/bin/pip install tqdm
+fi
+
+.venv/bin/python ecosystem_all_check.py "$@"
diff --git a/scripts/generate_known_standard_library.py b/scripts/generate_known_standard_library.py
index 1489939ab94e1..7fd7ae7222aed 100644
--- a/scripts/generate_known_standard_library.py
+++ b/scripts/generate_known_standard_library.py
@@ -21,13 +21,13 @@
 ]
 
 
-class FakeConfig:  # noqa: D101
+class FakeConfig:
     intersphinx_timeout = None
     tls_verify = True
     user_agent = ""
 
 
-class FakeApp:  # noqa: D101
+class FakeApp:
     srcdir = ""
     config = FakeConfig()
 
diff --git a/scripts/pyproject.toml b/scripts/pyproject.toml
index f03a66bc48f77..c34ba92a24a2f 100644
--- a/scripts/pyproject.toml
+++ b/scripts/pyproject.toml
@@ -11,11 +11,13 @@ line-length = 88
 line-length = 88
 select = ["ALL"]
 ignore = [
-  "C901", # McCabe complexity
-  "PL",   # pylint
-  "S",    # bandit
-  "G",    # flake8-logging
-  "T",    # flake8-print
+  "C901",  # McCabe complexity
+  "D",     # pydocstyle
+  "PL",    # pylint
+  "S",     # bandit
+  "G",     # flake8-logging
+  "T",     # flake8-print
+  "FBT",   # flake8-boolean-trap
 ]
 
 [tool.ruff.pydocstyle]
diff --git a/scripts/update_ambiguous_characters.py b/scripts/update_ambiguous_characters.py
new file mode 100644
index 0000000000000..8413c5bcfb082
--- /dev/null
+++ b/scripts/update_ambiguous_characters.py
@@ -0,0 +1,62 @@
+"""Generate the confusables.rs file from the VS Code ambiguous.json file."""
+import json
+import subprocess
+from pathlib import Path
+
+CONFUSABLES_RS_PATH = "crates/ruff/src/rules/ruff/rules/confusables.rs"
+AMBIGUOUS_JSON_URL = "https://raw.githubusercontent.com/hediet/vscode-unicode-data/main/out/ambiguous.json"
+
+
+def get_mapping_data() -> dict:
+    """
+    Get the ambiguous character mapping data from the vscode-unicode-data repository.
+
+    Uses the system's `curl` command to download the data,
+    instead of adding a dependency to a Python-native HTTP client.
+    """
+    content = subprocess.check_output(
+        ["curl", "-sSL", AMBIGUOUS_JSON_URL],
+        encoding="utf-8",
+    )
+    # The content is a JSON object literal wrapped in a JSON string, so double decode:
+    return json.loads(json.loads(content))
+
+
+def format_confusables_rs(raw_data: dict) -> str:
+    """Format the downloaded data into a Rust source file."""
+    prelude = """
+/// This file is auto-generated by scripts/update_ambiguous_characters.py.
+
+use once_cell::sync::Lazy;
+use rustc_hash::FxHashMap;
+
+/// Via: <https://github.com/hediet/vscode-unicode-data/blob/main/out/ambiguous.json>
+/// See: <https://github.com/microsoft/vscode/blob/095ddabc52b82498ee7f718a34f9dd11d59099a8/src/vs/base/common/strings.ts#L1094>
+pub(crate) static CONFUSABLES: Lazy<FxHashMap<u32, u8>> = Lazy::new(|| {
+    #[allow(clippy::unreadable_literal)]
+    FxHashMap::from_iter([
+""".lstrip()
+    tuples = []
+    for _category, items in raw_data.items():
+        for i in range(0, len(items), 2):
+            tuples.append(f"({items[i]}, {items[i + 1]}),")
+    postlude = """])});"""
+
+    print(f"{len(tuples)} confusable tuples.")
+
+    return prelude + "\n".join(tuples) + postlude
+
+
+def main() -> None:
+    print("Retrieving data...")
+    mapping_data = get_mapping_data()
+    formatted_data = format_confusables_rs(mapping_data)
+    confusables_path = Path(__file__).parent.parent / CONFUSABLES_RS_PATH
+    confusables_path.write_text(formatted_data, encoding="utf-8")
+    print("Formatting Rust file with cargo fmt...")
+    subprocess.check_call(["cargo", "fmt", "--", confusables_path])
+    print("Done.")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/update_schemastore.py b/scripts/update_schemastore.py
new file mode 100644
index 0000000000000..ace0f715c6519
--- /dev/null
+++ b/scripts/update_schemastore.py
@@ -0,0 +1,97 @@
+"""Update ruff.json in schemastore.
+
+This script will clone astral-sh/schemastore, update the schema and push the changes
+to a new branch tagged with the ruff git hash. You should see a URL to create the PR
+to schemastore in the CLI.
+"""
+
+import json
+from pathlib import Path
+from subprocess import check_call, check_output
+from tempfile import TemporaryDirectory
+
+schemastore_fork = "https://github.com/astral-sh/schemastore"
+schemastore_upstream = "https://github.com/SchemaStore/schemastore"
+ruff_repo = "https://github.com/charliermarsh/ruff"
+root = Path(
+    check_output(["git", "rev-parse", "--show-toplevel"], text=True).strip(),
+)
+ruff_json = Path("src/schemas/json/ruff.json")
+
+
+def update_schemastore(schemastore: Path) -> None:
+    if not schemastore.is_dir():
+        check_call(["git", "clone", schemastore_fork, schemastore])
+        check_call(
+            [
+                "git",
+                "remote",
+                "add",
+                "upstream",
+                schemastore_upstream,
+            ],
+            cwd=schemastore,
+        )
+    # Create a new branch tagged with the current ruff commit up to date with the latest
+    # upstream schemastore
+    check_call(["git", "fetch", "upstream"], cwd=schemastore)
+    current_sha = check_output(["git", "rev-parse", "HEAD"], text=True).strip()
+    branch = f"update-ruff-{current_sha}"
+    check_call(
+        ["git", "switch", "-c", branch],
+        cwd=schemastore,
+    )
+    check_call(
+        ["git", "reset", "--hard", "upstream/master"],
+        cwd=schemastore,
+    )
+
+    # Update the schema and format appropriately
+    schema = json.loads(root.joinpath("ruff.schema.json").read_text())
+    schema["$id"] = "https://json.schemastore.org/ruff.json"
+    schemastore.joinpath(ruff_json).write_text(
+        json.dumps(dict(sorted(schema.items())), indent=2, ensure_ascii=False),
+    )
+    check_call(["prettier", "--write", ruff_json], cwd=schemastore)
+
+    # Check if the schema has changed
+    # https://stackoverflow.com/a/9393642/3549270
+    if check_output(["git", "status", "-s"], cwd=schemastore).strip():
+        # Schema has changed, commit and push
+        commit_url = f"{ruff_repo}/commit/{current_sha}"
+        commit_body = (
+            f"This updates ruff's JSON schema to [{current_sha}]({commit_url})"
+        )
+        # https://stackoverflow.com/a/22909204/3549270
+        check_call(
+            [
+                "git",
+                "commit",
+                "-a",
+                "-m",
+                "Update ruff's JSON schema",
+                "-m",
+                commit_body,
+            ],
+            cwd=schemastore,
+        )
+        # This should show the link to create a PR
+        check_call(
+            ["git", "push", "--set-upstream", "origin", branch],
+            cwd=schemastore,
+        )
+    else:
+        print("No changes")
+
+
+def main() -> None:
+    schemastore_existing = root.joinpath("schemastore")
+    if schemastore_existing.is_dir():
+        update_schemastore(schemastore_existing)
+    else:
+        with TemporaryDirectory() as temp_dir:
+            update_schemastore(Path(temp_dir).joinpath("schemastore"))
+
+
+if __name__ == "__main__":
+    main()